Binary files /tmp/y6yf2f3uwK/language-pack-fr-base-12.04+20111229/data/extra.tar and /tmp/pmeCXHt_Bb/language-pack-fr-base-12.04+20120221/data/extra.tar differ
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/acl.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/acl.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/acl.po	2012-01-02 17:26:52.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/acl.po	2012-02-23 06:31:18.000000000 +0000
@@ -26,8 +26,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:34+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:29+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../chacl/chacl.c:46
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/adduser.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/adduser.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/adduser.po	2012-01-02 17:26:42.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/adduser.po	2012-02-23 06:31:08.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:01+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:24+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "X-Poedit-Country: FRANCE\n"
 "Language: \n"
 
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/alsa-utils.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/alsa-utils.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/alsa-utils.po	2012-01-02 17:26:42.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/alsa-utils.po	2012-02-23 06:31:08.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: alsa-utils 1.0.23\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-31 15:27+0100\n"
+"POT-Creation-Date: 2012-01-25 10:44+0100\n"
 "PO-Revision-Date: 2011-02-23 21:34+0000\n"
 "Last-Translator: cjst <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:02+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:24+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: alsamixer/card_select.c:126 alsamixer/device_name.c:126
 msgid "Sound Card"
@@ -224,131 +224,131 @@
 msgid "Side"
 msgstr "Côté"
 
-#: alsamixer/mixer_widget.c:84 alsamixer/mixer_widget.c:89
+#: alsamixer/mixer_widget.c:95 alsamixer/mixer_widget.c:100
 msgid "cannot open mixer"
 msgstr "le mixeur ne peut pas être ouvert"
 
-#: alsamixer/mixer_widget.c:95 alsamixer/mixer_widget.c:172
+#: alsamixer/mixer_widget.c:106 alsamixer/mixer_widget.c:183
 msgid "cannot load mixer controls"
 msgstr "les commandes de mixage ne peuvent pas être chargés"
 
-#: alsamixer/mixer_widget.c:162
+#: alsamixer/mixer_widget.c:173
 #, c-format
 msgid "Cannot open mixer device '%s'."
 msgstr "Le périphérique de mixage '%s' ne peut pas être ouvert."
 
-#: alsamixer/mixer_widget.c:183
+#: alsamixer/mixer_widget.c:194
 msgid "Esc     Exit"
 msgstr "Esc     Quitter"
 
-#: alsamixer/mixer_widget.c:184
+#: alsamixer/mixer_widget.c:195
 msgid "F1 ? H  Help"
 msgstr "F1 ? H  Aide"
 
-#: alsamixer/mixer_widget.c:185
+#: alsamixer/mixer_widget.c:196
 msgid "F2 /    System information"
 msgstr "F2 /    Informations système"
 
-#: alsamixer/mixer_widget.c:186
+#: alsamixer/mixer_widget.c:197
 msgid "F3      Show playback controls"
 msgstr "F3      Afficher les commandes de lecture"
 
-#: alsamixer/mixer_widget.c:187
+#: alsamixer/mixer_widget.c:198
 msgid "F4      Show capture controls"
 msgstr "F4      Afficher les commandes de capture"
 
-#: alsamixer/mixer_widget.c:188
+#: alsamixer/mixer_widget.c:199
 msgid "F5      Show all controls"
 msgstr "F5      Afficher toutes les commandes"
 
-#: alsamixer/mixer_widget.c:189
+#: alsamixer/mixer_widget.c:200
 msgid "Tab     Toggle view mode (F3/F4/F5)"
 msgstr "Tab     Choisir le mode de visualisation (F3/F4/F5)"
 
-#: alsamixer/mixer_widget.c:190
+#: alsamixer/mixer_widget.c:201
 msgid "F6 S    Select sound card"
 msgstr "F6 S    Choisir la carte son"
 
-#: alsamixer/mixer_widget.c:191
+#: alsamixer/mixer_widget.c:202
 msgid "L       Redraw screen"
 msgstr "L       Actualiser l'écran"
 
-#: alsamixer/mixer_widget.c:193
+#: alsamixer/mixer_widget.c:204
 msgid "Left    Move to the previous control"
 msgstr "Gauche  Aller à la commande précédente"
 
-#: alsamixer/mixer_widget.c:194
+#: alsamixer/mixer_widget.c:205
 msgid "Right   Move to the next control"
 msgstr "Droite  Aller à la commande suivante"
 
-#: alsamixer/mixer_widget.c:196
+#: alsamixer/mixer_widget.c:207
 msgid "Up/Down    Change volume"
 msgstr "Haut/Bas   Ajuster le volume"
 
-#: alsamixer/mixer_widget.c:197
+#: alsamixer/mixer_widget.c:208
 msgid "+ -        Change volume"
 msgstr "+ -        Ajuster le volume"
 
-#: alsamixer/mixer_widget.c:198
+#: alsamixer/mixer_widget.c:209
 msgid "Page Up/Dn Change volume in big steps"
 msgstr "Page Préc./Suiv. Ajuster le volume en grandes intervalles"
 
-#: alsamixer/mixer_widget.c:199
+#: alsamixer/mixer_widget.c:210
 msgid "End        Set volume to 0%"
 msgstr "Fin        Couper le volume"
 
-#: alsamixer/mixer_widget.c:200
+#: alsamixer/mixer_widget.c:211
 msgid "0-9        Set volume to 0%-90%"
 msgstr "0-9        Ajuster le volume entre 0 et 90%"
 
-#: alsamixer/mixer_widget.c:201
+#: alsamixer/mixer_widget.c:212
 msgid "Q W E      Increase left/both/right volumes"
 msgstr "Q W E      Augmenter les volumes de gauche/centre/droite"
 
 #. TRANSLATORS: or Y instead of Z
-#: alsamixer/mixer_widget.c:203
+#: alsamixer/mixer_widget.c:214
 msgid "Z X C      Decrease left/both/right volumes"
 msgstr "Z X C      Baisser les volumes de gauche/centre/droite"
 
-#: alsamixer/mixer_widget.c:204
+#: alsamixer/mixer_widget.c:215
 msgid "B          Balance left and right volumes"
 msgstr "B          Égaliser les volumes de gauche et droite"
 
-#: alsamixer/mixer_widget.c:206
+#: alsamixer/mixer_widget.c:217
 msgid "M          Toggle mute"
 msgstr "M          (Dés)activer le mode muet"
 
 #. TRANSLATORS: or , .
-#: alsamixer/mixer_widget.c:208
+#: alsamixer/mixer_widget.c:219
 msgid "< >        Toggle left/right mute"
 msgstr "< >        (Dés)activer le mode muet à gauche et à droite"
 
-#: alsamixer/mixer_widget.c:210
+#: alsamixer/mixer_widget.c:221
 msgid "Space      Toggle capture"
 msgstr "Espace     (Dés)activer la capture"
 
 #. TRANSLATORS: or Insert Delete
-#: alsamixer/mixer_widget.c:212
+#: alsamixer/mixer_widget.c:223
 msgid "; '        Toggle left/right capture"
 msgstr ";          (Dés)activer la capture à gauche et à droite"
 
-#: alsamixer/mixer_widget.c:214
+#: alsamixer/mixer_widget.c:225
 msgid "Authors:"
 msgstr "Auteurs:"
 
-#: alsamixer/mixer_widget.c:215
+#: alsamixer/mixer_widget.c:226
 msgid "  Tim Janik"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:216
+#: alsamixer/mixer_widget.c:227
 msgid "  Jaroslav Kysela <perex@perex.cz>"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:217
+#: alsamixer/mixer_widget.c:228
 msgid "  Clemens Ladisch <clemens@ladisch.de>"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:219
+#: alsamixer/mixer_widget.c:230
 msgid "Help"
 msgstr "Aide"
 
@@ -365,23 +365,23 @@
 msgid "Cannot open file \"%s\"."
 msgstr "Le fichier \"%s\" n'a pas pu être ouvert."
 
-#: aplay/aplay.c:152
+#: aplay/aplay.c:163
 msgid "raw data"
 msgstr "données brutes"
 
-#: aplay/aplay.c:153
+#: aplay/aplay.c:164
 msgid "VOC"
 msgstr "VOC"
 
-#: aplay/aplay.c:155
+#: aplay/aplay.c:166
 msgid "WAVE"
 msgstr "WAVE"
 
-#: aplay/aplay.c:156
+#: aplay/aplay.c:167
 msgid "Sparc Audio"
 msgstr "Sparc Audio"
 
-#: aplay/aplay.c:177
+#: aplay/aplay.c:188
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -411,12 +411,14 @@
 "-v, --verbose           show PCM structure and setup (accumulative)\n"
 "-V, --vumeter=TYPE      enable VU meter (TYPE: mono or stereo)\n"
 "-I, --separate-channels one file for each channel\n"
+"-i, --interactive       allow interactive operation from stdin\n"
 "    --disable-resample  disable automatic rate resample\n"
 "    --disable-channels  disable automatic channel conversions\n"
 "    --disable-format    disable automatic format conversions\n"
 "    --disable-softvol   disable software volume control (softvol)\n"
 "    --test-position     test ring buffer position\n"
-"    --test-coef=#\t test coeficient for ring buffer position (default 8)\n"
+"    --test-coef=#       test coefficient for ring buffer position (default "
+"8)\n"
 "                        expression for validation is: coef * (buffer_size / "
 "2)\n"
 "    --test-nowait       do not wait for ring buffer - eats whole CPU\n"
@@ -426,60 +428,13 @@
 "    --process-id-file   write the process ID here\n"
 "    --use-strftime      apply the strftime facility to the output file name\n"
 msgstr ""
-"Utilisation: %s [OPTION]... [FICHIER]...\n"
-"\n"
-"-h, --help              aide\n"
-"    --version           afficher la version du programme\n"
-"-l, --list-devices      afficher la listes des périphériques\n"
-"-L, --list-pcms         afficher la liste des noms de périphériques\n"
-"-D, --device=NOM        choisir le périphérique PCM par son nom\n"
-"-Q, --quiet             mode silencieux\n"
-"-t, --file-type TYPE    type de fichier (voc, wav, raw ou au)\n"
-"-c, --channels=#        canaux\n"
-"-f, --format=FORMAT     format d'échantillonage (insensible à la casse)\n"
-"-r, --rate=#            fréquence d'échantillonage\n"
-"-d, --duration=#        interrompre après # secondes\n"
-"-M, --mmap              charger le flux en mémoire avec mmap\n"
-"-N, --nonblock          mode non-bloquant\n"
-"-F, --period-time=#     # microsecondes entre chaque interruption\n"
-"-B, --buffer-time=#     la durée du tampon est de # microsecondes\n"
-"    --period-size=#     # trames entre chaque interruption\n"
-"    --buffer-size=#     la durée du tampon est de # trames\n"
-"-A, --avail-min=#       # microsecondes min. disponibles entre chaque "
-"réveil\n"
-"-R, --start-delay=#     # microsecondes de délai avant le démarrage\n"
-"                        automatique du périphérique PCM (relatif à la "
-"taille\n"
-"                        du tampon si <= 0)\n"
-"-T, --stop-delay=#      # microsecondes de délai depuis xrun avant l'arrêt\n"
-"                        automatique du périphérique PCM \n"
-"-v, --verbose           afficher la structure et la configuration du\n"
-"                        périphérique PCM (accumulatif)\n"
-"-V, --vumeter=TYPE      activer le VU-mètre (TYPE: mono ou stereo)\n"
-"-I, --separate-channels un fichier par canal\n"
-"    --disable-resample  désactiver le rééchantillonage de fréquence\n"
-"                        automatique\n"
-"    --disable-channels  désactiver les conversions automatiques de canal\n"
-"    --disable-format    désactiver les conversions automatiques de format\n"
-"    --disable-softvol   désactiver la commande du volume logicielle\n"
-"    --test-position     tester la position du tampon circulaire\n"
-"    --test-coef=#       test coefficient pour la position du tampon\n"
-"                        circulaire (par défaut 8). L'expression pour la\n"
-"                        validation est : coef * (taille_tampon / 2)\n"
-"    --test-nowait       ne pas attendre le tampon circulaire - prend toutes\n"
-"                        les resources du processeur\n"
-"    --max-file-time=#   commencer un autre fichier de capture quand "
-"l'ancien\n"
-"                        fichier a enregistré pendant # secondes\n"
-"    --process-id-file   écrire l'identifiant du processus ici\n"
-"    --use-strftime      utiliser strftime pour le nom du fichier de capture\n"
 
-#: aplay/aplay.c:216 speaker-test/speaker-test.c:819
+#: aplay/aplay.c:228 speaker-test/speaker-test.c:819
 #, c-format
 msgid "Recognized sample formats are:"
 msgstr "Les formats d'échantillonage connus sont:"
 
-#: aplay/aplay.c:222
+#: aplay/aplay.c:234
 #, c-format
 msgid ""
 "\n"
@@ -488,120 +443,120 @@
 "\n"
 "Certains de ceux-ci ne sont peut être pas disponibles avec ce matériel\n"
 
-#: aplay/aplay.c:223
+#: aplay/aplay.c:235
 #, c-format
 msgid "The availabled format shortcuts are:\n"
 msgstr "Les raccourcis format disponibles sont:\n"
 
-#: aplay/aplay.c:224
+#: aplay/aplay.c:236
 #, c-format
 msgid "-f cd (16 bit little endian, 44100, stereo)\n"
 msgstr "-f cd (16 bit petit boutiste, 44100, stéréo)\n"
 
-#: aplay/aplay.c:225
+#: aplay/aplay.c:237
 #, c-format
 msgid "-f cdr (16 bit big endian, 44100, stereo)\n"
 msgstr "-f cdr (16 bit gros boutiste, 44100, stéréo)\n"
 
-#: aplay/aplay.c:226
+#: aplay/aplay.c:238
 #, c-format
 msgid "-f dat (16 bit little endian, 48000, stereo)\n"
 msgstr "-f dat (16 bit petit boutiste, 48000, stéréo)\n"
 
-#: aplay/aplay.c:240
+#: aplay/aplay.c:252
 msgid "no soundcards found..."
 msgstr "aucune carte son n'a été trouvée..."
 
-#: aplay/aplay.c:243
+#: aplay/aplay.c:255
 #, c-format
 msgid "**** List of %s Hardware Devices ****\n"
 msgstr "**** Liste des Périphériques Matériels %s ****\n"
 
-#: aplay/aplay.c:272
+#: aplay/aplay.c:284
 #, c-format
 msgid "card %i: %s [%s], device %i: %s [%s]\n"
 msgstr "carte %i: %s [%s], périphérique %i: %s [%s]\n"
 
-#: aplay/aplay.c:278
+#: aplay/aplay.c:290
 #, c-format
 msgid "  Subdevices: %i/%i\n"
 msgstr "  Sous-périphériques: %i/%i\n"
 
-#: aplay/aplay.c:285
+#: aplay/aplay.c:297
 #, c-format
 msgid "  Subdevice #%i: %s\n"
 msgstr "  Sous-périphérique #%i: %s\n"
 
-#: aplay/aplay.c:362
+#: aplay/aplay.c:380
 #, c-format
 msgid "Aborted by signal %s...\n"
 msgstr "Interrompu par le signal %s...\n"
 
-#: aplay/aplay.c:473
+#: aplay/aplay.c:492
 msgid "command should be named either arecord or aplay"
 msgstr "la commande doit être nommée arecord ou aplay"
 
-#: aplay/aplay.c:512
+#: aplay/aplay.c:531
 #, c-format
 msgid "unrecognized file format %s"
 msgstr "format de fichier inconnu %s"
 
-#: aplay/aplay.c:519
+#: aplay/aplay.c:538
 #, c-format
 msgid "value %i for channels is invalid"
 msgstr "la valeur %i pour les canaux est incorrecte"
 
-#: aplay/aplay.c:538
+#: aplay/aplay.c:557
 #, c-format
 msgid "wrong extended format '%s'"
 msgstr "format étendu '%s' erronné"
 
-#: aplay/aplay.c:549
+#: aplay/aplay.c:568
 #, c-format
 msgid "bad speed value %i"
 msgstr "mauvaise valeur de vitesse %i"
 
-#: aplay/aplay.c:644
+#: aplay/aplay.c:666
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Essayez `%s --help' pour plus d'informations.\n"
 
-#: aplay/aplay.c:660
+#: aplay/aplay.c:682
 #, c-format
 msgid "audio open error: %s"
 msgstr "erreur à l'ouverture audio: %s"
 
-#: aplay/aplay.c:665
+#: aplay/aplay.c:687
 #, c-format
 msgid "info error: %s"
 msgstr "erreur info: %s"
 
-#: aplay/aplay.c:672
+#: aplay/aplay.c:694
 #, c-format
 msgid "nonblock setting error: %s"
 msgstr "paramètre de non-blocage erronné: %s"
 
-#: aplay/aplay.c:682 aplay/aplay.c:806 aplay/aplay.c:1174
+#: aplay/aplay.c:704 aplay/aplay.c:828 aplay/aplay.c:1196
 msgid "not enough memory"
 msgstr "pas assez de mémoire"
 
-#: aplay/aplay.c:706
+#: aplay/aplay.c:728
 #, c-format
 msgid "Cannot create process ID file %s: %s"
 msgstr "Le fichier de numéro de processus %s n'a pas pu être créé: %s"
 
-#: aplay/aplay.c:796
+#: aplay/aplay.c:818
 #, c-format
 msgid "read error (called from line %i)"
 msgstr "erreur de lecture (appelé à la ligne %i)"
 
-#: aplay/aplay.c:854
+#: aplay/aplay.c:876
 #, c-format
 msgid "unknown length of 'fmt ' chunk (read %u, should be %u at least)"
 msgstr ""
 "longueur du morceau 'fmt ' inconnue (lu %u, devrait être au moins %u)"
 
-#: aplay/aplay.c:864
+#: aplay/aplay.c:886
 #, c-format
 msgid ""
 "unknown length of extensible 'fmt ' chunk (read %u, should be %u at least)"
@@ -609,43 +564,43 @@
 "longueur du morceau 'fmt ' extensible inconnue (lu %u, devrait être au moins "
 "%u)"
 
-#: aplay/aplay.c:869
+#: aplay/aplay.c:891
 msgid "wrong format tag in extensible 'fmt ' chunk"
 msgstr "libellé de format erronné dans le morceau extensible 'fmt '"
 
-#: aplay/aplay.c:876
+#: aplay/aplay.c:898
 #, c-format
 msgid "can't play WAVE-file format 0x%04x which is not PCM or FLOAT encoded"
 msgstr ""
 "Les formats de ficher WAVE 0x%04x qui ne sont pas encodés en PCM ouFLOAT ne "
 "sont pas supportés"
 
-#: aplay/aplay.c:880
+#: aplay/aplay.c:902
 #, c-format
 msgid "can't play WAVE-files with %d tracks"
 msgstr "Les fichiers WAVE avec %d pistes ne sont pas supportés"
 
-#: aplay/aplay.c:888 aplay/aplay.c:988
+#: aplay/aplay.c:910 aplay/aplay.c:1010
 #, c-format
 msgid "Warning: format is changed to U8\n"
 msgstr "Avertissement: le format est changé en U8\n"
 
-#: aplay/aplay.c:894
+#: aplay/aplay.c:916
 #, c-format
 msgid "Warning: format is changed to S16_LE\n"
 msgstr "Avertissement: le format est changé en S16_LE\n"
 
-#: aplay/aplay.c:902
+#: aplay/aplay.c:924
 #, c-format
 msgid "Warning: format is changed to S24_3LE\n"
 msgstr "Avertissement: le format est changé en S24_3LE\n"
 
-#: aplay/aplay.c:908
+#: aplay/aplay.c:930
 #, c-format
 msgid "Warning: format is changed to S24_LE\n"
 msgstr "Avertissement: le format est changé en S24_LE\n"
 
-#: aplay/aplay.c:912
+#: aplay/aplay.c:934
 #, c-format
 msgid ""
 " can't play WAVE-files with sample %d bits in %d bytes wide (%d channels)"
@@ -653,190 +608,190 @@
 " les fichiers WAVE échantillonés %d bits par %d octets en largeur (%d "
 "canaux)ne sont pas supportés"
 
-#: aplay/aplay.c:924
+#: aplay/aplay.c:946
 #, c-format
 msgid " can't play WAVE-files with sample %d bits wide"
 msgstr ""
 " les fichiers WAVES échantillonés %d bits en largeur ne sont passupportés"
 
-#: aplay/aplay.c:982
+#: aplay/aplay.c:1004
 #, c-format
 msgid "Warning: format is changed to MU_LAW\n"
 msgstr "Avertissement: le format est changé en MU_LAW\n"
 
-#: aplay/aplay.c:994
+#: aplay/aplay.c:1016
 #, c-format
 msgid "Warning: format is changed to S16_BE\n"
 msgstr "Avertissement: le format est changé en S16_BE\n"
 
-#: aplay/aplay.c:1007 aplay/aplay.c:1925 aplay/aplay.c:1932 aplay/aplay.c:2455
-#: aplay/aplay.c:2467
+#: aplay/aplay.c:1029 aplay/aplay.c:1953 aplay/aplay.c:1960 aplay/aplay.c:2483
+#: aplay/aplay.c:2495
 msgid "read error"
 msgstr "erreur de lecture"
 
-#: aplay/aplay.c:1037
+#: aplay/aplay.c:1059
 msgid "Broken configuration for this PCM: no configurations available"
 msgstr "Configuration erronée pour ce périphérique PCM: pas de configuration"
 
-#: aplay/aplay.c:1054
+#: aplay/aplay.c:1076
 msgid "Access type not available"
 msgstr "Ce type d'accès n'est pas disponible"
 
-#: aplay/aplay.c:1059
+#: aplay/aplay.c:1081
 msgid "Sample format non available"
 msgstr "Ce format d'échantillonage n'est pas disponible"
 
-#: aplay/aplay.c:1065
+#: aplay/aplay.c:1087
 msgid "Channels count non available"
 msgstr "Nombre de canaux non disponible"
 
-#: aplay/aplay.c:1080
+#: aplay/aplay.c:1102
 #, c-format
 msgid "Warning: rate is not accurate (requested = %iHz, got = %iHz)\n"
 msgstr ""
 "Avertissement: la fréquence n'est pas précise (demandé = %iHz,\n"
 "obtenu = %iHz)\n"
 
-#: aplay/aplay.c:1086
+#: aplay/aplay.c:1108
 #, c-format
 msgid "         please, try the plug plugin %s\n"
 msgstr "         veuillez essayez le greffon de branchement %s\n"
 
-#: aplay/aplay.c:1123
+#: aplay/aplay.c:1145
 msgid "Unable to install hw params:"
 msgstr "Les paramètres matériel n'ont pas pu être installés:"
 
-#: aplay/aplay.c:1130
+#: aplay/aplay.c:1152
 #, c-format
 msgid "Can't use period equal to buffer size (%lu == %lu)"
 msgstr ""
 "Une période égale à la taille du tampon (%lu == %lu) ne peut êtreutilisée"
 
-#: aplay/aplay.c:1161
+#: aplay/aplay.c:1183
 msgid "unable to install sw params:"
 msgstr "Les paramètres logiciel n'ont pas pu être installés:"
 
-#: aplay/aplay.c:1192
+#: aplay/aplay.c:1214
 #, c-format
 msgid "snd_pcm_mmap_begin problem: %s"
 msgstr ""
 
-#: aplay/aplay.c:1215
+#: aplay/aplay.c:1239
 #, c-format
 msgid "stdin O_NONBLOCK flag setup failed\n"
 msgstr ""
 
-#: aplay/aplay.c:1237
+#: aplay/aplay.c:1263
 #, c-format
 msgid "\rPAUSE command ignored (no hw support)\n"
 msgstr ""
 
-#: aplay/aplay.c:1242
+#: aplay/aplay.c:1268
 #, c-format
 msgid "pause push error: %s"
 msgstr ""
 
-#: aplay/aplay.c:1251
+#: aplay/aplay.c:1277
 #, c-format
 msgid "pause release error: %s"
 msgstr ""
 
-#: aplay/aplay.c:1265
+#: aplay/aplay.c:1293
 #, c-format
 msgid ""
 "\r=== PAUSE ===                                                            "
 msgstr ""
 
-#: aplay/aplay.c:1307
+#: aplay/aplay.c:1335
 #, c-format
 msgid "status error: %s"
 msgstr "erreur d'état: %s"
 
-#: aplay/aplay.c:1317 aplay/aplay.c:1328
+#: aplay/aplay.c:1345 aplay/aplay.c:1356
 #, c-format
 msgid "%s!!! (at least %.3f ms long)\n"
 msgstr "%s!!! (au moins longue de %.3f ms)\n"
 
-#: aplay/aplay.c:1318 aplay/aplay.c:1321 aplay/aplay.c:1329
+#: aplay/aplay.c:1346 aplay/aplay.c:1349 aplay/aplay.c:1357
 msgid "underrun"
 msgstr "perte"
 
-#: aplay/aplay.c:1318 aplay/aplay.c:1329
+#: aplay/aplay.c:1346 aplay/aplay.c:1357
 msgid "overrun"
 msgstr "dépassement"
 
-#: aplay/aplay.c:1333
+#: aplay/aplay.c:1361
 #, c-format
 msgid "Status:\n"
 msgstr "État:\n"
 
-#: aplay/aplay.c:1337
+#: aplay/aplay.c:1365
 #, c-format
 msgid "xrun: prepare error: %s"
 msgstr "xrun: erreur d'instruction : %s"
 
-#: aplay/aplay.c:1343
+#: aplay/aplay.c:1371
 #, c-format
 msgid "Status(DRAINING):\n"
 msgstr "État (DRAINAGE) :\n"
 
-#: aplay/aplay.c:1347
+#: aplay/aplay.c:1375
 #, c-format
 msgid "capture stream format change? attempting recover...\n"
 msgstr ""
 "changement de format de flux de capture? tentative de récupération...\n"
 
-#: aplay/aplay.c:1349
+#: aplay/aplay.c:1377
 #, c-format
 msgid "xrun(DRAINING): prepare error: %s"
 msgstr "xrun (DRAINAGE) : erreur d'instruction : %s"
 
-#: aplay/aplay.c:1356
+#: aplay/aplay.c:1384
 #, c-format
 msgid "Status(R/W):\n"
 msgstr "État (Lecture/Écriture) :\n"
 
-#: aplay/aplay.c:1359
+#: aplay/aplay.c:1387
 #, c-format
 msgid "read/write error, state = %s"
 msgstr "erreur de lecture/écriture, état = %s"
 
-#: aplay/aplay.c:1369
+#: aplay/aplay.c:1397
 #, c-format
 msgid "Suspended. Trying resume. "
 msgstr "Suspendu. Tentative de reprise. "
 
-#: aplay/aplay.c:1374
+#: aplay/aplay.c:1402
 #, c-format
 msgid "Failed. Restarting stream. "
 msgstr "Échec. Redémarrage du flux. "
 
-#: aplay/aplay.c:1376
+#: aplay/aplay.c:1404
 #, c-format
 msgid "suspend: prepare error: %s"
 msgstr "suspension: prepare error: %s"
 
-#: aplay/aplay.c:1381
+#: aplay/aplay.c:1409
 #, c-format
 msgid "Done.\n"
 msgstr "Terminé.\n"
 
-#: aplay/aplay.c:1403
+#: aplay/aplay.c:1431
 #, c-format
 msgid " !clip  "
 msgstr " !clip  "
 
-#: aplay/aplay.c:1550
+#: aplay/aplay.c:1578
 #, c-format
 msgid "Unsupported bit size %d.\n"
 msgstr "%d bit(s) non supporté(s).\n"
 
-#: aplay/aplay.c:1584
+#: aplay/aplay.c:1612
 #, c-format
 msgid "Max peak (%li samples): 0x%08x "
 msgstr "Pic max. (%li échantillons): 0x%08x "
 
-#: aplay/aplay.c:1618
+#: aplay/aplay.c:1646
 #, c-format
 msgid ""
 "Suspicious buffer position (%li total): avail = %li, delay = %li, buffer = "
@@ -845,107 +800,107 @@
 "Position de tampon suspicieuse (total %li): dispo = %li, délai = %li, tampon "
 "= %li\n"
 
-#: aplay/aplay.c:1682
+#: aplay/aplay.c:1710
 #, c-format
 msgid "write error: %s"
 msgstr "erreur en écriture: %s"
 
-#: aplay/aplay.c:1729
+#: aplay/aplay.c:1757
 #, c-format
 msgid "writev error: %s"
 msgstr "erreur de writev: %s"
 
-#: aplay/aplay.c:1773
+#: aplay/aplay.c:1801
 #, c-format
 msgid "read error: %s"
 msgstr "erreur en lecture: %s"
 
-#: aplay/aplay.c:1817
+#: aplay/aplay.c:1845
 #, c-format
 msgid "readv error: %s"
 msgstr "erreur de readv: %s"
 
-#: aplay/aplay.c:1865
+#: aplay/aplay.c:1893
 msgid "can't allocate buffer for silence"
 msgstr "Un tampon pour silence n'a pas pu être alloué"
 
-#: aplay/aplay.c:1874 aplay/aplay.c:2100 aplay/aplay.c:2105 aplay/aplay.c:2152
-#: aplay/aplay.c:2161 aplay/aplay.c:2168 aplay/aplay.c:2178 aplay/aplay.c:2184
-#: aplay/aplay.c:2256 aplay/aplay.c:2286 aplay/aplay.c:2300
+#: aplay/aplay.c:1902 aplay/aplay.c:2128 aplay/aplay.c:2133 aplay/aplay.c:2180
+#: aplay/aplay.c:2189 aplay/aplay.c:2196 aplay/aplay.c:2206 aplay/aplay.c:2212
+#: aplay/aplay.c:2284 aplay/aplay.c:2314 aplay/aplay.c:2328
 msgid "write error"
 msgstr "erreur en écriture"
 
-#: aplay/aplay.c:1887
+#: aplay/aplay.c:1915
 #, c-format
 msgid "voc_pcm_flush - silence error"
 msgstr "voc_pcm_flush - erreur de silence"
 
-#: aplay/aplay.c:1890
+#: aplay/aplay.c:1918
 msgid "voc_pcm_flush error"
 msgstr "erreur voc_pcm_flush"
 
-#: aplay/aplay.c:1916
+#: aplay/aplay.c:1944
 msgid "malloc error"
 msgstr "erreur malloc"
 
-#: aplay/aplay.c:1920
+#: aplay/aplay.c:1948
 #, c-format
 msgid "Playing Creative Labs Channel file '%s'...\n"
 msgstr "Lecture du ficher de canaux Creative Labs '%s'...\n"
 
-#: aplay/aplay.c:1988 aplay/aplay.c:2080
+#: aplay/aplay.c:2016 aplay/aplay.c:2108
 msgid "can't play packed .voc files"
 msgstr "les fichiers .voc de type 'packed' ne sont pas supportés"
 
-#: aplay/aplay.c:2040
+#: aplay/aplay.c:2068
 #, c-format
 msgid "can't play loops; %s isn't seekable\n"
 msgstr "%s n'est pas navigable; les motifs n'ont pas pu être lus\n"
 
-#: aplay/aplay.c:2089
+#: aplay/aplay.c:2117
 #, c-format
 msgid "unknown blocktype %d. terminate."
 msgstr "type de bloc %d inconnu. fin."
 
-#: aplay/aplay.c:2220
+#: aplay/aplay.c:2248
 #, c-format
 msgid "Wave doesn't support %s format..."
 msgstr "Le format wave %s n'est pas supporté..."
 
-#: aplay/aplay.c:2280
+#: aplay/aplay.c:2308
 #, c-format
 msgid "Sparc Audio doesn't support %s format..."
 msgstr "Le format %s Sparc Audio n'est pas supporté..."
 
-#: aplay/aplay.c:2361
+#: aplay/aplay.c:2389
 msgid "Playing"
 msgstr "Lecture"
 
-#: aplay/aplay.c:2361
+#: aplay/aplay.c:2389
 msgid "Recording"
 msgstr "Capture"
 
-#: aplay/aplay.c:2365
+#: aplay/aplay.c:2393
 #, c-format
 msgid "Rate %d Hz, "
 msgstr "Fréquence %d Hz, "
 
-#: aplay/aplay.c:2367
+#: aplay/aplay.c:2395
 #, c-format
 msgid "Mono"
 msgstr "Mono"
 
-#: aplay/aplay.c:2369
+#: aplay/aplay.c:2397
 #, c-format
 msgid "Stereo"
 msgstr "Stéréo"
 
-#: aplay/aplay.c:2371
+#: aplay/aplay.c:2399
 #, c-format
 msgid "Channels %i"
 msgstr "%i Canaux"
 
-#: aplay/aplay.c:2882 aplay/aplay.c:2935
+#: aplay/aplay.c:2910 aplay/aplay.c:2963
 #, c-format
 msgid "You need to specify %d files"
 msgstr "Vous devez spécifier %d fichiers"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/apparmorapplet.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/apparmorapplet.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/apparmorapplet.po	2012-01-02 17:27:23.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/apparmorapplet.po	2012-02-23 06:31:47.000000000 +0000
@@ -12,8 +12,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:36+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:36+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/apparmor-applet.c:244
 msgid ""
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/app-install-data.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/app-install-data.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/app-install-data.po	2012-01-02 17:27:24.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/app-install-data.po	2012-02-23 06:31:47.000000000 +0000
@@ -8,15 +8,15 @@
 msgstr ""
 "Project-Id-Version: app-install-data-ubuntu\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-11-28 20:33+0000\n"
-"PO-Revision-Date: 2011-12-24 11:46+0000\n"
-"Last-Translator: little jo <Unknown>\n"
+"POT-Creation-Date: 2012-01-31 17:33+0000\n"
+"PO-Revision-Date: 2012-02-12 18:54+0000\n"
+"Last-Translator: Olivier FEBWIN <febwin@free.fr>\n"
 "Language-Team: French <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:39+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:38+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../menu-data-additional/7zip.desktop.in.h:1
 msgid "7zip"
@@ -54,31 +54,31 @@
 "plus récentes"
 
 #: ../menu-data-additional/flashplugin-installer.desktop.in.h:1
-msgid "Adobe Flash plugin"
-msgstr "Greffon Adobe Flash"
-
-#: ../menu-data-additional/flashplugin-installer.desktop.in.h:2
 msgid "Installer for the Adobe Flash plugin for Mozilla"
 msgstr "Installateur du greffon Adobe Flash pour Mozilla"
 
+#: ../menu-data-additional/flashplugin-installer.desktop.in.h:2
+msgid "Adobe Flash plugin"
+msgstr "Greffon Adobe Flash"
+
 #: ../menu-data-additional/gnome-utils.desktop.in.h:1
+msgid "GNOME Desktop Utilities"
+msgstr "Utilitaires du bureau Gnome"
+
+#: ../menu-data-additional/gnome-utils.desktop.in.h:2
 msgid "Dictionary, Disk Usage Analyzer, Log File Viewer, Search Tool"
 msgstr ""
 "Dictionnaire, analyseur d'utilisation des disques, afficheur de journaux "
 "système, recherche de fichiers"
 
-#: ../menu-data-additional/gnome-utils.desktop.in.h:2
-msgid "GNOME Desktop Utilities"
-msgstr "Utilitaires du bureau Gnome"
-
 #: ../menu-data-additional/icedtea-plugin.desktop.in.h:1
-msgid "Icedtea Java Browser Plugin"
-msgstr "Greffon Java Icedtea pour le navigateur Web"
-
-#: ../menu-data-additional/icedtea-plugin.desktop.in.h:2
 msgid "Icedtea Java Plugin"
 msgstr "Greffon Java Icedtea"
 
+#: ../menu-data-additional/icedtea-plugin.desktop.in.h:2
+msgid "Icedtea Java Browser Plugin"
+msgstr "Greffon Java Icedtea pour le navigateur Web"
+
 #: ../menu-data-additional/kernelpanic.desktop.in.h:1
 msgid "Kernel Panic"
 msgstr "Kernel Panic"
@@ -156,21 +156,21 @@
 msgstr "Il s'agit d'une collection de Clip Arts libres"
 
 #: ../menu-data-additional/pidgin-otr.desktop.in.h:1
-msgid "Off-the-Record Messaging plugin for pidgin"
-msgstr "Greffon de messagerie « hors micro » pour Pidgin"
-
-#: ../menu-data-additional/pidgin-otr.desktop.in.h:2
 msgid "Pidgin Internet Messenger Off-the-Record Plugin"
 msgstr "Greffon « hors micro » pour la messagerie instantanée Pidgin"
 
-#: ../menu-data-additional/pidgin-plugin-pack.desktop.in.h:1
-msgid "30 useful plugins for pidgin"
-msgstr "30 greffons pratiques pour Pidgin"
+#: ../menu-data-additional/pidgin-otr.desktop.in.h:2
+msgid "Off-the-Record Messaging plugin for pidgin"
+msgstr "Greffon de messagerie « hors micro » pour Pidgin"
 
-#: ../menu-data-additional/pidgin-plugin-pack.desktop.in.h:2
+#: ../menu-data-additional/pidgin-plugin-pack.desktop.in.h:1
 msgid "Pidgin Internet Messenger Plugin Pack"
 msgstr "Pack de greffon pour la messagerie instantanée Pidgin"
 
+#: ../menu-data-additional/pidgin-plugin-pack.desktop.in.h:2
+msgid "30 useful plugins for pidgin"
+msgstr "30 greffons pratiques pour Pidgin"
+
 #: ../menu-data-additional/rar.desktop.in.h:1
 msgid "RAR"
 msgstr "RAR"
@@ -180,22 +180,22 @@
 msgstr "Outil de compression/décompression RAR"
 
 #: ../menu-data-additional/spamassassin.desktop.in.h:1
+msgid "Spamassassin"
+msgstr "Spamassassin"
+
+#: ../menu-data-additional/spamassassin.desktop.in.h:2
 msgid "Spam filter using text analysis (works with Evolution Mail)"
 msgstr ""
 "Filtre anti-spam utilisant l'analyse de texte (fonctionne avec Evolution)"
 
-#: ../menu-data-additional/spamassassin.desktop.in.h:2
-msgid "Spamassassin"
-msgstr "Spamassassin"
-
 #: ../menu-data-additional/totem-plugin-arte.desktop.in.h:1
-msgid "A totem plugin to watch streams from arte.tv"
-msgstr "Un greffon pour Totem permettant de voir les vidéos de arte+7"
-
-#: ../menu-data-additional/totem-plugin-arte.desktop.in.h:2
 msgid "Arte plugin for totem"
 msgstr "Greffon Arte pour Totem"
 
+#: ../menu-data-additional/totem-plugin-arte.desktop.in.h:2
+msgid "A totem plugin to watch streams from arte.tv"
+msgstr "Un greffon pour Totem permettant de voir les vidéos de arte+7"
+
 #: ../menu-data-additional/ubuntu-restricted-extras.desktop.in.h:1
 msgid ""
 "Commonly used applications with restricted copyright (mp3, avi, mpeg, "
@@ -311,16 +311,16 @@
 msgstr "Prise en charge de GPG pour Thunderbird"
 
 #: ../menu-data-xul-extensions/firefox-launchpad-plugin.desktop.in.h:1
+msgid "Firefox Launchpad plugin"
+msgstr "Greffon Launchpad pour Firefox"
+
+#: ../menu-data-xul-extensions/firefox-launchpad-plugin.desktop.in.h:2
 msgid ""
 "Firefox Launchpad integration adds quick search for Launchpad services"
 msgstr ""
 "L'intégration Launchpad pour Firefox ajoute des fonctions de recherche "
 "rapide sur les services Launchpad"
 
-#: ../menu-data-xul-extensions/firefox-launchpad-plugin.desktop.in.h:2
-msgid "Firefox Launchpad plugin"
-msgstr "Greffon Launchpad pour Firefox"
-
 #: ../menu-data-xul-extensions/xul-ext-ubufox.desktop.in.h:1
 msgid "Ubufox extension for Firefox"
 msgstr "Extension Ubufox pour Firefox"
@@ -340,12 +340,20 @@
 msgstr "Jeu d'échecs en 3D"
 
 #: ../menu-data/3depict:3depict.desktop.in.h:1
+msgid "Valued point cloud visualisation and analysis"
+msgstr "Affichage et analyse par valeur de nuages de points en 3D"
+
+#: ../menu-data/3depict:3depict.desktop.in.h:2
 msgid "3depict"
 msgstr "3depict"
 
-#: ../menu-data/3depict:3depict.desktop.in.h:2
-msgid "Valued point cloud visualisation and analysis"
-msgstr "Affichage et analyse par valeur de nuages de points en 3D"
+#: ../menu-data/4digits:4digits.desktop.in.h:1
+msgid "4digits"
+msgstr "4digits"
+
+#: ../menu-data/4digits:4digits.desktop.in.h:2
+msgid "A guess-the-number game, aka Bulls and Cows"
+msgstr "Un jeu pour deviner un nombre, suivant les règles de Bulls & Cows"
 
 #: ../menu-data/7kaa:7kaa.desktop.in.h:1
 msgid "Seven Kingdoms"
@@ -388,21 +396,21 @@
 msgstr "Gérer votre musique"
 
 #: ../menu-data/abuse:abuse.desktop.in.h:1
-msgid "A side-scrolling shoot-em-up action game"
-msgstr "Un jeu de tir en défilement horizontal"
-
-#: ../menu-data/abuse:abuse.desktop.in.h:2
 msgid "Abuse"
 msgstr "Abuse"
 
-#: ../menu-data/accerciser:accerciser.desktop.in.h:1
-msgid "Accerciser Accessibility Explorer"
-msgstr "Explorateur d'accessibilité Accerciser"
+#: ../menu-data/abuse:abuse.desktop.in.h:2
+msgid "A side-scrolling shoot-em-up action game"
+msgstr "Un jeu de tir en défilement horizontal"
 
-#: ../menu-data/accerciser:accerciser.desktop.in.h:2
+#: ../menu-data/accerciser:accerciser.desktop.in.h:1
 msgid "Give your application an accessibility workout"
 msgstr "Soumettre votre application à un test d'accessibilité"
 
+#: ../menu-data/accerciser:accerciser.desktop.in.h:2
+msgid "Accerciser Accessibility Explorer"
+msgstr "Explorateur d'accessibilité Accerciser"
+
 #: ../menu-data/ace-of-penguins:penguin-canfield.desktop.in.h:1
 msgid "Penguin Canfield"
 msgstr "Penguin Canfield"
@@ -517,13 +525,13 @@
 msgstr "Piloter un vaisseau dans un environnement 4d"
 
 #: ../menu-data/adonthell-data:adonthell-data.desktop.in.h:1
-msgid "A 2D graphical RPG"
-msgstr "Un RPG 2D"
-
-#: ../menu-data/adonthell-data:adonthell-data.desktop.in.h:2
 msgid "Waste's Edge"
 msgstr "Waste's Edge"
 
+#: ../menu-data/adonthell-data:adonthell-data.desktop.in.h:2
+msgid "A 2D graphical RPG"
+msgstr "Un RPG 2D"
+
 #: ../menu-data/adun.app:UL.desktop.in.h:1
 msgid "Adun"
 msgstr "Adun"
@@ -533,13 +541,13 @@
 msgstr "Simulateur biomoléculaire"
 
 #: ../menu-data/aee:xae.desktop.in.h:1
-msgid "Small text editor"
-msgstr "Petit éditeur de texte"
-
-#: ../menu-data/aee:xae.desktop.in.h:2
 msgid "xae"
 msgstr "xae"
 
+#: ../menu-data/aee:xae.desktop.in.h:2
+msgid "Small text editor"
+msgstr "Petit éditeur de texte"
+
 #: ../menu-data/aeolus:aeolus.desktop.in.h:1
 msgid "Aeolus"
 msgstr "Aeolus"
@@ -565,13 +573,13 @@
 msgstr "Générer des arrangements de couleurs"
 
 #: ../menu-data/agenda.app:SimpleAgenda.desktop.in.h:1
-msgid "Simple agenda and calendar application for GNUstep"
-msgstr "Application simple d'agenda et de calendrier pour GNUstep"
-
-#: ../menu-data/agenda.app:SimpleAgenda.desktop.in.h:2
 msgid "SimpleAgenda"
 msgstr "SimpleAgenda"
 
+#: ../menu-data/agenda.app:SimpleAgenda.desktop.in.h:2
+msgid "Simple agenda and calendar application for GNUstep"
+msgstr "Application simple d'agenda et de calendrier pour GNUstep"
+
 #: ../menu-data/agtl:advancedcaching.desktop.in.h:1
 msgid "AGTL Geocaching Tool"
 msgstr "Outil AGTL de mise en cache de données géographiques"
@@ -605,21 +613,21 @@
 msgstr "Jouez à plusieurs jeux de solitaire différents"
 
 #: ../menu-data/akregator:kde4__akregator.desktop.in.h:1
-msgid "A KDE News Feed Reader"
-msgstr "Un lecteur de flux RSS d'actualités pour KDE"
-
-#: ../menu-data/akregator:kde4__akregator.desktop.in.h:2
 msgid "Akregator"
 msgstr "Akregator"
 
-#: ../menu-data/alacarte:alacarte.desktop.in.h:1
-msgid "Change which applications are shown on the main menu"
-msgstr "Choisir les applications affichées dans le menu principal"
+#: ../menu-data/akregator:kde4__akregator.desktop.in.h:2
+msgid "A KDE News Feed Reader"
+msgstr "Un lecteur de flux RSS d'actualités pour KDE"
 
-#: ../menu-data/alacarte:alacarte.desktop.in.h:2
+#: ../menu-data/alacarte:alacarte.desktop.in.h:1
 msgid "Main Menu"
 msgstr "Menu principal"
 
+#: ../menu-data/alacarte:alacarte.desktop.in.h:2
+msgid "Change which applications are shown on the main menu"
+msgstr "Choisir les applications affichées dans le menu principal"
+
 #: ../menu-data/alarm-clock-applet:alarm-clock-applet.desktop.in.h:1
 #: ../menu-data/alarm-clock:alarm-clock.desktop.in.h:1
 msgid "Alarm Clock"
@@ -642,14 +650,14 @@
 msgstr "Jeu de plateau à l'ancienne"
 
 #: ../menu-data/alien-arena:alien-arena.desktop.in.h:1
+msgid "Alien Arena"
+msgstr "Alien Arena"
+
+#: ../menu-data/alien-arena:alien-arena.desktop.in.h:2
 msgid "A standalone 3D first person online deathmatch shooter"
 msgstr ""
 "Un jeu 3D multijoueur en ligne de tir subjectif (de type match à mort)"
 
-#: ../menu-data/alien-arena:alien-arena.desktop.in.h:2
-msgid "Alien Arena"
-msgstr "Alien Arena"
-
 #: ../menu-data/aliki:aliki-alsa.desktop.in.h:1
 msgid "Aliki (with ALSA support)"
 msgstr "Aliki (avec prise en charge ALSA)"
@@ -657,7 +665,7 @@
 #: ../menu-data/aliki:aliki-alsa.desktop.in.h:2
 #: ../menu-data/aliki:aliki-jack.desktop.in.h:2
 msgid "Measurement tool for Impulse Responses"
-msgstr ""
+msgstr "Outil de mesure des réponses impulsionnelles"
 
 #: ../menu-data/aliki:aliki-jack.desktop.in.h:1
 msgid "Aliki (with JACK support)"
@@ -711,6 +719,16 @@
 msgid "OpenAL-Soft Configuration Utility"
 msgstr "Utilitaire de configuration d'OpenAL-Soft"
 
+#: ../menu-data/altos:altos.desktop.in.h:1
+msgid "AltOS UI"
+msgstr "Interface AltOS"
+
+#: ../menu-data/altos:altos.desktop.in.h:2
+msgid "View and log downlink data from Altus Metrum products"
+msgstr ""
+"Afficher et enregistrer les données de liaison descendante à partir de "
+"produits Altus Metrum"
+
 #: ../menu-data/amarok:kde4__amarok.desktop.in.h:1
 msgid "Amarok"
 msgstr "Amarok"
@@ -720,21 +738,21 @@
 msgstr "Amarok - Redécouvrez votre musique !"
 
 #: ../menu-data/amide:amide.desktop.in.h:1
-msgid "A Medical Image Data Examiner"
-msgstr "Un outil pour étudier les données d'imagerie médicale"
-
-#: ../menu-data/amide:amide.desktop.in.h:2
 msgid "Amide"
 msgstr "Amide"
 
-#: ../menu-data/amoebax:amoebax.desktop.in.h:1
-msgid "Amoebax"
-msgstr "Amoebax"
+#: ../menu-data/amide:amide.desktop.in.h:2
+msgid "A Medical Image Data Examiner"
+msgstr "Un outil pour étudier les données d'imagerie médicale"
 
-#: ../menu-data/amoebax:amoebax.desktop.in.h:2
+#: ../menu-data/amoebax:amoebax.desktop.in.h:1
 msgid "Defeat your opponent by filling up their grid up with garbage."
 msgstr "Battez votre adversaire en remplissant leur grille avec des déchets."
 
+#: ../menu-data/amoebax:amoebax.desktop.in.h:2
+msgid "Amoebax"
+msgstr "Amoebax"
+
 #: ../menu-data/amor:kde4__amor.desktop.in.h:1
 msgid "AMOR"
 msgstr "AMOR"
@@ -769,37 +787,37 @@
 msgstr "Synthétiseur logiciel modulaire"
 
 #: ../menu-data/amsn:amsn.desktop.in.h:1
-msgid "MSN Messenger for Linux"
-msgstr "MSN Messenger pour Linux"
-
-#: ../menu-data/amsn:amsn.desktop.in.h:2
 msgid "aMSN"
 msgstr "aMSN"
 
-#: ../menu-data/amsynth:amsynth.desktop.in.h:1
-msgid "Two oscillator software synthesizer"
-msgstr "Synthétiseur logiciel à deux oscillateurs"
+#: ../menu-data/amsn:amsn.desktop.in.h:2
+msgid "MSN Messenger for Linux"
+msgstr "MSN Messenger pour Linux"
 
-#: ../menu-data/amsynth:amsynth.desktop.in.h:2
+#: ../menu-data/amsynth:amsynth.desktop.in.h:1
 msgid "amSynth"
 msgstr "amSynth"
 
-#: ../menu-data/amule-utils-gui:amulegui.desktop.in.h:1
-msgid "aMule remote control"
-msgstr "Contrôle à distance d'aMule"
+#: ../menu-data/amsynth:amsynth.desktop.in.h:2
+msgid "Two oscillator software synthesizer"
+msgstr "Synthétiseur logiciel à deux oscillateurs"
 
-#: ../menu-data/amule-utils-gui:amulegui.desktop.in.h:2
+#: ../menu-data/amule-utils-gui:amulegui.desktop.in.h:1
 msgid "aMuleGUI"
 msgstr "aMuleGUI"
 
-#: ../menu-data/amule:amule.desktop.in.h:1
-msgid "A client for the eD2k network"
-msgstr "Un client pour le réseau ed2k"
+#: ../menu-data/amule-utils-gui:amulegui.desktop.in.h:2
+msgid "aMule remote control"
+msgstr "Contrôle à distance d'aMule"
 
-#: ../menu-data/amule:amule.desktop.in.h:2
+#: ../menu-data/amule:amule.desktop.in.h:1
 msgid "aMule"
 msgstr "aMule"
 
+#: ../menu-data/amule:amule.desktop.in.h:2
+msgid "A client for the eD2k network"
+msgstr "Un client pour le réseau ed2k"
+
 #: ../menu-data/anagramarama:anagramarama.desktop.in.h:1
 msgid "Anagramarama"
 msgstr "Anagramarama"
@@ -809,34 +827,34 @@
 msgstr "Jeu d'anagrammes dynamique utilisant SDL"
 
 #: ../menu-data/angband:angband-gtk.desktop.in.h:1
-#: ../menu-data/angband:angband-sdl.desktop.in.h:1
-#: ../menu-data/angband:angband-x11.desktop.in.h:1
+msgid "Angband (GTK)"
+msgstr "Angband (GTK)"
+
+#: ../menu-data/angband:angband-gtk.desktop.in.h:2
+#: ../menu-data/angband:angband-sdl.desktop.in.h:2
+#: ../menu-data/angband:angband-x11.desktop.in.h:2
 msgid ""
 "A roguelike dungeon exploration game based on the books of J.R.R.Tolkien"
 msgstr ""
 "Un jeu d'exploration de donjons de type Rogue, sur la base des livres de "
 "J.R.R. Tolkien"
 
-#: ../menu-data/angband:angband-gtk.desktop.in.h:2
-msgid "Angband (GTK)"
-msgstr "Angband (GTK)"
-
-#: ../menu-data/angband:angband-sdl.desktop.in.h:2
+#: ../menu-data/angband:angband-sdl.desktop.in.h:1
 msgid "Angband (SDL)"
 msgstr "Angband (SDL)"
 
-#: ../menu-data/angband:angband-x11.desktop.in.h:2
+#: ../menu-data/angband:angband-x11.desktop.in.h:1
 msgid "Angband (X11)"
 msgstr "Angband (X11)"
 
 #: ../menu-data/angrydd:angrydd.desktop.in.h:1
-msgid "\"Falling blocks puzzle game\""
-msgstr "Jeu de type Tétris"
-
-#: ../menu-data/angrydd:angrydd.desktop.in.h:2
 msgid "Angry Drunken Dwarves"
 msgstr "Nains mécontents éméchés"
 
+#: ../menu-data/angrydd:angrydd.desktop.in.h:2
+msgid "\"Falling blocks puzzle game\""
+msgstr "Jeu de type Tétris"
+
 #: ../menu-data/anjuta:anjuta.desktop.in.h:1
 msgid "Anjuta IDE"
 msgstr "EDI Anjuta"
@@ -847,21 +865,21 @@
 "Développer des logiciels dans un environnement de développement intégré (EDI)"
 
 #: ../menu-data/anki:anki.desktop.in.h:1
-msgid "An intelligent spaced-repetition memory training program"
-msgstr "Un programme pour exercer sa mémoire"
-
-#: ../menu-data/anki:anki.desktop.in.h:2
 msgid "Anki"
 msgstr "Anki"
 
-#: ../menu-data/apertium-tolk:apertium-tolk.desktop.in.h:1
-msgid "Translate as you type"
-msgstr "Traduire pendant la saisie"
+#: ../menu-data/anki:anki.desktop.in.h:2
+msgid "An intelligent spaced-repetition memory training program"
+msgstr "Un programme pour exercer sa mémoire"
 
-#: ../menu-data/apertium-tolk:apertium-tolk.desktop.in.h:2
+#: ../menu-data/apertium-tolk:apertium-tolk.desktop.in.h:1
 msgid "Translator"
 msgstr "Traducteur"
 
+#: ../menu-data/apertium-tolk:apertium-tolk.desktop.in.h:2
+msgid "Translate as you type"
+msgstr "Traduire pendant la saisie"
+
 #: ../menu-data/apper:kde4__apper.desktop.in.h:1
 msgid "Apper"
 msgstr "Apper"
@@ -875,7 +893,7 @@
 msgstr "Gestionnaire de paquets Aptitude"
 
 #: ../menu-data/aptitude-gtk:aptitude-gtk.desktop.in.h:2
-#: ../menu-data/synaptic:synaptic.desktop.in.h:1
+#: ../menu-data/synaptic:synaptic.desktop.in.h:2
 msgid "Install, remove and upgrade software packages"
 msgstr "Installer, désinstaller et mettre à jour les paquets de logiciels"
 
@@ -892,13 +910,13 @@
 msgstr "AptURL"
 
 #: ../menu-data/apvlv:apvlv.desktop.in.h:1
-msgid "Alf's PDF Viewer Like Vim"
-msgstr "Afficheur de PDF Alf (dans le style de Vim)"
-
-#: ../menu-data/apvlv:apvlv.desktop.in.h:2
 msgid "apvlv"
 msgstr "apvlv"
 
+#: ../menu-data/apvlv:apvlv.desktop.in.h:2
+msgid "Alf's PDF Viewer Like Vim"
+msgstr "Afficheur de PDF Alf (dans le style de Vim)"
+
 #: ../menu-data/aqemu:aqemu.desktop.in.h:1
 msgid "AQEMU"
 msgstr "AQEMU"
@@ -959,13 +977,13 @@
 msgstr "Jeu fantastique en 2D"
 
 #: ../menu-data/ardesia:ardesia.desktop.in.h:1
-msgid "Annotate on the desktop screen."
-msgstr "Ecrire des annotations sur l'écran de votre bureau."
-
-#: ../menu-data/ardesia:ardesia.desktop.in.h:2
 msgid "Ardesia desktop sketchpad "
 msgstr "Ardesia - un programme pour le dessin à l'ecran "
 
+#: ../menu-data/ardesia:ardesia.desktop.in.h:2
+msgid "Annotate on the desktop screen."
+msgstr "Ecrire des annotations sur l'écran de votre bureau."
+
 #: ../menu-data/ardour-i686:ardour.desktop.in.h:1
 #: ../menu-data/ardour:ardour.desktop.in.h:1
 msgid "Ardour Digital Audio Workstation"
@@ -1017,21 +1035,21 @@
 msgstr "Bac à sable pour applications de bureau"
 
 #: ../menu-data/armagetronad:armagetronad.desktop.in.h:1
-msgid "3d light cycle game"
-msgstr "Jeu 3D de type Tron"
-
-#: ../menu-data/armagetronad:armagetronad.desktop.in.h:2
 msgid "Armagetron Advanced"
 msgstr "Armagetron Advanced"
 
+#: ../menu-data/armagetronad:armagetronad.desktop.in.h:2
+msgid "3d light cycle game"
+msgstr "Jeu 3D de type Tron"
+
 #: ../menu-data/arora:arora.desktop.in.h:1
 msgid "Arora"
 msgstr "Arora"
 
 #: ../menu-data/arora:arora.desktop.in.h:2
-#: ../menu-data/dooble:dooble.desktop.in.h:1
-#: ../menu-data/firefox:firefox.desktop.in.h:1
-#: ../menu-data/netsurf-gtk:netsurf-gtk.desktop.in.h:1
+#: ../menu-data/dooble:dooble.desktop.in.h:2
+#: ../menu-data/firefox:firefox.desktop.in.h:2
+#: ../menu-data/netsurf-gtk:netsurf-gtk.desktop.in.h:2
 msgid "Browse the World Wide Web"
 msgstr "Naviguer sur le Web"
 
@@ -1052,21 +1070,21 @@
 msgstr "Défendre vos troupes"
 
 #: ../menu-data/asciijump:asciijump.desktop.in.h:1
-msgid "A clone of the dsj game"
-msgstr "Un clone du jeu dsj"
-
-#: ../menu-data/asciijump:asciijump.desktop.in.h:2
 msgid "asciijump"
 msgstr "asciijump"
 
-#: ../menu-data/asoundconf-gtk:asoundconf-gtk.desktop.in.h:1
-msgid "Allows you to select the default ALSA sound card"
-msgstr "Permet de sélectionner la carte son ALSA par défaut"
+#: ../menu-data/asciijump:asciijump.desktop.in.h:2
+msgid "A clone of the dsj game"
+msgstr "Un clone du jeu dsj"
 
-#: ../menu-data/asoundconf-gtk:asoundconf-gtk.desktop.in.h:2
+#: ../menu-data/asoundconf-gtk:asoundconf-gtk.desktop.in.h:1
 msgid "Default Sound Card"
 msgstr "Carte son par défaut"
 
+#: ../menu-data/asoundconf-gtk:asoundconf-gtk.desktop.in.h:2
+msgid "Allows you to select the default ALSA sound card"
+msgstr "Permet de sélectionner la carte son ALSA par défaut"
+
 #: ../menu-data/assaultcube:assaultcube.desktop.in.h:1
 msgid "AssaultCube"
 msgstr "AssaultCube"
@@ -1084,6 +1102,10 @@
 msgstr "Modifier la détection et l'affichage des types de fichiers"
 
 #: ../menu-data/asunder:asunder.desktop.in.h:1
+msgid "Asunder CD Ripper"
+msgstr "Extracteur de pistes CD audio Asunder"
+
+#: ../menu-data/asunder:asunder.desktop.in.h:2
 msgid ""
 "An application to save tracks from an Audio CD as WAV, MP3, OGG, FLAC, "
 "and/or Wavpack"
@@ -1091,10 +1113,6 @@
 "Une application pour enregistrer les pistes d'un CD audio au format WAV, "
 "MP3, OGG, FLAC, et/ou Wavpack."
 
-#: ../menu-data/asunder:asunder.desktop.in.h:2
-msgid "Asunder CD Ripper"
-msgstr "Extracteur de pistes CD audio Asunder"
-
 #: ../menu-data/asylum:asylum.desktop.in.h:1
 msgid "Asylum"
 msgstr "Asylum"
@@ -1132,14 +1150,15 @@
 msgstr "Attal"
 
 #: ../menu-data/attal:attal.desktop.in.h:2
+#: ../menu-data/triplea:triplea.desktop.in.h:2
 msgid "Turn based strategy game"
 msgstr "Jeu de stratégie tour par tour"
 
-#: ../menu-data/audacious:audacious2.desktop.in.h:1
+#: ../menu-data/audacious:audacious.desktop.in.h:1
 msgid "Audacious"
 msgstr "Audacious"
 
-#: ../menu-data/audacious:audacious2.desktop.in.h:2
+#: ../menu-data/audacious:audacious.desktop.in.h:2
 msgid "Listen to music"
 msgstr "Écouter de la musique"
 
@@ -1184,6 +1203,15 @@
 msgid "AutoKey (QT)"
 msgstr "AutoKey (QT)"
 
+#: ../menu-data/autorenamer:autorenamer.desktop.in.h:1
+msgid "AutoRenamer"
+msgstr "AutoRenamer"
+
+#: ../menu-data/autorenamer:autorenamer.desktop.in.h:2
+msgid "Automatically rename files have them sort in given order"
+msgstr ""
+"Renommer automatiquement des fichiers et les classer dans un ordre donné"
+
 #: ../menu-data/avahi-discover:avahi-discover.desktop.in.h:1
 msgid "Avahi Zeroconf Browser"
 msgstr "Explorateur ZeroConf Avahi"
@@ -1209,13 +1237,13 @@
 msgstr "Explorer les serveurs VNC ayant activé Zeroconf"
 
 #: ../menu-data/avant-window-navigator:avant-window-navigator.desktop.in.h:1
-msgid "A dock-like window navigator."
-msgstr "Une barre des tâches de type « Dock »"
-
-#: ../menu-data/avant-window-navigator:avant-window-navigator.desktop.in.h:2
 msgid "Avant Window Navigator"
 msgstr "Avant Window Navigator"
 
+#: ../menu-data/avant-window-navigator:avant-window-navigator.desktop.in.h:2
+msgid "A dock-like window navigator."
+msgstr "Une barre des tâches de type « Dock »"
+
 #: ../menu-data/avidemux-qt:avidemux-qt.desktop.in.h:1
 msgid "Avidemux (Qt)"
 msgstr "Avidemux (Qt)"
@@ -1230,13 +1258,13 @@
 msgstr "Avidemux (GTK+)"
 
 #: ../menu-data/avogadro:avogadro.desktop.in.h:1
-msgid "Advanced molecular editor"
-msgstr "Éditeur moléculaire avancé"
-
-#: ../menu-data/avogadro:avogadro.desktop.in.h:2
 msgid "Avogadro"
 msgstr "Avogadro"
 
+#: ../menu-data/avogadro:avogadro.desktop.in.h:2
+msgid "Advanced molecular editor"
+msgstr "Éditeur moléculaire avancé"
+
 #: ../menu-data/aweather:aweather.desktop.in.h:1
 msgid "AWeather"
 msgstr "AWeather"
@@ -1262,13 +1290,13 @@
 msgstr "Interface pour Axel - un accélérateur de téléchargements léger"
 
 #: ../menu-data/ayttm:ayttm.desktop.in.h:1
-msgid "\"The GTK Unified Messaging Client\""
-msgstr "Le client de messagerie GTK unifié"
-
-#: ../menu-data/ayttm:ayttm.desktop.in.h:2
 msgid "ayttm"
 msgstr "ayttm"
 
+#: ../menu-data/ayttm:ayttm.desktop.in.h:2
+msgid "\"The GTK Unified Messaging Client\""
+msgstr "Le client de messagerie GTK unifié"
+
 #: ../menu-data/azureus:azureus.desktop.in.h:1
 msgid "Download and share files using the BitTorrent P2P network"
 msgstr "Télécharger et partager des fichiers sur le réseau P2P BitTorrent"
@@ -1278,13 +1306,13 @@
 msgstr "Vuze"
 
 #: ../menu-data/babiloo:babiloo.desktop.in.h:1
-msgid "Application to view dictionaries"
-msgstr "Application pour consulter des dictionnaires"
-
-#: ../menu-data/babiloo:babiloo.desktop.in.h:2
 msgid "Babiloo"
 msgstr "Babiloo"
 
+#: ../menu-data/babiloo:babiloo.desktop.in.h:2
+msgid "Application to view dictionaries"
+msgstr "Application pour consulter des dictionnaires"
+
 #: ../menu-data/backintime-gnome:backintime-gnome.desktop.in.h:1
 #: ../menu-data/backintime-kde:kde4__backintime-kde4.desktop.in.h:1
 msgid "Back In Time"
@@ -1304,20 +1332,28 @@
 msgstr "Jeu de rôle et d'aventure en 3D"
 
 #: ../menu-data/balazarbrothers:balazarbrothers.desktop.in.h:1
-msgid "3D adventure and roleplaying game"
-msgstr "Jeu de rôle et d'aventure en 3D"
-
-#: ../menu-data/balazarbrothers:balazarbrothers.desktop.in.h:2
 msgid "Balazar Brothers"
 msgstr "Balazar Brothers"
 
+#: ../menu-data/balazarbrothers:balazarbrothers.desktop.in.h:2
+msgid "3D adventure and roleplaying game"
+msgstr "Jeu de rôle et d'aventure en 3D"
+
 #: ../menu-data/balder2d:Balder2D.desktop.in.h:1
+msgid "Balder2D"
+msgstr "Balder2D"
+
+#: ../menu-data/balder2d:Balder2D.desktop.in.h:2
 msgid "2D overhead shooter in Zero G"
 msgstr "Jeu 2D de tir en apesanteur"
 
-#: ../menu-data/balder2d:Balder2D.desktop.in.h:2
-msgid "Balder2D"
-msgstr "Balder2D"
+#: ../menu-data/ballview:ballview.desktop.in.h:1
+msgid "BALLView"
+msgstr "BALLView"
+
+#: ../menu-data/ballview:ballview.desktop.in.h:2
+msgid "Molecular modeling and visualization tool"
+msgstr "Outil de modélisation et de visualisation de molécules"
 
 #: ../menu-data/ballz:ballz.desktop.in.h:1
 msgid "B.A.L.L.Z."
@@ -1329,13 +1365,13 @@
 
 #: ../menu-data/balsa:balsa-mailto-handler.desktop.in.h:1
 #: ../menu-data/balsa:balsa.desktop.in.h:1
-msgid "Balsa Mail Client"
-msgstr "Client de messagerie électronique Balsa"
+msgid "E-Mail utility"
+msgstr "Utilitaire de gestion du courriel"
 
 #: ../menu-data/balsa:balsa-mailto-handler.desktop.in.h:2
 #: ../menu-data/balsa:balsa.desktop.in.h:2
-msgid "E-Mail utility"
-msgstr "Utilitaire de gestion du courriel"
+msgid "Balsa Mail Client"
+msgstr "Client de messagerie électronique Balsa"
 
 #: ../menu-data/bangarang:kde4__bangarang.desktop.in.h:1
 msgid "Bangarang"
@@ -1343,7 +1379,7 @@
 
 #: ../menu-data/bangarang:kde4__bangarang.desktop.in.h:2
 #: ../menu-data/kaffeine:kde4__kaffeine.desktop.in.h:2
-#: ../menu-data/kplayer:kde4__kplayer.desktop.in.h:2
+#: ../menu-data/kplayer:kde4__kplayer.desktop.in.h:1
 msgid "Media Player"
 msgstr "Lecteur multimédia Media Player"
 
@@ -1356,20 +1392,28 @@
 msgstr "Lire et d'organiser votre collection de médias"
 
 #: ../menu-data/bareftp:bareftp.desktop.in.h:1
-msgid "Transfer files using the FTP, FTPS or SFTP protocol"
-msgstr "Transférer des fichiers à l'aide des protocoles FTP, FTPS ou SFTP"
-
-#: ../menu-data/bareftp:bareftp.desktop.in.h:2
 msgid "bareFTP"
 msgstr "bareFTP"
 
+#: ../menu-data/bareftp:bareftp.desktop.in.h:2
+msgid "Transfer files using the FTP, FTPS or SFTP protocol"
+msgstr "Transférer des fichiers à l'aide des protocoles FTP, FTPS ou SFTP"
+
 #: ../menu-data/barrage:barrage.desktop.in.h:1
+msgid "Barrage"
+msgstr "Barrage"
+
+#: ../menu-data/barrage:barrage.desktop.in.h:2
 msgid "A rather destructive action game."
 msgstr "Un jeu d'action plutôt destructeur."
 
-#: ../menu-data/barrage:barrage.desktop.in.h:2
-msgid "Barrage"
-msgstr "Barrage"
+#: ../menu-data/basenji:basenji.desktop.in.h:1
+msgid "Basenji"
+msgstr "Basenji"
+
+#: ../menu-data/basenji:basenji.desktop.in.h:2
+msgid "A portable volume indexer."
+msgstr "Un indexeur de volume portable."
 
 #: ../menu-data/basex:basexgui.desktop.in.h:1
 msgid "BaseX XML Database"
@@ -1424,13 +1468,13 @@
 msgstr "Jouer au football avec des tanks"
 
 #: ../menu-data/bauble:bauble.desktop.in.h:1
-msgid "An application for managing botanical collections"
-msgstr "Une application de gestion de collections botaniques"
-
-#: ../menu-data/bauble:bauble.desktop.in.h:2
 msgid "Bauble"
 msgstr "Bauble"
 
+#: ../menu-data/bauble:bauble.desktop.in.h:2
+msgid "An application for managing botanical collections"
+msgstr "Une application de gestion de collections botaniques"
+
 #: ../menu-data/beidgui:beidgui35.desktop.in.h:1
 msgid "Belgian eID"
 msgstr "Belgian eID"
@@ -1440,6 +1484,10 @@
 msgstr "Afficher et d'administrer votre carte eID (belgique)"
 
 #: ../menu-data/beneath-a-steel-sky:beneath-a-steel-sky.desktop.in.h:1
+msgid "Beneath A Steel Sky"
+msgstr "Sous un ciel d'acier"
+
+#: ../menu-data/beneath-a-steel-sky:beneath-a-steel-sky.desktop.in.h:2
 msgid ""
 "A science-fiction adventure game set in a bleak post-apocalyptic vision of "
 "the future"
@@ -1447,10 +1495,6 @@
 "Un jeu de science-fiction proposant une vision sombre d'un avenir post-"
 "apocalyptique"
 
-#: ../menu-data/beneath-a-steel-sky:beneath-a-steel-sky.desktop.in.h:2
-msgid "Beneath A Steel Sky"
-msgstr "Sous un ciel d'acier"
-
 #: ../menu-data/berusky:berusky.desktop.in.h:1
 msgid "Berusky"
 msgstr "Berusky"
@@ -1460,13 +1504,13 @@
 msgstr "Jeu de logique basé sur Sokoban(TM)"
 
 #: ../menu-data/betaradio:betaradio.desktop.in.h:1
-msgid "An easy way to listen to internet radio of Taiwan."
-msgstr "Un moyen facile d'écouter les radios internet de Taiwan."
-
-#: ../menu-data/betaradio:betaradio.desktop.in.h:2
 msgid "BetaRadio Tuner"
 msgstr "Radio internet de Taïwan"
 
+#: ../menu-data/betaradio:betaradio.desktop.in.h:2
+msgid "An easy way to listen to internet radio of Taiwan."
+msgstr "Un moyen facile d'écouter les radios internet de Taiwan."
+
 #: ../menu-data/between:between.desktop.in.h:1
 msgid "Between"
 msgstr "Between"
@@ -1475,22 +1519,38 @@
 msgid "game about consciousness and isolation"
 msgstr "Un jeu sur la conscience et l'isolement"
 
-#: ../menu-data/bibledit:bibledit.desktop.in.h:1
+#: ../menu-data/bibledit-bibletime:bibledit-bibletime.desktop.in.h:1
+msgid "Bibledit-BibleTime"
+msgstr "Bibledit-BibleTime"
+
+#: ../menu-data/bibledit-bibletime:bibledit-bibletime.desktop.in.h:2
+msgid "Bibledit BibleTime Interface"
+msgstr ""
+
+#: ../menu-data/bibledit-gtk:bibledit-gtk.desktop.in.h:1
+msgid "Bibledit-Gtk"
+msgstr "Bibledit-Gtk"
+
+#: ../menu-data/bibledit-gtk:bibledit-gtk.desktop.in.h:2
 msgid "Bible Editor"
 msgstr "Éditeur de Bible"
 
-#: ../menu-data/bibledit:bibledit.desktop.in.h:2
-msgid "Bibledit"
-msgstr "Bibledit"
+#: ../menu-data/bibledit-xiphos:bibledit-xiphos.desktop.in.h:1
+msgid "Bibledit-Xiphos"
+msgstr "Bibledit-Xiphos"
 
-#: ../menu-data/biblememorizer:biblememorizer.desktop.in.h:1
-msgid "A simple KDE Application"
-msgstr "Une application KDE simple"
+#: ../menu-data/bibledit-xiphos:bibledit-xiphos.desktop.in.h:2
+msgid "Bibledit Xiphos Interface"
+msgstr ""
 
-#: ../menu-data/biblememorizer:biblememorizer.desktop.in.h:2
+#: ../menu-data/biblememorizer:biblememorizer.desktop.in.h:1
 msgid "BibleMemorizer"
 msgstr "BibleMemorizer"
 
+#: ../menu-data/biblememorizer:biblememorizer.desktop.in.h:2
+msgid "A simple KDE Application"
+msgstr "Une application KDE simple"
+
 #: ../menu-data/bibletime:bibletime.desktop.in.h:1
 msgid "An easy to use bible study tool"
 msgstr "Un outil d'étude de la bible facile à utiliser"
@@ -1541,20 +1601,12 @@
 msgstr "Jeu de logique coloré avec des modes tactique et arcade."
 
 #: ../menu-data/bino:bino.desktop.in.h:1
-msgid "3D video player"
-msgstr ""
-
-#: ../menu-data/bino:bino.desktop.in.h:2
 msgid "Bino"
 msgstr "Bino"
 
-#: ../menu-data/biococoa.app:BioCocoa.desktop.in.h:1
-msgid "BioCocoa"
-msgstr "BioCocoa"
-
-#: ../menu-data/biococoa.app:BioCocoa.desktop.in.h:2
-msgid "GNUstep BioCocoa"
-msgstr "GNUstep BioCocoa"
+#: ../menu-data/bino:bino.desktop.in.h:2
+msgid "3D video player"
+msgstr "Lecteur vidéo 3D"
 
 #: ../menu-data/biogenesis:biogenesis.desktop.in.h:1
 msgid "Biogenesis"
@@ -1569,13 +1621,13 @@
 "l'évolution des organismes"
 
 #: ../menu-data/bist:bist.desktop.in.h:1
-msgid "Bist stands for bidimensional structures"
-msgstr "Bist signifie « structures bidimensionnelles »"
-
-#: ../menu-data/bist:bist.desktop.in.h:2
 msgid "bist"
 msgstr "bist"
 
+#: ../menu-data/bist:bist.desktop.in.h:2
+msgid "Bist stands for bidimensional structures"
+msgstr "Bist signifie « structures bidimensionnelles »"
+
 #: ../menu-data/bitmeter:bitmeter.desktop.in.h:1
 msgid "Bitmeter"
 msgstr "Bitmeter"
@@ -1593,13 +1645,13 @@
 msgstr "Outil de téléphonie mobile CDMA"
 
 #: ../menu-data/bitstormlite:bitstormlite.desktop.in.h:1
-msgid "A small and fast BitTorrent client"
-msgstr "Un client BitTorrent léger et rapide"
-
-#: ../menu-data/bitstormlite:bitstormlite.desktop.in.h:2
 msgid "BitStormLite"
 msgstr "BitStormLite"
 
+#: ../menu-data/bitstormlite:bitstormlite.desktop.in.h:2
+msgid "A small and fast BitTorrent client"
+msgstr "Un client BitTorrent léger et rapide"
+
 #: ../menu-data/bittornado-gui:bittornado.desktop.in.h:1
 msgid "Bittornado Client"
 msgstr "Bittornado Client"
@@ -1641,13 +1693,13 @@
 msgstr "Libérer de l'espace et effacer ses traces"
 
 #: ../menu-data/blender:blender.desktop.in.h:1
-msgid "3D modeling, animation, rendering and post-production"
-msgstr "Modélisation 3D, animation, rendu et post-production"
-
-#: ../menu-data/blender:blender.desktop.in.h:2
 msgid "Blender"
 msgstr "Blender"
 
+#: ../menu-data/blender:blender.desktop.in.h:2
+msgid "3D modeling, animation, rendering and post-production"
+msgstr "Modélisation 3D, animation, rendu et post-production"
+
 #: ../menu-data/bless:bless.desktop.in.h:1
 msgid "Bless Hex Editor"
 msgstr "Éditeur hexadécimal Bless"
@@ -1657,13 +1709,13 @@
 msgstr "Éditer des fichiers binaires"
 
 #: ../menu-data/blinken:kde4__blinken.desktop.in.h:1
-msgid "A memory enhancement game"
-msgstr "Un jeu pour exercer sa mémoire"
-
-#: ../menu-data/blinken:kde4__blinken.desktop.in.h:2
 msgid "Blinken"
 msgstr "Blinken"
 
+#: ../menu-data/blinken:kde4__blinken.desktop.in.h:2
+msgid "A memory enhancement game"
+msgstr "Un jeu pour exercer sa mémoire"
+
 #: ../menu-data/blobandconquer:blobAndConquer.desktop.in.h:1
 msgid "Blob Wars : Blob And Conquer"
 msgstr "Blob Wars : Blob And Conquer"
@@ -1677,17 +1729,17 @@
 msgstr "Blobby Volley 2"
 
 #: ../menu-data/blobby:blobby.desktop.in.h:2
-msgid "Volley-Ball Game"
+msgid "Volleyball Game"
 msgstr "Jeu de volley-ball"
 
 #: ../menu-data/bloboats:bloboats.desktop.in.h:1
-msgid "An arcade-like boat racing game"
-msgstr "Un jeu de course de bateau de type arcade"
-
-#: ../menu-data/bloboats:bloboats.desktop.in.h:2
 msgid "Bloboats"
 msgstr "Bloboats"
 
+#: ../menu-data/bloboats:bloboats.desktop.in.h:2
+msgid "An arcade-like boat racing game"
+msgstr "Un jeu de course de bateau de type arcade"
+
 #: ../menu-data/blobwars:blobwars.desktop.in.h:1
 msgid "Blob Wars : Metal Blob Solid"
 msgstr "Blob Wars : Metal Blob Solid"
@@ -1721,13 +1773,13 @@
 msgstr "Clone de Tetris Attack dans une ambiance sinistre"
 
 #: ../menu-data/blogilo:kde4__blogilo.desktop.in.h:1
-msgid "A KDE Blogging Client"
-msgstr "Un client de blog pour KDE"
-
-#: ../menu-data/blogilo:kde4__blogilo.desktop.in.h:2
 msgid "Blogilo"
 msgstr "Blogilo"
 
+#: ../menu-data/blogilo:kde4__blogilo.desktop.in.h:2
+msgid "A KDE Blogging Client"
+msgstr "Un client de blog pour KDE"
+
 #: ../menu-data/bluefish:bluefish.desktop.in.h:1
 msgid "Bluefish Editor"
 msgstr "Éditeur Bluefish"
@@ -1737,24 +1789,24 @@
 msgstr "Éditeur pour le développement Web"
 
 #: ../menu-data/blueman:blueman-manager.desktop.in.h:1
-msgid "Blueman Bluetooth Manager"
-msgstr "Gestionnaire Bluetooth Blueman"
-
-#: ../menu-data/blueman:blueman-manager.desktop.in.h:2
 msgid "Bluetooth Manager"
 msgstr "Gestionnaire Bluetooth"
 
+#: ../menu-data/blueman:blueman-manager.desktop.in.h:2
+msgid "Blueman Bluetooth Manager"
+msgstr "Gestionnaire Bluetooth Blueman"
+
 #: ../menu-data/bluemindo:Bluemindo.desktop.in.h:1
+msgid "Bluemindo"
+msgstr "Bluemindo"
+
+#: ../menu-data/bluemindo:Bluemindo.desktop.in.h:2
 msgid ""
 "A really simple but powerful audio player in Python/PyGTK, using Gstreamer."
 msgstr ""
 "Un lecteur audio très simple, mais puissant, écrit en Python/PyGTK et "
 "utilisant Gstreamer."
 
-#: ../menu-data/bluemindo:Bluemindo.desktop.in.h:2
-msgid "Bluemindo"
-msgstr "Bluemindo"
-
 #: ../menu-data/blueproximity:blueproximity.desktop.in.h:1
 msgid "BlueProximity"
 msgstr "BlueProximity"
@@ -1774,13 +1826,13 @@
 "détectés"
 
 #: ../menu-data/bmon:bmon.desktop.in.h:1
-msgid "Bandwidth monitor"
-msgstr "Surveillance de la bande passante"
-
-#: ../menu-data/bmon:bmon.desktop.in.h:2
 msgid "bmon"
 msgstr "bmon"
 
+#: ../menu-data/bmon:bmon.desktop.in.h:2
+msgid "Bandwidth monitor"
+msgstr "Surveillance de la bande passante"
+
 #: ../menu-data/boa-constructor:boa-constructor.desktop.in.h:1
 msgid "Boa Constructor"
 msgstr "Boa Constructor"
@@ -1805,14 +1857,22 @@
 msgid "Configure or monitor a BOINC core client"
 msgstr "Configurer ou surveiller un client BOINC"
 
-#: ../menu-data/bomber:kde4__bomber.desktop.in.h:1
-msgid "Arcade Bombing Game"
-msgstr "Jeu d'arcade de bombardement"
+#: ../menu-data/bokken:bokken.desktop.in.h:1
+msgid "Bokken"
+msgstr "Bokken"
 
-#: ../menu-data/bomber:kde4__bomber.desktop.in.h:2
+#: ../menu-data/bokken:bokken.desktop.in.h:2
+msgid "Reverse engineering suite"
+msgstr ""
+
+#: ../menu-data/bomber:kde4__bomber.desktop.in.h:1
 msgid "Bomber"
 msgstr "Bomber"
 
+#: ../menu-data/bomber:kde4__bomber.desktop.in.h:2
+msgid "Arcade Bombing Game"
+msgstr "Jeu d'arcade de bombardement"
+
 #: ../menu-data/bomberclone:bomberclone.desktop.in.h:1
 msgid "Bomberclone"
 msgstr "Bomberclone"
@@ -1830,13 +1890,13 @@
 msgstr "Logiciel de création de DVD vidéo"
 
 #: ../menu-data/boswars:boswars.desktop.in.h:1
-msgid "Battle for survival"
-msgstr "Bataille pour la survie"
-
-#: ../menu-data/boswars:boswars.desktop.in.h:2
 msgid "Bos Wars"
 msgstr "Bos Wars"
 
+#: ../menu-data/boswars:boswars.desktop.in.h:2
+msgid "Battle for survival"
+msgstr "Bataille pour la survie"
+
 #: ../menu-data/bouml:bouml.desktop.in.h:1
 msgid "BOUML"
 msgstr "BOUML"
@@ -1862,37 +1922,41 @@
 msgstr "Jeu de plateau cinq-en-ligne"
 
 #: ../menu-data/bpython:bpython.desktop.in.h:1
+msgid "bpython"
+msgstr "bpython"
+
+#: ../menu-data/bpython:bpython.desktop.in.h:2
 msgid "A fancy interface to the python interpreter!"
 msgstr "Interface avancée pour l'interpréteur Python"
 
-#: ../menu-data/bpython:bpython.desktop.in.h:2
-msgid "bpython"
-msgstr "bpython"
+#: ../menu-data/braindump:kde4__braindump.desktop.in.h:1
+msgid "Braindump"
+msgstr "Braindump"
 
 #: ../menu-data/brasero:brasero.desktop.in.h:1
-msgid "Brasero Disc Burner"
-msgstr "Gravure de disque Brasero"
-
-#: ../menu-data/brasero:brasero.desktop.in.h:2
 msgid "Create and copy CDs and DVDs"
 msgstr "Créer et copier des CD et des DVD"
 
-#: ../menu-data/brewtarget:brewtarget.desktop.in.h:1
-msgid "Beer calculator"
-msgstr "Un calculateur de bières"
+#: ../menu-data/brasero:brasero.desktop.in.h:2
+msgid "Brasero Disc Burner"
+msgstr "Gravure de disque Brasero"
 
-#: ../menu-data/brewtarget:brewtarget.desktop.in.h:2
+#: ../menu-data/brewtarget:brewtarget.desktop.in.h:1
 msgid "Brewtarget"
 msgstr "Brewtarget"
 
-#: ../menu-data/briquolo:briquolo.desktop.in.h:1
-msgid "An OpenGL breakout"
-msgstr "Un casse-briques OpenGL"
+#: ../menu-data/brewtarget:brewtarget.desktop.in.h:2
+msgid "Beer calculator"
+msgstr "Un calculateur de bières"
 
-#: ../menu-data/briquolo:briquolo.desktop.in.h:2
+#: ../menu-data/briquolo:briquolo.desktop.in.h:1
 msgid "Briquolo"
 msgstr "Briquolo"
 
+#: ../menu-data/briquolo:briquolo.desktop.in.h:2
+msgid "An OpenGL breakout"
+msgstr "Un casse-briques OpenGL"
+
 #: ../menu-data/brp-pacu:brp-pacu.desktop.in.h:1
 msgid "Brp-pacu"
 msgstr "Brp-pacu"
@@ -1910,21 +1974,21 @@
 msgstr "Jeu d'échecs en 3D avec reflets des pièces"
 
 #: ../menu-data/bsnes:bsnes.desktop.in.h:1
-msgid "SNES emulator"
-msgstr "Emulateur SNES"
-
-#: ../menu-data/bsnes:bsnes.desktop.in.h:2
 msgid "bsnes"
 msgstr "bsnes"
 
-#: ../menu-data/bsnes:snespurify.desktop.in.h:1
-msgid "Tool for resolving problems with SNES ROMs"
-msgstr "Outil pour résoudre les problemes avec  les ROMs de SNES"
+#: ../menu-data/bsnes:bsnes.desktop.in.h:2
+msgid "SNES emulator"
+msgstr "Emulateur SNES"
 
-#: ../menu-data/bsnes:snespurify.desktop.in.h:2
+#: ../menu-data/bsnes:snespurify.desktop.in.h:1
 msgid "snespurify"
 msgstr "snespurify"
 
+#: ../menu-data/bsnes:snespurify.desktop.in.h:2
+msgid "Tool for resolving problems with SNES ROMs"
+msgstr "Outil pour résoudre les problemes avec  les ROMs de SNES"
+
 #: ../menu-data/btanks:btanks.desktop.in.h:1
 msgid "Battle Tanks"
 msgstr "Battle Tanks"
@@ -1933,28 +1997,16 @@
 msgid "fast 2D tank arcade game with multiplayer and split-screen modes"
 msgstr "Un jeu de tank 2D rapide avec les modes multi-joueurs et multi-écran"
 
-#: ../menu-data/btnx-config:btnx-config.desktop.in.h:1
-msgid "btnx"
-msgstr "btnx"
-
 #: ../menu-data/bubbros:bubbros.desktop.in.h:1
+msgid "The Bub's Brothers"
+msgstr "The Bub's Brothers"
+
+#: ../menu-data/bubbros:bubbros.desktop.in.h:2
 msgid "Kill evil enemies by catching them into bubbles and smashing those"
 msgstr ""
 "Tuer des ennemis diaboliques en les capturant dans des bulles et en les "
 "faisant éclater."
 
-#: ../menu-data/bubbros:bubbros.desktop.in.h:2
-msgid "The Bub's Brothers"
-msgstr "The Bub's Brothers"
-
-#: ../menu-data/bug-buddy:bug-buddy.desktop.in.h:1
-msgid "Bug Report Tool"
-msgstr "Outil de rapport de bogues"
-
-#: ../menu-data/bug-buddy:bug-buddy.desktop.in.h:2
-msgid "Report a bug in GNOME-based applications"
-msgstr "Signaler une anomalie dans les applications basées sur GNOME"
-
 #: ../menu-data/bugsquish:bugsquish.desktop.in.h:1
 msgid "Bug Squish"
 msgstr "Bug Squish"
@@ -1981,13 +2033,13 @@
 msgstr "Outil graphique permettant de configurer les niveaux d'exécution"
 
 #: ../menu-data/burgerspace:burgerspace.desktop.in.h:1
-msgid "A hamburger-smashing video game"
-msgstr "Un jeu où l'on écrase des hamburgers"
-
-#: ../menu-data/burgerspace:burgerspace.desktop.in.h:2
 msgid "BurgerSpace"
 msgstr "BurgerSpace"
 
+#: ../menu-data/burgerspace:burgerspace.desktop.in.h:2
+msgid "A hamburger-smashing video game"
+msgstr "Un jeu où l'on écrase des hamburgers"
+
 #: ../menu-data/buxon:buxon.desktop.in.h:1
 msgid "Buxon"
 msgstr "Buxon"
@@ -2005,21 +2057,21 @@
 msgstr "Créer et modifier des morceaux au format buzztard"
 
 #: ../menu-data/bygfoot:bygfoot.desktop.in.h:1
-msgid " A soccer manager game"
-msgstr " Un jeu d'entraîneur de football"
-
-#: ../menu-data/bygfoot:bygfoot.desktop.in.h:2
 msgid "bygfoot"
 msgstr "bygfoot"
 
-#: ../menu-data/byobu:byobu.desktop.in.h:1
-msgid "Advanced Command Line and Text Window Manager"
-msgstr "Gestionnaire avancé de fenêtres de texte et de lignes de commandes"
+#: ../menu-data/bygfoot:bygfoot.desktop.in.h:2
+msgid " A soccer manager game"
+msgstr " Un jeu d'entraîneur de football"
 
-#: ../menu-data/byobu:byobu.desktop.in.h:2
+#: ../menu-data/byobu:byobu.desktop.in.h:1
 msgid "Byobu Terminal"
 msgstr "Terminal Byobu"
 
+#: ../menu-data/byobu:byobu.desktop.in.h:2
+msgid "Advanced Command Line and Text Window Manager"
+msgstr "Gestionnaire avancé de fenêtres de texte et de lignes de commandes"
+
 #: ../menu-data/bzflag-data:bzflag.desktop.in.h:1
 msgid "BZFlag"
 msgstr "BZFlag"
@@ -2037,13 +2089,13 @@
 msgstr "Application graphique pour l'utilisation de Bazaar"
 
 #: ../menu-data/bzr-gtk:bzr-handle-patch.desktop.in.h:1
-msgid "Apply Bazaar Bundle"
-msgstr "Appliquer le « bundle » Bazaar"
-
-#: ../menu-data/bzr-gtk:bzr-handle-patch.desktop.in.h:2
 msgid "Bazaar"
 msgstr "Bazaar"
 
+#: ../menu-data/bzr-gtk:bzr-handle-patch.desktop.in.h:2
+msgid "Apply Bazaar Bundle"
+msgstr "Appliquer le « bundle » Bazaar"
+
 #: ../menu-data/cadabra:cadabra.desktop.in.h:1
 msgid "Cadabra"
 msgstr "Cadabra"
@@ -2077,12 +2129,73 @@
 msgstr "GLX-Dock (Cairo-Dock avec OpenGL)"
 
 #: ../menu-data/calibre:calibre.desktop.in.h:1
+msgid "calibre"
+msgstr "calibre"
+
+#: ../menu-data/calibre:calibre.desktop.in.h:2
 msgid "E-book library management"
 msgstr "Gestionnaire de bibliothèque de livres numériques"
 
-#: ../menu-data/calibre:calibre.desktop.in.h:2
-msgid "calibre"
-msgstr "calibre"
+#: ../menu-data/calligra-data:kde4__calligra.desktop.in.h:1
+msgid "Calligra"
+msgstr "Calligra"
+
+#: ../menu-data/calligraactive:calligraactive.desktop.in.h:1
+msgid "Calligra Active"
+msgstr "Calligra Active"
+
+#: ../menu-data/calligraflow:kde4__flow.desktop.in.h:1
+msgid "Calligra Flow"
+msgstr "Calligra Flow"
+
+#: ../menu-data/calligraflow:kde4__flow.desktop.in.h:2
+msgid "Flowchart & Diagram Editing"
+msgstr "Édition de graphes et diagrammes"
+
+#: ../menu-data/calligramobile:hildon__calligramobile.desktop.in.h:1
+msgid "Calligra Mobile"
+msgstr "Calligra Mobile"
+
+#: ../menu-data/calligraplan:kde4__plan.desktop.in.h:1
+msgid "Plan"
+msgstr "Plan"
+
+#: ../menu-data/calligraplan:kde4__plan.desktop.in.h:2
+#: ../menu-data/calligraplan:kde4__planwork.desktop.in.h:2
+#: ../menu-data/kplato:kde4__kplato.desktop.in.h:2
+#: ../menu-data/planner:planner.desktop.in.h:1
+msgid "Project Management"
+msgstr "Gestion de projets"
+
+#: ../menu-data/calligraplan:kde4__planwork.desktop.in.h:1
+msgid "Plan WorkPackage Handler"
+msgstr ""
+
+#: ../menu-data/calligrastage:kde4__stage.desktop.in.h:1
+msgid "Calligra Stage"
+msgstr "Calligra Stage"
+
+#: ../menu-data/calligrastage:kde4__stage.desktop.in.h:2
+#: ../menu-data/kpresenter:kde4__kpresenter.desktop.in.h:2
+msgid "Write presentation documents"
+msgstr "Créer des présentations en diapositives (PréAO)"
+
+#: ../menu-data/calligratables:kde4__tables.desktop.in.h:1
+msgid "Calligra Tables"
+msgstr "Calligra Tables"
+
+#: ../menu-data/calligratables:kde4__tables.desktop.in.h:2
+#: ../menu-data/kspread:kde4__kspread.desktop.in.h:2
+msgid "Write spreadsheet documents"
+msgstr "Créer des feuilles de calcul (tableur)"
+
+#: ../menu-data/calligrawords:kde4__words.desktop.in.h:1
+msgid "Calligra Words"
+msgstr "Calligra Words"
+
+#: ../menu-data/calligrawords:kde4__words.desktop.in.h:2
+msgid "Write documents"
+msgstr "Ecrire des documents"
 
 #: ../menu-data/cameleon:cameleon.desktop.in.h:1
 msgid "Cameleon"
@@ -2113,15 +2226,15 @@
 msgstr "Voir, modifier et enregistrer des images issues d'une webcam"
 
 #: ../menu-data/canorus:canorus.desktop.in.h:1
+msgid "Canorus"
+msgstr "Canorus"
+
+#: ../menu-data/canorus:canorus.desktop.in.h:2
 msgid "A free next-generation cross-platform music score editor!"
 msgstr ""
 "Un éditeur de partitions musicales multiplateforme de nouvelle génération "
 "libre !"
 
-#: ../menu-data/canorus:canorus.desktop.in.h:2
-msgid "Canorus"
-msgstr "Canorus"
-
 #: ../menu-data/cantor:kde4__cantor.desktop.in.h:1
 msgid "Cantor"
 msgstr "Cantor"
@@ -2131,13 +2244,13 @@
 msgstr "Une application KDE pour les logiciels de Mathématiques"
 
 #: ../menu-data/caret:caret.desktop.in.h:1
-msgid "Caret"
-msgstr "Caret"
-
-#: ../menu-data/caret:caret.desktop.in.h:2
 msgid "Cortical Surface Reconstruction and Visualization"
 msgstr "Reconstruction et visualisation de la surface du cortex"
 
+#: ../menu-data/caret:caret.desktop.in.h:2
+msgid "Caret"
+msgstr "Caret"
+
 #: ../menu-data/caribou:caribou.desktop.in.h:1
 msgid "Caribou"
 msgstr "Caribou"
@@ -2155,13 +2268,13 @@
 msgstr "Géométrie interactive CaRMetal"
 
 #: ../menu-data/catdoc:wordview.desktop.in.h:1
-msgid "Microsoft doc document file viewer"
-msgstr "Visionneuse de documents Microsoft doc"
-
-#: ../menu-data/catdoc:wordview.desktop.in.h:2
 msgid "Wordview Microsoft doc Viewer"
 msgstr "Wordview - Visionneuse de documents Microsoft doc"
 
+#: ../menu-data/catdoc:wordview.desktop.in.h:2
+msgid "Microsoft doc document file viewer"
+msgstr "Visionneuse de documents Microsoft doc"
+
 #: ../menu-data/catfish:catfish.desktop.in.h:1
 msgid "Catfish"
 msgstr "Catfish"
@@ -2179,14 +2292,14 @@
 msgstr "cb2Bib"
 
 #: ../menu-data/cbrpager:cbrpager.desktop.in.h:1
-#: ../menu-data/comix:comix.desktop.in.h:1
-msgid "A viewer for comic book archives"
-msgstr "Une visionneuse pour les archives de bandes dessinées"
-
-#: ../menu-data/cbrpager:cbrpager.desktop.in.h:2
 msgid "Cbrpager"
 msgstr "Cbrpager"
 
+#: ../menu-data/cbrpager:cbrpager.desktop.in.h:2
+#: ../menu-data/comix:comix.desktop.in.h:2
+msgid "A viewer for comic book archives"
+msgstr "Une visionneuse pour les archives de bandes dessinées"
+
 #: ../menu-data/cdcat:cdcat.desktop.in.h:1
 msgid "CdCat"
 msgstr "CdCat"
@@ -2255,13 +2368,13 @@
 msgstr "Jouer au Go contre des humains ou des ordinateurs"
 
 #: ../menu-data/charmap.app:Charmap.desktop.in.h:1
-msgid "Character map for GNUstep"
-msgstr "Table de caractères pour GNUstep"
-
-#: ../menu-data/charmap.app:Charmap.desktop.in.h:2
 msgid "Charmap"
 msgstr "Charmap"
 
+#: ../menu-data/charmap.app:Charmap.desktop.in.h:2
+msgid "Character map for GNUstep"
+msgstr "Table de caractères pour GNUstep"
+
 #: ../menu-data/checkbox-gtk:checkbox-gtk.desktop.in.h:1
 msgid "System Testing"
 msgstr "Test du système"
@@ -2276,7 +2389,7 @@
 msgstr "CheckGMail"
 
 #: ../menu-data/checkgmail:checkgmail.desktop.in.h:2
-#: ../menu-data/gnome-gmail-notifier:gnome-gmail-notifier.desktop.in.h:2
+#: ../menu-data/gnome-gmail-notifier:gnome-gmail-notifier.desktop.in.h:1
 msgid "Gmail Notifier"
 msgstr "Notification de courriels pour Gmail"
 
@@ -2298,6 +2411,14 @@
 msgid "Draw and make calculations on chemical structures"
 msgstr "Représenter et calculer des structures chimiques"
 
+#: ../menu-data/cherrytree:cherrytree.desktop.in.h:1
+msgid "CherryTree"
+msgstr "CherryTree"
+
+#: ../menu-data/cherrytree:cherrytree.desktop.in.h:2
+msgid "Hierarchical Note Taking"
+msgstr "Prise de Notes hierarchisées"
+
 #: ../menu-data/childsplay:childsplay.desktop.in.h:1
 msgid "Childsplay"
 msgstr "Jeux Childsplay"
@@ -2312,7 +2433,7 @@
 
 #: ../menu-data/chirp:chirp.desktop.in.h:2
 msgid "CHIRP Radio Programming Tool"
-msgstr ""
+msgstr "Outil de Programmation de Radio CHIRP"
 
 #: ../menu-data/chmsee:chmsee.desktop.in.h:1
 msgid "ChmSee"
@@ -2345,8 +2466,8 @@
 msgstr "Choqok"
 
 #: ../menu-data/choqok:kde4__choqok.desktop.in.h:2
-msgid "KDE Micro-blogging Client"
-msgstr "Client KDE de micro-blogging"
+msgid "Micro-blogging Client"
+msgstr "Client de micro-blogage"
 
 #: ../menu-data/chromium-bsu:chromium-bsu.desktop.in.h:1
 msgid "Chromium B.S.U."
@@ -2367,28 +2488,28 @@
 "les ballons."
 
 #: ../menu-data/clam-chordata:Chordata.desktop.in.h:1
-msgid "Analize chords (Chordata)"
-msgstr "Analyse des accords (Chordata)"
-
-#: ../menu-data/clam-chordata:Chordata.desktop.in.h:2
 msgid "CLAM Chordata"
-msgstr ""
+msgstr "CLAM Chordata"
 
-#: ../menu-data/clam-chordata:Chordata.desktop.in.h:3
+#: ../menu-data/clam-chordata:Chordata.desktop.in.h:2
 msgid "MP3/OGG/Wav songs chord analyser"
 msgstr "Analyseur d'accords de chansons aux formats MP3/OGG/Wav"
 
+#: ../menu-data/clam-chordata:Chordata.desktop.in.h:3
+msgid "Analize chords (Chordata)"
+msgstr "Analyse des accords (Chordata)"
+
 #: ../menu-data/clam-networkeditor:NetworkEditor.desktop.in.h:1
+msgid "CLAM Network Editor"
+msgstr "Éditeur réseau Clam"
+
+#: ../menu-data/clam-networkeditor:NetworkEditor.desktop.in.h:2
 msgid ""
 "An audio tool to build processing networks by connecting functional boxes"
 msgstr ""
 "Un outil audio pour construire des réseaux de traitement en connectant des "
 "boites fonctionnelles"
 
-#: ../menu-data/clam-networkeditor:NetworkEditor.desktop.in.h:2
-msgid "CLAM Network Editor"
-msgstr "Éditeur réseau Clam"
-
 #: ../menu-data/clam-networkeditor:NetworkEditor.desktop.in.h:3
 msgid "Edit (NetworkEditor)"
 msgstr ""
@@ -2398,13 +2519,13 @@
 msgstr "Prototypeur CLAM"
 
 #: ../menu-data/clam-networkeditor:Prototyper.desktop.in.h:2
-msgid "Run with Prototyper"
-msgstr ""
-
-#: ../menu-data/clam-networkeditor:Prototyper.desktop.in.h:3
 msgid "Runs an audio processing core under a QT designer interface"
 msgstr "Exécute un noyau de traitement audio avec une interface Qt Designer"
 
+#: ../menu-data/clam-networkeditor:Prototyper.desktop.in.h:3
+msgid "Run with Prototyper"
+msgstr "Lancer avec Prototyper"
+
 #: ../menu-data/clamtk:clamtk.desktop.in.h:1
 msgid "ClamTk"
 msgstr "ClamTk"
@@ -2442,7 +2563,7 @@
 msgstr "Cliplt"
 
 #: ../menu-data/clipit:clipit.desktop.in.h:2
-#: ../menu-data/parcellite:parcellite.desktop.in.h:1
+#: ../menu-data/parcellite:parcellite.desktop.in.h:2
 msgid "Clipboard Manager"
 msgstr "Gestionnaire de presse-papiers"
 
@@ -2475,14 +2596,14 @@
 "Contrôler plusieurs sessions ssh ou rsh depuis une unique fenêtre de saisie"
 
 #: ../menu-data/code-aster-gui:code-aster-gui.desktop.in.h:1
+msgid "code-aster-gui"
+msgstr "code-aster-gui"
+
+#: ../menu-data/code-aster-gui:code-aster-gui.desktop.in.h:2
 #: ../menu-data/eficas:eficas.desktop.in.h:2
 msgid "Graphical command editor for Code_Aster."
 msgstr "Éditeur de commandes en mode graphique pour Code_Aster"
 
-#: ../menu-data/code-aster-gui:code-aster-gui.desktop.in.h:2
-msgid "code-aster-gui"
-msgstr "code-aster-gui"
-
 #: ../menu-data/codeblocks:codeblocks.desktop.in.h:1
 msgid "Code::Blocks IDE"
 msgstr "IDE Code::Blocks (Interface de développement intégré)"
@@ -2501,28 +2622,24 @@
 
 #: ../menu-data/codfis:codfis.desktop.in.h:2
 msgid "Computes Italian Fiscal codes"
-msgstr ""
+msgstr "Permet le traitement des codes fiscaux italiens"
 
 #: ../menu-data/colorcode:colorcode.desktop.in.h:1
-msgid "Advanced clone of the MasterMind code-breaking game"
-msgstr "Clone évolué du jeu de réflexion MasterMind"
-
-#: ../menu-data/colorcode:colorcode.desktop.in.h:2
 msgid "ColorCode"
 msgstr "ColorCode"
 
+#: ../menu-data/colorcode:colorcode.desktop.in.h:2
+msgid "Advanced clone of the MasterMind code-breaking game"
+msgstr "Clone évolué du jeu de réflexion MasterMind"
+
 #: ../menu-data/colorname:colorname.desktop.in.h:1
 msgid "colorname"
 msgstr "nom de couleur"
 
-#: ../menu-data/comix:comix.desktop.in.h:2
+#: ../menu-data/comix:comix.desktop.in.h:1
 msgid "Comix"
 msgstr "Comix"
 
-#: ../menu-data/compiz-core:compiz.desktop.in.h:1
-msgid "Compiz"
-msgstr "Compiz"
-
 #: ../menu-data/compizconfig-settings-manager:ccsm.desktop.in.h:1
 msgid "CompizConfig Settings Manager"
 msgstr "Gestionnaire des paramètres CompizConfig"
@@ -2531,23 +2648,23 @@
 msgid "Configure Compiz with CompizConfig"
 msgstr "Configurer Compiz avec CompizConfig"
 
-#: ../menu-data/composite-data:composite.desktop.in.h:1
+#: ../menu-data/composite:composite.desktop.in.h:1
 msgid "Composite"
 msgstr "Composite"
 
-#: ../menu-data/composite-data:composite.desktop.in.h:2
-msgid "Live performance sequencer, sampler, looper"
-msgstr "Séquenceur, échantillonneur et boucleur (looper) pour concerts"
+#: ../menu-data/composite:composite.desktop.in.h:2
+msgid "Live performance sequencer"
+msgstr ""
 
 #: ../menu-data/computer-janitor-gtk:computer-janitor-gtk.desktop.in.h:1
+msgid "Computer Janitor"
+msgstr "Nettoyage du système"
+
+#: ../menu-data/computer-janitor-gtk:computer-janitor-gtk.desktop.in.h:2
 msgid "Clean up a system so it's more like a freshly installed one"
 msgstr ""
 "Nettoyer un système pour le retrouver comme au lendemain de son installation"
 
-#: ../menu-data/computer-janitor-gtk:computer-janitor-gtk.desktop.in.h:2
-msgid "Computer Janitor"
-msgstr "Nettoyage du système"
-
 #: ../menu-data/conduit:conduit.desktop.in.h:1
 msgid "Conduit Synchronizer"
 msgstr "Outil de synchronisation Conduit"
@@ -2562,7 +2679,7 @@
 
 #: ../menu-data/confclerk:confclerk.desktop.in.h:2
 msgid "Offline conference schedule application"
-msgstr ""
+msgstr "Application de planification de congrès et conférences"
 
 #: ../menu-data/configure-debian:configure-debian.desktop.in.h:1
 msgid "Configure-Debian"
@@ -2589,15 +2706,16 @@
 msgstr "Connectagram"
 
 #: ../menu-data/contacts:contacts.desktop.in.h:1
-msgid "Address book"
-msgstr "Carnet d'adresses"
-
-#: ../menu-data/contacts:contacts.desktop.in.h:2
 #: ../menu-data/gnome-contacts:gnome-contacts.desktop.in.h:1
-#: ../menu-data/thunderbird:thunderbird.desktop.in.h:2
+#: ../menu-data/kaddressbook-mobile:kde4__kaddressbook-mobile.desktop.in.h:1
+#: ../menu-data/thunderbird:thunderbird.desktop.in.h:4
 msgid "Contacts"
 msgstr "Contacts"
 
+#: ../menu-data/contacts:contacts.desktop.in.h:2
+msgid "Address book"
+msgstr "Carnet d'adresses"
+
 #: ../menu-data/controlaula:controlaula.desktop.in.h:1
 msgid " Classrooom control"
 msgstr " Contrôle de salle de classe"
@@ -2608,13 +2726,13 @@
 "Outil pour le professeur pour contrôler une salle de classe informatique"
 
 #: ../menu-data/convertall:convertall.desktop.in.h:1
-msgid "Convert between many different units"
-msgstr "Effectuer des conversions entre diverses unités"
-
-#: ../menu-data/convertall:convertall.desktop.in.h:2
 msgid "ConvertAll"
 msgstr "ConvertAll"
 
+#: ../menu-data/convertall:convertall.desktop.in.h:2
+msgid "Convert between many different units"
+msgstr "Effectuer des conversions entre diverses unités"
+
 #: ../menu-data/coqide:coqide.desktop.in.h:1
 msgid "CoqIDE Proof Assistant"
 msgstr "Assistant de démonstrations CoqIDE"
@@ -2632,21 +2750,21 @@
 msgstr "Gérer vos fonds d'écran"
 
 #: ../menu-data/cowbell:cowbell.desktop.in.h:1
-msgid "An elegant music organizer"
-msgstr "Un gestionnaire de musique élégant"
-
-#: ../menu-data/cowbell:cowbell.desktop.in.h:2
 msgid "Cowbell Music Organizer"
 msgstr "Gestionnaire de musique Cowbell"
 
-#: ../menu-data/cqrlog:cqrlog.desktop.in.h:1
-msgid "Advanced logging program for hamradio operators"
-msgstr "Programme d'enregistrement avancé pour les opérateurs radioamateurs"
+#: ../menu-data/cowbell:cowbell.desktop.in.h:2
+msgid "An elegant music organizer"
+msgstr "Un gestionnaire de musique élégant"
 
-#: ../menu-data/cqrlog:cqrlog.desktop.in.h:2
+#: ../menu-data/cqrlog:cqrlog.desktop.in.h:1
 msgid "CQRLOG"
 msgstr "CQRLOG"
 
+#: ../menu-data/cqrlog:cqrlog.desktop.in.h:2
+msgid "Advanced logging program for hamradio operators"
+msgstr "Programme d'enregistrement avancé pour les opérateurs radioamateurs"
+
 #: ../menu-data/crack-attack:crack-attack.desktop.in.h:1
 msgid "Crack Attack"
 msgstr "Crack Attack"
@@ -2678,35 +2796,35 @@
 "artificielle"
 
 #: ../menu-data/crossfire-client:crossfire-client.desktop.in.h:1
-msgid "Client for Crossfire, a multiplayer graphical RPG and adventure game"
-msgstr "Client pour Crossfire, un jeu d'aventure RPG multijoueur graphique"
-
-#: ../menu-data/crossfire-client:crossfire-client.desktop.in.h:2
 msgid "Crossfire GTK Client V2"
 msgstr "Client GTK Crossfire (V2)"
 
+#: ../menu-data/crossfire-client:crossfire-client.desktop.in.h:2
+msgid "Client for Crossfire, a multiplayer graphical RPG and adventure game"
+msgstr "Client pour Crossfire, un jeu d'aventure RPG multijoueur graphique"
+
 #: ../menu-data/cryptkeeper:cryptkeeper.desktop.in.h:1
 msgid "Cryptkeeper"
 msgstr "Cryptkeeper"
 
 #: ../menu-data/csmash:csmash.desktop.in.h:1
-msgid "3D tabletennis game"
-msgstr "Jeu de tennis de table en 3D"
-
-#: ../menu-data/csmash:csmash.desktop.in.h:2
 msgid "Cannon Smash"
 msgstr "Cannon Smash"
 
-#: ../menu-data/cssed:cssed.desktop.in.h:1
-msgid "Css and Web Development Editor"
-msgstr "Éditeur pour les CSS et le développement Web"
+#: ../menu-data/csmash:csmash.desktop.in.h:2
+msgid "3D tabletennis game"
+msgstr "Jeu de tennis de table en 3D"
 
-#: ../menu-data/cssed:cssed.desktop.in.h:2
+#: ../menu-data/cssed:cssed.desktop.in.h:1
 msgid "Cssed Editor"
 msgstr "Éditeur Cssed"
 
-#: ../menu-data/ctsim:ctsim.desktop.in.h:1
-msgid "CTSim Computed Tomography Simulator"
+#: ../menu-data/cssed:cssed.desktop.in.h:2
+msgid "Css and Web Development Editor"
+msgstr "Éditeur pour les CSS et le développement Web"
+
+#: ../menu-data/ctsim:ctsim.desktop.in.h:1
+msgid "CTSim Computed Tomography Simulator"
 msgstr "Simulateur de calculs pour tomographies CTSim"
 
 #: ../menu-data/ctsim:ctsim.desktop.in.h:2
@@ -2737,14 +2855,18 @@
 msgid "Serial Terminal"
 msgstr "Terminal sur port série"
 
-#: ../menu-data/cynthiune.app:Cynthiune.desktop.in.h:1
-msgid "A free and romantic music player"
-msgstr "Un logiciel libre et romantique d'écoute de musique"
+#: ../menu-data/cycle:cycle.desktop.in.h:1
+msgid "Cycle"
+msgstr "Cycle"
 
-#: ../menu-data/cynthiune.app:Cynthiune.desktop.in.h:2
+#: ../menu-data/cynthiune.app:Cynthiune.desktop.in.h:1
 msgid "Cynthiune"
 msgstr "Cynthiune"
 
+#: ../menu-data/cynthiune.app:Cynthiune.desktop.in.h:2
+msgid "A free and romantic music player"
+msgstr "Un logiciel libre et romantique d'écoute de musique"
+
 #: ../menu-data/cytadela:cytadela.desktop.in.h:1
 msgid "Cytadela"
 msgstr "Cytadela"
@@ -2778,13 +2900,13 @@
 msgstr "Répéteur D-RATS"
 
 #: ../menu-data/daemonfs:daemonfs.desktop.in.h:1
-msgid "DaemonFS"
-msgstr "DaemonFS"
-
-#: ../menu-data/daemonfs:daemonfs.desktop.in.h:2
 msgid "Real time monitoring software"
 msgstr "Logiciel de surveillance en temps réel"
 
+#: ../menu-data/daemonfs:daemonfs.desktop.in.h:2
+msgid "DaemonFS"
+msgstr "DaemonFS"
+
 #: ../menu-data/daisy-player:daisy-player.desktop.in.h:1
 msgid "Daisy player"
 msgstr "Lecteur de livre Daisy"
@@ -2802,13 +2924,13 @@
 msgstr "Convertisseur d'images au format RAW"
 
 #: ../menu-data/darktable:darktable.desktop.in.h:1
-msgid "Darktable Photo Workflow Software"
+msgid "Organize and develop images from digital cameras"
 msgstr ""
+"Organiser et développer des images à partir d'appareils photos numériques"
 
 #: ../menu-data/darktable:darktable.desktop.in.h:2
-msgid "Organize and develop images from digital cameras"
+msgid "Darktable Photo Workflow Software"
 msgstr ""
-"Organiser et développer des images à partir d'appareils photos numériques"
 
 #: ../menu-data/dasher:dasher.desktop.in.h:1
 msgid "Dasher"
@@ -2829,22 +2951,22 @@
 msgstr "Vos rendez-vous"
 
 #: ../menu-data/dc-qt:dc-qt.desktop.in.h:1
-msgid "GUI for Direct Connect Protocol"
-msgstr "Interface utilisateur pour le protocole Direct Connect"
-
-#: ../menu-data/dc-qt:dc-qt.desktop.in.h:2
 msgid "dc-qt"
 msgstr "dc-qt"
 
+#: ../menu-data/dc-qt:dc-qt.desktop.in.h:2
+msgid "GUI for Direct Connect Protocol"
+msgstr "Interface utilisateur pour le protocole Direct Connect"
+
 #: ../menu-data/dconf-tools:dconf-editor.desktop.in.h:1
+msgid "dconf Editor"
+msgstr "Éditeur dconf"
+
+#: ../menu-data/dconf-tools:dconf-editor.desktop.in.h:2
 #: ../menu-data/gconf-editor:gconf-editor.desktop.in.h:2
 msgid "Directly edit your entire configuration database"
 msgstr "Éditer directement toute votre base de données de configuration"
 
-#: ../menu-data/dconf-tools:dconf-editor.desktop.in.h:2
-msgid "dconf Editor"
-msgstr "Éditeur dconf"
-
 #: ../menu-data/ddd:ddd.desktop.in.h:1
 msgid "Data Display Debugger"
 msgstr "Interface graphique de débogage"
@@ -2878,13 +3000,13 @@
 msgstr "Guide de référence Debian"
 
 #: ../menu-data/decibel-audio-player:decibel-audio-player.desktop.in.h:1
-msgid "A simple audio player"
-msgstr "Un lecteur audio simple"
-
-#: ../menu-data/decibel-audio-player:decibel-audio-player.desktop.in.h:2
 msgid "Decibel Audio Player"
 msgstr "Lecteur audio Decibel"
 
+#: ../menu-data/decibel-audio-player:decibel-audio-player.desktop.in.h:2
+msgid "A simple audio player"
+msgstr "Un lecteur audio simple"
+
 #: ../menu-data/defendguin:defendguin.desktop.in.h:1
 msgid "Defendguin"
 msgstr "Defendguin"
@@ -2894,18 +3016,18 @@
 msgstr "Sauver les Pingouins"
 
 #: ../menu-data/deja-dup:deja-dup-ccpanel.desktop.in.h:1
-msgid "Back Up Now"
-msgstr "Sauvegarder maintenant"
-
-#: ../menu-data/deja-dup:deja-dup-ccpanel.desktop.in.h:2
 #: ../menu-data/deja-dup:deja-dup.desktop.in.h:1
 msgid "Backup"
 msgstr "Sauvegarder"
 
-#: ../menu-data/deja-dup:deja-dup-ccpanel.desktop.in.h:3
+#: ../menu-data/deja-dup:deja-dup-ccpanel.desktop.in.h:2
 msgid "Change your backup settings"
 msgstr "Modifiez votre configuration de sauvegarde"
 
+#: ../menu-data/deja-dup:deja-dup-ccpanel.desktop.in.h:3
+msgid "Back Up Now"
+msgstr "Sauvegarder maintenant"
+
 #: ../menu-data/dell-recovery:dell-recovery-media.desktop.in.h:1
 msgid "Dell Recovery"
 msgstr "Dell Recovery"
@@ -2916,20 +3038,20 @@
 
 #: ../menu-data/deluge-gtk:deluge.desktop.in.h:2
 #: ../menu-data/qbittorrent:qBittorrent.desktop.in.h:1
-#: ../menu-data/transmission-gtk:transmission-gtk.desktop.in.h:1
-#: ../menu-data/transmission-qt:transmission-qt.desktop.in.h:1
+#: ../menu-data/transmission-gtk:transmission-gtk.desktop.in.h:2
+#: ../menu-data/transmission-qt:transmission-qt.desktop.in.h:2
 msgid "Download and share files over BitTorrent"
 msgstr "Permet de télécharger et partager des fichiers via BitTorrent"
 
 #: ../menu-data/denemo:denemo.desktop.in.h:1
-#: ../menu-data/nted:nted.desktop.in.h:1
-msgid "Edit musical scores"
-msgstr "Édition de partitions musicales"
-
-#: ../menu-data/denemo:denemo.desktop.in.h:2
 msgid "GNU Denemo"
 msgstr "GNU Denemo"
 
+#: ../menu-data/denemo:denemo.desktop.in.h:2
+#: ../menu-data/nted:nted.desktop.in.h:2
+msgid "Edit musical scores"
+msgstr "Édition de partitions musicales"
+
 #: ../menu-data/deskscribe:deskscribe.desktop.in.h:1
 msgid "DeskScribe"
 msgstr "DeskScribe"
@@ -2939,12 +3061,17 @@
 msgstr "Outil de journalisation de l'activité des utilisateurs"
 
 #: ../menu-data/desktop-webmail:desktop-webmail.desktop.in.h:1
+msgid "Desktop Webmail"
+msgstr "Webmail intégré au bureau"
+
+#: ../menu-data/desktop-webmail:desktop-webmail.desktop.in.h:2
 msgid "Compose email in browser"
 msgstr "Écrire des courriels dans le navigateur"
 
-#: ../menu-data/desktop-webmail:desktop-webmail.desktop.in.h:2
-msgid "Desktop Webmail"
-msgstr "Webmail intégré au bureau"
+#: ../menu-data/desktop-webmail:desktop-webmail.desktop.in.h:3
+#: ../menu-data/thunderbird:thunderbird.desktop.in.h:3
+msgid "Compose New Message"
+msgstr "Rédiger un nouveau message"
 
 #: ../menu-data/desktopcouch-tools:desktopcouch-pair.desktop.in.h:1
 msgid "CouchDB Pairing Tool"
@@ -2955,21 +3082,21 @@
 msgstr "Utilitaire d'appariement bureau CouchDB"
 
 #: ../menu-data/desktopnova-tray:desktopnova-tray.desktop.in.h:1
-msgid "A Tray-Icon for DesktopNova"
-msgstr "Une icône de la zone de notifications pour Desktopnova"
-
-#: ../menu-data/desktopnova-tray:desktopnova-tray.desktop.in.h:2
 msgid "DesktopNova-Tray"
 msgstr "DesktopNova-Tray"
 
-#: ../menu-data/desktopnova:desktopnova.desktop.in.h:1
-msgid "Changes your background image automatically"
-msgstr "Changer le papier-peint automatiquement"
+#: ../menu-data/desktopnova-tray:desktopnova-tray.desktop.in.h:2
+msgid "A Tray-Icon for DesktopNova"
+msgstr "Une icône de la zone de notifications pour Desktopnova"
 
-#: ../menu-data/desktopnova:desktopnova.desktop.in.h:2
+#: ../menu-data/desktopnova:desktopnova.desktop.in.h:1
 msgid "DesktopNova"
 msgstr "DesktopNova"
 
+#: ../menu-data/desktopnova:desktopnova.desktop.in.h:2
+msgid "Changes your background image automatically"
+msgstr "Changer le papier-peint automatiquement"
+
 #: ../menu-data/desmume:desmume.desktop.in.h:1
 msgid "DeSmuME (Gtk)"
 msgstr "DeSmuME (Gtk)"
@@ -2979,27 +3106,27 @@
 msgstr "Émulateur Nintento DS"
 
 #: ../menu-data/devede:devede.desktop.in.h:1
+msgid "DeVeDe DVD/CD Video Creator"
+msgstr "Créateur de DVD/CD vidéo DeVeDe"
+
+#: ../menu-data/devede:devede.desktop.in.h:2
 msgid ""
 "Allows to create video CDs and DVDs, suitable to be reproduced in home DVD "
 "players"
 msgstr ""
 "Permet de créer des CD/DVD vidéos, compatibles avec les lecteurs de salon"
 
-#: ../menu-data/devede:devede.desktop.in.h:2
-msgid "DeVeDe DVD/CD Video Creator"
-msgstr "Créateur de DVD/CD vidéo DeVeDe"
-
 #: ../menu-data/devhelp:devhelp.desktop.in.h:1
-msgid "Developer's Help program"
-msgstr "Programme d'aide pour les développeurs"
-
-#: ../menu-data/devhelp:devhelp.desktop.in.h:2
 msgid "Devhelp"
 msgstr "Devhelp"
 
+#: ../menu-data/devhelp:devhelp.desktop.in.h:2
+msgid "Developer's Help program"
+msgstr "Programme d'aide pour les développeurs"
+
 #: ../menu-data/dff:dff.desktop.in.h:1
 msgid "DFF"
-msgstr ""
+msgstr "DFF"
 
 #: ../menu-data/dff:dff.desktop.in.h:2
 msgid "Digital Forensics Framework"
@@ -3013,11 +3140,11 @@
 msgid "Desktop Flickr Organizer for Gnome"
 msgstr "Gérer vos photos Flickr depuis votre bureau Gnome"
 
-#: ../menu-data/dia-common:dia-common.desktop.in.h:1
-msgid "Dia Diagram Editor"
-msgstr "Éditeur de diagrammes Dia"
+#: ../menu-data/dia-common:dia.desktop.in.h:1
+msgid "Dia"
+msgstr "Dia"
 
-#: ../menu-data/dia-common:dia-common.desktop.in.h:2
+#: ../menu-data/dia-common:dia.desktop.in.h:2
 msgid "Edit your Diagrams"
 msgstr "Créer et modifier vos diagrammes"
 
@@ -3030,21 +3157,21 @@
 msgstr "Plateforme de recherche dans la thérapie des radiations"
 
 #: ../menu-data/dictionaryreader.app:DictionaryReader.desktop.in.h:1
-msgid "A Dict client for GNUstep"
-msgstr "Un client de dictionnaires pour GNUstep"
-
-#: ../menu-data/dictionaryreader.app:DictionaryReader.desktop.in.h:2
 msgid "Dictionary Reader"
 msgstr "Dictionary Reader"
 
-#: ../menu-data/diffpdf:diffpdf.desktop.in.h:1
-msgid "Compare two PDF files"
-msgstr "Compare deux fichiers PDF"
+#: ../menu-data/dictionaryreader.app:DictionaryReader.desktop.in.h:2
+msgid "A Dict client for GNUstep"
+msgstr "Un client de dictionnaires pour GNUstep"
 
-#: ../menu-data/diffpdf:diffpdf.desktop.in.h:2
+#: ../menu-data/diffpdf:diffpdf.desktop.in.h:1
 msgid "DiffPDF"
 msgstr "DiffPDF"
 
+#: ../menu-data/diffpdf:diffpdf.desktop.in.h:2
+msgid "Compare two PDF files"
+msgstr "Compare deux fichiers PDF"
+
 #: ../menu-data/diffuse:diffuse.desktop.in.h:1
 msgid "Diffuse Merge Tool"
 msgstr "Diffuse Merge Tool (outil de comparaison et de fusion de fichiers)"
@@ -3054,16 +3181,16 @@
 msgstr "Outil graphique pour fusionner et comparer les fichiers textes"
 
 #: ../menu-data/digikam:kde4__digikam.desktop.in.h:1
-#: ../menu-data/showfoto:kde4__showfoto.desktop.in.h:1
+msgid "digiKam"
+msgstr "DigiKam"
+
+#: ../menu-data/digikam:kde4__digikam.desktop.in.h:2
+#: ../menu-data/showfoto:kde4__showfoto.desktop.in.h:2
 msgid ""
 "Manage your photographs like a professional with the power of open source"
 msgstr ""
 "Gérer vos photographies comme un professionnel avec la puissance du libre"
 
-#: ../menu-data/digikam:kde4__digikam.desktop.in.h:2
-msgid "digiKam"
-msgstr "DigiKam"
-
 #: ../menu-data/digikam:kde4__panoramagui.desktop.in.h:1
 msgid "A tool to assemble images as a panorama"
 msgstr "Un outil pour assembler des images en panorama"
@@ -3080,6 +3207,14 @@
 msgid "Lightweight browser"
 msgstr "Navigateur Web léger"
 
+#: ../menu-data/dino:dino.desktop.in.h:1
+msgid "Dino"
+msgstr "Dino"
+
+#: ../menu-data/dino:dino.desktop.in.h:2
+msgid "Integrated MIDI piano roll editor and sequencer engine"
+msgstr ""
+
 #: ../menu-data/djplay:djplay.desktop.in.h:1
 msgid "DJPlay"
 msgstr "DJPlay"
@@ -3097,21 +3232,21 @@
 msgstr "Afficheur DjVU"
 
 #: ../menu-data/djvusmooth:djvusmooth.desktop.in.h:1
-msgid "Graphical editor for DjVu"
-msgstr "Éditeur graphique pour DjVu"
-
-#: ../menu-data/djvusmooth:djvusmooth.desktop.in.h:2
 msgid "djvusmooth"
 msgstr "djvusmooth"
 
-#: ../menu-data/dkopp:dkopp.desktop.in.h:1
-msgid "Full and incremental backup to DVD with verify"
-msgstr "Sauvegarde complète et incrémentale sur DVD, avec vérification"
+#: ../menu-data/djvusmooth:djvusmooth.desktop.in.h:2
+msgid "Graphical editor for DjVu"
+msgstr "Éditeur graphique pour DjVu"
 
-#: ../menu-data/dkopp:dkopp.desktop.in.h:2
+#: ../menu-data/dkopp:dkopp.desktop.in.h:1
 msgid "dkopp"
 msgstr "dkopp"
 
+#: ../menu-data/dkopp:dkopp.desktop.in.h:2
+msgid "Full and incremental backup to DVD with verify"
+msgstr "Sauvegarde complète et incrémentale sur DVD, avec vérification"
+
 #: ../menu-data/dlume:dlume.desktop.in.h:1
 msgid "Dlume"
 msgstr "Dlume"
@@ -3129,20 +3264,12 @@
 msgstr "Importez des fichiers média dans la bibliothèque dmedia"
 
 #: ../menu-data/docbook2odf:docbook2odf.desktop.in.h:1
-msgid "Convert to OpenDocument"
-msgstr "Convertir du format Docbook vers le format OpenDocument"
-
-#: ../menu-data/docbook2odf:docbook2odf.desktop.in.h:2
 msgid "docbook2odf"
 msgstr "docbook2odf"
 
-#: ../menu-data/dockbarx:dbx_preference.desktop.in.h:1
-msgid "DockbarX Preference"
-msgstr "Préférences de DockbarX"
-
-#: ../menu-data/dockbarx:dbx_preference.desktop.in.h:2
-msgid "Preference dialog for DockbarX"
-msgstr "Fenêtre de préférences pour DockbarX"
+#: ../menu-data/docbook2odf:docbook2odf.desktop.in.h:2
+msgid "Convert to OpenDocument"
+msgstr "Convertir du format Docbook vers le format OpenDocument"
 
 #: ../menu-data/docky:docky.desktop.in.h:1
 msgid "Docky"
@@ -3165,12 +3292,12 @@
 msgstr "Dolphin"
 
 #: ../menu-data/dolphin:kde4__dolphin.desktop.in.h:2
-#: ../menu-data/exo-utils:exo-file-manager.desktop.in.h:2
-#: ../menu-data/pcmanfm:pcmanfm.desktop.in.h:2
+#: ../menu-data/exo-utils:exo-file-manager.desktop.in.h:1
+#: ../menu-data/pcmanfm:pcmanfm.desktop.in.h:1
 msgid "File Manager"
 msgstr "Gestionnaire de fichiers"
 
-#: ../menu-data/dooble:dooble.desktop.in.h:2
+#: ../menu-data/dooble:dooble.desktop.in.h:1
 msgid "Dooble"
 msgstr "Dooble"
 
@@ -3211,7 +3338,7 @@
 msgstr "Dragon Player"
 
 #: ../menu-data/dragonplayer:kde4__dragonplayer.desktop.in.h:2
-#: ../menu-data/xine-ui:xine.desktop.in.h:1
+#: ../menu-data/xine-ui:xine.desktop.in.h:2
 msgid "Video Player"
 msgstr "Lecteur vidéo"
 
@@ -3232,13 +3359,13 @@
 msgstr "Un jeu d'échec en 3D"
 
 #: ../menu-data/dreampie:dreampie.desktop.in.h:1
-msgid "An interactive Python shell"
-msgstr "Un interpréteur de commandes Pyhon interactif"
-
-#: ../menu-data/dreampie:dreampie.desktop.in.h:2
 msgid "DreamPie"
 msgstr "DreamPie"
 
+#: ../menu-data/dreampie:dreampie.desktop.in.h:2
+msgid "An interactive Python shell"
+msgstr "Un interpréteur de commandes Pyhon interactif"
+
 #: ../menu-data/drgeo:drgeo.desktop.in.h:1
 msgid "Dr.Geo"
 msgstr "Dr.Geo"
@@ -3300,38 +3427,38 @@
 "le contrôle de version distribué (par défaut avec Git)"
 
 #: ../menu-data/dvd95:dvd95.desktop.in.h:1
-msgid "Convert a DVD9 into a DVD5"
-msgstr "Convertir un DVD9 en DVD5"
-
-#: ../menu-data/dvd95:dvd95.desktop.in.h:2
 msgid "Dvd95 Converter"
 msgstr "Convertisseur Dvd95"
 
+#: ../menu-data/dvd95:dvd95.desktop.in.h:2
+msgid "Convert a DVD9 into a DVD5"
+msgstr "Convertir un DVD9 en DVD5"
+
 #: ../menu-data/dvdisaster:dvdisaster.desktop.in.h:1
+msgid "dvdisaster"
+msgstr "dvdisaster"
+
+#: ../menu-data/dvdisaster:dvdisaster.desktop.in.h:2
 msgid "Additional error protection for CD/DVD media"
 msgstr ""
 "Protection supplémentaire contre les erreurs de lecture sur les médias CD/DVD"
 
-#: ../menu-data/dvdisaster:dvdisaster.desktop.in.h:2
-msgid "dvdisaster"
-msgstr "dvdisaster"
-
 #: ../menu-data/dvdrip-queue:dvdrip-queue.desktop.in.h:1
-msgid "Queue dvd::rip projects"
-msgstr "File d'attente des projets dvd::rip"
-
-#: ../menu-data/dvdrip-queue:dvdrip-queue.desktop.in.h:2
 msgid "dvd::rip queue"
 msgstr "File d'attente dvd::rip"
 
-#: ../menu-data/dvdrip:dvdrip.desktop.in.h:1
-msgid "Rip DVDs"
-msgstr "Extraction des pistes de DVD"
+#: ../menu-data/dvdrip-queue:dvdrip-queue.desktop.in.h:2
+msgid "Queue dvd::rip projects"
+msgstr "File d'attente des projets dvd::rip"
 
-#: ../menu-data/dvdrip:dvdrip.desktop.in.h:2
+#: ../menu-data/dvdrip:dvdrip.desktop.in.h:1
 msgid "dvd::rip"
 msgstr "dvd::rip"
 
+#: ../menu-data/dvdrip:dvdrip.desktop.in.h:2
+msgid "Rip DVDs"
+msgstr "Extraction des pistes de DVD"
+
 #: ../menu-data/dvdstyler-data:dvdstyler.desktop.in.h:1
 msgid "DVD Styler"
 msgstr "DVD Styler"
@@ -3377,45 +3504,45 @@
 msgstr "Application Earcandy"
 
 #: ../menu-data/earth3d:kde__earth3d.desktop.in.h:1
-msgid "earth3d"
-msgstr "earth3d"
-
-#: ../menu-data/earth3d:kde__earth3d.desktop.in.h:2
 msgid "earth3d - 3D Model of the earth"
 msgstr "earth3d - modélisation 3D de la terre"
 
-#: ../menu-data/easychem:easychem.desktop.in.h:1
-msgid "Create high-quality chemical formulas"
-msgstr "Créer des formules chimiques de haute qualité"
+#: ../menu-data/earth3d:kde__earth3d.desktop.in.h:2
+msgid "earth3d"
+msgstr "earth3d"
 
-#: ../menu-data/easychem:easychem.desktop.in.h:2
+#: ../menu-data/easychem:easychem.desktop.in.h:1
 msgid "EasyChem Chemical Structures Editor"
 msgstr "Éditeur de structures chimiques EasyChem"
 
-#: ../menu-data/easydiff.app:EasyDiff.desktop.in.h:1
-msgid "A graphical GNUstep diff utility"
-msgstr "Utilitaire graphique de visualisation de diff pour GNUstep"
+#: ../menu-data/easychem:easychem.desktop.in.h:2
+msgid "Create high-quality chemical formulas"
+msgstr "Créer des formules chimiques de haute qualité"
 
-#: ../menu-data/easydiff.app:EasyDiff.desktop.in.h:2
+#: ../menu-data/easydiff.app:EasyDiff.desktop.in.h:1
 msgid "EasyDiff"
 msgstr "EasyDiff"
 
-#: ../menu-data/easymp3gain-gtk:easymp3gain.desktop.in.h:1
-msgid "A GUI for mp3gain, vorbisgain and aacgain"
-msgstr "Une interface graphique pour mp3gain, vorbisgain et aacgain"
+#: ../menu-data/easydiff.app:EasyDiff.desktop.in.h:2
+msgid "A graphical GNUstep diff utility"
+msgstr "Utilitaire graphique de visualisation de diff pour GNUstep"
 
-#: ../menu-data/easymp3gain-gtk:easymp3gain.desktop.in.h:2
+#: ../menu-data/easymp3gain-gtk:easymp3gain.desktop.in.h:1
 msgid "easyMP3Gain"
 msgstr "easyMP3Gain"
 
-#: ../menu-data/easystroke:easystroke.desktop.in.h:1
-msgid "Control your desktop using mouse gestures"
-msgstr "Contrôler votre bureau par des mouvements de la souris"
+#: ../menu-data/easymp3gain-gtk:easymp3gain.desktop.in.h:2
+msgid "A GUI for mp3gain, vorbisgain and aacgain"
+msgstr "Une interface graphique pour mp3gain, vorbisgain et aacgain"
 
-#: ../menu-data/easystroke:easystroke.desktop.in.h:2
+#: ../menu-data/easystroke:easystroke.desktop.in.h:1
 msgid "Easystroke Gesture Recognition"
 msgstr "Reconnaissance de mouvements Easystroke"
 
+#: ../menu-data/easystroke:easystroke.desktop.in.h:2
+msgid "Control your desktop using mouse gestures"
+msgstr "Contrôler votre bureau par des mouvements de la souris"
+
 #: ../menu-data/easytag:easytag.desktop.in.h:1
 msgid "EasyTAG Audio File Tag Viewer/Editor"
 msgstr "Lecteur/Editeur d'informations de fichiers audio EasyTAG"
@@ -3430,20 +3557,12 @@
 "GTK+"
 
 #: ../menu-data/eboard:eboard.desktop.in.h:1
-msgid "A graphical chessboard program"
-msgstr "Application graphique de jeu d'échecs"
-
-#: ../menu-data/eboard:eboard.desktop.in.h:2
 msgid "eboard"
 msgstr "Eboard"
 
-#: ../menu-data/ebook-speaker:eBook-speaker.desktop.in.h:1
-msgid "Speaking e-reader"
-msgstr "Lecteur d'eBook parlant"
-
-#: ../menu-data/ebook-speaker:eBook-speaker.desktop.in.h:2
-msgid "eBook speaker"
-msgstr "Lecteur vocal d'eBook"
+#: ../menu-data/eboard:eboard.desktop.in.h:2
+msgid "A graphical chessboard program"
+msgstr "Application graphique de jeu d'échecs"
 
 #: ../menu-data/ebumeter:ebumeter.desktop.in.h:1
 msgid "Ebumeter"
@@ -3470,25 +3589,25 @@
 msgstr "Environnement de développement intégré (EDI) Eclipse"
 
 #: ../menu-data/edenmath.app:EdenMath.desktop.in.h:1
-msgid "A Scientific Calculator"
-msgstr "Calculatrice scientifique"
-
-#: ../menu-data/edenmath.app:EdenMath.desktop.in.h:2
 msgid "EdenMath"
 msgstr "EdenMath"
 
+#: ../menu-data/edenmath.app:EdenMath.desktop.in.h:2
+msgid "A Scientific Calculator"
+msgstr "Calculatrice scientifique"
+
 #: ../menu-data/edubuntu-menueditor:menueditor.desktop.in.h:1
 msgid "Edubuntu menu editor"
 msgstr "Éditeur de menu pour Edubuntu"
 
 #: ../menu-data/eekboek-gui:ebwxshell.desktop.in.h:1
-msgid "Bookkeeping program for small to medium sized companies"
-msgstr "Logiciel de comptabilité pour petites et moyennes entreprises"
-
-#: ../menu-data/eekboek-gui:ebwxshell.desktop.in.h:2
 msgid "EekBoek"
 msgstr "Comptabilité EekBoek"
 
+#: ../menu-data/eekboek-gui:ebwxshell.desktop.in.h:2
+msgid "Bookkeeping program for small to medium sized companies"
+msgstr "Logiciel de comptabilité pour petites et moyennes entreprises"
+
 #: ../menu-data/efax-gtk:efax-gtk.desktop.in.h:1
 msgid "Efax-gtk"
 msgstr "Efax-gtk"
@@ -3502,21 +3621,21 @@
 msgstr "Eficas"
 
 #: ../menu-data/efte:efte.desktop.in.h:1
-msgid "Fast, extendable programmers' text editor"
-msgstr "Éditeur de texte rapide et extensible pour programmeurs"
-
-#: ../menu-data/efte:efte.desktop.in.h:2
 msgid "eFTE"
 msgstr "eFTE"
 
-#: ../menu-data/egoboo:egoboo.desktop.in.h:1
-msgid "3D dungeon crawling game"
-msgstr "Jeu de rôle de type donjon en 3D"
+#: ../menu-data/efte:efte.desktop.in.h:2
+msgid "Fast, extendable programmers' text editor"
+msgstr "Éditeur de texte rapide et extensible pour programmeurs"
 
-#: ../menu-data/egoboo:egoboo.desktop.in.h:2
+#: ../menu-data/egoboo:egoboo.desktop.in.h:1
 msgid "Egoboo"
 msgstr "Egoboo"
 
+#: ../menu-data/egoboo:egoboo.desktop.in.h:2
+msgid "3D dungeon crawling game"
+msgstr "Jeu de rôle de type donjon en 3D"
+
 #: ../menu-data/eiciel:eiciel.desktop.in.h:1
 msgid "Eiciel"
 msgstr "Eiciel"
@@ -3529,13 +3648,13 @@
 "fichiers et répertoires"
 
 #: ../menu-data/einstein:einstein.desktop.in.h:1
-msgid "\"Puzzle game inspired on Einstein's puzzle\""
-msgstr "« Jeu d'énigme inspiré de l'énigme d'Einstein »"
-
-#: ../menu-data/einstein:einstein.desktop.in.h:2
 msgid "Einstein"
 msgstr "Einstein"
 
+#: ../menu-data/einstein:einstein.desktop.in.h:2
+msgid "\"Puzzle game inspired on Einstein's puzzle\""
+msgstr "« Jeu d'énigme inspiré de l'énigme d'Einstein »"
+
 #: ../menu-data/eiskaltdcpp-gtk:eiskaltdcpp-gtk.desktop.in.h:1
 msgid "EiskaltDC++ Gtk"
 msgstr "EiskaltDC++ Gtk"
@@ -3558,22 +3677,30 @@
 msgstr "Voir et parler avec des gens via Internet"
 
 #: ../menu-data/electric:electric.desktop.in.h:1
-msgid "Electrical CAD System"
-msgstr "Système de CAO pour l'électricité"
-
-#: ../menu-data/electric:electric.desktop.in.h:2
 msgid "electric"
 msgstr "electric"
 
+#: ../menu-data/electric:electric.desktop.in.h:2
+msgid "Electrical CAD System"
+msgstr "Système de CAO pour l'électricité"
+
 #: ../menu-data/elinks-lite:elinks.desktop.in.h:1
 #: ../menu-data/elinks:elinks.desktop.in.h:1
-msgid "Browse the web in text mode"
-msgstr "Naviguer sur le Web en mode texte"
+msgid "ELinks Web Browser"
+msgstr "Navigateur Web ELinks"
 
 #: ../menu-data/elinks-lite:elinks.desktop.in.h:2
 #: ../menu-data/elinks:elinks.desktop.in.h:2
-msgid "ELinks Web Browser"
-msgstr "Navigateur Web ELinks"
+msgid "Browse the web in text mode"
+msgstr "Naviguer sur le Web en mode texte"
+
+#: ../menu-data/elki:elki.desktop.in.h:1
+msgid "ELKI"
+msgstr "ELKI"
+
+#: ../menu-data/elki:elki.desktop.in.h:2
+msgid "Data mining algorithm development framework"
+msgstr "Environnement de développement d'algorithmes de data mining"
 
 #: ../menu-data/elmer:ElmerGUI.desktop.in.h:1
 msgid "Elmer"
@@ -3609,46 +3736,46 @@
 "Lancer le navigateur par défaut sur le site Web local de l'explorateur EMBOSS"
 
 #: ../menu-data/emelfm2:emelfm2.desktop.in.h:1
-msgid "2-pane Gtk+2 file manager"
-msgstr "Gestionnaire de fichiers à deux volets sous Gtk+2"
-
-#: ../menu-data/emelfm2:emelfm2.desktop.in.h:2
 msgid "emelFM2"
 msgstr "emelFM2"
 
-#: ../menu-data/emerillon:emerillon.desktop.in.h:1
-msgid "Browse maps"
-msgstr "Explorer des cartes"
+#: ../menu-data/emelfm2:emelfm2.desktop.in.h:2
+msgid "2-pane Gtk+2 file manager"
+msgstr "Gestionnaire de fichiers à deux volets sous Gtk+2"
 
-#: ../menu-data/emerillon:emerillon.desktop.in.h:2
+#: ../menu-data/emerillon:emerillon.desktop.in.h:1
 msgid "Emerillon Map Viewer"
 msgstr "Afficheur de cartes Emerillon"
 
-#: ../menu-data/emesene:emesene.desktop.in.h:1
-msgid "Instant messaging client for MSN, Gtalk and Facebook"
-msgstr "Client de messagerie instantanée pour MSN, Gtalk et Facebook"
+#: ../menu-data/emerillon:emerillon.desktop.in.h:2
+msgid "Browse maps"
+msgstr "Explorer des cartes"
 
-#: ../menu-data/emesene:emesene.desktop.in.h:2
+#: ../menu-data/emesene:emesene.desktop.in.h:1
 msgid "emesene"
 msgstr "emesene"
 
-#: ../menu-data/emma:emma.desktop.in.h:1
-msgid "MySQL managing assistant"
-msgstr "Assistant de gestion MySQL"
+#: ../menu-data/emesene:emesene.desktop.in.h:2
+msgid "Instant messaging client for MSN, Gtalk and Facebook"
+msgstr "Client de messagerie instantanée pour MSN, Gtalk et Facebook"
 
-#: ../menu-data/emma:emma.desktop.in.h:2
+#: ../menu-data/emma:emma.desktop.in.h:1
 msgid "emma"
 msgstr "emma"
 
+#: ../menu-data/emma:emma.desktop.in.h:2
+msgid "MySQL managing assistant"
+msgstr "Assistant de gestion MySQL"
+
 #: ../menu-data/empathy:empathy.desktop.in.h:1
+msgid "Empathy Internet Messaging"
+msgstr "Client de messagerie instantanée Empathy"
+
+#: ../menu-data/empathy:empathy.desktop.in.h:2
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
 msgstr ""
 "Discuter sur Google Talk, Facebook, MSN et beaucoup d'autres services"
 
-#: ../menu-data/empathy:empathy.desktop.in.h:2
-msgid "Empathy Internet Messaging"
-msgstr "Client de messagerie instantanée Empathy"
-
 #: ../menu-data/empcommand:empcommand.desktop.in.h:1
 msgid "EMPCommand"
 msgstr "EMPCommand"
@@ -3693,13 +3820,13 @@
 "Découvrir des pierres appariées en déplaçant une bille au travers d'obstacles"
 
 #: ../menu-data/enna:enna.desktop.in.h:1
-msgid "EFL Multimedia Center"
-msgstr "Centre multimédia EFL"
-
-#: ../menu-data/enna:enna.desktop.in.h:2
 msgid "Enna"
 msgstr "Enna"
 
+#: ../menu-data/enna:enna.desktop.in.h:2
+msgid "EFL Multimedia Center"
+msgstr "Centre multimédia EFL"
+
 #: ../menu-data/entagged:entagged.desktop.in.h:1
 msgid "Entagged"
 msgstr "Entagged"
@@ -3709,14 +3836,14 @@
 msgstr "Éditeur d'étiquettes (tags)"
 
 #: ../menu-data/eog:eog.desktop.in.h:1
-msgid "Browse and rotate images"
-msgstr "Parcourir les images et les faire pivoter"
-
-#: ../menu-data/eog:eog.desktop.in.h:2
 #: ../menu-data/gpicview:gpicview.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Visionneuse d’images"
 
+#: ../menu-data/eog:eog.desktop.in.h:2
+msgid "Browse and rotate images"
+msgstr "Parcourir les images et les faire pivoter"
+
 #: ../menu-data/epdfview:epdfview.desktop.in.h:1
 msgid "Lightweight PDF document viewer"
 msgstr "Afficheur léger de documents PDF"
@@ -3726,23 +3853,27 @@
 msgstr "ePDFViewer"
 
 #: ../menu-data/epigrass:epigrass.desktop.in.h:1
-msgid "Epidemics Simulator"
-msgstr "Simulateur d'épidémies"
-
-#: ../menu-data/epigrass:epigrass.desktop.in.h:2
 msgid "Epigrass"
 msgstr "Epigrass"
 
-#: ../menu-data/epiphany-browser-data:epiphany.desktop.in.h:1
-#: ../menu-data/exo-utils:exo-web-browser.desktop.in.h:1
-msgid "Browse the web"
-msgstr "Naviguer sur le Web"
+#: ../menu-data/epigrass:epigrass.desktop.in.h:2
+msgid "Epidemics Simulator"
+msgstr "Simulateur d'épidémies"
 
-#: ../menu-data/epiphany-browser-data:epiphany.desktop.in.h:2
+#: ../menu-data/epiphany-browser-data:epiphany.desktop.in.h:1
 msgid "Epiphany Web Browser"
 msgstr "Navigateur Web Epiphany"
 
+#: ../menu-data/epiphany-browser-data:epiphany.desktop.in.h:2
+#: ../menu-data/exo-utils:exo-web-browser.desktop.in.h:2
+msgid "Browse the web"
+msgstr "Naviguer sur le Web"
+
 #: ../menu-data/epiphany:epiphany-game.desktop.in.h:1
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../menu-data/epiphany:epiphany-game.desktop.in.h:2
 msgid ""
 "Collect valuable minerals, while avoiding being hit by a falling boulder or "
 "a bomb"
@@ -3750,17 +3881,13 @@
 "Ramasser des minéraux de valeur tout en évitant d'être touché par un "
 "éboulement rocheux ou une bombe"
 
-#: ../menu-data/epiphany:epiphany-game.desktop.in.h:2
-msgid "Epiphany"
-msgstr "Epiphany"
-
 #: ../menu-data/epoptes:epoptes.desktop.in.h:1
 msgid "Epoptes"
 msgstr "Epoptes"
 
 #: ../menu-data/epoptes:epoptes.desktop.in.h:2
 msgid "Epoptes computer lab administration tool"
-msgstr ""
+msgstr "Outil d'administration de labo informatique Epoptes"
 
 #: ../menu-data/eqonomize:kde4__eqonomize.desktop.in.h:1
 msgid "Eqonomize!"
@@ -3779,13 +3906,13 @@
 msgstr "Environnement de développement intégré Python très complet"
 
 #: ../menu-data/espeak-gui:espeak-gui.desktop.in.h:1
-msgid "Let the computer read out text for you"
-msgstr "Synthèse vocale effectuée par l'ordinateur"
-
-#: ../menu-data/espeak-gui:espeak-gui.desktop.in.h:2
 msgid "eSpeak speech synthesizer"
 msgstr "Synthétiseur de parole eSpeak"
 
+#: ../menu-data/espeak-gui:espeak-gui.desktop.in.h:2
+msgid "Let the computer read out text for you"
+msgstr "Synthèse vocale effectuée par l'ordinateur"
+
 #: ../menu-data/esperanza:esperanza.desktop.in.h:1
 msgid "Esperanza"
 msgstr "Esperanza"
@@ -3796,14 +3923,6 @@
 msgstr ""
 "Client XMMS2 se voulant aussi complet et facile à utiliser que possible"
 
-#: ../menu-data/esteidutil:esteidutil.desktop.in.h:1
-msgid "EstEID smartcard management tool"
-msgstr "Gestionnaire de cartes à puce EstEID"
-
-#: ../menu-data/esteidutil:esteidutil.desktop.in.h:2
-msgid "esteidutil"
-msgstr "esteidutil"
-
 #: ../menu-data/etherape:etherape.desktop.in.h:1
 msgid "EtherApe"
 msgstr "EtherApe"
@@ -3813,53 +3932,54 @@
 msgstr "Surveillance graphique du réseau"
 
 #: ../menu-data/etoys:etoys.desktop.in.h:1
+msgid "eToys"
+msgstr "eToys"
+
+#: ../menu-data/etoys:etoys.desktop.in.h:2
 msgid " A media-rich model, simulation construction kit and authoring tool"
 msgstr ""
 " Un kit de modélisation, de simulation et de construction, et un outil de "
 "création multimédia"
 
-#: ../menu-data/etoys:etoys.desktop.in.h:2
-msgid "eToys"
-msgstr "eToys"
-
 #: ../menu-data/ettercap-graphical:ettercap.desktop.in.h:1
+msgid "ettercap"
+msgstr "ettercap"
+
+#: ../menu-data/ettercap-graphical:ettercap.desktop.in.h:2
 msgid "Multipurpose sniffer/interceptor/logger"
 msgstr ""
 "Un outil polyvalent pour flairer/intercepter/journaliser les trames réseau"
 
-#: ../menu-data/ettercap-graphical:ettercap.desktop.in.h:2
-msgid "ettercap"
-msgstr "ettercap"
-
 #: ../menu-data/etw:etw.desktop.in.h:1
-msgid "Arcade Soccer Game"
-msgstr "Jeu de football de type arcade"
-
-#: ../menu-data/etw:etw.desktop.in.h:2
 msgid "Eat The Whistle"
 msgstr "Eat The Whistle"
 
-#: ../menu-data/euler:euler.desktop.in.h:1
-msgid "An interactive mathematical program"
-msgstr "Un programme interactif de mathématiques"
+#: ../menu-data/etw:etw.desktop.in.h:2
+msgid "Arcade Soccer Game"
+msgstr "Jeu de football de type arcade"
 
-#: ../menu-data/euler:euler.desktop.in.h:2
+#: ../menu-data/euler:euler.desktop.in.h:1
 msgid "Euler"
 msgstr "Euler"
 
+#: ../menu-data/euler:euler.desktop.in.h:2
+msgid "An interactive mathematical program"
+msgstr "Un programme interactif de mathématiques"
+
 #: ../menu-data/evilvte:evilvte.desktop.in.h:1
+msgid "evilvte"
+msgstr "evilvte"
+
+#: ../menu-data/evilvte:evilvte.desktop.in.h:2
 #: ../menu-data/exo-utils:exo-terminal-emulator.desktop.in.h:1
 msgid "Terminal Emulator"
 msgstr "Émulateur de terminal"
 
-#: ../menu-data/evilvte:evilvte.desktop.in.h:2
-msgid "evilvte"
-msgstr "evilvte"
-
 #: ../menu-data/evince-common:evince.desktop.in.h:1
-#: ../menu-data/kdegraphics-mobipocket:kde4__okularApplication_mobi.desktop.in.h:1
-#: ../menu-data/okular:kde4__okular.desktop.in.h:1
-#: ../menu-data/okular:kde4__okularApplication_plucker.desktop.in.h:1
+#: ../menu-data/kdegraphics-mobipocket:kde4__okularApplication_mobi.desktop.in.h:2
+#: ../menu-data/okular-backend-odp:kde4__okularApplication_odp.desktop.in.h:2
+#: ../menu-data/okular:kde4__okular.desktop.in.h:2
+#: ../menu-data/okular:kde4__okularApplication_plucker.desktop.in.h:2
 msgid "Document Viewer"
 msgstr "Afficheur de documents"
 
@@ -3867,15 +3987,6 @@
 msgid "View multi-page documents"
 msgstr "Afficher des documents multipages"
 
-#: ../menu-data/evolution-rss:evolution-rss.desktop.in.h:1
-msgid "Evolution RSS"
-msgstr "Evolution RSS"
-
-#: ../menu-data/evolution-rss:evolution-rss.desktop.in.h:2
-msgid "Evolution plugin that enables Evolution Mail to display rss feeds."
-msgstr ""
-"Extension qui permet au client de courriel Evolution d'afficher des flux RSS."
-
 #: ../menu-data/evolution:evolution.desktop.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Messagerie et calendrier d'Evolution"
@@ -3901,14 +4012,14 @@
 msgstr "Écouter, parcourir et gérer votre collection musicale"
 
 #: ../menu-data/exfalso:exfalso.desktop.in.h:1
-msgid "Edit tags in your audio files"
-msgstr "Modifier les étiquettes (tags) de vos fichiers audio"
-
-#: ../menu-data/exfalso:exfalso.desktop.in.h:2
 msgid "Ex Falso"
 msgstr "Ex Falso"
 
-#: ../menu-data/exo-utils:exo-file-manager.desktop.in.h:1
+#: ../menu-data/exfalso:exfalso.desktop.in.h:2
+msgid "Edit tags in your audio files"
+msgstr "Modifier les étiquettes (tags) de vos fichiers audio"
+
+#: ../menu-data/exo-utils:exo-file-manager.desktop.in.h:2
 msgid "Browse the file system"
 msgstr "Parcourir le système de fichiers"
 
@@ -3921,14 +4032,14 @@
 msgstr "Lire vos emails"
 
 #: ../menu-data/exo-utils:exo-terminal-emulator.desktop.in.h:2
-#: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:3
+#: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:2
 #: ../menu-data/roxterm:roxterm.desktop.in.h:2
 #: ../menu-data/sakura:sakura.desktop.in.h:2
 msgid "Use the command line"
 msgstr "Utiliser la ligne de commande"
 
-#: ../menu-data/exo-utils:exo-web-browser.desktop.in.h:2
-#: ../menu-data/rekonq:kde4__rekonq.desktop.in.h:1
+#: ../menu-data/exo-utils:exo-web-browser.desktop.in.h:1
+#: ../menu-data/rekonq:kde4__rekonq.desktop.in.h:2
 msgid "Web Browser"
 msgstr "Navigateur Web"
 
@@ -3943,13 +4054,13 @@
 "d'expériences scientifiques"
 
 #: ../menu-data/extace:extace.desktop.in.h:1
-msgid "Audio Waveform Monitor"
-msgstr "Surveillance de l'enveloppe de l'onde sonore"
-
-#: ../menu-data/extace:extace.desktop.in.h:2
 msgid "Extace Waveform Display"
 msgstr "Afficheur d'ondes sonores Extace"
 
+#: ../menu-data/extace:extace.desktop.in.h:2
+msgid "Audio Waveform Monitor"
+msgstr "Surveillance de l'enveloppe de l'onde sonore"
+
 #: ../menu-data/extcalc:extcalc.desktop.in.h:1
 msgid "Extcalc"
 msgstr "Extcalc"
@@ -3986,23 +4097,14 @@
 msgid "No name"
 msgstr "Sans nom"
 
-#: ../menu-data/fastdnaml:fastdnaml.desktop.in.h:1
-msgid "Tool for construction of phylogenetic trees of DNA sequences"
-msgstr ""
-"Outil pour la construction d'arbres phylogénétiques de séquences d'ADN"
-
-#: ../menu-data/fastdnaml:fastdnaml.desktop.in.h:2
-msgid "fastDNAml"
-msgstr "fastDNAml"
-
 #: ../menu-data/fatrat:fatrat.desktop.in.h:1
-msgid "FatRat"
-msgstr "FatRat"
-
-#: ../menu-data/fatrat:fatrat.desktop.in.h:2
 msgid "Qt-based download/upload manager"
 msgstr "Gestionnaire de téléchargements basé sur Qt"
 
+#: ../menu-data/fatrat:fatrat.desktop.in.h:2
+msgid "FatRat"
+msgstr "FatRat"
+
 #: ../menu-data/faumachine:faum.desktop.in.h:1
 msgid "FAUmachine"
 msgstr "FAUmachine"
@@ -4045,71 +4147,71 @@
 msgstr "Interface graphique de configuration de Fcitx"
 
 #: ../menu-data/fcitx-data:fcitx.desktop.in.h:1
-msgid "Chinese Input Method"
-msgstr "Méthode de saisie chinoise"
-
-#: ../menu-data/fcitx-data:fcitx.desktop.in.h:2
 msgid "Fcitx"
 msgstr "Fcitx"
 
-#: ../menu-data/fcitx-ui-kimpanel:fcitx-kimpanel.desktop.in.h:1
-msgid "Chinese Input Method (Use Kimpanel)"
-msgstr "Méthode de saisie chinoise (utilise Kimpanel)"
+#: ../menu-data/fcitx-data:fcitx.desktop.in.h:2
+msgid "Chinese Input Method"
+msgstr "Méthode de saisie chinoise"
 
-#: ../menu-data/fcitx-ui-kimpanel:fcitx-kimpanel.desktop.in.h:2
+#: ../menu-data/fcitx-ui-kimpanel:fcitx-kimpanel.desktop.in.h:1
 msgid "Fcitx Kimpanel"
 msgstr "Fcitx Kimpanel"
 
+#: ../menu-data/fcitx-ui-kimpanel:fcitx-kimpanel.desktop.in.h:2
+msgid "Chinese Input Method (Use Kimpanel)"
+msgstr "Méthode de saisie chinoise (utilise Kimpanel)"
+
 #: ../menu-data/fcitx-ui-light:fcitx-light.desktop.in.h:1
+msgid "Fcitx Light UI"
+msgstr "Interface légère pour Fcitx"
+
+#: ../menu-data/fcitx-ui-light:fcitx-light.desktop.in.h:2
 msgid "Chinese Input Method (Use Light weight UI)"
 msgstr ""
 "Méthode de saisie du chinois (utilise une interface utilisateur légère)"
 
-#: ../menu-data/fcitx-ui-light:fcitx-light.desktop.in.h:2
-msgid "Fcitx Light UI"
-msgstr "Interface légère pour Fcitx"
-
 #: ../menu-data/feh:feh.desktop.in.h:1
 msgid "Feh"
 msgstr "Feh"
 
 #: ../menu-data/feh:feh.desktop.in.h:2
-#: ../menu-data/preview.app:Preview.desktop.in.h:1
+#: ../menu-data/preview.app:Preview.desktop.in.h:2
 msgid "Image viewer"
 msgstr "Visionneuse d'images"
 
 #: ../menu-data/felix-latin:felix.desktop.in.h:1
-msgid "Gaffiot's dictionary is a reference book"
-msgstr "Le dictionnaire de Gaffiot est un ouvrage de référence"
-
-#: ../menu-data/felix-latin:felix.desktop.in.h:2
 msgid "Latin-French dictionary"
 msgstr "Dictionnaire latin-français"
 
-#: ../menu-data/ferret:ferret.desktop.in.h:1
-msgid "Design E-R databases"
-msgstr "Concevoir des bases de données E-R"
+#: ../menu-data/felix-latin:felix.desktop.in.h:2
+msgid "Gaffiot's dictionary is a reference book"
+msgstr "Le dictionnaire de Gaffiot est un ouvrage de référence"
 
-#: ../menu-data/ferret:ferret.desktop.in.h:2
+#: ../menu-data/ferret:ferret.desktop.in.h:1
 msgid "ferret"
 msgstr "ferret"
 
-#: ../menu-data/fet:fet.desktop.in.h:1
-msgid "Generate timetables for educational institutions"
-msgstr "Générer des emplois du temps pour les institutions d'enseignement"
+#: ../menu-data/ferret:ferret.desktop.in.h:2
+msgid "Design E-R databases"
+msgstr "Concevoir des bases de données E-R"
 
-#: ../menu-data/fet:fet.desktop.in.h:2
+#: ../menu-data/fet:fet.desktop.in.h:1
 msgid "Timetable Generator"
 msgstr "Générateur d'emploi du temps"
 
-#: ../menu-data/ffado-mixer-qt4:ffado.org-ffadomixer.desktop.in.h:1
-msgid "Audio mixer for Firewire devices"
-msgstr "Mixeur audio pour périphériques FireWire"
+#: ../menu-data/fet:fet.desktop.in.h:2
+msgid "Generate timetables for educational institutions"
+msgstr "Générer des emplois du temps pour les institutions d'enseignement"
 
-#: ../menu-data/ffado-mixer-qt4:ffado.org-ffadomixer.desktop.in.h:2
+#: ../menu-data/ffado-mixer-qt4:ffado.org-ffadomixer.desktop.in.h:1
 msgid "FFADO Mixer"
 msgstr "Mixeur FFADO"
 
+#: ../menu-data/ffado-mixer-qt4:ffado.org-ffadomixer.desktop.in.h:2
+msgid "Audio mixer for Firewire devices"
+msgstr "Mixeur audio pour périphériques FireWire"
+
 #: ../menu-data/fgo:fgo.desktop.in.h:1
 msgid "FGo!"
 msgstr "FGo!"
@@ -4143,13 +4245,13 @@
 msgstr "Voir les informations sur l'utilisation du disque"
 
 #: ../menu-data/filezilla:filezilla.desktop.in.h:1
-msgid "Download and upload files via FTP, FTPS and SFTP"
-msgstr "Télécharger et transférer des fichiers via FTP, FTPS et SFTP"
-
-#: ../menu-data/filezilla:filezilla.desktop.in.h:2
 msgid "FileZilla"
 msgstr "FileZilla"
 
+#: ../menu-data/filezilla:filezilla.desktop.in.h:2
+msgid "Download and upload files via FTP, FTPS and SFTP"
+msgstr "Télécharger et transférer des fichiers via FTP, FTPS et SFTP"
+
 #: ../menu-data/filler:filler.desktop.in.h:1
 msgid "Filler"
 msgstr "Filler"
@@ -4175,7 +4277,7 @@
 msgid "Record and edit multitrack audio"
 msgstr "Enregistrer et editer de l'audio en multi-pistes"
 
-#: ../menu-data/firefox:firefox.desktop.in.h:2
+#: ../menu-data/firefox:firefox.desktop.in.h:1
 msgid "Firefox Web Browser"
 msgstr "Navigateur Web Firefox"
 
@@ -4184,54 +4286,62 @@
 msgstr "Ouvrir une nouvelle fenêtre"
 
 #: ../menu-data/firestarter:firestarter.desktop.in.h:1
-msgid "Desktop Firewall Tool"
-msgstr "Pare-feu pour ordinateur de bureau"
-
-#: ../menu-data/firestarter:firestarter.desktop.in.h:2
 msgid "Firestarter"
 msgstr "Firestarter"
 
-#: ../menu-data/fityk:fityk.desktop.in.h:1
-msgid "Peak fitting and data analysis"
-msgstr "Ajustement statistique et analyse de données"
+#: ../menu-data/firestarter:firestarter.desktop.in.h:2
+msgid "Desktop Firewall Tool"
+msgstr "Pare-feu pour ordinateur de bureau"
 
-#: ../menu-data/fityk:fityk.desktop.in.h:2
+#: ../menu-data/fityk:fityk.desktop.in.h:1
 msgid "fityk"
 msgstr "fityk"
 
+#: ../menu-data/fityk:fityk.desktop.in.h:2
+msgid "Peak fitting and data analysis"
+msgstr "Ajustement statistique et analyse de données"
+
 #: ../menu-data/flamerobin:flamerobin.desktop.in.h:1
+msgid "FlameRobin"
+msgstr "FlameRobin"
+
+#: ../menu-data/flamerobin:flamerobin.desktop.in.h:2
 msgid "Administration Tool for Firebird DBMS"
 msgstr "Outil d'administration pour Firebird DBMS"
 
-#: ../menu-data/flamerobin:flamerobin.desktop.in.h:2
-msgid "FlameRobin"
-msgstr "FlameRobin"
+#: ../menu-data/flare:flare.desktop.in.h:1
+msgid "Flare"
+msgstr "Flare"
+
+#: ../menu-data/flare:flare.desktop.in.h:2
+msgid "A single player, 2D-isometric, action Role-Playing Game"
+msgstr "Un jeu de rôle d'action solo en 2D isométrique"
 
 #: ../menu-data/fldiff:fldiff.desktop.in.h:1
-msgid "A graphical diff program"
-msgstr "Un programme diff graphique"
-
-#: ../menu-data/fldiff:fldiff.desktop.in.h:2
 msgid "fldiff"
 msgstr "fldiff"
 
-#: ../menu-data/fldigi:flarq.desktop.in.h:1
-msgid "Amateur Radio Data Transfer with ARQ"
-msgstr "Transfert de données radio amateur avec ARQ"
+#: ../menu-data/fldiff:fldiff.desktop.in.h:2
+msgid "A graphical diff program"
+msgstr "Un programme diff graphique"
 
-#: ../menu-data/fldigi:flarq.desktop.in.h:2
+#: ../menu-data/fldigi:flarq.desktop.in.h:1
 msgid "Flarq"
 msgstr "Flarq"
 
-#: ../menu-data/fldigi:fldigi.desktop.in.h:1
-#: ../menu-data/linpsk:linpsk.desktop.in.h:1
-msgid "Amateur Radio Sound Card Communications"
-msgstr "Communications radio-amateur avec une carte-son"
+#: ../menu-data/fldigi:flarq.desktop.in.h:2
+msgid "Amateur Radio Data Transfer with ARQ"
+msgstr "Transfert de données radio amateur avec ARQ"
 
-#: ../menu-data/fldigi:fldigi.desktop.in.h:2
+#: ../menu-data/fldigi:fldigi.desktop.in.h:1
 msgid "Fldigi"
 msgstr "Fldigi"
 
+#: ../menu-data/fldigi:fldigi.desktop.in.h:2
+#: ../menu-data/linpsk:linpsk.desktop.in.h:2
+msgid "Amateur Radio Sound Card Communications"
+msgstr "Communications radio-amateur avec une carte-son"
+
 #: ../menu-data/flegita:flegita.desktop.in.h:1
 msgid "Scanner Utility"
 msgstr "Utilitaire de numérisation d'images"
@@ -4241,6 +4351,10 @@
 msgstr "Numériser des images simplement"
 
 #: ../menu-data/flight-of-the-amazon-queen:flight-of-the-amazon-queen.desktop.in.h:1
+msgid "Flight of the Amazon Queen"
+msgstr "Flight of the Amazon Queen"
+
+#: ../menu-data/flight-of-the-amazon-queen:flight-of-the-amazon-queen.desktop.in.h:2
 msgid ""
 "Embark on a quest to rescue a kidnapped princess and in the process, "
 "discover the true sinister intentions of a suspiciously located Lederhosen "
@@ -4250,62 +4364,58 @@
 "de cette quête les intentions vraiment sinistres d'une compagnie "
 "curieusement logée à Lederhosen"
 
-#: ../menu-data/flight-of-the-amazon-queen:flight-of-the-amazon-queen.desktop.in.h:2
-msgid "Flight of the Amazon Queen"
-msgstr "Flight of the Amazon Queen"
-
 #: ../menu-data/flightgear:flightgear.desktop.in.h:1
-msgid "A flight simulator"
-msgstr "Un simulateur de vol"
-
-#: ../menu-data/flightgear:flightgear.desktop.in.h:2
 msgid "FlightGear"
 msgstr "FlightGear"
 
-#: ../menu-data/flobopuyo:flobopuyo.desktop.in.h:1
-msgid "A tetris-like game"
-msgstr "Un jeu semblable à Tetris"
+#: ../menu-data/flightgear:flightgear.desktop.in.h:2
+msgid "A flight simulator"
+msgstr "Un simulateur de vol"
 
-#: ../menu-data/flobopuyo:flobopuyo.desktop.in.h:2
+#: ../menu-data/flobopuyo:flobopuyo.desktop.in.h:1
 msgid "FloboPuyo"
 msgstr "FloboPuyo"
 
-#: ../menu-data/flphoto:flphoto.desktop.in.h:1
-msgid "FLTK Photo Software"
-msgstr "Logiciel photo en FLTK"
+#: ../menu-data/flobopuyo:flobopuyo.desktop.in.h:2
+msgid "A tetris-like game"
+msgstr "Un jeu semblable à Tetris"
 
-#: ../menu-data/flphoto:flphoto.desktop.in.h:2
+#: ../menu-data/flphoto:flphoto.desktop.in.h:1
 msgid "flPhoto"
 msgstr "flPhoto"
 
-#: ../menu-data/flpsed:flpsed.desktop.in.h:1
-msgid "Add text and annotations to PDF and PostScript documents"
-msgstr "Ajouter du texte et des annotations aux documents PDF et PostScript"
+#: ../menu-data/flphoto:flphoto.desktop.in.h:2
+msgid "FLTK Photo Software"
+msgstr "Logiciel photo en FLTK"
 
-#: ../menu-data/flpsed:flpsed.desktop.in.h:2
+#: ../menu-data/flpsed:flpsed.desktop.in.h:1
 msgid "flpsed PDF Annotator"
 msgstr "Annotation de PDF flpsed"
 
+#: ../menu-data/flpsed:flpsed.desktop.in.h:2
+msgid "Add text and annotations to PDF and PostScript documents"
+msgstr "Ajouter du texte et des annotations aux documents PDF et PostScript"
+
 #: ../menu-data/fltk1.1-games:flblocks.desktop.in.h:1
 #: ../menu-data/fltk1.3-games:flblocks.desktop.in.h:1
-msgid "Block Attack! Game"
-msgstr "Jeu Block Attack !"
-
-#: ../menu-data/fltk1.1-games:flblocks.desktop.in.h:2
-#: ../menu-data/fltk1.3-games:flblocks.desktop.in.h:2
 msgid "FLTK Block Attack!"
 msgstr ""
 "Jeu Block Attack créé avec la boîte à outils FLTK (Fast Light Toolkit)"
 
+#: ../menu-data/fltk1.1-games:flblocks.desktop.in.h:2
+#: ../menu-data/fltk1.3-games:flblocks.desktop.in.h:2
+msgid "Block Attack! Game"
+msgstr "Jeu Block Attack !"
+
 #: ../menu-data/fltk1.1-games:flcheckers.desktop.in.h:1
 #: ../menu-data/fltk1.3-games:flcheckers.desktop.in.h:1
-msgid "Checkers Game"
-msgstr "Jeu Checkers"
+msgid "FLTK Checkers"
+msgstr "Jeu Checkers en FLTK"
 
 #: ../menu-data/fltk1.1-games:flcheckers.desktop.in.h:2
 #: ../menu-data/fltk1.3-games:flcheckers.desktop.in.h:2
-msgid "FLTK Checkers"
-msgstr "Jeu Checkers en FLTK"
+msgid "Checkers Game"
+msgstr "Jeu Checkers"
 
 #: ../menu-data/fltk1.1-games:flsudoku.desktop.in.h:1
 #: ../menu-data/fltk1.3-games:flsudoku.desktop.in.h:1
@@ -4318,13 +4428,13 @@
 msgstr "Jeu de Sudoku"
 
 #: ../menu-data/fluid:fluid.desktop.in.h:1
-msgid "FLTK GUI Designer"
-msgstr "Concepteur d'interfaces utilisateur FLTK (Fast Light Toolkit)"
-
-#: ../menu-data/fluid:fluid.desktop.in.h:2
 msgid "FLUID"
 msgstr "FLUID"
 
+#: ../menu-data/fluid:fluid.desktop.in.h:2
+msgid "FLTK GUI Designer"
+msgstr "Concepteur d'interfaces utilisateur FLTK (Fast Light Toolkit)"
+
 #: ../menu-data/flumotion:flumotion-admin.desktop.in.h:1
 msgid "Flumotion Streaming Server Administration"
 msgstr "Administration du serveur Flumotion"
@@ -4334,20 +4444,20 @@
 msgstr "Gérer le serveur de transmission en continu Flumotion"
 
 #: ../menu-data/flush:flush.desktop.in.h:1
-msgid "Downloading files by BitTorrent protocol"
-msgstr "Télécharger des fichiers avec le protocole BitTorrent"
-
-#: ../menu-data/flush:flush.desktop.in.h:2
 msgid "Flush"
 msgstr "Flush"
 
+#: ../menu-data/flush:flush.desktop.in.h:2
+msgid "Downloading files by BitTorrent protocol"
+msgstr "Télécharger des fichiers avec le protocole BitTorrent"
+
 #: ../menu-data/fmit:fmit.desktop.in.h:1
-msgid "Music instrument tuner"
-msgstr "Accordeur d'instruments de musique"
+msgid "FMIT"
+msgstr "FMIT"
 
 #: ../menu-data/fmit:fmit.desktop.in.h:2
-msgid "fmit"
-msgstr "fmit"
+msgid "Tune musical instruments"
+msgstr "Accorder des instruments de musique"
 
 #: ../menu-data/focuswriter:focuswriter.desktop.in.h:1
 msgid "FocusWriter"
@@ -4370,29 +4480,29 @@
 msgstr "Donner un aperçu, comparer et gérer des polices de caractères"
 
 #: ../menu-data/font-manager:font-sampler.desktop.in.h:1
-msgid "Create a PDF sample sheet from a directory of fonts"
-msgstr "Créer un page PDF d'aperçus à partir d'un dossier de polices"
-
-#: ../menu-data/font-manager:font-sampler.desktop.in.h:2
 msgid "Font Sampler"
 msgstr "Font Sampler"
 
-#: ../menu-data/fontforge:fontforge.desktop.in.h:1
-msgid "An outline font editor"
-msgstr "Éditeur de polices vectorielles"
+#: ../menu-data/font-manager:font-sampler.desktop.in.h:2
+msgid "Create a PDF sample sheet from a directory of fonts"
+msgstr "Créer un page PDF d'aperçus à partir d'un dossier de polices"
 
-#: ../menu-data/fontforge:fontforge.desktop.in.h:2
+#: ../menu-data/fontforge:fontforge.desktop.in.h:1
 msgid "FontForge"
 msgstr "FontForge"
 
-#: ../menu-data/fontmatrix:fontmatrix.desktop.in.h:1
-msgid "A font manager"
-msgstr "Gestionnaire de polices"
+#: ../menu-data/fontforge:fontforge.desktop.in.h:2
+msgid "An outline font editor"
+msgstr "Éditeur de polices vectorielles"
 
-#: ../menu-data/fontmatrix:fontmatrix.desktop.in.h:2
+#: ../menu-data/fontmatrix:fontmatrix.desktop.in.h:1
 msgid "Fontmatrix"
 msgstr "Fontmatrix"
 
+#: ../menu-data/fontmatrix:fontmatrix.desktop.in.h:2
+msgid "A font manager"
+msgstr "Gestionnaire de polices"
+
 #: ../menu-data/fontypython:fontypython.desktop.in.h:1
 msgid "Fonty Python Font Manager"
 msgstr "Gestionnaire de polices Fonty Python"
@@ -4411,21 +4521,21 @@
 msgstr "Synthétiseur d'orgue"
 
 #: ../menu-data/foobillard:foobillard.desktop.in.h:1
-msgid "3D billiards game using OpenGL"
-msgstr "Jeu de billard en 3D utilisant OpenGL"
-
-#: ../menu-data/foobillard:foobillard.desktop.in.h:2
 msgid "Foobillard"
 msgstr "Foobillard"
 
-#: ../menu-data/foomatic-gui:foomatic-gui.desktop.in.h:1
-msgid "Foomatic-GUI printer configuration tool"
-msgstr "Interface graphique de configuration d'imprimantes Foomatic"
+#: ../menu-data/foobillard:foobillard.desktop.in.h:2
+msgid "3D billiards game using OpenGL"
+msgstr "Jeu de billard en 3D utilisant OpenGL"
 
-#: ../menu-data/foomatic-gui:foomatic-gui.desktop.in.h:2
+#: ../menu-data/foomatic-gui:foomatic-gui.desktop.in.h:1
 msgid "Printers"
 msgstr "Imprimantes"
 
+#: ../menu-data/foomatic-gui:foomatic-gui.desktop.in.h:2
+msgid "Foomatic-GUI printer configuration tool"
+msgstr "Interface graphique de configuration d'imprimantes Foomatic"
+
 #: ../menu-data/fotowall:fotowall.desktop.in.h:1
 msgid "Fotowall"
 msgstr "Fotowall"
@@ -4434,47 +4544,48 @@
 msgid "Photo collection creativity tool"
 msgstr "Photo collection creativity tool"
 
-#: ../menu-data/fotoxx:fotoxx.desktop.in.h:1
-msgid "Digital Photo Editor"
-msgstr "Editeur de photos numériques"
-
-#: ../menu-data/fotoxx:fotoxx.desktop.in.h:2
+#: ../menu-data/fotoxx:kornelix-fotoxx.desktop.in.h:1
 msgid "fotoxx"
 msgstr "Fotoxx"
 
-#: ../menu-data/foxtrotgps:foxtrotgps.desktop.in.h:1
-msgid "Display map and GPS position"
-msgstr "Afficher la carte et la position GPS"
+#: ../menu-data/fotoxx:kornelix-fotoxx.desktop.in.h:2
+msgid "Edit photos and manage collections"
+msgstr "Retoucher des photos et gérer des collections"
 
-#: ../menu-data/foxtrotgps:foxtrotgps.desktop.in.h:2
+#: ../menu-data/foxtrotgps:foxtrotgps.desktop.in.h:1
 msgid "FoxtrotGPS"
 msgstr "FoxtrotGPS"
 
+#: ../menu-data/foxtrotgps:foxtrotgps.desktop.in.h:2
+msgid "Display map and GPS position"
+msgstr "Afficher la carte et la position GPS"
+
 #: ../menu-data/fpm2:fpm2.desktop.in.h:1
 msgid "Figaro's Password Manager 2"
 msgstr "Gestionnaire de mots de passe Figaro 2"
 
 #: ../menu-data/fpm2:fpm2.desktop.in.h:2
+#: ../menu-data/kedpm-gtk:kedpm-gtk.desktop.in.h:2
 msgid "Manage passwords"
 msgstr "Gèrer les mots de passe"
 
 #: ../menu-data/fprint-demo:fprint-demo.desktop.in.h:1
-msgid "Fingerprint scanning demonstration"
-msgstr "Démonstration d'analyse d'empreintes digitales"
-
-#: ../menu-data/fprint-demo:fprint-demo.desktop.in.h:2
 msgid "fprint-demo"
 msgstr "fprint-demo"
 
-#: ../menu-data/fqterm:fqterm.desktop.in.h:1
-#: ../menu-data/qterm:qterm.desktop.in.h:1
-msgid "BBS client based on Qt library in linux"
-msgstr "Client BBS basé sur la bibliothèque Qt dans Linux"
+#: ../menu-data/fprint-demo:fprint-demo.desktop.in.h:2
+msgid "Fingerprint scanning demonstration"
+msgstr "Démonstration d'analyse d'empreintes digitales"
 
-#: ../menu-data/fqterm:fqterm.desktop.in.h:2
+#: ../menu-data/fqterm:fqterm.desktop.in.h:1
 msgid "FQTerm"
 msgstr "FQTerm"
 
+#: ../menu-data/fqterm:fqterm.desktop.in.h:2
+#: ../menu-data/qterm:qterm.desktop.in.h:2
+msgid "BBS client based on Qt library in linux"
+msgstr "Client BBS basé sur la bibliothèque Qt dans Linux"
+
 #: ../menu-data/fracplanet:fracplanet.desktop.in.h:1
 msgid "Fracplanet"
 msgstr "Fracplanet"
@@ -4500,38 +4611,51 @@
 msgstr "Générateur de fractale de type ensemble de Mandelbrot"
 
 #: ../menu-data/freealchemist:freealchemist.desktop.in.h:1
-msgid "A simpler figure block game"
-msgstr "Un jeu simple d'association de blocs"
-
-#: ../menu-data/freealchemist:freealchemist.desktop.in.h:2
 msgid "FreeAlchemist"
 msgstr "FreeAlchemist"
 
+#: ../menu-data/freealchemist:freealchemist.desktop.in.h:2
+msgid "A simpler figure block game"
+msgstr "Un jeu simple d'association de blocs"
+
 #: ../menu-data/freebirth:freebirth.desktop.in.h:1
-msgid "Bass synthesizer/sample player/sequencer"
-msgstr "Synthétiseur de basses, lecteur d'échantillons, séquenceur"
-
-#: ../menu-data/freebirth:freebirth.desktop.in.h:2
 msgid "Freebirth"
 msgstr "Freebirth"
 
+#: ../menu-data/freebirth:freebirth.desktop.in.h:2
+msgid "Bass synthesizer/sample player/sequencer"
+msgstr "Synthétiseur de basses, lecteur d'échantillons, séquenceur"
+
 #: ../menu-data/freecad:freecad.desktop.in.h:1
+msgid "FreeCAD"
+msgstr "FreeCAD"
+
+#: ../menu-data/freecad:freecad.desktop.in.h:2
 msgid "Feature based Parametric Modeler"
 msgstr "Modeleur paramètrique"
 
-#: ../menu-data/freecad:freecad.desktop.in.h:2
-msgid "FreeCAD"
-msgstr "FreeCAD"
+#: ../menu-data/freeciv-client-extras:freeciv-modpack.desktop.in.h:1
+msgid "Freeciv modpack installer"
+msgstr "Installateur de modpacks pour Freeciv"
+
+#: ../menu-data/freeciv-client-extras:freeciv-modpack.desktop.in.h:2
+msgid "Download and install add-ons for Freeciv"
+msgstr "Télécharger et installer des extensions pour Freeciv"
 
 #: ../menu-data/freeciv-client-gtk:freeciv-gtk.desktop.in.h:1
 msgid "Freeciv"
 msgstr "Freeciv"
 
 #: ../menu-data/freeciv-client-gtk:freeciv-gtk.desktop.in.h:2
+#: ../menu-data/freeciv-server:freeciv-server.desktop.in.h:2
 msgid ""
 "Turn-based strategy game inspired by the history of human civilization"
 msgstr "Jeu de stratégie inspiré par l'histoire de la civilisation humaine"
 
+#: ../menu-data/freeciv-server:freeciv-server.desktop.in.h:1
+msgid "Freeciv server"
+msgstr "Serveur Freeciv"
+
 #: ../menu-data/freecol:freecol.desktop.in.h:1
 msgid "FreeCol"
 msgstr "FreeCol"
@@ -4564,26 +4688,26 @@
 "Jeu d'aventure – jeu de rôle humoristique isométrique semblable à Zelda"
 
 #: ../menu-data/freedm:freedm.desktop.in.h:1
-#: ../menu-data/freedoom:freedoom.desktop.in.h:1
-msgid "First Person Shooter Game"
-msgstr "Jeu de tir subjectif (FPS)"
-
-#: ../menu-data/freedm:freedm.desktop.in.h:2
 msgid "Free DM"
 msgstr "Free DM"
 
+#: ../menu-data/freedm:freedm.desktop.in.h:2
 #: ../menu-data/freedoom:freedoom.desktop.in.h:2
+msgid "First Person Shooter Game"
+msgstr "Jeu de tir subjectif (FPS)"
+
+#: ../menu-data/freedoom:freedoom.desktop.in.h:1
 msgid "Freedoom"
 msgstr "Freedoom"
 
 #: ../menu-data/freedroid:freedroid.desktop.in.h:1
-msgid "Clear a spaceship from all droids"
-msgstr "Nettoyer un vaisseau spatial de tous ses androïdes"
-
-#: ../menu-data/freedroid:freedroid.desktop.in.h:2
 msgid "Freedroid"
 msgstr "Freedroid"
 
+#: ../menu-data/freedroid:freedroid.desktop.in.h:2
+msgid "Clear a spaceship from all droids"
+msgstr "Nettoyer un vaisseau spatial de tous ses androïdes"
+
 #: ../menu-data/freedroidrpg:freedroidrpg.desktop.in.h:1
 msgid "Freedroid RPG"
 msgstr "Freedroid RPG"
@@ -4593,26 +4717,22 @@
 msgstr "Jeu de rôles en 3D isométrique"
 
 #: ../menu-data/freegish:freegish.desktop.in.h:1
-msgid "A physics based arcade game"
-msgstr "Un jeu d'arcade basé sur la physique"
-
-#: ../menu-data/freegish:freegish.desktop.in.h:2
 msgid "FreeGish"
 msgstr "FreeGish"
 
-#: ../menu-data/freeguide:freeguide.desktop.in.h:1
-msgid "Download a TV guide from the Internet and view it"
-msgstr "Télécharger et lire un guide TV depuis l'Internet"
+#: ../menu-data/freegish:freegish.desktop.in.h:2
+msgid "A physics based arcade game"
+msgstr "Un jeu d'arcade basé sur la physique"
 
-#: ../menu-data/freeguide:freeguide.desktop.in.h:2
+#: ../menu-data/freeguide:freeguide.desktop.in.h:1
 msgid "FreeGuide"
 msgstr "FreeGuide"
 
-#: ../menu-data/freemat:freemat.desktop.in.h:1
-msgid "FreeMat"
-msgstr "FreeMat"
+#: ../menu-data/freeguide:freeguide.desktop.in.h:2
+msgid "Download a TV guide from the Internet and view it"
+msgstr "Télécharger et lire un guide TV depuis l'Internet"
 
-#: ../menu-data/freemat:freemat.desktop.in.h:2
+#: ../menu-data/freemat:freemat.desktop.in.h:1
 msgid ""
 "a free environment for rapid engineering and scientific prototyping and data "
 "processing."
@@ -4620,57 +4740,61 @@
 "Un environnement libre pour l'ingénierie rapide, de prototypage scientifique "
 "et de traitement des données."
 
-#: ../menu-data/freemind:freemind.desktop.in.h:1
-msgid "A free mind mapping tool"
-msgstr "Un logiciel libre de création de cartes heuristiques"
+#: ../menu-data/freemat:freemat.desktop.in.h:2
+msgid "FreeMat"
+msgstr "FreeMat"
 
-#: ../menu-data/freemind:freemind.desktop.in.h:2
+#: ../menu-data/freemind:freemind.desktop.in.h:1
 msgid "FreeMind"
 msgstr "FreeMind"
 
-#: ../menu-data/freemix:freemix.desktop.in.h:1
-msgid "Live video performance tool"
-msgstr "Outil pour les représentations vidéo en direct"
+#: ../menu-data/freemind:freemind.desktop.in.h:2
+msgid "A free mind mapping tool"
+msgstr "Un logiciel libre de création de cartes heuristiques"
 
-#: ../menu-data/freemix:freemix.desktop.in.h:2
+#: ../menu-data/freemix:freemix.desktop.in.h:1
 msgid "freemix"
 msgstr "freemix"
 
+#: ../menu-data/freemix:freemix.desktop.in.h:2
+msgid "Live video performance tool"
+msgstr "Outil pour les représentations vidéo en direct"
+
 #: ../menu-data/freeplane:freeplane.desktop.in.h:1
+msgid "Freeplane"
+msgstr "Freeplane"
+
+#: ../menu-data/freeplane:freeplane.desktop.in.h:2
 msgid ""
 "A free tool to structure and organise your information with mind mapping"
 msgstr ""
 "Un outil gratuit pour structurer et organiser vos informations sous la forme "
 "d'une carte heuristique (ou mindmap)"
 
-#: ../menu-data/freeplane:freeplane.desktop.in.h:2
-msgid "Freeplane"
-msgstr "Freeplane"
-
 #: ../menu-data/freepops-updater-gnome:freepops-updater-gnome.desktop.in.h:1
-msgid "Download updated version of FreePOPs plugins"
-msgstr "Télécharger une version mise à jour des greffons FreePOP"
-
-#: ../menu-data/freepops-updater-gnome:freepops-updater-gnome.desktop.in.h:2
 msgid "FreePOPs updater"
 msgstr "Mises à jour de FreePOP"
 
-#: ../menu-data/freespeak:freespeak.desktop.in.h:1
-msgid "A free frontend to online translator engines"
-msgstr "Une interface libre pour les applications de traduction en ligne"
+#: ../menu-data/freepops-updater-gnome:freepops-updater-gnome.desktop.in.h:2
+msgid "Download updated version of FreePOPs plugins"
+msgstr "Télécharger une version mise à jour des greffons FreePOP"
 
-#: ../menu-data/freespeak:freespeak.desktop.in.h:2
+#: ../menu-data/freespeak:freespeak.desktop.in.h:1
 msgid "FreeSpeak"
 msgstr "FreeSpeak"
 
-#: ../menu-data/freetennis:freetennis.desktop.in.h:1
-msgid "Free Tennis - a free tennis simulation"
-msgstr "Free Tennis - un logiciel libre de simulation de jeu de tennis"
+#: ../menu-data/freespeak:freespeak.desktop.in.h:2
+msgid "A free frontend to online translator engines"
+msgstr "Une interface libre pour les applications de traduction en ligne"
 
-#: ../menu-data/freetennis:freetennis.desktop.in.h:2
+#: ../menu-data/freetennis:freetennis.desktop.in.h:1
 msgid "FreeTennis"
 msgstr "FreeTennis"
 
+#: ../menu-data/freetennis:freetennis.desktop.in.h:2
+msgid "Free Tennis - a free tennis simulation"
+msgstr "Free Tennis - un logiciel libre de simulation de jeu de tennis"
+
 #: ../menu-data/freevial:freevial.desktop.in.h:1
 msgid "Freevial"
 msgstr "Freevial"
@@ -4684,9 +4808,9 @@
 msgstr "Freevo"
 
 #: ../menu-data/freevo:freevo.desktop.in.h:2
-msgid "Playing various multimedia formats, like pictures, audio or video. "
+msgid "Playing various multimedia formats, like pictures, audio or video"
 msgstr ""
-"Lecteur de formats multimédia divers, tels que photos, audio ou vidéo. "
+"Jouer divers formats multimedia comme des photos, de l'audio ou de la vidéo"
 
 #: ../menu-data/freewheeling:freewheeling.desktop.in.h:1
 msgid "FreeWheeling"
@@ -4706,14 +4830,14 @@
 "Traitement audio en temps réel fondé sur une manipulation du spectre de "
 "fréquences"
 
-#: ../menu-data/frescobaldi:kde4__frescobaldi.desktop.in.h:1
-msgid "Frescobaldi"
-msgstr "Frescobaldi"
-
-#: ../menu-data/frescobaldi:kde4__frescobaldi.desktop.in.h:2
+#: ../menu-data/frescobaldi:frescobaldi.desktop.in.h:1
 msgid "LilyPond Music Editor"
 msgstr "Éditeur de musique Lilypond"
 
+#: ../menu-data/frescobaldi:frescobaldi.desktop.in.h:2
+msgid "Frescobaldi"
+msgstr "Frescobaldi"
+
 #: ../menu-data/fretsonfire-game:fretsonfire-game.desktop.in.h:1
 msgid "Frets on Fire"
 msgstr "Frets on Fire"
@@ -4756,13 +4880,13 @@
 msgstr "Faites éclater les bulles !"
 
 #: ../menu-data/fsl-4.1:fsl-4.1.desktop.in.h:1
-msgid "FSL 4.1"
-msgstr "FSL 4.1"
-
-#: ../menu-data/fsl-4.1:fsl-4.1.desktop.in.h:2
 msgid "Software Collection for (f)MRI Data Analysis"
 msgstr "Ensemble de programmes pour l'analyse de données IRM(f)"
 
+#: ../menu-data/fsl-4.1:fsl-4.1.desktop.in.h:2
+msgid "FSL 4.1"
+msgstr "FSL 4.1"
+
 #: ../menu-data/fslint:fslint.desktop.in.h:1
 msgid "FSlint"
 msgstr "FSlint"
@@ -4831,6 +4955,14 @@
 msgid "Render Peter de Jong maps"
 msgstr "Rendu graphique de courbes de Peter de Jong"
 
+#: ../menu-data/g2ipmsg:g2ipmsg.desktop.in.h:1
+msgid "GNOME2 IP Messenger"
+msgstr "GNOME2 IP Messenger"
+
+#: ../menu-data/g2ipmsg:g2ipmsg.desktop.in.h:2
+msgid "IP Messenger for the GNOME2"
+msgstr "IP Messenger pour GNOME2"
+
 #: ../menu-data/g3data:g3data.desktop.in.h:1
 msgid "G3Data Graph Analyzer"
 msgstr "G3Data, analyseur de graphiques"
@@ -4840,13 +4972,13 @@
 msgstr "Récupérer les données à partir de graphiques numérisées"
 
 #: ../menu-data/g3dviewer:g3dviewer.desktop.in.h:1
-msgid "3D model viewer"
-msgstr "Visionneur de modèles 3D"
-
-#: ../menu-data/g3dviewer:g3dviewer.desktop.in.h:2
 msgid "G3DViewer"
 msgstr "Visionneur G3D"
 
+#: ../menu-data/g3dviewer:g3dviewer.desktop.in.h:2
+msgid "3D model viewer"
+msgstr "Visionneur de modèles 3D"
+
 #: ../menu-data/gabedit:gabedit.desktop.in.h:1
 msgid "Gabedit QC-GUI"
 msgstr "Interface graphique pour Gabedit QC"
@@ -4858,13 +4990,13 @@
 "ordinateur"
 
 #: ../menu-data/gadmin-bind:gadmin-bind.desktop.in.h:1
-msgid "BIND DNS server administration"
-msgstr "BIND, administration de serveurs DNS"
-
-#: ../menu-data/gadmin-bind:gadmin-bind.desktop.in.h:2
 msgid "GADMIN-BIND"
 msgstr "GADMIN-BIND"
 
+#: ../menu-data/gadmin-bind:gadmin-bind.desktop.in.h:2
+msgid "BIND DNS server administration"
+msgstr "BIND, administration de serveurs DNS"
+
 #: ../menu-data/gadmin-openvpn-client:gadmin-openvpn-client.desktop.in.h:1
 msgid "GADMIN-OPENVPN-Client"
 msgstr "GADMIN-OPENVPN-Client"
@@ -4903,21 +5035,21 @@
 "Administration de serveurs de fichiers, d'impression et de domaine SAMBA"
 
 #: ../menu-data/gaiksaurus:gaiksaurus.desktop.in.h:1
-msgid "Find Synonyms and Homonyms"
-msgstr "Trouver des synonymes et des homonymes"
-
-#: ../menu-data/gaiksaurus:gaiksaurus.desktop.in.h:2
 msgid "GTK Aiksaurus"
 msgstr "Aiksaurus GTK"
 
-#: ../menu-data/gajim:gajim.desktop.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Un client Jabber GTK+"
+#: ../menu-data/gaiksaurus:gaiksaurus.desktop.in.h:2
+msgid "Find Synonyms and Homonyms"
+msgstr "Trouver des synonymes et des homonymes"
 
-#: ../menu-data/gajim:gajim.desktop.in.h:2
+#: ../menu-data/gajim:gajim.desktop.in.h:1
 msgid "Gajim Instant Messenger"
 msgstr "Messagerie instantanée Gajim"
 
+#: ../menu-data/gajim:gajim.desktop.in.h:2
+msgid "A GTK+ Jabber client"
+msgstr "Un client Jabber GTK+"
+
 #: ../menu-data/galan:galan.desktop.in.h:1
 msgid "gAlan"
 msgstr "gAlan"
@@ -4931,13 +5063,13 @@
 msgstr "Effectuer des calculs simples ou scientifiques"
 
 #: ../menu-data/gallery-uploader:gallery-uploader.desktop.in.h:1
-msgid "Gallery Uploader"
-msgstr "Gallery Uploader"
-
-#: ../menu-data/gallery-uploader:gallery-uploader.desktop.in.h:2
 msgid "Upload pictures and videos to Gallery"
 msgstr "Publier photos et vidéos dans des galeries Web"
 
+#: ../menu-data/gallery-uploader:gallery-uploader.desktop.in.h:2
+msgid "Gallery Uploader"
+msgstr "Gallery Uploader"
+
 #: ../menu-data/gally:kde4__gally.desktop.in.h:1
 msgid "Gally"
 msgstr "Gally"
@@ -4964,46 +5096,46 @@
 msgstr "Jeu Gamazons"
 
 #: ../menu-data/gambas2-ide:gambas2.desktop.in.h:1
-msgid "Gambas Almost Means Basic"
-msgstr "Gambas Almost Means Basic (langage très proche du Basic)"
-
-#: ../menu-data/gambas2-ide:gambas2.desktop.in.h:2
 msgid "Gambas2"
 msgstr "Gambas2"
 
+#: ../menu-data/gambas2-ide:gambas2.desktop.in.h:2
+msgid "Gambas Almost Means Basic"
+msgstr "Gambas Almost Means Basic (langage très proche du Basic)"
+
 #: ../menu-data/gameconqueror:GameConqueror.desktop.in.h:1
+msgid "Game Conqueror"
+msgstr "Game Conqueror"
+
+#: ../menu-data/gameconqueror:GameConqueror.desktop.in.h:2
 msgid "A game hacking tool. A GUI front-end for scanmem."
 msgstr ""
 "Un outil pour trafiquer les jeux. C'est une interface graphique pour scanmem."
 
-#: ../menu-data/gameconqueror:GameConqueror.desktop.in.h:2
-msgid "Game Conqueror"
-msgstr "Game Conqueror"
-
 #: ../menu-data/gamgi:gamgi.desktop.in.h:1
-msgid "Construct, view and analyse atomic structures"
-msgstr "Construire, voir et analyser des structures atomiques"
-
-#: ../menu-data/gamgi:gamgi.desktop.in.h:2
 msgid "gamgi"
 msgstr "gamgi"
 
-#: ../menu-data/gamt:gamt.desktop.in.h:1
-msgid "Intel AMT serial-over-lan client."
-msgstr "Client SOL (Serial Over LAn) Intel AMT"
+#: ../menu-data/gamgi:gamgi.desktop.in.h:2
+msgid "Construct, view and analyse atomic structures"
+msgstr "Construire, voir et analyser des structures atomiques"
 
-#: ../menu-data/gamt:gamt.desktop.in.h:2
+#: ../menu-data/gamt:gamt.desktop.in.h:1
 msgid "gamt"
 msgstr "gamt"
 
-#: ../menu-data/ganyremote:ganyremote.desktop.in.h:1
-msgid "Bluetooth remote control"
-msgstr "Télécommande Bluetooth"
+#: ../menu-data/gamt:gamt.desktop.in.h:2
+msgid "Intel AMT serial-over-lan client."
+msgstr "Client SOL (Serial Over LAn) Intel AMT"
 
-#: ../menu-data/ganyremote:ganyremote.desktop.in.h:2
+#: ../menu-data/ganyremote:ganyremote.desktop.in.h:1
 msgid "ganyremote"
 msgstr "ganyremote"
 
+#: ../menu-data/ganyremote:ganyremote.desktop.in.h:2
+msgid "Bluetooth remote control"
+msgstr "Télécommande Bluetooth"
+
 #: ../menu-data/gaphor:gaphor.desktop.in.h:1
 msgid "Gaphor"
 msgstr "Gaphor"
@@ -5013,13 +5145,13 @@
 msgstr "Outil de modélisation Gaphor"
 
 #: ../menu-data/garden-of-coloured-lights:garden.desktop.in.h:1
-msgid "Abstract vertical shooter with music elements"
-msgstr ""
-
-#: ../menu-data/garden-of-coloured-lights:garden.desktop.in.h:2
 msgid "Garden of Coloured Lights"
 msgstr "Jardin de Lumières Colorées"
 
+#: ../menu-data/garden-of-coloured-lights:garden.desktop.in.h:2
+msgid "Abstract vertical shooter with music elements"
+msgstr ""
+
 #: ../menu-data/gargoyle-free:gargoyle.desktop.in.h:1
 msgid "Gargoyle"
 msgstr "Gargoyle"
@@ -5048,13 +5180,13 @@
 msgstr "Console graphique pour Asterisk"
 
 #: ../menu-data/gatos:gatos-conf.desktop.in.h:1
-msgid "Gatos Configuration Editor"
-msgstr "Éditeur de configuration Gatos"
-
-#: ../menu-data/gatos:gatos-conf.desktop.in.h:2
 msgid "gatos-conf"
 msgstr "gatos-conf"
 
+#: ../menu-data/gatos:gatos-conf.desktop.in.h:2
+msgid "Gatos Configuration Editor"
+msgstr "Éditeur de configuration Gatos"
+
 #: ../menu-data/gatos:xatitv.desktop.in.h:1
 msgid "TV viewer for ATI video cards"
 msgstr "Afficheur TV pour les cartes graphiques ATI"
@@ -5088,29 +5220,29 @@
 msgstr "Serveur de bataille navale pour Gnome"
 
 #: ../menu-data/gbemol:gbemol.desktop.in.h:1
-msgid "MPD client"
-msgstr "Client MPD"
-
-#: ../menu-data/gbemol:gbemol.desktop.in.h:2
 msgid "gbemol"
 msgstr "gbemol"
 
-#: ../menu-data/gbgoffice:gbgoffice.desktop.in.h:1
-msgid "GTK2 Bulgarian-English Dictionary"
-msgstr "Dictionnaire Bulgare-Anglais avec interface GTK2"
+#: ../menu-data/gbemol:gbemol.desktop.in.h:2
+msgid "MPD client"
+msgstr "Client MPD"
 
-#: ../menu-data/gbgoffice:gbgoffice.desktop.in.h:2
+#: ../menu-data/gbgoffice:gbgoffice.desktop.in.h:1
 msgid "GbgOffice"
 msgstr "GbgOffice"
 
-#: ../menu-data/gbirthday:gbirthday.desktop.in.h:1
-msgid "Birthday reminder for E-Mail contacts"
-msgstr "Rappel des anniversaires de vos contacts"
+#: ../menu-data/gbgoffice:gbgoffice.desktop.in.h:2
+msgid "GTK2 Bulgarian-English Dictionary"
+msgstr "Dictionnaire Bulgare-Anglais avec interface GTK2"
 
-#: ../menu-data/gbirthday:gbirthday.desktop.in.h:2
+#: ../menu-data/gbirthday:gbirthday.desktop.in.h:1
 msgid "GBirthday"
 msgstr "GBirthday"
 
+#: ../menu-data/gbirthday:gbirthday.desktop.in.h:2
+msgid "Birthday reminder for E-Mail contacts"
+msgstr "Rappel des anniversaires de vos contacts"
+
 #: ../menu-data/gbonds:gbonds.desktop.in.h:1
 msgid "GBonds"
 msgstr "GBonds"
@@ -5120,6 +5252,10 @@
 msgstr "Inventoriez vos bons du Trésor"
 
 #: ../menu-data/gbrainy:gbrainy.desktop.in.h:1
+msgid "gbrainy"
+msgstr "gbrainy"
+
+#: ../menu-data/gbrainy:gbrainy.desktop.in.h:2
 msgid ""
 "Play games that challenge your logic, verbal, calculation and memory "
 "abilities"
@@ -5127,10 +5263,6 @@
 "Mettre votre logique, expression, calcul mental et mémoire, à l'épreuve avec "
 "des jeux"
 
-#: ../menu-data/gbrainy:gbrainy.desktop.in.h:2
-msgid "gbrainy"
-msgstr "gbrainy"
-
 #: ../menu-data/gcalctool:gcalctool.desktop.in.h:1
 msgid "Calculator"
 msgstr "Calculatrice"
@@ -5140,37 +5272,29 @@
 msgstr "Effectuer des opérations arithmétiques, scientifiques ou financières"
 
 #: ../menu-data/gchempaint:gchempaint-0.12.desktop.in.h:1
-msgid "Edit chemical 2D structures"
-msgstr "Éditer des structures chimiques en 2D"
-
-#: ../menu-data/gchempaint:gchempaint-0.12.desktop.in.h:2
 msgid "GChemPaint Chemical Structures Editor"
 msgstr "Éditeur de structures chimiques GChemPaint"
 
-#: ../menu-data/gcin:gcin-setup.desktop.in.h:1
-msgid "Setup utility for gcin input method"
-msgstr "Utilitaire de configuration pour la méthode de saisie Gcin"
-
-#: ../menu-data/gcin:gcin-setup.desktop.in.h:2
-msgid "gcin Setup"
-msgstr "Configuration de Gcin"
+#: ../menu-data/gchempaint:gchempaint-0.12.desktop.in.h:2
+msgid "Edit chemical 2D structures"
+msgstr "Éditer des structures chimiques en 2D"
 
 #: ../menu-data/gcipher:gcipher.desktop.in.h:1
-msgid "A simple encryption tool"
-msgstr "Un outil simple de chiffrement"
-
-#: ../menu-data/gcipher:gcipher.desktop.in.h:2
 msgid "GCipher"
 msgstr "GCipher"
 
-#: ../menu-data/gco:gco.desktop.in.h:1
-msgid "A GNOME interface for managing your comic book collection"
-msgstr "Une interface Gnome pour gérer votre collection de bandes dessinées"
+#: ../menu-data/gcipher:gcipher.desktop.in.h:2
+msgid "A simple encryption tool"
+msgstr "Un outil simple de chiffrement"
 
-#: ../menu-data/gco:gco.desktop.in.h:2
+#: ../menu-data/gco:gco.desktop.in.h:1
 msgid "GNOME Comics Organizer"
 msgstr "Classeur de bandes dessinées pour GNOME"
 
+#: ../menu-data/gco:gco.desktop.in.h:2
+msgid "A GNOME interface for managing your comic book collection"
+msgstr "Une interface Gnome pour gérer votre collection de bandes dessinées"
+
 #: ../menu-data/gcolor2:gcolor2.desktop.in.h:1
 msgid "Gcolor2"
 msgstr "Gcolor2"
@@ -5180,41 +5304,41 @@
 msgstr "Sélecteur de couleurs simple GTK2"
 
 #: ../menu-data/gcompris:gcompris.desktop.in.h:1
-msgid "Educational game for ages 2 to 10"
-msgstr "Jeu éducatif pour les enfants de 2 à 10 ans"
-
-#: ../menu-data/gcompris:gcompris.desktop.in.h:2
 msgid "Educational suite GCompris"
 msgstr "Suite éducative GCompris"
 
-#: ../menu-data/gconf-cleaner:gconf-cleaner.desktop.in.h:1
-msgid "A Cleaning tool for GConf"
-msgstr "Un outil de nettoyage pour GConf"
+#: ../menu-data/gcompris:gcompris.desktop.in.h:2
+msgid "Educational game for ages 2 to 10"
+msgstr "Jeu éducatif pour les enfants de 2 à 10 ans"
 
-#: ../menu-data/gconf-cleaner:gconf-cleaner.desktop.in.h:2
+#: ../menu-data/gconf-cleaner:gconf-cleaner.desktop.in.h:1
 msgid "GConf Cleaner"
 msgstr "Nettoyeur pour GConf"
 
+#: ../menu-data/gconf-cleaner:gconf-cleaner.desktop.in.h:2
+msgid "A Cleaning tool for GConf"
+msgstr "Un outil de nettoyage pour GConf"
+
 #: ../menu-data/gconf-editor:gconf-editor.desktop.in.h:1
 msgid "Configuration Editor"
 msgstr "Éditeur de configuration"
 
 #: ../menu-data/gconjugue:gconjugue.desktop.in.h:1
-msgid "Conjugates Portuguese verbs"
-msgstr "Conjugaison des verbes en portugais"
-
-#: ../menu-data/gconjugue:gconjugue.desktop.in.h:2
 msgid "GConjugue"
 msgstr "GConjugue"
 
-#: ../menu-data/gcrystal:gcrystal-0.12.desktop.in.h:1
-msgid "Edit and display crystalline structures"
-msgstr "Éditer et afficher des structures cristallines"
+#: ../menu-data/gconjugue:gconjugue.desktop.in.h:2
+msgid "Conjugates Portuguese verbs"
+msgstr "Conjugaison des verbes en portugais"
 
-#: ../menu-data/gcrystal:gcrystal-0.12.desktop.in.h:2
+#: ../menu-data/gcrystal:gcrystal-0.12.desktop.in.h:1
 msgid "Gnome Crystal Crystalline Structures Viewer"
 msgstr "Afficheur de structure cristallines Gnome Crystal"
 
+#: ../menu-data/gcrystal:gcrystal-0.12.desktop.in.h:2
+msgid "Edit and display crystalline structures"
+msgstr "Éditer et afficher des structures cristallines"
+
 #: ../menu-data/gcstar:gcstar.desktop.in.h:1
 msgid "GCstar Collections Manager"
 msgstr "Gestionnaire de collections GCstar"
@@ -5225,37 +5349,37 @@
 "Gèrez vos bibliothèques de films, jeux, livres, musiques et plus encore"
 
 #: ../menu-data/gcu-bin:gchem3d-0.12.desktop.in.h:1
-msgid "Display chemical 3D structures"
-msgstr "Afficher des structures chimiques en 3D"
-
-#: ../menu-data/gcu-bin:gchem3d-0.12.desktop.in.h:2
 msgid "Molecules Viewer"
 msgstr "Afficheur de molécules"
 
-#: ../menu-data/gcu-bin:gchemcalc-0.12.desktop.in.h:1
-msgid "A simple calculator for chemistry"
-msgstr "Une calculatrice simple pour la chimie"
+#: ../menu-data/gcu-bin:gchem3d-0.12.desktop.in.h:2
+msgid "Display chemical 3D structures"
+msgstr "Afficher des structures chimiques en 3D"
 
-#: ../menu-data/gcu-bin:gchemcalc-0.12.desktop.in.h:2
+#: ../menu-data/gcu-bin:gchemcalc-0.12.desktop.in.h:1
 msgid "Chemical calculator"
 msgstr "Calculatrice pour la chimie"
 
-#: ../menu-data/gcu-bin:gchemtable-0.12.desktop.in.h:1
-msgid "A Mendeleiev table of the chemical elements"
-msgstr "Tableau de classification périodique des éléments de Mendeleïev"
+#: ../menu-data/gcu-bin:gchemcalc-0.12.desktop.in.h:2
+msgid "A simple calculator for chemistry"
+msgstr "Une calculatrice simple pour la chimie"
 
-#: ../menu-data/gcu-bin:gchemtable-0.12.desktop.in.h:2
+#: ../menu-data/gcu-bin:gchemtable-0.12.desktop.in.h:1
 msgid "Periodic table of the elements"
 msgstr "Tableau de classification périodique des éléments"
 
-#: ../menu-data/gcu-bin:gspectrum-0.12.desktop.in.h:1
-msgid "A spectrum viewer for the GNOME desktop"
-msgstr "Un visionneur de spectre pour le bureau GNOME"
+#: ../menu-data/gcu-bin:gchemtable-0.12.desktop.in.h:2
+msgid "A Mendeleiev table of the chemical elements"
+msgstr "Tableau de classification périodique des éléments de Mendeleïev"
 
-#: ../menu-data/gcu-bin:gspectrum-0.12.desktop.in.h:2
+#: ../menu-data/gcu-bin:gspectrum-0.12.desktop.in.h:1
 msgid "Spectrum viewer"
 msgstr "Afficheur de spectres (chimie)"
 
+#: ../menu-data/gcu-bin:gspectrum-0.12.desktop.in.h:2
+msgid "A spectrum viewer for the GNOME desktop"
+msgstr "Un visionneur de spectre pour le bureau GNOME"
+
 #: ../menu-data/gcursor:gcursor.desktop.in.h:1
 msgid "Cursor Selection"
 msgstr "Sélection de curseurs"
@@ -5279,7 +5403,7 @@
 
 #: ../menu-data/gdebi-kde:kde4__gdebi-kde.desktop.in.h:2
 #: ../menu-data/gdebi:gdebi.desktop.in.h:2
-#: ../menu-data/qapt-deb-installer:kde4__qapt-deb-installer.desktop.in.h:1
+#: ../menu-data/qapt-deb-installer:kde4__qapt-deb-installer.desktop.in.h:2
 msgid "Install and view software packages"
 msgstr "Installer des paquets logiciels et voir leur contenu"
 
@@ -5293,21 +5417,21 @@
 "Interface utilisateur graphique pour lier/monter des partitions chiffrées"
 
 #: ../menu-data/gdesklets:gdesklets.desktop.in.h:1
-msgid "A desktop applet system for GNOME"
-msgstr "Applet système pour le bureau GNOME"
-
-#: ../menu-data/gdesklets:gdesklets.desktop.in.h:2
 msgid "gDesklets"
 msgstr "gDesklets"
 
-#: ../menu-data/gdevilspie:gdevilspie.desktop.in.h:1
-msgid "GUI for devilspie matching daemon"
-msgstr "Interface graphique pour gérer le démon develspie"
+#: ../menu-data/gdesklets:gdesklets.desktop.in.h:2
+msgid "A desktop applet system for GNOME"
+msgstr "Applet système pour le bureau GNOME"
 
-#: ../menu-data/gdevilspie:gdevilspie.desktop.in.h:2
+#: ../menu-data/gdevilspie:gdevilspie.desktop.in.h:1
 msgid "gDevilspie"
 msgstr "gDevilspie"
 
+#: ../menu-data/gdevilspie:gdevilspie.desktop.in.h:2
+msgid "GUI for devilspie matching daemon"
+msgstr "Interface graphique pour gérer le démon develspie"
+
 #: ../menu-data/gdigi:gdigi.desktop.in.h:1
 msgid "gdigi"
 msgstr "gdigi"
@@ -5324,13 +5448,13 @@
 "celles-ci"
 
 #: ../menu-data/gdmap:gdmap.desktop.in.h:1
-msgid "Display disk space using tree maps"
-msgstr "Afficher l'espace disque en utilisant une cartographie arborescente"
-
-#: ../menu-data/gdmap:gdmap.desktop.in.h:2
 msgid "Graphical Disk Map"
 msgstr "Cartographie graphique des disques"
 
+#: ../menu-data/gdmap:gdmap.desktop.in.h:2
+msgid "Display disk space using tree maps"
+msgstr "Afficher l'espace disque en utilisant une cartographie arborescente"
+
 #: ../menu-data/gdpc:gdpc.desktop.in.h:1
 msgid "GDPC Molecular Dynamic Simulator"
 msgstr "Simulateur moléculaire dynamique GDPC"
@@ -5340,80 +5464,76 @@
 msgstr "Visualiser des simulations moléculaires dynamiques"
 
 #: ../menu-data/geany:geany.desktop.in.h:1
+msgid "Geany"
+msgstr "Geany"
+
+#: ../menu-data/geany:geany.desktop.in.h:2
 msgid "A fast and lightweight IDE using GTK2"
 msgstr ""
 "Un environnement de développement intégré (EDI) rapide et léger utilisant "
 "GTK2"
 
-#: ../menu-data/geany:geany.desktop.in.h:2
-msgid "Geany"
-msgstr "Geany"
-
 #: ../menu-data/gebabbel:gebabbel.desktop.in.h:1
-msgid "Convert GPS data and exchange it with a GPS unit"
-msgstr "Convertir des données GPS et les échanger avec un élément GPS"
-
-#: ../menu-data/gebabbel:gebabbel.desktop.in.h:2
 msgid "Gebabbel"
 msgstr "Gebabbel"
 
-#: ../menu-data/gecrit:gecrit.desktop.in.h:1
-msgid "A python text editor."
-msgstr "Un éditeur de texte en python."
+#: ../menu-data/gebabbel:gebabbel.desktop.in.h:2
+msgid "Convert GPS data and exchange it with a GPS unit"
+msgstr "Convertir des données GPS et les échanger avec un élément GPS"
 
-#: ../menu-data/gecrit:gecrit.desktop.in.h:2
+#: ../menu-data/gecrit:gecrit.desktop.in.h:1
 msgid "gEcrit"
 msgstr "gEcrit"
 
-#: ../menu-data/geda-gattrib:geda-gattrib.desktop.in.h:1
-msgid "Manipulate component attributes with gattrib"
-msgstr "Manipuler les attributs des composants avec gattrib"
+#: ../menu-data/gecrit:gecrit.desktop.in.h:2
+msgid "A python text editor."
+msgstr "Un éditeur de texte en python."
 
-#: ../menu-data/geda-gattrib:geda-gattrib.desktop.in.h:2
+#: ../menu-data/geda-gattrib:geda-gattrib.desktop.in.h:1
 msgid "gEDA Attribute Editor"
 msgstr "Éditeur d'attributs gEDA"
 
-#: ../menu-data/geda-gschem:geda-gschem.desktop.in.h:1
-msgid "Create and edit electrical schematics and symbols with gschem"
-msgstr "Créer et éditer des schémas électriques et des symboles avec gschem"
+#: ../menu-data/geda-gattrib:geda-gattrib.desktop.in.h:2
+msgid "Manipulate component attributes with gattrib"
+msgstr "Manipuler les attributs des composants avec gattrib"
 
-#: ../menu-data/geda-gschem:geda-gschem.desktop.in.h:2
+#: ../menu-data/geda-gschem:geda-gschem.desktop.in.h:1
 msgid "gEDA Schematic Editor"
 msgstr "Éditeur de schémas gEDA"
 
-#: ../menu-data/geda-xgsch2pcb:geda-xgsch2pcb.desktop.in.h:1
-msgid "Create and edit electronics projects with xgsch2pcb"
-msgstr "Créer et éditer des projets d'électronique avec xgsch2pcb"
+#: ../menu-data/geda-gschem:geda-gschem.desktop.in.h:2
+msgid "Create and edit electrical schematics and symbols with gschem"
+msgstr "Créer et éditer des schémas électriques et des symboles avec gschem"
 
-#: ../menu-data/geda-xgsch2pcb:geda-xgsch2pcb.desktop.in.h:2
+#: ../menu-data/geda-xgsch2pcb:geda-xgsch2pcb.desktop.in.h:1
 msgid "gEDA Schematic -> PCB Project"
 msgstr "Schémas gEDA -> projets PCB"
 
+#: ../menu-data/geda-xgsch2pcb:geda-xgsch2pcb.desktop.in.h:2
+msgid "Create and edit electronics projects with xgsch2pcb"
+msgstr "Créer et éditer des projets d'électronique avec xgsch2pcb"
+
 #: ../menu-data/gedit:gedit.desktop.in.h:1
-#: ../menu-data/jedit:jedit.desktop.in.h:1
-#: ../menu-data/scribes:scribes.desktop.in.h:1
-#: ../menu-data/vim-gui-common:gvim.desktop.in.h:1
+#: ../menu-data/jedit:jedit.desktop.in.h:2
+#: ../menu-data/scribes:scribes.desktop.in.h:2
+#: ../menu-data/vim-gui-common:gvim.desktop.in.h:2
 msgid "Edit text files"
 msgstr "Éditer des fichiers texte"
 
 #: ../menu-data/gedit:gedit.desktop.in.h:2
-#: ../menu-data/kwrite:kde4__kwrite.desktop.in.h:2
+#: ../menu-data/kwrite:kde4__kwrite.desktop.in.h:1
+#: ../menu-data/mined:mined.desktop.in.h:2
 msgid "Text Editor"
 msgstr "Éditeur de texte"
 
-#: ../menu-data/geeqie-gps:geeqie-gps.desktop.in.h:1
-msgid "Geeqie (GPS support)"
-msgstr "Geeqie (avec prise en charge GPS)"
+#: ../menu-data/geeqie:geeqie-standard.desktop.in.h:1
+msgid "Geeqie"
+msgstr "Geeqie"
 
-#: ../menu-data/geeqie-gps:geeqie-gps.desktop.in.h:2
 #: ../menu-data/geeqie:geeqie-standard.desktop.in.h:2
 msgid "View and manage images"
 msgstr "Afficher et gérer des images"
 
-#: ../menu-data/geeqie:geeqie-standard.desktop.in.h:1
-msgid "Geeqie"
-msgstr "Geeqie"
-
 #: ../menu-data/gelemental:gelemental.desktop.in.h:1
 msgid "Periodic Table"
 msgstr "Tableau périodique"
@@ -5445,31 +5565,31 @@
 msgstr "Simuler divers types de systèmes neuronaux"
 
 #: ../menu-data/genpo:genpo.desktop.in.h:1
-msgid "GENPO is the GENeral Purpose Organ."
-msgstr "GENPO (GENeral Purpose Organ) simule un orgue"
-
-#: ../menu-data/genpo:genpo.desktop.in.h:2
 msgid "Genpo"
 msgstr "Genpo"
 
+#: ../menu-data/genpo:genpo.desktop.in.h:2
+msgid "GENPO is the GENeral Purpose Organ."
+msgstr "GENPO (GENeral Purpose Organ) simule un orgue"
+
 #: ../menu-data/gentoo:gentoo.desktop.in.h:1
+msgid "Gentoo"
+msgstr "Gentoo"
+
+#: ../menu-data/gentoo:gentoo.desktop.in.h:2
 msgid "Fully GUI-configurable, two-pane X file manager"
 msgstr ""
 "Gestionnaire de fichier à interface graphique complètement configurable et à "
 "double panneau"
 
-#: ../menu-data/gentoo:gentoo.desktop.in.h:2
-msgid "Gentoo"
-msgstr "Gentoo"
-
 #: ../menu-data/geogebra:geogebra.desktop.in.h:1
-msgid "Create interactive mathematical constructions and applets. "
-msgstr "Créer des applets et des constructions mathématiques interactives. "
-
-#: ../menu-data/geogebra:geogebra.desktop.in.h:2
 msgid "GeoGebra"
 msgstr "GeoGebra"
 
+#: ../menu-data/geogebra:geogebra.desktop.in.h:2
+msgid "Create interactive mathematical constructions and applets. "
+msgstr "Créer des applets et des constructions mathématiques interactives. "
+
 #: ../menu-data/geomview:geomview.desktop.in.h:1
 msgid "Geomview"
 msgstr "Geomview"
@@ -5479,51 +5599,51 @@
 msgstr "Programme de visualisation interactive de géométrie"
 
 #: ../menu-data/geotranz:geotranz.desktop.in.h:1
-msgid "Geographic coordinates translator"
-msgstr "Convertisseur de coordonnées géographiques"
-
-#: ../menu-data/geotranz:geotranz.desktop.in.h:2
 msgid "Geotranz"
 msgstr "Geotranz"
 
-#: ../menu-data/gerbv:gerbv.desktop.in.h:1
-msgid "Gerber file viewer for PCB design"
-msgstr "Afficheur de fichiers Gerber pour la conception de PCB"
+#: ../menu-data/geotranz:geotranz.desktop.in.h:2
+msgid "Geographic coordinates translator"
+msgstr "Convertisseur de coordonnées géographiques"
 
-#: ../menu-data/gerbv:gerbv.desktop.in.h:2
+#: ../menu-data/gerbv:gerbv.desktop.in.h:1
 msgid "Gerbv Gerber File Viewer"
 msgstr "Afficheur de fichiers Gerber Gerbv"
 
+#: ../menu-data/gerbv:gerbv.desktop.in.h:2
+msgid "Gerber file viewer for PCB design"
+msgstr "Afficheur de fichiers Gerber pour la conception de PCB"
+
 #: ../menu-data/gerstensaft:gerstensaft.desktop.in.h:1
 msgid "Graphical frontend to SAFT"
 msgstr "Interface graphique pour SAFT (Simple Asynchronous File Transfer)"
 
 #: ../menu-data/gespeaker:gespeaker.desktop.in.h:1
-msgid "A frontend for espeak"
-msgstr "Interface pour espeak"
-
-#: ../menu-data/gespeaker:gespeaker.desktop.in.h:2
 msgid "Gespeaker"
 msgstr "Gespeaker"
 
+#: ../menu-data/gespeaker:gespeaker.desktop.in.h:2
+msgid "A frontend for espeak"
+msgstr "Interface pour espeak"
+
 #: ../menu-data/gextractwinicons:gextractwinicons.desktop.in.h:1
+msgid "gExtractWinIcons"
+msgstr "gExtractWinIcons"
+
+#: ../menu-data/gextractwinicons:gextractwinicons.desktop.in.h:2
 msgid "Extract cursors and icons from MS Windows compatible resource files"
 msgstr ""
 "Extrait curseurs et icones stockés dans les fichiers de ressources "
 "compatible MS Windows"
 
-#: ../menu-data/gextractwinicons:gextractwinicons.desktop.in.h:2
-msgid "gExtractWinIcons"
-msgstr "gExtractWinIcons"
-
 #: ../menu-data/gfaim:gfaim.desktop.in.h:1
-msgid "Find any recipe you want"
-msgstr "Trouver la recette que vous désirez"
-
-#: ../menu-data/gfaim:gfaim.desktop.in.h:2
 msgid "Gfaim"
 msgstr "Gfaim"
 
+#: ../menu-data/gfaim:gfaim.desktop.in.h:2
+msgid "Find any recipe you want"
+msgstr "Trouver la recette que vous désirez"
+
 #: ../menu-data/gfax:gfax.desktop.in.h:1
 msgid "Gfax Facsimile Program"
 msgstr "Programme de fax Gfax"
@@ -5545,15 +5665,15 @@
 msgstr "Jeu de logique GFingerPoken"
 
 #: ../menu-data/gftp-gtk:gftp.desktop.in.h:1
+msgid "gFTP"
+msgstr "Client FTP gFTP"
+
+#: ../menu-data/gftp-gtk:gftp.desktop.in.h:2
 msgid "Download and upload files using multiple file transfer protocols"
 msgstr ""
 "Télécharger ou envoyer des fichiers en utilisant divers protocoles de "
 "transfert"
 
-#: ../menu-data/gftp-gtk:gftp.desktop.in.h:2
-msgid "gFTP"
-msgstr "Client FTP gFTP"
-
 #: ../menu-data/ggcov:Development__ggcov.desktop.in.h:1
 msgid "GGcov"
 msgstr "GGcov"
@@ -5572,31 +5692,31 @@
 "Graphiques interactifs à variables multiples pour l'analyse de données"
 
 #: ../menu-data/ggz-gnome-client:ggz-gnome.desktop.in.h:1
-#: ../menu-data/ggz-gtk-client:ggz-gtk.desktop.in.h:1
-#: ../menu-data/ggz-txt-client:ggz-txt.desktop.in.h:1
-msgid "GGZ Core Client"
-msgstr "Client de base GGZ"
-
-#: ../menu-data/ggz-gnome-client:ggz-gnome.desktop.in.h:2
 msgid "GGZ-Gnome"
 msgstr "GGZ-Gnome"
 
+#: ../menu-data/ggz-gnome-client:ggz-gnome.desktop.in.h:2
 #: ../menu-data/ggz-gtk-client:ggz-gtk.desktop.in.h:2
+#: ../menu-data/ggz-txt-client:ggz-txt.desktop.in.h:2
+msgid "GGZ Core Client"
+msgstr "Client de base GGZ"
+
+#: ../menu-data/ggz-gtk-client:ggz-gtk.desktop.in.h:1
 msgid "ggz-gtk"
 msgstr "ggz-gtk"
 
-#: ../menu-data/ggz-txt-client:ggz-txt.desktop.in.h:2
+#: ../menu-data/ggz-txt-client:ggz-txt.desktop.in.h:1
 msgid "ggz-txt"
 msgstr "ggz-txt"
 
 #: ../menu-data/ghemical:ghemical.desktop.in.h:1
-msgid "Draw models of molecules"
-msgstr "Dessiner des modèles moléculaires"
-
-#: ../menu-data/ghemical:ghemical.desktop.in.h:2
 msgid "ghemical"
 msgstr "ghemical"
 
+#: ../menu-data/ghemical:ghemical.desktop.in.h:2
+msgid "Draw models of molecules"
+msgstr "Dessiner des modèles moléculaires"
+
 #: ../menu-data/ghex:ghex.desktop.in.h:1
 msgid "GHex"
 msgstr "GHex"
@@ -5606,13 +5726,13 @@
 msgstr "Verifier et modifier des fichiers binaires"
 
 #: ../menu-data/ghextris:ghextris.desktop.in.h:1
-msgid "Fit falling blocks together on a hexagonal grid"
-msgstr "Assembler des blocs qui tombent sur une grille hexagonale"
-
-#: ../menu-data/ghextris:ghextris.desktop.in.h:2
 msgid "Ghextris"
 msgstr "Ghextris"
 
+#: ../menu-data/ghextris:ghextris.desktop.in.h:2
+msgid "Fit falling blocks together on a hexagonal grid"
+msgstr "Assembler des blocs qui tombent sur une grille hexagonale"
+
 #: ../menu-data/ghkl:ghkl.desktop.in.h:1
 msgid "ghkl"
 msgstr "ghkl"
@@ -5630,15 +5750,15 @@
 msgstr "Afficheur de dépôts Git"
 
 #: ../menu-data/gigolo:gigolo.desktop.in.h:1
+msgid "Gigolo"
+msgstr "Gigolo"
+
+#: ../menu-data/gigolo:gigolo.desktop.in.h:2
 msgid "A simple frontend to easily connect to remote filesystems"
 msgstr ""
 "Une interface simple pour se connecter facilement à des systèmes de fichiers "
 "distants"
 
-#: ../menu-data/gigolo:gigolo.desktop.in.h:2
-msgid "Gigolo"
-msgstr "Gigolo"
-
 #: ../menu-data/gimmix:gimmix.desktop.in.h:1
 msgid "Gimmix"
 msgstr "Gimmix"
@@ -5650,13 +5770,13 @@
 "en C."
 
 #: ../menu-data/gimp:gimp.desktop.in.h:1
-msgid "Create images and edit photographs"
-msgstr "Créer des images et modifier des photographies"
-
-#: ../menu-data/gimp:gimp.desktop.in.h:2
 msgid "GIMP Image Editor"
 msgstr "Éditeur d'images GIMP"
 
+#: ../menu-data/gimp:gimp.desktop.in.h:2
+msgid "Create images and edit photographs"
+msgstr "Créer des images et modifier des photographies"
+
 #: ../menu-data/ginkgocadx:ginkgocadx.desktop.in.h:1
 msgid "Ginkgo CADx"
 msgstr "Ginkgo CADx (DAO)"
@@ -5666,50 +5786,50 @@
 msgstr "Afficheur d'images medicales DICOM"
 
 #: ../menu-data/gip:gip.desktop.in.h:1
-msgid "Calculate IP addresses and networks"
-msgstr "Calculer les adresses IP et les réseaux"
-
-#: ../menu-data/gip:gip.desktop.in.h:2
 msgid "Gip IP Address Calculator"
 msgstr "Calculatrice d'adresses IP Gip"
 
+#: ../menu-data/gip:gip.desktop.in.h:2
+msgid "Calculate IP addresses and networks"
+msgstr "Calculer les adresses IP et les réseaux"
+
 #: ../menu-data/gisomount:gisomount.desktop.in.h:1
 msgid "gISOMount"
 msgstr "gISOMount"
 
 #: ../menu-data/git-cola:cola.desktop.in.h:1
-msgid "A highly caffeinated git GUI"
-msgstr "Une interface graphique sur-vitaminée pour git"
-
-#: ../menu-data/git-cola:cola.desktop.in.h:2
 msgid "Cola Git GUI"
 msgstr "Cola, interface graphique à Git"
 
-#: ../menu-data/gitg:gitg.desktop.in.h:1
-msgid "Git repository browser"
-msgstr "Navigateur de dépôts Git"
+#: ../menu-data/git-cola:cola.desktop.in.h:2
+msgid "A highly caffeinated git GUI"
+msgstr "Une interface graphique sur-vitaminée pour git"
 
-#: ../menu-data/gitg:gitg.desktop.in.h:2
+#: ../menu-data/gitg:gitg.desktop.in.h:1
 msgid "gitg"
 msgstr "gitg"
 
-#: ../menu-data/gjacktransport:gjackclock.desktop.in.h:1
-msgid "Display JACK transport timecode"
-msgstr "Afficher les codes temporels du transport JACK"
+#: ../menu-data/gitg:gitg.desktop.in.h:2
+msgid "Git repository browser"
+msgstr "Navigateur de dépôts Git"
 
-#: ../menu-data/gjacktransport:gjackclock.desktop.in.h:2
+#: ../menu-data/gjacktransport:gjackclock.desktop.in.h:1
 msgid "G. JACK Clock"
 msgstr "Horloge G. JACK"
 
+#: ../menu-data/gjacktransport:gjackclock.desktop.in.h:2
+msgid "Display JACK transport timecode"
+msgstr "Afficher les codes temporels du transport JACK"
+
 #: ../menu-data/gjacktransport:gjacktransport.desktop.in.h:1
+msgid "G. JACK Transport"
+msgstr "Transport G. JACK"
+
+#: ../menu-data/gjacktransport:gjacktransport.desktop.in.h:2
 msgid "Access JACK transport mechanism via a dynamic graphical slider. "
 msgstr ""
 "Accès au mécanisme de transport JACK via un curseur graphique dynamique. "
 
-#: ../menu-data/gjacktransport:gjacktransport.desktop.in.h:2
-msgid "G. JACK Transport"
-msgstr "Transport G. JACK"
-
 #: ../menu-data/gjiten:gjiten.desktop.in.h:1
 msgid "Gjiten"
 msgstr "Gjiten"
@@ -5727,21 +5847,21 @@
 msgstr "Stocker et organiser les notes prises au hasard"
 
 #: ../menu-data/gkamus:gkamus.desktop.in.h:1
-msgid "English - Indonesian dictionary"
-msgstr "Dictionnaire Anglais - Indonésien"
-
-#: ../menu-data/gkamus:gkamus.desktop.in.h:2
 msgid "gKamus"
 msgstr "gKamus"
 
-#: ../menu-data/gkbd-capplet:gkbd-indicator-plugins-capplet.desktop.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "Activer/désactiver les greffons installés"
+#: ../menu-data/gkamus:gkamus.desktop.in.h:2
+msgid "English - Indonesian dictionary"
+msgstr "Dictionnaire Anglais - Indonésien"
 
-#: ../menu-data/gkbd-capplet:gkbd-indicator-plugins-capplet.desktop.in.h:2
+#: ../menu-data/gkbd-capplet:gkbd-indicator-plugins-capplet.desktop.in.h:1
 msgid "Keyboard Indicator plugins"
 msgstr "Greffons indicateurs du clavier"
 
+#: ../menu-data/gkbd-capplet:gkbd-indicator-plugins-capplet.desktop.in.h:2
+msgid "Enable/disable installed plugins"
+msgstr "Activer/désactiver les greffons installés"
+
 #: ../menu-data/gkbd-capplet:gkbd-keyboard-display.desktop.in.h:1
 msgid "Keyboard Layout"
 msgstr "Agencements de claviers"
@@ -5768,42 +5888,42 @@
 "Surveillance du CPU, de la mémoire, des disques, du réseau, du courriel"
 
 #: ../menu-data/gl-117:gl-117.desktop.in.h:1
-msgid "Play a flight simulator"
-msgstr "Jouer avec un simulateur de vol"
-
-#: ../menu-data/gl-117:gl-117.desktop.in.h:2
 msgid "gl-117"
 msgstr "gl-117"
 
+#: ../menu-data/gl-117:gl-117.desktop.in.h:2
+msgid "Play a flight simulator"
+msgstr "Jouer avec un simulateur de vol"
+
 #: ../menu-data/glabels:glabels.desktop.in.h:1
+msgid "gLabels Label Designer"
+msgstr "Concepteur d'étiquettes gLabels"
+
+#: ../menu-data/glabels:glabels.desktop.in.h:2
 msgid "Create labels, business cards and media covers"
 msgstr ""
 "Créer des étiquettes, des cartes de visite professionnelles et des jaquettes "
 "pour médias"
 
-#: ../menu-data/glabels:glabels.desktop.in.h:2
-msgid "gLabels Label Designer"
-msgstr "Concepteur d'étiquettes gLabels"
-
 #: ../menu-data/glade-gtk2:glade-3.desktop.in.h:1
 #: ../menu-data/glade:glade.desktop.in.h:1
-msgid "Create or open user interface designs for GTK+ applications"
-msgstr ""
-"Créer ou ouvrir des interfaces utilisateur pour les applications GTK+"
+msgid "Glade Interface Designer"
+msgstr "Concepteur d'interface Glade"
 
 #: ../menu-data/glade-gtk2:glade-3.desktop.in.h:2
 #: ../menu-data/glade:glade.desktop.in.h:2
-msgid "Glade Interface Designer"
-msgstr "Concepteur d'interface Glade"
+msgid "Create or open user interface designs for GTK+ applications"
+msgstr ""
+"Créer ou ouvrir des interfaces utilisateur pour les applications GTK+"
 
 #: ../menu-data/gladish:gladish.desktop.in.h:1
-msgid "LADI Session Handler"
-msgstr "Gestionnaire de session LADI"
-
-#: ../menu-data/gladish:gladish.desktop.in.h:2
 msgid "gladish"
 msgstr "gladish"
 
+#: ../menu-data/gladish:gladish.desktop.in.h:2
+msgid "LADI Session Handler"
+msgstr "Gestionnaire de session LADI"
+
 #: ../menu-data/glame:Multimedia__glame.desktop.in.h:1
 msgid "GLAME"
 msgstr "GLAME"
@@ -5820,14 +5940,6 @@
 msgid "Play the classic two-player boardgame of chess"
 msgstr "Jouer au jeu d'échecs classique à deux joueurs"
 
-#: ../menu-data/glest:glest.desktop.in.h:1
-msgid "Glest"
-msgstr "Glest"
-
-#: ../menu-data/glest:glest.desktop.in.h:2
-msgid "Play a real-time strategy game with 3D graphics"
-msgstr "Jouer à un jeu de stratégie en temps réel avec des graphismes en 3D"
-
 #: ../menu-data/glfer:glfer.desktop.in.h:1
 msgid "glfer"
 msgstr "glfer"
@@ -5853,61 +5965,53 @@
 msgstr "Afficher des images en utilisant gdk-pixbuf et OpenGL"
 
 #: ../menu-data/glob2:glob2.desktop.in.h:1
-msgid "An innovative new strategy game"
-msgstr "Un nouveau jeu de stratégie innovant"
-
-#: ../menu-data/glob2:glob2.desktop.in.h:2
 msgid "Globulation 2"
 msgstr "Globulation 2"
 
-#: ../menu-data/globs:globs.desktop.in.h:1
-msgid "GL Open Benchmark Suite"
-msgstr "Suite de tests pour GL Open"
+#: ../menu-data/glob2:glob2.desktop.in.h:2
+msgid "An innovative new strategy game"
+msgstr "Un nouveau jeu de stratégie innovant"
 
-#: ../menu-data/globs:globs.desktop.in.h:2
+#: ../menu-data/globs:globs.desktop.in.h:1
 msgid "Globs"
 msgstr "Globs"
 
-#: ../menu-data/glogg:glogg.desktop.in.h:1
-msgid "A smart interactive log explorer."
-msgstr "Un explorateur intelligent et interactif de journaux systèmes."
+#: ../menu-data/globs:globs.desktop.in.h:2
+msgid "GL Open Benchmark Suite"
+msgstr "Suite de tests pour GL Open"
 
-#: ../menu-data/glogg:glogg.desktop.in.h:2
+#: ../menu-data/glogg:glogg.desktop.in.h:1
 msgid "glogg"
 msgstr "glogg"
 
-#: ../menu-data/glom:glom.desktop.in.h:1
-msgid "A user-friendly database environment."
-msgstr "Un environnement de base de données facile à utiliser."
-
-#: ../menu-data/glom:glom.desktop.in.h:2
-msgid "Glom"
-msgstr "Glom"
+#: ../menu-data/glogg:glogg.desktop.in.h:2
+msgid "A smart interactive log explorer."
+msgstr "Un explorateur intelligent et interactif de journaux systèmes."
 
 #: ../menu-data/glpeces:glpeces.desktop.in.h:1
-msgid "GLPeces"
-msgstr "GLPeces"
-
-#: ../menu-data/glpeces:glpeces.desktop.in.h:2
 msgid "Play with 33 tangram and more 4600 figures"
 msgstr "Jouer avec 33 tangram et plus de 4600 figures"
 
-#: ../menu-data/gltron:gltron.desktop.in.h:1
-msgid "Play a Tron-like light cycle game"
-msgstr "Jouez à un petit jeu de bicyclette semblable à Tron"
+#: ../menu-data/glpeces:glpeces.desktop.in.h:2
+msgid "GLPeces"
+msgstr "GLPeces"
 
-#: ../menu-data/gltron:gltron.desktop.in.h:2
+#: ../menu-data/gltron:gltron.desktop.in.h:1
 msgid "glTron"
 msgstr "glTron"
 
-#: ../menu-data/glurp:glurp.desktop.in.h:1
-msgid "A Client for the MPD daemon"
-msgstr "Client pour le démon MPD"
+#: ../menu-data/gltron:gltron.desktop.in.h:2
+msgid "Play a Tron-like light cycle game"
+msgstr "Jouez à un petit jeu de bicyclette semblable à Tron"
 
-#: ../menu-data/glurp:glurp.desktop.in.h:2
+#: ../menu-data/glurp:glurp.desktop.in.h:1
 msgid "Glurp"
 msgstr "Glurp"
 
+#: ../menu-data/glurp:glurp.desktop.in.h:2
+msgid "A Client for the MPD daemon"
+msgstr "Client pour le démon MPD"
+
 #: ../menu-data/gmail-notify:gmail-notify.desktop.in.h:1
 msgid "Gmail Notify"
 msgstr "Notifications Gmail, Gmail Notify"
@@ -5925,21 +6029,21 @@
 msgstr "Jouer et parcourir les anciens jeux d'arcade"
 
 #: ../menu-data/gmanedit:gmanedit.desktop.in.h:1
-msgid "GNOME Manpages Editor"
-msgstr "Éditeur de pages de manuel GNOME"
-
-#: ../menu-data/gmanedit:gmanedit.desktop.in.h:2
 msgid "gmanedit"
 msgstr "gmanedit"
 
-#: ../menu-data/gmbox:gmbox.desktop.in.h:1
-msgid "Google Music Box"
-msgstr "Boite à Musique Google"
+#: ../menu-data/gmanedit:gmanedit.desktop.in.h:2
+msgid "GNOME Manpages Editor"
+msgstr "Éditeur de pages de manuel GNOME"
 
-#: ../menu-data/gmbox:gmbox.desktop.in.h:2
+#: ../menu-data/gmbox:gmbox.desktop.in.h:1
 msgid "gmbox"
 msgstr "gmbox"
 
+#: ../menu-data/gmbox:gmbox.desktop.in.h:2
+msgid "Google Music Box"
+msgstr "Boite à Musique Google"
+
 #: ../menu-data/gmchess:gmchess.desktop.in.h:1
 msgid "Chinese chess"
 msgstr "Dames chinoises"
@@ -5949,21 +6053,21 @@
 msgstr "Jouer au célèbre jeu de dames chinoises"
 
 #: ../menu-data/gmerlin:gmerlin-alsamixer.desktop.in.h:1
-msgid "Alsa mixer"
-msgstr "Mixeur Alsa"
-
-#: ../menu-data/gmerlin:gmerlin-alsamixer.desktop.in.h:2
 msgid "Gmerlin mixer"
 msgstr "Mixeur Gmerlin"
 
-#: ../menu-data/gmerlin:gmerlin-kbd.desktop.in.h:1
-msgid "Configure the Gmerlin keyboard daemon"
-msgstr "Configurer le processus de gestion clavier Gmerlin"
+#: ../menu-data/gmerlin:gmerlin-alsamixer.desktop.in.h:2
+msgid "Alsa mixer"
+msgstr "Mixeur Alsa"
 
-#: ../menu-data/gmerlin:gmerlin-kbd.desktop.in.h:2
+#: ../menu-data/gmerlin:gmerlin-kbd.desktop.in.h:1
 msgid "Gmerlin KBD"
 msgstr "Clavier Gmerlin"
 
+#: ../menu-data/gmerlin:gmerlin-kbd.desktop.in.h:2
+msgid "Configure the Gmerlin keyboard daemon"
+msgstr "Configurer le processus de gestion clavier Gmerlin"
+
 #: ../menu-data/gmerlin:gmerlin-player.desktop.in.h:1
 msgid "Gmerlin player"
 msgstr "Lecteur Gmerlin"
@@ -5973,29 +6077,29 @@
 msgstr "Lecteur multimédia multi-formats"
 
 #: ../menu-data/gmerlin:gmerlin-plugincfg.desktop.in.h:1
-msgid "Configure gmerlin plugins"
-msgstr "Configurer les extensions gmerlin"
+msgid "Gmerlin plugin configurator"
+msgstr "Configurateur de module Gmerlin"
 
 #: ../menu-data/gmerlin:gmerlin-plugincfg.desktop.in.h:2
-msgid "Gmerlin plugin configurator"
-msgstr ""
+msgid "Configure gmerlin plugins"
+msgstr "Configurer les extensions gmerlin"
 
 #: ../menu-data/gmerlin:gmerlin-recorder.desktop.in.h:1
-msgid "Audio/video recorder"
-msgstr "Enregistreur audio/vidéo"
-
-#: ../menu-data/gmerlin:gmerlin-recorder.desktop.in.h:2
 msgid "Gmerlin recorder"
 msgstr "Enregistreur Gmerlin"
 
-#: ../menu-data/gmerlin:gmerlin-transcoder.desktop.in.h:1
-msgid "Gmerlin multimedia transcoder"
-msgstr "Transcodeur multimedia Gmerlin"
+#: ../menu-data/gmerlin:gmerlin-recorder.desktop.in.h:2
+msgid "Audio/video recorder"
+msgstr "Enregistreur audio/vidéo"
 
-#: ../menu-data/gmerlin:gmerlin-transcoder.desktop.in.h:2
+#: ../menu-data/gmerlin:gmerlin-transcoder.desktop.in.h:1
 msgid "Gmerlin transcoder"
 msgstr "Transcodeur Gmerlin"
 
+#: ../menu-data/gmerlin:gmerlin-transcoder.desktop.in.h:2
+msgid "Gmerlin multimedia transcoder"
+msgstr "Transcodeur multimedia Gmerlin"
+
 #: ../menu-data/gmerlin:gmerlin-visualizer.desktop.in.h:1
 msgid "Gmerlin visualizer"
 msgstr "Visualiseur Gmerlin"
@@ -6005,29 +6109,29 @@
 msgstr "Lancer les modules de visualisation"
 
 #: ../menu-data/gmfsk:gmfsk.desktop.in.h:1
-msgid "HF digital mode terminal"
-msgstr "Terminal pour les émissions HF numériques"
-
-#: ../menu-data/gmfsk:gmfsk.desktop.in.h:2
 msgid "gMFSK"
 msgstr "gMFSK"
 
-#: ../menu-data/gmidimonitor:gmidimonitor-alsa.desktop.in.h:1
-msgid "Analyse MIDI messages through ALSA"
-msgstr "Analyser les messages MIDI via ALSA"
+#: ../menu-data/gmfsk:gmfsk.desktop.in.h:2
+msgid "HF digital mode terminal"
+msgstr "Terminal pour les émissions HF numériques"
 
-#: ../menu-data/gmidimonitor:gmidimonitor-alsa.desktop.in.h:2
+#: ../menu-data/gmidimonitor:gmidimonitor-alsa.desktop.in.h:1
 msgid "Gmidimonitor (with ALSA support)"
 msgstr "Gmidimonitor (avec prise en charge ALSA)"
 
-#: ../menu-data/gmidimonitor:gmidimonitor-jack.desktop.in.h:1
-msgid "Analyse MIDI messages through JACK"
-msgstr "Analyser les messages MIDI via JACK"
+#: ../menu-data/gmidimonitor:gmidimonitor-alsa.desktop.in.h:2
+msgid "Analyse MIDI messages through ALSA"
+msgstr "Analyser les messages MIDI via ALSA"
 
-#: ../menu-data/gmidimonitor:gmidimonitor-jack.desktop.in.h:2
+#: ../menu-data/gmidimonitor:gmidimonitor-jack.desktop.in.h:1
 msgid "Gmidimonitor (with JACK support)"
 msgstr "Gmidimonitor (avec prise en charge JACK)"
 
+#: ../menu-data/gmidimonitor:gmidimonitor-jack.desktop.in.h:2
+msgid "Analyse MIDI messages through JACK"
+msgstr "Analyser les messages MIDI via JACK"
+
 #: ../menu-data/gmlive:gmlive.desktop.in.h:1
 msgid "Gmlive"
 msgstr "Gmlive"
@@ -6041,13 +6145,13 @@
 msgstr "gMobileMedia (explorateur pour téléphones portables)"
 
 #: ../menu-data/gmorgan:gmorgan.desktop.in.h:1
-msgid "MIDI rhythm station for ALSA"
-msgstr "Station rythmique MIDI pour ALSA"
-
-#: ../menu-data/gmorgan:gmorgan.desktop.in.h:2
 msgid "gmorgan"
 msgstr "gmorgan"
 
+#: ../menu-data/gmorgan:gmorgan.desktop.in.h:2
+msgid "MIDI rhythm station for ALSA"
+msgstr "Station rythmique MIDI pour ALSA"
+
 #: ../menu-data/gmountiso:gmount-iso.desktop.in.h:1
 msgid "Gmount-iso"
 msgstr "Gmount-iso"
@@ -6057,47 +6161,47 @@
 msgstr "Monter des images iso de CD-ROM et DVD"
 
 #: ../menu-data/gmpc:gmpc.desktop.in.h:1
-msgid "A gnome frontend for the mpd daemon"
-msgstr "Une interface GNOME pour le démon mpd"
-
-#: ../menu-data/gmpc:gmpc.desktop.in.h:2
 msgid "Gnome Music Player Client"
 msgstr "Client de lecture de musique GNOME (gmpc)"
 
-#: ../menu-data/gmsh:gmsh.desktop.in.h:1
-#: ../menu-data/netgen:netgen.desktop.in.h:1
-msgid "3-D finite element mesh generator"
-msgstr "Générateur de maillage d'éléments finis en 3-D"
+#: ../menu-data/gmpc:gmpc.desktop.in.h:2
+msgid "A gnome frontend for the mpd daemon"
+msgstr "Une interface GNOME pour le démon mpd"
 
-#: ../menu-data/gmsh:gmsh.desktop.in.h:2
+#: ../menu-data/gmsh:gmsh.desktop.in.h:1
 msgid "Gmsh Mesh Generator"
 msgstr "Générateur de maillage Gmsh"
 
-#: ../menu-data/gmtp:gMTP.desktop.in.h:1
-msgid "A simple MTP Client for MP3 Players"
-msgstr "Un client simple MTP pour lecteurs MP3"
+#: ../menu-data/gmsh:gmsh.desktop.in.h:2
+#: ../menu-data/netgen:netgen.desktop.in.h:2
+msgid "3-D finite element mesh generator"
+msgstr "Générateur de maillage d'éléments finis en 3-D"
 
-#: ../menu-data/gmtp:gMTP.desktop.in.h:2
+#: ../menu-data/gmtp:gMTP.desktop.in.h:1
 msgid "gMTP"
 msgstr "gMTP"
 
-#: ../menu-data/gmult:gmult.desktop.in.h:1
-msgid "Figure out which letters are which numbers"
-msgstr "Deviner quelle lettre se cache derrière un nombre"
+#: ../menu-data/gmtp:gMTP.desktop.in.h:2
+msgid "A simple MTP Client for MP3 Players"
+msgstr "Un client simple MTP pour lecteurs MP3"
 
-#: ../menu-data/gmult:gmult.desktop.in.h:2
+#: ../menu-data/gmult:gmult.desktop.in.h:1
 msgid "Multiplication Puzzle"
 msgstr "Jeu d'énigme à base de multiplications"
 
+#: ../menu-data/gmult:gmult.desktop.in.h:2
+msgid "Figure out which letters are which numbers"
+msgstr "Deviner quelle lettre se cache derrière un nombre"
+
 #: ../menu-data/gmusicbrowser:gmusicbrowser.desktop.in.h:1
+msgid "gmusicbrowser"
+msgstr "gmusicbrowser"
+
+#: ../menu-data/gmusicbrowser:gmusicbrowser.desktop.in.h:2
 msgid "Jukebox for large collections of mp3/ogg/flac/mpc"
 msgstr ""
 "Juke-box pour les importantes collections de morceaux mp3/ogg/flac/mpc"
 
-#: ../menu-data/gmusicbrowser:gmusicbrowser.desktop.in.h:2
-msgid "gmusicbrowser"
-msgstr "gmusicbrowser"
-
 #: ../menu-data/gmysqlcc:gmysqlcc.desktop.in.h:1
 msgid "GMySQLcc"
 msgstr "GMySQLcc"
@@ -6119,21 +6223,21 @@
 msgstr "Réaliser des lignes de la même couleur pour gagner"
 
 #: ../menu-data/gnibbles:gnibbles.desktop.in.h:1
-msgid "Guide a worm around a maze"
-msgstr "Guider un ver dans un labyrinthe"
-
-#: ../menu-data/gnibbles:gnibbles.desktop.in.h:2
 msgid "Nibbles"
 msgstr "Nibbles"
 
-#: ../menu-data/gnobots2:gnobots2.desktop.in.h:1
-msgid "Avoid the robots and make them crash into each other"
-msgstr "Éviter les robots et faites-les s'écraser les uns contre les autres"
+#: ../menu-data/gnibbles:gnibbles.desktop.in.h:2
+msgid "Guide a worm around a maze"
+msgstr "Guider un ver dans un labyrinthe"
 
-#: ../menu-data/gnobots2:gnobots2.desktop.in.h:2
+#: ../menu-data/gnobots2:gnobots2.desktop.in.h:1
 msgid "Robots"
 msgstr "Robots"
 
+#: ../menu-data/gnobots2:gnobots2.desktop.in.h:2
+msgid "Avoid the robots and make them crash into each other"
+msgstr "Éviter les robots et faites-les s'écraser les uns contre les autres"
+
 #: ../menu-data/gnoemoe:gnoemoe.desktop.in.h:1
 msgid "GnoeMoe"
 msgstr "GnoeMoe"
@@ -6143,14 +6247,14 @@
 msgstr "Client MOO pour Gnome GnoeMoe"
 
 #: ../menu-data/gnomad2:gnomad2.desktop.in.h:1
+msgid "Gnomad 2"
+msgstr "Gnomad 2"
+
+#: ../menu-data/gnomad2:gnomad2.desktop.in.h:2
 msgid "A tool for managing Creative Nomad/Zen Jukeboxes and Dell DJs"
 msgstr ""
 "Un outil pour gérer les baladeurs numériques Creative Nomad/Zen et DJ Dell"
 
-#: ../menu-data/gnomad2:gnomad2.desktop.in.h:2
-msgid "Gnomad 2"
-msgstr "Gnomad 2"
-
 #: ../menu-data/gnome-activity-journal:gnome-activity-journal.desktop.in.h:1
 msgid "Activity Journal"
 msgstr "Journal des activités"
@@ -6164,13 +6268,13 @@
 "fichiers, contacts, etc."
 
 #: ../menu-data/gnome-alsamixer:gnome-alsamixer.desktop.in.h:1
-msgid "ALSA sound mixer for GNOME"
-msgstr "Table de mixage sonore ALSA pour GNOME"
-
-#: ../menu-data/gnome-alsamixer:gnome-alsamixer.desktop.in.h:2
 msgid "GNOME ALSA Mixer"
 msgstr "Table de mixage GNOME ALSA"
 
+#: ../menu-data/gnome-alsamixer:gnome-alsamixer.desktop.in.h:2
+msgid "ALSA sound mixer for GNOME"
+msgstr "Table de mixage sonore ALSA pour GNOME"
+
 #: ../menu-data/gnome-blog:gnome-blog.desktop.in.h:1
 msgid "Blog Entry Poster"
 msgstr "Postage d'articles Blog Entry Poster"
@@ -6220,13 +6324,13 @@
 msgstr "Télécharger des fichiers avec BitTorrent"
 
 #: ../menu-data/gnome-color-chooser:gnome-color-chooser.desktop.in.h:1
-msgid "Customize your GNOME desktop"
-msgstr "Personnaliser votre bureau GNOME"
-
-#: ../menu-data/gnome-color-chooser:gnome-color-chooser.desktop.in.h:2
 msgid "GNOME Color Chooser"
 msgstr "GNOME Color Chooser"
 
+#: ../menu-data/gnome-color-chooser:gnome-color-chooser.desktop.in.h:2
+msgid "Customize your GNOME desktop"
+msgstr "Personnaliser votre bureau GNOME"
+
 #: ../menu-data/gnome-color-manager:gcm-calibrate.desktop.in.h:1
 msgid "Color"
 msgstr "Couleur"
@@ -6260,13 +6364,13 @@
 msgstr "Inspecte et compare les profils de couleurs installés"
 
 #: ../menu-data/gnome-commander-data:gnome-commander.desktop.in.h:1
-msgid "A two paned file manager"
-msgstr "Un gestionnaire de fichiers à deux volets"
-
-#: ../menu-data/gnome-commander-data:gnome-commander.desktop.in.h:2
 msgid "GNOME Commander"
 msgstr "GNOME Commander"
 
+#: ../menu-data/gnome-commander-data:gnome-commander.desktop.in.h:2
+msgid "A two paned file manager"
+msgstr "Un gestionnaire de fichiers à deux volets"
+
 #: ../menu-data/gnome-disk-utility:palimpsest.desktop.in.h:1
 msgid "Disk Utility"
 msgstr "Utilitaire de disque"
@@ -6276,6 +6380,10 @@
 msgstr "Gestion des disques et média"
 
 #: ../menu-data/gnome-do:gnome-do.desktop.in.h:1
+msgid "GNOME Do"
+msgstr "GNOME Do"
+
+#: ../menu-data/gnome-do:gnome-do.desktop.in.h:2
 msgid ""
 "Do things as quickly as possible (but no quicker) with your files, "
 "bookmarks, applications, music, contacts, and more!"
@@ -6283,18 +6391,14 @@
 "Faire les choses aussi vite que possible (mais pas plus) avec vos fichiers, "
 "marque-pages, applications, musique, contacts et plus encore !"
 
-#: ../menu-data/gnome-do:gnome-do.desktop.in.h:2
-msgid "GNOME Do"
-msgstr "GNOME Do"
-
 #: ../menu-data/gnome-documents:gnome-documents.desktop.in.h:1
-msgid "Access, manage and share documents"
-msgstr "Accéder, gérer et partager des documents"
-
-#: ../menu-data/gnome-documents:gnome-documents.desktop.in.h:2
 msgid "Documents"
 msgstr "Documents"
 
+#: ../menu-data/gnome-documents:gnome-documents.desktop.in.h:2
+msgid "Access, manage and share documents"
+msgstr "Accéder, gérer et partager des documents"
+
 #: ../menu-data/gnome-dvb-client:gnome-dvb-control.desktop.in.h:1
 msgid "Digital TV Control Center"
 msgstr "Centre de contrôle TV numérique"
@@ -6304,7 +6408,7 @@
 msgstr "Plannifier les enregistrements et voir le programme TV"
 
 #: ../menu-data/gnome-font-viewer:gnome-font-viewer.desktop.in.h:1
-#: ../menu-data/kde-workspace-bin:kde4__kfontview.desktop.in.h:1
+#: ../menu-data/kde-workspace-bin:kde4__kfontview.desktop.in.h:2
 msgid "Font Viewer"
 msgstr "Afficheur de polices de caractères"
 
@@ -6313,13 +6417,13 @@
 msgstr "Aperçu des polices de caractères"
 
 #: ../menu-data/gnome-format:gnome-format.desktop.in.h:1
-msgid "Format external storage devices"
-msgstr "Formater des périphériques de stockage externes"
-
-#: ../menu-data/gnome-format:gnome-format.desktop.in.h:2
 msgid "Gnome Format"
 msgstr "Gnome Format"
 
+#: ../menu-data/gnome-format:gnome-format.desktop.in.h:2
+msgid "Format external storage devices"
+msgstr "Formater des périphériques de stockage externes"
+
 #: ../menu-data/gnome-genius:gnome-genius.desktop.in.h:1
 msgid "Genius Math Tool"
 msgstr "Outil mathématique Genius"
@@ -6328,7 +6432,7 @@
 msgid "Genius Mathematical Tool and Calculator"
 msgstr "Outil mathématique et calculatrice Genius"
 
-#: ../menu-data/gnome-gmail-notifier:gnome-gmail-notifier.desktop.in.h:1
+#: ../menu-data/gnome-gmail-notifier:gnome-gmail-notifier.desktop.in.h:2
 msgid "Gmail Inbox Monitor"
 msgstr "Surveillance de boîte de réception Gmail"
 
@@ -6357,61 +6461,53 @@
 msgstr "Déverrouiller l'accès aux mots de passe et autres secrets"
 
 #: ../menu-data/gnome-lirc-properties:gnome-lirc-properties.desktop.in.h:1
-msgid "Configure your remote control"
-msgstr "Configurer votre télécommande"
-
-#: ../menu-data/gnome-lirc-properties:gnome-lirc-properties.desktop.in.h:2
 msgid "Infrared Remote Control"
 msgstr "Télécommande infrarouge"
 
-#: ../menu-data/gnome-mahjongg:mahjongg.desktop.in.h:1
-msgid "Disassemble a pile of tiles by removing matching pairs"
-msgstr "Défaire un pile de tuiles en enlevant les paires identiques"
-
-#: ../menu-data/gnome-mahjongg:mahjongg.desktop.in.h:2
-msgid "Mahjongg"
-msgstr "Mahjongg"
+#: ../menu-data/gnome-lirc-properties:gnome-lirc-properties.desktop.in.h:2
+msgid "Configure your remote control"
+msgstr "Configurer votre télécommande"
 
 #: ../menu-data/gnome-mastermind:gnome-mastermind.desktop.in.h:1
-msgid "Break the hidden code!"
-msgstr "Découvrir la combinaison secrète !"
-
-#: ../menu-data/gnome-mastermind:gnome-mastermind.desktop.in.h:2
 msgid "Mastermind"
 msgstr "Mastermind"
 
-#: ../menu-data/gnome-media-player:gnome-media-player.desktop.in.h:1
-msgid "A simple media player for GNOME"
-msgstr "Un lecteur multimédia simple pour GNOME"
+#: ../menu-data/gnome-mastermind:gnome-mastermind.desktop.in.h:2
+msgid "Break the hidden code!"
+msgstr "Découvrir la combinaison secrète !"
 
-#: ../menu-data/gnome-media-player:gnome-media-player.desktop.in.h:2
+#: ../menu-data/gnome-media-player:gnome-media-player.desktop.in.h:1
 msgid "GNOME Media Player"
 msgstr "Gnome Media Player"
 
-#: ../menu-data/gnome-media:gnome-sound-recorder.desktop.in.h:1
-msgid "Record sound clips"
-msgstr "Enregistrer des échantillons sonores"
+#: ../menu-data/gnome-media-player:gnome-media-player.desktop.in.h:2
+msgid "A simple media player for GNOME"
+msgstr "Un lecteur multimédia simple pour GNOME"
 
-#: ../menu-data/gnome-media:gnome-sound-recorder.desktop.in.h:2
+#: ../menu-data/gnome-media:gnome-sound-recorder.desktop.in.h:1
 msgid "Sound Recorder"
 msgstr "Enregistreur de sons"
 
-#: ../menu-data/gnome-media:gstreamer-properties.desktop.in.h:1
-msgid "Configure defaults for GStreamer applications"
-msgstr "Configurer les valeurs par défaut pour les applications GStreamer"
+#: ../menu-data/gnome-media:gnome-sound-recorder.desktop.in.h:2
+msgid "Record sound clips"
+msgstr "Enregistrer des échantillons sonores"
 
-#: ../menu-data/gnome-media:gstreamer-properties.desktop.in.h:2
+#: ../menu-data/gnome-media:gstreamer-properties.desktop.in.h:1
 msgid "Multimedia Systems Selector"
 msgstr "Sélecteur de systèmes multimédias"
 
-#: ../menu-data/gnome-mousetrap:mousetrap.desktop.in.h:1
-msgid "Controls the mouse via Webcam."
-msgstr "Contrôle la souris via la webcam"
+#: ../menu-data/gnome-media:gstreamer-properties.desktop.in.h:2
+msgid "Configure defaults for GStreamer applications"
+msgstr "Configurer les valeurs par défaut pour les applications GStreamer"
 
-#: ../menu-data/gnome-mousetrap:mousetrap.desktop.in.h:2
+#: ../menu-data/gnome-mousetrap:mousetrap.desktop.in.h:1
 msgid "MouseTrap"
 msgstr "MouseTrap"
 
+#: ../menu-data/gnome-mousetrap:mousetrap.desktop.in.h:2
+msgid "Controls the mouse via Webcam."
+msgstr "Contrôle la souris via la webcam"
+
 #: ../menu-data/gnome-mplayer:gnome-mplayer.desktop.in.h:1
 msgid "GNOME MPlayer"
 msgstr "MPlayer GNOME"
@@ -6437,14 +6533,14 @@
 msgstr "Afficher des informations sur votre réseau"
 
 #: ../menu-data/gnome-network-admin:network.desktop.in.h:1
-msgid "Configure network devices and connections"
-msgstr "Configurer les interfaces réseau et les connexions"
-
-#: ../menu-data/gnome-network-admin:network.desktop.in.h:2
-#: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:2
+#: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:1
 msgid "Network"
 msgstr "Réseau"
 
+#: ../menu-data/gnome-network-admin:network.desktop.in.h:2
+msgid "Configure network devices and connections"
+msgstr "Configurer les interfaces réseau et les connexions"
+
 #: ../menu-data/gnome-orca:orca.desktop.in.h:1
 msgid "Orca Screen Reader"
 msgstr "Lecteur d'écran Orca"
@@ -6458,13 +6554,13 @@
 "des plages braille"
 
 #: ../menu-data/gnome-paint:gnome-paint.desktop.in.h:1
-msgid "Create and Edit Drawings or Images"
-msgstr "Créer et modifier des images ou des dessins"
-
-#: ../menu-data/gnome-paint:gnome-paint.desktop.in.h:2
 msgid "Gnome Paint Drawing Editor"
 msgstr "Éditeur de dessins Gnome Paint"
 
+#: ../menu-data/gnome-paint:gnome-paint.desktop.in.h:2
+msgid "Create and Edit Drawings or Images"
+msgstr "Créer et modifier des images ou des dessins"
+
 #: ../menu-data/gnome-phone-manager:gnome-phone-manager.desktop.in.h:1
 msgid "Phone Manager"
 msgstr "Gestionnaire de téléphone Phone Manager"
@@ -6482,37 +6578,37 @@
 msgstr "Imprimer plusieurs photos sur une même page"
 
 #: ../menu-data/gnome-pie:gnome-pie.desktop.in.h:1
-msgid "Cakes don't lie."
-msgstr "Les gâteaux ne mentent pas."
-
-#: ../menu-data/gnome-pie:gnome-pie.desktop.in.h:2
 msgid "Gnome-Pie"
 msgstr "Gnome-Pie"
 
-#: ../menu-data/gnome-power-manager:gnome-power-statistics.desktop.in.h:1
-msgid "Observe power management"
-msgstr "Surveiller la gestion d'énergie"
+#: ../menu-data/gnome-pie:gnome-pie.desktop.in.h:2
+msgid "Cakes don't lie."
+msgstr "Les gâteaux ne mentent pas."
 
-#: ../menu-data/gnome-power-manager:gnome-power-statistics.desktop.in.h:2
+#: ../menu-data/gnome-power-manager:gnome-power-statistics.desktop.in.h:1
 msgid "Power Statistics"
 msgstr "Statistiques de l'alimentation"
 
-#: ../menu-data/gnome-ppp:gnome-ppp.desktop.in.h:1
-msgid "GNOME Dialup Tool"
-msgstr "Outil de numérotation téléphonique GNOME"
+#: ../menu-data/gnome-power-manager:gnome-power-statistics.desktop.in.h:2
+msgid "Observe power management"
+msgstr "Surveiller la gestion d'énergie"
 
-#: ../menu-data/gnome-ppp:gnome-ppp.desktop.in.h:2
+#: ../menu-data/gnome-ppp:gnome-ppp.desktop.in.h:1
 msgid "GNOME PPP"
 msgstr "GNOME PPP"
 
-#: ../menu-data/gnome-schedule:gnome-schedule.desktop.in.h:1
-msgid "Manage your system tasks"
-msgstr "Gérer vos tâches système"
+#: ../menu-data/gnome-ppp:gnome-ppp.desktop.in.h:2
+msgid "GNOME Dialup Tool"
+msgstr "Outil de numérotation téléphonique GNOME"
 
-#: ../menu-data/gnome-schedule:gnome-schedule.desktop.in.h:2
+#: ../menu-data/gnome-schedule:gnome-schedule.desktop.in.h:1
 msgid "Scheduled tasks"
 msgstr "Tâches planifiées"
 
+#: ../menu-data/gnome-schedule:gnome-schedule.desktop.in.h:2
+msgid "Manage your system tasks"
+msgstr "Gérer vos tâches système"
+
 #: ../menu-data/gnome-shell:gnome-shell.desktop.in.h:1
 msgid "GNOME Shell"
 msgstr "GNOME Shell"
@@ -6522,13 +6618,13 @@
 msgstr "Gestion des fenêtres et lancement des applications"
 
 #: ../menu-data/gnome-specimen:gnome-specimen.desktop.in.h:1
-msgid "Preview and compare fonts"
-msgstr "Aperçu et comparaison de polices de caractères"
-
-#: ../menu-data/gnome-specimen:gnome-specimen.desktop.in.h:2
 msgid "Specimen Font Previewer"
 msgstr "Outil de prévisualisation de polices"
 
+#: ../menu-data/gnome-specimen:gnome-specimen.desktop.in.h:2
+msgid "Preview and compare fonts"
+msgstr "Aperçu et comparaison de polices de caractères"
+
 #: ../menu-data/gnome-split:gnome-split.desktop.in.h:1
 msgid "GNOME Split"
 msgstr "GNOME Split"
@@ -6555,24 +6651,24 @@
 "Tester vos aptitudes en logique avec ce casse-tête de nombres en grille"
 
 #: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:1
-msgid "New Terminal"
-msgstr "Nouveau Terminal"
-
-#: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:2
 #: ../menu-data/konsole:kde4__konsole.desktop.in.h:2
-#: ../menu-data/terminal.app:Terminal.desktop.in.h:2
-#: ../menu-data/vala-terminal:vala-terminal.desktop.in.h:2
+#: ../menu-data/terminal.app:Terminal.desktop.in.h:1
+#: ../menu-data/vala-terminal:vala-terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../menu-data/gnome-time-admin:time.desktop.in.h:1
-msgid "Change system time, date, and timezone"
-msgstr "Permet de modifier la date, l'heure et le fuseau horaire du système."
+#: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:3
+msgid "New Terminal"
+msgstr "Nouveau Terminal"
 
-#: ../menu-data/gnome-time-admin:time.desktop.in.h:2
+#: ../menu-data/gnome-time-admin:time.desktop.in.h:1
 msgid "Time and Date"
 msgstr "Utilitaire de configuration de la date et de l'heure"
 
+#: ../menu-data/gnome-time-admin:time.desktop.in.h:2
+msgid "Change system time, date, and timezone"
+msgstr "Permet de modifier la date, l'heure et le fuseau horaire du système."
+
 #: ../menu-data/gnome-translate:gnome-translate.desktop.in.h:1
 msgid "Language Translator"
 msgstr "Traducteur"
@@ -6614,38 +6710,38 @@
 msgstr "Cataloguer des disques ou CD"
 
 #: ../menu-data/gnomekiss:gnomekiss.desktop.in.h:1
-msgid "Gnome's KiSSeake dolls viewer"
-msgstr "Afficheur de poupées KISSeake pour Gnome"
-
-#: ../menu-data/gnomekiss:gnomekiss.desktop.in.h:2
 msgid "GnomeKiSS"
 msgstr "GnomeKiSS"
 
+#: ../menu-data/gnomekiss:gnomekiss.desktop.in.h:2
+msgid "Gnome's KiSSeake dolls viewer"
+msgstr "Afficheur de poupées KISSeake pour Gnome"
+
 #: ../menu-data/gnomine:gnomine.desktop.in.h:1
+#: ../menu-data/mines.app:Mines.desktop.in.h:1
 #: ../menu-data/sgt-puzzles:mines.desktop.in.h:1
-msgid "Clear hidden mines from a minefield"
-msgstr "Nettoyer un champ de mines de ses mines cachées"
+msgid "Mines"
+msgstr "Démineur"
 
 #: ../menu-data/gnomine:gnomine.desktop.in.h:2
-#: ../menu-data/mines.app:Mines.desktop.in.h:2
 #: ../menu-data/sgt-puzzles:mines.desktop.in.h:2
-msgid "Mines"
-msgstr "Démineur"
+msgid "Clear hidden mines from a minefield"
+msgstr "Nettoyer un champ de mines de ses mines cachées"
 
 #: ../menu-data/gnomint:gnomint.desktop.in.h:1
-msgid "Manage X.509 certificates and CAs, easily and graphically"
-msgstr "Gérer facilement et graphiquement les certificats X.509 et les AC"
-
-#: ../menu-data/gnomint:gnomint.desktop.in.h:2
 msgid "gnoMint X.509 CA Manager"
 msgstr "Gestionnaire d'AC X.509 gnoMint"
 
+#: ../menu-data/gnomint:gnomint.desktop.in.h:2
+msgid "Manage X.509 certificates and CAs, easily and graphically"
+msgstr "Gérer facilement et graphiquement les certificats X.509 et les AC"
+
 #: ../menu-data/gnote:gnote.desktop.in.h:1
 msgid "Gnote"
 msgstr "Gnote"
 
 #: ../menu-data/gnote:gnote.desktop.in.h:2
-#: ../menu-data/tomboy:tomboy.desktop.in.h:1
+#: ../menu-data/tomboy:tomboy.desktop.in.h:2
 msgid "Take notes, link ideas, and stay organized"
 msgstr "Prendre des notes, relier les idées, et rester organisé"
 
@@ -6659,13 +6755,13 @@
 "Système d'agenda, de journaux, de listes de choses à faire et de factures"
 
 #: ../menu-data/gnotravex:gnotravex.desktop.in.h:1
-msgid "Complete the puzzle by matching numbered tiles"
-msgstr "Compléter le puzzle en faisant correspondre les tuiles numérotées"
-
-#: ../menu-data/gnotravex:gnotravex.desktop.in.h:2
 msgid "Tetravex"
 msgstr "Tetravex"
 
+#: ../menu-data/gnotravex:gnotravex.desktop.in.h:2
+msgid "Complete the puzzle by matching numbered tiles"
+msgstr "Compléter le puzzle en faisant correspondre les tuiles numérotées"
+
 #: ../menu-data/gnotski:gnotski.desktop.in.h:1
 msgid "Klotski"
 msgstr "Klotski"
@@ -6691,13 +6787,13 @@
 msgstr "Programme de backgammon avec analyse (en mode graphique ou console)"
 
 #: ../menu-data/gnubik:gnubik.desktop.in.h:1
-msgid "3D Rubik's cube game"
-msgstr "Jeu 3D de Rubik's cube"
-
-#: ../menu-data/gnubik:gnubik.desktop.in.h:2
 msgid "GNUbik"
 msgstr "GNUbik"
 
+#: ../menu-data/gnubik:gnubik.desktop.in.h:2
+msgid "3D Rubik's cube game"
+msgstr "Jeu 3D de Rubik's cube"
+
 #: ../menu-data/gnucash:gnucash.desktop.in.h:1
 msgid "GnuCash Finance Management"
 msgstr "Gestionnaire de finances GnuCash"
@@ -6739,13 +6835,13 @@
 msgstr "Gestion et enregistrement, sans papier, des actes médicaux"
 
 #: ../menu-data/gnumeric-common:gnumeric.desktop.in.h:1
-msgid "Calculation, Analysis, and Visualization of Information"
-msgstr "Calculs, analyses et visualisation d'informations"
-
-#: ../menu-data/gnumeric-common:gnumeric.desktop.in.h:2
 msgid "Gnumeric Spreadsheet"
 msgstr "Tableur Gnumeric"
 
+#: ../menu-data/gnumeric-common:gnumeric.desktop.in.h:2
+msgid "Calculation, Analysis, and Visualization of Information"
+msgstr "Calculs, analyses et visualisation d'informations"
+
 #: ../menu-data/gnunet-gtk:gnunet-gtk.desktop.in.h:1
 msgid "GNUnet Secured P2P"
 msgstr "Pair à pair (P2P) sécurisé GNUnet"
@@ -6764,13 +6860,13 @@
 msgstr "Interface graphique QT pour GNUnet"
 
 #: ../menu-data/gnurobbo:gnurobbo.desktop.in.h:1
-msgid "A clone of Robbo"
-msgstr "Un clone de Robbo"
-
-#: ../menu-data/gnurobbo:gnurobbo.desktop.in.h:2
 msgid "GNU Robbo"
 msgstr "GNU Robbo"
 
+#: ../menu-data/gnurobbo:gnurobbo.desktop.in.h:2
+msgid "A clone of Robbo"
+msgstr "Un clone de Robbo"
+
 #: ../menu-data/gnusim8085:GNUSim8085.desktop.in.h:1
 msgid "GNUSim8085"
 msgstr "GNUSim8085"
@@ -6792,60 +6888,60 @@
 msgstr "GoatTracker"
 
 #: ../menu-data/gobby:gobby.desktop.in.h:1
-msgid "Edit text files collaboratively"
-msgstr "Éditer des fichiers texte collectivement"
-
-#: ../menu-data/gobby:gobby.desktop.in.h:2
 msgid "Gobby Collaborative Editor (0.4)"
 msgstr "Éditeur collaboratif Gobby (0.4)"
 
+#: ../menu-data/gobby:gobby.desktop.in.h:2
+msgid "Edit text files collaboratively"
+msgstr "Éditer des fichiers texte collectivement"
+
 #: ../menu-data/gofigure2:gofigure2.desktop.in.h:1
 msgid "GoFigure2"
 msgstr "GoFigure2"
 
 #: ../menu-data/gofigure2:gofigure2.desktop.in.h:2
 msgid "Visualization and Analysis of 3D+t bio-images"
-msgstr ""
+msgstr "Observation et analyse d'image biologique en 3D+t"
 
 #: ../menu-data/gogglesmm:gogglesmm.desktop.in.h:1
 msgid "Goggles Music Manager"
-msgstr ""
+msgstr "Gestionnaire de Musique Goggles"
 
 #: ../menu-data/gogglesmm:gogglesmm.desktop.in.h:2
-#: ../menu-data/rhythmbox:rhythmbox.desktop.in.h:1
+#: ../menu-data/rhythmbox:rhythmbox.desktop.in.h:2
 msgid "Play and organize your music collection"
 msgstr "Permet de lire et d'organiser votre collection musicale."
 
 #: ../menu-data/gok:gok.desktop.in.h:1
+msgid "On-Screen Keyboard"
+msgstr "Clavier visuel"
+
+#: ../menu-data/gok:gok.desktop.in.h:2
 msgid "Navigate applications and type using alternative input devices"
 msgstr ""
 "Naviguer parmi les applications et taper du texte en utilisant un "
 "périphérique de saisie alternatif"
 
-#: ../menu-data/gok:gok.desktop.in.h:2
-msgid "On-Screen Keyboard"
-msgstr "Clavier visuel"
-
 #: ../menu-data/goldendict:goldendict.desktop.in.h:1
 msgid "GoldenDict"
 msgstr "GoldenDict"
 
 #: ../menu-data/golly:golly.desktop.in.h:1
-msgid "A Conway's Game of Life simulator"
-msgstr "Une simulation « Jeu de la vie » de Conway"
-
-#: ../menu-data/golly:golly.desktop.in.h:2
 msgid "Golly"
 msgstr "Golly"
 
-#: ../menu-data/gomoku.app:Gomoku.desktop.in.h:1
-msgid "GNUstep Gomoku Game"
-msgstr "Le jeu Gomoku, basé sur la bibliothèque GNUStep."
+#: ../menu-data/golly:golly.desktop.in.h:2
+msgid "A Conway's Game of Life simulator"
+msgstr "Une simulation « Jeu de la vie » de Conway"
 
-#: ../menu-data/gomoku.app:Gomoku.desktop.in.h:2
+#: ../menu-data/gomoku.app:Gomoku.desktop.in.h:1
 msgid "Gomoku.app"
 msgstr "Gomoku"
 
+#: ../menu-data/gomoku.app:Gomoku.desktop.in.h:2
+msgid "GNUstep Gomoku Game"
+msgstr "Le jeu Gomoku, basé sur la bibliothèque GNUStep."
+
 #: ../menu-data/goobox:goobox.desktop.in.h:1
 #: ../menu-data/kscd:kde4__kscd.desktop.in.h:1
 msgid "CD Player"
@@ -6873,21 +6969,21 @@
 msgstr "Éditeur MPEG2 conforme GOP"
 
 #: ../menu-data/goplay:goplay.desktop.in.h:1
-msgid "Gaming packages browser"
-msgstr "Explorateur de paquets logiciels de jeux"
-
-#: ../menu-data/goplay:goplay.desktop.in.h:2
 msgid "GoPlay!"
 msgstr "GoPlay!"
 
-#: ../menu-data/gosa-desktop:gosa-desktop.desktop.in.h:1
-msgid "GOsa"
-msgstr "GOsa"
+#: ../menu-data/goplay:goplay.desktop.in.h:2
+msgid "Gaming packages browser"
+msgstr "Explorateur de paquets logiciels de jeux"
 
-#: ../menu-data/gosa-desktop:gosa-desktop.desktop.in.h:2
+#: ../menu-data/gosa-desktop:gosa-desktop.desktop.in.h:1
 msgid "GOsa²"
 msgstr "GOsa²"
 
+#: ../menu-data/gosa-desktop:gosa-desktop.desktop.in.h:2
+msgid "GOsa"
+msgstr "GOsa"
+
 #: ../menu-data/gosmore:gosmore.desktop.in.h:1
 msgid "Gosmore Map Viewer"
 msgstr "Visualisateur de Cartes Gosmore"
@@ -6909,53 +7005,53 @@
 "caractéristiques nutritionnelles, et bien d'autres choses."
 
 #: ../menu-data/gpaco:gpaco.desktop.in.h:1
-msgid "Manages software installed from source code"
-msgstr "Gère les logiciels installés depuis leur code source"
-
-#: ../menu-data/gpaco:gpaco.desktop.in.h:2
 msgid "Package Organizer"
 msgstr "Organiseur de paquets"
 
-#: ../menu-data/gpaint:gpaint.desktop.in.h:1
-msgid "A small-scale painting program for GNOME, the GNU Desktop"
-msgstr "Un programme de petits dessins pour GNOME, le bureau GNU"
+#: ../menu-data/gpaco:gpaco.desktop.in.h:2
+msgid "Manages software installed from source code"
+msgstr "Gère les logiciels installés depuis leur code source"
 
-#: ../menu-data/gpaint:gpaint.desktop.in.h:2
+#: ../menu-data/gpaint:gpaint.desktop.in.h:1
 msgid "GNU Paint"
 msgstr "GNU Paint"
 
-#: ../menu-data/gparted:gparted.desktop.in.h:1
-msgid "Create, reorganize, and delete partitions"
-msgstr "Créer, réorganiser et supprimer des partitions"
+#: ../menu-data/gpaint:gpaint.desktop.in.h:2
+msgid "A small-scale painting program for GNOME, the GNU Desktop"
+msgstr "Un programme de petits dessins pour GNOME, le bureau GNU"
 
-#: ../menu-data/gparted:gparted.desktop.in.h:2
+#: ../menu-data/gparted:gparted.desktop.in.h:1
 msgid "GParted Partition Editor"
 msgstr "Éditeur de partitions GParted"
 
-#: ../menu-data/gpdftext:gpdftext.desktop.in.h:1
-msgid "Edit text from ebook PDF files"
-msgstr "Modifier le  texte des fichiers PDF pour ebook"
+#: ../menu-data/gparted:gparted.desktop.in.h:2
+msgid "Create, reorganize, and delete partitions"
+msgstr "Créer, réorganiser et supprimer des partitions"
 
-#: ../menu-data/gpdftext:gpdftext.desktop.in.h:2
+#: ../menu-data/gpdftext:gpdftext.desktop.in.h:1
 msgid "gPDFText ebook editor"
 msgstr "Éditeur de texte gPDFText pour ebook"
 
-#: ../menu-data/gphpedit:gphpedit.desktop.in.h:1
-msgid "Edit PHP source files"
-msgstr "Éditer les fichiers source PHP"
+#: ../menu-data/gpdftext:gpdftext.desktop.in.h:2
+msgid "Edit text from ebook PDF files"
+msgstr "Modifier le  texte des fichiers PDF pour ebook"
 
-#: ../menu-data/gphpedit:gphpedit.desktop.in.h:2
+#: ../menu-data/gphpedit:gphpedit.desktop.in.h:1
 msgid "gPHPEdit"
 msgstr "gPHPEdit"
 
-#: ../menu-data/gpick:gpick.desktop.in.h:1
-msgid "Color picker"
-msgstr "Sélecteur de couleur"
+#: ../menu-data/gphpedit:gphpedit.desktop.in.h:2
+msgid "Edit PHP source files"
+msgstr "Éditer les fichiers source PHP"
 
-#: ../menu-data/gpick:gpick.desktop.in.h:2
+#: ../menu-data/gpick:gpick.desktop.in.h:1
 msgid "Gpick"
 msgstr "Gpick"
 
+#: ../menu-data/gpick:gpick.desktop.in.h:2
+msgid "Color picker"
+msgstr "Sélecteur de couleur"
+
 #: ../menu-data/gpicview:gpicview.desktop.in.h:2
 msgid "View your images easily"
 msgstr "Regarder vos images facilement"
@@ -6969,21 +7065,21 @@
 msgstr "Organiser en toute liberté les photos sur votre iPod !"
 
 #: ../menu-data/gplanarity:gplanarity.desktop.in.h:1
-msgid "Puzzle game involving untangling planar graphs"
-msgstr "Casse-tête demandant de démêler des figures géométriques"
-
-#: ../menu-data/gplanarity:gplanarity.desktop.in.h:2
 msgid "gPlanarity"
 msgstr "gPlanarity"
 
-#: ../menu-data/gpodder:gpodder.desktop.in.h:1
-msgid "Download audio and video content from podcasts"
-msgstr "Télécharger le contenu audio et video des podcasts"
+#: ../menu-data/gplanarity:gplanarity.desktop.in.h:2
+msgid "Puzzle game involving untangling planar graphs"
+msgstr "Casse-tête demandant de démêler des figures géométriques"
 
-#: ../menu-data/gpodder:gpodder.desktop.in.h:2
+#: ../menu-data/gpodder:gpodder.desktop.in.h:1
 msgid "gPodder Podcast Client"
 msgstr "Client podcast gPodder"
 
+#: ../menu-data/gpodder:gpodder.desktop.in.h:2
+msgid "Download audio and video content from podcasts"
+msgstr "Télécharger le contenu audio et video des podcasts"
+
 #: ../menu-data/gpointing-device-settings:gpointing-device-settings.desktop.in.h:1
 msgid "Pointing devices"
 msgstr "Dispositifs de pointage"
@@ -6993,13 +7089,13 @@
 msgstr "Définissez vos préférences pour votre souris et votre touchpad"
 
 #: ../menu-data/gpomme:gpomme.desktop.in.h:1
-msgid "A graphical client for pommed"
-msgstr "Un client graphique pour pommed"
-
-#: ../menu-data/gpomme:gpomme.desktop.in.h:2
 msgid "pommed GTK client"
 msgstr "Client GTK pommed"
 
+#: ../menu-data/gpomme:gpomme.desktop.in.h:2
+msgid "A graphical client for pommed"
+msgstr "Un client graphique pour pommed"
+
 #: ../menu-data/gpppon:gpppon.desktop.in.h:1
 msgid "GNOME PPPon"
 msgstr "GNOME PPPon"
@@ -7025,31 +7121,31 @@
 msgstr "Renommer fichiers et répertoires par lots"
 
 #: ../menu-data/gprompter:gprompter.desktop.in.h:1
-#: ../menu-data/pyprompter:pyprompter.desktop.in.h:1
-msgid "Predictive text editor powered by presage"
-msgstr "Editeur de texte prédictif propulsé par presage"
-
-#: ../menu-data/gprompter:gprompter.desktop.in.h:2
 msgid "gprompter"
 msgstr "gprompter"
 
+#: ../menu-data/gprompter:gprompter.desktop.in.h:2
+#: ../menu-data/pyprompter:pyprompter.desktop.in.h:2
+msgid "Predictive text editor powered by presage"
+msgstr "Editeur de texte prédictif propulsé par presage"
+
 #: ../menu-data/gpscorrelate-gui:gpscorrelate.desktop.in.h:1
+msgid "GPSCorrelate"
+msgstr "GPSCorrelate"
+
+#: ../menu-data/gpscorrelate-gui:gpscorrelate.desktop.in.h:2
 msgid "Add coordinates to jpeg images using gpx files"
 msgstr ""
 "Ajouter des coordonnées aux images jpeg en utilisant des fichiers gpx"
 
-#: ../menu-data/gpscorrelate-gui:gpscorrelate.desktop.in.h:2
-msgid "GPSCorrelate"
-msgstr "GPSCorrelate"
-
 #: ../menu-data/gpsdrive:gpsdrive.desktop.in.h:1
-msgid "GPS Navigation"
-msgstr "Navigation GPS"
-
-#: ../menu-data/gpsdrive:gpsdrive.desktop.in.h:2
 msgid "GpsDrive"
 msgstr "GpsDrive"
 
+#: ../menu-data/gpsdrive:gpsdrive.desktop.in.h:2
+msgid "GPS Navigation"
+msgstr "Navigation GPS"
+
 #: ../menu-data/gpsk31:gpsk31.desktop.in.h:1
 msgid "gpsk31"
 msgstr "gpsk31"
@@ -7067,29 +7163,29 @@
 msgstr "Afficher, modifier et trier les traces GPS"
 
 #: ../menu-data/gpxviewer:gpxviewer.desktop.in.h:1
-msgid "GPS Trace Viewer"
-msgstr "Afficheur de traces GPS"
-
-#: ../menu-data/gpxviewer:gpxviewer.desktop.in.h:2
 msgid "GPX Viewer"
 msgstr "Afficheur GPX"
 
-#: ../menu-data/grace:grace.desktop.in.h:1
-msgid "An XY plotting tool"
-msgstr "Outil de tracés XY"
+#: ../menu-data/gpxviewer:gpxviewer.desktop.in.h:2
+msgid "GPS Trace Viewer"
+msgstr "Afficheur de traces GPS"
 
-#: ../menu-data/grace:grace.desktop.in.h:2
+#: ../menu-data/grace:grace.desktop.in.h:1
 msgid "Grace"
 msgstr "Grace"
 
-#: ../menu-data/grafx2:grafx2.desktop.in.h:1
-msgid "Deluxe Paint Clone"
-msgstr "Clone de Deluxe Paint"
+#: ../menu-data/grace:grace.desktop.in.h:2
+msgid "An XY plotting tool"
+msgstr "Outil de tracés XY"
 
-#: ../menu-data/grafx2:grafx2.desktop.in.h:2
+#: ../menu-data/grafx2:grafx2.desktop.in.h:1
 msgid "GrafX2"
 msgstr "GrafX2"
 
+#: ../menu-data/grafx2:grafx2.desktop.in.h:2
+msgid "Deluxe Paint Clone"
+msgstr "Clone de Deluxe Paint"
+
 #: ../menu-data/gramps:gramps.desktop.in.h:1
 msgid "Gramps Genealogy System"
 msgstr "Système de généalogie Gramps"
@@ -7101,38 +7197,30 @@
 "Gérer des informations généalogiques, faire des recherches et des analyses "
 "généalogiques"
 
-#: ../menu-data/grandr:grandr.desktop.in.h:1
-msgid "Configure multiple screens"
-msgstr "Configurer des écrans multiples"
-
-#: ../menu-data/grandr:grandr.desktop.in.h:2
-msgid "Multiple Screens"
-msgstr "Écrans multiples"
-
 #: ../menu-data/granule:granule.desktop.in.h:1
-msgid "Flashcards Program"
-msgstr "Programme pour fiches mnémotechniques"
-
-#: ../menu-data/granule:granule.desktop.in.h:2
 msgid "Granule"
 msgstr "Granule"
 
-#: ../menu-data/graphmonkey:graphmonkey.desktop.in.h:1
-msgid "Draw mathematical graphs/curves"
-msgstr "Tracer des graphes ou courbes mathématiques"
+#: ../menu-data/granule:granule.desktop.in.h:2
+msgid "Flashcards Program"
+msgstr "Programme pour fiches mnémotechniques"
 
-#: ../menu-data/graphmonkey:graphmonkey.desktop.in.h:2
+#: ../menu-data/graphmonkey:graphmonkey.desktop.in.h:1
 msgid "Graphmonkey"
 msgstr "Graphmonkey"
 
-#: ../menu-data/graphthing:graphthing.desktop.in.h:1
-msgid "Create, manipulate and study graphs."
-msgstr "Créer, manipuler et étudier les graphes"
+#: ../menu-data/graphmonkey:graphmonkey.desktop.in.h:2
+msgid "Draw mathematical graphs/curves"
+msgstr "Tracer des graphes ou courbes mathématiques"
 
-#: ../menu-data/graphthing:graphthing.desktop.in.h:2
+#: ../menu-data/graphthing:graphthing.desktop.in.h:1
 msgid "GraphThing"
 msgstr "GraphThing"
 
+#: ../menu-data/graphthing:graphthing.desktop.in.h:2
+msgid "Create, manipulate and study graphs."
+msgstr "Créer, manipuler et étudier les graphes"
+
 #: ../menu-data/gravitation:gravitation.desktop.in.h:1
 msgid "Gravitation"
 msgstr "Gravitation"
@@ -7158,25 +7246,25 @@
 msgstr "Gérer les connexions à des machines"
 
 #: ../menu-data/grdesktop:grdesktop.desktop.in.h:1
-msgid "Connect to a remote Windows Terminal-Server"
-msgstr "Se connecter à un terminal Windows serveur distant"
-
-#: ../menu-data/grdesktop:grdesktop.desktop.in.h:2
 msgid "Remotedesktop Client"
 msgstr "Client pour Remotedesktop"
 
-#: ../menu-data/greenwich:greenwich.desktop.in.h:1
-msgid "Greenwich"
+#: ../menu-data/grdesktop:grdesktop.desktop.in.h:2
+msgid "Connect to a remote Windows Terminal-Server"
+msgstr "Se connecter à un terminal Windows serveur distant"
+
+#: ../menu-data/greenwich:greenwich.desktop.in.h:1
+msgid "Greenwich"
 msgstr "Greenwich"
 
 #: ../menu-data/gresistor:gresistor.desktop.in.h:1
-msgid "Resistor color code calculator"
-msgstr "Calculateur de code couleur de résistances"
-
-#: ../menu-data/gresistor:gresistor.desktop.in.h:2
 msgid "gResistor"
 msgstr "gResistor"
 
+#: ../menu-data/gresistor:gresistor.desktop.in.h:2
+msgid "Resistor color code calculator"
+msgstr "Calculateur de code couleur de résistances"
+
 #: ../menu-data/gresolver:gresolver.desktop.in.h:1
 msgid "DNS Query Tool"
 msgstr "Outil de requêtes DNS"
@@ -7186,13 +7274,13 @@
 msgstr "Exécuter des requêtes DNS avancées"
 
 #: ../menu-data/gretl-common:gretl.desktop.in.h:1
-msgid "Econometrics program"
-msgstr "Programme d'économétrie"
-
-#: ../menu-data/gretl-common:gretl.desktop.in.h:2
 msgid "gretl"
 msgstr "gretl"
 
+#: ../menu-data/gretl-common:gretl.desktop.in.h:2
+msgid "Econometrics program"
+msgstr "Programme d'économétrie"
+
 #: ../menu-data/grhino:grhino.desktop.in.h:1
 msgid "GRhino"
 msgstr "GRhino"
@@ -7215,13 +7303,13 @@
 msgstr "Gestionnaire de collections de films"
 
 #: ../menu-data/gringotts:gringotts.desktop.in.h:1
-msgid "An electronic strongbox"
-msgstr "Un coffre-fort électronique"
-
-#: ../menu-data/gringotts:gringotts.desktop.in.h:2
 msgid "Gringotts"
 msgstr "Gringotts"
 
+#: ../menu-data/gringotts:gringotts.desktop.in.h:2
+msgid "An electronic strongbox"
+msgstr "Un coffre-fort électronique"
+
 #: ../menu-data/grinvin:grinvin.desktop.in.h:1
 msgid "GrInvIn"
 msgstr "GrInvIn"
@@ -7235,13 +7323,13 @@
 msgstr "Gestion de finances personnelles"
 
 #: ../menu-data/gromit:gromit.desktop.in.h:1
-msgid "draw freehand screen annotations"
-msgstr ""
-
-#: ../menu-data/gromit:gromit.desktop.in.h:2
 msgid "gromit"
 msgstr "gromit"
 
+#: ../menu-data/gromit:gromit.desktop.in.h:2
+msgid "draw freehand screen annotations"
+msgstr ""
+
 #: ../menu-data/groundcontrol:groundcontrol.desktop.in.h:1
 msgid "Ground Control Configuration"
 msgstr "Configuration de Ground Control"
@@ -7251,13 +7339,13 @@
 msgstr "Configurer Ground Control avec votre compte Launchpad."
 
 #: ../menu-data/grpn:grpn.desktop.in.h:1
-msgid "A reverse polish notation calculator"
-msgstr "Une calculatrice en notation polonaise inversée"
-
-#: ../menu-data/grpn:grpn.desktop.in.h:2
 msgid "Grpn Calculator"
 msgstr "Calculatrice Grpn"
 
+#: ../menu-data/grpn:grpn.desktop.in.h:2
+msgid "A reverse polish notation calculator"
+msgstr "Une calculatrice en notation polonaise inversée"
+
 #: ../menu-data/grr.app:Grr.desktop.in.h:1
 msgid "Grr Feed Reader"
 msgstr "Lecteur de flux RSS Grr"
@@ -7275,24 +7363,28 @@
 msgstr "Synchroniser des fichiers avec rsync"
 
 #: ../menu-data/gscan2pdf:gscan2pdf.desktop.in.h:1
+msgid "gscan2pdf"
+msgstr "gscan2pdf"
+
+#: ../menu-data/gscan2pdf:gscan2pdf.desktop.in.h:2
 msgid "A GUI to aid the scan-to-PDF process"
 msgstr ""
 "Une interface graphique utilisateur facilitant le processus de numérisation "
 "vers le format PDF"
 
-#: ../menu-data/gscan2pdf:gscan2pdf.desktop.in.h:2
-msgid "gscan2pdf"
-msgstr "gscan2pdf"
-
 #: ../menu-data/gshare:gshare-manager.desktop.in.h:1
-msgid "Configure the file sharing service"
-msgstr "Configurer le service de partage de fichiers"
-
-#: ../menu-data/gshare:gshare-manager.desktop.in.h:2
 msgid "File Sharing"
 msgstr "Partage de fichiers"
 
+#: ../menu-data/gshare:gshare-manager.desktop.in.h:2
+msgid "Configure the file sharing service"
+msgstr "Configurer le service de partage de fichiers"
+
 #: ../menu-data/gshutdown:gshutdown.desktop.in.h:1
+msgid "GShutdown"
+msgstr "GShutdown"
+
+#: ../menu-data/gshutdown:gshutdown.desktop.in.h:2
 msgid ""
 "An advanced shutdown utility which allows you to schedule the shutdown or "
 "the restart of your computer"
@@ -7300,10 +7392,6 @@
 "Un utilitaire d'extinction élaboré qui vous permet de programmer l'arrêt ou "
 "le redémarrage de votre ordinateur"
 
-#: ../menu-data/gshutdown:gshutdown.desktop.in.h:2
-msgid "GShutdown"
-msgstr "GShutdown"
-
 #: ../menu-data/gsmartcontrol:gsmartcontrol.desktop.in.h:1
 msgid "GSmartControl"
 msgstr "GSmartControl"
@@ -7322,47 +7410,47 @@
 msgstr "Calculateur d'impédance RF"
 
 #: ../menu-data/gsoko:gsoko.desktop.in.h:1
-msgid "Clone of the Sokoban game"
-msgstr "Clone du jeu Sokoban"
-
-#: ../menu-data/gsoko:gsoko.desktop.in.h:2
 msgid "Sokoban"
 msgstr "Sokoban"
 
-#: ../menu-data/gsql:gsql.desktop.in.h:1
-msgid "Integrated Database Development Environment for GNOME"
-msgstr "Environnement de développement de bases de données pour GNOME"
+#: ../menu-data/gsoko:gsoko.desktop.in.h:2
+msgid "Clone of the Sokoban game"
+msgstr "Clone du jeu Sokoban"
 
-#: ../menu-data/gsql:gsql.desktop.in.h:2
+#: ../menu-data/gsql:gsql.desktop.in.h:1
 msgid "gsql"
 msgstr "gsql"
 
-#: ../menu-data/gstm:gstm.desktop.in.h:1
-msgid "Manage SSH tunnel connections"
-msgstr "Gérer des connexions tunnel SSH"
+#: ../menu-data/gsql:gsql.desktop.in.h:2
+msgid "Integrated Database Development Environment for GNOME"
+msgstr "Environnement de développement de bases de données pour GNOME"
 
-#: ../menu-data/gstm:gstm.desktop.in.h:2
+#: ../menu-data/gstm:gstm.desktop.in.h:1
 msgid "gSTM"
 msgstr "gSTM"
 
+#: ../menu-data/gstm:gstm.desktop.in.h:2
+msgid "Manage SSH tunnel connections"
+msgstr "Gérer des connexions tunnel SSH"
+
 #: ../menu-data/gtablix:gtablix.desktop.in.h:1
+msgid "Gtablix Timetable Generator"
+msgstr "Concepteur d'emplois du temps Gtablix"
+
+#: ../menu-data/gtablix:gtablix.desktop.in.h:2
 msgid "Generate highschool timetables using a GUI for Tablix."
 msgstr ""
 "Concevoir des emplois du temps pour le lycée avec une interface utilisateur "
 "pour Tablix"
 
-#: ../menu-data/gtablix:gtablix.desktop.in.h:2
-msgid "Gtablix Timetable Generator"
-msgstr "Concepteur d'emplois du temps Gtablix"
-
 #: ../menu-data/gtali:gtali.desktop.in.h:1
-msgid "Beat the odds in a poker-style dice game"
-msgstr "Tenter la chance dans un jeu de dés de type poker"
-
-#: ../menu-data/gtali:gtali.desktop.in.h:2
 msgid "Tali"
 msgstr "Tali"
 
+#: ../menu-data/gtali:gtali.desktop.in.h:2
+msgid "Beat the odds in a poker-style dice game"
+msgstr "Tenter la chance dans un jeu de dés de type poker"
+
 #: ../menu-data/gtamsanalyzer.app:GTAMSAnalyzer.desktop.in.h:1
 msgid "GTAMSAnalyzer"
 msgstr "GTAMSAnalyzer"
@@ -7396,13 +7484,13 @@
 msgstr "Organisateur personnel pour l'environnement de bureau GNOME"
 
 #: ../menu-data/gthumb:gthumb.desktop.in.h:1
-msgid "View and organize your images"
-msgstr "Afficher et organiser vos images"
-
-#: ../menu-data/gthumb:gthumb.desktop.in.h:2
 msgid "gThumb Image Viewer"
 msgstr "Visionneuse d'images gThumb"
 
+#: ../menu-data/gthumb:gthumb.desktop.in.h:2
+msgid "View and organize your images"
+msgstr "Afficher et organiser vos images"
+
 #: ../menu-data/gtick:gtick.desktop.in.h:1
 msgid "Gtick"
 msgstr "Gtick"
@@ -7420,29 +7508,29 @@
 msgstr "Suivre et planifier vos activités quotidiennes"
 
 #: ../menu-data/gtimer:gtimer.desktop.in.h:1
-msgid "GTK-based X11 task timer"
-msgstr "Planificateur de tâches  X11 développé avec GTK"
-
-#: ../menu-data/gtimer:gtimer.desktop.in.h:2
 msgid "GTimer"
 msgstr "GTimer"
 
-#: ../menu-data/gtk-chtheme:gtk-chtheme.desktop.in.h:1
-msgid "GTK+2.0 Theme Changer"
-msgstr "Changeur de thème GTK+2.0"
+#: ../menu-data/gtimer:gtimer.desktop.in.h:2
+msgid "GTK-based X11 task timer"
+msgstr "Planificateur de tâches  X11 développé avec GTK"
 
-#: ../menu-data/gtk-chtheme:gtk-chtheme.desktop.in.h:2
+#: ../menu-data/gtk-chtheme:gtk-chtheme.desktop.in.h:1
 msgid "Gtk-ChTheme"
 msgstr "Gtk-ChTheme"
 
-#: ../menu-data/gtk-gnutella:gtk-gnutella.desktop.in.h:1
-msgid "A GUI based Gnutella Servent"
-msgstr "Une interface utilisateur fondée sur Gnutella Servent"
+#: ../menu-data/gtk-chtheme:gtk-chtheme.desktop.in.h:2
+msgid "GTK+2.0 Theme Changer"
+msgstr "Changeur de thème GTK+2.0"
 
-#: ../menu-data/gtk-gnutella:gtk-gnutella.desktop.in.h:2
+#: ../menu-data/gtk-gnutella:gtk-gnutella.desktop.in.h:1
 msgid "gtk-gnutella"
 msgstr "gtk-gnutella"
 
+#: ../menu-data/gtk-gnutella:gtk-gnutella.desktop.in.h:2
+msgid "A GUI based Gnutella Servent"
+msgstr "Une interface utilisateur fondée sur Gnutella Servent"
+
 #: ../menu-data/gtk-recordmydesktop:gtk-recordmydesktop.desktop.in.h:1
 #: ../menu-data/recorditnow:kde4__recorditnow.desktop.in.h:1
 msgid "Desktop recorder"
@@ -7453,38 +7541,38 @@
 msgstr "Enregistrer des vidéos de votre bureau"
 
 #: ../menu-data/gtk-redshift:gtk-redshift.desktop.in.h:1
-msgid "Color temperature adjustment tool"
-msgstr "Outil de réglage de la température de couleur"
-
-#: ../menu-data/gtk-redshift:gtk-redshift.desktop.in.h:2
 msgid "Redshift"
 msgstr "Redshift"
 
-#: ../menu-data/gtk-vector-screenshot:take-vector-screenshot.desktop.in.h:1
-msgid "Save vector images of application windows"
-msgstr "Enregistrer des images vectorielles des fenetres d'applicaiton"
+#: ../menu-data/gtk-redshift:gtk-redshift.desktop.in.h:2
+msgid "Color temperature adjustment tool"
+msgstr "Outil de réglage de la température de couleur"
 
-#: ../menu-data/gtk-vector-screenshot:take-vector-screenshot.desktop.in.h:2
+#: ../menu-data/gtk-vector-screenshot:take-vector-screenshot.desktop.in.h:1
 msgid "Take Vector Screenshot"
 msgstr "Faire une copie d'ecran vectorielle"
 
+#: ../menu-data/gtk-vector-screenshot:take-vector-screenshot.desktop.in.h:2
+msgid "Save vector images of application windows"
+msgstr "Enregistrer des images vectorielles des fenetres d'applicaiton"
+
 #: ../menu-data/gtkam:gtkam.desktop.in.h:1
+msgid "Gtkam Digital Camera Browser"
+msgstr "Explorateur d'appareil photo numérique Gtkam"
+
+#: ../menu-data/gtkam:gtkam.desktop.in.h:2
 msgid "Browse and download images from an attached digital camera"
 msgstr ""
 "Parcourir et télécharger les images d'un appareil photo numérique connecté"
 
-#: ../menu-data/gtkam:gtkam.desktop.in.h:2
-msgid "Gtkam Digital Camera Browser"
-msgstr "Explorateur d'appareil photo numérique Gtkam"
-
 #: ../menu-data/gtkatlantic:gtkatlantic.desktop.in.h:1
-msgid "Connect to a Monopd server"
-msgstr "Se connecter à un serveur Monopd"
-
-#: ../menu-data/gtkatlantic:gtkatlantic.desktop.in.h:2
 msgid "GtkAtlantic"
 msgstr "GtkAtlantic"
 
+#: ../menu-data/gtkatlantic:gtkatlantic.desktop.in.h:2
+msgid "Connect to a Monopd server"
+msgstr "Se connecter à un serveur Monopd"
+
 #: ../menu-data/gtkballs:gtkballs.desktop.in.h:1
 msgid "GtkBalls"
 msgstr "GtkBalls"
@@ -7502,38 +7590,38 @@
 msgstr "Jouer à des jeux de plateau divers et variés"
 
 #: ../menu-data/gtkguitune:gtkguitune.desktop.in.h:1
-msgid "Tune your Guitar"
-msgstr "Accorder votre guitare"
-
-#: ../menu-data/gtkguitune:gtkguitune.desktop.in.h:2
 msgid "gtkGuitune"
 msgstr "gtkGuitune"
 
-#: ../menu-data/gtkhash:gtkhash.desktop.in.h:1
-msgid "Compute message digests and checksums"
-msgstr "Calculer les résumés de messages et les sommes de contrôle"
+#: ../menu-data/gtkguitune:gtkguitune.desktop.in.h:2
+msgid "Tune your Guitar"
+msgstr "Accorder votre guitare"
 
-#: ../menu-data/gtkhash:gtkhash.desktop.in.h:2
+#: ../menu-data/gtkhash:gtkhash.desktop.in.h:1
 msgid "GtkHash"
 msgstr "GtkHash"
 
-#: ../menu-data/gtklick:gtklick.desktop.in.h:1
-msgid "A Simple Metronome"
-msgstr "Un simple métronome"
+#: ../menu-data/gtkhash:gtkhash.desktop.in.h:2
+msgid "Compute message digests and checksums"
+msgstr "Calculer les résumés de messages et les sommes de contrôle"
 
-#: ../menu-data/gtklick:gtklick.desktop.in.h:2
+#: ../menu-data/gtklick:gtklick.desktop.in.h:1
 msgid "gtklick"
 msgstr "gtklick"
 
+#: ../menu-data/gtklick:gtklick.desktop.in.h:2
+msgid "A Simple Metronome"
+msgstr "Un simple métronome"
+
 #: ../menu-data/gtkorphan:gtkorphan.desktop.in.h:1
+msgid "Remove orphaned packages"
+msgstr "Suppression des paquets orphelins"
+
+#: ../menu-data/gtkorphan:gtkorphan.desktop.in.h:2
 msgid "A graphical tool to find and remove orphaned libraries"
 msgstr ""
 "Un outil graphique pour trouver et supprimer les bibliothèques orphelines"
 
-#: ../menu-data/gtkorphan:gtkorphan.desktop.in.h:2
-msgid "Remove orphaned packages"
-msgstr "Suppression des paquets orphelins"
-
 #: ../menu-data/gtkperf:gtkperf.desktop.in.h:1
 msgid "GtkPerf"
 msgstr "GtkPerf"
@@ -7551,29 +7639,29 @@
 msgstr "Gestionnaire d'iPod dtkpod"
 
 #: ../menu-data/gtkterm:gtkterm.desktop.in.h:1
-msgid "Communicate with the serial port"
-msgstr "Communiquer avec le port série"
-
-#: ../menu-data/gtkterm:gtkterm.desktop.in.h:2
 msgid "Serial port terminal"
 msgstr "Terminal sur port série"
 
-#: ../menu-data/gtkvncviewer:data__gtkvncviewer.desktop.in.h:1
-msgid "Connect to your VNC servers"
-msgstr "Se connecter à vos serveurs VNC"
+#: ../menu-data/gtkterm:gtkterm.desktop.in.h:2
+msgid "Communicate with the serial port"
+msgstr "Communiquer avec le port série"
 
-#: ../menu-data/gtkvncviewer:data__gtkvncviewer.desktop.in.h:2
+#: ../menu-data/gtkvncviewer:data__gtkvncviewer.desktop.in.h:1
 msgid "Gtk VNC Viewer"
 msgstr "Afficheur VNC (Gtk)"
 
-#: ../menu-data/gtkwhiteboard:gtkwhiteboard.desktop.in.h:1
-msgid "A whiteboard written in GTK using the wiimote"
-msgstr "Un tableau blanc utilisant la Wiimote (en GTK)"
+#: ../menu-data/gtkvncviewer:data__gtkvncviewer.desktop.in.h:2
+msgid "Connect to your VNC servers"
+msgstr "Se connecter à vos serveurs VNC"
 
-#: ../menu-data/gtkwhiteboard:gtkwhiteboard.desktop.in.h:2
+#: ../menu-data/gtkwhiteboard:gtkwhiteboard.desktop.in.h:1
 msgid "GTK Wiimote Whiteboard"
 msgstr "Tableau blanc Wiimote GTK"
 
+#: ../menu-data/gtkwhiteboard:gtkwhiteboard.desktop.in.h:2
+msgid "A whiteboard written in GTK using the wiimote"
+msgstr "Un tableau blanc utilisant la Wiimote (en GTK)"
+
 #: ../menu-data/gtodo:gtodo.desktop.in.h:1
 msgid "Todo list"
 msgstr "Liste des tâches à accomplir"
@@ -7615,13 +7703,13 @@
 msgstr "Insérer des caractères spéciaux dans les documents"
 
 #: ../menu-data/gufw:gufw.desktop.in.h:1
-msgid "Allows you to configure ufw firewall"
-msgstr "Vous permet de configurer un pare-feu « ufw »"
-
-#: ../menu-data/gufw:gufw.desktop.in.h:2
 msgid "Firewall Configuration"
 msgstr "Configuration du pare-feu"
 
+#: ../menu-data/gufw:gufw.desktop.in.h:2
+msgid "Allows you to configure ufw firewall"
+msgstr "Vous permet de configurer un pare-feu « ufw »"
+
 #: ../menu-data/gui-apt-key:gui-apt-key.desktop.in.h:1
 msgid "APT Key Manager"
 msgstr "Gestionnaire de clés APT"
@@ -7632,13 +7720,13 @@
 "Outil graphique d'administration des clés numériques utilisées avec APT"
 
 #: ../menu-data/guitarix:guitarix.desktop.in.h:1
-msgid "Simple mono amplifier simulation"
-msgstr "Simulation simple d'amplificateur mono"
-
-#: ../menu-data/guitarix:guitarix.desktop.in.h:2
 msgid "guitarix"
 msgstr "guitarix"
 
+#: ../menu-data/guitarix:guitarix.desktop.in.h:2
+msgid "Simple mono amplifier simulation"
+msgstr "Simulation simple d'amplificateur mono"
+
 #: ../menu-data/gummi:gummi.desktop.in.h:1
 msgid "Gummi"
 msgstr "Gummi"
@@ -7660,91 +7748,91 @@
 msgstr "UPnP AV Control Point"
 
 #: ../menu-data/gurlchecker:gurlchecker.desktop.in.h:1
-msgid "Graphical Web Links checker"
-msgstr "Testeur graphique de liens Web"
-
-#: ../menu-data/gurlchecker:gurlchecker.desktop.in.h:2
 msgid "gurlchecker"
 msgstr "gurlchecker"
 
-#: ../menu-data/guvcview:guvcview.desktop.in.h:1
-msgid "A video viewer and capturer for the linux uvc driver"
-msgstr "Visualisation et capture vidéo pour le pilote uvc Linux"
+#: ../menu-data/gurlchecker:gurlchecker.desktop.in.h:2
+msgid "Graphical Web Links checker"
+msgstr "Testeur graphique de liens Web"
 
-#: ../menu-data/guvcview:guvcview.desktop.in.h:2
+#: ../menu-data/guvcview:guvcview.desktop.in.h:1
 msgid "guvcview"
 msgstr "guvcview"
 
-#: ../menu-data/guymager:guymager.desktop.in.h:1
-msgid "Fast forensic imager"
-msgstr ""
+#: ../menu-data/guvcview:guvcview.desktop.in.h:2
+msgid "A video viewer and capturer for the linux uvc driver"
+msgstr "Visualisation et capture vidéo pour le pilote uvc Linux"
 
-#: ../menu-data/guymager:guymager.desktop.in.h:2
+#: ../menu-data/guymager:guymager.desktop.in.h:1
 msgid "Guymager"
 msgstr "Guymager"
 
-#: ../menu-data/gv:gv.desktop.in.h:1
-msgid "View PS and/or PDF files"
-msgstr "Visionneur de fichiers PS et PDF"
+#: ../menu-data/guymager:guymager.desktop.in.h:2
+msgid "Fast forensic imager"
+msgstr ""
 
-#: ../menu-data/gv:gv.desktop.in.h:2
+#: ../menu-data/gv:gv.desktop.in.h:1
 msgid "gv"
 msgstr "gv"
 
-#: ../menu-data/gvb:gvb.desktop.in.h:1
-msgid "Gvb"
-msgstr "Gvb"
+#: ../menu-data/gv:gv.desktop.in.h:2
+msgid "View PS and/or PDF files"
+msgstr "Visionneur de fichiers PS et PDF"
 
-#: ../menu-data/gvb:gvb.desktop.in.h:2
+#: ../menu-data/gvb:gvb.desktop.in.h:1
 msgid "Play with waves and vibrations"
 msgstr "Jouer avec les ondes et les vibrations"
 
-#: ../menu-data/gvrng:gvrng.desktop.in.h:1
-msgid "Guido van Robot NG"
-msgstr "Guido van Robot NG"
+#: ../menu-data/gvb:gvb.desktop.in.h:2
+msgid "Gvb"
+msgstr "Gvb"
 
-#: ../menu-data/gvrng:gvrng.desktop.in.h:2
+#: ../menu-data/gvrng:gvrng.desktop.in.h:1
 msgid "GvRng"
 msgstr "GvRng"
 
+#: ../menu-data/gvrng:gvrng.desktop.in.h:2
+msgid "Guido van Robot NG"
+msgstr "Guido van Robot NG"
+
 #: ../menu-data/gwaei:gwaei.desktop.in.h:1
+msgid "gWaei Japanese-English Dictionary"
+msgstr "Dictionnaire japonais-anglais gWaei"
+
+#: ../menu-data/gwaei:gwaei.desktop.in.h:2
 msgid "Enter a Japanese or English word to easily get translations."
 msgstr ""
 "Entrez un mot japonais ou anglais pour en obtenir facilement des traductions."
 
-#: ../menu-data/gwaei:gwaei.desktop.in.h:2
-msgid "gWaei Japanese-English Dictionary"
-msgstr "Dictionnaire japonais-anglais gWaei"
-
 #: ../menu-data/gwakeonlan:gwakeonlan.desktop.in.h:1
+msgid "gWakeOnLan"
+msgstr "gWakeOnLan"
+
+#: ../menu-data/gwakeonlan:gwakeonlan.desktop.in.h:2
 msgid ""
 "A GTK+ utility to awake turned off machine using the Wake On LAN feature."
 msgstr ""
 "Un utilitaire GTK+ pour allumer un ordinateur éteint grâce à la fonction "
 "Wake on LAN."
 
-#: ../menu-data/gwakeonlan:gwakeonlan.desktop.in.h:2
-msgid "gWakeOnLan"
-msgstr "gWakeOnLan"
-
 #: ../menu-data/gwaterfall:waterfall.desktop.in.h:1
+msgid "Waterfall"
+msgstr "Waterfall"
+
+#: ../menu-data/gwaterfall:waterfall.desktop.in.h:2
 msgid "View all characters of a font in all sizes."
 msgstr ""
 "Afficher tous les caractères de toutes les polices, dans toutes les tailles"
 
-#: ../menu-data/gwaterfall:waterfall.desktop.in.h:2
-msgid "Waterfall"
-msgstr "Waterfall"
-
 #: ../menu-data/gwave:gwave.desktop.in.h:1
+msgid "gwave"
+msgstr "gwave"
+
+#: ../menu-data/gwave:gwave.desktop.in.h:2
 msgid "A waveform viewer eg for spice simulators "
 msgstr ""
 "Un afficheur d'ondes pour simulateur de circuits électroniques par exemple "
 
-#: ../menu-data/gwave:gwave.desktop.in.h:2
-msgid "gwave"
-msgstr "gwave"
-
 #: ../menu-data/gwc:gwc.desktop.in.h:1
 msgid "Gnome Wave Cleaner"
 msgstr "Nettoyeur d'ondes Gnome"
@@ -7762,22 +7850,26 @@
 msgstr "Jouer à un jeu de puzzle semblable à « Diamond Mine »"
 
 #: ../menu-data/gwenrename:kde4__gwenrename.desktop.in.h:1
-msgid "A batch renaming tool for KDE"
-msgstr "Un outil de renommage par lot pour KDE"
-
-#: ../menu-data/gwenrename:kde4__gwenrename.desktop.in.h:2
 msgid "GwenRename"
 msgstr "GwenRename"
 
-#: ../menu-data/gwenview:kde4__gwenview.desktop.in.h:1
-msgid "A simple image viewer"
-msgstr "Une visionneuse d'images simple"
+#: ../menu-data/gwenrename:kde4__gwenrename.desktop.in.h:2
+msgid "A batch renaming tool for KDE"
+msgstr "Un outil de renommage par lot pour KDE"
 
-#: ../menu-data/gwenview:kde4__gwenview.desktop.in.h:2
+#: ../menu-data/gwenview:kde4__gwenview.desktop.in.h:1
 msgid "Gwenview"
 msgstr "Gwenview"
 
+#: ../menu-data/gwenview:kde4__gwenview.desktop.in.h:2
+msgid "A simple image viewer"
+msgstr "Une visionneuse d'images simple"
+
 #: ../menu-data/gwhere:gwhere.desktop.in.h:1
+msgid "Removable media catalog managment"
+msgstr "Gestion de catalogue de médias amovibles"
+
+#: ../menu-data/gwhere:gwhere.desktop.in.h:2
 msgid ""
 "GWhere allows to manage a database of yours CDs and others removable media "
 "(hard disks, floppy drive, Zip drive, CD-ROM, etc...). With GWhere it's easy "
@@ -7789,10 +7881,6 @@
 "parcourir facilement des CD ou d'effectuer une recherche rapide sans avoir "
 "besoin d'insérer les CD dans le lecteur à chaque fois."
 
-#: ../menu-data/gwhere:gwhere.desktop.in.h:2
-msgid "Removable media catalog managment"
-msgstr "Gestion de catalogue de médias amovibles"
-
 #: ../menu-data/gwibber:gwibber.desktop.in.h:1
 msgid "Gwibber Social Client"
 msgstr "Client de réseaux sociaux Gwibber"
@@ -7802,13 +7890,13 @@
 msgstr "Actualiser votre microblog et suivre l'activité de vos contacts"
 
 #: ../menu-data/gworkspace.app:GWorkspace.desktop.in.h:1
-msgid "GNUstep Workspace Manager"
-msgstr "Gestionnaire d'espace de travail GNUstep"
-
-#: ../menu-data/gworkspace.app:GWorkspace.desktop.in.h:2
 msgid "GWorkspace"
 msgstr "GWorkspace"
 
+#: ../menu-data/gworkspace.app:GWorkspace.desktop.in.h:2
+msgid "GNUstep Workspace Manager"
+msgstr "Gestionnaire d'espace de travail GNUstep"
+
 #: ../menu-data/gworldclock:gworldclock.desktop.in.h:1
 msgid "See the time in other timezones"
 msgstr "Afficher l'heure d'autres fuseaux horaires"
@@ -7824,7 +7912,7 @@
 #: ../menu-data/gwrite:gwrite.desktop.in.h:2
 #: ../menu-data/leafpad:leafpad.desktop.in.h:2
 #: ../menu-data/mousepad:mousepad.desktop.in.h:2
-#: ../menu-data/x2:x2.desktop.in.h:1
+#: ../menu-data/x2:x2.desktop.in.h:2
 msgid "Simple text editor"
 msgstr "Un simple éditeur de texte"
 
@@ -7837,21 +7925,21 @@
 msgstr "Voir et analyser des données SPM"
 
 #: ../menu-data/gxmms2:gxmms2.desktop.in.h:1
-msgid "Play music"
-msgstr "Lire des fichiers audio"
-
-#: ../menu-data/gxmms2:gxmms2.desktop.in.h:2
 msgid "gxmms2"
 msgstr "gxmms2"
 
-#: ../menu-data/gxneur:gxneur.desktop.in.h:1
-msgid "Automatic keyboard layout switcher"
-msgstr "Changement automatique de la disposition du clavier"
+#: ../menu-data/gxmms2:gxmms2.desktop.in.h:2
+msgid "Play music"
+msgstr "Lire des fichiers audio"
 
-#: ../menu-data/gxneur:gxneur.desktop.in.h:2
+#: ../menu-data/gxneur:gxneur.desktop.in.h:1
 msgid "gXNeur"
 msgstr "gXNeur"
 
+#: ../menu-data/gxneur:gxneur.desktop.in.h:2
+msgid "Automatic keyboard layout switcher"
+msgstr "Changement automatique de la disposition du clavier"
+
 #: ../menu-data/gxtuner:gxtuner.desktop.in.h:1
 msgid "Gxtuner"
 msgstr "Gxtuner"
@@ -7861,122 +7949,112 @@
 msgstr "Interface Tuner pour Jack"
 
 #: ../menu-data/gyrus:gyrus.desktop.in.h:1
-msgid "Administer the mailboxes of your IMAP Cyrus servers"
-msgstr "Administrer les boîtes aux lettres de serveurs IMAP Cyrus"
-
-#: ../menu-data/gyrus:gyrus.desktop.in.h:2
 msgid "Gyrus IMAP Cyrus Administrator"
 msgstr "Outil d'administration IMAP Cyrus Gyrus"
 
-#: ../menu-data/hamfax:hamfax.desktop.in.h:1
-msgid "Send and receive radio facsimiles"
-msgstr "Envoyer et recevoir des télécopies par radio"
+#: ../menu-data/gyrus:gyrus.desktop.in.h:2
+msgid "Administer the mailboxes of your IMAP Cyrus servers"
+msgstr "Administrer les boîtes aux lettres de serveurs IMAP Cyrus"
 
-#: ../menu-data/hamfax:hamfax.desktop.in.h:2
+#: ../menu-data/hamfax:hamfax.desktop.in.h:1
 msgid "hamfax"
 msgstr "hamfax"
 
-#: ../menu-data/hamster-applet:hamster-time-tracker.desktop.in.h:1
-msgid "Project Hamster - track your time"
-msgstr "Projet Hamster - décomptez votre temps"
+#: ../menu-data/hamfax:hamfax.desktop.in.h:2
+msgid "Send and receive radio facsimiles"
+msgstr "Envoyer et recevoir des télécopies par radio"
 
-#: ../menu-data/hamster-applet:hamster-time-tracker.desktop.in.h:2
+#: ../menu-data/hamster-applet:hamster-time-tracker.desktop.in.h:1
 msgid "Time Tracker"
 msgstr "Suivi du temps"
 
+#: ../menu-data/hamster-applet:hamster-time-tracker.desktop.in.h:2
+msgid "Project Hamster - track your time"
+msgstr "Projet Hamster - décomptez votre temps"
+
 #: ../menu-data/hannah-foo2zjs:hannah-foo2zjs.desktop.in.h:1
+msgid "Foo2ZJS Firmware Installer (Hannah)"
+msgstr "Installateur du micro-logiciel Foo2ZJS (Hannah)"
+
+#: ../menu-data/hannah-foo2zjs:hannah-foo2zjs.desktop.in.h:2
 msgid "Foo2ZJS Firmware Downloader and Installer"
 msgstr ""
 "Utilitaire de téléchargement et d'installation du micro-logiciel Foo2ZJS"
 
-#: ../menu-data/hannah-foo2zjs:hannah-foo2zjs.desktop.in.h:2
-msgid "Foo2ZJS Firmware Installer (Hannah)"
-msgstr "Installateur du micro-logiciel Foo2ZJS (Hannah)"
-
 #: ../menu-data/hannah:hannah.desktop.in.h:1
-msgid "A pacman-like game"
-msgstr "Un jeu semblable à pacman"
-
-#: ../menu-data/hannah:hannah.desktop.in.h:2
 msgid "Help Hannah's Horse"
 msgstr "Aidez le cheval d'Hannah"
 
+#: ../menu-data/hannah:hannah.desktop.in.h:2
+msgid "A pacman-like game"
+msgstr "Un jeu semblable à pacman"
+
 #: ../menu-data/hardinfo:hardinfo.desktop.in.h:1
 msgid "System Profiler and Benchmark"
 msgstr "Représentation et analyse des performances du système"
 
-#: ../menu-data/harpia:harpia.desktop.in.h:1
-msgid "Harpia"
-msgstr "Harpia"
-
-#: ../menu-data/harpia:harpia.desktop.in.h:2
-msgid "Image Processing and Computer Vision Automatic Programming Tool"
-msgstr ""
-"Outil pour les algorithmes de traitement d'image et le développement de "
-"systèmes informatiques de reconnaissance visuelle (openCV)"
-
 #: ../menu-data/hasciicam:hasciicam.desktop.in.h:1
-msgid "(h)ascii for the masses!"
-msgstr "(h)ascii pour les masses!"
-
-#: ../menu-data/hasciicam:hasciicam.desktop.in.h:2
 msgid "HasciiCam"
 msgstr "HasciiCam"
 
+#: ../menu-data/hasciicam:hasciicam.desktop.in.h:2
+msgid "(h)ascii for the masses!"
+msgstr "(h)ascii pour les masses!"
+
 #: ../menu-data/hatari:hatariui.desktop.in.h:1
 msgid "Hatari UI"
 msgstr "Interface utilisateur Hatari"
 
 #: ../menu-data/hdfview:hdfview.desktop.in.h:1
-msgid "HDF4/5 Data Browser"
-msgstr "Explorateur de données HDF 4/5"
-
-#: ../menu-data/hdfview:hdfview.desktop.in.h:2
 msgid "hdfview"
 msgstr "hdfview"
 
-#: ../menu-data/hdhomerun-config-gui:hdhr.desktop.in.h:1
-msgid "A GUI for configuration of HDHomeRun devices"
-msgstr "Interface de configuration pour tuner numérique HDHomeRun"
+#: ../menu-data/hdfview:hdfview.desktop.in.h:2
+msgid "HDF4/5 Data Browser"
+msgstr "Explorateur de données HDF 4/5"
 
-#: ../menu-data/hdhomerun-config-gui:hdhr.desktop.in.h:2
+#: ../menu-data/hdhomerun-config-gui:hdhr.desktop.in.h:1
 msgid "HDHomeRun Config GUI"
 msgstr "Interface de configuration pour HDHomeRun"
 
-#: ../menu-data/hedgewars:hedgewars.desktop.in.h:1
-msgid "Fighting Hedgehogs"
-msgstr "Bataille de hérissons"
+#: ../menu-data/hdhomerun-config-gui:hdhr.desktop.in.h:2
+msgid "A GUI for configuration of HDHomeRun devices"
+msgstr "Interface de configuration pour tuner numérique HDHomeRun"
 
-#: ../menu-data/hedgewars:hedgewars.desktop.in.h:2
+#: ../menu-data/hedgewars:hedgewars.desktop.in.h:1
 msgid "Hedgewars"
 msgstr "Hedgewars"
 
-#: ../menu-data/helpviewer.app:HelpViewer.desktop.in.h:1
-msgid "GNUstep Help Viewer"
-msgstr "Afficheur d'aide pour GNUstep"
+#: ../menu-data/hedgewars:hedgewars.desktop.in.h:2
+msgid "Fighting Hedgehogs"
+msgstr "Bataille de hérissons"
 
-#: ../menu-data/helpviewer.app:HelpViewer.desktop.in.h:2
+#: ../menu-data/helpviewer.app:HelpViewer.desktop.in.h:1
 msgid "HelpViewer"
 msgstr "HelpViewer"
 
-#: ../menu-data/herculesstudio:herculesstudio.desktop.in.h:1
-msgid "GUI front-end of hercules emulator"
-msgstr "Interface graphique pour l'émulateur hercules"
+#: ../menu-data/helpviewer.app:HelpViewer.desktop.in.h:2
+msgid "GNUstep Help Viewer"
+msgstr "Afficheur d'aide pour GNUstep"
 
-#: ../menu-data/herculesstudio:herculesstudio.desktop.in.h:2
+#: ../menu-data/herculesstudio:herculesstudio.desktop.in.h:1
 msgid "HerculesStudio"
 msgstr "HerculesStudio"
 
+#: ../menu-data/herculesstudio:herculesstudio.desktop.in.h:2
+msgid "GUI front-end of hercules emulator"
+msgstr "Interface graphique pour l'émulateur hercules"
+
 #: ../menu-data/heroes-common:heroes.desktop.in.h:1
+msgid "Heroes"
+msgstr "Heroes"
+
+#: ../menu-data/heroes-common:heroes.desktop.in.h:2
 msgid "Collect powerups and avoid your opponents' trails"
 msgstr ""
 "Collecter des pouvoirs surnaturels et éviter de croiser le chemin de vos "
 "ennemis"
 
-#: ../menu-data/heroes-common:heroes.desktop.in.h:2
-msgid "Heroes"
-msgstr "Heroes"
-
 #: ../menu-data/hex-a-hop:hex-a-hop.desktop.in.h:1
 msgid "Hex-a-hop"
 msgstr "Hex-a-hop"
@@ -8018,13 +8096,13 @@
 msgstr "hocr-gtk"
 
 #: ../menu-data/hocr-gtk:sane-pygtk.desktop.in.h:1
-msgid "A minimal program to work with scanner."
-msgstr "Un programme minimal pour travailler avec un scanner."
-
-#: ../menu-data/hocr-gtk:sane-pygtk.desktop.in.h:2
 msgid "sane-pygtk"
 msgstr "sane-pygtk"
 
+#: ../menu-data/hocr-gtk:sane-pygtk.desktop.in.h:2
+msgid "A minimal program to work with scanner."
+msgstr "Un programme minimal pour travailler avec un scanner."
+
 #: ../menu-data/holdingnuts:holdingnuts.desktop.in.h:1
 msgid "An open source poker client and server"
 msgstr "Client et serveur libre de jeu de poker"
@@ -8042,13 +8120,13 @@
 msgstr "Jouer à un jeu d'énigmes passionnant"
 
 #: ../menu-data/homebank:homebank.desktop.in.h:1
-msgid "Free, easy, personal accounting for everyone."
-msgstr "Comptabilité personnelle libre et facile, pour tous."
-
-#: ../menu-data/homebank:homebank.desktop.in.h:2
 msgid "HomeBank"
 msgstr "HomeBank"
 
+#: ../menu-data/homebank:homebank.desktop.in.h:2
+msgid "Free, easy, personal accounting for everyone."
+msgstr "Comptabilité personnelle libre et facile, pour tous."
+
 #: ../menu-data/horae:artemis.desktop.in.h:1
 msgid "Artemis"
 msgstr "Artemis"
@@ -8092,30 +8170,30 @@
 msgstr "Client Twitter léger basé sur Gtk2 et Webkit"
 
 #: ../menu-data/hotssh:hotssh.desktop.in.h:1
-msgid "Connect to a remote computer using Secure Shell"
-msgstr "Se connecter à un ordinateur distant en utilisant SSH"
-
-#: ../menu-data/hotssh:hotssh.desktop.in.h:2
 msgid "Secure Shell"
 msgstr "Interpréteur de commandes sécurisé (SSH)"
 
-#: ../menu-data/hotwire:hotwire.desktop.in.h:1
-msgid "Execute text commands"
-msgstr "Exécuter des commandes texte"
+#: ../menu-data/hotssh:hotssh.desktop.in.h:2
+msgid "Connect to a remote computer using Secure Shell"
+msgstr "Se connecter à un ordinateur distant en utilisant SSH"
 
-#: ../menu-data/hotwire:hotwire.desktop.in.h:2
+#: ../menu-data/hotwire:hotwire.desktop.in.h:1
 msgid "Hotwire Shell"
 msgstr "Interpréteur de commandes (shell) Hotwire"
 
-#: ../menu-data/hplip-gui:hplip.desktop.in.h:1
-msgid "HP Printing System Control Center"
-msgstr "Centre de contrôle du système d'impression HP"
+#: ../menu-data/hotwire:hotwire.desktop.in.h:2
+msgid "Execute text commands"
+msgstr "Exécuter des commandes texte"
 
-#: ../menu-data/hplip-gui:hplip.desktop.in.h:2
+#: ../menu-data/hplip-gui:hplip.desktop.in.h:1
 msgid "HPLIP Toolbox"
 msgstr "Boîte à outils HPLIP (HP Linux Imaging and Printing)"
 
-#: ../menu-data/htop:htop.desktop.in.h:1
+#: ../menu-data/hplip-gui:hplip.desktop.in.h:2
+msgid "HP Printing System Control Center"
+msgstr "Centre de contrôle du système d'impression HP"
+
+#: ../menu-data/htop:htop.desktop.in.h:1
 msgid "Htop"
 msgstr "Htop"
 
@@ -8123,51 +8201,38 @@
 msgid "Show System Processes"
 msgstr "Afficher les processus système"
 
-#: ../menu-data/hugin:calibrate_lens_gui.desktop.in.h:1
-msgid "Hugin Calibrate Lens"
-msgstr ""
-
-#: ../menu-data/hugin:calibrate_lens_gui.desktop.in.h:2
-#: ../menu-data/hugin:hugin.desktop.in.h:2
-msgid "Stitch photographs together"
-msgstr "Assembler des photographies"
-
-#: ../menu-data/hugin:hugin.desktop.in.h:1
-msgid "Hugin Panorama Creator"
-msgstr "Créateur de panoramiques Hugin"
-
 #: ../menu-data/hydra-gtk:hydra-gtk.desktop.in.h:1
-msgid "A fast network logon cracker"
-msgstr ""
-
-#: ../menu-data/hydra-gtk:hydra-gtk.desktop.in.h:2
 msgid "XHydra"
 msgstr "XHydra"
 
+#: ../menu-data/hydra-gtk:hydra-gtk.desktop.in.h:2
+msgid "A fast network logon cracker"
+msgstr ""
+
 #: ../menu-data/hydrogen:hydrogen.desktop.in.h:1
-msgid "Create drum sequences"
-msgstr "Créer des séquences de batterie"
+msgid "Hydrogen"
+msgstr "Hydrogen"
 
 #: ../menu-data/hydrogen:hydrogen.desktop.in.h:2
-msgid "Hydrogen Drum Machine"
-msgstr "Boîte à rythmes Hydrogen"
+msgid "Create drum sequences"
+msgstr "Créer des séquences de batterie"
 
 #: ../menu-data/iagno:iagno.desktop.in.h:1
-msgid "Dominate the board in a classic version of Reversi"
-msgstr "Conquérir le plateau dans une version classique du Reversi"
-
-#: ../menu-data/iagno:iagno.desktop.in.h:2
 msgid "Iagno"
 msgstr "Iagno"
 
-#: ../menu-data/ibus:ibus-setup.desktop.in.h:1
-msgid "Adjust methods for keyboard input."
-msgstr "Configurer les méthodes de saisie au clavier."
+#: ../menu-data/iagno:iagno.desktop.in.h:2
+msgid "Dominate the board in a classic version of Reversi"
+msgstr "Conquérir le plateau dans une version classique du Reversi"
 
-#: ../menu-data/ibus:ibus-setup.desktop.in.h:2
+#: ../menu-data/ibus:ibus-setup.desktop.in.h:1
 msgid "Keyboard Input Methods"
 msgstr "Méthodes de saisie au clavier"
 
+#: ../menu-data/ibus:ibus-setup.desktop.in.h:2
+msgid "Adjust methods for keyboard input."
+msgstr "Configurer les méthodes de saisie au clavier."
+
 #: ../menu-data/ibus:ibus.desktop.in.h:1
 msgid "IBus"
 msgstr "IBus"
@@ -8185,13 +8250,13 @@
 msgstr "Casser un iceberg en petits morceaux pour attraper les manchots"
 
 #: ../menu-data/icecc-monitor:kde4__icemon.desktop.in.h:1
-msgid "A monitor for an Icecream compilation network"
-msgstr "Surveillance pour un réseau de compilation Icecream"
-
-#: ../menu-data/icecc-monitor:kde4__icemon.desktop.in.h:2
 msgid "Icemon"
 msgstr "Icemon"
 
+#: ../menu-data/icecc-monitor:kde4__icemon.desktop.in.h:2
+msgid "A monitor for an Icecream compilation network"
+msgstr "Surveillance pour un réseau de compilation Icecream"
+
 #: ../menu-data/icedtea-netx-common:icedtea-netx-javaws.desktop.in.h:1
 msgid "IcedTea Java 6 Web Start"
 msgstr "IcedTea Java 6 Web Start"
@@ -8248,14 +8313,14 @@
 msgstr "Environnement de développement intégré pour Python"
 
 #: ../menu-data/ifpgui:ifpgui.desktop.in.h:1
+msgid "ifpgui"
+msgstr "ifpgui"
+
+#: ../menu-data/ifpgui:ifpgui.desktop.in.h:2
 msgid "KDE-style GUI for iRiver iFP flash players "
 msgstr ""
 "Interface graphique utilisateur de style KDE pour les baladeurs iRiver iFP "
 
-#: ../menu-data/ifpgui:ifpgui.desktop.in.h:2
-msgid "ifpgui"
-msgstr "ifpgui"
-
 #: ../menu-data/ifrit:ifrit.desktop.in.h:1
 msgid "IFRIT 3D Data Visualization"
 msgstr "Visualisation des données IFRIT en 3D"
@@ -8265,23 +8330,23 @@
 msgstr "Visualiser des simulations numériques en 3D"
 
 #: ../menu-data/ii-esu:ii-esu.desktop.in.h:1
-msgid "HIZ's ES"
-msgstr "HIZ's ES"
-
-#: ../menu-data/ii-esu:ii-esu.desktop.in.h:2
 msgid "ii-esu"
 msgstr "ii-esu"
 
-#: ../menu-data/ike-qtgui:ike.desktop.in.h:1
-msgid "Application to manage remote site configurations"
-msgstr "Application pour gérer les configurations de sites distants"
+#: ../menu-data/ii-esu:ii-esu.desktop.in.h:2
+msgid "HIZ's ES"
+msgstr "HIZ's ES"
 
-#: ../menu-data/ike-qtgui:ike.desktop.in.h:2
+#: ../menu-data/ike-qtgui:ike.desktop.in.h:1
 msgid "Shrew Soft VPN Access Manager"
 msgstr "Gestionnaire d'accès VPN Shrew Soft"
 
+#: ../menu-data/ike-qtgui:ike.desktop.in.h:2
+msgid "Application to manage remote site configurations"
+msgstr "Application pour gérer les configurations de sites distants"
+
 #: ../menu-data/im-config:im-config.desktop.in.h:1
-#: ../menu-data/uim-gtk2.0:uim.desktop.in.h:2
+#: ../menu-data/uim-gtk2.0:uim.desktop.in.h:1
 msgid "Input Method"
 msgstr "Méthode de saisie"
 
@@ -8295,13 +8360,13 @@
 msgstr "Changement de méthode de saisie"
 
 #: ../menu-data/imagej:imagej.desktop.in.h:1
-msgid "Image processing and analysis"
-msgstr "Traitement et analyse d'image"
-
-#: ../menu-data/imagej:imagej.desktop.in.h:2
 msgid "ImageJ"
 msgstr "ImageJ"
 
+#: ../menu-data/imagej:imagej.desktop.in.h:2
+msgid "Image processing and analysis"
+msgstr "Traitement et analyse d'image"
+
 #: ../menu-data/imageshack-uploader:imageshackuploader.desktop.in.h:1
 msgid "ImageShack Uploader"
 msgstr "Téléversement sur ImageShack"
@@ -8310,14 +8375,22 @@
 msgid "Upload your images and videos to ImageShack"
 msgstr "Téléverser vos images et vidéos sur ImageSchack"
 
-#: ../menu-data/imagination:imagination.desktop.in.h:1
-msgid "A lightweight DVD slideshow maker using GTK+2"
-msgstr "Créateur léger de diaporamas DVD utilisant GTK+2"
+#: ../menu-data/imagevis3d:imagevis3d.desktop.in.h:1
+msgid "ImageVis3D"
+msgstr "ImageVis3D"
 
-#: ../menu-data/imagination:imagination.desktop.in.h:2
+#: ../menu-data/imagevis3d:imagevis3d.desktop.in.h:2
+msgid "Desktop volume rendering application for large data"
+msgstr ""
+
+#: ../menu-data/imagination:imagination.desktop.in.h:1
 msgid "Imagination"
 msgstr "Imagination"
 
+#: ../menu-data/imagination:imagination.desktop.in.h:2
+msgid "A lightweight DVD slideshow maker using GTK+2"
+msgstr "Créateur léger de diaporamas DVD utilisant GTK+2"
+
 #: ../menu-data/imview:imview.desktop.in.h:1
 msgid "Imview Image Viewer"
 msgstr "Visionneuse d'images Imview"
@@ -8327,6 +8400,10 @@
 msgstr "Afficher et analyser des images scientifiques"
 
 #: ../menu-data/indicator-multiload:indicator-multiload.desktop.in.h:1
+msgid "System Load Indicator"
+msgstr "Indicateur de charge système"
+
+#: ../menu-data/indicator-multiload:indicator-multiload.desktop.in.h:2
 msgid ""
 "A system load monitor capable of displaying graphs for CPU, ram, and swap "
 "space use, plus network traffic."
@@ -8335,11 +8412,11 @@
 "d'utilisation du processeur, de la RAM, du fichier d'échange, et du trafic "
 "réseau."
 
-#: ../menu-data/indicator-multiload:indicator-multiload.desktop.in.h:2
-msgid "System Load Indicator"
-msgstr "Indicateur de charge système"
-
 #: ../menu-data/indicator-weather:indicator-weather.desktop.in.h:1
+msgid "Weather Indicator"
+msgstr "Indicateur météo"
+
+#: ../menu-data/indicator-weather:indicator-weather.desktop.in.h:2
 msgid ""
 "A weather indicator that displays information for one or multiple places in "
 "the world"
@@ -8347,18 +8424,14 @@
 "Un indicateur météo qui affiche les informations pour un ou plusieurs "
 "endroits dans le monde"
 
-#: ../menu-data/indicator-weather:indicator-weather.desktop.in.h:2
-msgid "Weather Indicator"
-msgstr "Indicateur météo"
-
 #: ../menu-data/inkscape:inkscape.desktop.in.h:1
-msgid "Create and edit Scalable Vector Graphics images"
-msgstr "Créer et éditer des images vectorielles au format SVG"
-
-#: ../menu-data/inkscape:inkscape.desktop.in.h:2
 msgid "Inkscape Vector Graphics Editor"
 msgstr "Éditeur d'images vectorielles Inkscape"
 
+#: ../menu-data/inkscape:inkscape.desktop.in.h:2
+msgid "Create and edit Scalable Vector Graphics images"
+msgstr "Créer et éditer des images vectorielles au format SVG"
+
 #: ../menu-data/insanity-tools:insanity-gtk.desktop.in.h:1
 msgid "Insanity testing system"
 msgstr "Système de test Insanity"
@@ -8376,46 +8449,70 @@
 msgstr "e Media Player"
 
 #: ../menu-data/iok:iok.desktop.in.h:1
-msgid "Enter Indic characters with a virtual keyboard"
-msgstr "Tapez des caractères Indic à l'aide du clavier virtuel"
-
-#: ../menu-data/iok:iok.desktop.in.h:2
 msgid "Indic Onscreen Keyboard"
 msgstr "Clavier virtuel indic"
 
+#: ../menu-data/iok:iok.desktop.in.h:2
+msgid "Enter Indic characters with a virtual keyboard"
+msgstr "Tapez des caractères Indic à l'aide du clavier virtuel"
+
 #: ../menu-data/iptux:iptux.desktop.in.h:1
+msgid "iptux"
+msgstr "iptux"
+
+#: ../menu-data/iptux:iptux.desktop.in.h:2
 msgid "Lan communication software"
 msgstr "Logiciel de communication en réseau local"
 
-#: ../menu-data/iptux:iptux.desktop.in.h:2
-msgid "iptux"
-msgstr "iptux"
+#: ../menu-data/ipython-qtconsole:ipython-qtconsole.desktop.in.h:1
+msgid "Enhanced interactive Python qtconsole"
+msgstr "Qtconsole Python interactive améliorée"
 
-#: ../menu-data/ircp-tray:ircp-tray.desktop.in.h:1
-msgid "A simple OBEX file transfer applet"
+#: ../menu-data/ipython-qtconsole:ipython-qtconsole.desktop.in.h:2
+msgid "IPython Qt console"
+msgstr "Console Qt Ipython"
+
+#: ../menu-data/ipython-qtconsole:ipython-qtconsole.desktop.in.h:3
+msgid "Pylab"
+msgstr "Pylab"
+
+#: ../menu-data/ipython-qtconsole:ipython-qtconsole.desktop.in.h:4
+msgid "Pylab (inline plots)"
 msgstr ""
-"Un applet simple pour le transfert de fichiers avec le protocole OBEX"
 
-#: ../menu-data/ircp-tray:ircp-tray.desktop.in.h:2
+#: ../menu-data/ipython:ipython.desktop.in.h:1
+msgid "Enhanced interactive Python shell"
+msgstr "Shell Python interactif amélioré"
+
+#: ../menu-data/ipython:ipython.desktop.in.h:2
+msgid "ipython"
+msgstr "ipython"
+
+#: ../menu-data/ircp-tray:ircp-tray.desktop.in.h:1
 msgid "Ircp Tray"
 msgstr "Ircp Tray"
 
-#: ../menu-data/iriverter:iriverter.desktop.in.h:1
-msgid "Convert videos for your handheld device"
-msgstr "Convertir des vidéos pour vos ordinateurs de poche"
+#: ../menu-data/ircp-tray:ircp-tray.desktop.in.h:2
+msgid "A simple OBEX file transfer applet"
+msgstr ""
+"Un applet simple pour le transfert de fichiers avec le protocole OBEX"
 
-#: ../menu-data/iriverter:iriverter.desktop.in.h:2
+#: ../menu-data/iriverter:iriverter.desktop.in.h:1
 msgid "iriverter"
 msgstr "iriverter"
 
-#: ../menu-data/isag:isag.desktop.in.h:1
-msgid "Interactive System Activity Grapher for sysstat"
-msgstr "Graphe interactif de l'activité système pour sysstat"
+#: ../menu-data/iriverter:iriverter.desktop.in.h:2
+msgid "Convert videos for your handheld device"
+msgstr "Convertir des vidéos pour vos ordinateurs de poche"
 
-#: ../menu-data/isag:isag.desktop.in.h:2
+#: ../menu-data/isag:isag.desktop.in.h:1
 msgid "Isag System Activity Grapher"
 msgstr "Graphe d'activité système Isag"
 
+#: ../menu-data/isag:isag.desktop.in.h:2
+msgid "Interactive System Activity Grapher for sysstat"
+msgstr "Graphe interactif de l'activité système pour sysstat"
+
 #: ../menu-data/isomaster:isomaster.desktop.in.h:1
 msgid "ISO Master"
 msgstr "ISO Master"
@@ -8433,13 +8530,13 @@
 msgstr "Enregistrer une vidéo du bureau au cours de votre session"
 
 #: ../menu-data/italc-master:italc.desktop.in.h:1
-msgid "Computer room overview"
-msgstr "Aperçu complet de la salle informatique"
-
-#: ../menu-data/italc-master:italc.desktop.in.h:2
 msgid "iTalc master interface"
 msgstr "Interface maître iTalc"
 
+#: ../menu-data/italc-master:italc.desktop.in.h:2
+msgid "Computer room overview"
+msgstr "Aperçu complet de la salle informatique"
+
 #: ../menu-data/itksnap:itksnap.desktop.in.h:1
 msgid "3D Structure Segmentation"
 msgstr "Segmentation de structures 3D (imagerie médicale)"
@@ -8449,21 +8546,21 @@
 msgstr "ITK-SNAP"
 
 #: ../menu-data/jaaa:jaaa-alsa.desktop.in.h:1
-msgid "Analyse or generate an Audio signal through ALSA"
-msgstr "Analyser ou générer un signal audio via ALSA"
-
-#: ../menu-data/jaaa:jaaa-alsa.desktop.in.h:2
 msgid "Jaaa (with ALSA support)"
 msgstr "Jaaa (avec prise en charge ALSA)"
 
-#: ../menu-data/jabref:jabref.desktop.in.h:1
-msgid "Graphical editor for BibTex bibliographies"
-msgstr "Éditeur graphique pour les bibliographies BibTex"
+#: ../menu-data/jaaa:jaaa-alsa.desktop.in.h:2
+msgid "Analyse or generate an Audio signal through ALSA"
+msgstr "Analyser ou générer un signal audio via ALSA"
 
-#: ../menu-data/jabref:jabref.desktop.in.h:2
+#: ../menu-data/jabref:jabref.desktop.in.h:1
 msgid "JabRef"
 msgstr "JabRef"
 
+#: ../menu-data/jabref:jabref.desktop.in.h:2
+msgid "Graphical editor for BibTex bibliographies"
+msgstr "Éditeur graphique pour les bibliographies BibTex"
+
 #: ../menu-data/jack-keyboard:jack-keyboard.desktop.in.h:1
 msgid "JACK Keyboard"
 msgstr "Clavier JACK"
@@ -8509,13 +8606,13 @@
 msgstr "Jukebox perfectionné Jajuk"
 
 #: ../menu-data/jamin:jamin.desktop.in.h:1
-msgid "JACK Audio Mastering interface"
-msgstr "Interface de « mastering » audio JACK"
-
-#: ../menu-data/jamin:jamin.desktop.in.h:2
 msgid "JAMin"
 msgstr "JAMin"
 
+#: ../menu-data/jamin:jamin.desktop.in.h:2
+msgid "JACK Audio Mastering interface"
+msgstr "Interface de « mastering » audio JACK"
+
 #: ../menu-data/jampal:jampal.desktop.in.h:1
 msgid "Jampal"
 msgstr "Jampal"
@@ -8525,29 +8622,29 @@
 msgstr "Organiser et lire de la musique au format mp3"
 
 #: ../menu-data/japa:japa-alsa.desktop.in.h:1
-msgid "Analyse an Audio signal through ALSA"
-msgstr "Analyser un signal audio via ALSA"
-
-#: ../menu-data/japa:japa-alsa.desktop.in.h:2
 msgid "Japa (with ALSA support)"
 msgstr "Japa (avec prise en charge ALSA)"
 
-#: ../menu-data/japa:japa-jack.desktop.in.h:1
-msgid "Analyse an Audio signal through JACK"
-msgstr "Analyser un signal audio via JACK"
+#: ../menu-data/japa:japa-alsa.desktop.in.h:2
+msgid "Analyse an Audio signal through ALSA"
+msgstr "Analyser un signal audio via ALSA"
 
-#: ../menu-data/japa:japa-jack.desktop.in.h:2
+#: ../menu-data/japa:japa-jack.desktop.in.h:1
 msgid "Japa (with JACK support)"
 msgstr "Japa (avec prise en charge JACK)"
 
-#: ../menu-data/jargoninformatique:jargoninformatique.desktop.in.h:1
-msgid "French computering dictionary"
-msgstr "Dictionnaire français du jargon informatique"
+#: ../menu-data/japa:japa-jack.desktop.in.h:2
+msgid "Analyse an Audio signal through JACK"
+msgstr "Analyser un signal audio via JACK"
 
-#: ../menu-data/jargoninformatique:jargoninformatique.desktop.in.h:2
+#: ../menu-data/jargoninformatique:jargoninformatique.desktop.in.h:1
 msgid "Jargon Informatique"
 msgstr "Jargon informatique"
 
+#: ../menu-data/jargoninformatique:jargoninformatique.desktop.in.h:2
+msgid "French computering dictionary"
+msgstr "Dictionnaire français du jargon informatique"
+
 #: ../menu-data/javamorph:javamorph.desktop.in.h:1
 msgid "JavaMorph"
 msgstr "JavaMorph"
@@ -8565,13 +8662,13 @@
 msgstr "Éditeur XML"
 
 #: ../menu-data/jcgui:Jc_Gui.desktop.in.h:1
-msgid "Host for jconvolver"
-msgstr "Interface pour jconviler/jconv"
-
-#: ../menu-data/jcgui:Jc_Gui.desktop.in.h:2
 msgid "Jc_Gui"
 msgstr "Jc_Gui"
 
+#: ../menu-data/jcgui:Jc_Gui.desktop.in.h:2
+msgid "Host for jconvolver"
+msgstr "Interface pour jconviler/jconv"
+
 #: ../menu-data/jclic:jclic.desktop.in.h:1
 msgid "JClic"
 msgstr "JClic"
@@ -8592,19 +8689,23 @@
 msgid "JD is a 2ch browser based on gtkmm2."
 msgstr "JD est un navigateur bi-canal fondé sur gtkmm2."
 
-#: ../menu-data/jedit:jedit.desktop.in.h:2
+#: ../menu-data/jedit:jedit.desktop.in.h:1
 msgid "jEdit"
 msgstr "jEdit"
 
 #: ../menu-data/jeex:jeex.desktop.in.h:1
-msgid "Hexadecimal Editor for Linux"
-msgstr "Éditeur hexadécimal pour Linux"
-
-#: ../menu-data/jeex:jeex.desktop.in.h:2
 msgid "Jeex"
 msgstr "Jeex"
 
+#: ../menu-data/jeex:jeex.desktop.in.h:2
+msgid "Hexadecimal Editor for Linux"
+msgstr "Éditeur hexadécimal pour Linux"
+
 #: ../menu-data/jemboss:jemboss.desktop.in.h:1
+msgid "Jemboss"
+msgstr "Jemboss"
+
+#: ../menu-data/jemboss:jemboss.desktop.in.h:2
 msgid ""
 "Graphical user interface for the European Molecular Biology Open Software "
 "Suite."
@@ -8612,18 +8713,14 @@
 "Interface graphique pour la suite logicielle libre de biologie moléculaire "
 "européenne."
 
-#: ../menu-data/jemboss:jemboss.desktop.in.h:2
-msgid "Jemboss"
-msgstr "Jemboss"
-
 #: ../menu-data/jfractionlab:JFractionLab.desktop.in.h:1
-msgid "Calculate Fractions is fun!"
-msgstr "Le calcul de fractions c'est amusant !"
-
-#: ../menu-data/jfractionlab:JFractionLab.desktop.in.h:2
 msgid "JFractionLab"
 msgstr "JFractionLab"
 
+#: ../menu-data/jfractionlab:JFractionLab.desktop.in.h:2
+msgid "Calculate Fractions is fun!"
+msgstr "Le calcul de fractions c'est amusant !"
+
 #: ../menu-data/jftp:jftp.desktop.in.h:1
 msgid "JFTP"
 msgstr "JFTP"
@@ -8633,38 +8730,38 @@
 msgstr "Client Java avec interface graphique pour FTP, SMB, SFTP et NFS"
 
 #: ../menu-data/jhbuild:jhbuild.desktop.in.h:1
-msgid "Build GNOME modules"
-msgstr "Construire des modules pour GNOME"
-
-#: ../menu-data/jhbuild:jhbuild.desktop.in.h:2
 msgid "GNOME Build Tool"
 msgstr "GNOME Build Tool"
 
+#: ../menu-data/jhbuild:jhbuild.desktop.in.h:2
+msgid "Build GNOME modules"
+msgstr "Construire des modules pour GNOME"
+
 #: ../menu-data/jigzo:jigzo.desktop.in.h:1
-msgid "Photo puzzle game for children"
-msgstr "Jeu de puzzle photo pour les enfants"
-
-#: ../menu-data/jigzo:jigzo.desktop.in.h:2
 msgid "jigzo"
 msgstr "jigzo"
 
-#: ../menu-data/jkmeter:jkmeter.desktop.in.h:1
-#: ../menu-data/meterbridge:meterbridge.desktop.in.h:1
-msgid "Audio level meter for JACK"
-msgstr "Vu-mètre audio pour JACK"
+#: ../menu-data/jigzo:jigzo.desktop.in.h:2
+msgid "Photo puzzle game for children"
+msgstr "Jeu de puzzle photo pour les enfants"
 
-#: ../menu-data/jkmeter:jkmeter.desktop.in.h:2
+#: ../menu-data/jkmeter:jkmeter.desktop.in.h:1
 msgid "Jkmeter"
 msgstr "Jkmeter"
 
-#: ../menu-data/jlgui:jlgui.desktop.in.h:1
-msgid "graphical music player"
-msgstr "Lecteur de musique graphique"
+#: ../menu-data/jkmeter:jkmeter.desktop.in.h:2
+#: ../menu-data/meterbridge:meterbridge.desktop.in.h:2
+msgid "Audio level meter for JACK"
+msgstr "Vu-mètre audio pour JACK"
 
-#: ../menu-data/jlgui:jlgui.desktop.in.h:2
+#: ../menu-data/jlgui:jlgui.desktop.in.h:1
 msgid "jlGui"
 msgstr "jlGui"
 
+#: ../menu-data/jlgui:jlgui.desktop.in.h:2
+msgid "graphical music player"
+msgstr "Lecteur de musique graphique"
+
 #: ../menu-data/jmeter:jmeter.desktop.in.h:1
 msgid "JMeter"
 msgstr "JMeter"
@@ -8690,21 +8787,21 @@
 msgstr "Visionneuse de molécules"
 
 #: ../menu-data/jnoisemeter:jnoisemeter.desktop.in.h:1
-msgid "Audio test signals meter for JACK"
-msgstr ""
-
-#: ../menu-data/jnoisemeter:jnoisemeter.desktop.in.h:2
 msgid "Jnoisemeter"
 msgstr "Jnoisemeter"
 
-#: ../menu-data/jobs-admin:jobs-admin.desktop.in.h:1
-msgid "Manage system jobs present on your computer"
-msgstr "Gérer les tâches système s'exécutant sur votre ordinateur"
+#: ../menu-data/jnoisemeter:jnoisemeter.desktop.in.h:2
+msgid "Audio test signals meter for JACK"
+msgstr ""
 
-#: ../menu-data/jobs-admin:jobs-admin.desktop.in.h:2
+#: ../menu-data/jobs-admin:jobs-admin.desktop.in.h:1
 msgid "System Jobs"
 msgstr "Tâches système"
 
+#: ../menu-data/jobs-admin:jobs-admin.desktop.in.h:2
+msgid "Manage system jobs present on your computer"
+msgstr "Gérer les tâches système s'exécutant sur votre ordinateur"
+
 #: ../menu-data/jockey-gtk:jockey-gtk.desktop.in.h:1
 #: ../menu-data/jockey-kde:jockey-kde.desktop.in.h:1
 msgid "Additional Drivers"
@@ -8724,13 +8821,13 @@
 msgstr "Créer simplement et facilement des fichiers audio multi-pistes"
 
 #: ../menu-data/josm:josm.desktop.in.h:1
-msgid "Editor for OpenStreetMap.org"
-msgstr "Éditeur pour OpenStreetMap.org"
-
-#: ../menu-data/josm:josm.desktop.in.h:2
 msgid "Josm"
 msgstr "Josm"
 
+#: ../menu-data/josm:josm.desktop.in.h:2
+msgid "Editor for OpenStreetMap.org"
+msgstr "Éditeur pour OpenStreetMap.org"
+
 #: ../menu-data/jovie:kde4__jovieapp.desktop.in.h:1
 msgid "Jovie"
 msgstr "Jovie"
@@ -8740,45 +8837,45 @@
 msgstr "Service de synthèse vocale pour KDE"
 
 #: ../menu-data/jpilot:jpilot.desktop.in.h:1
-msgid "Desktop organizer application for the Palm Pilot"
-msgstr "Agenda de bureau pour le Palm Pilot"
-
-#: ../menu-data/jpilot:jpilot.desktop.in.h:2
 msgid "J-Pilot"
 msgstr "J-Pilot"
 
-#: ../menu-data/jscribble:jscribble.desktop.in.h:1
-msgid "Infinite Notepad"
-msgstr ""
+#: ../menu-data/jpilot:jpilot.desktop.in.h:2
+msgid "Desktop organizer application for the Palm Pilot"
+msgstr "Agenda de bureau pour le Palm Pilot"
 
-#: ../menu-data/jscribble:jscribble.desktop.in.h:2
+#: ../menu-data/jscribble:jscribble.desktop.in.h:1
 msgid "jscribble"
 msgstr "jscribble"
 
-#: ../menu-data/jstest-gtk:jstest-gtk.desktop.in.h:1
-msgid "Joystick testing and configuration tool"
-msgstr "Outil de test et de configuration de joysticks"
+#: ../menu-data/jscribble:jscribble.desktop.in.h:2
+msgid "Infinite Notepad"
+msgstr "Bloc note infini"
 
-#: ../menu-data/jstest-gtk:jstest-gtk.desktop.in.h:2
+#: ../menu-data/jstest-gtk:jstest-gtk.desktop.in.h:1
 msgid "jstest-gtk"
 msgstr "jstest-gtk"
 
-#: ../menu-data/jsymphonic:jsymphonic.desktop.in.h:1
-msgid "File manager for Sony MP3 players"
-msgstr "Gestionnaire de fichiers pour lecteurs MP3 Sony"
+#: ../menu-data/jstest-gtk:jstest-gtk.desktop.in.h:2
+msgid "Joystick testing and configuration tool"
+msgstr "Outil de test et de configuration de joysticks"
 
-#: ../menu-data/jsymphonic:jsymphonic.desktop.in.h:2
+#: ../menu-data/jsymphonic:jsymphonic.desktop.in.h:1
 msgid "JSymphonic"
 msgstr "JSymphonic"
 
-#: ../menu-data/juffed:juffed.desktop.in.h:1
-msgid "Advanced text editor"
-msgstr "Éditeur de texte avancé"
+#: ../menu-data/jsymphonic:jsymphonic.desktop.in.h:2
+msgid "File manager for Sony MP3 players"
+msgstr "Gestionnaire de fichiers pour lecteurs MP3 Sony"
 
-#: ../menu-data/juffed:juffed.desktop.in.h:2
+#: ../menu-data/juffed:juffed.desktop.in.h:1
 msgid "JuffEd text editor"
 msgstr "Éditeur de texte JuffEd"
 
+#: ../menu-data/juffed:juffed.desktop.in.h:2
+msgid "Advanced text editor"
+msgstr "Éditeur de texte avancé"
+
 #: ../menu-data/juk:kde4__juk.desktop.in.h:1
 msgid "JuK"
 msgstr "JuK"
@@ -8792,13 +8889,13 @@
 msgstr "Accéder rapidement aux dossiers les plus utilisés"
 
 #: ../menu-data/jumpnbump:jumpnbump.desktop.in.h:1
-msgid "Jump on your opponents to make them explode"
-msgstr "Sauter sur vos adversaires pour les faire exploser"
-
-#: ../menu-data/jumpnbump:jumpnbump.desktop.in.h:2
 msgid "Jump'n'Bump"
 msgstr "Jump'n'Bump"
 
+#: ../menu-data/jumpnbump:jumpnbump.desktop.in.h:2
+msgid "Jump on your opponents to make them explode"
+msgstr "Sauter sur vos adversaires pour les faire exploser"
+
 #: ../menu-data/jxplorer:jxplorer.desktop.in.h:1
 msgid "JXplorer"
 msgstr "JXplorer"
@@ -8816,13 +8913,13 @@
 msgstr "K3b"
 
 #: ../menu-data/k3d:k3d.desktop.in.h:1
-msgid "Free-as-in-freedom 3D modeling and animation software"
-msgstr "Logiciel libre de modélisation et d'animation 3D"
-
-#: ../menu-data/k3d:k3d.desktop.in.h:2
 msgid "K-3D"
 msgstr "K-3D"
 
+#: ../menu-data/k3d:k3d.desktop.in.h:2
+msgid "Free-as-in-freedom 3D modeling and animation software"
+msgstr "Logiciel libre de modélisation et d'animation 3D"
+
 #: ../menu-data/k3dsurf:k3dsurf.desktop.in.h:1
 msgid "K3DSurf"
 msgstr "K3DSurf"
@@ -8832,21 +8929,21 @@
 msgstr "Outil pour les surfaces mathématiques"
 
 #: ../menu-data/k4dirstat:kde4__k4dirstat.desktop.in.h:1
-msgid "Directory statistics and disk usage"
-msgstr "Statistiques des répertoires et utilisation des disques"
-
-#: ../menu-data/k4dirstat:kde4__k4dirstat.desktop.in.h:2
 msgid "K4DirStat"
 msgstr "K4DirStat"
 
-#: ../menu-data/k9copy:kde4__k9copy.desktop.in.h:1
-msgid "DVD9 to DVD5 backup tool"
-msgstr "Outil pour enregistrer des DVD9 sur DVD5"
+#: ../menu-data/k4dirstat:kde4__k4dirstat.desktop.in.h:2
+msgid "Directory statistics and disk usage"
+msgstr "Statistiques des répertoires et utilisation des disques"
 
-#: ../menu-data/k9copy:kde4__k9copy.desktop.in.h:2
+#: ../menu-data/k9copy:kde4__k9copy.desktop.in.h:1
 msgid "k9copy"
 msgstr "k9copy"
 
+#: ../menu-data/k9copy:kde4__k9copy.desktop.in.h:2
+msgid "DVD9 to DVD5 backup tool"
+msgstr "Outil pour enregistrer des DVD9 sur DVD5"
+
 #: ../menu-data/kabikaboo:kabikaboo.desktop.in.h:1
 msgid "Kabikaboo"
 msgstr "Kabikaboo"
@@ -8855,26 +8952,22 @@
 msgid "Manage large collections of notes"
 msgstr "Gérer de grandes collections de notes"
 
-#: ../menu-data/kaddressbook-mobile:kde4__kaddressbook-mobile.desktop.in.h:1
-msgid "Kontact Touch Contacts"
-msgstr "Contacts Kontact Touch"
-
 #: ../menu-data/kaddressbook:kde4__kaddressbook.desktop.in.h:1
-msgid "Contact Manager"
-msgstr "Gestionnaire de contacts"
-
-#: ../menu-data/kaddressbook:kde4__kaddressbook.desktop.in.h:2
 msgid "KAddressBook"
 msgstr "KAddressBook"
 
-#: ../menu-data/kadu:kadu.desktop.in.h:1
-msgid "Gadu-Gadu/XMPP protocol client"
-msgstr "Client pour le protocole Gadu-Gadu/XMPP"
+#: ../menu-data/kaddressbook:kde4__kaddressbook.desktop.in.h:2
+msgid "Contact Manager"
+msgstr "Gestionnaire de contacts"
 
-#: ../menu-data/kadu:kadu.desktop.in.h:2
+#: ../menu-data/kadu:kadu.desktop.in.h:1
 msgid "Kadu"
 msgstr "Kadu"
 
+#: ../menu-data/kadu:kadu.desktop.in.h:2
+msgid "Gadu-Gadu/XMPP protocol client"
+msgstr "Client pour le protocole Gadu-Gadu/XMPP"
+
 #: ../menu-data/kaffeine:kde4__kaffeine.desktop.in.h:1
 msgid "Kaffeine"
 msgstr "Kaffeine"
@@ -8921,13 +9014,13 @@
 msgstr "Kalzium"
 
 #: ../menu-data/kamerka:kde4__kamerka.desktop.in.h:1
-msgid "Fancy-looking animated application for taking photos from webcam"
-msgstr ""
-
-#: ../menu-data/kamerka:kde4__kamerka.desktop.in.h:2
 msgid "Kamerka"
 msgstr "Kamerka"
 
+#: ../menu-data/kamerka:kde4__kamerka.desktop.in.h:2
+msgid "Fancy-looking animated application for taking photos from webcam"
+msgstr "Application animée pour prendre des photos à partir d'une webcam"
+
 #: ../menu-data/kamoso:kde4__kamoso.desktop.in.h:1
 msgid "Kamoso"
 msgstr "Kamoso"
@@ -8941,45 +9034,45 @@
 msgstr ""
 
 #: ../menu-data/kanagram:kde4__kanagram.desktop.in.h:1
-msgid "KDE Letter Order Game"
-msgstr "Jeu d'anagrammes pour KDE"
-
-#: ../menu-data/kanagram:kde4__kanagram.desktop.in.h:2
 msgid "Kanagram"
 msgstr "Kanagram"
 
-#: ../menu-data/kanatest:kanatest.desktop.in.h:1
-msgid "Drill game to learn Japanese kana characters"
-msgstr "Exercices pour apprendre les caractères japonais kana"
+#: ../menu-data/kanagram:kde4__kanagram.desktop.in.h:2
+msgid "KDE Letter Order Game"
+msgstr "Jeu d'anagrammes pour KDE"
 
-#: ../menu-data/kanatest:kanatest.desktop.in.h:2
+#: ../menu-data/kanatest:kanatest.desktop.in.h:1
 msgid "Kana test"
 msgstr "Kana test"
 
-#: ../menu-data/kanyremote:kanyremote.desktop.in.h:1
-msgid "Bluetooth remote control for KDE"
-msgstr "Télécommande Bluetooth pour KDE"
+#: ../menu-data/kanatest:kanatest.desktop.in.h:2
+msgid "Drill game to learn Japanese kana characters"
+msgstr "Exercices pour apprendre les caractères japonais kana"
 
-#: ../menu-data/kanyremote:kanyremote.desktop.in.h:2
+#: ../menu-data/kanyremote:kanyremote.desktop.in.h:1
 msgid "kanyremote"
 msgstr "kanyremote"
 
-#: ../menu-data/kapman:kde4__kapman.desktop.in.h:1
-msgid "Eat pills escaping ghosts"
-msgstr "Manger les pastilles en évitant les fantômes"
+#: ../menu-data/kanyremote:kanyremote.desktop.in.h:2
+msgid "Bluetooth remote control for KDE"
+msgstr "Télécommande Bluetooth pour KDE"
 
-#: ../menu-data/kapman:kde4__kapman.desktop.in.h:2
+#: ../menu-data/kapman:kde4__kapman.desktop.in.h:1
 msgid "Kapman"
 msgstr "Kapman"
 
-#: ../menu-data/kapptemplate:kde4__kapptemplate.desktop.in.h:1
-msgid "KAppTemplate"
-msgstr "KAppTemplate"
+#: ../menu-data/kapman:kde4__kapman.desktop.in.h:2
+msgid "Eat pills escaping ghosts"
+msgstr "Manger les pastilles en évitant les fantômes"
 
-#: ../menu-data/kapptemplate:kde4__kapptemplate.desktop.in.h:2
+#: ../menu-data/kapptemplate:kde4__kapptemplate.desktop.in.h:1
 msgid "KDE Template Generator"
 msgstr "Générateur de modèles pour KDE"
 
+#: ../menu-data/kapptemplate:kde4__kapptemplate.desktop.in.h:2
+msgid "KAppTemplate"
+msgstr "KAppTemplate"
+
 #: ../menu-data/kasumi:kasumi.desktop.in.h:1
 msgid "Anthy Dictionary editor"
 msgstr "Éditeur pour dictionnaire Anthy"
@@ -9013,29 +9106,29 @@
 msgstr "Éditeur de texte unicode multilingue"
 
 #: ../menu-data/kayali:kayali.desktop.in.h:1
-msgid "A Computer Algebra System"
-msgstr "Système algébrique pour ordinateurs"
-
-#: ../menu-data/kayali:kayali.desktop.in.h:2
 msgid "Kayali"
 msgstr "Kayali"
 
-#: ../menu-data/kbackup:kde4__kbackup.desktop.in.h:1
-msgid "Backup your data with an easy to use user interface"
-msgstr "Sauvergarder vos données avec une interface facile à prendre en main"
+#: ../menu-data/kayali:kayali.desktop.in.h:2
+msgid "A Computer Algebra System"
+msgstr "Système algébrique pour ordinateurs"
 
-#: ../menu-data/kbackup:kde4__kbackup.desktop.in.h:2
+#: ../menu-data/kbackup:kde4__kbackup.desktop.in.h:1
 msgid "KBackup"
 msgstr "KBackup"
 
-#: ../menu-data/kball:kball.desktop.in.h:1
-msgid "Find the exit"
-msgstr "Trouver la sortie"
+#: ../menu-data/kbackup:kde4__kbackup.desktop.in.h:2
+msgid "Backup your data with an easy to use user interface"
+msgstr "Sauvergarder vos données avec une interface facile à prendre en main"
 
-#: ../menu-data/kball:kball.desktop.in.h:2
+#: ../menu-data/kball:kball.desktop.in.h:1
 msgid "KBall"
 msgstr "KBall"
 
+#: ../menu-data/kball:kball.desktop.in.h:2
+msgid "Find the exit"
+msgstr "Trouver la sortie"
+
 #: ../menu-data/kbattleship:kde4__kbattleship.desktop.in.h:1
 msgid "Naval Battle"
 msgstr "Bataille navale"
@@ -9045,13 +9138,13 @@
 msgstr "Jeu de Bataille Navale"
 
 #: ../menu-data/kbedic:kbedic.desktop.in.h:1
-msgid "Bulgarian English dictionary"
-msgstr "Dictionnaire bulgare / anglais"
-
-#: ../menu-data/kbedic:kbedic.desktop.in.h:2
 msgid "kbe Dictionary"
 msgstr "Dictionnaire kbe"
 
+#: ../menu-data/kbedic:kbedic.desktop.in.h:2
+msgid "Bulgarian English dictionary"
+msgstr "Dictionnaire bulgare / anglais"
+
 #: ../menu-data/kbibtex:kde4__kbibtex.desktop.in.h:1
 msgid "KBibTeX"
 msgstr "KBibTeX"
@@ -9069,37 +9162,37 @@
 msgstr "KBlackBox"
 
 #: ../menu-data/kblocks:kde4__kblocks.desktop.in.h:1
-msgid "Falling Blocks Game"
-msgstr "Jeu de blocs qui tombent"
-
-#: ../menu-data/kblocks:kde4__kblocks.desktop.in.h:2
 msgid "KBlocks"
 msgstr "KBlocks"
 
-#: ../menu-data/kbounce:kde4__kbounce.desktop.in.h:1
-msgid "Ball Bouncing Game"
-msgstr "Jeu de balle rebondissante"
+#: ../menu-data/kblocks:kde4__kblocks.desktop.in.h:2
+msgid "Falling Blocks Game"
+msgstr "Jeu de blocs qui tombent"
 
-#: ../menu-data/kbounce:kde4__kbounce.desktop.in.h:2
+#: ../menu-data/kbounce:kde4__kbounce.desktop.in.h:1
 msgid "KBounce"
 msgstr "KBounce"
 
-#: ../menu-data/kbreakout:kde4__kbreakout.desktop.in.h:1
-msgid "Breakout-like Game"
-msgstr "Jeu de casse-briques"
+#: ../menu-data/kbounce:kde4__kbounce.desktop.in.h:2
+msgid "Ball Bouncing Game"
+msgstr "Jeu de balle rebondissante"
 
-#: ../menu-data/kbreakout:kde4__kbreakout.desktop.in.h:2
+#: ../menu-data/kbreakout:kde4__kbreakout.desktop.in.h:1
 msgid "KBreakOut"
 msgstr "KBreakOut"
 
-#: ../menu-data/kbruch:kde4__kbruch.desktop.in.h:1
-msgid "KBruch"
-msgstr "KBruch"
+#: ../menu-data/kbreakout:kde4__kbreakout.desktop.in.h:2
+msgid "Breakout-like Game"
+msgstr "Jeu de casse-briques"
 
-#: ../menu-data/kbruch:kde4__kbruch.desktop.in.h:2
+#: ../menu-data/kbruch:kde4__kbruch.desktop.in.h:1
 msgid "Practice exercises with fractions"
 msgstr "Exercices pratiques avec des fractions"
 
+#: ../menu-data/kbruch:kde4__kbruch.desktop.in.h:2
+msgid "KBruch"
+msgstr "KBruch"
+
 #: ../menu-data/kcachegrind:kde4__kcachegrind.desktop.in.h:1
 msgid "KCachegrind"
 msgstr "KCachegrind"
@@ -9117,15 +9210,15 @@
 msgstr "Calculatrice scientifique"
 
 #: ../menu-data/kcemu:kcemu.desktop.in.h:1
-msgid "Emulator for KC85 and compatible computer"
-msgstr "Émulateur pour KC85 et pour ordinateurs compatibles"
-
-#: ../menu-data/kcemu:kcemu.desktop.in.h:2
 msgid "KCemu"
 msgstr "KCemu"
 
-#: ../menu-data/kcharselect:kde4__KCharSelect.desktop.in.h:1
-msgid "Character Selector"
+#: ../menu-data/kcemu:kcemu.desktop.in.h:2
+msgid "Emulator for KC85 and compatible computer"
+msgstr "Émulateur pour KC85 et pour ordinateurs compatibles"
+
+#: ../menu-data/kcharselect:kde4__KCharSelect.desktop.in.h:1
+msgid "Character Selector"
 msgstr "Sélecteur de caractères"
 
 #: ../menu-data/kcharselect:kde4__KCharSelect.desktop.in.h:2
@@ -9133,6 +9226,10 @@
 msgstr "KCharSelect"
 
 #: ../menu-data/kcheckgmail:kde4__kcheckgmail.desktop.in.h:1
+msgid "KCheckGMail"
+msgstr "KCheckGMail"
+
+#: ../menu-data/kcheckgmail:kde4__kcheckgmail.desktop.in.h:2
 msgid ""
 "A Kicker applet to display how many email messages you have in your Gmail "
 "account."
@@ -9140,18 +9237,14 @@
 "Un applet pour le tableau de bord affichant le nombre de courriel reçus sur "
 "votre compte Gmail."
 
-#: ../menu-data/kcheckgmail:kde4__kcheckgmail.desktop.in.h:2
-msgid "KCheckGMail"
-msgstr "KCheckGMail"
-
 #: ../menu-data/kchmviewer:kde4__kchmviewer.desktop.in.h:1
-msgid "A viewer of CHM (MS-Help) files"
-msgstr "Afficheur de fichiers .CHM (aide de Microsoft)"
-
-#: ../menu-data/kchmviewer:kde4__kchmviewer.desktop.in.h:2
 msgid "KchmViewer"
 msgstr "KchmViewer"
 
+#: ../menu-data/kchmviewer:kde4__kchmviewer.desktop.in.h:2
+msgid "A viewer of CHM (MS-Help) files"
+msgstr "Afficheur de fichiers .CHM (aide de Microsoft)"
+
 #: ../menu-data/kcollectd:kde4__kcollectd.desktop.in.h:1
 msgid "KDE collectd database-viewer"
 msgstr "Visionneur de bases de données collectd pour KDE"
@@ -9177,21 +9270,21 @@
 msgstr "KColorEdit"
 
 #: ../menu-data/kdbg:kde4__kdbg.desktop.in.h:1
-msgid "Debug programs"
-msgstr "Programmes de débogage"
-
-#: ../menu-data/kdbg:kde4__kdbg.desktop.in.h:2
 msgid "KDbg"
 msgstr "KDbg"
 
-#: ../menu-data/kde-config-touchpad:kde4__synaptiks.desktop.in.h:1
-msgid "Touchpad management"
-msgstr "Gestion du pavé tactile"
+#: ../menu-data/kdbg:kde4__kdbg.desktop.in.h:2
+msgid "Debug programs"
+msgstr "Programmes de débogage"
 
-#: ../menu-data/kde-config-touchpad:kde4__synaptiks.desktop.in.h:2
+#: ../menu-data/kde-config-touchpad:kde4__synaptiks.desktop.in.h:1
 msgid "synaptiks"
 msgstr "synaptiks"
 
+#: ../menu-data/kde-config-touchpad:kde4__synaptiks.desktop.in.h:2
+msgid "Touchpad management"
+msgstr "Gestion du pavé tactile"
+
 #: ../menu-data/kde-runtime-data:kde4__nepomukbackup.desktop.in.h:1
 msgid "Nepomuk Backup"
 msgstr "Sauvegarde Nepomuk"
@@ -9214,21 +9307,21 @@
 msgid "Network Folder Wizard"
 msgstr "Assistant de dossier réseau"
 
-#: ../menu-data/kde-workspace-bin:kde4__kfontview.desktop.in.h:2
+#: ../menu-data/kde-workspace-bin:kde4__kfontview.desktop.in.h:1
 msgid "KFontView"
 msgstr "KFontView"
 
 #: ../menu-data/kde-workspace-bin:kde4__krandrtray.desktop.in.h:1
-msgid "A panel applet for resizing and reorientating X screens."
-msgstr "Un applet pour le redimensionnement et la réorientation de l'écran"
-
-#: ../menu-data/kde-workspace-bin:kde4__krandrtray.desktop.in.h:2
 msgid "KRandRTray"
 msgstr "KRandRTray"
 
-#: ../menu-data/kdegraphics-mobipocket:kde4__okularApplication_mobi.desktop.in.h:2
-#: ../menu-data/okular:kde4__okular.desktop.in.h:2
-#: ../menu-data/okular:kde4__okularApplication_plucker.desktop.in.h:2
+#: ../menu-data/kde-workspace-bin:kde4__krandrtray.desktop.in.h:2
+msgid "A panel applet for resizing and reorientating X screens."
+msgstr "Un applet pour le redimensionnement et la réorientation de l'écran"
+
+#: ../menu-data/kdegraphics-mobipocket:kde4__okularApplication_mobi.desktop.in.h:1
+#: ../menu-data/okular:kde4__okular.desktop.in.h:1
+#: ../menu-data/okular:kde4__okularApplication_plucker.desktop.in.h:1
 msgid "Okular"
 msgstr "Okular"
 
@@ -9259,18 +9352,18 @@
 msgstr "Lancer l'assistant de compte pour configurer les comptes PIM"
 
 #: ../menu-data/kdepim-runtime:kde4__akonaditray.desktop.in.h:1
-msgid "Akonadi Tray Utility"
-msgstr "Utilitaire Akonadi de la boîte à miniatures"
-
-#: ../menu-data/kdepim-runtime:kde4__akonaditray.desktop.in.h:2
 msgid "Akonaditray"
 msgstr "Akonaditray"
 
-#: ../menu-data/kdepim-wizards:kde4__groupwarewizard.desktop.in.h:1
-msgid "KDE Groupware Wizard"
-msgstr "Assistant de travail collaboratif pour KDE"
+#: ../menu-data/kdepim-runtime:kde4__akonaditray.desktop.in.h:2
+msgid "Akonadi Tray Utility"
+msgstr "Utilitaire Akonadi de la boîte à miniatures"
 
 #: ../menu-data/kdesrc-build:kde4__kdesrc-build.desktop.in.h:1
+msgid "KDE Source Builder"
+msgstr "Compilateur de sources KDE"
+
+#: ../menu-data/kdesrc-build:kde4__kdesrc-build.desktop.in.h:2
 msgid ""
 "Builds the KDE Platform and associated software from its source code. A "
 "command-line only program."
@@ -9278,25 +9371,30 @@
 "Construit la plate-forme KDE et les logiciels associés à partir de son code "
 "source. Un programme seulement pour la ligne de commande."
 
-#: ../menu-data/kdesrc-build:kde4__kdesrc-build.desktop.in.h:2
-msgid "KDE Source Builder"
-msgstr "Compilateur de sources KDE"
-
 #: ../menu-data/kdesvn:kde4__kdesvn.desktop.in.h:1
-msgid "A Subversion client for KDE"
-msgstr "Un client subversion pour KDE"
-
-#: ../menu-data/kdesvn:kde4__kdesvn.desktop.in.h:2
 msgid "kdesvn"
 msgstr "kdesvn"
 
+#: ../menu-data/kdesvn:kde4__kdesvn.desktop.in.h:2
+msgid "A Subversion client for KDE"
+msgstr "Un client subversion pour KDE"
+
 #: ../menu-data/kdevelop:kde4__kdevelop.desktop.in.h:1
+msgid "KDevelop 4"
+msgstr "KDevelop 4"
+
+#: ../menu-data/kdevelop:kde4__kdevelop.desktop.in.h:2
+#: ../menu-data/netbeans:netbeans.desktop.in.h:2
 msgid "Integrated Development Environment"
 msgstr "Environnement de développement intégré"
 
-#: ../menu-data/kdevelop:kde4__kdevelop.desktop.in.h:2
-msgid "KDevelop 4"
-msgstr "KDevelop 4"
+#: ../menu-data/kdevelop:kde4__kdevelop_ps.desktop.in.h:1
+msgid "KDevelop 4 (Pick Session)"
+msgstr ""
+
+#: ../menu-data/kdevelop:kde4__kdevelop_ps.desktop.in.h:2
+msgid "Integrated Development Environment (Pick Session to start with)"
+msgstr ""
 
 #: ../menu-data/kdf:kde4__kdf.desktop.in.h:1
 msgid "KDiskFree"
@@ -9315,25 +9413,29 @@
 msgstr "Jeu trois-en-ligne"
 
 #: ../menu-data/kdiff3:kde4__kdiff3.desktop.in.h:1
-msgid "A File And Directory Comparison And Merge Tool"
-msgstr "Un outil de comparaison et de fusion de fichiers et de dossiers"
-
-#: ../menu-data/kdiff3:kde4__kdiff3.desktop.in.h:2
 msgid "KDiff3"
 msgstr "KDiff3"
 
-#: ../menu-data/kdocker:kdocker.desktop.in.h:1
-msgid "Docks any application into system tray"
-msgstr "Réduit toutes les applications dans la boîtes à miniatures"
+#: ../menu-data/kdiff3:kde4__kdiff3.desktop.in.h:2
+msgid "A File And Directory Comparison And Merge Tool"
+msgstr "Un outil de comparaison et de fusion de fichiers et de dossiers"
 
-#: ../menu-data/kdocker:kdocker.desktop.in.h:2
+#: ../menu-data/kdocker:kdocker.desktop.in.h:1
 msgid "KDocker"
 msgstr "KDocker"
 
+#: ../menu-data/kdocker:kdocker.desktop.in.h:2
+msgid "Docks any application into system tray"
+msgstr "Réduit toutes les applications dans la boîtes à miniatures"
+
 #: ../menu-data/kdrill:kdrill.desktop.in.h:1
 msgid "KDrill"
 msgstr "KDrill"
 
+#: ../menu-data/kedpm-gtk:kedpm-gtk.desktop.in.h:1
+msgid "Ked Password Manager"
+msgstr "Gestionnaire de Mots de Passe Ked"
+
 #: ../menu-data/keepass2:keepass2.desktop.in.h:1
 msgid "KeePass2"
 msgstr "KeePass2"
@@ -9343,13 +9445,13 @@
 msgstr "Gestionnaire de mots de passe"
 
 #: ../menu-data/keepassx:keepassx.desktop.in.h:1
-msgid "Cross Platform Password Manager"
-msgstr "Gestionnaire de mots de passe multi plate-forme"
-
-#: ../menu-data/keepassx:keepassx.desktop.in.h:2
 msgid "KeePassX"
 msgstr "KeePassX"
 
+#: ../menu-data/keepassx:keepassx.desktop.in.h:2
+msgid "Cross Platform Password Manager"
+msgstr "Gestionnaire de mots de passe multi plate-forme"
+
 #: ../menu-data/kepas:kde4__kepas.desktop.in.h:1
 msgid "Kepas"
 msgstr "Kepas"
@@ -9367,21 +9469,21 @@
 msgstr "Kill Everything That Moves (Tuer tout ce qui bouge)"
 
 #: ../menu-data/keurocalc:kde4__keurocalc.desktop.in.h:1
-msgid "A currency converter and calculator"
-msgstr "Un convertisseur monétaire et une calculatrice"
-
-#: ../menu-data/keurocalc:kde4__keurocalc.desktop.in.h:2
 msgid "KEuroCalc"
 msgstr "KEuroCalc"
 
-#: ../menu-data/kexi:kde4__kexi.desktop.in.h:1
-msgid "Develop desktop database applications"
-msgstr "Développer des applications de bases de données pour le bureau"
+#: ../menu-data/keurocalc:kde4__keurocalc.desktop.in.h:2
+msgid "A currency converter and calculator"
+msgstr "Un convertisseur monétaire et une calculatrice"
 
-#: ../menu-data/kexi:kde4__kexi.desktop.in.h:2
+#: ../menu-data/kexi:kde4__kexi.desktop.in.h:1
 msgid "Kexi"
 msgstr "Kexi"
 
+#: ../menu-data/kexi:kde4__kexi.desktop.in.h:2
+msgid "Develop desktop database applications"
+msgstr "Développer des applications de bases de données pour le bureau"
+
 #: ../menu-data/keyboardcast:keyboardcast.desktop.in.h:1
 msgid "Keyboardcast"
 msgstr "Keyboardcast"
@@ -9400,21 +9502,21 @@
 msgstr "Moniteur de clavier et de souris pour capture vidéo"
 
 #: ../menu-data/keysafe:keysafe.desktop.in.h:1
-msgid "A password safe"
-msgstr "Un mot de passe sécurisé"
-
-#: ../menu-data/keysafe:keysafe.desktop.in.h:2
 msgid "KeySafe"
 msgstr "KeySafe"
 
-#: ../menu-data/keytouch-editor:keytouch-editor.desktop.in.h:1
-msgid "Edit keyboard maps for keytouch"
-msgstr "Éditer les dispositions du clavier pour keytouch"
+#: ../menu-data/keysafe:keysafe.desktop.in.h:2
+msgid "A password safe"
+msgstr "Un mot de passe sécurisé"
 
-#: ../menu-data/keytouch-editor:keytouch-editor.desktop.in.h:2
+#: ../menu-data/keytouch-editor:keytouch-editor.desktop.in.h:1
 msgid "KeyTouch Editor"
 msgstr "Éditeur KeyTouch"
 
+#: ../menu-data/keytouch-editor:keytouch-editor.desktop.in.h:2
+msgid "Edit keyboard maps for keytouch"
+msgstr "Éditer les dispositions du clavier pour keytouch"
+
 #: ../menu-data/kfilereplace:kde4__kfilereplace.desktop.in.h:1
 msgid "KFileReplace"
 msgstr "KFileReplace"
@@ -9436,14 +9538,18 @@
 msgstr "KFloppy"
 
 #: ../menu-data/kfourinline:kde4__kfourinline.desktop.in.h:1
-msgid "Four-in-a-row Board Game"
-msgstr "Jeu quatre-en-ligne"
-
-#: ../menu-data/kfourinline:kde4__kfourinline.desktop.in.h:2
 msgid "KFourInLine"
 msgstr "KFourInLine"
 
+#: ../menu-data/kfourinline:kde4__kfourinline.desktop.in.h:2
+msgid "Four-in-a-row Board Game"
+msgstr "Jeu quatre-en-ligne"
+
 #: ../menu-data/kfritz:kde4__kfritz.desktop.in.h:1
+msgid "KFritz"
+msgstr "KFritz"
+
+#: ../menu-data/kfritz:kde4__kfritz.desktop.in.h:2
 msgid ""
 "Access call history and phone book of your Fritz!Box and get notifications "
 "on incoming and outgoing calls."
@@ -9451,51 +9557,47 @@
 "Répertoire téléphonique et historique d'appels de votre Fritz!Box et "
 "notifications des appels entrants et sortants"
 
-#: ../menu-data/kfritz:kde4__kfritz.desktop.in.h:2
-msgid "KFritz"
-msgstr "KFritz"
-
 #: ../menu-data/kftpgrabber:kde4__kftpgrabber.desktop.in.h:1
-msgid "A graphical FTP client"
-msgstr "Client FTP graphique"
-
-#: ../menu-data/kftpgrabber:kde4__kftpgrabber.desktop.in.h:2
 msgid "KFTPGrabber"
 msgstr "KFTPGrabber"
 
-#: ../menu-data/kgeography:kde4__kgeography.desktop.in.h:1
-msgid "A Geography Learning Program"
-msgstr "Un programme d'apprentissage de la géographie"
+#: ../menu-data/kftpgrabber:kde4__kftpgrabber.desktop.in.h:2
+msgid "A graphical FTP client"
+msgstr "Client FTP graphique"
 
-#: ../menu-data/kgeography:kde4__kgeography.desktop.in.h:2
+#: ../menu-data/kgeography:kde4__kgeography.desktop.in.h:1
 msgid "KGeography"
 msgstr "KGeography"
 
+#: ../menu-data/kgeography:kde4__kgeography.desktop.in.h:2
+msgid "A Geography Learning Program"
+msgstr "Un programme d'apprentissage de la géographie"
+
 #: ../menu-data/kget:kde4__kget.desktop.in.h:1
+msgid "KGet"
+msgstr "KGet"
+
+#: ../menu-data/kget:kde4__kget.desktop.in.h:2
 #: ../menu-data/steadyflow:steadyflow.desktop.in.h:1
 msgid "Download Manager"
 msgstr "Gestionnaire de téléchargements"
 
-#: ../menu-data/kget:kde4__kget.desktop.in.h:2
-msgid "KGet"
-msgstr "KGet"
-
 #: ../menu-data/kgmailnotifier:kde4__kgmailnotifier.desktop.in.h:1
-msgid "A Gmail notifier applet for KDE"
-msgstr "Un applet de notification Gmail pour KDE"
-
-#: ../menu-data/kgmailnotifier:kde4__kgmailnotifier.desktop.in.h:2
 msgid "KGmailNotifier"
 msgstr "KGmailNotifier"
 
-#: ../menu-data/kgoldrunner:kde4__KGoldrunner.desktop.in.h:1
-msgid "A game of action and puzzle-solving"
-msgstr "Jeu d'action et de résolution d'énigme"
+#: ../menu-data/kgmailnotifier:kde4__kgmailnotifier.desktop.in.h:2
+msgid "A Gmail notifier applet for KDE"
+msgstr "Un applet de notification Gmail pour KDE"
 
-#: ../menu-data/kgoldrunner:kde4__KGoldrunner.desktop.in.h:2
+#: ../menu-data/kgoldrunner:kde4__KGoldrunner.desktop.in.h:1
 msgid "KGoldrunner"
 msgstr "KGoldRunner"
 
+#: ../menu-data/kgoldrunner:kde4__KGoldrunner.desktop.in.h:2
+msgid "A game of action and puzzle-solving"
+msgstr "Jeu d'action et de résolution d'énigme"
+
 #: ../menu-data/kgpg:kde4__kgpg.desktop.in.h:1
 msgid "A GnuPG frontend"
 msgstr "Une interface graphique pour GnuPG"
@@ -9505,29 +9607,29 @@
 msgstr "KGpg"
 
 #: ../menu-data/kgrab:kde4__kgrab.desktop.in.h:1
-msgid "KGrab"
-msgstr "KGrab"
-
-#: ../menu-data/kgrab:kde4__kgrab.desktop.in.h:2
 msgid "Screen Grabbing Program"
 msgstr "Logiciel de capture d'écran"
 
-#: ../menu-data/kgraphviewer:kde4__kgrapheditor.desktop.in.h:1
-msgid "A Graphviz dot graph editor for KDE"
-msgstr "Un éditeur de graphes Graphiz pour KDE"
+#: ../menu-data/kgrab:kde4__kgrab.desktop.in.h:2
+msgid "KGrab"
+msgstr "KGrab"
 
-#: ../menu-data/kgraphviewer:kde4__kgrapheditor.desktop.in.h:2
+#: ../menu-data/kgraphviewer:kde4__kgrapheditor.desktop.in.h:1
 msgid "kgrapheditor"
 msgstr "kgrapheditor"
 
-#: ../menu-data/kgraphviewer:kde4__kgraphviewer.desktop.in.h:1
-msgid "A Graphviz dot graph viewer for KDE"
-msgstr "Un afficheur de graphes Graphiz pour KDE"
+#: ../menu-data/kgraphviewer:kde4__kgrapheditor.desktop.in.h:2
+msgid "A Graphviz dot graph editor for KDE"
+msgstr "Un éditeur de graphes Graphiz pour KDE"
 
-#: ../menu-data/kgraphviewer:kde4__kgraphviewer.desktop.in.h:2
+#: ../menu-data/kgraphviewer:kde4__kgraphviewer.desktop.in.h:1
 msgid "kgraphviewer"
 msgstr "kgraphviewer"
 
+#: ../menu-data/kgraphviewer:kde4__kgraphviewer.desktop.in.h:2
+msgid "A Graphviz dot graph viewer for KDE"
+msgstr "Un afficheur de graphes Graphiz pour KDE"
+
 #: ../menu-data/khangman:kde4__khangman.desktop.in.h:1
 msgid "KDE Hangman Game"
 msgstr "Jeu de pendu KDE"
@@ -9537,13 +9639,13 @@
 msgstr "KHangMan"
 
 #: ../menu-data/khmerconverter:khmerconverter.desktop.in.h:1
-msgid "Convert Khmer between Unicode and legacy Khmer encodings."
-msgstr "Conversion du Khmer entre l'Unicode et les anciens encodages khmer"
-
-#: ../menu-data/khmerconverter:khmerconverter.desktop.in.h:2
 msgid "Khmer Converter"
 msgstr "Convertisseur Khmer"
 
+#: ../menu-data/khmerconverter:khmerconverter.desktop.in.h:2
+msgid "Convert Khmer between Unicode and legacy Khmer encodings."
+msgstr "Conversion du Khmer entre l'Unicode et les anciens encodages khmer"
+
 #: ../menu-data/kicad:kicad.desktop.in.h:1
 msgid "KiCad"
 msgstr "KiCad"
@@ -9557,36 +9659,36 @@
 msgstr "KIconEdit"
 
 #: ../menu-data/kid3-qt:kid3-qt.desktop.in.h:1
-#: ../menu-data/kid3:kde4__kid3.desktop.in.h:1
-msgid "Audio Tagger"
-msgstr "Étiquetteur de fichiers audio"
-
-#: ../menu-data/kid3-qt:kid3-qt.desktop.in.h:2
 msgid "Kid3-qt"
 msgstr "Kid3-qt"
 
+#: ../menu-data/kid3-qt:kid3-qt.desktop.in.h:2
 #: ../menu-data/kid3:kde4__kid3.desktop.in.h:2
+msgid "Audio Tagger"
+msgstr "Étiquetteur de fichiers audio"
+
+#: ../menu-data/kid3:kde4__kid3.desktop.in.h:1
 msgid "Kid3"
 msgstr "Kid3"
 
 #: ../menu-data/kig:kde4__kig.desktop.in.h:1
-msgid "Explore Geometric Constructions"
-msgstr "Explorer des constructions géométriques"
-
-#: ../menu-data/kig:kde4__kig.desktop.in.h:2
 msgid "Kig"
 msgstr "Kig"
 
-#: ../menu-data/kigo:kde4__kigo.desktop.in.h:1
-msgid "Go Board Game"
-msgstr "Jeu de Go"
+#: ../menu-data/kig:kde4__kig.desktop.in.h:2
+msgid "Explore Geometric Constructions"
+msgstr "Explorer des constructions géométriques"
 
-#: ../menu-data/kigo:kde4__kigo.desktop.in.h:2
+#: ../menu-data/kigo:kde4__kigo.desktop.in.h:1
 msgid "Kigo"
 msgstr "Kigo"
 
-#: ../menu-data/kiki-the-nano-bot:kiki-the-nano-bot.desktop.in.h:1
-msgid "Kiki the nano bot"
+#: ../menu-data/kigo:kde4__kigo.desktop.in.h:2
+msgid "Go Board Game"
+msgstr "Jeu de Go"
+
+#: ../menu-data/kiki-the-nano-bot:kiki-the-nano-bot.desktop.in.h:1
+msgid "Kiki the nano bot"
 msgstr "Kiki le nano robot"
 
 #: ../menu-data/kiki:kiki.desktop.in.h:1
@@ -9598,13 +9700,13 @@
 msgstr "Test d'expressions régulières"
 
 #: ../menu-data/kildclient:kildclient.desktop.in.h:1
-msgid "Connect to MUDs (Multi User Dungeons)"
-msgstr "Se connecter aux MUDs (Multi User Dungeons)"
-
-#: ../menu-data/kildclient:kildclient.desktop.in.h:2
 msgid "KildClient"
 msgstr "KildClient"
 
+#: ../menu-data/kildclient:kildclient.desktop.in.h:2
+msgid "Connect to MUDs (Multi User Dungeons)"
+msgstr "Se connecter aux MUDs (Multi User Dungeons)"
+
 #: ../menu-data/kile:kde4__kile.desktop.in.h:1
 msgid "(La)TeX development environment"
 msgstr "Environnement de développement (La)Tex"
@@ -9618,36 +9720,45 @@
 msgstr "Killbots"
 
 #: ../menu-data/kimagemapeditor:kde4__kimagemapeditor.desktop.in.h:1
-msgid "HTML Image Map Editor"
-msgstr "Éditeur de cartes d'images cliquables HTML"
-
-#: ../menu-data/kimagemapeditor:kde4__kimagemapeditor.desktop.in.h:2
 msgid "KImageMapEditor"
 msgstr "KImageMapEditor"
 
-#: ../menu-data/kinfocenter:kde4__kinfocenter.desktop.in.h:1
-msgid "Info Center"
-msgstr "Centre d'informations"
+#: ../menu-data/kimagemapeditor:kde4__kimagemapeditor.desktop.in.h:2
+msgid "HTML Image Map Editor"
+msgstr "Éditeur de cartes d'images cliquables HTML"
 
-#: ../menu-data/kinfocenter:kde4__kinfocenter.desktop.in.h:2
+#: ../menu-data/kinfocenter:kde4__kinfocenter.desktop.in.h:1
 msgid "KInfoCenter"
 msgstr "KInfoCenter"
 
-#: ../menu-data/kino:Kino.desktop.in.h:1
-msgid "Edit DV video"
-msgstr "Éditer les vidéos DV"
+#: ../menu-data/kinfocenter:kde4__kinfocenter.desktop.in.h:2
+msgid "Info Center"
+msgstr "Centre d'informations"
 
-#: ../menu-data/kino:Kino.desktop.in.h:2
+#: ../menu-data/kino:Kino.desktop.in.h:1
 msgid "Kino"
 msgstr "Kino"
 
+#: ../menu-data/kino:Kino.desktop.in.h:2
+msgid "Edit DV video"
+msgstr "Éditer les vidéos DV"
+
 #: ../menu-data/kipi-plugins:kde4__kipiplugins.desktop.in.h:1
+msgid "KIPI Plugins"
+msgstr "Modules externes KIPI"
+
+#: ../menu-data/kipi-plugins:kde4__kipiplugins.desktop.in.h:2
 msgid "KDE Image Plugins Interface"
 msgstr "Modules externes de traitement d'image pour les applications KDE"
 
-#: ../menu-data/kipi-plugins:kde4__kipiplugins.desktop.in.h:2
-msgid "KIPI Plugins"
-msgstr "Modules externes KIPI"
+#. X-DocPath=photolayoutseditor/index.html
+#: ../menu-data/kipi-plugins:kde4__photolayoutseditor.desktop.in.h:2
+msgid "Photo Layouts Editor"
+msgstr ""
+
+#: ../menu-data/kipi-plugins:kde4__photolayoutseditor.desktop.in.h:3
+msgid "Create beautiful and professional photo layouts from your photos"
+msgstr "Créer des mises en valeur belles et professionnelles de vos photos"
 
 #: ../menu-data/kiriki:kde4__kiriki.desktop.in.h:1
 msgid "Kiriki"
@@ -9658,13 +9769,13 @@
 msgstr "Jeu de dés de type Yams"
 
 #: ../menu-data/kita2:kde__kita2.desktop.in.h:1
-msgid "2ch client for KDE"
-msgstr "Client 2ch pour KDE"
-
-#: ../menu-data/kita2:kde__kita2.desktop.in.h:2
 msgid "Kita2"
 msgstr "Kita2"
 
+#: ../menu-data/kita2:kde__kita2.desktop.in.h:2
+msgid "2ch client for KDE"
+msgstr "Client 2ch pour KDE"
+
 #: ../menu-data/kiten:kde4__kiten.desktop.in.h:1
 msgid "Japanese Reference and Study Tool"
 msgstr "Référentiel et outil d'étude pour le japonais"
@@ -9674,13 +9785,13 @@
 msgstr "Kiten"
 
 #: ../menu-data/kitsune:kitsune.desktop.in.h:1
-msgid "Countdown"
-msgstr "Compte à rebours"
-
-#: ../menu-data/kitsune:kitsune.desktop.in.h:2
 msgid "Kitsune"
 msgstr "Kitsune"
 
+#: ../menu-data/kitsune:kitsune.desktop.in.h:2
+msgid "Countdown"
+msgstr "Compte à rebours"
+
 #: ../menu-data/kjots:kde4__Kjots.desktop.in.h:1
 msgid "KJots"
 msgstr "KJots"
@@ -9702,13 +9813,13 @@
 msgstr "Afficheur de SWF Gnash pour KDE"
 
 #: ../menu-data/klatexformula:klatexformula.desktop.in.h:1
-msgid "Generate images from LaTeX equations"
-msgstr "Générer des images à partir d'équations LaTeX"
-
-#: ../menu-data/klatexformula:klatexformula.desktop.in.h:2
 msgid "KLatexFormula"
 msgstr "KLatexFormula"
 
+#: ../menu-data/klatexformula:klatexformula.desktop.in.h:2
+msgid "Generate images from LaTeX equations"
+msgstr "Générer des images à partir d'équations LaTeX"
+
 #: ../menu-data/klavaro:klavaro.desktop.in.h:1
 msgid "Klavaro"
 msgstr "Klavaro"
@@ -9719,42 +9830,42 @@
 
 #: ../menu-data/kleopatra:kde4__kleopatra.desktop.in.h:1
 #: ../menu-data/kleopatra:kde4__kleopatra_import.desktop.in.h:1
-msgid "Certificate Manager and Unified Crypto GUI"
-msgstr "Gestionnaire de certificats et interface de cryptographie unifiée"
+msgid "Kleopatra"
+msgstr "Kleopatra"
 
 #: ../menu-data/kleopatra:kde4__kleopatra.desktop.in.h:2
 #: ../menu-data/kleopatra:kde4__kleopatra_import.desktop.in.h:2
-msgid "Kleopatra"
-msgstr "Kleopatra"
+msgid "Certificate Manager and Unified Crypto GUI"
+msgstr "Gestionnaire de certificats et interface de cryptographie unifiée"
 
 #: ../menu-data/klettres:kde4__klettres.desktop.in.h:1
-msgid "KLettres"
-msgstr "KLettres"
-
-#: ../menu-data/klettres:kde4__klettres.desktop.in.h:2
 msgid "a KDE program to learn the alphabet"
 msgstr "Un programme KDE pour apprendre l'alphabet"
 
+#: ../menu-data/klettres:kde4__klettres.desktop.in.h:2
+msgid "KLettres"
+msgstr "KLettres"
+
 #: ../menu-data/klickety:kde4__klickety.desktop.in.h:1
 msgid "Klickety"
 msgstr "Klickety"
 
 #: ../menu-data/klickety:kde4__ksame.desktop.in.h:1
-msgid "Board Game"
-msgstr "Jeu de plateau"
-
-#: ../menu-data/klickety:kde4__ksame.desktop.in.h:2
 msgid "SameGame"
 msgstr "Jeu Same"
 
-#: ../menu-data/klines:kde4__klines.desktop.in.h:1
-msgid "Kolor Lines"
-msgstr "Kolor Lines"
+#: ../menu-data/klickety:kde4__ksame.desktop.in.h:2
+msgid "Board Game"
+msgstr "Jeu de plateau"
 
-#: ../menu-data/klines:kde4__klines.desktop.in.h:2
+#: ../menu-data/klines:kde4__klines.desktop.in.h:1
 msgid "Tactical Game"
 msgstr "Jeu de tactique"
 
+#: ../menu-data/klines:kde4__klines.desktop.in.h:2
+msgid "Kolor Lines"
+msgstr "Kolor Lines"
+
 #: ../menu-data/klinkstatus:kde4__klinkstatus.desktop.in.h:1
 msgid "KLinkStatus"
 msgstr "KLinkStatus"
@@ -9764,21 +9875,21 @@
 msgstr "Vérificateur de liens"
 
 #: ../menu-data/klipper:kde4__klipper.desktop.in.h:1
-msgid "A cut & paste history utility"
-msgstr "Un outil d'historique du copier/coller"
-
-#: ../menu-data/klipper:kde4__klipper.desktop.in.h:2
 msgid "Klipper"
 msgstr "Klipper"
 
-#: ../menu-data/klog:kde4__klog.desktop.in.h:1
-msgid "KDE Ham Radio logging program"
-msgstr "Journal pour radio amateur sous KDE"
+#: ../menu-data/klipper:kde4__klipper.desktop.in.h:2
+msgid "A cut & paste history utility"
+msgstr "Un outil d'historique du copier/coller"
 
-#: ../menu-data/klog:kde4__klog.desktop.in.h:2
+#: ../menu-data/klog:kde4__klog.desktop.in.h:1
 msgid "KLog"
 msgstr "KLog"
 
+#: ../menu-data/klog:kde4__klog.desktop.in.h:2
+msgid "KDE Ham Radio logging program"
+msgstr "Journal pour radio amateur sous KDE"
+
 #: ../menu-data/kluppe:kluppe.desktop.in.h:1
 msgid "Kluppe"
 msgstr "Kluppe"
@@ -9804,8 +9915,8 @@
 msgstr "Mahjongg Solitaire"
 
 #: ../menu-data/kmail-mobile:kde4__kmail-mobile.desktop.in.h:1
-msgid "Kontact Touch Mail"
-msgstr "Messagerie Kontact Touch"
+msgid "Mail"
+msgstr "Courrier électronique"
 
 #: ../menu-data/kmail:kde4__KMail2.desktop.in.h:1
 msgid "KMail"
@@ -9836,21 +9947,21 @@
 msgstr "Client Live Messenger pour KDE"
 
 #: ../menu-data/kmetronome:kde4__kmetronome.desktop.in.h:1
-msgid "KDE MIDI Metronome Using ALSA Sequencer"
-msgstr "Métronome MIDI utilisant un séquenceur ALSA, pour KDE"
-
-#: ../menu-data/kmetronome:kde4__kmetronome.desktop.in.h:2
 msgid "KMetronome"
 msgstr "KMetronome"
 
-#: ../menu-data/kmidimon:kde4__kmidimon.desktop.in.h:1
-msgid "ALSA Sequencer MIDI monitor"
-msgstr "Surveillance du séquenceur MIDI ALSA"
+#: ../menu-data/kmetronome:kde4__kmetronome.desktop.in.h:2
+msgid "KDE MIDI Metronome Using ALSA Sequencer"
+msgstr "Métronome MIDI utilisant un séquenceur ALSA, pour KDE"
 
-#: ../menu-data/kmidimon:kde4__kmidimon.desktop.in.h:2
+#: ../menu-data/kmidimon:kde4__kmidimon.desktop.in.h:1
 msgid "KMidimon"
 msgstr "KMidimon"
 
+#: ../menu-data/kmidimon:kde4__kmidimon.desktop.in.h:2
+msgid "ALSA Sequencer MIDI monitor"
+msgstr "Surveillance du séquenceur MIDI ALSA"
+
 #: ../menu-data/kmines:kde4__kmines.desktop.in.h:1
 msgid "KMines"
 msgstr "KMines"
@@ -9860,21 +9971,21 @@
 msgstr "Jeu de type démineur"
 
 #: ../menu-data/kmix:kde4__kmix.desktop.in.h:1
-msgid "KMix"
-msgstr "KMix"
-
-#: ../menu-data/kmix:kde4__kmix.desktop.in.h:2
 msgid "Sound Mixer"
 msgstr "Mixeur de sons"
 
-#: ../menu-data/kmldonkey:kde4__kmldonkey.desktop.in.h:1
-msgid "An MLDonkey frontend for KDE"
-msgstr "Une interface MLDonkey pour KDE"
+#: ../menu-data/kmix:kde4__kmix.desktop.in.h:2
+msgid "KMix"
+msgstr "KMix"
 
-#: ../menu-data/kmldonkey:kde4__kmldonkey.desktop.in.h:2
+#: ../menu-data/kmldonkey:kde4__kmldonkey.desktop.in.h:1
 msgid "KMLDonkey"
 msgstr "KMLDonkey"
 
+#: ../menu-data/kmldonkey:kde4__kmldonkey.desktop.in.h:2
+msgid "An MLDonkey frontend for KDE"
+msgstr "Une interface MLDonkey pour KDE"
+
 #: ../menu-data/kmousetool:kde4__kmousetool.desktop.in.h:1
 msgid "Clicks the mouse for you, reducing the effects of RSI"
 msgstr ""
@@ -9933,13 +10044,13 @@
 msgstr "Jeu de construction de réseau"
 
 #: ../menu-data/knights:kde4__knights.desktop.in.h:1
-msgid "Chess game"
-msgstr "Jeu d'échecs"
-
-#: ../menu-data/knights:kde4__knights.desktop.in.h:2
 msgid "Knights"
 msgstr "Knights"
 
+#: ../menu-data/knights:kde4__knights.desktop.in.h:2
+msgid "Chess game"
+msgstr "Jeu d'échecs"
+
 #: ../menu-data/knode:kde4__KNode.desktop.in.h:1
 msgid "KNode"
 msgstr "KNode"
@@ -9949,25 +10060,25 @@
 msgstr "Lecteur de forums de discussion"
 
 #: ../menu-data/knotes-mobile:kde4__notes-mobile.desktop.in.h:1
-msgid "Kontact Touch Notes"
-msgstr "Notes Kontact Touch"
+msgid "Notes"
+msgstr "Notes"
 
 #: ../menu-data/knotes:kde4__knotes.desktop.in.h:1
-msgid "KNotes"
-msgstr "KNotes"
-
-#: ../menu-data/knotes:kde4__knotes.desktop.in.h:2
 msgid "Popup Notes"
 msgstr "Éditeur de petites notes"
 
-#: ../menu-data/kobodeluxe:kobodeluxe.desktop.in.h:1
-msgid "Destroy enemy bases in space"
-msgstr "Détruire les bases ennemies dans l'espace"
+#: ../menu-data/knotes:kde4__knotes.desktop.in.h:2
+msgid "KNotes"
+msgstr "KNotes"
 
-#: ../menu-data/kobodeluxe:kobodeluxe.desktop.in.h:2
+#: ../menu-data/kobodeluxe:kobodeluxe.desktop.in.h:1
 msgid "Kobo Deluxe"
 msgstr "Kobo Deluxe"
 
+#: ../menu-data/kobodeluxe:kobodeluxe.desktop.in.h:2
+msgid "Destroy enemy bases in space"
+msgstr "Détruire les bases ennemies dans l'espace"
+
 #: ../menu-data/kodos:kodos.desktop.in.h:1
 msgid "Kodos"
 msgstr "Kodos"
@@ -9989,13 +10100,13 @@
 msgstr "Mini golf"
 
 #: ../menu-data/kollision:kde4__kollision.desktop.in.h:1
-msgid "A simple ball dodging game"
-msgstr "Un jeu simple d'évitement de balles"
-
-#: ../menu-data/kollision:kde4__kollision.desktop.in.h:2
 msgid "Kollision"
 msgstr "Kollision"
 
+#: ../menu-data/kollision:kde4__kollision.desktop.in.h:2
+msgid "A simple ball dodging game"
+msgstr "Un jeu simple d'évitement de balles"
+
 #: ../menu-data/kolourpaint4:kde4__kolourpaint.desktop.in.h:1
 msgid "KolourPaint"
 msgstr "KolourPaint"
@@ -10005,37 +10116,37 @@
 msgstr "Logiciel de dessin"
 
 #: ../menu-data/komparator:kde4__komparator4.desktop.in.h:1
-msgid "A KDE Directory Synchronization Application"
-msgstr "Une application de synchronisation de dossiers pour KDE"
-
-#: ../menu-data/komparator:kde4__komparator4.desktop.in.h:2
 msgid "Komparator4"
 msgstr "Komparator4"
 
-#: ../menu-data/kompare:kde4__kompare.desktop.in.h:1
-msgid "Diff/Patch Frontend"
-msgstr "Interface pour diff/patch"
+#: ../menu-data/komparator:kde4__komparator4.desktop.in.h:2
+msgid "A KDE Directory Synchronization Application"
+msgstr "Une application de synchronisation de dossiers pour KDE"
 
-#: ../menu-data/kompare:kde4__kompare.desktop.in.h:2
+#: ../menu-data/kompare:kde4__kompare.desktop.in.h:1
 msgid "Kompare"
 msgstr "Kompare"
 
-#: ../menu-data/kompozer:kompozer.desktop.in.h:1
-msgid "Create Web Pages"
-msgstr "Créer des pages Web"
+#: ../menu-data/kompare:kde4__kompare.desktop.in.h:2
+msgid "Diff/Patch Frontend"
+msgstr "Interface pour diff/patch"
 
-#: ../menu-data/kompozer:kompozer.desktop.in.h:2
+#: ../menu-data/kompozer:kompozer.desktop.in.h:1
 msgid "KompoZer"
 msgstr "KompoZer"
 
-#: ../menu-data/konquest:kde4__konquest.desktop.in.h:1
-msgid "Galactic Strategy Game"
-msgstr "Jeu de stratégie Galactic"
+#: ../menu-data/kompozer:kompozer.desktop.in.h:2
+msgid "Create Web Pages"
+msgstr "Créer des pages Web"
 
-#: ../menu-data/konquest:kde4__konquest.desktop.in.h:2
+#: ../menu-data/konquest:kde4__konquest.desktop.in.h:1
 msgid "Konquest"
 msgstr "Konquest"
 
+#: ../menu-data/konquest:kde4__konquest.desktop.in.h:2
+msgid "Galactic Strategy Game"
+msgstr "Jeu de stratégie Galactic"
+
 #: ../menu-data/konsole:kde4__konsole.desktop.in.h:1
 msgid "Konsole"
 msgstr "Konsole"
@@ -10071,18 +10182,18 @@
 msgstr "Konversation"
 
 #: ../menu-data/kopete:kde4__kopete.desktop.in.h:1
-#: ../menu-data/licq-plugin-kde4:kde4__licq.desktop.in.h:1
-#: ../menu-data/licq-plugin-qt4:licq.desktop.in.h:1
-msgid "Instant Messenger"
-msgstr "Messagerie instantanée"
-
-#: ../menu-data/kopete:kde4__kopete.desktop.in.h:2
 msgid "Kopete"
 msgstr "Kopete"
 
+#: ../menu-data/kopete:kde4__kopete.desktop.in.h:2
+#: ../menu-data/licq-plugin-kde4:kde4__licq.desktop.in.h:2
+#: ../menu-data/licq-plugin-qt4:licq.desktop.in.h:2
+msgid "Instant Messenger"
+msgstr "Messagerie instantanée"
+
 #: ../menu-data/korganizer-mobile:kde4__korganizer-mobile.desktop.in.h:1
-msgid "Kontact Touch Calendar"
-msgstr "Agenda Kontact Touch"
+msgid "Calendar"
+msgstr "Agenda"
 
 #: ../menu-data/korganizer:kde4__korganizer-import.desktop.in.h:1
 #: ../menu-data/korganizer:kde4__korganizer.desktop.in.h:1
@@ -10095,13 +10206,13 @@
 msgstr "KOrganizer"
 
 #: ../menu-data/koules:koules.desktop.in.h:1
-msgid "Push your enemies away, but stay away from obstacles"
-msgstr "Écartez vos ennemis, mais faites attention aux embûches"
-
-#: ../menu-data/koules:koules.desktop.in.h:2
 msgid "koules"
 msgstr "Koules"
 
+#: ../menu-data/koules:koules.desktop.in.h:2
+msgid "Push your enemies away, but stay away from obstacles"
+msgstr "Écartez vos ennemis, mais faites attention aux embûches"
+
 #: ../menu-data/kover:kde4__kover.desktop.in.h:1
 msgid "CD Cover Printer"
 msgstr "Impression de jaquettes de CD"
@@ -10118,14 +10229,6 @@
 msgid "Patience Card Game"
 msgstr "Jeux de réussite"
 
-#: ../menu-data/kphone:kphone.desktop.in.h:1
-msgid "Kphone"
-msgstr "Kphone"
-
-#: ../menu-data/kphone:kphone.desktop.in.h:2
-msgid "Voice over IP (VoIP) phone application"
-msgstr "Application de téléphonie via l'Internet (VoIP)"
-
 #: ../menu-data/kphotoalbum:kde4__kphotoalbum.desktop.in.h:1
 msgid "KPhotoAlbum"
 msgstr "KPhotoAlbum"
@@ -10138,12 +10241,7 @@
 msgid "KPlato"
 msgstr "KPlato"
 
-#: ../menu-data/kplato:kde4__kplato.desktop.in.h:2
-#: ../menu-data/planner:planner.desktop.in.h:2
-msgid "Project Management"
-msgstr "Gestion de projets"
-
-#: ../menu-data/kplayer:kde4__kplayer.desktop.in.h:1
+#: ../menu-data/kplayer:kde4__kplayer.desktop.in.h:2
 msgid "KPlayer"
 msgstr "KPlayer"
 
@@ -10159,18 +10257,14 @@
 msgid "KPresenter"
 msgstr "KPresenter"
 
-#: ../menu-data/kpresenter:kde4__kpresenter.desktop.in.h:2
-msgid "Write presentation documents"
-msgstr "Créer des présentations en diapositives (PréAO)"
-
 #: ../menu-data/kradio4:kde4__kradio4.desktop.in.h:1
-msgid "V4L/V4L2-Radio Application for KDE4"
-msgstr "Application radio V4L/V4L2 pour KDE4"
-
-#: ../menu-data/kradio4:kde4__kradio4.desktop.in.h:2
 msgid "kradio4"
 msgstr "kradio4"
 
+#: ../menu-data/kradio4:kde4__kradio4.desktop.in.h:2
+msgid "V4L/V4L2-Radio Application for KDE4"
+msgstr "Application radio V4L/V4L2 pour KDE4"
+
 #: ../menu-data/kradioripper:kde4__kradioripper.desktop.in.h:1
 msgid "KRadioRipper"
 msgstr "KRadioRipper"
@@ -10236,30 +10330,33 @@
 msgstr "Jeu de plateau Reversi"
 
 #: ../menu-data/krfb:kde4__krfb.desktop.in.h:1
-#: ../menu-data/vino:vino-preferences.desktop.in.h:2
-msgid "Desktop Sharing"
-msgstr "Partage de bureau"
-
-#: ../menu-data/krfb:kde4__krfb.desktop.in.h:2
 msgid "Krfb"
 msgstr "Krfb"
 
-#: ../menu-data/krita:kde4__krita.desktop.in.h:1
-msgid "Edit and paint images"
-msgstr "Créer et retoucher des images"
+#: ../menu-data/krfb:kde4__krfb.desktop.in.h:2
+#: ../menu-data/vino:vino-preferences.desktop.in.h:1
+msgid "Desktop Sharing"
+msgstr "Partage de bureau"
 
-#: ../menu-data/krita:kde4__krita.desktop.in.h:2
+#: ../menu-data/krita:kde4__krita.desktop.in.h:1
+#: ../menu-data/krita:kde4__krita_odg.desktop.in.h:1
+#: ../menu-data/krita:kde4__krita_psd.desktop.in.h:1
 msgid "Krita"
 msgstr "Krita"
 
-#: ../menu-data/kruler:kde4__kruler.desktop.in.h:1
-msgid "KRuler"
-msgstr "KRuler"
+#: ../menu-data/krita:kde4__krita.desktop.in.h:2
+msgid "Edit and paint images"
+msgstr "Créer et retoucher des images"
 
-#: ../menu-data/kruler:kde4__kruler.desktop.in.h:2
+#: ../menu-data/kruler:kde4__kruler.desktop.in.h:1
+#: ../menu-data/screenruler:screenruler.desktop.in.h:1
 msgid "Screen Ruler"
 msgstr "Règle d'écran"
 
+#: ../menu-data/kruler:kde4__kruler.desktop.in.h:2
+msgid "KRuler"
+msgstr "KRuler"
+
 #: ../menu-data/krusader:kde4__krusader.desktop.in.h:1
 msgid "Krusader"
 msgstr "Krusader"
@@ -10272,6 +10369,14 @@
 msgid "KsCD"
 msgstr "KsCD"
 
+#: ../menu-data/kscope:kscope.desktop.in.h:1
+msgid "KScope"
+msgstr "KScope"
+
+#: ../menu-data/kscope:kscope.desktop.in.h:2
+msgid "Source editing environment"
+msgstr "Environnement de modification de source"
+
 #: ../menu-data/kseg:kseg.desktop.in.h:1
 msgid "KSeg Geometry Sketchpad"
 msgstr "Carnet de croquis géométriques KSeg"
@@ -10289,13 +10394,13 @@
 msgstr "Jeu de tuiles Sishen-Sho dans le style Mahjongg"
 
 #: ../menu-data/kshutdown:kde4__kshutdown.desktop.in.h:1
-msgid "An advanced shut down utility"
-msgstr "Un outil d'extinction perfectionné"
-
-#: ../menu-data/kshutdown:kde4__kshutdown.desktop.in.h:2
 msgid "KShutdown"
 msgstr "KShutdown"
 
+#: ../menu-data/kshutdown:kde4__kshutdown.desktop.in.h:2
+msgid "An advanced shut down utility"
+msgstr "Un outil d'extinction perfectionné"
+
 #: ../menu-data/ksirk:kde4__ksirk.desktop.in.h:1
 msgid "KsirK"
 msgstr "KsirK"
@@ -10305,13 +10410,13 @@
 msgstr "Jeu de stratégie pour la domination du monde"
 
 #: ../menu-data/ksnapshot:kde4__ksnapshot.desktop.in.h:1
-msgid "KSnapshot"
-msgstr "KSnapshot"
-
-#: ../menu-data/ksnapshot:kde4__ksnapshot.desktop.in.h:2
 msgid "Screen Capture Program"
 msgstr "Application de capture d'écran"
 
+#: ../menu-data/ksnapshot:kde4__ksnapshot.desktop.in.h:2
+msgid "KSnapshot"
+msgstr "KSnapshot"
+
 #: ../menu-data/kspaceduel:kde4__kspaceduel.desktop.in.h:1
 msgid "KSpaceDuel"
 msgstr "KSpaceDuel"
@@ -10324,35 +10429,31 @@
 msgid "KSpread"
 msgstr "KSpread"
 
-#: ../menu-data/kspread:kde4__kspread.desktop.in.h:2
-msgid "Write spreadsheet documents"
-msgstr "Créer des feuilles de calcul (tableur)"
-
 #: ../menu-data/ksquares:kde4__ksquares.desktop.in.h:1
-msgid "Connect the dots to create squares"
-msgstr "Relier les points pour former des carrés"
-
-#: ../menu-data/ksquares:kde4__ksquares.desktop.in.h:2
 msgid "KSquares"
 msgstr "KSquares"
 
+#: ../menu-data/ksquares:kde4__ksquares.desktop.in.h:2
+msgid "Connect the dots to create squares"
+msgstr "Relier les points pour former des carrés"
+
 #: ../menu-data/ksshaskpass:kde4__ksshaskpass.desktop.in.h:1
+msgid "SSH AskPass"
+msgstr "SSH AskPass"
+
+#: ../menu-data/ksshaskpass:kde4__ksshaskpass.desktop.in.h:2
 msgid "Enter passphrase to authenticate to the ssh agent"
 msgstr ""
 "Saisie d'une phrase de passe pour s'authentifier auprès de l'agent ssh"
 
-#: ../menu-data/ksshaskpass:kde4__ksshaskpass.desktop.in.h:2
-msgid "SSH AskPass"
-msgstr "SSH AskPass"
-
 #: ../menu-data/kst:kst.desktop.in.h:1
-msgid "Data Viewer"
-msgstr "Visionneuse de Données"
-
-#: ../menu-data/kst:kst.desktop.in.h:2
 msgid "Kst"
 msgstr "Kst"
 
+#: ../menu-data/kst:kst.desktop.in.h:2
+msgid "Data Viewer"
+msgstr "Visionneuse de Données"
+
 #: ../menu-data/kstars:kde4__kstars.desktop.in.h:1
 msgid "Desktop Planetarium"
 msgstr "Planétarium de bureau"
@@ -10402,7 +10503,7 @@
 msgstr "KTikZ"
 
 #: ../menu-data/ktikz:kde4__ktikz.desktop.in.h:2
-#: ../menu-data/qtikz:qtikz.desktop.in.h:1
+#: ../menu-data/qtikz:qtikz.desktop.in.h:2
 msgid "Program for creating TikZ (from the LaTeX pgf package) diagrams"
 msgstr ""
 "Programme pour la création de diagrammes TikZ (à partir du paquet LaTeX PGF)"
@@ -10424,65 +10525,65 @@
 msgstr "Suivi du temps"
 
 #: ../menu-data/ktoon:ktoon.desktop.in.h:1
-msgid "Animation"
-msgstr "Animation"
-
-#: ../menu-data/ktoon:ktoon.desktop.in.h:2
 msgid "KToon"
 msgstr "KToon"
 
-#: ../menu-data/ktorrent:kde4__ktorrent.desktop.in.h:1
-msgid "A BitTorrent program for KDE"
-msgstr "Un client BitTorrent pour KDE"
+#: ../menu-data/ktoon:ktoon.desktop.in.h:2
+msgid "Animation"
+msgstr "Animation"
 
-#: ../menu-data/ktorrent:kde4__ktorrent.desktop.in.h:2
+#: ../menu-data/ktorrent:kde4__ktorrent.desktop.in.h:1
 msgid "KTorrent"
 msgstr "KTorrent"
 
-#: ../menu-data/ktouch:kde4__ktouch.desktop.in.h:1
-msgid "KTouch"
-msgstr "KTouch"
+#: ../menu-data/ktorrent:kde4__ktorrent.desktop.in.h:2
+msgid "A BitTorrent program for KDE"
+msgstr "Un client BitTorrent pour KDE"
 
-#: ../menu-data/ktouch:kde4__ktouch.desktop.in.h:2
+#: ../menu-data/ktouch:kde4__ktouch.desktop.in.h:1
 msgid "Touch Typing Tutor"
 msgstr "Apprentissage de la frappe au clavier"
 
-#: ../menu-data/ktron:kde4__kdesnake.desktop.in.h:1
-msgid "KSnake"
-msgstr "KSnake"
+#: ../menu-data/ktouch:kde4__ktouch.desktop.in.h:2
+msgid "KTouch"
+msgstr "KTouch"
 
-#: ../menu-data/ktron:kde4__kdesnake.desktop.in.h:2
+#: ../menu-data/ktron:kde4__kdesnake.desktop.in.h:1
 msgid "Snake-like Game"
 msgstr "Jeu du serpent"
 
+#: ../menu-data/ktron:kde4__kdesnake.desktop.in.h:2
+msgid "KSnake"
+msgstr "KSnake"
+
 #: ../menu-data/ktron:kde4__ktron.desktop.in.h:1
 msgid "KSnakeDuel"
 msgstr "KSnakeDuel"
 
 #: ../menu-data/ktuberling:kde4__ktuberling.desktop.in.h:1
-msgid "Picture Game for Children"
-msgstr "Jeu d'images pour les enfants"
-
-#: ../menu-data/ktuberling:kde4__ktuberling.desktop.in.h:2
 msgid "Potato Guy"
 msgstr "Bonhomme patate"
 
-#: ../menu-data/kturtle:kde4__kturtle.desktop.in.h:1
-msgid "Educational Programming Environment"
-msgstr "Environnement éducatif de programmation"
+#: ../menu-data/ktuberling:kde4__ktuberling.desktop.in.h:2
+msgid "Picture Game for Children"
+msgstr "Jeu d'images pour les enfants"
 
-#: ../menu-data/kturtle:kde4__kturtle.desktop.in.h:2
+#: ../menu-data/kturtle:kde4__kturtle.desktop.in.h:1
 msgid "KTurtle"
 msgstr "KTurtle"
 
-#: ../menu-data/kubrick:kde4__kubrick.desktop.in.h:1
-msgid "A 3-D game based on Rubik's Cube"
-msgstr "Un jeu 3D basé sur le Rubik's Cube"
+#: ../menu-data/kturtle:kde4__kturtle.desktop.in.h:2
+msgid "Educational Programming Environment"
+msgstr "Environnement éducatif de programmation"
 
-#: ../menu-data/kubrick:kde4__kubrick.desktop.in.h:2
+#: ../menu-data/kubrick:kde4__kubrick.desktop.in.h:1
 msgid "Kubrick"
 msgstr "Kubrick"
 
+#: ../menu-data/kubrick:kde4__kubrick.desktop.in.h:2
+msgid "A 3-D game based on Rubik's Cube"
+msgstr "Un jeu 3D basé sur le Rubik's Cube"
+
 #: ../menu-data/kuiviewer:kde4__kuiviewer.desktop.in.h:1
 msgid "KUIViewer"
 msgstr "KUIViewer"
@@ -10492,15 +10593,15 @@
 msgstr "Afficheur de fichier d'interface Qt"
 
 #: ../menu-data/kupfer:kupfer.desktop.in.h:1
+msgid "Kupfer"
+msgstr "Kupfer"
+
+#: ../menu-data/kupfer:kupfer.desktop.in.h:2
 msgid "Convenient command and access tool for applications and documents"
 msgstr ""
 "Une commande pratique et un outil d'accès pour les applications et les "
 "documents"
 
-#: ../menu-data/kupfer:kupfer.desktop.in.h:2
-msgid "Kupfer"
-msgstr "Kupfer"
-
 #: ../menu-data/kuser:kde4__kuser.desktop.in.h:1
 msgid "KUser"
 msgstr "KUser"
@@ -10510,29 +10611,29 @@
 msgstr "Gestionnaire d'utilisateurs"
 
 #: ../menu-data/kvirc:kvirc.desktop.in.h:1
-msgid "Connect to Internet Relay Chat"
-msgstr "Se connecter à l'IRC"
-
-#: ../menu-data/kvirc:kvirc.desktop.in.h:2
 msgid "KVIrc"
 msgstr "KVIrc"
 
-#: ../menu-data/kvkbd:kde4__kvkbd.desktop.in.h:1
-msgid "A virtual keyboard for KDE"
-msgstr "Un clavier virtuel pour KDE"
+#: ../menu-data/kvirc:kvirc.desktop.in.h:2
+msgid "Connect to Internet Relay Chat"
+msgstr "Se connecter à l'IRC"
 
-#: ../menu-data/kvkbd:kde4__kvkbd.desktop.in.h:2
+#: ../menu-data/kvkbd:kde4__kvkbd.desktop.in.h:1
 msgid "Kvkbd"
 msgstr "Kvkbd"
 
-#: ../menu-data/kvpm:kvpm.desktop.in.h:1
-msgid "KDE Volume Partition Manager"
-msgstr "Gestionnaire de partitions de disque KDE"
+#: ../menu-data/kvkbd:kde4__kvkbd.desktop.in.h:2
+msgid "A virtual keyboard for KDE"
+msgstr "Un clavier virtuel pour KDE"
 
-#: ../menu-data/kvpm:kvpm.desktop.in.h:2
+#: ../menu-data/kvpm:kvpm.desktop.in.h:1
 msgid "KVPM"
 msgstr "KVPM"
 
+#: ../menu-data/kvpm:kvpm.desktop.in.h:2
+msgid "KDE Volume Partition Manager"
+msgstr "Gestionnaire de partitions de disque KDE"
+
 #: ../menu-data/kvpnc:kde4__kvpnc.desktop.in.h:1
 msgid "GUI for various VPN clients"
 msgstr ""
@@ -10552,13 +10653,13 @@
 msgstr "Outil de gestion des portefeuilles"
 
 #: ../menu-data/kwave:kde4__kwave.desktop.in.h:1
-msgid "A sound editor for KDE"
-msgstr "Un éditeur de sons pour KDE"
-
-#: ../menu-data/kwave:kde4__kwave.desktop.in.h:2
 msgid "Kwave Sound Editor"
 msgstr "Éditeur de sons Kwave"
 
+#: ../menu-data/kwave:kde4__kwave.desktop.in.h:2
+msgid "A sound editor for KDE"
+msgstr "Un éditeur de sons pour KDE"
+
 #: ../menu-data/kword:kde4__kword.desktop.in.h:1
 msgid "KWord"
 msgstr "KWord"
@@ -10576,18 +10677,18 @@
 msgid "KWordQuiz"
 msgstr "KWordQuiz"
 
-#: ../menu-data/kwrite:kde4__kwrite.desktop.in.h:1
+#: ../menu-data/kwrite:kde4__kwrite.desktop.in.h:2
 msgid "KWrite"
 msgstr "KWrite"
 
 #: ../menu-data/kx11grab:kde4__kx11grab.desktop.in.h:1
-msgid "Application for recording x11 windows"
-msgstr "Interface d'enregistrement de fenêtres X11"
-
-#: ../menu-data/kx11grab:kde4__kx11grab.desktop.in.h:2
 msgid "kx11grab"
 msgstr "kx11grab"
 
+#: ../menu-data/kx11grab:kde4__kx11grab.desktop.in.h:2
+msgid "Application for recording x11 windows"
+msgstr "Interface d'enregistrement de fenêtres X11"
+
 #: ../menu-data/l2tp-ipsec-vpn:L2TP-Ipsec-VPN-Manager.desktop.in.h:1
 msgid "L2TP Ipsec VPN Manager"
 msgstr ""
@@ -10597,11 +10698,11 @@
 msgstr ""
 
 #: ../menu-data/l2tp-ipsec-vpn:L2tpIPsecVpn-Applet.desktop.in.h:1
-msgid "Control your L2TP IPsec VPN connections"
+msgid "L2TP Ipsec VPN Applet"
 msgstr ""
 
 #: ../menu-data/l2tp-ipsec-vpn:L2tpIPsecVpn-Applet.desktop.in.h:2
-msgid "L2TP Ipsec VPN Applet"
+msgid "Control your L2TP IPsec VPN connections"
 msgstr ""
 
 #: ../menu-data/laby:laby.desktop.in.h:1
@@ -10621,39 +10722,39 @@
 msgstr "Cartographier vos idées"
 
 #: ../menu-data/laditools:ladiconf.desktop.in.h:1
-msgid "JACK and LASH control application configuration"
-msgstr ""
-
-#: ../menu-data/laditools:ladiconf.desktop.in.h:2
 msgid "Linux Audio Configuration"
 msgstr "Configuration du son sous Linux"
 
-#: ../menu-data/laditools:laditray.desktop.in.h:1
-msgid "JACK and LASH control tray application"
+#: ../menu-data/laditools:ladiconf.desktop.in.h:2
+msgid "JACK and LASH control application configuration"
 msgstr ""
 
-#: ../menu-data/laditools:laditray.desktop.in.h:2
+#: ../menu-data/laditools:laditray.desktop.in.h:1
 msgid "LADITray"
 msgstr "LADITray"
 
-#: ../menu-data/landell:landell.desktop.in.h:1
-msgid "Audio and video streams manager"
-msgstr "Gestionnaire de flux audio et vidéo"
+#: ../menu-data/laditools:laditray.desktop.in.h:2
+msgid "JACK and LASH control tray application"
+msgstr ""
 
-#: ../menu-data/landell:landell.desktop.in.h:2
+#: ../menu-data/landell:landell.desktop.in.h:1
 msgid "Landell"
 msgstr "Landell"
 
+#: ../menu-data/landell:landell.desktop.in.h:2
+msgid "Audio and video streams manager"
+msgstr "Gestionnaire de flux audio et vidéo"
+
 #: ../menu-data/language-selector-gnome:language-selector.desktop.in.h:1
+msgid "Language Support"
+msgstr "Prise en charge linguistique"
+
+#: ../menu-data/language-selector-gnome:language-selector.desktop.in.h:2
 msgid "Configure multiple and native language support on your system"
 msgstr ""
 "Configurer la prise en charge linguistique multiple et native sur votre "
 "système"
 
-#: ../menu-data/language-selector-gnome:language-selector.desktop.in.h:2
-msgid "Language Support"
-msgstr "Prise en charge linguistique"
-
 #: ../menu-data/lastfm:lastfm.desktop.in.h:1
 msgid "Last.fm"
 msgstr "Last.fm"
@@ -10671,37 +10772,37 @@
 msgstr "Permet de gérer les annuaires LDAP"
 
 #: ../menu-data/latexdraw:latexdraw.desktop.in.h:1
-msgid "Graphical editor for PSTricks"
-msgstr "Éditeur graphique pour PSTricks"
-
-#: ../menu-data/latexdraw:latexdraw.desktop.in.h:2
 msgid "LaTeXDraw"
 msgstr "LaTeXDraw"
 
-#: ../menu-data/latexila-data:latexila.desktop.in.h:1
-msgid "Edit LaTeX documents"
-msgstr "Modifier des documents LaTeX"
+#: ../menu-data/latexdraw:latexdraw.desktop.in.h:2
+msgid "Graphical editor for PSTricks"
+msgstr "Éditeur graphique pour PSTricks"
 
-#: ../menu-data/latexila-data:latexila.desktop.in.h:2
+#: ../menu-data/latexila-data:latexila.desktop.in.h:1
 msgid "LaTeXila"
 msgstr "LaTeXila"
 
-#: ../menu-data/lazarus-ide-0.9.30:lazarus-0.9.30.desktop.in.h:1
-msgid "Lazarus (0.9.30)"
-msgstr "Lazarus (0.9.30)"
-
-#: ../menu-data/lazarus-ide-0.9.30:lazarus-0.9.30.desktop.in.h:2
-msgid "Lazarus IDE (0.9.30)"
-msgstr "EDI Lazarus (0.9.30)"
+#: ../menu-data/latexila-data:latexila.desktop.in.h:2
+msgid "Edit LaTeX documents"
+msgstr "Modifier des documents LaTeX"
 
-#: ../menu-data/lbreakout2:lbreakout2.desktop.in.h:1
-msgid "A ball-and-paddle game with nice graphics."
-msgstr "Un jeu de casse-briques au graphisme élégant."
+#: ../menu-data/lazarus-ide-0.9.30.2:lazarus-0.9.30.2.desktop.in.h:1
+msgid "Lazarus (0.9.30.2)"
+msgstr "Lazarus (0.9.30.2)"
+
+#: ../menu-data/lazarus-ide-0.9.30.2:lazarus-0.9.30.2.desktop.in.h:2
+msgid "Lazarus IDE (0.9.30.2)"
+msgstr "EDI Lazarus (0.9.30.2)"
 
-#: ../menu-data/lbreakout2:lbreakout2.desktop.in.h:2
+#: ../menu-data/lbreakout2:lbreakout2.desktop.in.h:1
 msgid "LBreakout2"
 msgstr "LBreakout2"
 
+#: ../menu-data/lbreakout2:lbreakout2.desktop.in.h:2
+msgid "A ball-and-paddle game with nice graphics."
+msgstr "Un jeu de casse-briques au graphisme élégant."
+
 #: ../menu-data/lcrt:lcrt.desktop.in.h:1
 msgid "lcrt"
 msgstr "lcrt"
@@ -10711,34 +10812,34 @@
 msgstr "Leafpad"
 
 #: ../menu-data/lebiniou:lebiniou.desktop.in.h:1
-msgid "Displays images that evolve with sound"
-msgstr "Affiche des images qui évoluent en fonction du son"
-
-#: ../menu-data/lebiniou:lebiniou.desktop.in.h:2
 msgid "Le Biniou"
 msgstr "Le Biniou"
 
-#: ../menu-data/lekhonee-gnome:lekhonee-gnome.desktop.in.h:1
-#: ../menu-data/lekhonee-kde:lekhonee.desktop.in.h:1
-msgid "A Wordpress blog client"
-msgstr "Un client pour bloguer avec Wordpress"
+#: ../menu-data/lebiniou:lebiniou.desktop.in.h:2
+msgid "Displays images that evolve with sound"
+msgstr "Affiche des images qui évoluent en fonction du son"
 
-#: ../menu-data/lekhonee-gnome:lekhonee-gnome.desktop.in.h:2
+#: ../menu-data/lekhonee-gnome:lekhonee-gnome.desktop.in.h:1
 msgid "Lekhonee Gnome"
 msgstr "Lekhonee Gnome"
 
+#: ../menu-data/lekhonee-gnome:lekhonee-gnome.desktop.in.h:2
 #: ../menu-data/lekhonee-kde:lekhonee.desktop.in.h:2
+msgid "A Wordpress blog client"
+msgstr "Un client pour bloguer avec Wordpress"
+
+#: ../menu-data/lekhonee-kde:lekhonee.desktop.in.h:1
 msgid "Lekhonee"
 msgstr "Lekhonee"
 
 #: ../menu-data/lemonpos:kde4__lemon.desktop.in.h:1
-msgid "Lemon Point of sale"
-msgstr "Boutique virtuelle Lemon"
-
-#: ../menu-data/lemonpos:kde4__lemon.desktop.in.h:2
 msgid "lemon"
 msgstr "lemon"
 
+#: ../menu-data/lemonpos:kde4__lemon.desktop.in.h:2
+msgid "Lemon Point of sale"
+msgstr "Boutique virtuelle Lemon"
+
 #: ../menu-data/lernid:lernid.desktop.in.h:1
 msgid "Lernid"
 msgstr "Lernid"
@@ -10768,13 +10869,13 @@
 msgstr "Applications préférées"
 
 #: ../menu-data/librecad:librecad.desktop.in.h:1
-msgid "A professional CAD System"
-msgstr "Un système de CAO professionnel"
-
-#: ../menu-data/librecad:librecad.desktop.in.h:2
 msgid "LibreCAD"
 msgstr "LibreCAD"
 
+#: ../menu-data/librecad:librecad.desktop.in.h:2
+msgid "A professional CAD System"
+msgstr "Un système de CAO professionnel"
+
 #: ../menu-data/libreoffice-base:libreoffice-base.desktop.in.h:1
 msgid "LibreOffice Base"
 msgstr "LibreOffice Base"
@@ -10788,25 +10889,15 @@
 "surveiller et gérer vos information en utilisant « Base », le gestionnaire "
 "de bases de données."
 
-#: ../menu-data/libreoffice-base:libreoffice-base.desktop.in.h:3
-msgid "New Database"
-msgstr "Nouvelle base de données"
-
 #: ../menu-data/libreoffice-calc:libreoffice-calc.desktop.in.h:1
 msgid "LibreOffice Calc"
 msgstr "LibreOffice Calc"
 
 #: ../menu-data/libreoffice-calc:libreoffice-calc.desktop.in.h:2
-msgid "New Spreadsheet"
-msgstr "Nouvelle feuille de calcul"
-
-#: ../menu-data/libreoffice-calc:libreoffice-calc.desktop.in.h:3
 msgid ""
-"Perform calculation, analyze information and manage lists in spreadsheets by "
-"using Calc."
+"Perform calculations, analyze information and manage lists in spreadsheets "
+"by using Calc."
 msgstr ""
-"Réalisez des calculs, analysez des informations et gérez des listes dans des "
-"feuilles de calcul, en utilisant le tableur « Calc »."
 
 #: ../menu-data/libreoffice-common:libreoffice-startcenter.desktop.in.h:1
 msgid "LibreOffice "
@@ -10821,20 +10912,20 @@
 "ODF standardisé et ouvert. Pris en charge par The Document Foundation."
 
 #: ../menu-data/libreoffice-draw:libreoffice-draw.desktop.in.h:1
+msgid "LibreOffice Draw"
+msgstr "LibreOffice Draw"
+
+#: ../menu-data/libreoffice-draw:libreoffice-draw.desktop.in.h:2
 msgid "Create and edit drawings, flow charts, and logos by using Draw."
 msgstr ""
 "Créez et modifiez des dessins, des diagrammes et logos en utilisant "
 "l'application de graphisme vectoriel « Draw »."
 
-#: ../menu-data/libreoffice-draw:libreoffice-draw.desktop.in.h:2
-msgid "LibreOffice Draw"
-msgstr "LibreOffice Draw"
-
-#: ../menu-data/libreoffice-draw:libreoffice-draw.desktop.in.h:3
-msgid "New Drawing"
-msgstr "Nouveau dessin"
-
 #: ../menu-data/libreoffice-impress:libreoffice-impress.desktop.in.h:1
+msgid "LibreOffice Impress"
+msgstr "LibreOffice Impress"
+
+#: ../menu-data/libreoffice-impress:libreoffice-impress.desktop.in.h:2
 msgid ""
 "Create and edit presentations for slideshows, meeting and Web pages by using "
 "Impress."
@@ -10842,29 +10933,21 @@
 "Créez et utilisez des présentations en diaporama, pour vos réunions et pages "
 "Web en utilisant l'application de PréAO « Impress »."
 
-#: ../menu-data/libreoffice-impress:libreoffice-impress.desktop.in.h:2
-msgid "LibreOffice Impress"
-msgstr "LibreOffice Impress"
-
-#: ../menu-data/libreoffice-impress:libreoffice-impress.desktop.in.h:3
-msgid "New Presentation"
-msgstr "Nouvelle présentation"
-
 #: ../menu-data/libreoffice-math:libreoffice-math.desktop.in.h:1
+msgid "LibreOffice Math"
+msgstr "LibreOffice Math"
+
+#: ../menu-data/libreoffice-math:libreoffice-math.desktop.in.h:2
 msgid "Create and edit scientific formulas and equations by using Math."
 msgstr ""
 "Créez et modifiez des formules scientifiques et des équations en utilisant "
 "« Math »."
 
-#: ../menu-data/libreoffice-math:libreoffice-math.desktop.in.h:2
-msgid "LibreOffice Math"
-msgstr "LibreOffice Math"
-
-#: ../menu-data/libreoffice-math:libreoffice-math.desktop.in.h:3
-msgid "New Formula"
-msgstr "Nouvelle Formule"
-
 #: ../menu-data/libreoffice-writer:libreoffice-writer.desktop.in.h:1
+msgid "LibreOffice Writer"
+msgstr "LibreOffice Writer"
+
+#: ../menu-data/libreoffice-writer:libreoffice-writer.desktop.in.h:2
 msgid ""
 "Create and edit text and graphics in letters, reports, documents and Web "
 "pages by using Writer."
@@ -10873,43 +10956,43 @@
 "des documents et des pages Web en utilisant le traitement de texte "
 "« Writer »."
 
-#: ../menu-data/libreoffice-writer:libreoffice-writer.desktop.in.h:2
-msgid "LibreOffice Writer"
-msgstr "LibreOffice Writer"
-
-#: ../menu-data/libreoffice-writer:libreoffice-writer.desktop.in.h:3
-msgid "New Document"
-msgstr "Nouveau document"
-
-#: ../menu-data/licq-plugin-kde4:kde4__licq.desktop.in.h:2
-#: ../menu-data/licq-plugin-qt4:licq.desktop.in.h:2
+#: ../menu-data/licq-plugin-kde4:kde4__licq.desktop.in.h:1
+#: ../menu-data/licq-plugin-qt4:licq.desktop.in.h:1
 msgid "Licq"
 msgstr "Licq"
 
 #: ../menu-data/lifeograph:lifeograph.desktop.in.h:1
-msgid "Keep a private journal of your life"
-msgstr "Journal intime"
-
-#: ../menu-data/lifeograph:lifeograph.desktop.in.h:2
 msgid "Lifeograph"
 msgstr "Lifeograph"
 
+#: ../menu-data/lifeograph:lifeograph.desktop.in.h:2
+msgid "Keep a private journal of your life"
+msgstr "Journal intime"
+
 #: ../menu-data/liferea:liferea.desktop.in.h:1
+msgid "Liferea Feed Reader"
+msgstr "Liferea - lecteur de Flux RSS"
+
+#: ../menu-data/liferea:liferea.desktop.in.h:2
 msgid "Download and view feeds"
 msgstr "Télécharger et lire des flux RSS"
 
-#: ../menu-data/liferea:liferea.desktop.in.h:2
-msgid "Liferea Feed Reader"
-msgstr "Liferea - lecteur de Flux RSS"
+#: ../menu-data/lightsoff:lightsoff.desktop.in.h:1
+msgid "Lights Off"
+msgstr "Lights Off"
+
+#: ../menu-data/lightsoff:lightsoff.desktop.in.h:2
+msgid "Turn off all the lights"
+msgstr "Éteindre toutes les lumières"
 
 #: ../menu-data/lightspark:lightspark.desktop.in.h:1
-msgid "An alternative flash player"
-msgstr "Un lecteur Flash alternatif"
-
-#: ../menu-data/lightspark:lightspark.desktop.in.h:2
 msgid "Lightspark"
 msgstr "Lightspark"
 
+#: ../menu-data/lightspark:lightspark.desktop.in.h:2
+msgid "An alternative flash player"
+msgstr "Un lecteur Flash alternatif"
+
 #: ../menu-data/lightyears:lightyears.desktop.in.h:1
 msgid "20.000 Light Years Into Space"
 msgstr "20.000 Light Years Into Space"
@@ -10945,15 +11028,15 @@
 "de l'électricité, etc."
 
 #: ../menu-data/lingot:lingot.desktop.in.h:1
+msgid "Lingot"
+msgstr "Lingot"
+
+#: ../menu-data/lingot:lingot.desktop.in.h:2
 msgid "LINGOT Is Not a Guitar-Only Tuner"
 msgstr ""
 "LINGOT Is Not a Guitar-Only Tuner (Lingot n'est pas seulement un accordeur "
 "de guitare)"
 
-#: ../menu-data/lingot:lingot.desktop.in.h:2
-msgid "Lingot"
-msgstr "Lingot"
-
 #: ../menu-data/links2:links2.desktop.in.h:1
 msgid "Links 2"
 msgstr "Links 2"
@@ -10970,7 +11053,7 @@
 msgid "Linphone is a web-phone"
 msgstr "Linphone est un outil de téléphonie IP"
 
-#: ../menu-data/linpsk:linpsk.desktop.in.h:2
+#: ../menu-data/linpsk:linpsk.desktop.in.h:1
 msgid "Linpsk"
 msgstr "Linpsk"
 
@@ -10991,21 +11074,21 @@
 msgstr "Jeu de piano"
 
 #: ../menu-data/linuxdcpp:linuxdcpp.desktop.in.h:1
-msgid "A file-sharing client for the Direct Connect network"
-msgstr "Un client de partage de fichiers pour le réseau Direct Connect"
-
-#: ../menu-data/linuxdcpp:linuxdcpp.desktop.in.h:2
 msgid "LinuxDC++"
 msgstr "LinuxDC++"
 
-#: ../menu-data/liquidwar:liquidwar.desktop.in.h:1
-msgid "A unique multiplayer wargame"
-msgstr "Un jeu de guerre multi joueurs"
+#: ../menu-data/linuxdcpp:linuxdcpp.desktop.in.h:2
+msgid "A file-sharing client for the Direct Connect network"
+msgstr "Un client de partage de fichiers pour le réseau Direct Connect"
 
-#: ../menu-data/liquidwar:liquidwar.desktop.in.h:2
+#: ../menu-data/liquidwar:liquidwar.desktop.in.h:1
 msgid "Liquid War"
 msgstr "Liquid War"
 
+#: ../menu-data/liquidwar:liquidwar.desktop.in.h:2
+msgid "A unique multiplayer wargame"
+msgstr "Un jeu de guerre multi joueurs"
+
 #: ../menu-data/listen:listen.desktop.in.h:1
 msgid "Listen Music Player"
 msgstr "Lecteur audio Listen"
@@ -11015,29 +11098,29 @@
 msgstr "Écouter, parcourir ou éditer votre collection de musique"
 
 #: ../menu-data/literki:literki.desktop.in.h:1
-msgid "Hacker's keyboard"
-msgstr "Le clavier des hackers"
-
-#: ../menu-data/literki:literki.desktop.in.h:2
 msgid "Literki"
 msgstr "Literki"
 
-#: ../menu-data/littlewizard:littlewizard.desktop.in.h:1
-msgid "Development environment for children"
-msgstr "Environnement de développement pour les enfants"
+#: ../menu-data/literki:literki.desktop.in.h:2
+msgid "Hacker's keyboard"
+msgstr "Le clavier des hackers"
 
-#: ../menu-data/littlewizard:littlewizard.desktop.in.h:2
+#: ../menu-data/littlewizard:littlewizard.desktop.in.h:1
 msgid "Little Wizard"
 msgstr "Little Wizard"
 
-#: ../menu-data/live-magic:live-magic.desktop.in.h:1
-msgid "Create Debian Live systems (LiveCDs, etc.)"
-msgstr "Créer des systèmes Debian « Live » (LiveCD, etc.)"
+#: ../menu-data/littlewizard:littlewizard.desktop.in.h:2
+msgid "Development environment for children"
+msgstr "Environnement de développement pour les enfants"
 
-#: ../menu-data/live-magic:live-magic.desktop.in.h:2
+#: ../menu-data/live-magic:live-magic.desktop.in.h:1
 msgid "Live Magic"
 msgstr "Live Magic"
 
+#: ../menu-data/live-magic:live-magic.desktop.in.h:2
+msgid "Create Debian Live systems (LiveCDs, etc.)"
+msgstr "Créer des systèmes Debian « Live » (LiveCD, etc.)"
+
 #: ../menu-data/livemix:livemix.desktop.in.h:1
 msgid "LiveMix - Live Mixer"
 msgstr "LiveMix - Table de mixage en direct"
@@ -11055,37 +11138,37 @@
 msgstr "Éditeur vidéo/outil VJ"
 
 #: ../menu-data/ll-scope:ll-scope.desktop.in.h:1
-msgid "An oscilloscope DSSI plugin"
-msgstr "Un greffon oscilloscope DSSI"
-
-#: ../menu-data/ll-scope:ll-scope.desktop.in.h:2
 msgid "Oscilloscope"
 msgstr "Oscilloscope"
 
-#: ../menu-data/lletters:lletters.desktop.in.h:1
-msgid "GTK letters-learning game for small children"
-msgstr "Jeu d'apprentissage des lettres pour jeunes enfants (GTK)"
+#: ../menu-data/ll-scope:ll-scope.desktop.in.h:2
+msgid "An oscilloscope DSSI plugin"
+msgstr "Un greffon oscilloscope DSSI"
 
-#: ../menu-data/lletters:lletters.desktop.in.h:2
+#: ../menu-data/lletters:lletters.desktop.in.h:1
 msgid "Linux Letters and Numbers"
 msgstr "Des chiffres et des lettres pour Linux"
 
-#: ../menu-data/llk-linux:llk_linux.desktop.in.h:1
-msgid "Gtk based LianLianKan Game."
-msgstr "Jeu"
+#: ../menu-data/lletters:lletters.desktop.in.h:2
+msgid "GTK letters-learning game for small children"
+msgstr "Jeu d'apprentissage des lettres pour jeunes enfants (GTK)"
 
-#: ../menu-data/llk-linux:llk_linux.desktop.in.h:2
+#: ../menu-data/llk-linux:llk_linux.desktop.in.h:1
 msgid "llk_linux"
 msgstr "llk_linux"
 
-#: ../menu-data/lmarbles:lmarbles.desktop.in.h:1
-msgid "Build figures out of colored marbles"
-msgstr "Reproduisez des combinaisons de billes colorées"
+#: ../menu-data/llk-linux:llk_linux.desktop.in.h:2
+msgid "Gtk based LianLianKan Game."
+msgstr "Jeu"
 
-#: ../menu-data/lmarbles:lmarbles.desktop.in.h:2
+#: ../menu-data/lmarbles:lmarbles.desktop.in.h:1
 msgid "LMarbles"
 msgstr "LMarbles"
 
+#: ../menu-data/lmarbles:lmarbles.desktop.in.h:2
+msgid "Build figures out of colored marbles"
+msgstr "Reproduisez des combinaisons de billes colorées"
+
 #: ../menu-data/lmemory:lmemory.desktop.in.h:1
 msgid "LMemory"
 msgstr "LMemory"
@@ -11103,21 +11186,21 @@
 msgstr "Gérer votre blog"
 
 #: ../menu-data/lokalize:kde4__lokalize.desktop.in.h:1
-msgid "Computer-Aided Translation System"
-msgstr "Système de traduction assistée par ordinateur"
-
-#: ../menu-data/lokalize:kde4__lokalize.desktop.in.h:2
 msgid "Lokalize"
 msgstr "Lokalize"
 
-#: ../menu-data/lombard:lombard.desktop.in.h:1
-msgid "Create and edit movies"
-msgstr "Créer et monter des vidéos"
+#: ../menu-data/lokalize:kde4__lokalize.desktop.in.h:2
+msgid "Computer-Aided Translation System"
+msgstr "Système de traduction assistée par ordinateur"
 
-#: ../menu-data/lombard:lombard.desktop.in.h:2
+#: ../menu-data/lombard:lombard.desktop.in.h:1
 msgid "Lombard Video Editor"
 msgstr "Editeur Vidéo Lombard"
 
+#: ../menu-data/lombard:lombard.desktop.in.h:2
+msgid "Create and edit movies"
+msgstr "Créer et monter des vidéos"
+
 #: ../menu-data/londonlaw:londonlaw.desktop.in.h:1
 msgid "London Law"
 msgstr "London Law"
@@ -11135,45 +11218,45 @@
 msgstr "Outil d'analyse de vidéos sportives pour entraineurs"
 
 #: ../menu-data/loqui:loqui.desktop.in.h:1
-msgid "IRC client"
-msgstr "Client IRC"
-
-#: ../menu-data/loqui:loqui.desktop.in.h:2
 msgid "Loqui"
 msgstr "Loqui"
 
-#: ../menu-data/lostirc:lostirc.desktop.in.h:1
-msgid "Chat on IRC-networks"
-msgstr "Discuter en direct sur les réseaux IRC"
+#: ../menu-data/loqui:loqui.desktop.in.h:2
+msgid "IRC client"
+msgstr "Client IRC"
 
-#: ../menu-data/lostirc:lostirc.desktop.in.h:2
+#: ../menu-data/lostirc:lostirc.desktop.in.h:1
 msgid "LostIRC"
 msgstr "LostIRC"
 
-#: ../menu-data/lottanzb:lottanzb.desktop.in.h:1
-msgid "Download from the Usenet with the help of NZB files"
-msgstr "Télécharge depuis Usenet avec des fichiers NZB"
+#: ../menu-data/lostirc:lostirc.desktop.in.h:2
+msgid "Chat on IRC-networks"
+msgstr "Discuter en direct sur les réseaux IRC"
 
-#: ../menu-data/lottanzb:lottanzb.desktop.in.h:2
+#: ../menu-data/lottanzb:lottanzb.desktop.in.h:1
 msgid "LottaNZB Usenet Downloader"
 msgstr "LottaNZB : outil de téléchargement pour Usenet"
 
-#: ../menu-data/love:love.desktop.in.h:1
-msgid "Games development framework in lua"
-msgstr "Infrastructure de développement de jeux en Lua"
+#: ../menu-data/lottanzb:lottanzb.desktop.in.h:2
+msgid "Download from the Usenet with the help of NZB files"
+msgstr "Télécharge depuis Usenet avec des fichiers NZB"
 
-#: ../menu-data/love:love.desktop.in.h:2
+#: ../menu-data/love:love.desktop.in.h:1
 msgid "LÖVE"
 msgstr "LÖVE"
 
-#: ../menu-data/lprof:lprof.desktop.in.h:1
-msgid "Hardware ICC Profiler"
-msgstr "Créateur de profils ICC matériels"
+#: ../menu-data/love:love.desktop.in.h:2
+msgid "Games development framework in lua"
+msgstr "Infrastructure de développement de jeux en Lua"
 
-#: ../menu-data/lprof:lprof.desktop.in.h:2
+#: ../menu-data/lprof:lprof.desktop.in.h:1
 msgid "LProf"
 msgstr "LProf"
 
+#: ../menu-data/lprof:lprof.desktop.in.h:2
+msgid "Hardware ICC Profiler"
+msgstr "Créateur de profils ICC matériels"
+
 #: ../menu-data/lshw-gtk:lshw-gtk.desktop.in.h:1
 msgid "Hardware Lister"
 msgstr "Liste du matériel"
@@ -11183,13 +11266,13 @@
 msgstr "Fournit des informations sur le matériel"
 
 #: ../menu-data/lskat:kde4__lskat.desktop.in.h:1
-msgid "Card Game"
-msgstr "Jeu de cartes"
-
-#: ../menu-data/lskat:kde4__lskat.desktop.in.h:2
 msgid "LSkat"
 msgstr "LSkat"
 
+#: ../menu-data/lskat:kde4__lskat.desktop.in.h:2
+msgid "Card Game"
+msgstr "Jeu de cartes"
+
 #: ../menu-data/ltris:ltris.desktop.in.h:1
 msgid "LTris"
 msgstr "LTris"
@@ -11207,31 +11290,42 @@
 msgstr "Démarrer une session LTSP LiveCD"
 
 #: ../menu-data/luakit:luakit.desktop.in.h:1
+msgid "Luakit"
+msgstr "Luakit"
+
+#: ../menu-data/luakit:luakit.desktop.in.h:2
 msgid "Fast, small, webkit based micro-browser extensible by Lua"
 msgstr ""
 "Micro-navigateur rapide, léger, utilisant Webkit et extensible avec Lua"
 
-#: ../menu-data/luakit:luakit.desktop.in.h:2
-msgid "Luakit"
-msgstr "Luakit"
+#: ../menu-data/lubuntu-software-center:lubuntu-software-center.desktop.in.h:1
+msgid "Lubuntu Software Center"
+msgstr "Logithèque Lubuntu"
 
-#: ../menu-data/luciole:luciole.desktop.in.h:1
-msgid "Image Per Image capture tool for making animation movies."
-msgstr "Outil de capture image par image pour faire des films d'animation."
+#: ../menu-data/lubuntu-software-center:lubuntu-software-center.desktop.in.h:2
+#: ../menu-data/software-center:ubuntu-software-center.desktop.in.h:2
+msgid "Lets you choose from thousands of applications available for Ubuntu"
+msgstr ""
+"Vous permet de choisir parmi des milliers d'applications disponibles pour "
+"Ubuntu"
 
-#: ../menu-data/luciole:luciole.desktop.in.h:2
+#: ../menu-data/luciole:luciole.desktop.in.h:1
 msgid "Luciole"
 msgstr "Luciole"
 
+#: ../menu-data/luciole:luciole.desktop.in.h:2
+msgid "Image Per Image capture tool for making animation movies."
+msgstr "Outil de capture image par image pour faire des films d'animation."
+
 #: ../menu-data/luckybackup:luckybackup.desktop.in.h:1
+msgid "luckyBackup"
+msgstr "luckyBackup"
+
+#: ../menu-data/luckybackup:luckybackup.desktop.in.h:2
 msgid "Backup & sync your data with the power of rsync"
 msgstr ""
 "Sauvegarde et synchronisation de vos données grâce à la puissance de rsync"
 
-#: ../menu-data/luckybackup:luckybackup.desktop.in.h:2
-msgid "luckyBackup"
-msgstr "luckyBackup"
-
 #: ../menu-data/lugaru:lugaru.desktop.in.h:1
 msgid "Lugaru"
 msgstr "Lugaru"
@@ -11261,13 +11355,13 @@
 msgstr "Page Web pour modifier les mots de passe des utilisateurs LDAP"
 
 #: ../menu-data/lxinput:lxinput.desktop.in.h:1
-msgid "Configure keyboard, mouse, and other input devices"
-msgstr "Configurer clavier, souris et autres périphériques d'entrées"
-
-#: ../menu-data/lxinput:lxinput.desktop.in.h:2
 msgid "Keyboard and Mouse"
 msgstr "Clavier et Souris"
 
+#: ../menu-data/lxinput:lxinput.desktop.in.h:2
+msgid "Configure keyboard, mouse, and other input devices"
+msgstr "Configurer clavier, souris et autres périphériques d'entrées"
+
 #: ../menu-data/lxkeymap:lxkeymap.desktop.in.h:1
 msgid "Lxkeymap"
 msgstr "Lxkeymap"
@@ -11277,13 +11371,13 @@
 msgstr "Application Lxkeymap"
 
 #: ../menu-data/lxtask:lxtask.desktop.in.h:1
-msgid "Manage running processes"
-msgstr "Gérer les processus actifs"
-
-#: ../menu-data/lxtask:lxtask.desktop.in.h:2
 msgid "Task Manager"
 msgstr "Gestionnaire de tâches"
 
+#: ../menu-data/lxtask:lxtask.desktop.in.h:2
+msgid "Manage running processes"
+msgstr "Gérer les processus actifs"
+
 #: ../menu-data/lybniz:lybniz.desktop.in.h:1
 msgid "Lybniz Graph Plotter"
 msgstr "Traceur de graphes Lybniz"
@@ -11301,13 +11395,13 @@
 msgstr "Outil d'audit de sécurité (super-utilisateur)"
 
 #: ../menu-data/lynkeos.app:Lynkeos.desktop.in.h:1
-msgid "Filtering of astronomical images"
-msgstr "Application de filtres sur des images astronomiques."
-
-#: ../menu-data/lynkeos.app:Lynkeos.desktop.in.h:2
 msgid "Lynkeos Image Processor"
 msgstr "Traitement d'images Lynkeos"
 
+#: ../menu-data/lynkeos.app:Lynkeos.desktop.in.h:2
+msgid "Filtering of astronomical images"
+msgstr "Application de filtres sur des images astronomiques."
+
 #: ../menu-data/lyricue:lyricue.desktop.in.h:1
 msgid "Lyricue"
 msgstr "Lyricue"
@@ -11322,16 +11416,16 @@
 
 #: ../menu-data/lyricue:lyricue_display.desktop.in.h:2
 msgid "The GNU Lyric Display System Display"
-msgstr ""
+msgstr "Le système d'affichage de paroles GNU"
 
 #: ../menu-data/madbomber:madbomber.desktop.in.h:1
-msgid "Catch the Bombs"
-msgstr "Attraper les bombes"
-
-#: ../menu-data/madbomber:madbomber.desktop.in.h:2
 msgid "Mad Bomber"
 msgstr "Mad Bomber"
 
+#: ../menu-data/madbomber:madbomber.desktop.in.h:2
+msgid "Catch the Bombs"
+msgstr "Attraper les bombes"
+
 #: ../menu-data/maelstrom:maelstrom.desktop.in.h:1
 msgid "Maelstrom"
 msgstr "Maelstrom"
@@ -11364,30 +11458,38 @@
 msgid "Play classic Mahjong puzzle game"
 msgstr "Jouer au jeu de Mahjong classique"
 
-#: ../menu-data/mail-notification:mail-notification.desktop.in.h:1
-msgid "Get notified when new mail arrives"
-msgstr "Recevoir une notification quand un nouveau courriel arrive"
+#: ../menu-data/mahjongg:mahjongg.desktop.in.h:1
+msgid "Mahjongg"
+msgstr "Mahjongg"
 
-#: ../menu-data/mail-notification:mail-notification.desktop.in.h:2
+#: ../menu-data/mahjongg:mahjongg.desktop.in.h:2
+msgid "Disassemble a pile of tiles by removing matching pairs"
+msgstr "Défaire un pile de tuiles en enlevant les paires identiques"
+
+#: ../menu-data/mail-notification:mail-notification.desktop.in.h:1
 msgid "Mail Notification"
 msgstr "Notification de nouveau courriel"
 
-#: ../menu-data/mana:mana.desktop.in.h:1
-msgid "A 2D MMORPG client"
-msgstr "Un client MMORPG 2D"
+#: ../menu-data/mail-notification:mail-notification.desktop.in.h:2
+msgid "Get notified when new mail arrives"
+msgstr "Recevoir une notification quand un nouveau courriel arrive"
 
-#: ../menu-data/mana:mana.desktop.in.h:2
+#: ../menu-data/mana:mana.desktop.in.h:1
 msgid "Mana"
 msgstr "Mana"
 
-#: ../menu-data/mandelbulber:mandelbulber.desktop.in.h:1
-msgid "Mandebulber"
-msgstr "Mandebulber"
+#: ../menu-data/mana:mana.desktop.in.h:2
+msgid "A 2D MMORPG client"
+msgstr "Un client MMORPG 2D"
 
-#: ../menu-data/mandelbulber:mandelbulber.desktop.in.h:2
+#: ../menu-data/mandelbulber:mandelbulber.desktop.in.h:1
 msgid "Visit 3D Fractal World"
 msgstr "Visiter le Monde des Fractales en 3D"
 
+#: ../menu-data/mandelbulber:mandelbulber.desktop.in.h:2
+msgid "Mandebulber"
+msgstr "Mandebulber"
+
 #: ../menu-data/mangler:mangler.desktop.in.h:1
 msgid "Mangler"
 msgstr "Mangler"
@@ -11405,21 +11507,29 @@
 msgstr "Partager la souris et le curseur avec d'autres ordinateurs"
 
 #: ../menu-data/marble:kde4__marble.desktop.in.h:1
+msgid "Marble"
+msgstr "Marble"
+
+#: ../menu-data/marble:kde4__marble.desktop.in.h:2
 msgid "Desktop Globe"
 msgstr "Globe terrestre pour le bureau"
 
-#: ../menu-data/marble:kde4__marble.desktop.in.h:2
-msgid "Marble"
-msgstr "Marble"
+#: ../menu-data/massif-visualizer:kde4__massif-visualizer.desktop.in.h:1
+msgid "Massif-Visualizer"
+msgstr "Massif-Visualizer"
 
-#: ../menu-data/massxpert:massxpert.desktop.in.h:1
-msgid "Bio-polymer mass spectrometry software"
-msgstr "Logiciel de spectrométrie de masse des bio-polymères"
+#: ../menu-data/massif-visualizer:kde4__massif-visualizer.desktop.in.h:2
+msgid "Visualization of Memory Profiling Data"
+msgstr ""
 
-#: ../menu-data/massxpert:massxpert.desktop.in.h:2
+#: ../menu-data/massxpert:massxpert.desktop.in.h:1
 msgid "massXpert"
 msgstr "massXpert"
 
+#: ../menu-data/massxpert:massxpert.desktop.in.h:2
+msgid "Bio-polymer mass spectrometry software"
+msgstr "Logiciel de spectrométrie de masse des bio-polymères"
+
 #: ../menu-data/matchbox-keyboard:inputmethods__matchbox-keyboard.desktop.in.h:1
 msgid "Keyboard"
 msgstr "Clavier"
@@ -11429,45 +11539,45 @@
 msgstr "Clavier virtuel"
 
 #: ../menu-data/mathomatic:mathomatic.desktop.in.h:1
-msgid "Do symbolic mathematics and quick calculations"
-msgstr "Effectuer des mathématiques symboliques et des calculs rapides"
-
-#: ../menu-data/mathomatic:mathomatic.desktop.in.h:2
 msgid "Mathomatic"
 msgstr "Mathomatic"
 
-#: ../menu-data/mathwar:MathWar.desktop.in.h:1
-msgid "A simple math game for kids"
-msgstr "Un jeu mathématique simple pour les enfants"
+#: ../menu-data/mathomatic:mathomatic.desktop.in.h:2
+msgid "Do symbolic mathematics and quick calculations"
+msgstr "Effectuer des mathématiques symboliques et des calculs rapides"
 
-#: ../menu-data/mathwar:MathWar.desktop.in.h:2
+#: ../menu-data/mathwar:MathWar.desktop.in.h:1
 msgid "MathWar"
 msgstr "MathWar"
 
+#: ../menu-data/mathwar:MathWar.desktop.in.h:2
+msgid "A simple math game for kids"
+msgstr "Un jeu mathématique simple pour les enfants"
+
 #: ../menu-data/matlab-support:matlab.desktop.in.h:1
 msgid "MATLAB"
 msgstr "MATLAB"
 
 #: ../menu-data/matlab-support:matlab.desktop.in.h:2
 msgid "Scientific computing environment"
-msgstr ""
+msgstr "Environnement pour l'informatique scientifique"
 
 #: ../menu-data/mc:mc.desktop.in.h:1
-msgid "File manager"
-msgstr "Gestionnaire de fichiers"
-
-#: ../menu-data/mc:mc.desktop.in.h:2
 msgid "Midnight Commander"
 msgstr "Midnight Commander"
 
-#: ../menu-data/mcrl2:mcrl2-gui.desktop.in.h:1
-msgid "Graphical front end for mCRL2 toolset"
-msgstr "Interface graphique pour l'ensemble d'outils mCRL2"
+#: ../menu-data/mc:mc.desktop.in.h:2
+msgid "File manager"
+msgstr "Gestionnaire de fichiers"
 
-#: ../menu-data/mcrl2:mcrl2-gui.desktop.in.h:2
+#: ../menu-data/mcrl2:mcrl2-gui.desktop.in.h:1
 msgid "mCRL2"
 msgstr "mCRL2"
 
+#: ../menu-data/mcrl2:mcrl2-gui.desktop.in.h:2
+msgid "Graphical front end for mCRL2 toolset"
+msgstr "Interface graphique pour l'ensemble d'outils mCRL2"
+
 #: ../menu-data/mcu8051ide:mcu8051ide.desktop.in.h:1
 msgid "Graphical IDE for MCS-51 based microcontrollers"
 msgstr "EDI graphique pour micro-contrôleurs à base de MCS-51"
@@ -11485,12 +11595,20 @@
 msgstr "Voir et exporter des bases de données Microsoft Access"
 
 #: ../menu-data/me-tv:me-tv.desktop.in.h:1
+msgid "Me TV"
+msgstr "Me TV"
+
+#: ../menu-data/me-tv:me-tv.desktop.in.h:2
 msgid "A digital television (DVB) viewer for GNOME"
 msgstr "Un poste de télévision numérique (TNT) pour GNOME"
 
-#: ../menu-data/me-tv:me-tv.desktop.in.h:2
-msgid "Me TV"
-msgstr "Me TV"
+#: ../menu-data/mediainfo-gui:mediainfo-gui.desktop.in.h:1
+msgid "MediaInfo"
+msgstr "MediaInfo"
+
+#: ../menu-data/mediainfo-gui:mediainfo-gui.desktop.in.h:2
+msgid "Supplies technical and tag information about a video or audio file"
+msgstr ""
 
 #: ../menu-data/mediathekview:mediathekview.desktop.in.h:1
 msgid "MediathekView"
@@ -11509,46 +11627,54 @@
 msgstr "Interface utilisateur web UPnP MediaServer MediaTomb"
 
 #: ../menu-data/medit:medit.desktop.in.h:1
+msgid "medit"
+msgstr "medit"
+
+#: ../menu-data/medit:medit.desktop.in.h:2
 #: ../menu-data/nedit:nedit.desktop.in.h:2
 msgid "Text editor"
 msgstr "Éditeur de texte"
 
-#: ../menu-data/medit:medit.desktop.in.h:2
-msgid "medit"
-msgstr "medit"
-
 #: ../menu-data/mednafen:mednafen.desktop.in.h:1
 msgid "Mednafen"
 msgstr "Mednafen"
 
 #: ../menu-data/mednafen:mednafen.desktop.in.h:2
 msgid "Multi-system video game emulator"
-msgstr ""
+msgstr "Emulateur de plusieurs systèmes de jeu vidéo"
 
-#: ../menu-data/meld:meld.desktop.in.h:1
-msgid "Compare and merge your files"
-msgstr "Comparer et fusionner vos fichiers"
+#: ../menu-data/megaglest:megaglest.desktop.in.h:1
+msgid "A real time strategy game."
+msgstr "Un jeu de stratégie en temps réel"
+
+#: ../menu-data/megaglest:megaglest.desktop.in.h:2
+msgid "MegaGlest"
+msgstr "MegaGlest"
 
-#: ../menu-data/meld:meld.desktop.in.h:2
+#: ../menu-data/meld:meld.desktop.in.h:1
 msgid "Meld Diff Viewer"
 msgstr "Afficheur de diff Meld"
 
-#: ../menu-data/melting-gui:melting-gui.desktop.in.h:1
-msgid "\"Computes the melting temperature for a nucleic acid duplex.\""
-msgstr "« Calcule la température d'assemblage de brins d'acide nucléique »"
+#: ../menu-data/meld:meld.desktop.in.h:2
+msgid "Compare and merge your files"
+msgstr "Comparer et fusionner vos fichiers"
 
-#: ../menu-data/melting-gui:melting-gui.desktop.in.h:2
+#: ../menu-data/melting-gui:melting-gui.desktop.in.h:1
 msgid "Melting"
 msgstr "Melting"
 
-#: ../menu-data/memaker:memaker.desktop.in.h:1
-msgid "Builds avatars for all your applications."
-msgstr "Créer des avatars pour toutes vos applications"
+#: ../menu-data/melting-gui:melting-gui.desktop.in.h:2
+msgid "\"Computes the melting temperature for a nucleic acid duplex.\""
+msgstr "« Calcule la température d'assemblage de brins d'acide nucléique »"
 
-#: ../menu-data/memaker:memaker.desktop.in.h:2
+#: ../menu-data/memaker:memaker.desktop.in.h:1
 msgid "MeMaker"
 msgstr "MeMaker"
 
+#: ../menu-data/memaker:memaker.desktop.in.h:2
+msgid "Builds avatars for all your applications."
+msgstr "Créer des avatars pour toutes vos applications"
+
 #: ../menu-data/meritous:meritous.desktop.in.h:1
 msgid "Meritous"
 msgstr "Meritous"
@@ -11577,86 +11703,98 @@
 msgid "Metacity"
 msgstr "Metacity"
 
-#: ../menu-data/meterbridge:meterbridge.desktop.in.h:2
+#: ../menu-data/meterbridge:meterbridge.desktop.in.h:1
 msgid "Meterbridge"
 msgstr "Meterbridge"
 
 #: ../menu-data/mgm:mgm.desktop.in.h:1
-msgid "A highly configurable, very gaudy system load meter"
-msgstr "Un moniteur de charge configurable et très coloré"
-
-#: ../menu-data/mgm:mgm.desktop.in.h:2
 msgid "MGM System Monitor"
 msgstr "Surveillance système MGM"
 
-#: ../menu-data/mhwaveedit:mhwaveedit.desktop.in.h:1
-msgid "Record, play, edit and convert sound files"
-msgstr "Enregistrer, jouer, modifier et convertir des fichiers sons"
+#: ../menu-data/mgm:mgm.desktop.in.h:2
+msgid "A highly configurable, very gaudy system load meter"
+msgstr "Un moniteur de charge configurable et très coloré"
 
-#: ../menu-data/mhwaveedit:mhwaveedit.desktop.in.h:2
+#: ../menu-data/mhwaveedit:mhwaveedit.desktop.in.h:1
 msgid "mhWaveEdit"
 msgstr "mhWaveEdit"
 
-#: ../menu-data/micropolis:micropolis.desktop.in.h:1
-msgid "A real-time city management simulator"
-msgstr "Un simulateur de gestion de ville en temps réel"
+#: ../menu-data/mhwaveedit:mhwaveedit.desktop.in.h:2
+msgid "Record, play, edit and convert sound files"
+msgstr "Enregistrer, jouer, modifier et convertir des fichiers sons"
 
-#: ../menu-data/micropolis:micropolis.desktop.in.h:2
+#: ../menu-data/micropolis:micropolis.desktop.in.h:1
 msgid "Micropolis"
 msgstr "Micropolis"
 
+#: ../menu-data/micropolis:micropolis.desktop.in.h:2
+msgid "A real-time city management simulator"
+msgstr "Un simulateur de gestion de ville en temps réel"
+
 #: ../menu-data/midori:midori-private.desktop.in.h:1
-msgid "Open a new private browsing window"
-msgstr "Ouvrir une nouvelle fenêtre de navigation privée"
+msgid "Midori Private Browsing"
+msgstr "Navigation Privée Midori"
 
 #: ../menu-data/midori:midori-private.desktop.in.h:2
-msgid "Private Browsing"
-msgstr "Navigation privée"
+msgid "Open a new private browsing window"
+msgstr "Ouvrir une nouvelle fenêtre de navigation privée"
 
 #: ../menu-data/midori:midori.desktop.in.h:1
-msgid "Lightweight web browser"
-msgstr "Navigateur Web léger"
-
-#: ../menu-data/midori:midori.desktop.in.h:2
 msgid "Midori"
 msgstr "Midori"
 
-#: ../menu-data/midori:midori.desktop.in.h:3
-msgid "New P_rivate Browsing Window"
-msgstr "Nouvelle fenêtre de navigation p_rivée"
+#: ../menu-data/midori:midori.desktop.in.h:2
+msgid "Lightweight web browser"
+msgstr "Navigateur Web léger"
 
-#: ../menu-data/midori:midori.desktop.in.h:4
+#: ../menu-data/midori:midori.desktop.in.h:3
 msgid "New _Tab"
 msgstr "Nouvel ongle_t"
 
-#: ../menu-data/midori:midori.desktop.in.h:5
+#: ../menu-data/midori:midori.desktop.in.h:4
 msgid "New _Window"
 msgstr "_Nouvelle fenêtre"
 
-#: ../menu-data/milkytracker:milkytracker.desktop.in.h:1
-msgid "Fasttracker 2 Clone"
-msgstr "Clone de Fasttracker 2"
+#: ../menu-data/midori:midori.desktop.in.h:5
+msgid "New P_rivate Browsing Window"
+msgstr "Nouvelle fenêtre de navigation p_rivée"
 
-#: ../menu-data/milkytracker:milkytracker.desktop.in.h:2
+#: ../menu-data/milkytracker:milkytracker.desktop.in.h:1
 msgid "MilkyTracker"
 msgstr "MilkyTracker"
 
+#: ../menu-data/milkytracker:milkytracker.desktop.in.h:2
+msgid "Fasttracker 2 Clone"
+msgstr "Clone de Fasttracker 2"
+
 #: ../menu-data/milkytracker:milkytracker.desktop.in.h:3
 msgid "MilkyTracker (play song)"
 msgstr "MilkyTracker (lecteur audio)"
 
 #: ../menu-data/minbar:minbar.desktop.in.h:1
+msgid "Minbar Prayer Times"
+msgstr "Horaires des prières Minbar"
+
+#: ../menu-data/minbar:minbar.desktop.in.h:2
 msgid "Islamic prayer times"
 msgstr "Heures des prières pour les musulmans"
 
-#: ../menu-data/minbar:minbar.desktop.in.h:2
-msgid "Minbar Prayer Times"
-msgstr "Horaires des prières Minbar"
+#: ../menu-data/mined:mined.desktop.in.h:1
+msgid "MinEd"
+msgstr "MinEd"
 
-#: ../menu-data/mines.app:Mines.desktop.in.h:1
+#: ../menu-data/mines.app:Mines.desktop.in.h:2
 msgid "GNUstep minesweeper game"
 msgstr "Jeu de démineur GNUstep"
 
+#: ../menu-data/minetest:minetest.desktop.in.h:1
+msgid "Minetest"
+msgstr "Minetest"
+
+#: ../menu-data/minetest:minetest.desktop.in.h:2
+msgid "InfiniMiner/Minecraft-inspired open game world"
+msgstr ""
+
 #: ../menu-data/minirok:kde4__minirok.desktop.in.h:1
 msgid "Minirok"
 msgstr "Minirok"
@@ -11669,75 +11807,67 @@
 msgid "Watch YouTube videos"
 msgstr "Regarder les vidéos YouTube"
 
-#: ../menu-data/minitunes:minitunes.desktop.in.h:1
-msgid "Minitunes"
-msgstr "Minitunes"
-
-#: ../menu-data/minitunes:minitunes.desktop.in.h:2
-msgid "Play your music collection"
-msgstr "Jouer votre collection de musique"
-
 #: ../menu-data/mirage:mirage.desktop.in.h:1
-msgid "A fast GTK+ Image Viewer"
-msgstr "Un visionneuse d'image rapide GTK+"
-
-#: ../menu-data/mirage:mirage.desktop.in.h:2
 msgid "Mirage"
 msgstr "Mirage"
 
+#: ../menu-data/mirage:mirage.desktop.in.h:2
+msgid "A fast GTK+ Image Viewer"
+msgstr "Un visionneuse d'image rapide GTK+"
+
 #: ../menu-data/miro:miro.desktop.in.h:1
+msgid "Miro music and video player"
+msgstr "Miro - Lecteur libre et gratuit de musique et de vidéos"
+
+#: ../menu-data/miro:miro.desktop.in.h:2
 msgid ""
 "Fully featured video and music player, podcast client, and bittorrent client"
 msgstr "Lecteur de vidéo et  de musique,  client de podcast et bittorrent"
 
-#: ../menu-data/miro:miro.desktop.in.h:2
-msgid "Miro music and video player"
-msgstr "Miro - Lecteur libre et gratuit de musique et de vidéos"
-
 #: ../menu-data/mirrormagic:mirrormagic.desktop.in.h:1
 msgid "MirrorMagic"
 msgstr "MirrorMagic"
 
 #: ../menu-data/mistelix:mistelix.desktop.in.h:1
-msgid "Author DVDs and slideshows"
-msgstr "Créer des DVD vidéo et des diaporamas"
-
-#: ../menu-data/mistelix:mistelix.desktop.in.h:2
 msgid "Mistelix"
 msgstr "Mistelix"
 
-#: ../menu-data/mixxx:mixxx.desktop.in.h:1
-msgid "A digital DJ interface"
-msgstr "Une interface pour DJ numérique"
+#: ../menu-data/mistelix:mistelix.desktop.in.h:2
+msgid "Author DVDs and slideshows"
+msgstr "Créer des DVD vidéo et des diaporamas"
 
-#: ../menu-data/mixxx:mixxx.desktop.in.h:2
+#: ../menu-data/mixxx:mixxx.desktop.in.h:1
 msgid "Mixxx"
 msgstr "Mixxx"
 
-#: ../menu-data/mkvtoolnix-gui:mkvinfo.desktop.in.h:1
-msgid "Show information about MKV files"
-msgstr "Affiche les informations à propos des fichiers MKV"
+#: ../menu-data/mixxx:mixxx.desktop.in.h:2
+msgid "A digital DJ interface"
+msgstr "Une interface pour DJ numérique"
 
-#: ../menu-data/mkvtoolnix-gui:mkvinfo.desktop.in.h:2
+#: ../menu-data/mkvtoolnix-gui:mkvinfo.desktop.in.h:1
 msgid "mkvinfo"
 msgstr "mkvinfo"
 
-#: ../menu-data/mkvtoolnix-gui:mkvmergeGUI.desktop.in.h:1
-msgid "MKV files creator"
-msgstr "Créateur de fichiers MKV"
+#: ../menu-data/mkvtoolnix-gui:mkvinfo.desktop.in.h:2
+msgid "Show information about MKV files"
+msgstr "Affiche les informations à propos des fichiers MKV"
 
-#: ../menu-data/mkvtoolnix-gui:mkvmergeGUI.desktop.in.h:2
+#: ../menu-data/mkvtoolnix-gui:mkvmergeGUI.desktop.in.h:1
 msgid "mkvmerge GUI"
 msgstr "Interface graphique pour mkvmerge"
 
-#: ../menu-data/mldonkey-gui:mldonkey-gui.desktop.in.h:1
-msgid "Graphical frontend for MLDonkey"
-msgstr "Interface graphique pour MLDonkey"
+#: ../menu-data/mkvtoolnix-gui:mkvmergeGUI.desktop.in.h:2
+msgid "MKV files creator"
+msgstr "Créateur de fichiers MKV"
 
-#: ../menu-data/mldonkey-gui:mldonkey-gui.desktop.in.h:2
+#: ../menu-data/mldonkey-gui:mldonkey-gui.desktop.in.h:1
 msgid "MLDonkey"
 msgstr "MLDonkey"
 
+#: ../menu-data/mldonkey-gui:mldonkey-gui.desktop.in.h:2
+msgid "Graphical frontend for MLDonkey"
+msgstr "Interface graphique pour MLDonkey"
+
 #: ../menu-data/mlterm-common:mlterm.desktop.in.h:1
 msgid "Multilingual Terminal"
 msgstr "Terminal multilingue"
@@ -11747,57 +11877,57 @@
 msgstr "Utiliser la ligne de commande multilingue"
 
 #: ../menu-data/mm3d:mm3d.desktop.in.h:1
-msgid "Create and edit 3D models and animations"
-msgstr "Créer et modifier des objets ou des animations en 3D"
-
-#: ../menu-data/mm3d:mm3d.desktop.in.h:2
 msgid "Misfit Model 3D"
 msgstr "Misfit Model 3D"
 
+#: ../menu-data/mm3d:mm3d.desktop.in.h:2
+msgid "Create and edit 3D models and animations"
+msgstr "Créer et modifier des objets ou des animations en 3D"
+
 #: ../menu-data/mmass:mmass.desktop.in.h:1
+msgid "mMass"
+msgstr "mMass"
+
+#: ../menu-data/mmass:mmass.desktop.in.h:2
 msgid "Mass spectrum viewer and data analysis proteomics tool"
 msgstr ""
 "Afficheur pour spectromètre de masse et outil d'analyse de données de "
 "protéomiques"
 
-#: ../menu-data/mmass:mmass.desktop.in.h:2
-msgid "mMass"
-msgstr "mMass"
-
 #: ../menu-data/mmpong-gl:mmpong-gl.desktop.in.h:1
-msgid "massively multiplayer pong game"
-msgstr "jeu pong massivement multijoueur"
-
-#: ../menu-data/mmpong-gl:mmpong-gl.desktop.in.h:2
 msgid "mmpong-gl"
 msgstr "mmpong-gl"
 
+#: ../menu-data/mmpong-gl:mmpong-gl.desktop.in.h:2
+msgid "massively multiplayer pong game"
+msgstr "jeu pong massivement multijoueur"
+
 #: ../menu-data/mnemosyne:mnemosyne.desktop.in.h:1
+msgid "Mnemosyne"
+msgstr "Mnemosyne"
+
+#: ../menu-data/mnemosyne:mnemosyne.desktop.in.h:2
 msgid "A flash card program to make your review process more efficient"
 msgstr ""
 "Un programme de fiches mnémotechniques pour accroître l'efficacité de vos "
 "révisions"
 
-#: ../menu-data/mnemosyne:mnemosyne.desktop.in.h:2
-msgid "Mnemosyne"
-msgstr "Mnemosyne"
-
 #: ../menu-data/model-builder:model-builder.desktop.in.h:1
-msgid "Graphical ODE simulator"
-msgstr "Simulateur graphique ODE"
-
-#: ../menu-data/model-builder:model-builder.desktop.in.h:2
 msgid "Model Builder"
 msgstr "Model Builder"
 
-#: ../menu-data/mokomaze:mokomaze.desktop.in.h:1
-msgid "Ball-in-the-labyrinth game"
-msgstr "Jeu de la boule dans un labyrinthe"
+#: ../menu-data/model-builder:model-builder.desktop.in.h:2
+msgid "Graphical ODE simulator"
+msgstr "Simulateur graphique ODE"
 
-#: ../menu-data/mokomaze:mokomaze.desktop.in.h:2
+#: ../menu-data/mokomaze:mokomaze.desktop.in.h:1
 msgid "Mokomaze"
 msgstr "Mokomaze"
 
+#: ../menu-data/mokomaze:mokomaze.desktop.in.h:2
+msgid "Ball-in-the-labyrinth game"
+msgstr "Jeu de la boule dans un labyrinthe"
+
 #: ../menu-data/monajat-applet:monajat.desktop.in.h:1
 msgid "Monajat Applet for supplications"
 msgstr "Applet Monajat pour les supplications"
@@ -11815,13 +11945,13 @@
 msgstr "Jeu d'arcade Monkey Bubble"
 
 #: ../menu-data/monkeystudio:monkeystudio.desktop.in.h:1
-msgid "MkS IDE"
-msgstr "MkS IDE"
-
-#: ../menu-data/monkeystudio:monkeystudio.desktop.in.h:2
 msgid "Monkey Studio IDE"
 msgstr "Monkey Studio IDE"
 
+#: ../menu-data/monkeystudio:monkeystudio.desktop.in.h:2
+msgid "MkS IDE"
+msgstr "MkS IDE"
+
 #: ../menu-data/mono-runtime:mono-runtime-terminal.desktop.in.h:1
 msgid "Mono Runtime (Terminal)"
 msgstr "Moteur Mono (Terminal)"
@@ -11831,6 +11961,10 @@
 msgstr "Moteur Mono"
 
 #: ../menu-data/mono-tools-gui:gsharp.desktop.in.h:1
+msgid "gsharp"
+msgstr "gsharp"
+
+#: ../menu-data/mono-tools-gui:gsharp.desktop.in.h:2
 msgid ""
 "Write C# in an interactive shell, and inject your code into running Mono "
 "processes"
@@ -11838,30 +11972,26 @@
 "Écrire du code C# en ligne de commande et l'injecter dans des processus Mono "
 "en cours d'exécution"
 
-#: ../menu-data/mono-tools-gui:gsharp.desktop.in.h:2
-msgid "gsharp"
-msgstr "gsharp"
-
 #: ../menu-data/mono-tools-gui:ilcontrast.desktop.in.h:1
+msgid "Mono IL Contrast"
+msgstr "Mono IL Contrast"
+
+#: ../menu-data/mono-tools-gui:ilcontrast.desktop.in.h:2
 msgid "Identify differences in the API exposed by mono library assemblies."
 msgstr ""
 "Identifier les différences dans l'API induites par l'assemblage des "
 "bibliothèques mono."
 
-#: ../menu-data/mono-tools-gui:ilcontrast.desktop.in.h:2
-msgid "Mono IL Contrast"
-msgstr "Mono IL Contrast"
-
 #: ../menu-data/monodevelop:monodevelop.desktop.in.h:1
+msgid "MonoDevelop"
+msgstr "MonoDevelop"
+
+#: ../menu-data/monodevelop:monodevelop.desktop.in.h:2
 msgid "Develop .NET applications in an Integrated Development Environment"
 msgstr ""
 "Développez des applications .NET dans un environnement de développement "
 "intégré"
 
-#: ../menu-data/monodevelop:monodevelop.desktop.in.h:2
-msgid "MonoDevelop"
-msgstr "MonoDevelop"
-
 #: ../menu-data/monodoc-browser:monodoc.desktop.in.h:1
 msgid "Mono Documentation"
 msgstr "Documentation de Mono"
@@ -11879,29 +12009,29 @@
 msgstr "Explorateur de documentation pour Mono"
 
 #: ../menu-data/monster-masher:monster-masher.desktop.in.h:1
-msgid "Mash monsters and save the gnomes"
-msgstr "Réduire les monstres en purée et sauver les nains"
-
-#: ../menu-data/monster-masher:monster-masher.desktop.in.h:2
 msgid "Monster Masher"
 msgstr "Monster Masher"
 
-#: ../menu-data/monsterz:monsterz.desktop.in.h:1
-msgid "Little arcade puzzle game, similar to the famous Bejeweled"
-msgstr "Petit casse-tête d'arcade, semblable au célèbre Bejeweled"
+#: ../menu-data/monster-masher:monster-masher.desktop.in.h:2
+msgid "Mash monsters and save the gnomes"
+msgstr "Réduire les monstres en purée et sauver les nains"
 
-#: ../menu-data/monsterz:monsterz.desktop.in.h:2
+#: ../menu-data/monsterz:monsterz.desktop.in.h:1
 msgid "Monsterz"
 msgstr "Monsterz"
 
-#: ../menu-data/moon-lander:moon-lander.desktop.in.h:1
-msgid "Fun game based on the classic moon lander"
-msgstr "Jeu amusant fondé sur le classique « moon lander » (alunissage)"
+#: ../menu-data/monsterz:monsterz.desktop.in.h:2
+msgid "Little arcade puzzle game, similar to the famous Bejeweled"
+msgstr "Petit casse-tête d'arcade, semblable au célèbre Bejeweled"
 
-#: ../menu-data/moon-lander:moon-lander.desktop.in.h:2
+#: ../menu-data/moon-lander:moon-lander.desktop.in.h:1
 msgid "Moonlander"
 msgstr "Moonlander"
 
+#: ../menu-data/moon-lander:moon-lander.desktop.in.h:2
+msgid "Fun game based on the classic moon lander"
+msgstr "Jeu amusant fondé sur le classique « moon lander » (alunissage)"
+
 #: ../menu-data/moovida:moovida.desktop.in.h:1
 msgid "Moovida Media Center"
 msgstr "Centre multimédia Moovida"
@@ -11912,14 +12042,14 @@
 "Lire vos films et votre musique sur la télévision grâce à une télécommande"
 
 #: ../menu-data/moserial:moserial.desktop.in.h:1
+msgid "moserial Terminal"
+msgstr "Terminal moserial"
+
+#: ../menu-data/moserial:moserial.desktop.in.h:2
 msgid "A serial terminal optimized for logging and file capture"
 msgstr ""
 "Un terminal série optimisé pour la journalisation et la capture de fichiers"
 
-#: ../menu-data/moserial:moserial.desktop.in.h:2
-msgid "moserial Terminal"
-msgstr "Terminal moserial"
-
 #: ../menu-data/mountmanager:mountmanager-gtk.desktop.in.h:1
 #: ../menu-data/mountmanager:mountmanager-kde.desktop.in.h:1
 msgid "MountManager"
@@ -11938,15 +12068,15 @@
 msgid "Mousepad"
 msgstr "Mousepad"
 
-#: ../menu-data/mp3diags:mp3diags.desktop.in.h:1
-msgid "MP3 Diags"
-msgstr "MP3 Diags"
-
 #. DocPath=
-#: ../menu-data/mp3diags:mp3diags.desktop.in.h:3
+#: ../menu-data/mp3diags:mp3diags.desktop.in.h:2
 msgid "MP3 Diags - diagnosis and repair tool"
 msgstr "MP3 Diags - outil de diagnostic et de réparation"
 
+#: ../menu-data/mp3diags:mp3diags.desktop.in.h:3
+msgid "MP3 Diags"
+msgstr "MP3 Diags"
+
 #: ../menu-data/mp3splt-gtk:mp3splt-gtk.desktop.in.h:1
 msgid "Mp3splt-gtk audio splitter"
 msgstr "Séparateur audio Mp3splt-gtk"
@@ -11956,21 +12086,30 @@
 msgstr "Séparer des fichiers mp3 et ogg sans décodage"
 
 #: ../menu-data/mpdcon.app:MPDCon.desktop.in.h:1
+msgid "MPDCon"
+msgstr "MPDCon"
+
+#: ../menu-data/mpdcon.app:MPDCon.desktop.in.h:2
 msgid "GNUstep client for MPD"
 msgstr "Client GNUstep pour MPD"
 
-#: ../menu-data/mpdcon.app:MPDCon.desktop.in.h:2
-msgid "MPDCon"
-msgstr "MPDCon"
+#: ../menu-data/mplayer-gui:mplayer.desktop.in.h:1
+msgid "MPlayer Media Player"
+msgstr "Lecteur multimédia MPlayer"
 
-#: ../menu-data/mplinuxman:mplinuxman.desktop.in.h:1
-msgid "Manage your MPMan portable mp3 player"
-msgstr "Gérer votre lecteur mp3 portable MPMan"
+#: ../menu-data/mplayer-gui:mplayer.desktop.in.h:2
+#: ../menu-data/totem:totem.desktop.in.h:2
+msgid "Play movies and songs"
+msgstr "Permet de lire des films et de la musique"
 
-#: ../menu-data/mplinuxman:mplinuxman.desktop.in.h:2
+#: ../menu-data/mplinuxman:mplinuxman.desktop.in.h:1
 msgid "Mplinuxman"
 msgstr "Mplinuxman"
 
+#: ../menu-data/mplinuxman:mplinuxman.desktop.in.h:2
+msgid "Manage your MPMan portable mp3 player"
+msgstr "Gérer votre lecteur mp3 portable MPMan"
+
 #: ../menu-data/mricron:dcm2niigui.desktop.in.h:1
 msgid "DICOM to NIfTI Conversion"
 msgstr "Convertisseur DICOM vers NIfTI"
@@ -11980,13 +12119,13 @@
 msgstr "dcm2nii"
 
 #: ../menu-data/mricron:mricron-npm.desktop.in.h:1
-msgid "NPM"
-msgstr "NPM"
-
-#: ../menu-data/mricron:mricron-npm.desktop.in.h:2
 msgid "Non-parametric MRI Analysis"
 msgstr "Analyse non-paramétrique MRI"
 
+#: ../menu-data/mricron:mricron-npm.desktop.in.h:2
+msgid "NPM"
+msgstr "NPM"
+
 #: ../menu-data/mricron:mricron.desktop.in.h:1
 msgid "2D/3D MRI Image Viewer"
 msgstr "Afficheur d'images 2D/3D MRI"
@@ -12021,13 +12160,13 @@
 "Logiciel de création d'images bitmap et de manipulation de photos numériques"
 
 #: ../menu-data/mu-cade:mu-cade.desktop.in.h:1
-msgid "Kenta Cho's Mu-cade"
-msgstr "Mu-cade par Kenta Cho"
-
-#: ../menu-data/mu-cade:mu-cade.desktop.in.h:2
 msgid "Mu-cade"
 msgstr "Mu-cade"
 
+#: ../menu-data/mu-cade:mu-cade.desktop.in.h:2
+msgid "Kenta Cho's Mu-cade"
+msgstr "Mu-cade par Kenta Cho"
+
 #: ../menu-data/mudlet:mudlet.desktop.in.h:1
 msgid "Mudlet"
 msgstr "Mudlet"
@@ -12045,15 +12184,15 @@
 msgstr "Outil de téléchargement MultiGet"
 
 #: ../menu-data/mumble:mumble.desktop.in.h:1
+msgid "Mumble"
+msgstr "Mumble"
+
+#: ../menu-data/mumble:mumble.desktop.in.h:2
 msgid "A low-latency, high quality voice chat program for gaming"
 msgstr ""
 "Un programme de messagerie instantanée audio à faible latence et de haute "
 "qualité pour le jeu"
 
-#: ../menu-data/mumble:mumble.desktop.in.h:2
-msgid "Mumble"
-msgstr "Mumble"
-
 #: ../menu-data/muon-installer:kde4__muon-installer.desktop.in.h:1
 msgid "Muon Software Center"
 msgstr "Logithèque Muon"
@@ -12067,7 +12206,7 @@
 msgstr "Gestionnaire de mises à jour Muon"
 
 #: ../menu-data/muon-updater:kde4__muon-updater.desktop.in.h:2
-#: ../menu-data/update-manager:update-manager.desktop.in.h:2
+#: ../menu-data/update-manager:update-manager.desktop.in.h:1
 msgid "Update Manager"
 msgstr "Gestionnaire de Mises à Jour"
 
@@ -12096,36 +12235,44 @@
 msgstr "Client Python/GTK2 Museek"
 
 #: ../menu-data/muse:muse.desktop.in.h:1
-msgid "Midi Music Editor"
-msgstr "Editeur de Musique MIDI"
-
-#: ../menu-data/muse:muse.desktop.in.h:2
 msgid "MusE"
 msgstr "MusE"
 
-#: ../menu-data/museeq:museeq.desktop.in.h:1
-msgid "C++/QT3 Museek client"
-msgstr "Client C++/QT3 Museek"
+#: ../menu-data/muse:muse.desktop.in.h:2
+msgid "Midi Music Editor"
+msgstr "Editeur de Musique MIDI"
 
-#: ../menu-data/museeq:museeq.desktop.in.h:2
+#: ../menu-data/museeq:museeq.desktop.in.h:1
 msgid "Museeq"
 msgstr "Museeq"
 
-#: ../menu-data/musescore:mscore.desktop.in.h:1
-msgid "MuseScore"
-msgstr "MuseScore"
+#: ../menu-data/museeq:museeq.desktop.in.h:2
+msgid "C++/QT3 Museek client"
+msgstr "Client C++/QT3 Museek"
 
-#: ../menu-data/musescore:mscore.desktop.in.h:2
+#: ../menu-data/musescore:mscore.desktop.in.h:1
 msgid "WYSIWYG Music score typesetter"
 msgstr "Logiciel de composition de musique (partitions) WYSIWYG"
 
+#: ../menu-data/musescore:mscore.desktop.in.h:2
+msgid "MuseScore"
+msgstr "MuseScore"
+
 #: ../menu-data/musetup-gtk:musetup-gtk.desktop.in.h:1
+msgid "Musetup-gtk"
+msgstr "Musetup-gtk"
+
+#: ../menu-data/musetup-gtk:musetup-gtk.desktop.in.h:2
 msgid "Museek daemon configuration tool"
 msgstr "Outil de configuration du démon Museek"
 
-#: ../menu-data/musetup-gtk:musetup-gtk.desktop.in.h:2
-msgid "Musetup-gtk"
-msgstr "Musetup-gtk"
+#: ../menu-data/musique:musique.desktop.in.h:1
+msgid "Musique"
+msgstr "Musique"
+
+#: ../menu-data/musique:musique.desktop.in.h:2
+msgid "Play your music collection"
+msgstr "Jouer votre collection de musique"
 
 #: ../menu-data/mutt:mutt.desktop.in.h:1
 msgid "Simple text-based Mail User Agent"
@@ -12140,13 +12287,13 @@
 msgstr "Mutter"
 
 #: ../menu-data/mx44:mx44.desktop.in.h:1
-msgid "Polyphonic, multichannel midi realtime software synthesizer"
-msgstr "Synthétiseur logiciel MIDI temps-réel, polyphonique et multi piste"
-
-#: ../menu-data/mx44:mx44.desktop.in.h:2
 msgid "mx44"
 msgstr "mx44"
 
+#: ../menu-data/mx44:mx44.desktop.in.h:2
+msgid "Polyphonic, multichannel midi realtime software synthesizer"
+msgstr "Synthétiseur logiciel MIDI temps-réel, polyphonique et multi piste"
+
 #: ../menu-data/mypaint:mypaint.desktop.in.h:1
 msgid "MyPaint"
 msgstr "MyPaint"
@@ -12155,38 +12302,22 @@
 msgid "Painting program for digital artists"
 msgstr "Programme de peinture pour les artistes numériques"
 
-#: ../menu-data/mysql-admin:MySQLAdministrator.desktop.in.h:1
-msgid "MySQL Administration Tool"
-msgstr "Outil d'administration de MySQL"
-
-#: ../menu-data/mysql-admin:MySQLAdministrator.desktop.in.h:2
-msgid "MySQL Administrator"
-msgstr "MySQL Administrator"
-
 #: ../menu-data/mysql-navigator:mysql-navigator.desktop.in.h:1
-msgid "GUI client for MySQL"
-msgstr "Client graphique pour MySQL"
-
-#: ../menu-data/mysql-navigator:mysql-navigator.desktop.in.h:2
 msgid "MySQL Navigator"
 msgstr "Explorateur MySQL"
 
-#: ../menu-data/mysql-query-browser:MySQLQueryBrowser.desktop.in.h:1
-msgid "MySQL Query Browser"
-msgstr "Explorateur de requêtes MySQL"
-
-#: ../menu-data/mysql-query-browser:MySQLQueryBrowser.desktop.in.h:2
-msgid "MySQL Query Tool"
-msgstr "Outil de requêtes MySQL"
+#: ../menu-data/mysql-navigator:mysql-navigator.desktop.in.h:2
+msgid "GUI client for MySQL"
+msgstr "Client graphique pour MySQL"
 
 #: ../menu-data/mythnettv-gui:mythnettv.desktop.in.h:1
-msgid "A video RSS grabber"
-msgstr "Un agrégateur de flux vidéo RSS"
-
-#: ../menu-data/mythnettv-gui:mythnettv.desktop.in.h:2
 msgid "MythNetTV"
 msgstr "MythNetTV"
 
+#: ../menu-data/mythnettv-gui:mythnettv.desktop.in.h:2
+msgid "A video RSS grabber"
+msgstr "Un agrégateur de flux vidéo RSS"
+
 #: ../menu-data/mythtv-backend:mythtv-setup.desktop.in.h:1
 msgid "MythTV Backend Setup"
 msgstr "Configuration du moteur de traitement MythTV"
@@ -12196,41 +12327,49 @@
 msgstr "Utilisé pour configurer un moteur de traitement (serveur)"
 
 #: ../menu-data/mythtv-frontend:mythtv.desktop.in.h:1
+msgid "MythTV Frontend"
+msgstr "Interface MythTV"
+
+#: ../menu-data/mythtv-frontend:mythtv.desktop.in.h:2
 msgid "A frontend for all content on a mythtv-backend"
 msgstr ""
 "Une interface pour le contenu diffusé par le moteur de traitement MythTV"
 
-#: ../menu-data/mythtv-frontend:mythtv.desktop.in.h:2
-msgid "MythTV Frontend"
-msgstr "Interface MythTV"
+#: ../menu-data/myunity:myunity.desktop.in.h:1
+msgid "MyUnity"
+msgstr "MyUnity"
+
+#: ../menu-data/myunity:myunity.desktop.in.h:2
+msgid "Configuratore per Unity"
+msgstr "Configuration d'Unity"
 
 #: ../menu-data/nagstamon:nagstamon.desktop.in.h:1
-msgid "Nagios status monitor "
-msgstr "Monitreur d'état Nagios "
-
-#: ../menu-data/nagstamon:nagstamon.desktop.in.h:2
 msgid "nagstamon"
 msgstr "nagstamon"
 
-#: ../menu-data/nanny:nanny-admin-console.desktop.in.h:1
-msgid "Nanny parental control admin console"
-msgstr "Console d'administration de contrôle parental Nanny"
+#: ../menu-data/nagstamon:nagstamon.desktop.in.h:2
+msgid "Nagios status monitor "
+msgstr "Monitreur d'état Nagios "
 
-#: ../menu-data/nanny:nanny-admin-console.desktop.in.h:2
+#: ../menu-data/nanny:nanny-admin-console.desktop.in.h:1
 msgid "Parental Control"
 msgstr "Contrôle parental"
 
-#: ../menu-data/nautilus-actions:nact.desktop.in.h:1
-msgid "Configure items to be added to the Nautilus context menus"
-msgstr "Configurer des éléments à ajouter au menu contextuel de Nautilus"
+#: ../menu-data/nanny:nanny-admin-console.desktop.in.h:2
+msgid "Nanny parental control admin console"
+msgstr "Console d'administration de contrôle parental Nanny"
 
-#: ../menu-data/nautilus-actions:nact.desktop.in.h:2
+#: ../menu-data/nautilus-actions:nact.desktop.in.h:1
 msgid "Nautilus-Actions Configuration Tool"
 msgstr "Outil de configuration d'actions pour Nautilus"
 
+#: ../menu-data/nautilus-actions:nact.desktop.in.h:2
+msgid "Configure items to be added to the Nautilus context menus"
+msgstr "Configurer des éléments à ajouter au menu contextuel de Nautilus"
+
 #: ../menu-data/nautilus-compare:nautilus-compare-preferences.desktop.in.h:1
 msgid "Nautilus Compare Extension Preferences"
-msgstr ""
+msgstr "Préférences de l'extension Nautilus Compare"
 
 #: ../menu-data/nautilus-compare:nautilus-compare-preferences.desktop.in.h:2
 msgid "Preferences for Nautilus Compare Extension"
@@ -12253,13 +12392,13 @@
 msgstr "Panneau de configuration de Pastebin pour Nautilus"
 
 #: ../menu-data/nautilus-scripts-manager:nautilus-scripts-manager.desktop.in.h:1
-msgid "Enable or disable Nautilus scripts"
-msgstr "Active ou désactive les scripts Nautilus"
-
-#: ../menu-data/nautilus-scripts-manager:nautilus-scripts-manager.desktop.in.h:2
 msgid "Nautilus scripts manager"
 msgstr "Gestionnaire de scripts Nautilus"
 
+#: ../menu-data/nautilus-scripts-manager:nautilus-scripts-manager.desktop.in.h:2
+msgid "Enable or disable Nautilus scripts"
+msgstr "Active ou désactive les scripts Nautilus"
+
 #: ../menu-data/navit:navit.desktop.in.h:1
 msgid "Navit"
 msgstr "Navit"
@@ -12311,21 +12450,21 @@
 msgstr "Afficher des séquences biologiques simples"
 
 #: ../menu-data/ncmpcpp:ncmpcpp.desktop.in.h:1
-msgid "NCurses Music Player Client"
-msgstr "Client NCurses Music Player"
-
-#: ../menu-data/ncmpcpp:ncmpcpp.desktop.in.h:2
 msgid "Ncmpcpp"
 msgstr "Ncmpcpp"
 
-#: ../menu-data/ndisgtk:ndisgtk.desktop.in.h:1
-msgid "Ndiswrapper driver installation tool"
-msgstr "Outil d'installation de pilotes Ndiswrapper"
+#: ../menu-data/ncmpcpp:ncmpcpp.desktop.in.h:2
+msgid "NCurses Music Player Client"
+msgstr "Client NCurses Music Player"
 
-#: ../menu-data/ndisgtk:ndisgtk.desktop.in.h:2
+#: ../menu-data/ndisgtk:ndisgtk.desktop.in.h:1
 msgid "Windows Wireless Drivers"
 msgstr "Pilotes réseau sans-fil Windows"
 
+#: ../menu-data/ndisgtk:ndisgtk.desktop.in.h:2
+msgid "Ndiswrapper driver installation tool"
+msgstr "Outil d'installation de pilotes Ndiswrapper"
+
 #: ../menu-data/nedit:nedit.desktop.in.h:1
 msgid "NEdit"
 msgstr "NEdit"
@@ -12339,13 +12478,13 @@
 msgstr "Greffon DSSI oscillateur unitaire simple"
 
 #: ../menu-data/nemiver:nemiver.desktop.in.h:1
-msgid "Debug Applications"
-msgstr "Déboguer les applications"
-
-#: ../menu-data/nemiver:nemiver.desktop.in.h:2
 msgid "Nemiver C/C++ Debugger"
 msgstr "Débogueur C/C++ Nemiver"
 
+#: ../menu-data/nemiver:nemiver.desktop.in.h:2
+msgid "Debug Applications"
+msgstr "Déboguer les applications"
+
 #: ../menu-data/netapplet:netapplet.desktop.in.h:1
 msgid "Network Selector"
 msgstr "Sélecteur de réseau - Network Selector"
@@ -12354,6 +12493,10 @@
 msgid "Network Selector Panel Applet"
 msgstr "Applet Network Selector"
 
+#: ../menu-data/netbeans:netbeans.desktop.in.h:1
+msgid "NetBeans IDE 7.0.1"
+msgstr "EDI NetBeans 7.0.1"
+
 #: ../menu-data/netemul:netemul.desktop.in.h:1
 msgid "NetEmul"
 msgstr "NetEmul"
@@ -12362,7 +12505,7 @@
 msgid "The LAN network simulator"
 msgstr "Simulateur de réseau LAN"
 
-#: ../menu-data/netgen:netgen.desktop.in.h:2
+#: ../menu-data/netgen:netgen.desktop.in.h:1
 msgid "Netgen Mesh Generator"
 msgstr "Générateur de mailles (mesh) Netgen"
 
@@ -12386,41 +12529,41 @@
 msgid "Netrek"
 msgstr "Netrek"
 
-#: ../menu-data/netsurf-gtk:netsurf-gtk.desktop.in.h:2
+#: ../menu-data/netsurf-gtk:netsurf-gtk.desktop.in.h:1
 msgid "NetSurf Web Browser"
 msgstr "Navigateur Web NetSurf"
 
-#: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:1
+#: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:2
 msgid "Manage your network connections"
 msgstr "Gérer vos connexions réseaux"
 
 #: ../menu-data/neverball:neverball.desktop.in.h:1
-msgid "A 3D arcade game with a ball"
-msgstr "Un jeu d'arcade 3D avec une balle"
-
-#: ../menu-data/neverball:neverball.desktop.in.h:2
 msgid "Neverball"
 msgstr "Neverball"
 
-#: ../menu-data/neverputt:neverputt.desktop.in.h:1
-msgid "A 3D mini golf game"
-msgstr "Un mini golf en 3D"
+#: ../menu-data/neverball:neverball.desktop.in.h:2
+msgid "A 3D arcade game with a ball"
+msgstr "Un jeu d'arcade 3D avec une balle"
 
-#: ../menu-data/neverputt:neverputt.desktop.in.h:2
+#: ../menu-data/neverputt:neverputt.desktop.in.h:1
 msgid "Neverputt"
 msgstr "Neverputt"
 
+#: ../menu-data/neverputt:neverputt.desktop.in.h:2
+msgid "A 3D mini golf game"
+msgstr "Un mini golf en 3D"
+
 #: ../menu-data/nexuiz:nexuiz.desktop.in.h:1
+msgid "Nexuiz"
+msgstr "Nexuiz"
+
+#: ../menu-data/nexuiz:nexuiz.desktop.in.h:2
 msgid ""
 "A networked 3D first person shooter game with high-quality graphic effects"
 msgstr ""
 "Un jeu de tir subjectif (FPS) en 3D avec des effets graphiques de haute "
 "qualité"
 
-#: ../menu-data/nexuiz:nexuiz.desktop.in.h:2
-msgid "Nexuiz"
-msgstr "Nexuiz"
-
 #: ../menu-data/nfoview:nfoview.desktop.in.h:1
 msgid "NFO Viewer"
 msgstr "Afficheur de fichiers NFO"
@@ -12446,13 +12589,13 @@
 msgstr "Jeu dont l'objectif est de collecter des bonbons"
 
 #: ../menu-data/nip2:nip2.desktop.in.h:1
-msgid "Image manipulation program based on VIPS"
-msgstr "Programme de manipulation d'images fondé sur VIPS"
-
-#: ../menu-data/nip2:nip2.desktop.in.h:2
 msgid "nip2"
 msgstr "nip2"
 
+#: ../menu-data/nip2:nip2.desktop.in.h:2
+msgid "Image manipulation program based on VIPS"
+msgstr "Programme de manipulation d'images fondé sur VIPS"
+
 #: ../menu-data/njam:njam.desktop.in.h:1
 msgid "Njam"
 msgstr "Njam"
@@ -12462,53 +12605,53 @@
 msgstr "Jeu de type Pacman à plusieurs joueurs"
 
 #: ../menu-data/njplot:njplot.desktop.in.h:1
+msgid "NJplot"
+msgstr "NJplot"
+
+#: ../menu-data/njplot:njplot.desktop.in.h:2
 msgid ""
 "Displays, modifies and exports in PostScript format phylogenetic trees"
 msgstr ""
 "Afficher, modifier et exporter au format PostScript des arbres "
 "phylogénétiques"
 
-#: ../menu-data/njplot:njplot.desktop.in.h:2
-msgid "NJplot"
-msgstr "NJplot"
-
 #: ../menu-data/nmapsi4:kde__nmapsi4.desktop.in.h:1
-msgid "Is a Qt4 interface for nmap scanner"
-msgstr "Interface Qt4 pour l'analyseur réseau nmap"
-
-#: ../menu-data/nmapsi4:kde__nmapsi4.desktop.in.h:2
 msgid "NmapSI4 - User mode"
 msgstr "NmapSI4 - Mode utilisateur"
 
-#: ../menu-data/noiz2sa:noiz2sa.desktop.in.h:1
-msgid "An Abstract Shooter by Kenta Cho"
-msgstr "Un jeu de tir abstrait par Kenta Cho"
+#: ../menu-data/nmapsi4:kde__nmapsi4.desktop.in.h:2
+msgid "Is a Qt4 interface for nmap scanner"
+msgstr "Interface Qt4 pour l'analyseur réseau nmap"
 
-#: ../menu-data/noiz2sa:noiz2sa.desktop.in.h:2
+#: ../menu-data/noiz2sa:noiz2sa.desktop.in.h:1
 msgid "Noiz2sa"
 msgstr "Noiz2sa"
 
-#: ../menu-data/notification-daemon:notification-daemon.desktop.in.h:1
-msgid "Display notifications"
-msgstr "Afficher les notifications"
+#: ../menu-data/noiz2sa:noiz2sa.desktop.in.h:2
+msgid "An Abstract Shooter by Kenta Cho"
+msgstr "Un jeu de tir abstrait par Kenta Cho"
 
-#: ../menu-data/notification-daemon:notification-daemon.desktop.in.h:2
+#: ../menu-data/notification-daemon:notification-daemon.desktop.in.h:1
 msgid "Notification Daemon"
 msgstr "Démon de notification"
 
-#: ../menu-data/nted:nted.desktop.in.h:2
+#: ../menu-data/notification-daemon:notification-daemon.desktop.in.h:2
+msgid "Display notifications"
+msgstr "Afficher les notifications"
+
+#: ../menu-data/nted:nted.desktop.in.h:1
 msgid "NtEd"
 msgstr "NtEd"
 
 #: ../menu-data/ntfs-config:ntfs-config.desktop.in.h:1
+msgid "NTFS Configuration Tool"
+msgstr "Outil de Configuration NTFS"
+
+#: ../menu-data/ntfs-config:ntfs-config.desktop.in.h:2
 msgid "Enable/disable write support for NTFS with a simple click."
 msgstr ""
 "Activer/désactiver la gestion de l'écriture pour NTFS d'un simple clic."
 
-#: ../menu-data/ntfs-config:ntfs-config.desktop.in.h:2
-msgid "NTFS Configuration Tool"
-msgstr "Outil de Configuration NTFS"
-
 #: ../menu-data/nuapplet:nuapplet2.desktop.in.h:1
 msgid "NuApplet"
 msgstr "NuApplet"
@@ -12533,45 +12676,63 @@
 msgid "Network UPS Tools GUI client"
 msgstr ""
 
-#: ../menu-data/nvtv:nvtv.desktop.in.h:1
-msgid "Control the TV output of NVidia video cards"
-msgstr "Contrôler la sortie TV des cartes graphiques NVidia"
+#: ../menu-data/nvclock-gtk:nvclock.desktop.in.h:1
+msgid "NVCLOCK"
+msgstr "NVCLOCK"
 
-#: ../menu-data/nvtv:nvtv.desktop.in.h:2
+#: ../menu-data/nvclock-gtk:nvclock.desktop.in.h:2
+msgid "Overclock and Monitor NVIDIA cards"
+msgstr ""
+
+#: ../menu-data/nvtv:nvtv.desktop.in.h:1
 msgid "Nvtv TV Out"
 msgstr "Nvtv TV Out"
 
-#: ../menu-data/nzb:nzb.desktop.in.h:1
-msgid "Grab nzb files"
-msgstr "Récupérer des fichiers nzb"
+#: ../menu-data/nvtv:nvtv.desktop.in.h:2
+msgid "Control the TV output of NVidia video cards"
+msgstr "Contrôler la sortie TV des cartes graphiques NVidia"
 
-#: ../menu-data/nzb:nzb.desktop.in.h:2
+#: ../menu-data/nzb:nzb.desktop.in.h:1
 msgid "Nzb"
 msgstr "Nzb"
 
-#: ../menu-data/obconf:obconf.desktop.in.h:1
-msgid "Configure and personalize the Openbox window manager"
-msgstr "Configurer et personnaliser le gestionnaire de fenêtres Openbox"
+#: ../menu-data/nzb:nzb.desktop.in.h:2
+msgid "Grab nzb files"
+msgstr "Récupérer des fichiers nzb"
 
-#: ../menu-data/obconf:obconf.desktop.in.h:2
+#: ../menu-data/obconf:obconf.desktop.in.h:1
 msgid "Openbox Configuration Manager"
 msgstr "Gestionnaire de configuration Openbox"
 
-#: ../menu-data/obextool:obextool.desktop.in.h:1
-msgid "A GUI for bluetooth transfers"
-msgstr "Une interface graphique pour les transferts Bluetooth"
+#: ../menu-data/obconf:obconf.desktop.in.h:2
+msgid "Configure and personalize the Openbox window manager"
+msgstr "Configurer et personnaliser le gestionnaire de fenêtres Openbox"
 
-#: ../menu-data/obextool:obextool.desktop.in.h:2
+#: ../menu-data/obextool:obextool.desktop.in.h:1
 msgid "ObexTool"
 msgstr "ObexTool"
 
+#: ../menu-data/obextool:obextool.desktop.in.h:2
+msgid "A GUI for bluetooth transfers"
+msgstr "Une interface graphique pour les transferts Bluetooth"
+
 #: ../menu-data/objcryst-fox:fox.desktop.in.h:1
+msgid "Fox"
+msgstr "Fox"
+
+#: ../menu-data/objcryst-fox:fox.desktop.in.h:2
 msgid "Crystal structure determination"
 msgstr "Détermination de structures cristallines"
 
-#: ../menu-data/objcryst-fox:fox.desktop.in.h:2
-msgid "Fox"
-msgstr "Fox"
+#: ../menu-data/oce-draw:oce-draw.desktop.in.h:1
+#: ../menu-data/opencascade-draw:opencascade-draw.desktop.in.h:1
+msgid "OpenCASCADE"
+msgstr "OpenCASCADE"
+
+#: ../menu-data/oce-draw:oce-draw.desktop.in.h:2
+#: ../menu-data/opencascade-draw:opencascade-draw.desktop.in.h:2
+msgid "OpenCASCADE DRAWEXE test harness"
+msgstr "Banc de test OpenCASCADE DRAWEXE"
 
 #: ../menu-data/ocrfeeder:ocrfeeder.desktop.in.h:1
 msgid "OCRFeeder"
@@ -12590,81 +12751,85 @@
 msgstr "Informatique scientifique utilisant GNU Octave"
 
 #: ../menu-data/oggconvert:oggconvert.desktop.in.h:1
-msgid "Convert media files to Free formats"
-msgstr "Convertir les fichiers multimédia vers des formats ouverts"
-
-#: ../menu-data/oggconvert:oggconvert.desktop.in.h:2
 msgid "OggConvert"
 msgstr "OggConvert - conversion en ogg"
 
-#: ../menu-data/ogmrip:ogmrip.desktop.in.h:1
-msgid "A DVD encoder"
-msgstr "Un encodeur DVD"
+#: ../menu-data/oggconvert:oggconvert.desktop.in.h:2
+msgid "Convert media files to Free formats"
+msgstr "Convertir les fichiers multimédia vers des formats ouverts"
 
-#: ../menu-data/ogmrip:ogmrip.desktop.in.h:2
+#: ../menu-data/ogmrip:ogmrip.desktop.in.h:1
 msgid "DVD Encoder OGMRip"
 msgstr "Encodeur de DVD OGMRip"
 
+#: ../menu-data/ogmrip:ogmrip.desktop.in.h:2
+msgid "A DVD encoder"
+msgstr "Un encodeur DVD"
+
 #: ../menu-data/okteta:kde4__okteta.desktop.in.h:1
+msgid "Okteta"
+msgstr "Okteta"
+
+#: ../menu-data/okteta:kde4__okteta.desktop.in.h:2
 msgid "Hex Editor"
 msgstr "Éditeur hexadécimal"
 
-#: ../menu-data/okteta:kde4__okteta.desktop.in.h:2
-msgid "Okteta"
-msgstr "Okteta"
+#: ../menu-data/okular-backend-odp:kde4__okularApplication_odp.desktop.in.h:1
+msgid "okular"
+msgstr "okular"
 
 #: ../menu-data/omaque:kde4__omaque.desktop.in.h:1
 msgid "Omaque"
 msgstr "Omaque"
 
 #: ../menu-data/omegat:omegat.desktop.in.h:1
-msgid "Computer-Assisted Translation tool"
-msgstr "Outil de traduction assistée par ordinateur"
-
-#: ../menu-data/omegat:omegat.desktop.in.h:2
 msgid "OmegaT"
 msgstr "OmegaT"
 
-#: ../menu-data/onboard:onboard.desktop.in.h:1
-msgid "Flexible onscreen keyboard for GNOME"
-msgstr "Clavier virtuel polyvalent pour GNOME"
+#: ../menu-data/omegat:omegat.desktop.in.h:2
+msgid "Computer-Assisted Translation tool"
+msgstr "Outil de traduction assistée par ordinateur"
 
-#: ../menu-data/onboard:onboard.desktop.in.h:2
+#: ../menu-data/onboard:onboard.desktop.in.h:1
 msgid "Onboard"
 msgstr "Onboard"
 
-#: ../menu-data/oneisenough:oneisenough.desktop.in.h:1
-msgid "2D platform game about communist and capitalist balls"
-msgstr "Jeu 2D de lutte entre communistes et capitalistes"
+#: ../menu-data/onboard:onboard.desktop.in.h:2
+msgid "Flexible onscreen keyboard for GNOME"
+msgstr "Clavier virtuel polyvalent pour GNOME"
 
-#: ../menu-data/oneisenough:oneisenough.desktop.in.h:2
+#: ../menu-data/oneisenough:oneisenough.desktop.in.h:1
 msgid "One Is Enough"
 msgstr "One Is Enough (un seul suffit)"
 
-#: ../menu-data/ontv:ontv.desktop.in.h:1
-msgid "Monitor TV programs"
-msgstr ""
+#: ../menu-data/oneisenough:oneisenough.desktop.in.h:2
+msgid "2D platform game about communist and capitalist balls"
+msgstr "Jeu 2D de lutte entre communistes et capitalistes"
 
-#: ../menu-data/ontv:ontv.desktop.in.h:2
+#: ../menu-data/ontv:ontv.desktop.in.h:1
 msgid "OnTV"
 msgstr "OnTV"
 
-#: ../menu-data/oolite:oolite.desktop.in.h:1
-msgid "An OpenGL Elite-like space game"
-msgstr "Un Jeu OpenGL dans l'espace ressemblant à Elite"
+#: ../menu-data/ontv:ontv.desktop.in.h:2
+msgid "Monitor TV programs"
+msgstr "Avoir un aperçu de ce qui passe à la TV"
 
-#: ../menu-data/oolite:oolite.desktop.in.h:2
+#: ../menu-data/oolite:oolite.desktop.in.h:1
 msgid "Oolite"
 msgstr "Oolite"
 
-#: ../menu-data/open-axiom:open-axiom.desktop.in.h:1
-msgid "Open scientific computation platform"
-msgstr ""
+#: ../menu-data/oolite:oolite.desktop.in.h:2
+msgid "An OpenGL Elite-like space game"
+msgstr "Un Jeu OpenGL dans l'espace ressemblant à Elite"
 
-#: ../menu-data/open-axiom:open-axiom.desktop.in.h:2
+#: ../menu-data/open-axiom:open-axiom.desktop.in.h:1
 msgid "OpenAxiom"
 msgstr "OpenAxiom"
 
+#: ../menu-data/open-axiom:open-axiom.desktop.in.h:2
+msgid "Open scientific computation platform"
+msgstr "Une plateforme informatique scientifique libre et ouverte"
+
 #: ../menu-data/open-invaders:open-invaders.desktop.in.h:1
 msgid "Open Invaders"
 msgstr "Open Invaders"
@@ -12674,34 +12839,34 @@
 msgstr "Un clone de Space Invaders"
 
 #: ../menu-data/openarena:openarena.desktop.in.h:1
+msgid "OpenArena"
+msgstr "OpenArena"
+
+#: ../menu-data/openarena:openarena.desktop.in.h:2
 msgid ""
 "A fast-paced 3D first-person shooter, similar to id Software Inc.'s Quake "
 "III Arena"
 msgstr "Un jeu de tir subjectif (FPS) rapide, similaire à Quake III"
 
-#: ../menu-data/openarena:openarena.desktop.in.h:2
-msgid "OpenArena"
-msgstr "OpenArena"
-
 #: ../menu-data/openbmap-logger:openBmap.desktop.in.h:1
+msgid "OBM"
+msgstr "OBM"
+
+#: ../menu-data/openbmap-logger:openBmap.desktop.in.h:2
 msgid "Logs GSM and GPS and uploads to openBmap."
 msgstr ""
 "Journalise des informations GSM et GPS et les transfert sur openBmap."
 
-#: ../menu-data/openbmap-logger:openBmap.desktop.in.h:2
-msgid "OBM"
-msgstr "OBM"
-
 #: ../menu-data/openbox:openbox.desktop.in.h:1
+msgid "Openbox"
+msgstr "Openbox"
+
+#: ../menu-data/openbox:openbox.desktop.in.h:2
 msgid "Log in using the Openbox window manager (without a session manager)"
 msgstr ""
 "S'identifier en utilisant le gestionnaire de fenêtres Openbox (sans utiliser "
 "un gestionnaire de session)"
 
-#: ../menu-data/openbox:openbox.desktop.in.h:2
-msgid "Openbox"
-msgstr "Openbox"
-
 #: ../menu-data/openbve:openbve.desktop.in.h:1
 msgid "OpenBVE"
 msgstr "OpenBVE"
@@ -12710,14 +12875,6 @@
 msgid "Train/railway simulator compatible with 'BVE Trainsim' routes"
 msgstr "Simulateur ferroviaire compatible avec les voies « BVE Trainsim »"
 
-#: ../menu-data/opencascade-draw:opencascade-draw.desktop.in.h:1
-msgid "OpenCASCADE"
-msgstr "OpenCASCADE"
-
-#: ../menu-data/opencascade-draw:opencascade-draw.desktop.in.h:2
-msgid "OpenCASCADE DRAWEXE test harness"
-msgstr "Banc de test OpenCASCADE DRAWEXE"
-
 #: ../menu-data/opencity:opencity.desktop.in.h:1
 msgid "OpenCity"
 msgstr "OpenCity"
@@ -12743,13 +12900,13 @@
 msgstr "Chercher des mots sur un dictionnaire local ou en ligne "
 
 #: ../menu-data/openfetion:openfetion.desktop.in.h:1
-msgid "Fetion For Linux"
-msgstr "Fetion Pour Linux"
-
-#: ../menu-data/openfetion:openfetion.desktop.in.h:2
 msgid "OpenFetion"
 msgstr "OpenFetion"
 
+#: ../menu-data/openfetion:openfetion.desktop.in.h:2
+msgid "Fetion For Linux"
+msgstr "Fetion Pour Linux"
+
 #: ../menu-data/openjdk-6-jre:openjdk-6-java.desktop.in.h:1
 msgid "OpenJDK Java 6 Runtime"
 msgstr "OpenJDK Java 6 Runtime"
@@ -12759,62 +12916,62 @@
 msgstr "Moteur OpenJDK Java 7"
 
 #: ../menu-data/openrocket:openrocket.desktop.in.h:1
-msgid "Design and simulate model rockets"
-msgstr "Conception et simulation de modèles réduits de fusées"
-
-#: ../menu-data/openrocket:openrocket.desktop.in.h:2
 msgid "OpenRocket"
 msgstr "OpenRocket"
 
-#: ../menu-data/openshot:openshot.desktop.in.h:1
-msgid "Create and edit videos and movies"
-msgstr "Créer et monter des vidéos et des films"
+#: ../menu-data/openrocket:openrocket.desktop.in.h:2
+msgid "Design and simulate model rockets"
+msgstr "Conception et simulation de modèles réduits de fusées"
 
-#: ../menu-data/openshot:openshot.desktop.in.h:2
+#: ../menu-data/openshot:openshot.desktop.in.h:1
 msgid "OpenShot Video Editor"
 msgstr "Editeur Vidéo OpenShot"
 
+#: ../menu-data/openshot:openshot.desktop.in.h:2
+msgid "Create and edit videos and movies"
+msgstr "Créer et monter des vidéos et des films"
+
 #: ../menu-data/openstv:openstv.desktop.in.h:1
+msgid "OpenSTV Voting Software"
+msgstr "Logiciel de vote OpenSTV"
+
+#: ../menu-data/openstv:openstv.desktop.in.h:2
 msgid "Conduct a Single Transferable Vote election"
 msgstr ""
 "Conduire une élection STV (proportionelle et par ordre de préférence)"
 
-#: ../menu-data/openstv:openstv.desktop.in.h:2
-msgid "OpenSTV Voting Software"
-msgstr "Logiciel de vote OpenSTV"
-
 #: ../menu-data/openteacher:openteacher.desktop.in.h:1
-msgid "Learn words in a foreign language."
-msgstr "Apprenez des mots dans une langue étrangère."
-
-#: ../menu-data/openteacher:openteacher.desktop.in.h:2
 msgid "OpenTeacher"
 msgstr "OpenTeacher"
 
-#: ../menu-data/openttd:openttd.desktop.in.h:1
-msgid "A clone of Transport Tycoon Deluxe"
-msgstr "Clone de Transport Tycoon Deluxe"
+#: ../menu-data/openteacher:openteacher.desktop.in.h:2
+msgid "Learn words in a foreign language."
+msgstr "Apprenez des mots dans une langue étrangère."
 
-#: ../menu-data/openttd:openttd.desktop.in.h:2
+#: ../menu-data/openttd:openttd.desktop.in.h:1
 msgid "OpenTTD"
 msgstr "OpenTTD"
 
-#: ../menu-data/openuniverse:openuniverse.desktop.in.h:1
-msgid "Explore the solar system in this accurate simulation"
-msgstr "Explorer le système solaire dans cette simulation très précise"
+#: ../menu-data/openttd:openttd.desktop.in.h:2
+msgid "A clone of Transport Tycoon Deluxe"
+msgstr "Clone de Transport Tycoon Deluxe"
 
-#: ../menu-data/openuniverse:openuniverse.desktop.in.h:2
+#: ../menu-data/openuniverse:openuniverse.desktop.in.h:1
 msgid "OpenUniverse Space Simulator"
 msgstr "Simulateur spatial OpenUniverse"
 
-#: ../menu-data/openvas-client:OpenVAS-Client.desktop.in.h:1
-msgid "GTK+-2 Client for OpenVAS Security Scanner"
-msgstr "Client GTK+-2 pour OpenVAS Security Scanner"
+#: ../menu-data/openuniverse:openuniverse.desktop.in.h:2
+msgid "Explore the solar system in this accurate simulation"
+msgstr "Explorer le système solaire dans cette simulation très précise"
 
-#: ../menu-data/openvas-client:OpenVAS-Client.desktop.in.h:2
+#: ../menu-data/openvas-client:OpenVAS-Client.desktop.in.h:1
 msgid "OpenVAS-Client"
 msgstr "OpenVAS-Client"
 
+#: ../menu-data/openvas-client:OpenVAS-Client.desktop.in.h:2
+msgid "GTK+-2 Client for OpenVAS Security Scanner"
+msgstr "Client GTK+-2 pour OpenVAS Security Scanner"
+
 #: ../menu-data/openwalnut-qt4:openwalnut.desktop.in.h:1
 msgid "OpenWalnut"
 msgstr "OpenWalnut"
@@ -12828,13 +12985,13 @@
 msgstr "Le classique jeu de dés Yahtzee"
 
 #: ../menu-data/optgeo:optgeo.desktop.in.h:1
-msgid "Interactive tool to study and simulate optic assemblies"
-msgstr "Outil interactif pour étudier et simuler les assemblages optiques"
-
-#: ../menu-data/optgeo:optgeo.desktop.in.h:2
 msgid "OptGeo"
 msgstr "OptGeo"
 
+#: ../menu-data/optgeo:optgeo.desktop.in.h:2
+msgid "Interactive tool to study and simulate optic assemblies"
+msgstr "Outil interactif pour étudier et simuler les assemblages optiques"
+
 #: ../menu-data/orage:globaltime.desktop.in.h:1
 msgid "Orage Globaltime"
 msgstr "Horloge universelle Orage"
@@ -12844,13 +13001,13 @@
 msgstr "Afficher l'heure de différents pays"
 
 #: ../menu-data/orage:xfcalendar.desktop.in.h:1
-msgid "Desktop calendar"
-msgstr "Calendrier de bureau"
-
-#: ../menu-data/orage:xfcalendar.desktop.in.h:2
 msgid "Orage Calendar"
 msgstr "Calendrier Orage"
 
+#: ../menu-data/orage:xfcalendar.desktop.in.h:2
+msgid "Desktop calendar"
+msgstr "Calendrier de bureau"
+
 #: ../menu-data/orage:xfce-xfcalendar-settings.desktop.in.h:1
 msgid "Orage preferences"
 msgstr "Configuration d'Orage"
@@ -12860,13 +13017,13 @@
 msgstr "Paramétrages pour l'application agenda de Xfce 4 (Orage)"
 
 #: ../menu-data/orbital-eunuchs-sniper:orbital-eunuchs-sniper.desktop.in.h:1
-msgid "Anti-terrorist Satellite Sniping Game"
-msgstr "Jeu de satellite tireur d'élite anti-terroriste"
-
-#: ../menu-data/orbital-eunuchs-sniper:orbital-eunuchs-sniper.desktop.in.h:2
 msgid "Orbital Eunuchs Sniper"
 msgstr "Orbital Eunuchs Sniper"
 
+#: ../menu-data/orbital-eunuchs-sniper:orbital-eunuchs-sniper.desktop.in.h:2
+msgid "Anti-terrorist Satellite Sniping Game"
+msgstr "Jeu de satellite tireur d'élite anti-terroriste"
+
 #: ../menu-data/oregano:oregano.desktop.in.h:1
 msgid "Oregano"
 msgstr "Oregano"
@@ -12884,21 +13041,21 @@
 msgstr "Agenda personnel"
 
 #: ../menu-data/othman:Othman.desktop.in.h:1
-msgid "Electronic Mus-haf"
-msgstr "Mus'haf numérique"
-
-#: ../menu-data/othman:Othman.desktop.in.h:2
 msgid "Othman Quran Browser"
 msgstr "Explorateur de Coran - Othman"
 
-#: ../menu-data/out-of-order:out-of-order.desktop.in.h:1
-msgid "Adventure Game"
-msgstr "Jeu d'Aventure"
+#: ../menu-data/othman:Othman.desktop.in.h:2
+msgid "Electronic Mus-haf"
+msgstr "Mus'haf numérique"
 
-#: ../menu-data/out-of-order:out-of-order.desktop.in.h:2
+#: ../menu-data/out-of-order:out-of-order.desktop.in.h:1
 msgid "Out Of Order"
 msgstr "Out Of Order"
 
+#: ../menu-data/out-of-order:out-of-order.desktop.in.h:2
+msgid "Adventure Game"
+msgstr "Jeu d'Aventure"
+
 #: ../menu-data/overgod:overgod.desktop.in.h:1
 msgid "Overgod"
 msgstr "Overgod"
@@ -12919,13 +13076,13 @@
 "simulation atomique."
 
 #: ../menu-data/pacemaker-mgmt-client:crm_gui.desktop.in.h:1
-msgid "Pacemaker CRM GUI"
-msgstr "Interface graphique du CRM Pacemaker"
-
-#: ../menu-data/pacemaker-mgmt-client:crm_gui.desktop.in.h:2
 msgid "Pacemaker GUI"
 msgstr "Interface graphique de Pacemaker"
 
+#: ../menu-data/pacemaker-mgmt-client:crm_gui.desktop.in.h:2
+msgid "Pacemaker CRM GUI"
+msgstr "Interface graphique du CRM Pacemaker"
+
 #: ../menu-data/packagesearch:packagesearch.desktop.in.h:1
 msgid "Debian Package Search"
 msgstr "Recherche de paquets Debian"
@@ -12943,13 +13100,13 @@
 msgstr "Générateur de paquets"
 
 #: ../menu-data/pacman:pacman.desktop.in.h:1
-msgid "A simple clone of the classic arcade game"
-msgstr "Un clone du jeu d'arcade classique Pacman"
-
-#: ../menu-data/pacman:pacman.desktop.in.h:2
 msgid "Pacman"
 msgstr "Pacman"
 
+#: ../menu-data/pacman:pacman.desktop.in.h:2
+msgid "A simple clone of the classic arcade game"
+msgstr "Un clone du jeu d'arcade classique Pacman"
+
 #: ../menu-data/padre:padre.desktop.in.h:1
 msgid "Padre"
 msgstr "Padre"
@@ -12969,26 +13126,26 @@
 "multiples"
 
 #: ../menu-data/palapeli:kde4__palapeli.desktop.in.h:1
-msgid "Jigsaw puzzle game"
-msgstr "Jeu de puzzle"
-
-#: ../menu-data/palapeli:kde4__palapeli.desktop.in.h:2
 msgid "Palapeli"
 msgstr "Palapeli"
 
-#: ../menu-data/paman:paman.desktop.in.h:1
-msgid "Manage your PulseAudio sound server"
-msgstr "Gérer votre serveur son PulseAudio"
+#: ../menu-data/palapeli:kde4__palapeli.desktop.in.h:2
+msgid "Jigsaw puzzle game"
+msgstr "Jeu de puzzle"
 
-#: ../menu-data/paman:paman.desktop.in.h:2
+#: ../menu-data/paman:paman.desktop.in.h:1
 msgid "PulseAudio Manager"
 msgstr "Gestionnaire PulseAudio"
 
+#: ../menu-data/paman:paman.desktop.in.h:2
+msgid "Manage your PulseAudio sound server"
+msgstr "Gérer votre serveur son PulseAudio"
+
 #: ../menu-data/pan:pan.desktop.in.h:1
 msgid "Pan Newsreader"
 msgstr "Lecteur de groupes de discussion Pan"
 
-#: ../menu-data/pan:pan.desktop.in.h:2 ../menu-data/xpn:xpn.desktop.in.h:1
+#: ../menu-data/pan:pan.desktop.in.h:2 ../menu-data/xpn:xpn.desktop.in.h:2
 msgid "Read News from Usenet"
 msgstr "Lire les groupes de discussion Usenet"
 
@@ -13016,7 +13173,7 @@
 msgid "ParaView allows viewing of large data sets"
 msgstr "Paraview permet d'afficher des ensembles de données de grande taille"
 
-#: ../menu-data/parcellite:parcellite.desktop.in.h:2
+#: ../menu-data/parcellite:parcellite.desktop.in.h:1
 msgid "Parcellite"
 msgstr "Parcellite"
 
@@ -13033,13 +13190,13 @@
 msgstr "Parole"
 
 #: ../menu-data/parsec47:parsec47.desktop.in.h:1
-msgid "Kenta Cho's PARSEC47"
-msgstr "PARSEC47 par Kenta Cho"
-
-#: ../menu-data/parsec47:parsec47.desktop.in.h:2
 msgid "PARSEC47"
 msgstr "PARSEC47"
 
+#: ../menu-data/parsec47:parsec47.desktop.in.h:2
+msgid "Kenta Cho's PARSEC47"
+msgstr "PARSEC47 par Kenta Cho"
+
 #: ../menu-data/partitionmanager:kde4__partitionmanager.desktop.in.h:1
 msgid "KDE Partition Manager"
 msgstr "Gestionnaire de partition de disque pou KDE"
@@ -13048,6 +13205,14 @@
 msgid "Manage disks, partitions and file systems"
 msgstr "Gérer les disques, les partitions et les systèmes de fichiers"
 
+#: ../menu-data/pasaffe:pasaffe.desktop.in.h:1
+msgid "Pasaffe"
+msgstr "Pasaffe"
+
+#: ../menu-data/pasaffe:pasaffe.desktop.in.h:2
+msgid "Pasaffe password manager"
+msgstr "Gestionnaire de mot de passe Pasaffe"
+
 #: ../menu-data/passage:passage.desktop.in.h:1
 msgid "Passage"
 msgstr "Passage"
@@ -13065,23 +13230,23 @@
 msgstr "un gestionnaire de mots de passe"
 
 #: ../menu-data/patchage:patchage.desktop.in.h:1
+msgid "Patchage"
+msgstr "Patchage"
+
+#: ../menu-data/patchage:patchage.desktop.in.h:2
 msgid ""
 "Connect audio and MIDI applications together and manage audio sessions"
 msgstr ""
 "Connecter ensemble des applications audio et MIDI et gérer les sessions audio"
 
-#: ../menu-data/patchage:patchage.desktop.in.h:2
-msgid "Patchage"
-msgstr "Patchage"
-
 #: ../menu-data/pathogen:pathogen.desktop.in.h:1
-msgid "Destroy the pathogens"
-msgstr "Détruire les agents pathogènes"
-
-#: ../menu-data/pathogen:pathogen.desktop.in.h:2
 msgid "Pathogen"
 msgstr "Pathogen"
 
+#: ../menu-data/pathogen:pathogen.desktop.in.h:2
+msgid "Destroy the pathogens"
+msgstr "Détruire les agents pathogènes"
+
 #: ../menu-data/pathological:pathological.desktop.in.h:1
 msgid "Pathological"
 msgstr "Pathological"
@@ -13091,37 +13256,37 @@
 msgstr "Résoudre des casse-têtes mettant en jeu chemins et billes"
 
 #: ../menu-data/pauker:pauker.desktop.in.h:1
-msgid "Generic card based learning program"
-msgstr "Programme d'apprentissage générique basé sur des cartes"
-
-#: ../menu-data/pauker:pauker.desktop.in.h:2
 msgid "Pauker"
 msgstr "Pauker"
 
-#: ../menu-data/pavucontrol:pavucontrol.desktop.in.h:1
-msgid "Adjust the volume level"
-msgstr "Ajuster le niveau du volume sonore"
+#: ../menu-data/pauker:pauker.desktop.in.h:2
+msgid "Generic card based learning program"
+msgstr "Programme d'apprentissage générique basé sur des cartes"
 
-#: ../menu-data/pavucontrol:pavucontrol.desktop.in.h:2
+#: ../menu-data/pavucontrol:pavucontrol.desktop.in.h:1
 msgid "PulseAudio Volume Control"
 msgstr "Contrôleur de volume PulseAudio"
 
-#: ../menu-data/pavumeter:pavumeter.desktop.in.h:1
-msgid "Monitor the output volume"
-msgstr "Contrôler le volume de sortie."
+#: ../menu-data/pavucontrol:pavucontrol.desktop.in.h:2
+msgid "Adjust the volume level"
+msgstr "Ajuster le niveau du volume sonore"
 
-#: ../menu-data/pavumeter:pavumeter.desktop.in.h:2
+#: ../menu-data/pavumeter:pavumeter.desktop.in.h:1
 msgid "PulseAudio Volume Meter (Playback)"
 msgstr "Contrôleur de volume PulseAudio (Lecture)"
 
-#: ../menu-data/paw++:paw++.desktop.in.h:1
-msgid "Analyze and graphically present experimental data"
-msgstr "Analyser et présenter graphiquement les données expérimentales."
+#: ../menu-data/pavumeter:pavumeter.desktop.in.h:2
+msgid "Monitor the output volume"
+msgstr "Contrôler le volume de sortie."
 
-#: ../menu-data/paw++:paw++.desktop.in.h:2
+#: ../menu-data/paw++:paw++.desktop.in.h:1
 msgid "Paw++ (Physics Analysis Workstation)"
 msgstr "Station de travail pour analyses physiques « Paw++ »"
 
+#: ../menu-data/paw++:paw++.desktop.in.h:2
+msgid "Analyze and graphically present experimental data"
+msgstr "Analyser et présenter graphiquement les données expérimentales."
+
 #: ../menu-data/pcalendar:pcalendar.desktop.in.h:1
 msgid "Periodic Calendar"
 msgstr "Calendrier périodique"
@@ -13134,14 +13299,14 @@
 "fertilité"
 
 #: ../menu-data/pcb-common:pcb.desktop.in.h:1
-msgid "Create and edit printed circuit board designs"
-msgstr "Créer et éditer des dessins de circuits imprimés."
-
-#: ../menu-data/pcb-common:pcb.desktop.in.h:2
 msgid "PCB Designer"
 msgstr "PCB Designer"
 
-#: ../menu-data/pcmanfm:pcmanfm.desktop.in.h:1
+#: ../menu-data/pcb-common:pcb.desktop.in.h:2
+msgid "Create and edit printed circuit board designs"
+msgstr "Créer et éditer des dessins de circuits imprimés."
+
+#: ../menu-data/pcmanfm:pcmanfm.desktop.in.h:2
 msgid "Browse the file system and manage the files"
 msgstr "Naviguer dans les fichiers système et gérer les fichiers."
 
@@ -13170,16 +13335,23 @@
 msgid "Sony PlayStation emulator"
 msgstr "Emulateur de Sony Playstation"
 
-#: ../menu-data/pdfchain:pdfchain.desktop.in.h:1
-msgid "GUI for PDFTK - A graphical tool for manipulating PDF"
-msgstr ""
-"Interface graphique pour PDFTK - Un outil graphique pour manipuler les "
-"fichiers PDF"
+#: ../menu-data/pdf-presenter-console:pdf-presenter-console.desktop.in.h:1
+msgid "PDF Presenter Console"
+msgstr "Console de Présentation PDF"
+
+#: ../menu-data/pdf-presenter-console:pdf-presenter-console.desktop.in.h:2
+msgid "Presentation program for PDF files"
+msgstr "Programme de présentation pour les fichiers PDF"
 
-#: ../menu-data/pdfchain:pdfchain.desktop.in.h:2
+#: ../menu-data/pdfchain:pdfchain.desktop.in.h:1
 msgid "PDF Chain"
 msgstr "PDF Chain"
 
+#: ../menu-data/pdfchain:pdfchain.desktop.in.h:2
+msgid "GUI for the PDFTK - A graphical tool for manipulating PDF"
+msgstr ""
+"Interface graphique pour PDFTK - Un outil graphique pour modifier des PDF"
+
 #: ../menu-data/pdfedit:pdfedit.desktop.in.h:1
 msgid "PDF Editor"
 msgstr "Éditeur de PDF"
@@ -13193,30 +13365,30 @@
 msgstr "Supprimer, extraire et pivoter les pages des documents PDF"
 
 #: ../menu-data/pdfsam:pdfsam.desktop.in.h:1
-msgid "A tool to split and merge pdf documents"
-msgstr "Un outil pour découper et assembler des documents pdf"
-
-#: ../menu-data/pdfsam:pdfsam.desktop.in.h:2
 msgid "pdfsam"
 msgstr "pdfsam"
 
+#: ../menu-data/pdfsam:pdfsam.desktop.in.h:2
+msgid "A tool to split and merge pdf documents"
+msgstr "Un outil pour découper et assembler des documents pdf"
+
 #: ../menu-data/pdfshuffler:pdfshuffler.desktop.in.h:1
+msgid "PDF-Shuffler"
+msgstr "PDF-Shuffler"
+
+#: ../menu-data/pdfshuffler:pdfshuffler.desktop.in.h:2
 msgid "PDF Merging, Rearranging, Splitting, Rotating and Cropping"
 msgstr ""
 "Fusion, fractionnement, réarrangement, rotation et recadrage de documents PDF"
 
-#: ../menu-data/pdfshuffler:pdfshuffler.desktop.in.h:2
-msgid "PDF-Shuffler"
-msgstr "PDF-Shuffler"
-
 #: ../menu-data/peg-e:peg-e.desktop.in.h:1
-msgid "Peg elimination game"
-msgstr "Jeu d'élimination Peg"
-
-#: ../menu-data/peg-e:peg-e.desktop.in.h:2
 msgid "Peg-E"
 msgstr "Peg-E"
 
+#: ../menu-data/peg-e:peg-e.desktop.in.h:2
+msgid "Peg elimination game"
+msgstr "Jeu d'élimination Peg"
+
 #: ../menu-data/peg-solitaire:peg-solitaire.desktop.in.h:1
 msgid "Peg-Solitaire"
 msgstr "Peg-Solitaire"
@@ -13230,86 +13402,86 @@
 msgstr "Jeu de casse-tête éducatif semblable à Hi-Q"
 
 #: ../menu-data/pencil:pencil.desktop.in.h:1
-msgid "Draw cartoons"
-msgstr "Faire des dessins animés"
-
-#: ../menu-data/pencil:pencil.desktop.in.h:2
 msgid "Pencil"
 msgstr "Pencil"
 
-#: ../menu-data/penguin-command:penguin-command.desktop.in.h:1
-msgid "A Missile Command clone"
-msgstr "Un clone de Missile Command"
+#: ../menu-data/pencil:pencil.desktop.in.h:2
+msgid "Draw cartoons"
+msgstr "Faire des dessins animés"
 
-#: ../menu-data/penguin-command:penguin-command.desktop.in.h:2
+#: ../menu-data/penguin-command:penguin-command.desktop.in.h:1
 msgid "Penguin Command"
 msgstr "Penguin Command"
 
-#: ../menu-data/penguintv:penguintv.desktop.in.h:1
-msgid "Aggregates rss feeds, podcasts, and video blogs"
-msgstr "Agréger les flux RSS, les podscasts, et les blogs vidéo"
+#: ../menu-data/penguin-command:penguin-command.desktop.in.h:2
+msgid "A Missile Command clone"
+msgstr "Un clone de Missile Command"
 
-#: ../menu-data/penguintv:penguintv.desktop.in.h:2
+#: ../menu-data/penguintv:penguintv.desktop.in.h:1
 msgid "PenguinTV Media Aggregator"
 msgstr "Agrégateur « PenguinTV Media »"
 
+#: ../menu-data/penguintv:penguintv.desktop.in.h:2
+msgid "Aggregates rss feeds, podcasts, and video blogs"
+msgstr "Agréger les flux RSS, les podscasts, et les blogs vidéo"
+
 #: ../menu-data/pente:pente.desktop.in.h:1
+msgid "Pente"
+msgstr "Pente"
+
+#: ../menu-data/pente:pente.desktop.in.h:2
 msgid "Five in a row game for X"
 msgstr "Jeu cinq en ligne pour X"
 
-#: ../menu-data/pente:pente.desktop.in.h:2
-msgid "Pente"
-msgstr "Pente"
+#: ../menu-data/pentobi:pentobi.desktop.in.h:1
+msgid "Pentobi"
+msgstr "Pentobi"
+
+#: ../menu-data/pentobi:pentobi.desktop.in.h:2
+msgid "Computer program that plays the board game Blokus"
+msgstr "Une application qui permet de jouer au jeu de plateau Blokus."
 
 #: ../menu-data/performous:performous.desktop.in.h:1
-msgid "A karaoke game"
-msgstr "Un jeu de Karaoke"
-
-#: ../menu-data/performous:performous.desktop.in.h:2
 msgid "Performous"
 msgstr "Performous"
 
-#: ../menu-data/perlprimer:perlprimer.desktop.in.h:1
-msgid "Graphical design of primers for PCR and sequencing"
-msgstr "Conception graphique d'amorces pour l'ACP (PCR) ou le séquençage"
+#: ../menu-data/performous:performous.desktop.in.h:2
+msgid "A karaoke game"
+msgstr "Un jeu de Karaoke"
 
-#: ../menu-data/perlprimer:perlprimer.desktop.in.h:2
+#: ../menu-data/perlprimer:perlprimer.desktop.in.h:1
 msgid "PerlPrimer"
 msgstr "PerlPrimer"
 
-#: ../menu-data/perroquet:perroquet.desktop.in.h:1
-msgid "Oral comprehension teacher"
-msgstr "Assistant à la compréhension orale"
+#: ../menu-data/perlprimer:perlprimer.desktop.in.h:2
+msgid "Graphical design of primers for PCR and sequencing"
+msgstr "Conception graphique d'amorces pour l'ACP (PCR) ou le séquençage"
 
-#: ../menu-data/perroquet:perroquet.desktop.in.h:2
+#: ../menu-data/perroquet:perroquet.desktop.in.h:1
 msgid "Perroquet"
 msgstr "Perroquet"
 
-#: ../menu-data/pessulus:pessulus.desktop.in.h:1
-msgid "Configure the lockdown policy"
-msgstr "Configurer la politique de verrouillage"
-
-#: ../menu-data/pessulus:pessulus.desktop.in.h:2
-msgid "Lockdown Editor"
-msgstr "Éditeur de verrous"
+#: ../menu-data/perroquet:perroquet.desktop.in.h:2
+msgid "Oral comprehension teacher"
+msgstr "Assistant à la compréhension orale"
 
 #: ../menu-data/petri-foo:petri-foo.desktop.in.h:1
 msgid "Petri-foo"
 msgstr "Petri-foo"
 
 #: ../menu-data/petri-foo:petri-foo.desktop.in.h:2
-#: ../menu-data/specimen:specimen.desktop.in.h:1
+#: ../menu-data/specimen:specimen.desktop.in.h:2
 msgid "Sound Sampler"
 msgstr "Échantillonneur de sons"
 
 #: ../menu-data/pgadmin3:pgadmin3.desktop.in.h:1
-msgid "PostgreSQL Administration Tool"
-msgstr "Outil d'administration PostgreSQL"
-
-#: ../menu-data/pgadmin3:pgadmin3.desktop.in.h:2
 msgid "pgAdmin III"
 msgstr "pgAdmin III"
 
+#: ../menu-data/pgadmin3:pgadmin3.desktop.in.h:2
+msgid "PostgreSQL Administration Tool"
+msgstr "Outil d'administration PostgreSQL"
+
 #: ../menu-data/phasex:phasex.desktop.in.h:1
 msgid "PHASEX"
 msgstr "PHASEX"
@@ -13319,12 +13491,20 @@
 msgstr "PHASEX - synthétiseur logiciel"
 
 #: ../menu-data/phatch:phatch.desktop.in.h:1
+msgid "Phatch PHoto bATCH Processor"
+msgstr "Traitement par lot Phatch PHoto bATCH"
+
+#: ../menu-data/phatch:phatch.desktop.in.h:2
 msgid "Easily batch process images and edit metadata"
 msgstr "Traiter par lots les images et modifier les métadonnées facilement"
 
-#: ../menu-data/phatch:phatch.desktop.in.h:2
-msgid "Phatch PHoto bATCH Processor"
-msgstr "Traitement par lot Phatch PHoto bATCH"
+#: ../menu-data/phlipple:phlipple.desktop.in.h:1
+msgid "Phlipple"
+msgstr "Phlipple"
+
+#: ../menu-data/phlipple:phlipple.desktop.in.h:2
+msgid "Phlipping squares will never be the same again"
+msgstr ""
 
 #: ../menu-data/phoronix-test-suite:phoronix-test-suite.desktop.in.h:1
 msgid "Phoronix Test Suite"
@@ -13336,22 +13516,30 @@
 "Utilitaire d'évaluation des performances de la suite de tests Phoronix"
 
 #: ../menu-data/photofilmstrip:photofilmstrip.desktop.in.h:1
-msgid "Create animated slideshows"
-msgstr "Créer des diaporamas animés"
-
-#: ../menu-data/photofilmstrip:photofilmstrip.desktop.in.h:2
 msgid "PhotoFilmStrip"
 msgstr "PhotoFilmStrip"
 
-#: ../menu-data/photoprint:fotoprint.desktop.in.h:1
-msgid "Color managed printing of multiple photos on single page"
-msgstr "Impression en couleurs de plusieurs photos sur une seule page"
+#: ../menu-data/photofilmstrip:photofilmstrip.desktop.in.h:2
+msgid "Create animated slideshows"
+msgstr "Créer des diaporamas animés"
 
 #. Encoding=UTF-8
-#: ../menu-data/photoprint:fotoprint.desktop.in.h:3
+#: ../menu-data/photoprint:fotoprint.desktop.in.h:2
 msgid "PhotoPrint"
 msgstr "PhotoPrint"
 
+#: ../menu-data/photoprint:fotoprint.desktop.in.h:3
+msgid "Color managed printing of multiple photos on single page"
+msgstr "Impression en couleurs de plusieurs photos sur une seule page"
+
+#: ../menu-data/pianobooster:pianobooster.desktop.in.h:1
+msgid "Piano Booster"
+msgstr "Piano Booster"
+
+#: ../menu-data/pianobooster:pianobooster.desktop.in.h:2
+msgid "Learn the piano just by playing a game"
+msgstr "Apprenez à jouer du piano en jouant à un jeu"
+
 #: ../menu-data/picard:picard.desktop.in.h:1
 msgid "MusicBrainz Picard"
 msgstr "MusicBrainz Picard"
@@ -13369,16 +13557,16 @@
 msgstr "Application de développement intégré pour Python « PIDA »"
 
 #: ../menu-data/pidgin:pidgin.desktop.in.h:1
+msgid "Pidgin Internet Messenger"
+msgstr "Messagerie instantanée Pidgin"
+
+#: ../menu-data/pidgin:pidgin.desktop.in.h:2
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
 "Conversation par messages instantanés. Prend en charge AIM, Google Talk, "
 "Jabber/XMPP, MSN, Yahoo et d'autres"
 
-#: ../menu-data/pidgin:pidgin.desktop.in.h:2
-msgid "Pidgin Internet Messenger"
-msgstr "Messagerie instantanée Pidgin"
-
 #: ../menu-data/pinball:pinball.desktop.in.h:1
 msgid "Emilia Pinball"
 msgstr "Flipper Emilia Pinball"
@@ -13388,21 +13576,21 @@
 msgstr "Jeu de flipper OpenGL"
 
 #: ../menu-data/pingus:pingus.desktop.in.h:1
-msgid "Guide a horde of penguins through various obstacles"
-msgstr "Guider une horde de manchots au travers de divers obstacles"
-
-#: ../menu-data/pingus:pingus.desktop.in.h:2
 msgid "Pingus"
 msgstr "Pingus"
 
-#: ../menu-data/pino:pino.desktop.in.h:1
-msgid "Fast, easy, and free Twitter and Identi.ca client"
-msgstr "Client rapide, simple et libre pour Twitter et Identi.ca"
+#: ../menu-data/pingus:pingus.desktop.in.h:2
+msgid "Guide a horde of penguins through various obstacles"
+msgstr "Guider une horde de manchots au travers de divers obstacles"
 
-#: ../menu-data/pino:pino.desktop.in.h:2
+#: ../menu-data/pino:pino.desktop.in.h:1
 msgid "Pino - Twitter and Identi.ca client"
 msgstr "Pino - Client Twitter et Identi.ca"
 
+#: ../menu-data/pino:pino.desktop.in.h:2
+msgid "Fast, easy, and free Twitter and Identi.ca client"
+msgstr "Client rapide, simple et libre pour Twitter et Identi.ca"
+
 #: ../menu-data/pinot:pinot.desktop.in.h:1
 msgid "Pinot Metasearch Tool"
 msgstr "Outil de méta-recherche Pinot"
@@ -13428,13 +13616,13 @@
 msgstr "Jouer à une partie de Pioneers"
 
 #: ../menu-data/pipewalker:pipewalker.desktop.in.h:1
-msgid "Connect all hosts to network!"
-msgstr "Connectez tous les hôtes au réseau !"
-
-#: ../menu-data/pipewalker:pipewalker.desktop.in.h:2
 msgid "PipeWalker"
 msgstr "PipeWalker"
 
+#: ../menu-data/pipewalker:pipewalker.desktop.in.h:2
+msgid "Connect all hosts to network!"
+msgstr "Connectez tous les hôtes au réseau !"
+
 #: ../menu-data/pithos:pithos.desktop.in.h:1
 msgid "Pithos"
 msgstr "Pithos"
@@ -13444,38 +13632,42 @@
 msgstr "Lire de la musique avec Pandora Radio"
 
 #: ../menu-data/pitivi:pitivi.desktop.in.h:1
-msgid "Create and edit your own movies"
-msgstr "Créer et modifier vos propres vidéos"
-
-#: ../menu-data/pitivi:pitivi.desktop.in.h:2
 msgid "Pitivi Video Editor"
 msgstr "Éditeur vidéo Pitivi"
 
-#: ../menu-data/pixbros:pixbros.desktop.in.h:1
-msgid "2D game inspired in Bubble Bobble, Snow Bros and Tumble Pop"
-msgstr "Jeu en 2d s'inspirant de Bubble Bobble, Snow Bros et Tumble Pop"
+#: ../menu-data/pitivi:pitivi.desktop.in.h:2
+msgid "Create and edit your own movies"
+msgstr "Créer et modifier vos propres vidéos"
 
-#: ../menu-data/pixbros:pixbros.desktop.in.h:2
+#: ../menu-data/pixbros:pixbros.desktop.in.h:1
 msgid "PIX Bros"
 msgstr "PIX Bros"
 
-#: ../menu-data/pixelize:pixelize.desktop.in.h:1
-msgid "Create an image consisting of many small images"
-msgstr "Créer une image constituée de nombreuses petites images"
+#: ../menu-data/pixbros:pixbros.desktop.in.h:2
+msgid "2D game inspired in Bubble Bobble, Snow Bros and Tumble Pop"
+msgstr "Jeu en 2d s'inspirant de Bubble Bobble, Snow Bros et Tumble Pop"
 
-#: ../menu-data/pixelize:pixelize.desktop.in.h:2
+#: ../menu-data/pixelize:pixelize.desktop.in.h:1
 msgid "Pixelize"
 msgstr "Pixelize"
 
-#: ../menu-data/pixfrogger:pixfrogger.desktop.in.h:1
-msgid "Help the frog cross the street"
-msgstr "Aider les grenouilles à traverser la rue."
+#: ../menu-data/pixelize:pixelize.desktop.in.h:2
+msgid "Create an image consisting of many small images"
+msgstr "Créer une image constituée de nombreuses petites images"
 
-#: ../menu-data/pixfrogger:pixfrogger.desktop.in.h:2
+#: ../menu-data/pixfrogger:pixfrogger.desktop.in.h:1
 msgid "PIX Frogger"
 msgstr "PIX Frogger"
 
+#: ../menu-data/pixfrogger:pixfrogger.desktop.in.h:2
+msgid "Help the frog cross the street"
+msgstr "Aider les grenouilles à traverser la rue."
+
 #: ../menu-data/planets:planets.desktop.in.h:1
+msgid "Planets"
+msgstr "Planètes"
+
+#: ../menu-data/planets:planets.desktop.in.h:2
 msgid ""
 "A simple interactive program for playing with simulations of planetary "
 "systems"
@@ -13483,78 +13675,74 @@
 "Un programme interactif simple pour jouer avec des simulations de systèmes "
 "planétaires."
 
-#: ../menu-data/planets:planets.desktop.in.h:2
-msgid "Planets"
-msgstr "Planètes"
-
-#: ../menu-data/planner:planner.desktop.in.h:1
+#: ../menu-data/planner:planner.desktop.in.h:2
 msgid "Planner Project Management"
 msgstr "Gestionnaire de projets Planner"
 
 #: ../menu-data/plasma-scriptengine-superkaramba:kde4__superkaramba.desktop.in.h:1
-msgid "An engine for cool desktop eyecandy."
-msgstr "Un moteur pour ajouter des applets sur le bureau"
-
-#: ../menu-data/plasma-scriptengine-superkaramba:kde4__superkaramba.desktop.in.h:2
 msgid "SuperKaramba"
 msgstr "SuperKaramba"
 
+#: ../menu-data/plasma-scriptengine-superkaramba:kde4__superkaramba.desktop.in.h:2
+msgid "An engine for cool desktop eyecandy."
+msgstr "Un moteur pour ajouter des applets sur le bureau"
+
 #: ../menu-data/playitslowly:playitslowly.desktop.in.h:1
+msgid "Play it Slowly"
+msgstr "Play it Slowly"
+
+#: ../menu-data/playitslowly:playitslowly.desktop.in.h:2
 msgid "A tool to play back a piece of music at a different speed or pitch"
 msgstr ""
 "Un outil pour rejouer un partie d'un morceau à une vitesse ou un rythme "
 "différent"
 
-#: ../menu-data/playitslowly:playitslowly.desktop.in.h:2
-msgid "Play it Slowly"
-msgstr "Play it Slowly"
-
 #: ../menu-data/playonlinux:PlayOnLinux.desktop.in.h:1
 msgid "PlayOnLinux"
 msgstr "PlayOnLinux"
 
 #: ../menu-data/plee-the-bear:plee-the-bear.desktop.in.h:1
+msgid "Plee the Bear"
+msgstr "Plee the Bear"
+
+#: ../menu-data/plee-the-bear:plee-the-bear.desktop.in.h:2
 msgid "Catch your son, he ate all the honey then ran away"
 msgstr ""
 "Attrapez votre fils, il a mangé tout le miel puis il est parti en courant"
 
-#: ../menu-data/plee-the-bear:plee-the-bear.desktop.in.h:2
-msgid "Plee the Bear"
-msgstr "Plee the Bear"
-
 #: ../menu-data/ploader:ploader.desktop.in.h:1
+msgid "pLoader"
+msgstr "pLoader"
+
+#: ../menu-data/ploader:ploader.desktop.in.h:2
 msgid "application to upload your pictures to your Piwigo gallery"
 msgstr ""
 "Application pour envoyer vos photos vers votre galerie en ligne Piwigo"
 
-#: ../menu-data/ploader:ploader.desktop.in.h:2
-msgid "pLoader"
-msgstr "pLoader"
-
 #: ../menu-data/plopfolio.app:PlopFolio.desktop.in.h:1
-msgid "Personal dashboard for GNUstep"
-msgstr "Tableau de bord personnel pour GNUstep"
-
-#: ../menu-data/plopfolio.app:PlopFolio.desktop.in.h:2
 msgid "PlopFolio"
 msgstr "PlopFolio"
 
-#: ../menu-data/plotdrop:plotdrop.desktop.in.h:1
-msgid "Drag and Drop graph plotting"
-msgstr "Construction de graphes par glisser-déposer"
+#: ../menu-data/plopfolio.app:PlopFolio.desktop.in.h:2
+msgid "Personal dashboard for GNUstep"
+msgstr "Tableau de bord personnel pour GNUstep"
 
-#: ../menu-data/plotdrop:plotdrop.desktop.in.h:2
+#: ../menu-data/plotdrop:plotdrop.desktop.in.h:1
 msgid "PlotDrop"
 msgstr "PlotDrop"
 
-#: ../menu-data/podbrowser:podbrowser.desktop.in.h:1
-msgid "Browse Perl Documentation"
-msgstr "Naviguer dans la documentation Perl"
+#: ../menu-data/plotdrop:plotdrop.desktop.in.h:2
+msgid "Drag and Drop graph plotting"
+msgstr "Construction de graphes par glisser-déposer"
 
-#: ../menu-data/podbrowser:podbrowser.desktop.in.h:2
+#: ../menu-data/podbrowser:podbrowser.desktop.in.h:1
 msgid "Pod Browser"
 msgstr "Pod Browser"
 
+#: ../menu-data/podbrowser:podbrowser.desktop.in.h:2
+msgid "Browse Perl Documentation"
+msgstr "Naviguer dans la documentation Perl"
+
 #: ../menu-data/poe.app:Poe.desktop.in.h:1
 msgid "Poe"
 msgstr "Poe"
@@ -13564,13 +13752,13 @@
 msgstr "Éditeur de commentaires pour fichiers Vorbis"
 
 #: ../menu-data/poedit:poedit.desktop.in.h:1
-msgid "Gettext catalogs editor"
-msgstr "Éditeur de fichiers .po (Gettext)"
-
-#: ../menu-data/poedit:poedit.desktop.in.h:2
 msgid "Poedit"
 msgstr "Poedit"
 
+#: ../menu-data/poedit:poedit.desktop.in.h:2
+msgid "Gettext catalogs editor"
+msgstr "Éditeur de fichiers .po (Gettext)"
+
 #: ../menu-data/pokerth:pokerth.desktop.in.h:1
 msgid "PokerTH"
 msgstr "PokerTH"
@@ -13580,37 +13768,37 @@
 msgstr "Jeu de poker Texas hold'em"
 
 #: ../menu-data/pondus:pondus.desktop.in.h:1
-msgid "Keep track of your weight"
-msgstr "Suivez l'évolution de votre poids"
-
-#: ../menu-data/pondus:pondus.desktop.in.h:2
 msgid "Pondus"
 msgstr "Pondus"
 
-#: ../menu-data/pornview:Graphics__pornview.desktop.in.h:1
-msgid "Photo/Movie collection manager"
-msgstr "Gestionnaire de collection de photos/films"
+#: ../menu-data/pondus:pondus.desktop.in.h:2
+msgid "Keep track of your weight"
+msgstr "Suivez l'évolution de votre poids"
 
-#: ../menu-data/pornview:Graphics__pornview.desktop.in.h:2
+#: ../menu-data/pornview:Graphics__pornview.desktop.in.h:1
 msgid "PornView"
 msgstr "PornView"
 
-#: ../menu-data/posterazor:posterazor.desktop.in.h:1
-msgid "Cuts a raster image into multipage PDF documents"
-msgstr "Découper une image bitmap en documents PDF sur plusieurs pages"
+#: ../menu-data/pornview:Graphics__pornview.desktop.in.h:2
+msgid "Photo/Movie collection manager"
+msgstr "Gestionnaire de collection de photos/films"
 
-#: ../menu-data/posterazor:posterazor.desktop.in.h:2
+#: ../menu-data/posterazor:posterazor.desktop.in.h:1
 msgid "PosteRazor"
 msgstr "PosteRazor"
 
-#: ../menu-data/postler:postler.desktop.in.h:1
-msgid "Lean mail interface"
-msgstr "Client mail léger"
+#: ../menu-data/posterazor:posterazor.desktop.in.h:2
+msgid "Cuts a raster image into multipage PDF documents"
+msgstr "Découper une image bitmap en documents PDF sur plusieurs pages"
 
-#: ../menu-data/postler:postler.desktop.in.h:2
+#: ../menu-data/postler:postler.desktop.in.h:1
 msgid "Postler"
 msgstr "Postler"
 
+#: ../menu-data/postler:postler.desktop.in.h:2
+msgid "Lean mail interface"
+msgstr "Client mail léger"
+
 #: ../menu-data/postr:postr.desktop.in.h:1
 msgid "Flickr Uploader"
 msgstr "Envoi vers Flickr"
@@ -13620,39 +13808,39 @@
 msgstr "Transférer des photos à Flickr"
 
 #: ../menu-data/pouetchess:pouetChess.desktop.in.h:1
+msgid "pouetChess"
+msgstr "Jeux d'échecs pouetChess"
+
+#: ../menu-data/pouetchess:pouetChess.desktop.in.h:2
 msgid "Play a game of chess, either against another player or against the AI"
 msgstr ""
 "Jouer à un jeu d'échecs contre un joueur ou contre l'intelligence "
 "artificielle."
 
-#: ../menu-data/pouetchess:pouetChess.desktop.in.h:2
-msgid "pouetChess"
-msgstr "Jeux d'échecs pouetChess"
-
 #: ../menu-data/powder:powder.desktop.in.h:1
-msgid "Graphical dungeon crawling game"
-msgstr "Jeu graphique d'exploration de donjons"
-
-#: ../menu-data/powder:powder.desktop.in.h:2
 msgid "Powder"
 msgstr "Powder"
 
-#: ../menu-data/powermanga:powermanga.desktop.in.h:1
-msgid "Play a vertical shoot 'em up game"
-msgstr "Jouer à un jeu de tir vertical"
+#: ../menu-data/powder:powder.desktop.in.h:2
+msgid "Graphical dungeon crawling game"
+msgstr "Jeu graphique d'exploration de donjons"
 
-#: ../menu-data/powermanga:powermanga.desktop.in.h:2
+#: ../menu-data/powermanga:powermanga.desktop.in.h:1
 msgid "Powermanga"
 msgstr "Powermanga"
 
-#: ../menu-data/pptview:pptview.desktop.in.h:1
-msgid "PowerPoint Viewer"
-msgstr "Visionneuse PowerPoint Viewer"
+#: ../menu-data/powermanga:powermanga.desktop.in.h:2
+msgid "Play a vertical shoot 'em up game"
+msgstr "Jouer à un jeu de tir vertical"
 
-#: ../menu-data/pptview:pptview.desktop.in.h:2
+#: ../menu-data/pptview:pptview.desktop.in.h:1
 msgid "View PowerPoint presentations"
 msgstr "Afficher des présentations PowerPoint"
 
+#: ../menu-data/pptview:pptview.desktop.in.h:2
+msgid "PowerPoint Viewer"
+msgstr "Visionneuse PowerPoint Viewer"
+
 #: ../menu-data/pq:pq.desktop.in.h:1
 msgid "Progress Quest"
 msgstr "Progress Quest"
@@ -13662,30 +13850,39 @@
 msgstr "Regarder votre personnage d'heroic-fantasy évoluer"
 
 #: ../menu-data/praat:praat.desktop.in.h:1
-msgid "Analyze, synthesize and manipulate speech"
-msgstr "Analyser, synthétiser et manipuler la voix"
-
-#: ../menu-data/praat:praat.desktop.in.h:2
 msgid "Praat Speech Analyzer"
 msgstr "Analyseur vocal Praat"
 
-#: ../menu-data/prefixsuffix:prefixsuffix.desktop.in.h:1
-msgid "Batch renaming of files."
-msgstr "Renommer les fichiers par lot"
+#: ../menu-data/praat:praat.desktop.in.h:2
+msgid "Analyze, synthesize and manipulate speech"
+msgstr "Analyser, synthétiser et manipuler la voix"
 
-#: ../menu-data/prefixsuffix:prefixsuffix.desktop.in.h:2
+#: ../menu-data/prefixsuffix:prefixsuffix.desktop.in.h:1
 msgid "PrefixSuffix"
 msgstr "PrefixSuffix"
 
+#: ../menu-data/prefixsuffix:prefixsuffix.desktop.in.h:2
+msgid "Batch renaming of files."
+msgstr "Renommer les fichiers par lot"
+
 #: ../menu-data/prelude-notify:prelude-notify.desktop.in.h:1
+msgid "prelude-notify"
+msgstr "prelude-notify"
+
+#: ../menu-data/prelude-notify:prelude-notify.desktop.in.h:2
 msgid "Graphical notification applet for prelude"
 msgstr "Applet de notification pour Prelude"
 
-#: ../menu-data/prelude-notify:prelude-notify.desktop.in.h:2
-msgid "prelude-notify"
-msgstr "prelude-notify"
+#: ../menu-data/prerex:prerex.desktop.in.h:1
+msgid "prerex"
+msgstr "prerex"
+
+#: ../menu-data/prerex:prerex.desktop.in.h:2
+#: ../menu-data/vprerex:vprerex.desktop.in.h:2
+msgid "Edit course prerequisite charts"
+msgstr ""
 
-#: ../menu-data/preview.app:Preview.desktop.in.h:2
+#: ../menu-data/preview.app:Preview.desktop.in.h:1
 msgid "Preview"
 msgstr "Aperçu"
 
@@ -13700,13 +13897,13 @@
 "précise d'images bitmap"
 
 #: ../menu-data/primrose:primrose.desktop.in.h:1
-msgid "Captivating tile-clearing puzzle game"
-msgstr "Jeu de casse-tête captivant d'élimination de tuiles"
-
-#: ../menu-data/primrose:primrose.desktop.in.h:2
 msgid "Primrose"
 msgstr "Primrose"
 
+#: ../menu-data/primrose:primrose.desktop.in.h:2
+msgid "Captivating tile-clearing puzzle game"
+msgstr "Jeu de casse-tête captivant d'élimination de tuiles"
+
 #: ../menu-data/project-x:projectx.desktop.in.h:1
 msgid "A video editing and demultiplexing tool"
 msgstr "Un outil d'édition et de démultiplexage vidéo"
@@ -13724,39 +13921,39 @@
 msgstr "Environnement de développement intégré (EDI) officiel pour GNUstep"
 
 #: ../menu-data/projectl:projectl.desktop.in.h:1
-msgid "HIZ's ProjectL"
-msgstr "HIZ's ProjectL"
-
-#: ../menu-data/projectl:projectl.desktop.in.h:2
 msgid "ProjectL"
 msgstr "ProjectL"
 
+#: ../menu-data/projectl:projectl.desktop.in.h:2
+msgid "HIZ's ProjectL"
+msgstr "HIZ's ProjectL"
+
 #: ../menu-data/projectm-jack:projectM-jack.desktop.in.h:1
+msgid "projectM Jack Audio Visualization"
+msgstr "projectM - visualisation de flux audio JACK"
+
+#: ../menu-data/projectm-jack:projectM-jack.desktop.in.h:2
 msgid ""
 "A milkdrop based music visualizer visualizing JackAudio streams on a Qt4 GUI"
 msgstr ""
 "Un afficheur de flux audio JACK compatible avec Milkdrop. Interface Qt4."
 
-#: ../menu-data/projectm-jack:projectM-jack.desktop.in.h:2
-msgid "projectM Jack Audio Visualization"
-msgstr "projectM - visualisation de flux audio JACK"
-
 #: ../menu-data/projectm-pulseaudio:projectM-pulseaudio.desktop.in.h:1
-msgid "Visualization of PulseAudio streams with projectM"
-msgstr "Visualisation de flux audio PulseAudio avec projectM"
-
-#: ../menu-data/projectm-pulseaudio:projectM-pulseaudio.desktop.in.h:2
 msgid "projectM PulseAudio Visualization"
 msgstr "projectM - visualisation de flux audio PulseAudio"
 
-#: ../menu-data/projectmanager.app:ProjectManager.desktop.in.h:1
-msgid "IDE for GNUstep"
-msgstr "Environnement de développement pour GNUstep"
+#: ../menu-data/projectm-pulseaudio:projectM-pulseaudio.desktop.in.h:2
+msgid "Visualization of PulseAudio streams with projectM"
+msgstr "Visualisation de flux audio PulseAudio avec projectM"
 
-#: ../menu-data/projectmanager.app:ProjectManager.desktop.in.h:2
+#: ../menu-data/projectmanager.app:ProjectManager.desktop.in.h:1
 msgid "Project Manager IDE"
 msgstr "EDI de gestion de projet"
 
+#: ../menu-data/projectmanager.app:ProjectManager.desktop.in.h:2
+msgid "IDE for GNUstep"
+msgstr "Environnement de développement pour GNUstep"
+
 #: ../menu-data/promoe:promoe.desktop.in.h:1
 msgid "Promoe"
 msgstr "Promoe"
@@ -13774,39 +13971,39 @@
 msgstr "Psensor est un moniteur de température graphique pour Linux"
 
 #: ../menu-data/psi-plus-webkit:psi-plus-webkit.desktop.in.h:1
-#: ../menu-data/psi-plus:psi-plus.desktop.in.h:1
-#: ../menu-data/psi:psi.desktop.in.h:1
-msgid "Communicate over the Jabber network"
-msgstr "Communiquer sur le réseau Jabber"
-
-#: ../menu-data/psi-plus-webkit:psi-plus-webkit.desktop.in.h:2
 msgid "Psi Plus Webkit"
-msgstr ""
+msgstr "Psi Plus Webkit"
 
+#: ../menu-data/psi-plus-webkit:psi-plus-webkit.desktop.in.h:2
 #: ../menu-data/psi-plus:psi-plus.desktop.in.h:2
+#: ../menu-data/psi:psi.desktop.in.h:2
+msgid "Communicate over the Jabber network"
+msgstr "Communiquer sur le réseau Jabber"
+
+#: ../menu-data/psi-plus:psi-plus.desktop.in.h:1
 msgid "Psi+"
 msgstr "Psi+"
 
-#: ../menu-data/psi:psi.desktop.in.h:2
+#: ../menu-data/psi:psi.desktop.in.h:1
 msgid "Psi"
 msgstr "Psi"
 
 #: ../menu-data/pspp:pspp.desktop.in.h:1
-msgid "Analyze statistical data with a free alternative to SPSS"
-msgstr "Analyse de données statistiques avec une alternative libre à SPSS"
-
-#: ../menu-data/pspp:pspp.desktop.in.h:2
 msgid "GNU PSPP"
 msgstr "GNU PSPP"
 
-#: ../menu-data/psychopy:psychopy.desktop.in.h:1
-msgid "PsychoPy"
-msgstr "PsychoPy"
+#: ../menu-data/pspp:pspp.desktop.in.h:2
+msgid "Analyze statistical data with a free alternative to SPSS"
+msgstr "Analyse de données statistiques avec une alternative libre à SPSS"
 
-#: ../menu-data/psychopy:psychopy.desktop.in.h:2
+#: ../menu-data/psychopy:psychopy.desktop.in.h:1
 msgid "Psychology Stimuli IDE"
 msgstr "EDI Psychology Stimuli"
 
+#: ../menu-data/psychopy:psychopy.desktop.in.h:2
+msgid "PsychoPy"
+msgstr "PsychoPy"
+
 #: ../menu-data/pterm:pterm.desktop.in.h:1
 msgid "PuTTY Terminal Emulator"
 msgstr "Émulateur de terminal PuTTY"
@@ -13816,21 +14013,21 @@
 msgstr "Démarrer une session de terminal PuTTY"
 
 #: ../menu-data/puddletag:puddletag.desktop.in.h:1
-msgid "Audio Tag Editor"
-msgstr "Éditeur de métadonnées audio"
-
-#: ../menu-data/puddletag:puddletag.desktop.in.h:2
 msgid "puddletag"
 msgstr "puddletag"
 
-#: ../menu-data/pureadmin:pureadmin.desktop.in.h:1
-msgid "Administer and monitor your FTP server"
-msgstr "Administre et surveille votre serveur FTP"
+#: ../menu-data/puddletag:puddletag.desktop.in.h:2
+msgid "Audio Tag Editor"
+msgstr "Éditeur de métadonnées audio"
 
-#: ../menu-data/pureadmin:pureadmin.desktop.in.h:2
+#: ../menu-data/pureadmin:pureadmin.desktop.in.h:1
 msgid "PureAdmin"
 msgstr "PureAdmin"
 
+#: ../menu-data/pureadmin:pureadmin.desktop.in.h:2
+msgid "Administer and monitor your FTP server"
+msgstr "Administre et surveille votre serveur FTP"
+
 #: ../menu-data/puredata-core:puredata.desktop.in.h:1
 msgid "PureData"
 msgstr "PureData"
@@ -13842,37 +14039,45 @@
 "multimédia en temps réel"
 
 #: ../menu-data/purrr:purrr.desktop.in.h:1
-msgid "A Mass-renamer for files"
-msgstr "Un outil pour renommer en masse les fichiers"
-
-#: ../menu-data/purrr:purrr.desktop.in.h:2
 msgid "Purrr"
 msgstr "Purrr"
 
-#: ../menu-data/putty:putty.desktop.in.h:1
-msgid "Connect to an SSH server with PuTTY"
-msgstr "Connecter à un serveur SSH avec PuTTY"
+#: ../menu-data/purrr:purrr.desktop.in.h:2
+msgid "A Mass-renamer for files"
+msgstr "Un outil pour renommer en masse les fichiers"
 
-#: ../menu-data/putty:putty.desktop.in.h:2
+#: ../menu-data/putty:putty.desktop.in.h:1
 msgid "PuTTY SSH Client"
 msgstr "Client SSH PuTTY"
 
+#: ../menu-data/putty:putty.desktop.in.h:2
+msgid "Connect to an SSH server with PuTTY"
+msgstr "Connecter à un serveur SSH avec PuTTY"
+
 #: ../menu-data/pybackpack:pybackpack.desktop.in.h:1
+msgid "File Backup Manager"
+msgstr "Gestionnaire de sauvegardes de fichiers"
+
+#: ../menu-data/pybackpack:pybackpack.desktop.in.h:2
 msgid "Back up important files"
 msgstr "Sauvegarder les données importantes."
 
-#: ../menu-data/pybackpack:pybackpack.desktop.in.h:2
-msgid "File Backup Manager"
-msgstr "Gestionnaire de sauvegardes de fichiers"
+#: ../menu-data/pybik:pybik.desktop.in.h:1
+msgid "Pybik"
+msgstr "Pybik"
+
+#: ../menu-data/pybik:pybik.desktop.in.h:2
+msgid "The magic cube"
+msgstr "Le cube magique"
 
 #: ../menu-data/pybliographer:pybliographic.desktop.in.h:1
-msgid "Manage bibliographic databases"
-msgstr "Gérer des bases de données bibliographiques."
-
-#: ../menu-data/pybliographer:pybliographic.desktop.in.h:2
 msgid "Pybliographic Bibliography Manager"
 msgstr "Gestionnaire de bibliographie PyBliographic"
 
+#: ../menu-data/pybliographer:pybliographic.desktop.in.h:2
+msgid "Manage bibliographic databases"
+msgstr "Gérer des bases de données bibliographiques."
+
 #: ../menu-data/pybridge:pybridge.desktop.in.h:1
 msgid "PyBridge"
 msgstr "PyBridge"
@@ -13890,21 +14095,21 @@
 "pour le bureau Gnome"
 
 #: ../menu-data/pygmy:pygmy.desktop.in.h:1
-msgid "GTK+ MPD client"
-msgstr "Client MPD basé sur GTK+"
-
-#: ../menu-data/pygmy:pygmy.desktop.in.h:2
 msgid "Pygmy"
 msgstr "Pygmy"
 
-#: ../menu-data/pykaraoke-bin:pykaraoke_mini.desktop.in.h:1
-msgid "Minimum-interface PyKaraoke"
-msgstr "Interface minimale PyKaraoke"
+#: ../menu-data/pygmy:pygmy.desktop.in.h:2
+msgid "GTK+ MPD client"
+msgstr "Client MPD basé sur GTK+"
 
-#: ../menu-data/pykaraoke-bin:pykaraoke_mini.desktop.in.h:2
+#: ../menu-data/pykaraoke-bin:pykaraoke_mini.desktop.in.h:1
 msgid "PyKaraoke Mini"
 msgstr "PyKaraoke Mini"
 
+#: ../menu-data/pykaraoke-bin:pykaraoke_mini.desktop.in.h:2
+msgid "Minimum-interface PyKaraoke"
+msgstr "Interface minimale PyKaraoke"
+
 #: ../menu-data/pykaraoke:pykaraoke.desktop.in.h:1
 msgid "PyKaraoke"
 msgstr "PyKaraoke"
@@ -13914,38 +14119,38 @@
 msgstr "Lecteur universel de chansons et films de karaoké"
 
 #: ../menu-data/pymca:edfviewer.desktop.in.h:1
-msgid "Display files in ESRF Data Format"
-msgstr "Affiche les fichiers au format de données ESRF"
-
-#: ../menu-data/pymca:edfviewer.desktop.in.h:2
 msgid "EDFviewer"
 msgstr "EDFviewer"
 
+#: ../menu-data/pymca:edfviewer.desktop.in.h:2
+msgid "Display files in ESRF Data Format"
+msgstr "Affiche les fichiers au format de données ESRF"
+
 #: ../menu-data/pymca:elementsinfo.desktop.in.h:1
+msgid "Elementsinfo"
+msgstr "Elementsinfo"
+
+#: ../menu-data/pymca:elementsinfo.desktop.in.h:2
 msgid "Display X-ray information on elements"
 msgstr ""
 "Afficher les données de spectrométrie de fluorescence  X des éléments"
 
-#: ../menu-data/pymca:elementsinfo.desktop.in.h:2
-msgid "Elementsinfo"
-msgstr "Elementsinfo"
-
 #: ../menu-data/pymca:peakidentifier.desktop.in.h:1
-msgid "Find the energy of X-ray spectral lines"
-msgstr "Trouver les énergies des rayons X du spectre"
-
-#: ../menu-data/pymca:peakidentifier.desktop.in.h:2
 msgid "Peakidentifier"
 msgstr "Peakidentifier"
 
-#: ../menu-data/pymca:pymca.desktop.in.h:1
-msgid "Analyse X-ray Fluorescence data"
-msgstr "Analyse les données de fluorescence X"
+#: ../menu-data/pymca:peakidentifier.desktop.in.h:2
+msgid "Find the energy of X-ray spectral lines"
+msgstr "Trouver les énergies des rayons X du spectre"
 
-#: ../menu-data/pymca:pymca.desktop.in.h:2
+#: ../menu-data/pymca:pymca.desktop.in.h:1
 msgid "PyMCA"
 msgstr "PyMCA"
 
+#: ../menu-data/pymca:pymca.desktop.in.h:2
+msgid "Analyse X-ray Fluorescence data"
+msgstr "Analyse les données de fluorescence X"
+
 #: ../menu-data/pymca:pymcaroitool.desktop.in.h:1
 msgid "PyMCA ROI tool"
 msgstr "Outil PyMCA ROI"
@@ -13955,15 +14160,15 @@
 msgstr "Outil pour les régions particulièers en imagerie XRF"
 
 #: ../menu-data/pymol:pymol.desktop.in.h:1
+msgid "PyMOL Molecular Graphics System"
+msgstr "PyMOL Molecular Graphics System"
+
+#: ../menu-data/pymol:pymol.desktop.in.h:2
 msgid "Model molecular structures and produce high-quality images of them"
 msgstr ""
 "Modéliser des structures moléculaires et produire des images de haute "
 "qualité de celles-ci"
 
-#: ../menu-data/pymol:pymol.desktop.in.h:2
-msgid "PyMOL Molecular Graphics System"
-msgstr "PyMOL Molecular Graphics System"
-
 #: ../menu-data/pynagram:pynagram.desktop.in.h:1
 msgid "Pynagram"
 msgstr "Pynagram"
@@ -13977,13 +14182,13 @@
 msgstr "pyNeighborhood"
 
 #: ../menu-data/pypar2:pypar2.desktop.in.h:1
-msgid "A graphical frontend for the par2 utility"
-msgstr "Une interface graphique pour l'utilitaire par2"
-
-#: ../menu-data/pypar2:pypar2.desktop.in.h:2
 msgid "PyPar2"
 msgstr "PyPar2"
 
+#: ../menu-data/pypar2:pypar2.desktop.in.h:2
+msgid "A graphical frontend for the par2 utility"
+msgstr "Une interface graphique pour l'utilitaire par2"
+
 #: ../menu-data/pype:pype.desktop.in.h:1
 msgid "PyPE"
 msgstr "PyPE"
@@ -13996,34 +14201,34 @@
 msgid "PyPI Browser"
 msgstr "Navigateur pour PyPI"
 
-#: ../menu-data/pyprompter:pyprompter.desktop.in.h:2
+#: ../menu-data/pyprompter:pyprompter.desktop.in.h:1
 msgid "pyprompter"
 msgstr "pyprompter"
 
 #: ../menu-data/pyracerz:pyracerz.desktop.in.h:1
-msgid "2D racing game"
-msgstr "Jeu de course en 2D"
-
-#: ../menu-data/pyracerz:pyracerz.desktop.in.h:2
 msgid "pyRacerz"
 msgstr "PyRacerz"
 
-#: ../menu-data/pyragua:pyragua.desktop.in.h:1
-msgid "A fast and lightweight IDE using wxPython"
-msgstr "Un environnement de développement léger et rapide basé sur wxPython"
+#: ../menu-data/pyracerz:pyracerz.desktop.in.h:2
+msgid "2D racing game"
+msgstr "Jeu de course en 2D"
 
-#: ../menu-data/pyragua:pyragua.desktop.in.h:2
+#: ../menu-data/pyragua:pyragua.desktop.in.h:1
 msgid "Pyragua"
 msgstr "Pyragua"
 
-#: ../menu-data/pyrenamer:pyrenamer.desktop.in.h:1
-msgid "Mass rename files"
-msgstr "Renommer en masse les fichiers"
+#: ../menu-data/pyragua:pyragua.desktop.in.h:2
+msgid "A fast and lightweight IDE using wxPython"
+msgstr "Un environnement de développement léger et rapide basé sur wxPython"
 
-#: ../menu-data/pyrenamer:pyrenamer.desktop.in.h:2
+#: ../menu-data/pyrenamer:pyrenamer.desktop.in.h:1
 msgid "pyRenamer"
 msgstr "pyRenamer"
 
+#: ../menu-data/pyrenamer:pyrenamer.desktop.in.h:2
+msgid "Mass rename files"
+msgstr "Renommer en masse les fichiers"
+
 #: ../menu-data/pyrocket:pyrocket.desktop.in.h:1
 msgid "Dream Cheeky Rocket Control"
 msgstr "Contrôleur de missiles Dream Cheeky"
@@ -14032,42 +14237,50 @@
 msgid "Enabling Cubicle Warfare on Linux"
 msgstr "Utilisation des armes de guerre USB sous Linux"
 
-#: ../menu-data/pyroom:pyroom.desktop.in.h:1
-msgid "Distraction free full-screen text editor"
-msgstr "Éditeur de texte plein écran pour ne pas être distrait"
+#: ../menu-data/pyromaths:pyromaths.desktop.in.h:1
+msgid "Pyromaths"
+msgstr "Pyromaths"
+
+#: ../menu-data/pyromaths:pyromaths.desktop.in.h:2
+msgid "Générateur d'exercices de maths"
+msgstr "Générateur d'exercices de maths"
 
-#: ../menu-data/pyroom:pyroom.desktop.in.h:2
+#: ../menu-data/pyroom:pyroom.desktop.in.h:1
 msgid "PyRoom"
 msgstr "PyRoom"
 
-#: ../menu-data/pyscrabble:pyscrabble.desktop.in.h:1
-msgid "A classical game of words"
-msgstr "Un jeu de lettres classique"
+#: ../menu-data/pyroom:pyroom.desktop.in.h:2
+msgid "Distraction free full-screen text editor"
+msgstr "Éditeur de texte plein écran pour ne pas être distrait"
 
-#: ../menu-data/pyscrabble:pyscrabble.desktop.in.h:2
+#: ../menu-data/pyscrabble:pyscrabble.desktop.in.h:1
 msgid "PyScrabble"
 msgstr "PyScrabble"
 
-#: ../menu-data/pysdm:pysdm.desktop.in.h:1
-msgid "Management of Storage Devices"
-msgstr "Gestion d'appareils de stockage"
+#: ../menu-data/pyscrabble:pyscrabble.desktop.in.h:2
+msgid "A classical game of words"
+msgstr "Un jeu de lettres classique"
 
-#: ../menu-data/pysdm:pysdm.desktop.in.h:2
+#: ../menu-data/pysdm:pysdm.desktop.in.h:1
 msgid "Storage Device Manager"
 msgstr "Permet de gérer ses appareils de stockage"
 
+#: ../menu-data/pysdm:pysdm.desktop.in.h:2
+msgid "Management of Storage Devices"
+msgstr "Gestion d'appareils de stockage"
+
 #: ../menu-data/pysolfc:pysol.desktop.in.h:1
 msgid "PySol Fan Club Edition"
 msgstr "PySol Fan Club Edition"
 
 #: ../menu-data/pysycache:pysycache-admin.desktop.in.h:1
-msgid "Configuration of PySyCache"
-msgstr "Configuration de PySyCache"
-
-#: ../menu-data/pysycache:pysycache-admin.desktop.in.h:2
 msgid "Pysycache Admin"
 msgstr "Pysycache Admin"
 
+#: ../menu-data/pysycache:pysycache-admin.desktop.in.h:2
+msgid "Configuration of PySyCache"
+msgstr "Configuration de PySyCache"
+
 #: ../menu-data/pysycache:pysycache.desktop.in.h:1
 msgid "PySyCache"
 msgstr "PySyCache"
@@ -14077,21 +14290,21 @@
 msgstr "Apprenez aux enfants à se servir de la souris"
 
 #: ../menu-data/python-acidobasic:pyacidobasic.desktop.in.h:1
-msgid "Interactive tool to simulate acido-basic titrations"
-msgstr "Outil interactif pour simuler les titrages acido-basiques"
-
-#: ../menu-data/python-acidobasic:pyacidobasic.desktop.in.h:2
 msgid "pyAcidoBasic"
 msgstr "pyAcidoBasic"
 
-#: ../menu-data/python-dogtail:dogtail-recorder.desktop.in.h:1
-msgid "Automate your desktop using Dogtail"
-msgstr "Automatiser votre ordinateur de bureau en utilisant Dogtail"
+#: ../menu-data/python-acidobasic:pyacidobasic.desktop.in.h:2
+msgid "Interactive tool to simulate acido-basic titrations"
+msgstr "Outil interactif pour simuler les titrages acido-basiques"
 
-#: ../menu-data/python-dogtail:dogtail-recorder.desktop.in.h:2
+#: ../menu-data/python-dogtail:dogtail-recorder.desktop.in.h:1
 msgid "Dogtail Script Recorder"
 msgstr "Enregistreur de scripts Dogtail"
 
+#: ../menu-data/python-dogtail:dogtail-recorder.desktop.in.h:2
+msgid "Automate your desktop using Dogtail"
+msgstr "Automatiser votre ordinateur de bureau en utilisant Dogtail"
+
 #: ../menu-data/python-dogtail:sniff.desktop.in.h:1
 msgid "AT-SPI Browser"
 msgstr "Explorateur AT-SPI"
@@ -14140,50 +14353,50 @@
 msgstr "Programme interactif pour des analyses XAFS"
 
 #: ../menu-data/python-lunch:lunch.desktop.in.h:1
-msgid "Distributed Process Launcher"
-msgstr "Lanceur de processus distribués"
-
-#: ../menu-data/python-lunch:lunch.desktop.in.h:2
 msgid "Lunch"
 msgstr "Lunch"
 
+#: ../menu-data/python-lunch:lunch.desktop.in.h:2
+msgid "Distributed Process Launcher"
+msgstr "Lanceur de processus distribués"
+
 #: ../menu-data/python-mecavideo:pymecavideo.desktop.in.h:1
+msgid "pyMecaVideo"
+msgstr "pyMecaVideo"
+
+#: ../menu-data/python-mecavideo:pymecavideo.desktop.in.h:2
 msgid "Interactive tool to track moving points in video framesets"
 msgstr ""
 "Outil interactif pour traquer des points en mouvement dans des vidéos"
 
-#: ../menu-data/python-mecavideo:pymecavideo.desktop.in.h:2
-msgid "pyMecaVideo"
-msgstr "pyMecaVideo"
-
 #: ../menu-data/python-poker2d:python-poker2d.desktop.in.h:1
-msgid "Multiplayer online poker"
-msgstr "Poker en ligne multi joueurs"
-
-#: ../menu-data/python-poker2d:python-poker2d.desktop.in.h:2
 msgid "poker2D"
 msgstr "Poker2D"
 
-#: ../menu-data/python-web2py:web2py.desktop.in.h:1
-msgid "Enterprise web development framework using Python"
-msgstr "Environnement de développement web Python pour l'entreprise"
+#: ../menu-data/python-poker2d:python-poker2d.desktop.in.h:2
+msgid "Multiplayer online poker"
+msgstr "Poker en ligne multi joueurs"
 
-#: ../menu-data/python-web2py:web2py.desktop.in.h:2
+#: ../menu-data/python-web2py:web2py.desktop.in.h:1
 msgid "web2py"
 msgstr "web2py"
 
+#: ../menu-data/python-web2py:web2py.desktop.in.h:2
+msgid "Enterprise web development framework using Python"
+msgstr "Environnement de développement web Python pour l'entreprise"
+
 #: ../menu-data/python-whiteboard:python-whiteboard.desktop.in.h:1
 msgid "python-whiteboard"
 msgstr "python-whiteboard"
 
 #: ../menu-data/python-wxglade:wxglade.desktop.in.h:1
-msgid "GUI designer written in Python with wxPython"
-msgstr "Concepteur d'interface graphique écrit en Python avec wxPython"
-
-#: ../menu-data/python-wxglade:wxglade.desktop.in.h:2
 msgid "wxGlade"
 msgstr "wxGlade"
 
+#: ../menu-data/python-wxglade:wxglade.desktop.in.h:2
+msgid "GUI designer written in Python with wxPython"
+msgstr "Concepteur d'interface graphique écrit en Python avec wxPython"
+
 #: ../menu-data/pythoncad:pythoncad.desktop.in.h:1
 msgid "PyCAD"
 msgstr "PyCAD"
@@ -14193,30 +14406,30 @@
 msgstr "PythonCAD"
 
 #: ../menu-data/pytrainer:pytrainer.desktop.in.h:1
-msgid "The Free Sport Training Center"
-msgstr "Centre d'entrainement sportif libre"
+msgid "pytrainer"
+msgstr "pytrainer"
 
 #: ../menu-data/pytrainer:pytrainer.desktop.in.h:2
-msgid "pyTrainer"
-msgstr "pyTrainer"
+msgid "The Free Sport Training Center"
+msgstr "Centre d'entrainement sportif libre"
 
 #: ../menu-data/q4wine:q4wine.desktop.in.h:1
-msgid "Q4Wine"
-msgstr "Q4Wine"
-
-#: ../menu-data/q4wine:q4wine.desktop.in.h:2
 msgid "Qt4 utility for Wine applications and prefixes management."
 msgstr "Utilitaire Qt4 pour les applications Wine et la gestion de préfixes"
 
-#: ../menu-data/qalculate-gtk:qalculate-gtk.desktop.in.h:1
-msgid "Powerful and easy to use calculator"
-msgstr "Calculateur puissant et facile à utiliser"
+#: ../menu-data/q4wine:q4wine.desktop.in.h:2
+msgid "Q4Wine"
+msgstr "Q4Wine"
 
-#: ../menu-data/qalculate-gtk:qalculate-gtk.desktop.in.h:2
+#: ../menu-data/qalculate-gtk:qalculate-gtk.desktop.in.h:1
 msgid "Qalculate!"
 msgstr "Qalculate!"
 
-#: ../menu-data/qapt-deb-installer:kde4__qapt-deb-installer.desktop.in.h:2
+#: ../menu-data/qalculate-gtk:qalculate-gtk.desktop.in.h:2
+msgid "Powerful and easy to use calculator"
+msgstr "Calculateur puissant et facile à utiliser"
+
+#: ../menu-data/qapt-deb-installer:kde4__qapt-deb-installer.desktop.in.h:1
 msgid "QApt Package Installer"
 msgstr "Programme d'installation de paquets QApt"
 
@@ -14229,26 +14442,30 @@
 msgstr "Enregistreur audio simple mais efficace"
 
 #: ../menu-data/qasconfig:qasconfig.desktop.in.h:1
-msgid "ALSA configuration browser"
-msgstr "Navigateur de configuration ALSA"
-
-#: ../menu-data/qasconfig:qasconfig.desktop.in.h:2
 msgid "QasConfig"
 msgstr "QasConfig"
 
-#: ../menu-data/qasmixer:qasmixer.desktop.in.h:1
-msgid "Graphical mixer application for the ALSA"
-msgstr "Application graphique de mixage pour ALSA"
+#: ../menu-data/qasconfig:qasconfig.desktop.in.h:2
+msgid "ALSA configuration browser"
+msgstr "Navigateur de configuration ALSA"
 
-#: ../menu-data/qasmixer:qasmixer.desktop.in.h:2
+#: ../menu-data/qasmixer:qasmixer.desktop.in.h:1
 msgid "QasMixer"
 msgstr "QasMixer"
 
+#: ../menu-data/qasmixer:qasmixer.desktop.in.h:2
+msgid "Graphical mixer application for the ALSA"
+msgstr "Application graphique de mixage pour ALSA"
+
 #: ../menu-data/qbittorrent:qBittorrent.desktop.in.h:2
 msgid "qBittorrent"
 msgstr "qBittorrent"
 
 #: ../menu-data/qcomicbook:qcomicbook.desktop.in.h:1
+msgid "qcomicbook"
+msgstr "qcomicbook"
+
+#: ../menu-data/qcomicbook:qcomicbook.desktop.in.h:2
 msgid ""
 "QComicBook is a viewer for comic book archives (cbz, cbr, cbt). QComicBook "
 "has specific features like page preview, thumbnails view, bookmarks, manga "
@@ -14258,10 +14475,6 @@
 "QComicBook a des fonctionnalités spécifiques pour une lecture facile des "
 "bandes dessinées comme aperçu, vue en vignettes, marque-pages, mode manga."
 
-#: ../menu-data/qcomicbook:qcomicbook.desktop.in.h:2
-msgid "qcomicbook"
-msgstr "qcomicbook"
-
 #: ../menu-data/qdacco:qdacco.desktop.in.h:1
 msgid "Qdacco dictionary"
 msgstr "Dictionnaire Qdacco"
@@ -14271,30 +14484,38 @@
 msgstr "Permet de chercher les mots dans un dictionnaire catalan - anglais"
 
 #: ../menu-data/qdevelop:qdevelop.desktop.in.h:1
-msgid "Development environment for Qt4"
-msgstr "Environnement de développement pour Qt4"
-
-#: ../menu-data/qdevelop:qdevelop.desktop.in.h:2
 msgid "QDevelop"
 msgstr "QDevelop"
 
-#: ../menu-data/qelectrotech:qelectrotech.desktop.in.h:1
-msgid "An electric diagrams editor."
-msgstr "Un éditeur de diagrammes électriques"
+#: ../menu-data/qdevelop:qdevelop.desktop.in.h:2
+msgid "Development environment for Qt4"
+msgstr "Environnement de développement pour Qt4"
+
+#: ../menu-data/qdigidoc:qdigidoc-client.desktop.in.h:1
+msgid "DigiDoc3 Client"
+msgstr "Client DigiDoc3"
+
+#: ../menu-data/qdigidoc:qdigidoc-crypto.desktop.in.h:1
+msgid "DigiDoc3 Crypto"
+msgstr "Crypto DigiDoc3"
 
 #. Encoding=UTF-8
-#: ../menu-data/qelectrotech:qelectrotech.desktop.in.h:3
+#: ../menu-data/qelectrotech:qelectrotech.desktop.in.h:2
 msgid "QElectroTech"
 msgstr "QElectroTech"
 
-#: ../menu-data/qemu-launcher:qemu-launcher.desktop.in.h:1
-msgid "Manage virtual machine configurations"
-msgstr "Gérer les configurations d'une machine virtuelle"
+#: ../menu-data/qelectrotech:qelectrotech.desktop.in.h:3
+msgid "An electric diagrams editor."
+msgstr "Un éditeur de diagrammes électriques"
 
-#: ../menu-data/qemu-launcher:qemu-launcher.desktop.in.h:2
+#: ../menu-data/qemu-launcher:qemu-launcher.desktop.in.h:1
 msgid "Qemu Launcher"
 msgstr "Lanceur Qemu"
 
+#: ../menu-data/qemu-launcher:qemu-launcher.desktop.in.h:2
+msgid "Manage virtual machine configurations"
+msgstr "Gérer les configurations d'une machine virtuelle"
+
 #: ../menu-data/qemulator:qemulator.desktop.in.h:1
 msgid "Qemu Virtual Engines manager"
 msgstr "Gestionnaire de moteurs virtuels Qemu"
@@ -14303,32 +14524,36 @@
 msgid "Qemulator"
 msgstr "Qemulator"
 
+#: ../menu-data/qesteidutil:qesteidutil.desktop.in.h:1
+msgid "ID-card Utility"
+msgstr ""
+
 #: ../menu-data/qfreefax:qfreefax.desktop.in.h:1
+msgid "qFreeFax"
+msgstr "qFreeFax"
+
+#: ../menu-data/qfreefax:qfreefax.desktop.in.h:2
 msgid "GUI for fax fonctionality provided by French ISP \"Free\""
 msgstr ""
 "Interface graphique pour des fonctionnalités de fax fourni par le FAI "
 "Français « Free »"
 
-#: ../menu-data/qfreefax:qfreefax.desktop.in.h:2
-msgid "qFreeFax"
-msgstr "qFreeFax"
-
 #: ../menu-data/qgis:qgis.desktop.in.h:1
-msgid "Geographical Information System"
-msgstr "Système d'informations géographiques"
-
-#: ../menu-data/qgis:qgis.desktop.in.h:2
 msgid "Quantum GIS"
 msgstr "Quantum GIS"
 
-#: ../menu-data/qgit:qgit.desktop.in.h:1
-msgid "git GUI viewer"
-msgstr "interface de visualisation pour git"
+#: ../menu-data/qgis:qgis.desktop.in.h:2
+msgid "Geographical Information System"
+msgstr "Système d'informations géographiques"
 
-#: ../menu-data/qgit:qgit.desktop.in.h:2
+#: ../menu-data/qgit:qgit.desktop.in.h:1
 msgid "qgit"
 msgstr "qgit"
 
+#: ../menu-data/qgit:qgit.desktop.in.h:2
+msgid "git GUI viewer"
+msgstr "interface de visualisation pour git"
+
 #: ../menu-data/qgo:kde__qgo.desktop.in.h:1
 msgid "qgo"
 msgstr "qgo"
@@ -14339,16 +14564,16 @@
 
 #: ../menu-data/qjackctl:qjackctl.desktop.in.h:2
 msgid "QjackCtl is a JACK Audio Connection Kit Qt GUI Interface"
-msgstr ""
+msgstr "Interface QT pour la connection audio JACK - QjackCtl"
 
 #: ../menu-data/qlandkartegt:qlandkartegt.desktop.in.h:1
-msgid "GPS device mapping utility"
-msgstr "Utilitaire de cartographie pour périphériques GPS"
-
-#: ../menu-data/qlandkartegt:qlandkartegt.desktop.in.h:2
 msgid "QLandkarteGT"
 msgstr "QLandkarteGT"
 
+#: ../menu-data/qlandkartegt:qlandkartegt.desktop.in.h:2
+msgid "GPS device mapping utility"
+msgstr "Utilitaire de cartographie pour périphériques GPS"
+
 #: ../menu-data/qliss3d:qliss3d.desktop.in.h:1
 msgid "Qliss3D"
 msgstr "Qliss3D"
@@ -14358,24 +14583,24 @@
 msgstr "Outil de démonstration pour la méthode de Lissajous"
 
 #: ../menu-data/qlix:qlix.desktop.in.h:1
+msgid "Qlix"
+msgstr "Qlix"
+
+#: ../menu-data/qlix:qlix.desktop.in.h:2
 msgid ""
 "Manage tracks, files, and playlists between a host computer and an MTP device"
 msgstr ""
 "Permet de gérer les pistes, fichiers et listes de lecture entre un "
 "ordinateur hôte et un appareil MTP"
 
-#: ../menu-data/qlix:qlix.desktop.in.h:2
-msgid "Qlix"
-msgstr "Qlix"
-
 #: ../menu-data/qmidiarp:qmidiarp.desktop.in.h:1
-msgid "Arpeggiator-Sequencer-LFO"
-msgstr "Arpeggiator-Sequencer-LFO"
-
-#: ../menu-data/qmidiarp:qmidiarp.desktop.in.h:2
 msgid "QMidiArp"
 msgstr "QMidiArp"
 
+#: ../menu-data/qmidiarp:qmidiarp.desktop.in.h:2
+msgid "Arpeggiator-Sequencer-LFO"
+msgstr "Arpeggiator-Sequencer-LFO"
+
 #: ../menu-data/qmidinet:qmidinet.desktop.in.h:1
 msgid "QmidiNet"
 msgstr "QmidiNet"
@@ -14384,23 +14609,23 @@
 msgid "QmidiNet is a MIDI Network Gateway via UDP/IP Multicast"
 msgstr "QmidiNet est une passerelle pour réseau MIDI via multicast UDP/IP"
 
-#: ../menu-data/qmidiroute:qmidiroute.desktop.in.h:1
-msgid "MIDI router and filter utility"
-msgstr "utilitaire de routage et de filtrage MIDI"
-
 #. Icon=qmidiroute
-#: ../menu-data/qmidiroute:qmidiroute.desktop.in.h:3
+#: ../menu-data/qmidiroute:qmidiroute.desktop.in.h:2
 msgid "QMidiRoute"
 msgstr "QMidiRoute"
 
-#: ../menu-data/qmk-groundstation:qmk-groundstation.desktop.in.h:1
-msgid "A tool to configure a Mikrokopter "
-msgstr "Un outil de configuration pour Mikrokopter "
+#: ../menu-data/qmidiroute:qmidiroute.desktop.in.h:3
+msgid "MIDI router and filter utility"
+msgstr "utilitaire de routage et de filtrage MIDI"
 
-#: ../menu-data/qmk-groundstation:qmk-groundstation.desktop.in.h:2
+#: ../menu-data/qmk-groundstation:qmk-groundstation.desktop.in.h:1
 msgid "QMK-Groundstation"
 msgstr "QMK-Groundstation"
 
+#: ../menu-data/qmk-groundstation:qmk-groundstation.desktop.in.h:2
+msgid "A tool to configure a Mikrokopter "
+msgstr "Un outil de configuration pour Mikrokopter "
+
 #: ../menu-data/qmmp:qmmp.desktop.in.h:1
 msgid "Qmmp"
 msgstr "Qmmp"
@@ -14410,33 +14635,33 @@
 msgstr "Lecteur multimédia écrit en Qt4"
 
 #: ../menu-data/qmpdclient:qmpdclient.desktop.in.h:1
-msgid "A nicer MPD client"
-msgstr "Un client MPD plus convivial"
-
-#: ../menu-data/qmpdclient:qmpdclient.desktop.in.h:2
 msgid "QMPDClient"
 msgstr "QMPDClient"
 
-#: ../menu-data/qprogram-starter:qprogram-starter.desktop.in.h:1
-msgid "qprogram-starter"
-msgstr "Planificateur de tâches Qt qprogram-starter"
+#: ../menu-data/qmpdclient:qmpdclient.desktop.in.h:2
+msgid "A nicer MPD client"
+msgstr "Un client MPD plus convivial"
 
-#: ../menu-data/qpxtool:qpxtool.desktop.in.h:1
-msgid "CD/DVD media quality checker"
-msgstr "Testeur de qualité de média CD/DVD"
+#: ../menu-data/qprogram-starter:qprogram-starter.desktop.in.h:1
+msgid "qprogram-starter"
+msgstr "Planificateur de tâches Qt qprogram-starter"
 
-#: ../menu-data/qpxtool:qpxtool.desktop.in.h:2
+#: ../menu-data/qpxtool:qpxtool.desktop.in.h:1
 msgid "QPxTool"
 msgstr "QPxTool"
 
-#: ../menu-data/qrfcview:qrfcview.desktop.in.h:1
-msgid "Downloads and displays RFC"
-msgstr "Permet de télécharger et afficher les demandes de commentaires (RFC)"
+#: ../menu-data/qpxtool:qpxtool.desktop.in.h:2
+msgid "CD/DVD media quality checker"
+msgstr "Testeur de qualité de média CD/DVD"
 
-#: ../menu-data/qrfcview:qrfcview.desktop.in.h:2
+#: ../menu-data/qrfcview:qrfcview.desktop.in.h:1
 msgid "qRFCView"
 msgstr "qRFCView"
 
+#: ../menu-data/qrfcview:qrfcview.desktop.in.h:2
+msgid "Downloads and displays RFC"
+msgstr "Permet de télécharger et afficher les demandes de commentaires (RFC)"
+
 #: ../menu-data/qsampler:qsampler.desktop.in.h:1
 msgid "Qsampler"
 msgstr "Qsampler"
@@ -14458,21 +14683,21 @@
 msgstr "qshutdown"
 
 #: ../menu-data/qsource-highlight:qsource-highlight.desktop.in.h:1
-msgid "Highlight your sources"
-msgstr "Coloration syntaxique de vos codes sources"
-
-#: ../menu-data/qsource-highlight:qsource-highlight.desktop.in.h:2
 msgid "QSource-Highlight"
 msgstr "QSource-Highlight"
 
-#: ../menu-data/qstardict:qstardict.desktop.in.h:1
-msgid "QStarDict"
-msgstr "QStarDict"
+#: ../menu-data/qsource-highlight:qsource-highlight.desktop.in.h:2
+msgid "Highlight your sources"
+msgstr "Coloration syntaxique de vos codes sources"
 
-#: ../menu-data/qstardict:qstardict.desktop.in.h:2
+#: ../menu-data/qstardict:qstardict.desktop.in.h:1
 msgid "QStarDict is Qt version of StarDict"
 msgstr "QStarDict est la version  Qt de StarDict"
 
+#: ../menu-data/qstardict:qstardict.desktop.in.h:2
+msgid "QStarDict"
+msgstr "QStarDict"
+
 #: ../menu-data/qsynth:qsynth.desktop.in.h:1
 msgid "Qsynth"
 msgstr "Qsynth"
@@ -14508,30 +14733,30 @@
 "Qt3"
 
 #: ../menu-data/qt3-qtconfig:qt3config.desktop.in.h:1
+msgid "Qt3 Configuration"
+msgstr "Configuration de Qt3"
+
+#: ../menu-data/qt3-qtconfig:qt3config.desktop.in.h:2
 msgid "A graphical configuration tool for programs using Qt 3"
 msgstr ""
 "Un outil de configuration graphique pour les programmes utilisant Qt 3"
 
-#: ../menu-data/qt3-qtconfig:qt3config.desktop.in.h:2
-msgid "Qt3 Configuration"
-msgstr "Configuration de Qt3"
-
 #: ../menu-data/qt4-designer:designer-qt4.desktop.in.h:1
-msgid "Interface Designer"
-msgstr "Concepteur d'interfaces"
-
-#: ../menu-data/qt4-designer:designer-qt4.desktop.in.h:2
 msgid "Qt 4 Designer"
 msgstr "Qt 4 Designer"
 
-#: ../menu-data/qt4-dev-tools:assistant-qt4.desktop.in.h:1
-msgid "Document Browser"
-msgstr "Explorateur de documents"
+#: ../menu-data/qt4-designer:designer-qt4.desktop.in.h:2
+msgid "Interface Designer"
+msgstr "Concepteur d'interfaces"
 
-#: ../menu-data/qt4-dev-tools:assistant-qt4.desktop.in.h:2
+#: ../menu-data/qt4-dev-tools:assistant-qt4.desktop.in.h:1
 msgid "Qt 4 Assistant"
 msgstr "Assistant Qt4"
 
+#: ../menu-data/qt4-dev-tools:assistant-qt4.desktop.in.h:2
+msgid "Document Browser"
+msgstr "Explorateur de documents"
+
 #: ../menu-data/qt4-dev-tools:linguist-qt4.desktop.in.h:1
 msgid "Qt 4 Linguist"
 msgstr "Qt 4 Linguist"
@@ -14553,37 +14778,37 @@
 msgstr "Utiliser un multimètre numérique"
 
 #: ../menu-data/qtemu:qtemu.desktop.in.h:1
-msgid "Frontend to QEMU virtual machine monitor"
-msgstr "Interface de surveillance de machine virtuelle QEMU"
-
-#: ../menu-data/qtemu:qtemu.desktop.in.h:2
 msgid "QtEmu"
 msgstr "QtEmu"
 
-#: ../menu-data/qterm:qterm.desktop.in.h:2
+#: ../menu-data/qtemu:qtemu.desktop.in.h:2
+msgid "Frontend to QEMU virtual machine monitor"
+msgstr "Interface de surveillance de machine virtuelle QEMU"
+
+#: ../menu-data/qterm:qterm.desktop.in.h:1
 msgid "QTerm"
 msgstr "QTerm"
 
 #: ../menu-data/qtgain:QtGain.desktop.in.h:1
-msgid "Add \"gain\" tags to your audio files"
-msgstr "Ajouter le marqueur « gain » à vos fichiers audio"
-
-#: ../menu-data/qtgain:QtGain.desktop.in.h:2
 msgid "QtGain"
 msgstr "QtGain"
 
-#: ../menu-data/qtikz:qtikz.desktop.in.h:2
+#: ../menu-data/qtgain:QtGain.desktop.in.h:2
+msgid "Add \"gain\" tags to your audio files"
+msgstr "Ajouter le marqueur « gain » à vos fichiers audio"
+
+#: ../menu-data/qtikz:qtikz.desktop.in.h:1
 msgid "QTikZ"
 msgstr "QTikZ"
 
 #: ../menu-data/qtiplot:qtiplot.desktop.in.h:1
-msgid "Analyze and plot scientific data"
-msgstr ""
-
-#: ../menu-data/qtiplot:qtiplot.desktop.in.h:2
 msgid "QtiPlot"
 msgstr "QtiPlot"
 
+#: ../menu-data/qtiplot:qtiplot.desktop.in.h:2
+msgid "Analyze and plot scientific data"
+msgstr "Analyser et grapher des données scientifiques"
+
 #: ../menu-data/qtm:qtm.desktop.in.h:1
 msgid "QTM"
 msgstr "QTM"
@@ -14593,21 +14818,21 @@
 msgstr "Application de gestion de blog"
 
 #: ../menu-data/qtnx:qtnx.desktop.in.h:1
-msgid "Client for NX remote desktop"
-msgstr "Client pour la prise de contrôle du bureau à distance NX"
-
-#: ../menu-data/qtnx:qtnx.desktop.in.h:2
 msgid "QTNX"
 msgstr "QTNX"
 
-#: ../menu-data/qtoctave:qtoctave.desktop.in.h:1
-msgid "Graphical Qt frontend for GNU Octave"
-msgstr "Interface graphique Qt pour Octave"
+#: ../menu-data/qtnx:qtnx.desktop.in.h:2
+msgid "Client for NX remote desktop"
+msgstr "Client pour la prise de contrôle du bureau à distance NX"
 
-#: ../menu-data/qtoctave:qtoctave.desktop.in.h:2
+#: ../menu-data/qtoctave:qtoctave.desktop.in.h:1
 msgid "QtOctave"
 msgstr "QtOctave"
 
+#: ../menu-data/qtoctave:qtoctave.desktop.in.h:2
+msgid "Graphical Qt frontend for GNU Octave"
+msgstr "Interface graphique Qt pour Octave"
+
 #: ../menu-data/qtodo:qtodo.desktop.in.h:1
 msgid "QToDo"
 msgstr "QToDo"
@@ -14658,63 +14883,89 @@
 msgstr "Analyse technique de la bourse et des marchés et création de graphes"
 
 #: ../menu-data/quadrapassel:quadrapassel.desktop.in.h:1
-msgid "Fit falling blocks together"
-msgstr "Faire correspondre les blocs qui tombent"
-
-#: ../menu-data/quadrapassel:quadrapassel.desktop.in.h:2
 msgid "Quadrapassel"
 msgstr "Quadrapassel"
 
+#: ../menu-data/quadrapassel:quadrapassel.desktop.in.h:2
+msgid "Fit falling blocks together"
+msgstr "Faire correspondre les blocs qui tombent"
+
 #: ../menu-data/quake3:quake3.desktop.in.h:1
+msgid "Quake III Arena"
+msgstr "Quake III Arena"
+
+#: ../menu-data/quake3:quake3.desktop.in.h:2
 msgid "Play the original Quake III Arena"
 msgstr "Jouer à Quake III Arena version originale"
 
-#: ../menu-data/quake3:quake3.desktop.in.h:2
-msgid "Quake III Arena"
-msgstr "Quake III Arena"
+#: ../menu-data/quake:quake-armagon.desktop.in.h:1
+msgid "Quake: Scourge of Armagon"
+msgstr "Quake: Scourge of Armagon"
 
-#: ../menu-data/quarry:quarry.desktop.in.h:1
-msgid "A multi-purpose board game GUI for Go, Amazons and Reversi"
+#: ../menu-data/quake:quake-armagon.desktop.in.h:2
+msgid "Mission Pack 1 for the classic first person shooter"
 msgstr ""
-"Un interface graphique pour les jeux de plateau : Go, Amazones et Othello"
+"Pack Mission 1 pour ce classique des jeux de tir à la première personne"
 
-#: ../menu-data/quarry:quarry.desktop.in.h:2
+#: ../menu-data/quake:quake-dissolution.desktop.in.h:1
+msgid "Quake: Dissolution of Eternity"
+msgstr "Quake: Dissolution of Eternity"
+
+#: ../menu-data/quake:quake-dissolution.desktop.in.h:2
+msgid "Mission Pack 2 for the classic first person shooter"
+msgstr ""
+"Pack Mission 2 pour ce classique des jeux de tir à la première personne"
+
+#: ../menu-data/quake:quake.desktop.in.h:1
+msgid "Quake"
+msgstr "Quake"
+
+#: ../menu-data/quake:quake.desktop.in.h:2
+msgid "Classic first person shooter"
+msgstr "Un classique des jeux de tir à la première personne"
+
+#: ../menu-data/quarry:quarry.desktop.in.h:1
 msgid "Quarry"
 msgstr "Quarry"
 
+#: ../menu-data/quarry:quarry.desktop.in.h:2
+msgid "A multi-purpose board game GUI for Go, Amazons and Reversi"
+msgstr ""
+"Un interface graphique pour les jeux de plateau : Go, Amazones et Othello"
+
 #: ../menu-data/quassel-client-qt4:quasselclient.desktop.in.h:1
 #: ../menu-data/quassel-client:kde4__quasselclient.desktop.in.h:1
-#: ../menu-data/quassel-qt4:quassel.desktop.in.h:1
-#: ../menu-data/quassel:kde4__quassel.desktop.in.h:1
-msgid "Distributed IRC client with central core component"
-msgstr "Client IRC distribué avec composant essentiel centralisé"
-
-#: ../menu-data/quassel-client-qt4:quasselclient.desktop.in.h:2
-#: ../menu-data/quassel-client:kde4__quasselclient.desktop.in.h:2
 msgid "Quassel IRC (Client only)"
 msgstr "Quassel IRC (client uniquement)"
 
+#: ../menu-data/quassel-client-qt4:quasselclient.desktop.in.h:2
+#: ../menu-data/quassel-client:kde4__quasselclient.desktop.in.h:2
 #: ../menu-data/quassel-qt4:quassel.desktop.in.h:2
 #: ../menu-data/quassel:kde4__quassel.desktop.in.h:2
+msgid "Distributed IRC client with central core component"
+msgstr "Client IRC distribué avec composant essentiel centralisé"
+
+#: ../menu-data/quassel-qt4:quassel.desktop.in.h:1
+#: ../menu-data/quassel:kde4__quassel.desktop.in.h:1
 msgid "Quassel IRC"
 msgstr "Quassel IRC"
 
 #: ../menu-data/qucs:qucs.desktop.in.h:1
-msgid "A Universal Circuit Simulator"
-msgstr "Un simulateur de circuit universel."
-
-#: ../menu-data/qucs:qucs.desktop.in.h:2
 msgid "Qucs"
 msgstr "Qucs"
 
-#: ../menu-data/quicksynergy:quicksynergy.desktop.in.h:1
-msgid "A graphical interface for easily configuring Synergy"
-msgstr "Une interface graphique pour configurer facilement Synergy."
+#: ../menu-data/qucs:qucs.desktop.in.h:2
+msgid "A Universal Circuit Simulator"
+msgstr "Un simulateur de circuit universel."
 
-#: ../menu-data/quicksynergy:quicksynergy.desktop.in.h:2
+#: ../menu-data/quicksynergy:quicksynergy.desktop.in.h:1
 msgid "QuickSynergy"
 msgstr "QuickSynergy"
 
+#: ../menu-data/quicksynergy:quicksynergy.desktop.in.h:2
+msgid "A graphical interface for easily configuring Synergy"
+msgstr "Une interface graphique pour configurer facilement Synergy."
+
 #: ../menu-data/quitcount:quitcount.desktop.in.h:1
 msgid "QuitCount"
 msgstr "QuitCount"
@@ -14725,13 +14976,13 @@
 "Simple compteur affichant vos bénéfices depuis que vous avez arrêté de fumer"
 
 #: ../menu-data/quodlibet:quodlibet.desktop.in.h:1
-msgid "Listen to, browse, or edit your audio collection"
-msgstr "Écouter, éditer ou naviguer dans votre collection audio"
-
-#: ../menu-data/quodlibet:quodlibet.desktop.in.h:2
 msgid "Quod Libet"
 msgstr "Quod Libet"
 
+#: ../menu-data/quodlibet:quodlibet.desktop.in.h:2
+msgid "Listen to, browse, or edit your audio collection"
+msgstr "Écouter, éditer ou naviguer dans votre collection audio"
+
 #: ../menu-data/qutecom:qutecom.desktop.in.h:1
 msgid "QuteCom"
 msgstr "QuteCom"
@@ -14745,29 +14996,29 @@
 "utilisant des protocoles multiples"
 
 #: ../menu-data/qutim:qutim.desktop.in.h:1
-msgid "Communicate over IM"
-msgstr "Communiquer par messagerie instantanée"
-
-#: ../menu-data/qutim:qutim.desktop.in.h:2
 msgid "qutIM"
 msgstr "qutIM"
 
-#: ../menu-data/qv4l2:qv4l2.desktop.in.h:1
-msgid "Allow testing Video4Linux devices"
-msgstr "Permet de tester les dispositifs Video4Linux"
+#: ../menu-data/qutim:qutim.desktop.in.h:2
+msgid "Communicate over IM"
+msgstr "Communiquer par messagerie instantanée"
 
-#: ../menu-data/qv4l2:qv4l2.desktop.in.h:2
+#: ../menu-data/qv4l2:qv4l2.desktop.in.h:1
 msgid "QT V4L2 test Utility"
 msgstr "Utilitaire de test QT V4L2"
 
-#: ../menu-data/qviaggiatreno:qviaggiatreno.desktop.in.h:1
-msgid "Interfaccia grafica per ViaggiaTreno"
-msgstr "Interface graphique pour QViaggiaTreno"
+#: ../menu-data/qv4l2:qv4l2.desktop.in.h:2
+msgid "Allow testing Video4Linux devices"
+msgstr "Permet de tester les dispositifs Video4Linux"
 
-#: ../menu-data/qviaggiatreno:qviaggiatreno.desktop.in.h:2
+#: ../menu-data/qviaggiatreno:qviaggiatreno.desktop.in.h:1
 msgid "QViaggiaTreno"
 msgstr "QViaggiaTreno"
 
+#: ../menu-data/qviaggiatreno:qviaggiatreno.desktop.in.h:2
+msgid "Interfaccia grafica per ViaggiaTreno"
+msgstr "Interface graphique pour QViaggiaTreno"
+
 #: ../menu-data/qwbfsmanager:QWBFSManager.desktop.in.h:1
 msgid "QWBFS Manager"
 msgstr "QWBFS Manager"
@@ -14781,37 +15032,29 @@
 "disques durs formatés avec le système de fichier WBFS"
 
 #: ../menu-data/qweborf:qweborf.desktop.in.h:1
-msgid "Shares files using the HTTP protocol"
-msgstr "Partage de fichiers en utilisant le protocole HTTP"
-
-#: ../menu-data/qweborf:qweborf.desktop.in.h:2
 msgid "qweborf"
 msgstr "qweborf"
 
-#: ../menu-data/qwit:qwit.desktop.in.h:1
-msgid "Qt4 Twitter Client"
-msgstr "Client Twitter Qt4"
-
-#: ../menu-data/qwit:qwit.desktop.in.h:2
-msgid "Qwit"
-msgstr "Qwit"
+#: ../menu-data/qweborf:qweborf.desktop.in.h:2
+msgid "Shares files using the HTTP protocol"
+msgstr "Partage de fichiers en utilisant le protocole HTTP"
 
 #: ../menu-data/qwo:qwo.desktop.in.h:1
-msgid "An input method for touchscreens"
-msgstr "Méthode de saisie pour écrans tactiles"
-
-#: ../menu-data/qwo:qwo.desktop.in.h:2
 msgid "qwo"
 msgstr "qwo"
 
-#: ../menu-data/qxw:qxw.desktop.in.h:1
-msgid "Construct crossword puzzles"
-msgstr "Fabriquer des mots croisés"
+#: ../menu-data/qwo:qwo.desktop.in.h:2
+msgid "An input method for touchscreens"
+msgstr "Méthode de saisie pour écrans tactiles"
 
-#: ../menu-data/qxw:qxw.desktop.in.h:2
+#: ../menu-data/qxw:qxw.desktop.in.h:1
 msgid "Qxw"
 msgstr "Qxw"
 
+#: ../menu-data/qxw:qxw.desktop.in.h:2
+msgid "Construct crossword puzzles"
+msgstr "Fabriquer des mots croisés"
+
 #: ../menu-data/r-cran-rcmdr:Rcmdr.desktop.in.h:1
 msgid "Graphical interface to the R environment for statistical computing "
 msgstr "Interface graphique pour l'environnement informatique statistique R "
@@ -14833,22 +15076,26 @@
 msgstr "Radio Tray"
 
 #: ../menu-data/raincat:raincat.desktop.in.h:1
-msgid "2D puzzle game featuring a fuzzy little cat"
-msgstr "Jeu de réflexion 2D avec un petit chat"
-
-#: ../menu-data/raincat:raincat.desktop.in.h:2
 msgid "Raincat"
 msgstr "Raincat"
 
-#: ../menu-data/rakarrack:rakarrack.desktop.in.h:1
-msgid "Guitar Effects Processor"
-msgstr "Processeur d'effets de guitare"
+#: ../menu-data/raincat:raincat.desktop.in.h:2
+msgid "2D puzzle game featuring a fuzzy little cat"
+msgstr "Jeu de réflexion 2D avec un petit chat"
 
-#: ../menu-data/rakarrack:rakarrack.desktop.in.h:2
+#: ../menu-data/rakarrack:rakarrack.desktop.in.h:1
 msgid "Rakarrack"
 msgstr "Rakarrack"
 
+#: ../menu-data/rakarrack:rakarrack.desktop.in.h:2
+msgid "Guitar Effects Processor"
+msgstr "Processeur d'effets de guitare"
+
 #: ../menu-data/rapid-photo-downloader:rapid-photo-downloader.desktop.in.h:1
+msgid "Rapid Photo Downloader"
+msgstr "Rapid Photo Downloader"
+
+#: ../menu-data/rapid-photo-downloader:rapid-photo-downloader.desktop.in.h:2
 msgid ""
 "Download photos and videos from cameras, memory cards and Portable Storage "
 "Devices"
@@ -14856,19 +15103,15 @@
 "Téléchargez les photos et vidéos à partir de caméras, cartes mémoire et "
 "périphériques de stockage portables"
 
-#: ../menu-data/rapid-photo-downloader:rapid-photo-downloader.desktop.in.h:2
-msgid "Rapid Photo Downloader"
-msgstr "Rapid Photo Downloader"
-
 #: ../menu-data/rapidsvn:rapidsvn.desktop.in.h:1
-#: ../menu-data/subcommander:subcommander.desktop.in.h:1
-msgid "A GUI Client for Subversion"
-msgstr "Une interface graphique pour Subversion"
-
-#: ../menu-data/rapidsvn:rapidsvn.desktop.in.h:2
 msgid "RapidSVN"
 msgstr "RapidSVN"
 
+#: ../menu-data/rapidsvn:rapidsvn.desktop.in.h:2
+#: ../menu-data/subcommander:subcommander.desktop.in.h:2
+msgid "A GUI Client for Subversion"
+msgstr "Une interface graphique pour Subversion"
+
 #: ../menu-data/rasmol:rasmol-gtk.desktop.in.h:1
 msgid "RasMol (GTK version)"
 msgstr "RasMol (version GTK)"
@@ -14896,13 +15139,13 @@
 msgstr "Convertisseur RAW et traitement numérique de photo. "
 
 #: ../menu-data/rbbr:rbbr.desktop.in.h:1
-msgid "Browse Ruby Classes and Modules"
-msgstr "Parcourir les classes et les modules Ruby"
-
-#: ../menu-data/rbbr:rbbr.desktop.in.h:2
 msgid "Ruby Browser"
 msgstr "Explorateur Ruby"
 
+#: ../menu-data/rbbr:rbbr.desktop.in.h:2
+msgid "Browse Ruby Classes and Modules"
+msgstr "Parcourir les classes et les modules Ruby"
+
 #: ../menu-data/recoll:recoll-searchgui.desktop.in.h:1
 msgid "Find documents by specifying search terms"
 msgstr "Recherche de documents par mots clés"
@@ -14915,76 +15158,76 @@
 msgid "RecordItNow"
 msgstr "RecordItNow"
 
-#: ../menu-data/rednotebook:rednotebook.desktop.in.h:1
-msgid "Daily journal with calendar, templates and keyword searching "
-msgstr ""
-"Journal quotidien avec calendrier, modèles et recherche par mots-clés "
-
 #. Encoding=UTF-­8 #Encoding causes problems
-#: ../menu-data/rednotebook:rednotebook.desktop.in.h:3
+#: ../menu-data/rednotebook:rednotebook.desktop.in.h:2
 msgid "RedNotebook"
 msgstr "RedNotebook"
 
-#: ../menu-data/referencer:referencer.desktop.in.h:1
-msgid "Document organiser"
-msgstr "Classeur de documents"
+#: ../menu-data/rednotebook:rednotebook.desktop.in.h:3
+msgid "Daily journal with calendar, templates and keyword searching "
+msgstr ""
+"Journal quotidien avec calendrier, modèles et recherche par mots-clés "
 
-#: ../menu-data/referencer:referencer.desktop.in.h:2
+#: ../menu-data/referencer:referencer.desktop.in.h:1
 msgid "Referencer"
 msgstr "Referencer"
 
-#: ../menu-data/regexxer:regexxer.desktop.in.h:1
-msgid "Search and replace using regular expressions"
-msgstr "Rechercher et remplacer en utilisant des expressions régulières"
+#: ../menu-data/referencer:referencer.desktop.in.h:2
+msgid "Document organiser"
+msgstr "Classeur de documents"
 
-#: ../menu-data/regexxer:regexxer.desktop.in.h:2
+#: ../menu-data/regexxer:regexxer.desktop.in.h:1
 msgid "regexxer Search Tool"
 msgstr "Outils de recherche regexxer"
 
-#: ../menu-data/regina-normal:kde4__regina.desktop.in.h:1
-msgid "A Normal Surface Theory Calculator"
-msgstr "Un calculateur de la théorie des surfaces normales"
+#: ../menu-data/regexxer:regexxer.desktop.in.h:2
+msgid "Search and replace using regular expressions"
+msgstr "Rechercher et remplacer en utilisant des expressions régulières"
 
-#: ../menu-data/regina-normal:kde4__regina.desktop.in.h:2
+#: ../menu-data/regina-normal:kde4__regina.desktop.in.h:1
 msgid "Regina"
 msgstr "Regina"
 
-#: ../menu-data/reinteract:reinteract.desktop.in.h:1
-msgid "Interactive Python shell"
-msgstr "Shell interactif Python"
+#: ../menu-data/regina-normal:kde4__regina.desktop.in.h:2
+msgid "A Normal Surface Theory Calculator"
+msgstr "Un calculateur de la théorie des surfaces normales"
 
-#: ../menu-data/reinteract:reinteract.desktop.in.h:2
+#: ../menu-data/reinteract:reinteract.desktop.in.h:1
 msgid "Reinteract"
 msgstr "Reinteract"
 
-#: ../menu-data/rekonq:kde4__rekonq.desktop.in.h:2
+#: ../menu-data/reinteract:reinteract.desktop.in.h:2
+msgid "Interactive Python shell"
+msgstr "Shell interactif Python"
+
+#: ../menu-data/rekonq:kde4__rekonq.desktop.in.h:1
 msgid "rekonq"
 msgstr "rekonq"
 
 #: ../menu-data/relational:relational.desktop.in.h:1
-msgid "Learn and experiment relational algebra"
-msgstr "Apprendre et découvrir l'algèbre relationnelle"
-
-#: ../menu-data/relational:relational.desktop.in.h:2
 msgid "Relational"
 msgstr "Relationnel"
 
-#: ../menu-data/reminiscence:reminiscence.desktop.in.h:1
-msgid "A port of FlashBack game engine"
-msgstr "Un port du moteur de jeu FlashBack"
+#: ../menu-data/relational:relational.desktop.in.h:2
+msgid "Learn and experiment relational algebra"
+msgstr "Apprendre et découvrir l'algèbre relationnelle"
 
-#: ../menu-data/reminiscence:reminiscence.desktop.in.h:2
+#: ../menu-data/reminiscence:reminiscence.desktop.in.h:1
 msgid "REminiscence"
 msgstr "REminiscence"
 
-#: ../menu-data/remmina:remmina.desktop.in.h:1
-msgid "Connect to remote desktops"
-msgstr "Connectez-vous sur des bureaux distants"
+#: ../menu-data/reminiscence:reminiscence.desktop.in.h:2
+msgid "A port of FlashBack game engine"
+msgstr "Un port du moteur de jeu FlashBack"
 
-#: ../menu-data/remmina:remmina.desktop.in.h:2
+#: ../menu-data/remmina:remmina.desktop.in.h:1
 msgid "Remmina Remote Desktop Client"
 msgstr "Client de bureau à distance Remmina"
 
+#: ../menu-data/remmina:remmina.desktop.in.h:2
+msgid "Connect to remote desktops"
+msgstr "Connectez-vous sur des bureaux distants"
+
 #: ../menu-data/renpy-demo:renpy-demo.desktop.in.h:1
 msgid "Ren'Py Demo"
 msgstr "Démo Ren'Py"
@@ -15010,13 +15253,13 @@
 msgstr "Jeux de type roman interactif (visual novel)"
 
 #: ../menu-data/resapplet:resapplet.desktop.in.h:1
-msgid "Change your screen resolution"
-msgstr "Changer votre résolution d'écran"
-
-#: ../menu-data/resapplet:resapplet.desktop.in.h:2
 msgid "Resolution Switcher"
 msgstr "Changer la résolution"
 
+#: ../menu-data/resapplet:resapplet.desktop.in.h:2
+msgid "Change your screen resolution"
+msgstr "Changer votre résolution d'écran"
+
 #: ../menu-data/retext:retext.desktop.in.h:1
 msgid "ReText"
 msgstr "ReText"
@@ -15026,13 +15269,13 @@
 msgstr "Éditeur de texte simple pour Markdown et ReStructuredText"
 
 #: ../menu-data/revelation:revelation.desktop.in.h:1
-msgid "Organize and secure your passwords"
-msgstr "Organiser et sécuriser vos mots de passe"
-
-#: ../menu-data/revelation:revelation.desktop.in.h:2
 msgid "Revelation Password Manager"
 msgstr "Gestionnaire de mots de passe Revelation"
 
+#: ../menu-data/revelation:revelation.desktop.in.h:2
+msgid "Organize and secure your passwords"
+msgstr "Organiser et sécuriser vos mots de passe"
+
 #: ../menu-data/rfdump:rfdump.desktop.in.h:1
 msgid "RFDump"
 msgstr "RFDump"
@@ -15042,13 +15285,13 @@
 msgstr "Outil pour interagir directement avec un lecteur RFID"
 
 #: ../menu-data/rgbpaint:rgbpaint.desktop.in.h:1
-msgid "Very basic painting program"
-msgstr "Un programme basique de dessin."
-
-#: ../menu-data/rgbpaint:rgbpaint.desktop.in.h:2
 msgid "rgbPaint"
 msgstr "rgbPaint"
 
+#: ../menu-data/rgbpaint:rgbpaint.desktop.in.h:2
+msgid "Very basic painting program"
+msgstr "Un programme basique de dessin."
+
 #: ../menu-data/rhinote:rhinote.desktop.in.h:1
 msgid "Rhinote"
 msgstr "Rhinote"
@@ -15057,7 +15300,7 @@
 msgid "Virtual sticky-notes"
 msgstr "Des petits pense-bête sur votre bureau."
 
-#: ../menu-data/rhythmbox:rhythmbox.desktop.in.h:2
+#: ../menu-data/rhythmbox:rhythmbox.desktop.in.h:1
 msgid "Rhythmbox Music Player"
 msgstr "Lecteur de musique Rhythmbox"
 
@@ -15070,63 +15313,63 @@
 msgstr "Un simulateur de petit train en bois."
 
 #: ../menu-data/ripoff:ripoff.desktop.in.h:1
-msgid "Rip audio from your CDs"
-msgstr "Permet de convertir vos CD en  fichiers audio."
-
-#: ../menu-data/ripoff:ripoff.desktop.in.h:2
 msgid "RipOff"
 msgstr "RipOff"
 
-#: ../menu-data/ripperx:ripperx.desktop.in.h:1
-msgid "Rip Cds"
-msgstr "Permet de convertir vos CD en fichiers audio."
+#: ../menu-data/ripoff:ripoff.desktop.in.h:2
+msgid "Rip audio from your CDs"
+msgstr "Permet de convertir vos CD en  fichiers audio."
 
-#: ../menu-data/ripperx:ripperx.desktop.in.h:2
+#: ../menu-data/ripperx:ripperx.desktop.in.h:1
 msgid "Ripper X"
 msgstr "Ripper X"
 
-#: ../menu-data/ristretto:ristretto.desktop.in.h:1
-msgid "Look at your images's easily"
-msgstr "Regarder vos images facilement"
+#: ../menu-data/ripperx:ripperx.desktop.in.h:2
+msgid "Rip Cds"
+msgstr "Permet de convertir vos CD en fichiers audio."
 
-#: ../menu-data/ristretto:ristretto.desktop.in.h:2
+#: ../menu-data/ristretto:ristretto.desktop.in.h:1
 msgid "Ristretto Image Viewer"
 msgstr "Visionneuse d'images Ristretto"
 
-#: ../menu-data/rkward:kde4__rkward.desktop.in.h:1
-msgid "GUI for the R-project"
-msgstr "Interface graphique R-project"
+#: ../menu-data/ristretto:ristretto.desktop.in.h:2
+msgid "Look at your images easily"
+msgstr ""
 
-#: ../menu-data/rkward:kde4__rkward.desktop.in.h:2
+#: ../menu-data/rkward:kde4__rkward.desktop.in.h:1
 msgid "RKWard"
 msgstr "RKWard"
 
+#: ../menu-data/rkward:kde4__rkward.desktop.in.h:2
+msgid "GUI for the R-project"
+msgstr "Interface graphique R-project"
+
 #: ../menu-data/rlplot:rlplot.desktop.in.h:1
+msgid "Rlplot Graph Generator"
+msgstr "Générateur de graphe Rlplot"
+
+#: ../menu-data/rlplot:rlplot.desktop.in.h:2
 msgid "Generate publication quality graphs"
 msgstr "Génère des graphes à partir de jeux de données."
 
-#: ../menu-data/rlplot:rlplot.desktop.in.h:2
-msgid "Rlplot Graph Generator"
-msgstr "Générateur de graphe Rlplot"
+#: ../menu-data/rlvm:rlvm.desktop.in.h:1
+msgid "rlvm"
+msgstr "rlvm"
 
 #. GNOME and KDE 3 uses Comment.
-#: ../menu-data/rlvm:rlvm.desktop.in.h:2
+#: ../menu-data/rlvm:rlvm.desktop.in.h:3
 msgid "RealLive Emulator"
 msgstr "Emulateur RealLive"
 
-#: ../menu-data/rlvm:rlvm.desktop.in.h:3
-msgid "rlvm"
-msgstr "rlvm"
-
 #: ../menu-data/robocode:robocode.desktop.in.h:1
+msgid "Robocode"
+msgstr "Robocode"
+
+#: ../menu-data/robocode:robocode.desktop.in.h:2
 msgid "Java programming game based on battle tanks"
 msgstr ""
 "Un jeu pour apprendre à programmer en Java, basé sur des combats de tanks."
 
-#: ../menu-data/robocode:robocode.desktop.in.h:2
-msgid "Robocode"
-msgstr "Robocode"
-
 #: ../menu-data/robocut:robocut.desktop.in.h:1
 msgid "Robocut"
 msgstr "Robocut"
@@ -15136,13 +15379,13 @@
 msgstr "Permet de couper des graphismes avec des traceurs Graphtec"
 
 #: ../menu-data/rocs:kde4__rocs.desktop.in.h:1
-msgid "Graph Theory Tool for Professors and Students."
-msgstr "Outil de théorie des graphes pour professeurs et étudiants"
-
-#: ../menu-data/rocs:kde4__rocs.desktop.in.h:2
 msgid "Rocs"
 msgstr "Rocs"
 
+#: ../menu-data/rocs:kde4__rocs.desktop.in.h:2
+msgid "Graph Theory Tool for Professors and Students."
+msgstr "Outil de théorie des graphes pour professeurs et étudiants"
+
 #: ../menu-data/rootstock-gtk:rootstock.desktop.in.h:1
 msgid "RootStock"
 msgstr "RootStock"
@@ -15156,52 +15399,52 @@
 msgstr "Rosegarden"
 
 #: ../menu-data/rott:rott.desktop.in.h:1
+msgid "Rise of the Triad"
+msgstr "Rise of the Triad"
+
+#: ../menu-data/rott:rott.desktop.in.h:2
 msgid ""
 "A high quality, fast scrolling first-person perspective 3D action game"
 msgstr ""
 "Jeu d'action en 3D à la première personne, de haute qualité et à défilement "
 "rapide"
 
-#: ../menu-data/rott:rott.desktop.in.h:2
-msgid "Rise of the Triad"
-msgstr "Rise of the Triad"
-
 #: ../menu-data/roxterm:roxterm.desktop.in.h:1
 msgid "ROXTerm"
 msgstr "ROXTerm"
 
 #: ../menu-data/rrootage:rrootage.desktop.in.h:1
-msgid "Destroy autocreated battleships"
-msgstr "Détruire les navires crées automatiquement"
-
-#: ../menu-data/rrootage:rrootage.desktop.in.h:2
 msgid "rRootage"
 msgstr "rRootage"
 
-#: ../menu-data/rsibreak:kde4__rsibreak.desktop.in.h:1
-msgid "Makes sure you rest now and then"
-msgstr "Pour être sûr de faire une pause de temps en temps"
+#: ../menu-data/rrootage:rrootage.desktop.in.h:2
+msgid "Destroy autocreated battleships"
+msgstr "Détruire les navires crées automatiquement"
 
-#: ../menu-data/rsibreak:kde4__rsibreak.desktop.in.h:2
+#: ../menu-data/rsibreak:kde4__rsibreak.desktop.in.h:1
 msgid "RSIBreak"
 msgstr "RSIBreak"
 
-#: ../menu-data/rubrica:rubrica2.desktop.in.h:1
-msgid "Manage contacts and addresses"
-msgstr "Permet de gérer ses contacts."
+#: ../menu-data/rsibreak:kde4__rsibreak.desktop.in.h:2
+msgid "Makes sure you rest now and then"
+msgstr "Pour être sûr de faire une pause de temps en temps"
 
-#: ../menu-data/rubrica:rubrica2.desktop.in.h:2
+#: ../menu-data/rubrica:rubrica2.desktop.in.h:1
 msgid "Rubrica Addressbook"
 msgstr "Carnet d'adresse Rubrica"
 
-#: ../menu-data/rutilt:rutilt.desktop.in.h:1
-msgid "Manage your wireless network interfaces"
-msgstr "Permet de gérer ses interfaces réseau sans-fil."
+#: ../menu-data/rubrica:rubrica2.desktop.in.h:2
+msgid "Manage contacts and addresses"
+msgstr "Permet de gérer ses contacts."
 
-#: ../menu-data/rutilt:rutilt.desktop.in.h:2
+#: ../menu-data/rutilt:rutilt.desktop.in.h:1
 msgid "RutilT WLAN Manager"
 msgstr "Gestionnaire de réseau sans-fil RutilT"
 
+#: ../menu-data/rutilt:rutilt.desktop.in.h:2
+msgid "Manage your wireless network interfaces"
+msgstr "Permet de gérer ses interfaces réseau sans-fil."
+
 #: ../menu-data/rygel:rygel.desktop.in.h:1
 msgid "Rygel"
 msgstr "Rygel"
@@ -15210,23 +15453,14 @@
 msgid "UPnP/DLNA Services"
 msgstr "Services UPnP/DLNA"
 
-#: ../menu-data/sabayon:sabayon.desktop.in.h:1
-msgid "Establish and Edit Profiles for Users"
-msgstr ""
-"Permet de créer et de modifier des profils (catégories) d'utilisateurs."
-
-#: ../menu-data/sabayon:sabayon.desktop.in.h:2
-msgid "User Profile Editor"
-msgstr "Gestionnaire de profils utilisateurs"
-
 #: ../menu-data/sabnzbdplus:sabnzbdplus.desktop.in.h:1
-msgid "Download from usenet"
-msgstr "Télécharger à partir d'usenet"
-
-#: ../menu-data/sabnzbdplus:sabnzbdplus.desktop.in.h:2
 msgid "SABnzbd+"
 msgstr "SABnzbd+"
 
+#: ../menu-data/sabnzbdplus:sabnzbdplus.desktop.in.h:2
+msgid "Download from usenet"
+msgstr "Télécharger à partir d'usenet"
+
 #: ../menu-data/sadms:sadms.desktop.in.h:1
 msgid "Sadms"
 msgstr "Sadms"
@@ -15240,72 +15474,63 @@
 msgstr "Afficher et manipuler des informations géographiques"
 
 #: ../menu-data/sagasu:sagasu.desktop.in.h:1
+msgid "Sagasu"
+msgstr "Sagasu"
+
+#: ../menu-data/sagasu:sagasu.desktop.in.h:2
 msgid "GNOME tool to find strings in a set of files"
 msgstr ""
 "Utilitaire Gnome pour trouver une chaine de caractères dans un ensemble de "
 "fichiers."
 
-#: ../menu-data/sagasu:sagasu.desktop.in.h:2
-msgid "Sagasu"
-msgstr "Sagasu"
-
 #: ../menu-data/sagcad:sagcad.desktop.in.h:1
-msgid "Draw and create"
-msgstr "Permet de concevoir et dessiner"
-
-#: ../menu-data/sagcad:sagcad.desktop.in.h:2
 msgid "SagCAD"
 msgstr "SagCAD"
 
-#: ../menu-data/sailcut:sailcut.desktop.in.h:1
-msgid "Sail Design Application"
-msgstr "Conception de dessin de voile"
+#: ../menu-data/sagcad:sagcad.desktop.in.h:2
+msgid "Draw and create"
+msgstr "Permet de concevoir et dessiner"
 
-#: ../menu-data/sailcut:sailcut.desktop.in.h:2
+#: ../menu-data/sailcut:sailcut.desktop.in.h:1
 msgid "Sailcut CAD"
 msgstr "Sailcut CAD (DAO)"
 
+#: ../menu-data/sailcut:sailcut.desktop.in.h:2
+msgid "Sail Design Application"
+msgstr "Conception de dessin de voile"
+
 #: ../menu-data/sakura:sakura.desktop.in.h:1
 msgid "Sakura"
 msgstr "Sakura"
 
-#: ../menu-data/salasaga:salasaga.desktop.in.h:1
-msgid "Create eLearning for desktop applications"
-msgstr ""
-"Créer des programmes d'apprentissage en ligne pour les applications de bureau"
-
-#: ../menu-data/salasaga:salasaga.desktop.in.h:2
-msgid "Salasaga"
-msgstr "Salasaga"
-
 #: ../menu-data/sandboxgamemaker:sandboxgamemaker.desktop.in.h:1
-msgid "Create 3D games and worlds"
-msgstr "Créer des univers et des jeux en 3D"
-
-#: ../menu-data/sandboxgamemaker:sandboxgamemaker.desktop.in.h:2
 msgid "Platinum Arts Sandbox Gamemaker"
 msgstr "Platinum Arts, bac à sable pour la création de jeux"
 
-#: ../menu-data/sauerbraten:sauerbraten.desktop.in.h:1
-msgid "A networked, fast-paced 3D first-person shooter"
-msgstr "Un jeu d'action subjective 3D, rythmé et orienté réseau."
+#: ../menu-data/sandboxgamemaker:sandboxgamemaker.desktop.in.h:2
+msgid "Create 3D games and worlds"
+msgstr "Créer des univers et des jeux en 3D"
 
-#: ../menu-data/sauerbraten:sauerbraten.desktop.in.h:2
+#: ../menu-data/sauerbraten:sauerbraten.desktop.in.h:1
 msgid "Sauerbraten"
 msgstr "Sauerbraten"
 
+#: ../menu-data/sauerbraten:sauerbraten.desktop.in.h:2
+msgid "A networked, fast-paced 3D first-person shooter"
+msgstr "Un jeu d'action subjective 3D, rythmé et orienté réseau."
+
 #: ../menu-data/sawfish:sawfish.desktop.in.h:1
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #: ../menu-data/scantailor:scantailor.desktop.in.h:1
-msgid "Interactive post-processing tool for scanned pages"
-msgstr "Outil interactif de traiitement de document après numérisation"
-
-#: ../menu-data/scantailor:scantailor.desktop.in.h:2
 msgid "Scan Tailor"
 msgstr "Scan Tailor"
 
+#: ../menu-data/scantailor:scantailor.desktop.in.h:2
+msgid "Interactive post-processing tool for scanned pages"
+msgstr "Outil interactif de traiitement de document après numérisation"
+
 #: ../menu-data/scenic:scenic.desktop.in.h:1
 msgid "Scenic"
 msgstr "Scenic"
@@ -15317,13 +15542,13 @@
 "installations "
 
 #: ../menu-data/scidavis:scidavis.desktop.in.h:1
-msgid "Application for scientific data analysis and visualization"
-msgstr "Application d'analyse et de visualisation de données scientifiques"
-
-#: ../menu-data/scidavis:scidavis.desktop.in.h:2
 msgid "SciDAVis"
 msgstr "SciDAVis"
 
+#: ../menu-data/scidavis:scidavis.desktop.in.h:2
+msgid "Application for scientific data analysis and visualization"
+msgstr "Application d'analyse et de visualisation de données scientifiques"
+
 #: ../menu-data/scilab-cli:scilab-cli.desktop.in.h:1
 #: ../menu-data/scilab:scilab-adv-cli.desktop.in.h:1
 #: ../menu-data/scilab:scilab.desktop.in.h:1
@@ -15352,42 +15577,39 @@
 msgid "Setup utility for Smart Common Input Method platform"
 msgstr "Utilitaire de configuration pour SCIM"
 
+#: ../menu-data/scite:SciTE.desktop.in.h:1
 #: ../menu-data/scite:scite.desktop.in.h:1
-msgid "Programming editor"
-msgstr "Un éditeur de texte léger, avec coloration syntaxique."
-
-#: ../menu-data/scite:scite.desktop.in.h:2
 msgid "SciTE Text Editor"
 msgstr "Éditeur de texte SciTE"
 
+#: ../menu-data/scite:SciTE.desktop.in.h:2
+msgid "Edit your source files"
+msgstr "Modifier vos fichiers souce"
+
+#: ../menu-data/scite:scite.desktop.in.h:2
+msgid "Programming editor"
+msgstr "Un éditeur de texte léger, avec coloration syntaxique."
+
 #: ../menu-data/scolasync:scolasync.desktop.in.h:1
+msgid "ScolaSync"
+msgstr "ScolaSync"
+
+#: ../menu-data/scolasync:scolasync.desktop.in.h:2
 msgid "Interactive tool to copy files to or from USB storage media"
 msgstr ""
 "Un outil interactif pour copier des fichiers vers ou à partir de supports de "
 "stockage USB"
 
-#: ../menu-data/scolasync:scolasync.desktop.in.h:2
-msgid "ScolaSync"
-msgstr "ScolaSync"
-
 #: ../menu-data/scolily:scolily.desktop.in.h:1
+msgid "Scolily Score Recorder"
+msgstr "Enregistreur de partition Scolily"
+
+#: ../menu-data/scolily:scolily.desktop.in.h:2
 msgid "Create scores on-the-fly by recording from mic"
 msgstr ""
 "Permet de créer à la volée des partitions à partir d'un enregistrement au "
 "microphone."
 
-#: ../menu-data/scolily:scolily.desktop.in.h:2
-msgid "Scolily Score Recorder"
-msgstr "Enregistreur de partition Scolily"
-
-#: ../menu-data/scorched3d:scorched3d.desktop.in.h:1
-msgid "3D artillery game similar to Scorched Earth"
-msgstr "Un jeu d'artillerie en 3D semblable à Scorched Earth"
-
-#: ../menu-data/scorched3d:scorched3d.desktop.in.h:2
-msgid "Scorched 3D"
-msgstr "Scorched 3D"
-
 #: ../menu-data/screenie-qt:screenie-qt.desktop.in.h:1
 msgid "Screenie"
 msgstr "Screenie"
@@ -15397,71 +15619,75 @@
 msgstr "Composeur de copies d'écran"
 
 #: ../menu-data/screenkey:screenkey.desktop.in.h:1
-msgid "Screencast your keys"
-msgstr "Permet d'afficher à l'écran les touches que vous tapez au clavier"
-
-#: ../menu-data/screenkey:screenkey.desktop.in.h:2
 msgid "Screenkey"
 msgstr "Screenkey"
 
+#: ../menu-data/screenkey:screenkey.desktop.in.h:2
+msgid "Screencast your keys"
+msgstr "Permet d'afficher à l'écran les touches que vous tapez au clavier"
+
 #: ../menu-data/screenlets:screenlets-manager.desktop.in.h:1
+msgid "Screenlets"
+msgstr "Screenlets"
+
+#: ../menu-data/screenlets:screenlets-manager.desktop.in.h:2
 msgid "A graphical tool to manage your Screenlets."
 msgstr "Outils graphique pour gérer vos Screenlets"
 
-#: ../menu-data/screenlets:screenlets-manager.desktop.in.h:2
-msgid "Screenlets"
-msgstr "Screenlets"
+#: ../menu-data/screenruler:screenruler.desktop.in.h:2
+msgid "Measure objects on your screen"
+msgstr "Permet de mesurer des éléments sur votre écran"
 
-#: ../menu-data/scribes:scribes.desktop.in.h:2
+#: ../menu-data/scribes:scribes.desktop.in.h:1
 msgid "Scribes Text Editor"
 msgstr "Éditeur de texte Scribes"
 
 #: ../menu-data/scribus-ng:scribus-ng.desktop.in.h:1
-#: ../menu-data/scribus:scribus.desktop.in.h:1
-msgid "Page Layout and Publication"
-msgstr "Mise en page et publication"
-
-#: ../menu-data/scribus-ng:scribus-ng.desktop.in.h:2
 msgid "ScribusNG"
 msgstr "ScribusNG"
 
+#: ../menu-data/scribus-ng:scribus-ng.desktop.in.h:2
 #: ../menu-data/scribus:scribus.desktop.in.h:2
+msgid "Page Layout and Publication"
+msgstr "Mise en page et publication"
+
+#: ../menu-data/scribus:scribus.desktop.in.h:1
 msgid "Scribus"
 msgstr "Scribus"
 
 #: ../menu-data/scummvm-data:scummvm.desktop.in.h:1
-msgid "Interpreter for several adventure games"
-msgstr "Interpréteur d'un certain nombre de jeu d'aventure"
-
-#: ../menu-data/scummvm-data:scummvm.desktop.in.h:2
 msgid "ScummVM"
 msgstr "ScummVM"
 
-#: ../menu-data/sdl-ball:sdl-ball.desktop.in.h:1
-msgid "Breakout Game"
-msgstr "Jeu de casse-briques"
+#: ../menu-data/scummvm-data:scummvm.desktop.in.h:2
+msgid "Interpreter for several adventure games"
+msgstr "Interpréteur d'un certain nombre de jeu d'aventure"
 
-#: ../menu-data/sdl-ball:sdl-ball.desktop.in.h:2
+#: ../menu-data/sdl-ball:sdl-ball.desktop.in.h:1
 msgid "SDL-Ball"
 msgstr "SDL-Ball"
 
+#: ../menu-data/sdl-ball:sdl-ball.desktop.in.h:2
+msgid "Breakout Game"
+msgstr "Jeu de casse-briques"
+
 #: ../menu-data/sdlbasic:sdlbasic.desktop.in.h:1
+msgid "sdlBasic"
+msgstr "sdlBasic"
+
+#: ../menu-data/sdlbasic:sdlbasic.desktop.in.h:2
 msgid "Multiplatform basic interpreter for the development of videogames"
 msgstr ""
 "Interpréteur Basic multi plate-forme pour le développement de jeux vidéo"
 
-#: ../menu-data/sdlbasic:sdlbasic.desktop.in.h:2
-msgid "sdlBasic"
-msgstr "sdlBasic"
-
 #: ../menu-data/seahorse:seahorse.desktop.in.h:1
-msgid "Manage your passwords and encryption keys"
-msgstr "Permet de gérer vos mots de passe et vos clés de chiffrement"
-
-#: ../menu-data/seahorse:seahorse.desktop.in.h:2
 msgid "Passwords and Keys"
 msgstr "Mots de passe et clés"
 
+#: ../menu-data/seahorse:seahorse.desktop.in.h:2
+msgid "Manage your passwords and encryption keys"
+msgstr "Permet de gérer vos mots de passe et vos clés de chiffrement"
+
 #: ../menu-data/seamonkey:seamonkey.desktop.in.h:1
 msgid "SeaMonkey"
 msgstr "SeaMonkey"
@@ -15475,65 +15701,73 @@
 msgstr "Recherche et récupération"
 
 #: ../menu-data/searchmonkey:searchmonkey.desktop.in.h:1
+msgid "Searchmonkey"
+msgstr "Searchmonkey"
+
+#: ../menu-data/searchmonkey:searchmonkey.desktop.in.h:2
 msgid "Regular expression power search utilty"
 msgstr ""
 "Un utilitaire de recherche de fichiers, prenant en charge les expressions "
 "régulières."
 
-#: ../menu-data/searchmonkey:searchmonkey.desktop.in.h:2
-msgid "Searchmonkey"
-msgstr "Searchmonkey"
-
 #: ../menu-data/seaview:seaview.desktop.in.h:1
+msgid "SeaView"
+msgstr "SeaView"
+
+#: ../menu-data/seaview:seaview.desktop.in.h:2
 msgid ""
 "Edits multiple sequence alignments and prints them in PostScript format."
 msgstr ""
 "Permet de générer des séquences et des alignements de séquences de "
 "nucléotides (ADN/ARN) et de les imprimer au format PostScript."
 
-#: ../menu-data/seaview:seaview.desktop.in.h:2
-msgid "SeaView"
-msgstr "SeaView"
-
 #: ../menu-data/secpanel:secpanel.desktop.in.h:1
-msgid "A graphical user interface for SSH and SCP"
-msgstr "Une interface graphique pour SSH et SCP."
-
-#: ../menu-data/secpanel:secpanel.desktop.in.h:2
 msgid "SecPanel"
 msgstr "SecPanel"
 
-#: ../menu-data/semantik:kde4__semantik.desktop.in.h:1
-msgid "Mind mapping software"
-msgstr "Logiciel de cartes heuristiques"
+#: ../menu-data/secpanel:secpanel.desktop.in.h:2
+msgid "A graphical user interface for SSH and SCP"
+msgstr "Une interface graphique pour SSH et SCP."
 
-#: ../menu-data/semantik:kde4__semantik.desktop.in.h:2
+#: ../menu-data/semantik:kde4__semantik.desktop.in.h:1
 msgid "Semantik"
 msgstr "Semantik"
 
-#: ../menu-data/sentinella:kde4__sentinella.desktop.in.h:1
-msgid "Action launcher based on system activity"
-msgstr "Lanceur d'actions basé sur l'activité du système"
+#: ../menu-data/semantik:kde4__semantik.desktop.in.h:2
+msgid "Mind mapping software"
+msgstr "Logiciel de cartes heuristiques"
 
-#: ../menu-data/sentinella:kde4__sentinella.desktop.in.h:2
+#: ../menu-data/sentinella:kde4__sentinella.desktop.in.h:1
 msgid "Sentinella"
 msgstr "Sentinella"
 
-#: ../menu-data/seq24:seq24.desktop.in.h:1
-msgid "MIDI Sequencer"
-msgstr "Séquenceur MIDI"
+#: ../menu-data/sentinella:kde4__sentinella.desktop.in.h:2
+msgid "Action launcher based on system activity"
+msgstr "Lanceur d'actions basé sur l'activité du système"
 
-#: ../menu-data/seq24:seq24.desktop.in.h:2
+#: ../menu-data/seq24:seq24.desktop.in.h:1
 msgid "Seq24"
 msgstr "Seq24"
 
+#: ../menu-data/seq24:seq24.desktop.in.h:2
+msgid "MIDI Sequencer"
+msgstr "Séquenceur MIDI"
+
 #: ../menu-data/series60-remote:series60-remote.desktop.in.h:1
+msgid "Series60-Remote"
+msgstr "Series60-Remote"
+
+#: ../menu-data/series60-remote:series60-remote.desktop.in.h:2
 msgid "Application to manage your S60 mobile phone"
 msgstr "Application pour gérer votre téléphone S60"
 
-#: ../menu-data/series60-remote:series60-remote.desktop.in.h:2
-msgid "Series60-Remote"
-msgstr "Series60-Remote"
+#: ../menu-data/sflphone-gnome:sflphone.desktop.in.h:1
+msgid "SFLphone VoIP Client"
+msgstr "Client Voix sur IP (VoIP) SFLphone"
+
+#: ../menu-data/sflphone-gnome:sflphone.desktop.in.h:2
+msgid "Call and receive calls with SIP or IAX protocols"
+msgstr "Appeller et recevoir des appels avec les protocoles SIP et IAX"
 
 #: ../menu-data/sgt-puzzles:blackboxgame.desktop.in.h:1
 msgid "Black Box"
@@ -15585,6 +15819,10 @@
 "libre en bas à droite"
 
 #: ../menu-data/sgt-puzzles:filling.desktop.in.h:1
+msgid "Filling"
+msgstr "Filling"
+
+#: ../menu-data/sgt-puzzles:filling.desktop.in.h:2
 msgid ""
 "Fill in digits so that each connected region of squares containing the same "
 "digit has an area equal to that digit"
@@ -15592,10 +15830,6 @@
 "Remplir avec des chiffres afin que chaque région de carrés contenant le même "
 "chiffre est une surface égale à ce même chiffre."
 
-#: ../menu-data/sgt-puzzles:filling.desktop.in.h:2
-msgid "Filling"
-msgstr "Filling"
-
 #: ../menu-data/sgt-puzzles:flipgame.desktop.in.h:1
 msgid "Flip"
 msgstr "Flip"
@@ -15605,6 +15839,10 @@
 msgstr "Illuminer simultanément tous les carrés du jeu"
 
 #: ../menu-data/sgt-puzzles:galaxies.desktop.in.h:1
+msgid "Galaxies"
+msgstr "Galaxies"
+
+#: ../menu-data/sgt-puzzles:galaxies.desktop.in.h:2
 msgid ""
 "Draw edges along the grid lines which divide the rectangle under certain "
 "rules"
@@ -15612,34 +15850,30 @@
 "Tracer selon des règles données des arêtes suivant la grille de division du "
 "rectangle (casse-tête)"
 
-#: ../menu-data/sgt-puzzles:galaxies.desktop.in.h:2
-msgid "Galaxies"
-msgstr "Galaxies"
-
 #: ../menu-data/sgt-puzzles:guess.desktop.in.h:1
-msgid "Game similar to the famous 'Mastermind'"
-msgstr "Jeu semblable au fameux « Mastermind »"
-
-#: ../menu-data/sgt-puzzles:guess.desktop.in.h:2
 msgid "Guess"
 msgstr "Guess"
 
-#: ../menu-data/sgt-puzzles:inertia.desktop.in.h:1
-msgid "Collect all the gems without running into any mines"
-msgstr "Ramasser toutes les pierres précieuses sans heurter les mines"
+#: ../menu-data/sgt-puzzles:guess.desktop.in.h:2
+msgid "Game similar to the famous 'Mastermind'"
+msgstr "Jeu semblable au fameux « Mastermind »"
 
-#: ../menu-data/sgt-puzzles:inertia.desktop.in.h:2
+#: ../menu-data/sgt-puzzles:inertia.desktop.in.h:1
 msgid "Inertia"
 msgstr "Inertia"
 
-#: ../menu-data/sgt-puzzles:keen.desktop.in.h:1
-msgid "Game based on KenKen"
-msgstr "Jeu fondé sur Kenken"
+#: ../menu-data/sgt-puzzles:inertia.desktop.in.h:2
+msgid "Collect all the gems without running into any mines"
+msgstr "Ramasser toutes les pierres précieuses sans heurter les mines"
 
-#: ../menu-data/sgt-puzzles:keen.desktop.in.h:2
+#: ../menu-data/sgt-puzzles:keen.desktop.in.h:1
 msgid "Keen"
 msgstr "Keen"
 
+#: ../menu-data/sgt-puzzles:keen.desktop.in.h:2
+msgid "Game based on KenKen"
+msgstr "Jeu fondé sur Kenken"
+
 #: ../menu-data/sgt-puzzles:lightup.desktop.in.h:1
 msgid "Light Up"
 msgstr "Light Up"
@@ -15651,13 +15885,13 @@
 "eux"
 
 #: ../menu-data/sgt-puzzles:loopy.desktop.in.h:1
-msgid "Draw lines around a digit according to the number in it"
-msgstr "Tracer des lignes autour d'un chiffre d'après sa valeur"
-
-#: ../menu-data/sgt-puzzles:loopy.desktop.in.h:2
 msgid "Loopy"
 msgstr "Loopy"
 
+#: ../menu-data/sgt-puzzles:loopy.desktop.in.h:2
+msgid "Draw lines around a digit according to the number in it"
+msgstr "Tracer des lignes autour d'un chiffre d'après sa valeur"
+
 #: ../menu-data/sgt-puzzles:magnets.desktop.in.h:1
 msgid "Magnets"
 msgstr "Magnets"
@@ -15667,6 +15901,10 @@
 msgstr "Jeu de réflexion Magnets"
 
 #: ../menu-data/sgt-puzzles:map.desktop.in.h:1
+msgid "Map"
+msgstr "Map"
+
+#: ../menu-data/sgt-puzzles:map.desktop.in.h:2
 msgid ""
 "Colour each region with one of four colours so that no two regions sharing a "
 "boundary have the same colour"
@@ -15675,10 +15913,6 @@
 "sorte que deux régions qui ont une frontière commune n'aient jamais la même "
 "couleur"
 
-#: ../menu-data/sgt-puzzles:map.desktop.in.h:2
-msgid "Map"
-msgstr "Map"
-
 #: ../menu-data/sgt-puzzles:netgame.desktop.in.h:1
 msgid "Net"
 msgstr "Net"
@@ -15688,24 +15922,24 @@
 msgstr "Pivoter chaque pièce pour réparer le réseau"
 
 #: ../menu-data/sgt-puzzles:netslide.desktop.in.h:1
+msgid "Netslide"
+msgstr "Netslide"
+
+#: ../menu-data/sgt-puzzles:netslide.desktop.in.h:2
 msgid ""
 "Game combining the grid generation of Net with the movement of Sixteen"
 msgstr ""
 "Jeu combinant l'outil de génération de grille de Net avec le mouvement de "
 "Sixteen"
 
-#: ../menu-data/sgt-puzzles:netslide.desktop.in.h:2
-msgid "Netslide"
-msgstr "Netslide"
-
 #: ../menu-data/sgt-puzzles:pattern.desktop.in.h:1
-msgid "Fill in the entire grid black or white"
-msgstr "Remplir entièrement la grille de noir ou de blanc"
-
-#: ../menu-data/sgt-puzzles:pattern.desktop.in.h:2
 msgid "Pattern"
 msgstr "Pattern"
 
+#: ../menu-data/sgt-puzzles:pattern.desktop.in.h:2
+msgid "Fill in the entire grid black or white"
+msgstr "Remplir entièrement la grille de noir ou de blanc"
+
 #: ../menu-data/sgt-puzzles:pegs.desktop.in.h:1
 msgid "Pegs"
 msgstr "Pegs"
@@ -15717,13 +15951,13 @@
 "adjacente."
 
 #: ../menu-data/sgt-puzzles:range.desktop.in.h:1
-msgid "Fill the grid so the range of each numbered square matches the number"
-msgstr ""
-
-#: ../menu-data/sgt-puzzles:range.desktop.in.h:2
 msgid "Range"
 msgstr "Range"
 
+#: ../menu-data/sgt-puzzles:range.desktop.in.h:2
+msgid "Fill the grid so the range of each numbered square matches the number"
+msgstr ""
+
 #: ../menu-data/sgt-puzzles:rect.desktop.in.h:1
 msgid "Rectangles"
 msgstr "Rectangles"
@@ -15736,49 +15970,49 @@
 "règles"
 
 #: ../menu-data/sgt-puzzles:samegame.desktop.in.h:1
+msgid "Same Game"
+msgstr "Same Game"
+
+#: ../menu-data/sgt-puzzles:samegame.desktop.in.h:2
 msgid ""
 "Clear the grid of coloured squares by highlighting contiguous regions of "
 "more than one coloured square"
 msgstr "Videz l'écran en supprimant des groupes de billes colorées"
 
-#: ../menu-data/sgt-puzzles:samegame.desktop.in.h:2
-msgid "Same Game"
-msgstr "Same Game"
-
 #: ../menu-data/sgt-puzzles:signpost.desktop.in.h:1
-msgid "Link the squares of a grid according to the arrows on them"
-msgstr ""
-
-#: ../menu-data/sgt-puzzles:signpost.desktop.in.h:2
 msgid "Signpost"
 msgstr "Signpost"
 
-#: ../menu-data/sgt-puzzles:singles.desktop.in.h:1
-msgid "Puzzle game based on Hitori"
-msgstr "Jeu de reflexion fondé sur Hitori"
+#: ../menu-data/sgt-puzzles:signpost.desktop.in.h:2
+msgid "Link the squares of a grid according to the arrows on them"
+msgstr "Liez les cases de la grille en suivant leurs flèches"
 
-#: ../menu-data/sgt-puzzles:singles.desktop.in.h:2
+#: ../menu-data/sgt-puzzles:singles.desktop.in.h:1
 msgid "Singles"
 msgstr "Singles"
 
-#: ../menu-data/sgt-puzzles:sixteen.desktop.in.h:1
-msgid "Game similar to Fifteen, but with a different type of move"
-msgstr "Jeu similaire à Fifteen mais avec un type de déplacement différent"
+#: ../menu-data/sgt-puzzles:singles.desktop.in.h:2
+msgid "Puzzle game based on Hitori"
+msgstr "Jeu de reflexion fondé sur Hitori"
 
-#: ../menu-data/sgt-puzzles:sixteen.desktop.in.h:2
+#: ../menu-data/sgt-puzzles:sixteen.desktop.in.h:1
 msgid "Sixteen"
 msgstr "Sixteen"
 
+#: ../menu-data/sgt-puzzles:sixteen.desktop.in.h:2
+msgid "Game similar to Fifteen, but with a different type of move"
+msgstr "Jeu similaire à Fifteen mais avec un type de déplacement différent"
+
 #: ../menu-data/sgt-puzzles:slant.desktop.in.h:1
+msgid "Slant"
+msgstr "Slant"
+
+#: ../menu-data/sgt-puzzles:slant.desktop.in.h:2
 msgid "Draw a diagonal line and choose which way each line slants"
 msgstr ""
 "Permet de dessiner des lignes en diagonales et de choisir de quel côté elles "
 "penchent"
 
-#: ../menu-data/sgt-puzzles:slant.desktop.in.h:2
-msgid "Slant"
-msgstr "Slant"
-
 #: ../menu-data/sgt-puzzles:solo.desktop.in.h:1
 msgid "Solo"
 msgstr "Solo"
@@ -15788,61 +16022,61 @@
 msgstr "Un jeu de Sudoku"
 
 #: ../menu-data/sgt-puzzles:tents.desktop.in.h:1
-msgid "Place tents in some of the remaining squares, under some conditions"
-msgstr "Placez des tentes aux places restantes, sous certaines conditions"
-
-#: ../menu-data/sgt-puzzles:tents.desktop.in.h:2
 msgid "Tents"
 msgstr "Tentes"
 
-#: ../menu-data/sgt-puzzles:towers.desktop.in.h:1
-msgid "Puzzle game based on Skyscrapers"
-msgstr "Jeu de réflexion fondé sur Skyscrapers"
+#: ../menu-data/sgt-puzzles:tents.desktop.in.h:2
+msgid "Place tents in some of the remaining squares, under some conditions"
+msgstr "Placez des tentes aux places restantes, sous certaines conditions"
 
-#: ../menu-data/sgt-puzzles:towers.desktop.in.h:2
+#: ../menu-data/sgt-puzzles:towers.desktop.in.h:1
 msgid "Towers"
 msgstr "Towers"
 
-#: ../menu-data/sgt-puzzles:twiddle.desktop.in.h:1
-msgid "Arrange the numbers into ascending order "
-msgstr "Ranger les nombres par ordre croissant "
+#: ../menu-data/sgt-puzzles:towers.desktop.in.h:2
+msgid "Puzzle game based on Skyscrapers"
+msgstr "Jeu de réflexion fondé sur Skyscrapers"
 
-#: ../menu-data/sgt-puzzles:twiddle.desktop.in.h:2
+#: ../menu-data/sgt-puzzles:twiddle.desktop.in.h:1
 msgid "Twiddle"
 msgstr "Twiddle"
 
+#: ../menu-data/sgt-puzzles:twiddle.desktop.in.h:2
+msgid "Arrange the numbers into ascending order "
+msgstr "Ranger les nombres par ordre croissant "
+
 #: ../menu-data/sgt-puzzles:unequal.desktop.in.h:1
+msgid "Unequal"
+msgstr "Unequal"
+
+#: ../menu-data/sgt-puzzles:unequal.desktop.in.h:2
 msgid "Fully populate the grid with numbers under some conditions"
 msgstr ""
 "Remplir complètement la grille avec des nombres en respectant certaines "
 "règles"
 
-#: ../menu-data/sgt-puzzles:unequal.desktop.in.h:2
-msgid "Unequal"
-msgstr "Unequal"
-
 #: ../menu-data/sgt-puzzles:untangle.desktop.in.h:1
-msgid "Position the points so that no line crosses another"
-msgstr "Disposer les points afin qu'aucune ligne n'en croise une autre"
-
-#: ../menu-data/sgt-puzzles:untangle.desktop.in.h:2
 msgid "Untangle"
 msgstr "Untangle"
 
+#: ../menu-data/sgt-puzzles:untangle.desktop.in.h:2
+msgid "Position the points so that no line crosses another"
+msgstr "Disposer les points afin qu'aucune ligne n'en croise une autre"
+
 #: ../menu-data/shisen.app:Shisen.desktop.in.h:1
 msgid "Shisen"
 msgstr "Shisen"
 
 #: ../menu-data/shoes:shoes.desktop.in.h:1
+msgid "Shoes"
+msgstr "Shoes"
+
+#: ../menu-data/shoes:shoes.desktop.in.h:2
 msgid "Interpreter for Shoes programs"
 msgstr ""
 "Interpréteur pour les programmes écrit en Ruby et utilisant la bibliothèque "
 "Shoes."
 
-#: ../menu-data/shoes:shoes.desktop.in.h:2
-msgid "Shoes"
-msgstr "Shoes"
-
 #: ../menu-data/shotwell:shotwell.desktop.in.h:1
 msgid "Organize your photos"
 msgstr "Organisez vos photos"
@@ -15851,41 +16085,41 @@
 msgid "Shotwell Photo Manager"
 msgstr "Gestionnaire de photos Shotwell"
 
-#: ../menu-data/showfoto:kde4__showfoto.desktop.in.h:2
+#: ../menu-data/showfoto:kde4__showfoto.desktop.in.h:1
 msgid "showFoto"
 msgstr "ShowFoto"
 
 #: ../menu-data/showq:showq.desktop.in.h:1
-msgid "MIDI controllable audio player"
-msgstr ""
-
-#: ../menu-data/showq:showq.desktop.in.h:2
 msgid "ShowQ"
 msgstr "ShowQ"
 
+#: ../menu-data/showq:showq.desktop.in.h:2
+msgid "MIDI controllable audio player"
+msgstr "Lecteur de sons contrôlable par MIDI"
+
 #: ../menu-data/shutter:shutter.desktop.in.h:1
-msgid "Capture an area of the screen"
-msgstr "Faire une copie d'une zone de l'écran"
+msgid "Shutter"
+msgstr "Shutter"
 
 #: ../menu-data/shutter:shutter.desktop.in.h:2
-msgid "Capture the current active window"
-msgstr "Faire une copie de la fenêtre active"
+msgid "Capture, edit and share screenshots"
+msgstr "Faire des captures d'acran, les modifier et les partager"
 
 #: ../menu-data/shutter:shutter.desktop.in.h:3
-msgid "Capture the entire screen"
-msgstr "Faire une copie l'écran en entier"
+msgid "Capture an area of the screen"
+msgstr "Faire une copie d'une zone de l'écran"
 
 #: ../menu-data/shutter:shutter.desktop.in.h:4
-msgid "Capture, edit and share screenshots"
-msgstr "Faire des captures d'acran, les modifier et les partager"
+msgid "Capture the entire screen"
+msgstr "Faire une copie l'écran en entier"
 
 #: ../menu-data/shutter:shutter.desktop.in.h:5
 msgid "Select a window to capture"
 msgstr "Séléctionner la fenêtre à copier"
 
 #: ../menu-data/shutter:shutter.desktop.in.h:6
-msgid "Shutter"
-msgstr "Shutter"
+msgid "Capture the current active window"
+msgstr "Faire une copie de la fenêtre active"
 
 #: ../menu-data/sigviewer:sigviewer.desktop.in.h:1
 msgid "SigViewer"
@@ -15898,86 +16132,78 @@
 "Visualisateur des biosignaux tels que EEG, EMG et ECG. "
 "http://sigviewer.sf.net"
 
-#: ../menu-data/sim-qt:kde__sim.desktop.in.h:1
-msgid "SIM Instant Messenger"
-msgstr "Messagerie instantanée SIM"
-
-#: ../menu-data/sim-qt:kde__sim.desktop.in.h:2
-msgid "Sim-IM"
-msgstr "Sim-IM"
-
 #: ../menu-data/simdock:simdock.desktop.in.h:1
-msgid "A dockbar for GNOME"
-msgstr "Un dock pour GNOME"
-
-#: ../menu-data/simdock:simdock.desktop.in.h:2
 msgid "SimDock"
 msgstr "SimDock"
 
-#: ../menu-data/simple-image-reducer:simple-image-reducer.desktop.in.h:1
-msgid "Reduce and rotate images in three-four clicks."
-msgstr "Réduire et retourner des images en quelques clics"
+#: ../menu-data/simdock:simdock.desktop.in.h:2
+msgid "A dockbar for GNOME"
+msgstr "Un dock pour GNOME"
 
-#: ../menu-data/simple-image-reducer:simple-image-reducer.desktop.in.h:2
+#: ../menu-data/simple-image-reducer:simple-image-reducer.desktop.in.h:1
 msgid "Simple Image Reducer"
 msgstr "Réducteur d'image intuitif"
 
-#: ../menu-data/simple-scan:simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Numériser des documents"
+#: ../menu-data/simple-image-reducer:simple-image-reducer.desktop.in.h:2
+msgid "Reduce and rotate images in three-four clicks."
+msgstr "Réduire et retourner des images en quelques clics"
 
-#: ../menu-data/simple-scan:simple-scan.desktop.in.h:2
+#: ../menu-data/simple-scan:simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
-#: ../menu-data/sineshaper:sineshaper.desktop.in.h:1
-msgid "Monophonic synth plugin with two oscillators and waveshapers"
-msgstr ""
+#: ../menu-data/simple-scan:simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Numériser des documents"
 
-#: ../menu-data/sineshaper:sineshaper.desktop.in.h:2
+#: ../menu-data/sineshaper:sineshaper.desktop.in.h:1
 msgid "Sineshaper"
 msgstr "Sineshaper"
 
-#: ../menu-data/singularity:singularity.desktop.in.h:1
-msgid "Become the singularity"
-msgstr "Un jeu basé sur l'intelligence artificielle."
+#: ../menu-data/sineshaper:sineshaper.desktop.in.h:2
+msgid "Monophonic synth plugin with two oscillators and waveshapers"
+msgstr ""
 
-#: ../menu-data/singularity:singularity.desktop.in.h:2
+#: ../menu-data/singularity:singularity.desktop.in.h:1
 msgid "Singularity"
 msgstr "Singularity"
 
-#: ../menu-data/sitplus:sitplus.desktop.in.h:1
-msgid "Framework for ludic-therapeutic activities"
-msgstr ""
+#: ../menu-data/singularity:singularity.desktop.in.h:2
+msgid "Become the singularity"
+msgstr "Un jeu basé sur l'intelligence artificielle."
 
-#: ../menu-data/sitplus:sitplus.desktop.in.h:2
+#: ../menu-data/sitplus:sitplus.desktop.in.h:1
 msgid "Sitplus"
 msgstr "Sitplus"
 
-#: ../menu-data/sixpack:SIXpack.desktop.in.h:1
-msgid "EXAFS data analysis"
-msgstr "Analyses de données EXAFS"
+#: ../menu-data/sitplus:sitplus.desktop.in.h:2
+msgid "Framework for ludic-therapeutic activities"
+msgstr "Environnement pour les activités ludo-thérapeutiques"
 
-#: ../menu-data/sixpack:SIXpack.desktop.in.h:2
+#: ../menu-data/sixpack:SIXpack.desktop.in.h:1
 msgid "SIXpack"
 msgstr "SIXpack"
 
-#: ../menu-data/skanlite:kde4__skanlite.desktop.in.h:1
-msgid "Scan and save images"
-msgstr "Numériser et enregistrer des images"
+#: ../menu-data/sixpack:SIXpack.desktop.in.h:2
+msgid "EXAFS data analysis"
+msgstr "Analyses de données EXAFS"
 
-#: ../menu-data/skanlite:kde4__skanlite.desktop.in.h:2
+#: ../menu-data/skanlite:kde4__skanlite.desktop.in.h:1
 msgid "Skanlite"
 msgstr "Skanlite"
 
-#: ../menu-data/skrooge:kde4__skrooge.desktop.in.h:1
-msgid "Manage your money"
-msgstr "Gérer vos finances"
+#: ../menu-data/skanlite:kde4__skanlite.desktop.in.h:2
+msgid "Scan and save images"
+msgstr "Numériser et enregistrer des images"
 
-#: ../menu-data/skrooge:kde4__skrooge.desktop.in.h:2
+#: ../menu-data/skrooge:kde4__skrooge.desktop.in.h:1
 msgid "skrooge"
 msgstr "skrooge"
 
+#: ../menu-data/skrooge:kde4__skrooge.desktop.in.h:2
+msgid "Manage your money"
+msgstr "Gérer vos finances"
+
 #: ../menu-data/slashem-gtk:slashem-gtk.desktop.in.h:1
 msgid "GTK Slash'EM"
 msgstr "GTK Slash'EM"
@@ -15995,20 +16221,12 @@
 msgstr "Super Lotsa Added Stuff Hack - Extended Magic (SDL)"
 
 #: ../menu-data/slashem-x11:slashem-x11.desktop.in.h:1
-msgid "Super Lotsa Added Stuff Hack - Extended Magic (X11)"
-msgstr "Super Lotsa Added Stuff Hack - Extended Magic (X11)"
-
-#: ../menu-data/slashem-x11:slashem-x11.desktop.in.h:2
 msgid "X Slash'EM"
 msgstr "X Slash'EM"
 
-#: ../menu-data/slicer:slicer.desktop.in.h:1
-msgid "3D Slicer"
-msgstr "3D Slicer"
-
-#: ../menu-data/slicer:slicer.desktop.in.h:2
-msgid "Start 3D Slicer"
-msgstr "Démarrer 3D Slicer"
+#: ../menu-data/slashem-x11:slashem-x11.desktop.in.h:2
+msgid "Super Lotsa Added Stuff Hack - Extended Magic (X11)"
+msgstr "Super Lotsa Added Stuff Hack - Extended Magic (X11)"
 
 #: ../menu-data/slimevolley:slimevolley.desktop.in.h:1
 msgid "Slime Volley"
@@ -16027,69 +16245,69 @@
 msgstr "Logiciel de téléchargement de fichiers Slimrat"
 
 #: ../menu-data/slingshot:slingshot.desktop.in.h:1
-msgid "2D space shooting game with gravity"
-msgstr "Jeu de tir 2D dans l'espace gérant la gravité"
-
-#: ../menu-data/slingshot:slingshot.desktop.in.h:2
 msgid "Slingshot"
 msgstr "Slingshot"
 
+#: ../menu-data/slingshot:slingshot.desktop.in.h:2
+msgid "2D space shooting game with gravity"
+msgstr "Jeu de tir 2D dans l'espace gérant la gravité"
+
 #: ../menu-data/sludge-devkit:sludge-floormaker.desktop.in.h:1
-msgid "Edit SLUDGE floor plans"
+msgid "SLUDGE Floor Maker"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-floormaker.desktop.in.h:2
-msgid "SLUDGE Floor Maker"
+msgid "Edit SLUDGE floor plans"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-projectmanager.desktop.in.h:1
-msgid "Manage and compile SLUDGE projects"
-msgstr "Gérer et compiler des projets SLUDGE"
-
-#: ../menu-data/sludge-devkit:sludge-projectmanager.desktop.in.h:2
 msgid "SLUDGE Project Manager"
 msgstr "Gestionnaire de projet SLUDGE"
 
+#: ../menu-data/sludge-devkit:sludge-projectmanager.desktop.in.h:2
+msgid "Manage and compile SLUDGE projects"
+msgstr "Gérer et compiler des projets SLUDGE"
+
 #: ../menu-data/sludge-devkit:sludge-spritebankeditor.desktop.in.h:1
-msgid "Edit SLUDGE sprite banks"
+msgid "SLUDGE Sprite Bank Editor"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-spritebankeditor.desktop.in.h:2
-msgid "SLUDGE Sprite Bank Editor"
+msgid "Edit SLUDGE sprite banks"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-translationeditor.desktop.in.h:1
-msgid "Edit SLUDGE translation files"
-msgstr ""
-
-#: ../menu-data/sludge-devkit:sludge-translationeditor.desktop.in.h:2
 msgid "SLUDGE Translation Editor"
 msgstr "Éditeur de traduction SLUDGE"
 
+#: ../menu-data/sludge-devkit:sludge-translationeditor.desktop.in.h:2
+msgid "Edit SLUDGE translation files"
+msgstr ""
+
 #: ../menu-data/sludge-devkit:sludge-zbuffermaker.desktop.in.h:1
-msgid "Edit SLUDGE z-buffer files"
+msgid "SLUDGE Z-Buffer Maker"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-zbuffermaker.desktop.in.h:2
-msgid "SLUDGE Z-Buffer Maker"
+msgid "Edit SLUDGE z-buffer files"
 msgstr ""
 
 #: ../menu-data/sludge-engine:sludge-engine.desktop.in.h:1
-msgid "Play SLUDGE games"
-msgstr "Jouez à des jeux SLUDGE"
-
-#: ../menu-data/sludge-engine:sludge-engine.desktop.in.h:2
 msgid "SLUDGE Engine"
 msgstr "Moteur SLUDGE"
 
-#: ../menu-data/sm:sm.desktop.in.h:1
-msgid "Displays a short text fullscreen"
-msgstr "Affiche un petit message en plein écran"
+#: ../menu-data/sludge-engine:sludge-engine.desktop.in.h:2
+msgid "Play SLUDGE games"
+msgstr "Jouez à des jeux SLUDGE"
 
-#: ../menu-data/sm:sm.desktop.in.h:2
+#: ../menu-data/sm:sm.desktop.in.h:1
 msgid "Screen-Message"
 msgstr "Screen-Message"
 
+#: ../menu-data/sm:sm.desktop.in.h:2
+msgid "Displays a short text fullscreen"
+msgstr "Affiche un petit message en plein écran"
+
 #: ../menu-data/smartpm:smart.desktop.in.h:1
 msgid "Smart Package Manager"
 msgstr "Gestionnaire de paquets Smart"
@@ -16103,14 +16321,14 @@
 msgstr "L'explorateur de partages SMB/CIFS"
 
 #: ../menu-data/smc:smc.desktop.in.h:1
+msgid "Secret Maryo Chronicles"
+msgstr "Secret Maryo Chronicles"
+
+#: ../menu-data/smc:smc.desktop.in.h:2
 msgid "A 2D platform game with style similar to classic sidescroller games"
 msgstr ""
 "Un jeu de plate-forme en 2D au style analogue au jeux à défilement classiques"
 
-#: ../menu-data/smc:smc.desktop.in.h:2
-msgid "Secret Maryo Chronicles"
-msgstr "Secret Maryo Chronicles"
-
 #: ../menu-data/smplayer:smplayer.desktop.in.h:1
 msgid "A great MPlayer front-end"
 msgstr "Une excellente interface graphique pour MPlayer"
@@ -16120,39 +16338,39 @@
 msgstr "SMPlayer"
 
 #: ../menu-data/smuxi-frontend-gnome:smuxi-frontend-gnome.desktop.in.h:1
-msgid "Chat with other people on IRC"
-msgstr "Permet de discuter avec d'autres personnes sur IRC"
-
-#: ../menu-data/smuxi-frontend-gnome:smuxi-frontend-gnome.desktop.in.h:2
 msgid "Smuxi IRC Client"
 msgstr "Client IRC Smuxi"
 
-#: ../menu-data/snake4:snake4.desktop.in.h:1
-msgid "Fruit-eating snake game"
-msgstr "Jeu du serpent mangeur de fruits"
+#: ../menu-data/smuxi-frontend-gnome:smuxi-frontend-gnome.desktop.in.h:2
+msgid "Chat with other people on IRC"
+msgstr "Permet de discuter avec d'autres personnes sur IRC"
 
-#: ../menu-data/snake4:snake4.desktop.in.h:2
+#: ../menu-data/snake4:snake4.desktop.in.h:1
 msgid "Snake4"
 msgstr "Snake4"
 
+#: ../menu-data/snake4:snake4.desktop.in.h:2
+msgid "Fruit-eating snake game"
+msgstr "Jeu du serpent mangeur de fruits"
+
 #: ../menu-data/snappea:snappea.desktop.in.h:1
+msgid "Snappea 3-Manifold Creator"
+msgstr "Créateur de 3-manifold Snappea"
+
+#: ../menu-data/snappea:snappea.desktop.in.h:2
 msgid "Create and study hyperbolic 3-manifolds"
 msgstr ""
 "Créer et étudier des variétés de Riemann hyperboliques à 3 dimensions "
 "(manifolds)"
 
-#: ../menu-data/snappea:snappea.desktop.in.h:2
-msgid "Snappea 3-Manifold Creator"
-msgstr "Créateur de 3-manifold Snappea"
-
 #: ../menu-data/snowballz:snowball.desktop.in.h:1
-msgid "Command your army of penguins"
-msgstr "Commandez votre armée de manchots"
-
-#: ../menu-data/snowballz:snowball.desktop.in.h:2
 msgid "SnowballZ"
 msgstr "SnowballZ"
 
+#: ../menu-data/snowballz:snowball.desktop.in.h:2
+msgid "Command your army of penguins"
+msgstr "Commandez votre armée de manchots"
+
 #: ../menu-data/socnetv:socnetv.desktop.in.h:1
 msgid "SocNetV"
 msgstr "SocNetV"
@@ -16162,54 +16380,48 @@
 msgstr "Affichage et analyse des réseaux sociaux"
 
 #: ../menu-data/sofa-apps:sofa.desktop.in.h:1
-msgid "Open Source Framework for Medical Simulation"
-msgstr "Infrastructure libre pour les simulations médicales"
-
-#: ../menu-data/sofa-apps:sofa.desktop.in.h:2
 msgid "SOFA"
 msgstr "SOFA"
 
-#: ../menu-data/software-center:ubuntu-software-center.desktop.in.h:1
-msgid "Lets you choose from thousands of applications available for Ubuntu"
-msgstr ""
-"Vous permet de choisir parmi des milliers d'applications disponibles pour "
-"Ubuntu"
+#: ../menu-data/sofa-apps:sofa.desktop.in.h:2
+msgid "Open Source Framework for Medical Simulation"
+msgstr "Infrastructure libre pour les simulations médicales"
 
-#: ../menu-data/software-center:ubuntu-software-center.desktop.in.h:2
+#: ../menu-data/software-center:ubuntu-software-center.desktop.in.h:1
 msgid "Ubuntu Software Center"
 msgstr "Logithèque Ubuntu"
 
 #: ../menu-data/software-properties-gtk:software-properties-gtk.desktop.in.h:1
 #: ../menu-data/software-properties-kde:software-properties-kde.desktop.in.h:1
-msgid "Configure the sources for installable software and updates"
-msgstr ""
-"Configurer les sources pour les logiciels à installer et leurs mises à jour"
+msgid "Software Sources"
+msgstr "Sources de logiciels"
 
 #: ../menu-data/software-properties-gtk:software-properties-gtk.desktop.in.h:2
 #: ../menu-data/software-properties-kde:software-properties-kde.desktop.in.h:2
-msgid "Software Sources"
-msgstr "Sources de logiciels"
+msgid "Configure the sources for installable software and updates"
+msgstr ""
+"Configurer les sources pour les logiciels à installer et leurs mises à jour"
 
 #: ../menu-data/solarwolf:solarwolf.desktop.in.h:1
 msgid "SolarWolf"
 msgstr "SolarWolf"
 
 #: ../menu-data/solfege:solfege.desktop.in.h:1
-msgid "Ear training"
-msgstr ""
-
-#: ../menu-data/solfege:solfege.desktop.in.h:2
 msgid "GNU Solfege"
 msgstr "GNU Solfège"
 
-#: ../menu-data/sonata:sonata.desktop.in.h:1
-msgid "An elegant GTK+ MPD client"
-msgstr "Un élégant client MPD"
+#: ../menu-data/solfege:solfege.desktop.in.h:2
+msgid "Ear training"
+msgstr "Entrainement de l'oreille"
 
-#: ../menu-data/sonata:sonata.desktop.in.h:2
+#: ../menu-data/sonata:sonata.desktop.in.h:1
 msgid "Sonata"
 msgstr "Sonata"
 
+#: ../menu-data/sonata:sonata.desktop.in.h:2
+msgid "An elegant GTK+ MPD client"
+msgstr "Un élégant client MPD"
+
 #: ../menu-data/songwrite:songwrite.desktop.in.h:1
 msgid "Songwrite"
 msgstr "Songwrite"
@@ -16231,47 +16443,47 @@
 msgstr "Jeu de combat de chiens WW1"
 
 #: ../menu-data/sound-juicer:sound-juicer.desktop.in.h:1
-msgid "Copy music from your CDs"
-msgstr "Permet de copier la musique de vos CD audio"
-
-#: ../menu-data/sound-juicer:sound-juicer.desktop.in.h:2
 msgid "Sound Juicer Audio CD Extractor"
 msgstr "Extracteur de CD audio Sound Juicer"
 
-#: ../menu-data/soundconverter:soundconverter.desktop.in.h:1
-msgid "Convert audio files into other formats"
-msgstr "Permet de convertir les fichiers audio vers d'autres formats"
+#: ../menu-data/sound-juicer:sound-juicer.desktop.in.h:2
+msgid "Copy music from your CDs"
+msgstr "Permet de copier la musique de vos CD audio"
 
-#: ../menu-data/soundconverter:soundconverter.desktop.in.h:2
+#: ../menu-data/soundconverter:soundconverter.desktop.in.h:1
 msgid "Sound Converter"
 msgstr "Convertisseur de sons"
 
-#: ../menu-data/soundkonverter:kde4__soundkonverter.desktop.in.h:1
-msgid "An audio file converter"
-msgstr "Un convertisseur de fichiers audio"
+#: ../menu-data/soundconverter:soundconverter.desktop.in.h:2
+msgid "Convert audio files into other formats"
+msgstr "Permet de convertir les fichiers audio vers d'autres formats"
 
-#: ../menu-data/soundkonverter:kde4__soundkonverter.desktop.in.h:2
+#: ../menu-data/soundkonverter:kde4__soundkonverter.desktop.in.h:1
 msgid "soundKonverter"
 msgstr "soundKonverter"
 
+#: ../menu-data/soundkonverter:kde4__soundkonverter.desktop.in.h:2
+msgid "An audio file converter"
+msgstr "Un convertisseur de fichiers audio"
+
 #: ../menu-data/source-highlight-ide:source-highlight-ide.desktop.in.h:1
+msgid "Source-Highlight-IDE"
+msgstr "Source-Highlight-IDE"
+
+#: ../menu-data/source-highlight-ide:source-highlight-ide.desktop.in.h:2
 msgid "Develop, modify or debug a source-highlight definition file"
 msgstr ""
 "Développer, modifier ou déboguer un fichier de définition de coloration "
 "syntaxique"
 
-#: ../menu-data/source-highlight-ide:source-highlight-ide.desktop.in.h:2
-msgid "Source-Highlight-IDE"
-msgstr "Source-Highlight-IDE"
-
 #: ../menu-data/spacezero:spacezero.desktop.in.h:1
-msgid "Real Time Strategy 2D space combat multiplayer net game."
-msgstr ""
-
-#: ../menu-data/spacezero:spacezero.desktop.in.h:2
 msgid "Spacezero"
 msgstr "Spacezero"
 
+#: ../menu-data/spacezero:spacezero.desktop.in.h:2
+msgid "Real Time Strategy 2D space combat multiplayer net game."
+msgstr "Jeu en réseau de stratégie dans l'espace en 2D"
+
 #: ../menu-data/sparkleshare:sparkleshare.desktop.in.h:1
 msgid "SparkleShare"
 msgstr "SparkleShare"
@@ -16281,25 +16493,25 @@
 msgstr "Interface pour Spatialite"
 
 #: ../menu-data/spe:spe.desktop.in.h:1
-msgid "Integrated Python Development Environment"
-msgstr "Environnement intégré de développement Python"
-
-#: ../menu-data/spe:spe.desktop.in.h:2
 msgid "SPE (Stani's Python Editor)"
 msgstr "SPE (Éditeur python de Stani )"
 
-#: ../menu-data/specimen:specimen.desktop.in.h:2
+#: ../menu-data/spe:spe.desktop.in.h:2
+msgid "Integrated Python Development Environment"
+msgstr "Environnement intégré de développement Python"
+
+#: ../menu-data/specimen:specimen.desktop.in.h:1
 msgid "Specimen"
 msgstr "Specimen"
 
 #: ../menu-data/specto:specto.desktop.in.h:1
-msgid "Be notified of everything"
-msgstr "Permet d'être averti de quoique soit"
-
-#: ../menu-data/specto:specto.desktop.in.h:2
 msgid "Specto"
 msgstr "Specto"
 
+#: ../menu-data/specto:specto.desktop.in.h:2
+msgid "Be notified of everything"
+msgstr "Permet d'être averti de quoique soit"
+
 #: ../menu-data/spectools:spectool_gtk.desktop.in.h:1
 msgid "2.4 GHz spectrum analysis using the Wi-Spy hardware device"
 msgstr "Analyse des fréquences à 2,4 GHz avec le périphérique Wi-Spy"
@@ -16309,92 +16521,92 @@
 msgstr "Outil d'analyse de fréquences"
 
 #: ../menu-data/speedcrunch:speedcrunch.desktop.in.h:1
-msgid "High precision calculator"
-msgstr "Calculatrice de haute précision"
-
-#: ../menu-data/speedcrunch:speedcrunch.desktop.in.h:2
 msgid "SpeedCrunch"
 msgstr "SpeedCrunch"
 
-#: ../menu-data/spek:spek.desktop.in.h:1
-msgid "Spek Spectrum Analyser"
-msgstr "Analyseur de spectre Spek"
+#: ../menu-data/speedcrunch:speedcrunch.desktop.in.h:2
+msgid "High precision calculator"
+msgstr "Calculatrice de haute précision"
 
-#: ../menu-data/spek:spek.desktop.in.h:2
+#: ../menu-data/spek:spek.desktop.in.h:1
 msgid "View spectrograms of your audio files"
 msgstr "Voir des spectrogrammes de vos fichiers audio"
 
-#: ../menu-data/spim:xspim.desktop.in.h:1
-msgid "Graphical MIPS32 Assembly language emulator"
-msgstr "Émulateur graphique de langage assembleur MIPS32"
+#: ../menu-data/spek:spek.desktop.in.h:2
+msgid "Spek Spectrum Analyser"
+msgstr "Analyseur de spectre Spek"
 
-#: ../menu-data/spim:xspim.desktop.in.h:2
+#: ../menu-data/spim:xspim.desktop.in.h:1
 msgid "xSPIM"
 msgstr "xSPIM"
 
-#: ../menu-data/spotlighter:spotlighter.desktop.in.h:1
-msgid "Show and move a spotlight on the desktop"
-msgstr "Afficher et déplacer un spot lumineux sur le bureau"
+#: ../menu-data/spim:xspim.desktop.in.h:2
+msgid "Graphical MIPS32 Assembly language emulator"
+msgstr "Émulateur graphique de langage assembleur MIPS32"
 
-#: ../menu-data/spotlighter:spotlighter.desktop.in.h:2
+#: ../menu-data/spotlighter:spotlighter.desktop.in.h:1
 msgid "Spotlighter"
 msgstr "Spotlighter"
 
+#: ../menu-data/spotlighter:spotlighter.desktop.in.h:2
+msgid "Show and move a spotlight on the desktop"
+msgstr "Afficher et déplacer un spot lumineux sur le bureau"
+
 #: ../menu-data/spout:spout.desktop.in.h:1
 msgid "Spout"
 msgstr "Spout"
 
 #: ../menu-data/spring:spring.desktop.in.h:1
+msgid "Spring"
+msgstr "Spring"
+
+#: ../menu-data/spring:spring.desktop.in.h:2
 msgid "An open source RTS with similar gameplay to TA"
 msgstr ""
 "Un jeu de stratégie en temps réel (RTS) Open Source proposant une jouabilité "
 "similaire à celle de Total Annihilation"
 
-#: ../menu-data/spring:spring.desktop.in.h:2
-msgid "Spring"
-msgstr "Spring"
-
 #: ../menu-data/springlobby:springlobby.desktop.in.h:1
+msgid "SpringLobby"
+msgstr "SpringLobby"
+
+#: ../menu-data/springlobby:springlobby.desktop.in.h:2
 msgid "Play real-time strategy games using the Spring engine"
 msgstr ""
 "Jouer à des jeux de stratégie en temps réel utilisant le moteur Spring"
 
-#: ../menu-data/springlobby:springlobby.desktop.in.h:2
-msgid "SpringLobby"
-msgstr "SpringLobby"
-
 #: ../menu-data/spyder:spyder.desktop.in.h:1
-msgid "Python IDE for scientists"
-msgstr "EDI Python pour les scientifiques"
-
-#: ../menu-data/spyder:spyder.desktop.in.h:2
 msgid "spyder"
 msgstr "spyder"
 
-#: ../menu-data/sqlitebrowser:sqlitebrowser.desktop.in.h:1
-msgid "GUI editor for SQLite databases"
-msgstr "Éditeur graphique de bases de données SQLite"
+#: ../menu-data/spyder:spyder.desktop.in.h:2
+msgid "Python IDE for scientists"
+msgstr "EDI Python pour les scientifiques"
 
-#: ../menu-data/sqlitebrowser:sqlitebrowser.desktop.in.h:2
+#: ../menu-data/sqlitebrowser:sqlitebrowser.desktop.in.h:1
 msgid "SQLite database browser"
 msgstr "Navigateur de bases de données SQLite"
 
-#: ../menu-data/sqliteman:sqliteman.desktop.in.h:1
-msgid "Administer and develop your Sqlite3 databases"
-msgstr "Administrer et développer des bases de donées Sqlite3"
+#: ../menu-data/sqlitebrowser:sqlitebrowser.desktop.in.h:2
+msgid "GUI editor for SQLite databases"
+msgstr "Éditeur graphique de bases de données SQLite"
 
-#: ../menu-data/sqliteman:sqliteman.desktop.in.h:2
+#: ../menu-data/sqliteman:sqliteman.desktop.in.h:1
 msgid "Sqliteman"
 msgstr "Sqliteman"
 
-#: ../menu-data/squeak-vm:squeak.desktop.in.h:1
-msgid " Programming system and content development tool"
-msgstr " Outil de développement de contenu et de programmation"
+#: ../menu-data/sqliteman:sqliteman.desktop.in.h:2
+msgid "Administer and develop your Sqlite3 databases"
+msgstr "Administrer et développer des bases de donées Sqlite3"
 
-#: ../menu-data/squeak-vm:squeak.desktop.in.h:2
+#: ../menu-data/squeak-vm:squeak.desktop.in.h:1
 msgid "Squeak"
 msgstr "Squeak"
 
+#: ../menu-data/squeak-vm:squeak.desktop.in.h:2
+msgid " Programming system and content development tool"
+msgstr " Outil de développement de contenu et de programmation"
+
 #: ../menu-data/squeeze:squeeze.desktop.in.h:1
 msgid "Squeeze"
 msgstr "Squeeze"
@@ -16413,21 +16625,21 @@
 msgstr "SSVNC - Accéder à des bureaux VNC distants"
 
 #: ../menu-data/stackapplet:stackapplet.desktop.in.h:1
-msgid "Launch the StackApplet indicator"
-msgstr "Lancer l'indicateur StackApplet"
-
-#: ../menu-data/stackapplet:stackapplet.desktop.in.h:2
 msgid "StackApplet"
 msgstr "StackApplet"
 
-#: ../menu-data/stardict-common:stardict.desktop.in.h:1
-msgid "Lookup words"
-msgstr "Un dictionnaire."
+#: ../menu-data/stackapplet:stackapplet.desktop.in.h:2
+msgid "Launch the StackApplet indicator"
+msgstr "Lancer l'indicateur StackApplet"
 
-#: ../menu-data/stardict-common:stardict.desktop.in.h:2
+#: ../menu-data/stardict-common:stardict.desktop.in.h:1
 msgid "StarDict"
 msgstr "StarDict"
 
+#: ../menu-data/stardict-common:stardict.desktop.in.h:2
+msgid "Lookup words"
+msgstr "Un dictionnaire."
+
 #: ../menu-data/starplot:starplot.desktop.in.h:1
 msgid "StarPlot Star Chart Viewer"
 msgstr "Afficheur de graphes stellaires StarPlot"
@@ -16437,14 +16649,14 @@
 msgstr "Afficher des graphes stellaires détaillés en 3D"
 
 #: ../menu-data/startupmanager:startupmanager.desktop.in.h:1
+msgid "StartUp-Manager"
+msgstr "Gestionnaire d'amorçage StartUp-Manager"
+
+#: ../menu-data/startupmanager:startupmanager.desktop.in.h:2
 msgid "Change settings for the bootloader and splash screen"
 msgstr ""
 "Permet de paramétrer le menu d'amorçage ainsi que son apparence visuelle."
 
-#: ../menu-data/startupmanager:startupmanager.desktop.in.h:2
-msgid "StartUp-Manager"
-msgstr "Gestionnaire d'amorçage StartUp-Manager"
-
 #: ../menu-data/starvoyager:starvoyager.desktop.in.h:1
 msgid "Star Voyager"
 msgstr "Star Voyager"
@@ -16454,29 +16666,29 @@
 msgstr "Gestionnaire de téléchargements Steadyflow"
 
 #: ../menu-data/stella:stella.desktop.in.h:1
-msgid "A multi-platform Atari 2600 emulator"
-msgstr "Un émulateur Atari 2600 multi plate-forme"
-
-#: ../menu-data/stella:stella.desktop.in.h:2
 msgid "Stella"
 msgstr "Stella"
 
-#: ../menu-data/stellarium:stellarium.desktop.in.h:1
-msgid "Planetarium"
-msgstr "Un planétarium interactif."
+#: ../menu-data/stella:stella.desktop.in.h:2
+msgid "A multi-platform Atari 2600 emulator"
+msgstr "Un émulateur Atari 2600 multi plate-forme"
 
-#: ../menu-data/stellarium:stellarium.desktop.in.h:2
+#: ../menu-data/stellarium:stellarium.desktop.in.h:1
 msgid "Stellarium"
 msgstr "Stellarium"
 
-#: ../menu-data/step:kde4__step.desktop.in.h:1
-msgid "Simulate physics experiments"
-msgstr "Simuler des expériences physiques"
+#: ../menu-data/stellarium:stellarium.desktop.in.h:2
+msgid "Planetarium"
+msgstr "Un planétarium interactif."
 
-#: ../menu-data/step:kde4__step.desktop.in.h:2
+#: ../menu-data/step:kde4__step.desktop.in.h:1
 msgid "Step"
 msgstr "Step"
 
+#: ../menu-data/step:kde4__step.desktop.in.h:2
+msgid "Simulate physics experiments"
+msgstr "Simuler des expériences physiques"
+
 #: ../menu-data/stepbill.app:StepBill.desktop.in.h:1
 msgid "StepBill"
 msgstr "StepBill (jeu)"
@@ -16486,21 +16698,21 @@
 msgstr "StepBill (jeu) - XBill pour GNUstep (basé sur MacBill)"
 
 #: ../menu-data/stopmotion:stopmotion.desktop.in.h:1
-msgid "Program to create stop-motion animations"
-msgstr "Permet de créer des animations à partir d'images fixes."
-
-#: ../menu-data/stopmotion:stopmotion.desktop.in.h:2
 msgid "Stopmotion"
 msgstr "Stopmotion"
 
-#: ../menu-data/stopwatch:stopwatch.desktop.in.h:1
-msgid "A virtual stopwatch"
-msgstr "Un chronomètre virtuel."
+#: ../menu-data/stopmotion:stopmotion.desktop.in.h:2
+msgid "Program to create stop-motion animations"
+msgstr "Permet de créer des animations à partir d'images fixes."
 
-#: ../menu-data/stopwatch:stopwatch.desktop.in.h:2
+#: ../menu-data/stopwatch:stopwatch.desktop.in.h:1
 msgid "Stopwatch"
 msgstr "Chronomètre"
 
+#: ../menu-data/stopwatch:stopwatch.desktop.in.h:2
+msgid "A virtual stopwatch"
+msgstr "Un chronomètre virtuel."
+
 #: ../menu-data/stormbaancoureur:stormbaancoureur.desktop.in.h:1
 msgid "Stormbaan Coureur"
 msgstr "Stormbaan Coureur"
@@ -16510,29 +16722,31 @@
 msgstr "Un simulateur de course d'obstacles pour voitures."
 
 #: ../menu-data/streamtuner2:streamtuner2.desktop.in.h:1
-msgid "Listen to shoutcast/xiph/live365 music stations"
-msgstr "Écoutez des stations de musique shoutcast/xiph/live365"
-
-#: ../menu-data/streamtuner2:streamtuner2.desktop.in.h:2
 msgid "streamtuner2"
 msgstr "streamtuner2"
 
-#: ../menu-data/streamtuner:streamtuner.desktop.in.h:1
-msgid "Browse Internet stream directories"
-msgstr "Un moteur de recherche de radios Web."
+#: ../menu-data/streamtuner2:streamtuner2.desktop.in.h:2
+msgid "Listen to shoutcast/xiph/live365 music stations"
+msgstr "Écoutez des stations de musique shoutcast/xiph/live365"
 
-#: ../menu-data/streamtuner:streamtuner.desktop.in.h:2
+#: ../menu-data/streamtuner:streamtuner.desktop.in.h:1
 msgid "streamtuner"
 msgstr "Streamtuner"
 
-#: ../menu-data/stretchplayer:stretchplayer.desktop.in.h:1
-msgid "Audio file player with time stretch"
-msgstr ""
+#: ../menu-data/streamtuner:streamtuner.desktop.in.h:2
+msgid "Browse Internet stream directories"
+msgstr "Un moteur de recherche de radios Web."
 
-#: ../menu-data/stretchplayer:stretchplayer.desktop.in.h:2
+#: ../menu-data/stretchplayer:stretchplayer.desktop.in.h:1
 msgid "StretchPlayer"
 msgstr "StretchPlayer"
 
+#: ../menu-data/stretchplayer:stretchplayer.desktop.in.h:2
+msgid "Audio file player with time stretch"
+msgstr ""
+"Lecteur de fichiers audio permettant d'utiliser des effets \"time "
+"stretching\""
+
 #: ../menu-data/stroq:stroq.desktop.in.h:1
 msgid "StroQ"
 msgstr "StroQ"
@@ -16542,42 +16756,42 @@
 msgstr "Un clone de Hitofude Polarium/Chokkan, StroQ"
 
 #: ../menu-data/structure-synth:structure-synth.desktop.in.h:1
-msgid "Application for creating 3D structures"
-msgstr "Application pour créer des structures en 3D"
-
-#: ../menu-data/structure-synth:structure-synth.desktop.in.h:2
 msgid "Structure Synth"
 msgstr "Structure Synth"
 
-#: ../menu-data/subcommander:subcommander.desktop.in.h:2
+#: ../menu-data/structure-synth:structure-synth.desktop.in.h:2
+msgid "Application for creating 3D structures"
+msgstr "Application pour créer des structures en 3D"
+
+#: ../menu-data/subcommander:subcommander.desktop.in.h:1
 msgid "Subcommander"
 msgstr "Subcommander"
 
 #: ../menu-data/subdownloader:subdownloader.desktop.in.h:1
+msgid "SubDownloader"
+msgstr "SubDownloader"
+
+#: ../menu-data/subdownloader:subdownloader.desktop.in.h:2
 msgid "Application to download/upload subtitles of your movies."
 msgstr ""
 "Application pour télécharger/téléverser des sous-titres pour vos films."
 
-#: ../menu-data/subdownloader:subdownloader.desktop.in.h:2
-msgid "SubDownloader"
-msgstr "SubDownloader"
-
 #: ../menu-data/subtitlecomposer:kde4__subtitlecomposer.desktop.in.h:1
-msgid "KDE subtitle editor"
-msgstr "Éditeur de sous-titres pour KDE"
-
-#: ../menu-data/subtitlecomposer:kde4__subtitlecomposer.desktop.in.h:2
 msgid "Subtitle Composer"
 msgstr "Subtitle Composer"
 
-#: ../menu-data/subtitleeditor:subtitleeditor.desktop.in.h:1
-msgid "A subtitle editor based on GStreamer and Gtk+"
-msgstr "Éditeur de sous-titres utilisant GStreamer et Gtk+"
+#: ../menu-data/subtitlecomposer:kde4__subtitlecomposer.desktop.in.h:2
+msgid "KDE subtitle editor"
+msgstr "Éditeur de sous-titres pour KDE"
 
-#: ../menu-data/subtitleeditor:subtitleeditor.desktop.in.h:2
+#: ../menu-data/subtitleeditor:subtitleeditor.desktop.in.h:1
 msgid "Subtitle Editor"
 msgstr "Éditeur de sous-titres Subtitle Editor"
 
+#: ../menu-data/subtitleeditor:subtitleeditor.desktop.in.h:2
+msgid "A subtitle editor based on GStreamer and Gtk+"
+msgstr "Éditeur de sous-titres utilisant GStreamer et Gtk+"
+
 #: ../menu-data/sugar-emulator-0.84:sugar-emulator.desktop.in.h:1
 #: ../menu-data/sugar-emulator-0.86:sugar-emulator.desktop.in.h:1
 #: ../menu-data/sugar-emulator-0.88:sugar-emulator.desktop.in.h:1
@@ -16593,22 +16807,22 @@
 msgstr "L'émulateur d'environnement de bureau Sugar"
 
 #: ../menu-data/sunflow:sunflow.desktop.in.h:1
+msgid "Sunflow"
+msgstr "Moteur de rendu Sunflow"
+
+#: ../menu-data/sunflow:sunflow.desktop.in.h:2
 msgid "Photorealistic Rendering Engine"
 msgstr ""
 "Un moteur de rendu photo-réaliste basé sur du lancer de rayon (raytracing)."
 
-#: ../menu-data/sunflow:sunflow.desktop.in.h:2
-msgid "Sunflow"
-msgstr "Moteur de rendu Sunflow"
-
 #: ../menu-data/supercollider-emacs:scel.desktop.in.h:1
-msgid "Emacs environment for SuperCollider"
-msgstr "Environnement Emacs pour SuperCollider"
-
-#: ../menu-data/supercollider-emacs:scel.desktop.in.h:2
 msgid "SuperCollider Emacs (scel)"
 msgstr "Emacs SuperCollider (scel)"
 
+#: ../menu-data/supercollider-emacs:scel.desktop.in.h:2
+msgid "Emacs environment for SuperCollider"
+msgstr "Environnement Emacs pour SuperCollider"
+
 #: ../menu-data/supercollider-vim:scvim.desktop.in.h:1
 msgid "SuperCollider Vim"
 msgstr "Vim SuperCollider"
@@ -16618,21 +16832,21 @@
 msgstr "Environnement Vim pour SuperCollider"
 
 #: ../menu-data/supertux-stable:supertux.desktop.in.h:1
-msgid "A Super Mario inspired penguin platform game"
-msgstr "Un jeu de plate-forme, inspiré par Super Mario."
-
-#: ../menu-data/supertux-stable:supertux.desktop.in.h:2
 msgid "SuperTux"
 msgstr "SuperTux"
 
-#: ../menu-data/supertux:supertux2.desktop.in.h:1
-msgid "Play a classic 2D platform game"
-msgstr "Un jeu de plate-forme 2D classique, inspiré par Super Mario."
+#: ../menu-data/supertux-stable:supertux.desktop.in.h:2
+msgid "A Super Mario inspired penguin platform game"
+msgstr "Un jeu de plate-forme, inspiré par Super Mario."
 
-#: ../menu-data/supertux:supertux2.desktop.in.h:2
+#: ../menu-data/supertux:supertux2.desktop.in.h:1
 msgid "SuperTux 2"
 msgstr "SuperTux 2"
 
+#: ../menu-data/supertux:supertux2.desktop.in.h:2
+msgid "Play a classic 2D platform game"
+msgstr "Un jeu de plate-forme 2D classique, inspiré par Super Mario."
+
 #: ../menu-data/supertuxkart:supertuxkart.desktop.in.h:1
 msgid "Supertuxkart"
 msgstr "SupertuxKart"
@@ -16650,29 +16864,29 @@
 msgstr "Afficher des topographies de grottes"
 
 #: ../menu-data/survex-svxedit:survex-svxedit.desktop.in.h:1
-msgid "Enter cave survey data for Survex"
-msgstr "Saisir les données topographiques de grottes pour Survex"
-
-#: ../menu-data/survex-svxedit:survex-svxedit.desktop.in.h:2
 msgid "SvxEdit Cave Survey Data Editor"
 msgstr "Éditeur de données topographiques de grottes SwxEdit"
 
-#: ../menu-data/svn-workbench:svn-workbench.desktop.in.h:1
-msgid "A Workbench for Subversion"
-msgstr "Un environnement de travail pour Subversion"
+#: ../menu-data/survex-svxedit:survex-svxedit.desktop.in.h:2
+msgid "Enter cave survey data for Survex"
+msgstr "Saisir les données topographiques de grottes pour Survex"
 
-#: ../menu-data/svn-workbench:svn-workbench.desktop.in.h:2
+#: ../menu-data/svn-workbench:svn-workbench.desktop.in.h:1
 msgid "SVN Workbench"
 msgstr "SVN Workbench"
 
-#: ../menu-data/swami:swami.desktop.in.h:1
-msgid "Create, play and organize MIDI instruments and sounds"
-msgstr "Créer, jouer et gérer des instruments MIDI et des sons"
+#: ../menu-data/svn-workbench:svn-workbench.desktop.in.h:2
+msgid "A Workbench for Subversion"
+msgstr "Un environnement de travail pour Subversion"
 
-#: ../menu-data/swami:swami.desktop.in.h:2
+#: ../menu-data/swami:swami.desktop.in.h:1
 msgid "Swami Instrument Editor"
 msgstr "Éditeur d'instrument Swami"
 
+#: ../menu-data/swami:swami.desktop.in.h:2
+msgid "Create, play and organize MIDI instruments and sounds"
+msgstr "Créer, jouer et gérer des instruments MIDI et des sons"
+
 #: ../menu-data/sweep:sweep.desktop.in.h:1
 msgid "Sweep"
 msgstr "Sweep"
@@ -16690,38 +16904,48 @@
 msgstr "Nettoyeur du système"
 
 #: ../menu-data/sweethome3d:sweethome3d.desktop.in.h:1
+msgid "Sweet Home 3D"
+msgstr "Sweet Home 3D"
+
+#: ../menu-data/sweethome3d:sweethome3d.desktop.in.h:2
 msgid "Interior 2D design application with 3D preview"
 msgstr "Aménagement de logement en 2D avec prévisualisation en 3D"
 
-#: ../menu-data/sweethome3d:sweethome3d.desktop.in.h:2
-msgid "Sweet Home 3D"
-msgstr "Sweet Home 3D"
+#: ../menu-data/swell-foop:swell-foop.desktop.in.h:1
+msgid "Swell Foop"
+msgstr "Swell Foop"
 
-#: ../menu-data/sylph-searcher:sylph-searcher.desktop.in.h:1
-msgid "Full-text search program for Sylpheed"
-msgstr "Application de recherche de texte pour Sylpheed"
+#: ../menu-data/swell-foop:swell-foop.desktop.in.h:2
+msgid "Clear the screen by removing groups of colored and shaped tiles"
+msgstr ""
+"Vider l'écran en supprimant des groupes d'objets de couleurs et de formes "
+"variées"
 
-#: ../menu-data/sylph-searcher:sylph-searcher.desktop.in.h:2
+#: ../menu-data/sylph-searcher:sylph-searcher.desktop.in.h:1
 msgid "Sylph-Searcher"
 msgstr "Sylph-Searcher"
 
-#: ../menu-data/sylpheed:sylpheed.desktop.in.h:1
-msgid "E-Mail client"
-msgstr "Client de courrier électronique"
+#: ../menu-data/sylph-searcher:sylph-searcher.desktop.in.h:2
+msgid "Full-text search program for Sylpheed"
+msgstr "Application de recherche de texte pour Sylpheed"
 
-#: ../menu-data/sylpheed:sylpheed.desktop.in.h:2
+#: ../menu-data/sylpheed:sylpheed.desktop.in.h:1
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
-#: ../menu-data/synapse:synapse.desktop.in.h:1
-msgid "Search everything you do."
-msgstr "Rechercher tout ce que vous faîtes."
+#: ../menu-data/sylpheed:sylpheed.desktop.in.h:2
+msgid "E-Mail client"
+msgstr "Client de courrier électronique"
 
-#: ../menu-data/synapse:synapse.desktop.in.h:2
+#: ../menu-data/synapse:synapse.desktop.in.h:1
 msgid "Synapse"
 msgstr "Synapse"
 
-#: ../menu-data/synaptic:synaptic.desktop.in.h:2
+#: ../menu-data/synapse:synapse.desktop.in.h:2
+msgid "Search everything you do."
+msgstr "Rechercher tout ce que vous faîtes."
+
+#: ../menu-data/synaptic:synaptic.desktop.in.h:1
 msgid "Synaptic Package Manager"
 msgstr "Gestionnaire de paquets Synaptic"
 
@@ -16734,46 +16958,46 @@
 msgstr "À jour"
 
 #: ../menu-data/synce-trayicon:synce-trayicon.desktop.in.h:1
-msgid "SynCE PDA control for GNOME"
-msgstr "Contrôle de PDA SynCE pour GNOME"
-
-#: ../menu-data/synce-trayicon:synce-trayicon.desktop.in.h:2
 msgid "SynCE Tray Icon"
 msgstr "Icône de notification SynCE"
 
-#: ../menu-data/syncmaildir-applet:smd-applet-configure.desktop.in.h:1
-msgid "Configure Sync Mail Dir"
-msgstr "Configurer Sync Mail Dir"
+#: ../menu-data/synce-trayicon:synce-trayicon.desktop.in.h:2
+msgid "SynCE PDA control for GNOME"
+msgstr "Contrôle de PDA SynCE pour GNOME"
 
-#: ../menu-data/syncmaildir-applet:smd-applet-configure.desktop.in.h:2
+#: ../menu-data/syncmaildir-applet:smd-applet-configure.desktop.in.h:1
 msgid "Sync Mail Dir"
 msgstr "Sync Mail Dir"
 
-#: ../menu-data/syncropated:syncropated.desktop.in.h:1
-msgid "Media Syncronizer"
-msgstr "Synchroniseur de dossiers musicaux"
+#: ../menu-data/syncmaildir-applet:smd-applet-configure.desktop.in.h:2
+msgid "Configure Sync Mail Dir"
+msgstr "Configurer Sync Mail Dir"
 
-#: ../menu-data/syncropated:syncropated.desktop.in.h:2
+#: ../menu-data/syncropated:syncropated.desktop.in.h:1
 msgid "Syncropated!"
 msgstr "Syncropated !"
 
+#: ../menu-data/syncropated:syncropated.desktop.in.h:2
+msgid "Media Syncronizer"
+msgstr "Synchroniseur de dossiers musicaux"
+
 #: ../menu-data/sysinfo:sysinfo.desktop.in.h:1
+msgid "Sysinfo"
+msgstr "Sysinfo"
+
+#: ../menu-data/sysinfo:sysinfo.desktop.in.h:2
 msgid "Display detailed computer/system information"
 msgstr ""
 "Permet de visualiser les information sur son ordinateur ou son système"
 
-#: ../menu-data/sysinfo:sysinfo.desktop.in.h:2
-msgid "Sysinfo"
-msgstr "Sysinfo"
-
 #: ../menu-data/sysprof:sysprof.desktop.in.h:1
-msgid "A system-wide linux profiler"
-msgstr "Un analyseur de ressources système pour Linux"
-
-#: ../menu-data/sysprof:sysprof.desktop.in.h:2
 msgid "Sysprof Profiler"
 msgstr "Sysprof Profiler"
 
+#: ../menu-data/sysprof:sysprof.desktop.in.h:2
+msgid "A system-wide linux profiler"
+msgstr "Un analyseur de ressources système pour Linux"
+
 #: ../menu-data/system-config-audit:system-config-audit.desktop.in.h:1
 msgid "Audit Configuration"
 msgstr "Audit Configuration"
@@ -16791,49 +17015,61 @@
 msgstr "Permet graphiquement de configurer et gérer des clusters"
 
 #: ../menu-data/system-config-date:system-config-date.desktop.in.h:1
-msgid "Change system date and time"
-msgstr "Changer la date et l'heure du système"
-
-#: ../menu-data/system-config-date:system-config-date.desktop.in.h:2
 msgid "Date & Time"
 msgstr "Date & heure"
 
-#: ../menu-data/system-config-kickstart:system-config-kickstart.desktop.in.h:1
-msgid "Create a kickstart file"
-msgstr "Créer un fichier kickstart"
+#: ../menu-data/system-config-date:system-config-date.desktop.in.h:2
+msgid "Change system date and time"
+msgstr "Changer la date et l'heure du système"
 
-#: ../menu-data/system-config-kickstart:system-config-kickstart.desktop.in.h:2
+#: ../menu-data/system-config-kickstart:system-config-kickstart.desktop.in.h:1
 msgid "Kickstart"
 msgstr "Kickstart"
 
-#: ../menu-data/system-config-lvm:system-config-lvm.desktop.in.h:1
-msgid "Configure LVM in a graphical setting"
-msgstr "Permet de configurer graphiquement les LVM"
+#: ../menu-data/system-config-kickstart:system-config-kickstart.desktop.in.h:2
+msgid "Create a kickstart file"
+msgstr "Créer un fichier kickstart"
 
-#: ../menu-data/system-config-lvm:system-config-lvm.desktop.in.h:2
+#: ../menu-data/system-config-lvm:system-config-lvm.desktop.in.h:1
 msgid "Logical Volume Management"
 msgstr "Gestionnaire de Volume logique"
 
-#: ../menu-data/system-config-printer-gnome:system-config-printer.desktop.in.h:1
-msgid "Configure printers"
-msgstr "Configurer les imprimantes"
+#: ../menu-data/system-config-lvm:system-config-lvm.desktop.in.h:2
+msgid "Configure LVM in a graphical setting"
+msgstr "Permet de configurer graphiquement les LVM"
 
-#: ../menu-data/system-config-printer-gnome:system-config-printer.desktop.in.h:2
+#: ../menu-data/system-config-printer-gnome:system-config-printer.desktop.in.h:1
 msgid "Printing"
 msgstr "Impression"
 
+#: ../menu-data/system-config-printer-gnome:system-config-printer.desktop.in.h:2
+msgid "Configure printers"
+msgstr "Configurer les imprimantes"
+
 #: ../menu-data/system-config-samba:system-config-samba.desktop.in.h:1
+msgid "Samba"
+msgstr "Samba"
+
+#: ../menu-data/system-config-samba:system-config-samba.desktop.in.h:2
 msgid "Create, modify, and delete samba shares"
 msgstr "Permet de créer, modifier et effacer  des dossiers samba"
 
-#: ../menu-data/system-config-samba:system-config-samba.desktop.in.h:2
-msgid "Samba"
-msgstr "Samba"
+#: ../menu-data/systemsettings:kde4__kdesystemsettings.desktop.in.h:1
+msgid "KDE System Settings"
+msgstr "Paramètres système de KDE"
 
 #: ../menu-data/systemsettings:kde4__systemsettings.desktop.in.h:1
 msgid "System Settings"
 msgstr "Configuration du système"
 
+#: ../menu-data/tagainijisho:tagainijisho.desktop.in.h:1
+msgid "Tagaini Jisho"
+msgstr "Tagaini Jisho"
+
+#: ../menu-data/tagainijisho:tagainijisho.desktop.in.h:2
+msgid "A free Japanese dictionary and study assistant"
+msgstr "Un dictionnaire et un assistant d'étude libres pour le japonais"
+
 #: ../menu-data/tagtool:tagtool.desktop.in.h:1
 msgid "Audio Tag Tool"
 msgstr "Audio Tag Tool"
@@ -16843,57 +17079,57 @@
 msgstr "Éditeur d\"étiquette MP3 et Ogg Vorbis"
 
 #: ../menu-data/tagua:kde4__tagua.desktop.in.h:1
-msgid "A generic board game application."
-msgstr "Une application de jeu de plateau générique"
-
-#: ../menu-data/tagua:kde4__tagua.desktop.in.h:2
 msgid "Tagua"
 msgstr "Tagua"
 
-#: ../menu-data/talksoup.app:TalkSoup.desktop.in.h:1
-msgid "An IRC Client for GNUstep and Mac OS X"
-msgstr "Un client IRC pour GNUstep et Mac OS X"
+#: ../menu-data/tagua:kde4__tagua.desktop.in.h:2
+msgid "A generic board game application."
+msgstr "Une application de jeu de plateau générique"
 
-#: ../menu-data/talksoup.app:TalkSoup.desktop.in.h:2
+#: ../menu-data/talksoup.app:TalkSoup.desktop.in.h:1
 msgid "TalkSoup"
 msgstr "TalkSoup"
 
-#: ../menu-data/tangerine:tangerine.desktop.in.h:1
-msgid "Share your music with close friends"
-msgstr "Partager votre musique avec vos amis proches"
+#: ../menu-data/talksoup.app:TalkSoup.desktop.in.h:2
+msgid "An IRC Client for GNUstep and Mac OS X"
+msgstr "Un client IRC pour GNUstep et Mac OS X"
 
-#: ../menu-data/tangerine:tangerine.desktop.in.h:2
+#: ../menu-data/tangerine:tangerine.desktop.in.h:1
 msgid "Tangerine Media Sharing"
 msgstr "Partage de média Tangerine"
 
-#: ../menu-data/tanglet:tanglet.desktop.in.h:1
-msgid "Single player variant of Boggle"
-msgstr "Variante du Boggle à un seul joueur"
+#: ../menu-data/tangerine:tangerine.desktop.in.h:2
+msgid "Share your music with close friends"
+msgstr "Partager votre musique avec vos amis proches"
 
-#: ../menu-data/tanglet:tanglet.desktop.in.h:2
+#: ../menu-data/tanglet:tanglet.desktop.in.h:1
 msgid "Tanglet"
 msgstr "Tanglet"
 
+#: ../menu-data/tanglet:tanglet.desktop.in.h:2
+msgid "Single player variant of Boggle"
+msgstr "Variante du Boggle à un seul joueur"
+
 #: ../menu-data/tasks-mobile:kde4__tasks-mobile.desktop.in.h:1
-msgid "Kontact Touch Tasks"
-msgstr "Tâches Kontact Touch"
+msgid "Tasks"
+msgstr "Tâches"
 
 #: ../menu-data/tasque:tasque.desktop.in.h:1
-msgid "Easy quick task management"
-msgstr "Permet de gérer facilement une liste de tâche"
-
-#: ../menu-data/tasque:tasque.desktop.in.h:2
 msgid "Tasque"
 msgstr "Tasque"
 
-#: ../menu-data/tatan:tatan.desktop.in.h:1
-msgid "HIZ's Tatan"
-msgstr "HIZ's Tatan"
+#: ../menu-data/tasque:tasque.desktop.in.h:2
+msgid "Easy quick task management"
+msgstr "Permet de gérer facilement une liste de tâche"
 
-#: ../menu-data/tatan:tatan.desktop.in.h:2
+#: ../menu-data/tatan:tatan.desktop.in.h:1
 msgid "Tatan"
 msgstr "Tatan"
 
+#: ../menu-data/tatan:tatan.desktop.in.h:2
+msgid "HIZ's Tatan"
+msgstr "HIZ's Tatan"
+
 #: ../menu-data/taxbird:taxbird.desktop.in.h:1
 msgid "Taxbird"
 msgstr "Taxbird"
@@ -16902,6 +17138,48 @@
 msgid "freier Elster-Client für Linux"
 msgstr "Client Elster libre pour Linux"
 
+#: ../menu-data/tcos-configurator:tcos-configurator.desktop.in.h:1
+msgid "TCOS Server Configurator"
+msgstr "Configuration du Serveur TCOS"
+
+#: ../menu-data/tcos-configurator:tcos-configurator.desktop.in.h:2
+msgid "Configure TCOS server daemons and users"
+msgstr "Configurer les utilisateurs et les processus serveur TCOS"
+
+#: ../menu-data/tcos-standalone:tcos-standalone.desktop.in.h:1
+msgid "TCOS Standalone"
+msgstr "TCOS - Mode autonome"
+
+#: ../menu-data/tcos-standalone:tcos-standalone.desktop.in.h:2
+msgid "Configure standalone mode of TCOS"
+msgstr "Configurer le mode autonome de TCOS"
+
+#: ../menu-data/tcosconfig:tcosconfig.desktop.in.h:1
+msgid "TCOS-config"
+msgstr "TCOS-config"
+
+#: ../menu-data/tcosconfig:tcosconfig.desktop.in.h:2
+msgid "Configure and make bootable initramfs images for thin client networks"
+msgstr ""
+"Configurer et rendre amorçable des images initramfs pour les réseaux de "
+"clients légers"
+
+#: ../menu-data/tcosmonitor:tcosmonitor.desktop.in.h:1
+msgid "TcosMonitor"
+msgstr "TcosMonitor"
+
+#: ../menu-data/tcosmonitor:tcosmonitor.desktop.in.h:2
+msgid "Thin client network monitor"
+msgstr "Moniteur de réseau de clients légers"
+
+#: ../menu-data/tcosmonitor:tcospersonalize.desktop.in.h:1
+msgid "TcosPersonalize"
+msgstr "TcosPersonalize"
+
+#: ../menu-data/tcosmonitor:tcospersonalize.desktop.in.h:2
+msgid "Configure a simple TCOS thin client"
+msgstr "Configurer un client léger simple TCOS"
+
 #: ../menu-data/tea:tea.desktop.in.h:1
 msgid "TEA Text Editor"
 msgstr "Éditeur de texte TEA"
@@ -16919,13 +17197,13 @@
 msgstr "Chat en voix sur IP pour le jeu en ligne"
 
 #: ../menu-data/teeworlds:teeworlds.desktop.in.h:1
-msgid "An online multi-player platform 2D shooter"
-msgstr "Jeu en ligne de tir multi joueurs en 2D"
-
-#: ../menu-data/teeworlds:teeworlds.desktop.in.h:2
 msgid "Teeworlds"
 msgstr "Teeworlds"
 
+#: ../menu-data/teeworlds:teeworlds.desktop.in.h:2
+msgid "An online multi-player platform 2D shooter"
+msgstr "Jeu en ligne de tir multi joueurs en 2D"
+
 #: ../menu-data/teg:teg.desktop.in.h:1
 msgid "T.E.G. client"
 msgstr "Application cliente T.E.G."
@@ -16935,21 +17213,21 @@
 msgstr "Application cliente Tenes Empanadas Graciela"
 
 #: ../menu-data/tegaki-recognize:tegaki-recognize.desktop.in.h:1
-msgid "Handwriting Recognition"
-msgstr "Reconnaissance de manuscrit"
-
-#: ../menu-data/tegaki-recognize:tegaki-recognize.desktop.in.h:2
 msgid "Tegaki Recognize"
 msgstr "Reconaissance d'écriture - Tegaki"
 
-#: ../menu-data/tekka:tekka.desktop.in.h:1
-msgid "Chat on IRC"
-msgstr "Discutez sur IRC"
+#: ../menu-data/tegaki-recognize:tegaki-recognize.desktop.in.h:2
+msgid "Handwriting Recognition"
+msgstr "Reconnaissance de manuscrit"
 
-#: ../menu-data/tekka:tekka.desktop.in.h:2
+#: ../menu-data/tekka:tekka.desktop.in.h:1
 msgid "tekka IRC Client"
 msgstr "Client IRC tekka"
 
+#: ../menu-data/tekka:tekka.desktop.in.h:2
+msgid "Chat on IRC"
+msgstr "Discutez sur IRC"
+
 #: ../menu-data/telegnome:telegnome.desktop.in.h:1
 msgid "TeleGNOME"
 msgstr "TeleGNOME"
@@ -16959,13 +17237,13 @@
 msgstr "Visualiser de pages Teletext"
 
 #: ../menu-data/teleport:teleport.desktop.in.h:1
-msgid "Move applications between displays"
-msgstr "Permet de déplacer des applications entre des affichages"
-
-#: ../menu-data/teleport:teleport.desktop.in.h:2
 msgid "Teleport"
 msgstr "Teleport"
 
+#: ../menu-data/teleport:teleport.desktop.in.h:2
+msgid "Move applications between displays"
+msgstr "Permet de déplacer des applications entre des affichages"
+
 #: ../menu-data/tellico:kde4__tellico.desktop.in.h:1
 msgid "A collection manager"
 msgstr "Un gestionnaire de collections"
@@ -16975,66 +17253,66 @@
 msgstr "Tellico"
 
 #: ../menu-data/tennix:tennix.desktop.in.h:1
-msgid "Play tennis against the computer or a friend"
-msgstr "Jouer au tennis contre un ami ou l'ordinateur"
-
-#: ../menu-data/tennix:tennix.desktop.in.h:2
 msgid "Tennix!"
 msgstr "Tennix !"
 
-#: ../menu-data/terminal.app:Terminal.desktop.in.h:1
+#: ../menu-data/tennix:tennix.desktop.in.h:2
+msgid "Play tennis against the computer or a friend"
+msgstr "Jouer au tennis contre un ami ou l'ordinateur"
+
+#: ../menu-data/terminal.app:Terminal.desktop.in.h:2
 msgid "A terminal emulator"
 msgstr "Émulateur de terminal"
 
 #: ../menu-data/terminator:terminator.desktop.in.h:1
-msgid "Multiple terminals in one window"
-msgstr "Permet d'avoir plusieurs terminaux en une seule fenêtre"
-
-#: ../menu-data/terminator:terminator.desktop.in.h:2
 msgid "Terminator"
 msgstr "Terminator"
 
-#: ../menu-data/termit:termit.desktop.in.h:1
-msgid "Lightweight terminal emulator"
-msgstr "Émulateur de terminal léger"
+#: ../menu-data/terminator:terminator.desktop.in.h:2
+msgid "Multiple terminals in one window"
+msgstr "Permet d'avoir plusieurs terminaux en une seule fenêtre"
 
-#: ../menu-data/termit:termit.desktop.in.h:2
+#: ../menu-data/termit:termit.desktop.in.h:1
 msgid "Termit"
 msgstr "Termit"
 
+#: ../menu-data/termit:termit.desktop.in.h:2
+msgid "Lightweight terminal emulator"
+msgstr "Émulateur de terminal léger"
+
 #: ../menu-data/terraintool:terraintool.desktop.in.h:1
-msgid "Generate surface mesh in survex format"
+msgid "Terraintool surface mesh generator"
 msgstr ""
 
 #: ../menu-data/terraintool:terraintool.desktop.in.h:2
-msgid "Terraintool surface mesh generator"
+msgid "Generate surface mesh in survex format"
 msgstr ""
 
 #: ../menu-data/testdrive-gtk:testdrive-gtk.desktop.in.h:1
-msgid "Download and run an Ubuntu ISO in a Virtual Machine"
-msgstr ""
-"Télécharge et exécute une image ISO d'Ubuntu dans une machine virtuelle"
-
-#: ../menu-data/testdrive-gtk:testdrive-gtk.desktop.in.h:2
 msgid "Test Drive an Ubuntu ISO"
 msgstr "Conduite de tests pour une ISO Ubuntu"
 
-#: ../menu-data/tetraproc:tetraproc.desktop.in.h:1
-msgid "Tetrahedral Microphone Processor for Ambisonic Recording"
+#: ../menu-data/testdrive-gtk:testdrive-gtk.desktop.in.h:2
+msgid "Download and run an Ubuntu ISO in a Virtual Machine"
 msgstr ""
+"Télécharge et exécute une image ISO d'Ubuntu dans une machine virtuelle"
 
-#: ../menu-data/tetraproc:tetraproc.desktop.in.h:2
+#: ../menu-data/tetraproc:tetraproc.desktop.in.h:1
 msgid "Tetraproc"
 msgstr "Tetraproc"
 
-#: ../menu-data/tetzle:tetzle.desktop.in.h:1
-msgid "Jigsaw puzzle with tetromino pieces"
-msgstr "Puzzle avec des pièces Tetromino"
+#: ../menu-data/tetraproc:tetraproc.desktop.in.h:2
+msgid "Tetrahedral Microphone Processor for Ambisonic Recording"
+msgstr "Processeur microphone pour l'enregistrement tétraédrique Ambisonic"
 
-#: ../menu-data/tetzle:tetzle.desktop.in.h:2
+#: ../menu-data/tetzle:tetzle.desktop.in.h:1
 msgid "Tetzle"
 msgstr "Tetzle"
 
+#: ../menu-data/tetzle:tetzle.desktop.in.h:2
+msgid "Jigsaw puzzle with tetromino pieces"
+msgstr "Puzzle avec des pièces Tetromino"
+
 #: ../menu-data/tex-guy:tex-guy.desktop.in.h:1
 msgid "DVI Viewer"
 msgstr "Afficheur DVI"
@@ -17044,13 +17322,13 @@
 msgstr "Permet d'afficher des DVI produit avec TeX et LaTeX"
 
 #: ../menu-data/texmacs-common:texmacs.desktop.in.h:1
-msgid "A structured wysiwyg scientific text editor"
-msgstr "Un éditeur de texte scientifique wysiwyg"
-
-#: ../menu-data/texmacs-common:texmacs.desktop.in.h:2
 msgid "GNU TeXmacs Editor"
 msgstr "Éditeur GNU TeXmacs"
 
+#: ../menu-data/texmacs-common:texmacs.desktop.in.h:2
+msgid "A structured wysiwyg scientific text editor"
+msgstr "Un éditeur de texte scientifique wysiwyg"
+
 #: ../menu-data/texmaker:texmaker.desktop.in.h:1
 msgid "LaTeX development environment"
 msgstr "Environnement de développement LaTeX"
@@ -17068,48 +17346,48 @@
 msgstr "Un éditeur de texte pour OpenStep"
 
 #: ../menu-data/texworks:texworks.desktop.in.h:1
+msgid "TeXworks"
+msgstr "TeXworks"
+
+#: ../menu-data/texworks:texworks.desktop.in.h:2
 msgid ""
 "A simple environment for editing, typesetting, and previewing TeX documents"
 msgstr ""
 "Un environnement simple pour l'édition, la composition, et la "
 "prévisualisation de documents TeX"
 
-#: ../menu-data/texworks:texworks.desktop.in.h:2
-msgid "TeXworks"
-msgstr "TeXworks"
-
 #: ../menu-data/tgif:tgif.desktop.in.h:1
-msgid "Interactive 2-D vector drawing program for X11"
-msgstr "Programme interactif de dessins vectoriels en 2D pour X11"
-
-#: ../menu-data/tgif:tgif.desktop.in.h:2
 msgid "Tgif"
 msgstr "Tgif"
 
-#: ../menu-data/thawab:thawab.desktop.in.h:1
-msgid "Electronic Arabic/Islamic Encyclopedia"
-msgstr "Encycolpédie arabe/islamique numérique"
+#: ../menu-data/tgif:tgif.desktop.in.h:2
+msgid "Interactive 2-D vector drawing program for X11"
+msgstr "Programme interactif de dessins vectoriels en 2D pour X11"
 
-#: ../menu-data/thawab:thawab.desktop.in.h:2
+#: ../menu-data/thawab:thawab.desktop.in.h:1
 msgid "Thawab"
 msgstr "Thawab"
 
-#: ../menu-data/themonospot:themonospot.desktop.in.h:1
-msgid "themonospot"
-msgstr "themonospot"
+#: ../menu-data/thawab:thawab.desktop.in.h:2
+msgid "Electronic Arabic/Islamic Encyclopedia"
+msgstr "Encycolpédie arabe/islamique numérique"
 
-#: ../menu-data/themonospot:themonospot.desktop.in.h:2
+#: ../menu-data/themonospot:themonospot.desktop.in.h:1
 msgid "themonospot - extract information from avi or mkv files"
 msgstr "themonospot - extraire l'nformation des fichiers avi ou mkv"
 
-#: ../menu-data/theorur:theorur.desktop.in.h:1
-msgid "Broadcast multimedia streams over an Icecast system"
-msgstr "Diffusion de flux multimédia sur un système Icecast"
+#: ../menu-data/themonospot:themonospot.desktop.in.h:2
+msgid "themonospot"
+msgstr "themonospot"
 
-#: ../menu-data/theorur:theorur.desktop.in.h:2
+#: ../menu-data/theorur:theorur.desktop.in.h:1
 msgid "Theorur"
 msgstr "Theorur"
 
+#: ../menu-data/theorur:theorur.desktop.in.h:2
+msgid "Broadcast multimedia streams over an Icecast system"
+msgstr "Diffusion de flux multimédia sur un système Icecast"
+
 #: ../menu-data/therion-viewer:therion-viewer.desktop.in.h:1
 msgid "Therion loch viewer"
 msgstr "Afficheur loch Therion"
@@ -17119,74 +17397,70 @@
 msgstr "Afficher les cartes Therion en 3D"
 
 #: ../menu-data/therion:therion.desktop.in.h:1
-msgid "Draw up surveys in Therion format"
-msgstr "Dessiner des cartes au format Therion"
-
-#: ../menu-data/therion:therion.desktop.in.h:2
 msgid "Therion"
 msgstr "Therion"
 
-#: ../menu-data/thin-client-manager-gnome:student-control-panel.desktop.in.h:1
-msgid "Control Thin Client connections"
-msgstr "Contrôler les connexions des clients légers"
+#: ../menu-data/therion:therion.desktop.in.h:2
+msgid "Draw up surveys in Therion format"
+msgstr "Dessiner des cartes au format Therion"
 
-#: ../menu-data/thin-client-manager-gnome:student-control-panel.desktop.in.h:2
+#: ../menu-data/thin-client-manager-gnome:student-control-panel.desktop.in.h:1
 msgid "Thin Client Manager"
 msgstr "Gestionnaire de clients légers"
 
-#: ../menu-data/thoggen:thoggen.desktop.in.h:1
-msgid "Extracts Video from your DVDs"
-msgstr "Permet de créer des fichiers vidéos à partir de vos DVD."
+#: ../menu-data/thin-client-manager-gnome:student-control-panel.desktop.in.h:2
+msgid "Control Thin Client connections"
+msgstr "Contrôler les connexions des clients légers"
 
-#: ../menu-data/thoggen:thoggen.desktop.in.h:2
+#: ../menu-data/thoggen:thoggen.desktop.in.h:1
 msgid "Thoggen DVD Ripper"
 msgstr "Extracteur de DVD Thoggen"
 
-#: ../menu-data/threadscope:threadscope.desktop.in.h:1
-msgid "Haskell GHC thread profiler"
-msgstr "Profileur d'unité d'exécution (thread) Haskell GHC"
+#: ../menu-data/thoggen:thoggen.desktop.in.h:2
+msgid "Extracts Video from your DVDs"
+msgstr "Permet de créer des fichiers vidéos à partir de vos DVD."
 
-#: ../menu-data/threadscope:threadscope.desktop.in.h:2
+#: ../menu-data/threadscope:threadscope.desktop.in.h:1
 msgid "threadscope"
 msgstr "threadscope"
 
-#: ../menu-data/thunar:Thunar.desktop.in.h:1
-msgid "Browse the filesystem with the file manager"
-msgstr "Explorer le système de fichiers avec le gestionnaire de fichiers"
+#: ../menu-data/threadscope:threadscope.desktop.in.h:2
+msgid "Haskell GHC thread profiler"
+msgstr "Profileur d'unité d'exécution (thread) Haskell GHC"
 
-#: ../menu-data/thunar:Thunar.desktop.in.h:2
+#: ../menu-data/thunar:Thunar.desktop.in.h:1
 msgid "Thunar File Manager"
 msgstr "Gestionnaire de fichiers Thunar"
 
+#: ../menu-data/thunar:Thunar.desktop.in.h:2
+msgid "Browse the filesystem with the file manager"
+msgstr "Explorer le système de fichiers avec le gestionnaire de fichiers"
+
 #: ../menu-data/thunderbird:thunderbird.desktop.in.h:1
-msgid "Compose New Message"
-msgstr "Rédiger un nouveau message"
+msgid "Thunderbird Mail"
+msgstr "Client courriel Thunderbird"
 
-#: ../menu-data/thunderbird:thunderbird.desktop.in.h:3
+#: ../menu-data/thunderbird:thunderbird.desktop.in.h:2
 msgid "Send and receive mail with Thunderbird"
 msgstr "Envoyer et recevoir des courriels avec Thunderbird"
 
-#: ../menu-data/thunderbird:thunderbird.desktop.in.h:4
-msgid "Thunderbird Mail"
-msgstr "Client courriel Thunderbird"
-
 #: ../menu-data/tickr:tickr.desktop.in.h:1
+msgid "Tickr - RSS Feed Reader"
+msgstr "Tickr - Lecteur de Flux RSS"
+
+#: ../menu-data/tickr:tickr.desktop.in.h:2
 msgid "GTK-based highly graphically-customizable RSS Ticker"
 msgstr ""
 "Lecteur de titres RSS basé sur GTK hautement personnalisable graphiquement"
 
-#: ../menu-data/tickr:tickr.desktop.in.h:2
-msgid "Tickr - RSS Feed Reader"
-msgstr "Tickr - Lecteur de Flux RSS"
-
 #: ../menu-data/tictactoe-ng:tictactoe-ng.desktop.in.h:1
-msgid "Simple, fun tic tac toe game for GNOME"
-msgstr "Un jeu simple et amusant de morpion pour GNOME"
-
-#: ../menu-data/tictactoe-ng:tictactoe-ng.desktop.in.h:2
 msgid "Tic Tac Toe"
 msgstr "Tic Tac Toe"
 
+#: ../menu-data/tictactoe-ng:tictactoe-ng.desktop.in.h:2
+msgid "Simple, fun tic tac toe game for GNOME"
+msgstr "Un jeu simple et amusant de morpion pour GNOME"
+
 #: ../menu-data/tiger:tiger.desktop.in.h:1
 msgid "Tiger UNIX security tool"
 msgstr "Tiger : outil de sécurité UNIX"
@@ -17216,87 +17490,71 @@
 msgstr "Séquenceur MIDI TiMidity++"
 
 #: ../menu-data/tint2:tint2conf.desktop.in.h:1
-msgid "Customize the panel settings"
-msgstr "Personnaliser le tableau de bord"
-
-#: ../menu-data/tint2:tint2conf.desktop.in.h:2
 msgid "Panel tint2"
 msgstr "Panel tint2"
 
-#: ../menu-data/tinyeartrainer:tinyeartrainer.desktop.in.h:1
-msgid "A tool to train your ears to hear relative pitch"
-msgstr ""
-"Un outil pour entraîner vos oreilles à identifier une hauteur musicale"
+#: ../menu-data/tint2:tint2conf.desktop.in.h:2
+msgid "Customize the panel settings"
+msgstr "Personnaliser le tableau de bord"
 
-#: ../menu-data/tinyeartrainer:tinyeartrainer.desktop.in.h:2
+#: ../menu-data/tinyeartrainer:tinyeartrainer.desktop.in.h:1
 msgid "Tiny Ear Trainer"
 msgstr "Tiny Ear Trainer"
 
-#: ../menu-data/tipptrainer:tipptrainer.desktop.in.h:1
-msgid "A program to learn touch typing"
-msgstr "Un programme pour apprendre à taper au clavier"
-
-#: ../menu-data/tipptrainer:tipptrainer.desktop.in.h:2
-msgid "Tipptrainer Typing Tutor"
-msgstr "Apprentissage de la frappe au clavier avec Tipptrainer"
+#: ../menu-data/tinyeartrainer:tinyeartrainer.desktop.in.h:2
+msgid "A tool to train your ears to hear relative pitch"
+msgstr ""
+"Un outil pour entraîner vos oreilles à identifier une hauteur musicale"
 
 #: ../menu-data/titanion:titanion.desktop.in.h:1
-msgid "Kenta Cho's Titanion"
-msgstr "Titanion par Kenta Cho"
-
-#: ../menu-data/titanion:titanion.desktop.in.h:2
 msgid "Titanion"
 msgstr "Titanion"
 
-#: ../menu-data/tkabber:tkabber.desktop.in.h:1
-msgid "Communicate via XMPP (Jabber) protocol"
-msgstr "Communiquez via le protocole XMPP (Jabber)"
+#: ../menu-data/titanion:titanion.desktop.in.h:2
+msgid "Kenta Cho's Titanion"
+msgstr "Titanion par Kenta Cho"
 
-#: ../menu-data/tkabber:tkabber.desktop.in.h:2
+#: ../menu-data/tkabber:tkabber.desktop.in.h:1
 msgid "Tkabber"
 msgstr "Tkabber"
 
-#: ../menu-data/tkcvs:tkcvs.desktop.in.h:1
-msgid "A graphical frontend to CVS and Subversion."
-msgstr "Interface graphique pour CVS et Subversion."
+#: ../menu-data/tkabber:tkabber.desktop.in.h:2
+msgid "Communicate via XMPP (Jabber) protocol"
+msgstr "Communiquez via le protocole XMPP (Jabber)"
 
-#: ../menu-data/tkcvs:tkcvs.desktop.in.h:2
+#: ../menu-data/tkcvs:tkcvs.desktop.in.h:1
 msgid "tkcvs"
 msgstr "TkCVS"
 
-#: ../menu-data/tkdiff:tkdiff.desktop.in.h:1
-msgid "TkDiff File Comparison"
-msgstr "Comparateur de fichier TkDiff"
-
-#: ../menu-data/tkdiff:tkdiff.desktop.in.h:2
-msgid "TkDiff is a graphical front-end for the standard Unix 'diff' utility."
-msgstr "Une interface graphique pour l'utilitaire Unix « diff »."
+#: ../menu-data/tkcvs:tkcvs.desktop.in.h:2
+msgid "A graphical frontend to CVS and Subversion."
+msgstr "Interface graphique pour CVS et Subversion."
 
 #: ../menu-data/tkgate:tkgate.desktop.in.h:1
-msgid "Event driven digital circuit simulator with Tcl/Tk"
-msgstr "Simulateur de circuit numérique en événementiel avec Tcl/Tk"
-
-#: ../menu-data/tkgate:tkgate.desktop.in.h:2
 msgid "tkgate Circuit Simulator"
 msgstr "Simulateur de circuit Tkgate"
 
-#: ../menu-data/tmw:tmw.desktop.in.h:1
-msgid "The Mana World 2D MMORPG client"
-msgstr "Cient pour The Mana World 2D MMORPG"
+#: ../menu-data/tkgate:tkgate.desktop.in.h:2
+msgid "Event driven digital circuit simulator with Tcl/Tk"
+msgstr "Simulateur de circuit numérique en événementiel avec Tcl/Tk"
 
-#: ../menu-data/tmw:tmw.desktop.in.h:2
+#: ../menu-data/tmw:tmw.desktop.in.h:1
 msgid "The Mana world"
 msgstr "The Mana world"
 
-#: ../menu-data/tomatoes:tomatoes.desktop.in.h:1
-msgid "How many tomatoes can you smash in ten short minutes?"
-msgstr "Combien de tomates pouvez-vous éclater en dix petites minutes ?"
+#: ../menu-data/tmw:tmw.desktop.in.h:2
+msgid "The Mana World 2D MMORPG client"
+msgstr "Cient pour The Mana World 2D MMORPG"
 
-#: ../menu-data/tomatoes:tomatoes.desktop.in.h:2
+#: ../menu-data/tomatoes:tomatoes.desktop.in.h:1
 msgid "I Have No Tomatoes"
 msgstr "I Have No Tomatoes"
 
-#: ../menu-data/tomboy:tomboy.desktop.in.h:2
+#: ../menu-data/tomatoes:tomatoes.desktop.in.h:2
+msgid "How many tomatoes can you smash in ten short minutes?"
+msgstr "Combien de tomates pouvez-vous éclater en dix petites minutes ?"
+
+#: ../menu-data/tomboy:tomboy.desktop.in.h:1
 msgid "Tomboy Notes"
 msgstr "Notes Tomboy"
 
@@ -17309,77 +17567,73 @@
 msgstr "Éditeur d'animations en direct Toonloop"
 
 #: ../menu-data/toppler:toppler.desktop.in.h:1
+msgid "Tower Toppler"
+msgstr "Tower Toppler"
+
+#: ../menu-data/toppler:toppler.desktop.in.h:2
 msgid "A clone of the 'Nebulus' game on old 8 and 16 bit machines."
 msgstr ""
 "Clone du jeu « Nebulus » originaire des anciennes machines 8- et 16-bit"
 
-#: ../menu-data/toppler:toppler.desktop.in.h:2
-msgid "Tower Toppler"
-msgstr "Tower Toppler"
-
 #: ../menu-data/tora:tora.desktop.in.h:1
+msgid "TOra"
+msgstr "TOra"
+
+#: ../menu-data/tora:tora.desktop.in.h:2
 msgid "A graphical toolkit for database administration and development"
 msgstr ""
 "Une boite à outils graphique pour l'administration et le développement de "
 "base de données"
 
-#: ../menu-data/tora:tora.desktop.in.h:2
-msgid "TOra"
-msgstr "TOra"
-
 #: ../menu-data/torchat:torchat.desktop.in.h:1
+msgid "TorChat"
+msgstr "TorChat"
+
+#: ../menu-data/torchat:torchat.desktop.in.h:2
 msgid "Decentralized instant messenger built on top of the Tor Network"
 msgstr ""
 "Client de messagerie instantanée décentralisée construite sur le Réseau Tor"
 
-#: ../menu-data/torchat:torchat.desktop.in.h:2
-msgid "TorChat"
-msgstr "TorChat"
-
 #: ../menu-data/torcs:torcs.desktop.in.h:1
-msgid "3D racing cars simulator game"
-msgstr "Un jeu en 3D de simulation de course de voiture."
-
-#: ../menu-data/torcs:torcs.desktop.in.h:2
 msgid "TORCS"
 msgstr "TORCS"
 
+#: ../menu-data/torcs:torcs.desktop.in.h:2
+msgid "3D racing cars simulator game"
+msgstr "Un jeu en 3D de simulation de course de voiture."
+
 #: ../menu-data/tortoisehg:tortoisehg.desktop.in.h:1
 msgid "TortoiseHG Workbench"
 msgstr ""
 
 #: ../menu-data/torus-trooper-pure:torus-trooper-pure.desktop.in.h:1
-msgid "HIZ's version of Torus Trooper"
-msgstr "Version HIZ de Torus Trooper"
-
-#: ../menu-data/torus-trooper-pure:torus-trooper-pure.desktop.in.h:2
 msgid "Torus Trooper Pure"
 msgstr "Torus Trooper Pure"
 
-#: ../menu-data/torus-trooper:torus-trooper.desktop.in.h:1
-msgid "Kenta Cho's Torus Trooper"
-msgstr "Torus trooper par Kenta Cho"
+#: ../menu-data/torus-trooper-pure:torus-trooper-pure.desktop.in.h:2
+msgid "HIZ's version of Torus Trooper"
+msgstr "Version HIZ de Torus Trooper"
 
-#: ../menu-data/torus-trooper:torus-trooper.desktop.in.h:2
+#: ../menu-data/torus-trooper:torus-trooper.desktop.in.h:1
 msgid "Torus Trooper"
 msgstr "Torus Trooper"
 
+#: ../menu-data/torus-trooper:torus-trooper.desktop.in.h:2
+msgid "Kenta Cho's Torus Trooper"
+msgstr "Torus trooper par Kenta Cho"
+
 #: ../menu-data/totem:totem.desktop.in.h:1
 msgid "Movie Player"
 msgstr "Lecteur vidéo"
 
-#: ../menu-data/totem:totem.desktop.in.h:2
-msgid "Play movies and songs"
-msgstr "Permet de lire des films et de la musique"
-
 #: ../menu-data/tovidgui:tovidgui.desktop.in.h:1
-msgid "Author videos to DVD with menus"
-msgstr "Transformer des vidéos en DVD avec menus"
-
-#: ../menu-data/tovidgui:tovidgui.desktop.in.h:2
 msgid "tovid GUI"
 msgstr "Interface tovid"
 
+#: ../menu-data/tovidgui:tovidgui.desktop.in.h:2
+msgid "Author videos to DVD with menus"
+msgstr "Transformer des vidéos en DVD avec menus"
+
 #: ../menu-data/trackballs:trackballs.desktop.in.h:1
 msgid "Marble Madness type game"
 msgstr "Jeu de type Marble Madness"
@@ -17409,21 +17663,21 @@
 msgstr "Jeu de tir abstrait 2D dans un style rétro"
 
 #: ../menu-data/transfermii-gui:transfermii-gui.desktop.in.h:1
-msgid "Transfer miis from a wiimote"
-msgstr "Transférer les « miis » depuis une Wiimote"
-
-#: ../menu-data/transfermii-gui:transfermii-gui.desktop.in.h:2
 msgid "Transfermii"
 msgstr "Transfermii"
 
-#: ../menu-data/transgui:transgui.desktop.in.h:1
-msgid "GUI to remotely control a Transmission daemon"
-msgstr "Interface graphique pour contrôler à distance le démon Transmission"
+#: ../menu-data/transfermii-gui:transfermii-gui.desktop.in.h:2
+msgid "Transfer miis from a wiimote"
+msgstr "Transférer les « miis » depuis une Wiimote"
 
-#: ../menu-data/transgui:transgui.desktop.in.h:2
+#: ../menu-data/transgui:transgui.desktop.in.h:1
 msgid "Transmission remote GUI"
 msgstr "Interface de contrôle à distance de Transmission"
 
+#: ../menu-data/transgui:transgui.desktop.in.h:2
+msgid "GUI to remotely control a Transmission daemon"
+msgstr "Interface graphique pour contrôler à distance le démon Transmission"
+
 #: ../menu-data/transmageddon:transmageddon.desktop.in.h:1
 msgid "Transmageddon Video Transcoder"
 msgstr "Transcodeur vidéo Transmageddon"
@@ -17432,11 +17686,11 @@
 msgid "Video format conversion tool"
 msgstr "Outil de conversion de formats vidéo"
 
-#: ../menu-data/transmission-gtk:transmission-gtk.desktop.in.h:2
+#: ../menu-data/transmission-gtk:transmission-gtk.desktop.in.h:1
 msgid "Transmission BitTorrent Client"
 msgstr "Client BitTorrent Transmission"
 
-#: ../menu-data/transmission-qt:transmission-qt.desktop.in.h:2
+#: ../menu-data/transmission-qt:transmission-qt.desktop.in.h:1
 msgid "Qtransmission Bittorrent Client"
 msgstr "Client Bittorrent Qtransmission"
 
@@ -17452,47 +17706,30 @@
 msgid "Office Document Reader"
 msgstr "Lecteur de documents MSOffice"
 
-#: ../menu-data/tree-ppuzzle:tree-ppuzzle.desktop.in.h:1
-msgid ""
-"Reconstruction of phylogenetic trees by maximum likelihood (parallelized "
-"version)"
-msgstr ""
-"Reconstruction d'arbres phylogénétiques avec le maximum de vraisemblance "
-"(version parallélisée)"
-
-#: ../menu-data/tree-ppuzzle:tree-ppuzzle.desktop.in.h:2
-msgid "tree-ppuzzle"
-msgstr "tree-ppuzzle"
-
-#: ../menu-data/tree-puzzle:tree-puzzle.desktop.in.h:1
-msgid "Reconstruction of phylogenetic trees by maximum likelihood"
-msgstr ""
-"Reconstruction d'arbres phylogénétiques avec le maximum de vraisemblance"
-
-#: ../menu-data/tree-puzzle:tree-puzzle.desktop.in.h:2
-msgid "tree-puzzle"
-msgstr "tree-puzzle"
-
 #: ../menu-data/treeline:treeline.desktop.in.h:1
-msgid "Tree-like structured custom data manager"
-msgstr "Gestionnaire de données personnalisé structuré en arbre"
-
-#: ../menu-data/treeline:treeline.desktop.in.h:2
 msgid "TreeLine"
 msgstr "TreeLine"
 
+#: ../menu-data/treeline:treeline.desktop.in.h:2
+msgid "Tree-like structured custom data manager"
+msgstr "Gestionnaire de données personnalisé structuré en arbre"
+
 #: ../menu-data/treeviewx:treeviewx.desktop.in.h:1
+msgid "TreeView X"
+msgstr "TreeView X"
+
+#: ../menu-data/treeviewx:treeviewx.desktop.in.h:2
 msgid ""
 "Displays, modifies, prints and exports in SVG format phylogenetic trees"
 msgstr ""
 "Afficher, modifier, imprimer et exporter au format SVG des arbres "
 "phylogénétiques"
 
-#: ../menu-data/treeviewx:treeviewx.desktop.in.h:2
-msgid "TreeView X"
-msgstr "TreeView X"
-
 #: ../menu-data/tremulous:tremulous.desktop.in.h:1
+msgid "Tremulous"
+msgstr "Tremulous"
+
+#: ../menu-data/tremulous:tremulous.desktop.in.h:2
 msgid ""
 "Aliens vs Humans, First Person Shooter game with elements of Real Time "
 "Strategy"
@@ -17500,26 +17737,22 @@
 "Extra-terrestres contre humains, jeu de tir subjectif avec des éléments de "
 "stratégie en temps réel"
 
-#: ../menu-data/tremulous:tremulous.desktop.in.h:2
-msgid "Tremulous"
-msgstr "Tremulous"
-
 #: ../menu-data/trigger-rally:trigger-rally.desktop.in.h:1
-msgid "3D rally racing car game"
-msgstr "Jeu de course automobile en 3D"
-
-#: ../menu-data/trigger-rally:trigger-rally.desktop.in.h:2
 msgid "Trigger"
 msgstr "Trigger"
 
-#: ../menu-data/trimage:trimage.desktop.in.h:1
-msgid "A cross-platform tool for optimizing PNG and JPG files."
-msgstr "Un outil multi-plateformes pour optimiser les fichiers PNG et JPG."
+#: ../menu-data/trigger-rally:trigger-rally.desktop.in.h:2
+msgid "3D rally racing car game"
+msgstr "Jeu de course automobile en 3D"
 
-#: ../menu-data/trimage:trimage.desktop.in.h:2
+#: ../menu-data/trimage:trimage.desktop.in.h:1
 msgid "Trimage image compressor"
 msgstr "Compresseur d'image Trimage"
 
+#: ../menu-data/trimage:trimage.desktop.in.h:2
+msgid "A cross-platform tool for optimizing PNG and JPG files."
+msgstr "Un outil multi-plateformes pour optimiser les fichiers PNG et JPG."
+
 #: ../menu-data/triplane:triplane.desktop.in.h:1
 msgid "Triplane Classic"
 msgstr "Triplane Classic"
@@ -17528,6 +17761,10 @@
 msgid "side-scrolling dogfighting game"
 msgstr "Triplane Classic est un jeu de combat aérien"
 
+#: ../menu-data/triplea:triplea.desktop.in.h:1
+msgid "TripleA"
+msgstr ""
+
 #: ../menu-data/tritium:tritium.desktop.in.h:1
 msgid "Tritium"
 msgstr "Tritium"
@@ -17537,29 +17774,29 @@
 msgstr "Gestionnaire de fenêtres Tritium"
 
 #: ../menu-data/trovacap:trovacap.desktop.in.h:1
-msgid "Computes Italian ZIP codes"
-msgstr ""
-
-#: ../menu-data/trovacap:trovacap.desktop.in.h:2
 msgid "TrovaCAP"
 msgstr "TrovaCAP"
 
-#: ../menu-data/trustedqsl:tqsl.desktop.in.h:1
-msgid "Sign QSO data for upload to LoTW"
-msgstr "Permet de signer des données QSO pour les téléverser sur LoTW"
+#: ../menu-data/trovacap:trovacap.desktop.in.h:2
+msgid "Computes Italian ZIP codes"
+msgstr "Permet le traitement des codes postaux italiens"
 
-#: ../menu-data/trustedqsl:tqsl.desktop.in.h:2
+#: ../menu-data/trustedqsl:tqsl.desktop.in.h:1
 msgid "TrustedQSL"
 msgstr "TrustedQSL"
 
-#: ../menu-data/tryton-client:tryton-client.desktop.in.h:1
-msgid "Access Tryton server"
-msgstr "Serveur Access Tryton"
+#: ../menu-data/trustedqsl:tqsl.desktop.in.h:2
+msgid "Sign QSO data for upload to LoTW"
+msgstr "Permet de signer des données QSO pour les téléverser sur LoTW"
 
-#: ../menu-data/tryton-client:tryton-client.desktop.in.h:2
+#: ../menu-data/tryton-client:tryton-client.desktop.in.h:1
 msgid "Tryton"
 msgstr "Tryton"
 
+#: ../menu-data/tryton-client:tryton-client.desktop.in.h:2
+msgid "Access Tryton server"
+msgstr "Serveur Access Tryton"
+
 #: ../menu-data/tryton-neso:neso.desktop.in.h:1
 msgid "Neso"
 msgstr "Neso"
@@ -17577,13 +17814,13 @@
 msgstr "Teletekst Browser"
 
 #: ../menu-data/tucan:tucan.desktop.in.h:1
-msgid "Download and upload manager for hosting sites."
-msgstr "Gestionnaire de téléchargement pour sites d'hébergement"
-
-#: ../menu-data/tucan:tucan.desktop.in.h:2
 msgid "Tucan Manager"
 msgstr "Tucan Manager"
 
+#: ../menu-data/tucan:tucan.desktop.in.h:2
+msgid "Download and upload manager for hosting sites."
+msgstr "Gestionnaire de téléchargement pour sites d'hébergement"
+
 #: ../menu-data/tucnak2:tucnak2.desktop.in.h:1
 msgid "Tucnak 2"
 msgstr "Tucnak 2"
@@ -17593,27 +17830,27 @@
 msgstr "Enregistreur VHF pour compétitions de VHF"
 
 #: ../menu-data/tumiki-fighters:tumiki-fighters.desktop.in.h:1
-msgid "Kenta Cho's Tumiki Fighters"
-msgstr "Tumiki Fighters par Kenta Cho"
-
-#: ../menu-data/tumiki-fighters:tumiki-fighters.desktop.in.h:2
 msgid "Tumiki Fighters"
 msgstr "Tumiki Fighters"
 
-#: ../menu-data/tunapie:tunapie.desktop.in.h:1
-msgid "Lists audio and video streams from shoutcast and icecast"
-msgstr "Lister les flux audio et vidéo shoutcast et icecast"
+#: ../menu-data/tumiki-fighters:tumiki-fighters.desktop.in.h:2
+msgid "Kenta Cho's Tumiki Fighters"
+msgstr "Tumiki Fighters par Kenta Cho"
 
-#: ../menu-data/tunapie:tunapie.desktop.in.h:2
+#: ../menu-data/tunapie:tunapie.desktop.in.h:1
 msgid "Tunapie"
 msgstr "Tunapie"
 
+#: ../menu-data/tunapie:tunapie.desktop.in.h:2
+msgid "Lists audio and video streams from shoutcast and icecast"
+msgstr "Lister les flux audio et vidéo shoutcast et icecast"
+
 #: ../menu-data/tunnelx:tunnelx.desktop.in.h:1
-msgid "Draw cave surveys"
+msgid "Tunnel Cave Drawing Software"
 msgstr ""
 
 #: ../menu-data/tunnelx:tunnelx.desktop.in.h:2
-msgid "Tunnel Cave Drawing Software"
+msgid "Draw cave surveys"
 msgstr ""
 
 #: ../menu-data/turpial:turpial.desktop.in.h:1
@@ -17625,13 +17862,13 @@
 msgstr "Client Twitter écrit en Python"
 
 #: ../menu-data/turtleart:turtleart.desktop.in.h:1
-msgid "A Logo programming environment"
-msgstr "Un environnement de programmation Logo"
-
-#: ../menu-data/turtleart:turtleart.desktop.in.h:2
 msgid "TurtleArt"
 msgstr "TurtleArt"
 
+#: ../menu-data/turtleart:turtleart.desktop.in.h:2
+msgid "A Logo programming environment"
+msgstr "Un environnement de programmation Logo"
+
 #: ../menu-data/tuxcards:tuxcards.desktop.in.h:1
 msgid "TuxCards"
 msgstr "TuxCards"
@@ -17641,29 +17878,29 @@
 msgstr "Un bloc-note hiérarchique pour saisir et gérer vos notes et idées"
 
 #: ../menu-data/tuxcmd:tuxcmd.desktop.in.h:1
-msgid "A two panel file manager"
-msgstr "Gestionnaire de fichiers à deux panneaux"
-
-#: ../menu-data/tuxcmd:tuxcmd.desktop.in.h:2
 msgid "Tux Commander"
 msgstr "Tux Commander"
 
-#: ../menu-data/tuxfootball:tuxfootball.desktop.in.h:1
-msgid "2D Football Game"
-msgstr "Jeu de Football en 2D"
+#: ../menu-data/tuxcmd:tuxcmd.desktop.in.h:2
+msgid "A two panel file manager"
+msgstr "Gestionnaire de fichiers à deux panneaux"
 
-#: ../menu-data/tuxfootball:tuxfootball.desktop.in.h:2
+#: ../menu-data/tuxfootball:tuxfootball.desktop.in.h:1
 msgid "Tuxfootball"
 msgstr "Tuxfootball"
 
-#: ../menu-data/tuxguitar:tuxguitar.desktop.in.h:1
-msgid "Edit, playback guitar tablatures"
-msgstr "Éditer et jouer des tablatures pour guitare"
+#: ../menu-data/tuxfootball:tuxfootball.desktop.in.h:2
+msgid "2D Football Game"
+msgstr "Jeu de Football en 2D"
 
-#: ../menu-data/tuxguitar:tuxguitar.desktop.in.h:2
+#: ../menu-data/tuxguitar:tuxguitar.desktop.in.h:1
 msgid "tuxguitar"
 msgstr "tuxguitar"
 
+#: ../menu-data/tuxguitar:tuxguitar.desktop.in.h:2
+msgid "Edit, playback guitar tablatures"
+msgstr "Éditer et jouer des tablatures pour guitare"
+
 #: ../menu-data/tuxmath:tuxmath.desktop.in.h:1
 msgid "Tux Math "
 msgstr "Tux Math "
@@ -17673,30 +17910,30 @@
 msgstr "Tux Math - Apprendre les mathématiques avec Tux !"
 
 #: ../menu-data/tuxpaint:tuxpaint.desktop.in.h:1
-msgid "A drawing program for children."
-msgstr "Un logiciel de dessin pour les enfants"
-
-#: ../menu-data/tuxpaint:tuxpaint.desktop.in.h:2
 msgid "Tux Paint"
 msgstr "Tux Paint"
 
-#: ../menu-data/tuxpuck:tuxpuck.desktop.in.h:1
-msgid "Play Shufflepuck with Tux"
-msgstr "Jouer à Shufflepuck avec Tux (jeu de palet)"
+#: ../menu-data/tuxpaint:tuxpaint.desktop.in.h:2
+msgid "A drawing program for children."
+msgstr "Un logiciel de dessin pour les enfants"
 
-#: ../menu-data/tuxpuck:tuxpuck.desktop.in.h:2
+#: ../menu-data/tuxpuck:tuxpuck.desktop.in.h:1
 msgid "Tuxpuck"
 msgstr "Tuxpuck"
 
-#: ../menu-data/tuxtype:tuxtype.desktop.in.h:1
-msgid "Educational typing tutor game starring Tux"
-msgstr ""
-"Jeu éducatif d'apprentissage de frappe au clavier avec Tux en vedette"
+#: ../menu-data/tuxpuck:tuxpuck.desktop.in.h:2
+msgid "Play Shufflepuck with Tux"
+msgstr "Jouer à Shufflepuck avec Tux (jeu de palet)"
 
-#: ../menu-data/tuxtype:tuxtype.desktop.in.h:2
+#: ../menu-data/tuxtype:tuxtype.desktop.in.h:1
 msgid "Tux Typing"
 msgstr "Tux Typing"
 
+#: ../menu-data/tuxtype:tuxtype.desktop.in.h:2
+msgid "Educational typing tutor game starring Tux"
+msgstr ""
+"Jeu éducatif d'apprentissage de frappe au clavier avec Tux en vedette"
+
 #: ../menu-data/tvtime:net-tvtime.desktop.in.h:1
 msgid "High quality video deinterlacer"
 msgstr "Désentrelacement vidéo de qualité"
@@ -17706,25 +17943,25 @@
 msgstr "Poste de télévision TVtime"
 
 #: ../menu-data/twinkle:twinkle.desktop.in.h:1
-msgid "A SIP softphone"
-msgstr "Un téléphone logiciel SIP"
-
-#: ../menu-data/twinkle:twinkle.desktop.in.h:2
 msgid "Twinkle"
 msgstr "Twinkle"
 
+#: ../menu-data/twinkle:twinkle.desktop.in.h:2
+msgid "A SIP softphone"
+msgstr "Un téléphone logiciel SIP"
+
 #: ../menu-data/tworld:tworld.desktop.in.h:1
 msgid "Tile World"
 msgstr "Tile World"
 
 #: ../menu-data/txtreader:txtreader.desktop.in.h:1
-msgid "Read text novels and more"
-msgstr "Lire des textes de romans et autres"
-
-#: ../menu-data/txtreader:txtreader.desktop.in.h:2
 msgid "Txt Reader"
 msgstr "Txt Reader"
 
+#: ../menu-data/txtreader:txtreader.desktop.in.h:2
+msgid "Read text novels and more"
+msgstr "Lire des textes de romans et autres"
+
 #: ../menu-data/uae:uae.desktop.in.h:1
 msgid "UAE"
 msgstr "UAE"
@@ -17734,29 +17971,29 @@
 msgstr "Émulateur UAE Amiga"
 
 #: ../menu-data/ubuntuone-installer:ubuntuone-installer.desktop.in.h:1
-msgid "Configure and manage your Ubuntu One account"
-msgstr "Configurez et gérez votre compte Ubuntu One"
-
-#: ../menu-data/ubuntuone-installer:ubuntuone-installer.desktop.in.h:2
 msgid "Ubuntu One"
 msgstr "Ubuntu One"
 
-#: ../menu-data/ubuntustudio-controls:ubuntustudio-controls.desktop.in.h:1
-msgid "Change settings for multimedia production"
-msgstr "Modifier la configuration pour la production multimédia"
+#: ../menu-data/ubuntuone-installer:ubuntuone-installer.desktop.in.h:2
+msgid "Configure and manage your Ubuntu One account"
+msgstr "Configurez et gérez votre compte Ubuntu One"
 
-#: ../menu-data/ubuntustudio-controls:ubuntustudio-controls.desktop.in.h:2
+#: ../menu-data/ubuntustudio-controls:ubuntustudio-controls.desktop.in.h:1
 msgid "Ubuntu Studio Controls"
 msgstr "Contrôles d'Ubuntu Studio"
 
-#: ../menu-data/uck:uck.desktop.in.h:1
-msgid "Customize your Ubuntu Desktop CDs easily"
-msgstr "Personnaliser facilement vos CD d'installation Ubuntu"
+#: ../menu-data/ubuntustudio-controls:ubuntustudio-controls.desktop.in.h:2
+msgid "Change settings for multimedia production"
+msgstr "Modifier la configuration pour la production multimédia"
 
-#: ../menu-data/uck:uck.desktop.in.h:2
+#: ../menu-data/uck:uck.desktop.in.h:1
 msgid "Ubuntu Customization Kit"
 msgstr "Kit de personnalisation Ubuntu"
 
+#: ../menu-data/uck:uck.desktop.in.h:2
+msgid "Customize your Ubuntu Desktop CDs easily"
+msgstr "Personnaliser facilement vos CD d'installation Ubuntu"
+
 #: ../menu-data/udav:udav.desktop.in.h:1
 msgid "Udav"
 msgstr "Udav"
@@ -17766,33 +18003,33 @@
 msgstr "Visionneur de données basé sur MathGL"
 
 #: ../menu-data/ufraw:ufraw.desktop.in.h:1
+msgid "UFRaw"
+msgstr "UFRaw"
+
+#: ../menu-data/ufraw:ufraw.desktop.in.h:2
 msgid "A utility to read and manipulate raw images from digital cameras"
 msgstr ""
 "Un utilitaire qui permet de lire et de manipuler des images au format RAW "
 "des appareils photos numériques"
 
-#: ../menu-data/ufraw:ufraw.desktop.in.h:2
-msgid "UFRaw"
-msgstr "UFRaw"
-
 #: ../menu-data/ugene:ugene.desktop.in.h:1
-msgid "Integrated Bioinformatics Suite"
-msgstr "Suite intégrée pour la bioinformatique"
-
-#: ../menu-data/ugene:ugene.desktop.in.h:2
 msgid "Unipro UGENE"
 msgstr "Unipro UGENE"
 
+#: ../menu-data/ugene:ugene.desktop.in.h:2
+msgid "Integrated Bioinformatics Suite"
+msgstr "Suite intégrée pour la bioinformatique"
+
 #: ../menu-data/uget:uget-gtk.desktop.in.h:1
+msgid "uGet"
+msgstr "uGet"
+
+#: ../menu-data/uget:uget-gtk.desktop.in.h:2
 msgid "Download multiple URLs and apply it to one of setting/queue."
 msgstr ""
 "Télécharge de nombreuses adresses (URL) et les les place en file d'attente"
 
-#: ../menu-data/uget:uget-gtk.desktop.in.h:2
-msgid "uGet"
-msgstr "uGet"
-
-#: ../menu-data/uim-gtk2.0:uim.desktop.in.h:1
+#: ../menu-data/uim-gtk2.0:uim.desktop.in.h:2
 msgid "Customize uim input method environment"
 msgstr "Personnaliser la méthode de saisie UIM"
 
@@ -17805,29 +18042,29 @@
 msgstr "Afficheur d'annotations UIMA"
 
 #: ../menu-data/uima-utils:uima-cpegui.desktop.in.h:1
-msgid "Graphical interface to build UIMA CPE"
-msgstr "Interface graphique pour construire des CPE UIMA"
-
-#: ../menu-data/uima-utils:uima-cpegui.desktop.in.h:2
 msgid "UIMA CPE Gui"
 msgstr "Interface graphique CPE UIMA"
 
-#: ../menu-data/uima-utils:uima-documentanalyzer.desktop.in.h:1
-msgid "Simple UIMA analysis engine runner"
-msgstr "Outil simple pour lancer le traitement des analyses UIMA"
+#: ../menu-data/uima-utils:uima-cpegui.desktop.in.h:2
+msgid "Graphical interface to build UIMA CPE"
+msgstr "Interface graphique pour construire des CPE UIMA"
 
-#: ../menu-data/uima-utils:uima-documentanalyzer.desktop.in.h:2
+#: ../menu-data/uima-utils:uima-documentanalyzer.desktop.in.h:1
 msgid "UIMA Document Analyzer"
 msgstr "Analyseur de documents UIMA"
 
-#: ../menu-data/ukopp:ukopp.desktop.in.h:1
-msgid "Full and incremental backup with media verification"
-msgstr "Sauvegarde complète ou incrémentielle avec vérification du support"
+#: ../menu-data/uima-utils:uima-documentanalyzer.desktop.in.h:2
+msgid "Simple UIMA analysis engine runner"
+msgstr "Outil simple pour lancer le traitement des analyses UIMA"
 
-#: ../menu-data/ukopp:ukopp.desktop.in.h:2
+#: ../menu-data/ukopp:ukopp.desktop.in.h:1
 msgid "ukopp"
 msgstr "ukopp"
 
+#: ../menu-data/ukopp:ukopp.desktop.in.h:2
+msgid "Full and incremental backup with media verification"
+msgstr "Sauvegarde complète ou incrémentielle avec vérification du support"
+
 #: ../menu-data/ultracopier:ultracopier.desktop.in.h:1
 msgid "Copy/Move files with lot of options"
 msgstr "Copier/Déplacer des fichiers avec beaucoup d'options"
@@ -17837,107 +18074,107 @@
 msgstr "Ultracopier"
 
 #: ../menu-data/umbrello:kde4__umbrello.desktop.in.h:1
-msgid "UML Modeller"
-msgstr "Modélisation UML"
-
-#: ../menu-data/umbrello:kde4__umbrello.desktop.in.h:2
 msgid "Umbrello"
 msgstr "Umbrello"
 
-#: ../menu-data/umit:umit.desktop.in.h:1
-msgid "Explore the network and scan ports"
-msgstr "Explorer le réseau et analyser les ports"
+#: ../menu-data/umbrello:kde4__umbrello.desktop.in.h:2
+msgid "UML Modeller"
+msgstr "Modélisation UML"
 
-#: ../menu-data/umit:umit.desktop.in.h:2
+#: ../menu-data/umit:umit.desktop.in.h:1
 msgid "Umit Network Scanner"
 msgstr "Analyseur de réseau Umit"
 
-#: ../menu-data/unetbootin:unetbootin.desktop.in.h:1
-msgid "Tool for creating Live USB drives"
-msgstr "Outil de création de clés USB amorçables"
+#: ../menu-data/umit:umit.desktop.in.h:2
+msgid "Explore the network and scan ports"
+msgstr "Explorer le réseau et analyser les ports"
 
-#: ../menu-data/unetbootin:unetbootin.desktop.in.h:2
+#: ../menu-data/unetbootin:unetbootin.desktop.in.h:1
 msgid "UNetbootin"
 msgstr "UNetbootin"
 
+#: ../menu-data/unetbootin:unetbootin.desktop.in.h:2
+msgid "Tool for creating Live USB drives"
+msgstr "Outil de création de clés USB amorçables"
+
 #: ../menu-data/unison-gtk:unison-gtk.desktop.in.h:1
+#: ../menu-data/unison2.27.57-gtk:unison2.27.57-gtk.desktop.in.h:1
+msgid "Unison"
+msgstr "Unison"
+
+#: ../menu-data/unison-gtk:unison-gtk.desktop.in.h:2
 msgid "GTK interface for the unison file synchronization tool 2.32.52"
 msgstr ""
 "Interface GTK pour l'outil de synchronisation de fichier Unison 2.32.52"
 
-#: ../menu-data/unison-gtk:unison-gtk.desktop.in.h:2
 #: ../menu-data/unison2.27.57-gtk:unison2.27.57-gtk.desktop.in.h:2
-msgid "Unison"
-msgstr "Unison"
-
-#: ../menu-data/unison2.27.57-gtk:unison2.27.57-gtk.desktop.in.h:1
 msgid "GTK interface for the unison file synchronization tool 2.27.57"
 msgstr ""
 "Interface GTK pour l'outil de synchronisation de fichiers Unison 2.27.57"
 
 #: ../menu-data/unity-2d-launcher:unity-2d-launcher.desktop.in.h:1
-msgid "A Qt-based applications launcher"
-msgstr "Un lanceur d'applications basé sur Qt"
-
-#: ../menu-data/unity-2d-launcher:unity-2d-launcher.desktop.in.h:2
 msgid "Unity 2d Launcher"
 msgstr "Lanceur 2d Unity"
 
-#: ../menu-data/unity-2d-panel:unity-2d-panel.desktop.in.h:1
-msgid "A Qt-based panel"
-msgstr "Un tableau de bord basé sur Qt"
+#: ../menu-data/unity-2d-launcher:unity-2d-launcher.desktop.in.h:2
+msgid "A Qt-based applications launcher"
+msgstr "Un lanceur d'applications basé sur Qt"
 
-#: ../menu-data/unity-2d-panel:unity-2d-panel.desktop.in.h:2
+#: ../menu-data/unity-2d-panel:unity-2d-panel.desktop.in.h:1
 msgid "Unity 2D Panel"
 msgstr "Tableau de bord 2D Unity"
 
+#: ../menu-data/unity-2d-panel:unity-2d-panel.desktop.in.h:2
+msgid "A Qt-based panel"
+msgstr "Un tableau de bord basé sur Qt"
+
 #: ../menu-data/unity-2d-places:unity-2d-places.desktop.in.h:1
-msgid "A Qt-based implementation of Unity Places"
+msgid "Unity 2D Places"
 msgstr ""
 
 #: ../menu-data/unity-2d-places:unity-2d-places.desktop.in.h:2
-msgid "Unity 2D Places"
+msgid "A Qt-based implementation of Unity Places"
 msgstr ""
 
-#: ../menu-data/update-manager:update-manager.desktop.in.h:1
+#: ../menu-data/update-manager:update-manager.desktop.in.h:2
 msgid "Show and install available updates"
 msgstr "Voir et installer les mises à jour disponibles"
 
 #: ../menu-data/upnp-inspector:upnp-inspector.desktop.in.h:1
+msgid "UPnP Inspector"
+msgstr "UPnP Inspector"
+
+#: ../menu-data/upnp-inspector:upnp-inspector.desktop.in.h:2
 msgid " DLNA/UPnP device and service analyzer,control-point and test-tool"
 msgstr ""
 " analyseur de matériel et service DLNA/UPnP, point de contrôle et outil de "
 "test"
 
-#: ../menu-data/upnp-inspector:upnp-inspector.desktop.in.h:2
-msgid "UPnP Inspector"
-msgstr "UPnP Inspector"
-
 #: ../menu-data/upnp-router-control:upnp-router-control.desktop.in.h:1
-msgid "A simple program to manage UPnP IGD compliant routers"
-msgstr "Une application simple pour gérer les routeurs compatibles UPnP IGD"
-
-#: ../menu-data/upnp-router-control:upnp-router-control.desktop.in.h:2
 msgid "UPnP Router Control"
 msgstr "Contrôle de routeur UPnP"
 
-#: ../menu-data/uqm:uqm.desktop.in.h:1
-msgid "An interstellar adventure game"
-msgstr "Un jeu d'aventure dans l'espace"
+#: ../menu-data/upnp-router-control:upnp-router-control.desktop.in.h:2
+msgid "A simple program to manage UPnP IGD compliant routers"
+msgstr "Une application simple pour gérer les routeurs compatibles UPnP IGD"
 
-#: ../menu-data/uqm:uqm.desktop.in.h:2
+#: ../menu-data/uqm:uqm.desktop.in.h:1
 msgid "The Ur-Quan Masters"
 msgstr "Les maîtres de Ur-Quan"
 
+#: ../menu-data/uqm:uqm.desktop.in.h:2
+msgid "An interstellar adventure game"
+msgstr "Un jeu d'aventure dans l'espace"
+
 #: ../menu-data/usb-creator-gtk:usb-creator-gtk.desktop.in.h:1
 #: ../menu-data/usb-creator-kde:usb-creator-kde.desktop.in.h:1
-msgid "Create a startup disk using a CD or disc image"
-msgstr "Créer un disque de démarrage à partir d'un CD ou d'une image disque"
+msgid "Startup Disk Creator"
+msgstr "Créateur de disque de démarrage"
 
 #: ../menu-data/usb-creator-gtk:usb-creator-gtk.desktop.in.h:2
 #: ../menu-data/usb-creator-kde:usb-creator-kde.desktop.in.h:2
-msgid "Startup Disk Creator"
-msgstr "Créateur de disque de démarrage"
+msgid "Create a startup disk using a CD or disc image"
+msgstr "Créer un disque de démarrage à partir d'un CD ou d'une image disque"
 
 #: ../menu-data/usb-imagewriter:imagewriter.desktop.in.h:1
 msgid "ImageWriter"
@@ -17968,13 +18205,13 @@
 msgstr "Monter et démonter des systèmes de fichiers"
 
 #: ../menu-data/usermode:redhat-userpasswd.desktop.in.h:1
-msgid "Change your login password"
-msgstr "Changer votre mot de passe de connexion"
-
-#: ../menu-data/usermode:redhat-userpasswd.desktop.in.h:2
 msgid "Password"
 msgstr "Mot de passe"
 
+#: ../menu-data/usermode:redhat-userpasswd.desktop.in.h:2
+msgid "Change your login password"
+msgstr "Changer votre mot de passe de connexion"
+
 #: ../menu-data/utf8-migration-tool:utf8migrationtool.desktop.in.h:1
 msgid "UTF-8 Migration Tool"
 msgstr "Outil de migration en UTF-8"
@@ -17988,45 +18225,49 @@
 msgstr "geisview"
 
 #: ../menu-data/v-sim-common:v-sim.desktop.in.h:1
-msgid "Atomic visualisation"
-msgstr "Visualisation atomique"
-
-#: ../menu-data/v-sim-common:v-sim.desktop.in.h:2
 msgid "V_Sim"
 msgstr "V_Sim"
 
-#: ../menu-data/v4l2ucp:v4l2ucp.desktop.in.h:1
-msgid "A universal control panel for V4L2 devices"
-msgstr "Un panneau de contrôle universel pour périphériques V4L2"
+#: ../menu-data/v-sim-common:v-sim.desktop.in.h:2
+msgid "Atomic visualisation"
+msgstr "Visualisation atomique"
 
-#: ../menu-data/v4l2ucp:v4l2ucp.desktop.in.h:2
+#: ../menu-data/v4l2ucp:v4l2ucp.desktop.in.h:1
 msgid "Video4Linux Control Panel"
 msgstr "Panneau de contrôle Video4Linux"
 
+#: ../menu-data/v4l2ucp:v4l2ucp.desktop.in.h:2
+msgid "A universal control panel for V4L2 devices"
+msgstr "Un panneau de contrôle universel pour périphériques V4L2"
+
 #: ../menu-data/vagalume:vagalume.desktop.in.h:1
+msgid "Last.fm Client"
+msgstr "Client Last.fm"
+
+#: ../menu-data/vagalume:vagalume.desktop.in.h:2
 msgid "Vagalume Last.fm Client"
 msgstr "Client Last.fm Vagalume"
 
 #: ../menu-data/val-and-rick:val-and-rick.desktop.in.h:1
-msgid "Kenta Cho's Val & Rick"
-msgstr "Val & Rick par Kenta Cho"
-
-#: ../menu-data/val-and-rick:val-and-rick.desktop.in.h:2
 msgid "Val & Rick"
 msgstr "Val & Rick"
 
-#: ../menu-data/vala-terminal:vala-terminal.desktop.in.h:1
+#: ../menu-data/val-and-rick:val-and-rick.desktop.in.h:2
+msgid "Kenta Cho's Val & Rick"
+msgstr "Val & Rick par Kenta Cho"
+
+#: ../menu-data/vala-terminal:vala-terminal.desktop.in.h:2
 msgid "Command Line Interface"
 msgstr "Interface en ligne de commande"
 
 #: ../menu-data/valknut:valknut.desktop.in.h:1
-msgid "Share files over the Direct Connect network"
-msgstr "Partager des fichiers sur le réseau Direct Connect"
-
-#: ../menu-data/valknut:valknut.desktop.in.h:2
 msgid "Valknut"
 msgstr "Valknut"
 
+#: ../menu-data/valknut:valknut.desktop.in.h:2
+msgid "Share files over the Direct Connect network"
+msgstr "Partager des fichiers sur le réseau Direct Connect"
+
 #: ../menu-data/vbaexpress:vbaexpress.desktop.in.h:1
 msgid "VBA Express"
 msgstr "VBA Express"
@@ -18036,30 +18277,30 @@
 msgstr "Interface de VisualBoyAdvance"
 
 #: ../menu-data/vectoroids:vectoroids.desktop.in.h:1
-msgid "A clone of the classic arcade game \"Asteroids\""
-msgstr "Un jeu d'arcades dans la pure tradition de « Asteroids »"
-
-#: ../menu-data/vectoroids:vectoroids.desktop.in.h:2
 msgid "Vectoroids"
 msgstr "Vectoroids"
 
-#: ../menu-data/verbiste-gnome:verbiste.desktop.in.h:1
-msgid "French conjugation system"
-msgstr "Système de conjugaison français"
+#: ../menu-data/vectoroids:vectoroids.desktop.in.h:2
+msgid "A clone of the classic arcade game \"Asteroids\""
+msgstr "Un jeu d'arcades dans la pure tradition de « Asteroids »"
 
-#: ../menu-data/verbiste-gnome:verbiste.desktop.in.h:2
+#: ../menu-data/verbiste-gnome:verbiste.desktop.in.h:1
 msgid "Verbiste"
 msgstr "Verbiste"
 
+#: ../menu-data/verbiste-gnome:verbiste.desktop.in.h:2
+msgid "French conjugation system"
+msgstr "Système de conjugaison français"
+
 #: ../menu-data/veusz:veusz.desktop.in.h:1
+msgid "Veusz"
+msgstr "Veusz"
+
+#: ../menu-data/veusz:veusz.desktop.in.h:2
 msgid "For graphing and manipulation of scientific data"
 msgstr ""
 "Pour la représentation graphique et la manipulation de données scientifiques"
 
-#: ../menu-data/veusz:veusz.desktop.in.h:2
-msgid "Veusz"
-msgstr "Veusz"
-
 #: ../menu-data/vice:x128.desktop.in.h:1
 msgid "Commodore 128"
 msgstr "Commodore 128"
@@ -18085,13 +18326,13 @@
 msgstr "Commodore VIC-20"
 
 #: ../menu-data/vidalia:vidalia.desktop.in.h:1
-msgid "Tor GUI"
-msgstr "Interface graphique pour Tor"
-
-#: ../menu-data/vidalia:vidalia.desktop.in.h:2
 msgid "Vidalia"
 msgstr "Vidalia"
 
+#: ../menu-data/vidalia:vidalia.desktop.in.h:2
+msgid "Tor GUI"
+msgstr "Interface graphique pour Tor"
+
 #: ../menu-data/videocut:videocut.desktop.in.h:1
 msgid "A simple video application"
 msgstr "Une application vidéo simple"
@@ -18101,68 +18342,72 @@
 msgstr "VideoCut"
 
 #: ../menu-data/videoporama:videoporama.desktop.in.h:1
-msgid "Make and export image slideshows"
-msgstr "Créer et exporter des diaporamas d'images"
-
-#: ../menu-data/videoporama:videoporama.desktop.in.h:2
 msgid "Videoporama"
 msgstr "Videoporama"
 
+#: ../menu-data/videoporama:videoporama.desktop.in.h:2
+msgid "Make and export image slideshows"
+msgstr "Créer et exporter des diaporamas d'images"
+
 #: ../menu-data/viewmol:viewmol.desktop.in.h:1
 msgid "Viewmol"
 msgstr "Viewmol"
 
 #: ../menu-data/viewpdf.app:ViewPDF.desktop.in.h:1
-msgid "A spicy PDF Reader."
-msgstr "Un lecteur de fichiers PDF relevé"
-
-#: ../menu-data/viewpdf.app:ViewPDF.desktop.in.h:2
 msgid "ViewPDF"
 msgstr "ViewPDF"
 
+#: ../menu-data/viewpdf.app:ViewPDF.desktop.in.h:2
+msgid "A spicy PDF Reader."
+msgstr "Un lecteur de fichiers PDF relevé"
+
 #: ../menu-data/viking:viking.desktop.in.h:1
+msgid "Viking"
+msgstr "Viking"
+
+#: ../menu-data/viking:viking.desktop.in.h:2
 msgid "Map Based GPS Data Manager (live data capable)."
 msgstr ""
 "Gestionnaire de données GPS basées sur des cartes (possibilité de données en "
 "direct)"
 
-#: ../menu-data/viking:viking.desktop.in.h:2
-msgid "Viking"
-msgstr "Viking"
-
-#: ../menu-data/vim-gui-common:gvim.desktop.in.h:2
+#: ../menu-data/vim-gui-common:gvim.desktop.in.h:1
 msgid "GVim"
 msgstr "GVim"
 
 #: ../menu-data/vinagre:vinagre.desktop.in.h:1
-msgid "Access remote desktops"
-msgstr "Accéder à des bureaux distants"
-
-#: ../menu-data/vinagre:vinagre.desktop.in.h:2
 msgid "Remote Desktop Viewer"
 msgstr "Afficheur de bureaux distants"
 
-#: ../menu-data/vino:vino-preferences.desktop.in.h:1
+#: ../menu-data/vinagre:vinagre.desktop.in.h:2
+msgid "Access remote desktops"
+msgstr "Accéder à des bureaux distants"
+
+#: ../menu-data/vino:vino-preferences.desktop.in.h:2
 msgid "Choose how other users can remotely view your desktop"
 msgstr "Choisir comment les autres utilisateurs peuvent voir votre bureau"
 
 #: ../menu-data/viridian:viridian.desktop.in.h:1
-msgid "Stand alone front end for Ampache."
-msgstr "Interface autonome pour Ampache"
-
-#: ../menu-data/viridian:viridian.desktop.in.h:2
 msgid "viridian"
 msgstr "viridian"
 
-#: ../menu-data/virt-manager:virt-manager.desktop.in.h:1
-msgid "Manage virtual machines"
-msgstr "Permet de gérer des machines virtuelles"
+#: ../menu-data/viridian:viridian.desktop.in.h:2
+msgid "Stand alone front end for Ampache."
+msgstr "Interface autonome pour Ampache"
 
-#: ../menu-data/virt-manager:virt-manager.desktop.in.h:2
+#: ../menu-data/virt-manager:virt-manager.desktop.in.h:1
 msgid "Virtual Machine Manager"
 msgstr "Gestionnaire de machine virtuelle"
 
+#: ../menu-data/virt-manager:virt-manager.desktop.in.h:2
+msgid "Manage virtual machines"
+msgstr "Permet de gérer des machines virtuelles"
+
 #: ../menu-data/virtaal:virtaal.desktop.in.h:1
+msgid "Virtaal"
+msgstr "Virtaal"
+
+#: ../menu-data/virtaal:virtaal.desktop.in.h:2
 msgid ""
 "A translation tool to help a human translator translate files into other "
 "languages"
@@ -18170,30 +18415,22 @@
 "Un outil de localisation pour aider un traducteur humain à adapter des "
 "fichiers dans d'autres langues"
 
-#: ../menu-data/virtaal:virtaal.desktop.in.h:2
-msgid "Virtaal"
-msgstr "Virtaal"
-
 #: ../menu-data/virtualbox-qt:virtualbox.desktop.in.h:1
-msgid "Run several virtual systems on a single host computer"
-msgstr "Exécuter plusieurs systèmes virtuels sur le même ordinateur hôte"
-
-#: ../menu-data/virtualbox-qt:virtualbox.desktop.in.h:2
 msgid "VirtualBox"
 msgstr "VirtualBox"
 
-#: ../menu-data/viruskiller:viruskiller.desktop.in.h:1
-msgid "Virus Killer"
-msgstr "Virus Killer"
+#: ../menu-data/virtualbox-qt:virtualbox.desktop.in.h:2
+msgid "Run several virtual systems on a single host computer"
+msgstr "Exécuter plusieurs systèmes virtuels sur le même ordinateur hôte"
 
 #: ../menu-data/visolate:visolate.desktop.in.h:1
-msgid "PCB CNC converter"
-msgstr "Convertisseur PCB CNC"
-
-#: ../menu-data/visolate:visolate.desktop.in.h:2
 msgid "Visolate"
 msgstr "Visolate"
 
+#: ../menu-data/visolate:visolate.desktop.in.h:2
+msgid "PCB CNC converter"
+msgstr "Convertisseur PCB CNC"
+
 #: ../menu-data/visualboyadvance-gtk:VisualBoyAdvance.desktop.in.h:1
 msgid " VisualBoy Advance"
 msgstr " VisualBoy Advance"
@@ -18203,45 +18440,45 @@
 msgstr "Émulateur de Game Boy Advance"
 
 #: ../menu-data/visualvm:visualvm.desktop.in.h:1
-msgid "All-in-One Java Troubleshooting Tool"
-msgstr "Outil de débogage tout-en-un pour Java"
-
-#: ../menu-data/visualvm:visualvm.desktop.in.h:2
 msgid "VisualVM"
 msgstr "VisualVM"
 
-#: ../menu-data/vitables:vitables.desktop.in.h:1
-msgid "PyTables & HDF5 Files Visualizer"
-msgstr "Visionneuse de fichiers PyTables & HDF5"
+#: ../menu-data/visualvm:visualvm.desktop.in.h:2
+msgid "All-in-One Java Troubleshooting Tool"
+msgstr "Outil de débogage tout-en-un pour Java"
 
-#: ../menu-data/vitables:vitables.desktop.in.h:2
+#: ../menu-data/vitables:vitables.desktop.in.h:1
 msgid "ViTables"
 msgstr "ViTables"
 
-#: ../menu-data/vite:vite.desktop.in.h:1
-msgid "A visual trace explorer"
-msgstr "Un exploreur graphique de traces d'exécution"
+#: ../menu-data/vitables:vitables.desktop.in.h:2
+msgid "PyTables & HDF5 Files Visualizer"
+msgstr "Visionneuse de fichiers PyTables & HDF5"
 
-#: ../menu-data/vite:vite.desktop.in.h:2
+#: ../menu-data/vite:vite.desktop.in.h:1
 msgid "ViTE"
 msgstr "ViTE"
 
-#: ../menu-data/vkeybd:vkeybd.desktop.in.h:1
-msgid "MIDI Virtual Keyboard"
-msgstr "Clavier virtuel MIDI"
+#: ../menu-data/vite:vite.desktop.in.h:2
+msgid "A visual trace explorer"
+msgstr "Un exploreur graphique de traces d'exécution"
 
-#: ../menu-data/vkeybd:vkeybd.desktop.in.h:2
+#: ../menu-data/vkeybd:vkeybd.desktop.in.h:1
 msgid "Virtual MIDI Keyboard"
 msgstr "Clavier MIDI virtuel"
 
-#: ../menu-data/vlc:vlc.desktop.in.h:1
-msgid "Read, capture, broadcast your multimedia streams"
-msgstr "Lire, capturer, diffuser vos flux multimédia"
+#: ../menu-data/vkeybd:vkeybd.desktop.in.h:2
+msgid "MIDI Virtual Keyboard"
+msgstr "Clavier virtuel MIDI"
 
-#: ../menu-data/vlc:vlc.desktop.in.h:2
+#: ../menu-data/vlc:vlc.desktop.in.h:1
 msgid "VLC media player"
 msgstr "Lecteur multimédia VLC"
 
+#: ../menu-data/vlc:vlc.desktop.in.h:2
+msgid "Read, capture, broadcast your multimedia streams"
+msgstr "Lire, capturer, diffuser vos flux multimédia"
+
 #: ../menu-data/vmpk:vmpk.desktop.in.h:1
 msgid "VMPK"
 msgstr "VMPK"
@@ -18260,28 +18497,32 @@
 msgstr "vodovod"
 
 #: ../menu-data/volumecontrol.app:VolumeControl.desktop.in.h:1
-msgid "Control your volume settings"
-msgstr "Contrôler les réglages de volume"
-
-#: ../menu-data/volumecontrol.app:VolumeControl.desktop.in.h:2
 msgid "VolumeControl"
 msgstr "VolumeControl"
 
-#: ../menu-data/vor:vor.desktop.in.h:1
-msgid "Variations on Rockdodger"
-msgstr "Variantes de Rockdodger"
+#: ../menu-data/volumecontrol.app:VolumeControl.desktop.in.h:2
+msgid "Control your volume settings"
+msgstr "Contrôler les réglages de volume"
 
-#: ../menu-data/vor:vor.desktop.in.h:2
+#: ../menu-data/vor:vor.desktop.in.h:1
 msgid "VoR"
 msgstr "VoR"
 
+#: ../menu-data/vor:vor.desktop.in.h:2
+msgid "Variations on Rockdodger"
+msgstr "Variantes de Rockdodger"
+
 #: ../menu-data/voxbo:vbview2.desktop.in.h:1
+msgid "VoxBo Image Viewer"
+msgstr "Visualisateur d'images VoxBo"
+
+#: ../menu-data/voxbo:vbview2.desktop.in.h:2
 msgid "VBView2"
 msgstr "VBView2"
 
-#: ../menu-data/voxbo:vbview2.desktop.in.h:2
-msgid "VoxBo Image Viewer"
-msgstr "Visualisateur d'images VoxBo"
+#: ../menu-data/vprerex:vprerex.desktop.in.h:1
+msgid "vprerex"
+msgstr "vprerex"
 
 #: ../menu-data/vusb-analyzer:vusb-analyzer.desktop.in.h:1
 msgid "Virtual USB Analyzer"
@@ -18292,156 +18533,148 @@
 msgstr ""
 
 #: ../menu-data/vym:vym.desktop.in.h:1
-msgid "Create mind maps"
-msgstr "Créer des cartes heuristiques"
-
-#: ../menu-data/vym:vym.desktop.in.h:2
 msgid "VYM - View Your Mind"
 msgstr "VYM - Cartographier vos idées"
 
-#: ../menu-data/w3af:w3af.desktop.in.h:1
-msgid "Web Application Attack and Audit Framework"
-msgstr "Environnement d'attaque et d'audit d'application Web"
+#: ../menu-data/vym:vym.desktop.in.h:2
+msgid "Create mind maps"
+msgstr "Créer des cartes heuristiques"
 
-#: ../menu-data/w3af:w3af.desktop.in.h:2
+#: ../menu-data/w3af:w3af.desktop.in.h:1
 msgid "w3af"
 msgstr "w3af"
 
+#: ../menu-data/w3af:w3af.desktop.in.h:2
+msgid "Web Application Attack and Audit Framework"
+msgstr "Environnement d'attaque et d'audit d'application Web"
+
 #: ../menu-data/wakeup:wakeup.desktop.in.h:1
+msgid "Wakeup"
+msgstr "Wakeup"
+
+#: ../menu-data/wakeup:wakeup.desktop.in.h:2
 msgid ""
 "A talking and fully customizable alarm clock that will operate from poweroff"
 msgstr ""
 
-#: ../menu-data/wakeup:wakeup.desktop.in.h:2
-msgid "Wakeup"
-msgstr "Wakeup"
-
 #: ../menu-data/wallch:wallch.desktop.in.h:1
-msgid "Change Wallpaper"
-msgstr "Changer le papier-peint"
+msgid "Wallch"
+msgstr "Wallch"
 
 #: ../menu-data/wallch:wallch.desktop.in.h:2
 msgid "Change desktop wallpapers automatically"
 msgstr "Changer l'arrière-plan de bureau automatiquement"
 
 #: ../menu-data/wallch:wallch.desktop.in.h:3
-msgid "Live Earth Wallpaper"
-msgstr "Papier-peint de la Terre en direct"
+msgid "Start"
+msgstr "Démarrer"
 
 #: ../menu-data/wallch:wallch.desktop.in.h:4
-msgid "Next"
-msgstr "Suivant"
-
-#: ../menu-data/wallch:wallch.desktop.in.h:5
 msgid "Pause"
 msgstr "Pause"
 
+#: ../menu-data/wallch:wallch.desktop.in.h:5
+msgid "Stop"
+msgstr "Arrêter"
+
 #: ../menu-data/wallch:wallch.desktop.in.h:6
-msgid "Previous"
-msgstr "Précedent"
+msgid "Next"
+msgstr "Suivant"
 
 #: ../menu-data/wallch:wallch.desktop.in.h:7
-msgid "Start"
-msgstr "Démarrer"
+msgid "Previous"
+msgstr "Précedent"
 
 #: ../menu-data/wallch:wallch.desktop.in.h:8
-msgid "Start Changing Wallpapers"
-msgstr "Commencer à changer les arrière-plans"
+msgid "Change Wallpaper"
+msgstr "Changer le papier-peint"
 
 #: ../menu-data/wallch:wallch.desktop.in.h:9
-msgid "Stop"
-msgstr "Arrêter"
+msgid "Start Changing Wallpapers"
+msgstr "Commencer à changer les arrière-plans"
 
 #: ../menu-data/wallch:wallch.desktop.in.h:10
-msgid "Wallch"
-msgstr "Wallch"
+msgid "Live Earth Wallpaper"
+msgstr "Papier-peint de la Terre en direct"
 
 #: ../menu-data/wally:wally.desktop__wally.desktop.in.h:1
-msgid "KDE4 Wallpaper changer"
-msgstr "Changeur de papier-peint pour KDE4"
-
-#: ../menu-data/wally:wally.desktop__wally.desktop.in.h:2
 msgid "Wally"
 msgstr "Wally"
 
-#: ../menu-data/wammu:wammu.desktop.in.h:1
-msgid "Application for mobile phones - frontend for Gammu"
-msgstr "Application pour les téléphones portables - interface pour Gammu"
+#: ../menu-data/wally:wally.desktop__wally.desktop.in.h:2
+msgid "KDE4 Wallpaper changer"
+msgstr "Changeur de papier-peint pour KDE4"
 
-#: ../menu-data/wammu:wammu.desktop.in.h:2
+#: ../menu-data/wammu:wammu.desktop.in.h:1
 msgid "Wammu"
 msgstr "Wammu"
 
-#: ../menu-data/warmux:warmux.desktop.in.h:1
-msgid "A 2D game where funny characters launch funny weapons"
-msgstr "Un jeu en 2D où de drôles de personnages lancent de drôles d'armes"
+#: ../menu-data/wammu:wammu.desktop.in.h:2
+msgid "Application for mobile phones - frontend for Gammu"
+msgstr "Application pour les téléphones portables - interface pour Gammu"
 
-#: ../menu-data/warmux:warmux.desktop.in.h:2
+#: ../menu-data/warmux:warmux.desktop.in.h:1
 msgid "Warmux"
 msgstr "Warmux"
 
-#: ../menu-data/warsow:warsow.desktop.in.h:1
-msgid "A fast paced, networked 3D first person shooter"
-msgstr "Un jeu de tir subjectif 3D rapide et en réseau"
+#: ../menu-data/warmux:warmux.desktop.in.h:2
+msgid "A 2D game where funny characters launch funny weapons"
+msgstr "Un jeu en 2D où de drôles de personnages lancent de drôles d'armes"
 
-#: ../menu-data/warsow:warsow.desktop.in.h:2
+#: ../menu-data/warsow:warsow.desktop.in.h:1
 msgid "Warsow"
 msgstr "Warsow"
 
-#: ../menu-data/warzone2100:warzone2100.desktop.in.h:1
-msgid "Postnuclear realtime strategy"
-msgstr "Stratégie en temps réel dans un univers post-nucléaire"
+#: ../menu-data/warsow:warsow.desktop.in.h:2
+msgid "A fast paced, networked 3D first person shooter"
+msgstr "Un jeu de tir subjectif 3D rapide et en réseau"
 
-#: ../menu-data/warzone2100:warzone2100.desktop.in.h:2
+#: ../menu-data/warzone2100:warzone2100.desktop.in.h:1
 msgid "Warzone 2100"
 msgstr "Warzone 2100"
 
-#: ../menu-data/wavbreaker:wavbreaker.desktop.in.h:1
-msgid "Split wave files into multiple chunks"
-msgstr "Découper les fichiers Wav en plusieurs parties"
+#: ../menu-data/warzone2100:warzone2100.desktop.in.h:2
+msgid "Postnuclear realtime strategy"
+msgstr "Stratégie en temps réel dans un univers post-nucléaire"
 
-#: ../menu-data/wavbreaker:wavbreaker.desktop.in.h:2
+#: ../menu-data/wavbreaker:wavbreaker.desktop.in.h:1
 msgid "Wavbreaker File Splitter"
 msgstr "Découpe de fichiers Wavbreaker"
 
-#: ../menu-data/wavesurfer:wavesurfer.desktop.in.h:1
-msgid "Manipulate sound files"
-msgstr "Manipuler des fichiers audio"
+#: ../menu-data/wavbreaker:wavbreaker.desktop.in.h:2
+msgid "Split wave files into multiple chunks"
+msgstr "Découper les fichiers Wav en plusieurs parties"
 
-#: ../menu-data/wavesurfer:wavesurfer.desktop.in.h:2
+#: ../menu-data/wavesurfer:wavesurfer.desktop.in.h:1
 msgid "wavesurfer"
 msgstr "wavesurfer"
 
-#: ../menu-data/webboard:webboard.desktop.in.h:1
-msgid ""
-"Publish text notes and source code on a pastebin server for collaborative "
-"debugging"
-msgstr ""
-"Publier des notes ou du code source sur un serveur pastebin pour débogage "
-"collaboratif"
-
-#: ../menu-data/webboard:webboard.desktop.in.h:2
-msgid "WebBoard"
-msgstr "WebBoard"
+#: ../menu-data/wavesurfer:wavesurfer.desktop.in.h:2
+msgid "Manipulate sound files"
+msgstr "Manipuler des fichiers audio"
 
 #: ../menu-data/webhttrack:WebHTTrack.desktop.in.h:1
-msgid "Copy websites to your computer"
-msgstr "Copier des sites Web sur votre ordinateur"
-
-#: ../menu-data/webhttrack:WebHTTrack.desktop.in.h:2
 msgid "WebHTTrack Website Copier"
 msgstr "Aspirateur de sites Web WebHTTrack"
 
+#: ../menu-data/webhttrack:WebHTTrack.desktop.in.h:2
+msgid "Copy websites to your computer"
+msgstr "Copier des sites Web sur votre ordinateur"
+
 #: ../menu-data/webissues:webissues.desktop.in.h:1
+msgid "WebIssues"
+msgstr "WebIssues"
+
+#: ../menu-data/webissues:webissues.desktop.in.h:2
 msgid "Desktop Client for the WebIssues team collaboration system"
 msgstr ""
 "Client de bureau pour le système de collaboration en équipe WebIssues"
 
-#: ../menu-data/webissues:webissues.desktop.in.h:2
-msgid "WebIssues"
-msgstr "WebIssues"
-
 #: ../menu-data/webservice-office-zoho:webservice-office-zoho-sheet.desktop.in.h:1
+msgid "Zoho Webservice Spreadsheet"
+msgstr "Service Web de tableur Zoho"
+
+#: ../menu-data/webservice-office-zoho:webservice-office-zoho-sheet.desktop.in.h:2
 msgid ""
 "Perform calculation, analyze information and manage lists in spreadsheets "
 "using Zoho web services."
@@ -18449,11 +18682,11 @@
 "Effectuer des calculs, analyser des données et gérer des listes dans des "
 "tableurs en utilisant les services en ligne Zoho."
 
-#: ../menu-data/webservice-office-zoho:webservice-office-zoho-sheet.desktop.in.h:2
-msgid "Zoho Webservice Spreadsheet"
-msgstr "Service Web de tableur Zoho"
-
 #: ../menu-data/webservice-office-zoho:webservice-office-zoho-show.desktop.in.h:1
+msgid "Zoho Webservice Presentation"
+msgstr "Service Web de présentation Zoho"
+
+#: ../menu-data/webservice-office-zoho:webservice-office-zoho-show.desktop.in.h:2
 msgid ""
 "Create and edit presentations for slideshows, meeting and Web pages using "
 "Zoho web services."
@@ -18461,11 +18694,11 @@
 "Créer et modifier des présentations de type diaporama ou des pages Web en "
 "utilisant les services en ligne Zoho."
 
-#: ../menu-data/webservice-office-zoho:webservice-office-zoho-show.desktop.in.h:2
-msgid "Zoho Webservice Presentation"
-msgstr "Service Web de présentation Zoho"
-
 #: ../menu-data/webservice-office-zoho:webservice-office-zoho-writer.desktop.in.h:1
+msgid "Zoho Webservice Word Processor"
+msgstr "Service Web de traitement de texte Zoho"
+
+#: ../menu-data/webservice-office-zoho:webservice-office-zoho-writer.desktop.in.h:2
 msgid ""
 "Create and edit text and graphics in letters, reports, documents and Web "
 "pages using Zoho web services."
@@ -18473,62 +18706,71 @@
 "Créer et modifier des textes et des images dans des lettres, rapports ou "
 "documents et des pages Web en utilisant les services en ligne Zoho."
 
-#: ../menu-data/webservice-office-zoho:webservice-office-zoho-writer.desktop.in.h:2
-msgid "Zoho Webservice Word Processor"
-msgstr "Service Web de traitement de texte Zoho"
-
 #: ../menu-data/weka:weka.desktop.in.h:1
+msgid "weka"
+msgstr "weka"
+
+#: ../menu-data/weka:weka.desktop.in.h:2
 msgid "Machine learning algorithms for data mining tasks"
 msgstr ""
 "Algorithmes d'apprentissage automatique pour des tâches d'extraction de "
 "données"
 
-#: ../menu-data/weka:weka.desktop.in.h:2
-msgid "weka"
-msgstr "weka"
+#: ../menu-data/wesnoth-1.10-core:wesnoth-1.10.desktop.in.h:1
+msgid "Battle for Wesnoth (1.10)"
+msgstr "Battle for Wesnoth (1.10)"
 
-#: ../menu-data/wesnoth-1.8-core:wesnoth-1.8.desktop.in.h:1
+#: ../menu-data/wesnoth-1.10-core:wesnoth-1.10.desktop.in.h:2
+#: ../menu-data/wesnoth-1.8-core:wesnoth-1.8.desktop.in.h:2
 msgid "A fantasy turn-based strategy game"
 msgstr ""
 "Jeu de stratégie au tour par tour dans un univers médiéval-fantastique"
 
-#: ../menu-data/wesnoth-1.8-core:wesnoth-1.8.desktop.in.h:2
+#: ../menu-data/wesnoth-1.10-core:wesnoth-1.10_editor.desktop.in.h:1
+msgid "Battle for Wesnoth Map Editor (1.10)"
+msgstr "Editeur de Cartes pour Battle for Wesnoth (1.10)"
+
+#: ../menu-data/wesnoth-1.10-core:wesnoth-1.10_editor.desktop.in.h:2
+msgid "A map editor for Battle for Wesnoth maps"
+msgstr "Éditeur de carte pour le jeu de stratégie Battle for Wesnoth"
+
+#: ../menu-data/wesnoth-1.8-core:wesnoth-1.8.desktop.in.h:1
 msgid "Battle for Wesnoth (1.8)"
 msgstr "Battle for Wesnoth (1.8)"
 
 #: ../menu-data/whichwayisup:whichwayisup.desktop.in.h:1
+msgid "Which Way is Up"
+msgstr "Which Way Is Up"
+
+#: ../menu-data/whichwayisup:whichwayisup.desktop.in.h:2
 msgid "2D platform game with a slight rotational twist"
 msgstr ""
 "Jeu de plates-formes en 2D où il est possible de faire pivoter le décor"
 
-#: ../menu-data/whichwayisup:whichwayisup.desktop.in.h:2
-msgid "Which Way is Up"
-msgstr "Which Way Is Up"
-
 #: ../menu-data/wicd-gtk:wicd.desktop.in.h:1
-msgid "Start the Wicd client without system tray icon"
-msgstr "Démarrer le client Wicd sans icône de notification"
-
-#: ../menu-data/wicd-gtk:wicd.desktop.in.h:2
 msgid "Wicd Network Manager"
 msgstr "Gestionnaire réseau Wicd"
 
-#: ../menu-data/wicd-kde:kde4__wicd-kde.desktop.in.h:1
-msgid "Wicd Client KDE"
-msgstr "Client Wicd pour KDE"
+#: ../menu-data/wicd-gtk:wicd.desktop.in.h:2
+msgid "Start the Wicd client without system tray icon"
+msgstr "Démarrer le client Wicd sans icône de notification"
 
-#: ../menu-data/wicd-kde:kde4__wicd-kde.desktop.in.h:2
+#: ../menu-data/wicd-kde:kde4__wicd-kde.desktop.in.h:1
 msgid "Wicd client"
 msgstr "Client Wicd"
 
-#: ../menu-data/widelands:widelands.desktop.in.h:1
-msgid "A a real-time build-up strategy game"
-msgstr "Jeu de stratégie et de gestion en temps réel"
+#: ../menu-data/wicd-kde:kde4__wicd-kde.desktop.in.h:2
+msgid "Wicd Client KDE"
+msgstr "Client Wicd pour KDE"
 
-#: ../menu-data/widelands:widelands.desktop.in.h:2
+#: ../menu-data/widelands:widelands.desktop.in.h:1
 msgid "Widelands"
 msgstr "Widelands"
 
+#: ../menu-data/widelands:widelands.desktop.in.h:2
+msgid "A a real-time build-up strategy game"
+msgstr "Jeu de stratégie et de gestion en temps réel"
+
 #: ../menu-data/widemargin:widemargin.desktop.in.h:1
 msgid "Simple Bible Application"
 msgstr "Application simple pour l'étude de la Bible"
@@ -18538,20 +18780,12 @@
 msgstr "Wide Margin"
 
 #: ../menu-data/wifi-radar:wifi-radar.desktop.in.h:1
-msgid "Tool for connecting to wireless networks"
-msgstr "Outil pour se connecter à des réseaux sans-fil"
-
-#: ../menu-data/wifi-radar:wifi-radar.desktop.in.h:2
 msgid "WiFi Radar"
 msgstr "WiFi Radar"
 
-#: ../menu-data/wiican:wiican.desktop.in.h:1
-msgid "Wiican"
-msgstr "Wiican"
-
-#: ../menu-data/wiican:wiican.desktop.in.h:2
-msgid "Wiimote manager usage assistant and mapping manager"
-msgstr "Assistant d'utilisation de Wiimote"
+#: ../menu-data/wifi-radar:wifi-radar.desktop.in.h:2
+msgid "Tool for connecting to wireless networks"
+msgstr "Outil pour se connecter à des réseaux sans-fil"
 
 #: ../menu-data/willowng-config-gnome:willowng.desktop.in.h:1
 #: ../menu-data/willowng-config-kde:kde__willowng-kde.desktop.in.h:1
@@ -18569,29 +18803,29 @@
 msgstr "Chargeur de programme Windows Wine"
 
 #: ../menu-data/winefish:winefish.desktop.in.h:1
-msgid "LaTeX Editor based on Bluefish"
-msgstr "Éditeur LaTeX basé sur Bluefish"
-
-#: ../menu-data/winefish:winefish.desktop.in.h:2
 msgid "Winefish LaTeX Editor"
 msgstr "Éditeur LaTeX Winefish"
 
-#: ../menu-data/winff:winff.desktop.in.h:1
-msgid "GUI for FFMPEG"
-msgstr "Interface graphique pour FFMPEG"
+#: ../menu-data/winefish:winefish.desktop.in.h:2
+msgid "LaTeX Editor based on Bluefish"
+msgstr "Éditeur LaTeX basé sur Bluefish"
 
-#: ../menu-data/winff:winff.desktop.in.h:2
+#: ../menu-data/winff:winff.desktop.in.h:1
 msgid "WinFF"
 msgstr "WinFF"
 
-#: ../menu-data/wings3d:wings3d.desktop.in.h:1
-msgid "Create and edit 3D models of objects"
-msgstr "Créer et modifier des modèles d'objets en 3D"
+#: ../menu-data/winff:winff.desktop.in.h:2
+msgid "GUI for FFMPEG"
+msgstr "Interface graphique pour FFMPEG"
 
-#: ../menu-data/wings3d:wings3d.desktop.in.h:2
+#: ../menu-data/wings3d:wings3d.desktop.in.h:1
 msgid "Wings3D polygon mesh modeller"
 msgstr "Modélisation de polygones tridimensionnels (mesh) Wings3D"
 
+#: ../menu-data/wings3d:wings3d.desktop.in.h:2
+msgid "Create and edit 3D models of objects"
+msgstr "Créer et modifier des modèles d'objets en 3D"
+
 #: ../menu-data/wininfo:xdg-wininfo.desktop.in.h:1
 msgid "A window information utility for X"
 msgstr "Utilitaire d'informations sur les fenêtres pour X"
@@ -18601,51 +18835,59 @@
 msgstr "Informations X Window"
 
 #: ../menu-data/winpdb:winpdb.desktop.in.h:1
-msgid "Platform independent Python debugger"
-msgstr "Débogueur Python indépendant de la plate-forme"
-
-#: ../menu-data/winpdb:winpdb.desktop.in.h:2
 msgid "Winpdb"
 msgstr "Winpdb"
 
-#: ../menu-data/wireshark:wireshark.desktop.in.h:1
-msgid "Network traffic analyzer"
-msgstr "Analyseur de trames réseau"
+#: ../menu-data/winpdb:winpdb.desktop.in.h:2
+msgid "Platform independent Python debugger"
+msgstr "Débogueur Python indépendant de la plate-forme"
 
-#: ../menu-data/wireshark:wireshark.desktop.in.h:2
+#: ../menu-data/wireshark:wireshark.desktop.in.h:1
 msgid "Wireshark"
 msgstr "Wireshark"
 
-#: ../menu-data/wizznic:wizznic.desktop.in.h:1
-msgid "A puzzle-block falling game."
-msgstr ""
+#: ../menu-data/wireshark:wireshark.desktop.in.h:2
+msgid "Network traffic analyzer"
+msgstr "Analyseur de trames réseau"
 
-#: ../menu-data/wizznic:wizznic.desktop.in.h:2
+#: ../menu-data/wizznic:wizznic.desktop.in.h:1
 msgid "Wizznic"
 msgstr "Wizznic"
 
+#: ../menu-data/wizznic:wizznic.desktop.in.h:2
+msgid "A puzzle-block falling game."
+msgstr "Un jeu de blocs qui tombent"
+
 #: ../menu-data/wmgui:wmgui.desktop.in.h:1
+msgid "Wmgui"
+msgstr "Wmgui"
+
+#: ../menu-data/wmgui:wmgui.desktop.in.h:2
 msgid "Simple GTK gui to the wiimote to test and display the wiimote data."
 msgstr ""
 "Interface GTK simple pour la Wiimote pour afficher et tester les données de "
 "la Wiimote"
 
-#: ../menu-data/wmgui:wmgui.desktop.in.h:2
-msgid "Wmgui"
-msgstr "Wmgui"
-
 #: ../menu-data/wmitime:wmitime.desktop.in.h:1
 msgid "Wmitime"
 msgstr "Wmitime"
 
-#: ../menu-data/worker:worker.desktop.in.h:1
-msgid "File manager for X."
-msgstr "Gestionnaire de fichiers pour X."
+#: ../menu-data/wolf4sdl:wolf4sdl.desktop.in.h:1
+msgid "Wolf4SDL"
+msgstr "Wolf4SDL"
 
-#: ../menu-data/worker:worker.desktop.in.h:2
+#: ../menu-data/wolf4sdl:wolf4sdl.desktop.in.h:2
+msgid "SDL-Port of Wolfenstein 3-D and Spear of Destiny"
+msgstr ""
+
+#: ../menu-data/worker:worker.desktop.in.h:1
 msgid "Worker"
 msgstr "Worker"
 
+#: ../menu-data/worker:worker.desktop.in.h:2
+msgid "File manager for X."
+msgstr "Gestionnaire de fichiers pour X."
+
 #: ../menu-data/workrave:workrave.desktop.in.h:1
 msgid ""
 "Assists in the prevention and recovery of Repetitive Strain Injury (RSI)"
@@ -18658,37 +18900,45 @@
 msgstr "Workrave"
 
 #: ../menu-data/wpagui:wpa_gui.desktop.in.h:1
-msgid "Graphical user interface for wpa_supplicant"
-msgstr "Interface graphique pour wpa_supplicant"
-
-#: ../menu-data/wpagui:wpa_gui.desktop.in.h:2
 msgid "wpa_gui"
 msgstr "wpa_gui"
 
+#: ../menu-data/wpagui:wpa_gui.desktop.in.h:2
+msgid "Graphical user interface for wpa_supplicant"
+msgstr "Interface graphique pour wpa_supplicant"
+
 #: ../menu-data/wrapperfactory.app:WrapperFactory.desktop.in.h:1
+msgid "WrapperFactory"
+msgstr "WrapperFactory"
+
+#: ../menu-data/wrapperfactory.app:WrapperFactory.desktop.in.h:2
 msgid "Graphically create Unix application wrappers for GNUstep"
 msgstr "Créer graphiquement des adaptateurs (wrappers) Unix pour GNUstep"
 
-#: ../menu-data/wrapperfactory.app:WrapperFactory.desktop.in.h:2
-msgid "WrapperFactory"
-msgstr "WrapperFactory"
+#: ../menu-data/writetype:writetype.desktop.in.h:1
+msgid "Writetype"
+msgstr "Writetype"
+
+#: ../menu-data/writetype:writetype.desktop.in.h:2
+msgid "A word processor to make typing easier"
+msgstr "Un traitement de texte pour rendre plus facile la saisie de texte"
 
 #: ../menu-data/wsjt:wsjt.desktop.in.h:1
-msgid "Amateur radio weak signal communications"
-msgstr "Communications radio-amateur à signal faible"
-
-#: ../menu-data/wsjt:wsjt.desktop.in.h:2
 msgid "WSJT"
 msgstr "WSJT"
 
-#: ../menu-data/wxbanker:wxbanker.desktop.in.h:1
-msgid "A lightweight personal finance manager"
-msgstr "Un gestionnaire financier personnel léger"
+#: ../menu-data/wsjt:wsjt.desktop.in.h:2
+msgid "Amateur radio weak signal communications"
+msgstr "Communications radio-amateur à signal faible"
 
-#: ../menu-data/wxbanker:wxbanker.desktop.in.h:2
+#: ../menu-data/wxbanker:wxbanker.desktop.in.h:1
 msgid "wxBanker Finance Manager"
 msgstr "Gestionnaire financier wxBanker"
 
+#: ../menu-data/wxbanker:wxbanker.desktop.in.h:2
+msgid "A lightweight personal finance manager"
+msgstr "Un gestionnaire financier personnel léger"
+
 #: ../menu-data/wxformbuilder:wxformbuilder.desktop.in.h:1
 msgid "wxFormBuilder"
 msgstr "wxFormBuilder"
@@ -18698,22 +18948,22 @@
 msgstr "Concepteur d'interface graphique wxWidgets"
 
 #: ../menu-data/wxmaxima:wxmaxima.desktop.in.h:1
-msgid "Perform symbolic and numeric calculations using Maxima"
-msgstr "Effectuer des calculs symboliques et numériques en utilisant Maxima"
-
-#: ../menu-data/wxmaxima:wxmaxima.desktop.in.h:2
 msgid "wxMaxima"
 msgstr "wxMaxima"
 
-#: ../menu-data/x11vnc:x11vnc.desktop.in.h:1
-msgid "Share this desktop by VNC"
-msgstr "Partagez ce bureau via VNC"
+#: ../menu-data/wxmaxima:wxmaxima.desktop.in.h:2
+msgid "Perform symbolic and numeric calculations using Maxima"
+msgstr "Effectuer des calculs symboliques et numériques en utilisant Maxima"
 
-#: ../menu-data/x11vnc:x11vnc.desktop.in.h:2
+#: ../menu-data/x11vnc:x11vnc.desktop.in.h:1
 msgid "X11VNC Server"
 msgstr "Serveur X11VNC"
 
-#: ../menu-data/x2:x2.desktop.in.h:2
+#: ../menu-data/x11vnc:x11vnc.desktop.in.h:2
+msgid "Share this desktop by VNC"
+msgstr "Partagez ce bureau via VNC"
+
+#: ../menu-data/x2:x2.desktop.in.h:1
 msgid "X2"
 msgstr "X2"
 
@@ -18727,37 +18977,37 @@
 msgstr "Simulation de boulier pour fair des calculs"
 
 #: ../menu-data/xacobeo:xacobeo.desktop.in.h:1
-msgid "Build and execute XPath queries"
-msgstr "Construire et exécuter des requêtes XPath"
-
-#: ../menu-data/xacobeo:xacobeo.desktop.in.h:2
 msgid "Xacobeo"
 msgstr "Xacobeo"
 
-#: ../menu-data/xaos:xaos.desktop.in.h:1
-msgid "Fractal Generator"
-msgstr "Générateur de fractales"
+#: ../menu-data/xacobeo:xacobeo.desktop.in.h:2
+msgid "Build and execute XPath queries"
+msgstr "Construire et exécuter des requêtes XPath"
 
-#: ../menu-data/xaos:xaos.desktop.in.h:2
+#: ../menu-data/xaos:xaos.desktop.in.h:1
 msgid "Xaos - Fractal Zoomer"
 msgstr "Xaos - Fractal Zoomer"
 
-#: ../menu-data/xaralx:xaralx.desktop.in.h:1
-msgid "Versatile vector graphics program"
-msgstr "Logiciel de dessin vectoriel polyvalent"
+#: ../menu-data/xaos:xaos.desktop.in.h:2
+msgid "Fractal Generator"
+msgstr "Générateur de fractales"
 
-#: ../menu-data/xaralx:xaralx.desktop.in.h:2
+#: ../menu-data/xaralx:xaralx.desktop.in.h:1
 msgid "Xara Xtreme"
 msgstr "Xara Xtreme"
 
-#: ../menu-data/xarchiver:xarchiver.desktop.in.h:1
-msgid "A GTK+2 only archive manager"
-msgstr "Gestionnaire d'archives GTK+2"
+#: ../menu-data/xaralx:xaralx.desktop.in.h:2
+msgid "Versatile vector graphics program"
+msgstr "Logiciel de dessin vectoriel polyvalent"
 
-#: ../menu-data/xarchiver:xarchiver.desktop.in.h:2
+#: ../menu-data/xarchiver:xarchiver.desktop.in.h:1
 msgid "Xarchiver"
 msgstr "Xarchiver"
 
+#: ../menu-data/xarchiver:xarchiver.desktop.in.h:2
+msgid "A GTK+2 only archive manager"
+msgstr "Gestionnaire d'archives GTK+2"
+
 #: ../menu-data/xawtv:xawtv.desktop.in.h:1
 msgid "TV viewer for X11"
 msgstr "Afficheur TV pour X11"
@@ -18767,30 +19017,34 @@
 msgstr "XawTV"
 
 #: ../menu-data/xbill:xbill.desktop.in.h:1
-msgid "Get rid of those Wingdows Viruses!"
-msgstr "Se débarrasser de ces virus Windows !"
-
-#: ../menu-data/xbill:xbill.desktop.in.h:2
 msgid "XBill"
 msgstr "XBill"
 
-#: ../menu-data/xboard:xboard.desktop.in.h:1
-msgid "Use an X Windows Chess Board"
-msgstr "Utiliser un plateau d'échecs pour X"
+#: ../menu-data/xbill:xbill.desktop.in.h:2
+msgid "Get rid of those Wingdows Viruses!"
+msgstr "Se débarrasser de ces virus Windows !"
 
-#: ../menu-data/xboard:xboard.desktop.in.h:2
+#: ../menu-data/xboard:xboard.desktop.in.h:1
 msgid "XBoard"
 msgstr "XBoard"
 
-#: ../menu-data/xboing:xboing.desktop.in.h:1
-msgid "Destroy some blocks"
-msgstr "Détruire des blocs"
+#: ../menu-data/xboard:xboard.desktop.in.h:2
+msgid "Use an X Windows Chess Board"
+msgstr "Utiliser un plateau d'échecs pour X"
 
-#: ../menu-data/xboing:xboing.desktop.in.h:2
+#: ../menu-data/xboing:xboing.desktop.in.h:1
 msgid "XBoing II"
 msgstr "XBoing II"
 
+#: ../menu-data/xboing:xboing.desktop.in.h:2
+msgid "Destroy some blocks"
+msgstr "Détruire des blocs"
+
 #: ../menu-data/xca:xca.desktop.in.h:1
+msgid "XCA"
+msgstr "XCA"
+
+#: ../menu-data/xca:xca.desktop.in.h:2
 msgid ""
 "A graphical user interface for handling and issuing X.509 compliant "
 "Certificates"
@@ -18798,50 +19052,46 @@
 "Une interface graphique pour gérer et délivrer des certificats à la norme "
 "X.509"
 
-#: ../menu-data/xca:xca.desktop.in.h:2
-msgid "XCA"
-msgstr "XCA"
-
 #: ../menu-data/xcdroast:xcdroast.desktop.in.h:1
-msgid "Create a CD"
-msgstr "Créer un CD"
-
-#: ../menu-data/xcdroast:xcdroast.desktop.in.h:2
 msgid "X-CD-Roast"
 msgstr "X-CD-Roast"
 
-#: ../menu-data/xcfa:xcfa.desktop.in.h:1
-msgid "X Convert File Audio. Programme pour convertir les fichiers audio."
-msgstr "X Convert File Audio. Programme pour convertir les fichiers audio."
+#: ../menu-data/xcdroast:xcdroast.desktop.in.h:2
+msgid "Create a CD"
+msgstr "Créer un CD"
 
-#: ../menu-data/xcfa:xcfa.desktop.in.h:2
+#: ../menu-data/xcfa:xcfa.desktop.in.h:1
 msgid "XCFA"
 msgstr "XCFA"
 
-#: ../menu-data/xchat-gnome:xchat-gnome.desktop.in.h:1
-msgid "Chat with people using IRC"
-msgstr "Discuter avec les personnes utilisant un canal IRC"
+#: ../menu-data/xcfa:xcfa.desktop.in.h:2
+msgid "X Convert File Audio. Programme pour convertir les fichiers audio."
+msgstr "X Convert File Audio. Programme pour convertir les fichiers audio."
 
-#: ../menu-data/xchat-gnome:xchat-gnome.desktop.in.h:2
+#: ../menu-data/xchat-gnome:xchat-gnome.desktop.in.h:1
 msgid "XChat-GNOME IRC Chat"
 msgstr "XChat-GNOME IRC Chat"
 
-#: ../menu-data/xchat:xchat.desktop.in.h:1
-msgid "Chat with other people using Internet Relay Chat"
-msgstr "Discuter avec les personnes utilisant l'IRC"
+#: ../menu-data/xchat-gnome:xchat-gnome.desktop.in.h:2
+msgid "Chat with people using IRC"
+msgstr "Discuter avec les personnes utilisant un canal IRC"
 
-#: ../menu-data/xchat:xchat.desktop.in.h:2
+#: ../menu-data/xchat:xchat.desktop.in.h:1
 msgid "XChat IRC"
 msgstr "XChat IRC"
 
-#: ../menu-data/xchm:xchm.desktop.in.h:1
-msgid "Compiled HTML Help (CHM) file viewer"
-msgstr "Afficheur de fichiers d'aide HTML compilés (CHM)"
+#: ../menu-data/xchat:xchat.desktop.in.h:2
+msgid "Chat with other people using Internet Relay Chat"
+msgstr "Discuter avec les personnes utilisant l'IRC"
 
-#: ../menu-data/xchm:xchm.desktop.in.h:2
+#: ../menu-data/xchm:xchm.desktop.in.h:1
 msgid "xCHM"
 msgstr "xCHM"
 
+#: ../menu-data/xchm:xchm.desktop.in.h:2
+msgid "Compiled HTML Help (CHM) file viewer"
+msgstr "Afficheur de fichiers d'aide HTML compilés (CHM)"
+
 #: ../menu-data/xdemineur:xdemineur.desktop.in.h:1
 msgid "Xdemineur"
 msgstr "Xdemineur"
@@ -18851,48 +19101,48 @@
 msgstr "Encore un autre démineur pour X"
 
 #: ../menu-data/xdiagnose:xdiagnose.desktop.in.h:1
-msgid "X.org Diagnostic and Repair Utility"
-msgstr "Utilitaire de réparation et de diagnostic pour X.org"
-
-#: ../menu-data/xdiagnose:xdiagnose.desktop.in.h:2
 msgid "xdiagnose"
 msgstr "xdiagnose"
 
-#: ../menu-data/xdot:xdot.desktop.in.h:1
-msgid "Interactive viewer for Graphviz dot files"
-msgstr "Afficheur interactif de fichiers Graphviz dot"
+#: ../menu-data/xdiagnose:xdiagnose.desktop.in.h:2
+msgid "X.org Diagnostic and Repair Utility"
+msgstr "Utilitaire de réparation et de diagnostic pour X.org"
 
-#: ../menu-data/xdot:xdot.desktop.in.h:2
+#: ../menu-data/xdot:xdot.desktop.in.h:1
 msgid "XDot"
 msgstr "XDot"
 
-#: ../menu-data/xdx:Xdx.desktop.in.h:1
-msgid "DX-cluster client for amateur radio"
-msgstr "Client DX-cluster pour les radioamateurs"
+#: ../menu-data/xdot:xdot.desktop.in.h:2
+msgid "Interactive viewer for Graphviz dot files"
+msgstr "Afficheur interactif de fichiers Graphviz dot"
 
-#: ../menu-data/xdx:Xdx.desktop.in.h:2
+#: ../menu-data/xdx:Xdx.desktop.in.h:1
 msgid "Xdx"
 msgstr "Xdx"
 
-#: ../menu-data/xenwatch:xenwatch.desktop.in.h:1
-msgid "watch xen domains"
-msgstr "Surveiller les domaines Xen"
+#: ../menu-data/xdx:Xdx.desktop.in.h:2
+msgid "DX-cluster client for amateur radio"
+msgstr "Client DX-cluster pour les radioamateurs"
 
-#: ../menu-data/xenwatch:xenwatch.desktop.in.h:2
+#: ../menu-data/xenwatch:xenwatch.desktop.in.h:1
 msgid "xenwatch"
 msgstr "xenwatch"
 
+#: ../menu-data/xenwatch:xenwatch.desktop.in.h:2
+msgid "watch xen domains"
+msgstr "Surveiller les domaines Xen"
+
 #: ../menu-data/xfburn:xfburn.desktop.in.h:1
-msgid "Burn Image (xfburn)"
-msgstr "Gravure d'image disque (xfburn)"
+msgid "Xfburn"
+msgstr "Xfburn"
 
 #: ../menu-data/xfburn:xfburn.desktop.in.h:2
 msgid "CD and DVD burning application"
 msgstr "Application de gravure de CD et DVD"
 
 #: ../menu-data/xfburn:xfburn.desktop.in.h:3
-msgid "Xfburn"
-msgstr "Xfburn"
+msgid "Burn Image (xfburn)"
+msgstr "Gravure d'image disque (xfburn)"
 
 #: ../menu-data/xfdesktop4:xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop "
@@ -18904,21 +19154,21 @@
 "Définir l'arrière-plan du bureau et le comportement des menus et des icônes"
 
 #: ../menu-data/xfe:xfe.desktop.in.h:1
-msgid "A lightweight file manager for X Window"
-msgstr "Une gestionnaire de fichiers léger pour X Window"
-
-#: ../menu-data/xfe:xfe.desktop.in.h:2
 msgid "Xfe"
 msgstr "Xfe"
 
-#: ../menu-data/xfig:xfig.desktop.in.h:1
-msgid "Diagram editor"
-msgstr "Éditeur de diagrammes"
+#: ../menu-data/xfe:xfe.desktop.in.h:2
+msgid "A lightweight file manager for X Window"
+msgstr "Une gestionnaire de fichiers léger pour X Window"
 
-#: ../menu-data/xfig:xfig.desktop.in.h:2
+#: ../menu-data/xfig:xfig.desktop.in.h:1
 msgid "Xfig"
 msgstr "Xfig"
 
+#: ../menu-data/xfig:xfig.desktop.in.h:2
+msgid "Diagram editor"
+msgstr "Éditeur de diagrammes"
+
 #: ../menu-data/xflr5:xflr5.desktop.in.h:1
 msgid "XFLR5"
 msgstr "XFLR5"
@@ -18928,37 +19178,37 @@
 msgstr "analysis tool for airfoils"
 
 #: ../menu-data/xfmpc:xfmpc.desktop.in.h:1
-msgid "MPD client written in GTK+ for Xfce"
-msgstr "Client MPD écrit en GTK+ pour XFCE"
-
-#: ../menu-data/xfmpc:xfmpc.desktop.in.h:2
 msgid "Xfmpc"
 msgstr "Xfmpc"
 
-#: ../menu-data/xfwm4:xfce-wm-settings.desktop.in.h:1
-msgid "Configure window behavior and shortcuts"
-msgstr "Configurer le comportement des fenêtres et les raccourcis"
+#: ../menu-data/xfmpc:xfmpc.desktop.in.h:2
+msgid "MPD client written in GTK+ for Xfce"
+msgstr "Client MPD écrit en GTK+ pour XFCE"
 
-#: ../menu-data/xfwm4:xfce-wm-settings.desktop.in.h:2
+#: ../menu-data/xfwm4:xfce-wm-settings.desktop.in.h:1
 msgid "Window Manager"
 msgstr "Gestionnaire de fenêtres"
 
-#: ../menu-data/xfwm4:xfce-wmtweaks-settings.desktop.in.h:1
-msgid "Fine-tune window behaviour and effects"
-msgstr "Régler dans les détails le comportement des fenêtres et les effets"
+#: ../menu-data/xfwm4:xfce-wm-settings.desktop.in.h:2
+msgid "Configure window behavior and shortcuts"
+msgstr "Configurer le comportement des fenêtres et les raccourcis"
 
-#: ../menu-data/xfwm4:xfce-wmtweaks-settings.desktop.in.h:2
+#: ../menu-data/xfwm4:xfce-wmtweaks-settings.desktop.in.h:1
 msgid "Window Manager Tweaks"
 msgstr "Réglages précis du Gestionnaire de Fenêtres"
 
-#: ../menu-data/xfwm4:xfce-workspaces-settings.desktop.in.h:1
-msgid "Set number and names of workspaces"
-msgstr "Définir le nombre et les noms des espaces de travail"
+#: ../menu-data/xfwm4:xfce-wmtweaks-settings.desktop.in.h:2
+msgid "Fine-tune window behaviour and effects"
+msgstr "Régler dans les détails le comportement des fenêtres et les effets"
 
-#: ../menu-data/xfwm4:xfce-workspaces-settings.desktop.in.h:2
+#: ../menu-data/xfwm4:xfce-workspaces-settings.desktop.in.h:1
 msgid "Workspaces"
 msgstr "Espaces de travail"
 
+#: ../menu-data/xfwm4:xfce-workspaces-settings.desktop.in.h:2
+msgid "Set number and names of workspaces"
+msgstr "Définir le nombre et les noms des espaces de travail"
+
 #: ../menu-data/xgalaga:xgalaga.desktop.in.h:1
 msgid "Galaga"
 msgstr "Galaga"
@@ -18968,18 +19218,18 @@
 msgstr "Jouer à Galaga"
 
 #: ../menu-data/xgnokii:xgnokii.desktop.in.h:1
-msgid "Manage your mobile phone"
-msgstr "Gérer votre téléphone portable"
-
-#: ../menu-data/xgnokii:xgnokii.desktop.in.h:2
 msgid "Xgnokii"
 msgstr "Xgnokii"
 
+#: ../menu-data/xgnokii:xgnokii.desktop.in.h:2
+msgid "Manage your mobile phone"
+msgstr "Gérer votre téléphone portable"
+
 #: ../menu-data/xhtml2ps:xhtml2ps.desktop.in.h:1
 msgid "xhtml2ps"
 msgstr "xhtml2ps"
 
-#: ../menu-data/xine-ui:xine.desktop.in.h:2
+#: ../menu-data/xine-ui:xine.desktop.in.h:1
 msgid "xine"
 msgstr "xine"
 
@@ -19008,241 +19258,233 @@
 msgstr "Exécutez l'outil de calibration pour les écrans tactiles"
 
 #: ../menu-data/xiphos:xiphos.desktop.in.h:1
-msgid "Study the Bible"
-msgstr "Étudier la Bible"
-
-#: ../menu-data/xiphos:xiphos.desktop.in.h:2
 msgid "Xiphos Bible Guide"
 msgstr "Guide de bible Xiphos"
 
+#: ../menu-data/xiphos:xiphos.desktop.in.h:2
+msgid "Study the Bible"
+msgstr "Étudier la Bible"
+
 #: ../menu-data/xiterm+thai:xiterm+thai.desktop.in.h:1
 msgid "Thai X terminal"
 msgstr "Terminal en thaï pour X"
 
 #: ../menu-data/xjadeo:xjadeo.desktop.in.h:1
-msgid "A simple video player that gets sync from jack transport."
-msgstr "Un lecteur de vidéos simple qui se synchronise sur un transport JACK"
-
-#: ../menu-data/xjadeo:xjadeo.desktop.in.h:2
 msgid "Xjadeo"
 msgstr "Xjadeo"
 
-#: ../menu-data/xjump:xjump.desktop.in.h:1
-msgid "A jumping game"
-msgstr "Un jeu sautant"
+#: ../menu-data/xjadeo:xjadeo.desktop.in.h:2
+msgid "A simple video player that gets sync from jack transport."
+msgstr "Un lecteur de vidéos simple qui se synchronise sur un transport JACK"
 
-#: ../menu-data/xjump:xjump.desktop.in.h:2
+#: ../menu-data/xjump:xjump.desktop.in.h:1
 msgid "XJump"
 msgstr "XJump"
 
-#: ../menu-data/xlog:xlog.desktop.in.h:1
-msgid "Amateur Radio logging program"
-msgstr "Journal de trafic informatisé pour radio-amateurs"
+#: ../menu-data/xjump:xjump.desktop.in.h:2
+msgid "A jumping game"
+msgstr "Un jeu sautant"
 
-#: ../menu-data/xlog:xlog.desktop.in.h:2
+#: ../menu-data/xlog:xlog.desktop.in.h:1
 msgid "Xlog"
 msgstr "Xlog"
 
+#: ../menu-data/xlog:xlog.desktop.in.h:2
+msgid "Amateur Radio logging program"
+msgstr "Journal de trafic informatisé pour radio-amateurs"
+
 #: ../menu-data/xmabacus:xmabacus.desktop.in.h:2
 msgid "simulation of the ancient calculator (Motif version)"
 msgstr "Simulation d'une calculette ancienne (version Motif)"
 
 #: ../menu-data/xmahjongg:xmahjongg.desktop.in.h:1
-msgid "A colorful solitaire Mah Jongg game"
-msgstr "Jeu de solitaire Majong coloré"
-
-#: ../menu-data/xmahjongg:xmahjongg.desktop.in.h:2
 msgid "xmahjongg"
 msgstr "xmahjongg"
 
-#: ../menu-data/xmakemol:xmakemol.desktop.in.h:1
-msgid "View and manipulate atomic and other chemical systems"
-msgstr "Visualiser et manipuler des systèmes chimiques atomique ou autres"
+#: ../menu-data/xmahjongg:xmahjongg.desktop.in.h:2
+msgid "A colorful solitaire Mah Jongg game"
+msgstr "Jeu de solitaire Majong coloré"
 
-#: ../menu-data/xmakemol:xmakemol.desktop.in.h:2
+#: ../menu-data/xmakemol:xmakemol.desktop.in.h:1
 msgid "XMakemol"
 msgstr "XMakemol"
 
-#: ../menu-data/xmaxima:xmaxima.desktop.in.h:1
-msgid "An interface to the Maxima Computer Algebra System"
-msgstr "Une interface pour le système Maxima Computer Algebra"
+#: ../menu-data/xmakemol:xmakemol.desktop.in.h:2
+msgid "View and manipulate atomic and other chemical systems"
+msgstr "Visualiser et manipuler des systèmes chimiques atomique ou autres"
 
-#: ../menu-data/xmaxima:xmaxima.desktop.in.h:2
+#: ../menu-data/xmaxima:xmaxima.desktop.in.h:1
 msgid "Maxima Algebra System"
 msgstr "Maxima Algebra System"
 
+#: ../menu-data/xmaxima:xmaxima.desktop.in.h:2
+msgid "An interface to the Maxima Computer Algebra System"
+msgstr "Une interface pour le système Maxima Computer Algebra"
+
 #: ../menu-data/xmille:xmille.desktop.in.h:1
 msgid "Xmille"
 msgstr "Xmille"
 
 #: ../menu-data/xmlcopyeditor:xmlcopyeditor.desktop.in.h:1
-msgid "Edit XML documents"
-msgstr "Éditez des documents XML"
-
-#: ../menu-data/xmlcopyeditor:xmlcopyeditor.desktop.in.h:2
 msgid "XML Copy Editor"
 msgstr "XML Copy Editor"
 
-#: ../menu-data/xmms2tray:xmms2tray.desktop.in.h:1
-msgid "XMMS2 tray icon"
-msgstr "Icône de la zone de notifications pour XMMS2"
+#: ../menu-data/xmlcopyeditor:xmlcopyeditor.desktop.in.h:2
+msgid "Edit XML documents"
+msgstr "Éditez des documents XML"
 
-#: ../menu-data/xmms2tray:xmms2tray.desktop.in.h:2
+#: ../menu-data/xmms2tray:xmms2tray.desktop.in.h:1
 msgid "XMMS2tray"
 msgstr "XMMS2tray"
 
+#: ../menu-data/xmms2tray:xmms2tray.desktop.in.h:2
+msgid "XMMS2 tray icon"
+msgstr "Icône de la zone de notifications pour XMMS2"
+
 #: ../menu-data/xmonad:xmonad.desktop.in.h:1
 msgid "Xmonad"
 msgstr "Xmonad"
 
 #: ../menu-data/xmotd:xmotd.desktop.in.h:1
-msgid "A message of the day browser for X"
-msgstr "Un navigateur de message du jour pour X"
-
-#: ../menu-data/xmotd:xmotd.desktop.in.h:2
 msgid "Message of the day"
 msgstr "Message du jour"
 
-#: ../menu-data/xmoto:xmoto.desktop.in.h:1
-msgid "Motocross game"
-msgstr "Jeu de motocross"
+#: ../menu-data/xmotd:xmotd.desktop.in.h:2
+msgid "A message of the day browser for X"
+msgstr "Un navigateur de message du jour pour X"
 
-#: ../menu-data/xmoto:xmoto.desktop.in.h:2
+#: ../menu-data/xmoto:xmoto.desktop.in.h:1
 msgid "Xmoto"
 msgstr "Xmoto"
 
-#: ../menu-data/xmpuzzles:xmbarrel.desktop.in.h:1
-#: ../menu-data/xpuzzles:xbarrel.desktop.in.h:1
-msgid "barrel game"
-msgstr "Jeu de barils"
+#: ../menu-data/xmoto:xmoto.desktop.in.h:2
+msgid "Motocross game"
+msgstr "Jeu de motocross"
 
-#: ../menu-data/xmpuzzles:xmbarrel.desktop.in.h:2
+#: ../menu-data/xmpuzzles:xmbarrel.desktop.in.h:1
 msgid "xmbarrel"
 msgstr "xmbarrel"
 
-#: ../menu-data/xmpuzzles:xmcubes.desktop.in.h:1
-#: ../menu-data/xpuzzles:xcubes.desktop.in.h:1
-msgid "cubes game"
-msgstr "Jeu de cubes"
+#: ../menu-data/xmpuzzles:xmbarrel.desktop.in.h:2
+#: ../menu-data/xpuzzles:xbarrel.desktop.in.h:2
+msgid "barrel game"
+msgstr "Jeu de barils"
 
-#: ../menu-data/xmpuzzles:xmcubes.desktop.in.h:2
+#: ../menu-data/xmpuzzles:xmcubes.desktop.in.h:1
 msgid "xmcubes"
 msgstr "xmcubes"
 
-#: ../menu-data/xmpuzzles:xmdino.desktop.in.h:1
-#: ../menu-data/xpuzzles:xdino.desktop.in.h:1
-msgid "dino game"
-msgstr "Jeu dino"
+#: ../menu-data/xmpuzzles:xmcubes.desktop.in.h:2
+#: ../menu-data/xpuzzles:xcubes.desktop.in.h:2
+msgid "cubes game"
+msgstr "Jeu de cubes"
 
-#: ../menu-data/xmpuzzles:xmdino.desktop.in.h:2
+#: ../menu-data/xmpuzzles:xmdino.desktop.in.h:1
 msgid "xmdino"
 msgstr "xmdino"
 
-#: ../menu-data/xmpuzzles:xmhexagons.desktop.in.h:1
-#: ../menu-data/xpuzzles:xhexagons.desktop.in.h:1
-msgid "hexagons game"
-msgstr "Jeu Hexagons"
+#: ../menu-data/xmpuzzles:xmdino.desktop.in.h:2
+#: ../menu-data/xpuzzles:xdino.desktop.in.h:2
+msgid "dino game"
+msgstr "Jeu dino"
 
-#: ../menu-data/xmpuzzles:xmhexagons.desktop.in.h:2
+#: ../menu-data/xmpuzzles:xmhexagons.desktop.in.h:1
 msgid "xmhexagons"
 msgstr "xmhexagons"
 
-#: ../menu-data/xmpuzzles:xmmball.desktop.in.h:1
-#: ../menu-data/xpuzzles:xmball.desktop.in.h:1
-msgid "mball game"
-msgstr "Jeu Mball"
+#: ../menu-data/xmpuzzles:xmhexagons.desktop.in.h:2
+#: ../menu-data/xpuzzles:xhexagons.desktop.in.h:2
+msgid "hexagons game"
+msgstr "Jeu Hexagons"
 
-#: ../menu-data/xmpuzzles:xmmball.desktop.in.h:2
+#: ../menu-data/xmpuzzles:xmmball.desktop.in.h:1
 msgid "xmmball"
 msgstr "xmmball"
 
-#: ../menu-data/xmpuzzles:xmmlink.desktop.in.h:1
-#: ../menu-data/xpuzzles:xmlink.desktop.in.h:1
-msgid "mlink game"
-msgstr "Jeu Mlink"
+#: ../menu-data/xmpuzzles:xmmball.desktop.in.h:2
+#: ../menu-data/xpuzzles:xmball.desktop.in.h:2
+msgid "mball game"
+msgstr "Jeu Mball"
 
-#: ../menu-data/xmpuzzles:xmmlink.desktop.in.h:2
+#: ../menu-data/xmpuzzles:xmmlink.desktop.in.h:1
 msgid "xmmlink"
 msgstr "xmmlink"
 
-#: ../menu-data/xmpuzzles:xmoct.desktop.in.h:1
-#: ../menu-data/xpuzzles:xoct.desktop.in.h:1
-msgid "oct game"
-msgstr "Jeu Oct"
+#: ../menu-data/xmpuzzles:xmmlink.desktop.in.h:2
+#: ../menu-data/xpuzzles:xmlink.desktop.in.h:2
+msgid "mlink game"
+msgstr "Jeu Mlink"
 
-#: ../menu-data/xmpuzzles:xmoct.desktop.in.h:2
+#: ../menu-data/xmpuzzles:xmoct.desktop.in.h:1
 msgid "xmoct"
 msgstr "xmoct"
 
-#: ../menu-data/xmpuzzles:xmpanex.desktop.in.h:1
-#: ../menu-data/xpuzzles:xpanex.desktop.in.h:1
-msgid "panex game"
-msgstr "Jeu Panex"
+#: ../menu-data/xmpuzzles:xmoct.desktop.in.h:2
+#: ../menu-data/xpuzzles:xoct.desktop.in.h:2
+msgid "oct game"
+msgstr "Jeu Oct"
 
-#: ../menu-data/xmpuzzles:xmpanex.desktop.in.h:2
+#: ../menu-data/xmpuzzles:xmpanex.desktop.in.h:1
 msgid "xmpanex"
 msgstr "xmpanex"
 
-#: ../menu-data/xmpuzzles:xmpyraminx.desktop.in.h:1
-#: ../menu-data/xpuzzles:xpyraminx.desktop.in.h:1
-msgid "pyraminx game"
-msgstr "Jeu Pyraminx"
+#: ../menu-data/xmpuzzles:xmpanex.desktop.in.h:2
+#: ../menu-data/xpuzzles:xpanex.desktop.in.h:2
+msgid "panex game"
+msgstr "Jeu Panex"
 
-#: ../menu-data/xmpuzzles:xmpyraminx.desktop.in.h:2
+#: ../menu-data/xmpuzzles:xmpyraminx.desktop.in.h:1
 msgid "xmpyraminx"
 msgstr "xmpyraminx"
 
-#: ../menu-data/xmpuzzles:xmrubik.desktop.in.h:1
-#: ../menu-data/xpuzzles:xrubik.desktop.in.h:1
-msgid "rubik game"
-msgstr "Jeu Rubik"
+#: ../menu-data/xmpuzzles:xmpyraminx.desktop.in.h:2
+#: ../menu-data/xpuzzles:xpyraminx.desktop.in.h:2
+msgid "pyraminx game"
+msgstr "Jeu Pyraminx"
 
-#: ../menu-data/xmpuzzles:xmrubik.desktop.in.h:2
+#: ../menu-data/xmpuzzles:xmrubik.desktop.in.h:1
 msgid "xmrubik"
 msgstr "xmrubik"
 
-#: ../menu-data/xmpuzzles:xmskewb.desktop.in.h:1
-#: ../menu-data/xpuzzles:xskewb.desktop.in.h:1
-msgid "skewb game"
-msgstr "Jeu Skewb"
+#: ../menu-data/xmpuzzles:xmrubik.desktop.in.h:2
+#: ../menu-data/xpuzzles:xrubik.desktop.in.h:2
+msgid "rubik game"
+msgstr "Jeu Rubik"
 
-#: ../menu-data/xmpuzzles:xmskewb.desktop.in.h:2
+#: ../menu-data/xmpuzzles:xmskewb.desktop.in.h:1
 msgid "xmskewb"
 msgstr "xmskewb"
 
-#: ../menu-data/xmpuzzles:xmtriangles.desktop.in.h:1
-#: ../menu-data/xpuzzles:xtriangles.desktop.in.h:1
-msgid "triangles game"
-msgstr "Jeu de triangles"
+#: ../menu-data/xmpuzzles:xmskewb.desktop.in.h:2
+#: ../menu-data/xpuzzles:xskewb.desktop.in.h:2
+msgid "skewb game"
+msgstr "Jeu Skewb"
 
-#: ../menu-data/xmpuzzles:xmtriangles.desktop.in.h:2
+#: ../menu-data/xmpuzzles:xmtriangles.desktop.in.h:1
 msgid "xmtriangles"
 msgstr "xmtriangles"
 
-#: ../menu-data/xnetcardconfig:xfld-xnetcardconfig.desktop.in.h:1
-msgid "Configure network card"
-msgstr "Permet de configurer une carte réseau"
+#: ../menu-data/xmpuzzles:xmtriangles.desktop.in.h:2
+#: ../menu-data/xpuzzles:xtriangles.desktop.in.h:2
+msgid "triangles game"
+msgstr "Jeu de triangles"
 
-#: ../menu-data/xnetcardconfig:xfld-xnetcardconfig.desktop.in.h:2
+#: ../menu-data/xnetcardconfig:xfld-xnetcardconfig.desktop.in.h:1
 msgid "xnetcardconfig"
 msgstr "xnetcardconfig"
 
-#: ../menu-data/xoids:xoids.desktop.in.h:1
-msgid "Pilot a spaceship and destroy asteroids and UFOs"
-msgstr "Pilotez un vaisseau et détruisez des astéroïdes et des OVNIs"
-
-#: ../menu-data/xoids:xoids.desktop.in.h:2
-msgid "Xoids"
-msgstr "Xoids"
+#: ../menu-data/xnetcardconfig:xfld-xnetcardconfig.desktop.in.h:2
+msgid "Configure network card"
+msgstr "Permet de configurer une carte réseau"
 
 #: ../menu-data/xoo:xoo.desktop.in.h:1
-msgid "Handheld Device Simulator"
-msgstr "Simulateur de périphérique mobile"
-
-#: ../menu-data/xoo:xoo.desktop.in.h:2
 msgid "Xoo"
 msgstr "Xoo"
 
+#: ../menu-data/xoo:xoo.desktop.in.h:2
+msgid "Handheld Device Simulator"
+msgstr "Simulateur de périphérique mobile"
+
 #: ../menu-data/xoscope:xoscope.desktop.in.h:1
 msgid "Xoscope"
 msgstr "Xoscope"
@@ -19252,29 +19494,29 @@
 msgstr "Oscilloscope numérique"
 
 #: ../menu-data/xosview:xosview.desktop.in.h:1
-msgid "X based system monitor"
-msgstr "Moniteur système basé sur X"
-
-#: ../menu-data/xosview:xosview.desktop.in.h:2
 msgid "Xosview"
 msgstr "Xosview"
 
-#: ../menu-data/xournal:xournal.desktop.in.h:1
-msgid "Take handwritten notes"
-msgstr "Prendre des notes à la main"
+#: ../menu-data/xosview:xosview.desktop.in.h:2
+msgid "X based system monitor"
+msgstr "Moniteur système basé sur X"
 
-#: ../menu-data/xournal:xournal.desktop.in.h:2
+#: ../menu-data/xournal:xournal.desktop.in.h:1
 msgid "Xournal"
 msgstr "Xournal"
 
-#: ../menu-data/xpad:xpad.desktop.in.h:1
-msgid "Jot down notes for later"
-msgstr "Prendre des notes pour plus tard"
+#: ../menu-data/xournal:xournal.desktop.in.h:2
+msgid "Take handwritten notes"
+msgstr "Prendre des notes à la main"
 
-#: ../menu-data/xpad:xpad.desktop.in.h:2
+#: ../menu-data/xpad:xpad.desktop.in.h:1
 msgid "Xpad"
 msgstr "Xpad"
 
+#: ../menu-data/xpad:xpad.desktop.in.h:2
+msgid "Jot down notes for later"
+msgstr "Prendre des notes pour plus tard"
+
 #: ../menu-data/xpaint:xpaint.desktop.in.h:1
 msgid "XPaint"
 msgstr "XPaint"
@@ -19284,74 +19526,78 @@
 msgstr "Application de dessin Xpaint"
 
 #: ../menu-data/xpdf:xpdf.desktop.in.h:1
-msgid "View PDF files"
-msgstr "Permet d'afficher des fichiers PDF"
-
-#: ../menu-data/xpdf:xpdf.desktop.in.h:2
 msgid "xpdf"
 msgstr "xpdf"
 
-#: ../menu-data/xpn:xpn.desktop.in.h:2
+#: ../menu-data/xpdf:xpdf.desktop.in.h:2
+msgid "View PDF files"
+msgstr "Permet d'afficher des fichiers PDF"
+
+#: ../menu-data/xpn:xpn.desktop.in.h:1
 msgid "Xpn Newsreader"
 msgstr "Lecteur de nouvelles Xpn"
 
-#: ../menu-data/xpuzzles:xbarrel.desktop.in.h:2
+#: ../menu-data/xpuzzles:xbarrel.desktop.in.h:1
 msgid "xbarrel"
 msgstr "xbarrel"
 
-#: ../menu-data/xpuzzles:xcubes.desktop.in.h:2
+#: ../menu-data/xpuzzles:xcubes.desktop.in.h:1
 msgid "xcubes"
 msgstr "xcubes"
 
-#: ../menu-data/xpuzzles:xdino.desktop.in.h:2
+#: ../menu-data/xpuzzles:xdino.desktop.in.h:1
 msgid "xdino"
 msgstr "xdino"
 
-#: ../menu-data/xpuzzles:xhexagons.desktop.in.h:2
+#: ../menu-data/xpuzzles:xhexagons.desktop.in.h:1
 msgid "xhexagons"
 msgstr "xhexagons"
 
-#: ../menu-data/xpuzzles:xmball.desktop.in.h:2
+#: ../menu-data/xpuzzles:xmball.desktop.in.h:1
 msgid "xmball"
 msgstr "xmball"
 
-#: ../menu-data/xpuzzles:xmlink.desktop.in.h:2
+#: ../menu-data/xpuzzles:xmlink.desktop.in.h:1
 msgid "xmlink"
 msgstr "xmlink"
 
-#: ../menu-data/xpuzzles:xoct.desktop.in.h:2
+#: ../menu-data/xpuzzles:xoct.desktop.in.h:1
 msgid "xoct"
 msgstr "xoct"
 
-#: ../menu-data/xpuzzles:xpanex.desktop.in.h:2
+#: ../menu-data/xpuzzles:xpanex.desktop.in.h:1
 msgid "xpanex"
 msgstr "xpanex"
 
-#: ../menu-data/xpuzzles:xpyraminx.desktop.in.h:2
+#: ../menu-data/xpuzzles:xpyraminx.desktop.in.h:1
 msgid "xpyraminx"
 msgstr "xpyraminx"
 
-#: ../menu-data/xpuzzles:xrubik.desktop.in.h:2
+#: ../menu-data/xpuzzles:xrubik.desktop.in.h:1
 msgid "xrubik"
 msgstr "xrubik"
 
-#: ../menu-data/xpuzzles:xskewb.desktop.in.h:2
+#: ../menu-data/xpuzzles:xskewb.desktop.in.h:1
 msgid "xskewb"
 msgstr "xskewb"
 
-#: ../menu-data/xpuzzles:xtriangles.desktop.in.h:2
+#: ../menu-data/xpuzzles:xtriangles.desktop.in.h:1
 msgid "xtriangles"
 msgstr "xtriangles"
 
 #: ../menu-data/xqf:xqf.desktop.in.h:1
-msgid "Locate and connect to game servers"
-msgstr "Localiser et se connecter à des serveurs de jeu"
-
-#: ../menu-data/xqf:xqf.desktop.in.h:2
 msgid "XQF Game Server Browser"
 msgstr "Navigateur de serveur de jeu XQF"
 
+#: ../menu-data/xqf:xqf.desktop.in.h:2
+msgid "Locate and connect to game servers"
+msgstr "Localiser et se connecter à des serveurs de jeu"
+
 #: ../menu-data/xsane:xsane.desktop.in.h:1
+msgid "XSane Image scanning program"
+msgstr "Logiciel de numérisation d'images XSane"
+
+#: ../menu-data/xsane:xsane.desktop.in.h:2
 msgid ""
 "A program to work with scanner. Can be used as a scanning, copier, OCR, fax "
 "tools."
@@ -19359,50 +19605,46 @@
 "Une application pour les scanners. Elle peut être utilisée pour numériser, "
 "photocopier, faire de la reconnaissance de caractères ou faxer."
 
-#: ../menu-data/xsane:xsane.desktop.in.h:2
-msgid "XSane Image scanning program"
-msgstr "Logiciel de numérisation d'images XSane"
-
 #: ../menu-data/xscavenger:xscavenger.desktop.in.h:1
-msgid "X11 clone of Lode Runner"
-msgstr "Clone X11 de Lode Runner"
-
-#: ../menu-data/xscavenger:xscavenger.desktop.in.h:2
 msgid "XScavenger"
 msgstr "XScavenger"
 
-#: ../menu-data/xscorch:xscorch.desktop.in.h:1
-msgid "Clone of Scorched Earth"
-msgstr "Clone de Scorched Earth"
+#: ../menu-data/xscavenger:xscavenger.desktop.in.h:2
+msgid "X11 clone of Lode Runner"
+msgstr "Clone X11 de Lode Runner"
 
-#: ../menu-data/xscorch:xscorch.desktop.in.h:2
+#: ../menu-data/xscorch:xscorch.desktop.in.h:1
 msgid "Xscorch"
 msgstr "Xscorch"
 
+#: ../menu-data/xscorch:xscorch.desktop.in.h:2
+msgid "Clone of Scorched Earth"
+msgstr "Clone de Scorched Earth"
+
 #: ../menu-data/xsddiagram:xsddiagram.desktop.in.h:1
-msgid "XML Schema Definition (XSD) diagram viewer"
-msgstr "Afficheur de schémas XSD (XML Schema Definition)"
-
-#: ../menu-data/xsddiagram:xsddiagram.desktop.in.h:2
 msgid "XSD Diagram"
 msgstr "Schémas XSD"
 
-#: ../menu-data/xsensors:xsensors.desktop.in.h:1
-msgid "View hardware health"
-msgstr "Afficher des données sur le matériel (températures, tensions, etc.)"
+#: ../menu-data/xsddiagram:xsddiagram.desktop.in.h:2
+msgid "XML Schema Definition (XSD) diagram viewer"
+msgstr "Afficheur de schémas XSD (XML Schema Definition)"
 
-#: ../menu-data/xsensors:xsensors.desktop.in.h:2
+#: ../menu-data/xsensors:xsensors.desktop.in.h:1
 msgid "XSensors"
 msgstr "XSensors"
 
-#: ../menu-data/xshogi:xshogi.desktop.in.h:1
-msgid "Play Shogi Game"
-msgstr "Jouer à Shogi"
+#: ../menu-data/xsensors:xsensors.desktop.in.h:2
+msgid "View hardware health"
+msgstr "Afficher des données sur le matériel (températures, tensions, etc.)"
 
-#: ../menu-data/xshogi:xshogi.desktop.in.h:2
+#: ../menu-data/xshogi:xshogi.desktop.in.h:1
 msgid "Xshogi"
 msgstr "Xshogi"
 
+#: ../menu-data/xshogi:xshogi.desktop.in.h:2
+msgid "Play Shogi Game"
+msgstr "Jouer à Shogi"
+
 #: ../menu-data/xsol:xsol.desktop.in.h:1
 msgid "Klondike Solitaire"
 msgstr "Solitaire Klondike"
@@ -19420,66 +19662,58 @@
 msgstr "Emulateur standard de terminal pour le système de fenêtres X"
 
 #: ../menu-data/xtide:xtide.desktop.in.h:1
-msgid "View tide and current predictions"
-msgstr "Voir la marée et les dernières prévisions"
-
-#: ../menu-data/xtide:xtide.desktop.in.h:2
 msgid "XTide Tide Predictor"
 msgstr "XTide Tide Predictor"
 
-#: ../menu-data/xvattr:xvattr.desktop.in.h:1
-msgid "XVideo Settings Utility"
-msgstr "Outil de configuration XVideo"
+#: ../menu-data/xtide:xtide.desktop.in.h:2
+msgid "View tide and current predictions"
+msgstr "Voir la marée et les dernières prévisions"
 
-#: ../menu-data/xvattr:xvattr.desktop.in.h:2
+#: ../menu-data/xvattr:xvattr.desktop.in.h:1
 msgid "gxvattr"
 msgstr "gxvattr"
 
-#: ../menu-data/xvidcap:xvidcap.desktop.in.h:1
-msgid "X11 Screencam"
-msgstr "X11 Screencam"
-
-#: ../menu-data/xvidcap:xvidcap.desktop.in.h:2
-msgid "XVidCap Screen Capture"
-msgstr "Capture d'écran avec XVidCap"
+#: ../menu-data/xvattr:xvattr.desktop.in.h:2
+msgid "XVideo Settings Utility"
+msgstr "Outil de configuration XVideo"
 
 #: ../menu-data/xvile:uxvile.desktop.in.h:1
 msgid "UXVile"
 msgstr "UXVile"
 
 #: ../menu-data/xvile:uxvile.desktop.in.h:2
-#: ../menu-data/xvile:xvile.desktop.in.h:1
+#: ../menu-data/xvile:xvile.desktop.in.h:2
 msgid "VI Like Emacs"
 msgstr "VI Like Emacs"
 
-#: ../menu-data/xvile:xvile.desktop.in.h:2
+#: ../menu-data/xvile:xvile.desktop.in.h:1
 msgid "XVile"
 msgstr "XVile"
 
 #: ../menu-data/xwelltris:xwelltris.desktop.in.h:1
-msgid "Play a 3D Tetris like game"
-msgstr "Jouer à un jeu en 3D de type Tetris"
-
-#: ../menu-data/xwelltris:xwelltris.desktop.in.h:2
 msgid "XWelltris"
 msgstr "XWelltris"
 
-#: ../menu-data/xword:xword.desktop.in.h:1
-msgid "Do crossword puzzles"
-msgstr "Faire des mots croisés"
+#: ../menu-data/xwelltris:xwelltris.desktop.in.h:2
+msgid "Play a 3D Tetris like game"
+msgstr "Jouer à un jeu en 3D de type Tetris"
 
-#: ../menu-data/xword:xword.desktop.in.h:2
+#: ../menu-data/xword:xword.desktop.in.h:1
 msgid "Xword"
 msgstr "Xword"
 
-#: ../menu-data/xxxterm:xxxterm.desktop.in.h:1
-msgid "Minimalist's Web Browser"
-msgstr "Navigateur Web Minimaliste"
+#: ../menu-data/xword:xword.desktop.in.h:2
+msgid "Do crossword puzzles"
+msgstr "Faire des mots croisés"
 
-#: ../menu-data/xxxterm:xxxterm.desktop.in.h:2
+#: ../menu-data/xxxterm:xxxterm.desktop.in.h:1
 msgid "xxxterm Browser"
 msgstr "Navigateur xxxterm"
 
+#: ../menu-data/xxxterm:xxxterm.desktop.in.h:2
+msgid "Minimalist's Web Browser"
+msgstr "Navigateur Web Minimaliste"
+
 #: ../menu-data/xyscan:xyscan.desktop.in.h:1
 msgid "XYscan"
 msgstr "XYscan"
@@ -19489,15 +19723,15 @@
 msgstr "Récolter des données à partir de points imprimés"
 
 #: ../menu-data/yabause-gtk:yabause-gtk.desktop.in.h:1
-#: ../menu-data/yabause-qt:yabause-qt.desktop.in.h:1
-msgid "Sega Saturn emulator"
-msgstr "Émulateur de Sega Saturn"
-
-#: ../menu-data/yabause-gtk:yabause-gtk.desktop.in.h:2
 msgid "Yabause (Gtk port)"
 msgstr "Yabause (portage Gtk)"
 
+#: ../menu-data/yabause-gtk:yabause-gtk.desktop.in.h:2
 #: ../menu-data/yabause-qt:yabause-qt.desktop.in.h:2
+msgid "Sega Saturn emulator"
+msgstr "Émulateur de Sega Saturn"
+
+#: ../menu-data/yabause-qt:yabause-qt.desktop.in.h:1
 msgid "Yabause (Qt port)"
 msgstr "Yabause (portage Qt)"
 
@@ -19506,21 +19740,21 @@
 msgstr "Yade"
 
 #: ../menu-data/yahtzeesharp:YahtzeeSharp.desktop.in.h:1
-msgid "An open source Yahtzee like game written in C#"
-msgstr "Un jeu de type YAMS écrit en C#"
-
-#: ../menu-data/yahtzeesharp:YahtzeeSharp.desktop.in.h:2
 msgid "YahtzeeSharp"
 msgstr "YahtzeeSharp"
 
-#: ../menu-data/yakuake:kde4__yakuake.desktop.in.h:1
-msgid "A drop-down terminal emulator based on KDE Konsole technology."
-msgstr "Un émulateur de terminal déroulant fondé sur Konsole."
+#: ../menu-data/yahtzeesharp:YahtzeeSharp.desktop.in.h:2
+msgid "An open source Yahtzee like game written in C#"
+msgstr "Un jeu de type YAMS écrit en C#"
 
-#: ../menu-data/yakuake:kde4__yakuake.desktop.in.h:2
+#: ../menu-data/yakuake:kde4__yakuake.desktop.in.h:1
 msgid "Yakuake"
 msgstr "Yakuake"
 
+#: ../menu-data/yakuake:kde4__yakuake.desktop.in.h:2
+msgid "A drop-down terminal emulator based on KDE Konsole technology."
+msgstr "Un émulateur de terminal déroulant fondé sur Konsole."
+
 #: ../menu-data/yapet:yapet.desktop.in.h:1
 msgid "YAPET"
 msgstr "YAPET"
@@ -19530,45 +19764,45 @@
 msgstr "Un outil de chiffrement des mots de passe"
 
 #: ../menu-data/yarssr:yarssr.desktop.in.h:1
-msgid "RSS reader for the notification area"
-msgstr "Lecteur RSS pour la zone de notification"
-
-#: ../menu-data/yarssr:yarssr.desktop.in.h:2
 msgid "Yarssr"
 msgstr "Yarssr"
 
-#: ../menu-data/yate-qt4:yate-qt4.desktop.in.h:1
-msgid "Place phone calls over the Internet"
-msgstr "Passer des appels téléphoniques par Internet"
+#: ../menu-data/yarssr:yarssr.desktop.in.h:2
+msgid "RSS reader for the notification area"
+msgstr "Lecteur RSS pour la zone de notification"
 
-#: ../menu-data/yate-qt4:yate-qt4.desktop.in.h:2
+#: ../menu-data/yate-qt4:yate-qt4.desktop.in.h:1
 msgid "Yate VoIP Client"
 msgstr "Client VoIP Yate"
 
-#: ../menu-data/yelp:yelp.desktop.in.h:1
-msgid "Get help with Unity"
-msgstr "Obtenir de l'aide concernant Unity"
+#: ../menu-data/yate-qt4:yate-qt4.desktop.in.h:2
+msgid "Place phone calls over the Internet"
+msgstr "Passer des appels téléphoniques par Internet"
 
-#: ../menu-data/yelp:yelp.desktop.in.h:2
+#: ../menu-data/yelp:yelp.desktop.in.h:1
 msgid "Help"
 msgstr "Aide"
 
-#: ../menu-data/ygraph:ygraph.desktop.in.h:1
-msgid "Produce simple xy-plots of scientific data"
-msgstr "Produire des graphiques xy simples à partir de données scientifiques"
+#: ../menu-data/yelp:yelp.desktop.in.h:2
+msgid "Get help with Unity"
+msgstr "Obtenir de l'aide concernant Unity"
 
-#: ../menu-data/ygraph:ygraph.desktop.in.h:2
+#: ../menu-data/ygraph:ygraph.desktop.in.h:1
 msgid "ygraph Scientific Data Plotter"
 msgstr "Générateur de graphiques scientifiques ygraph"
 
-#: ../menu-data/yofrankie:yofrankie-bge.desktop.in.h:1
-msgid "A 3D platform game"
-msgstr "Un jeu de plateforme en 3D"
+#: ../menu-data/ygraph:ygraph.desktop.in.h:2
+msgid "Produce simple xy-plots of scientific data"
+msgstr "Produire des graphiques xy simples à partir de données scientifiques"
 
-#: ../menu-data/yofrankie:yofrankie-bge.desktop.in.h:2
+#: ../menu-data/yofrankie:yofrankie-bge.desktop.in.h:1
 msgid "Yo Frankie!"
 msgstr "Yo Frankie!"
 
+#: ../menu-data/yofrankie:yofrankie-bge.desktop.in.h:2
+msgid "A 3D platform game"
+msgstr "Un jeu de plateforme en 3D"
+
 #: ../menu-data/yorick-cubeview:cubeview.desktop.in.h:1
 msgid "3D FITS data viewer for spectro-imaging"
 msgstr "Afficheur 3D pour des données d'imagerie spectrale au format FITS"
@@ -19586,13 +19820,13 @@
 msgstr "Spydr"
 
 #: ../menu-data/yoshimi:yoshimi.desktop.in.h:1
-msgid "Software Synthesizer based on ZynAddSubFX"
-msgstr "Synthétiseur logiciel fondé sur ZynAddSubFX"
-
-#: ../menu-data/yoshimi:yoshimi.desktop.in.h:2
 msgid "Yoshimi"
 msgstr "Yoshimi"
 
+#: ../menu-data/yoshimi:yoshimi.desktop.in.h:2
+msgid "Software Synthesizer based on ZynAddSubFX"
+msgstr "Synthétiseur logiciel fondé sur ZynAddSubFX"
+
 #: ../menu-data/youtranslate:youtranslate.desktop.in.h:1
 msgid "Online Translator YouTranslate!"
 msgstr "Traducteur en ligne YouTranslate !"
@@ -19602,45 +19836,45 @@
 msgstr "Traduisez des mots ou des phrases avec un traducteur en ligne"
 
 #: ../menu-data/z88:z88.desktop.in.h:1
-msgid " Finite Element Analysis Program"
-msgstr " Programme d'analyse par éléments finis"
-
-#: ../menu-data/z88:z88.desktop.in.h:2
 msgid "Z88"
 msgstr "Z88"
 
-#: ../menu-data/zanshin:kde4__zanshin.desktop.in.h:1
-msgid "TODO Management Application"
-msgstr "Application de gestion de listes de tâches"
+#: ../menu-data/z88:z88.desktop.in.h:2
+msgid " Finite Element Analysis Program"
+msgstr " Programme d'analyse par éléments finis"
 
-#: ../menu-data/zanshin:kde4__zanshin.desktop.in.h:2
+#: ../menu-data/zanshin:kde4__zanshin.desktop.in.h:1
 msgid "Zanshin"
 msgstr "Zanshin"
 
-#: ../menu-data/zapping:zapping.desktop.in.h:1
-msgid "Lets you watch TV in a window"
-msgstr "Permet de regarder la télévision dans une fenêtre"
+#: ../menu-data/zanshin:kde4__zanshin.desktop.in.h:2
+msgid "TODO Management Application"
+msgstr "Application de gestion de listes de tâches"
 
-#: ../menu-data/zapping:zapping.desktop.in.h:2
+#: ../menu-data/zapping:zapping.desktop.in.h:1
 msgid "Zapping TV Viewer"
 msgstr "Afficheur TV Zapping"
 
-#: ../menu-data/zatacka:zatacka.desktop.in.h:1
-msgid "Arcade multiplayer game for 2-6 players"
-msgstr "Jeu d'arcade pour 2 à 6 joueurs"
+#: ../menu-data/zapping:zapping.desktop.in.h:2
+msgid "Lets you watch TV in a window"
+msgstr "Permet de regarder la télévision dans une fenêtre"
 
-#: ../menu-data/zatacka:zatacka.desktop.in.h:2
+#: ../menu-data/zatacka:zatacka.desktop.in.h:1
 msgid "Zatacka"
 msgstr "Zatacka"
 
-#: ../menu-data/zathura:zathura.desktop.in.h:1
-msgid "A minimalistic PDF viewer"
-msgstr "Une visionneuse PDF minimaliste"
+#: ../menu-data/zatacka:zatacka.desktop.in.h:2
+msgid "Arcade multiplayer game for 2-6 players"
+msgstr "Jeu d'arcade pour 2 à 6 joueurs"
 
-#: ../menu-data/zathura:zathura.desktop.in.h:2
+#: ../menu-data/zathura:zathura.desktop.in.h:1
 msgid "Zathura"
 msgstr "Zathura"
 
+#: ../menu-data/zathura:zathura.desktop.in.h:2
+msgid "A minimalistic PDF viewer"
+msgstr "Une visionneuse PDF minimaliste"
+
 #: ../menu-data/zaz:zaz.desktop.in.h:1
 msgid "Zaz"
 msgstr "Zaz"
@@ -19650,45 +19884,53 @@
 msgstr "Zaz ain't Z***"
 
 #: ../menu-data/zekr:zekr.desktop.in.h:1
-msgid "Study The Quran"
-msgstr "Permet l'étude du Coran"
-
-#: ../menu-data/zekr:zekr.desktop.in.h:2
 msgid "Zekr "
 msgstr "Zekr "
 
-#: ../menu-data/zenmap:zenmap.desktop.in.h:1
-msgid "A cross-platform GUI for the Nmap Security Scanner."
-msgstr "Une interface graphique pour l'analyseur de sécurité Nmap"
+#: ../menu-data/zekr:zekr.desktop.in.h:2
+msgid "Study The Quran"
+msgstr "Permet l'étude du Coran"
 
-#: ../menu-data/zenmap:zenmap.desktop.in.h:2
+#: ../menu-data/zenmap:zenmap.desktop.in.h:1
 msgid "Zenmap"
 msgstr "Zenmap"
 
-#: ../menu-data/zhone:zhone.desktop.in.h:1
-msgid "Feature Phone UI"
-msgstr "Interface utilisateur de démonstration téléphone portable"
+#: ../menu-data/zenmap:zenmap.desktop.in.h:2
+msgid "A cross-platform GUI for the Nmap Security Scanner."
+msgstr "Une interface graphique pour l'analyseur de sécurité Nmap"
 
-#: ../menu-data/zhone:zhone.desktop.in.h:2
+#: ../menu-data/zhone:zhone.desktop.in.h:1
 msgid "Zhone"
 msgstr "Zhone"
 
+#: ../menu-data/zhone:zhone.desktop.in.h:2
+msgid "Feature Phone UI"
+msgstr "Interface utilisateur de démonstration téléphone portable"
+
 #: ../menu-data/zim:zim.desktop.in.h:1
+msgid "Zim Desktop Wiki"
+msgstr "Wiki de bureau Zim"
+
+#: ../menu-data/zim:zim.desktop.in.h:2
 msgid "Edit text files \"wiki style\""
 msgstr "Modifier les fichiers textes « à la façon wiki »"
 
-#: ../menu-data/zim:zim.desktop.in.h:2
-msgid "Zim Desktop Wiki"
-msgstr "Wiki de bureau Zim"
+#: ../menu-data/zim:zim.desktop.in.h:3
+msgid "Quick Note"
+msgstr ""
 
-#: ../menu-data/zipper.app:Zipper.desktop.in.h:1
-msgid "GUI for various compressed file formats"
-msgstr "Interface graphique pour de nombreux formats compressés"
+#: ../menu-data/zim:zim.desktop.in.h:4
+msgid "Quick Note from Clipboard"
+msgstr ""
 
-#: ../menu-data/zipper.app:Zipper.desktop.in.h:2
+#: ../menu-data/zipper.app:Zipper.desktop.in.h:1
 msgid "Zipper"
 msgstr "Zipper"
 
+#: ../menu-data/zipper.app:Zipper.desktop.in.h:2
+msgid "GUI for various compressed file formats"
+msgstr "Interface graphique pour de nombreux formats compressés"
+
 #: ../menu-data/zita-at1:zita-at1.desktop.in.h:1
 msgid "AT1"
 msgstr "AT1"
@@ -19706,37 +19948,37 @@
 msgstr "Réverbération étonnante par kokkinizita - plus de bang par octet"
 
 #: ../menu-data/zsnes:zsnes.desktop.in.h:1
-msgid "Play Super Nintendo (SNES) games"
-msgstr "Jouer à des jeux Super Nintendo (SNES)"
-
-#: ../menu-data/zsnes:zsnes.desktop.in.h:2
 msgid "ZSNES Emulator"
 msgstr "Émulateur ZSNES"
 
-#: ../menu-data/zygrib:zygrib.desktop.in.h:1
-msgid "Multi-protocol Messaging Client"
-msgstr "Client de messagerie multi-protocoles"
+#: ../menu-data/zsnes:zsnes.desktop.in.h:2
+msgid "Play Super Nintendo (SNES) games"
+msgstr "Jouer à des jeux Super Nintendo (SNES)"
 
-#: ../menu-data/zygrib:zygrib.desktop.in.h:2
+#: ../menu-data/zygrib:zygrib.desktop.in.h:1
 msgid "zyGrib GRIB file viewer"
 msgstr "Afficheur de données météorologiques au format zyGrib GRIB"
 
+#: ../menu-data/zygrib:zygrib.desktop.in.h:2
+msgid "Multi-protocol Messaging Client"
+msgstr "Client de messagerie multi-protocoles"
+
 #: ../menu-data/zynaddsubfx:zynaddsubfx.desktop.in.h:1
 msgid "ZynAddSubFX Software Synthesizer"
 msgstr "Synthétiseur logiciel ZynAddSubFX"
 
 #: ../menu-data/zynjacku:lv2rack.desktop.in.h:1
-msgid "LV2 plugins host for JACK"
-msgstr "Hébergement de greffons LV2 pour JACK"
-
-#: ../menu-data/zynjacku:lv2rack.desktop.in.h:2
 msgid "Lv2rack"
 msgstr "Lv2rack"
 
-#: ../menu-data/zynjacku:zynjacku.desktop.in.h:1
-msgid "LV2 synths host for JACK"
-msgstr "Synthétiseurs LV2 pour JACK"
+#: ../menu-data/zynjacku:lv2rack.desktop.in.h:2
+msgid "LV2 plugins host for JACK"
+msgstr "Hébergement de greffons LV2 pour JACK"
 
-#: ../menu-data/zynjacku:zynjacku.desktop.in.h:2
+#: ../menu-data/zynjacku:zynjacku.desktop.in.h:1
 msgid "Zynjacku"
 msgstr "Zynjacku"
+
+#: ../menu-data/zynjacku:zynjacku.desktop.in.h:2
+msgid "LV2 synths host for JACK"
+msgstr "Synthétiseurs LV2 pour JACK"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/apport.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/apport.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/apport.po	2012-01-02 17:27:19.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/apport.po	2012-02-23 06:31:43.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: apport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-24 15:39+0000\n"
-"PO-Revision-Date: 2011-12-17 09:08+0000\n"
+"POT-Creation-Date: 2012-02-20 16:20+0000\n"
+"PO-Revision-Date: 2012-01-03 12:34+0000\n"
 "Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:36+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:38+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: ../apport/ui.py:92
@@ -46,21 +46,44 @@
 "\n"
 "%s"
 
-#: ../apport/ui.py:213
+#. package does not exist
+#: ../apport/ui.py:193 ../apport/ui.py:200 ../apport/ui.py:206
+#: ../apport/ui.py:285 ../apport/ui.py:293 ../apport/ui.py:364
+#: ../apport/ui.py:367 ../apport/ui.py:565 ../apport/ui.py:898
+#: ../apport/ui.py:1033 ../apport/ui.py:1037 ../apport/ui.py:1056
+#: ../apport/ui.py:1062 ../apport/ui.py:1615 ../apport/ui.py:1632
+#: ../apport/ui.py:2254 ../apport/ui.py:2273 ../apport/ui.py:2284
+#: ../apport/ui.py:2295
+msgid "Invalid problem report"
+msgstr "Rapport d'anomalie invalide"
+
+#: ../apport/ui.py:195 ../apport/ui.py:1039
+msgid "This problem report is damaged and cannot be processed."
+msgstr "Ce rapport d'anomalie est endommagé et ne peut pas être traité."
+
+#: ../apport/ui.py:201
+msgid "The report belongs to a package that is not installed."
+msgstr "Le rapport fait référence à un paquet non installé."
+
+#: ../apport/ui.py:207
+msgid "An error occurred while attempting to process this problem report."
+msgstr ""
+
+#: ../apport/ui.py:246
 msgid "unknown program"
 msgstr "programme inconnu"
 
-#: ../apport/ui.py:214 ../gtk/apport-gtk.py:81
+#: ../apport/ui.py:247
 #, python-format
 msgid "Sorry, the program \"%s\" closed unexpectedly"
 msgstr "Désolé, le programme « %s » a quitté de façon inattendue"
 
-#: ../apport/ui.py:215 ../apport/ui.py:1105
+#: ../apport/ui.py:248 ../apport/ui.py:1077
 #, python-format
 msgid "Problem in %s"
 msgstr "Problème dans %s"
 
-#: ../apport/ui.py:216
+#: ../apport/ui.py:249
 msgid ""
 "Your computer does not have enough free memory to automatically analyze the "
 "problem and send a report to the developers."
@@ -68,62 +91,43 @@
 "Votre ordinateur ne possède pas suffisamment de mémoire libre pour analyser "
 "automatiquement le problème et envoyer un rapport aux développeurs."
 
-#. package does not exist
-#: ../apport/ui.py:243 ../apport/ui.py:269 ../apport/ui.py:275
-#: ../apport/ui.py:305 ../apport/ui.py:313 ../apport/ui.py:384
-#: ../apport/ui.py:387 ../apport/ui.py:583 ../apport/ui.py:926
-#: ../apport/ui.py:1061 ../apport/ui.py:1065 ../apport/ui.py:1084
-#: ../apport/ui.py:1090 ../apport/ui.py:1702 ../apport/ui.py:1719
-#: ../apport/ui.py:2334 ../apport/ui.py:2350 ../apport/ui.py:2361
-#: ../apport/ui.py:2372
-msgid "Invalid problem report"
-msgstr "Rapport d'anomalie invalide"
-
-#: ../apport/ui.py:244 ../apport/ui.py:276
-msgid "The report belongs to a package that is not installed."
-msgstr "Le rapport fait référence à un paquet non installé."
-
-#: ../apport/ui.py:271 ../apport/ui.py:1067
-msgid "This problem report is damaged and cannot be processed."
-msgstr "Ce rapport d'anomalie est endommagé et ne peut pas être traité."
-
-#: ../apport/ui.py:306
+#: ../apport/ui.py:286
 msgid "You are not allowed to access this problem report."
 msgstr "Vous n'êtes pas autorisé à accéder à ce rapport d'anomalie."
 
-#: ../apport/ui.py:309
+#: ../apport/ui.py:289
 msgid "Error"
 msgstr "Erreur"
 
-#: ../apport/ui.py:310
+#: ../apport/ui.py:290
 msgid "There is not enough disk space available to process this report."
 msgstr ""
 "Il n'y a pas assez d'espace disque disponible pour traiter ce rapport."
 
-#: ../apport/ui.py:337
+#: ../apport/ui.py:317
 msgid "No package specified"
 msgstr "Aucun paquet spécifié"
 
-#: ../apport/ui.py:338
+#: ../apport/ui.py:318
 msgid ""
 "You need to specify a package or a PID. See --help for more information."
 msgstr ""
 "Vous devez préciser un paquet ou un PID. Utilisez --help pour plus "
 "d'informations."
 
-#: ../apport/ui.py:354
+#: ../apport/ui.py:334
 msgid "Invalid PID"
 msgstr "PID invalide"
 
-#: ../apport/ui.py:355
+#: ../apport/ui.py:335
 msgid "The specified process ID does not belong to a program."
 msgstr "L'ID de processus spécifié n'appartient à aucun programme."
 
-#: ../apport/ui.py:363
+#: ../apport/ui.py:343
 msgid "Permission denied"
 msgstr "Autorisation refusée"
 
-#: ../apport/ui.py:364
+#: ../apport/ui.py:344
 msgid ""
 "The specified process does not belong to you. Please run this program as the "
 "process owner or as root."
@@ -132,25 +136,25 @@
 "en tant que propriétaire du processus ou en tant que super-utilisateur "
 "(root)."
 
-#: ../apport/ui.py:385
+#: ../apport/ui.py:365
 #, python-format
 msgid "Symptom script %s did not determine an affected package"
 msgstr "Le script  %s n'a pas pu déterminer un paquet affecté"
 
-#: ../apport/ui.py:388
+#: ../apport/ui.py:368
 #, python-format
 msgid "Package %s does not exist"
 msgstr "Le paquet %s n'existe pas"
 
-#: ../apport/ui.py:413 ../apport/ui.py:595 ../apport/ui.py:600
+#: ../apport/ui.py:393 ../apport/ui.py:577 ../apport/ui.py:582
 msgid "Cannot create report"
 msgstr "Impossible de créer le rapport"
 
-#: ../apport/ui.py:427 ../apport/ui.py:473 ../apport/ui.py:490
+#: ../apport/ui.py:408 ../apport/ui.py:454 ../apport/ui.py:471
 msgid "Updating problem report"
 msgstr "Mise à jour du rapport d'anomalie"
 
-#: ../apport/ui.py:428
+#: ../apport/ui.py:409
 msgid ""
 "You are not the reporter or subscriber of this problem report, or the report "
 "is a duplicate or already closed.\n"
@@ -161,7 +165,7 @@
 "déjà fermé ou il s'agit d'un doublon.\n"
 "Veuillez créer  un nouveau rapport en utilisant « apport-bug »."
 
-#: ../apport/ui.py:437
+#: ../apport/ui.py:418
 msgid ""
 "You are not the reporter of this problem report. It is much easier to mark a "
 "bug as a duplicate of another than to move your comments and attachments to "
@@ -180,24 +184,24 @@
 "initial.  \n"
 "Voulez-vous vraiment continuer ?"
 
-#: ../apport/ui.py:474 ../apport/ui.py:491
+#: ../apport/ui.py:455 ../apport/ui.py:472
 msgid "No additional information collected."
 msgstr "Aucune information supplémentaire n'a été collectée."
 
-#: ../apport/ui.py:540
+#: ../apport/ui.py:522
 msgid "What kind of problem do you want to report?"
 msgstr "Quel type de problème voulez-vous signaler ?"
 
-#: ../apport/ui.py:557
+#: ../apport/ui.py:539
 msgid "Unknown symptom"
 msgstr "Symptôme inconnu"
 
-#: ../apport/ui.py:558
+#: ../apport/ui.py:540
 #, python-format
 msgid "The symptom \"%s\" is not known."
 msgstr "Le symptôme « %s » est inconnu."
 
-#: ../apport/ui.py:586
+#: ../apport/ui.py:568
 msgid ""
 "After closing this message please click on an application window to report a "
 "problem about it."
@@ -205,31 +209,31 @@
 "Après la fermeture de ce message, veuillez cliquer sur la fenêtre de "
 "l'application pour laquelle vous voulez signaler un problème."
 
-#: ../apport/ui.py:596 ../apport/ui.py:601
+#: ../apport/ui.py:578 ../apport/ui.py:583
 msgid "xprop failed to determine process ID of the window"
 msgstr "xprop n'a pas pu déterminer l'ID du processus de la fenêtre"
 
-#: ../apport/ui.py:615
+#: ../apport/ui.py:597
 msgid "%prog <report number>"
 msgstr "%prog <numéro du rapport>"
 
-#: ../apport/ui.py:617
+#: ../apport/ui.py:599
 msgid "Specify package name."
 msgstr "Veuillez indiquer le nom du paquet."
 
-#: ../apport/ui.py:619 ../apport/ui.py:668
+#: ../apport/ui.py:601 ../apport/ui.py:650
 msgid "Add an extra tag to the report. Can be specified multiple times."
 msgstr ""
 "Ajouter un marqueur supplémentaire pour le rapport. Peut être spécifié "
 "plusieurs fois."
 
-#: ../apport/ui.py:649
+#: ../apport/ui.py:631
 msgid ""
 "%prog [options] [symptom|pid|package|program path|.apport/.crash file]"
 msgstr ""
 "%prog [options] [symptom|pid|package|program path|.apport/.crash file]"
 
-#: ../apport/ui.py:652
+#: ../apport/ui.py:634
 msgid ""
 "Start in bug filing mode. Requires --package and an optional --pid, or just "
 "a --pid. If neither is given, display a list of known symptoms. (Implied if "
@@ -239,17 +243,17 @@
 "pid en option, ou simplement --pid. Si aucun n'est fournit, affiche une "
 "liste de symptômes connus. (Implicite si un seul argument est fournit.)"
 
-#: ../apport/ui.py:654
+#: ../apport/ui.py:636
 msgid "Click a window as a target for filing a problem report."
 msgstr ""
 "Cliquez sur la fenêtre pour laquelle vous voulez signaler un problème."
 
-#: ../apport/ui.py:656
+#: ../apport/ui.py:638
 msgid "Start in bug updating mode. Can take an optional --package."
 msgstr ""
 "Commencer en mode « mise à jour de bogue ». Accepte l'option --package"
 
-#: ../apport/ui.py:658
+#: ../apport/ui.py:640
 msgid ""
 "File a bug report about a symptom. (Implied if symptom name is given as only "
 "argument.)"
@@ -257,7 +261,7 @@
 "Effectue un rapport de bogue concernant un symptôme. (Implicite si le nom du "
 "symptôme est donné comme unique argument.)"
 
-#: ../apport/ui.py:660
+#: ../apport/ui.py:642
 msgid ""
 "Specify package name in --file-bug mode. This is optional if a --pid is "
 "specified. (Implied if package name is given as only argument.)"
@@ -266,7 +270,7 @@
 "pid est spécifié. (Implicite si le nom du paquet est donné comme unique "
 "argument.)"
 
-#: ../apport/ui.py:662
+#: ../apport/ui.py:644
 msgid ""
 "Specify a running program in --file-bug mode. If this is specified, the bug "
 "report will contain more information.  (Implied if pid is given as only "
@@ -276,7 +280,7 @@
 "spécifié le rapport de bogue contiendra davantage d'informations. (implicite "
 "si l’identifiant du processus est passé comme unique argument)"
 
-#: ../apport/ui.py:664
+#: ../apport/ui.py:646
 #, python-format
 msgid ""
 "Report the crash from given .apport or .crash file instead of the pending "
@@ -286,7 +290,7 @@
 "partir de ceux en attente dans %s. (Implicite si le fichier est donné comme "
 "unique argument.)"
 
-#: ../apport/ui.py:666
+#: ../apport/ui.py:648
 msgid ""
 "In bug filing mode, save the collected information into a file instead of "
 "reporting it. This file can then be reported later on from a different "
@@ -296,83 +300,83 @@
 "un fichier plutôt que de générer un rapport. Ce fichier pourra être utilisé "
 "plus tard à partir d'une autre machine pour envoyer un rapport."
 
-#: ../apport/ui.py:670
+#: ../apport/ui.py:652
 msgid "Print the Apport version number."
 msgstr "Affiche le numéro de version d'Apport."
 
-#: ../apport/ui.py:802
+#: ../apport/ui.py:784
 msgid ""
 "This will launch apport-retrace in a terminal window to examine the crash."
 msgstr ""
 "Cela va lancer apport-retrace dans une fenêtre de terminal pour examiner le "
 "crash."
 
-#: ../apport/ui.py:803
+#: ../apport/ui.py:785
 msgid "Run gdb session"
 msgstr "Lancer une session gdb"
 
-#: ../apport/ui.py:804
+#: ../apport/ui.py:786
 msgid "Run gdb session without downloading debug symbols"
 msgstr "Exécuter la session gdb sans télécharger les symboles de débogage"
 
 #. TRANSLATORS: %s contains the crash report file name
-#: ../apport/ui.py:806
+#: ../apport/ui.py:788
 #, python-format
 msgid "Update %s with fully symbolic stack trace"
-msgstr ""
+msgstr "Mise à jour de %s avec une trace de la pile totalement symbolique"
 
-#: ../apport/ui.py:844
+#: ../apport/ui.py:828
 #, python-format
 msgid "The problem happened with the program %s which changed since then."
 msgstr "Le problème s'est produit avec le programme %s qui a changé depuis."
 
-#: ../apport/ui.py:927
+#: ../apport/ui.py:899
 msgid "Could not determine the package or source package name."
 msgstr "Impossible de déterminer le nom du paquet ou du paquet source."
 
-#: ../apport/ui.py:942
+#: ../apport/ui.py:914
 msgid "Unable to start web browser"
 msgstr "Impossible de lancer le navigateur Web"
 
-#: ../apport/ui.py:943
+#: ../apport/ui.py:915
 #, python-format
 msgid "Unable to start web browser to open %s."
 msgstr "Impossible de lancer le navigateur Web pour ouvrir %s."
 
-#: ../apport/ui.py:1017
+#: ../apport/ui.py:989
 #, python-format
 msgid "Please enter your account information for the %s bug tracking system"
 msgstr ""
 "Veuillez saisir les informations de votre compte pour le système de suivi "
 "des bogues %s"
 
-#: ../apport/ui.py:1028
+#: ../apport/ui.py:1000
 msgid "Network problem"
 msgstr "Problème réseau"
 
-#: ../apport/ui.py:1030
+#: ../apport/ui.py:1002
 msgid ""
 "Cannot connect to crash database, please check your Internet connection."
 msgstr ""
 "Impossible de se connecter à la base de données des plantages. Veuillez "
 "vérifier votre connexion Internet."
 
-#: ../apport/ui.py:1056
+#: ../apport/ui.py:1028
 msgid "Memory exhaustion"
 msgstr "Mémoire saturée"
 
-#: ../apport/ui.py:1057
+#: ../apport/ui.py:1029
 msgid "Your system does not have enough memory to process this crash report."
 msgstr ""
 "Votre système n'a pas assez de mémoire pour traiter ce rapport d'anomalie."
 
-#: ../apport/ui.py:1080 ../apport/ui.py:1089
+#: ../apport/ui.py:1052 ../apport/ui.py:1061
 msgid ""
 "This problem report applies to a program which is not installed any more."
 msgstr ""
 "Ce rapport d'anomalie fait référence à un logiciel qui n'est plus installé."
 
-#: ../apport/ui.py:1108
+#: ../apport/ui.py:1080
 #, python-format
 msgid ""
 "The problem cannot be reported:\n"
@@ -383,11 +387,11 @@
 "\n"
 "%s"
 
-#: ../apport/ui.py:1141 ../apport/ui.py:1148
+#: ../apport/ui.py:1113 ../apport/ui.py:1120
 msgid "Problem already known"
 msgstr "Problème déjà connu"
 
-#: ../apport/ui.py:1142
+#: ../apport/ui.py:1114
 msgid ""
 "This problem was already reported in the bug report displayed in the web "
 "browser. Please check if you can add any further information that might be "
@@ -397,7 +401,7 @@
 "navigateur Web. Veuillez vérifier si vous pouvez ajouter des informations "
 "complémentaires susceptibles d'aider les développeurs."
 
-#: ../apport/ui.py:1149
+#: ../apport/ui.py:1121
 msgid "This problem was already reported to developers. Thank you!"
 msgstr "Ce problème a déjà été signalé aux développeurs. Merci!"
 
@@ -415,12 +419,12 @@
 msgstr "Faites un choix (%s) :"
 
 #. translators: first %s: application name, second %s: date, third %s: time
-#: ../bin/apport-cli.py:139
+#: ../bin/apport-cli.py:140
 #, python-format
 msgid "%s closed unexpectedly on %s at %s."
 msgstr "%s a quitté de manière inattendue le %s à %s"
 
-#: ../bin/apport-cli.py:143
+#: ../bin/apport-cli.py:144
 msgid ""
 "If you were not doing anything confidential (entering passwords or other\n"
 "private information), you can help to improve the application by reporting\n"
@@ -432,60 +436,56 @@
 "signalant\n"
 "le problème."
 
-#: ../bin/apport-cli.py:146 ../bin/apport-cli.py:165 ../bin/apport-cli.py:183
-#: ../kde/apport-kde.py:202 ../kde/apport-kde.py:233 ../kde/apport-kde.py:254
+#: ../bin/apport-cli.py:147 ../bin/apport-cli.py:166 ../bin/apport-cli.py:184
 msgid "&Report Problem..."
 msgstr "&Signaler le problème..."
 
-#: ../bin/apport-cli.py:147
+#: ../bin/apport-cli.py:148 ../bin/apport-cli.py:249
 msgid "Cancel and &ignore future crashes of this program version"
 msgstr ""
 "Annuler et &ignorer les futurs plantages de cette version du programme"
 
-#: ../bin/apport-cli.py:148 ../bin/apport-cli.py:166 ../bin/apport-cli.py:184
-#: ../bin/apport-cli.py:243 ../bin/apport-cli.py:326 ../bin/apport-cli.py:358
-#: ../bin/apport-cli.py:379
+#: ../bin/apport-cli.py:149 ../bin/apport-cli.py:167 ../bin/apport-cli.py:185
+#: ../bin/apport-cli.py:251 ../bin/apport-cli.py:333 ../bin/apport-cli.py:365
+#: ../bin/apport-cli.py:386
 msgid "&Cancel"
 msgstr "&Annuler"
 
-#: ../bin/apport-cli.py:163
+#: ../bin/apport-cli.py:164
 #, python-format
 msgid "The package \"%s\" failed to install or upgrade."
 msgstr "L'installation ou la mise à niveau du paquet « %s » a échoué."
 
-#: ../bin/apport-cli.py:164 ../gtk/apport-gtk.ui.h:23 ../kde/apport-kde.py:230
+#: ../bin/apport-cli.py:165
 msgid ""
 "You can help the developers to fix the package by reporting the problem."
 msgstr ""
 "Vous pouvez aider les développeurs à résoudre le problème en le signalant."
 
-#: ../bin/apport-cli.py:176 ../gtk/apport-gtk.py:133 ../kde/apport-kde.py:245
+#: ../bin/apport-cli.py:177
 msgid "Your system encountered a serious kernel problem."
 msgstr "Un problème sérieux avec le noyau s'est produit sur votre système."
 
-#: ../bin/apport-cli.py:180 ../gtk/apport-gtk.py:137 ../kde/apport-kde.py:249
+#: ../bin/apport-cli.py:181
 msgid "You can help the developers to fix the problem by reporting it."
 msgstr ""
 "Vous pouvez aider les développeurs à corriger ce problème en le signalant."
 
-#: ../bin/apport-cli.py:208
+#: ../bin/apport-cli.py:212
 #, python-format
 msgid "(%i bytes)"
 msgstr "(%i octets)"
 
-#: ../bin/apport-cli.py:210 ../gtk/apport-gtk.py:167 ../kde/apport-kde.py:297
+#: ../bin/apport-cli.py:214 ../gtk/apport-gtk.py:117 ../kde/apport-kde.py:307
 msgid "(binary data)"
 msgstr "(données binaires)"
 
-#: ../bin/apport-cli.py:218 ../gtk/apport-gtk.py:190 ../kde/apport-kde.py:269
-msgid "Send this data to the developers?"
-msgstr "Envoyer ces données aux développeurs ?"
-
-#: ../bin/apport-cli.py:220 ../kde/apport-kde.py:274
+#: ../bin/apport-cli.py:235 ../test/gtk.py:248 ../gtk/apport-gtk.py:145
+#: ../kde/apport-kde.py:153 ../test/kde.py:169
 msgid "Send problem report to the developers?"
 msgstr "Envoyer un rapport d'anomalie aux développeurs ?"
 
-#: ../bin/apport-cli.py:221
+#: ../bin/apport-cli.py:236
 msgid ""
 "After the problem report has been sent, please fill out the form in the\n"
 "automatically opened web browser."
@@ -493,53 +493,43 @@
 "Une fois que le rapport d'incident aura été envoyé, veuillez compléter le\n"
 "formulaire ouvert automatiquement dans votre navigateur Web."
 
-#: ../bin/apport-cli.py:226
-#, python-format
-msgid "&Send complete report (recommended; %s)"
-msgstr "&Envoyer un rapport complet (recommandé ; %s)"
-
-#: ../bin/apport-cli.py:228
-#, python-format
-msgid "Send &reduced report (slow Internet connection; %s)"
-msgstr "Envoyer un rapport ab&régé (connexion Internet lente ; %s)"
-
-#: ../bin/apport-cli.py:231
+#: ../bin/apport-cli.py:239
 #, python-format
 msgid "&Send report (%s)"
 msgstr "&Envoyer le rapport (%s)"
 
-#: ../bin/apport-cli.py:236
+#: ../bin/apport-cli.py:243
 msgid "&Examine locally"
 msgstr "&Examiner en local"
 
-#: ../bin/apport-cli.py:240
+#: ../bin/apport-cli.py:247
 msgid "&View report"
 msgstr "&Voir le rapport"
 
-#: ../bin/apport-cli.py:241
+#: ../bin/apport-cli.py:248
 msgid "&Keep report file for sending later or copying to somewhere else"
 msgstr ""
 "&Conserver le fichier du rapport pour l'envoyer ultérieurement ou le copier "
 "quelque part"
 
-#: ../bin/apport-cli.py:275
+#: ../bin/apport-cli.py:284
 msgid "Problem report file:"
 msgstr "Fichier du rapport d'anomalie :"
 
-#: ../bin/apport-cli.py:283 ../bin/apport-cli.py:288
+#: ../bin/apport-cli.py:290 ../bin/apport-cli.py:295
 msgid "&Confirm"
 msgstr "&Confirmer"
 
-#: ../bin/apport-cli.py:287
+#: ../bin/apport-cli.py:294
 #, python-format
 msgid "Error: %s"
 msgstr "Erreur : %s"
 
-#: ../bin/apport-cli.py:293 ../kde/apport-kde.py:336
+#: ../bin/apport-cli.py:300 ../kde/apport-kde.py:343
 msgid "Collecting problem information"
 msgstr "Collecte des informations liées au problème"
 
-#: ../bin/apport-cli.py:294
+#: ../bin/apport-cli.py:301
 msgid ""
 "The collected information can be sent to the developers to improve the\n"
 "application. This might take a few minutes."
@@ -547,11 +537,11 @@
 "Les informations collectées peuvent être envoyées aux développeurs pour\n"
 "améliorer l'application. Cela peut prendre quelques minutes."
 
-#: ../bin/apport-cli.py:306 ../gtk/apport-gtk.ui.h:22 ../kde/apport-kde.py:353
+#: ../bin/apport-cli.py:313 ../gtk/apport-gtk.ui.h:13 ../kde/apport-kde.py:360
 msgid "Uploading problem information"
 msgstr "Envoi des informations liées au problème"
 
-#: ../bin/apport-cli.py:307
+#: ../bin/apport-cli.py:314
 msgid ""
 "The collected information is being sent to the bug tracking system.\n"
 "This might take a few minutes."
@@ -559,40 +549,40 @@
 "Les informations collectées sont envoyées au système de suivi de bogues.\n"
 "Cela peut prendre quelques minutes."
 
-#: ../bin/apport-cli.py:357
+#: ../bin/apport-cli.py:364
 msgid "&Done"
 msgstr "&Terminé"
 
-#: ../bin/apport-cli.py:363
+#: ../bin/apport-cli.py:370
 msgid "none"
 msgstr "aucun"
 
-#: ../bin/apport-cli.py:364
+#: ../bin/apport-cli.py:371
 #, python-format
 msgid "Selected: %s. Multiple choices:"
 msgstr "Sélectionné : % s. Choix multiples :"
 
-#: ../bin/apport-cli.py:380
+#: ../bin/apport-cli.py:387
 msgid "Choices:"
 msgstr "Choix :"
 
-#: ../bin/apport-cli.py:394
+#: ../bin/apport-cli.py:401
 msgid "Path to file (Enter to cancel):"
 msgstr "Emplacement du fichier (touche Entrée pour annuler) :"
 
-#: ../bin/apport-cli.py:400
+#: ../bin/apport-cli.py:407
 msgid "File does not exist."
 msgstr "Le fichier n'existe pas."
 
-#: ../bin/apport-cli.py:402
+#: ../bin/apport-cli.py:409
 msgid "This is a directory."
 msgstr "Ceci est un répertoire."
 
-#: ../bin/apport-cli.py:408
+#: ../bin/apport-cli.py:415
 msgid "To continue, you must visit the following URL:"
 msgstr "Pour continuer, vous devez visiter l'adresse suivante :"
 
-#: ../bin/apport-cli.py:410
+#: ../bin/apport-cli.py:417
 msgid ""
 "You can launch a browser now, or copy this URL into a browser on another "
 "computer."
@@ -600,11 +590,11 @@
 "Vous pouvez ouvrir un navigateur Web maintenant, ou saisir cette adresse "
 "dans un navigateur sur un autre ordinateur."
 
-#: ../bin/apport-cli.py:412
+#: ../bin/apport-cli.py:419
 msgid "Launch a browser now"
 msgstr "Lancer un navigateur Web maintenant"
 
-#: ../bin/apport-cli.py:426
+#: ../bin/apport-cli.py:433
 msgid "No pending crash reports. Try --help for more information."
 msgstr ""
 "Aucun rapport d'anomalie en attente. Essayez --help pour plus d'informations."
@@ -633,63 +623,56 @@
 "Le processus de reprise s'est bloqué juste avant d'arriver à son terme, et "
 "sera apparu comme s'étant terminé normalement."
 
-#: ../gtk/apport-gtk.ui.h:1
-msgid "<big><b>Collecting problem information</b></big>"
-msgstr "<big><b>Collecte des informations liées au problème</b></big>"
+#: ../gtk/apport-gtk.ui.h:1 ../kde/apport-kde.py:395 ../kde/apport-kde.py:431
+msgid "Apport"
+msgstr "Apport"
 
 #: ../gtk/apport-gtk.ui.h:2
-msgid ""
-"<big><b>Send problem report to the developers?</b></big>\n"
-"\n"
-"After the problem report has been sent, please fill out the form in the "
-"automatically opened web browser."
+msgid "Crash report"
 msgstr ""
-"<big><b>Envoyer un rapport d'anomalie aux développeurs ?</b></big>\n"
-"\n"
-"Une fois le rapport envoyé, veuillez remplir le formulaire affiché "
-"automatiquement dans votre navigateur Web."
 
-#: ../gtk/apport-gtk.ui.h:5
-msgid "<big><b>Uploading problem information</b></big>"
-msgstr "<big><b>Envoi des informations liées au problème</b></big>"
+#: ../gtk/apport-gtk.ui.h:3
+msgid "<big><b>Sorry, Ubuntu has experienced an internal error.</b></big>"
+msgstr ""
 
-#: ../gtk/apport-gtk.ui.h:7
-#, no-c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Sorry, the package \"%s\" failed to "
-"install or upgrade.</span>"
+#: ../gtk/apport-gtk.ui.h:4 ../test/gtk.py:153 ../test/gtk.py:189
+#: ../gtk/apport-gtk.py:221 ../kde/apport-kde.py:199 ../test/kde.py:143
+msgid "If you notice further problems, try restarting the computer."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Désolé, échec lors de l'installation "
-"ou de la mise à niveau du paquet « %s ».</span>"
 
-#: ../gtk/apport-gtk.ui.h:8
-msgid "Application problem"
-msgstr "Problème logiciel"
+#: ../gtk/apport-gtk.ui.h:5
+msgid "Send an error report to help fix this problem"
+msgstr ""
 
-#: ../gtk/apport-gtk.ui.h:9 ../kde/apport-kde.py:388 ../kde/apport-kde.py:424
-msgid "Apport"
-msgstr "Apport"
+#: ../gtk/apport-gtk.ui.h:6
+msgid "Ignore future problems of this program version"
+msgstr ""
 
-#: ../gtk/apport-gtk.ui.h:11 ../kde/apport-kde.py:305
-#, no-c-format, python-format
-msgid "Complete report (recommended; %s)"
-msgstr "Rapport complet (recommandé ; %s)"
+#: ../gtk/apport-gtk.ui.h:7 ../gtk/apport-gtk.py:164 ../gtk/apport-gtk.py:461
+#: ../kde/apport-kde.py:240
+msgid "Show Details"
+msgstr ""
 
-#: ../gtk/apport-gtk.ui.h:12
-msgid "Content of the report"
-msgstr "Contenu du rapport"
+#: ../gtk/apport-gtk.ui.h:8
+msgid "_Examine locally"
+msgstr "_Examiner en local"
 
-#: ../gtk/apport-gtk.ui.h:13 ../kde/apport-kde.py:197
-msgid ""
-"If you were not doing anything confidential (entering passwords or other "
-"private information), you can help to improve the application by reporting "
-"the problem."
+#: ../gtk/apport-gtk.ui.h:9 ../gtk/apport-gtk.py:212 ../kde/apport-kde.py:192
+msgid "Leave Closed"
 msgstr ""
-"Si vous ne faisiez rien de confidentiel (saisie de mots de passe ou "
-"d'informations privées), vous pouvez aider à améliorer l'application en "
-"signalant le problème."
 
-#: ../gtk/apport-gtk.ui.h:14
+#: ../gtk/apport-gtk.ui.h:10 ../test/gtk.py:68 ../test/gtk.py:95
+#: ../test/gtk.py:161 ../test/gtk.py:197 ../gtk/apport-gtk.py:176
+#: ../gtk/apport-gtk.py:224 ../kde/apport-kde.py:202 ../test/kde.py:63
+#: ../test/kde.py:88 ../test/kde.py:149
+msgid "Continue"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:11
+msgid "<big><b>Collecting problem information</b></big>"
+msgstr "<big><b>Collecte des informations liées au problème</b></big>"
+
+#: ../gtk/apport-gtk.ui.h:12
 msgid ""
 "Information is being collected that may help the developers fix the problem "
 "you report."
@@ -697,24 +680,11 @@
 "Des données sont en cours de collecte pour aider les développeurs à corriger "
 "le problème que vous avez rencontré."
 
-#: ../gtk/apport-gtk.ui.h:15 ../kde/apport-kde.py:252
-msgid "Kernel problem"
-msgstr "Problème de noyau"
-
-#: ../gtk/apport-gtk.ui.h:16
-msgid "Package problem"
-msgstr "Problème de paquet"
-
-#: ../gtk/apport-gtk.ui.h:18 ../kde/apport-kde.py:308
-#, no-c-format, python-format
-msgid "Reduced report (slow Internet connection; %s)"
-msgstr "Rapport abrégé (connexion Internet lente ; %s)"
-
-#: ../gtk/apport-gtk.ui.h:19
-msgid "Restart _Program"
-msgstr "Relancer le _programme"
+#: ../gtk/apport-gtk.ui.h:14
+msgid "<big><b>Uploading problem information</b></big>"
+msgstr "<big><b>Envoi des informations liées au problème</b></big>"
 
-#: ../gtk/apport-gtk.ui.h:20 ../kde/apport-kde.py:354
+#: ../gtk/apport-gtk.ui.h:15 ../kde/apport-kde.py:361
 msgid ""
 "The collected information is being sent to the bug tracking system. This "
 "might take a few minutes."
@@ -722,33 +692,6 @@
 "Les données collectées sont transmises au système de suivi des bogues. Ceci "
 "peut prendre quelques minutes."
 
-#: ../gtk/apport-gtk.ui.h:21
-msgid ""
-"This will remove some large items from the report. These are very useful for "
-"developers to debug the problem, but might be too big for you to upload if "
-"you have a slow internet connection."
-msgstr ""
-"Des parties volumineuses vont être supprimées du rapport. Elles sont très "
-"utiles aux développeurs pour résoudre le problème, mais peuvent se révéler "
-"trop lourdes lors de leur transmission si vous ne disposez que d'une "
-"connexion Internet bas débit."
-
-#: ../gtk/apport-gtk.ui.h:24
-msgid "_Examine locally"
-msgstr "_Examiner en local"
-
-#: ../gtk/apport-gtk.ui.h:25
-msgid "_Ignore future crashes of this program version"
-msgstr "_Ignorer les prochains plantages de cette version du programme"
-
-#: ../gtk/apport-gtk.ui.h:26
-msgid "_Report Problem..."
-msgstr "Signaler ce p_roblème..."
-
-#: ../gtk/apport-gtk.ui.h:27
-msgid "_Send Report"
-msgstr "_Envoyer le rapport"
-
 #: ../bin/apport-retrace.py:37
 msgid "%prog [options] <apport problem report | crash ID>"
 msgstr "%prog [options] <apport problem report | crash ID>"
@@ -823,6 +766,7 @@
 #: ../bin/apport-retrace.py:59
 msgid "Prepend timestamps to log messages, for batch operation"
 msgstr ""
+"Préfixer un horodatage aux messages de journal, pour un traitement par lots"
 
 #: ../bin/apport-retrace.py:61
 msgid "Cache directory for packages downloaded in the sandbox"
@@ -881,80 +825,105 @@
 
 #: ../gtk/apport-gtk-mime.desktop.in.h:1 ../kde/apport-kde.desktop.in.h:1
 #: ../kde/apport-kde-mime.desktop.in.h:1 ../gtk/apport-gtk.desktop.in.h:1
-msgid "Report a malfunction to the developers"
-msgstr "Signaler un dysfonctionnement aux développeurs"
+msgid "Report a problem..."
+msgstr "Signaler un problème..."
 
 #: ../gtk/apport-gtk-mime.desktop.in.h:2 ../kde/apport-kde.desktop.in.h:2
 #: ../kde/apport-kde-mime.desktop.in.h:2 ../gtk/apport-gtk.desktop.in.h:2
-msgid "Report a problem..."
-msgstr "Signaler un problème..."
+msgid "Report a malfunction to the developers"
+msgstr "Signaler un dysfonctionnement aux développeurs"
 
-#: ../data/kernel_oops.py:28
-msgid "Your system might become unstable now and might need to be restarted."
+#: ../test/gtk.py:61 ../test/kde.py:58
+msgid "Ubuntu has restarted after experiencing an internal error."
 msgstr ""
-"Votre système peut maintenant devenir instable et nécessiter un redémarrage."
 
-#: ../gtk/apport-gtk.py:79 ../gtk/apport-gtk.py:83 ../kde/apport-kde.py:188
-#, python-format
-msgid "Sorry, %s closed unexpectedly"
-msgstr "Désolé, %s a quitté de façon inattendue"
+#: ../test/gtk.py:88 ../gtk/apport-gtk.py:200 ../kde/apport-kde.py:181
+#: ../test/kde.py:83
+msgid "Sorry, a problem occurred while installing software."
+msgstr ""
 
-#: ../kde/apport-kde.py:133
-msgid "&Details..."
-msgstr "&Détails..."
+#: ../test/gtk.py:99 ../test/kde.py:91
+msgid "Package: apport 1.2.3~0ubuntu1"
+msgstr ""
 
-#: ../kde/apport-kde.py:160
-msgid "Username:"
-msgstr "Nom d'utilisateur :"
+#: ../test/gtk.py:123 ../test/kde.py:115
+msgid "The application Apport has closed unexpectedly."
+msgstr ""
 
-#: ../kde/apport-kde.py:161
-msgid "Password:"
-msgstr "Mot de passe :"
+#: ../test/gtk.py:130 ../gtk/apport-gtk.py:213 ../gtk/apport-gtk.py:267
+#: ../kde/apport-kde.py:193 ../kde/apport-kde.py:326 ../test/kde.py:120
+msgid "Relaunch"
+msgstr ""
+
+#: ../test/gtk.py:151 ../test/kde.py:141
+msgid "Sorry, Ubuntu has experienced an internal error."
+msgstr ""
+
+#: ../test/gtk.py:187
+msgid "Sorry, the application apport has closed unexpectedly."
+msgstr ""
+
+#: ../test/gtk.py:204
+msgid "Sorry, apport has closed unexpectedly."
+msgstr ""
+
+#: ../test/gtk.py:256 ../gtk/apport-gtk.py:154 ../kde/apport-kde.py:161
+#: ../test/kde.py:175
+msgid "Send"
+msgstr ""
+
+#: ../data/kernel_oops.py:28
+msgid "Your system might become unstable now and might need to be restarted."
+msgstr ""
+"Votre système peut maintenant devenir instable et nécessiter un redémarrage."
 
-#: ../kde/apport-kde.py:191
+#: ../gtk/apport-gtk.py:132
 #, python-format
-msgid "Sorry, the program \"%s\" closed unexpectedly."
-msgstr "Désolé, le programme « %s » a quitté de façon inattendue."
+msgid "Sorry, the application %s has closed unexpectedly."
+msgstr ""
 
-#: ../kde/apport-kde.py:194
+#: ../gtk/apport-gtk.py:135
 #, python-format
-msgid "Sorry, %s closed unexpectedly."
-msgstr "Désolé, %s a quitté de façon inattendue."
+msgid "Sorry, %s has closed unexpectedly."
+msgstr ""
 
-#: ../kde/apport-kde.py:200
-msgid "&Ignore future crashes of this program version"
-msgstr "&Ignorer les prochains plantages de cette version du logiciel"
+#: ../gtk/apport-gtk.py:139 ../kde/apport-kde.py:196
+#, python-format
+msgid "Sorry, %s has experienced an internal error."
+msgstr ""
 
-#: ../kde/apport-kde.py:209
-msgid "Restart &Program"
-msgstr "Redémarrer le &programme"
+#: ../gtk/apport-gtk.py:185 ../kde/apport-kde.py:167
+#, python-format
+msgid "%s has restarted after experiencing an internal error."
+msgstr ""
 
-#: ../kde/apport-kde.py:228
+#: ../gtk/apport-gtk.py:193 ../kde/apport-kde.py:175
 #, python-format
-msgid "Sorry, the package \"%s\" failed to install or upgrade."
-msgstr "Désolé, le paquet « %s » n'a pas pu être installé ou mis à jour."
+msgid "Package: %s"
+msgstr ""
 
-#: ../kde/apport-kde.py:268 ../kde/apport-kde.py:273
-msgid "Generic error"
-msgstr "Erreur générique"
+#: ../gtk/apport-gtk.py:209 ../kde/apport-kde.py:187
+#, python-format
+msgid "The application %s has closed unexpectedly."
+msgstr ""
 
-#: ../kde/apport-kde.py:275
-msgid ""
-"After the problem report has been sent, please fill out the form in the "
-"automatically opened web browser."
+#: ../gtk/apport-gtk.py:464 ../kde/apport-kde.py:237
+msgid "Hide Details"
 msgstr ""
-"Après l'envoi du rapport d'anomalie, veuillez remplir le formulaire ouvert "
-"automatiquement dans le navigateur Web."
 
-#: ../kde/apport-kde.py:278
-msgid "&Send"
-msgstr "&Envoyer"
+#: ../kde/apport-kde.py:269
+msgid "Username:"
+msgstr "Nom d'utilisateur :"
+
+#: ../kde/apport-kde.py:270
+msgid "Password:"
+msgstr "Mot de passe :"
 
-#: ../kde/apport-kde.py:335
+#: ../kde/apport-kde.py:342
 msgid "Collecting Problem Information"
 msgstr "Collecte des informations liées au problème"
 
-#: ../kde/apport-kde.py:337
+#: ../kde/apport-kde.py:344
 msgid ""
 "The collected information can be sent to the developers to improve the "
 "application. This might take a few minutes."
@@ -962,7 +931,7 @@
 "Les informations collectées peuvent être envoyées aux développeurs pour "
 "améliorer l'application. Cela peut prendre quelques minutes."
 
-#: ../kde/apport-kde.py:352
+#: ../kde/apport-kde.py:359
 msgid "Uploading Problem Information"
 msgstr "Envoi des informations liées au problème"
 
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/apt-listchanges.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/apt-listchanges.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/apt-listchanges.po	2012-01-02 17:26:42.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/apt-listchanges.po	2012-02-23 06:31:08.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:06+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:26+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: ../apt-listchanges.py:80
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/apt.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/apt.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/apt.po	2012-01-02 17:26:42.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/apt.po	2012-02-23 06:31:08.000000000 +0000
@@ -8,164 +8,163 @@
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-29 19:46+0000\n"
-"PO-Revision-Date: 2011-12-06 07:19+0000\n"
+"POT-Creation-Date: 2012-02-14 10:00+0000\n"
+"PO-Revision-Date: 2012-02-14 12:44+0000\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:03+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:25+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: \n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Le paquet %s de version %s contient une dépendance absente :\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Nombre total de paquets : "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "Nombre total de structures de paquets : "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Paquets ordinaires : "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Paquets entièrement virtuels : "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Paquets virtuels simples : "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Paquets virtuels mixtes : "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Manquants : "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Nombre de versions distinctes : "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Nombre de descriptions distinctes : "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Nombre de dépendances : "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Nombre de relations version/fichier : "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Nombre de relations description/fichier : "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Nombre de relations « Provides » : "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Nombre de motifs rationnels : "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Espace occupé par les versions des dépendances : "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Espace disque gaspillé : "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Total de l'espace attribué : "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Fichier %s désynchronisé."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Aucun paquet n'a été trouvé"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "Vous devez fournir au moins un motif de recherche"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
-"Cette commande est obsolète. Veuillez utiliser 'apt-mark showauto' à la "
-"place."
+"Cette commande est obsolète. Veuillez utiliser « apt-mark showauto »."
 
-#: cmdline/apt-cache.cc:1448
+#: cmdline/apt-cache.cc:1452
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Impossible de trouver le paquet %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Fichiers du paquet :"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Le cache est désynchronisé, impossible de référencer un fichier"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Paquets étiquetés :"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(non trouvé)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Installé : "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Candidat : "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(aucun)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Étiquette de paquet : "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Table de version :"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3230 cmdline/apt-internal-solver.cc:30
-#: cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3264 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pour %s compilé sur %s %s\n"
 
-#: cmdline/apt-cache.cc:1682
+#: cmdline/apt-cache.cc:1686
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -201,33 +200,70 @@
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
+"Usage : apt-cache [options] commande\n"
+"        apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
+"        apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"\n"
+"apt-cache est un outil de bas niveau pour manipuler les fichiers de cache\n"
+"pour les binaires, et pour en obtenir des informations.\n"
+"\n"
+"Commandes :\n"
+"   gencaches - Construit le cache des sources et celui des binaires\n"
+"   showpkg - Affiche quelques informations générales pour un unique paquet\n"
+"   showsrc - Affiche les enregistrements des sources\n"
+"   stats - Affiche quelques statistiques de base\n"
+"   dump - Affiche la totalité des fichiers dans un formulaire succinct\n"
+"   dumpavail - Affiche une liste de fichiers disponibles sur la sortie "
+"standard\n"
+"   unmet - Affiche les dépendances manquantes\n"
+"   search - Cherche une expression rationnelle dans la liste des paquets\n"
+"   show - Affiche la description du paquet\n"
+"   depends - Affiche toutes les dépendances d'un paquet\n"
+"   rdepends - Affiche les dépendances inverses d'un paquet\n"
+"   pkgnames - Liste le nom de tous les paquets du système\n"
+"   dotty - Génère un graphe des paquets pour GraphViz\n"
+"   xvcg - Génère un graphe des paquets pour xvcg\n"
+"   policy - Affiche l'étiquetage (Pin) en vigueur\n"
+"\n"
+"Options :\n"
+"  -h    Ce texte d'aide\n"
+"  -p=?  Le cache des paquets\n"
+"  -s=?  Le cache des sources\n"
+"  -q    Enlève l'indicateur de progression\n"
+"  -i    Affiche seulement les dépendances importantes pour la commande "
+"« unmet »\n"
+"  -c=?  Lit ce fichier de configuration\n"
+"  -o=?  Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
+"Veuillez consulter les pages de manuel de apt-cache(8) et apt.conf(5) pour "
+"plus\n"
+"d'informations.\n"
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 "Veuillez indiquer le nom de ce disque, par exemple « Debian 5.0.3 Disk 1 »"
 
-#: cmdline/apt-cdrom.cc:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 "Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Impossible de monter « %s » sur « %s »"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 "Veuillez répéter cette opération pour tous les disques de votre jeu de "
 "cédéroms."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Les arguments ne sont pas en parité"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -255,12 +291,12 @@
 "   -c=? Lit ce fichier de configuration\n"
 "   -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s n'est pas un paquet Debian valide."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -284,41 +320,41 @@
 "   -c=? Lit ce fichier de configuration\n"
 "   -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267
+#: cmdline/apt-extracttemplates.cc:269
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Impossible d'écrire sur %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 "Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "La liste d'extension du paquet est trop longue"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
+#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263
+#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299
 #, c-format
 msgid "Error processing directory %s"
 msgstr "Erreur lors du traitement du répertoire %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "La liste d'extension des sources est trop grande"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Erreur lors de l'écriture de l'en-tête du fichier contenu"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Erreur du traitement du contenu %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -401,27 +437,27 @@
 "  -c=? Lit ce fichier de configuration\n"
 "  -o=? Place une option de configuration arbitraire"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Aucune sélection ne correspond"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr ""
 "Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "Base de données corrompue, fichier renommé en %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "Base de données ancienne, tentative de mise à jour de %s\""
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -429,110 +465,110 @@
 "Le format de la base de données n'est pas valable. Si vous mettez APT à "
 "jour, veuillez supprimer puis recréer la base de données."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Impossible d'ouvrir le fichier de base de données %s : %s"
 
-#: ftparchive/cachedb.cc:123
+#: ftparchive/cachedb.cc:126
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Impossible de statuer %s"
 
-#: ftparchive/cachedb.cc:245
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "L'archive n'a pas d'enregistrement de contrôle"
 
-#: ftparchive/cachedb.cc:482
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Impossible d'obtenir un curseur"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "A : Impossible de lire le contenu du répertoire %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "A : Impossible de statuer %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E : "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "A : "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E : des erreurs sont survenues sur le fichier "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Impossible de résoudre %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Échec du parcours de l'arbre"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Impossible d'ouvrir %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " Délier %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Impossible de lire le lien %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Impossible de délier %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Impossible de lier %s à %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Seuil de delink de %so atteint.\n"
 
-#: ftparchive/writer.cc:399
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "L'archive ne possède pas de champ de paquet"
 
-#: ftparchive/writer.cc:407 ftparchive/writer.cc:709
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s ne possède pas d'entrée « override »\n"
 
-#: ftparchive/writer.cc:475 ftparchive/writer.cc:825
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  le responsable de %s est %s et non %s\n"
 
-#: ftparchive/writer.cc:719
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s ne possède pas d'entrée « source override »\n"
 
-#: ftparchive/writer.cc:723
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s ne possède pas également pas d'entrée « binary override »\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Échec de l'allocation de mémoire"
 
@@ -543,81 +579,69 @@
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
 #, c-format
-msgid "Malformed override %s line %lu #1"
-msgstr "Entrée « override » %s mal formée ligne %lu n° 1"
+msgid "Malformed override %s line %llu #1"
+msgstr ""
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
 #, c-format
-msgid "Malformed override %s line %lu #2"
-msgstr "Entrée « override » %s mal formée %lu n° 2"
+msgid "Malformed override %s line %llu #2"
+msgstr ""
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
 #, c-format
-msgid "Malformed override %s line %lu #3"
-msgstr "Entrée « override » %s mal formée %lu n° 3"
+msgid "Malformed override %s line %llu #3"
+msgstr ""
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
 #, c-format
 msgid "Failed to read the override file %s"
 msgstr "Impossible de lire le fichier d'« override » %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Algorithme de compression « %s » inconnu"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "La sortie compressée %s a besoin d'un ensemble de compression"
 
-#: ftparchive/multicompress.cc:165
+#: ftparchive/multicompress.cc:168
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Impossible de créer le tube IPC sur le sous-processus"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Impossible de créer FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Échec du fork"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Fils compressé"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Erreur interne, impossible de créer %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Impossible de créer un sous-processus IPC"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Impossible d'exécuter la compression "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "décompacteur"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "Échec d'entrée/sortie du sous-processus sur le fichier"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Impossible de lire lors du calcul de la somme MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Problème en déliant %s"
 
-#: ftparchive/multicompress.cc:485
+#: ftparchive/multicompress.cc:373
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Impossible de changer le nom %s en %s"
@@ -732,34 +756,34 @@
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu partiellement installés ou enlevés.\n"
 
-#: cmdline/apt-get.cc:633
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Note : sélection de %s pour la tâche « %s »\n"
 
-#: cmdline/apt-get.cc:639
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Note : sélection de %s pour l'expression rationnelle « %s »\n"
 
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Le paquet %s est un paquet virtuel fourni par :\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Installé]"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr " [Pas de version candidate]"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Vous devez explicitement sélectionner un paquet à installer."
 
-#: cmdline/apt-get.cc:681
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -771,131 +795,131 @@
 "devenu obsolète\n"
 "ou qu'il n'est disponible que sur une autre source\n"
 
-#: cmdline/apt-get.cc:699
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Cependant les paquets suivants le remplacent :"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Le paquet « %s » n'a pas de version susceptible d'être installée"
 
-#: cmdline/apt-get.cc:722
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "Les paquets virtuels comme « %s » ne peuvent pas être supprimés\n"
 
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Note : sélection de « %s » au lieu de « %s »\n"
 
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n"
 
-#: cmdline/apt-get.cc:787
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "%s ignoré : il n'est pas installé et seules des mises à jour ont été "
 "demandées.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 "La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n"
 
-#: cmdline/apt-get.cc:804
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s est déjà la plus récente version disponible.\n"
 
-#: cmdline/apt-get.cc:823 cmdline/apt-get.cc:2093 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s passé en « installé manuellement ».\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Version choisie « %s » (%s) pour « %s »\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:865
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Version choisie « %s » (%s) pour « %s » à cause de « %s »\n"
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Le paquet %s n'est pas installé, et ne peut donc être supprimé\n"
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Correction des dépendances..."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " a échoué."
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Impossible de corriger les dépendances"
 
-#: cmdline/apt-get.cc:983
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Impossible de minimiser le nombre des paquets mis à jour"
 
-#: cmdline/apt-get.cc:985
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Fait"
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes."
 
-#: cmdline/apt-get.cc:992
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f."
 
-#: cmdline/apt-get.cc:1017
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés."
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Avertissement d'authentification ignoré.\n"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Faut-il installer ces paquets sans vérification (o/N) ? "
 
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Certains paquets n'ont pas pu être authentifiés"
 
-#: cmdline/apt-get.cc:1039 cmdline/apt-get.cc:1200
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Il y a des problèmes et -y a été employé sans --force-yes"
 
-#: cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés."
 
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "Les paquets doivent être enlevés mais la désinstallation est désactivée."
 
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erreur interne. Le tri a été interrompu."
 
-#: cmdline/apt-get.cc:1138
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Étrangement, les tailles ne correspondent pas. Veuillez le signaler par "
@@ -903,21 +927,21 @@
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1145
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Il est nécessaire de prendre %so/%so dans les archives.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1150
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Il est nécessaire de prendre %so dans les archives.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1157
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -925,23 +949,23 @@
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1162
+#: cmdline/apt-get.cc:1173
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Après cette opération, %so d'espace disque seront libérés.\n"
 
-#: cmdline/apt-get.cc:1177 cmdline/apt-get.cc:1180 cmdline/apt-get.cc:2506
-#: cmdline/apt-get.cc:2509
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Impossible de déterminer l'espace disponible sur %s"
 
-#: cmdline/apt-get.cc:1190
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Pas assez d'espace disponible sur %s"
 
-#: cmdline/apt-get.cc:1206 cmdline/apt-get.cc:1226
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "L'option --trivial-only a été indiquée mais il ne s'agit pas d'une opération "
@@ -949,11 +973,11 @@
 
 # The space before the exclamation mark must not be a non-breaking space; this
 # sentence is supposed to be typed by a user who cannot see the difference.
-#: cmdline/apt-get.cc:1208
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Oui, faites ce que je vous dis !"
 
-#: cmdline/apt-get.cc:1210
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -964,28 +988,28 @@
 "Pour continuer, tapez la phrase « %s »\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1216 cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Annulation."
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Souhaitez-vous continuer [O/n] ? "
 
-#: cmdline/apt-get.cc:1303 cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Impossible de récupérer %s  %s\n"
 
-#: cmdline/apt-get.cc:1321
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Certains fichiers n'ont pu être téléchargés."
 
-#: cmdline/apt-get.cc:1322 cmdline/apt-get.cc:2583
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Téléchargement achevé et dans le mode téléchargement uniquement"
 
-#: cmdline/apt-get.cc:1328
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -993,20 +1017,20 @@
 "Impossible de récupérer quelques archives, peut-être devrez-vous lancer apt-"
 "get update ou essayer avec --fix-missing ?"
 
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 "l'option --fix-missing et l'échange de support ne sont pas encore reconnus."
 
-#: cmdline/apt-get.cc:1337
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Impossible de corriger le fait que les paquets manquent."
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Annulation de l'installation."
 
-#: cmdline/apt-get.cc:1366
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1020,39 +1044,39 @@
 "Les paquets suivants ont disparu du système car tous leurs fichiers\n"
 "ont été remplacés par d'autres paquets :"
 
-#: cmdline/apt-get.cc:1370
+#: cmdline/apt-get.cc:1381
 msgid "Note: This is done automatic and on purpose by dpkg."
 msgstr ""
 "Note : cette opération volontaire (effectuée par dpkg) est automatique."
 
-#: cmdline/apt-get.cc:1508
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 "La distribution cible « %s » indisponible pour le paquet « %s » est ignorée"
 
-#: cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Choix de « %s » comme paquet source à la place de « %s »\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1578
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "La version « %s » indisponible du paquet « %s » est ignorée"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "La commande de mise à jour ne prend pas d'argument"
 
-#: cmdline/apt-get.cc:1656
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
-"Aucune suppression n'est sensée se produire : impossible de lancer "
+"Aucune suppression n'est censée se produire : impossible de lancer "
 "« Autoremover »"
 
-#: cmdline/apt-get.cc:1751
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1071,16 +1095,16 @@
 #. "that package should be filed.") << endl;
 #. }
 #. 
-#: cmdline/apt-get.cc:1754 cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "L'information suivante devrait vous aider à résoudre la situation :"
 
-#: cmdline/apt-get.cc:1758
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 "Erreur interne, l'outil de suppression automatique a cassé quelque chose."
 
-#: cmdline/apt-get.cc:1765
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1092,7 +1116,7 @@
 "Les paquets suivants ont été installés automatiquement et ne sont plus "
 "nécessaires :"
 
-#: cmdline/apt-get.cc:1769
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1102,20 +1126,20 @@
 msgstr[1] ""
 "%lu paquets ont été installés automatiquement et ne sont plus nécessaires.\n"
 
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Veuillez utiliser « apt-get autoremove » pour les supprimer."
 
-#: cmdline/apt-get.cc:1790
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erreur interne, AllUpgrade a cassé le boulot !"
 
-#: cmdline/apt-get.cc:1889
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1123,7 +1147,7 @@
 "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n"
 "(ou indiquez une solution)."
 
-#: cmdline/apt-get.cc:1908
+#: cmdline/apt-get.cc:1929
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1135,77 +1159,77 @@
 "la distribution « unstable », que certains paquets n'ont pas encore\n"
 "été créés ou ne sont pas sortis d'« Incoming »."
 
-#: cmdline/apt-get.cc:1929
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Paquets défectueux"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Les paquets supplémentaires suivants seront installés :"
 
-#: cmdline/apt-get.cc:2045
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Paquets suggérés :"
 
-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Paquets recommandés :"
 
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossible de trouver le paquet %s"
 
-#: cmdline/apt-get.cc:2095 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s passé en « installé automatiquement ».\n"
 
-#: cmdline/apt-get.cc:2103 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
-"Cette commande est obsolète. Veuillez utiliser 'apt-mark auto' et 'apt-mark "
-"manual' à la place."
+"Cette commande est obsolète. Veuillez utiliser « apt-mark auto » et « apt-"
+"mark manual »."
 
-#: cmdline/apt-get.cc:2119
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Calcul de la mise à jour... "
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2143
 msgid "Failed"
 msgstr "Échec"
 
-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Fait"
 
-#: cmdline/apt-get.cc:2194 cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Erreur interne, la tentative de résolution du problème a cassé certaines "
 "parties"
 
-#: cmdline/apt-get.cc:2226 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Impossible de verrouiller le répertoire de téléchargement"
 
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr "Téléchargement de %s %s"
 
-#: cmdline/apt-get.cc:2368
+#: cmdline/apt-get.cc:2396
 msgid "Must specify at least one package to fetch source for"
 msgstr "Vous devez spécifier au moins un paquet source"
 
-#: cmdline/apt-get.cc:2408 cmdline/apt-get.cc:2720
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossible de trouver une source de paquet pour %s"
 
-#: cmdline/apt-get.cc:2425
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1215,7 +1239,7 @@
 "suivi de versions « %s » à l'adresse :\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2430
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1223,94 +1247,99 @@
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2483
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n"
 
-#: cmdline/apt-get.cc:2520
+#: cmdline/apt-get.cc:2548
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Pas assez d'espace disponible sur %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2529
+#: cmdline/apt-get.cc:2557
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Nécessité de prendre %so/%so dans les sources.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Nécessité de prendre %so dans les sources.\n"
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Récupération des sources %s\n"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Échec lors de la récupération de quelques archives."
 
-#: cmdline/apt-get.cc:2609
+#: cmdline/apt-get.cc:2637
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n"
 
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "La commande de décompactage « %s » a échoué.\n"
 
-#: cmdline/apt-get.cc:2622
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
 
-#: cmdline/apt-get.cc:2644
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "La commande de construction « %s » a échoué.\n"
 
-#: cmdline/apt-get.cc:2664
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Échec du processus fils"
 
-#: cmdline/apt-get.cc:2683
+#: cmdline/apt-get.cc:2711
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Il faut spécifier au moins un paquet pour vérifier les dépendances de "
 "construction"
 
-#: cmdline/apt-get.cc:2708
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) "
 "APT::Architectures for setup"
 msgstr ""
+"Aucune information sur l'architecture n'est disponible pour %s. Veuillez "
+"consulter la section à propos de APT::Architectures dans la page de manuel "
+"apt.conf(5)."
 
-#: cmdline/apt-get.cc:2725
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Impossible d'obtenir les dépendances de construction pour %s"
 
-#: cmdline/apt-get.cc:2745
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s n'a pas de dépendance de construction.\n"
 
-#: cmdline/apt-get.cc:2875
+#: cmdline/apt-get.cc:2909
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
+"La dépendance %s vis-à-vis de %s ne peut être satisfaite car %s n'est pas "
+"autorisé avec les paquets « %s »."
 
-#: cmdline/apt-get.cc:2896
+#: cmdline/apt-get.cc:2930
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1319,7 +1348,7 @@
 "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne "
 "peut être trouvé"
 
-#: cmdline/apt-get.cc:2919
+#: cmdline/apt-get.cc:2953
 #, c-format
 msgid ""
 "Failed to satisfy %s dependency for %s: Installed package %s is too new"
@@ -1327,45 +1356,49 @@
 "Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s "
 "est trop récent"
 
-#: cmdline/apt-get.cc:2958
+#: cmdline/apt-get.cc:2992
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
+"La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version "
+"disponible du paquet %s ne peut satisfaire les prérequis de version."
 
-#: cmdline/apt-get.cc:2964
+#: cmdline/apt-get.cc:2998
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
+"La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s "
+"n'a pas de version disponible."
 
-#: cmdline/apt-get.cc:2987
+#: cmdline/apt-get.cc:3021
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Impossible de satisfaire les dépendances %s pour %s : %s"
 
-#: cmdline/apt-get.cc:3003
+#: cmdline/apt-get.cc:3037
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 "Les dépendances de compilation pour %s ne peuvent pas être satisfaites."
 
-#: cmdline/apt-get.cc:3008
+#: cmdline/apt-get.cc:3042
 msgid "Failed to process build dependencies"
 msgstr "Impossible d'activer les dépendances de construction"
 
-#: cmdline/apt-get.cc:3101 cmdline/apt-get.cc:3113
+#: cmdline/apt-get.cc:3135 cmdline/apt-get.cc:3147
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Journal des modifications pour %s (%s)"
 
-#: cmdline/apt-get.cc:3235
+#: cmdline/apt-get.cc:3269
 msgid "Supported modules:"
 msgstr "Modules reconnus :"
 
-#: cmdline/apt-get.cc:3276
+#: cmdline/apt-get.cc:3310
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1410,8 +1443,52 @@
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
+"Usage : apt-get [options] commandes\n"
+"        apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+"        apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get est une interface simple en ligne de commande servant à\n"
+"télécharger et à installer les paquets. Les commandes les plus\n"
+"fréquemment employées sont update et install.\n"
+"\n"
+"Commandes :\n"
+"  update - Récupère les nouvelles listes de paquets\n"
+"  upgrade - Réalise une mise à jour\n"
+"  install - Installe de nouveaux paquets (pkg1 est libc6 et non libc6.deb)\n"
+"  remove - Supprime des paquets\n"
+"  autoremove - Supprime tous les paquets installés automatiquement\n"
+"  purge - Supprime des paquets et leurs fichiers de configuration\n"
+"  source - Télécharge les archives de sources\n"
+"  build-dep - Configure build-dependencies pour les paquets sources\n"
+"  dist-upgrade - Met à jour la distribution, reportez-vous à apt-get(8)\n"
+"  dselect-upgrade - Suit les sélections de dselect\n"
+"  clean - Supprime dans le cache local tous les fichiers téléchargés\n"
+"  autoclean - Supprime dans le cache local les fichiers inutiles\n"
+"  check - Vérifie qu'il n'y a pas de rupture de dépendances\n"
+"  changelog - Télécharge et affiche le journal des modifications\n"
+"              («  changelog ») du paquet indiqué\n"
+"  download - Télécharge le paquet dinaire dans le répertoire courant\n"
+"\n"
+"Options :\n"
+"  -h Ce texte d'aide\n"
+"  -q Message de sortie enregistrable - aucun indicateur de progression\n"
+"  -qq Aucun message de sortie, exceptés les messages d'erreur\n"
+"  -d Simple téléchargement - n'installe pas ou ne décompacte pas les "
+"archives\n"
+"  -s N'agit pas. Réalise uniquement une simulation de commande\n"
+"  -y Répond oui à toutes les questions et n'interroge pas l'utilisateur\n"
+"  -f Tente de poursuivre si le contrôle d'intégrité échoue\n"
+"  -m Tente de poursuivre si les archives ne sont pas localisables\n"
+"  -u Affiche une liste des paquets mis à jour\n"
+"  -b Construit la source du paquet après l'avoir récupérée\n"
+"  -V Affiche les numéros des versions de façon détaillée\n"
+"  -c=? Lit ce fichier de configuration\n"
+"  -o=? Place une option de configuration arbitraire, ex. -o dir::cache=/tmp\n"
+"Reportez-vous aux pages de manuels d'apt-get(8), sources.list(5) et\n"
+"apt.conf(5) pour plus d'informations et d'options.\n"
+"                      Cet APT a les « Super Cow Powers »\n"
 
-#: cmdline/apt-get.cc:3441
+#: cmdline/apt-get.cc:3475
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1425,33 +1502,33 @@
 "      et la situation n'est donc pas forcément représentative\n"
 "      de la réalité !"
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Atteint "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Réception de :"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ign "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Err "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%so réceptionnés en %s (%so/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [En cours]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1462,7 +1539,7 @@
 "« %s »\n"
 "dans le lecteur « %s » et appuyez sur la touche Entrée\n"
 
-#: cmdline/apt-internal-solver.cc:34
+#: cmdline/apt-internal-solver.cc:36
 msgid ""
 "Usage: apt-internal-resolver\n"
 "\n"
@@ -1478,46 +1555,48 @@
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-mark.cc:49
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "%s ne peut pas être marqué car il n'est pas installé.\n"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "%s était déjà marqué comme installé manuellement.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "%s était déjà marqué comme installé automatiquement.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "%s était déjà marqué comme figé (« hold »).\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "%s était déjà marqué comme non figé.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "%s passé en figé (« hold »).\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "Annulation de l'état figé pour %s.\n"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
+"Échec de l'exécution de dpkg. Possédez-vous les privilèges du "
+"superutilisateur ?"
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1539,11 +1618,11 @@
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Enregistrement de paquet inconnu !"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/apturl.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/apturl.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/apturl.po	2012-01-02 17:27:25.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/apturl.po	2012-02-23 06:31:48.000000000 +0000
@@ -9,8 +9,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:55+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:55+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "X-Poedit-Country: FRANCE\n"
 "X-Poedit-Language: French\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/aspell.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/aspell.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/aspell.po	2012-01-02 17:26:42.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/aspell.po	2012-02-23 06:31:08.000000000 +0000
@@ -19,8 +19,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:08+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:27+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: common/info.cpp:232
 msgid "a number between 0 and 1"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/attr.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/attr.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/attr.po	2012-01-02 17:26:42.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/attr.po	2012-02-23 06:31:08.000000000 +0000
@@ -24,8 +24,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:09+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:28+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../attr/attr.c:46
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/avahi.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/avahi.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/avahi.po	2012-01-02 17:27:16.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/avahi.po	2012-02-23 06:31:39.000000000 +0000
@@ -17,8 +17,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:56+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:55+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: ../avahi-common/error.c:30
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/bacula.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/bacula.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/bacula.po	2012-01-02 17:26:58.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/bacula.po	2012-02-23 06:31:25.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: Bacula 1.38\n"
 "Report-Msgid-Bugs-To: bacula-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-10-29 11:54+0200\n"
-"PO-Revision-Date: 2011-12-06 23:19+0000\n"
+"POT-Creation-Date: 2012-01-17 20:45+0100\n"
+"PO-Revision-Date: 2012-02-09 23:36+0000\n"
 "Last-Translator: Eric Bollengier <Unknown>\n"
 "Language-Team: French <bacula-devel-fr@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:31+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:13+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: src/dird/jobq.c:74
@@ -49,7 +49,7 @@
 msgstr ""
 
 #: src/dird/jobq.c:220 src/dird/job.c:113 src/stored/dircmd.c:198
-#: src/stored/stored.c:531
+#: src/stored/stored.c:503
 #, c-format
 msgid "Unable to init job cond variable: ERR=%s\n"
 msgstr ""
@@ -88,34 +88,34 @@
 #: src/dird/ua_select.c:54
 #, c-format
 msgid "The current %s retention period is: %s\n"
-msgstr "La période de rétention courante %s est : %s\n"
+msgstr "La période de rétention courante %s est : %s\n"
 
 #: src/dird/ua_select.c:59
 msgid "Continue? (yes/mod/no): "
-msgstr "Continuer ? (oui/mod/non) : "
+msgstr "Continuer ? (oui/mod/non) : "
 
-#: src/dird/ua_select.c:62 src/dird/ua_run.c:226
+#: src/dird/ua_select.c:62 src/dird/ua_run.c:232
 msgid "mod"
 msgstr "mod"
 
 #: src/dird/ua_select.c:63
 msgid "Enter new retention period: "
-msgstr "Saisissez une nouvelle période de rétention : "
+msgstr "Saisissez une nouvelle période de rétention : "
 
 #: src/dird/ua_select.c:67
 msgid "Invalid period.\n"
-msgstr "Période invalide.\n"
+msgstr "Période invalide.\n"
 
 #: src/dird/ua_select.c:143
 msgid "You have the following choices:\n"
-msgstr "Vous avez les choix suivants :\n"
+msgstr "Vous avez les choix suivants :\n"
 
 #: src/dird/ua_select.c:159
 msgid "The defined Storage resources are:\n"
-msgstr "Les ressources de Stockage définies sont :\n"
+msgstr "Les ressources de Stockage définies sont :\n"
 
-#: src/dird/ua_select.c:167 src/dird/ua_dotcmds.c:697 src/dird/ua_cmds.c:1000
-#: src/dird/ua_run.c:231 src/wx-console/wxbrestorepanel.cpp:339
+#: src/dird/ua_select.c:167 src/dird/ua_dotcmds.c:715 src/dird/ua_cmds.c:996
+#: src/dird/ua_run.c:237 src/wx-console/wxbrestorepanel.cpp:339
 #: src/wx-console/wxbrestorepanel.cpp:355
 #: src/wx-console/wxbrestorepanel.cpp:479
 #: src/wx-console/wxbrestorepanel.cpp:480
@@ -130,21 +130,21 @@
 
 #: src/dird/ua_select.c:167
 msgid "Select Storage resource"
-msgstr "Sélectionnez la ressource de Stockage"
+msgstr "Sélectionnez la ressource de Stockage"
 
 #: src/dird/ua_select.c:182 src/dird/ua_restore.c:1296
 msgid "The defined FileSet resources are:\n"
-msgstr "Les FileSet définis sont :\n"
+msgstr "Les FileSet définis sont :\n"
 
-#: src/dird/ua_select.c:190 src/dird/ua_restore.c:1300 src/dird/ua_run.c:233
+#: src/dird/ua_select.c:190 src/dird/ua_restore.c:1300 src/dird/ua_run.c:239
 msgid "FileSet"
 msgstr "FileSet"
 
 #: src/dird/ua_select.c:190 src/dird/ua_restore.c:1300
 msgid "Select FileSet resource"
-msgstr "Sélectionnez le FileSet"
+msgstr "Sélectionnez le FileSet"
 
-#: src/dird/ua_select.c:220 src/dird/ua_cmds.c:1987
+#: src/dird/ua_select.c:220 src/dird/ua_cmds.c:1983
 msgid "Could not find a Catalog resource\n"
 msgstr "Impossible de trouver un Catalogue\n"
 
@@ -155,7 +155,7 @@
 
 #: src/dird/ua_select.c:229
 msgid "The defined Catalog resources are:\n"
-msgstr "Les Catalogues définis sont :\n"
+msgstr "Les Catalogues définis sont :\n"
 
 #: src/dird/ua_select.c:237
 msgid "Catalog"
@@ -163,21 +163,21 @@
 
 #: src/dird/ua_select.c:237
 msgid "Select Catalog resource"
-msgstr "Sélectionnez le Catalogue"
+msgstr "Sélectionnez le Catalogue"
 
 #: src/dird/ua_select.c:255 src/dird/ua_select.c:281
 msgid "The defined Job resources are:\n"
-msgstr "Les Job définis sont :\n"
+msgstr "Les Job définis sont :\n"
 
 #: src/dird/ua_select.c:266 src/dird/ua_select.c:289 src/dird/ua_select.c:330
 #: src/dird/ua_select.c:1187 src/dird/dird_conf.c:650 src/dird/ua_prune.c:593
-#: src/dird/ua_run.c:232
+#: src/dird/ua_run.c:238
 msgid "Job"
 msgstr "Job"
 
 #: src/dird/ua_select.c:266 src/dird/ua_select.c:289
 msgid "Select Job resource"
-msgstr "Sélectionnez le Job"
+msgstr "Sélectionnez le Job"
 
 #: src/dird/ua_select.c:308
 #, c-format
@@ -186,18 +186,18 @@
 
 #: src/dird/ua_select.c:322
 msgid "The defined Restore Job resources are:\n"
-msgstr "Les Job de restauration sont :\n"
+msgstr "Les Job de restauration sont :\n"
 
 #: src/dird/ua_select.c:330
 msgid "Select Restore Job"
-msgstr "Sélectionnez le Job de restauration"
+msgstr "Sélectionnez le Job de restauration"
 
 #: src/dird/ua_select.c:347
 msgid "The defined Client resources are:\n"
-msgstr "Les clients définis sont :\n"
+msgstr "Les clients définis sont :\n"
 
-#: src/dird/ua_select.c:355 src/dird/ua_select.c:464 src/dird/ua_dotcmds.c:698
-#: src/dird/ua_cmds.c:1001 src/dird/ua_run.c:237
+#: src/dird/ua_select.c:355 src/dird/ua_select.c:464 src/dird/ua_dotcmds.c:716
+#: src/dird/ua_cmds.c:997 src/dird/ua_run.c:243
 #: src/wx-console/wxbrestorepanel.cpp:336
 #: src/wx-console/wxbrestorepanel.cpp:354
 #: src/wx-console/wxbrestorepanel.cpp:431
@@ -217,22 +217,22 @@
 
 #: src/dird/ua_select.c:355
 msgid "Select Client (File daemon) resource"
-msgstr "Sélectionnez le client (File daemon)"
+msgstr "Sélectionnez le client (File daemon)"
 
 #: src/dird/ua_select.c:382
 #, c-format
 msgid "Error: Client resource %s does not exist.\n"
-msgstr "Erreur : le client %s n'est pas définie.\n"
+msgstr "Erreur : le client %s n'est pas définie.\n"
 
 #: src/dird/ua_select.c:407
 #, c-format
 msgid "Could not find Client %s: ERR=%s"
-msgstr "Impossible de trouver le client %s : ERR=%s"
+msgstr "Impossible de trouver le client %s : ERR=%s"
 
 #: src/dird/ua_select.c:417 src/dird/ua_select.c:471
 #, c-format
 msgid "Could not find Client \"%s\": ERR=%s"
-msgstr "Impossible de trouver le client « %s » : ERR=%s"
+msgstr "Impossible de trouver le client \"%s\" : ERR=%s"
 
 #: src/dird/ua_select.c:446
 #, c-format
@@ -242,35 +242,35 @@
 #: src/dird/ua_select.c:450
 msgid "No clients defined. You must run a job before using this command.\n"
 msgstr ""
-"Pas de client défini. Vous devez lancer une sauvegarde avant d'utiliser "
+"Pas de client défini. Vous devez lancer une sauvegarde avant d'utiliser "
 "cette commande.\n"
 
 #: src/dird/ua_select.c:454
 msgid "Defined Clients:\n"
-msgstr "Clients définis :\n"
+msgstr "Clients définis :\n"
 
 #: src/dird/ua_select.c:464
 msgid "Select the Client"
-msgstr "Sélectionnez le client"
+msgstr "Sélectionnez le client"
 
 #: src/dird/ua_select.c:497 src/dird/ua_select.c:521 src/dird/ua_select.c:566
 #, c-format
 msgid "Could not find Pool \"%s\": ERR=%s"
-msgstr "Impossible de trouver le Pool « %s » : ERR=%s"
+msgstr "Impossible de trouver le Pool \"%s\" : ERR=%s"
 
 #: src/dird/ua_select.c:532 src/dird/ua_output.c:474 src/dird/ua_update.c:437
 #, c-format
 msgid "Error obtaining pool ids. ERR=%s\n"
-msgstr "Erreur pendant lors de la récupération du pool. ERR=%s\n"
+msgstr "Erreur pendant lors de la récupération du pool. ERR=%s\n"
 
 #: src/dird/ua_select.c:536
 msgid "No pools defined. Use the \"create\" command to create one.\n"
 msgstr ""
-"Pas de Pool défini. Utilisez la commande « create » pour en créer un.\n"
+"Pas de Pool défini. Utilisez la commande « create » pour en créer un.\n"
 
 #: src/dird/ua_select.c:540
 msgid "Defined Pools:\n"
-msgstr "Pools définis :\n"
+msgstr "Pools définis :\n"
 
 #: src/dird/ua_select.c:542 src/dird/ua_select.c:562 src/dird/ua_update.c:364
 #: src/baconfig.h:80
@@ -278,7 +278,7 @@
 msgstr ""
 
 #: src/dird/ua_select.c:553 src/dird/ua_select.c:667 src/dird/ua_update.c:615
-#: src/dird/ua_run.c:245 src/wx-console/wxbrestorepanel.cpp:338
+#: src/dird/ua_run.c:251 src/wx-console/wxbrestorepanel.cpp:338
 #: src/wx-console/wxbrestorepanel.cpp:527
 #: src/wx-console/wxbrestorepanel.cpp:537
 #: src/wx-console/wxbrestorepanel.cpp:1834
@@ -287,12 +287,12 @@
 
 #: src/dird/ua_select.c:553
 msgid "Select the Pool"
-msgstr "Sélectionnez le Pool"
+msgstr "Sélectionnez le Pool"
 
 #: src/dird/ua_select.c:591
 #, c-format
 msgid "No access to Pool \"%s\"\n"
-msgstr "Pas d'accès au Pool « %s »\n"
+msgstr "Pas d'accès au Pool \"%s\"\n"
 
 #: src/dird/ua_select.c:624
 msgid "Enter *MediaId or Volume name: "
@@ -300,30 +300,30 @@
 
 #: src/dird/ua_select.c:659
 msgid "The defined Pool resources are:\n"
-msgstr "Les Pools définis sont :\n"
+msgstr "Les Pools définis sont :\n"
 
 #: src/dird/ua_select.c:667
 msgid "Select Pool resource"
-msgstr "Sélectionnez le Pool"
+msgstr "Sélectionnez le Pool"
 
 #: src/dird/ua_select.c:691 src/dird/ua_restore.c:555
 #, c-format
 msgid "Error: Pool resource \"%s\" does not exist.\n"
-msgstr "Erreur : le Pool « %s » n'existe pas.\n"
+msgstr "Erreur : le Pool \"%s\" n'existe pas.\n"
 
 #: src/dird/ua_select.c:702
 msgid "Enter the JobId to select: "
-msgstr "Entrez le JobId à sélectionner : "
+msgstr "Entrez le JobId à sélectionner : "
 
 #: src/dird/ua_select.c:740
 #, c-format
 msgid "Could not find Job \"%s\": ERR=%s"
-msgstr "Impossible de trouver le Job « %s » : ERR=%s"
+msgstr "Impossible de trouver le Job \"%s\" : ERR=%s"
 
 #: src/dird/ua_select.c:820
 #, c-format
 msgid "Automatically selected %s: %s\n"
-msgstr "Sélection automatique %s : %s\n"
+msgstr "Sélection automatique %s : %s\n"
 
 #: src/dird/ua_select.c:831
 #, c-format
@@ -335,16 +335,16 @@
 #: src/dird/ua_select.c:849
 #, c-format
 msgid "Selection list for \"%s\" is empty!\n"
-msgstr "La sélection pour « %s » est vide !\n"
+msgstr "La sélection pour \"%s\" est vide !\n"
 
 #: src/dird/ua_select.c:855
 #, c-format
 msgid "Automatically selected: %s\n"
-msgstr "Sélection automatique : %s\n"
+msgstr "Sélection automatique : %s\n"
 
 #: src/dird/ua_select.c:867
 msgid "Selection aborted, nothing done.\n"
-msgstr "Sélection annulée, rien de fait.\n"
+msgstr "Sélection annulée, rien de fait.\n"
 
 #: src/dird/ua_select.c:872
 #, c-format
@@ -358,7 +358,7 @@
 #: src/dird/ua_select.c:938
 #, c-format
 msgid "Expecting jobid=nn command, got: %s\n"
-msgstr "Attendait l'option jobid=nn, pas : %s\n"
+msgstr "Attendait l'option jobid=nn, pas : %s\n"
 
 #: src/dird/ua_select.c:942
 #, c-format
@@ -368,30 +368,30 @@
 #: src/dird/ua_select.c:952
 #, c-format
 msgid "Expecting job=xxx, got: %s.\n"
-msgstr "Attendait l'option job=xxx, pas : %s\n"
+msgstr "Attendait l'option job=xxx, pas : %s\n"
 
 #: src/dird/ua_select.c:956 src/dird/ua_select.c:968
 #, c-format
 msgid "Job \"%s\" is not running.\n"
-msgstr "Job « %s » n'est pas en cours.\n"
+msgstr "Job \"%s\" n'est pas en cours.\n"
 
 #: src/dird/ua_select.c:964
 #, c-format
 msgid "Expecting ujobid=xxx, got: %s.\n"
-msgstr "Attendait l'option ujobid=xxx, pas : %s\n"
+msgstr "Attendait l'option ujobid=xxx, pas : %s\n"
 
 #: src/dird/ua_select.c:984
 #, c-format
 msgid "Storage resource \"%s\": not found\n"
-msgstr "Storage resource « %s » : non trouvé\n"
+msgstr "Storage resource \"%s\" : non trouvé\n"
 
 #: src/dird/ua_select.c:1016
 msgid "Enter autochanger drive[0]: "
-msgstr "Saisissez le numéro du lecteur de l'autochanger [0] : "
+msgstr "Saisissez le numéro du lecteur de l'autochanger [0] : "
 
 #: src/dird/ua_select.c:1037
 msgid "Enter autochanger slot: "
-msgstr "Saisissez le slot de l'autochanger [0] : "
+msgstr "Saisissez le slot de l'autochanger [0] : "
 
 #: src/dird/ua_select.c:1067
 msgid "Media Types defined in conf file:\n"
@@ -413,9 +413,9 @@
 #: src/dird/ua_select.c:1121 src/dird/ua_select.c:1131
 #, c-format
 msgid "Warning Job %s is not running. Continuing anyway ...\n"
-msgstr "Attention le Job %s n'est pas en cours. Continuons quand même...\n"
+msgstr "Attention le Job %s n'est pas en cours. Continuons quand même...\n"
 
-#: src/dird/ua_select.c:1141 src/dird/ua_cmds.c:697 src/dird/ua_cmds.c:743
+#: src/dird/ua_select.c:1141 src/dird/ua_cmds.c:693 src/dird/ua_cmds.c:739
 msgid "Unauthorized command from this console.\n"
 msgstr "Commande interdite depuis cette console.\n"
 
@@ -429,7 +429,7 @@
 
 #: src/dird/ua_select.c:1173
 msgid "Select Job:\n"
-msgstr "Sélectionnez le Job :\n"
+msgstr "Sélectionnez le Job :\n"
 
 #: src/dird/ua_select.c:1182
 #, c-format
@@ -451,16 +451,16 @@
 
 #: src/dird/ua_select.c:1194
 msgid "Confirm cancel?"
-msgstr "Confirmez l'annulation :"
+msgstr "Confirmez l'annulation :"
 
 #: src/dird/ua_select.c:1200
 msgid "Confirm cancel (yes/no): "
-msgstr "Confirmez l'annulation (oui/non) : "
+msgstr "Confirmez l'annulation (oui/non) : "
 
-#: src/dird/ua_select.c:1209 src/dird/ua_cmds.c:738 src/dird/ua_cmds.c:1105
+#: src/dird/ua_select.c:1209 src/dird/ua_cmds.c:734 src/dird/ua_cmds.c:1101
 #, c-format
 msgid "Job \"%s\" not found.\n"
-msgstr "Job « %s » non trouvé.\n"
+msgstr "Job \"%s\" non trouvé.\n"
 
 #: src/dird/bsr.c:173
 #, c-format
@@ -475,7 +475,7 @@
 #: src/dird/bsr.c:232
 #, c-format
 msgid "Unable to create bootstrap file %s. ERR=%s\n"
-msgstr "Impossible de créer le fichier bootstrap %s. ERR=%s\n"
+msgstr "Impossible de créer le fichier bootstrap %s. ERR=%s\n"
 
 #: src/dird/bsr.c:241
 msgid "No files found to read. No bootstrap file written.\n"
@@ -483,12 +483,12 @@
 
 #: src/dird/bsr.c:245
 msgid "Error writing bsr file.\n"
-msgstr "Erreur pendant l'écriture du fichier bsr.\n"
+msgstr "Erreur pendant l'écriture du fichier bsr.\n"
 
 #: src/dird/bsr.c:250
 #, c-format
 msgid "Bootstrap records written to %s\n"
-msgstr "Fichier bootstrap écrit sur %s\n"
+msgstr "Fichier bootstrap écrit sur %s\n"
 
 #: src/dird/bsr.c:298
 msgid ""
@@ -496,13 +496,13 @@
 "   Volume(s)                 Storage(s)                SD Device(s)\n"
 "===========================================================================\n"
 msgstr ""
-"Ce job va utiliser les éléments suivants :\n"
+"Ce job va utiliser les éléments suivants :\n"
 "   Volume(s)                 Storage(s)                SD Device(s)\n"
 "===========================================================================\n"
 
 #: src/dird/bsr.c:317
 msgid "No Volumes found to restore.\n"
-msgstr "Aucun volume trouvé pour la restauration.\n"
+msgstr "Aucun volume trouvé pour la restauration.\n"
 
 #: src/dird/bsr.c:319
 msgid ""
@@ -530,13 +530,13 @@
 "Please run a Verify with Level=InitCatalog before\n"
 "running the current Job.\n"
 msgstr ""
-"Impossible de trouvé JobId d'un précédent Job « InitCatalog.\n"
+"Impossible de trouvé JobId d'un précédent Job « InitCatalog.\n"
 "Il faut lancer un Job Verify avec l'option Level=InitCatalog avant\n"
 "de lancer le Job courant.\n"
 
 #: src/dird/verify.c:153
 msgid "Unable to find JobId of previous Job for this client.\n"
-msgstr "Impossible de trouver JobId d'un précédent Job pour ce client.\n"
+msgstr "Impossible de trouver JobId d'un précédent Job pour ce client.\n"
 
 #: src/dird/verify.c:170
 #, c-format
@@ -546,7 +546,7 @@
 #: src/dird/verify.c:176
 #, c-format
 msgid "Last Job %d did not terminate normally. JobStatus=%c\n"
-msgstr "Le dernier job %d ne s'est pas terminé correctement. JobStatus=%c\n"
+msgstr "Le dernier job %d ne s'est pas terminé correctement. JobStatus=%c\n"
 
 #: src/dird/verify.c:180
 #, c-format
@@ -567,32 +567,32 @@
 msgid "Unimplemented verify level %d\n"
 msgstr ""
 
-#: src/dird/verify.c:424
+#: src/dird/verify.c:421
 msgid "Verify OK"
-msgstr "Vérification OK"
+msgstr "Vérification OK"
 
-#: src/dird/verify.c:428
+#: src/dird/verify.c:425
 msgid "*** Verify Error ***"
-msgstr "*** Erreur de Vérification ***"
+msgstr "*** Erreur de Vérification ***"
 
-#: src/dird/verify.c:432
+#: src/dird/verify.c:429
 msgid "Verify warnings"
 msgstr "Vérifier les avertissements"
 
-#: src/dird/verify.c:435
+#: src/dird/verify.c:432
 msgid "Verify Canceled"
-msgstr "Vérification annulée"
+msgstr "Vérification annulée"
 
-#: src/dird/verify.c:438
+#: src/dird/verify.c:435
 msgid "Verify Differences"
 msgstr "Vérifier les différences"
 
-#: src/dird/verify.c:443
+#: src/dird/verify.c:440
 #, c-format
 msgid "Inappropriate term code: %d %c\n"
 msgstr ""
 
-#: src/dird/verify.c:457
+#: src/dird/verify.c:454
 #, c-format
 msgid ""
 "%s %s %s (%s):\n"
@@ -615,7 +615,7 @@
 "\n"
 msgstr ""
 
-#: src/dird/verify.c:492
+#: src/dird/verify.c:489
 #, c-format
 msgid ""
 "%s %s %s (%s):\n"
@@ -636,102 +636,102 @@
 "\n"
 msgstr ""
 
-#: src/dird/verify.c:570
+#: src/dird/verify.c:567
 #, c-format
 msgid ""
 "bird<filed: bad attributes, expected 3 fields got %d\n"
 " mslen=%d msg=%s\n"
 msgstr ""
 
-#: src/dird/verify.c:615
+#: src/dird/verify.c:612
 #, c-format
 msgid "New file: %s\n"
-msgstr "Nouveau Fichier : %s\n"
+msgstr "Nouveau Fichier : %s\n"
 
-#: src/dird/verify.c:616
+#: src/dird/verify.c:613
 #, c-format
 msgid "File not in catalog: %s\n"
-msgstr "Fichier absent du catalogue : %s\n"
+msgstr "Fichier absent du catalogue : %s\n"
 
-#: src/dird/verify.c:640
+#: src/dird/verify.c:637
 #, c-format
 msgid "      st_ino   differ. Cat: %s File: %s\n"
 msgstr ""
 
-#: src/dird/verify.c:649
+#: src/dird/verify.c:646
 #, c-format
 msgid "      st_mode  differ. Cat: %x File: %x\n"
 msgstr ""
 
-#: src/dird/verify.c:657
+#: src/dird/verify.c:654
 #, c-format
 msgid "      st_nlink differ. Cat: %d File: %d\n"
 msgstr ""
 
-#: src/dird/verify.c:665
+#: src/dird/verify.c:662
 #, c-format
 msgid "      st_uid   differ. Cat: %u File: %u\n"
 msgstr ""
 
-#: src/dird/verify.c:673
+#: src/dird/verify.c:670
 #, c-format
 msgid "      st_gid   differ. Cat: %u File: %u\n"
 msgstr ""
 
-#: src/dird/verify.c:681
+#: src/dird/verify.c:678
 #, c-format
 msgid "      st_size  differ. Cat: %s File: %s\n"
 msgstr ""
 
-#: src/dird/verify.c:690
+#: src/dird/verify.c:687
 msgid "      st_atime differs\n"
 msgstr ""
 
-#: src/dird/verify.c:697
+#: src/dird/verify.c:694
 msgid "      st_mtime differs\n"
 msgstr ""
 
-#: src/dird/verify.c:704
+#: src/dird/verify.c:701
 msgid "      st_ctime differs\n"
 msgstr ""
 
-#: src/dird/verify.c:711
+#: src/dird/verify.c:708
 #, c-format
 msgid "      st_size  decrease. Cat: %s File: %s\n"
 msgstr ""
 
-#: src/dird/verify.c:741
+#: src/dird/verify.c:738
 #, c-format
 msgid "MD5/SHA1 index %d not same as attributes %d\n"
 msgstr ""
 
-#: src/dird/verify.c:749
+#: src/dird/verify.c:746
 #, c-format
 msgid "      %s differs. File=%s Cat=%s\n"
 msgstr ""
 
-#: src/dird/verify.c:760
+#: src/dird/verify.c:757
 #, c-format
 msgid "bdird<filed: bad attributes from filed n=%d : %s\n"
 msgstr ""
 
-#: src/dird/verify.c:799
+#: src/dird/verify.c:796
 #, c-format
 msgid "The following files are in the Catalog but not on %s:\n"
 msgstr ""
 
-#: src/dird/verify.c:814 src/tools/testfind.c:417
+#: src/dird/verify.c:811 src/tools/testfind.c:420
 #, c-format
 msgid "File: %s\n"
-msgstr "Fichier : %s\n"
+msgstr "Fichier : %s\n"
 
 #: src/dird/admin.c:66
 #, c-format
 msgid "Start Admin JobId %d, Job=%s\n"
 msgstr ""
 
-#: src/dird/admin.c:92 src/dird/vbackup.c:304 src/dird/migrate.c:1216
-#: src/dird/backup.c:620
+#: src/dird/admin.c:92 src/dird/vbackup.c:304 src/dird/migrate.c:1226
+#: src/dird/backup.c:618
 #, c-format
 msgid "Error getting Job record for Job report: ERR=%s"
 msgstr ""
@@ -746,9 +746,9 @@
 
 #: src/dird/admin.c:108
 msgid "Admin Canceled"
-msgstr "Admin Annulé"
+msgstr "Admin Annulé"
 
-#: src/dird/admin.c:112 src/dird/vbackup.c:354 src/dird/backup.c:676
+#: src/dird/admin.c:112 src/dird/vbackup.c:354 src/dird/backup.c:674
 #: src/dird/restore.c:591
 #, c-format
 msgid "Inappropriate term code: %c\n"
@@ -758,7 +758,7 @@
 msgid "Bacula "
 msgstr "Bacula "
 
-#: src/dird/dird.c:111
+#: src/dird/dird.c:112
 #, c-format
 msgid ""
 "\n"
@@ -780,66 +780,66 @@
 "\n"
 msgstr ""
 
-#: src/dird/dird.c:257 src/stored/stored.c:243 src/console/console.c:1109
-#: src/filed/filed.c:217 src/qt-console/main.cpp:156
+#: src/dird/dird.c:258 src/stored/stored.c:227 src/console/console.c:1109
+#: src/filed/filed.c:218 src/qt-console/main.cpp:165
 msgid "Cryptography library initialization failed.\n"
 msgstr ""
 
-#: src/dird/dird.c:261 src/dird/dird.c:289 src/dird/dird.c:535
-#: src/dird/dird.c:538 src/stored/stored.c:247 src/console/console.c:1113
-#: src/filed/filed.c:222 src/qt-console/main.cpp:160
+#: src/dird/dird.c:262 src/dird/dird.c:292 src/dird/dird.c:538
+#: src/dird/dird.c:541 src/stored/stored.c:231 src/console/console.c:1113
+#: src/filed/filed.c:223 src/qt-console/main.cpp:169
 #, c-format
 msgid "Please correct configuration file: %s\n"
 msgstr "Merci de corriger le fichier de configuration : %s\n"
 
-#: src/dird/dird.c:521
+#: src/dird/dird.c:524
 msgid "Too many open reload requests. Request ignored.\n"
 msgstr ""
 
-#: src/dird/dird.c:536
+#: src/dird/dird.c:539
 msgid "Out of reload table entries. Giving up.\n"
 msgstr ""
 
-#: src/dird/dird.c:539
+#: src/dird/dird.c:542
 msgid "Resetting previous configuration.\n"
-msgstr "Retour à la dernière configuration.\n"
+msgstr "Retour à la dernière configuration.\n"
 
-#: src/dird/dird.c:603
+#: src/dird/dird.c:606
 #, c-format
 msgid ""
 "No Director resource defined in %s\n"
 "Without that I don't know who I am :-(\n"
 msgstr ""
 
-#: src/dird/dird.c:611 src/filed/filed.c:348
+#: src/dird/dird.c:614 src/filed/filed.c:350
 #, c-format
 msgid "No Messages resource defined in %s\n"
 msgstr ""
 
-#: src/dird/dird.c:616
+#: src/dird/dird.c:619
 #, c-format
 msgid "Only one Director resource permitted in %s\n"
 msgstr ""
 
-#: src/dird/dird.c:625 src/dird/dird.c:831 src/dird/dird.c:886
-#: src/dird/dird.c:1053 src/stored/stored.c:382 src/console/console.c:1296
-#: src/console/console.c:1326 src/filed/filed.c:355 src/filed/filed.c:514
+#: src/dird/dird.c:628 src/dird/dird.c:834 src/dird/dird.c:889
+#: src/dird/dird.c:1056 src/stored/stored.c:354 src/console/console.c:1296
+#: src/console/console.c:1326 src/filed/filed.c:357 src/filed/filed.c:516
 #: src/wx-console/console_thread.cpp:118 src/wx-console/console_thread.cpp:144
-#: src/qt-console/main.cpp:212 src/qt-console/main.cpp:242
+#: src/qt-console/main.cpp:224 src/qt-console/main.cpp:254
 msgid "TLS required but not configured in Bacula.\n"
 msgstr ""
 
-#: src/dird/dird.c:633 src/stored/stored.c:438 src/filed/filed.c:524
+#: src/dird/dird.c:636 src/stored/stored.c:410 src/filed/filed.c:526
 #, c-format
 msgid "\"TLS Certificate\" file not defined for Director \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:639 src/stored/stored.c:444 src/filed/filed.c:530
+#: src/dird/dird.c:642 src/stored/stored.c:416 src/filed/filed.c:532
 #, c-format
 msgid "\"TLS Key\" file not defined for Director \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:646 src/stored/stored.c:450 src/filed/filed.c:536
+#: src/dird/dird.c:649 src/stored/stored.c:422 src/filed/filed.c:538
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
@@ -847,46 +847,46 @@
 "using \"TLS Verify Peer\".\n"
 msgstr ""
 
-#: src/dird/dird.c:665 src/stored/stored.c:469 src/filed/filed.c:555
+#: src/dird/dird.c:668 src/stored/stored.c:441 src/filed/filed.c:557
 #, c-format
 msgid "Failed to initialize TLS context for Director \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:673
+#: src/dird/dird.c:676
 #, c-format
 msgid "No Job records defined in %s\n"
 msgstr ""
 
-#: src/dird/dird.c:731 src/dird/dird.c:744
+#: src/dird/dird.c:734 src/dird/dird.c:747
 #, c-format
 msgid "Hey something is wrong. p=0x%lu\n"
 msgstr ""
 
-#: src/dird/dird.c:805
+#: src/dird/dird.c:808
 #, c-format
 msgid "\"%s\" directive in Job \"%s\" resource is required, but not found.\n"
 msgstr ""
 
-#: src/dird/dird.c:812
+#: src/dird/dird.c:815
 msgid "Too many items in Job resource\n"
 msgstr ""
 
-#: src/dird/dird.c:816
+#: src/dird/dird.c:819
 #, c-format
 msgid "No storage specified in Job \"%s\" nor in Pool.\n"
-msgstr "Pas de Storage spécifié dans le job « %s » ni dans le Pool.\n"
+msgstr "Pas de Storage spécifié dans le job \"%s\" ni dans le Pool.\n"
 
-#: src/dird/dird.c:840
+#: src/dird/dird.c:843
 #, c-format
 msgid "\"TLS Certificate\" file not defined for Console \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:846
+#: src/dird/dird.c:849
 #, c-format
 msgid "\"TLS Key\" file not defined for Console \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:853
+#: src/dird/dird.c:856
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
@@ -894,48 +894,47 @@
 "using \"TLS Verify Peer\".\n"
 msgstr ""
 
-#: src/dird/dird.c:870 src/dird/dird.c:910 src/filed/filed.c:380
+#: src/dird/dird.c:873 src/dird/dird.c:913 src/filed/filed.c:382
 #, c-format
 msgid "Failed to initialize TLS context for File daemon \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:893
+#: src/dird/dird.c:896
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "File daemon \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:950 src/dird/dird.c:952
+#: src/dird/dird.c:953 src/dird/dird.c:955
 #, c-format
 msgid "Could not open Catalog \"%s\", database \"%s\".\n"
 msgstr ""
-"Impossible d'ouvrir le catalogue « %s », sur la base de données "
-"« %s ».\n"
+"Impossible d'ouvrir le catalogue \"%s\", sur la base de données \"%s\".\n"
 
-#: src/dird/dird.c:955 src/tools/cats_test.c:377
+#: src/dird/dird.c:958 src/tools/cats_test.c:377
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/dird/dird.c:1034
+#: src/dird/dird.c:1037
 #, c-format
 msgid "Could not create storage record for %s\n"
 msgstr ""
 
-#: src/dird/dird.c:1042
+#: src/dird/dird.c:1045
 #, c-format
 msgid "Could not update storage record for %s\n"
 msgstr ""
 
-#: src/dird/dird.c:1061
+#: src/dird/dird.c:1064
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "Storage \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:1077 src/stored/stored.c:422
+#: src/dird/dird.c:1080 src/stored/stored.c:394
 #, c-format
 msgid "Failed to initialize TLS context for Storage \"%s\" in %s.\n"
 msgstr ""
@@ -954,18 +953,18 @@
 msgid "Old style Include/Exclude not supported\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:393 src/dird/inc_conf.c:742 src/dird/dird_conf.c:1994
+#: src/dird/inc_conf.c:393 src/dird/inc_conf.c:739 src/dird/dird_conf.c:1993
 #, c-format
 msgid "Expecting keyword, got: %s\n"
 msgstr "Attendait un mot clef, eu : %s\n"
 
-#: src/dird/inc_conf.c:401 src/dird/inc_conf.c:748 src/dird/dird_conf.c:2000
+#: src/dird/inc_conf.c:401 src/dird/inc_conf.c:745 src/dird/dird_conf.c:1999
 #: src/lib/parse_conf.c:976
 #, c-format
 msgid "expected an equals, got: %s"
-msgstr "attendait un égale, eu : %s"
+msgstr "attendait un égale, eu : %s"
 
-#: src/dird/inc_conf.c:411 src/dird/inc_conf.c:757 src/dird/dird_conf.c:2011
+#: src/dird/inc_conf.c:411 src/dird/inc_conf.c:754 src/dird/dird_conf.c:2010
 #, c-format
 msgid "Keyword %s not permitted in this resource"
 msgstr ""
@@ -980,70 +979,70 @@
 msgid "Expected a regex string, got: %s\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:561
+#: src/dird/inc_conf.c:559
 #, c-format
 msgid "Expected a wild-card string, got: %s\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:584
+#: src/dird/inc_conf.c:582
 #, c-format
 msgid "Expected an fstype string, got: %s\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:596
+#: src/dird/inc_conf.c:593
 msgid "ExcludeDirContaining directive not permitted in Exclude.\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:623
+#: src/dird/inc_conf.c:620
 #, c-format
 msgid "Expected an drivetype string, got: %s\n"
-msgstr "Attendait un type de lecteur, pas : %s\n"
+msgstr "Attendait un type de lecteur, pas : %s\n"
 
-#: src/dird/inc_conf.c:647 src/dird/inc_conf.c:690
+#: src/dird/inc_conf.c:644 src/dird/inc_conf.c:687
 #, c-format
 msgid "Backslash found. Use forward slashes or quote the string.: %s\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:662 src/dird/inc_conf.c:705
+#: src/dird/inc_conf.c:659 src/dird/inc_conf.c:702
 #, c-format
 msgid "Expected a filename, got: %s"
 msgstr "Attendait un nom de fichier, eu : %s"
 
-#: src/dird/inc_conf.c:679
+#: src/dird/inc_conf.c:676
 msgid "Plugin directive not permitted in Exclude\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:722
+#: src/dird/inc_conf.c:719
 msgid "Options section not permitted in Exclude\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:727 src/dird/dird_conf.c:1980
+#: src/dird/inc_conf.c:724 src/dird/dird_conf.c:1979
 #, c-format
 msgid "Expecting open brace. Got %s"
 msgstr "Attendait {, eu : %s"
 
-#: src/dird/inc_conf.c:782
+#: src/dird/inc_conf.c:779
 #, c-format
 msgid "Expected a FileSet keyword, got: %s"
-msgstr "Attendait le mot clef FileSet, eu : %s"
+msgstr "Attendait le mot clef FileSet, eu : %s"
 
-#: src/dird/ua_query.c:73 src/findlib/create_file.c:291
-#: src/findlib/create_file.c:394
+#: src/dird/ua_query.c:73 src/findlib/create_file.c:288
+#: src/findlib/create_file.c:391
 #, c-format
 msgid "Could not open %s: ERR=%s\n"
-msgstr "Impossible d'ouvrir %s : ERR=%s\n"
+msgstr "Impossible d'ouvrir %s : ERR=%s\n"
 
 #: src/dird/ua_query.c:78
 msgid "Available queries:\n"
-msgstr "Requêtes disponibles :\n"
+msgstr "Requêtes disponibles :\n"
 
 #: src/dird/ua_query.c:85
 msgid "Choose a query"
-msgstr "Choisissez une requête"
+msgstr "Choisissez une requête"
 
 #: src/dird/ua_query.c:99
 msgid "Could not find query.\n"
-msgstr "Impossible de trouver la requête.\n"
+msgstr "Impossible de trouver la requête.\n"
 
 #: src/dird/ua_query.c:117
 msgid "Too many prompts in query, max is 9.\n"
@@ -1063,7 +1062,7 @@
 
 #: src/dird/ua_query.c:268 src/dird/ua_query.c:284
 msgid "Enter SQL query: "
-msgstr "Saisissez votre requête SQL : "
+msgstr "Saisissez votre requête SQL : "
 
 #: src/dird/ua_query.c:286
 msgid "Add to SQL query: "
@@ -1076,12 +1075,12 @@
 #: src/dird/newvol.c:91
 #, c-format
 msgid "Illegal character in Volume name \"%s\"\n"
-msgstr "Caractère interdit dans le nom du Volume « %s »\n"
+msgstr "Caractère interdit dans le nom du Volume \"%s\"\n"
 
 #: src/dird/newvol.c:104
 #, c-format
 msgid "Created new Volume \"%s\" in catalog.\n"
-msgstr "Le Volume « %s » a été créé dans le catalogue.\n"
+msgstr "Le Volume \"%s\" a été créé dans le catalogue.\n"
 
 #: src/dird/newvol.c:131
 #, c-format
@@ -1092,11 +1091,11 @@
 #, c-format
 msgid ""
 "Wanted to create Volume \"%s\", but it already exists. Trying again.\n"
-msgstr "Impossible de créer le volume « %s » car il existe déjà.\n"
+msgstr "Impossible de créer le volume \"%s\" car il existe déjà.\n"
 
 #: src/dird/newvol.c:151
 msgid "Too many failures. Giving up creating Volume name.\n"
-msgstr "Trop d'erreurs. Abandon de la création du volume.\n"
+msgstr "Trop d'erreurs. Abandon de la création du volume.\n"
 
 #: src/dird/expand.c:255
 #, c-format
@@ -1136,7 +1135,7 @@
 #: src/dird/recycle.c:65
 #, c-format
 msgid "Recycled volume \"%s\"\n"
-msgstr "Volume recyclé « %s »\n"
+msgstr "Volume recyclé \"%s\"\n"
 
 #: src/dird/ua_purge.c:90
 msgid ""
@@ -1152,33 +1151,33 @@
 
 #: src/dird/ua_purge.c:157
 msgid "Choose item to purge"
-msgstr "Choisissez l'élément à purger"
+msgstr "Choisissez l'élément à purger"
 
 #: src/dird/ua_purge.c:204
 #, c-format
 msgid "Begin purging files for Client \"%s\"\n"
-msgstr "Début de la purge des fichiers du client « %s »\n"
+msgstr "Début de la purge des fichiers du client \"%s\"\n"
 
 #: src/dird/ua_purge.c:213 src/dird/ua_purge.c:263
 #, c-format
 msgid "No Files found for client %s to purge from %s catalog.\n"
 msgstr ""
-"Pas de fichier à purger pour le client « %s » dans le catalogue %s.\n"
+"Pas de fichier à purger pour le client \"%s\" dans le catalogue %s.\n"
 
 #: src/dird/ua_purge.c:216
 #, c-format
 msgid "Files for %d Jobs for client \"%s\" purged from %s catalog.\n"
-msgstr "Fichiers de %d jobs du client « %s » purgé du catalogue %s.\n"
+msgstr "Fichiers de %d jobs du client \"%s\" purgé du catalogue %s.\n"
 
 #: src/dird/ua_purge.c:254
 #, c-format
 msgid "Begin purging jobs from Client \"%s\"\n"
-msgstr "Début de purge des jobs du client « %s »\n"
+msgstr "Début de purge des jobs du client \"%s\"\n"
 
 #: src/dird/ua_purge.c:266
 #, c-format
 msgid "%d Jobs for client %s purged from %s catalog.\n"
-msgstr "%d jobs du client « %s » purgé du catalogue %s.\n"
+msgstr "%d jobs du client \"%s\" purgé du catalogue %s.\n"
 
 #: src/dird/ua_purge.c:464
 #, c-format
@@ -1188,30 +1187,28 @@
 "The VolStatus must be: Append, Full, Used, or Error to be purged.\n"
 msgstr ""
 "\n"
-"Le volume « %s » est en état « %s » et il ne peut pas être "
-"purgé.\n"
-"Son statut doit être : Append, Full, Used ou Error pour être purgé.\n"
+"Le volume \"%s\" est en état \"%s\" et il ne peut pas être purgé.\n"
+"Son statut doit être : Append, Full, Used ou Error pour être purgé.\n"
 
 #: src/dird/ua_purge.c:492
 #, c-format
 msgid "%d File%s on Volume \"%s\" purged from catalog.\n"
-msgstr "%d fichier%s du volume « %s » purgé du catalogue.\n"
+msgstr "%d fichier%s du volume \"%s\" purgé du catalogue.\n"
 
 #: src/dird/ua_purge.c:541
 #, c-format
 msgid ""
 "There are no more Jobs associated with Volume \"%s\". Marking it purged.\n"
 msgstr ""
-"Il n'y a plus de job associé avec le volume « %s ». Il est marqué "
-"purgé.\n"
+"Il n'y a plus de job associé avec le volume \"%s\". Il est marqué purgé.\n"
 
 #: src/dird/ua_purge.c:556 src/dird/ua_label.c:759
 #, c-format
 msgid "Connecting to Storage daemon %s at %s:%d ...\n"
 msgstr "Connexion au Storage Daemon %s (%s:%d)...\n"
 
-#: src/dird/ua_purge.c:559 src/dird/ua_dotcmds.c:588 src/dird/ua_cmds.c:776
-#: src/dird/ua_cmds.c:1535 src/dird/ua_label.c:762 src/dird/job.c:448
+#: src/dird/ua_purge.c:559 src/dird/ua_dotcmds.c:606 src/dird/ua_cmds.c:772
+#: src/dird/ua_cmds.c:1531 src/dird/ua_label.c:762 src/dird/job.c:448
 msgid "Failed to connect to Storage daemon.\n"
 msgstr "Impossible de se connecter au Storage daemon.\n"
 
@@ -1238,24 +1235,24 @@
 #, c-format
 msgid "Unable move recycled Volume in full Pool \"%s\" MaxVols=%d\n"
 msgstr ""
-"Impossible de déplacer le volume recyclé, le Pool « %s » est plein. "
+"Impossible de déplacer le volume recyclé, le Pool \"%s\" est plein. "
 "MaxVols=%d\n"
 
 #: src/dird/ua_purge.c:799
 #, c-format
 msgid "All records pruned from Volume \"%s\"; marking it \"Purged\"\n"
 msgstr ""
-"Il n'y a pas de job associé avec le volume « %s ». Il est marqué comme "
+"Il n'y a pas de job associé avec le volume \"%s\". Il est marqué comme "
 "Purged.\n"
 
 #: src/dird/ua_purge.c:804
 #, c-format
 msgid "Cannot purge Volume with VolStatus=%s\n"
-msgstr "Impossible de purger un volume dans l'état (VolStatus) %s\n"
+msgstr "Impossible de purger un volume dans l'état (VolStatus) %s\n"
 
 #: src/dird/vbackup.c:76 src/dird/migrate.c:114
 msgid "Could not get or create a Pool record.\n"
-msgstr "Impossible de récupérer ou de créer un Pool dans le catalogue.\n"
+msgstr "Impossible de récupérer ou de créer un Pool dans le catalogue.\n"
 
 #: src/dird/vbackup.c:89 src/dird/migrate.c:227 src/dird/migrate.c:228
 #: src/dird/backup.c:93 src/dird/job.c:185 src/dird/job.c:868
@@ -1263,7 +1260,7 @@
 msgid "Pool resource"
 msgstr "Ressource Pool"
 
-#: src/dird/vbackup.c:116 src/dird/migrate.c:284
+#: src/dird/vbackup.c:116 src/dird/migrate.c:285
 msgid "Job Pool's NextPool resource"
 msgstr ""
 
@@ -1290,32 +1287,32 @@
 msgid "Could not get or create the FileSet record.\n"
 msgstr ""
 
-#: src/dird/vbackup.c:311 src/dird/backup.c:627
+#: src/dird/vbackup.c:311 src/dird/backup.c:625
 #, c-format
 msgid "Error getting Client record for Job report: ERR=%s"
 msgstr ""
 
-#: src/dird/vbackup.c:317 src/dird/migrate.c:1246 src/dird/backup.c:633
+#: src/dird/vbackup.c:317 src/dird/migrate.c:1256 src/dird/backup.c:631
 #, c-format
 msgid "Error getting Media record for Volume \"%s\": ERR=%s"
 msgstr ""
 
-#: src/dird/vbackup.c:327 src/dird/backup.c:643 src/dird/backup.c:652
+#: src/dird/vbackup.c:327 src/dird/backup.c:641 src/dird/backup.c:650
 #: src/stored/bscan.c:1210
 msgid "Backup OK -- with warnings"
 msgstr "Backup OK -- avec des erreurs"
 
-#: src/dird/vbackup.c:329 src/dird/backup.c:645 src/stored/bscan.c:1207
+#: src/dird/vbackup.c:329 src/dird/backup.c:643 src/stored/bscan.c:1207
 msgid "Backup OK"
 msgstr "Backup OK"
 
-#: src/dird/vbackup.c:334 src/dird/backup.c:656 src/stored/bscan.c:1214
+#: src/dird/vbackup.c:334 src/dird/backup.c:654 src/stored/bscan.c:1214
 msgid "*** Backup Error ***"
 msgstr "*** Backup en erreur ***"
 
-#: src/dird/vbackup.c:344 src/dird/backup.c:666 src/stored/bscan.c:1217
+#: src/dird/vbackup.c:344 src/dird/backup.c:664 src/stored/bscan.c:1217
 msgid "Backup Canceled"
-msgstr "Backup annulé"
+msgstr "Backup annulé"
 
 #: src/dird/vbackup.c:391
 #, c-format
@@ -1385,16 +1382,16 @@
 #: src/dird/ua_output.c:445
 #, c-format
 msgid "Jobid %d used %d Volume(s): %s\n"
-msgstr "JobId %d a utilisé %d volume(s) : %s\n"
+msgstr "JobId %d a utilisé %d volume(s) : %s\n"
 
 #: src/dird/ua_output.c:463
 msgid "No Pool specified.\n"
-msgstr "Pas de Pool spécifié.\n"
+msgstr "Pas de Pool spécifié.\n"
 
 #: src/dird/ua_output.c:484
 #, c-format
 msgid "Pool: %s\n"
-msgstr "Pool : %s\n"
+msgstr "Pool : %s\n"
 
 #: src/dird/ua_output.c:500
 msgid "Ignoring invalid value for days. Max is 50.\n"
@@ -1434,7 +1431,7 @@
 #: src/dird/ua_output.c:719 src/dird/job.c:133 src/tools/cats_test.c:375
 #, c-format
 msgid "Could not open database \"%s\".\n"
-msgstr "Impossible d'ouvrir la base de données « %s ».\n"
+msgstr "Impossible d'ouvrir la base de données \"%s\".\n"
 
 #: src/dird/ua_output.c:732
 #, c-format
@@ -1444,7 +1441,7 @@
 #: src/dird/ua_output.c:740
 #, c-format
 msgid "Pool %s created in database.\n"
-msgstr "Pool %s créé en base.\n"
+msgstr "Pool %s créé en base.\n"
 
 #: src/dird/ua_output.c:793
 msgid "You have no messages.\n"
@@ -1454,97 +1451,97 @@
 msgid "Message too long to display.\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:153 src/dird/ua_cmds.c:236
+#: src/dird/ua_dotcmds.c:155 src/dird/ua_cmds.c:236
 #, c-format
 msgid "Can't use %s command in a runscript"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:173
+#: src/dird/ua_dotcmds.c:175
 msgid ": is an invalid command.\n"
 msgstr ": est une commande invalide.\n"
 
-#: src/dird/ua_dotcmds.c:522 src/dird/ua_restore.c:780
+#: src/dird/ua_dotcmds.c:540 src/dird/ua_restore.c:780
 #: src/dird/ua_restore.c:823
 #, c-format
 msgid "Unable to get Job record for JobId=%s: ERR=%s\n"
-msgstr "Impossible de récupérer le Job du JobId=%s : ERR=%s\n"
+msgstr "Impossible de récupérer le Job du JobId=%s : ERR=%s\n"
 
-#: src/dird/ua_dotcmds.c:582 src/dird/ua_cmds.c:770 src/dird/ua_cmds.c:1524
+#: src/dird/ua_dotcmds.c:600 src/dird/ua_cmds.c:766 src/dird/ua_cmds.c:1520
 #: src/dird/ua_status.c:352 src/dird/job.c:147 src/dird/job.c:153
 #: src/dird/job.c:1157 src/dird/job.c:1161
 msgid "unknown source"
 msgstr "source inconnue"
 
-#: src/dird/ua_dotcmds.c:585 src/dird/ua_cmds.c:773 src/dird/ua_status.c:355
+#: src/dird/ua_dotcmds.c:603 src/dird/ua_cmds.c:769 src/dird/ua_status.c:355
 #, c-format
 msgid "Connecting to Storage daemon %s at %s:%d\n"
 msgstr "Connexion au Storage Daemon %s (%s:%d)\n"
 
-#: src/dird/ua_dotcmds.c:591 src/dird/ua_cmds.c:779 src/dird/ua_status.c:366
+#: src/dird/ua_dotcmds.c:609 src/dird/ua_cmds.c:775 src/dird/ua_status.c:366
 msgid "Connected to storage daemon\n"
-msgstr "Connecté au Storage Daemon\n"
+msgstr "Connecté au Storage Daemon\n"
 
-#: src/dird/ua_dotcmds.c:611 src/dird/ua_cmds.c:808 src/dird/ua_cmds.c:1206
+#: src/dird/ua_dotcmds.c:629 src/dird/ua_cmds.c:804 src/dird/ua_cmds.c:1202
 #: src/dird/ua_status.c:397
 #, c-format
 msgid "Connecting to Client %s at %s:%d\n"
 msgstr "Connexion au client %s (%s:%d)\n"
 
-#: src/dird/ua_dotcmds.c:614 src/dird/ua_cmds.c:811 src/dird/ua_cmds.c:1209
+#: src/dird/ua_dotcmds.c:632 src/dird/ua_cmds.c:807 src/dird/ua_cmds.c:1205
 msgid "Failed to connect to Client.\n"
 msgstr "Impossible de se connecter au Client.\n"
 
-#: src/dird/ua_dotcmds.c:657 src/dird/ua_dotcmds.c:750
+#: src/dird/ua_dotcmds.c:675 src/dird/ua_dotcmds.c:769
 #, c-format
 msgid "Unknown command: %s\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:695 src/dird/ua_cmds.c:998
+#: src/dird/ua_dotcmds.c:713 src/dird/ua_cmds.c:994
 msgid "Available daemons are: \n"
-msgstr "Les démons disponibles sont : \n"
+msgstr "Les démons disponibles sont : \n"
 
-#: src/dird/ua_dotcmds.c:696 src/dird/ua_cmds.c:999
+#: src/dird/ua_dotcmds.c:714 src/dird/ua_cmds.c:995
 msgid "Director"
 msgstr "Director"
 
-#: src/dird/ua_dotcmds.c:699
+#: src/dird/ua_dotcmds.c:717
 msgid "Select daemon type to make die"
-msgstr "Sélectionnez le composant a tuer"
+msgstr "Sélectionnez le composant a tuer"
 
-#: src/dird/ua_dotcmds.c:725
+#: src/dird/ua_dotcmds.c:743
 msgid "The Director will generate a deadlock.\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:729
+#: src/dird/ua_dotcmds.c:747
 msgid "The Director will segment fault.\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:917
+#: src/dird/ua_dotcmds.c:936
 msgid "Access to specified Client or FileSet not allowed.\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:922 src/dird/ua_dotcmds.c:966
+#: src/dird/ua_dotcmds.c:941 src/dird/ua_dotcmds.c:985
 #: src/dird/ua_restore.c:941 src/dird/ua_restore.c:969
 #: src/dird/ua_restore.c:990
 #, c-format
 msgid "Query failed: %s. ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:961
+#: src/dird/ua_dotcmds.c:980
 msgid "query keyword not found.\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:988
+#: src/dird/ua_dotcmds.c:1007
 #, c-format
 msgid "List MediaType failed: ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:1002
+#: src/dird/ua_dotcmds.c:1021
 #, c-format
 msgid "List Media failed: ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:1016
+#: src/dird/ua_dotcmds.c:1035
 #, c-format
 msgid "List Location failed: ERR=%s\n"
 msgstr ""
@@ -1552,12 +1549,12 @@
 #: src/dird/next_vol.c:149
 #, c-format
 msgid "Purging oldest volume \"%s\"\n"
-msgstr "Purge du plus ancien volume « %s »\n"
+msgstr "Purge du plus ancien volume \"%s\"\n"
 
 #: src/dird/next_vol.c:155
 #, c-format
 msgid "Pruning oldest volume \"%s\"\n"
-msgstr "Prunning du plus ancien volume « %s »\n"
+msgstr "Prunning du plus ancien volume \"%s\"\n"
 
 #: src/dird/next_vol.c:174
 msgid "We seem to be looping trying to find the next volume. I give up.\n"
@@ -1571,8 +1568,7 @@
 #: src/dird/next_vol.c:209
 #, c-format
 msgid "Volume used once. Marking Volume \"%s\" as Used.\n"
-msgstr ""
-"Volume utilisé une fois. Marquage du volume « %s » comme Used.\n"
+msgstr "Volume utilisé une fois. Marquage du volume \"%s\" comme Used.\n"
 
 #: src/dird/next_vol.c:216
 #, c-format
@@ -1598,7 +1594,7 @@
 
 #: src/dird/next_vol.c:271
 msgid "volume has expired"
-msgstr "le volume a expiré"
+msgstr "le volume a expiré"
 
 #: src/dird/next_vol.c:289 src/dird/next_vol.c:333
 #, c-format
@@ -1611,11 +1607,11 @@
 
 #: src/dird/next_vol.c:300
 msgid "but should be Append, Purged or Recycle"
-msgstr "mais doit être Append, Purged ou bien Recycle"
+msgstr "mais doit être Append, Purged ou bien Recycle"
 
 #: src/dird/next_vol.c:309
 msgid "volume has recycling disabled"
-msgstr "le recyclage du volume est désactivé"
+msgstr "le recyclage du volume est désactivé"
 
 #: src/dird/next_vol.c:336
 msgid ""
@@ -1633,24 +1629,24 @@
 #: src/dird/next_vol.c:402
 #, c-format
 msgid "Unable to get Pool record: ERR=%s"
-msgstr "Impossible de récupérer le Pool depuis le catalogue : ERR=%s"
+msgstr "Impossible de récupérer le Pool depuis le catalogue : ERR=%s"
 
 #: src/dird/next_vol.c:409
 #, c-format
 msgid "Unable add Scratch Volume, Pool \"%s\" full MaxVols=%d\n"
 msgstr ""
-"Impossible d'ajouter un volume du Scratch, le Pool « %s » est plein. "
+"Impossible d'ajouter un volume du Scratch, le Pool \"%s\" est plein. "
 "MaxVols=%d\n"
 
 #: src/dird/next_vol.c:428
 #, c-format
 msgid "Failed to move Scratch Volume. ERR=%s\n"
-msgstr "Impossible de déplacer un Volume du Scratch. ERR=%s\n"
+msgstr "Impossible de déplacer un Volume du Scratch. ERR=%s\n"
 
 #: src/dird/next_vol.c:433
 #, c-format
 msgid "Using Volume \"%s\" from 'Scratch' pool.\n"
-msgstr "Utilisation du Volume « %s » du pool « Scratch ».\n"
+msgstr "Utilisation du Volume \"%s\" du pool « Scratch ».\n"
 
 #: src/dird/ua_cmds.c:120
 msgid "Add media to a pool"
@@ -1819,9 +1815,9 @@
 #: src/dird/ua_cmds.c:247
 #, c-format
 msgid "%s: is an invalid command.\n"
-msgstr "%s : est une commande invalide.\n"
+msgstr "%s : est une commande invalide.\n"
 
-#: src/dird/ua_cmds.c:289
+#: src/dird/ua_cmds.c:288
 msgid ""
 "You probably don't want to be using this command since it\n"
 "creates database records without labeling the Volumes.\n"
@@ -1829,212 +1825,211 @@
 "\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:308
+#: src/dird/ua_cmds.c:307
 #, c-format
 msgid "Pool already has maximum volumes=%d\n"
-msgstr "Le pool a déjà atteint le nombre maximum de volume=%d\n"
+msgstr "Le pool a déjà atteint le nombre maximum de volume=%d\n"
 
-#: src/dird/ua_cmds.c:309
+#: src/dird/ua_cmds.c:308
 msgid "Enter new maximum (zero for unlimited): "
-msgstr "Entrez le nouveau maximum (zéro pour illimité) : "
+msgstr "Entrez le nouveau maximum (zéro pour illimité) : "
 
-#: src/dird/ua_cmds.c:329
+#: src/dird/ua_cmds.c:328
 #, c-format
 msgid "Enter number of Volumes to create. 0=>fixed name. Max=%d: "
-msgstr "Entrez le nombre de Volume à créer. 0=>nom fixé. Max=%d : "
+msgstr "Entrez le nombre de Volume à créer. 0=>nom fixé. Max=%d : "
 
-#: src/dird/ua_cmds.c:335
+#: src/dird/ua_cmds.c:334
 #, c-format
 msgid "The number must be between 0 and %d\n"
-msgstr "Le nombre doit être entre 0 et %d\n"
+msgstr "Le nombre doit être entre 0 et %d\n"
 
-#: src/dird/ua_cmds.c:343
+#: src/dird/ua_cmds.c:342
 msgid "Enter Volume name: "
-msgstr "Entrez le nom du Volume : "
+msgstr "Entrez le nom du Volume : "
 
-#: src/dird/ua_cmds.c:347
+#: src/dird/ua_cmds.c:346
 msgid "Enter base volume name: "
-msgstr "Entrez le nom de base du volume : "
+msgstr "Entrez le nom de base du volume : "
 
-#: src/dird/ua_cmds.c:356 src/dird/ua_label.c:648
+#: src/dird/ua_cmds.c:355 src/dird/ua_label.c:648
 msgid "Volume name too long.\n"
 msgstr "Nom de Volume trop long.\n"
 
-#: src/dird/ua_cmds.c:360 src/dird/ua_label.c:654 src/lib/edit.c:501
+#: src/dird/ua_cmds.c:359 src/dird/ua_label.c:654 src/lib/edit.c:501
 msgid "Volume name must be at least one character long.\n"
-msgstr "Le nom du volume doit comporter au moins un caractère\n"
+msgstr "Le nom du volume doit comporter au moins un caractère\n"
 
-#: src/dird/ua_cmds.c:371
+#: src/dird/ua_cmds.c:370
 msgid "Enter the starting number: "
-msgstr "Entrez le nombre de départ : "
+msgstr "Entrez le nombre de départ : "
 
-#: src/dird/ua_cmds.c:376
+#: src/dird/ua_cmds.c:375
 msgid "Start number must be greater than zero.\n"
-msgstr "Le nombre de départ doit être supérieur à zéro.\n"
+msgstr "Le nombre de départ doit être supérieur à zéro.\n"
 
-#: src/dird/ua_cmds.c:387
+#: src/dird/ua_cmds.c:386
 msgid "Enter slot (0 for none): "
-msgstr "Saisissez le slot (0 pour aucun) : "
+msgstr "Saisissez le slot (0 pour aucun) : "
 
-#: src/dird/ua_cmds.c:391
+#: src/dird/ua_cmds.c:390
 msgid "InChanger? yes/no: "
-msgstr "InChanger ? oui/non : "
+msgstr "InChanger ? oui/non : "
 
-#: src/dird/ua_cmds.c:419
+#: src/dird/ua_cmds.c:415
 #, c-format
 msgid "%d Volumes created in pool %s\n"
-msgstr "%d Volumes créés dans le pool %s\n"
+msgstr "%d Volumes créés dans le pool %s\n"
 
-#: src/dird/ua_cmds.c:435 src/dird/ua_cmds.c:1037
+#: src/dird/ua_cmds.c:431 src/dird/ua_cmds.c:1033
 msgid "Turn on or off? "
-msgstr "Activer ou désactiver ? (on/off) "
+msgstr "Activer ou désactiver ? (on/off) "
 
-#: src/dird/ua_cmds.c:549
+#: src/dird/ua_cmds.c:545
 #, c-format
 msgid ""
 "Can't set %s RecyclePool to %s, %s is not in database.\n"
 "Try to update it with 'update pool=%s'\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:567
+#: src/dird/ua_cmds.c:563
 #, c-format
 msgid ""
 "Can't set %s ScratchPool to %s, %s is not in database.\n"
 "Try to update it with 'update pool=%s'\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:636
+#: src/dird/ua_cmds.c:632
 #, c-format
 msgid ""
 "Error: Pool %s already exists.\n"
 "Use update to change it.\n"
 msgstr ""
-"Erreur : Pool %s est déjà défini.\n"
+"Erreur : Pool %s est déjà défini.\n"
 "Utilisez update pour le changer\n"
 
-#: src/dird/ua_cmds.c:647
+#: src/dird/ua_cmds.c:643
 #, c-format
 msgid "Pool %s created.\n"
-msgstr "Pool %s créé.\n"
+msgstr "Pool %s créé.\n"
 
-#: src/dird/ua_cmds.c:677
+#: src/dird/ua_cmds.c:673
 msgid "Python interpreter restarted.\n"
 msgstr "Interpréteur python redémarré.\n"
 
-#: src/dird/ua_cmds.c:680 src/dird/ua_cmds.c:1335
+#: src/dird/ua_cmds.c:676 src/dird/ua_cmds.c:1331
 msgid "Nothing done.\n"
 msgstr "Rien de fait.\n"
 
-#: src/dird/ua_cmds.c:704 src/dird/ua_cmds.c:1088 src/dird/ua_run.c:1562
+#: src/dird/ua_cmds.c:700 src/dird/ua_cmds.c:1084 src/dird/ua_run.c:1582
 #, c-format
 msgid "Client \"%s\" not found.\n"
-msgstr "le client « %s » est introuvable.\n"
+msgstr "le client \"%s\" est introuvable.\n"
 
-#: src/dird/ua_cmds.c:713
+#: src/dird/ua_cmds.c:709
 #, c-format
 msgid "Client \"%s\" address set to %s\n"
-msgstr "Client « %s » adresse positionné à %s\n"
+msgstr "Client \"%s\" adresse positionné à %s\n"
 
-#: src/dird/ua_cmds.c:747
+#: src/dird/ua_cmds.c:743
 #, c-format
 msgid "Job \"%s\" %sabled\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:925
+#: src/dird/ua_cmds.c:921
 msgid "Enter new debug level: "
-msgstr "Saisissez le nouveau niveau de debug : "
+msgstr "Saisissez le nouveau niveau de debug : "
 
-#: src/dird/ua_cmds.c:1002
+#: src/dird/ua_cmds.c:998
 msgid "All"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1003
+#: src/dird/ua_cmds.c:999
 msgid "Select daemon type to set debug level"
-msgstr "Sélectionnez le composant a mettre à jour"
+msgstr "Sélectionnez le composant a mettre à jour"
 
-#: src/dird/ua_cmds.c:1092 src/dird/ua_cmds.c:1930
+#: src/dird/ua_cmds.c:1088 src/dird/ua_cmds.c:1926
 #, c-format
 msgid "No authorization for Client \"%s\"\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1097
+#: src/dird/ua_cmds.c:1093
 msgid "Client name missing.\n"
 msgstr "Nom du client manquant.\n"
 
-#: src/dird/ua_cmds.c:1109 src/dird/ua_cmds.c:1170 src/dird/ua_cmds.c:1952
+#: src/dird/ua_cmds.c:1105 src/dird/ua_cmds.c:1166 src/dird/ua_cmds.c:1948
 #, c-format
 msgid "No authorization for Job \"%s\"\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1114
+#: src/dird/ua_cmds.c:1110
 msgid "Job name missing.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1123
+#: src/dird/ua_cmds.c:1119
 #, c-format
 msgid "Fileset \"%s\" not found.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1127
+#: src/dird/ua_cmds.c:1123
 #, c-format
 msgid "No authorization for FileSet \"%s\"\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1132
+#: src/dird/ua_cmds.c:1128
 msgid "Fileset name missing.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1143 src/dird/ua_run.c:557
+#: src/dird/ua_cmds.c:1139 src/dird/ua_run.c:563
 #, c-format
 msgid "Level \"%s\" not valid.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1147
+#: src/dird/ua_cmds.c:1143
 msgid "Level value missing.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1153
+#: src/dird/ua_cmds.c:1149
 msgid "Invalid value for accurate. It must be yes or no.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1166
+#: src/dird/ua_cmds.c:1162
 msgid "No job specified.\n"
-msgstr "Pas de job sélectionné.\n"
+msgstr "Pas de job sélectionné.\n"
 
-#: src/dird/ua_cmds.c:1214
+#: src/dird/ua_cmds.c:1210
 msgid "Error sending include list.\n"
 msgstr "Erreur pendant l'envoi de la liste d'inclusion.\n"
 
-#: src/dird/ua_cmds.c:1219
+#: src/dird/ua_cmds.c:1215
 msgid "Error sending exclude list.\n"
 msgstr "Erreur pendant l'envoi de la liste d'exclusion.\n"
 
-#: src/dird/ua_cmds.c:1321
+#: src/dird/ua_cmds.c:1317
 msgid ""
 "In general it is not a good idea to delete either a\n"
 "Pool or a Volume since they may contain data.\n"
 "\n"
 msgstr ""
-"Généralement supprimer un pool ou bien un volume\n"
-"n'est pas une bonne idée car ils peuvent contenir des données.\n"
+"Généralement supprimer un pool ou bien un volume\n"
+"n'est pas une bonne idée car ils peuvent contenir des données.\n"
 "\n"
 
-#: src/dird/ua_cmds.c:1324
+#: src/dird/ua_cmds.c:1320
 msgid "Choose catalog item to delete"
-msgstr "Choisissez l'objet du catalogue à supprimer"
+msgstr "Choisissez l'objet du catalogue à supprimer"
 
-#: src/dird/ua_cmds.c:1388
+#: src/dird/ua_cmds.c:1384
 msgid "Enter JobId to delete: "
-msgstr "Saisissez le JobId à supprimer : "
+msgstr "Saisissez le JobId à supprimer : "
 
-#: src/dird/ua_cmds.c:1427
+#: src/dird/ua_cmds.c:1423
 #, c-format
 msgid "Job %s and associated records deleted from the catalog.\n"
 msgstr ""
-"Le Job %s et les enregistrements associés ont été supprimés du "
-"catalogue.\n"
+"Le Job %s et les enregistrements associés ont été supprimés du catalogue.\n"
 
-#: src/dird/ua_cmds.c:1442
+#: src/dird/ua_cmds.c:1438
 #, c-format
 msgid ""
 "\n"
@@ -2043,46 +2038,46 @@
 msgstr ""
 "\n"
 "Cette commande va supprimer le Volume %s\n"
-"et tous les Jobs sauvegardés sur celui-ci du Catalogue\n"
+"et tous les Jobs sauvegardés sur celui-ci du Catalogue\n"
 
-#: src/dird/ua_cmds.c:1449
+#: src/dird/ua_cmds.c:1445
 #, c-format
 msgid "Are you sure you want to delete Volume \"%s\"? (yes/no): "
 msgstr ""
 
-#: src/dird/ua_cmds.c:1462
+#: src/dird/ua_cmds.c:1458
 msgid "Can't list jobs on this volume\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1487
+#: src/dird/ua_cmds.c:1483
 #, c-format
 msgid "Are you sure you want to delete Pool \"%s\"? (yes/no): "
 msgstr ""
 
-#: src/dird/ua_cmds.c:1602
+#: src/dird/ua_cmds.c:1598
 #, c-format
 msgid "Using Catalog name=%s DB=%s\n"
 msgstr "Utilisation du Catalogue name=%s DB=%s\n"
 
-#: src/dird/ua_cmds.c:1670
+#: src/dird/ua_cmds.c:1666
 msgid "ERR: Can't open db\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1717
+#: src/dird/ua_cmds.c:1713
 msgid "Wait on mount timed out\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1727
+#: src/dird/ua_cmds.c:1723
 msgid "ERR: Job was not found\n"
 msgstr "ERR : impossible de trouver la tâche\n"
 
-#: src/dird/ua_cmds.c:1803
+#: src/dird/ua_cmds.c:1799
 msgid ""
 "  Command       Description\n"
 "  =======       ===========\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1807
+#: src/dird/ua_cmds.c:1803
 #, c-format
 msgid ""
 "  %-13s %s\n"
@@ -2091,12 +2086,12 @@
 "\t%s\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1812
+#: src/dird/ua_cmds.c:1808
 #, c-format
 msgid "  %-13s %s\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1816
+#: src/dird/ua_cmds.c:1812
 #, c-format
 msgid ""
 "\n"
@@ -2107,7 +2102,7 @@
 "Impossible de trouver la commande %s.\n"
 "\n"
 
-#: src/dird/ua_cmds.c:1818
+#: src/dird/ua_cmds.c:1814
 msgid ""
 "\n"
 "When at a prompt, entering a period cancels the command.\n"
@@ -2117,25 +2112,25 @@
 "Sur une question, tapez un point (.) pour annuler la commande en cours.\n"
 "\n"
 
-#: src/dird/ua_cmds.c:1854 src/filed/status.c:85
+#: src/dird/ua_cmds.c:1850 src/filed/status.c:85
 #, c-format
 msgid "%s Version: %s (%s) %s %s %s %s\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1913 src/dird/ua_cmds.c:1940 src/dird/ua_cmds.c:1962
+#: src/dird/ua_cmds.c:1909 src/dird/ua_cmds.c:1936 src/dird/ua_cmds.c:1958
 #, c-format
 msgid "No authorization for Catalog \"%s\"\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:2007
+#: src/dird/ua_cmds.c:2003
 #, c-format
 msgid "Could not open catalog database \"%s\".\n"
-msgstr "Impossible d'ouvrir le catalogue « %s ».\n"
+msgstr "Impossible d'ouvrir le catalogue \"%s\".\n"
 
-#: src/dird/ua_cmds.c:2017
+#: src/dird/ua_cmds.c:2013
 #, c-format
 msgid "Using Catalog \"%s\"\n"
-msgstr "Utilisation du Catalogue « %s »\n"
+msgstr "Utilisation du Catalogue \"%s\"\n"
 
 #: src/dird/ua_tree.c:74
 msgid "add dir/file to be restored recursively, wildcards allowed"
@@ -2143,12 +2138,11 @@
 
 #: src/dird/ua_tree.c:75
 msgid "change current directory"
-msgstr "change le répertoire courant"
+msgstr "change le répertoire courant"
 
 #: src/dird/ua_tree.c:76
 msgid "count marked files in and below the cd"
-msgstr ""
-"compte le nombre de fichiers marqués à partir du répertoire courant"
+msgstr "compte le nombre de fichiers marqués à partir du répertoire courant"
 
 #: src/dird/ua_tree.c:77
 msgid "delete dir/file to be restored recursively in dir"
@@ -2156,12 +2150,11 @@
 
 #: src/dird/ua_tree.c:78 src/dird/ua_tree.c:79
 msgid "long list current directory, wildcards allowed"
-msgstr ""
-"liste détaillée du répertoire courant, les jocker (*) fonctionnent"
+msgstr "liste détaillée du répertoire courant, les jocker (*) fonctionnent"
 
 #: src/dird/ua_tree.c:80
 msgid "leave file selection mode"
-msgstr "sort de la sélection des fichiers"
+msgstr "sort de la sélection des fichiers"
 
 #: src/dird/ua_tree.c:81
 msgid "estimate restore size"
@@ -2169,7 +2162,7 @@
 
 #: src/dird/ua_tree.c:82
 msgid "same as done command"
-msgstr "synonyme de la commande  « done »"
+msgstr "synonyme de la commande  « done »"
 
 #: src/dird/ua_tree.c:83
 msgid "find files, wildcards allowed"
@@ -2182,7 +2175,7 @@
 #: src/dird/ua_tree.c:85 src/dird/ua_tree.c:86
 msgid "list current directory, wildcards allowed"
 msgstr ""
-"affiche le contenu du répertoire courant, les jokers (*) fonctionnent"
+"affiche le contenu du répertoire courant, les jokers (*) fonctionnent"
 
 #: src/dird/ua_tree.c:87
 msgid "list subdir in current directory, wildcards allowed"
@@ -2190,7 +2183,7 @@
 
 #: src/dird/ua_tree.c:88
 msgid "list the marked files in and below the cd"
-msgstr "liste les fichiers marqués à partir du répertoire courant"
+msgstr "liste les fichiers marqués à partir du répertoire courant"
 
 #: src/dird/ua_tree.c:89
 msgid "list the marked files in"
@@ -2199,24 +2192,24 @@
 #: src/dird/ua_tree.c:90
 msgid "mark dir/file to be restored recursively, wildcards allowed"
 msgstr ""
-"marque récursivement les fichiers/répertoires pour être restaurés, les "
+"marque récursivement les fichiers/répertoires pour être restaurés, les "
 "jokers (*) fonctionnent"
 
 #: src/dird/ua_tree.c:91
 msgid "mark directory name to be restored (no files)"
-msgstr "marque un répertoire (seulement) pour la restauration"
+msgstr "marque un répertoire (seulement) pour la restauration"
 
 #: src/dird/ua_tree.c:92 src/dird/ua_tree.c:93
 msgid "print current working directory"
-msgstr "affiche le répertoire courant"
+msgstr "affiche le répertoire courant"
 
 #: src/dird/ua_tree.c:94
 msgid "unmark dir/file to be restored recursively in dir"
-msgstr "dé-sélectionne les fichiers/répertoires récursivement"
+msgstr "dé-sélectionne les fichiers/répertoires récursivement"
 
 #: src/dird/ua_tree.c:95
 msgid "unmark directory name only no recursion"
-msgstr "dé-sélectionne seulement un répertoire"
+msgstr "dé-sélectionne seulement un répertoire"
 
 #: src/dird/ua_tree.c:96
 msgid "quit and do not do restore"
@@ -2232,19 +2225,18 @@
 "\n"
 msgstr ""
 "\n"
-"Vous êtes dans le mode de sélection des fichiers ou vous devez ajouter "
+"Vous êtes dans le mode de sélection des fichiers ou vous devez ajouter "
 "(mark)\n"
-"et supprimez (unmark) les fichiers à restaurer. Aucun fichier n'est "
-"sélectionné\n"
-"par défaut sauf si vous avez utilisé l'option « all » dans la "
-"commande.\n"
-"Terminez votre saisie par « done »\n"
+"et supprimez (unmark) les fichiers à restaurer. Aucun fichier n'est "
+"sélectionné\n"
+"par défaut sauf si vous avez utilisé l'option « all » dans la commande.\n"
+"Terminez votre saisie par « done »\n"
 "\n"
 
 #: src/dird/ua_tree.c:129 src/dird/ua_tree.c:827
 #, c-format
 msgid "cwd is: %s\n"
-msgstr "Le répertoire courant est : %s\n"
+msgstr "Le répertoire courant est : %s\n"
 
 #: src/dird/ua_tree.c:138 src/dird/ua_tree.c:157
 #, c-format
@@ -2253,35 +2245,35 @@
 
 #: src/dird/ua_tree.c:370 src/dird/ua_tree.c:382 src/dird/ua_tree.c:399
 msgid "No files marked.\n"
-msgstr "Aucun fichier sélectionné.\n"
+msgstr "Aucun fichier sélectionné.\n"
 
 #: src/dird/ua_tree.c:384
 msgid "1 file marked.\n"
-msgstr "1 fichier sélectionné.\n"
+msgstr "1 fichier sélectionné.\n"
 
 #: src/dird/ua_tree.c:386
 #, c-format
 msgid "%s files marked.\n"
-msgstr "%s fichiers sélectionnés.\n"
+msgstr "%s fichiers sélectionnés.\n"
 
 #: src/dird/ua_tree.c:414
 msgid "No directories marked.\n"
-msgstr "Pas de répertoire sélectionné.\n"
+msgstr "Pas de répertoire sélectionné.\n"
 
 #: src/dird/ua_tree.c:416
 msgid "1 directory marked.\n"
-msgstr "1 répertoire sélectionné.\n"
+msgstr "1 répertoire sélectionné.\n"
 
 #: src/dird/ua_tree.c:418
 #, c-format
 msgid "%s directories marked.\n"
-msgstr "%s répertoires sélectionnés.\n"
+msgstr "%s répertoires sélectionnés.\n"
 
 #: src/dird/ua_tree.c:439
 #, c-format
 msgid "%s total files/dirs. %s marked to be restored.\n"
 msgstr ""
-"%s fichiers/répertoires au total. %s sélectionné pour la restauration.\n"
+"%s fichiers/répertoires au total. %s sélectionné pour la restauration.\n"
 
 #: src/dird/ua_tree.c:450
 msgid "No file specification given.\n"
@@ -2295,10 +2287,9 @@
 #: src/dird/ua_tree.c:764
 #, c-format
 msgid "%d total files; %d marked to be restored; %s bytes.\n"
-msgstr ""
-"%d fichiers en tout ; %d marqués pour la restauration ; %s octets.\n"
+msgstr "%d fichiers en tout ; %d marqués pour la restauration ; %s octets.\n"
 
-#: src/dird/ua_tree.c:775 src/stored/btape.c:2943
+#: src/dird/ua_tree.c:775 src/stored/btape.c:2947
 #, c-format
 msgid ""
 "  Command    Description\n"
@@ -2310,8 +2301,8 @@
 #: src/dird/ua_tree.c:798
 msgid "Too few or too many arguments. Try using double quotes.\n"
 msgstr ""
-"Trop ou pas assez d'arguments sur la commande. Essayez d'utiliser des "
-"« \" »\n"
+"Trop ou pas assez d'arguments sur la commande. Essayez d'utiliser des « \" "
+"»\n"
 
 #: src/dird/ua_tree.c:810
 msgid "Invalid path given.\n"
@@ -2319,29 +2310,29 @@
 
 #: src/dird/ua_tree.c:846 src/dird/ua_tree.c:858
 msgid "No files unmarked.\n"
-msgstr "Pas de fichier dé-sélectionné.\n"
+msgstr "Pas de fichier dé-sélectionné.\n"
 
 #: src/dird/ua_tree.c:860
 msgid "1 file unmarked.\n"
-msgstr "1 fichier dé-sélectionné.\n"
+msgstr "1 fichier dé-sélectionné.\n"
 
 #: src/dird/ua_tree.c:863
 #, c-format
 msgid "%s files unmarked.\n"
-msgstr "%s fichiers dé-sélectionnés.\n"
+msgstr "%s fichiers dé-sélectionnés.\n"
 
 #: src/dird/ua_tree.c:874 src/dird/ua_tree.c:891
 msgid "No directories unmarked.\n"
-msgstr "Pas de répertoire dé-sélectionné\n"
+msgstr "Pas de répertoire dé-sélectionné\n"
 
 #: src/dird/ua_tree.c:893
 msgid "1 directory unmarked.\n"
-msgstr "1 répertoire dé-sélectionné\n"
+msgstr "1 répertoire dé-sélectionné\n"
 
 #: src/dird/ua_tree.c:895
 #, c-format
 msgid "%d directories unmarked.\n"
-msgstr "%d répertoires dé-sélectionnés.\n"
+msgstr "%d répertoires dé-sélectionnés.\n"
 
 #: src/dird/dird_conf.c:559 src/tray-monitor/tray_conf.c:168
 #: src/qt-console/tray-monitor/tray_conf.cpp:168
@@ -2693,48 +2684,48 @@
 #: src/lib/parse_conf.c:225 src/qt-console/tray-monitor/tray_conf.cpp:294
 #, c-format
 msgid "Too many items in %s resource\n"
-msgstr "Trop d'élément dans la ressource %s\n"
+msgstr "Trop d'élément dans la ressource %s\n"
 
 #: src/dird/dird_conf.c:1421
 #, c-format
 msgid "Cannot find Pool resource %s\n"
-msgstr "Impossible de trouver la ressource Pool « %s »\n"
+msgstr "Impossible de trouver la ressource Pool \"%s\"\n"
 
 #: src/dird/dird_conf.c:1432
 #, c-format
 msgid "Cannot find Console resource %s\n"
-msgstr "Impossible de trouver la ressource Console « %s »\n"
+msgstr "Impossible de trouver la ressource Console \"%s\"\n"
 
-#: src/dird/dird_conf.c:1438 src/stored/stored_conf.c:608
+#: src/dird/dird_conf.c:1438 src/stored/stored_conf.c:611
 #: src/filed/filed_conf.c:381
 #, c-format
 msgid "Cannot find Director resource %s\n"
-msgstr "Impossible de trouver la ressource Director « %s »\n"
+msgstr "Impossible de trouver la ressource Director \"%s\"\n"
 
-#: src/dird/dird_conf.c:1445 src/stored/stored_conf.c:614
+#: src/dird/dird_conf.c:1445 src/stored/stored_conf.c:617
 #, c-format
 msgid "Cannot find Storage resource %s\n"
-msgstr "Impossible de trouver la ressource Storage « %s »\n"
+msgstr "Impossible de trouver la ressource Storage \"%s\"\n"
 
 #: src/dird/dird_conf.c:1454
 #, c-format
 msgid "Cannot find Job resource %s\n"
-msgstr "Impossible de trouver la ressource Job « %s »\n"
+msgstr "Impossible de trouver la ressource Job \"%s\"\n"
 
 #: src/dird/dird_conf.c:1504
 #, c-format
 msgid "Cannot find Counter resource %s\n"
-msgstr "Impossible de trouver la ressource Counter « %s »\n"
+msgstr "Impossible de trouver la ressource Counter \"%s\"\n"
 
 #: src/dird/dird_conf.c:1512 src/filed/filed_conf.c:387
 #, c-format
 msgid "Cannot find Client resource %s\n"
-msgstr "Impossible de trouver la ressource Client « %s »\n"
+msgstr "Impossible de trouver la ressource Client \"%s\"\n"
 
 #: src/dird/dird_conf.c:1525
 #, c-format
 msgid "Cannot find Schedule resource %s\n"
-msgstr "Impossible de trouver la ressource Schedule « %s »\n"
+msgstr "Impossible de trouver la ressource Schedule \"%s\"\n"
 
 #: src/dird/dird_conf.c:1530 src/dird/dird_conf.c:1590
 #: src/tray-monitor/tray_conf.c:314 src/tray-monitor/tray_conf.c:352
@@ -2767,33 +2758,33 @@
 msgid "Expected one of: %s, got: %s"
 msgstr ""
 
-#: src/dird/dird_conf.c:1704
+#: src/dird/dird_conf.c:1703
 #, c-format
 msgid "Expected a Migration Job Type keyword, got: %s"
-msgstr "Attendait un type de Job de Migration, eu : %s"
+msgstr "Attendait un type de Job de Migration, eu : %s"
 
-#: src/dird/dird_conf.c:1730
+#: src/dird/dird_conf.c:1729
 #, c-format
 msgid "Expected a Job Type keyword, got: %s"
 msgstr ""
 
-#: src/dird/dird_conf.c:1754
+#: src/dird/dird_conf.c:1753
 #, c-format
 msgid "Expected a Job Level keyword, got: %s"
-msgstr "Attendait un niveau de sauvegarde, eu : %s"
+msgstr "Attendait un niveau de sauvegarde, eu : %s"
 
-#: src/dird/dird_conf.c:1774
+#: src/dird/dird_conf.c:1773
 #, c-format
 msgid "Expected a Restore replacement option, got: %s"
 msgstr "Attendait un niveau de remplacement, eu : %s"
 
-#: src/dird/dird_conf.c:1824 src/dird/dird_conf.c:1940
+#: src/dird/dird_conf.c:1823 src/dird/dird_conf.c:1939
 #: src/lib/parse_conf.c:761 src/lib/parse_conf.c:777
 #, c-format
 msgid "Expect %s, got: %s"
-msgstr "Attendait %s, a pas : %s"
+msgstr "Attendait %s, a pas : %s"
 
-#: src/dird/dird_conf.c:1846 src/lib/parse_conf.c:478
+#: src/dird/dird_conf.c:1845 src/lib/parse_conf.c:478
 #, c-format
 msgid "Could not find config Resource %s referenced on line %d : %s\n"
 msgstr ""
@@ -2801,23 +2792,23 @@
 #: src/dird/getmsg.c:176
 #, c-format
 msgid "bget_dirmsg: unknown bnet signal %d\n"
-msgstr "bget_dirmsg : signal bnet inconnu %d\n"
+msgstr "bget_dirmsg : signal bnet inconnu %d\n"
 
 #: src/dird/getmsg.c:194 src/dird/getmsg.c:200 src/dird/getmsg.c:213
 #: src/dird/getmsg.c:247 src/dird/getmsg.c:269 src/dird/getmsg.c:295
 #, c-format
 msgid "Malformed message: %s\n"
-msgstr "Message mal formé : %s\n"
+msgstr "Message mal formé : %s\n"
 
 #: src/dird/getmsg.c:367
 #, c-format
 msgid "Bad response to %s command: wanted %s, got %s\n"
-msgstr "Mauvaise réponse à la commande %s : voulait %s, pas %s\n"
+msgstr "Mauvaise réponse à la commande %s : voulait %s, pas %s\n"
 
 #: src/dird/getmsg.c:372
 #, c-format
 msgid "Socket error on %s command: ERR=%s\n"
-msgstr "Erreur de socket sur la commande %s : ERR=%s\n"
+msgstr "Erreur de socket sur la commande %s : ERR=%s\n"
 
 #: src/dird/ua_restore.c:148
 msgid "\"RegexWhere\" specification not authorized.\n"
@@ -2835,15 +2826,15 @@
 
 #: src/dird/ua_restore.c:194
 msgid "Restore not done.\n"
-msgstr "Restauration non effectuée.\n"
+msgstr "Restauration non effectuée.\n"
 
 #: src/dird/ua_restore.c:205
 msgid "Unable to construct a valid BSR. Cannot continue.\n"
-msgstr "Impossible de générer un fichier bootstrap valide. Abandon.\n"
+msgstr "Impossible de générer un fichier bootstrap valide. Abandon.\n"
 
 #: src/dird/ua_restore.c:209 src/dird/ua_restore.c:221
 msgid "No files selected to be restored.\n"
-msgstr "Aucun fichier sélectionné pour la restauration.\n"
+msgstr "Aucun fichier sélectionné pour la restauration.\n"
 
 #: src/dird/ua_restore.c:215
 msgid ""
@@ -2852,7 +2843,7 @@
 "\n"
 msgstr ""
 "\n"
-"1 fichier sélectionne pour la restauration.\n"
+"1 fichier sélectionne pour la restauration.\n"
 "\n"
 
 #: src/dird/ua_restore.c:217
@@ -2863,7 +2854,7 @@
 "\n"
 msgstr ""
 "\n"
-"%s fichiers sélectionnés pour la restauration.\n"
+"%s fichiers sélectionnés pour la restauration.\n"
 "\n"
 
 #: src/dird/ua_restore.c:236
@@ -2881,40 +2872,40 @@
 
 #: src/dird/ua_restore.c:434
 msgid "List last 20 Jobs run"
-msgstr "Afficher les 20 derniers jobs lancés"
+msgstr "Afficher les 20 derniers jobs lancés"
 
 #: src/dird/ua_restore.c:435
 msgid "List Jobs where a given File is saved"
-msgstr "Afficher les jobs où un fichier donné a été sauvegardé"
+msgstr "Afficher les jobs où un fichier donné a été sauvegardé"
 
 #: src/dird/ua_restore.c:436
 msgid "Enter list of comma separated JobIds to select"
-msgstr "Saisir une liste de JobIds à sélectionner (ex : 12,4,3)"
+msgstr "Saisir une liste de JobIds à sélectionner (ex : 12,4,3)"
 
 #: src/dird/ua_restore.c:437
 msgid "Enter SQL list command"
-msgstr "Exécuter une requête SQL"
+msgstr "Exécuter une requête SQL"
 
 #: src/dird/ua_restore.c:438
 msgid "Select the most recent backup for a client"
-msgstr "Sélectionner la sauvegarde la plus récente pour un client"
+msgstr "Sélectionner la sauvegarde la plus récente pour un client"
 
 #: src/dird/ua_restore.c:439
 msgid "Select backup for a client before a specified time"
 msgstr ""
-"Sélectionner la dernière sauvegarde pour un client avant une certaine date"
+"Sélectionner la dernière sauvegarde pour un client avant une certaine date"
 
 #: src/dird/ua_restore.c:440
 msgid "Enter a list of files to restore"
-msgstr "Saisir la liste des fichiers à restaurer"
+msgstr "Saisir la liste des fichiers à restaurer"
 
 #: src/dird/ua_restore.c:441
 msgid "Enter a list of files to restore before a specified time"
-msgstr "Saisir la liste des fichiers à restaurer avant une certaine date"
+msgstr "Saisir la liste des fichiers à restaurer avant une certaine date"
 
 #: src/dird/ua_restore.c:442
 msgid "Find the JobIds of the most recent backup for a client"
-msgstr "Afficher les JobIds de sauvegarde les plus récents pour un client"
+msgstr "Afficher les JobIds de sauvegarde les plus récents pour un client"
 
 #: src/dird/ua_restore.c:443
 msgid "Find the JobIds for a backup for a client before a specified time"
@@ -2922,7 +2913,7 @@
 
 #: src/dird/ua_restore.c:444
 msgid "Enter a list of directories to restore for found JobIds"
-msgstr "Saisir la liste des répertoires à restaurer (pour un JobId)"
+msgstr "Saisir la liste des répertoires à restaurer (pour un JobId)"
 
 #: src/dird/ua_restore.c:445
 msgid "Select full restore to a specified Job date"
@@ -2936,17 +2927,17 @@
 #: src/dird/ua_restore.c:491
 #, c-format
 msgid "Unknown keyword: %s\n"
-msgstr "Mot clef inconnu : %s\n"
+msgstr "Mot clef inconnu : %s\n"
 
 #: src/dird/ua_restore.c:520 src/dird/ua_update.c:955
 #, c-format
 msgid "Improper date format: %s\n"
-msgstr "Format de date invalide : %s\n"
+msgstr "Format de date invalide : %s\n"
 
 #: src/dird/ua_restore.c:560
 #, c-format
 msgid "Error: Pool resource \"%s\" access not allowed.\n"
-msgstr "Erreur : l'utilisation du Pool « %s » n'est pas autorisé.\n"
+msgstr "Erreur : l'utilisation du Pool \"%s\" n'est pas autorisé.\n"
 
 #: src/dird/ua_restore.c:576
 msgid ""
@@ -2958,23 +2949,22 @@
 "\n"
 msgstr ""
 "\n"
-"D'abord, vous devez sélectionner un ou plusieurs jobs (par leur JobId) qui\n"
-"contiennent les fichiers à restaurer. Il vous est présenté plusieurs "
-"méthodes\n"
-"pour choisir le bon JobId. Après, vous pourrez sélectionner les fichiers "
-"à\n"
-"restaurer parmi la liste totale des fichiers présents dans les jobs\n"
-"sélectionnés.\n"
+"D'abord, vous devez sélectionner un ou plusieurs jobs (par leur JobId) qui\n"
+"contiennent les fichiers à restaurer. Il vous est présenté plusieurs "
+"méthodes\n"
+"pour choisir le bon JobId. Après, vous pourrez sélectionner les fichiers à\n"
+"restaurer parmi la liste totale des fichiers présents dans les jobs\n"
+"sélectionnés.\n"
 "\n"
 
 #: src/dird/ua_restore.c:589
 msgid "To select the JobIds, you have the following choices:\n"
 msgstr ""
-"Pour sélectionner les JobIds, vous avez les possibilités suivantes :\n"
+"Pour sélectionner les JobIds, vous avez les possibilités suivantes :\n"
 
 #: src/dird/ua_restore.c:594
 msgid "Select item: "
-msgstr "Choix : "
+msgstr "Choix : "
 
 #: src/dird/ua_restore.c:599 src/dird/ua_restore.c:634
 msgid "SQL query not authorized.\n"
@@ -2982,15 +2972,15 @@
 
 #: src/dird/ua_restore.c:612
 msgid "Enter Filename (no path):"
-msgstr "Saisissez le nom du fichier (sans le chemin) :"
+msgstr "Saisissez le nom du fichier (sans le chemin) :"
 
 #: src/dird/ua_restore.c:627 src/dird/ua_restore.c:735
 msgid "Enter JobId(s), comma separated, to restore: "
-msgstr "Saisissez le ou les JobIds à restaurer (ex : id1,id2,id3) : "
+msgstr "Saisissez le ou les JobIds à restaurer (ex : id1,id2,id3) : "
 
 #: src/dird/ua_restore.c:637
 msgid "Enter SQL list command: "
-msgstr "Exécuter une requête SQL : "
+msgstr "Exécuter une requête SQL : "
 
 #: src/dird/ua_restore.c:671 src/dird/ua_restore.c:694
 msgid ""
@@ -2998,18 +2988,18 @@
 "containing a list of file names with paths, and terminate\n"
 "them with a blank line.\n"
 msgstr ""
-"Saisissez les répertoires complets ou bien < pour saisir le nom d'un\n"
-"fichier contenant la liste des répertoires et\n"
+"Saisissez les répertoires complets ou bien < pour saisir le nom d'un\n"
+"fichier contenant la liste des répertoires et\n"
 "terminez la saisie par une ligne vide.\n"
 
 #: src/dird/ua_restore.c:675 src/dird/ua_restore.c:698
 msgid "Enter full filename: "
-msgstr "Saisissez le nom complet du fichier : "
+msgstr "Saisissez le nom complet du fichier : "
 
 #: src/dird/ua_restore.c:733
 #, c-format
 msgid "You have already selected the following JobIds: %s\n"
-msgstr "Vous avez déjà sélectionné les JobIds suivants : %s\n"
+msgstr "Vous avez déjà sélectionné les JobIds suivants : %s\n"
 
 #: src/dird/ua_restore.c:751
 msgid ""
@@ -3017,13 +3007,13 @@
 "with a < to indicate it is a filename containing a list\n"
 "of directories and terminate them with a blank line.\n"
 msgstr ""
-"Saisissez les répertoires complets ou bien le nom d'un\n"
-"fichier (commençant par <) contenant la liste des répertoires et\n"
+"Saisissez les répertoires complets ou bien le nom d'un\n"
+"fichier (commençant par <) contenant la liste des répertoires et\n"
 "terminez la saisie par une ligne vide.\n"
 
 #: src/dird/ua_restore.c:755
 msgid "Enter directory name: "
-msgstr "Saisissez le nom d'un répertoire : "
+msgstr "Saisissez le nom d'un répertoire : "
 
 #: src/dird/ua_restore.c:771
 msgid "Enter JobId to get the state to restore: "
@@ -3045,17 +3035,17 @@
 
 #: src/dird/ua_restore.c:842
 msgid "No Jobs selected.\n"
-msgstr "Pas de job sélectionné.\n"
+msgstr "Pas de job sélectionné.\n"
 
 #: src/dird/ua_restore.c:847
 #, c-format
 msgid "You have selected the following JobIds: %s\n"
-msgstr "Vous avez sélectionné les JobIds suivants : %s\n"
+msgstr "Vous avez sélectionné les JobIds suivants : %s\n"
 
 #: src/dird/ua_restore.c:849
 #, c-format
 msgid "You have selected the following JobId: %s\n"
-msgstr "Vous avez sélectionné le JobId suivant : %s\n"
+msgstr "Vous avez sélectionné le JobId suivant : %s\n"
 
 #: src/dird/ua_restore.c:859
 msgid ""
@@ -3066,7 +3056,7 @@
 
 #: src/dird/ua_restore.c:862
 msgid "Enter date as YYYY-MM-DD HH:MM:SS :"
-msgstr "Saisissez la date au format YYYY-MM-DD HH:MM:SS :"
+msgstr "Saisissez la date au format YYYY-MM-DD HH:MM:SS :"
 
 #: src/dird/ua_restore.c:868
 msgid "Improper date format.\n"
@@ -3075,17 +3065,17 @@
 #: src/dird/ua_restore.c:889
 #, c-format
 msgid "Cannot open file %s: ERR=%s\n"
-msgstr "Impossible d'ouvrir le fichier %s : ERR=%s\n"
+msgstr "Impossible d'ouvrir le fichier %s : ERR=%s\n"
 
 #: src/dird/ua_restore.c:897 src/dird/ua_restore.c:901
 #, c-format
 msgid "Error occurred on line %d of file \"%s\"\n"
-msgstr "Une erreur est survenue à la ligne %d de  « %s »\n"
+msgstr "Une erreur est survenue à la ligne %d de  \"%s\"\n"
 
 #: src/dird/ua_restore.c:945 src/dird/ua_restore.c:973
 #, c-format
 msgid "No database record found for: %s\n"
-msgstr "Pas d'enregistrement trouvé en base pour : %s\n"
+msgstr "Pas d'enregistrement trouvé en base pour : %s\n"
 
 #: src/dird/ua_restore.c:961
 msgid "No JobId specified cannot continue.\n"
@@ -3111,7 +3101,7 @@
 "Do you want to restore all the files? (yes|no): "
 msgstr ""
 "\n"
-"Voulez vous restaurer tous les fichiers ? (oui|non) : "
+"Voulez vous restaurer tous les fichiers ? (oui|non) : "
 
 #: src/dird/ua_restore.c:1058
 msgid ""
@@ -3179,17 +3169,17 @@
 #: src/dird/ua_restore.c:1351 src/dird/ua_restore.c:1367
 #, c-format
 msgid "No Full backup before %s found.\n"
-msgstr "Pas de backup Full trouvé avant %s.\n"
+msgstr "Pas de backup Full trouvé avant %s.\n"
 
 #: src/dird/ua_restore.c:1396
 msgid "No jobs found.\n"
-msgstr "Pas de jobs trouvé.\n"
+msgstr "Pas de jobs trouvé.\n"
 
 #: src/dird/ua_restore.c:1517
 #, c-format
 msgid "Warning default storage overridden by \"%s\" on command line.\n"
 msgstr ""
-"Attention, le storage par défaut est remplacé par  « %s » en ligne de "
+"Attention, le storage par défaut est remplacé par  \"%s\" en ligne de "
 "commande.\n"
 
 #: src/dird/ua_restore.c:1533
@@ -3197,8 +3187,8 @@
 msgid ""
 "Storage \"%s\" not found, using Storage \"%s\" from MediaType \"%s\".\n"
 msgstr ""
-"Le Storage « %s » est introuvable, utilisation du Storage « %s » du "
-"MediaType « %s ».\n"
+"Le Storage \"%s\" est introuvable, utilisation du Storage \"%s\" du "
+"MediaType \"%s\".\n"
 
 #: src/dird/ua_restore.c:1541
 #, c-format
@@ -3227,105 +3217,105 @@
 msgid "FD gave bad response to JobId command: %s\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:183 src/dird/fd_cmds.c:268
+#: src/dird/fd_cmds.c:184 src/dird/fd_cmds.c:272
 msgid ", since="
 msgstr ", depuis="
 
-#: src/dird/fd_cmds.c:246
+#: src/dird/fd_cmds.c:249
 msgid ""
 "No prior or suitable Full backup found in catalog. Doing FULL backup.\n"
 msgstr ""
-"Pas de précédent backup Full utilisable. Lancement d'un backup FULL.\n"
+"Pas de précédent backup Full utilisable. Lancement d'un backup FULL.\n"
 
-#: src/dird/fd_cmds.c:247 src/dird/fd_cmds.c:253 src/dird/fd_cmds.c:261
+#: src/dird/fd_cmds.c:250 src/dird/fd_cmds.c:256 src/dird/fd_cmds.c:265
 #, c-format
 msgid " (upgraded from %s)"
-msgstr " (à la place de %s)"
+msgstr " (à la place de %s)"
 
-#: src/dird/fd_cmds.c:252
+#: src/dird/fd_cmds.c:255
 msgid ""
 "No prior or suitable Differential backup found in catalog. Doing "
 "Differential backup.\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:259
+#: src/dird/fd_cmds.c:263
 #, c-format
 msgid "Prior failed job found in catalog. Upgrading to %s.\n"
-msgstr "Le job précédent était en erreur. Passage au type %s.\n"
+msgstr "Le job précédent était en erreur. Passage au type %s.\n"
 
-#: src/dird/fd_cmds.c:322
+#: src/dird/fd_cmds.c:328
 #, c-format
 msgid "Unimplemented backup level %d %c\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:395
+#: src/dird/fd_cmds.c:401
 msgid ""
 "FD compression disabled for this Job because AllowCompress=No in Storage "
 "resource.\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:494 src/filed/job.c:822
+#: src/dird/fd_cmds.c:500 src/filed/job.c:858
 #, c-format
 msgid "Cannot run program: %s. ERR=%s\n"
-msgstr "Impossible de lancer la commande : %s. ERR=%s\n"
+msgstr "Impossible de lancer la commande : %s. ERR=%s\n"
 
-#: src/dird/fd_cmds.c:505 src/dird/fd_cmds.c:530 src/dird/fd_cmds.c:544
+#: src/dird/fd_cmds.c:511 src/dird/fd_cmds.c:536 src/dird/fd_cmds.c:550
 msgid ">filed: write error on socket\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:511
+#: src/dird/fd_cmds.c:517
 #, c-format
 msgid "Error running program: %s. ERR=%s\n"
-msgstr "Erreur dans l'exécution de la commande : %s. ERR=%s\n"
+msgstr "Erreur dans l'exécution de la commande : %s. ERR=%s\n"
 
-#: src/dird/fd_cmds.c:520
+#: src/dird/fd_cmds.c:526
 #, c-format
 msgid "Cannot open included file: %s. ERR=%s\n"
-msgstr "Impossible d'ouvrir le fichier inclus : %s. ERR=%s\n"
+msgstr "Impossible d'ouvrir le fichier inclus : %s. ERR=%s\n"
 
-#: src/dird/fd_cmds.c:666
+#: src/dird/fd_cmds.c:672
 #, c-format
 msgid "Client \"%s\" RunScript failed.\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:689
+#: src/dird/fd_cmds.c:695
 #, c-format
 msgid ""
 "Client \"%s\" may not be used to restore this job. Please upgrade your "
 "client.\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:755
+#: src/dird/fd_cmds.c:770
 msgid "RestoreObject failed.\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:791
+#: src/dird/fd_cmds.c:806
 #, c-format
 msgid ""
 "<filed: bad attributes, expected 3 fields got %d\n"
 "msglen=%d msg=%s\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:810 src/dird/fd_cmds.c:869 src/dird/catreq.c:443
+#: src/dird/fd_cmds.c:825 src/dird/fd_cmds.c:884 src/dird/catreq.c:443
 #: src/cats/sqlite.c:374 src/cats/ingres.c:451 src/cats/postgresql.c:441
 #: src/cats/dbi.c:552 src/cats/mysql.c:358
 #, c-format
 msgid "Attribute create error. %s"
 msgstr "Erreur de création d'attribut. %s"
 
-#: src/dird/fd_cmds.c:847
+#: src/dird/fd_cmds.c:862
 #, c-format
 msgid "%s index %d not same as attributes %d\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:861
+#: src/dird/fd_cmds.c:876
 #, c-format
 msgid "<filed: Network error getting attributes. ERR=%s\n"
 msgstr ""
 
 #: src/dird/ua_label.c:104
 msgid "Negative numbers not permitted\n"
-msgstr "Les nombres négatifs ne sont pas autorisés\n"
+msgstr "Les nombres négatifs ne sont pas autorisés\n"
 
 #: src/dird/ua_label.c:110
 msgid "Range end is not integer.\n"
@@ -3345,52 +3335,51 @@
 
 #: src/dird/ua_label.c:133
 msgid "Values must be be greater than zero.\n"
-msgstr "Les valeurs doivent être supérieurs à zéro.\n"
+msgstr "Les valeurs doivent être supérieurs à zéro.\n"
 
 #: src/dird/ua_label.c:137
 msgid "Slot too large.\n"
 msgstr "Slot trop grand.\n"
 
-#: src/dird/ua_label.c:187 src/dird/ua_label.c:352 src/dird/ua_label.c:1215
-#: src/dird/ua_run.c:1537
+#: src/dird/ua_label.c:187 src/dird/ua_label.c:352 src/dird/ua_label.c:1214
+#: src/dird/ua_run.c:1557
 msgid "command line"
 msgstr "ligne de commande"
 
-#: src/dird/ua_label.c:205 src/dird/ua_label.c:516 src/dird/ua_label.c:1222
+#: src/dird/ua_label.c:205 src/dird/ua_label.c:516 src/dird/ua_label.c:1221
 msgid "No slots in changer to scan.\n"
-msgstr "Pas de slot dans le magasin à scanner.\n"
+msgstr "Pas de slot dans le magasin à scanner.\n"
 
 #: src/dird/ua_label.c:217 src/dird/ua_label.c:527
 msgid "No Volumes found to label, or no barcodes.\n"
-msgstr "Pas de volume à labéliser ou pas de codebar.\n"
+msgstr "Pas de volume à labéliser ou pas de codebar.\n"
 
-#: src/dird/ua_label.c:227 src/dird/ua_label.c:1243
+#: src/dird/ua_label.c:227 src/dird/ua_label.c:1242
 #, c-format
 msgid "Slot %d greater than max %d ignored.\n"
-msgstr "Le slot %d est ignoré car il est supérieur au maximum %d.\n"
+msgstr "Le slot %d est ignoré car il est supérieur au maximum %d.\n"
 
 #: src/dird/ua_label.c:256
 #, c-format
 msgid "No VolName for Slot=%d InChanger set to zero.\n"
-msgstr "Pas de volume sur le Slot %d. Mise à zéro de InChanger.\n"
+msgstr "Pas de volume sur le Slot %d. Mise à zéro de InChanger.\n"
 
 #: src/dird/ua_label.c:274
 #, c-format
 msgid "Catalog record for Volume \"%s\" updated to reference slot %d.\n"
 msgstr ""
-"Mise à jour des informations du volume « %s » dans le catalogue "
-"(Slot=%d).\n"
+"Mise à jour des informations du volume \"%s\" dans le catalogue (Slot=%d).\n"
 
 #: src/dird/ua_label.c:278
 #, c-format
 msgid "Catalog record for Volume \"%s\" is up to date.\n"
-msgstr "Le volume « %s » est à jour dans le catalogue.\n"
+msgstr "Le volume \"%s\" est à jour dans le catalogue.\n"
 
 #: src/dird/ua_label.c:284
 #, c-format
 msgid "Volume \"%s\" not found in catalog. Slot=%d InChanger set to zero.\n"
 msgstr ""
-"Volume « %s » absent du catalogue. mise à zéro de InChanger pour le "
+"Volume \"%s\" absent du catalogue. mise à zéro de InChanger pour le "
 "Slot=%d.\n"
 
 #: src/dird/ua_label.c:381
@@ -3399,32 +3388,31 @@
 "Volume \"%s\" has VolStatus %s. It must be Purged or Recycled before "
 "relabeling.\n"
 msgstr ""
-"Le volume « %s » (VolStatus) a le statut « %s ». Il doit être "
-"purgé ou bien\n"
-"recyclé avant de pouvoir le re-labéliser.\n"
+"Le volume \"%s\" (VolStatus) a le statut \"%s\". Il doit être purgé ou bien\n"
+"recyclé avant de pouvoir le re-labéliser.\n"
 
 #: src/dird/ua_label.c:397
 msgid "Enter new Volume name: "
-msgstr "Saisissez le nouveau nom du Volume : "
+msgstr "Saisissez le nouveau nom du Volume : "
 
 #: src/dird/ua_label.c:410
 #, c-format
 msgid "Media record for new Volume \"%s\" already exists.\n"
-msgstr "Le nouveau volume « %s » existe déjà en base.\n"
+msgstr "Le nouveau volume \"%s\" existe déjà en base.\n"
 
 #: src/dird/ua_label.c:428
 msgid "Enter slot (0 or Enter for none): "
-msgstr "Saisissez le slot (0 ou Entrée pour aucun) : "
+msgstr "Saisissez le slot (0 ou Entrée pour aucun) : "
 
 #: src/dird/ua_label.c:456
 #, c-format
 msgid "Delete of Volume \"%s\" failed. ERR=%s"
-msgstr "Impossible de supprimer le volume « %s ». ERR=%s"
+msgstr "Impossible de supprimer le volume \"%s\". ERR=%s"
 
 #: src/dird/ua_label.c:459
 #, c-format
 msgid "Old volume \"%s\" deleted from catalog.\n"
-msgstr "L'ancien volume « %s » a été supprimé du catalogue.\n"
+msgstr "L'ancien volume \"%s\" a été supprimé du catalogue.\n"
 
 #: src/dird/ua_label.c:470
 #, c-format
@@ -3441,7 +3429,7 @@
 "Slot  Volume\n"
 "==============\n"
 msgstr ""
-"Les volumes suivants vont être labélisés :\n"
+"Les volumes suivants vont être labélisés :\n"
 "Slot  Volume\n"
 "==============\n"
 
@@ -3457,7 +3445,7 @@
 #: src/dird/ua_label.c:568
 #, c-format
 msgid "Error setting InChanger: ERR=%s"
-msgstr "Impossible de positionner le flag InChanger : ERR=%s"
+msgstr "Impossible de positionner le flag InChanger : ERR=%s"
 
 #: src/dird/ua_label.c:591
 #, c-format
@@ -3477,18 +3465,17 @@
 #: src/dird/ua_label.c:641
 #, c-format
 msgid "Illegal character \"%c\" in a volume name.\n"
-msgstr "Caractères « %c » interdits dans le nom d'un volume.\n"
+msgstr "Caractères « %c » interdits dans le nom d'un volume.\n"
 
 #: src/dird/ua_label.c:688
 #, c-format
 msgid "Sending relabel command from \"%s\" to \"%s\" ...\n"
-msgstr ""
-"Envoie de la commande pour re-labéliser de « %s » à « %s »...\n"
+msgstr "Envoie de la commande pour re-labéliser de \"%s\" à \"%s\"...\n"
 
 #: src/dird/ua_label.c:695
 #, c-format
 msgid "Sending label command for Volume \"%s\" Slot %d ...\n"
-msgstr "Demande de labélisation du volume « %s » Slot %d...\n"
+msgstr "Demande de labélisation du volume \"%s\" Slot %d...\n"
 
 #: src/dird/ua_label.c:736
 #, c-format
@@ -3498,7 +3485,7 @@
 #: src/dird/ua_label.c:749
 #, c-format
 msgid "Label command failed for Volume %s.\n"
-msgstr "Impossible de labéliser le volume %s.\n"
+msgstr "Impossible de labéliser le volume %s.\n"
 
 #: src/dird/ua_label.c:787
 msgid "Could not open SD socket.\n"
@@ -3507,35 +3494,34 @@
 #: src/dird/ua_label.c:859 src/dird/ua_label.c:869
 #, c-format
 msgid "Invalid Slot number: %s\n"
-msgstr "Numéro de slot invalide : %s\n"
+msgstr "Numéro de slot invalide : %s\n"
 
 #: src/dird/ua_label.c:878
 #, c-format
 msgid "Invalid Volume name: %s\n"
-msgstr "Nom de Volume invalide : %s\n"
+msgstr "Nom de Volume invalide : %s\n"
 
 #: src/dird/ua_label.c:972
 #, c-format
 msgid "Device \"%s\" has %d slots.\n"
-msgstr "Le Device « %s » a %d slots.\n"
+msgstr "Le Device \"%s\" a %d slots.\n"
 
 #: src/dird/ua_label.c:1018
 #, c-format
 msgid "Pool \"%s\" resource not found for volume \"%s\"!\n"
-msgstr ""
-"La ressource Pool « %s » est introuvable pour le volume « %s »\n"
+msgstr "La ressource Pool \"%s\" est introuvable pour le volume \"%s\"\n"
 
-#: src/dird/ua_label.c:1234
+#: src/dird/ua_label.c:1233
 msgid "No Volumes found, or no barcodes.\n"
 msgstr ""
 
-#: src/dird/ua_label.c:1237
+#: src/dird/ua_label.c:1236
 msgid ""
 " Slot |   Volume Name    |   Status  |     Media Type       |      Pool      "
 "    |\n"
 msgstr ""
 
-#: src/dird/ua_label.c:1238
+#: src/dird/ua_label.c:1237
 msgid ""
 "------+------------------+-----------+----------------------+----------------"
 "----|\n"
@@ -3544,7 +3530,7 @@
 #: src/dird/scheduler.c:112
 #, c-format
 msgid "Job %s not found\n"
-msgstr "Job %s non trouvé\n"
+msgstr "Job %s non trouvé\n"
 
 #: src/dird/scheduler.c:136
 msgid "Walk queue"
@@ -3566,114 +3552,119 @@
 msgid "run override"
 msgstr ""
 
-#: src/dird/scheduler.c:411
+#: src/dird/scheduler.c:413
 msgid "Inserted job"
 msgstr ""
 
-#: src/dird/scheduler.c:419
+#: src/dird/scheduler.c:421
 msgid "Appended job"
 msgstr ""
 
-#: src/dird/scheduler.c:423
+#: src/dird/scheduler.c:425
 msgid "Run queue"
 msgstr ""
 
-#: src/dird/run_conf.c:206
+#: src/dird/run_conf.c:208
 #, c-format
 msgid "Expected an equals, got: %s"
-msgstr "Attendait un égale, pas : %s"
+msgstr "Attendait un égale, pas : %s"
 
-#: src/dird/run_conf.c:219 src/dird/run_conf.c:231
+#: src/dird/run_conf.c:221 src/dird/run_conf.c:233 src/dird/run_conf.c:327
 #, c-format
 msgid "Expect a YES or NO, got: %s"
 msgstr "Attendait Oui ou Non, eu : %s"
 
-#: src/dird/run_conf.c:245
+#: src/dird/run_conf.c:247
 #, c-format
 msgid "Job level field: %s not found in run record"
 msgstr ""
 
-#: src/dird/run_conf.c:263
+#: src/dird/run_conf.c:265
 #, c-format
 msgid "Could not find specified Pool Resource: %s"
 msgstr ""
 
-#: src/dird/run_conf.c:288
+#: src/dird/run_conf.c:290
 #, c-format
 msgid "Could not find specified Storage Resource: %s"
 msgstr ""
 
-#: src/dird/run_conf.c:300
+#: src/dird/run_conf.c:302
 #, c-format
 msgid "Could not find specified Messages Resource: %s"
 msgstr ""
 
-#: src/dird/run_conf.c:308
+#: src/dird/run_conf.c:312 src/lib/parse_conf.c:736 src/lib/parse_conf.c:742
+#, c-format
+msgid "expected a time period, got: %s"
+msgstr ""
+
+#: src/dird/run_conf.c:331
 #, c-format
 msgid "Expected a keyword name, got: %s"
 msgstr ""
 
-#: src/dird/run_conf.c:347
+#: src/dird/run_conf.c:370
 msgid "Day number out of range (1-31)"
 msgstr ""
 
-#: src/dird/run_conf.c:364 src/dird/run_conf.c:519
+#: src/dird/run_conf.c:387 src/dird/run_conf.c:542
 msgid "Week number out of range (0-53)"
 msgstr "Numero de semaine hors du champ (0-53)"
 
-#: src/dird/run_conf.c:380
+#: src/dird/run_conf.c:403
 #, c-format
 msgid "Job type field: %s in run record not found"
 msgstr ""
 
-#: src/dird/run_conf.c:387
+#: src/dird/run_conf.c:410
 #, c-format
 msgid "Unexpected token: %d:%s"
 msgstr "Jeton inattendu: %d:%s"
 
-#: src/dird/run_conf.c:431
+#: src/dird/run_conf.c:454
 msgid "Time must be preceded by keyword AT."
 msgstr "L'heure doit être précédée par le mot-clé AT."
 
-#: src/dird/run_conf.c:440
+#: src/dird/run_conf.c:463
 msgid "Time logic error.\n"
 msgstr ""
 
-#: src/dird/run_conf.c:455 src/dird/run_conf.c:474
+#: src/dird/run_conf.c:478 src/dird/run_conf.c:497
 msgid "Bad time specification."
 msgstr ""
 
-#: src/dird/run_conf.c:488
+#: src/dird/run_conf.c:511
 msgid "Range logic error.\n"
 msgstr ""
 
-#: src/dird/run_conf.c:497
+#: src/dird/run_conf.c:520
 msgid "Bad day range specification."
 msgstr ""
 
-#: src/dird/run_conf.c:544
+#: src/dird/run_conf.c:567
 msgid "Invalid month, week or position day range"
 msgstr ""
 
-#: src/dird/run_conf.c:559
+#: src/dird/run_conf.c:582
 msgid "Invalid month, weekday or position range"
 msgstr ""
 
-#: src/dird/run_conf.c:618
+#: src/dird/run_conf.c:641
 msgid "Unexpected run state\n"
 msgstr ""
 
 #: src/dird/ua_update.c:97
 msgid "Update choice:\n"
-msgstr "Élément à mettre à jour :\n"
+msgstr "Élément à mettre à jour :\n"
 
 #: src/dird/ua_update.c:98
 msgid "Volume parameters"
-msgstr "Paramètres d'un volume"
+msgstr "Paramètres d'un volume"
 
 #: src/dird/ua_update.c:99
 msgid "Pool from resource"
-msgstr "Pool à partir de sa définition"
+msgstr "Pool à partir de sa définition"
 
 #: src/dird/ua_update.c:100
 msgid "Slots from autochanger"
@@ -3689,7 +3680,7 @@
 
 #: src/dird/ua_update.c:102
 msgid "Choose catalog item to update"
-msgstr "Choisissez l'élément à mettre à jour"
+msgstr "Choisissez l'élément à mettre à jour"
 
 #: src/dird/ua_update.c:145
 #, c-format
@@ -3699,27 +3690,27 @@
 #: src/dird/ua_update.c:154
 #, c-format
 msgid "New Volume status is: %s\n"
-msgstr "Le statut du volume est : %s\n"
+msgstr "Le statut du volume est : %s\n"
 
 #: src/dird/ua_update.c:164
 #, c-format
 msgid "Invalid retention period specified: %s\n"
-msgstr "Période de rétention invalide : %s\n"
+msgstr "Période de rétention invalide : %s\n"
 
 #: src/dird/ua_update.c:172
 #, c-format
 msgid "New retention period is: %s\n"
-msgstr "La nouvelle période de rétention est : %s\n"
+msgstr "La nouvelle période de rétention est : %s\n"
 
 #: src/dird/ua_update.c:183
 #, c-format
 msgid "Invalid use duration specified: %s\n"
-msgstr "Durée d'utilisation invalide : %s\n"
+msgstr "Durée d'utilisation invalide : %s\n"
 
 #: src/dird/ua_update.c:191
 #, c-format
 msgid "New use duration is: %s\n"
-msgstr "La nouvelle durée d'utilisation est : %s\n"
+msgstr "La nouvelle durée d'utilisation est : %s\n"
 
 #: src/dird/ua_update.c:205
 #, c-format
@@ -3743,7 +3734,7 @@
 
 #: src/dird/ua_update.c:248 src/dird/ua_update.c:268
 msgid "Invalid value. It must be yes or no.\n"
-msgstr "Saisie invalide. Veuillez répondre oui ou non.\n"
+msgstr "Saisie invalide. Veuillez répondre oui ou non.\n"
 
 #: src/dird/ua_update.c:256
 #, c-format
@@ -3751,14 +3742,14 @@
 msgstr ""
 
 #: src/dird/ua_update.c:257 src/dird/ua_update.c:277 src/dird/ua_update.c:698
-#: src/dird/ua_run.c:178 src/dird/backup.c:780 src/dird/backup.c:781
-#: src/dird/backup.c:782 src/dird/ua_input.c:131 src/stored/parse_bsr.c:864
-#: src/tools/dbcheck.c:1342
+#: src/dird/ua_run.c:180 src/dird/backup.c:778 src/dird/backup.c:779
+#: src/dird/backup.c:780 src/dird/ua_input.c:131 src/stored/parse_bsr.c:864
+#: src/tools/dbcheck.c:1352
 msgid "yes"
 msgstr "oui"
 
 #: src/dird/ua_update.c:257 src/dird/ua_update.c:277 src/dird/ua_update.c:698
-#: src/dird/backup.c:780 src/dird/backup.c:781 src/dird/backup.c:782
+#: src/dird/backup.c:778 src/dird/backup.c:779 src/dird/backup.c:780
 #: src/dird/ua_input.c:135 src/stored/parse_bsr.c:864
 msgid "no"
 msgstr "non"
@@ -3771,7 +3762,7 @@
 #: src/dird/ua_update.c:294
 #, c-format
 msgid "Invalid slot, it must be between 0 and MaxVols=%d\n"
-msgstr "Slot invalide, il doit être compris entre 0 et MaxVols=%d\n"
+msgstr "Slot invalide, il doit être compris entre 0 et MaxVols=%d\n"
 
 #: src/dird/ua_update.c:303 src/dird/ua_update.c:726
 #, c-format
@@ -3781,17 +3772,17 @@
 #: src/dird/ua_update.c:305
 #, c-format
 msgid "New Slot is: %d\n"
-msgstr "Le nouveau slot est : %d\n"
+msgstr "Le nouveau slot est : %d\n"
 
 #: src/dird/ua_update.c:330
 #, c-format
 msgid "New Pool is: %s\n"
-msgstr "Le nouveau pool est : %s\n"
+msgstr "Le nouveau pool est : %s\n"
 
 #: src/dird/ua_update.c:373
 #, c-format
 msgid "New RecyclePool is: %s\n"
-msgstr "Le nouveau RecyclePool est : %s\n"
+msgstr "Le nouveau RecyclePool est : %s\n"
 
 #: src/dird/ua_update.c:393
 #, c-format
@@ -3838,9 +3829,9 @@
 msgid "New ActionOnPurge is: %s\n"
 msgstr ""
 
-#: src/dird/ua_update.c:604 src/dird/ua_run.c:229
+#: src/dird/ua_update.c:604 src/dird/ua_run.c:235
 msgid "Parameters to modify:\n"
-msgstr "Paramètre à modifier :\n"
+msgstr "Paramètre à modifier :\n"
 
 #: src/dird/ua_update.c:605
 msgid "Volume Status"
@@ -3848,11 +3839,11 @@
 
 #: src/dird/ua_update.c:606
 msgid "Volume Retention Period"
-msgstr "Période de rétention d'un volume"
+msgstr "Période de rétention d'un volume"
 
 #: src/dird/ua_update.c:607
 msgid "Volume Use Duration"
-msgstr "Durée d'utilisation d'un volume"
+msgstr "Durée d'utilisation d'un volume"
 
 #: src/dird/ua_update.c:608
 msgid "Maximum Volume Jobs"
@@ -3910,23 +3901,23 @@
 msgid "Done"
 msgstr "Fin"
 
-#: src/dird/ua_update.c:623 src/dird/ua_run.c:259 src/dird/ua_run.c:588
+#: src/dird/ua_update.c:623 src/dird/ua_run.c:265 src/dird/ua_run.c:594
 msgid "Select parameter to modify"
-msgstr "Sélectionnez le paramètre à modifier"
+msgstr "Sélectionnez le paramètre à modifier"
 
 #: src/dird/ua_update.c:631
 #, c-format
 msgid "Updating Volume \"%s\"\n"
-msgstr "Mise à jour du Volume « %s »\n"
+msgstr "Mise à jour du Volume \"%s\"\n"
 
 #: src/dird/ua_update.c:636
 #, c-format
 msgid "Current Volume status is: %s\n"
-msgstr "Le statut actuel du volume (Volume status) est : %s\n"
+msgstr "Le statut actuel du volume (Volume status) est : %s\n"
 
 #: src/dird/ua_update.c:637
 msgid "Possible Values are:\n"
-msgstr "Les valeurs possibles sont :\n"
+msgstr "Les valeurs possibles sont :\n"
 
 #: src/dird/ua_update.c:648
 msgid "Choose new Volume Status"
@@ -3935,47 +3926,47 @@
 #: src/dird/ua_update.c:654
 #, c-format
 msgid "Current retention period is: %s\n"
-msgstr "La période de rétention actuelle est : %s\n"
+msgstr "La période de rétention actuelle est : %s\n"
 
 #: src/dird/ua_update.c:656
 msgid "Enter Volume Retention period: "
-msgstr "Saisissez la période de rétention du volume : "
+msgstr "Saisissez la période de rétention du volume : "
 
 #: src/dird/ua_update.c:663
 #, c-format
 msgid "Current use duration is: %s\n"
-msgstr "La durée d'utilisation actuelle est : %s\n"
+msgstr "La durée d'utilisation actuelle est : %s\n"
 
 #: src/dird/ua_update.c:665
 msgid "Enter Volume Use Duration: "
-msgstr "Saisissez la durée d'utilisation du volume : "
+msgstr "Saisissez la durée d'utilisation du volume : "
 
 #: src/dird/ua_update.c:672
 #, c-format
 msgid "Current max jobs is: %u\n"
-msgstr "Le nombre maximum de Job actuel est : %u\n"
+msgstr "Le nombre maximum de Job actuel est : %u\n"
 
 #: src/dird/ua_update.c:673
 msgid "Enter new Maximum Jobs: "
-msgstr "Saisissez la valeur du nombre maximum de Job : "
+msgstr "Saisissez la valeur du nombre maximum de Job : "
 
 #: src/dird/ua_update.c:680
 #, c-format
 msgid "Current max files is: %u\n"
-msgstr "Le nombre maximum de fichier actuel est : %u\n"
+msgstr "Le nombre maximum de fichier actuel est : %u\n"
 
 #: src/dird/ua_update.c:681
 msgid "Enter new Maximum Files: "
-msgstr "Saisissez la valeur du nombre maximum de fichier (Maximum Files) : "
+msgstr "Saisissez la valeur du nombre maximum de fichier (Maximum Files) : "
 
 #: src/dird/ua_update.c:688
 #, c-format
 msgid "Current value is: %s\n"
-msgstr "La valeur actuelle est : %s\n"
+msgstr "La valeur actuelle est : %s\n"
 
 #: src/dird/ua_update.c:689
 msgid "Enter new Maximum Bytes: "
-msgstr "Saisissez la nouvelle taille maximum (octets) : "
+msgstr "Saisissez la nouvelle taille maximum (octets) : "
 
 #: src/dird/ua_update.c:697
 #, c-format
@@ -3989,11 +3980,11 @@
 #: src/dird/ua_update.c:706
 #, c-format
 msgid "Current Slot is: %d\n"
-msgstr "Le slot courant est : %d\n"
+msgstr "Le slot courant est : %d\n"
 
 #: src/dird/ua_update.c:707
 msgid "Enter new Slot: "
-msgstr "Saisissez le nouveau slot : "
+msgstr "Saisissez le nouveau slot : "
 
 #: src/dird/ua_update.c:714
 #, c-format
@@ -4017,7 +4008,7 @@
 "\n"
 msgstr ""
 "Attention, changer le nombre de fichier du Volume peut\n"
-"vous faire perdre des données du Volume\n"
+"vous faire perdre des données du Volume\n"
 "\n"
 
 #: src/dird/ua_update.c:737
@@ -4046,25 +4037,25 @@
 #: src/dird/ua_update.c:766
 #, c-format
 msgid "Current Pool is: %s\n"
-msgstr "Le pool courant est : %s\n"
+msgstr "Le pool courant est : %s\n"
 
 #: src/dird/ua_update.c:767
 msgid "Enter new Pool name: "
-msgstr "Saisissez le nouveau nom pour ce pool : "
+msgstr "Saisissez le nouveau nom pour ce pool : "
 
 #: src/dird/ua_update.c:788
 #, c-format
 msgid "Current Enabled is: %d\n"
-msgstr "La valeur actuelle de Enabled est : %d\n"
+msgstr "La valeur actuelle de Enabled est : %d\n"
 
 #: src/dird/ua_update.c:789
 msgid "Enter new Enabled: "
-msgstr "Saisissez la nouvelle valeur pour Enabled : "
+msgstr "Saisissez la nouvelle valeur pour Enabled : "
 
 #: src/dird/ua_update.c:808
 #, c-format
 msgid "Current RecyclePool is: %s\n"
-msgstr "Le RecyclePool courant est : %s\n"
+msgstr "Le RecyclePool courant est : %s\n"
 
 #: src/dird/ua_update.c:810
 msgid "No current RecyclePool\n"
@@ -4081,7 +4072,7 @@
 
 #: src/dird/ua_update.c:830
 msgid "Selection terminated.\n"
-msgstr "Sélection terminée.\n"
+msgstr "Sélection terminée.\n"
 
 #: src/dird/ua_update.c:850
 #, c-format
@@ -4091,13 +4082,12 @@
 #: src/dird/ua_update.c:882
 #, c-format
 msgid "db_update_pool_record returned %d. ERR=%s\n"
-msgstr "db_update_pool_record a retourné %d. ERR=%s\n"
+msgstr "db_update_pool_record a retourné %d. ERR=%s\n"
 
 #: src/dird/ua_update.c:889
 msgid "Pool DB record updated from resource.\n"
 msgstr ""
-"Les paramètres du Pool en base ont été mis à jour depuis la "
-"configuration.\n"
+"Les paramètres du Pool en base ont été mis à jour depuis la configuration.\n"
 
 #: src/dird/ua_update.c:916
 msgid "Expect JobId keyword, not found.\n"
@@ -4135,170 +4125,170 @@
 msgid "setup job failed.\n"
 msgstr ""
 
-#: src/dird/migrate.c:257
+#: src/dird/migrate.c:258
 #, c-format
 msgid "Pool for JobId %s not in database. ERR=%s\n"
 msgstr ""
 
-#: src/dird/migrate.c:265
+#: src/dird/migrate.c:266
 #, c-format
 msgid "Pool resource \"%s\" not found.\n"
 msgstr ""
 
-#: src/dird/migrate.c:315 src/dird/migrate.c:886
+#: src/dird/migrate.c:316 src/dird/migrate.c:896
 #, c-format
 msgid "Could not get job record for JobId %s to %s. ERR=%s"
 msgstr ""
 
-#: src/dird/migrate.c:326
+#: src/dird/migrate.c:327
 #, c-format
 msgid "JobId %s already %s probably by another Job. %s stopped.\n"
 msgstr ""
 
-#: src/dird/migrate.c:336
+#: src/dird/migrate.c:337
 #, c-format
 msgid "Start %s JobId %s, Job=%s\n"
 msgstr ""
 
-#: src/dird/migrate.c:708
+#: src/dird/migrate.c:710
 #, c-format
 msgid "No %s SQL selection pattern specified.\n"
 msgstr ""
 
-#: src/dird/migrate.c:715 src/dird/migrate.c:734 src/dird/migrate.c:755
-#: src/dird/migrate.c:791 src/dird/migrate.c:818 src/dird/migrate.c:944
-#: src/dird/migrate.c:977 src/dird/migrate.c:1106
+#: src/dird/migrate.c:717 src/dird/migrate.c:736 src/dird/migrate.c:757
+#: src/dird/migrate.c:793 src/dird/migrate.c:820 src/dird/migrate.c:954
+#: src/dird/migrate.c:987 src/dird/migrate.c:1116
 #, c-format
 msgid "SQL failed. ERR=%s\n"
 msgstr ""
 
-#: src/dird/migrate.c:738 src/dird/migrate.c:745 src/dird/migrate.c:759
-#: src/dird/migrate.c:822
+#: src/dird/migrate.c:740 src/dird/migrate.c:747 src/dird/migrate.c:761
+#: src/dird/migrate.c:824
 #, c-format
 msgid "No Volumes found to %s.\n"
 msgstr ""
 
-#: src/dird/migrate.c:773 src/dird/migrate.c:858 src/dird/migrate.c:874
+#: src/dird/migrate.c:775 src/dird/migrate.c:864 src/dird/migrate.c:884
 msgid "Invalid JobId found.\n"
 msgstr ""
 
-#: src/dird/migrate.c:833
+#: src/dird/migrate.c:835
 #, c-format
 msgid "Unknown %s Selection Type.\n"
 msgstr ""
 
-#: src/dird/migrate.c:844 src/dird/migrate.c:861 src/dird/migrate.c:877
+#: src/dird/migrate.c:846 src/dird/migrate.c:867 src/dird/migrate.c:887
 #, c-format
 msgid "No JobIds found to %s.\n"
 msgstr ""
 
-#: src/dird/migrate.c:848
+#: src/dird/migrate.c:850
 #, c-format
 msgid "The following %u JobId%s chosen to be %s: %s\n"
 msgstr ""
 
-#: src/dird/migrate.c:849
+#: src/dird/migrate.c:851
 msgid " was"
 msgstr ""
 
-#: src/dird/migrate.c:849
+#: src/dird/migrate.c:851
 msgid "s were"
 msgstr ""
 
-#: src/dird/migrate.c:893
+#: src/dird/migrate.c:903
 #, c-format
 msgid "%s using JobId=%s Job=%s\n"
 msgstr ""
 
-#: src/dird/migrate.c:927
+#: src/dird/migrate.c:937
 msgid "Could not start migration job.\n"
 msgstr ""
 
-#: src/dird/migrate.c:929
+#: src/dird/migrate.c:939
 #, c-format
 msgid "%s JobId %d started.\n"
 msgstr ""
 
-#: src/dird/migrate.c:948
+#: src/dird/migrate.c:958
 #, c-format
 msgid "No %s found to %s.\n"
 msgstr ""
 
-#: src/dird/migrate.c:952
+#: src/dird/migrate.c:962
 #, c-format
 msgid "SQL error. Expected 1 MediaId got %d\n"
 msgstr ""
 
-#: src/dird/migrate.c:981 src/dird/migrate.c:1111
+#: src/dird/migrate.c:991 src/dird/migrate.c:1121
 #, c-format
 msgid "No %ss found to %s.\n"
 msgstr ""
 
-#: src/dird/migrate.c:1003
+#: src/dird/migrate.c:1013
 msgid "Selection Type 'pooluncopiedjobs' only applies to Copy Jobs"
 msgstr ""
 
-#: src/dird/migrate.c:1012
+#: src/dird/migrate.c:1022
 #, c-format
 msgid "SQL to get uncopied jobs failed. ERR=%s\n"
 msgstr ""
 
-#: src/dird/migrate.c:1035
+#: src/dird/migrate.c:1045
 #, c-format
 msgid "No %s %s selection pattern specified.\n"
 msgstr ""
 
-#: src/dird/migrate.c:1046
+#: src/dird/migrate.c:1056
 #, c-format
 msgid "SQL to get %s failed. ERR=%s\n"
 msgstr ""
 
-#: src/dird/migrate.c:1051
+#: src/dird/migrate.c:1061
 #, c-format
 msgid "Query of Pool \"%s\" returned no Jobs to %s.\n"
 msgstr ""
 
-#: src/dird/migrate.c:1060
+#: src/dird/migrate.c:1070
 #, c-format
 msgid "Could not compile regex pattern \"%s\" ERR=%s\n"
 msgstr ""
 
-#: src/dird/migrate.c:1089
+#: src/dird/migrate.c:1099
 #, c-format
 msgid "Regex pattern matched no Jobs to %s.\n"
 msgstr ""
 
-#: src/dird/migrate.c:1254
+#: src/dird/migrate.c:1264
 #, c-format
 msgid "%s OK -- with warnings"
 msgstr "%s OK -- avec des avertissements"
 
-#: src/dird/migrate.c:1256
+#: src/dird/migrate.c:1266
 #, c-format
 msgid "%s OK"
 msgstr ""
 
-#: src/dird/migrate.c:1261
+#: src/dird/migrate.c:1271
 #, c-format
 msgid "*** %s Error ***"
 msgstr "*** %s Erreur ***"
 
-#: src/dird/migrate.c:1271
+#: src/dird/migrate.c:1281
 #, c-format
 msgid "%s Canceled"
-msgstr "%s Annulé"
+msgstr "%s Annulé"
 
-#: src/dird/migrate.c:1280
+#: src/dird/migrate.c:1290
 #, c-format
 msgid "Inappropriate %s term code"
 msgstr ""
 
-#: src/dird/migrate.c:1290
+#: src/dird/migrate.c:1300
 #, c-format
 msgid "%s -- no files to %s"
 msgstr ""
 
-#: src/dird/migrate.c:1305
+#: src/dird/migrate.c:1315
 #, c-format
 msgid ""
 "%s %s %s (%s):\n"
@@ -4333,17 +4323,17 @@
 "\n"
 msgstr ""
 
-#: src/dird/migrate.c:1416
+#: src/dird/migrate.c:1426
 #, c-format
 msgid "No Next Pool specification found in Pool \"%s\".\n"
 msgstr ""
 
-#: src/dird/migrate.c:1422
+#: src/dird/migrate.c:1432
 #, c-format
 msgid "No Storage specification found in Next Pool \"%s\".\n"
 msgstr ""
 
-#: src/dird/migrate.c:1428
+#: src/dird/migrate.c:1438
 msgid "Storage from Pool's NextPool resource"
 msgstr ""
 
@@ -4354,7 +4344,7 @@
 #: src/dird/ua_prune.c:171
 #, c-format
 msgid "Cannot prune Volume \"%s\" because it is archived.\n"
-msgstr "Impossible de pruner le Volume « %s » car il est archivé.\n"
+msgstr "Impossible de pruner le Volume \"%s\" car il est archivé.\n"
 
 #: src/dird/ua_prune.c:213
 msgid "Pruned Jobs from JobHisto catalog.\n"
@@ -4366,7 +4356,7 @@
 
 #: src/dird/ua_prune.c:316
 msgid "No Files found to prune.\n"
-msgstr "Pas de fichier trouvé pour la purge du catalogue (prune).\n"
+msgstr "Pas de fichier trouvé pour la purge du catalogue (prune).\n"
 
 #: src/dird/ua_prune.c:339
 #, c-format
@@ -4390,7 +4380,7 @@
 
 #: src/dird/ua_prune.c:595
 msgid "No Jobs found to prune.\n"
-msgstr "Pas de job trouvé pour la purge du catalogue (prune).\n"
+msgstr "Pas de job trouvé pour la purge du catalogue (prune).\n"
 
 #: src/dird/autoprune.c:76
 msgid ""
@@ -4400,63 +4390,63 @@
 "Fin de la purge automatique.\n"
 "\n"
 
-#: src/dird/ua_run.c:152
+#: src/dird/ua_run.c:154
 msgid "OK to run? (yes/mod/no): "
-msgstr "OK pour le lancement ? (oui/mod/non) : "
+msgstr "OK pour le lancement ? (oui/mod/non) : "
 
-#: src/dird/ua_run.c:191
+#: src/dird/ua_run.c:193
 msgid "Job failed.\n"
-msgstr "Job échoué.\n"
+msgstr "Job échoué.\n"
 
-#: src/dird/ua_run.c:194
+#: src/dird/ua_run.c:196
 #, c-format
 msgid "Job queued. JobId=%s\n"
 msgstr "Job mis en queue. JobId=%s\n"
 
-#: src/dird/ua_run.c:200
+#: src/dird/ua_run.c:202
 msgid "Job not run.\n"
-msgstr "Job non lancé.\n"
+msgstr "Job non lancé.\n"
 
-#: src/dird/ua_run.c:230
+#: src/dird/ua_run.c:236
 msgid "Level"
 msgstr "Type"
 
-#: src/dird/ua_run.c:235
+#: src/dird/ua_run.c:241
 msgid "Restore Client"
 msgstr ""
 
-#: src/dird/ua_run.c:239 src/wx-console/wxbrestorepanel.cpp:356
+#: src/dird/ua_run.c:245 src/wx-console/wxbrestorepanel.cpp:356
 #: src/wx-console/wxbrestorepanel.cpp:854
 #: src/wx-console/wxbrestorepanel.cpp:1918
 msgid "When"
 msgstr "Quand"
 
-#: src/dird/ua_run.c:240 src/wx-console/wxbrestorepanel.cpp:357
+#: src/dird/ua_run.c:246 src/wx-console/wxbrestorepanel.cpp:357
 #: src/wx-console/wxbrestorepanel.cpp:1128
 #: src/wx-console/wxbrestorepanel.cpp:1921
 msgid "Priority"
-msgstr "Priorité"
+msgstr "Priorité"
 
-#: src/dird/ua_run.c:247
+#: src/dird/ua_run.c:253
 msgid "Verify Job"
-msgstr "Job de vérification"
+msgstr "Job de vérification"
 
-#: src/dird/ua_run.c:250 src/wx-console/wxbrestorepanel.cpp:349
+#: src/dird/ua_run.c:256 src/wx-console/wxbrestorepanel.cpp:349
 #: src/wx-console/wxbrestorepanel.cpp:1899
 msgid "Bootstrap"
 msgstr "Bootstrap"
 
-#: src/dird/ua_run.c:251 src/wx-console/wxbrestorepanel.cpp:350
+#: src/dird/ua_run.c:257 src/wx-console/wxbrestorepanel.cpp:350
 #: src/wx-console/wxbrestorepanel.cpp:1104
 #: src/wx-console/wxbrestorepanel.cpp:1901
 msgid "Where"
 msgstr "Destination"
 
-#: src/dird/ua_run.c:252
+#: src/dird/ua_run.c:258
 msgid "File Relocation"
 msgstr ""
 
-#: src/dird/ua_run.c:253 src/wx-console/wxbrestorepanel.cpp:352
+#: src/dird/ua_run.c:259 src/wx-console/wxbrestorepanel.cpp:352
 #: src/wx-console/wxbrestorepanel.cpp:1112
 #: src/wx-console/wxbrestorepanel.cpp:1905
 #: src/wx-console/wxbrestorepanel.cpp:1906
@@ -4464,218 +4454,218 @@
 #: src/wx-console/wxbrestorepanel.cpp:1908
 #: src/wx-console/wxbrestorepanel.cpp:1909
 msgid "Replace"
-msgstr "Écrasement"
+msgstr "Écrasement"
 
-#: src/dird/ua_run.c:254
+#: src/dird/ua_run.c:260
 msgid "JobId"
 msgstr "JobId"
 
-#: src/dird/ua_run.c:257
+#: src/dird/ua_run.c:263
 msgid "Plugin Options"
 msgstr ""
 
-#: src/dird/ua_run.c:268 src/dird/ua_run.c:1543
+#: src/dird/ua_run.c:274 src/dird/ua_run.c:1563
 msgid "user selection"
 msgstr ""
 
-#: src/dird/ua_run.c:300
+#: src/dird/ua_run.c:306
 msgid ""
 "Please enter desired start time as YYYY-MM-DD HH:MM:SS (return for now): "
 msgstr ""
-"Saisissez la date de lancement (YYYY-MM-DD HH:MM:SS) (ou maintenant) : "
+"Saisissez la date de lancement (YYYY-MM-DD HH:MM:SS) (ou maintenant) : "
 
-#: src/dird/ua_run.c:308 src/dird/ua_run.c:484
+#: src/dird/ua_run.c:314 src/dird/ua_run.c:490
 msgid "Invalid time, using current time.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:315
+#: src/dird/ua_run.c:321
 msgid "Enter new Priority: "
-msgstr "Saisissez la nouvelle priorité : "
+msgstr "Saisissez la nouvelle priorité : "
 
-#: src/dird/ua_run.c:319
+#: src/dird/ua_run.c:325
 msgid "Priority must be a positive integer.\n"
-msgstr "La priorité doit être un entier positif.\n"
+msgstr "La priorité doit être un entier positif.\n"
 
-#: src/dird/ua_run.c:340
+#: src/dird/ua_run.c:346
 msgid "Please enter the Bootstrap file name: "
-msgstr "Saisissez le nom du fichier Bootstrap : "
+msgstr "Saisissez le nom du fichier Bootstrap : "
 
 # Impossible d'ouvrir %s : ERR=%s
-#: src/dird/ua_run.c:352
+#: src/dird/ua_run.c:358
 #, c-format
 msgid "Warning cannot open %s: ERR=%s\n"
-msgstr "Impossible d'ouvrir %s : ERR=%s\n"
+msgstr "Impossible d'ouvrir %s : ERR=%s\n"
 
-#: src/dird/ua_run.c:371
+#: src/dird/ua_run.c:377
 msgid "Please enter path prefix for restore (/ for none): "
-msgstr "Saisissez le chemin (prefix) pour la restauration (/ pour aucun) : "
+msgstr "Saisissez le chemin (prefix) pour la restauration (/ pour aucun) : "
 
-#: src/dird/ua_run.c:393
+#: src/dird/ua_run.c:399
 msgid "Replace:\n"
-msgstr "Écrasement :\n"
+msgstr "Écrasement :\n"
 
-#: src/dird/ua_run.c:397
+#: src/dird/ua_run.c:403
 msgid "Select replace option"
-msgstr "Saisissez l'option d'écrasement"
+msgstr "Saisissez l'option d'écrasement"
 
-#: src/dird/ua_run.c:408
+#: src/dird/ua_run.c:414
 msgid ""
 "You must set the bootstrap file to NULL to be able to specify a JobId.\n"
 msgstr ""
-"Vous ne devez pas spécifié de fichier bootstrap pour pouvoir utiliser un "
+"Vous ne devez pas spécifié de fichier bootstrap pour pouvoir utiliser un "
 "JobId.\n"
 
-#: src/dird/ua_run.c:413
+#: src/dird/ua_run.c:419
 msgid "Please Plugin Options string: "
 msgstr ""
 
-#: src/dird/ua_run.c:451 src/dird/ua_run.c:460
+#: src/dird/ua_run.c:457 src/dird/ua_run.c:466
 msgid "User input"
 msgstr ""
 
-#: src/dird/ua_run.c:514
+#: src/dird/ua_run.c:520
 #, c-format
 msgid "Invalid replace option: %s\n"
-msgstr "Option d'écrasement (Replace) invalide : %s\n"
+msgstr "Option d'écrasement (Replace) invalide : %s\n"
 
-#: src/dird/ua_run.c:577
+#: src/dird/ua_run.c:583
 #, c-format
 msgid "strip_prefix=%s add_prefix=%s add_suffix=%s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:580
+#: src/dird/ua_run.c:586
 msgid "This will replace your current Where value\n"
 msgstr ""
 
-#: src/dird/ua_run.c:581
+#: src/dird/ua_run.c:587
 msgid "Strip prefix"
 msgstr ""
 
-#: src/dird/ua_run.c:582
+#: src/dird/ua_run.c:588
 msgid "Add prefix"
 msgstr ""
 
-#: src/dird/ua_run.c:583
+#: src/dird/ua_run.c:589
 msgid "Add file suffix"
 msgstr ""
 
-#: src/dird/ua_run.c:584
+#: src/dird/ua_run.c:590
 msgid "Enter a regexp"
 msgstr ""
 
-#: src/dird/ua_run.c:585
+#: src/dird/ua_run.c:591
 msgid "Test filename manipulation"
 msgstr ""
 
-#: src/dird/ua_run.c:586
+#: src/dird/ua_run.c:592
 msgid "Use this ?"
 msgstr ""
 
-#: src/dird/ua_run.c:591
+#: src/dird/ua_run.c:597
 msgid "Please enter path prefix to strip: "
-msgstr "Saisissez le début du chemin (prefix) à enlever : "
+msgstr "Saisissez le début du chemin (prefix) à enlever : "
 
-#: src/dird/ua_run.c:599
+#: src/dird/ua_run.c:605
 msgid "Please enter path prefix to add (/ for none): "
-msgstr "Saisissez le chemin (prefix) à ajouter (/ pour aucun) : "
+msgstr "Saisissez le chemin (prefix) à ajouter (/ pour aucun) : "
 
-#: src/dird/ua_run.c:610
+#: src/dird/ua_run.c:616
 msgid "Please enter file suffix to add: "
-msgstr "Saisissez une extention à ajouter aux fichiers : "
+msgstr "Saisissez une extention à ajouter aux fichiers : "
 
-#: src/dird/ua_run.c:617
+#: src/dird/ua_run.c:623
 msgid "Please enter a valid regexp (!from!to!): "
-msgstr "Saisissez une regexp valide (!rechercher!remplacer!) : "
+msgstr "Saisissez une regexp valide (!rechercher!remplacer!) : "
 
-#: src/dird/ua_run.c:630
+#: src/dird/ua_run.c:636
 #, c-format
 msgid "regexwhere=%s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:636
+#: src/dird/ua_run.c:642
 #, c-format
 msgid "strip_prefix=%s add_prefix=%s add_suffix=%s result=%s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:643
+#: src/dird/ua_run.c:649
 msgid "Cannot use your regexp\n"
 msgstr "Impossible d'utiliser votre regexp\n"
 
-#: src/dird/ua_run.c:646
+#: src/dird/ua_run.c:652
 msgid "Enter a period (.) to stop this test\n"
 msgstr ""
 
-#: src/dird/ua_run.c:647
+#: src/dird/ua_run.c:653
 msgid "Please enter filename to test: "
-msgstr "Saisissez un nom de fichier à tester : "
+msgstr "Saisissez un nom de fichier à tester : "
 
-#: src/dird/ua_run.c:649
+#: src/dird/ua_run.c:655
 #, c-format
 msgid "%s -> %s\n"
 msgstr "%s -> %s\n"
 
-#: src/dird/ua_run.c:693
+#: src/dird/ua_run.c:699
 msgid "Cannot use your regexp.\n"
 msgstr "Impossible d'utiliser votre regexp.\n"
 
-#: src/dird/ua_run.c:706 src/dird/ua_run.c:736
+#: src/dird/ua_run.c:712 src/dird/ua_run.c:742
 msgid "Levels:\n"
-msgstr "Types :\n"
+msgstr "Types :\n"
 
-#: src/dird/ua_run.c:708 src/stored/status.c:600 src/lib/util.c:426
+#: src/dird/ua_run.c:714 src/stored/status.c:600 src/lib/util.c:426
 #: src/lib/util.c:472 src/filed/status.c:519
 msgid "Full"
 msgstr "Full"
 
-#: src/dird/ua_run.c:709 src/stored/status.c:603 src/lib/util.c:429
+#: src/dird/ua_run.c:715 src/stored/status.c:603 src/lib/util.c:429
 #: src/filed/status.c:522
 msgid "Incremental"
-msgstr "Incrémental"
+msgstr "Incrémental"
 
-#: src/dird/ua_run.c:710 src/stored/status.c:606 src/lib/util.c:432
+#: src/dird/ua_run.c:716 src/stored/status.c:606 src/lib/util.c:432
 #: src/filed/status.c:525
 msgid "Differential"
-msgstr "Différentiel"
+msgstr "Différentiel"
 
-#: src/dird/ua_run.c:711 src/stored/status.c:609 src/lib/util.c:435
+#: src/dird/ua_run.c:717 src/stored/status.c:609 src/lib/util.c:435
 #: src/filed/status.c:528
 msgid "Since"
 msgstr "Depuis"
 
-#: src/dird/ua_run.c:712
+#: src/dird/ua_run.c:718
 msgid "VirtualFull"
 msgstr ""
 
-#: src/dird/ua_run.c:713 src/dird/ua_run.c:742
+#: src/dird/ua_run.c:719 src/dird/ua_run.c:748
 msgid "Select level"
 msgstr "Saisissez le type"
 
-#: src/dird/ua_run.c:737
+#: src/dird/ua_run.c:743
 msgid "Initialize Catalog"
 msgstr "Initialisez le catalogue"
 
-#: src/dird/ua_run.c:738 src/stored/status.c:612 src/lib/util.c:438
+#: src/dird/ua_run.c:744 src/stored/status.c:612 src/lib/util.c:438
 #: src/filed/status.c:531
 msgid "Verify Catalog"
 msgstr ""
 
-#: src/dird/ua_run.c:739 src/lib/util.c:444
+#: src/dird/ua_run.c:745 src/lib/util.c:444
 msgid "Verify Volume to Catalog"
 msgstr ""
 
-#: src/dird/ua_run.c:740 src/lib/util.c:447
+#: src/dird/ua_run.c:746 src/lib/util.c:447
 msgid "Verify Disk to Catalog"
 msgstr ""
 
-#: src/dird/ua_run.c:741
+#: src/dird/ua_run.c:747
 msgid "Verify Volume Data (not yet implemented)"
-msgstr "Vérification des données sur le volume (pas encore implémenté)"
+msgstr "Vérification des données sur le volume (pas encore implémenté)"
 
-#: src/dird/ua_run.c:762
+#: src/dird/ua_run.c:768
 msgid "Level not appropriate for this Job. Cannot be changed.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:793
+#: src/dird/ua_run.c:799
 #, c-format
 msgid ""
 "Run Admin Job\n"
@@ -4687,7 +4677,7 @@
 "Priority: %d\n"
 msgstr ""
 
-#: src/dird/ua_run.c:837
+#: src/dird/ua_run.c:843
 #, c-format
 msgid ""
 "Run Backup job\n"
@@ -4702,12 +4692,12 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dird/ua_run.c:868
+#: src/dird/ua_run.c:874
 #, c-format
 msgid "Could not get job record for selected JobId. ERR=%s"
 msgstr ""
 
-#: src/dird/ua_run.c:907
+#: src/dird/ua_run.c:913
 #, c-format
 msgid ""
 "Run Verify Job\n"
@@ -4723,11 +4713,11 @@
 "Priority:    %d\n"
 msgstr ""
 
-#: src/dird/ua_run.c:936
+#: src/dird/ua_run.c:942
 msgid "Please enter a JobId for restore: "
-msgstr "Saisissez le JobId pour la restauration : "
+msgstr "Saisissez le JobId pour la restauration : "
 
-#: src/dird/ua_run.c:976
+#: src/dird/ua_run.c:982
 #, c-format
 msgid ""
 "Run Restore job\n"
@@ -4745,7 +4735,7 @@
 "Plugin Options:  %s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1032
+#: src/dird/ua_run.c:1038
 #, c-format
 msgid ""
 "Run Restore job\n"
@@ -4765,18 +4755,18 @@
 "Lancement de la restauration\n"
 "JobName :        %s\n"
 "Bootstrap :      %s\n"
-"Déplacement :    %s\n"
-"Écrasement :     %s\n"
+"Déplacement :    %s\n"
+"Écrasement :     %s\n"
 "FileSet :        %s\n"
 "Backup Client :  %s\n"
 "Restore Client : %s\n"
 "Storage :        %s\n"
 "Quand :          %s\n"
 "Catalogue :      %s\n"
-"Priorité :       %d\n"
+"Priorité :       %d\n"
 "Options Plugins: %s\n"
 
-#: src/dird/ua_run.c:1063
+#: src/dird/ua_run.c:1069
 #, c-format
 msgid ""
 "Run Restore job\n"
@@ -4787,17 +4777,17 @@
 "JobName :    %s\n"
 "Bootstrap :  %s\n"
 
-#: src/dird/ua_run.c:1071
+#: src/dird/ua_run.c:1077
 #, c-format
 msgid "RegexWhere: %s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1074
+#: src/dird/ua_run.c:1080
 #, c-format
 msgid "Where:      %s\n"
 msgstr "Where :     %s\n"
 
-#: src/dird/ua_run.c:1078
+#: src/dird/ua_run.c:1084
 #, c-format
 msgid ""
 "Replace:         %s\n"
@@ -4809,225 +4799,262 @@
 "Priority:        %d\n"
 "Plugin Options:  %s\n"
 msgstr ""
-"Écrasement :      %s\n"
+"Écrasement :      %s\n"
 "Client :          %s\n"
 "Storage :         %s\n"
 "JobId :           %s\n"
 "Quand :           %s\n"
 "Catalogue :       %s\n"
-"Priorité :        %d\n"
+"Priorité :        %d\n"
 "Options Plugins : %s\n"
 
-#: src/dird/ua_run.c:1133
+#: src/dird/ua_run.c:1139
 msgid "Run Copy job\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1135
+#: src/dird/ua_run.c:1141
 msgid "Run Migration job\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1164
+#: src/dird/ua_run.c:1170
 #, c-format
 msgid "Unknown Job Type=%d\n"
 msgstr "Job du Type=%d inconnu\n"
 
-#: src/dird/ua_run.c:1231
+#: src/dird/ua_run.c:1239
 #, c-format
 msgid "Value missing for keyword %s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1238
+#: src/dird/ua_run.c:1246
 msgid "Job name specified twice.\n"
-msgstr "Le job est déjà spécifié.\n"
+msgstr "Le job est déjà spécifié.\n"
 
-#: src/dird/ua_run.c:1246
+#: src/dird/ua_run.c:1254
 msgid "JobId specified twice.\n"
-msgstr "Le JobId est déjà spécifié.\n"
+msgstr "Le JobId est déjà spécifié.\n"
 
-#: src/dird/ua_run.c:1255 src/dird/ua_run.c:1395
+#: src/dird/ua_run.c:1263 src/dird/ua_run.c:1403
 msgid "Client specified twice.\n"
-msgstr "Le client est déjà spécifié.\n"
+msgstr "Le client est déjà spécifié.\n"
 
-#: src/dird/ua_run.c:1263
+#: src/dird/ua_run.c:1271
 msgid "FileSet specified twice.\n"
-msgstr "Le FileSet est déjà spécifié.\n"
+msgstr "Le FileSet est déjà spécifié.\n"
 
-#: src/dird/ua_run.c:1271
+#: src/dird/ua_run.c:1279
 msgid "Level specified twice.\n"
-msgstr "Le type (Level) est déjà spécifié.\n"
+msgstr "Le type (Level) est déjà spécifié.\n"
 
-#: src/dird/ua_run.c:1280
+#: src/dird/ua_run.c:1288
 msgid "Storage specified twice.\n"
-msgstr "Le Storage est déjà spécifié.\n"
+msgstr "Le Storage est déjà spécifié.\n"
 
-#: src/dird/ua_run.c:1288
+#: src/dird/ua_run.c:1296
 msgid "RegexWhere or Where specified twice.\n"
-msgstr "RegexWhere ou Where est déjà spécifiée.\n"
+msgstr "RegexWhere ou Where est déjà spécifiée.\n"
 
-#: src/dird/ua_run.c:1293
+#: src/dird/ua_run.c:1301
 msgid "No authorization for \"regexwhere\" specification.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1300
+#: src/dird/ua_run.c:1308
 msgid "Where or RegexWhere specified twice.\n"
-msgstr "RegexWhere ou Where est déjà spécifiée.\n"
+msgstr "RegexWhere ou Where est déjà spécifiée.\n"
 
-#: src/dird/ua_run.c:1305
+#: src/dird/ua_run.c:1313
 msgid "No authoriztion for \"where\" specification.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1312
+#: src/dird/ua_run.c:1320
 msgid "Bootstrap specified twice.\n"
-msgstr "Le bootstrap est déjà spécifié.\n"
+msgstr "Le bootstrap est déjà spécifié.\n"
 
-#: src/dird/ua_run.c:1320
+#: src/dird/ua_run.c:1328
 msgid "Replace specified twice.\n"
-msgstr "L'option d'écrasement (Replace) est déjà spécifié.\n"
+msgstr "L'option d'écrasement (Replace) est déjà spécifié.\n"
 
-#: src/dird/ua_run.c:1328
+#: src/dird/ua_run.c:1336
 msgid "When specified twice.\n"
-msgstr "La planification (When) est déjà spécifiée.\n"
+msgstr "La planification (When) est déjà spécifiée.\n"
 
-#: src/dird/ua_run.c:1336
+#: src/dird/ua_run.c:1344
 msgid "Priority specified twice.\n"
-msgstr "La priorité (Priority) est déjà spécifiée.\n"
+msgstr "La priorité (Priority) est déjà spécifiée.\n"
 
-#: src/dird/ua_run.c:1341
+#: src/dird/ua_run.c:1349
 msgid "Priority must be positive nonzero setting it to 10.\n"
 msgstr ""
-"La priorité doit être supérieure à zéro. Utilisation d'une priorité de "
-"10.\n"
+"La priorité doit être supérieure à zéro. Utilisation d'une priorité de 10.\n"
 
-#: src/dird/ua_run.c:1351
+#: src/dird/ua_run.c:1359
 msgid "Verify Job specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1379
+#: src/dird/ua_run.c:1387
 msgid "Migration Job specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1387
+#: src/dird/ua_run.c:1395
 msgid "Pool specified twice.\n"
-msgstr "Le pool est déjà spécifié.\n"
+msgstr "Le pool est déjà spécifié.\n"
 
-#: src/dird/ua_run.c:1403
+#: src/dird/ua_run.c:1411
 msgid "Restore Client specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1410
+#: src/dird/ua_run.c:1418
 msgid "Plugin Options not yet implemented.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1413
+#: src/dird/ua_run.c:1421
 msgid "Plugin Options specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1418
+#: src/dird/ua_run.c:1426
 msgid "No authoriztion for \"PluginOptions\" specification.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1425
+#: src/dird/ua_run.c:1433
 msgid "Spool flag specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1432
+#: src/dird/ua_run.c:1440
 msgid "Invalid spooldata flag.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1441
+#: src/dird/ua_run.c:1449
 msgid "IgnoreDuplicateCheck flag specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1448
+#: src/dird/ua_run.c:1456
 msgid "Invalid ignoreduplicatecheck flag.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1469
+#: src/dird/ua_run.c:1461
+msgid "Accurate flag specified twice.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1468
+msgid "Invalid accurate flag.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1489
 #, c-format
 msgid "Invalid keyword: %s\n"
-msgstr "Argument invalide : %s\n"
+msgstr "Argument invalide : %s\n"
 
-#: src/dird/ua_run.c:1484
+#: src/dird/ua_run.c:1504
 #, c-format
 msgid "Catalog \"%s\" not found\n"
-msgstr "Le catalogue « %s » est introuvable\n"
+msgstr "Le catalogue \"%s\" est introuvable\n"
 
-#: src/dird/ua_run.c:1488
+#: src/dird/ua_run.c:1508
 #, c-format
 msgid "No authorization. Catalog \"%s\".\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1499
+#: src/dird/ua_run.c:1519
 #, c-format
 msgid "Job \"%s\" not found\n"
-msgstr "Le job « %s » est introuvable\n"
+msgstr "Le job \"%s\" est introuvable\n"
 
-#: src/dird/ua_run.c:1506
+#: src/dird/ua_run.c:1526
 msgid "A job name must be specified.\n"
-msgstr "Un nom de Job doit être spécifié.\n"
+msgstr "Un nom de Job doit être spécifié.\n"
 
-#: src/dird/ua_run.c:1512
+#: src/dird/ua_run.c:1532
 #, c-format
 msgid "No authorization. Job \"%s\".\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1520
+#: src/dird/ua_run.c:1540
 #, c-format
 msgid "Pool \"%s\" not found.\n"
-msgstr "Le pool  « %s » est introuvable.\n"
+msgstr "Le pool  \"%s\" est introuvable.\n"
 
-#: src/dird/ua_run.c:1530
+#: src/dird/ua_run.c:1550
 #, c-format
 msgid "No authorization. Pool \"%s\".\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1540
+#: src/dird/ua_run.c:1560
 #, c-format
 msgid "Storage \"%s\" not found.\n"
-msgstr "Le Storage « %s » est introuvable.\n"
+msgstr "Le Storage \"%s\" est introuvable.\n"
 
-#: src/dird/ua_run.c:1549 src/dird/job.c:1242
+#: src/dird/ua_run.c:1569 src/dird/job.c:1242
 msgid "No storage specified.\n"
-msgstr "Pas de storage sélectionné.\n"
+msgstr "Pas de storage sélectionné.\n"
 
-#: src/dird/ua_run.c:1552
+#: src/dird/ua_run.c:1572
 #, c-format
 msgid "No authorization. Storage \"%s\".\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1572 src/dird/ua_run.c:1592
+#: src/dird/ua_run.c:1592 src/dird/ua_run.c:1612
 #, c-format
 msgid "No authorization. Client \"%s\".\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1582
+#: src/dird/ua_run.c:1602
 #, c-format
 msgid "Restore Client \"%s\" not found.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1601
+#: src/dird/ua_run.c:1621
 #, c-format
 msgid "FileSet \"%s\" not found.\n"
-msgstr "Le FileSet « %s » est introuvable.\n"
+msgstr "Le FileSet \"%s\" est introuvable.\n"
 
-#: src/dird/ua_run.c:1610
+#: src/dird/ua_run.c:1630
 #, c-format
 msgid "No authorization. FileSet \"%s\".\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1618
+#: src/dird/ua_run.c:1638
 #, c-format
 msgid "Verify Job \"%s\" not found.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1628
+#: src/dird/ua_run.c:1648
 #, c-format
 msgid "Migration Job \"%s\" not found.\n"
 msgstr ""
 
+#: src/dird/dir_plugins.c:180 src/stored/sd_plugins.c:183
+#: src/filed/fd_plugins.c:973
+#, c-format
+msgid "Loaded plugin: %s\n"
+msgstr ""
+
+#: src/dird/dir_plugins.c:200 src/stored/sd_plugins.c:203
+#: src/filed/fd_plugins.c:992
+#, c-format
+msgid "Plugin magic wrong. Plugin=%s wanted=%s got=%s\n"
+msgstr ""
+
+#: src/dird/dir_plugins.c:208 src/stored/sd_plugins.c:211
+#: src/filed/fd_plugins.c:1000
+#, c-format
+msgid "Plugin version incorrect. Plugin=%s wanted=%d got=%d\n"
+msgstr ""
+
+#: src/dird/dir_plugins.c:217 src/stored/sd_plugins.c:220
+#: src/filed/fd_plugins.c:1008
+#, c-format
+msgid "Plugin license incompatible. Plugin=%s license=%s\n"
+msgstr ""
+
+#: src/dird/dir_plugins.c:225 src/stored/sd_plugins.c:228
+#: src/filed/fd_plugins.c:1016
+#, c-format
+msgid "Plugin size incorrect. Plugin=%s wanted=%d got=%d\n"
+msgstr ""
+
 #: src/dird/backup.c:96
 msgid "No Storage specification found in Job or Pool.\n"
-msgstr "Pas de Storage défini dans le Job ou le Pool.\n"
+msgstr "Pas de Storage défini dans le Job ou le Pool.\n"
 
 #: src/dird/backup.c:256
 #, c-format
@@ -5045,7 +5072,7 @@
 #: src/dird/backup.c:328
 #, c-format
 msgid "Start Backup JobId %s, Job=%s\n"
-msgstr "Démarrage du backup JobId %s, Job=%s\n"
+msgstr "Démarrage du backup JobId %s, Job=%s\n"
 
 #: src/dird/backup.c:517
 #, c-format
@@ -5059,13 +5086,13 @@
 
 #: src/dird/backup.c:565
 msgid "No Job status returned from FD.\n"
-msgstr "Impossible de récupérer le statut du Job depuis le FD.\n"
+msgstr "Impossible de récupérer le statut du Job depuis le FD.\n"
 
-#: src/dird/backup.c:649
+#: src/dird/backup.c:647
 msgid "Backup failed -- incomplete"
 msgstr ""
 
-#: src/dird/backup.c:722
+#: src/dird/backup.c:720
 #, c-format
 msgid ""
 "%s %s %s (%s):\n"
@@ -5104,25 +5131,25 @@
 "\n"
 msgstr ""
 
-#: src/dird/backup.c:824
+#: src/dird/backup.c:822
 #, c-format
 msgid ""
 "Could not get Job Volume Parameters to update Bootstrap file. ERR=%s\n"
 msgstr ""
 
-#: src/dird/backup.c:860
+#: src/dird/backup.c:858
 #, c-format
 msgid ""
 "Could not open WriteBootstrap file:\n"
 "%s: ERR=%s\n"
 msgstr ""
-"Impossible d'ouvrir le fichier bootstrap (WriteBootstrap) :\n"
-"%s : ERR=%s\n"
+"Impossible d'ouvrir le fichier bootstrap (WriteBootstrap) :\n"
+"%s : ERR=%s\n"
 
-#: src/dird/restore.c:137 src/dird/msgchan.c:463 src/filed/job.c:2370
+#: src/dird/restore.c:137 src/dird/msgchan.c:463 src/filed/job.c:2409
 #, c-format
 msgid "Could not open bootstrap file %s: ERR=%s\n"
-msgstr "Impossible d'ouvrir le fichier bootstrap %s : ERR=%s\n"
+msgstr "Impossible d'ouvrir le fichier bootstrap %s : ERR=%s\n"
 
 #: src/dird/restore.c:185 src/dird/restore.c:276
 #, c-format
@@ -5144,7 +5171,7 @@
 #: src/dird/restore.c:510
 #, c-format
 msgid "Start Restore Job %s\n"
-msgstr "Démarrage du Job de restauration %s\n"
+msgstr "Démarrage du Job de restauration %s\n"
 
 #: src/dird/restore.c:561
 msgid "Restore OK -- warning file count mismatch"
@@ -5164,7 +5191,7 @@
 
 #: src/dird/restore.c:581
 msgid "Restore Canceled"
-msgstr "Restauration annulée"
+msgstr "Restauration annulée"
 
 #: src/dird/restore.c:608
 #, c-format
@@ -5187,25 +5214,25 @@
 "\n"
 msgstr ""
 
-#: src/dird/ua_status.c:175
+#: src/dird/ua_status.c:174
 msgid "Status available for:\n"
-msgstr "Statut disponible pour :\n"
+msgstr "Statut disponible pour :\n"
 
-#: src/dird/ua_status.c:181
+#: src/dird/ua_status.c:180
 msgid "Select daemon type for status"
-msgstr "Saisissez le composant à afficher"
+msgstr "Saisissez le composant à afficher"
 
-#: src/dird/ua_status.c:295 src/stored/status.c:218
+#: src/dird/ua_status.c:294 src/stored/status.c:218
 #, c-format
 msgid "%s Version: %s (%s) %s %s %s\n"
-msgstr "%s Version : %s (%s) %s %s %s\n"
+msgstr "%s Version : %s (%s) %s %s %s\n"
 
-#: src/dird/ua_status.c:298
+#: src/dird/ua_status.c:297
 #, c-format
-msgid "Daemon started %s. Jobs: run=%d, running=%d\n"
+msgid "Daemon started %s. Jobs: run=%d, running=%d mode=%d,%d\n"
 msgstr ""
 
-#: src/dird/ua_status.c:300 src/stored/status.c:229 src/filed/status.c:142
+#: src/dird/ua_status.c:300 src/stored/status.c:228 src/filed/status.c:142
 #, c-format
 msgid " Heap: heap=%s smbytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"
 msgstr ""
@@ -5232,7 +5259,7 @@
 
 #: src/dird/ua_status.c:408
 msgid "Connected to file daemon\n"
-msgstr "Connecté avec le File Daemon\n"
+msgstr "Connecté avec le File Daemon\n"
 
 #: src/dird/ua_status.c:428
 msgid ""
@@ -5240,7 +5267,7 @@
 "Scheduled Jobs:\n"
 msgstr ""
 "\n"
-"Jobs planifiés :\n"
+"Jobs planifiés :\n"
 
 #: src/dird/ua_status.c:429
 msgid ""
@@ -5270,7 +5297,7 @@
 
 #: src/dird/ua_status.c:588
 msgid "No Scheduled Jobs.\n"
-msgstr "Pas de job programmé.\n"
+msgstr "Pas de job programmé.\n"
 
 #: src/dird/ua_status.c:605 src/stored/status.c:396 src/filed/status.c:183
 msgid ""
@@ -5278,12 +5305,12 @@
 "Running Jobs:\n"
 msgstr ""
 "\n"
-"Job en cours :\n"
+"Job en cours :\n"
 
 #: src/dird/ua_status.c:613
 #, c-format
 msgid "Console connected at %s\n"
-msgstr "Console connecté à %s\n"
+msgstr "Console connecté à %s\n"
 
 #: src/dird/ua_status.c:623
 msgid ""
@@ -5305,7 +5332,7 @@
 
 #: src/dird/ua_status.c:639
 msgid "is waiting execution"
-msgstr "est en attente d'exécution"
+msgstr "est en attente d'exécution"
 
 #: src/dird/ua_status.c:642
 msgid "is running"
@@ -5313,11 +5340,11 @@
 
 #: src/dird/ua_status.c:645
 msgid "is blocked"
-msgstr "est bloqué"
+msgstr "est bloqué"
 
 #: src/dird/ua_status.c:648
 msgid "has terminated"
-msgstr "est terminé"
+msgstr "est terminé"
 
 #: src/dird/ua_status.c:651
 msgid "has terminated with warnings"
@@ -5341,7 +5368,7 @@
 
 #: src/dird/ua_status.c:666
 msgid "has been canceled"
-msgstr "a été annulé"
+msgstr "a été annulé"
 
 #: src/dird/ua_status.c:671
 msgid "is waiting on Client"
@@ -5379,7 +5406,7 @@
 
 #: src/dird/ua_status.c:703
 msgid "is waiting for its start time"
-msgstr "attend son heure de démarrage"
+msgstr "attend son heure de démarrage"
 
 #: src/dird/ua_status.c:706
 msgid "is waiting for higher priority jobs to finish"
@@ -5404,7 +5431,7 @@
 #: src/dird/ua_status.c:723
 #, c-format
 msgid "is in unknown state %c"
-msgstr "est dans un état inconnu %c"
+msgstr "est dans un état inconnu %c"
 
 #: src/dird/ua_status.c:737
 msgid "is waiting for a mount request"
@@ -5440,7 +5467,7 @@
 
 #: src/dird/ua_status.c:813
 msgid "No Terminated Jobs.\n"
-msgstr "Pas de job terminé.\n"
+msgstr "Pas de job terminé.\n"
 
 #: src/dird/ua_status.c:819 src/stored/status.c:507 src/filed/status.c:330
 msgid ""
@@ -5448,11 +5475,11 @@
 "Terminated Jobs:\n"
 msgstr ""
 "\n"
-"Job terminés :\n"
+"Job terminés :\n"
 
 #: src/dird/ua_status.c:820 src/stored/status.c:514 src/filed/status.c:340
 msgid " JobId  Level    Files      Bytes   Status   Finished        Name \n"
-msgstr " JobId  Type     Fichiers   Octets   Statut  Terminé         Nom \n"
+msgstr " JobId  Type     Fichiers   Octets   Statut  Terminé         Nom \n"
 
 #: src/dird/ua_status.c:821
 msgid ""
@@ -5463,7 +5490,7 @@
 #: src/dird/ua_status.c:853 src/stored/status.c:536 src/lib/util.c:180
 #: src/filed/status.c:363
 msgid "Created"
-msgstr "Crée"
+msgstr "Crée"
 
 #: src/dird/ua_status.c:857 src/stored/status.c:540 src/lib/util.c:196
 #: src/lib/util.c:331 src/lib/util.c:478 src/filed/status.c:367
@@ -5474,7 +5501,7 @@
 msgid "Diffs"
 msgstr ""
 
-#: src/dird/ua_status.c:866 src/stored/status.c:549 src/stored/btape.c:1520
+#: src/dird/ua_status.c:866 src/stored/status.c:549 src/stored/btape.c:1521
 #: src/lib/util.c:189 src/lib/util.c:324 src/filed/status.c:376
 #: src/wx-console/wxbconfigpanel.cpp:209
 msgid "OK"
@@ -5510,11 +5537,11 @@
 #: src/dird/ua_input.c:107 src/dird/ua_input.c:113
 #, c-format
 msgid "Expected a positive integer, got: %s\n"
-msgstr "Attendait un entier positif, pas : %s\n"
+msgstr "Attendait un entier positif, pas : %s\n"
 
 #: src/dird/ua_input.c:170
 msgid "Invalid response. You must answer yes or no.\n"
-msgstr "Réponse invalide. Vous devez répondre oui ou non.\n"
+msgstr "Réponse invalide. Vous devez répondre oui ou non.\n"
 
 #: src/dird/ua_input.c:193
 msgid "Invalid Enabled value, it must be yes, no, archived, 0, 1, or 2\n"
@@ -5533,35 +5560,35 @@
 msgid "Comment must be at least one character long.\n"
 msgstr ""
 
-#: src/dird/pythondir.c:122 src/stored/pythonsd.c:101
+#: src/dird/pythondir.c:121 src/stored/pythonsd.c:101
 #: src/stored/pythonsd.c:166 src/filed/pythonfd.c:94 src/filed/pythonfd.c:148
 #: src/filed/pythonfd.c:212
 msgid "Job pointer not found."
 msgstr ""
 
-#: src/dird/pythondir.c:154
+#: src/dird/pythondir.c:153
 msgid "Pool record not found."
 msgstr ""
 
-#: src/dird/pythondir.c:210 src/stored/pythonsd.c:143 src/filed/pythonfd.c:125
+#: src/dird/pythondir.c:209 src/stored/pythonsd.c:143 src/filed/pythonfd.c:125
 #, c-format
 msgid "Attribute %s not found."
-msgstr "Attribut %s non trouvé."
+msgstr "Attribut %s non trouvé."
 
-#: src/dird/pythondir.c:253 src/dird/pythondir.c:259 src/stored/pythonsd.c:183
+#: src/dird/pythondir.c:252 src/dird/pythondir.c:258 src/stored/pythonsd.c:183
 #: src/filed/pythonfd.c:167
 msgid "Read-only attribute"
 msgstr ""
 
-#: src/dird/pythondir.c:285
+#: src/dird/pythondir.c:284
 msgid "Priority must be 1-100"
-msgstr "La priorité doit être comprise entre 1 et 100"
+msgstr "La priorité doit être comprise entre 1 et 100"
 
-#: src/dird/pythondir.c:290
+#: src/dird/pythondir.c:289
 msgid "Job Level can be set only during JobInit"
 msgstr ""
 
-#: src/dird/pythondir.c:304
+#: src/dird/pythondir.c:303
 msgid "Bad JobLevel string"
 msgstr ""
 
@@ -5597,7 +5624,7 @@
 #: src/dird/job.c:403
 #, c-format
 msgid "JobId %s, Job %s marked to be canceled.\n"
-msgstr "JobId %s, Job %s marqué pour être annulé.\n"
+msgstr "JobId %s, Job %s marqué pour être annulé.\n"
 
 #: src/dird/job.c:413
 msgid "Failed to connect to File daemon.\n"
@@ -5605,11 +5632,11 @@
 
 #: src/dird/job.c:548
 msgid "Max wait time exceeded. Job canceled.\n"
-msgstr "Temps d'attente maximum dépassé. Abandon du job.\n"
+msgstr "Temps d'attente maximum dépassé. Abandon du job.\n"
 
 #: src/dird/job.c:553
 msgid "Max run time exceeded. Job canceled.\n"
-msgstr "Temps d'exécution maximum atteind. Abandon du job.\n"
+msgstr "Temps d'exécution maximum atteind. Abandon du job.\n"
 
 #: src/dird/job.c:558
 msgid "Max run sched time exceeded. Job canceled.\n"
@@ -5690,12 +5717,12 @@
 msgid "Client resource"
 msgstr ""
 
-#: src/dird/job.c:1411
+#: src/dird/job.c:1403
 #, c-format
 msgid "Could not start clone job: \"%s\".\n"
 msgstr ""
 
-#: src/dird/job.c:1414
+#: src/dird/job.c:1406
 #, c-format
 msgid "Clone JobId %d started.\n"
 msgstr ""
@@ -5723,7 +5750,7 @@
 msgstr ""
 
 #: src/dird/authenticate.c:127 src/wx-console/authenticate.c:127
-#: src/console/authenticate.c:125
+#: src/console/authenticate.c:122
 msgid ""
 "Authorization problem: Remote server did not advertise required TLS "
 "support.\n"
@@ -5731,10 +5758,10 @@
 "Problème d'autorisation : le serveur distant n'a pas proposé la prise en "
 "charge du TLS requis.\n"
 
-#: src/dird/authenticate.c:134 src/stored/authenticate.c:147
-#: src/stored/authenticate.c:258 src/wx-console/authenticate.c:133
-#: src/console/authenticate.c:132 src/filed/authenticate.c:158
-#: src/filed/authenticate.c:277
+#: src/dird/authenticate.c:134 src/stored/authenticate.c:146
+#: src/stored/authenticate.c:257 src/wx-console/authenticate.c:133
+#: src/console/authenticate.c:129 src/filed/authenticate.c:160
+#: src/filed/authenticate.c:279
 msgid "Authorization problem: Remote server requires TLS.\n"
 msgstr "Problème d'autorisation : Le serveur distant nécessite TLS.\n"
 
@@ -5747,13 +5774,12 @@
 #, c-format
 msgid "bdird<stored: \"%s:%s\" bad response to Hello command: ERR=%s\n"
 msgstr ""
-"bdird<stored: « %s:%s » Mauvaise réponse à la commande Hello : "
-"ERR=%s\n"
+"bdird<stored: « %s:%s » Mauvaise réponse à la commande Hello : ERR=%s\n"
 
 #: src/dird/authenticate.c:162 src/tray-monitor/authenticate.c:152
 #: src/qt-console/tray-monitor/authenticate.cpp:151
 msgid "Storage daemon rejected Hello command\n"
-msgstr "Le storage a rejeté la commande Hello\n"
+msgstr "Le storage a rejeté la commande Hello\n"
 
 #: src/dird/authenticate.c:163
 #, c-format
@@ -5810,44 +5836,44 @@
 #: src/dird/authenticate.c:277 src/tray-monitor/authenticate.c:198
 #: src/qt-console/tray-monitor/authenticate.cpp:197
 msgid "File daemon rejected Hello command\n"
-msgstr "Le Client a rejeté la commande Hello\\n\n"
+msgstr "Le Client a rejeté la commande Hello\\n\n"
 
 #: src/dird/authenticate.c:278
 #, c-format
 msgid "File daemon at \"%s:%d\" rejected Hello command\n"
 msgstr ""
 
-#: src/dird/authenticate.c:303
+#: src/dird/authenticate.c:302
 #, c-format
 msgid "UA Hello from %s:%s:%d is invalid. Len=%d\n"
 msgstr ""
 
-#: src/dird/authenticate.c:310
+#: src/dird/authenticate.c:309
 #, c-format
 msgid "UA Hello from %s:%s:%d is invalid. Got: %s\n"
 msgstr ""
 
-#: src/dird/authenticate.c:380
+#: src/dird/authenticate.c:377
 msgid ""
 "Authorization problem: Remote client did not advertise required TLS "
 "support.\n"
 msgstr ""
 
-#: src/dird/authenticate.c:388
+#: src/dird/authenticate.c:385
 msgid "Authorization problem: Remote client requires TLS.\n"
 msgstr ""
 
-#: src/dird/authenticate.c:403 src/filed/authenticate.c:167
-#: src/filed/authenticate.c:286
+#: src/dird/authenticate.c:400 src/filed/authenticate.c:169
+#: src/filed/authenticate.c:288
 msgid "TLS negotiation failed.\n"
 msgstr ""
 
-#: src/dird/authenticate.c:417
+#: src/dird/authenticate.c:414
 #, c-format
 msgid "Unable to authenticate console \"%s\" at %s:%s:%d.\n"
 msgstr ""
 
-#: src/dird/authenticate.c:422
+#: src/dird/authenticate.c:419
 #, c-format
 msgid "1000 OK: %s Version: %s (%s)\n"
 msgstr "1000 OK: %s Version: %s (%s)\n"
@@ -5855,12 +5881,12 @@
 #: src/dird/catreq.c:129 src/dird/catreq.c:356
 #, c-format
 msgid "1990 Invalid Catalog Request: %s"
-msgstr "1990 Requête sur le Catalogue Invalide : %s"
+msgstr "1990 Requête sur le Catalogue Invalide : %s"
 
 #: src/dird/catreq.c:130
 #, c-format
 msgid "Invalid Catalog request; DB not open: %s"
-msgstr "Requête sur le Catalogue invalide ; la base n'est pas ouverte : %s"
+msgstr "Requête sur le Catalogue invalide ; la base n'est pas ouverte : %s"
 
 #: src/dird/catreq.c:155
 msgid "1901 No Media.\n"
@@ -5868,7 +5894,7 @@
 
 #: src/dird/catreq.c:183
 msgid "not in Pool"
-msgstr "non présent dans le Pool"
+msgstr "non présent dans le Pool"
 
 #: src/dird/catreq.c:185
 msgid "not correct MediaType"
@@ -5876,23 +5902,23 @@
 
 #: src/dird/catreq.c:195
 msgid "is not Enabled"
-msgstr "n'est pas activé (Enabled)"
+msgstr "n'est pas activé (Enabled)"
 
 #: src/dird/catreq.c:204
 #, c-format
-msgid "1998 Volume \"%s\" status is %s, %s.\n"
-msgstr "1998 Le statut du Volume « %s » est %s, %s.\n"
+msgid "1998 Volume \"%s\" catalog status is %s, %s.\n"
+msgstr ""
 
 #: src/dird/catreq.c:209
 #, c-format
 msgid "1997 Volume \"%s\" not in catalog.\n"
-msgstr "1997 le Volume « %s » n'est pas dans le catalogue.\n"
+msgstr "1997 le Volume \"%s\" n'est pas dans le catalogue.\n"
 
 #: src/dird/catreq.c:231
 #, c-format
 msgid "Unable to get Media record for Volume %s: ERR=%s\n"
 msgstr ""
-"Impossible de récupérer les informations du Media pour le Volume %s : "
+"Impossible de récupérer les informations du Media pour le Volume %s : "
 "ERR=%s\n"
 
 #: src/dird/catreq.c:233
@@ -5922,7 +5948,7 @@
 
 #: src/dird/catreq.c:321
 msgid "1993 Update Media error\n"
-msgstr "1993 Erreur sur la mise à jour du Media\n"
+msgstr "1993 Erreur sur la mise à jour du Media\n"
 
 #: src/dird/catreq.c:345
 #, c-format
@@ -5974,13 +6000,13 @@
 msgid "Invalid Catalog Update; DB not open: %s"
 msgstr ""
 
-#: src/dird/catreq.c:671 src/dird/catreq.c:689 src/lib/bsock.c:605
+#: src/dird/catreq.c:670 src/dird/catreq.c:685 src/lib/bsock.c:605
 #, c-format
 msgid "fread attr spool error. ERR=%s\n"
 msgstr ""
 
 #: src/dird/msgchan.c:106 src/tray-monitor/tray-monitor.c:952
-#: src/filed/job.c:1727 src/qt-console/tray-monitor/tray-monitor.cpp:375
+#: src/filed/job.c:1771 src/qt-console/tray-monitor/tray-monitor.cpp:375
 msgid "Storage daemon"
 msgstr ""
 
@@ -6422,17 +6448,17 @@
 "Please see "
 msgstr ""
 
-#: src/tray-monitor/authenticate.c:97 src/console/authenticate.c:155
+#: src/tray-monitor/authenticate.c:97 src/console/authenticate.c:152
 #: src/qt-console/tray-monitor/authenticate.cpp:96
 #, c-format
 msgid "Bad response to Hello command: ERR=%s\n"
-msgstr "Mauvaise réponse à la commande Hello : ERR=%s\n"
+msgstr "Mauvaise réponse à la commande Hello : ERR=%s\n"
 
 #: src/tray-monitor/authenticate.c:104 src/wx-console/authenticate.c:157
-#: src/console/authenticate.c:162
+#: src/console/authenticate.c:159
 #: src/qt-console/tray-monitor/authenticate.cpp:103
 msgid "Director rejected Hello command\n"
-msgstr "Le director a rejeté la commande Hello\n"
+msgstr "Le director a rejeté la commande Hello\n"
 
 #: src/tray-monitor/authenticate.c:138
 #: src/qt-console/tray-monitor/authenticate.cpp:137
@@ -6460,31 +6486,31 @@
 "Please see "
 msgstr ""
 
-#: src/stored/reserve.c:88
+#: src/stored/reserve.c:86
 #, c-format
 msgid "Unable to initialize reservation lock. ERR=%s\n"
 msgstr ""
 
-#: src/stored/reserve.c:158
+#: src/stored/reserve.c:156
 #, c-format
 msgid "Hey! num_writers=%d!!!!\n"
 msgstr ""
 
-#: src/stored/reserve.c:256
+#: src/stored/reserve.c:255
 msgid "3939 Could not get dcr\n"
 msgstr ""
 
-#: src/stored/reserve.c:358
+#: src/stored/reserve.c:357
 #, c-format
 msgid "Device reservation failed for JobId=%d: %s\n"
 msgstr ""
 
-#: src/stored/reserve.c:367
+#: src/stored/reserve.c:366
 #, c-format
 msgid "Failed command: %s\n"
-msgstr "Erreur sur la commande : %s\n"
+msgstr "Erreur sur la commande : %s\n"
 
-#: src/stored/reserve.c:626 src/stored/dircmd.c:618
+#: src/stored/reserve.c:625 src/stored/dircmd.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6492,93 +6518,92 @@
 "does not exist.\n"
 msgstr ""
 
-#: src/stored/reserve.c:630 src/stored/dircmd.c:596
+#: src/stored/reserve.c:629 src/stored/dircmd.c:596
 #, c-format
 msgid ""
 "\n"
 "     Device \"%s\" requested by DIR could not be opened or does not exist.\n"
 msgstr ""
 
-#: src/stored/reserve.c:646
+#: src/stored/reserve.c:645
 #, c-format
 msgid "3926 Could not get dcr for device: %s\n"
 msgstr ""
 
-#: src/stored/reserve.c:772
+#: src/stored/reserve.c:771
 #, c-format
 msgid "3601 JobId=%u device %s is BLOCKED due to user unmount.\n"
 msgstr ""
-"3601 JobId=%u device %s est BLOQUÉ car il a été demonté par "
-"l'utilisateur.\n"
+"3601 JobId=%u device %s est BLOQUÉ car il a été demonté par l'utilisateur.\n"
 
-#: src/stored/reserve.c:782
+#: src/stored/reserve.c:781
 #, c-format
 msgid "3602 JobId=%u device %s is busy (already reading/writing).\n"
-msgstr "3602 JobId=%u device %s est occupé (à lire ou écrire).\n"
+msgstr "3602 JobId=%u device %s est occupé (à lire ou écrire).\n"
 
-#: src/stored/reserve.c:829
+#: src/stored/reserve.c:833
 #, c-format
 msgid "3603 JobId=%u device %s is busy reading.\n"
-msgstr "3603 JobId=%u device %s est occupé en lecture.\n"
+msgstr "3603 JobId=%u device %s est occupé en lecture.\n"
 
-#: src/stored/reserve.c:838
+#: src/stored/reserve.c:842
 #, c-format
 msgid "3604 JobId=%u device %s is BLOCKED due to user unmount.\n"
 msgstr ""
-"3604 JobId=%u device %s est bloqué car il a été démonté par "
-"l'utilisateur (unmount).\n"
+"3604 JobId=%u device %s est bloqué car il a été démonté par l'utilisateur "
+"(unmount).\n"
 
-#: src/stored/reserve.c:875
+#: src/stored/reserve.c:884
 #, c-format
 msgid ""
 "3608 JobId=%u wants Pool=\"%s\" but have Pool=\"%s\" nreserve=%d on drive "
 "%s.\n"
 msgstr ""
 
-#: src/stored/reserve.c:898
+#: src/stored/reserve.c:907
 #, c-format
 msgid "3609 JobId=%u Max concurrent jobs exceeded on drive %s.\n"
 msgstr ""
 
-#: src/stored/reserve.c:910
+#: src/stored/reserve.c:919
 #, c-format
 msgid "3610 JobId=%u Volume max jobs exceeded on drive %s.\n"
 msgstr ""
 
-#: src/stored/reserve.c:962
+#: src/stored/reserve.c:971
 #, c-format
 msgid "3605 JobId=%u wants free drive but device %s is busy.\n"
 msgstr ""
-"3605 JobId=%u voulait libérer le lecteur, mais le device %s est occupé.\n"
+"3605 JobId=%u voulait libérer le lecteur, mais le device %s est occupé.\n"
 
-#: src/stored/reserve.c:971
+#: src/stored/reserve.c:980
 #, c-format
 msgid "3606 JobId=%u prefers mounted drives, but drive %s has no Volume.\n"
 msgstr ""
-"3606 JobId=%u voulait un lecteur monté, mais le lecteur %s est vide.\n"
+"3606 JobId=%u voulait un lecteur monté, mais le lecteur %s est vide.\n"
 
-#: src/stored/reserve.c:993
+#: src/stored/reserve.c:1002
 #, c-format
 msgid "3607 JobId=%u wants Vol=\"%s\" drive has Vol=\"%s\" on drive %s.\n"
 msgstr ""
-"3607 JobId=%u voulait Vol=« %s », c'est le Vol=« %s » qui est dans "
-"le drive %s.\n"
+"3607 JobId=%u voulait Vol=\"%s\", c'est le Vol=\"%s\" qui est dans le drive "
+"%s.\n"
 
-#: src/stored/reserve.c:1048
+#: src/stored/reserve.c:1057
 #, c-format
 msgid "Logic error!!!! JobId=%u Should not get here.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1049
+#: src/stored/reserve.c:1058
 #, c-format
 msgid "3910 JobId=%u Logic error!!!! drive %s Should not get here.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1052
+#: src/stored/reserve.c:1061
 msgid "Logic error!!!! Should not get here.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1055
+#: src/stored/reserve.c:1064
 #, c-format
 msgid "3911 JobId=%u failed reserve drive %s.\n"
 msgstr ""
@@ -6710,7 +6735,7 @@
 msgstr ""
 
 #: src/stored/bls.c:479 src/stored/bextract.c:612 src/stored/bcopy.c:375
-#: src/stored/bscan.c:1370 src/stored/btape.c:3044
+#: src/stored/bscan.c:1370 src/stored/btape.c:3048
 #, c-format
 msgid "Mount Volume \"%s\" on device %s and press return when ready: "
 msgstr ""
@@ -6725,7 +6750,7 @@
 msgid "Invalid connection from %s. Len=%d\n"
 msgstr ""
 
-#: src/stored/dircmd.c:208 src/filed/authenticate.c:206
+#: src/stored/dircmd.c:208 src/filed/authenticate.c:208
 msgid "Unable to authenticate Director\n"
 msgstr ""
 
@@ -6737,7 +6762,7 @@
 #: src/stored/dircmd.c:317
 #, c-format
 msgid "3904 Job %s not found.\n"
-msgstr "3904 Job %s non trouvé.\n"
+msgstr "3904 Job %s non trouvé.\n"
 
 #: src/stored/dircmd.c:345
 #, c-format
@@ -6768,21 +6793,21 @@
 #, c-format
 msgid "3920 Cannot label Volume because it is already labeled: \"%s\"\n"
 msgstr ""
-"3920 Impossible de labéliser le Volume car il possède déjà le label : "
-"« %s »\n"
+"3920 Impossible de labéliser le Volume car il possède déjà le label : "
+"\"%s\"\n"
 
 #: src/stored/dircmd.c:504
 msgid "3921 Wrong volume mounted.\n"
-msgstr "3921 Mauvais volume monté.\n"
+msgstr "3921 Mauvais volume monté.\n"
 
 #: src/stored/dircmd.c:508
 msgid "3922 Cannot relabel an ANSI/IBM labeled Volume.\n"
-msgstr "3922 Impossible de re-labéliser un Volume ANSI/IBM.\n"
+msgstr "3922 Impossible de re-labéliser un Volume ANSI/IBM.\n"
 
 #: src/stored/dircmd.c:516
 #, c-format
 msgid "3912 Failed to label Volume: ERR=%s\n"
-msgstr "3912 Impossible de labéliser le Volume : ERR=%s\n"
+msgstr "3912 Impossible de labéliser le Volume : ERR=%s\n"
 
 #: src/stored/dircmd.c:526
 #, c-format
@@ -6798,7 +6823,7 @@
 #: src/stored/dircmd.c:563
 #, c-format
 msgid "3001 Mounted Volume: %s\n"
-msgstr "3001 Volume monté : %s\n"
+msgstr "3001 Volume monté : %s\n"
 
 #: src/stored/dircmd.c:567 src/stored/dircmd.c:1195
 #, c-format
@@ -6872,7 +6897,7 @@
 #: src/stored/dircmd.c:795
 #, c-format
 msgid "3909 Error scanning mount command: %s\n"
-msgstr "3909 Erreur pendant la lecture de la commande de montage : %s\n"
+msgstr "3909 Erreur pendant la lecture de la commande de montage : %s\n"
 
 #: src/stored/dircmd.c:823 src/stored/dircmd.c:876
 #, c-format
@@ -6938,10 +6963,10 @@
 msgid "3927 Error scanning release command: %s\n"
 msgstr ""
 
-#: src/stored/dircmd.c:1028 src/filed/job.c:1490
+#: src/stored/dircmd.c:1028 src/filed/job.c:1531
 #, c-format
 msgid "Could not create bootstrap file %s: ERR=%s\n"
-msgstr "Impossible de créer le fichier bootstrap %s : ERR=%s\n"
+msgstr "Impossible de créer le fichier bootstrap %s : ERR=%s\n"
 
 #: src/stored/dircmd.c:1041
 msgid "Error parsing bootstrap file.\n"
@@ -6954,7 +6979,7 @@
 
 #: src/stored/dircmd.c:1120
 #, c-format
-msgid "3908 Error scanning autocharger drives/list/slots command: %s\n"
+msgid "3908 Error scanning autochanger drives/list/slots command: %s\n"
 msgstr ""
 
 #: src/stored/dircmd.c:1163
@@ -7214,7 +7239,7 @@
 
 #: src/stored/ansi_label.c:333
 #, c-format
-msgid "Could not write ANSI VOL1 label. ERR=%s\n"
+msgid "Could not write ANSI VOL1 label. Wanted size=%d got=%d ERR=%s\n"
 msgstr ""
 
 #: src/stored/ansi_label.c:371 src/stored/ansi_label.c:400
@@ -7253,10 +7278,10 @@
 msgid "NULL Volume name. This shouldn't happen!!!\n"
 msgstr ""
 
-#: src/stored/append.c:111 src/stored/btape.c:2232
+#: src/stored/append.c:111 src/stored/btape.c:2233
 #, c-format
 msgid "Write session label failed. ERR=%s\n"
-msgstr "Impossible d'écrire le label de session. ERR=%s\n"
+msgstr "Impossible d'écrire le label de session. ERR=%s\n"
 
 #: src/stored/append.c:123
 #, c-format
@@ -7289,18 +7314,18 @@
 "Job write elapsed time = %02d:%02d:%02d, Transfer rate = %s Bytes/second\n"
 msgstr ""
 
-#: src/stored/append.c:289 src/stored/btape.c:2351
+#: src/stored/append.c:289 src/stored/btape.c:2352
 #, c-format
 msgid "Error writing end session label. ERR=%s\n"
 msgstr ""
 
-#: src/stored/append.c:305 src/stored/mac.c:127 src/stored/mac.c:246
-#: src/stored/spool.c:301
+#: src/stored/append.c:305 src/stored/mac.c:126 src/stored/mac.c:247
+#: src/stored/spool.c:300
 #, c-format
 msgid "Fatal append error on device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/append.c:307 src/stored/mac.c:129
+#: src/stored/append.c:307 src/stored/mac.c:128
 msgid "Set ok=FALSE after write_block_to_device.\n"
 msgstr ""
 
@@ -7342,7 +7367,7 @@
 
 #: src/stored/label.c:135
 msgid "Could not read Volume label from block.\n"
-msgstr "Impossible de lire le label du Volume depuis le média.\n"
+msgstr "Impossible de lire le label du Volume depuis le média.\n"
 
 #: src/stored/label.c:138
 #, c-format
@@ -7362,7 +7387,7 @@
 #: src/stored/label.c:186
 #, c-format
 msgid "Volume on %s has bad Bacula label type: %x\n"
-msgstr "Le volume sur %s possède un mauvais label Bacula : %x\n"
+msgstr "Le volume sur %s possède un mauvais label Bacula : %x\n"
 
 #: src/stored/label.c:236 src/stored/label.c:399 src/stored/mount.c:460
 #, c-format
@@ -7372,7 +7397,7 @@
 #: src/stored/label.c:276
 #, c-format
 msgid "Cannot write Volume label to block for device %s\n"
-msgstr "Impossible d'écrire le label du Volume sur le Device %s\n"
+msgstr "Impossible d'écrire le label du Volume sur le Device %s\n"
 
 #: src/stored/label.c:328 src/stored/label.c:429 src/stored/mount.c:216
 #, c-format
@@ -7403,15 +7428,14 @@
 #, c-format
 msgid "Recycled volume \"%s\" on device %s, all previous data lost.\n"
 msgstr ""
-"Recyclage du volume « %s » sur le lecteur %s, les précédentes données "
-"sont perdues.\n"
+"Recyclage du volume \"%s\" sur le lecteur %s, les précédentes données sont "
+"perdues.\n"
 
 #: src/stored/label.c:525
 #, c-format
 msgid "Wrote label to prelabeled Volume \"%s\" on device %s\n"
 msgstr ""
-"Écriture du label sur le Volume pré-labélisé « %s » sur le lecteur "
-"%s\n"
+"Écriture du label sur le Volume pré-labélisé \"%s\" sur le lecteur %s\n"
 
 #: src/stored/label.c:726
 #, c-format
@@ -7563,7 +7587,7 @@
 #: src/stored/status.c:132
 #, c-format
 msgid "Autochanger \"%s\" with devices:\n"
-msgstr "Autochangeur « %s » avec les Devices :\n"
+msgstr "Autochangeur \"%s\" avec les Devices :\n"
 
 #: src/stored/status.c:150
 #, c-format
@@ -7573,7 +7597,7 @@
 "    Pool:        %s\n"
 "    Media type:  %s\n"
 msgstr ""
-"Le Device %s est monté avec :\n"
+"Le Device %s est monté avec :\n"
 "    Volume :        %s\n"
 "    Pool :          %s\n"
 "    Type du Media : %s\n"
@@ -7581,8 +7605,7 @@
 #: src/stored/status.c:160
 #, c-format
 msgid "Device %s open but no Bacula volume is currently mounted.\n"
-msgstr ""
-"Le Device %s est ouvert, mais il n'y a pas de Volume Bacula monté.\n"
+msgstr "Le Device %s est ouvert, mais il n'y a pas de Volume Bacula monté.\n"
 
 #: src/stored/status.c:171
 #, c-format
@@ -7597,7 +7620,7 @@
 #: src/stored/status.c:192
 #, c-format
 msgid "    Positioned at File=%s Block=%s\n"
-msgstr "    Positionné sur Fichier=%s Bloc=%s\n"
+msgstr "    Positionné sur Fichier=%s Bloc=%s\n"
 
 #: src/stored/status.c:199
 #, c-format
@@ -7607,7 +7630,7 @@
 #: src/stored/status.c:203
 #, c-format
 msgid "Device \"%s\" is not open or does not exist.\n"
-msgstr "Le Device « %s » n'est pas ouvert ou il n'existe pas.\n"
+msgstr "Le Device \"%s\" n'est pas ouvert ou il n'existe pas.\n"
 
 #: src/stored/status.c:225
 #, c-format
@@ -7622,13 +7645,13 @@
 
 #: src/stored/status.c:254
 msgid "    Device is BLOCKED. User unmounted.\n"
-msgstr "    Le Device est BLOQUÉ. Démonté par l'utilisateur.\n"
+msgstr "    Le Device est BLOQUÉ. Démonté par l'utilisateur.\n"
 
 #: src/stored/status.c:258
 msgid "    Device is BLOCKED. User unmounted during wait for media/mount.\n"
 msgstr ""
-"    Le Device est BLOQUÉ. Démonté par l'utilisateur à cause d'un "
-"chargement de média.\n"
+"    Le Device est BLOQUÉ. Démonté par l'utilisateur à cause d'un chargement "
+"de média.\n"
 
 #: src/stored/status.c:270
 #, c-format
@@ -7637,7 +7660,7 @@
 "       Pool:        %s\n"
 "       Media type:  %s\n"
 msgstr ""
-"    Le Device est BLOQUÉ en attente du montage du volume « %s »,\n"
+"    Le Device est BLOQUÉ en attente du montage du volume \"%s\",\n"
 "        Pool :       %s\n"
 "        Media type : %s\n"
 
@@ -7648,13 +7671,13 @@
 "       Pool:        %s\n"
 "       Media type:  %s\n"
 msgstr ""
-"    Le Device est BLOQUÉ en attente de création d'un volume :\n"
+"    Le Device est BLOQUÉ en attente de création d'un volume :\n"
 "        Pool :       %s\n"
 "        Media type : %s\n"
 
 #: src/stored/status.c:291
 msgid "    Device is BLOCKED waiting for media.\n"
-msgstr "    Le Device est BLOQUÉ en attente d'un média.\n"
+msgstr "    Le Device est BLOQUÉ en attente d'un média.\n"
 
 #: src/stored/status.c:297
 msgid "    Device is being initialized.\n"
@@ -7662,24 +7685,24 @@
 
 #: src/stored/status.c:301
 msgid "    Device is blocked labeling a Volume.\n"
-msgstr "    Le Device est occupé à labéliser un Volume.\n"
+msgstr "    Le Device est occupé à labéliser un Volume.\n"
 
 #: src/stored/status.c:310
 #, c-format
 msgid "    Slot %d is loaded in drive %d.\n"
-msgstr "    Le slot %d est chargé dans le lecteur %d.\n"
+msgstr "    Le slot %d est chargé dans le lecteur %d.\n"
 
 #: src/stored/status.c:314
 #, c-format
 msgid "    Drive %d is not loaded.\n"
-msgstr "    Le lecteur %d n'est pas chargé.\n"
+msgstr "    Le lecteur %d n'est pas chargé.\n"
 
 #: src/stored/status.c:317
 #, c-format
 msgid "    Drive %d status unknown.\n"
 msgstr "    Le statut du lecteur %d est inconnu.\n"
 
-#: src/stored/status.c:331 src/stored/btape.c:687
+#: src/stored/status.c:331 src/stored/btape.c:688
 #, c-format
 msgid "Configured device capabilities:\n"
 msgstr ""
@@ -7695,7 +7718,7 @@
 "\n"
 msgstr ""
 
-#: src/stored/status.c:371 src/stored/btape.c:719
+#: src/stored/status.c:371 src/stored/btape.c:720
 #, c-format
 msgid "Device parameters:\n"
 msgstr ""
@@ -7726,8 +7749,8 @@
 "Reading: %s %s job %s JobId=%d Volume=\"%s\"\n"
 "    pool=\"%s\" device=%s\n"
 msgstr ""
-"Lecture : %s %s job %s JobId=%d Volume=« %s »\n"
-"   pool=« %s » device=%s\n"
+"Lecture : %s %s job %s JobId=%d Volume=\"%s\"\n"
+"   pool=\"%s\" device=%s\n"
 
 #: src/stored/status.c:430
 #, c-format
@@ -7761,7 +7784,7 @@
 "Jobs waiting to reserve a drive:\n"
 msgstr ""
 "\n"
-"Jobs en attente de réservation de lecteur :\n"
+"Jobs en attente de réservation de lecteur :\n"
 
 #: src/stored/status.c:516
 msgid "===================================================================\n"
@@ -7808,28 +7831,28 @@
 
 #: src/stored/status.c:760
 msgid "Bacula Storage: Idle"
-msgstr "Bacula Storage : En attente"
+msgstr "Bacula Storage : En attente"
 
 #: src/stored/status.c:771
 msgid "Bacula Storage: Running"
-msgstr "Bacula Storage : En cours"
+msgstr "Bacula Storage : En cours"
 
 #: src/stored/status.c:785
 msgid "Bacula Storage: Last Job Canceled"
-msgstr "Bacula Storage : Dernier Job annulé"
+msgstr "Bacula Storage : Dernier Job annulé"
 
 #: src/stored/status.c:789
 msgid "Bacula Storage: Last Job Failed"
-msgstr "Bacula Storage : Dernier Job en erreur"
+msgstr "Bacula Storage : Dernier Job en erreur"
 
 #: src/stored/status.c:793
 msgid "Bacula Storage: Last Job had Warnings"
-msgstr "Bacula Storage : Le dernier Job avait des erreurs"
+msgstr "Bacula Storage : Le dernier Job avait des erreurs"
 
 #: src/stored/read_record.c:89
 #, c-format
 msgid "End of Volume at file %u on device %s, Volume \"%s\"\n"
-msgstr "Fin de Volume au fichier %u sur le Device %s, Volume « %s »\n"
+msgstr "Fin de Volume au fichier %u sur le Device %s, Volume \"%s\"\n"
 
 #: src/stored/read_record.c:93
 msgid "End of all volumes.\n"
@@ -7846,7 +7869,7 @@
 #: src/stored/read_record.c:143
 #, c-format
 msgid "End of %s %u on device %s, Volume \"%s\"\n"
-msgstr "Fin de %s %u sur le device %s, Volume « %s »\n"
+msgstr "Fin de %s %u sur le device %s, Volume \"%s\"\n"
 
 #: src/stored/read_record.c:158
 msgid "Did fsr in attemp to skip bad record.\n"
@@ -7855,8 +7878,7 @@
 #: src/stored/read_record.c:397
 #, c-format
 msgid "Forward spacing Volume \"%s\" to file:block %u:%u.\n"
-msgstr ""
-"Postionnement en avant du Volume « %s » sur le fichier:bloc %u:%u.\n"
+msgstr "Postionnement en avant du Volume \"%s\" sur le fichier:bloc %u:%u.\n"
 
 #: src/stored/read_record.c:421
 msgid "Begin Session"
@@ -7893,7 +7915,7 @@
 msgstr ""
 
 #: src/stored/bextract.c:196 src/stored/bcopy.c:163 src/stored/bscan.c:248
-#: src/tools/bvfs_test.c:201 src/tools/bbatch.c:190 src/tools/ing_test.c:184
+#: src/tools/bvfs_test.c:201 src/tools/bbatch.c:190 src/tools/ing_test.c:185
 #: src/tools/cats_test.c:321
 msgid "Wrong number of arguments: \n"
 msgstr ""
@@ -7916,15 +7938,15 @@
 #: src/stored/bextract.c:253
 #, c-format
 msgid "%s must be a directory.\n"
-msgstr "%s doit être un répertoire.\n"
+msgstr "%s doit être un répertoire.\n"
 
 #: src/stored/bextract.c:274
 #, c-format
 msgid "%u files restored.\n"
-msgstr "%u fichiers restaurés.\n"
+msgstr "%u fichiers restaurés.\n"
 
 #: src/stored/bextract.c:284 src/stored/bextract.c:290
-#: src/filed/restore.c:1242
+#: src/filed/restore.c:1474
 #, c-format
 msgid "Write error on %s: %s\n"
 msgstr ""
@@ -7933,7 +7955,7 @@
 msgid "Logic error output file should be open but is not.\n"
 msgstr ""
 
-#: src/stored/bextract.c:335 src/filed/restore.c:363
+#: src/stored/bextract.c:335 src/filed/restore.c:566
 #, c-format
 msgid "%s stream not supported on this Client.\n"
 msgstr ""
@@ -7949,7 +7971,7 @@
 msgstr ""
 
 #: src/stored/bextract.c:429 src/stored/bextract.c:494
-#: src/filed/restore.c:1099
+#: src/filed/restore.c:1329
 #, c-format
 msgid "Seek to %s error on %s: ERR=%s\n"
 msgstr ""
@@ -7957,18 +7979,18 @@
 #: src/stored/bextract.c:448
 #, c-format
 msgid "Uncompression error. ERR=%d\n"
-msgstr "Erreur de décompression. ERR=%d\n"
+msgstr "Erreur de décompression. ERR=%d\n"
 
-#: src/stored/bextract.c:462 src/filed/restore.c:1212
+#: src/stored/bextract.c:462 src/filed/restore.c:1444
 msgid "GZIP data stream found, but GZIP not configured!\n"
 msgstr ""
 
-#: src/stored/bextract.c:517 src/filed/restore.c:1138
+#: src/stored/bextract.c:517 src/filed/restore.c:1370
 #, c-format
 msgid "Compressed header version error. version=0x%x\n"
 msgstr ""
 
-#: src/stored/bextract.c:522 src/filed/restore.c:1143
+#: src/stored/bextract.c:522 src/filed/restore.c:1375
 #, c-format
 msgid "Compressed header size error. comp_len=%d, msglen=%d\n"
 msgstr ""
@@ -7978,7 +8000,7 @@
 msgid "LZO uncompression error. ERR=%d\n"
 msgstr ""
 
-#: src/stored/bextract.c:556 src/filed/restore.c:1176
+#: src/stored/bextract.c:556 src/filed/restore.c:1408
 #, c-format
 msgid "Compression algorithm 0x%x found, but not supported!\n"
 msgstr ""
@@ -7987,7 +8009,7 @@
 msgid "Got Program Name or Data Stream. Ignored.\n"
 msgstr ""
 
-#: src/stored/bextract.c:592 src/filed/restore.c:807
+#: src/stored/bextract.c:592 src/filed/restore.c:325 src/filed/restore.c:1027
 #, c-format
 msgid "Unknown stream=%d ignored. This shouldn't happen!\n"
 msgstr ""
@@ -8012,7 +8034,7 @@
 "\n"
 msgstr ""
 
-#: src/stored/bcopy.c:204 src/stored/device.c:298 src/stored/btape.c:472
+#: src/stored/bcopy.c:204 src/stored/device.c:298 src/stored/btape.c:473
 #, c-format
 msgid "dev open failed: %s\n"
 msgstr ""
@@ -8044,7 +8066,7 @@
 msgstr ""
 
 #: src/stored/bcopy.c:282 src/stored/bcopy.c:290 src/stored/bcopy.c:318
-#: src/stored/btape.c:2750
+#: src/stored/btape.c:2754
 #, c-format
 msgid "Cannot fixup device error. %s\n"
 msgstr ""
@@ -8184,22 +8206,26 @@
 msgid "Unexpected Tape is Off-line\n"
 msgstr ""
 
-#: src/stored/acquire.c:71
+#: src/stored/acquire.c:70
 #, c-format
 msgid "Acquire read: num_writers=%d not zero. Job %d canceled.\n"
 msgstr ""
 
-#: src/stored/acquire.c:80
+#: src/stored/acquire.c:79
 #, c-format
 msgid "No volumes specified for reading. Job %s canceled.\n"
-msgstr "Pas de volume spécifié pour la lecture. Abandon du job %s.\n"
+msgstr "Pas de volume spécifié pour la lecture. Abandon du job %s.\n"
 
-#: src/stored/acquire.c:89
+#: src/stored/acquire.c:88
 #, c-format
 msgid "Logic error: no next volume to read. Numvol=%d Curvol=%d\n"
 msgstr ""
 
-#: src/stored/acquire.c:115
+#: src/stored/acquire.c:95 src/stored/acquire.c:163 src/stored/acquire.c:431
+msgid "generate_plugin_event(bsdEventDeviceOpen) Failed\n"
+msgstr ""
+
+#: src/stored/acquire.c:119
 #, c-format
 msgid ""
 "Changing read device. Want Media Type=\"%s\" have=\"%s\"\n"
@@ -8208,69 +8234,68 @@
 "Changement du Device de lecture. Want Media Type=\"%s\" have=\"%s\"\n"
 "  device=%s\n"
 
-#: src/stored/acquire.c:152
+#: src/stored/acquire.c:159
 #, c-format
 msgid "Media Type change.  New read device %s chosen.\n"
 msgstr ""
 
-#: src/stored/acquire.c:165
+#: src/stored/acquire.c:175
 #, c-format
 msgid "No suitable device found to read Volume \"%s\"\n"
 msgstr ""
 
-#: src/stored/acquire.c:205
+#: src/stored/acquire.c:214
 #, c-format
 msgid "Job %s canceled.\n"
 msgstr "Le job %s est annulé.\n"
 
-#: src/stored/acquire.c:223
+#: src/stored/acquire.c:232
 #, c-format
 msgid "Read open device %s Volume \"%s\" failed: ERR=%s\n"
 msgstr ""
 
-#: src/stored/acquire.c:313
+#: src/stored/acquire.c:322
 #, c-format
 msgid "Too many errors trying to mount device %s for reading.\n"
 msgstr ""
 
-#: src/stored/acquire.c:322
+#: src/stored/acquire.c:330
 #, c-format
 msgid "Ready to read from volume \"%s\" on device %s.\n"
-msgstr ""
-"Prêt à lire les données du volume « %s » depuis le device %s.\n"
+msgstr "Prêt à lire les données du volume \"%s\" depuis le device %s.\n"
 
-#: src/stored/acquire.c:370
+#: src/stored/acquire.c:383
 #, c-format
 msgid "Want to append, but device %s is busy reading.\n"
 msgstr ""
 
-#: src/stored/acquire.c:403
+#: src/stored/acquire.c:416
 #, c-format
 msgid "Could not ready device %s for append.\n"
 msgstr ""
 
-#: src/stored/acquire.c:488 src/stored/spool.c:322 src/stored/block.c:368
+#: src/stored/acquire.c:508 src/stored/spool.c:321 src/stored/block.c:368
 #: src/stored/block.c:738 src/stored/block.c:812
 #, c-format
 msgid "Could not create JobMedia record for Volume=\"%s\" Job=%s\n"
-msgstr "Impossible de créer un JobMedia en base pour le Volume=%s Job=%s\n"
+msgstr "Impossible de créer un JobMedia en base pour le Volume=%s Job=%s\n"
 
-#: src/stored/acquire.c:538
+#: src/stored/acquire.c:559
 #, c-format
 msgid "Alert: %s"
 msgstr "Alert: %s"
 
-#: src/stored/acquire.c:546
+#: src/stored/acquire.c:567
 #, c-format
 msgid "3997 Bad alert command: %s: ERR=%s.\n"
 msgstr ""
 
-#: src/stored/acquire.c:616 src/stored/dev.c:263 src/stored/dev.c:281
+#: src/stored/acquire.c:637 src/stored/dev.c:263 src/stored/dev.c:281
 #: src/stored/dev.c:287 src/stored/dev.c:298 src/lib/openssl.c:122
 #: src/lib/openssl.c:181
 #, c-format
 msgid "Unable to init mutex: ERR=%s\n"
-msgstr "Impossible d'initialiser le muxtex : ERR=%s\n"
+msgstr "Impossible d'initialiser le muxtex : ERR=%s\n"
 
 #: src/stored/askdir.c:178
 msgid "Network error on bnet_recv in req_vol_info.\n"
@@ -8279,8 +8304,7 @@
 #: src/stored/askdir.c:196
 #, c-format
 msgid "Error getting Volume info: %s"
-msgstr ""
-"Erreur pendant la récupération des informations sur un Volume : %s"
+msgstr "Erreur pendant la récupération des informations sur un Volume : %s"
 
 #: src/stored/askdir.c:374
 #, c-format
@@ -8301,8 +8325,8 @@
 #, c-format
 msgid "Job %s canceled while waiting for mount on Storage Device \"%s\".\n"
 msgstr ""
-"Le job %s a été annulé alors qu'il attendait un montage sur le Storage "
-"Device « %s ».\n"
+"Le job %s a été annulé alors qu'il attendait un montage sur le Storage "
+"Device \"%s\".\n"
 
 #: src/stored/askdir.c:530
 #, c-format
@@ -8331,7 +8355,7 @@
 #, c-format
 msgid "Job %s canceled while waiting for mount on Storage Device %s.\n"
 msgstr ""
-"Le Job %s a été annulé pendant qu'il attendait le montage sur le Storage "
+"Le Job %s a été annulé pendant qu'il attendait le montage sur le Storage "
 "Device %s.\n"
 
 #: src/stored/askdir.c:623
@@ -8381,17 +8405,17 @@
 msgid "No Volume names found for restore.\n"
 msgstr ""
 
-#: src/stored/read.c:121
+#: src/stored/read.c:120
 #, c-format
 msgid ">filed: Error Hdr=%s\n"
 msgstr ""
 
-#: src/stored/read.c:122 src/stored/read.c:137
+#: src/stored/read.c:121 src/stored/read.c:136
 #, c-format
 msgid "Error sending to File daemon. ERR=%s\n"
 msgstr ""
 
-#: src/stored/read.c:136
+#: src/stored/read.c:135
 #, c-format
 msgid "Error sending to FD. ERR=%s\n"
 msgstr ""
@@ -8437,13 +8461,12 @@
 #, c-format
 msgid "3304 Issuing autochanger \"load slot %d, drive %d\" command.\n"
 msgstr ""
-"3304 Envoi de la commande « load slot %d, drive %d » à l'autochangeur.\n"
+"3304 Envoi de la commande « load slot %d, drive %d » à l'autochangeur.\n"
 
 #: src/stored/autochanger.c:208
 #, c-format
 msgid "3305 Autochanger \"load slot %d, drive %d\", status is OK.\n"
-msgstr ""
-"3305 Autochangeur « load slot %d, drive %d », le résultat est OK.\n"
+msgstr "3305 Autochangeur « load slot %d, drive %d », le résultat est OK.\n"
 
 #: src/stored/autochanger.c:217
 #, c-format
@@ -8451,26 +8474,23 @@
 "3992 Bad autochanger \"load slot %d, drive %d\": ERR=%s.\n"
 "Results=%s\n"
 msgstr ""
-"3992 Erreur sur l'autochangeur « load slot %d, drive %d » : ERR=%s.\n"
+"3992 Erreur sur l'autochangeur « load slot %d, drive %d » : ERR=%s.\n"
 "Resultat=%s\n"
 
 #: src/stored/autochanger.c:280
 #, c-format
 msgid "3301 Issuing autochanger \"loaded? drive %d\" command.\n"
-msgstr ""
-"3301 Envoi de la commande « loaded? drive %d » à l'autochangeur.\n"
+msgstr "3301 Envoi de la commande « loaded? drive %d » à l'autochangeur.\n"
 
 #: src/stored/autochanger.c:292
 #, c-format
 msgid "3302 Autochanger \"loaded? drive %d\", result is Slot %d.\n"
-msgstr ""
-"3302 Autochangeur « loaded drive %d », le resultat est Slot %d.\n"
+msgstr "3302 Autochangeur « loaded drive %d », le resultat est Slot %d.\n"
 
 #: src/stored/autochanger.c:299
 #, c-format
 msgid "3302 Autochanger \"loaded? drive %d\", result: nothing loaded.\n"
-msgstr ""
-"3302 Autochangeur « loaded drive %d », résultat : lecteur vide.\n"
+msgstr "3302 Autochangeur « loaded drive %d », résultat : lecteur vide.\n"
 
 #: src/stored/autochanger.c:311
 #, c-format
@@ -8478,7 +8498,7 @@
 "3991 Bad autochanger \"loaded? drive %d\" command: ERR=%s.\n"
 "Results=%s\n"
 msgstr ""
-"3991 Erreur sur l'autochangeur « loaded drive %d » : ERR=%s.\n"
+"3991 Erreur sur l'autochangeur « loaded drive %d » : ERR=%s.\n"
 "Resultat=%s\n"
 
 #: src/stored/autochanger.c:328
@@ -8495,8 +8515,7 @@
 #, c-format
 msgid "3307 Issuing autochanger \"unload slot %d, drive %d\" command.\n"
 msgstr ""
-"3307 Envoi de la commande « unload slot %d, drive %d » à "
-"l'autochangeur.\n"
+"3307 Envoi de la commande « unload slot %d, drive %d » à l'autochangeur.\n"
 
 #: src/stored/autochanger.c:399
 #, c-format
@@ -8504,7 +8523,7 @@
 "3995 Bad autochanger \"unload slot %d, drive %d\": ERR=%s\n"
 "Results=%s\n"
 msgstr ""
-"3995 Erreur sur l'autochangeur « unload slot %d, drive %d » : ERR=%s.\n"
+"3995 Erreur sur l'autochangeur « unload slot %d, drive %d » : ERR=%s.\n"
 "Resultat=%s\n"
 
 #: src/stored/autochanger.c:465
@@ -8516,7 +8535,7 @@
 #, c-format
 msgid "3995 Bad autochanger \"unload slot %d, drive %d\": ERR=%s.\n"
 msgstr ""
-"3995 Erreur sur l'autochangeur « unload slot %d, drive %d » : ERR=%s.\n"
+"3995 Erreur sur l'autochangeur « unload slot %d, drive %d » : ERR=%s.\n"
 
 #: src/stored/autochanger.c:570
 #, c-format
@@ -8526,18 +8545,18 @@
 #: src/stored/autochanger.c:591
 #, c-format
 msgid "3306 Issuing autochanger \"%s\" command.\n"
-msgstr "3306 Envoi de la commande « %s » à l'autochangeur.\n"
+msgstr "3306 Envoi de la commande \"%s\" à l'autochangeur.\n"
 
 #: src/stored/autochanger.c:594
 msgid "3996 Open bpipe failed.\n"
 msgstr ""
 
-#: src/stored/autochanger.c:621 src/console/console.c:1454
+#: src/stored/autochanger.c:621 src/console/console.c:1458
 #, c-format
 msgid "Autochanger error: ERR=%s\n"
-msgstr "Erreur sur l'autochangeur : ERR=%s\n"
+msgstr "Erreur sur l'autochangeur : ERR=%s\n"
 
-#: src/stored/stored.c:100
+#: src/stored/stored.c:87
 #, c-format
 msgid ""
 "\n"
@@ -8559,66 +8578,66 @@
 "\n"
 msgstr ""
 
-#: src/stored/stored.c:152 src/stored/btape.c:178
+#: src/stored/stored.c:136 src/stored/btape.c:178
 #, c-format
 msgid "Tape block size (%d) not multiple of system size (%d)\n"
 msgstr ""
 
-#: src/stored/stored.c:156 src/stored/btape.c:182
+#: src/stored/stored.c:140 src/stored/btape.c:182
 #, c-format
 msgid "Tape block size (%d) is not a power of 2\n"
 msgstr ""
 
-#: src/stored/stored.c:284
+#: src/stored/stored.c:268
 msgid "Volume Session Time is ZERO!\n"
 msgstr ""
 
-#: src/stored/stored.c:305
+#: src/stored/stored.c:277
 #, c-format
 msgid "Unable to create thread. ERR=%s\n"
 msgstr ""
 
-#: src/stored/stored.c:338 src/stored/bscan.c:262
+#: src/stored/stored.c:310 src/stored/bscan.c:262
 #, c-format
 msgid "No Storage resource defined in %s. Cannot continue.\n"
 msgstr ""
 
-#: src/stored/stored.c:344
+#: src/stored/stored.c:316
 #, c-format
 msgid "Only one Storage resource permitted in %s\n"
 msgstr ""
 
-#: src/stored/stored.c:349
+#: src/stored/stored.c:321
 #, c-format
 msgid "No Director resource defined in %s. Cannot continue.\n"
 msgstr ""
 
-#: src/stored/stored.c:354
+#: src/stored/stored.c:326
 #, c-format
 msgid "No Device resource defined in %s. Cannot continue.\n"
 msgstr ""
 
-#: src/stored/stored.c:362
+#: src/stored/stored.c:334
 #, c-format
 msgid "No Messages resource defined in %s. Cannot continue.\n"
 msgstr ""
 
-#: src/stored/stored.c:369 src/stored/bscan.c:270
+#: src/stored/stored.c:341 src/stored/bscan.c:270
 #, c-format
 msgid "No Working Directory defined in %s. Cannot continue.\n"
 msgstr ""
 
-#: src/stored/stored.c:391
+#: src/stored/stored.c:363
 #, c-format
 msgid "\"TLS Certificate\" file not defined for Storage \"%s\" in %s.\n"
 msgstr ""
 
-#: src/stored/stored.c:397
+#: src/stored/stored.c:369
 #, c-format
 msgid "\"TLS Key\" file not defined for Storage \"%s\" in %s.\n"
 msgstr ""
 
-#: src/stored/stored.c:403
+#: src/stored/stored.c:375
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
@@ -8626,17 +8645,17 @@
 "using \"TLS Verify Peer\".\n"
 msgstr ""
 
-#: src/stored/stored.c:539
+#: src/stored/stored.c:511
 #, c-format
 msgid "Could not initialize %s\n"
 msgstr "Impossible d'initialiser %s\n"
 
-#: src/stored/stored.c:552
+#: src/stored/stored.c:525
 #, c-format
 msgid "Could not open device %s\n"
 msgstr "Impossible d'ouvrir le device %s\n"
 
-#: src/stored/stored.c:566
+#: src/stored/stored.c:539
 #, c-format
 msgid "Could not mount device %s\n"
 msgstr "Impossible de monter le device %s\n"
@@ -8644,12 +8663,12 @@
 #: src/stored/device.c:120
 #, c-format
 msgid "End of medium on Volume \"%s\" Bytes=%s Blocks=%s at %s.\n"
-msgstr "Fin de média sur le Volume « %s » Octets=%s Blocs=%s à %s.\n"
+msgstr "Fin de média sur le Volume \"%s\" Octets=%s Blocs=%s à %s.\n"
 
 #: src/stored/device.c:139
 #, c-format
 msgid "New volume \"%s\" mounted on device %s at %s.\n"
-msgstr "Nouveau volume « %s » monté sur le device %s à %s.\n"
+msgstr "Nouveau volume \"%s\" monté sur le device %s à %s.\n"
 
 #: src/stored/device.c:151
 #, c-format
@@ -8676,41 +8695,41 @@
 msgid "Unable to open archive %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/fd_cmds.c:165
+#: src/stored/fd_cmds.c:166
 #, c-format
 msgid "Command error with FD, hanging up. %s\n"
 msgstr ""
 
-#: src/stored/fd_cmds.c:168
+#: src/stored/fd_cmds.c:169
 msgid "Command error with FD, hanging up.\n"
 msgstr ""
 
-#: src/stored/fd_cmds.c:179
+#: src/stored/fd_cmds.c:180
 #, c-format
 msgid "FD command not found: %s\n"
 msgstr ""
 
-#: src/stored/fd_cmds.c:205
+#: src/stored/fd_cmds.c:206
 msgid "Append data error.\n"
 msgstr ""
 
-#: src/stored/fd_cmds.c:210
+#: src/stored/fd_cmds.c:211
 msgid "Attempt to append on non-open session.\n"
 msgstr ""
 
-#: src/stored/fd_cmds.c:222 src/stored/fd_cmds.c:265
+#: src/stored/fd_cmds.c:223 src/stored/fd_cmds.c:266
 msgid "Attempt to close non-open session.\n"
 msgstr ""
 
-#: src/stored/fd_cmds.c:240
+#: src/stored/fd_cmds.c:241
 msgid "Attempt to open already open session.\n"
 msgstr ""
 
-#: src/stored/fd_cmds.c:294
+#: src/stored/fd_cmds.c:295
 msgid "Attempt to read on non-open session.\n"
 msgstr ""
 
-#: src/stored/fd_cmds.c:312 src/stored/fd_cmds.c:321
+#: src/stored/fd_cmds.c:313 src/stored/fd_cmds.c:322
 msgid "Attempt to open read on non-open session.\n"
 msgstr ""
 
@@ -8722,24 +8741,23 @@
 #: src/stored/mount.c:104
 #, c-format
 msgid "Job %d canceled.\n"
-msgstr "Le job %d est annulé.\n"
+msgstr "Le job %d est annulé.\n"
 
 #: src/stored/mount.c:280
 #, c-format
 msgid "Volume \"%s\" previously written, moving to end of data.\n"
-msgstr ""
-"Le volume « %s » contient des données, re-positionnement à la fin.\n"
+msgstr "Le volume \"%s\" contient des données, re-positionnement à la fin.\n"
 
 #: src/stored/mount.c:286
 #, c-format
 msgid "Unable to position to end of data on device %s: ERR=%s\n"
 msgstr ""
-"Impossible de se positionner à la fin du média sur le device %s : ERR=%s\n"
+"Impossible de se positionner à la fin du média sur le device %s : ERR=%s\n"
 
 #: src/stored/mount.c:408 src/stored/mount.c:730
 #, c-format
 msgid "Volume \"%s\" not on device %s.\n"
-msgstr "Le volume « %s » n'est pas dans le device %s.\n"
+msgstr "Le volume \"%s\" n'est pas dans le device %s.\n"
 
 #: src/stored/mount.c:441
 #, c-format
@@ -8748,16 +8766,15 @@
 "    Current Volume \"%s\" not acceptable because:\n"
 "    %s"
 msgstr ""
-"Le director voulait utiliser le volume « %s ».\n"
-"    Le volume courant « %s » n'est pas utilisable car :\n"
+"Le director voulait utiliser le volume \"%s\".\n"
+"    Le volume courant \"%s\" n'est pas utilisable car :\n"
 "    %s"
 
 #: src/stored/mount.c:596
 #, c-format
 msgid "Ready to append to end of Volume \"%s\" part=%d size=%s\n"
 msgstr ""
-"Prêt à ajouter des données à la fin du volume « %s » part=%d "
-"size=%s\n"
+"Prêt à ajouter des données à la fin du volume \"%s\" part=%d size=%s\n"
 
 #: src/stored/mount.c:600
 #, c-format
@@ -8769,8 +8786,7 @@
 #: src/stored/mount.c:614
 #, c-format
 msgid "Ready to append to end of Volume \"%s\" at file=%d.\n"
-msgstr ""
-"Prêt à ajouter des données à la fin du volume « %s » file=%d.\n"
+msgstr "Prêt à ajouter des données à la fin du volume \"%s\" file=%d.\n"
 
 #: src/stored/mount.c:617
 #, c-format
@@ -8816,7 +8832,7 @@
 #: src/stored/mount.c:720
 #, c-format
 msgid "Labeled new Volume \"%s\" on device %s.\n"
-msgstr "Le nouveau volume « %s » a été labélisé sur le device %s.\n"
+msgstr "Le nouveau volume \"%s\" a été labélisé sur le device %s.\n"
 
 #: src/stored/mount.c:725
 #, c-format
@@ -8828,7 +8844,7 @@
 #: src/stored/mount.c:744
 #, c-format
 msgid "Marking Volume \"%s\" in Error in Catalog.\n"
-msgstr "Le volume « %s » est marqué en Erreur dans le catalogue.\n"
+msgstr "Le volume \"%s\" est marqué en Erreur dans le catalogue.\n"
 
 #: src/stored/mount.c:761
 #, c-format
@@ -8847,7 +8863,7 @@
 "Invalid tape position on volume \"%s\" on device %s. Expected %d, got %d\n"
 msgstr ""
 
-#: src/stored/mount.c:864 src/stored/btape.c:3116
+#: src/stored/mount.c:864 src/stored/btape.c:3120
 #, c-format
 msgid "Cannot open Dev=%s, Vol=%s\n"
 msgstr ""
@@ -8902,7 +8918,7 @@
 
 #: src/stored/spool.c:112
 msgid "Spooling data ...\n"
-msgstr "Spooling des données...\n"
+msgstr "Spooling des données...\n"
 
 #: src/stored/spool.c:138
 #, c-format
@@ -8922,118 +8938,118 @@
 #, c-format
 msgid "Committing spooled data to Volume \"%s\". Despooling %s bytes ...\n"
 msgstr ""
-"Transfert des données spoolées sur le Volume « %s ». Transfert de %s "
+"Transfert des données spoolées sur le Volume \"%s\". Transfert de %s "
 "octets...\n"
 
 #: src/stored/spool.c:239
 #, c-format
 msgid "Writing spooled data to Volume. Despooling %s bytes ...\n"
 msgstr ""
-"Écriture des données spoolées sur le Volume. Transfert de %s octets...\n"
+"Écriture des données spoolées sur le Volume. Transfert de %s octets...\n"
 
-#: src/stored/spool.c:340
+#: src/stored/spool.c:339
 #, c-format
 msgid ""
 "Despooling elapsed time = %02d:%02d:%02d, Transfer rate = %s Bytes/second\n"
 msgstr ""
 
-#: src/stored/spool.c:349 src/stored/spool.c:548 src/stored/spool.c:594
+#: src/stored/spool.c:348 src/stored/spool.c:546 src/stored/spool.c:592
 #, c-format
 msgid "Ftruncate spool file failed: ERR=%s\n"
 msgstr ""
 
-#: src/stored/spool.c:409
+#: src/stored/spool.c:407
 #, c-format
 msgid "Spool header read error. ERR=%s\n"
 msgstr ""
 
-#: src/stored/spool.c:412
+#: src/stored/spool.c:410
 #, c-format
 msgid "Spool read error. Wanted %u bytes, got %d\n"
 msgstr ""
 
-#: src/stored/spool.c:413
+#: src/stored/spool.c:411
 #, c-format
 msgid "Spool header read error. Wanted %u bytes, got %d\n"
 msgstr ""
 
-#: src/stored/spool.c:420 src/stored/spool.c:421
+#: src/stored/spool.c:418 src/stored/spool.c:419
 #, c-format
 msgid "Spool block too big. Max %u bytes, got %u\n"
 msgstr ""
 
-#: src/stored/spool.c:427 src/stored/spool.c:428
+#: src/stored/spool.c:425 src/stored/spool.c:426
 #, c-format
 msgid "Spool data read error. Wanted %u bytes, got %d\n"
 msgstr ""
 
-#: src/stored/spool.c:489
+#: src/stored/spool.c:487
 msgid "User specified spool size reached.\n"
-msgstr "Taille du spool spécifiée par l'utlisateur atteinte.\n"
+msgstr "Taille du spool spécifiée par l'utlisateur atteinte.\n"
 
-#: src/stored/spool.c:491
+#: src/stored/spool.c:489
 msgid "Bad return from despool in write_block.\n"
 msgstr ""
 
-#: src/stored/spool.c:499
+#: src/stored/spool.c:497
 msgid "Spooling data again ...\n"
-msgstr "Reprise du spool des données...\n"
+msgstr "Reprise du spool des données...\n"
 
-#: src/stored/spool.c:531
+#: src/stored/spool.c:529
 #, c-format
 msgid "Error writing header to spool file. ERR=%s\n"
 msgstr ""
 
-#: src/stored/spool.c:536
+#: src/stored/spool.c:534
 #, c-format
 msgid ""
 "Error writing header to spool file. Disk probably full. Attempting recovery. "
 "Wanted to write=%d got=%d\n"
 msgstr ""
 
-#: src/stored/spool.c:554 src/stored/spool.c:600
+#: src/stored/spool.c:552 src/stored/spool.c:598
 msgid "Fatal despooling error."
 msgstr ""
 
-#: src/stored/spool.c:562
+#: src/stored/spool.c:560
 msgid "Retrying after header spooling error failed.\n"
 msgstr ""
 
-#: src/stored/spool.c:578
+#: src/stored/spool.c:576
 #, c-format
 msgid "Error writing data to spool file. ERR=%s\n"
 msgstr ""
-"Erreur pendant l'écriture des données vers le fichier de spool. ERR=%s\n"
+"Erreur pendant l'écriture des données vers le fichier de spool. ERR=%s\n"
 
-#: src/stored/spool.c:611
+#: src/stored/spool.c:609
 msgid "Retrying after data spooling error failed.\n"
 msgstr ""
 
-#: src/stored/spool.c:681
+#: src/stored/spool.c:679
 msgid "Network error on BlastAttributes.\n"
 msgstr ""
 
-#: src/stored/spool.c:705 src/stored/spool.c:729
+#: src/stored/spool.c:703 src/stored/spool.c:727
 #, c-format
 msgid "Fseek on attributes file failed: ERR=%s\n"
 msgstr ""
 
-#: src/stored/spool.c:717
+#: src/stored/spool.c:715
 #, c-format
 msgid "Truncate on attributes file failed: ERR=%s\n"
 msgstr ""
 
-#: src/stored/spool.c:742
+#: src/stored/spool.c:739
 #, c-format
 msgid "Sending spooled attrs to the Director. Despooling %s bytes ...\n"
 msgstr ""
-"Transfert des attributs spoolés au Director. Transfert de %s octets...\n"
+"Transfert des attributs spoolés au Director. Transfert de %s octets...\n"
 
-# Impossible d'ouvrir le fichier de spool des attributs : ERR=%s
-#: src/stored/spool.c:768
+# Impossible d'ouvrir le fichier de spool des attributs : ERR=%s
+#: src/stored/spool.c:765
 #, c-format
 msgid "fopen attr spool file %s failed: ERR=%s\n"
-msgstr "Impossible d'ouvrir le fichier de spool des attributs %s : ERR=%s\n"
+msgstr "Impossible d'ouvrir le fichier de spool des attributs %s : ERR=%s\n"
 
 #: src/stored/lock.c:235
 #, c-format
@@ -9070,8 +9086,8 @@
 msgid "Warning: unknown resource type %d\n"
 msgstr ""
 
-#: src/stored/stored_conf.c:552 src/stored/stored_conf.c:642
-#: src/stored/stored_conf.c:677 src/wx-console/console_conf.c:164
+#: src/stored/stored_conf.c:555 src/stored/stored_conf.c:645
+#: src/stored/stored_conf.c:680 src/wx-console/console_conf.c:164
 #: src/wx-console/console_conf.c:239 src/wx-console/console_conf.c:284
 #: src/wx-console/console_conf.c:311 src/console/console_conf.c:157
 #: src/console/console_conf.c:233 src/console/console_conf.c:278
@@ -9083,27 +9099,27 @@
 msgid "Unknown resource type %d\n"
 msgstr "Type de ressource inconnu %d\n"
 
-#: src/stored/stored_conf.c:581
+#: src/stored/stored_conf.c:584
 #, c-format
 msgid "\"%s\" item is required in \"%s\" resource, but not found.\n"
 msgstr ""
 
-#: src/stored/stored_conf.c:587
+#: src/stored/stored_conf.c:590
 #, c-format
 msgid "Too many items in \"%s\" resource\n"
-msgstr "Trop d'éléments dans la ressource « %s »\n"
+msgstr "Trop d'éléments dans la ressource \"%s\"\n"
 
-#: src/stored/stored_conf.c:621
+#: src/stored/stored_conf.c:624
 #, c-format
 msgid "Cannot find AutoChanger resource %s\n"
 msgstr "Impossible de trouver la ressource AutoChanger %s\n"
 
-#: src/stored/stored_conf.c:637
+#: src/stored/stored_conf.c:640
 #, c-format
 msgid "Unable to init lock: ERR=%s\n"
 msgstr ""
 
-#: src/stored/stored_conf.c:695
+#: src/stored/stored_conf.c:698
 #, c-format
 msgid ""
 "Attempt to define second \"%s\" resource named \"%s\" is not permitted.\n"
@@ -9145,7 +9161,7 @@
 msgid "Block size %u on device %s is too large, using default %u\n"
 msgstr ""
 "La taille de bloc %u sur le Device %s est trop grande, utilisation de la "
-"valeur par défaut %u\n"
+"valeur par défaut %u\n"
 
 #: src/stored/dev.c:249
 #, c-format
@@ -9190,7 +9206,7 @@
 #: src/stored/dev.c:1454
 #, c-format
 msgid "lseek error on %s. ERR=%s.\n"
-msgstr "erreur de déplacement (lseek) sur %s : ERR=%s\n"
+msgstr "erreur de déplacement (lseek) sur %s : ERR=%s\n"
 
 #: src/stored/dev.c:695
 #, c-format
@@ -9257,7 +9273,7 @@
 msgid "ioctl MTFSF error on %s. ERR=%s.\n"
 msgstr "erreur ioctl MTFSF sur %s. ERR=%s.\n"
 
-#: src/stored/dev.c:1194 src/stored/btape.c:1974
+#: src/stored/dev.c:1194 src/stored/btape.c:1975
 #, c-format
 msgid "read error on %s. ERR=%s.\n"
 msgstr ""
@@ -9354,7 +9370,7 @@
 #: src/stored/dev.c:1989 src/stored/dev.c:2060
 #, c-format
 msgid "Device %s cannot be %smounted. ERR=%s\n"
-msgstr "Le Device %s ne peut pas être %smounted. ERR=%s\n"
+msgstr "Le Device %s ne peut pas être %smounted. ERR=%s\n"
 
 #: src/stored/dev.c:2456
 #, c-format
@@ -9406,12 +9422,12 @@
 msgstr ""
 
 #: src/stored/bscan.c:302 src/tools/bvfs_test.c:215 src/tools/bbatch.c:201
-#: src/tools/bbatch.c:250 src/tools/ing_test.c:190
+#: src/tools/bbatch.c:250 src/tools/ing_test.c:191
 msgid "Could not init Bacula database\n"
 msgstr ""
 
 #: src/stored/bscan.c:309 src/tools/bvfs_test.c:224 src/tools/bbatch.c:257
-#: src/tools/ing_test.c:199
+#: src/tools/ing_test.c:200
 #, c-format
 msgid "Using Database: %s, User: %s\n"
 msgstr ""
@@ -9712,21 +9728,21 @@
 msgid "Updated MD5/SHA1 record\n"
 msgstr ""
 
-#: src/stored/job.c:230
+#: src/stored/job.c:231
 #, c-format
 msgid "FD connect failed: Job name not found: %s\n"
 msgstr ""
 
-#: src/stored/job.c:240
+#: src/stored/job.c:241
 #, c-format
 msgid "Hey!!!! JobId %u Job %s already authenticated.\n"
 msgstr ""
 
-#: src/stored/job.c:257
+#: src/stored/job.c:258
 msgid "Unable to authenticate File daemon\n"
 msgstr ""
 
-#: src/stored/job.c:386
+#: src/stored/job.c:387
 msgid "In free_jcr(), but still attached to device!!!!\n"
 msgstr ""
 
@@ -9771,140 +9787,140 @@
 msgid "btape only works with tape storage.\n"
 msgstr ""
 
-#: src/stored/btape.c:382
+#: src/stored/btape.c:383
 #, c-format
 msgid "Total Volume bytes=%sB. Total Write rate = %sB/s\n"
 msgstr ""
 
-#: src/stored/btape.c:408
+#: src/stored/btape.c:409
 #, c-format
 msgid "Volume bytes=%sB. Write rate = %sB/s\n"
 msgstr ""
 
-#: src/stored/btape.c:476
+#: src/stored/btape.c:477
 #, c-format
 msgid "open device %s: OK\n"
 msgstr ""
 
-#: src/stored/btape.c:499
+#: src/stored/btape.c:500
 msgid "Enter Volume Name: "
-msgstr "Saisissez un nom de Volume : "
+msgstr "Saisissez un nom de Volume : "
 
-#: src/stored/btape.c:506
+#: src/stored/btape.c:507
 #, c-format
 msgid "Device open failed. ERR=%s\n"
-msgstr "Erreur sur l'ouverture du périphérique. ERR=%s\n"
+msgstr "Erreur sur l'ouverture du périphérique. ERR=%s\n"
 
-#: src/stored/btape.c:511
+#: src/stored/btape.c:512
 #, c-format
 msgid "Wrote Volume label for volume \"%s\".\n"
 msgstr ""
 
-#: src/stored/btape.c:525
+#: src/stored/btape.c:526
 msgid "Volume has no label.\n"
 msgstr "Le Volume n'a pas de label.\n"
 
-#: src/stored/btape.c:528
+#: src/stored/btape.c:529
 msgid "Volume label read correctly.\n"
 msgstr ""
 
-#: src/stored/btape.c:531
+#: src/stored/btape.c:532
 #, c-format
 msgid "I/O error on device: ERR=%s"
 msgstr ""
 
-#: src/stored/btape.c:534
+#: src/stored/btape.c:535
 msgid "Volume name error\n"
 msgstr ""
 
-#: src/stored/btape.c:537
+#: src/stored/btape.c:538
 #, c-format
 msgid "Error creating label. ERR=%s"
 msgstr ""
 
-#: src/stored/btape.c:540
+#: src/stored/btape.c:541
 msgid "Volume version error.\n"
 msgstr ""
 
-#: src/stored/btape.c:543
+#: src/stored/btape.c:544
 msgid "Bad Volume label type.\n"
 msgstr ""
 
-#: src/stored/btape.c:546
+#: src/stored/btape.c:547
 msgid "Unknown error.\n"
 msgstr ""
 
-#: src/stored/btape.c:564
+#: src/stored/btape.c:565
 #, c-format
 msgid "Bad status from load. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:566
+#: src/stored/btape.c:567
 #, c-format
 msgid "Loaded %s\n"
 msgstr ""
 
-#: src/stored/btape.c:575 src/stored/btape.c:1136 src/stored/btape.c:1209
-#: src/stored/btape.c:1289 src/stored/btape.c:1560
+#: src/stored/btape.c:576 src/stored/btape.c:1137 src/stored/btape.c:1210
+#: src/stored/btape.c:1290 src/stored/btape.c:1561
 #, c-format
 msgid "Bad status from rewind. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:578 src/stored/btape.c:1568
+#: src/stored/btape.c:579 src/stored/btape.c:1569
 #, c-format
 msgid "Rewound %s\n"
 msgstr ""
 
-#: src/stored/btape.c:604 src/stored/btape.c:1572
+#: src/stored/btape.c:605 src/stored/btape.c:1573
 #, c-format
 msgid "Bad status from weof. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:608
+#: src/stored/btape.c:609
 #, c-format
 msgid "Wrote 1 EOF to %s\n"
 msgstr ""
 
-#: src/stored/btape.c:611
+#: src/stored/btape.c:612
 #, c-format
 msgid "Wrote %d EOFs to %s\n"
 msgstr ""
 
-#: src/stored/btape.c:629
+#: src/stored/btape.c:630
 msgid "Moved to end of medium.\n"
 msgstr ""
 
-#: src/stored/btape.c:656
+#: src/stored/btape.c:657
 #, c-format
 msgid "Bad status from bsf. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:658
+#: src/stored/btape.c:659
 #, c-format
 msgid "Backspaced %d file%s.\n"
 msgstr ""
 
-#: src/stored/btape.c:675
+#: src/stored/btape.c:676
 #, c-format
 msgid "Bad status from bsr. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:677
+#: src/stored/btape.c:678
 #, c-format
 msgid "Backspaced %d record%s.\n"
 msgstr ""
 
-#: src/stored/btape.c:705
+#: src/stored/btape.c:706
 #, c-format
 msgid "Device status:\n"
 msgstr ""
 
-#: src/stored/btape.c:724
+#: src/stored/btape.c:725
 #, c-format
 msgid "Status:\n"
-msgstr "Statut :\n"
+msgstr "Statut :\n"
 
-#: src/stored/btape.c:739
+#: src/stored/btape.c:740
 msgid ""
 "Test writing larger and larger records.\n"
 "This is a torture test for records.\n"
@@ -9913,24 +9929,24 @@
 "plus the header exceeds the block size (by default about 64K)\n"
 msgstr ""
 
-#: src/stored/btape.c:745
+#: src/stored/btape.c:746
 msgid "Do you want to continue? (y/n): "
-msgstr "Voulez vous continuer ? (y/n) : "
+msgstr "Voulez vous continuer ? (y/n) : "
 
-#: src/stored/btape.c:747 src/stored/btape.c:2197
+#: src/stored/btape.c:748 src/stored/btape.c:2198
 msgid "Command aborted.\n"
-msgstr "Commande annulée.\n"
+msgstr "Commande annulée.\n"
 
-#: src/stored/btape.c:763
+#: src/stored/btape.c:764
 #, c-format
 msgid "Block %d i=%d\n"
 msgstr ""
 
-#: src/stored/btape.c:789
+#: src/stored/btape.c:790
 msgid "Skipping read backwards test because BSR turned off.\n"
 msgstr ""
 
-#: src/stored/btape.c:793
+#: src/stored/btape.c:794
 msgid ""
 "\n"
 "=== Write, backup, and re-read test ===\n"
@@ -9944,73 +9960,73 @@
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:806 src/stored/btape.c:817 src/stored/btape.c:828
-#: src/stored/btape.c:1146 src/stored/btape.c:1162 src/stored/btape.c:1904
-#: src/stored/btape.c:2817
+#: src/stored/btape.c:807 src/stored/btape.c:818 src/stored/btape.c:829
+#: src/stored/btape.c:1147 src/stored/btape.c:1163 src/stored/btape.c:1905
+#: src/stored/btape.c:2821
 msgid "Error writing record to block.\n"
 msgstr ""
 
-#: src/stored/btape.c:810 src/stored/btape.c:821 src/stored/btape.c:832
-#: src/stored/btape.c:1150 src/stored/btape.c:1166 src/stored/btape.c:1908
-#: src/stored/btape.c:2821
+#: src/stored/btape.c:811 src/stored/btape.c:822 src/stored/btape.c:833
+#: src/stored/btape.c:1151 src/stored/btape.c:1167 src/stored/btape.c:1909
+#: src/stored/btape.c:2825
 msgid "Error writing block to device.\n"
 msgstr ""
 
-#: src/stored/btape.c:813
+#: src/stored/btape.c:814
 #, c-format
 msgid "Wrote first record of %d bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:824
+#: src/stored/btape.c:825
 #, c-format
 msgid "Wrote second record of %d bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:835
+#: src/stored/btape.c:836
 #, c-format
 msgid "Wrote third record of %d bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:842 src/stored/btape.c:847
+#: src/stored/btape.c:843 src/stored/btape.c:848
 #, c-format
 msgid "Backspace file failed! ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:851
+#: src/stored/btape.c:852
 msgid "Backspaced over EOF OK.\n"
 msgstr ""
 
-#: src/stored/btape.c:853
+#: src/stored/btape.c:854
 #, c-format
 msgid "Backspace record failed! ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:856
+#: src/stored/btape.c:857
 msgid "Backspace record OK.\n"
 msgstr ""
 
-#: src/stored/btape.c:859 src/stored/btape.c:865
+#: src/stored/btape.c:860 src/stored/btape.c:866
 #, c-format
 msgid "Read block failed! ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:870
+#: src/stored/btape.c:871
 msgid "Bad data in record. Test failed!\n"
 msgstr ""
 
-#: src/stored/btape.c:874
+#: src/stored/btape.c:875
 msgid ""
 "\n"
 "Block re-read correct. Test succeeded!\n"
 msgstr ""
 
-#: src/stored/btape.c:875
+#: src/stored/btape.c:876
 msgid ""
 "=== End Write, backup, and re-read test ===\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:882
+#: src/stored/btape.c:883
 msgid ""
 "This is not terribly serious since Bacula only uses\n"
 "this function to verify the last block written to the\n"
@@ -10022,50 +10038,50 @@
 "to your Storage daemon's Device resource definition.\n"
 msgstr ""
 
-#: src/stored/btape.c:904
+#: src/stored/btape.c:905
 #, c-format
 msgid "Begin writing %i files of %sB with raw blocks of %u bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:925 src/stored/btape.c:2873
+#: src/stored/btape.c:926 src/stored/btape.c:2877
 #, c-format
 msgid "Write failed at block %u. stat=%d ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:959
+#: src/stored/btape.c:960
 #, c-format
 msgid "Begin writing %i files of %sB with blocks of %u bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:968
+#: src/stored/btape.c:969
 msgid ""
 "\n"
 "Error writing record to block.\n"
 msgstr ""
 
-#: src/stored/btape.c:972
+#: src/stored/btape.c:973
 msgid ""
 "\n"
 "Error writing block to device.\n"
 msgstr ""
 
-#: src/stored/btape.c:1027
+#: src/stored/btape.c:1028
 msgid "The file_size is too big, stop this test with Ctrl-c.\n"
 msgstr ""
 
-#: src/stored/btape.c:1055
+#: src/stored/btape.c:1056
 msgid "Test with zero data, should give the maximum throughput.\n"
 msgstr ""
 
-#: src/stored/btape.c:1067 src/stored/btape.c:1093
+#: src/stored/btape.c:1068 src/stored/btape.c:1094
 msgid "Test with random data, should give the minimum throughput.\n"
 msgstr ""
 
-#: src/stored/btape.c:1082
+#: src/stored/btape.c:1083
 msgid "Test with zero data and bacula block structure.\n"
 msgstr ""
 
-#: src/stored/btape.c:1122
+#: src/stored/btape.c:1123
 #, c-format
 msgid ""
 "\n"
@@ -10079,66 +10095,66 @@
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1154 src/stored/btape.c:1170
+#: src/stored/btape.c:1155 src/stored/btape.c:1171
 #, c-format
 msgid "Wrote %d blocks of %d bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:1212 src/stored/btape.c:1292
+#: src/stored/btape.c:1213 src/stored/btape.c:1293
 msgid "Rewind OK.\n"
 msgstr ""
 
-#: src/stored/btape.c:1225 src/stored/btape.c:1344
+#: src/stored/btape.c:1226 src/stored/btape.c:1345
 msgid "Got EOF on tape.\n"
 msgstr ""
 
-#: src/stored/btape.c:1230
+#: src/stored/btape.c:1231
 #, c-format
 msgid "Read block %d failed! ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1236
+#: src/stored/btape.c:1237
 #, c-format
 msgid "Read record failed. Block %d! ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1242 src/stored/btape.c:1374
+#: src/stored/btape.c:1243 src/stored/btape.c:1375
 #, c-format
 msgid "Bad data in record. Expected %d, got %d at byte %d. Test failed!\n"
 msgstr ""
 
-#: src/stored/btape.c:1249
+#: src/stored/btape.c:1250
 #, c-format
 msgid "%d blocks re-read correctly.\n"
 msgstr ""
 
-#: src/stored/btape.c:1252 src/stored/btape.c:1381
+#: src/stored/btape.c:1253 src/stored/btape.c:1382
 msgid ""
 "=== Test Succeeded. End Write, rewind, and re-read test ===\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1280
+#: src/stored/btape.c:1281
 msgid "Block position test\n"
 msgstr ""
 
-#: src/stored/btape.c:1335
+#: src/stored/btape.c:1336
 #, c-format
 msgid "Reposition to file:block %d:%d\n"
 msgstr ""
 
-#: src/stored/btape.c:1337
+#: src/stored/btape.c:1338
 msgid "Reposition error.\n"
 msgstr ""
 
-#: src/stored/btape.c:1350
+#: src/stored/btape.c:1351
 #, c-format
 msgid ""
 "Read block %d failed! file=%d blk=%d. ERR=%s\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1352
+#: src/stored/btape.c:1353
 msgid ""
 "This may be because the tape drive block size is not\n"
 " set to variable blocking as normally used by Bacula.\n"
@@ -10152,17 +10168,17 @@
 " in your Device resource.\n"
 msgstr ""
 
-#: src/stored/btape.c:1368
+#: src/stored/btape.c:1369
 #, c-format
 msgid "Read record failed! ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1379
+#: src/stored/btape.c:1380
 #, c-format
 msgid "Block %d re-read correctly.\n"
 msgstr ""
 
-#: src/stored/btape.c:1400
+#: src/stored/btape.c:1401
 msgid ""
 "\n"
 "\n"
@@ -10176,58 +10192,58 @@
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1424
+#: src/stored/btape.c:1425
 msgid "Now moving to end of medium.\n"
 msgstr ""
 
-#: src/stored/btape.c:1426 src/stored/btape.c:1655
+#: src/stored/btape.c:1427 src/stored/btape.c:1656
 #, c-format
 msgid "We should be in file 3. I am at file %d. %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1427 src/stored/btape.c:1445 src/stored/btape.c:1644
-#: src/stored/btape.c:1656 src/stored/btape.c:1669 src/stored/btape.c:1686
+#: src/stored/btape.c:1428 src/stored/btape.c:1446 src/stored/btape.c:1645
+#: src/stored/btape.c:1657 src/stored/btape.c:1670 src/stored/btape.c:1687
 msgid "This is correct!"
 msgstr ""
 
-#: src/stored/btape.c:1427 src/stored/btape.c:1445 src/stored/btape.c:1644
-#: src/stored/btape.c:1656 src/stored/btape.c:1669 src/stored/btape.c:1686
+#: src/stored/btape.c:1428 src/stored/btape.c:1446 src/stored/btape.c:1645
+#: src/stored/btape.c:1657 src/stored/btape.c:1670 src/stored/btape.c:1687
 msgid "This is NOT correct!!!!"
 msgstr ""
 
-#: src/stored/btape.c:1433
+#: src/stored/btape.c:1434
 msgid ""
 "\n"
 "Now the important part, I am going to attempt to append to the tape.\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1440
+#: src/stored/btape.c:1441
 msgid ""
 "Done appending, there should be no I/O errors\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1441
+#: src/stored/btape.c:1442
 msgid "Doing Bacula scan of blocks:\n"
 msgstr ""
 
-#: src/stored/btape.c:1443
+#: src/stored/btape.c:1444
 msgid "End scanning the tape.\n"
 msgstr ""
 
-#: src/stored/btape.c:1444 src/stored/btape.c:1668
+#: src/stored/btape.c:1445 src/stored/btape.c:1669
 #, c-format
 msgid "We should be in file 4. I am at file %d. %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1469
+#: src/stored/btape.c:1470
 msgid ""
 "\n"
 "Autochanger enabled, but no name or no command device specified.\n"
 msgstr ""
 
-#: src/stored/btape.c:1473
+#: src/stored/btape.c:1474
 msgid ""
 "\n"
 "Ah, I see you have an autochanger configured.\n"
@@ -10235,13 +10251,13 @@
 " that I can write on in Slot 1.\n"
 msgstr ""
 
-#: src/stored/btape.c:1476
+#: src/stored/btape.c:1477
 msgid ""
 "\n"
 "Do you wish to continue with the Autochanger test? (y/n): "
 msgstr ""
 
-#: src/stored/btape.c:1483
+#: src/stored/btape.c:1484
 msgid ""
 "\n"
 "\n"
@@ -10249,74 +10265,74 @@
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1492
+#: src/stored/btape.c:1493
 msgid "3301 Issuing autochanger \"loaded\" command.\n"
 msgstr ""
 
-#: src/stored/btape.c:1501
+#: src/stored/btape.c:1502
 #, c-format
 msgid "3991 Bad autochanger command: %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1502
+#: src/stored/btape.c:1503
 #, c-format
 msgid "3991 result=\"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1506
+#: src/stored/btape.c:1507
 #, c-format
 msgid "Slot %d loaded. I am going to unload it.\n"
 msgstr ""
 
-#: src/stored/btape.c:1508
+#: src/stored/btape.c:1509
 msgid "Nothing loaded in the drive. OK.\n"
 msgstr ""
 
-#: src/stored/btape.c:1515
+#: src/stored/btape.c:1516
 #, c-format
 msgid "3302 Issuing autochanger \"unload %d %d\" command.\n"
 msgstr ""
 
-#: src/stored/btape.c:1520
+#: src/stored/btape.c:1521
 #, c-format
 msgid "unload status=%s %d\n"
 msgstr ""
 
-#: src/stored/btape.c:1520
+#: src/stored/btape.c:1521
 msgid "Bad"
 msgstr ""
 
-#: src/stored/btape.c:1523
+#: src/stored/btape.c:1524
 #, c-format
 msgid "3992 Bad autochanger command: %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1524
+#: src/stored/btape.c:1525
 #, c-format
 msgid "3992 result=\"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1534
+#: src/stored/btape.c:1535
 #, c-format
 msgid "3303 Issuing autochanger \"load %d %d\" command.\n"
 msgstr ""
 
-#: src/stored/btape.c:1542
+#: src/stored/btape.c:1543
 #, c-format
 msgid "3303 Autochanger \"load %d %d\" status is OK.\n"
 msgstr ""
 
-#: src/stored/btape.c:1546
+#: src/stored/btape.c:1547
 #, c-format
 msgid "3993 Bad autochanger command: %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1547
+#: src/stored/btape.c:1548
 #, c-format
 msgid "3993 result=\"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1562
+#: src/stored/btape.c:1563
 msgid ""
 "\n"
 "The test failed, probably because you need to put\n"
@@ -10324,12 +10340,12 @@
 "Adding a 30 second sleep and trying again ...\n"
 msgstr ""
 
-#: src/stored/btape.c:1575
+#: src/stored/btape.c:1576
 #, c-format
 msgid "Wrote EOF to %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1579
+#: src/stored/btape.c:1580
 #, c-format
 msgid ""
 "\n"
@@ -10341,18 +10357,18 @@
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1584
+#: src/stored/btape.c:1585
 msgid ""
 "\n"
 "The test autochanger worked!!\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1595
+#: src/stored/btape.c:1596
 msgid "You must correct this error or the Autochanger will not work.\n"
 msgstr ""
 
-#: src/stored/btape.c:1613
+#: src/stored/btape.c:1614
 msgid ""
 "\n"
 "\n"
@@ -10364,30 +10380,30 @@
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1638
+#: src/stored/btape.c:1639
 msgid "Now forward spacing 1 file.\n"
 msgstr ""
 
-#: src/stored/btape.c:1640 src/stored/btape.c:1652 src/stored/btape.c:1665
-#: src/stored/btape.c:1683 src/stored/btape.c:1859
+#: src/stored/btape.c:1641 src/stored/btape.c:1653 src/stored/btape.c:1666
+#: src/stored/btape.c:1684 src/stored/btape.c:1860
 #, c-format
 msgid "Bad status from fsr. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1643
+#: src/stored/btape.c:1644
 #, c-format
 msgid "We should be in file 1. I am at file %d. %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1650
+#: src/stored/btape.c:1651
 msgid "Now forward spacing 2 files.\n"
 msgstr ""
 
-#: src/stored/btape.c:1663
+#: src/stored/btape.c:1664
 msgid "Now forward spacing 4 files.\n"
 msgstr ""
 
-#: src/stored/btape.c:1675
+#: src/stored/btape.c:1676
 msgid ""
 "The test worked this time. Please add:\n"
 "\n"
@@ -10396,35 +10412,35 @@
 "to your Device resource for this drive.\n"
 msgstr ""
 
-#: src/stored/btape.c:1681
+#: src/stored/btape.c:1682
 msgid "Now forward spacing 1 more file.\n"
 msgstr ""
 
-#: src/stored/btape.c:1685
+#: src/stored/btape.c:1686
 #, c-format
 msgid "We should be in file 5. I am at file %d. %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1690
+#: src/stored/btape.c:1691
 msgid ""
 "\n"
 "=== End Forward space files test ===\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1694
+#: src/stored/btape.c:1695
 msgid ""
 "\n"
 "The forward space file test failed.\n"
 msgstr ""
 
-#: src/stored/btape.c:1696
+#: src/stored/btape.c:1697
 msgid ""
 "You have Fast Forward Space File enabled.\n"
 "I am turning it off then retrying the test.\n"
 msgstr ""
 
-#: src/stored/btape.c:1702
+#: src/stored/btape.c:1703
 msgid ""
 "You must correct this error or Bacula will not work.\n"
 "Some systems, e.g. OpenBSD, require you to set\n"
@@ -10432,7 +10448,7 @@
 "in your device resource. Use with caution.\n"
 msgstr ""
 
-#: src/stored/btape.c:1736
+#: src/stored/btape.c:1737
 msgid ""
 "\n"
 "Append test failed. Attempting again.\n"
@@ -10442,7 +10458,7 @@
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1744
+#: src/stored/btape.c:1745
 msgid ""
 "\n"
 "\n"
@@ -10454,7 +10470,7 @@
 "to your Device resource in the Storage conf file.\n"
 msgstr ""
 
-#: src/stored/btape.c:1751
+#: src/stored/btape.c:1752
 msgid ""
 "\n"
 "\n"
@@ -10464,7 +10480,7 @@
 "\n"
 "Ceci n'a apparemment *PAS* corrigé le problème.\n"
 
-#: src/stored/btape.c:1756
+#: src/stored/btape.c:1757
 msgid ""
 "\n"
 "\n"
@@ -10472,7 +10488,7 @@
 "Setting \"BSF at EOM = yes\" and retrying append test.\n"
 msgstr ""
 
-#: src/stored/btape.c:1761
+#: src/stored/btape.c:1762
 msgid ""
 "\n"
 "\n"
@@ -10485,7 +10501,7 @@
 "to your Device resource in the Storage conf file.\n"
 msgstr ""
 
-#: src/stored/btape.c:1772
+#: src/stored/btape.c:1773
 msgid ""
 "\n"
 "Append test failed.\n"
@@ -10512,7 +10528,7 @@
 "in your device resource. Use with caution.\n"
 msgstr ""
 
-#: src/stored/btape.c:1794
+#: src/stored/btape.c:1795
 msgid ""
 "\n"
 "The above Bacula scan should have output identical to what follows.\n"
@@ -10536,111 +10552,111 @@
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1837
+#: src/stored/btape.c:1838
 #, c-format
 msgid "Bad status from fsf. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1841
+#: src/stored/btape.c:1842
 msgid "Forward spaced 1 file.\n"
 msgstr ""
 
-#: src/stored/btape.c:1844
+#: src/stored/btape.c:1845
 #, c-format
 msgid "Forward spaced %d files.\n"
 msgstr ""
 
-#: src/stored/btape.c:1863
+#: src/stored/btape.c:1864
 msgid "Forward spaced 1 record.\n"
 msgstr ""
 
-#: src/stored/btape.c:1866
+#: src/stored/btape.c:1867
 #, c-format
 msgid "Forward spaced %d records.\n"
 msgstr ""
 
-#: src/stored/btape.c:1911
+#: src/stored/btape.c:1912
 #, c-format
 msgid "Wrote one record of %d bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:1913
+#: src/stored/btape.c:1914
 msgid "Wrote block to device.\n"
 msgstr ""
 
-#: src/stored/btape.c:1927
+#: src/stored/btape.c:1928
 msgid "Enter length to read: "
 msgstr ""
 
-#: src/stored/btape.c:1932
+#: src/stored/btape.c:1933
 msgid "Bad length entered, using default of 1024 bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:1941
+#: src/stored/btape.c:1942
 #, c-format
 msgid "Read of %d bytes gives stat=%d. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1964 src/stored/btape.c:2013
+#: src/stored/btape.c:1965 src/stored/btape.c:2014
 #, c-format
 msgid "End of tape\n"
 msgstr ""
 
-#: src/stored/btape.c:1969
+#: src/stored/btape.c:1970
 #, c-format
 msgid "Starting scan at file %u\n"
 msgstr ""
 
-#: src/stored/btape.c:1976
+#: src/stored/btape.c:1977
 #, c-format
 msgid "Bad status from read %d. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1979 src/stored/btape.c:1993 src/stored/btape.c:2057
-#: src/stored/btape.c:2069 src/stored/btape.c:2082 src/stored/btape.c:2098
+#: src/stored/btape.c:1980 src/stored/btape.c:1994 src/stored/btape.c:2058
+#: src/stored/btape.c:2070 src/stored/btape.c:2083 src/stored/btape.c:2099
 #, c-format
 msgid "1 block of %d bytes in file %d\n"
 msgstr ""
 
-#: src/stored/btape.c:1982 src/stored/btape.c:1996 src/stored/btape.c:2060
-#: src/stored/btape.c:2072 src/stored/btape.c:2085 src/stored/btape.c:2101
+#: src/stored/btape.c:1983 src/stored/btape.c:1997 src/stored/btape.c:2061
+#: src/stored/btape.c:2073 src/stored/btape.c:2086 src/stored/btape.c:2102
 #, c-format
 msgid "%d blocks of %d bytes in file %d\n"
 msgstr ""
 
-#: src/stored/btape.c:2004 src/stored/btape.c:2076
+#: src/stored/btape.c:2005 src/stored/btape.c:2077
 #, c-format
 msgid "End of File mark.\n"
 msgstr ""
 
-#: src/stored/btape.c:2025 src/stored/btape.c:2129
+#: src/stored/btape.c:2026 src/stored/btape.c:2130
 #, c-format
 msgid "Total files=%d, blocks=%d, bytes = %s\n"
 msgstr ""
 
-#: src/stored/btape.c:2089
+#: src/stored/btape.c:2090
 #, c-format
 msgid "Short block read.\n"
 msgstr ""
 
-#: src/stored/btape.c:2092
+#: src/stored/btape.c:2093
 #, c-format
 msgid "Error reading block. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:2116
+#: src/stored/btape.c:2117
 #, c-format
 msgid ""
 "Block=%u file,blk=%u,%u blen=%u First rec FI=%s SessId=%u SessTim=%u Strm=%s "
 "rlen=%d\n"
 msgstr ""
 
-#: src/stored/btape.c:2138
+#: src/stored/btape.c:2139
 #, c-format
 msgid "Device status: %u. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:2170
+#: src/stored/btape.c:2171
 #, c-format
 msgid ""
 "\n"
@@ -10666,81 +10682,81 @@
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:2188
+#: src/stored/btape.c:2189
 msgid ""
 "Do you want to run the simplified test (s) with one tape\n"
 "or the complete multiple tape (m) test: (s/m) "
 msgstr ""
-"Voulez vous lancer le test simplifié (s) utilisant une seule bande\n"
-"ou bien le test multi-bande complet (m) : (s/m) "
+"Voulez vous lancer le test simplifié (s) utilisant une seule bande\n"
+"ou bien le test multi-bande complet (m) : (s/m) "
 
-#: src/stored/btape.c:2191
+#: src/stored/btape.c:2192
 msgid "Simple test (single tape) selected.\n"
-msgstr "Sélection du test simplifié (utilisant une seule bande).\n"
+msgstr "Sélection du test simplifié (utilisant une seule bande).\n"
 
-#: src/stored/btape.c:2194
+#: src/stored/btape.c:2195
 msgid "Multiple tape test selected.\n"
-msgstr "Sélection du test multiple.\n"
+msgstr "Sélection du test multiple.\n"
 
-#: src/stored/btape.c:2236
+#: src/stored/btape.c:2237
 msgid "Wrote Start of Session label.\n"
-msgstr "Écriture du label de début de session.\n"
+msgstr "Écriture du label de début de session.\n"
 
-#: src/stored/btape.c:2255
+#: src/stored/btape.c:2256
 #, c-format
 msgid "%s Begin writing Bacula records to tape ...\n"
 msgstr ""
 
-#: src/stored/btape.c:2257
+#: src/stored/btape.c:2258
 #, c-format
 msgid "%s Begin writing Bacula records to first tape ...\n"
 msgstr ""
 
-#: src/stored/btape.c:2283
+#: src/stored/btape.c:2284
 msgid "Flush block failed.\n"
 msgstr ""
 
-#: src/stored/btape.c:2297
+#: src/stored/btape.c:2298
 #, c-format
 msgid "Wrote block=%u, file,blk=%u,%u VolBytes=%s rate=%sB/s\n"
 msgstr ""
 
-#: src/stored/btape.c:2308
+#: src/stored/btape.c:2309
 #, c-format
 msgid "%s Flush block, write EOF\n"
-msgstr "Flush de %s blocs, écriture de EOF\n"
+msgstr "Flush de %s blocs, écriture de EOF\n"
 
-#: src/stored/btape.c:2317
+#: src/stored/btape.c:2318
 msgid "Wrote 1000 blocks on second tape. Done.\n"
 msgstr ""
 
-#: src/stored/btape.c:2322
+#: src/stored/btape.c:2323
 msgid "Not OK\n"
 msgstr ""
 
-#: src/stored/btape.c:2346
+#: src/stored/btape.c:2347
 msgid "Job canceled.\n"
 msgstr ""
 
-#: src/stored/btape.c:2357
+#: src/stored/btape.c:2358
 msgid "Set ok=false after write_block_to_device.\n"
 msgstr ""
 
-#: src/stored/btape.c:2361
+#: src/stored/btape.c:2362
 msgid "Wrote End of Session label.\n"
-msgstr "Écriture du label de fin de session.\n"
+msgstr "Écriture du label de fin de session.\n"
 
-#: src/stored/btape.c:2385
+#: src/stored/btape.c:2386
 #, c-format
 msgid "Wrote state file last_block_num1=%d last_block_num2=%d\n"
-msgstr "Écriture du fichier d'état last_block_num1=%d last_block_num2=%d\n"
+msgstr "Écriture du fichier d'état last_block_num1=%d last_block_num2=%d\n"
 
-#: src/stored/btape.c:2389
+#: src/stored/btape.c:2390
 #, c-format
 msgid "Could not create state file: %s ERR=%s\n"
-msgstr "Impossible de créer le fichier d'état : %s ERR=%s\n"
+msgstr "Impossible de créer le fichier d'état : %s ERR=%s\n"
 
-#: src/stored/btape.c:2400
+#: src/stored/btape.c:2401
 #, c-format
 msgid ""
 "\n"
@@ -10748,7 +10764,7 @@
 "%s Done filling tape at %d:%d. Now beginning re-read of tape ...\n"
 msgstr ""
 
-#: src/stored/btape.c:2403
+#: src/stored/btape.c:2404
 #, c-format
 msgid ""
 "\n"
@@ -10756,23 +10772,23 @@
 "%s Done filling tapes at %d:%d. Now beginning re-read of first tape ...\n"
 msgstr ""
 
-#: src/stored/btape.c:2409
+#: src/stored/btape.c:2410
 msgid "do_unfill failed.\n"
 msgstr ""
 
-#: src/stored/btape.c:2414
+#: src/stored/btape.c:2415
 #, c-format
 msgid "%s: Error during test.\n"
 msgstr ""
 
-#: src/stored/btape.c:2449
+#: src/stored/btape.c:2450
 msgid ""
 "\n"
 "The state file level has changed. You must redo\n"
 "the fill command.\n"
 msgstr ""
 
-#: src/stored/btape.c:2456
+#: src/stored/btape.c:2457
 #, c-format
 msgid ""
 "\n"
@@ -10780,98 +10796,98 @@
 "You must redo the fill command.\n"
 msgstr ""
 "\n"
-"Impossible de trouver le fichier d'état : %s ERR=%s\n"
-"Vous devez relancer la commande « fill ».\n"
+"Impossible de trouver le fichier d'état : %s ERR=%s\n"
+"Vous devez relancer la commande « fill ».\n"
 
-#: src/stored/btape.c:2522
+#: src/stored/btape.c:2523
 msgid "Mount first tape. Press enter when ready: "
-msgstr "Chargez la première bande et appuyez sur « Entrée » : "
+msgstr "Chargez la première bande et appuyez sur « Entrée » : "
 
-#: src/stored/btape.c:2538
+#: src/stored/btape.c:2539
 msgid "Rewinding.\n"
 msgstr "Rembobinage.\n"
 
-#: src/stored/btape.c:2543
+#: src/stored/btape.c:2544
 #, c-format
 msgid "Reading the first 10000 records from %u:%u.\n"
 msgstr "Lecture des 10000 premiers enregistrements depuis %u:%u.\n"
 
-#: src/stored/btape.c:2547 src/stored/btape.c:2615
+#: src/stored/btape.c:2548 src/stored/btape.c:2616
 #, c-format
 msgid "Reposition from %u:%u to %u:%u\n"
-msgstr "Re-positionnement de %u:%u à %u:%u\n"
+msgstr "Re-positionnement de %u:%u à %u:%u\n"
 
-#: src/stored/btape.c:2550 src/stored/btape.c:2602 src/stored/btape.c:2618
+#: src/stored/btape.c:2551 src/stored/btape.c:2603 src/stored/btape.c:2619
 #, c-format
 msgid "Reposition error. ERR=%s\n"
 msgstr "Erreur pendant le re-positionnement. ERR=%s\n"
 
-#: src/stored/btape.c:2553
+#: src/stored/btape.c:2554
 #, c-format
 msgid "Reading block %u.\n"
 msgstr "Lecture du bloc %u.\n"
 
-#: src/stored/btape.c:2555 src/stored/btape.c:2607 src/stored/btape.c:2623
+#: src/stored/btape.c:2556 src/stored/btape.c:2608 src/stored/btape.c:2624
 #, c-format
 msgid "Error reading block: ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:2560
+#: src/stored/btape.c:2561
 msgid ""
 "\n"
 "The last block on the tape matches. Test succeeded.\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:2563
+#: src/stored/btape.c:2564
 msgid ""
 "\n"
 "The last block of the first tape matches.\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:2587
+#: src/stored/btape.c:2588
 msgid "Mount second tape. Press enter when ready: "
-msgstr "Chargez une deuxième bande et appuyez sur « Entrée » : "
+msgstr "Chargez une deuxième bande et appuyez sur « Entrée » : "
 
-#: src/stored/btape.c:2600
+#: src/stored/btape.c:2601
 #, c-format
 msgid "Reposition from %u:%u to 0:1\n"
-msgstr "Re-positionnement de %u:%u à 0:1\n"
+msgstr "Re-positionnement de %u:%u à 0:1\n"
 
-#: src/stored/btape.c:2605 src/stored/btape.c:2621
+#: src/stored/btape.c:2606 src/stored/btape.c:2622
 #, c-format
 msgid "Reading block %d.\n"
 msgstr "Lecture du bloc %d.\n"
 
-#: src/stored/btape.c:2611
+#: src/stored/btape.c:2612
 msgid ""
 "\n"
 "The first block on the second tape matches.\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:2627
+#: src/stored/btape.c:2628
 msgid ""
 "\n"
 "The last block on the second tape matches. Test succeeded.\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:2644
+#: src/stored/btape.c:2645
 #, c-format
 msgid "10000 records read now at %d:%d\n"
-msgstr "10000 enregistrements lus maintenant à %d:%d\n"
+msgstr "10000 enregistrements lus maintenant à %d:%d\n"
 
-#: src/stored/btape.c:2667 src/stored/btape.c:2678 src/stored/btape.c:2723
+#: src/stored/btape.c:2671 src/stored/btape.c:2682 src/stored/btape.c:2727
 msgid "Last block written"
-msgstr "Dernier bloc écrit"
+msgstr "Dernier bloc écrit"
 
-#: src/stored/btape.c:2669 src/stored/btape.c:2679
+#: src/stored/btape.c:2673 src/stored/btape.c:2683
 msgid "Block read back"
 msgstr ""
 
-#: src/stored/btape.c:2670
+#: src/stored/btape.c:2674
 #, c-format
 msgid ""
 "\n"
@@ -10879,7 +10895,7 @@
 "The blocks differ at byte %u\n"
 msgstr ""
 
-#: src/stored/btape.c:2671
+#: src/stored/btape.c:2675
 msgid ""
 "\n"
 "\n"
@@ -10889,173 +10905,172 @@
 "to write multi-tape Volumes.!!!!\n"
 msgstr ""
 
-#: src/stored/btape.c:2707
+#: src/stored/btape.c:2711
 #, c-format
 msgid "Last block at: %u:%u this_dev_block_num=%d\n"
 msgstr ""
 
-#: src/stored/btape.c:2721
+#: src/stored/btape.c:2725
 #, c-format
 msgid "Block not written: FileIndex=%u blk_block=%u Size=%u\n"
 msgstr ""
 
-#: src/stored/btape.c:2725
+#: src/stored/btape.c:2729
 msgid "Block not written"
-msgstr "Bloc non écrit"
+msgstr "Bloc non écrit"
 
-#: src/stored/btape.c:2740
+#: src/stored/btape.c:2744
 #, c-format
 msgid "End of tape %d:%d. Volume Bytes=%s. Write rate = %sB/s\n"
 msgstr ""
 
-#: src/stored/btape.c:2791
+#: src/stored/btape.c:2795
 msgid "Test writing blocks of 64512 bytes to tape.\n"
 msgstr ""
 
-#: src/stored/btape.c:2793
+#: src/stored/btape.c:2797
 msgid "How many blocks do you want to write? (1000): "
 msgstr ""
 
-#: src/stored/btape.c:2810
+#: src/stored/btape.c:2814
 #, c-format
 msgid "Begin writing %d Bacula blocks to tape ...\n"
 msgstr ""
 
-#: src/stored/btape.c:2853
+#: src/stored/btape.c:2857
 #, c-format
 msgid "Begin writing raw blocks of %u bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:2884
+#: src/stored/btape.c:2888
 msgid "test autochanger"
 msgstr ""
 
-#: src/stored/btape.c:2885
+#: src/stored/btape.c:2889
 msgid "backspace file"
 msgstr ""
 
-#: src/stored/btape.c:2886
+#: src/stored/btape.c:2890
 msgid "backspace record"
 msgstr ""
 
-#: src/stored/btape.c:2887
+#: src/stored/btape.c:2891
 msgid "list device capabilities"
 msgstr ""
 
-#: src/stored/btape.c:2888
+#: src/stored/btape.c:2892
 msgid "clear tape errors"
 msgstr ""
 
-#: src/stored/btape.c:2889
+#: src/stored/btape.c:2893
 msgid "go to end of Bacula data for append"
 msgstr ""
 
-#: src/stored/btape.c:2890
+#: src/stored/btape.c:2894
 msgid "go to the physical end of medium"
 msgstr ""
 
-#: src/stored/btape.c:2891
+#: src/stored/btape.c:2895
 msgid "fill tape, write onto second volume"
 msgstr ""
 
-#: src/stored/btape.c:2892
+#: src/stored/btape.c:2896
 msgid "read filled tape"
 msgstr ""
 
-#: src/stored/btape.c:2893
+#: src/stored/btape.c:2897
 msgid "forward space a file"
 msgstr ""
 
-#: src/stored/btape.c:2894
+#: src/stored/btape.c:2898
 msgid "forward space a record"
 msgstr ""
 
-#: src/stored/btape.c:2895
+#: src/stored/btape.c:2899
 msgid "print this command"
 msgstr "affiche cette commande"
 
-#: src/stored/btape.c:2896
+#: src/stored/btape.c:2900
 msgid "write a Bacula label to the tape"
 msgstr ""
 
-#: src/stored/btape.c:2897
+#: src/stored/btape.c:2901
 msgid "load a tape"
 msgstr ""
 
-#: src/stored/btape.c:2898
+#: src/stored/btape.c:2902
 msgid "quit btape"
 msgstr ""
 
-#: src/stored/btape.c:2899
+#: src/stored/btape.c:2903
 msgid "use write() to fill tape"
 msgstr ""
 
-#: src/stored/btape.c:2900
+#: src/stored/btape.c:2904
 msgid "read and print the Bacula tape label"
 msgstr ""
 
-#: src/stored/btape.c:2901
+#: src/stored/btape.c:2905
 msgid "test record handling functions"
 msgstr ""
 
-#: src/stored/btape.c:2902
+#: src/stored/btape.c:2906
 msgid "rewind the tape"
 msgstr "rembobine la bande"
 
-#: src/stored/btape.c:2903
+#: src/stored/btape.c:2907
 msgid "read() tape block by block to EOT and report"
 msgstr ""
 
-#: src/stored/btape.c:2904
+#: src/stored/btape.c:2908
 msgid "Bacula read block by block to EOT and report"
-msgstr ""
-"Bacula lit bloc par bloc jusqu'à la fin de la bande (EOT) et résume"
+msgstr "Bacula lit bloc par bloc jusqu'à la fin de la bande (EOT) et résume"
 
-#: src/stored/btape.c:2905
+#: src/stored/btape.c:2909
 msgid ""
 "[file_size=n(GB)|nb_file=3|skip_zero|skip_random|skip_raw|skip_block] report "
 "drive speed"
 msgstr ""
 
-#: src/stored/btape.c:2906
+#: src/stored/btape.c:2910
 msgid "print tape status"
 msgstr ""
 
-#: src/stored/btape.c:2907
+#: src/stored/btape.c:2911
 msgid "General test Bacula tape functions"
-msgstr "test général des fonctions Bacula sur un lecteur de bande"
+msgstr "test général des fonctions Bacula sur un lecteur de bande"
 
-#: src/stored/btape.c:2908
+#: src/stored/btape.c:2912
 msgid "write an EOF on the tape"
-msgstr "écrit un EOF sur la bande"
+msgstr "écrit un EOF sur la bande"
 
-#: src/stored/btape.c:2909
+#: src/stored/btape.c:2913
 msgid "write a single Bacula block"
-msgstr "écrit un seul bloc bacula"
+msgstr "écrit un seul bloc bacula"
 
-#: src/stored/btape.c:2910
+#: src/stored/btape.c:2914
 msgid "read a single record"
 msgstr "lit un seul enregistrement"
 
-#: src/stored/btape.c:2911
+#: src/stored/btape.c:2915
 msgid "read a single Bacula block"
 msgstr "lit un seul bloc bacula"
 
-#: src/stored/btape.c:2912
+#: src/stored/btape.c:2916
 msgid "quick fill command"
 msgstr ""
 
-#: src/stored/btape.c:2933
+#: src/stored/btape.c:2937
 #, c-format
 msgid "\"%s\" is an invalid command\n"
-msgstr "« %s » est une commande invalide.\n"
+msgstr "\"%s\" est une commande invalide.\n"
 
-#: src/stored/btape.c:2942
+#: src/stored/btape.c:2946
 #, c-format
 msgid "Interactive commands:\n"
 msgstr ""
 
-#: src/stored/btape.c:2953
+#: src/stored/btape.c:2957
 #, c-format
 msgid ""
 "\n"
@@ -11073,89 +11088,89 @@
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:3041
+#: src/stored/btape.c:3045
 #, c-format
 msgid "Mount second Volume on device %s and press return when ready: "
 msgstr ""
 
-#: src/stored/btape.c:3069
+#: src/stored/btape.c:3073
 #, c-format
 msgid "Mount blank Volume on device %s and press return when ready: "
 msgstr ""
 
-#: src/stored/btape.c:3089
+#: src/stored/btape.c:3093
 #, c-format
 msgid "End of Volume \"%s\" %d records.\n"
 msgstr ""
 
-#: src/stored/btape.c:3103
+#: src/stored/btape.c:3107
 #, c-format
 msgid "Read block=%u, VolBytes=%s rate=%sB/s\n"
 msgstr ""
 
-#: src/stored/authenticate.c:63
+#: src/stored/authenticate.c:61
 #, c-format
 msgid "I only authenticate Directors, not %d\n"
 msgstr ""
 
-#: src/stored/authenticate.c:69 src/filed/authenticate.c:74
+#: src/stored/authenticate.c:67 src/filed/authenticate.c:76
 #, c-format
 msgid "Bad Hello command from Director at %s. Len=%d.\n"
 msgstr ""
 
-#: src/stored/authenticate.c:80 src/filed/authenticate.c:86
+#: src/stored/authenticate.c:78 src/filed/authenticate.c:88
 #, c-format
 msgid "Bad Hello command from Director at %s: %s\n"
 msgstr ""
 
-#: src/stored/authenticate.c:93
+#: src/stored/authenticate.c:92
 #, c-format
 msgid ""
 "Connection from unknown Director %s at %s rejected.\n"
 "Please see "
 msgstr ""
 
-#: src/stored/authenticate.c:130
+#: src/stored/authenticate.c:129
 msgid ""
 "Incorrect password given by Director.\n"
 "Please see "
 msgstr ""
 
-#: src/stored/authenticate.c:138 src/stored/authenticate.c:249
-#: src/filed/authenticate.c:149 src/filed/authenticate.c:268
+#: src/stored/authenticate.c:137 src/stored/authenticate.c:248
+#: src/filed/authenticate.c:151 src/filed/authenticate.c:270
 msgid ""
 "Authorization problem: Remote server did not advertize required TLS "
 "support.\n"
 msgstr ""
 
-#: src/stored/authenticate.c:156
+#: src/stored/authenticate.c:155
 #, c-format
 msgid "TLS negotiation failed with DIR at \"%s:%d\"\n"
 msgstr ""
 
-#: src/stored/authenticate.c:192
+#: src/stored/authenticate.c:191
 #, c-format
 msgid "Unable to authenticate Director at %s.\n"
 msgstr ""
 
-#: src/stored/authenticate.c:240 src/stored/authenticate.c:280
+#: src/stored/authenticate.c:239 src/stored/authenticate.c:279
 #, c-format
 msgid ""
 "Incorrect authorization key from File daemon at %s rejected.\n"
 "Please see "
 msgstr ""
 
-#: src/stored/authenticate.c:267
+#: src/stored/authenticate.c:266
 #, c-format
 msgid "TLS negotiation failed with FD at \"%s:%d\"\n"
 msgstr ""
 
-#: src/stored/wait.c:134
+#: src/stored/wait.c:133
 #, c-format
 msgid "pthread timedwait error. ERR=%s\n"
 msgstr ""
 
-#: src/stored/wait.c:233
+#: src/stored/wait.c:239
 #, c-format
 msgid "JobId=%s, Job %s waiting to reserve a device.\n"
 msgstr ""
@@ -11221,7 +11236,7 @@
 #: src/stored/block.c:506
 #, c-format
 msgid "Unable to write EOF. ERR=%s\n"
-msgstr "Impossible d'écrire le marqueur EOF. ERR=%s\n"
+msgstr "Impossible d'écrire le marqueur EOF. ERR=%s\n"
 
 #: src/stored/block.c:532 src/stored/block.c:557
 msgid "Write block header zeroed.\n"
@@ -11230,15 +11245,15 @@
 #: src/stored/block.c:576
 #, c-format
 msgid "Write error at %u:%u on device %s. ERR=%s.\n"
-msgstr "Erreur d'écriture à %u:%u sur le device %s. ERR=%s\n"
+msgstr "Erreur d'écriture à %u:%u sur le device %s. ERR=%s\n"
 
 #: src/stored/block.c:583
 #, c-format
 msgid ""
 "End of Volume \"%s\" at %u:%u on device %s. Write of %u bytes got %d.\n"
 msgstr ""
-"Fin du volume « %s » à %u:%u sur le device %s. Ecriture de %u octets, "
-"eu %d.\n"
+"Fin du volume \"%s\" à %u:%u sur le device %s. Ecriture de %u octets, eu "
+"%d.\n"
 
 #: src/stored/block.c:664 src/stored/block.c:670
 #, c-format
@@ -11271,7 +11286,7 @@
 
 #: src/stored/block.c:713
 msgid "Re-read of last block succeeded.\n"
-msgstr "La re-lecture du dernier bloc écrit a réussi.\n"
+msgstr "La re-lecture du dernier bloc écrit a réussi.\n"
 
 #: src/stored/block.c:745
 #, c-format
@@ -11313,70 +11328,70 @@
 "free_space_errno=%d).\n"
 msgstr ""
 
-#: src/stored/block.c:963
+#: src/stored/block.c:962
 #, c-format
 msgid "Block buffer size looping problem on device %s\n"
 msgstr ""
 
-#: src/stored/block.c:975
+#: src/stored/block.c:974
 #, c-format
 msgid "Unable to open device part=%d %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/block.c:1001
+#: src/stored/block.c:1000
 #, c-format
 msgid "Read error on fd=%d at file:blk %u:%u on device %s. ERR=%s.\n"
 msgstr ""
 
-#: src/stored/block.c:1014
+#: src/stored/block.c:1013
 #, c-format
 msgid "Read zero bytes at %u:%u on device %s.\n"
 msgstr ""
 
-#: src/stored/block.c:1038
+#: src/stored/block.c:1037
 #, c-format
 msgid ""
 "Volume data error at %u:%u! Very short block of %d bytes on device %s "
 "discarded.\n"
 msgstr ""
 
-#: src/stored/block.c:1063
+#: src/stored/block.c:1062
 #, c-format
 msgid "Block length %u is greater than buffer %u. Attempting recovery.\n"
 msgstr ""
 
-#: src/stored/block.c:1082
+#: src/stored/block.c:1081
 #, c-format
 msgid "Setting block buffer size to %u bytes.\n"
 msgstr ""
 
-#: src/stored/block.c:1097
+#: src/stored/block.c:1096
 #, c-format
 msgid ""
 "Volume data error at %u:%u! Short block of %d bytes on device %s discarded.\n"
 msgstr ""
 
-#: src/lib/plugins.c:111
+#: src/lib/plugins.c:112
 #, c-format
 msgid "Failed to open Plugin directory %s: ERR=%s\n"
 msgstr ""
 
-#: src/lib/plugins.c:128
+#: src/lib/plugins.c:129
 #, c-format
 msgid "Failed to find any plugins in %s\n"
 msgstr ""
 
-#: src/lib/plugins.c:161
+#: src/lib/plugins.c:163
 #, c-format
-msgid "Plugin load %s failed: ERR=%s\n"
+msgid "dlopen plugin %s failed: ERR=%s\n"
 msgstr ""
 
-#: src/lib/plugins.c:172
+#: src/lib/plugins.c:174
 #, c-format
 msgid "Lookup of loadPlugin in plugin %s failed: ERR=%s\n"
 msgstr ""
 
-#: src/lib/plugins.c:181
+#: src/lib/plugins.c:183
 #, c-format
 msgid "Lookup of unloadPlugin in plugin %s failed: ERR=%s\n"
 msgstr ""
@@ -11454,11 +11469,11 @@
 #: src/lib/attr.c:81
 #, c-format
 msgid "Error scanning attributes: %s\n"
-msgstr "Erreur pendant la lecture des attributs : %s\n"
+msgstr "Erreur pendant la lecture des attributs : %s\n"
 
 #: src/lib/smartall.c:145 src/lib/smartall.c:256 src/lib/smartall.c:271
 msgid "Out of memory\n"
-msgstr "Plus de mémoire\n"
+msgstr "Plus de mémoire\n"
 
 #: src/lib/smartall.c:150
 msgid "Too much memory used."
@@ -11539,7 +11554,7 @@
 #: src/lib/smartall.c:487
 #, c-format
 msgid "  Buffer address: %p\n"
-msgstr "  Adresse du buffer : %p\n"
+msgstr "  Adresse du buffer : %p\n"
 
 #: src/lib/smartall.c:494
 #, c-format
@@ -11615,13 +11630,13 @@
 "Could not connect to %s on %s:%d. ERR=%s\n"
 "Retrying ...\n"
 msgstr ""
-"Impossible de se connecter à %s sur %s:%d. ERR=%s\n"
-"Réessaie...\n"
+"Impossible de se connecter à %s sur %s:%d. ERR=%s\n"
+"Réessaie...\n"
 
 #: src/lib/bsock.c:132
 #, c-format
 msgid "Unable to connect to %s on %s:%d. ERR=%s\n"
-msgstr "Impossible de se connecter à %s sur %s:%d. ERR=%s\n"
+msgstr "Impossible de se connecter à %s sur %s:%d. ERR=%s\n"
 
 #: src/lib/bsock.c:202
 #, c-format
@@ -11641,7 +11656,7 @@
 #: src/lib/bsock.c:244 src/lib/bsock.c:280 src/lib/bnet_server.c:201
 #, c-format
 msgid "Cannot set SO_KEEPALIVE on socket: %s\n"
-msgstr "Impossible de positionner SO_KEEPALIVE sur la socket : %s\n"
+msgstr "Impossible de positionner SO_KEEPALIVE sur la socket : %s\n"
 
 #: src/lib/bsock.c:252
 #, c-format
@@ -11691,7 +11706,7 @@
 #: src/lib/bsock.c:532
 #, c-format
 msgid "Read error from %s:%s:%d: ERR=%s\n"
-msgstr "Erreur de lecture de %s:%s:%d : ERR=%s\n"
+msgstr "Erreur de lecture de %s:%s:%d : ERR=%s\n"
 
 #: src/lib/bsock.c:623
 msgid "fread attr spool I/O error.\n"
@@ -11704,7 +11719,7 @@
 #: src/lib/bsock.c:702 src/lib/bsock.c:726
 #, c-format
 msgid "sockopt error: %s\n"
-msgstr "erreur sockopt : %s\n"
+msgstr "erreur sockopt : %s\n"
 
 #: src/lib/bsock.c:708 src/lib/bsock.c:732
 #, c-format
@@ -11715,7 +11730,7 @@
 #, c-format
 msgid "Network buffer size %d not multiple of tape block size.\n"
 msgstr ""
-"La taille du buffer réseau %d n'est pas un multiple de la taille de bloc du "
+"La taille du buffer réseau %d n'est pas un multiple de la taille de bloc du "
 "lecteur.\n"
 
 #: src/lib/bsock.c:757 src/lib/bsock.c:791
@@ -11723,48 +11738,48 @@
 msgid "fcntl F_GETFL error. ERR=%s\n"
 msgstr ""
 
-#: src/lib/bsock.c:763 src/lib/bsock.c:797 src/lib/bsock.c:822
+#: src/lib/bsock.c:763 src/lib/bsock.c:797 src/lib/bsock.c:829
 #, c-format
 msgid "fcntl F_SETFL error. ERR=%s\n"
 msgstr ""
 
-#: src/lib/bsock.c:995 src/qt-console/bcomm/dircomm_auth.cpp:112
+#: src/lib/bsock.c:1002 src/qt-console/bcomm/dircomm_auth.cpp:112
 #, c-format
 msgid "Director authorization problem at \"%s:%d\"\n"
 msgstr ""
 
-#: src/lib/bsock.c:1002 src/qt-console/bcomm/dircomm_auth.cpp:119
+#: src/lib/bsock.c:1009 src/qt-console/bcomm/dircomm_auth.cpp:119
 #, c-format
 msgid ""
 "Authorization problem: Remote server at \"%s:%d\" did not advertise required "
 "TLS support.\n"
 msgstr ""
 
-#: src/lib/bsock.c:1010 src/qt-console/bcomm/dircomm_auth.cpp:127
+#: src/lib/bsock.c:1017 src/qt-console/bcomm/dircomm_auth.cpp:127
 #, c-format
 msgid ""
 "Authorization problem with Director at \"%s:%d\": Remote server requires "
 "TLS.\n"
 msgstr ""
 
-#: src/lib/bsock.c:1022 src/qt-console/bcomm/dircomm_auth.cpp:138
+#: src/lib/bsock.c:1029 src/qt-console/bcomm/dircomm_auth.cpp:138
 #, c-format
 msgid "TLS negotiation failed with Director at \"%s:%d\"\n"
 msgstr ""
 
-#: src/lib/bsock.c:1032 src/qt-console/bcomm/dircomm_auth.cpp:150
+#: src/lib/bsock.c:1039 src/qt-console/bcomm/dircomm_auth.cpp:150
 #, c-format
 msgid ""
 "Bad response to Hello command: ERR=%s\n"
 "The Director at \"%s:%d\" is probably not running.\n"
 msgstr ""
 
-#: src/lib/bsock.c:1041 src/qt-console/bcomm/dircomm_auth.cpp:159
+#: src/lib/bsock.c:1048 src/qt-console/bcomm/dircomm_auth.cpp:159
 #, c-format
 msgid "Director at \"%s:%d\" rejected Hello command\n"
 msgstr ""
 
-#: src/lib/bsock.c:1051 src/qt-console/bcomm/dircomm_auth.cpp:171
+#: src/lib/bsock.c:1058 src/qt-console/bcomm/dircomm_auth.cpp:171
 #, c-format
 msgid ""
 "Authorization problem with Director at \"%s:%d\"\n"
@@ -11800,7 +11815,7 @@
 #: src/lib/message.c:544
 #, c-format
 msgid "close error: ERR=%s\n"
-msgstr "erreur de fermeture : ERR=%s\n"
+msgstr "erreur de fermeture : ERR=%s\n"
 
 #: src/lib/message.c:555
 #, c-format
@@ -11814,16 +11829,16 @@
 "CMD=%s\n"
 "ERR=%s\n"
 msgstr ""
-"La commande mail s'est terminée en erreur.\n"
+"La commande mail s'est terminée en erreur.\n"
 "CMD=%s\n"
 "ERR=%s\n"
 
 #: src/lib/message.c:662
 #, c-format
 msgid "fopen %s failed: ERR=%s\n"
-msgstr "fopen %s en erreur : ERR=%s\n"
+msgstr "fopen %s en erreur : ERR=%s\n"
 
-#: src/lib/message.c:813
+#: src/lib/message.c:835
 #, c-format
 msgid ""
 "Msg delivery error: Operator mail program terminated in error.\n"
@@ -11831,77 +11846,77 @@
 "ERR=%s\n"
 msgstr ""
 
-#: src/lib/message.c:834
+#: src/lib/message.c:856
 #, c-format
 msgid "Msg delivery error: fopen %s failed: ERR=%s\n"
 msgstr ""
 
-#: src/lib/message.c:1153
+#: src/lib/message.c:1175
 #, c-format
 msgid "%s: ABORTING due to ERROR in %s:%d\n"
 msgstr ""
 
-#: src/lib/message.c:1157
+#: src/lib/message.c:1179
 #, c-format
 msgid "%s: ERROR TERMINATION at %s:%d\n"
 msgstr ""
 
-#: src/lib/message.c:1162
+#: src/lib/message.c:1184
 #, c-format
 msgid "%s: Fatal Error because: "
-msgstr "%s : Erreur Fatale car : "
+msgstr "%s : Erreur Fatale car : "
 
-#: src/lib/message.c:1164
+#: src/lib/message.c:1186
 #, c-format
 msgid "%s: Fatal Error at %s:%d because:\n"
-msgstr "%s : Erreur Fatale à %s:%d car :\n"
+msgstr "%s : Erreur Fatale à %s:%d car :\n"
 
-#: src/lib/message.c:1168
+#: src/lib/message.c:1190
 #, c-format
 msgid "%s: ERROR: "
-msgstr "%s : ERREUR : "
+msgstr "%s : ERREUR : "
 
-#: src/lib/message.c:1170
+#: src/lib/message.c:1192
 #, c-format
 msgid "%s: ERROR in %s:%d "
-msgstr "%s : ERREUR dans %s:%d "
+msgstr "%s : ERREUR dans %s:%d "
 
-#: src/lib/message.c:1173
+#: src/lib/message.c:1195
 #, c-format
 msgid "%s: Warning: "
-msgstr "%s : Attention : "
+msgstr "%s : Attention : "
 
-#: src/lib/message.c:1176
+#: src/lib/message.c:1198
 #, c-format
 msgid "%s: Security violation: "
 msgstr ""
 
-#: src/lib/message.c:1264
+#: src/lib/message.c:1286
 #, c-format
 msgid "%s ABORTING due to ERROR\n"
 msgstr ""
 
-#: src/lib/message.c:1267
+#: src/lib/message.c:1289
 #, c-format
 msgid "%s ERROR TERMINATION\n"
 msgstr ""
 
-#: src/lib/message.c:1270
+#: src/lib/message.c:1292
 #, c-format
 msgid "%s JobId %u: Fatal error: "
 msgstr "%s JobId %u: Erreur fatale : "
 
-#: src/lib/message.c:1279
+#: src/lib/message.c:1301
 #, c-format
 msgid "%s JobId %u: Error: "
 msgstr "%s JobId %u : Erreur : "
 
-#: src/lib/message.c:1285
+#: src/lib/message.c:1307
 #, c-format
 msgid "%s JobId %u: Warning: "
 msgstr "%s JobId %u : Attention : "
 
-#: src/lib/message.c:1291
+#: src/lib/message.c:1313
 #, c-format
 msgid "%s JobId %u: Security violation: "
 msgstr ""
@@ -11914,47 +11929,46 @@
 #: src/lib/bnet_server.c:121
 #, c-format
 msgid "Cannot set SO_REUSEADDR on socket: %s\n"
-msgstr ""
-"Impossible de positionner l'option SO_REUSEADDR sur la socket : %s\n"
+msgstr "Impossible de positionner l'option SO_REUSEADDR sur la socket : %s\n"
 
 #: src/lib/bnet_server.c:130
 #, c-format
 msgid "Cannot bind port %d: ERR=%s: Retrying ...\n"
-msgstr "Impossible de s'attacher au port %d : ERR=%s : Réessaie...\n"
+msgstr "Impossible de s'attacher au port %d : ERR=%s : Réessaie...\n"
 
 #: src/lib/bnet_server.c:135
 #, c-format
 msgid "Cannot bind port %d: ERR=%s.\n"
-msgstr "Impossible de s'attacher au port %d : ERR=%s.\n"
+msgstr "Impossible de s'attacher au port %d : ERR=%s.\n"
 
 #: src/lib/bnet_server.c:146
 #, c-format
 msgid "Could not init client queue: ERR=%s\n"
-msgstr "Impossible d'initialiser la queue cliente : ERR=%s\n"
+msgstr "Impossible d'initialiser la queue cliente : ERR=%s\n"
 
 #: src/lib/bnet_server.c:165
 #, c-format
 msgid "Error in select: %s\n"
-msgstr "Erreur sur le select : %s\n"
+msgstr "Erreur sur le select : %s\n"
 
 #: src/lib/bnet_server.c:186
 #, c-format
 msgid "Connection from %s:%d refused by hosts.access\n"
-msgstr "Connexion depuis %s:%d refusée par hosts.access\n"
+msgstr "Connexion depuis %s:%d refusée par hosts.access\n"
 
 #: src/lib/bnet_server.c:212
 msgid "Could not create client BSOCK.\n"
-msgstr "Impossible de créer la structure BSOCK cliente.\n"
+msgstr "Impossible de créer la structure BSOCK cliente.\n"
 
 #: src/lib/bnet_server.c:219
 #, c-format
 msgid "Could not add job to client queue: ERR=%s\n"
-msgstr "Impossible d'ajouter le job à la queue cliente : ERR=%s\n"
+msgstr "Impossible d'ajouter le job à la queue cliente : ERR=%s\n"
 
 #: src/lib/bnet_server.c:236
 #, c-format
 msgid "Could not destroy client queue: ERR=%s\n"
-msgstr "Impossible de détruire la queue cliente : ERR=%s\n"
+msgstr "Impossible de détruire la queue cliente : ERR=%s\n"
 
 #: src/lib/bpipe.c:361 src/lib/bpipe.c:444
 msgid "Program killed by Bacula (timeout)\n"
@@ -11981,7 +11995,7 @@
 msgstr ""
 
 #: src/lib/lockmgr.c:275 src/lib/lockmgr.c:611 src/lib/lockmgr.c:639
-#: src/lib/jcr.c:319
+#: src/lib/jcr.c:321
 #, c-format
 msgid "pthread key create failed: ERR=%s\n"
 msgstr "erreur sur pthread_key_create. ERR=%s\n"
@@ -11997,11 +12011,11 @@
 
 #: src/lib/crypto.c:449
 msgid "Unable to read certificate from file"
-msgstr "Impossible de lire le certificat à partir du fichier"
+msgstr "Impossible de lire le certificat à partir du fichier"
 
 #: src/lib/crypto.c:455
 msgid "Unable to extract public key from certificate"
-msgstr "Impossible d'extraire la clef publique à partir du certificat"
+msgstr "Impossible d'extraire la clef publique à partir du certificat"
 
 #: src/lib/crypto.c:462
 msgid ""
@@ -12013,20 +12027,20 @@
 #: src/lib/crypto.c:469
 #, c-format
 msgid "Unsupported key type provided: %d\n"
-msgstr "Type de clef fourni non supporté : %d\n"
+msgstr "Type de clef fourni non supporté : %d\n"
 
 #: src/lib/crypto.c:506 src/lib/crypto.c:554
 msgid "Unable to open private key file"
-msgstr "Impossible d'ouvrir le fichier de clef privée"
+msgstr "Impossible d'ouvrir le fichier de clef privée"
 
 #: src/lib/crypto.c:536 src/lib/crypto.c:570
 msgid "Unable to read private key from file"
-msgstr "Impossible de lire la clef privée à partir du fichier"
+msgstr "Impossible de lire la clef privée à partir du fichier"
 
 #: src/lib/crypto.c:629
 #, c-format
 msgid "Unsupported digest type: %d\n"
-msgstr "Le digest spécifié n'est pas supporté : %d\n"
+msgstr "Le digest spécifié n'est pas supporté : %d\n"
 
 #: src/lib/crypto.c:643
 msgid "OpenSSL digest initialization failed"
@@ -12038,7 +12052,7 @@
 
 #: src/lib/crypto.c:675
 msgid "OpenSSL digest finalize failed"
-msgstr "Initialisation du digest OpenSSL à échoué"
+msgstr "Initialisation du digest OpenSSL à échoué"
 
 #: src/lib/crypto.c:773
 msgid "OpenSSL digest_new failed"
@@ -12058,32 +12072,32 @@
 
 #: src/lib/crypto.c:888
 msgid "Signature creation failed"
-msgstr "La création de la signature a échouée"
+msgstr "La création de la signature a échouée"
 
 #: src/lib/crypto.c:966
 msgid "Signature decoding failed"
-msgstr "Le décodage de la signature a échoué"
+msgstr "Le décodage de la signature a échoué"
 
 #: src/lib/crypto.c:1043
 msgid "Unsupported cipher type specified\n"
-msgstr "Le cipher spécifié est non supporté\n"
+msgstr "Le cipher spécifié est non supporté\n"
 
 #: src/lib/crypto.c:1192
 msgid "CryptoData decoding failed"
-msgstr "Le décodage du CryptoData a échoué"
+msgstr "Le décodage du CryptoData a échoué"
 
 #: src/lib/crypto.c:1236
 msgid "Failure decrypting the session key"
-msgstr "Impossible de décrypter la clef de session"
+msgstr "Impossible de décrypter la clef de session"
 
 #: src/lib/crypto.c:1287
 #, c-format
 msgid "Unsupported contentEncryptionAlgorithm: %d\n"
-msgstr "contentEncryptionAlgorithm non supporté : %d\n"
+msgstr "contentEncryptionAlgorithm non supporté : %d\n"
 
 #: src/lib/crypto.c:1297 src/lib/crypto.c:1303
 msgid "OpenSSL cipher context initialization failed"
-msgstr "Initialisation du contexte clef/IV du cipher OpenSSL à échoué"
+msgstr "Initialisation du contexte clef/IV du cipher OpenSSL à échoué"
 
 #: src/lib/crypto.c:1310
 msgid "Encryption session provided an invalid symmetric key"
@@ -12100,7 +12114,7 @@
 #: src/lib/crypto.c:1392
 #, c-format
 msgid "Unable to init OpenSSL threading: ERR=%s\n"
-msgstr "Impossible d'initialiser le thread OpenSSL : ERR=%s\n"
+msgstr "Impossible d'initialiser le thread OpenSSL : ERR=%s\n"
 
 #: src/lib/crypto.c:1405
 msgid "Failed to seed OpenSSL PRNG\n"
@@ -12156,14 +12170,14 @@
 msgid "Unknown error"
 msgstr "Erreur inconnue."
 
-#: src/lib/cram-md5.c:110 src/lib/cram-md5.c:138
+#: src/lib/cram-md5.c:109 src/lib/cram-md5.c:137
 msgid "1999 Authorization failed.\n"
 msgstr ""
 
 #: src/lib/priv.c:68
 #, c-format
 msgid "Could not find userid=%s: ERR=%s\n"
-msgstr "Impossible de trouver le userid %s : ERR=%s\n"
+msgstr "Impossible de trouver le userid %s : ERR=%s\n"
 
 #: src/lib/priv.c:74
 #, c-format
@@ -12173,7 +12187,7 @@
 #: src/lib/priv.c:87
 #, c-format
 msgid "Could not find group=%s: ERR=%s\n"
-msgstr "Impossible de trouver le groupe=%s : ERR=%s\n"
+msgstr "Impossible de trouver le groupe=%s : ERR=%s\n"
 
 #: src/lib/priv.c:95
 #, c-format
@@ -12223,7 +12237,7 @@
 #: src/lib/openssl.c:143 src/lib/openssl.c:214
 #, c-format
 msgid "Unable to destroy mutex: ERR=%s\n"
-msgstr "Impossible de détruire le mutex : ERR=%s\n"
+msgstr "Impossible de détruire le mutex : ERR=%s\n"
 
 #: src/lib/util.c:183
 msgid "Running"
@@ -12231,7 +12245,7 @@
 
 #: src/lib/util.c:186
 msgid "Blocked"
-msgstr "Bloqué"
+msgstr "Bloqué"
 
 #: src/lib/util.c:192
 msgid "Error: incomplete job"
@@ -12243,11 +12257,11 @@
 
 #: src/lib/util.c:205 src/lib/util.c:337
 msgid "Canceled"
-msgstr "Annulé"
+msgstr "Annulé"
 
 #: src/lib/util.c:208
 msgid "Verify differences"
-msgstr "Vérification des différences"
+msgstr "Vérification des différences"
 
 #: src/lib/util.c:211
 msgid "Waiting on FD"
@@ -12300,11 +12314,11 @@
 
 #: src/lib/util.c:276
 msgid "Completed with warnings"
-msgstr "Terminé avec des avertissements"
+msgstr "Terminé avec des avertissements"
 
 #: src/lib/util.c:279
 msgid "Terminated with errors"
-msgstr "Terminé avec des erreurs"
+msgstr "Terminé avec des erreurs"
 
 #: src/lib/util.c:282
 msgid "Fatal error"
@@ -12312,11 +12326,11 @@
 
 #: src/lib/util.c:285
 msgid "Created, not yet running"
-msgstr "Créé, mais non démarré"
+msgstr "Créé, mais non démarré"
 
 #: src/lib/util.c:288
 msgid "Canceled by user"
-msgstr "Annulé par l'utilisateur"
+msgstr "Annulé par l'utilisateur"
 
 #: src/lib/util.c:291
 msgid "Verify found differences"
@@ -12336,7 +12350,7 @@
 
 #: src/lib/util.c:303
 msgid "Batch inserting file records"
-msgstr "Mise à jour du catalogue"
+msgstr "Mise à jour du catalogue"
 
 #: src/lib/util.c:334
 msgid "Fatal Error"
@@ -12350,7 +12364,7 @@
 msgid "Unknown term code"
 msgstr ""
 
-#: src/lib/util.c:359 src/lib/jcr.c:230
+#: src/lib/util.c:359 src/lib/jcr.c:232
 msgid "Backup"
 msgstr "Backup"
 
@@ -12360,7 +12374,7 @@
 
 #: src/lib/util.c:365
 msgid "Verify"
-msgstr "Vérifier"
+msgstr "Vérifier"
 
 #: src/lib/util.c:368 src/wx-console/wxbrestorepanel.cpp:404
 #: src/wx-console/wxbrestorepanel.cpp:2000
@@ -12407,7 +12421,7 @@
 msgid "Truncate"
 msgstr ""
 
-#: src/lib/util.c:409 src/filed/restore.c:928
+#: src/lib/util.c:409 src/filed/restore.c:1158
 msgid "None"
 msgstr ""
 
@@ -12457,7 +12471,7 @@
 
 #: src/lib/util.c:753 src/lib/util.c:763 src/lib/util.c:771 src/lib/util.c:778
 #: src/lib/util.c:785 src/lib/util.c:799 src/lib/util.c:809 src/lib/util.c:822
-#: src/lib/util.c:833 src/filed/restore.c:944
+#: src/lib/util.c:833 src/filed/restore.c:1174
 msgid "*none*"
 msgstr ""
 
@@ -12514,20 +12528,19 @@
 
 #: src/lib/tls.c:172
 msgid "Error loading private key"
-msgstr "Erreur dans le chargement de la clef privée"
+msgstr "Erreur dans le chargement de la clef privée"
 
 #: src/lib/tls.c:180
 msgid "Unable to open DH parameters file"
-msgstr "Impossible d'ouvrir le fichier de paramètre DH"
+msgstr "Impossible d'ouvrir le fichier de paramètre DH"
 
 #: src/lib/tls.c:186
 msgid "Unable to load DH parameters from specified file"
-msgstr ""
-"Impossible de charger les paramètres DH à partir du fichier spécifié"
+msgstr "Impossible de charger les paramètres DH à partir du fichier spécifié"
 
 #: src/lib/tls.c:190
 msgid "Failed to set TLS Diffie-Hellman parameters"
-msgstr "Impossible de positionner les paramètres TLS Diffie-Hellman"
+msgstr "Impossible de positionner les paramètres TLS Diffie-Hellman"
 
 #: src/lib/tls.c:200
 msgid "Error setting cipher list, no valid ciphers available\n"
@@ -12548,162 +12561,162 @@
 
 #: src/lib/tls.c:427
 msgid "Error creating new SSL object"
-msgstr "Erreur pendant la création d'un nouvel objet SSL"
+msgstr "Erreur pendant la création d'un nouvel objet SSL"
 
-#: src/lib/tls.c:490 src/lib/tls.c:513
+#: src/lib/tls.c:491 src/lib/tls.c:514
 msgid "Connect failure"
 msgstr "Erreur de connexion"
 
-#: src/lib/tls.c:592 src/lib/tls.c:596
+#: src/lib/tls.c:594 src/lib/tls.c:598
 msgid "TLS shutdown failure."
 msgstr ""
 
-#: src/lib/tls.c:650 src/lib/tls.c:676
+#: src/lib/tls.c:653 src/lib/tls.c:679
 msgid "TLS read/write failure."
 msgstr ""
 
-#: src/lib/jcr.c:232
+#: src/lib/jcr.c:234
 msgid "Verifying"
-msgstr "Vérification"
+msgstr "Vérification"
 
-#: src/lib/jcr.c:234
+#: src/lib/jcr.c:236
 msgid "Restoring"
 msgstr "Restauration"
 
-#: src/lib/jcr.c:236
+#: src/lib/jcr.c:238
 msgid "Archiving"
 msgstr "Archivage"
 
-#: src/lib/jcr.c:238
+#: src/lib/jcr.c:240
 msgid "Copying"
 msgstr "Copier"
 
-#: src/lib/jcr.c:240
+#: src/lib/jcr.c:242
 msgid "Migration"
 msgstr "Migrer"
 
-#: src/lib/jcr.c:242
+#: src/lib/jcr.c:244
 msgid "Scanning"
 msgstr ""
 
-#: src/lib/jcr.c:244
+#: src/lib/jcr.c:246
 msgid "Unknown operation"
-msgstr "Opération inconnue"
+msgstr "Opération inconnue"
 
-#: src/lib/jcr.c:253
+#: src/lib/jcr.c:255
 msgid "backup"
 msgstr "backup"
 
-#: src/lib/jcr.c:255
+#: src/lib/jcr.c:257
 msgid "verified"
-msgstr "vérifié"
+msgstr "vérifié"
 
-#: src/lib/jcr.c:255
+#: src/lib/jcr.c:257
 msgid "verify"
-msgstr "Vérifier"
+msgstr "Vérifier"
 
-#: src/lib/jcr.c:257
+#: src/lib/jcr.c:259
 msgid "restored"
-msgstr "Restauré"
+msgstr "Restauré"
 
-#: src/lib/jcr.c:257
+#: src/lib/jcr.c:259
 msgid "restore"
 msgstr "restaurer"
 
-#: src/lib/jcr.c:259
+#: src/lib/jcr.c:261
 msgid "archived"
-msgstr "archivé"
+msgstr "archivé"
 
-#: src/lib/jcr.c:259
+#: src/lib/jcr.c:261
 msgid "archive"
 msgstr "archiver"
 
-#: src/lib/jcr.c:261
+#: src/lib/jcr.c:263
 msgid "copied"
-msgstr "copié"
+msgstr "copié"
 
-#: src/lib/jcr.c:261
+#: src/lib/jcr.c:263
 msgid "copy"
 msgstr "copier"
 
-#: src/lib/jcr.c:263
+#: src/lib/jcr.c:265
 msgid "migrated"
 msgstr "migrer"
 
-#: src/lib/jcr.c:263
+#: src/lib/jcr.c:265
 msgid "migrate"
-msgstr "migré"
+msgstr "migré"
 
-#: src/lib/jcr.c:265
+#: src/lib/jcr.c:267
 msgid "scanned"
-msgstr "scanné"
+msgstr "scanné"
 
-#: src/lib/jcr.c:265
+#: src/lib/jcr.c:267
 msgid "scan"
 msgstr "scanner"
 
-#: src/lib/jcr.c:267
+#: src/lib/jcr.c:269
 msgid "unknown action"
 msgstr "action inconnue"
 
-#: src/lib/jcr.c:341
+#: src/lib/jcr.c:343
 #, c-format
 msgid "pthread_once failed. ERR=%s\n"
 msgstr "erreur sur pthread_once. ERR=%s\n"
 
-#: src/lib/jcr.c:348
+#: src/lib/jcr.c:350
 #, c-format
 msgid "Could not init msg_queue mutex. ERR=%s\n"
 msgstr ""
 
-#: src/lib/jcr.c:401
+#: src/lib/jcr.c:403
 msgid "NULL jcr.\n"
 msgstr "NULL jcr.\n"
 
-#: src/lib/jcr.c:507
+#: src/lib/jcr.c:509
 #, c-format
 msgid "JCR use_count=%d JobId=%d\n"
 msgstr "JCR use_count=%d JobId=%d\n"
 
-#: src/lib/jcr.c:617
+#: src/lib/jcr.c:619
 #, c-format
 msgid "pthread_setspecific failed: ERR=%s\n"
 msgstr ""
 
-#: src/lib/jcr.c:1067
+#: src/lib/jcr.c:1097
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Storage "
 "daemon.\n"
 msgstr ""
-"Le watchdog a envoyé un signal après %d secs au thread bloqué en écoute "
-"du SD.\n"
+"Le watchdog a envoyé un signal après %d secs au thread bloqué en écoute du "
+"SD.\n"
 
-#: src/lib/jcr.c:1079
+#: src/lib/jcr.c:1109
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading File daemon.\n"
 msgstr ""
-"Le watchdog a envoyé un signal après %d secs au thread bloqué en écoute "
-"du FD.\n"
+"Le watchdog a envoyé un signal après %d secs au thread bloqué en écoute du "
+"FD.\n"
 
-#: src/lib/jcr.c:1091
+#: src/lib/jcr.c:1121
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Director.\n"
 msgstr ""
-"Le watchdog a envoyé un signal après %d secs au thread bloqué en écoute "
-"du Director.\n"
+"Le watchdog a envoyé un signal après %d secs au thread bloqué en écoute du "
+"Director.\n"
 
 #: src/lib/res.c:65
 #, c-format
 msgid "rwl_writelock failure at %s:%d:  ERR=%s\n"
-msgstr "rwl_writelock en échec sur %s:%d : ERR=%s\n"
+msgstr "rwl_writelock en échec sur %s:%d : ERR=%s\n"
 
 #: src/lib/res.c:75
 #, c-format
 msgid "rwl_writeunlock failure at %s:%d:. ERR=%s\n"
-msgstr "rwl_writeunlock en échec sur %s:%d :. ERR=%s\n"
+msgstr "rwl_writeunlock en échec sur %s:%d :. ERR=%s\n"
 
 #: src/lib/parse_conf.c:177
 msgid "***UNKNOWN***"
@@ -12742,14 +12755,12 @@
 #: src/lib/parse_conf.c:530
 #, c-format
 msgid "Could not find config Resource \"%s\" referenced on line %d : %s\n"
-msgstr ""
-"Impossible de trouver la ressource « %s » utilisée ligne %d : %s\n"
+msgstr "Impossible de trouver la ressource \"%s\" utilisée ligne %d : %s\n"
 
 #: src/lib/parse_conf.c:593
 #, c-format
 msgid "Missing config Resource \"%s\" referenced on line %d : %s\n"
-msgstr ""
-"Impossible de trouver la ressource « %s » utilisée ligne %d : %s\n"
+msgstr "Impossible de trouver la ressource \"%s\" utilisée ligne %d : %s\n"
 
 #: src/lib/parse_conf.c:665
 #, c-format
@@ -12774,15 +12785,10 @@
 msgid "speed"
 msgstr ""
 
-#: src/lib/parse_conf.c:736 src/lib/parse_conf.c:742
-#, c-format
-msgid "expected a time period, got: %s"
-msgstr ""
-
 #: src/lib/parse_conf.c:803
 #, c-format
 msgid "Expected a Tape Label keyword, got: %s"
-msgstr "Attendait un Label de lecteur, a pas : %s"
+msgstr "Attendait un Label de lecteur, a pas : %s"
 
 #: src/lib/parse_conf.c:886
 #, c-format
@@ -12796,7 +12802,7 @@
 #: src/lib/parse_conf.c:917
 #, c-format
 msgid "Cannot open config file \"%s\": %s\n"
-msgstr "Impossible d'ouvrir le fichier de configuration « %s » : %s\n"
+msgstr "Impossible d'ouvrir le fichier de configuration \"%s\" : %s\n"
 
 #: src/lib/parse_conf.c:934
 msgid ""
@@ -12807,7 +12813,7 @@
 #: src/lib/parse_conf.c:938
 #, c-format
 msgid "Expected a Resource name identifier, got: %s"
-msgstr "Attendait un identifiant de Ressource, a pas : %s"
+msgstr "Attendait un identifiant de Ressource, a pas : %s"
 
 #: src/lib/parse_conf.c:954
 #, c-format
@@ -12833,7 +12839,7 @@
 #: src/lib/parse_conf.c:1011
 #, c-format
 msgid "unexpected token %d %s in resource definition"
-msgstr "mot clés inattendu %d %s dans la définition de la ressource"
+msgstr "mot clés inattendu %d %s dans la définition de la ressource"
 
 #: src/lib/parse_conf.c:1017
 #, c-format
@@ -12854,7 +12860,7 @@
 #: src/lib/mem_pool.c:623
 #, c-format
 msgid "Out of memory requesting %d bytes\n"
-msgstr "Plus de mémoire à l'allocation de %d octets\n"
+msgstr "Plus de mémoire à l'allocation de %d octets\n"
 
 #: src/lib/mem_pool.c:167
 msgid "obuf is NULL\n"
@@ -12876,7 +12882,7 @@
 #: src/lib/berrno.c:81
 #, c-format
 msgid "Child died from signal %d: %s"
-msgstr "Le processus fils est mort par le signal %d : %s"
+msgstr "Le processus fils est mort par le signal %d : %s"
 
 #: src/lib/berrno.c:87
 msgid "Invalid errno. No error message possible."
@@ -12885,15 +12891,15 @@
 #: src/lib/bnet.c:134
 #, c-format
 msgid "Attr spool write error. ERR=%s\n"
-msgstr "Erreur pendant l'écriture des attributs dans le spool. ERR=%s\n"
+msgstr "Erreur pendant l'écriture des attributs dans le spool. ERR=%s\n"
 
 #: src/lib/bnet.c:279 src/lib/bnet.c:320
 msgid "TLS connection initialization failed.\n"
-msgstr "Initialisation de la connexion TLS échouée.\n"
+msgstr "Initialisation de la connexion TLS échouée.\n"
 
 #: src/lib/bnet.c:287
 msgid "TLS Negotiation failed.\n"
-msgstr "Négociation TLS échouée.\n"
+msgstr "Négociation TLS échouée.\n"
 
 #: src/lib/bnet.c:293 src/lib/bnet.c:335
 msgid ""
@@ -12910,15 +12916,15 @@
 
 #: src/lib/bnet.c:359
 msgid "TLS enabled but not configured.\n"
-msgstr "TLS activé mais non configuré.\n"
+msgstr "TLS activé mais non configuré.\n"
 
 #: src/lib/bnet.c:365
 msgid "TLS enable but not configured.\n"
-msgstr "TLS actif mais non configuré.\n"
+msgstr "TLS actif mais non configuré.\n"
 
 #: src/lib/bnet.c:423
 msgid "No problem."
-msgstr "Pas de problème."
+msgstr "Pas de problème."
 
 #: src/lib/bnet.c:426
 msgid "Authoritative answer for host not found."
@@ -12952,13 +12958,13 @@
 #: src/lib/signal.c:151 src/lib/signal.c:153
 #, c-format
 msgid "Bacula interrupted by signal %d: %s\n"
-msgstr "Bacula a reçu le signal %d : %s\n"
+msgstr "Bacula a reçu le signal %d : %s\n"
 
 #: src/lib/signal.c:166
 #, c-format
 msgid "Kaboom! %s, %s got signal %d - %s. Attempting traceback.\n"
 msgstr ""
-"Kaboom ! %s, %s a reçu le signal %d - %s. Tentative de dump des traces.\n"
+"Kaboom ! %s, %s a reçu le signal %d - %s. Tentative de dump des traces.\n"
 
 #: src/lib/signal.c:168
 #, c-format
@@ -12968,7 +12974,7 @@
 #: src/lib/signal.c:202
 #, c-format
 msgid "Fork error: ERR=%s\n"
-msgstr "Fork en erreur : ERR=%s\n"
+msgstr "Fork en erreur : ERR=%s\n"
 
 #: src/lib/signal.c:210
 #, c-format
@@ -12978,7 +12984,7 @@
 #: src/lib/signal.c:214
 #, c-format
 msgid "execv: %s failed: ERR=%s\n"
-msgstr "execv : %s en échec : ERR=%s\n"
+msgstr "execv : %s en échec : ERR=%s\n"
 
 #: src/lib/signal.c:235
 #, c-format
@@ -12988,7 +12994,7 @@
 #: src/lib/signal.c:289
 #, c-format
 msgid "BA_NSIG too small (%d) should be (%d)\n"
-msgstr "BA_NSIG trop petit (%d) devrait être (%d)\n"
+msgstr "BA_NSIG trop petit (%d) devrait être (%d)\n"
 
 #: src/lib/signal.c:295
 msgid "UNKNOWN SIGNAL"
@@ -13052,7 +13058,7 @@
 
 #: src/lib/signal.c:314
 msgid "Broken pipe"
-msgstr "Tube brisé"
+msgstr "Tube brisé"
 
 #: src/lib/signal.c:315
 msgid "Alarm clock"
@@ -13150,47 +13156,47 @@
 msgid "stop_btimer called with NULL btimer_id\n"
 msgstr ""
 
-#: src/lib/bsys.c:218 src/lib/bsys.c:235 src/lib/bsys.c:259 src/lib/bsys.c:272
+#: src/lib/bsys.c:215 src/lib/bsys.c:232 src/lib/bsys.c:256 src/lib/bsys.c:269
 #, c-format
 msgid "Out of memory: ERR=%s\n"
-msgstr "Plus de mémoire : ERR=%s\n"
+msgstr "Plus de mémoire : ERR=%s\n"
 
-#: src/lib/bsys.c:314
+#: src/lib/bsys.c:311
 msgid "Buffer overflow.\n"
 msgstr "Buffer overflow.\n"
 
-#: src/lib/bsys.c:380
+#: src/lib/bsys.c:377
 msgid "Bad errno"
 msgstr "Mauvais errno"
 
-#: src/lib/bsys.c:395
+#: src/lib/bsys.c:392
 #, c-format
 msgid "Memset for %d bytes at %s:%d\n"
 msgstr ""
 
-#: src/lib/bsys.c:425
+#: src/lib/bsys.c:422
 #, c-format
 msgid "Cannot open pid file. %s ERR=%s\n"
 msgstr "Impossible d'ouvrir le fichier contenant le pid. %s ERR=%s\n"
 
-#: src/lib/bsys.c:440
+#: src/lib/bsys.c:437
 #, c-format
 msgid ""
 "%s is already running. pid=%d\n"
 "Check file %s\n"
 msgstr ""
 
-#: src/lib/bsys.c:454
+#: src/lib/bsys.c:451
 #, c-format
 msgid "Could not open pid file. %s ERR=%s\n"
 msgstr "Impossible d'ouvrir le fichier pid. %s ERR=%s\n"
 
-#: src/lib/bsys.c:565
+#: src/lib/bsys.c:562
 #, c-format
 msgid "Could not create state file. %s ERR=%s\n"
-msgstr "Impossible de créer le fichier d'état. %s ERR=%s\n"
+msgstr "Impossible de créer le fichier d'état. %s ERR=%s\n"
 
-#: src/lib/bsys.c:584
+#: src/lib/bsys.c:581
 #, c-format
 msgid "Write final hdr error: ERR=%s\n"
 msgstr ""
@@ -13198,12 +13204,12 @@
 #: src/lib/runscript.c:236
 #, c-format
 msgid "%s: run %s \"%s\"\n"
-msgstr "%s: exécution %s de la commande « %s »\n"
+msgstr "%s: exécution %s de la commande \"%s\"\n"
 
 #: src/lib/runscript.c:245
 #, c-format
 msgid "Runscript: %s could not execute. ERR=%s\n"
-msgstr "Runscript : impossible d'exécuter %s. ERR=%s\n"
+msgstr "Runscript : impossible d'exécuter %s. ERR=%s\n"
 
 #: src/lib/runscript.c:254
 #, c-format
@@ -13214,13 +13220,13 @@
 #, c-format
 msgid "Runscript: %s returned non-zero status=%d. ERR=%s\n"
 msgstr ""
-"Runscript : %s s'est terminé avec un statut différent de 0 statut=%d. "
+"Runscript : %s s'est terminé avec un statut différent de 0 statut=%d. "
 "ERR=%s\n"
 
 #: src/lib/lex.c:91 src/wx-console/console_thread.cpp:212
 #, c-format
 msgid "Problem probably begins at line %d.\n"
-msgstr "Le problème commence sûrement au début de la ligne %d.\n"
+msgstr "Le problème commence sûrement au début de la ligne %d.\n"
 
 #: src/lib/lex.c:96 src/wx-console/console_thread.cpp:217
 #, c-format
@@ -13238,7 +13244,7 @@
 #: src/lib/lex.c:100
 #, c-format
 msgid "Config error: %s\n"
-msgstr "Erreur de config : %s\n"
+msgstr "Erreur de config : %s\n"
 
 #: src/lib/lex.c:129
 msgid "Close of NULL file\n"
@@ -13253,8 +13259,7 @@
 #: src/lib/lex.c:267
 #, c-format
 msgid "Config token too long, file: %s, line %d, begins at line %d\n"
-msgstr ""
-"Config token trop long, fichier : %s, ligne %d, débutant ligne %d\n"
+msgstr "Config token trop long, fichier : %s, ligne %d, débutant ligne %d\n"
 
 #: src/lib/lex.c:291
 msgid "none"
@@ -13304,43 +13309,43 @@
 #: src/lib/lex.c:339 src/lib/lex.c:345 src/lib/lex.c:356 src/lib/lex.c:362
 #, c-format
 msgid "expected a positive integer number, got: %s"
-msgstr "attendait un nombre entier positif, pas : %s"
+msgstr "attendait un nombre entier positif, pas : %s"
 
-#: src/lib/lex.c:472
+#: src/lib/lex.c:478
 msgid ""
 "This config file appears to be in an unsupported Unicode format (UTF-16be). "
 "Please resave as UTF-8\n"
 msgstr ""
 
-#: src/lib/lex.c:611 src/lib/lex.c:639
+#: src/lib/lex.c:617 src/lib/lex.c:645
 #, c-format
 msgid "Cannot open included config file %s: %s\n"
-msgstr "Impossible d'ouvrir le fichier de configuration inclus %s : %s\n"
+msgstr "Impossible d'ouvrir le fichier de configuration inclus %s : %s\n"
 
-#: src/lib/lex.c:698 src/lib/lex.c:755
+#: src/lib/lex.c:704 src/lib/lex.c:761
 #, c-format
 msgid "expected an integer or a range, got %s: %s"
-msgstr "attendait un entier ou bien un intervalle, pas %s : %s"
+msgstr "attendait un entier ou bien un intervalle, pas %s : %s"
 
-#: src/lib/lex.c:712 src/lib/lex.c:720 src/lib/lex.c:731 src/lib/lex.c:739
+#: src/lib/lex.c:718 src/lib/lex.c:726 src/lib/lex.c:737 src/lib/lex.c:745
 #, c-format
 msgid "expected an integer number, got %s: %s"
-msgstr "attendait un nombre entier, pas %s : %s"
+msgstr "attendait un nombre entier, pas %s : %s"
 
-#: src/lib/lex.c:769
+#: src/lib/lex.c:775
 #, c-format
 msgid "expected a name, got %s: %s"
-msgstr "attendait un nom, pas %s : %s"
+msgstr "attendait un nom, pas %s : %s"
 
-#: src/lib/lex.c:773
+#: src/lib/lex.c:779
 #, c-format
 msgid "name %s length %d too long, max is %d\n"
 msgstr "la longueur du nom %s (%d) est trop grande, le max est %d\n"
 
-#: src/lib/lex.c:781
+#: src/lib/lex.c:787
 #, c-format
 msgid "expected a string, got %s: %s"
-msgstr "attendait une chaîne, pas %s : %s"
+msgstr "attendait une chaîne, pas %s : %s"
 
 #: src/lib/var.c:2669
 msgid "everything ok"
@@ -13352,11 +13357,11 @@
 
 #: src/lib/var.c:2671
 msgid "incomplete hexadecimal value"
-msgstr "valeur hexadécimale incomplète"
+msgstr "valeur hexadécimale incomplète"
 
 #: src/lib/var.c:2672
 msgid "invalid hexadecimal value"
-msgstr "valeur hexadécimale invalide"
+msgstr "valeur hexadécimale invalide"
 
 #: src/lib/var.c:2673
 msgid "octal value too large"
@@ -13368,7 +13373,7 @@
 
 #: src/lib/var.c:2675
 msgid "incomplete octal value"
-msgstr "valeur octal incomplète"
+msgstr "valeur octal incomplète"
 
 #: src/lib/var.c:2676
 msgid "incomplete grouped hexadecimal value"
@@ -13384,7 +13389,7 @@
 
 #: src/lib/var.c:2679
 msgid "out of memory"
-msgstr "plus de mémoire"
+msgstr "plus de mémoire"
 
 #: src/lib/var.c:2680
 msgid "incomplete variable specification"
@@ -13392,11 +13397,11 @@
 
 #: src/lib/var.c:2681
 msgid "undefined variable"
-msgstr "variable non définie"
+msgstr "variable non définie"
 
 #: src/lib/var.c:2682
 msgid "input is neither text nor variable"
-msgstr "l'entrée n'est ni du texte ni une variable"
+msgstr "l'entrée n'est ni du texte ni une variable"
 
 #: src/lib/var.c:2683
 msgid "unknown command character in variable"
@@ -13520,7 +13525,7 @@
 
 #: src/lib/var.c:2713
 msgid "undefined operation"
-msgstr "opération indéfinie"
+msgstr "opération indéfinie"
 
 #: src/lib/var.c:2714
 msgid "formatting failure"
@@ -13533,12 +13538,12 @@
 #: src/lib/address_conf.c:62
 #, c-format
 msgid "Only ipv4 and ipv6 are supported (%d)\n"
-msgstr "Seulement l'ipv4 et l'ipv6 sont supportés (%d)\n"
+msgstr "Seulement l'ipv4 et l'ipv6 sont supportés (%d)\n"
 
 #: src/lib/address_conf.c:66
 #, c-format
 msgid "Only ipv4 is supported (%d)\n"
-msgstr "Seulement l'ipv4 est supporté (%d)\n"
+msgstr "Seulement l'ipv4 est supporté (%d)\n"
 
 #: src/lib/address_conf.c:175
 #, c-format
@@ -13553,7 +13558,7 @@
 #: src/lib/address_conf.c:263
 #, c-format
 msgid "Can't add default address (%s)\n"
-msgstr "Impossible d'ajouter l'adresse par défaut (%s)\n"
+msgstr "Impossible d'ajouter l'adresse par défaut (%s)\n"
 
 #: src/lib/address_conf.c:292
 msgid "the old style addresses cannot be mixed with new style"
@@ -13567,12 +13572,12 @@
 #: src/lib/address_conf.c:322
 #, c-format
 msgid "can't resolve hostname(%s) %s"
-msgstr "impossible de résoudre le hostname (%s) %s"
+msgstr "impossible de résoudre le hostname (%s) %s"
 
 #: src/lib/address_conf.c:412 src/lib/address_conf.c:443
 #, c-format
 msgid "Expected a block begin { , got: %s"
-msgstr "Attendait un début de bloc {, pas : %s"
+msgstr "Attendait un début de bloc {, pas : %s"
 
 #: src/lib/address_conf.c:417
 msgid "Empty addr block is not allowed"
@@ -13581,27 +13586,27 @@
 #: src/lib/address_conf.c:421
 #, c-format
 msgid "Expected a string, got: %s"
-msgstr "Attendait une chaîne, pas : %s"
+msgstr "Attendait une chaîne, pas : %s"
 
 #: src/lib/address_conf.c:430
 #, c-format
 msgid "Expected a string [ip|ipv4|ipv6], got: %s"
-msgstr "Attentait la chaîne [ip|ipv4|ipv6], pas : %s"
+msgstr "Attentait la chaîne [ip|ipv4|ipv6], pas : %s"
 
 #: src/lib/address_conf.c:434
 #, c-format
 msgid "Expected a string [ip|ipv4], got: %s"
-msgstr "Attendait la chaîne [ip|ipv4], pas : %s"
+msgstr "Attendait la chaîne [ip|ipv4], pas : %s"
 
 #: src/lib/address_conf.c:439 src/lib/address_conf.c:469
 #, c-format
 msgid "Expected a equal =, got: %s"
-msgstr "Attendait un égal =, pas : %s"
+msgstr "Attendait un égal =, pas : %s"
 
 #: src/lib/address_conf.c:450 src/lib/address_conf.c:465
 #, c-format
 msgid "Expected a identifier [addr|port], got: %s"
-msgstr "Attendait un identifiant [addr|port], pas : %s"
+msgstr "Attendait un identifiant [addr|port], pas : %s"
 
 #: src/lib/address_conf.c:455
 msgid "Only one port per address block"
@@ -13614,12 +13619,12 @@
 #: src/lib/address_conf.c:477
 #, c-format
 msgid "Expected a number or a string, got: %s"
-msgstr "Attendait un nombre ou une chaîne, pas : %s"
+msgstr "Attendait un nombre ou une chaîne, pas : %s"
 
 #: src/lib/address_conf.c:483 src/lib/address_conf.c:516
 #, c-format
 msgid "Expected an IP number or a hostname, got: %s"
-msgstr "Attendait une adresse IP ou un nom de machine, pas : %s"
+msgstr "Attendait une adresse IP ou un nom de machine, pas : %s"
 
 #: src/lib/address_conf.c:489
 msgid "State machine missmatch"
@@ -13628,24 +13633,24 @@
 #: src/lib/address_conf.c:495 src/lib/address_conf.c:507
 #, c-format
 msgid "Expected a end of block }, got: %s"
-msgstr "Attendait une fin de bloc }, pas : %s"
+msgstr "Attendait une fin de bloc }, pas : %s"
 
 #: src/lib/address_conf.c:501
 #, c-format
 msgid "Can't add hostname(%s) and port(%s) to addrlist (%s)"
 msgstr ""
-"Impossible d'ajouter le hostname (%s) et le port (%s) à la liste d'adresse "
+"Impossible d'ajouter le hostname (%s) et le port (%s) à la liste d'adresse "
 "(%s)"
 
 #: src/lib/address_conf.c:521 src/lib/address_conf.c:535
 #, c-format
 msgid "can't add port (%s) to (%s)"
-msgstr "impossible d'ajouter le port (%s) à (%s)"
+msgstr "impossible d'ajouter le port (%s) à (%s)"
 
 #: src/lib/address_conf.c:530
 #, c-format
 msgid "Expected a port number or string, got: %s"
-msgstr "Attendait un numéro de port ou une chaîne, pas : %s"
+msgstr "Attendait un numéro de port ou une chaîne, pas : %s"
 
 #: src/lib/edit.c:478
 msgid "Empty name not allowed.\n"
@@ -13654,7 +13659,7 @@
 #: src/lib/edit.c:488
 #, c-format
 msgid "Illegal character \"%c\" in name.\n"
-msgstr "Caractère illégal « %c » dans le nom.\n"
+msgstr "Caractère illégal « %c » dans le nom.\n"
 
 #: src/lib/edit.c:495
 msgid "Name too long.\n"
@@ -13675,32 +13680,32 @@
 msgid "Cannot reset current directory: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/mkpath.c:53
+#: src/findlib/mkpath.c:137
 #, c-format
 msgid "Cannot create directory %s: ERR=%s\n"
 msgstr "Impossible de créer le dossier %s: ERR=%s\n"
 
-#: src/findlib/mkpath.c:57 src/findlib/mkpath.c:112
+#: src/findlib/mkpath.c:141 src/findlib/mkpath.c:202
 #, c-format
 msgid "%s exists but is not a directory.\n"
 msgstr "%s existe mais n'est pas un dossier.\n"
 
-#: src/findlib/mkpath.c:74
+#: src/findlib/mkpath.c:164
 #, c-format
 msgid "Cannot change owner and/or group of %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/mkpath.c:79
+#: src/findlib/mkpath.c:169
 #, c-format
 msgid "Cannot change permissions of %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/mkpath.c:149
+#: src/findlib/mkpath.c:239
 #, c-format
 msgid "%c: is not a valid drive.\n"
 msgstr ""
 
-#: src/findlib/mkpath.c:195
+#: src/findlib/mkpath.c:283
 msgid "Too many subdirectories. Some permissions not reset.\n"
 msgstr ""
 
@@ -13744,83 +13749,83 @@
 msgid "AdjustTokenPrivileges set "
 msgstr ""
 
-#: src/findlib/create_file.c:130
+#: src/findlib/create_file.c:124
 #, c-format
 msgid "File skipped. Not newer: %s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:137
+#: src/findlib/create_file.c:131
 #, c-format
 msgid "File skipped. Not older: %s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:143
+#: src/findlib/create_file.c:141
 #, c-format
 msgid "File skipped. Already exists: %s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:170
+#: src/findlib/create_file.c:167
 #, c-format
 msgid "File %s already exists and could not be replaced. ERR=%s.\n"
 msgstr ""
 
-#: src/findlib/create_file.c:221 src/findlib/create_file.c:285
-#: src/findlib/create_file.c:381
+#: src/findlib/create_file.c:218 src/findlib/create_file.c:282
+#: src/findlib/create_file.c:378
 #, c-format
 msgid "bpkt already open fid=%d\n"
 msgstr ""
 
-#: src/findlib/create_file.c:229 src/filed/fd_plugins.c:668
+#: src/findlib/create_file.c:226 src/filed/fd_plugins.c:890
 #, c-format
 msgid "Could not create %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:244
+#: src/findlib/create_file.c:241
 #, c-format
 msgid "Cannot make fifo %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:262
+#: src/findlib/create_file.c:259
 #, c-format
 msgid "Cannot make node %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:307
+#: src/findlib/create_file.c:304
 #, c-format
 msgid "Could not symlink %s -> %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:332 src/findlib/create_file.c:345
+#: src/findlib/create_file.c:329 src/findlib/create_file.c:342
 #, c-format
 msgid "Could not restore file flags for file %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:336 src/findlib/create_file.c:353
+#: src/findlib/create_file.c:333 src/findlib/create_file.c:350
 #, c-format
 msgid "Could not hard link %s -> %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:349
+#: src/findlib/create_file.c:346
 #, c-format
 msgid "Could not reset file flags for file %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:404
+#: src/findlib/create_file.c:401
 #, c-format
 msgid "Original file %s have been deleted: type=%d\n"
 msgstr ""
 
-#: src/findlib/create_file.c:416
+#: src/findlib/create_file.c:413
 #, c-format
 msgid "Original file %s not saved: type=%d\n"
 msgstr ""
 
-#: src/findlib/create_file.c:419
+#: src/findlib/create_file.c:416
 #, c-format
 msgid "Unknown file type %d; not restored: %s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:463
+#: src/findlib/create_file.c:460
 #, c-format
 msgid "Zero length filename: %s\n"
 msgstr ""
@@ -14053,12 +14058,12 @@
 msgid "NetBSD Specific Extended attribs"
 msgstr ""
 
-#: src/findlib/find.c:224
+#: src/findlib/find.c:226
 #, c-format
 msgid "Plugin: \"%s\" not found.\n"
 msgstr ""
 
-#: src/findlib/match.c:210 src/tools/testfind.c:651 src/filed/job.c:1415
+#: src/findlib/match.c:210 src/tools/testfind.c:654 src/filed/job.c:1456
 #, c-format
 msgid "Unknown include/exclude option: %c\n"
 msgstr ""
@@ -14116,7 +14121,7 @@
 #: src/cats/sql_create.c:189
 #, c-format
 msgid "pool record %s already exists\n"
-msgstr "Le pool %s existe déjà en base\n"
+msgstr "Le pool %s existe déjà en base\n"
 
 #: src/cats/sql_create.c:221
 #, c-format
@@ -14126,7 +14131,7 @@
 #: src/cats/sql_create.c:254
 #, c-format
 msgid "Device record %s already exists\n"
-msgstr "Le device %s existe déjà en base\n"
+msgstr "Le device %s existe déjà en base\n"
 
 #: src/cats/sql_create.c:271
 #, c-format
@@ -14161,7 +14166,7 @@
 #: src/cats/sql_create.c:424
 #, c-format
 msgid "Volume \"%s\" already exists.\n"
-msgstr "Le volume « %s » existe déjà en base.\n"
+msgstr "Le volume \"%s\" existe déjà en base.\n"
 
 #: src/cats/sql_create.c:470
 #, c-format
@@ -14190,7 +14195,7 @@
 
 #: src/cats/sql_create.c:595 src/cats/sql_get.c:205 src/cats/sql_get.c:258
 #: src/cats/sql_get.c:640 src/cats/sql_get.c:722 src/cats/sql_get.c:1041
-#: src/cats/sql.c:339 src/cats/sql.c:346 src/cats/postgresql.c:158
+#: src/cats/sql.c:340 src/cats/sql.c:347 src/cats/postgresql.c:158
 #, c-format
 msgid "error fetching row: %s\n"
 msgstr ""
@@ -14424,53 +14429,53 @@
 msgid "Media record for Vol=%s not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_find.c:95 src/cats/sql_find.c:124 src/cats/sql_find.c:175
+#: src/cats/sql_find.c:98 src/cats/sql_find.c:127 src/cats/sql_find.c:182
 #, c-format
 msgid ""
 "Query error for start time request: ERR=%s\n"
 "CMD=%s\n"
 msgstr ""
 
-#: src/cats/sql_find.c:101 src/cats/sql_find.c:181
+#: src/cats/sql_find.c:104 src/cats/sql_find.c:188
 msgid "No prior Full backup Job record found.\n"
-msgstr "Pas de précédent backup Full en base.\n"
+msgstr "Pas de précédent backup Full en base.\n"
 
-#: src/cats/sql_find.c:113
+#: src/cats/sql_find.c:116
 #, c-format
 msgid "Unknown level=%d\n"
 msgstr ""
 
-#: src/cats/sql_find.c:130
+#: src/cats/sql_find.c:133
 #, c-format
 msgid ""
 "No Job record found: ERR=%s\n"
 "CMD=%s\n"
 msgstr ""
 
-#: src/cats/sql_find.c:282
+#: src/cats/sql_find.c:291
 #, c-format
 msgid "Unknown Job level=%d\n"
 msgstr "Niveau de job inconnu %d\n"
 
-#: src/cats/sql_find.c:292
+#: src/cats/sql_find.c:301
 #, c-format
 msgid "No Job found for: %s.\n"
-msgstr "Pas de job trouvé pour : %s.\n"
+msgstr "Pas de job trouvé pour : %s.\n"
 
-#: src/cats/sql_find.c:303
+#: src/cats/sql_find.c:312
 #, c-format
 msgid "No Job found for: %s\n"
-msgstr "Pas de job trouvé pour %s\n"
+msgstr "Pas de job trouvé pour %s\n"
 
-#: src/cats/sql_find.c:384
+#: src/cats/sql_find.c:393
 #, c-format
 msgid "Request for Volume item %d greater than max %d or less than 1\n"
 msgstr ""
 
-#: src/cats/sql_find.c:399
+#: src/cats/sql_find.c:408
 #, c-format
 msgid "No Volume record found for item %d.\n"
-msgstr "Pas de volume trouvé en base pour l'objet %d.\n"
+msgstr "Pas de volume trouvé en base pour l'objet %d.\n"
 
 #: src/cats/sqlite.c:159 src/cats/ingres.c:248 src/cats/postgresql.c:203
 #: src/cats/dbi.c:221 src/cats/mysql.c:157
@@ -14558,27 +14563,27 @@
 msgid "Update failed: affected_rows=%s for %s\n"
 msgstr ""
 
-#: src/cats/sql.c:313
+#: src/cats/sql.c:314
 #, c-format
 msgid ""
 "delete %s failed:\n"
 "%s\n"
 msgstr ""
 
-#: src/cats/sql.c:407
+#: src/cats/sql.c:408
 #, c-format
 msgid "Path length is zero. File=%s\n"
 msgstr ""
 
-#: src/cats/sql.c:601
+#: src/cats/sql.c:603
 msgid "No results to list.\n"
 msgstr "Liste vide.\n"
 
-#: src/cats/sql.c:722
+#: src/cats/sql.c:724
 msgid "Could not init database batch connection"
 msgstr ""
 
-#: src/cats/sql.c:728
+#: src/cats/sql.c:730
 #, c-format
 msgid "Could not open database \"%s\": ERR=%s\n"
 msgstr ""
@@ -14630,12 +14635,12 @@
 
 #: src/cats/postgresql.c:1097
 msgid "A user name for PostgreSQL must be supplied.\n"
-msgstr "Un nom d'utilisateur PostgreSQL doit être fourni.\n"
+msgstr "Un nom d'utilisateur PostgreSQL doit être fourni.\n"
 
 #: src/cats/sql_list.c:59
 #, c-format
 msgid "Query failed: %s\n"
-msgstr "Erreur sur la requête : %s\n"
+msgstr "Erreur sur la requête : %s\n"
 
 #: src/cats/sql_list.c:275
 msgid "These JobIds have copies as follows:\n"
@@ -14711,11 +14716,11 @@
 msgstr ""
 "Impossible de se connecter au serveur MySQL.\n"
 "Base=%s Utilisateur=%s\n"
-"Le serveur n'est pas démarré ou bien votre password est invalide.\n"
+"Le serveur n'est pas démarré ou bien votre password est invalide.\n"
 
-#: src/cats/mysql.c:640
+#: src/cats/mysql.c:639
 msgid "A user name for MySQL must be supplied.\n"
-msgstr "Un nom d'utilisateur MySQL doit être fourni.\n"
+msgstr "Un nom d'utilisateur MySQL doit être fourni.\n"
 
 #: src/wx-console/console_conf.c:147 src/console/console_conf.c:140
 #: src/qt-console/bat_conf.cpp:141
@@ -14734,7 +14739,7 @@
 msgid "Director: name=%s address=%s DIRport=%d\n"
 msgstr ""
 
-#: src/wx-console/authenticate.c:142 src/console/authenticate.c:141
+#: src/wx-console/authenticate.c:142 src/console/authenticate.c:138
 msgid "TLS negotiation failed\n"
 msgstr "Éche de la négociation TLS\n"
 
@@ -14742,7 +14747,7 @@
 msgid "Bad response to Hello command: ERR="
 msgstr ""
 
-#: src/wx-console/authenticate.c:167 src/console/authenticate.c:172
+#: src/wx-console/authenticate.c:167 src/console/authenticate.c:169
 msgid ""
 "Director authorization problem.\n"
 "Most likely the passwords do not agree.\n"
@@ -14758,7 +14763,7 @@
 "Version: "
 msgstr ""
 "\n"
-"Version : "
+"Version : "
 
 #: src/console/console.c:178
 msgid "input from file"
@@ -14856,72 +14861,70 @@
 #: src/qt-console/bcomm/dircomm.cpp:129
 #, c-format
 msgid "Failed to initialize TLS context for Console \"%s\".\n"
-msgstr ""
-"Impossible d'initialiser le contexte TLS pour la Console « %s ».\n"
+msgstr "Impossible d'initialiser le contexte TLS pour la Console \"%s\".\n"
 
 #: src/console/console.c:1180 src/wx-console/console_thread.cpp:420
 #: src/qt-console/bcomm/dircomm.cpp:152
 #, c-format
 msgid "Failed to initialize TLS context for Director \"%s\".\n"
-msgstr ""
-"Impossible d'initialiser le contexte TLS pour le Director « %s ».\n"
+msgstr "Impossible d'initialiser le contexte TLS pour le Director \"%s\".\n"
 
 #: src/console/console.c:1210
 msgid "Enter a period to cancel a command.\n"
 msgstr "Tapez un point (.) pour annuler une commande.\n"
 
-#: src/console/console.c:1304 src/qt-console/main.cpp:220
+#: src/console/console.c:1304 src/qt-console/main.cpp:232
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "Director \"%s\" in %s. At least one CA certificate store is required.\n"
 msgstr ""
 
-#: src/console/console.c:1313 src/qt-console/main.cpp:229
+#: src/console/console.c:1313 src/qt-console/main.cpp:241
 #, c-format
 msgid ""
 "No Director resource defined in %s\n"
 "Without that I don't how to speak to the Director :-(\n"
 msgstr ""
-"Pas de director défini pour %s\n"
-"Sans cette définition, il n'est pas possible de se connecter à celui-ci.\n"
+"Pas de director défini pour %s\n"
+"Sans cette définition, il n'est pas possible de se connecter à celui-ci.\n"
 
-#: src/console/console.c:1333 src/qt-console/main.cpp:250
+#: src/console/console.c:1333 src/qt-console/main.cpp:262
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "Console \"%s\" in %s.\n"
 msgstr ""
 
-#: src/console/console.c:1357
+#: src/console/console.c:1359
 msgid "Too many arguments on input command.\n"
 msgstr "Trop d'arguments sur la commande.\n"
 
-#: src/console/console.c:1361
+#: src/console/console.c:1363
 msgid "First argument to input command must be a filename.\n"
-msgstr "Le premier argument de la commande doit être un fichier.\n"
+msgstr "Le premier argument de la commande doit être un fichier.\n"
 
-#: src/console/console.c:1367
+#: src/console/console.c:1369
 #, c-format
 msgid "Cannot open file %s for input. ERR=%s\n"
 msgstr "Impossible d'ouvrir le fichier %s pour lecture. ERR=%s\n"
 
-#: src/console/console.c:1397
+#: src/console/console.c:1401
 msgid "Too many arguments on output/tee command.\n"
 msgstr ""
 
-#: src/console/console.c:1414
+#: src/console/console.c:1418
 #, c-format
 msgid "Cannot open file %s for output. ERR=%s\n"
 msgstr "Impossible d'ouvrir le fichier %s pour la sortie. ERR=%s\n"
 
-#: src/console/console.c:1433
+#: src/console/console.c:1437
 msgid "Too many arguments. Enclose command in double quotes.\n"
 msgstr ""
-"Trop d'arguments sur la commande. Essayez d'utiliser des « \" » autour "
-"des commandes\n"
+"Trop d'arguments sur la commande. Essayez d'utiliser des « \" » autour des "
+"commandes\n"
 
-#: src/console/console.c:1442
+#: src/console/console.c:1446
 #, c-format
 msgid "Cannot popen(\"%s\", \"r\"): ERR=%s\n"
 msgstr ""
@@ -14964,27 +14967,27 @@
 msgid "Files seen = %d\n"
 msgstr ""
 
-#: src/tools/testls.c:215 src/tools/testfind.c:319
+#: src/tools/testls.c:215 src/tools/testfind.c:322
 #, c-format
 msgid "Err: Could not access %s: %s\n"
 msgstr ""
 
-#: src/tools/testls.c:218 src/tools/testfind.c:322
+#: src/tools/testls.c:218 src/tools/testfind.c:325
 #, c-format
 msgid "Err: Could not follow ff->link %s: %s\n"
 msgstr ""
 
-#: src/tools/testls.c:221 src/tools/testfind.c:325
+#: src/tools/testls.c:221 src/tools/testfind.c:328
 #, c-format
 msgid "Err: Could not stat %s: %s\n"
 msgstr ""
 
-#: src/tools/testls.c:224 src/tools/testfind.c:328
+#: src/tools/testls.c:224 src/tools/testfind.c:331
 #, c-format
 msgid "Skip: File not saved. No change. %s\n"
 msgstr ""
 
-#: src/tools/testls.c:227 src/tools/testfind.c:331
+#: src/tools/testls.c:227 src/tools/testfind.c:334
 #, c-format
 msgid "Err: Attempt to backup archive. Not saved. %s\n"
 msgstr ""
@@ -14999,17 +15002,17 @@
 msgid "Skip: File system change prohibited. Directory not entered. %s\n"
 msgstr ""
 
-#: src/tools/testls.c:236 src/tools/testfind.c:334
+#: src/tools/testls.c:236 src/tools/testfind.c:337
 #, c-format
 msgid "Err: Could not open directory %s: %s\n"
 msgstr ""
 
-#: src/tools/testls.c:239 src/tools/testfind.c:337
+#: src/tools/testls.c:239 src/tools/testfind.c:340
 #, c-format
 msgid "Err: Unknown file ff->type %d: %s\n"
 msgstr ""
 
-#: src/tools/bvfs_test.c:56 src/tools/ing_test.c:56
+#: src/tools/bvfs_test.c:56 src/tools/ing_test.c:57
 #, c-format
 msgid ""
 "\n"
@@ -15071,19 +15074,19 @@
 msgid "Error while inserting file\n"
 msgstr ""
 
-#: src/tools/ing_test.c:230 src/tools/ing_test.c:263 src/tools/ing_test.c:301
+#: src/tools/ing_test.c:231 src/tools/ing_test.c:264 src/tools/ing_test.c:302
 msgid "Stmt went wrong\n"
 msgstr ""
 
-#: src/tools/ing_test.c:319
+#: src/tools/ing_test.c:320
 msgid "CREATE-Stmt went wrong\n"
 msgstr ""
 
-#: src/tools/ing_test.c:324
+#: src/tools/ing_test.c:325
 msgid "DROP-Stmt went wrong\n"
 msgstr ""
 
-#: src/tools/fstype.c:47
+#: src/tools/fstype.c:48
 #, c-format
 msgid ""
 "\n"
@@ -15097,7 +15100,7 @@
 "\n"
 msgstr ""
 
-#: src/tools/fstype.c:101 src/tools/drivetype.c:78
+#: src/tools/fstype.c:102 src/tools/drivetype.c:78
 #, c-format
 msgid "%s: unknown\n"
 msgstr ""
@@ -15105,7 +15108,7 @@
 #: src/tools/bregex.c:153 src/tools/bwild.c:122 src/tools/bregtest.c:137
 #, c-format
 msgid "Could not open data file: %s\n"
-msgstr "Impossible d'ouvrir le fichier de données %s.\n"
+msgstr "Impossible d'ouvrir le fichier de données %s.\n"
 
 #: src/tools/drivetype.c:47
 #, c-format
@@ -15123,7 +15126,7 @@
 "\n"
 msgstr ""
 
-#: src/tools/testfind.c:69
+#: src/tools/testfind.c:70
 #, c-format
 msgid ""
 "\n"
@@ -15144,7 +15147,7 @@
 "\n"
 msgstr ""
 
-#: src/tools/testfind.c:234
+#: src/tools/testfind.c:235
 #, c-format
 msgid ""
 "\n"
@@ -15156,43 +15159,43 @@
 "Hard links     : %d\n"
 msgstr ""
 
-#: src/tools/testfind.c:275
+#: src/tools/testfind.c:278
 #, c-format
 msgid "Reg: %s\n"
 msgstr ""
 
-#: src/tools/testfind.c:297
+#: src/tools/testfind.c:300
 msgid "\t[will not descend: recursion turned off]"
 msgstr ""
 
-#: src/tools/testfind.c:299
+#: src/tools/testfind.c:302
 msgid "\t[will not descend: file system change not allowed]"
 msgstr ""
 
-#: src/tools/testfind.c:301
+#: src/tools/testfind.c:304
 msgid "\t[will not descend: disallowed file system]"
 msgstr ""
 
-#: src/tools/testfind.c:303
+#: src/tools/testfind.c:306
 msgid "\t[will not descend: disallowed drive type]"
 msgstr ""
 
-#: src/tools/testfind.c:387
+#: src/tools/testfind.c:390
 #, c-format
 msgid "===== Filename truncated to 255 chars: %s\n"
 msgstr ""
 
-#: src/tools/testfind.c:404
+#: src/tools/testfind.c:407
 #, c-format
 msgid "========== Path name truncated to 255 chars: %s\n"
 msgstr ""
 
-#: src/tools/testfind.c:413
+#: src/tools/testfind.c:416
 #, c-format
 msgid "========== Path length is zero. File=%s\n"
 msgstr ""
 
-#: src/tools/testfind.c:416
+#: src/tools/testfind.c:419
 #, c-format
 msgid "Path: %s\n"
 msgstr ""
@@ -15493,9 +15496,9 @@
 msgstr ""
 
 #: src/tools/dbcheck.c:748 src/tools/dbcheck.c:810 src/tools/dbcheck.c:856
-#: src/tools/dbcheck.c:914 src/tools/dbcheck.c:972 src/tools/dbcheck.c:1015
-#: src/tools/dbcheck.c:1057 src/tools/dbcheck.c:1099 src/tools/dbcheck.c:1136
-#: src/tools/dbcheck.c:1169 src/tools/dbcheck.c:1203 src/tools/dbcheck.c:1270
+#: src/tools/dbcheck.c:924 src/tools/dbcheck.c:982 src/tools/dbcheck.c:1025
+#: src/tools/dbcheck.c:1067 src/tools/dbcheck.c:1109 src/tools/dbcheck.c:1146
+#: src/tools/dbcheck.c:1179 src/tools/dbcheck.c:1213 src/tools/dbcheck.c:1280
 msgid "Print them? (yes/no): "
 msgstr ""
 
@@ -15529,179 +15532,184 @@
 msgid "Deleting %d orphaned File records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:890 src/tools/dbcheck.c:948
+#: src/tools/dbcheck.c:891
+#, c-format
+msgid "Pruning orphaned Path entries isn't possible when using BVFS.\n"
+msgstr ""
+
+#: src/tools/dbcheck.c:900 src/tools/dbcheck.c:958
 msgid "Create temporary index? (yes/no): "
 msgstr ""
 
-#: src/tools/dbcheck.c:902
+#: src/tools/dbcheck.c:912
 #, c-format
 msgid "Checking for orphaned Path entries. This may take some time!\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:913
+#: src/tools/dbcheck.c:923
 #, c-format
 msgid "Found %d orphaned Path records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:926
+#: src/tools/dbcheck.c:936
 #, c-format
 msgid "Deleting %d orphaned Path records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:960
+#: src/tools/dbcheck.c:970
 #, c-format
 msgid "Checking for orphaned Filename entries. This may take some time!\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:971
+#: src/tools/dbcheck.c:981
 #, c-format
 msgid "Found %d orphaned Filename records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:984
+#: src/tools/dbcheck.c:994
 #, c-format
 msgid "Deleting %d orphaned Filename records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1004
+#: src/tools/dbcheck.c:1014
 #, c-format
 msgid "Checking for orphaned FileSet entries. This takes some time!\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1014
+#: src/tools/dbcheck.c:1024
 #, c-format
 msgid "Found %d orphaned FileSet records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1029
+#: src/tools/dbcheck.c:1039
 #, c-format
 msgid "Deleting %d orphaned FileSet records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1038
+#: src/tools/dbcheck.c:1048
 #, c-format
 msgid "Checking for orphaned Client entries.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1056
+#: src/tools/dbcheck.c:1066
 #, c-format
 msgid "Found %d orphaned Client records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1071
+#: src/tools/dbcheck.c:1081
 #, c-format
 msgid "Deleting %d orphaned Client records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1080
+#: src/tools/dbcheck.c:1090
 #, c-format
 msgid "Checking for orphaned Job entries.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1098
+#: src/tools/dbcheck.c:1108
 #, c-format
 msgid "Found %d orphaned Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1113
+#: src/tools/dbcheck.c:1123
 #, c-format
 msgid "Deleting %d orphaned Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1115
+#: src/tools/dbcheck.c:1125
 #, c-format
 msgid "Deleting JobMedia records of orphaned Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1117
+#: src/tools/dbcheck.c:1127
 #, c-format
 msgid "Deleting Log records of orphaned Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1126
+#: src/tools/dbcheck.c:1136
 #, c-format
 msgid "Checking for Admin Job entries.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1135
+#: src/tools/dbcheck.c:1145
 #, c-format
 msgid "Found %d Admin Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1150
+#: src/tools/dbcheck.c:1160
 #, c-format
 msgid "Deleting %d Admin Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1159
+#: src/tools/dbcheck.c:1169
 #, c-format
 msgid "Checking for Restore Job entries.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1168
+#: src/tools/dbcheck.c:1178
 #, c-format
 msgid "Found %d Restore Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1183
+#: src/tools/dbcheck.c:1193
 #, c-format
 msgid "Deleting %d Restore Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1193
+#: src/tools/dbcheck.c:1203
 #, c-format
 msgid "Checking for Filenames with a trailing slash\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1202
+#: src/tools/dbcheck.c:1212
 #, c-format
 msgid "Found %d bad Filename records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1220 src/tools/dbcheck.c:1286
+#: src/tools/dbcheck.c:1230 src/tools/dbcheck.c:1296
 #, c-format
 msgid "Reparing %d bad Filename records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1260
+#: src/tools/dbcheck.c:1270
 #, c-format
 msgid "Checking for Paths without a trailing slash\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1269
+#: src/tools/dbcheck.c:1279
 #, c-format
 msgid "Found %d bad Path records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1432
+#: src/tools/dbcheck.c:1442
 #, c-format
 msgid ""
 "Ok. Index over the %s column already exists and dbcheck will work faster.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1435
+#: src/tools/dbcheck.c:1445
 #, c-format
 msgid ""
 "Note. Index over the %s column not found, that can greatly slow down "
 "dbcheck.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1450
+#: src/tools/dbcheck.c:1460
 #, c-format
 msgid "Create temporary index... This may take some time!\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1458
+#: src/tools/dbcheck.c:1468
 #, c-format
 msgid "Temporary index created.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1473
+#: src/tools/dbcheck.c:1483
 #, c-format
 msgid "Drop temporary index.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1483
+#: src/tools/dbcheck.c:1493
 #, c-format
 msgid "Temporary index %s deleted.\n"
 msgstr ""
@@ -15726,7 +15734,7 @@
 msgid "     Could not stat %s: ERR=%s\n"
 msgstr ""
 
-#: src/filed/verify.c:147 src/filed/backup.c:439
+#: src/filed/verify.c:147 src/filed/backup.c:450
 #, c-format
 msgid "     Unchanged file skipped: %s\n"
 msgstr ""
@@ -15746,37 +15754,37 @@
 msgid "     File system change prohibited. Directory skipped: %s\n"
 msgstr ""
 
-#: src/filed/verify.c:164
+#: src/filed/verify.c:165
 #, c-format
 msgid "     Could not open directory %s: ERR=%s\n"
 msgstr ""
 
-#: src/filed/verify.c:169
+#: src/filed/verify.c:170
 #, c-format
 msgid "     Unknown file type %d: %s\n"
 msgstr ""
 
-#: src/filed/verify.c:213 src/filed/verify_vol.c:206
+#: src/filed/verify.c:214 src/filed/verify_vol.c:206
 #, c-format
 msgid "Network error in send to Director: ERR=%s\n"
 msgstr ""
 
-#: src/filed/verify.c:246 src/filed/accurate.c:424 src/filed/backup.c:492
+#: src/filed/verify.c:247 src/filed/accurate.c:428 src/filed/backup.c:503
 #, c-format
 msgid "%s digest initialization failed\n"
 msgstr ""
 
-#: src/filed/verify.c:308
+#: src/filed/verify.c:309
 #, c-format
 msgid "     Cannot open %s: ERR=%s.\n"
 msgstr ""
 
-#: src/filed/verify.c:322
+#: src/filed/verify.c:323
 #, c-format
 msgid "     Cannot open resource fork for %s: ERR=%s.\n"
 msgstr ""
 
-#: src/filed/verify.c:385
+#: src/filed/verify.c:386
 #, c-format
 msgid "Error reading file %s: ERR=%s\n"
 msgstr ""
@@ -15786,12 +15794,12 @@
 msgid "Space saved with Base jobs: %lld MB\n"
 msgstr ""
 
-#: src/filed/accurate.c:395
+#: src/filed/accurate.c:399
 #, c-format
 msgid "Cannot verify checksum for %s\n"
 msgstr ""
 
-#: src/filed/accurate.c:503
+#: src/filed/accurate.c:507
 msgid "2991 Bad accurate command\n"
 msgstr ""
 
@@ -15875,344 +15883,320 @@
 msgid "Bacula Client: Last Job had Warnings"
 msgstr ""
 
-#: src/filed/xattr.c:92 src/filed/xattr.c:107 src/filed/xattr.c:115
-#: src/filed/fd_plugins.c:480 src/filed/fd_plugins.c:494 src/filed/acl.c:101
-#: src/filed/acl.c:116 src/filed/acl.c:124 src/filed/backup.c:947
-#: src/filed/backup.c:1143 src/filed/backup.c:1180 src/filed/backup.c:1193
-#: src/filed/backup.c:1269 src/filed/backup.c:1366
+#: src/filed/xattr.c:96 src/filed/xattr.c:111 src/filed/xattr.c:119
+#: src/filed/fd_plugins.c:696 src/filed/fd_plugins.c:710 src/filed/acl.c:105
+#: src/filed/acl.c:120 src/filed/acl.c:128 src/filed/backup.c:993
+#: src/filed/backup.c:1189 src/filed/backup.c:1226 src/filed/backup.c:1239
+#: src/filed/backup.c:1315 src/filed/backup.c:1413
 #, c-format
 msgid "Network send error to SD. ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:231
+#: src/filed/xattr.c:244
 #, c-format
 msgid "Illegal xattr stream, no XATTR_MAGIC on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:244
+#: src/filed/xattr.c:258
 #, c-format
 msgid "Illegal xattr stream, xattr name length <= 0 on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:359 src/filed/xattr.c:390
+#: src/filed/xattr.c:376 src/filed/xattr.c:408
 #, c-format
 msgid "llistea error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:452 src/filed/xattr.c:479
+#: src/filed/xattr.c:472 src/filed/xattr.c:500
 #, c-format
 msgid "lgetea error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:496 src/filed/xattr.c:746 src/filed/xattr.c:1146
-#: src/filed/xattr.c:1536 src/filed/xattr.c:1870 src/filed/xattr.c:2606
+#: src/filed/xattr.c:519 src/filed/xattr.c:807 src/filed/xattr.c:1249
+#: src/filed/xattr.c:1702 src/filed/xattr.c:2064 src/filed/xattr.c:2843
 #, c-format
 msgid "Xattr stream on file \"%s\" exceeds maximum size of %d bytes\n"
 msgstr ""
 
-#: src/filed/xattr.c:524 src/filed/xattr.c:777 src/filed/xattr.c:1174
-#: src/filed/xattr.c:1574 src/filed/xattr.c:1892
+#: src/filed/xattr.c:550 src/filed/xattr.c:841 src/filed/xattr.c:1280
+#: src/filed/xattr.c:1743 src/filed/xattr.c:2089
 #, c-format
 msgid "Failed to serialize extended attributes on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:587
+#: src/filed/xattr.c:624
 #, c-format
 msgid "lsetea error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:655 src/filed/xattr.c:719 src/filed/xattr.c:730
+#: src/filed/xattr.c:710 src/filed/xattr.c:777 src/filed/xattr.c:789
 #, c-format
 msgid "attr_list error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:845
+#: src/filed/xattr.c:916
 #, c-format
 msgid "Received illegal xattr named %s on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:875 src/filed/xattr.c:884
+#: src/filed/xattr.c:947 src/filed/xattr.c:957
 #, c-format
 msgid "attr_set error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:993 src/filed/xattr.c:1023
+#: src/filed/xattr.c:1092 src/filed/xattr.c:1123
 #, c-format
 msgid "llistxattr error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:1103 src/filed/xattr.c:1129
+#: src/filed/xattr.c:1204 src/filed/xattr.c:1231
 #, c-format
 msgid "lgetxattr error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:1236
+#: src/filed/xattr.c:1350
 #, c-format
 msgid "lsetxattr error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:1356 src/filed/xattr.c:1386
+#: src/filed/xattr.c:1507 src/filed/xattr.c:1539
 #, c-format
 msgid "extattr_list_link error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:1403
+#: src/filed/xattr.c:1558
 #, c-format
 msgid "Failed to convert %d into namespace on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:1492 src/filed/xattr.c:1518
+#: src/filed/xattr.c:1653 src/filed/xattr.c:1682
 #, c-format
 msgid "extattr_get_link error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:1633
+#: src/filed/xattr.c:1809
 #, c-format
 msgid "Failed to split %s into namespace and name part on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:1645
+#: src/filed/xattr.c:1822
 #, c-format
 msgid "Failed to convert %s into namespace on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:1663
+#: src/filed/xattr.c:1841
 #, c-format
 msgid "extattr_set_link error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:1753 src/filed/xattr.c:1774
+#: src/filed/xattr.c:1943 src/filed/xattr.c:1965
 #, c-format
 msgid "getproplist error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:1963
+#: src/filed/xattr.c:2169
 #, c-format
 msgid "Unable create proper proplist to restore xattrs on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:1988
+#: src/filed/xattr.c:2196
 #, c-format
 msgid "setproplist error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2274 src/filed/xattr.c:2324
+#: src/filed/xattr.c:2496 src/filed/xattr.c:2547
 #, c-format
 msgid "Unable to get acl on xattr %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2338
+#: src/filed/xattr.c:2562
 #, c-format
 msgid "Unable to get acl text on xattr %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2407
+#: src/filed/xattr.c:2632
 #, c-format
 msgid "Unable to get status on xattr %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2530
+#: src/filed/xattr.c:2763
 #, c-format
 msgid "Unable to open xattr %s on \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2549
+#: src/filed/xattr.c:2784
 #, c-format
 msgid "Unable to read symlin %s on \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2618
+#: src/filed/xattr.c:2859
 #, c-format
 msgid "Unable to read content of xattr %s on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:2654
+#: src/filed/xattr.c:2897
 #, c-format
 msgid "Unable to chdir to xattr space of file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2710 src/filed/xattr.c:2937
+#: src/filed/xattr.c:2953 src/filed/xattr.c:3193
 #, c-format
 msgid "Unable to open file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2735 src/filed/xattr.c:2986
+#: src/filed/xattr.c:2979 src/filed/xattr.c:3246
 #, c-format
 msgid "Unable to open xattr space %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2748 src/filed/xattr.c:2956
+#: src/filed/xattr.c:2993 src/filed/xattr.c:3214
 #, c-format
 msgid "Unable to chdir to xattr space on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2766
+#: src/filed/xattr.c:3012
 #, c-format
 msgid "Unable to list the xattr space on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2855
+#: src/filed/xattr.c:3105
 #, c-format
 msgid "Unable to convert acl from text on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:2862 src/filed/xattr.c:2883
+#: src/filed/xattr.c:3113 src/filed/xattr.c:3135
 #, c-format
 msgid "Unable to restore acl of xattr %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2948
+#: src/filed/xattr.c:3205
 #, c-format
 msgid "Unable to open xattr space on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2972 src/filed/xattr.c:3111
+#: src/filed/xattr.c:3231 src/filed/xattr.c:3379
 #, c-format
 msgid "Unable to open xattr %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:3000
+#: src/filed/xattr.c:3261
 #, c-format
 msgid "Unable to chdir to xattr space %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:3036
+#: src/filed/xattr.c:3299
 #, c-format
 msgid "Unable to mkfifo xattr %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:3050
+#: src/filed/xattr.c:3315
 #, c-format
 msgid "Unable to mknod xattr %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:3065
+#: src/filed/xattr.c:3331
 #, c-format
 msgid "Unable to mkdir xattr %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:3082
+#: src/filed/xattr.c:3349
 #, c-format
 msgid "Unable to link xattr %s to %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:3131
+#: src/filed/xattr.c:3400
 #, c-format
 msgid ""
 "Unable to restore data of xattr %s on file \"%s\": Not all data available in "
 "xattr stream\n"
 msgstr ""
 
-#: src/filed/xattr.c:3141
+#: src/filed/xattr.c:3411
 #, c-format
 msgid "Unable to restore data of xattr %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:3161
+#: src/filed/xattr.c:3432
 #, c-format
 msgid "Unable to symlink xattr %s to %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:3194
+#: src/filed/xattr.c:3466
 #, c-format
 msgid "Unable to restore owner of xattr %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:3219
+#: src/filed/xattr.c:3492
 #, c-format
 msgid "Unable to restore filetimes of xattr %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:3234
+#: src/filed/xattr.c:3508
 #, c-format
 msgid "Illegal xattr stream, failed to parse xattr stream on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:3291
+#: src/filed/xattr.c:3570
 #, c-format
 msgid "Failed to restore extensible attributes on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:3302
+#: src/filed/xattr.c:3583
 #, c-format
 msgid "Failed to restore extended attributes on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:3382 src/filed/acl.c:1871
+#: src/filed/xattr.c:3672 src/filed/acl.c:2109
 #, c-format
 msgid "Unable to stat file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:3429
+#: src/filed/xattr.c:3719
 #, c-format
 msgid ""
 "Can't restore Extended Attributes of %s - incompatible xattr stream "
 "encountered - %d\n"
 msgstr ""
 
-#: src/filed/fd_plugins.c:380
+#: src/filed/fd_plugins.c:480 src/filed/fd_plugins.c:619
 #, c-format
 msgid "Command plugin \"%s\": no type in startBackupFile packet.\n"
 msgstr ""
 
-#: src/filed/fd_plugins.c:393
+#: src/filed/fd_plugins.c:493
 #, c-format
 msgid "Command plugin \"%s\": no object_name in startBackupFile packet.\n"
 msgstr ""
 
-#: src/filed/fd_plugins.c:405
+#: src/filed/fd_plugins.c:505 src/filed/fd_plugins.c:626
 #, c-format
 msgid "Command plugin \"%s\": no fname in startBackupFile packet.\n"
 msgstr ""
 
-#: src/filed/fd_plugins.c:467
+#: src/filed/fd_plugins.c:683
 msgid "Plugin save packet not found.\n"
 msgstr ""
 
-#: src/filed/fd_plugins.c:587
+#: src/filed/fd_plugins.c:806
 #, c-format
 msgid "Plugin=%s not found.\n"
-msgstr "Plugin=%s non trouvé.\n"
+msgstr "Plugin=%s non trouvé.\n"
 
-#: src/filed/fd_plugins.c:644
+#: src/filed/fd_plugins.c:863
 #, c-format
 msgid "Plugin createFile call failed. Stat=%d file=%s\n"
 msgstr ""
 
-#: src/filed/fd_plugins.c:652
+#: src/filed/fd_plugins.c:874
 #, c-format
 msgid "Plugin createFile call failed. Returned CF_ERROR file=%s\n"
 msgstr ""
 
-#: src/filed/fd_plugins.c:751
-#, c-format
-msgid "Loaded plugin: %s\n"
-msgstr ""
-
-#: src/filed/fd_plugins.c:770
-#, c-format
-msgid "Plugin magic wrong. Plugin=%s wanted=%s got=%s\n"
-msgstr ""
-
-#: src/filed/fd_plugins.c:778
-#, c-format
-msgid "Plugin version incorrect. Plugin=%s wanted=%d got=%d\n"
-msgstr ""
-
-#: src/filed/fd_plugins.c:786
-#, c-format
-msgid "Plugin license incompatible. Plugin=%s license=%s\n"
-msgstr ""
-
-#: src/filed/fd_plugins.c:793
-msgid "Plugin size mismatch.\n"
-msgstr ""
-
-#: src/filed/fd_plugins.c:1375
+#: src/filed/fd_plugins.c:1621
 msgid "Command plugin: no fname in baculaCheckChanges packet.\n"
 msgstr ""
 
-#: src/filed/filed.c:75
+#: src/filed/filed.c:76
 #, c-format
 msgid ""
 "\n"
@@ -16234,237 +16218,252 @@
 "\n"
 msgstr ""
 
-#: src/filed/filed.c:198
+#: src/filed/filed.c:199
 msgid "-k option has no meaning without -u option.\n"
 msgstr ""
 
-#: src/filed/filed.c:335
+#: src/filed/filed.c:337
 #, c-format
 msgid ""
 "No File daemon resource defined in %s\n"
 "Without that I don't know who I am :-(\n"
 msgstr ""
 
-#: src/filed/filed.c:340
+#: src/filed/filed.c:342
 #, c-format
 msgid "Only one Client resource permitted in %s\n"
 msgstr ""
 
-#: src/filed/filed.c:364
+#: src/filed/filed.c:366
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "File daemon in %s.\n"
 msgstr ""
 
-#: src/filed/filed.c:388
+#: src/filed/filed.c:390
 msgid "PKI encryption/signing enabled but not compiled into Bacula.\n"
 msgstr ""
 
-#: src/filed/filed.c:399
+#: src/filed/filed.c:401
 #, c-format
 msgid ""
 "\"PKI Key Pair\" must be defined for File daemon \"%s\" in %s if either "
 "\"PKI Sign\" or \"PKI Encrypt\" are enabled.\n"
 msgstr ""
 
-#: src/filed/filed.c:411 src/filed/filed.c:442 src/filed/filed.c:483
+#: src/filed/filed.c:413 src/filed/filed.c:444 src/filed/filed.c:485
 msgid "Failed to allocate a new keypair object.\n"
 msgstr ""
 
-#: src/filed/filed.c:415
+#: src/filed/filed.c:417
 #, c-format
 msgid "Failed to load public certificate for File daemon \"%s\" in %s.\n"
 msgstr ""
 
-#: src/filed/filed.c:421
+#: src/filed/filed.c:423
 #, c-format
 msgid "Failed to load private key for File daemon \"%s\" in %s.\n"
 msgstr ""
 
-#: src/filed/filed.c:451
+#: src/filed/filed.c:453
 #, c-format
 msgid ""
 "Failed to load private key from file %s for File daemon \"%s\" in %s.\n"
 msgstr ""
 
-#: src/filed/filed.c:458
+#: src/filed/filed.c:460
 #, c-format
 msgid ""
 "Failed to load trusted signer certificate from file %s for File daemon "
 "\"%s\" in %s.\n"
 msgstr ""
 
-#: src/filed/filed.c:489
+#: src/filed/filed.c:491
 #, c-format
 msgid ""
 "Failed to load master key certificate from file %s for File daemon \"%s\" in "
 "%s.\n"
 msgstr ""
 
-#: src/filed/filed.c:505
+#: src/filed/filed.c:507
 #, c-format
 msgid "No Director resource defined in %s\n"
 msgstr ""
 
-#: src/filed/acl.c:179 src/filed/acl.c:201
+#: src/filed/acl.c:225 src/filed/acl.c:248
 #, c-format
 msgid "aclx_get error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:226
+#: src/filed/acl.c:274
 #, c-format
 msgid "Unknown acl type encountered on file \"%s\": %ld\n"
 msgstr ""
 
-#: src/filed/acl.c:248 src/filed/acl.c:256
+#: src/filed/acl.c:298 src/filed/acl.c:307
 #, c-format
 msgid "Failed to convert acl into text on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/acl.c:342 src/filed/acl.c:351
+#: src/filed/acl.c:381
+#, c-format
+msgid ""
+"Trying to restore POSIX acl on file \"%s\" on filesystem without AIXC acl "
+"support\n"
+msgstr ""
+
+#: src/filed/acl.c:389
+#, c-format
+msgid ""
+"Trying to restore NFSv4 acl on file \"%s\" on filesystem without NFS4 acl "
+"support\n"
+msgstr ""
+
+#: src/filed/acl.c:433 src/filed/acl.c:443
 #, c-format
 msgid "aclx_scanStr error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:364
+#: src/filed/acl.c:467
 #, c-format
 msgid "aclx_put error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:692
+#: src/filed/acl.c:809
 #, c-format
 msgid "acl_to_text error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:719
+#: src/filed/acl.c:837
 #, c-format
 msgid "acl_get_file error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:767
+#: src/filed/acl.c:889
 #, c-format
 msgid ""
 "acl_delete_def_file error on file \"%s\": filesystem doesn't support ACLs\n"
 msgstr ""
 
-#: src/filed/acl.c:772
+#: src/filed/acl.c:895
 #, c-format
 msgid "acl_delete_def_file error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:780
+#: src/filed/acl.c:904
 #, c-format
 msgid "acl_from_text error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:793
+#: src/filed/acl.c:918
 #, c-format
 msgid "acl_valid error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:822
+#: src/filed/acl.c:948
 #, c-format
 msgid "acl_set_file error on file \"%s\": filesystem doesn't support ACLs\n"
 msgstr ""
 
-#: src/filed/acl.c:830
+#: src/filed/acl.c:957
 #, c-format
 msgid "acl_set_file error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:919 src/filed/acl.c:944 src/filed/acl.c:1052
-#: src/filed/acl.c:1486 src/filed/acl.c:1582
+#: src/filed/acl.c:1063 src/filed/acl.c:1089 src/filed/acl.c:1201
+#: src/filed/acl.c:1692 src/filed/acl.c:1795
 #, c-format
 msgid "pathconf error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:1066
+#: src/filed/acl.c:1216
 #, c-format
 msgid ""
 "Trying to restore acl on file \"%s\" on filesystem without %s acl support\n"
 msgstr ""
 
-#: src/filed/acl.c:1306
+#: src/filed/acl.c:1492
 #, c-format
 msgid "getacl error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:1337
+#: src/filed/acl.c:1525
 #, c-format
 msgid "acltostr error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:1354 src/filed/acl.c:1361
+#: src/filed/acl.c:1546 src/filed/acl.c:1554
 #, c-format
 msgid "strtoacl error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:1387
+#: src/filed/acl.c:1582
 #, c-format
 msgid "setacl error on file \"%s\": filesystem doesn't support ACLs\n"
 msgstr ""
 
-#: src/filed/acl.c:1394
+#: src/filed/acl.c:1590
 #, c-format
 msgid "setacl error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:1504
+#: src/filed/acl.c:1711
 #, c-format
 msgid "acl_get error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:1574
+#: src/filed/acl.c:1786
 #, c-format
 msgid ""
 "Trying to restore acl on file \"%s\" on filesystem without acl support\n"
 msgstr ""
 
-#: src/filed/acl.c:1598
+#: src/filed/acl.c:1812
 #, c-format
 msgid ""
-"Trying to restore acl on file \"%s\" on filesystem without aclent acl "
+"Trying to restore POSIX acl on file \"%s\" on filesystem without aclent acl "
 "support\n"
 msgstr ""
 
-#: src/filed/acl.c:1608
+#: src/filed/acl.c:1823
 #, c-format
 msgid ""
-"Trying to restore acl on file \"%s\" on filesystem without ace acl support\n"
+"Trying to restore NFSv4 acl on file \"%s\" on filesystem without ace acl "
+"support\n"
 msgstr ""
 
-#: src/filed/acl.c:1623
+#: src/filed/acl.c:1839
 #, c-format
 msgid "acl_fromtext error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:1636 src/filed/acl.c:1643
+#: src/filed/acl.c:1853 src/filed/acl.c:1861
 #, c-format
 msgid "wrong encoding of acl type in acl stream on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/acl.c:1667
+#: src/filed/acl.c:1886
 #, c-format
 msgid "acl_set error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:1746
+#: src/filed/acl.c:1971
 #, c-format
 msgid "acltotext error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:1764
+#: src/filed/acl.c:1993
 #, c-format
 msgid "aclfromtext error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:1781
+#: src/filed/acl.c:2011
 #, c-format
 msgid "acl(SETACL) error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:1943
+#: src/filed/acl.c:2181
 #, c-format
 msgid "Can't restore ACLs of %s - incompatible acl stream encountered - %d\n"
 msgstr ""
@@ -16473,17 +16472,17 @@
 msgid "Storage command not issued before Verify.\n"
 msgstr ""
 
-#: src/filed/verify_vol.c:97 src/filed/restore.c:282
+#: src/filed/verify_vol.c:97 src/filed/restore.c:483
 #, c-format
 msgid "Record header scan error: %s\n"
 msgstr ""
 
-#: src/filed/verify_vol.c:106 src/filed/restore.c:294
+#: src/filed/verify_vol.c:106 src/filed/restore.c:495
 #, c-format
 msgid "Data record error. ERR=%s\n"
 msgstr ""
 
-#: src/filed/verify_vol.c:110 src/filed/restore.c:298
+#: src/filed/verify_vol.c:110 src/filed/restore.c:499
 #, c-format
 msgid "Actual data size %d not same as header %d\n"
 msgstr ""
@@ -16497,629 +16496,621 @@
 msgid "Cannot set buffer size FD->SD.\n"
 msgstr ""
 
-#: src/filed/backup.c:190
+#: src/filed/backup.c:194
 #, c-format
 msgid "Encountered %ld acl errors while doing backup\n"
 msgstr ""
 
-#: src/filed/backup.c:194
+#: src/filed/backup.c:198
 #, c-format
 msgid "Encountered %ld xattr errors while doing backup\n"
 msgstr ""
 
-#: src/filed/backup.c:261 src/filed/backup.c:270
+#: src/filed/backup.c:267 src/filed/backup.c:276
 msgid "An error occurred while encrypting the stream.\n"
 msgstr ""
 
-#: src/filed/backup.c:376
+#: src/filed/backup.c:387
 #, c-format
 msgid "     Recursion turned off. Will not descend from %s into %s\n"
 msgstr ""
 
-#: src/filed/backup.c:383
+#: src/filed/backup.c:394
 #, c-format
 msgid ""
 "     %s is a different filesystem. Will not descend from %s into it.\n"
 msgstr ""
 
-#: src/filed/backup.c:389
+#: src/filed/backup.c:400
 #, c-format
 msgid "     Disallowed filesystem. Will not descend from %s into %s\n"
 msgstr ""
 
-#: src/filed/backup.c:394
+#: src/filed/backup.c:405
 #, c-format
 msgid "     Disallowed drive type. Will not descend into %s\n"
 msgstr ""
 
-#: src/filed/backup.c:405
+#: src/filed/backup.c:416
 #, c-format
 msgid "     Socket file skipped: %s\n"
 msgstr ""
 
-#: src/filed/backup.c:418
+#: src/filed/backup.c:429
 #, c-format
 msgid "     Could not access \"%s\": ERR=%s\n"
-msgstr "     Impossible d'acceder à « %s » : ERR=%s\n"
+msgstr "     Impossible d'acceder à \"%s\" : ERR=%s\n"
 
-#: src/filed/backup.c:425
+#: src/filed/backup.c:436
 #, c-format
 msgid "     Could not follow link \"%s\": ERR=%s\n"
-msgstr "     Impossible de suivre le lien « %s » : ERR=%s\n"
+msgstr "     Impossible de suivre le lien \"%s\" : ERR=%s\n"
 
-#: src/filed/backup.c:432
+#: src/filed/backup.c:443
 #, c-format
 msgid "     Could not stat \"%s\": ERR=%s\n"
-msgstr "     Impossible d'acceder à « %s » : ERR=%s\\n\n"
+msgstr "     Impossible d'acceder à \"%s\" : ERR=%s\\n\n"
 
-#: src/filed/backup.c:442
+#: src/filed/backup.c:453
 #, c-format
 msgid "     Archive file not saved: %s\n"
 msgstr ""
 
-#: src/filed/backup.c:446
+#: src/filed/backup.c:457
 #, c-format
 msgid "     Could not open directory \"%s\": ERR=%s\n"
-msgstr "     Impossible d'ouvrir le répertoire « %s » : ERR=%s\n"
+msgstr "     Impossible d'ouvrir le répertoire \"%s\" : ERR=%s\n"
 
-#: src/filed/backup.c:452
+#: src/filed/backup.c:463
 #, c-format
 msgid "     Unknown file type %d; not saved: %s\n"
-msgstr "     Type de fichier inconnu %d ; non sauvé : %s\n"
+msgstr "     Type de fichier inconnu %d ; non sauvé : %s\n"
 
-#: src/filed/backup.c:508
+#: src/filed/backup.c:519
 #, c-format
 msgid "%s signature digest initialization failed\n"
 msgstr ""
 
-#: src/filed/backup.c:588
+#: src/filed/backup.c:624
 #, c-format
 msgid "     Cannot open \"%s\": ERR=%s.\n"
-msgstr "     Impossible d'ouvrir « %s » : ERR=%s.\n"
+msgstr "     Impossible d'ouvrir \"%s\" : ERR=%s.\n"
 
-#: src/filed/backup.c:625
+#: src/filed/backup.c:661
 #, c-format
 msgid "     Cannot open resource fork for \"%s\": ERR=%s.\n"
 msgstr ""
 
-#: src/filed/backup.c:717
+#: src/filed/backup.c:757
 msgid "Failed to allocate memory for crypto signature.\n"
 msgstr ""
 
-#: src/filed/backup.c:722 src/filed/backup.c:728 src/filed/backup.c:743
+#: src/filed/backup.c:762 src/filed/backup.c:768 src/filed/backup.c:783
 msgid "An error occurred while signing the stream.\n"
 msgstr ""
 
-#: src/filed/backup.c:767
+#: src/filed/backup.c:807
 msgid "An error occurred finalizing signing the stream.\n"
 msgstr ""
 
-#: src/filed/backup.c:879
+#: src/filed/backup.c:925
 #, c-format
 msgid "Compression deflateParams error: %d\n"
 msgstr ""
 
-#: src/filed/backup.c:916
+#: src/filed/backup.c:962
 msgid "Encrypting sparse or offset data not supported.\n"
 msgstr ""
 
-#: src/filed/backup.c:923
+#: src/filed/backup.c:969
 msgid "Failed to initialize encryption context.\n"
 msgstr ""
 
-#: src/filed/backup.c:1033
+#: src/filed/backup.c:1079
 #, c-format
 msgid "Compression deflate error: %d\n"
 msgstr ""
 
-#: src/filed/backup.c:1040
+#: src/filed/backup.c:1086
 #, c-format
 msgid "Compression deflateReset error: %d\n"
 msgstr ""
 
-#: src/filed/backup.c:1070
+#: src/filed/backup.c:1116
 #, c-format
 msgid "Compression LZO error: %d\n"
 msgstr ""
 
-#: src/filed/backup.c:1115 src/filed/backup.c:1131
+#: src/filed/backup.c:1161 src/filed/backup.c:1177
 msgid "Encryption error\n"
 msgstr ""
 
-#: src/filed/backup.c:1157
+#: src/filed/backup.c:1203
 #, c-format
 msgid "Read error on file %s. ERR=%s\n"
 msgstr ""
 
-#: src/filed/backup.c:1160
+#: src/filed/backup.c:1206
 #, c-format
 msgid "Too many errors. JobErrors=%d.\n"
 msgstr ""
 
-#: src/filed/backup.c:1170
+#: src/filed/backup.c:1216
 msgid "Encryption padding error\n"
 msgstr ""
 
-#: src/filed/backup.c:1234
+#: src/filed/backup.c:1280
 msgid "Invalid file flags, no supported data stream type.\n"
 msgstr ""
 
-#: src/filed/backup.c:1489
+#: src/filed/backup.c:1536
 #, c-format
 msgid "VSS Writer (BackupComplete): %s\n"
 msgstr ""
 
-#: src/filed/restore.c:116
+#: src/filed/restore.c:114
 #, c-format
 msgid "Size of data or stream of %s not correct. Original %s, restored %s.\n"
 msgstr ""
 
-#: src/filed/restore.c:136
+#: src/filed/restore.c:134
 #, c-format
 msgid "Invalid length of Finder Info (got %d, not 32)\n"
 msgstr ""
 
-#: src/filed/restore.c:141
+#: src/filed/restore.c:139
 #, c-format
 msgid "Could not set Finder Info on %s\n"
 msgstr ""
 
-#: src/filed/restore.c:216
+#: src/filed/restore.c:415
 msgid "LZO init failed\n"
 msgstr ""
 
-#: src/filed/restore.c:451
+#: src/filed/restore.c:657
 msgid "Unexpected cryptographic session data stream.\n"
 msgstr ""
 
-#: src/filed/restore.c:461
+#: src/filed/restore.c:667
 msgid ""
 "No private decryption keys have been defined to decrypt encrypted backup "
 "data.\n"
 msgstr ""
 
-#: src/filed/restore.c:472
+#: src/filed/restore.c:678
 msgid "Could not create digest.\n"
 msgstr ""
 
-#: src/filed/restore.c:490
+#: src/filed/restore.c:696
 msgid "Missing private key required to decrypt encrypted backup data.\n"
 msgstr ""
 
-#: src/filed/restore.c:493
+#: src/filed/restore.c:699
 msgid "Decrypt of the session key failed.\n"
-msgstr "Impossible de décrypter la clef de session.\n"
+msgstr "Impossible de décrypter la clef de session.\n"
 
-#: src/filed/restore.c:499
+#: src/filed/restore.c:705
 #, c-format
 msgid "An error occurred while decoding encrypted session data stream: %s\n"
 msgstr ""
 
-#: src/filed/restore.c:566 src/filed/restore.c:619
+#: src/filed/restore.c:772 src/filed/restore.c:825
 #, c-format
 msgid "Missing encryption session data stream for %s\n"
 msgstr ""
 
-#: src/filed/restore.c:574 src/filed/restore.c:626
+#: src/filed/restore.c:780 src/filed/restore.c:832
 #, c-format
 msgid "Failed to initialize decryption context for %s\n"
 msgstr ""
 
-#: src/filed/restore.c:638
+#: src/filed/restore.c:844
 #, c-format
 msgid "Cannot open resource fork for %s.\n"
 msgstr ""
 
-#: src/filed/restore.c:770
+#: src/filed/restore.c:986
 msgid "Unexpected cryptographic signature data stream.\n"
 msgstr ""
 
-#: src/filed/restore.c:778
+#: src/filed/restore.c:994
 #, c-format
 msgid "Failed to decode message signature for %s\n"
 msgstr ""
 
-#: src/filed/restore.c:836
+#: src/filed/restore.c:1058
 #, c-format
 msgid "Encountered %ld acl errors while doing restore\n"
 msgstr ""
 
-#: src/filed/restore.c:840
+#: src/filed/restore.c:1062
 #, c-format
 msgid "Encountered %ld xattr errors while doing restore\n"
 msgstr ""
 
-#: src/filed/restore.c:844
+#: src/filed/restore.c:1066
 #, c-format
 msgid ""
 "%d non-supported data streams and %d non-supported attrib streams ignored.\n"
 msgstr ""
 
-#: src/filed/restore.c:848
+#: src/filed/restore.c:1070
 #, c-format
 msgid "%d non-supported resource fork streams ignored.\n"
 msgstr ""
 
-#: src/filed/restore.c:851
+#: src/filed/restore.c:1073
 #, c-format
 msgid "%d non-supported Finder Info streams ignored.\n"
 msgstr ""
 
-#: src/filed/restore.c:854
+#: src/filed/restore.c:1076
 #, c-format
 msgid "%d non-supported acl streams ignored.\n"
 msgstr ""
 
-#: src/filed/restore.c:857
+#: src/filed/restore.c:1079
 #, c-format
 msgid "%d non-supported crypto streams ignored.\n"
 msgstr ""
 
-#: src/filed/restore.c:860
+#: src/filed/restore.c:1082
 #, c-format
 msgid "%d non-supported xattr streams ignored.\n"
 msgstr ""
 
-#: src/filed/restore.c:932
+#: src/filed/restore.c:1162
 msgid "Zlib errno"
 msgstr ""
 
-#: src/filed/restore.c:934
+#: src/filed/restore.c:1164
 msgid "Zlib stream error"
 msgstr ""
 
-#: src/filed/restore.c:936
+#: src/filed/restore.c:1166
 msgid "Zlib data error"
 msgstr ""
 
-#: src/filed/restore.c:938
+#: src/filed/restore.c:1168
 msgid "Zlib memory error"
 msgstr ""
 
-#: src/filed/restore.c:940
+#: src/filed/restore.c:1170
 msgid "Zlib buffer error"
 msgstr ""
 
-#: src/filed/restore.c:942
+#: src/filed/restore.c:1172
 msgid "Zlib version error"
 msgstr ""
 
-#: src/filed/restore.c:982
+#: src/filed/restore.c:1212
 #, c-format
 msgid "Missing cryptographic signature for %s\n"
 msgstr ""
 
-#: src/filed/restore.c:1015 src/filed/restore.c:1044
+#: src/filed/restore.c:1245 src/filed/restore.c:1274
 #, c-format
 msgid "Signature validation failed for file %s: ERR=%s\n"
 msgstr ""
 
-#: src/filed/restore.c:1032
+#: src/filed/restore.c:1262
 #, c-format
 msgid "Digest one file failed for file: %s\n"
 msgstr ""
 
-#: src/filed/restore.c:1071
+#: src/filed/restore.c:1301
 #, c-format
 msgid "Signature validation failed for %s: %s\n"
 msgstr ""
 
-#: src/filed/restore.c:1166
+#: src/filed/restore.c:1398
 #, c-format
 msgid "LZO uncompression error on file %s. ERR=%d\n"
 msgstr ""
 
-#: src/filed/restore.c:1203
+#: src/filed/restore.c:1435
 #, c-format
 msgid "Uncompression error on file %s. ERR=%s\n"
 msgstr ""
 
-#: src/filed/restore.c:1236
+#: src/filed/restore.c:1468
 #, c-format
 msgid "Write error in Win32 Block Decomposition on %s: %s\n"
 msgstr ""
 
-#: src/filed/restore.c:1295
+#: src/filed/restore.c:1527
 msgid "Decryption error\n"
 msgstr ""
 
-#: src/filed/restore.c:1389
+#: src/filed/restore.c:1620
 msgid "Logic error: output file should be open\n"
 msgstr ""
 
-#: src/filed/restore.c:1420
+#: src/filed/restore.c:1658
 msgid "Logic error: output file should not be open\n"
 msgstr ""
 
-#: src/filed/restore.c:1453
+#: src/filed/restore.c:1692
 #, c-format
 msgid "Decryption error. buf_len=%d decrypt_len=%d on file %s\n"
 msgstr ""
 
-#: src/filed/restore.c:1574
+#: src/filed/restore.c:1813
 msgid "Open File Manager paused\n"
 msgstr ""
 
-#: src/filed/restore.c:1578
+#: src/filed/restore.c:1817
 msgid "FAILED to pause Open File Manager\n"
 msgstr ""
 
-#: src/filed/restore.c:1586
+#: src/filed/restore.c:1825
 #, c-format
 msgid "Running as '%s'. Privmask=%#08x\n"
 msgstr ""
 
-#: src/filed/restore.c:1588
+#: src/filed/restore.c:1827
 msgid "Failed to retrieve current UserName\n"
 msgstr ""
 
-#: src/filed/job.c:454
+#: src/filed/job.c:458
 #, c-format
 msgid "2901 Job %s not found.\n"
 msgstr "2901 Le job %s est introuvable.\n"
 
-#: src/filed/job.c:464
+#: src/filed/job.c:468
 #, c-format
 msgid "2001 Job %s marked to be canceled.\n"
-msgstr "2001 Le job %s va être annulé.\n"
+msgstr "2001 Le job %s va être annulé.\n"
 
-#: src/filed/job.c:467
+#: src/filed/job.c:471
 msgid "2902 Error scanning cancel command.\n"
-msgstr "2902 Erreur dans le décodage de la commande d'annulation.\n"
+msgstr "2902 Erreur dans le décodage de la commande d'annulation.\n"
 
-#: src/filed/job.c:490
+#: src/filed/job.c:494
 #, c-format
 msgid "2991 Bad setdebug command: %s\n"
-msgstr "2991 Erreur dans la commande setdebug : %s\n"
+msgstr "2991 Erreur dans la commande setdebug : %s\n"
 
-#: src/filed/job.c:513
+#: src/filed/job.c:517
 #, c-format
 msgid "Bad estimate command: %s"
 msgstr ""
 
-#: src/filed/job.c:514
+#: src/filed/job.c:518
 msgid "2992 Bad estimate command.\n"
 msgstr ""
 
-#: src/filed/job.c:537
+#: src/filed/job.c:541
 #, c-format
 msgid "Bad Job Command: %s"
 msgstr ""
 
-#: src/filed/job.c:563
+#: src/filed/job.c:580
 #, c-format
 msgid "Bad RunBeforeJob command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:564 src/filed/job.c:582
+#: src/filed/job.c:581 src/filed/job.c:600
 msgid "2905 Bad RunBeforeJob command.\n"
 msgstr ""
 
-#: src/filed/job.c:593
+#: src/filed/job.c:611
 msgid "2905 Bad RunBeforeNow command.\n"
 msgstr ""
 
-#: src/filed/job.c:612
+#: src/filed/job.c:630
 #, c-format
 msgid "Bad RunAfter command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:613
+#: src/filed/job.c:631
 msgid "2905 Bad RunAfterJob command.\n"
 msgstr ""
 
-#: src/filed/job.c:647
+#: src/filed/job.c:667
 #, c-format
 msgid "Bad RunScript command: %s\n"
-msgstr "Erreur dans la commande RunScript : %s\n"
+msgstr "Erreur dans la commande RunScript : %s\n"
 
-#: src/filed/job.c:648
+#: src/filed/job.c:668
 msgid "2905 Bad RunScript command.\n"
 msgstr "2905 Erreur sur la commande RunScript.\n"
 
-#: src/filed/job.c:692
+#: src/filed/job.c:722
 #, c-format
 msgid "Bad RestoreObject command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:753
+#: src/filed/job.c:789
 msgid "2909 Bad RestoreObject command.\n"
 msgstr ""
 
-#: src/filed/job.c:792
+#: src/filed/job.c:828
 #, c-format
 msgid "Plugin Directory not defined. Cannot use plugin: \"%s\"\n"
 msgstr ""
 
-#: src/filed/job.c:834
+#: src/filed/job.c:870
 #, c-format
 msgid "Error running program: %s. stat=%d: ERR=%s\n"
-msgstr "Erreur dans l'exécution de la commande : %s. stat=%d: ERR=%s\n"
+msgstr "Erreur dans l'exécution de la commande : %s. stat=%d: ERR=%s\n"
 
-#: src/filed/job.c:845
+#: src/filed/job.c:881
 #, c-format
 msgid "Cannot open FileSet input file: %s. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:991
+#: src/filed/job.c:1027
 #, c-format
 msgid "REGEX %s compile error. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:1137
+#: src/filed/job.c:1178
 #, c-format
 msgid "Invalid FileSet command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1607
+#: src/filed/job.c:1651
 #, c-format
 msgid ""
 "DIR and FD clocks differ by %lld seconds, FD automatically compensating.\n"
 msgstr ""
 
-#: src/filed/job.c:1616
+#: src/filed/job.c:1660
 #, c-format
 msgid "Unknown backup level: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1629
+#: src/filed/job.c:1673
 #, c-format
 msgid "Bad level command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1651
+#: src/filed/job.c:1695
 #, c-format
 msgid "Bad session command: %s"
 msgstr ""
 
-#: src/filed/job.c:1712
+#: src/filed/job.c:1756
 #, c-format
 msgid "Bad storage command: %s"
 msgstr ""
 
-#: src/filed/job.c:1733
+#: src/filed/job.c:1777
 #, c-format
 msgid "Failed to connect to Storage daemon: %s:%d\n"
 msgstr ""
 
-#: src/filed/job.c:1745
+#: src/filed/job.c:1789
 msgid "Failed to authenticate Storage daemon.\n"
 msgstr ""
 
-#: src/filed/job.c:1792
+#: src/filed/job.c:1836
 msgid "ACL support not configured for your machine.\n"
 msgstr ""
 
-#: src/filed/job.c:1796
+#: src/filed/job.c:1840
 msgid "XATTR support not configured for your machine.\n"
 msgstr ""
 
-#: src/filed/job.c:1805
+#: src/filed/job.c:1849
 msgid "Cannot contact Storage daemon\n"
-msgstr "Impossible de se connecter au démon Storage\n"
+msgstr "Impossible de se connecter au démon Storage\n"
 
-#: src/filed/job.c:1824
+#: src/filed/job.c:1868
 #, c-format
 msgid "Bad response to append open: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1829
+#: src/filed/job.c:1873
 msgid "Bad response from stored to open command\n"
 msgstr ""
 
-#: src/filed/job.c:1860
+#: src/filed/job.c:1904
 #, c-format
 msgid "Generate VSS snapshots. Driver=\"%s\", Drive(s)=\"%s\"\n"
-msgstr ""
-"Création des snapshot VSS. Driver=« %s », Lecteur(s)=« %s »\n"
+msgstr "Création des snapshot VSS. Driver=\"%s\", Lecteur(s)=\"%s\"\n"
 
-#: src/filed/job.c:1863
-#, c-format
-msgid "Generate VSS snapshots failed. ERR=%s\n"
+#: src/filed/job.c:1906
+msgid "CreateSGenerate VSS snapshots failed.\n"
 msgstr ""
 
-#: src/filed/job.c:1869
+#: src/filed/job.c:1912
 #, c-format
 msgid "Generate VSS snapshot of drive \"%c:\\\" failed.\n"
 msgstr ""
 
-#: src/filed/job.c:1875
+#: src/filed/job.c:1918
 #, c-format
 msgid "VSS Writer (PrepareForBackup): %s\n"
 msgstr ""
 
-#: src/filed/job.c:1880
+#: src/filed/job.c:1923
 msgid "No drive letters found for generating VSS snapshots.\n"
 msgstr ""
 
-#: src/filed/job.c:1884
-#, c-format
-msgid "VSS was not initialized properly. ERR=%s\n"
+#: src/filed/job.c:1926
+msgid "VSS was not initialized properly.\n"
 msgstr ""
 
-#: src/filed/job.c:1934
+#: src/filed/job.c:1976
 msgid "Append Close with SD failed.\n"
 msgstr ""
 
-#: src/filed/job.c:1938
+#: src/filed/job.c:1980
 #, c-format
 msgid "Bad status %d returned from Storage Daemon.\n"
 msgstr ""
 
-#: src/filed/job.c:1968
+#: src/filed/job.c:2010
 #, c-format
 msgid "2994 Bad verify command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1983 src/filed/job.c:2024
+#: src/filed/job.c:2025 src/filed/job.c:2066
 #, c-format
 msgid "2994 Bad verify level: %s\n"
 msgstr ""
 
-#: src/filed/job.c:2093
+#: src/filed/job.c:2138
 #, c-format
 msgid "Bad replace command. CMD=%s\n"
 msgstr ""
 
-#: src/filed/job.c:2111
+#: src/filed/job.c:2161
 #, c-format
 msgid "Bad where regexp. where=%s\n"
 msgstr ""
 
-#: src/filed/job.c:2154
-#, c-format
-msgid "VSS Writer (PreRestore): %s\n"
-msgstr ""
-
-#: src/filed/job.c:2165
+#: src/filed/job.c:2199
 #, c-format
 msgid "VSS was not initialized properly. VSS support is disabled. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:2207
+#: src/filed/job.c:2244
 #, c-format
 msgid "VSS Writer (RestoreComplete): %s\n"
 msgstr ""
 
-#: src/filed/job.c:2254
+#: src/filed/job.c:2292
 msgid "Improper calling sequence.\n"
 msgstr ""
 
-#: src/filed/job.c:2274
+#: src/filed/job.c:2312
 #, c-format
 msgid "Bad response to SD read open: %s\n"
 msgstr ""
 
-#: src/filed/job.c:2279
+#: src/filed/job.c:2317
 msgid "Bad response from stored to read open command\n"
 msgstr ""
 
-#: src/filed/job.c:2346
+#: src/filed/job.c:2385
 #, c-format
 msgid "Comm error with SD. bad response to %s. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:2349
+#: src/filed/job.c:2388
 #, c-format
 msgid "Bad response to %s command. Wanted %s, got %s\n"
 msgstr ""
 
-#: src/filed/authenticate.c:66
+#: src/filed/authenticate.c:68
 #, c-format
 msgid "I only authenticate directors, not %d\n"
 msgstr ""
 
-#: src/filed/authenticate.c:98
+#: src/filed/authenticate.c:100
 #, c-format
 msgid "Connection from unknown Director %s at %s rejected.\n"
-msgstr "Connexion d'un Director inconnu %s à %s rejeté.\n"
+msgstr "Connexion d'un Director inconnu %s à %s rejeté.\n"
 
-#: src/filed/authenticate.c:142
+#: src/filed/authenticate.c:144
 #, c-format
 msgid "Incorrect password given by Director at %s.\n"
-msgstr "Password incorrect donné par le Director à %s.\n"
+msgstr "Password incorrect donné par le Director à %s.\n"
 
-#: src/filed/authenticate.c:261
+#: src/filed/authenticate.c:263
 msgid ""
 "Authorization key rejected by Storage daemon.\n"
 "Please see "
@@ -18117,7 +18108,7 @@
 msgid "Console: name=%s\n"
 msgstr ""
 
-#: src/qt-console/main.cpp:179
+#: src/qt-console/main.cpp:191
 #, c-format
 msgid ""
 "\n"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/bash.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/bash.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/bash.po	2012-01-02 17:26:42.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/bash.po	2012-02-23 06:31:09.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:09+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:28+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: arrayfunc.c:50
 msgid "bad array subscript"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/bfd.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/bfd.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/bfd.po	2012-01-02 17:26:42.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/bfd.po	2012-02-23 06:31:09.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:11+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:29+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: aout-adobe.c:127
 msgid "%B: Unknown section type in a.out.adobe file: %x\n"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/binutils.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/binutils.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/binutils.po	2012-01-02 17:26:43.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/binutils.po	2012-02-23 06:31:09.000000000 +0000
@@ -10,14 +10,14 @@
 "Project-Id-Version: binutils-2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
 "POT-Creation-Date: 2011-06-02 14:35+0100\n"
-"PO-Revision-Date: 2011-12-13 17:02+0000\n"
+"PO-Revision-Date: 2012-01-27 01:48+0000\n"
 "Last-Translator: Frédéric Marchal <Unknown>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:12+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:29+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: addr2line.c:81
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/bison.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/bison.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/bison.po	2012-01-02 17:26:43.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/bison.po	2012-02-23 06:31:10.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:16+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:32+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: src/complain.c:115 src/complain.c:126 src/complain.c:135 src/complain.c:183
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/bison-runtime.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/bison-runtime.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/bison-runtime.po	2012-01-02 17:26:43.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/bison-runtime.po	2012-02-23 06:31:10.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:17+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:32+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: data/glr.c:923 data/yacc.c:727
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/byobu.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/byobu.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/byobu.po	2012-01-02 17:27:31.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/byobu.po	2012-02-23 06:31:55.000000000 +0000
@@ -7,116 +7,202 @@
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-24 23:42+0000\n"
+"POT-Creation-Date: 2009-11-23 20:48-0600\n"
 "PO-Revision-Date: 2010-12-27 09:12+0000\n"
 "Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 18:27+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:13+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: \n"
 
-#: usr/lib/byobu/menu:37 usr/bin/byobu-config:121 usr/bin/byobu-config:216
-#: usr/bin/byobu-config:222
+#: bin/menu:34 byobu-config:129 byobu-config:401 byobu-config:409
 msgid "Menu"
 msgstr "Menu"
 
-#: usr/bin/byobu-export:25
-msgid ""
-"\n"
-"The byobu-export utility is now deprecated.\n"
-"\n"
-"To install byobu on a system for which byobu is not packaged, or\n"
-"where you are not the root user, simply:\n"
-" * Download the latest release (>= 3.0) from:\n"
-"    https://launchpad.net/byobu/+download\n"
-" * And follow the instructions in the README\n"
-"\n"
+#: byobu-export:68 byobu-export:71 byobu-select-profile:104
+#: byobu-select-profile:107
+msgid "Choose"
+msgstr "Choisir"
+
+#: byobu-export:171
+msgid "File exists"
+msgstr "Le fichier existe."
+
+#: byobu-export:172
+msgid "Remove file? [y/N] "
+msgstr "Supprimer le fichier? [y/N] "
+
+#: byobu-export:199
+msgid "Select a color: "
+msgstr "Choisissez une couleur : "
+
+#: byobu-export:240
+msgid "Profile"
+msgstr "Profil"
+
+#: byobu-export:241
+msgid "Archive"
+msgstr "Archive"
+
+#: byobu-export:243
+msgid "Extract the archive in your home directory on the target system."
 msgstr ""
+"Décompressez l'archive dans votre répertoire personnel (home) sur le système "
+"cible."
 
-#: usr/bin/byobu-select-profile:84
-msgid "ERROR: Invalid selection"
-msgstr "ERREUR : Sélection non valide"
+#: byobu-select-profile:49
+msgid "Error:"
+msgstr "Erreur :"
 
-#: usr/bin/byobu-select-profile:90
-msgid "Select the foreground color: "
-msgstr "Sélectionnez la couleur de premier plan : "
-
-#: usr/bin/byobu-select-profile:93
-msgid "Select the background color: "
-msgstr "Sélectionnez la couleur d'arrière-plan : "
+#: byobu-select-profile:49
+msgid " file exists, but is not a symlink"
+msgstr " fichire existe, mais n'est pas un lien symbolique"
 
-#: usr/bin/byobu-select-profile:107 usr/bin/byobu-select-profile:110
-msgid "Choose"
-msgstr "Choisir"
+#: byobu-select-profile:80
+msgid "Select a screen profile: "
+msgstr "Sélectionnez un profil screen : "
 
-#: usr/bin/byobu-select-profile:118
-msgid "Selected"
+#: byobu-select-profile:97
+msgid "ERROR: Invalid selection"
+msgstr "ERREUR : Sélection non valide"
+
+#: byobu-select-profile:134
+msgid ""
+"If you are using the default set of keybindings, press\\n<F5> to activate "
+"these changes.\\n\\nOtherwise, exit this screen session and start a new one."
 msgstr ""
+"Si vous utilisez la configuration par défaut des raccourcis clavier, appuyez "
+"sur\\n<F5> pour activer ces changements.\\n\\nSinon, quittez cette session "
+"écran et commencez-en une nouvelle."
+
+#: byobu-select-profile:136
+msgid "Run \"byobu\" to activate"
+msgstr "Exécutez \"byobu\" pour activer"
 
-#: usr/bin/byobu-config:88
+#: byobu-config:83
 msgid "Byobu currently launches at login (toggle off)"
 msgstr "Byobu s'exécute actuellement à la connexion (désactiver)"
 
-#: usr/bin/byobu-config:90
+#: byobu-config:85
 msgid "Byobu currently does not launch at login (toggle on)"
 msgstr "Byobu ne s'exécute actuellement pas à la connexion (activer)"
 
-#: usr/bin/byobu-config:92
-msgid "Help -- Quick Start Guide"
-msgstr "Aide -- Guide de Démarrage Rapide"
+#: byobu-config:89
+msgid "Help"
+msgstr "Aide"
+
+#: byobu-config:90
+msgid "Change Byobu's colors"
+msgstr "Changer les couleurs de Byobu"
 
-#: usr/bin/byobu-config:93 usr/bin/byobu-config:197
+#: byobu-config:91
 msgid "Toggle status notifications"
 msgstr "Changer les notification d'état"
 
-#: usr/bin/byobu-config:94 usr/bin/byobu-config:267
+#: byobu-config:92
+msgid "Change keybinding set"
+msgstr "Changer d'ensemble de raccourcis clavier"
+
+#: byobu-config:93
 msgid "Change escape sequence"
 msgstr "Changer la séquence d'échapement"
 
-#: usr/bin/byobu-config:97
+#: byobu-config:94
+msgid "Create new windows"
+msgstr "Créer de nouvelles fenêtres"
+
+#: byobu-config:95
+msgid "Manage default windows"
+msgstr "Gérer les fenêtres par défaut"
+
+#: byobu-config:99 byobu-config:487
 msgid " Byobu Configuration Menu"
 msgstr " Menu de Configuration de Byobu"
 
-#: usr/bin/byobu-config:106
+#: byobu-config:110
 msgid "Okay"
 msgstr "Ok"
 
-#: usr/bin/byobu-config:106 usr/bin/byobu-config:196 usr/bin/byobu-config:266
+#: byobu-config:110 byobu-config:144 byobu-config:161 byobu-config:195
+#: byobu-config:335 byobu-config:376 byobu-config:449
 msgid "Cancel"
 msgstr "Annuler"
 
-#: usr/bin/byobu-config:122
+#: byobu-config:130
 msgid "Byobu Help"
 msgstr "Aide de Byobu"
 
-#: usr/bin/byobu-config:196 usr/bin/byobu-config:266
+#: byobu-config:144 byobu-config:161 byobu-config:195 byobu-config:335
+#: byobu-config:376 byobu-config:449
 msgid "Apply"
 msgstr "Appliquer"
 
-#: usr/bin/byobu-config:215
-msgid "Byobu will not be launched next time you login."
-msgstr ""
-
-#: usr/bin/byobu-config:216
-msgid "Message"
-msgstr "Message"
+#: byobu-config:146
+msgid "Which profile would you like to use?"
+msgstr "Quel profil voudriez-vous utiliser ?"
+
+#: byobu-config:162
+msgid "Which set of keybindings would you like to use?"
+msgstr "Quel ensemble de raccourcis clavier voudriez-vous utiliser ?"
+
+#: byobu-config:175
+msgid "Title: "
+msgstr "Titre : "
+
+#: byobu-config:177
+msgid "Command: "
+msgstr "Commande : "
+
+#: byobu-config:179
+msgid "Presets: "
+msgstr "Pré-réglages : "
+
+#: byobu-config:193
+msgid "Add to default windows"
+msgstr "Ajouter aux fenêtres par défaut"
+
+#: byobu-config:197
+msgid "Create new window(s):"
+msgstr "Créer nouvelle(s) fenêtre(s) :"
+
+#: byobu-config:336
+msgid "Toggle status notifications:"
+msgstr "Changer les notifications d'état :"
+
+#: byobu-config:368
+msgid "Windows:"
+msgstr "Fenêtres :"
+
+#: byobu-config:378
+msgid "Select window(s) to create by default:"
+msgstr "Sélectionner fenêtre(s) à créer par défaut :"
 
-#: usr/bin/byobu-config:221
+#: byobu-config:398
 msgid "Byobu will be launched automatically next time you login."
 msgstr ""
 "Byobu sera lancé automatiquement la prochaine fois que vous vous connecterez."
 
-#: usr/bin/byobu-config:265
+#: byobu-config:406
+msgid "Byobu will not be used next time you login."
+msgstr ""
+"Byobu ne sera pas utilisé la prochaine fois que vous vous connecterez."
+
+#: byobu-config:408
+msgid "Message"
+msgstr "Message"
+
+#: byobu-config:448
 msgid "Escape key: ctrl-"
 msgstr "Séquence d'échapement : ctrl-"
 
-#: usr/bin/byobu-config:315
-msgid "Byobu Configuration Menu"
-msgstr ""
+#: byobu-config:451
+msgid "Change escape sequence:"
+msgstr "Changer la séquence d'échapement :"
 
-#: usr/bin/byobu-config:316
-msgid "<Tab> between elements | <Enter> selects | <Esc> exits"
+#: byobu-config:488
+msgid "<Tab>/<Alt-Tab> between elements | <Enter> selects | <Esc> exits"
 msgstr ""
+"<Tab>/<Alt-Tab> entre les éléments | <Enter> sélectionne | <Esc> quitte"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/bzr.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/bzr.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/bzr.po	2012-01-02 17:27:49.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/bzr.po	2012-02-23 06:32:14.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: bzr\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-12-08 09:21+0100\n"
+"POT-Creation-Date: 2012-01-16 15:18+0100\n"
 "PO-Revision-Date: 2011-12-07 12:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -15,61 +15,61 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-30 01:41+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 06:51+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: bzrlib/add.py:95
 msgid "skipping {0} (larger than {1} of {2} bytes)"
 msgstr ""
 
-#: bzrlib/branch.py:871
+#: bzrlib/branch.py:872
 msgid "Unstacking"
 msgstr "Dépilement"
 
-#: bzrlib/branch.py:3173
+#: bzrlib/branch.py:3205
 #, python-format
 msgid "Pushed up to revision %d."
 msgstr "Publication jusqu'à la révision %d."
 
-#: bzrlib/branch.py:3175
+#: bzrlib/branch.py:3207
 #, python-format
 msgid "%d tag updated."
 msgid_plural "%d tags updated."
 msgstr[0] "%d étiquette mise à jour."
 msgstr[1] "%d étiquettes mises à jour."
 
-#: bzrlib/branch.py:3178
+#: bzrlib/branch.py:3210
 msgid "No new revisions or tags to push."
 msgstr "Pas de nouvelles révisions ou étiquettes à publier."
 
-#: bzrlib/branch.py:3180
+#: bzrlib/branch.py:3212
 msgid "No new revisions to push."
 msgstr "Aucune nouvelle révision à envoyer."
 
-#: bzrlib/branch.py:3200
+#: bzrlib/branch.py:3232
 msgid "checked branch {0} format {1}"
 msgstr ""
 
-#: bzrlib/branch.py:3203
+#: bzrlib/branch.py:3235
 #, python-format
 msgid "found error:%s"
 msgstr "erreur trouvée : %s"
 
-#: bzrlib/builtins.py:118 bzrlib/builtins.py:2868 bzrlib/workingtree.py:304
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
 #, python-format
 msgid "Ignoring files outside view. View is %s"
 msgstr ""
 
-#: bzrlib/builtins.py:127
+#: bzrlib/builtins.py:218
 #, python-format
 msgid "bzr %s --revision takes exactly one revision identifier"
 msgstr ""
 
-#: bzrlib/builtins.py:212
+#: bzrlib/builtins.py:303
 msgid "Display status summary."
 msgstr ""
 
-#: bzrlib/builtins.py:214
+#: bzrlib/builtins.py:305
 msgid ""
 "This reports on versioned and unknown files, reporting them\n"
 "grouped by state.  Possible states are:"
@@ -77,7 +77,7 @@
 "Ceci informe sur les fichiers versionnés et inconnus, regroupés\n"
 "selon leur état. Les différents états sont :"
 
-#: bzrlib/builtins.py:217
+#: bzrlib/builtins.py:308
 msgid ""
 "added\n"
 "    Versioned in the working copy but not in the previous revision."
@@ -85,7 +85,7 @@
 "ajouté\n"
 "    Versionné dans la copie de travail mais pas dans la révision précédente."
 
-#: bzrlib/builtins.py:220
+#: bzrlib/builtins.py:311
 msgid ""
 "removed\n"
 "    Versioned in the previous revision but removed or deleted\n"
@@ -95,7 +95,7 @@
 "    Versionné dans la révision précédente mais enlevé ou supprimé\n"
 "    de la copie de travail."
 
-#: bzrlib/builtins.py:224
+#: bzrlib/builtins.py:315
 msgid ""
 "renamed\n"
 "    Path of this file changed from the previous revision;\n"
@@ -108,7 +108,7 @@
 "dont\n"
 "    le répertoire parent a été renommé."
 
-#: bzrlib/builtins.py:229
+#: bzrlib/builtins.py:320
 msgid ""
 "modified\n"
 "    Text has changed since the previous revision."
@@ -116,7 +116,7 @@
 "modifié\n"
 "    Le texte a été modifié depuis la révision précédente."
 
-#: bzrlib/builtins.py:232
+#: bzrlib/builtins.py:323
 msgid ""
 "kind changed\n"
 "    File kind has been changed (e.g. from file to directory)."
@@ -124,7 +124,7 @@
 "type modifié\n"
 "    le type du fichier a été modifiée (ex. de fichier à répertoire)."
 
-#: bzrlib/builtins.py:235
+#: bzrlib/builtins.py:326
 msgid ""
 "unknown\n"
 "    Not versioned and not matching an ignore pattern."
@@ -132,7 +132,7 @@
 "inconnu\n"
 "    Non versionné et ne correspond pas à une règle d'exclusion."
 
-#: bzrlib/builtins.py:238
+#: bzrlib/builtins.py:329
 msgid ""
 "Additionally for directories, symlinks and files with a changed\n"
 "executable bit, Bazaar indicates their type using a trailing\n"
@@ -140,7 +140,7 @@
 "disabled using the '--no-classify' option."
 msgstr ""
 
-#: bzrlib/builtins.py:243
+#: bzrlib/builtins.py:334
 msgid ""
 "To see ignored files use 'bzr ignored'.  For details on the\n"
 "changes to file texts, use 'bzr diff'."
@@ -149,14 +149,14 @@
 "Pour le détail des modifications sur les fichiers textes,\n"
 "utilisez « bzr diff »."
 
-#: bzrlib/builtins.py:246
+#: bzrlib/builtins.py:337
 msgid ""
 "Note that --short or -S gives status flags for each item, similar\n"
 "to Subversion's status command. To get output similar to svn -q,\n"
 "use bzr status -SV."
 msgstr ""
 
-#: bzrlib/builtins.py:250
+#: bzrlib/builtins.py:341
 msgid ""
 "If no arguments are specified, the status of the entire working\n"
 "directory is shown.  Otherwise, only the status of the specified\n"
@@ -164,7 +164,7 @@
 "is reported for everything inside that directory."
 msgstr ""
 
-#: bzrlib/builtins.py:255
+#: bzrlib/builtins.py:346
 msgid ""
 "Before merges are committed, the pending merge tip revisions are\n"
 "shown. To see all pending merge revisions, use the -v option.\n"
@@ -172,140 +172,140 @@
 "the no-pending option or specify a file/directory."
 msgstr ""
 
-#: bzrlib/builtins.py:260
+#: bzrlib/builtins.py:351
 msgid ""
 "To compare the working directory to a specific revision, pass a\n"
 "single revision to the revision argument."
 msgstr ""
 
-#: bzrlib/builtins.py:263
+#: bzrlib/builtins.py:354
 msgid ""
 "To see which files have changed in a specific revision, or between\n"
 "two revisions, pass a revision range to the revision argument.\n"
 "This will produce the same results as calling 'bzr diff --summarize'."
 msgstr ""
 
-#: bzrlib/builtins.py:272
+#: bzrlib/builtins.py:363
 msgid "Use short status indicators."
 msgstr ""
 
-#: bzrlib/builtins.py:274
+#: bzrlib/builtins.py:365
 msgid "Only show versioned files."
 msgstr ""
 
-#: bzrlib/builtins.py:276
+#: bzrlib/builtins.py:367
 msgid "Don't show pending merges."
 msgstr ""
 
-#: bzrlib/builtins.py:279
+#: bzrlib/builtins.py:370
 msgid "Do not mark object type using indicator."
 msgstr ""
 
-#: bzrlib/builtins.py:294
+#: bzrlib/builtins.py:385
 msgid "bzr status --revision takes exactly one or two revision specifiers"
 msgstr ""
 "bzr status --revision prend exactement un ou deux numéros de révision"
 
-#: bzrlib/builtins.py:338 bzrlib/builtins.py:5024
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
 msgid "You can only supply one of revision_id or --revision"
 msgstr ""
 
-#: bzrlib/builtins.py:341 bzrlib/builtins.py:5026
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
 msgid "You must supply either --revision or a revision_id"
 msgstr ""
 
-#: bzrlib/builtins.py:348
+#: bzrlib/builtins.py:439
 #, python-format
 msgid "Repository %r does not support access to raw revision texts"
 msgstr ""
 
-#: bzrlib/builtins.py:359
+#: bzrlib/builtins.py:450
 msgid "The repository {0} contains no revision {1}."
 msgstr "Le répertoire {0} ne contient aucune révision {1}."
 
-#: bzrlib/builtins.py:366
+#: bzrlib/builtins.py:457
 msgid "You cannot specify a NULL revision."
 msgstr ""
 
-#: bzrlib/builtins.py:458
+#: bzrlib/builtins.py:549
 msgid "Remove the working tree from a given branch/checkout."
 msgstr ""
 
-#: bzrlib/builtins.py:460
+#: bzrlib/builtins.py:551
 msgid ""
 "Since a lightweight checkout is little more than a working tree\n"
 "this will refuse to run against one."
 msgstr ""
 
-#: bzrlib/builtins.py:463
+#: bzrlib/builtins.py:554
 msgid "To re-create the working tree, use \"bzr checkout\"."
 msgstr ""
 
-#: bzrlib/builtins.py:469
+#: bzrlib/builtins.py:560
 msgid ""
 "Remove the working tree even if it has uncommitted or shelved changes."
 msgstr ""
 
-#: bzrlib/builtins.py:483
+#: bzrlib/builtins.py:574
 msgid "No working tree to remove"
 msgstr ""
 
-#: bzrlib/builtins.py:485
+#: bzrlib/builtins.py:576
 msgid "You cannot remove the working tree of a remote path"
 msgstr ""
 
-#: bzrlib/builtins.py:494
+#: bzrlib/builtins.py:585
 msgid "You cannot remove the working tree from a lightweight checkout"
 msgstr ""
 
-#: bzrlib/builtins.py:534
+#: bzrlib/builtins.py:625
 msgid ""
 "The tree does not appear to be corrupt. You probably want \"bzr revert\" "
 "instead. Use \"--force\" if you are sure you want to reset the working tree."
 msgstr ""
 
-#: bzrlib/builtins.py:545
+#: bzrlib/builtins.py:636
 msgid ""
 ", the header appears corrupt, try passing -r -1 to set the state to the last "
 "commit"
 msgstr ""
 
-#: bzrlib/builtins.py:549
+#: bzrlib/builtins.py:640
 msgid "failed to reset the tree state{0}"
 msgstr ""
 
-#: bzrlib/builtins.py:553
+#: bzrlib/builtins.py:644
 msgid "Show current revision number."
 msgstr "Afficher le numéro de la révision actuelle."
 
-#: bzrlib/builtins.py:555
+#: bzrlib/builtins.py:646
 msgid "This is equal to the number of revisions on this branch."
 msgstr ""
 
-#: bzrlib/builtins.py:568
+#: bzrlib/builtins.py:659
 msgid "--tree and --revision can not be used together"
 msgstr ""
 
-#: bzrlib/builtins.py:585 bzrlib/builtins.py:5808
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
 msgid "Tags can only be placed on a single revision, not on a range"
 msgstr ""
 
-#: bzrlib/builtins.py:609
+#: bzrlib/builtins.py:700
 msgid "Show revno of working tree."
 msgstr ""
 
-#: bzrlib/builtins.py:657
+#: bzrlib/builtins.py:748
 msgid "Add specified files or directories."
 msgstr ""
 
-#: bzrlib/builtins.py:659
+#: bzrlib/builtins.py:750
 msgid ""
 "In non-recursive mode, all the named items are added, regardless\n"
 "of whether they were previously ignored.  A warning is given if\n"
 "any of the named files are already versioned."
 msgstr ""
 
-#: bzrlib/builtins.py:663
+#: bzrlib/builtins.py:754
 msgid ""
 "In recursive mode (the default), files are treated the same way\n"
 "but the behaviour for directories is different.  Directories that\n"
@@ -316,19 +316,19 @@
 "directories.  If no names are given '.' is assumed."
 msgstr ""
 
-#: bzrlib/builtins.py:671
+#: bzrlib/builtins.py:762
 msgid ""
 "A warning will be printed when nested trees are encountered,\n"
 "unless they are explicitly ignored."
 msgstr ""
 
-#: bzrlib/builtins.py:674
+#: bzrlib/builtins.py:765
 msgid ""
 "Therefore simply saying 'bzr add' will version all files that\n"
 "are currently unknown."
 msgstr ""
 
-#: bzrlib/builtins.py:677
+#: bzrlib/builtins.py:768
 msgid ""
 "Adding a file whose parent directory is not versioned will\n"
 "implicitly add the parent, and so on up to the root. This means\n"
@@ -336,13 +336,13 @@
 "get added when you add a file in the directory."
 msgstr ""
 
-#: bzrlib/builtins.py:682
+#: bzrlib/builtins.py:773
 msgid ""
 "--dry-run will show which files would be added, but not actually\n"
 "add them."
 msgstr ""
 
-#: bzrlib/builtins.py:685
+#: bzrlib/builtins.py:776
 msgid ""
 "--file-ids-from will try to use the file ids from the supplied path.\n"
 "It looks up ids trying to find a matching parent directory with the\n"
@@ -353,65 +353,69 @@
 "into a subdirectory of this one."
 msgstr ""
 
-#: bzrlib/builtins.py:693
+#: bzrlib/builtins.py:784
 msgid ""
 "Any files matching patterns in the ignore list will not be added\n"
 "unless they are explicitly mentioned."
 msgstr ""
 
-#: bzrlib/builtins.py:696
+#: bzrlib/builtins.py:787
 msgid ""
 "In recursive mode, files larger than the configuration option \n"
 "add.maximum_file_size will be skipped. Named items are never skipped due\n"
 "to file size."
 msgstr ""
 
-#: bzrlib/builtins.py:703
+#: bzrlib/builtins.py:794
 msgid "Don't recursively add the contents of directories."
 msgstr ""
 
-#: bzrlib/builtins.py:709
+#: bzrlib/builtins.py:800
 msgid "Lookup file ids from this tree."
 msgstr ""
 
-#: bzrlib/builtins.py:745
+#: bzrlib/builtins.py:836
 msgid "ignored {0} matching \"{1}\"\n"
 msgstr ""
 
-#: bzrlib/builtins.py:750
+#: bzrlib/builtins.py:841
 msgid "Create a new versioned directory."
 msgstr ""
 
-#: bzrlib/builtins.py:752
+#: bzrlib/builtins.py:843
 msgid "This is equivalent to creating the directory and then adding it."
 msgstr ""
 
-#: bzrlib/builtins.py:767
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
 #, python-format
 msgid "added %s\n"
 msgstr "ajouté %s\n"
 
-#: bzrlib/builtins.py:811
+#: bzrlib/builtins.py:926
 #, python-format
 msgid "invalid kind %r specified"
 msgstr ""
 
-#: bzrlib/builtins.py:848
+#: bzrlib/builtins.py:963
 msgid "Move or rename a file."
 msgstr "Déplacer ou renommer un fichier."
 
-#: bzrlib/builtins.py:850
+#: bzrlib/builtins.py:965
 msgid "    bzr mv SOURCE... DESTINATION"
 msgstr ""
 
-#: bzrlib/builtins.py:852
+#: bzrlib/builtins.py:967
 msgid ""
 "If the last argument is a versioned directory, all the other names\n"
 "are moved into it.  Otherwise, there must be exactly two arguments\n"
 "and the file is changed to a new name."
 msgstr ""
 
-#: bzrlib/builtins.py:856
+#: bzrlib/builtins.py:971
 msgid ""
 "If OLDNAME does not exist on the filesystem but is versioned and\n"
 "NEWNAME does exist on the filesystem but is not versioned, mv\n"
@@ -420,53 +424,53 @@
 "The same is valid when moving many SOURCE files to a DESTINATION."
 msgstr ""
 
-#: bzrlib/builtins.py:862
+#: bzrlib/builtins.py:977
 msgid "Files cannot be moved between branches."
 msgstr ""
 
-#: bzrlib/builtins.py:869
+#: bzrlib/builtins.py:984
 msgid ""
 "Move only the bzr identifier of the file, because the file has already been "
 "moved."
 msgstr ""
 
-#: bzrlib/builtins.py:871
+#: bzrlib/builtins.py:986
 msgid "Automatically guess renames."
 msgstr ""
 
-#: bzrlib/builtins.py:872
+#: bzrlib/builtins.py:987
 msgid "Avoid making changes when guessing renames."
 msgstr ""
 
-#: bzrlib/builtins.py:881
+#: bzrlib/builtins.py:996
 msgid "--dry-run requires --auto."
 msgstr ""
 
-#: bzrlib/builtins.py:885
+#: bzrlib/builtins.py:1000
 msgid "missing file argument"
 msgstr ""
 
-#: bzrlib/builtins.py:889
+#: bzrlib/builtins.py:1004
 msgid "can not move root of branch"
 msgstr ""
 
-#: bzrlib/builtins.py:895
+#: bzrlib/builtins.py:1010
 msgid "Only one path may be specified to --auto."
 msgstr ""
 
-#: bzrlib/builtins.py:898
+#: bzrlib/builtins.py:1013
 msgid "--after cannot be specified with --auto."
 msgstr ""
 
-#: bzrlib/builtins.py:935
+#: bzrlib/builtins.py:1050
 msgid "to mv multiple files the destination must be a versioned directory"
 msgstr ""
 
-#: bzrlib/builtins.py:987
+#: bzrlib/builtins.py:1102
 msgid "Turn this branch into a mirror of another branch."
 msgstr ""
 
-#: bzrlib/builtins.py:989
+#: bzrlib/builtins.py:1104
 msgid ""
 "By default, this command only works on branches that have not diverged.\n"
 "Branches are considered diverged if the destination branch's most recent \n"
@@ -474,21 +478,21 @@
 "parent."
 msgstr ""
 
-#: bzrlib/builtins.py:994
+#: bzrlib/builtins.py:1109
 msgid ""
 "If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
 "from one into the other.  Once one branch has merged, the other should\n"
 "be able to pull it again."
 msgstr ""
 
-#: bzrlib/builtins.py:998
+#: bzrlib/builtins.py:1113
 msgid ""
 "If you want to replace your local changes and just want your branch to\n"
 "match the remote one, use pull --overwrite. This will work even if the two\n"
 "branches have diverged."
 msgstr ""
 
-#: bzrlib/builtins.py:1002
+#: bzrlib/builtins.py:1117
 msgid ""
 "If there is no default location set, the first pull will set it (use\n"
 "--no-remember to avoid setting it). After that, you can omit the\n"
@@ -496,89 +500,89 @@
 "value will only be saved if the remote location can be accessed."
 msgstr ""
 
-#: bzrlib/builtins.py:1007
+#: bzrlib/builtins.py:1122
 msgid ""
 "The --verbose option will display the revisions pulled using the log_format\n"
 "configuration option. You can use a different format by overriding it with\n"
 "-Olog_format=<other_format>."
 msgstr ""
 
-#: bzrlib/builtins.py:1011
+#: bzrlib/builtins.py:1126
 msgid ""
 "Note: The location can be specified either in the form of a branch,\n"
 "or in the form of a path to a file containing a merge directive generated\n"
 "with bzr send."
 msgstr ""
 
-#: bzrlib/builtins.py:1019
+#: bzrlib/builtins.py:1134
 msgid "Show logs of pulled revisions."
 msgstr ""
 
-#: bzrlib/builtins.py:1021
+#: bzrlib/builtins.py:1136
 msgid ""
 "Branch to pull into, rather than the one containing the working directory."
 msgstr ""
 
-#: bzrlib/builtins.py:1024
+#: bzrlib/builtins.py:1139
 msgid ""
 "Perform a local pull in a bound branch.  Local pulls are not applied to the "
 "master branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1053
+#: bzrlib/builtins.py:1168
 msgid "Need working tree for --show-base."
 msgstr ""
 
-#: bzrlib/builtins.py:1069
+#: bzrlib/builtins.py:1184
 msgid "No pull location known or specified."
 msgstr ""
 
-#: bzrlib/builtins.py:1075
+#: bzrlib/builtins.py:1190
 #, python-format
 msgid "Using saved parent location: %s\n"
 msgstr ""
 
-#: bzrlib/builtins.py:1082 bzrlib/builtins.py:4234
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
 msgid "Cannot use -r with merge directives or bundles"
 msgstr ""
 
-#: bzrlib/builtins.py:1123
+#: bzrlib/builtins.py:1238
 msgid "Update a mirror of this branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1125
+#: bzrlib/builtins.py:1240
 msgid ""
 "The target branch will not have its working tree populated because this\n"
 "is both expensive, and is not supported on remote file systems."
 msgstr ""
 
-#: bzrlib/builtins.py:1128
+#: bzrlib/builtins.py:1243
 msgid ""
 "Some smart servers or protocols *may* put the working tree in place in\n"
 "the future."
 msgstr ""
 
-#: bzrlib/builtins.py:1131
+#: bzrlib/builtins.py:1246
 msgid ""
 "This command only works on branches that have not diverged.  Branches are\n"
 "considered diverged if the destination branch's most recent commit is one\n"
 "that has not been merged (directly or indirectly) by the source branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1135
+#: bzrlib/builtins.py:1250
 msgid ""
 "If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
 "the other branch completely, discarding its unmerged changes."
 msgstr ""
 
-#: bzrlib/builtins.py:1138
+#: bzrlib/builtins.py:1253
 msgid ""
 "If you want to ensure you have the different changes in the other branch,\n"
 "do a merge (see bzr help merge) from the other branch, and commit that.\n"
 "After that you will be able to do a push without '--overwrite'."
 msgstr ""
 
-#: bzrlib/builtins.py:1142
+#: bzrlib/builtins.py:1257
 msgid ""
 "If there is no default push location set, the first push will set it (use\n"
 "--no-remember to avoid setting it).  After that, you can omit the\n"
@@ -586,54 +590,72 @@
 "value will only be saved if the remote location can be accessed."
 msgstr ""
 
-#: bzrlib/builtins.py:1147
+#: bzrlib/builtins.py:1262
 msgid ""
 "The --verbose option will display the revisions pushed using the log_format\n"
 "configuration option. You can use a different format by overriding it with\n"
 "-Olog_format=<other_format>."
 msgstr ""
 
-#: bzrlib/builtins.py:1161
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
 msgid ""
 "By default push will fail if the target directory exists, but does not "
 "already have a control directory.  This flag will allow push to proceed."
 msgstr ""
 
-#: bzrlib/builtins.py:1166
+#: bzrlib/builtins.py:1281
 msgid ""
 "Create a stacked branch that references the public location of the parent "
 "branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1169
+#: bzrlib/builtins.py:1284
 msgid ""
 "Create a stacked branch that refers to another branch for the commit "
 "history. Only the work not present in the referenced branch is included in "
 "the branch created."
 msgstr ""
 
-#: bzrlib/builtins.py:1177
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
 msgid "Don't populate the working tree, even for protocols that support it."
 msgstr ""
 
-#: bzrlib/builtins.py:1221
+#: bzrlib/builtins.py:1336
 msgid "Could not determine branch to refer to."
 msgstr ""
 
-#: bzrlib/builtins.py:1228 bzrlib/foreign.py:305
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
 msgid "No push location known or specified."
 msgstr ""
 
-#: bzrlib/builtins.py:1232
+#: bzrlib/builtins.py:1355
 #, python-format
 msgid "Using saved push location: %s"
 msgstr ""
 
-#: bzrlib/builtins.py:1242
+#: bzrlib/builtins.py:1365
 msgid "Create a new branch that is a copy of an existing branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1244
+#: bzrlib/builtins.py:1367
 msgid ""
 "If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
 "be used.  In other words, \"branch ../foo/bar\" will attempt to create "
@@ -644,105 +666,105 @@
 "create ./foo-bar."
 msgstr ""
 
-#: bzrlib/builtins.py:1251
+#: bzrlib/builtins.py:1374
 msgid ""
 "To retrieve the branch as of a particular revision, supply the --revision\n"
 "parameter, as in \"branch foo/bar -r 5\"."
 msgstr ""
 
-#: bzrlib/builtins.py:1254
+#: bzrlib/builtins.py:1377
 msgid "The synonyms 'clone' and 'get' for this command are deprecated."
 msgstr ""
 
-#: bzrlib/builtins.py:1264
+#: bzrlib/builtins.py:1387
 msgid "Create a branch without a working-tree."
 msgstr ""
 
-#: bzrlib/builtins.py:1266
+#: bzrlib/builtins.py:1389
 msgid "Switch the checkout in the current directory to the new branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1269
+#: bzrlib/builtins.py:1392
 msgid ""
 "Create a stacked branch referring to the source branch. The new branch will "
 "depend on the availability of the source branch for all operations."
 msgstr ""
 
-#: bzrlib/builtins.py:1273
+#: bzrlib/builtins.py:1396
 msgid "Do not use a shared repository, even if available."
 msgstr ""
 
-#: bzrlib/builtins.py:1275
+#: bzrlib/builtins.py:1398
 msgid ""
 "By default branch will fail if the target directory exists, but does not "
 "already have a control directory.  This flag will allow branch to proceed."
 msgstr ""
 
-#: bzrlib/builtins.py:1280
+#: bzrlib/builtins.py:1403
 msgid "Bind new branch to from location."
 msgstr ""
 
-#: bzrlib/builtins.py:1327
+#: bzrlib/builtins.py:1450
 #, python-format
 msgid "Target directory \"%s\" already exists."
 msgstr ""
 
-#: bzrlib/builtins.py:1339
+#: bzrlib/builtins.py:1462
 #, python-format
 msgid "Parent of \"%s\" does not exist."
 msgstr ""
 
-#: bzrlib/builtins.py:1358
+#: bzrlib/builtins.py:1481
 msgid "The branch {0} has no revision {1}."
 msgstr ""
 
-#: bzrlib/builtins.py:1368 bzrlib/push.py:51
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
 #, python-format
 msgid "Created new stacked branch referring to %s."
 msgstr ""
 
-#: bzrlib/builtins.py:1372
+#: bzrlib/builtins.py:1500
 #, python-format
 msgid "Branched %d revision."
 msgid_plural "Branched %d revisions."
 msgstr[0] ""
 msgstr[1] ""
 
-#: bzrlib/builtins.py:1377
+#: bzrlib/builtins.py:1505
 #, python-format
 msgid "New branch bound to %s"
 msgstr ""
 
-#: bzrlib/builtins.py:1382 bzrlib/builtins.py:6121
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
 #, python-format
 msgid "Switched to branch: %s"
 msgstr ""
 
-#: bzrlib/builtins.py:1387
+#: bzrlib/builtins.py:1515
 msgid "List the branches available at the current location."
 msgstr ""
 
-#: bzrlib/builtins.py:1389
+#: bzrlib/builtins.py:1517
 msgid ""
 "This command will print the names of all the branches at the current\n"
 "location."
 msgstr ""
 
-#: bzrlib/builtins.py:1396
+#: bzrlib/builtins.py:1524
 msgid ""
 "Recursively scan for branches rather than just looking in the specified "
 "location."
 msgstr ""
 
-#: bzrlib/builtins.py:1413
-msgid " (default)\n"
+#: bzrlib/builtins.py:1554
+msgid "(default)"
 msgstr ""
 
-#: bzrlib/builtins.py:1420
+#: bzrlib/builtins.py:1566
 msgid "Create a new checkout of an existing branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1422
+#: bzrlib/builtins.py:1568
 msgid ""
 "If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
 "for\n"
@@ -752,7 +774,7 @@
 "location using SFTP."
 msgstr ""
 
-#: bzrlib/builtins.py:1427
+#: bzrlib/builtins.py:1573
 msgid ""
 "If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
 "will\n"
@@ -764,7 +786,7 @@
 "create ./foo-bar."
 msgstr ""
 
-#: bzrlib/builtins.py:1434
+#: bzrlib/builtins.py:1580
 msgid ""
 "To retrieve the branch as of a particular revision, supply the --revision\n"
 "parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
@@ -774,7 +796,7 @@
 "code.)"
 msgstr ""
 
-#: bzrlib/builtins.py:1444
+#: bzrlib/builtins.py:1590
 msgid ""
 "Perform a lightweight checkout.  Lightweight checkouts depend on access to "
 "the branch for every operation.  Normal checkouts can perform common "
@@ -782,38 +804,38 @@
 "commits."
 msgstr ""
 
-#: bzrlib/builtins.py:1451
+#: bzrlib/builtins.py:1597
 msgid "Get file contents from this tree."
 msgstr ""
 
-#: bzrlib/builtins.py:1453
+#: bzrlib/builtins.py:1599
 msgid "Hard-link working tree files where possible."
 msgstr ""
 
-#: bzrlib/builtins.py:1494
+#: bzrlib/builtins.py:1640
 msgid ""
 "Show list of renamed files.\n"
 "    "
 msgstr ""
 
-#: bzrlib/builtins.py:1524
+#: bzrlib/builtins.py:1670
 msgid "Update a working tree to a new revision."
 msgstr ""
 
-#: bzrlib/builtins.py:1526
+#: bzrlib/builtins.py:1672
 msgid ""
 "This will perform a merge of the destination revision (the tip of the\n"
 "branch, or the specified revision) into the working tree, and then make\n"
 "that revision the basis revision for the working tree.  "
 msgstr ""
 
-#: bzrlib/builtins.py:1530
+#: bzrlib/builtins.py:1676
 msgid ""
 "You can use this to visit an older revision, or to update a working tree\n"
 "that is out of date from its branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1533
+#: bzrlib/builtins.py:1679
 msgid ""
 "If there are any uncommitted changes in the tree, they will be carried\n"
 "across and remain as uncommitted changes after the update.  To discard\n"
@@ -821,13 +843,13 @@
 "with the changes brought in by the change in basis revision."
 msgstr ""
 
-#: bzrlib/builtins.py:1538
+#: bzrlib/builtins.py:1684
 msgid ""
 "If the tree's branch is bound to a master branch, bzr will also update\n"
 "the branch from the master."
 msgstr ""
 
-#: bzrlib/builtins.py:1541
+#: bzrlib/builtins.py:1687
 msgid ""
 "You cannot update just a single file or directory, because each Bazaar\n"
 "working tree has just a single basis revision.  If you want to restore a\n"
@@ -837,95 +859,100 @@
 "out the old content of that file to a new location."
 msgstr ""
 
-#: bzrlib/builtins.py:1548
+#: bzrlib/builtins.py:1694
 msgid ""
 "The 'dir' argument, if given, must be the location of the root of a\n"
 "working tree to update.  By default, the working tree that contains the \n"
 "current working directory is used."
 msgstr ""
 
-#: bzrlib/builtins.py:1564
+#: bzrlib/builtins.py:1710
 msgid "bzr update --revision takes exactly one revision"
 msgstr ""
 
-#: bzrlib/builtins.py:1572
+#: bzrlib/builtins.py:1718
 msgid "bzr update can only update a whole tree, not a file or subdirectory"
 msgstr ""
 
-#: bzrlib/builtins.py:1603
+#: bzrlib/builtins.py:1749
 msgid "Tree is up to date at revision {0} of branch {1}"
 msgstr ""
 
-#: bzrlib/builtins.py:1619
+#: bzrlib/builtins.py:1765
 #, python-format
 msgid ""
 "branch has no revision %s\n"
 "bzr update --revision only works for a revision in the branch history"
 msgstr ""
 
-#: bzrlib/builtins.py:1625
+#: bzrlib/builtins.py:1771
 msgid "Updated to revision {0} of branch {1}"
 msgstr ""
 
-#: bzrlib/builtins.py:1629
+#: bzrlib/builtins.py:1775
 msgid ""
 "Your local commits will now show as pending merges with 'bzr status', and "
 "can be committed with 'bzr commit'."
 msgstr ""
 
-#: bzrlib/builtins.py:1638
+#: bzrlib/builtins.py:1784
 msgid "Show information about a working tree, branch or repository."
 msgstr ""
 
-#: bzrlib/builtins.py:1640
+#: bzrlib/builtins.py:1786
 msgid ""
 "This command will show all known locations and formats associated to the\n"
 "tree, branch or repository."
 msgstr ""
 
-#: bzrlib/builtins.py:1643
+#: bzrlib/builtins.py:1789
 msgid ""
 "In verbose mode, statistical information is included with each report.\n"
 "To see extended statistic information, use a verbosity level of 2 or\n"
 "higher by specifying the verbose option multiple times, e.g. -vv."
 msgstr ""
 
-#: bzrlib/builtins.py:1647
+#: bzrlib/builtins.py:1793
 msgid "Branches and working trees will also report any missing revisions."
 msgstr ""
 
-#: bzrlib/builtins.py:1651
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
 msgid "  Display information on the format and related locations:"
 msgstr ""
 
-#: bzrlib/builtins.py:1653
+#: bzrlib/builtins.py:1799
 msgid "    bzr info"
 msgstr ""
 
-#: bzrlib/builtins.py:1655
+#: bzrlib/builtins.py:1801
 msgid ""
 "  Display the above together with extended format information and\n"
 "  basic statistics (like the number of files in the working tree and\n"
 "  number of revisions in the branch and repository):"
 msgstr ""
 
-#: bzrlib/builtins.py:1659
+#: bzrlib/builtins.py:1805
 msgid "    bzr info -v"
 msgstr ""
 
-#: bzrlib/builtins.py:1661
+#: bzrlib/builtins.py:1807
 msgid "  Display the above together with number of committers to the branch:"
 msgstr ""
 
-#: bzrlib/builtins.py:1663
+#: bzrlib/builtins.py:1809
 msgid "    bzr info -vv"
 msgstr ""
 
-#: bzrlib/builtins.py:1682
+#: bzrlib/builtins.py:1828
 msgid "Remove files or directories."
 msgstr ""
 
-#: bzrlib/builtins.py:1684
+#: bzrlib/builtins.py:1830
 msgid ""
 "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
 "delete them if they can easily be recovered using revert otherwise they\n"
@@ -934,49 +961,49 @@
 "Bazaar but missing in your tree and stop tracking them for you."
 msgstr ""
 
-#: bzrlib/builtins.py:1692
+#: bzrlib/builtins.py:1838
 msgid "Only remove files that have never been committed."
 msgstr ""
 
-#: bzrlib/builtins.py:1694
+#: bzrlib/builtins.py:1840
 msgid "The file deletion mode to be used."
 msgstr ""
 
-#: bzrlib/builtins.py:1695
+#: bzrlib/builtins.py:1841
 msgid "Deletion Strategy"
 msgstr ""
 
-#: bzrlib/builtins.py:1696
+#: bzrlib/builtins.py:1842
 msgid "Backup changed files (default)."
 msgstr ""
 
-#: bzrlib/builtins.py:1697
+#: bzrlib/builtins.py:1843
 msgid "Delete from bzr but leave the working copy."
 msgstr ""
 
-#: bzrlib/builtins.py:1698
+#: bzrlib/builtins.py:1844
 msgid "Don't backup changed files."
 msgstr ""
 
-#: bzrlib/builtins.py:1699
+#: bzrlib/builtins.py:1845
 msgid ""
 "Delete all the specified files, even if they can not be recovered and even "
 "if they are non-empty directories. (deprecated, use no-backup)"
 msgstr ""
 
-#: bzrlib/builtins.py:1708
+#: bzrlib/builtins.py:1854
 msgid "(The --force option is deprecated, rather use --no-backup in future.)"
 msgstr ""
 
-#: bzrlib/builtins.py:1725
+#: bzrlib/builtins.py:1871
 msgid "No matching files."
 msgstr ""
 
-#: bzrlib/builtins.py:1786
+#: bzrlib/builtins.py:1932
 msgid "Reconcile bzr metadata in a branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1788
+#: bzrlib/builtins.py:1934
 msgid ""
 "This can correct data mismatches that may have been caused by\n"
 "previous ghost operations or bzr upgrades. You should only\n"
@@ -984,7 +1011,7 @@
 "advises you to run it."
 msgstr ""
 
-#: bzrlib/builtins.py:1793
+#: bzrlib/builtins.py:1939
 msgid ""
 "If a second branch is provided, cross-branch reconciliation is\n"
 "also attempted, which will check that data like the tree root\n"
@@ -992,44 +1019,44 @@
 "correctly in both branches."
 msgstr ""
 
-#: bzrlib/builtins.py:1798
+#: bzrlib/builtins.py:1944
 msgid ""
 "At the same time it is run it may recompress data resulting in\n"
 "a potential saving in disk space or performance gain."
 msgstr ""
 
-#: bzrlib/builtins.py:1801
+#: bzrlib/builtins.py:1947
 msgid "The branch *MUST* be on a listable system such as local disk or sftp."
 msgstr ""
 
-#: bzrlib/builtins.py:1868
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
 msgid ""
 "Format for the bzr 2.0 series.\n"
 "Uses group-compress storage.\n"
 "Provides rich roots which are a one-way transition.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:1868
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
 msgid ""
 "Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
 "bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
 msgstr ""
 
-#: bzrlib/builtins.py:1868
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
 msgid "The 2a format with experimental support for colocated branches.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:1869
+#: bzrlib/builtins.py:2015
 msgid "Make a directory into a versioned branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1871
+#: bzrlib/builtins.py:2017
 msgid ""
 "Use this to create an empty branch, or before importing an\n"
 "existing project."
 msgstr ""
 
-#: bzrlib/builtins.py:1874
+#: bzrlib/builtins.py:2020
 msgid ""
 "If there is a repository in a parent directory of the location, then\n"
 "the history of the branch will be stored in the repository.  Otherwise\n"
@@ -1037,17 +1064,17 @@
 "in the .bzr directory."
 msgstr ""
 
-#: bzrlib/builtins.py:1879
+#: bzrlib/builtins.py:2025
 msgid ""
 "If there is already a branch at the location but it has no working tree,\n"
 "the tree can be populated with 'bzr checkout'."
 msgstr ""
 
-#: bzrlib/builtins.py:1882
+#: bzrlib/builtins.py:2028
 msgid "Recipe for importing a tree of files::"
 msgstr ""
 
-#: bzrlib/builtins.py:1884
+#: bzrlib/builtins.py:2030
 msgid ""
 "    cd ~/project\n"
 "    bzr init\n"
@@ -1056,50 +1083,50 @@
 "    bzr commit -m \"imported project\""
 msgstr ""
 
-#: bzrlib/builtins.py:1895
+#: bzrlib/builtins.py:2041
 msgid ""
 "Create the path leading up to the branch if it does not already exist."
 msgstr ""
 
-#: bzrlib/builtins.py:1898
+#: bzrlib/builtins.py:2044
 msgid "Specify a format for this branch. See \"help formats\"."
 msgstr ""
 
-#: bzrlib/builtins.py:1906
+#: bzrlib/builtins.py:2052
 msgid ""
 "Never change revnos or the existing log.  Append revisions to it only."
 msgstr ""
 
-#: bzrlib/builtins.py:1909
+#: bzrlib/builtins.py:2055
 msgid "Create a branch without a working tree."
 msgstr ""
 
-#: bzrlib/builtins.py:1929 bzrlib/push.py:108
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
 #, python-format
 msgid ""
 "Parent directory of %s does not exist.\n"
 "You may supply --create-prefix to create all leading parent directories."
 msgstr ""
 
-#: bzrlib/builtins.py:1963
+#: bzrlib/builtins.py:2109
 msgid ""
 "This branch format cannot be set to append-revisions-only.  Try --default."
 msgstr ""
 
-#: bzrlib/builtins.py:1974
+#: bzrlib/builtins.py:2120
 msgid "Created a {0} (format: {1})\n"
 msgstr ""
 
-#: bzrlib/builtins.py:1983
+#: bzrlib/builtins.py:2129
 #, python-format
 msgid "Using shared repository: %s\n"
 msgstr ""
 
-#: bzrlib/builtins.py:1987
+#: bzrlib/builtins.py:2133
 msgid "Create a shared repository for branches to share storage space."
 msgstr ""
 
-#: bzrlib/builtins.py:1989
+#: bzrlib/builtins.py:2135
 msgid ""
 "New branches created under the repository directory will store their\n"
 "revisions in the repository, not in the branch directory.  For branches\n"
@@ -1107,7 +1134,7 @@
 "speeds up the creation of new branches."
 msgstr ""
 
-#: bzrlib/builtins.py:1994
+#: bzrlib/builtins.py:2140
 msgid ""
 "If the --no-trees option is given then the branches in the repository\n"
 "will not have working trees by default.  They will still exist as \n"
@@ -1117,47 +1144,47 @@
 "branches, such as on a server."
 msgstr ""
 
-#: bzrlib/builtins.py:2001
+#: bzrlib/builtins.py:2147
 msgid ""
 ":Examples:\n"
 "    Create a shared repository holding just branches::"
 msgstr ""
 
-#: bzrlib/builtins.py:2004
+#: bzrlib/builtins.py:2150
 msgid ""
 "        bzr init-repo --no-trees repo\n"
 "        bzr init repo/trunk"
 msgstr ""
 
-#: bzrlib/builtins.py:2007
+#: bzrlib/builtins.py:2153
 msgid "    Make a lightweight checkout elsewhere::"
 msgstr ""
 
-#: bzrlib/builtins.py:2009
+#: bzrlib/builtins.py:2155
 msgid ""
 "        bzr checkout --lightweight repo/trunk trunk-checkout\n"
 "        cd trunk-checkout\n"
 "        (add files here)"
 msgstr ""
 
-#: bzrlib/builtins.py:2017
+#: bzrlib/builtins.py:2163
 msgid ""
 "Specify a format for this repository. See \"bzr help formats\" for details."
 msgstr ""
 
-#: bzrlib/builtins.py:2021
+#: bzrlib/builtins.py:2167
 msgid "Repository format"
 msgstr ""
 
-#: bzrlib/builtins.py:2023
+#: bzrlib/builtins.py:2169
 msgid "Branches in the repository will default to not having a working tree."
 msgstr ""
 
-#: bzrlib/builtins.py:2047
+#: bzrlib/builtins.py:2195
 msgid "Show differences in the working tree, between revisions or branches."
 msgstr ""
 
-#: bzrlib/builtins.py:2049
+#: bzrlib/builtins.py:2197
 msgid ""
 "If no arguments are given, all changes for the current tree are listed.\n"
 "If files are given, only the changes in those files are listed.\n"
@@ -1167,13 +1194,13 @@
 "given."
 msgstr ""
 
-#: bzrlib/builtins.py:2056
+#: bzrlib/builtins.py:2204
 msgid ""
 "\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
 "produces patches suitable for \"patch -p1\"."
 msgstr ""
 
-#: bzrlib/builtins.py:2059
+#: bzrlib/builtins.py:2207
 msgid ""
 "Note that when using the -r argument with a range of revisions, the\n"
 "differences are computed between the two specified revisions.  That\n"
@@ -1183,7 +1210,7 @@
 "in the range."
 msgstr ""
 
-#: bzrlib/builtins.py:2066
+#: bzrlib/builtins.py:2214
 msgid ""
 ":Exit values:\n"
 "    1 - changed\n"
@@ -1192,113 +1219,113 @@
 "    0 - no change"
 msgstr ""
 
-#: bzrlib/builtins.py:2072
+#: bzrlib/builtins.py:2220
 msgid ""
 ":Examples:\n"
 "    Shows the difference in the working tree versus the last commit::"
 msgstr ""
 
-#: bzrlib/builtins.py:2075
+#: bzrlib/builtins.py:2223
 msgid "        bzr diff"
 msgstr ""
 
-#: bzrlib/builtins.py:2077
+#: bzrlib/builtins.py:2225
 msgid "    Difference between the working tree and revision 1::"
 msgstr ""
 
-#: bzrlib/builtins.py:2079
+#: bzrlib/builtins.py:2227
 msgid "        bzr diff -r1"
 msgstr ""
 
-#: bzrlib/builtins.py:2081
+#: bzrlib/builtins.py:2229
 msgid "    Difference between revision 3 and revision 1::"
 msgstr ""
 
-#: bzrlib/builtins.py:2083
+#: bzrlib/builtins.py:2231
 msgid "        bzr diff -r1..3"
 msgstr ""
 
-#: bzrlib/builtins.py:2085
+#: bzrlib/builtins.py:2233
 msgid "    Difference between revision 3 and revision 1 for branch xxx::"
 msgstr ""
 
-#: bzrlib/builtins.py:2087
+#: bzrlib/builtins.py:2235
 msgid "        bzr diff -r1..3 xxx"
 msgstr ""
 
-#: bzrlib/builtins.py:2089
+#: bzrlib/builtins.py:2237
 msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
 msgstr ""
 
-#: bzrlib/builtins.py:2091
+#: bzrlib/builtins.py:2239
 msgid "        bzr diff -c2"
 msgstr ""
 
-#: bzrlib/builtins.py:2093
+#: bzrlib/builtins.py:2241
 msgid ""
 "    To see the changes introduced by revision X::\n"
 "    \n"
 "        bzr diff -cX"
 msgstr ""
 
-#: bzrlib/builtins.py:2097
+#: bzrlib/builtins.py:2245
 msgid ""
 "    Note that in the case of a merge, the -c option shows the changes\n"
 "    compared to the left hand parent. To see the changes against\n"
 "    another parent, use::"
 msgstr ""
 
-#: bzrlib/builtins.py:2101
+#: bzrlib/builtins.py:2249
 msgid "        bzr diff -r<chosen_parent>..X"
 msgstr ""
 
-#: bzrlib/builtins.py:2103
+#: bzrlib/builtins.py:2251
 msgid ""
 "    The changes between the current revision and the previous revision\n"
 "    (equivalent to -c-1 and -r-2..-1)"
 msgstr ""
 
-#: bzrlib/builtins.py:2106
+#: bzrlib/builtins.py:2254
 msgid "        bzr diff -r-2.."
 msgstr ""
 
-#: bzrlib/builtins.py:2108
+#: bzrlib/builtins.py:2256
 msgid "    Show just the differences for file NEWS::"
 msgstr ""
 
-#: bzrlib/builtins.py:2110
+#: bzrlib/builtins.py:2258
 msgid "        bzr diff NEWS"
 msgstr ""
 
-#: bzrlib/builtins.py:2112
+#: bzrlib/builtins.py:2260
 msgid "    Show the differences in working tree xxx for file NEWS::"
 msgstr ""
 
-#: bzrlib/builtins.py:2114
+#: bzrlib/builtins.py:2262
 msgid "        bzr diff xxx/NEWS"
 msgstr ""
 
-#: bzrlib/builtins.py:2116
+#: bzrlib/builtins.py:2264
 msgid "    Show the differences from branch xxx to this working tree:"
 msgstr ""
 
-#: bzrlib/builtins.py:2118
+#: bzrlib/builtins.py:2266
 msgid "        bzr diff --old xxx"
 msgstr ""
 
-#: bzrlib/builtins.py:2120
+#: bzrlib/builtins.py:2268
 msgid "    Show the differences between two branches for file NEWS::"
 msgstr ""
 
-#: bzrlib/builtins.py:2122
+#: bzrlib/builtins.py:2270
 msgid "        bzr diff --old xxx --new yyy NEWS"
 msgstr ""
 
-#: bzrlib/builtins.py:2124
+#: bzrlib/builtins.py:2272
 msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
 msgstr ""
 
-#: bzrlib/builtins.py:2126
+#: bzrlib/builtins.py:2274
 msgid ""
 "        bzr diff --prefix old/:new/\n"
 "        \n"
@@ -1307,78 +1334,78 @@
 "        bzr diff --using /usr/bin/diff --diff-options -wu"
 msgstr ""
 
-#: bzrlib/builtins.py:2136
+#: bzrlib/builtins.py:2284
 msgid "Pass these options to the external diff program."
 msgstr ""
 
-#: bzrlib/builtins.py:2139
+#: bzrlib/builtins.py:2287
 msgid ""
 "Set prefixes added to old and new filenames, as two values separated by a "
 "colon. (eg \"old/:new/\")."
 msgstr ""
 
-#: bzrlib/builtins.py:2142
+#: bzrlib/builtins.py:2290
 msgid "Branch/tree to compare from."
 msgstr ""
 
-#: bzrlib/builtins.py:2146
+#: bzrlib/builtins.py:2294
 msgid "Branch/tree to compare to."
 msgstr ""
 
-#: bzrlib/builtins.py:2152
+#: bzrlib/builtins.py:2300
 msgid "Use this command to compare files."
 msgstr ""
 
-#: bzrlib/builtins.py:2157
+#: bzrlib/builtins.py:2305
 msgid "Diff format to use."
 msgstr ""
 
-#: bzrlib/builtins.py:2159
+#: bzrlib/builtins.py:2307
 msgid "Diff format"
 msgstr ""
 
-#: bzrlib/builtins.py:2181
+#: bzrlib/builtins.py:2329
 msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
 msgstr ""
 
-#: bzrlib/builtins.py:2185
+#: bzrlib/builtins.py:2333
 msgid "bzr diff --revision takes exactly one or two revision specifiers"
 msgstr ""
 
-#: bzrlib/builtins.py:2190 bzrlib/builtins.py:2588 bzrlib/builtins.py:2601
-#: bzrlib/builtins.py:2609 bzrlib/builtins.py:4760
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
 msgid "{0} and {1} are mutually exclusive"
 msgstr ""
 
-#: bzrlib/builtins.py:2210
+#: bzrlib/builtins.py:2358
 msgid ""
 "List files deleted in the working tree.\n"
 "    "
 msgstr ""
 
-#: bzrlib/builtins.py:2288
+#: bzrlib/builtins.py:2436
 msgid "Show the tree root directory."
 msgstr ""
 
-#: bzrlib/builtins.py:2290
+#: bzrlib/builtins.py:2438
 msgid ""
 "The root is the nearest enclosing directory with a .bzr control\n"
 "directory."
 msgstr ""
 
-#: bzrlib/builtins.py:2305
+#: bzrlib/builtins.py:2453
 msgid "The limit argument must be an integer."
 msgstr ""
 
-#: bzrlib/builtins.py:2313
+#: bzrlib/builtins.py:2461
 msgid "The levels argument must be an integer."
 msgstr ""
 
-#: bzrlib/builtins.py:2318
+#: bzrlib/builtins.py:2466
 msgid "Show historical log for a branch or subset of a branch."
 msgstr ""
 
-#: bzrlib/builtins.py:2320
+#: bzrlib/builtins.py:2468
 msgid ""
 "log is bzr's default tool for exploring the history of a branch.\n"
 "The branch to use is taken from the first parameter. If no parameters\n"
@@ -1386,14 +1413,14 @@
 "Here are some simple examples::"
 msgstr ""
 
-#: bzrlib/builtins.py:2325
+#: bzrlib/builtins.py:2473
 msgid ""
 "  bzr log                       log the current branch\n"
 "  bzr log foo.py                log a file in its branch\n"
 "  bzr log http://server/branch  log a branch on a server"
 msgstr ""
 
-#: bzrlib/builtins.py:2329
+#: bzrlib/builtins.py:2477
 msgid ""
 "The filtering, ordering and information shown for each revision can\n"
 "be controlled as explained below. By default, all revisions are\n"
@@ -1403,11 +1430,11 @@
 "were merged."
 msgstr ""
 
-#: bzrlib/builtins.py:2336
+#: bzrlib/builtins.py:2484
 msgid ":Output control:"
 msgstr ""
 
-#: bzrlib/builtins.py:2338
+#: bzrlib/builtins.py:2486
 msgid ""
 "  The log format controls how information about each revision is\n"
 "  displayed. The standard log formats are called ``long``, ``short``\n"
@@ -1415,13 +1442,13 @@
 "  for more details on log formats."
 msgstr ""
 
-#: bzrlib/builtins.py:2343
+#: bzrlib/builtins.py:2491
 msgid ""
 "  The following options can be used to control what information is\n"
 "  displayed::"
 msgstr ""
 
-#: bzrlib/builtins.py:2346
+#: bzrlib/builtins.py:2494
 msgid ""
 "    -l N        display a maximum of N revisions\n"
 "    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
@@ -1430,25 +1457,25 @@
 "    --show-ids  display revision-ids (and file-ids), not just revnos"
 msgstr ""
 
-#: bzrlib/builtins.py:2352
+#: bzrlib/builtins.py:2500
 msgid ""
 "  Note that the default number of levels to display is a function of the\n"
 "  log format. If the -n option is not used, the standard log formats show\n"
 "  just the top level (mainline)."
 msgstr ""
 
-#: bzrlib/builtins.py:2356
+#: bzrlib/builtins.py:2504
 msgid ""
 "  Status summaries are shown using status flags like A, M, etc. To see\n"
 "  the changes explained using words like ``added`` and ``modified``\n"
 "  instead, use the -vv option."
 msgstr ""
 
-#: bzrlib/builtins.py:2360
+#: bzrlib/builtins.py:2508
 msgid ":Ordering control:"
 msgstr ""
 
-#: bzrlib/builtins.py:2362
+#: bzrlib/builtins.py:2510
 msgid ""
 "  To display revisions from oldest to newest, use the --forward option.\n"
 "  In most cases, using this option will have little impact on the total\n"
@@ -1456,17 +1483,17 @@
 "  display revisions like --reverse does when it can."
 msgstr ""
 
-#: bzrlib/builtins.py:2367
+#: bzrlib/builtins.py:2515
 msgid ":Revision filtering:"
 msgstr ""
 
-#: bzrlib/builtins.py:2369
+#: bzrlib/builtins.py:2517
 msgid ""
 "  The -r option can be used to specify what revision or range of revisions\n"
 "  to filter against. The various forms are shown below::"
 msgstr ""
 
-#: bzrlib/builtins.py:2372
+#: bzrlib/builtins.py:2520
 msgid ""
 "    -rX      display revision X\n"
 "    -rX..    display revision X and later\n"
@@ -1474,13 +1501,13 @@
 "    -rX..Y   display from X to Y inclusive"
 msgstr ""
 
-#: bzrlib/builtins.py:2377
+#: bzrlib/builtins.py:2525
 msgid ""
 "  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
 "  Some common examples are given below::"
 msgstr ""
 
-#: bzrlib/builtins.py:2380
+#: bzrlib/builtins.py:2528
 msgid ""
 "    -r-1                show just the tip\n"
 "    -r-10..             show the last 10 mainline revisions\n"
@@ -1490,7 +1517,7 @@
 "    -rdate:yesterday..  show changes since yesterday"
 msgstr ""
 
-#: bzrlib/builtins.py:2387
+#: bzrlib/builtins.py:2535
 msgid ""
 "  When logging a range of revisions using -rX..Y, log starts at\n"
 "  revision Y and searches back in history through the primary\n"
@@ -1500,74 +1527,74 @@
 "  a nested merge revision and the log will be truncated accordingly."
 msgstr ""
 
-#: bzrlib/builtins.py:2394
+#: bzrlib/builtins.py:2542
 msgid ":Path filtering:"
 msgstr ""
 
-#: bzrlib/builtins.py:2396
+#: bzrlib/builtins.py:2544
 msgid ""
 "  If parameters are given and the first one is not a branch, the log\n"
 "  will be filtered to show only those revisions that changed the\n"
 "  nominated files or directories."
 msgstr ""
 
-#: bzrlib/builtins.py:2400
+#: bzrlib/builtins.py:2548
 msgid ""
 "  Filenames are interpreted within their historical context. To log a\n"
 "  deleted file, specify a revision range so that the file existed at\n"
 "  the end or start of the range."
 msgstr ""
 
-#: bzrlib/builtins.py:2404
+#: bzrlib/builtins.py:2552
 msgid ""
 "  Historical context is also important when interpreting pathnames of\n"
 "  renamed files/directories. Consider the following example:"
 msgstr ""
 
-#: bzrlib/builtins.py:2407
+#: bzrlib/builtins.py:2555
 msgid ""
 "  * revision 1: add tutorial.txt\n"
 "  * revision 2: modify tutorial.txt\n"
 "  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
 msgstr ""
 
-#: bzrlib/builtins.py:2411
+#: bzrlib/builtins.py:2559
 msgid "  In this case:"
 msgstr ""
 
-#: bzrlib/builtins.py:2413
+#: bzrlib/builtins.py:2561
 msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
 msgstr ""
 
-#: bzrlib/builtins.py:2415
+#: bzrlib/builtins.py:2563
 msgid ""
 "  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
 msgstr ""
 
-#: bzrlib/builtins.py:2417
+#: bzrlib/builtins.py:2565
 msgid ""
 "  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
 "    the original file in revision 2."
 msgstr ""
 
-#: bzrlib/builtins.py:2420
+#: bzrlib/builtins.py:2568
 msgid ""
 "  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
 "    was no file called guide.txt in revision 2."
 msgstr ""
 
-#: bzrlib/builtins.py:2423
+#: bzrlib/builtins.py:2571
 msgid ""
 "  Renames are always followed by log. By design, there is no need to\n"
 "  explicitly ask for this (and no way to stop logging a file back\n"
 "  until it was last renamed)."
 msgstr ""
 
-#: bzrlib/builtins.py:2427
+#: bzrlib/builtins.py:2575
 msgid ":Other filtering:"
 msgstr ""
 
-#: bzrlib/builtins.py:2429
+#: bzrlib/builtins.py:2577
 msgid ""
 "  The --match option can be used for finding revisions that match a\n"
 "  regular expression in a commit message, committer, author or bug.\n"
@@ -1576,11 +1603,11 @@
 "  --match-message can be used to only match a specific field."
 msgstr ""
 
-#: bzrlib/builtins.py:2435
+#: bzrlib/builtins.py:2583
 msgid ":Tips & tricks:"
 msgstr ""
 
-#: bzrlib/builtins.py:2437
+#: bzrlib/builtins.py:2585
 msgid ""
 "  GUI tools and IDEs are often better at exploring history than command\n"
 "  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
@@ -1589,12 +1616,12 @@
 "  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
 msgstr ""
 
-#: bzrlib/builtins.py:2443
+#: bzrlib/builtins.py:2591
 msgid ""
 "  You may find it useful to add the aliases below to ``bazaar.conf``::"
 msgstr ""
 
-#: bzrlib/builtins.py:2445
+#: bzrlib/builtins.py:2593
 msgid ""
 "    [ALIASES]\n"
 "    tip = log -r-1\n"
@@ -1602,20 +1629,20 @@
 "    show = log -v -p"
 msgstr ""
 
-#: bzrlib/builtins.py:2450
+#: bzrlib/builtins.py:2598
 msgid ""
 "  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
 "  will show the last 10 mainline revisions. To see the details of a\n"
 "  particular revision X,  ``bzr show -rX``."
 msgstr ""
 
-#: bzrlib/builtins.py:2454
+#: bzrlib/builtins.py:2602
 msgid ""
 "  If you are interested in looking deeper into a particular merge X,\n"
 "  use ``bzr log -n0 -rX``."
 msgstr ""
 
-#: bzrlib/builtins.py:2457
+#: bzrlib/builtins.py:2605
 msgid ""
 "  ``bzr log -v`` on a branch with lots of history is currently\n"
 "  very slow. A fix for this issue is currently under development.\n"
@@ -1623,7 +1650,7 @@
 "  be given when using the -v option."
 msgstr ""
 
-#: bzrlib/builtins.py:2462
+#: bzrlib/builtins.py:2610
 msgid ""
 "  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
 "  used to find revisions matching user names, commit messages, etc.\n"
@@ -1631,7 +1658,7 @@
 "  a list of words but not others."
 msgstr ""
 
-#: bzrlib/builtins.py:2467
+#: bzrlib/builtins.py:2615
 msgid ""
 "  When exploring non-mainline history on large projects with deep\n"
 "  history, the performance of log can be greatly improved by installing\n"
@@ -1639,146 +1666,146 @@
 "  trading disk space for faster speed."
 msgstr ""
 
-#: bzrlib/builtins.py:2476
+#: bzrlib/builtins.py:2624
 msgid "Show from oldest to newest."
 msgstr ""
 
-#: bzrlib/builtins.py:2479
+#: bzrlib/builtins.py:2627
 msgid "Show files changed in each revision."
 msgstr ""
 
-#: bzrlib/builtins.py:2485
+#: bzrlib/builtins.py:2633
 msgid "Show just the specified revision. See also \"help revisionspec\"."
 msgstr ""
 
-#: bzrlib/builtins.py:2489
+#: bzrlib/builtins.py:2637
 msgid "What names to list as authors - first, all or committer."
 msgstr ""
 
-#: bzrlib/builtins.py:2490
+#: bzrlib/builtins.py:2638
 msgid "Authors"
 msgstr ""
 
-#: bzrlib/builtins.py:2495
+#: bzrlib/builtins.py:2643
 msgid "Number of levels to display - 0 for all, 1 for flat."
 msgstr ""
 
-#: bzrlib/builtins.py:2505
+#: bzrlib/builtins.py:2653
 msgid "Limit the output to the first N revisions."
 msgstr ""
 
-#: bzrlib/builtins.py:2510
+#: bzrlib/builtins.py:2658
 msgid "Show changes made in each revision as a patch."
 msgstr ""
 
-#: bzrlib/builtins.py:2512
+#: bzrlib/builtins.py:2660
 msgid "Show merged revisions like --levels 0 does."
 msgstr ""
 
-#: bzrlib/builtins.py:2516
+#: bzrlib/builtins.py:2664
 msgid "Do not report commits with more than one parent."
 msgstr ""
 
-#: bzrlib/builtins.py:2518
+#: bzrlib/builtins.py:2666
 msgid ""
 "Display only the revisions that are not part of both ancestries (require -"
 "rX..Y)."
 msgstr ""
 
-#: bzrlib/builtins.py:2522
+#: bzrlib/builtins.py:2670
 msgid "Show digital signature validity."
 msgstr ""
 
-#: bzrlib/builtins.py:2525
+#: bzrlib/builtins.py:2673
 msgid "Show revisions whose properties match this expression."
 msgstr ""
 
-#: bzrlib/builtins.py:2529
+#: bzrlib/builtins.py:2677
 msgid "Show revisions whose message matches this expression."
 msgstr ""
 
-#: bzrlib/builtins.py:2533
+#: bzrlib/builtins.py:2681
 msgid "Show revisions whose committer matches this expression."
 msgstr ""
 
-#: bzrlib/builtins.py:2537
+#: bzrlib/builtins.py:2685
 msgid "Show revisions whose authors match this expression."
 msgstr ""
 
-#: bzrlib/builtins.py:2541
+#: bzrlib/builtins.py:2689
 msgid "Show revisions whose bugs match this expression."
 msgstr ""
 
-#: bzrlib/builtins.py:2595
+#: bzrlib/builtins.py:2743
 msgid "--exclude-common-ancestry requires -r with two revisions"
 msgstr ""
 
-#: bzrlib/builtins.py:2623
+#: bzrlib/builtins.py:2771
 #, python-format
 msgid "Path unknown at end or start of revision range: %s"
 msgstr ""
 
-#: bzrlib/builtins.py:2740
+#: bzrlib/builtins.py:2888
 #, python-format
 msgid "bzr %s doesn't accept two revisions in different branches."
 msgstr ""
 
-#: bzrlib/builtins.py:2756
+#: bzrlib/builtins.py:2904
 #, python-format
 msgid "bzr %s --revision takes one or two values."
 msgstr ""
 
-#: bzrlib/builtins.py:2801
+#: bzrlib/builtins.py:2949
 msgid ""
 "List files in a tree.\n"
 "    "
 msgstr ""
 
-#: bzrlib/builtins.py:2810
+#: bzrlib/builtins.py:2958
 msgid "Recurse into subdirectories."
 msgstr ""
 
-#: bzrlib/builtins.py:2812
+#: bzrlib/builtins.py:2960
 msgid "Print paths relative to the root of the branch."
 msgstr ""
 
-#: bzrlib/builtins.py:2814
+#: bzrlib/builtins.py:2962
 msgid "Print unknown files."
 msgstr ""
 
-#: bzrlib/builtins.py:2815
+#: bzrlib/builtins.py:2963
 msgid "Print versioned files."
 msgstr ""
 
-#: bzrlib/builtins.py:2818
+#: bzrlib/builtins.py:2966
 msgid "Print ignored files."
 msgstr ""
 
-#: bzrlib/builtins.py:2820
+#: bzrlib/builtins.py:2968
 msgid "List entries of a particular kind: file, directory, symlink."
 msgstr ""
 
-#: bzrlib/builtins.py:2833
+#: bzrlib/builtins.py:2981
 msgid "invalid kind specified"
 msgstr ""
 
-#: bzrlib/builtins.py:2836
+#: bzrlib/builtins.py:2984
 msgid "Cannot set both --verbose and --null"
 msgstr ""
 
-#: bzrlib/builtins.py:2845
+#: bzrlib/builtins.py:2993
 msgid "cannot specify both --from-root and PATH"
 msgstr ""
 
-#: bzrlib/builtins.py:2932
+#: bzrlib/builtins.py:3080
 msgid "Ignore specified files or patterns."
 msgstr ""
 
-#: bzrlib/builtins.py:2934
+#: bzrlib/builtins.py:3082
 msgid "See ``bzr help patterns`` for details on the syntax of patterns."
 msgstr ""
 
-#: bzrlib/builtins.py:2936
+#: bzrlib/builtins.py:3084
 msgid ""
 "If a .bzrignore file does not exist, the ignore command\n"
 "will create one and add the specified files or patterns to the newly\n"
@@ -1787,7 +1814,7 @@
 "the use of the ignore command will require an explicit add command."
 msgstr ""
 
-#: bzrlib/builtins.py:2942
+#: bzrlib/builtins.py:3090
 msgid ""
 "To remove patterns from the ignore list, edit the .bzrignore file.\n"
 "After adding, editing or deleting that file either indirectly by\n"
@@ -1795,7 +1822,7 @@
 "it."
 msgstr ""
 
-#: bzrlib/builtins.py:2947
+#: bzrlib/builtins.py:3095
 msgid ""
 "Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
 "the global ignore file can be found in the application data directory as\n"
@@ -1804,20 +1831,20 @@
 "can be edited directly using an editor."
 msgstr ""
 
-#: bzrlib/builtins.py:2953
+#: bzrlib/builtins.py:3101
 msgid ""
 "Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
 "precedence over regular ignores.  Such exceptions are used to specify\n"
 "files that should be versioned which would otherwise be ignored."
 msgstr ""
 
-#: bzrlib/builtins.py:2957
+#: bzrlib/builtins.py:3105
 msgid ""
 "Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
 "precedence over the '!' exception patterns."
 msgstr ""
 
-#: bzrlib/builtins.py:2960
+#: bzrlib/builtins.py:3108
 msgid ""
 ":Notes: \n"
 "    \n"
@@ -1825,63 +1852,63 @@
 "  the shell on Unix."
 msgstr ""
 
-#: bzrlib/builtins.py:2965
+#: bzrlib/builtins.py:3113
 msgid ""
 "* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
 "  To ignore patterns that begin with that character, use the \"RE:\" prefix."
 msgstr ""
 
-#: bzrlib/builtins.py:2968
+#: bzrlib/builtins.py:3116
 msgid ""
 ":Examples:\n"
 "    Ignore the top level Makefile::"
 msgstr ""
 
-#: bzrlib/builtins.py:2971
+#: bzrlib/builtins.py:3119
 msgid "        bzr ignore ./Makefile"
 msgstr ""
 
-#: bzrlib/builtins.py:2973
+#: bzrlib/builtins.py:3121
 msgid "    Ignore .class files in all directories...::"
 msgstr ""
 
-#: bzrlib/builtins.py:2975
+#: bzrlib/builtins.py:3123
 msgid "        bzr ignore \"*.class\""
 msgstr ""
 
-#: bzrlib/builtins.py:2977
+#: bzrlib/builtins.py:3125
 msgid "    ...but do not ignore \"special.class\"::"
 msgstr ""
 
-#: bzrlib/builtins.py:2979
+#: bzrlib/builtins.py:3127
 msgid "        bzr ignore \"!special.class\""
 msgstr ""
 
-#: bzrlib/builtins.py:2981
+#: bzrlib/builtins.py:3129
 msgid "    Ignore files whose name begins with the \"#\" character::"
 msgstr ""
 
-#: bzrlib/builtins.py:2983
+#: bzrlib/builtins.py:3131
 msgid "        bzr ignore \"RE:^#\""
 msgstr ""
 
-#: bzrlib/builtins.py:2985
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
 msgid "    Ignore .o files under the lib directory::"
 msgstr ""
 
-#: bzrlib/builtins.py:2987
+#: bzrlib/builtins.py:3135
 msgid "        bzr ignore \"lib/**/*.o\""
 msgstr ""
 
-#: bzrlib/builtins.py:2991
+#: bzrlib/builtins.py:3139
 msgid "        bzr ignore \"RE:lib/.*\\.o\""
 msgstr ""
 
-#: bzrlib/builtins.py:2993
+#: bzrlib/builtins.py:3141
 msgid "    Ignore everything but the \"debian\" toplevel directory::"
 msgstr ""
 
-#: bzrlib/builtins.py:2995
+#: bzrlib/builtins.py:3143
 msgid ""
 "        bzr ignore \"RE:(?!debian/).*\"\n"
 "    \n"
@@ -1893,26 +1920,26 @@
 "        bzr ignore \"!!*~\""
 msgstr ""
 
-#: bzrlib/builtins.py:3009
+#: bzrlib/builtins.py:3157
 msgid "Display the default ignore rules that bzr uses."
 msgstr ""
 
-#: bzrlib/builtins.py:3021
+#: bzrlib/builtins.py:3169
 msgid "ignore requires at least one NAME_PATTERN or --default-rules."
 msgstr ""
 
-#: bzrlib/builtins.py:3032
+#: bzrlib/builtins.py:3180
 #, python-format
 msgid "Invalid ignore pattern found. %s"
 msgid_plural "Invalid ignore patterns found. %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bzrlib/builtins.py:3041
+#: bzrlib/builtins.py:3189
 msgid "NAME_PATTERN should not be an absolute path"
 msgstr ""
 
-#: bzrlib/builtins.py:3054
+#: bzrlib/builtins.py:3202
 #, python-format
 msgid ""
 "Warning: the following files are version controlled and match your ignore "
@@ -1922,64 +1949,64 @@
 "them.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:3061
+#: bzrlib/builtins.py:3209
 msgid "List ignored files and the patterns that matched them."
 msgstr ""
 
-#: bzrlib/builtins.py:3063
+#: bzrlib/builtins.py:3211
 msgid ""
 "List all the ignored files and the ignore pattern that caused the file to\n"
 "be ignored."
 msgstr ""
 
-#: bzrlib/builtins.py:3066
+#: bzrlib/builtins.py:3214
 msgid "Alternatively, to list just the files::"
 msgstr ""
 
-#: bzrlib/builtins.py:3068
+#: bzrlib/builtins.py:3216
 msgid "    bzr ls --ignored"
 msgstr ""
 
-#: bzrlib/builtins.py:3102
+#: bzrlib/builtins.py:3250
 #, python-format
 msgid "not a valid revision-number: %r"
 msgstr ""
 
-#: bzrlib/builtins.py:3109
+#: bzrlib/builtins.py:3257
 msgid ""
 "Export current or past revision to a destination directory or archive."
 msgstr ""
 
-#: bzrlib/builtins.py:3111
+#: bzrlib/builtins.py:3259
 msgid "If no revision is specified this exports the last committed revision."
 msgstr ""
 
-#: bzrlib/builtins.py:3113
+#: bzrlib/builtins.py:3261
 msgid ""
 "Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
 "given, try to find the format with the extension. If no extension\n"
 "is found exports to a directory (equivalent to --format=dir)."
 msgstr ""
 
-#: bzrlib/builtins.py:3117
+#: bzrlib/builtins.py:3265
 msgid ""
 "If root is supplied, it will be used as the root directory inside\n"
 "container formats (tar, zip, etc). If it is not supplied it will default\n"
 "to the exported filename. The root option has no effect for 'dir' format."
 msgstr ""
 
-#: bzrlib/builtins.py:3121
+#: bzrlib/builtins.py:3269
 msgid ""
 "If branch is omitted then the branch containing the current working\n"
 "directory will be used."
 msgstr ""
 
-#: bzrlib/builtins.py:3124
+#: bzrlib/builtins.py:3272
 msgid ""
 "Note: Export of tree with non-ASCII filenames to zip is not supported."
 msgstr ""
 
-#: bzrlib/builtins.py:3126
+#: bzrlib/builtins.py:3274
 msgid ""
 "  =================       =========================\n"
 "  Supported formats       Autodetected by extension\n"
@@ -1992,74 +2019,74 @@
 "  =================       ========================="
 msgstr ""
 
-#: bzrlib/builtins.py:3140
+#: bzrlib/builtins.py:3288
 msgid "Type of file to export to."
 msgstr ""
 
-#: bzrlib/builtins.py:3143
+#: bzrlib/builtins.py:3291
 msgid "Apply content filters to export the convenient form."
 msgstr ""
 
-#: bzrlib/builtins.py:3147
+#: bzrlib/builtins.py:3295
 msgid "Name of the root directory inside the exported file."
 msgstr ""
 
-#: bzrlib/builtins.py:3149
+#: bzrlib/builtins.py:3297
 msgid ""
 "Set modification time of files to that of the last revision in which it was "
 "changed."
 msgstr ""
 
-#: bzrlib/builtins.py:3152
+#: bzrlib/builtins.py:3300
 msgid ""
 "Export the working tree contents rather than that of the last revision."
 msgstr ""
 
-#: bzrlib/builtins.py:3171
+#: bzrlib/builtins.py:3319
 msgid "--uncommitted requires a working tree"
 msgstr ""
 
-#: bzrlib/builtins.py:3180
+#: bzrlib/builtins.py:3328
 #, python-format
 msgid "Unsupported export format: %s"
 msgstr ""
 
-#: bzrlib/builtins.py:3184
+#: bzrlib/builtins.py:3332
 msgid ""
 "Write the contents of a file as of a given revision to standard output."
 msgstr ""
 
-#: bzrlib/builtins.py:3186
+#: bzrlib/builtins.py:3334
 msgid "If no revision is nominated, the last revision is used."
 msgstr ""
 
-#: bzrlib/builtins.py:3188
+#: bzrlib/builtins.py:3336
 msgid ""
 "Note: Take care to redirect standard output when using this command on a\n"
 "binary file."
 msgstr ""
 
-#: bzrlib/builtins.py:3194
+#: bzrlib/builtins.py:3342
 msgid "The path name in the old tree."
 msgstr ""
 
-#: bzrlib/builtins.py:3195
+#: bzrlib/builtins.py:3343
 msgid "Apply content filters to display the convenience form."
 msgstr ""
 
-#: bzrlib/builtins.py:3206
+#: bzrlib/builtins.py:3354
 msgid "bzr cat --revision takes exactly one revision specifier"
 msgstr ""
 
-#: bzrlib/builtins.py:3231 bzrlib/builtins.py:3243
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
 msgid "{0!r} is not present in revision {1}"
 msgstr ""
 
-#: bzrlib/builtins.py:3266
+#: bzrlib/builtins.py:3414
 msgid "Commit changes into a new revision."
 msgstr ""
 
-#: bzrlib/builtins.py:3268
+#: bzrlib/builtins.py:3416
 msgid ""
 "An explanatory message needs to be given for each commit. This is\n"
 "often done by using the --message option (getting the message from the\n"
@@ -2069,44 +2096,44 @@
 "boilerplate text loaded into the editor, use the --show-diff option."
 msgstr ""
 
-#: bzrlib/builtins.py:3275
+#: bzrlib/builtins.py:3423
 msgid ""
 "By default, the entire tree is committed and the person doing the\n"
 "commit is assumed to be the author. These defaults can be overridden\n"
 "as explained below."
 msgstr ""
 
-#: bzrlib/builtins.py:3279
+#: bzrlib/builtins.py:3427
 msgid ":Selective commits:"
 msgstr ""
 
-#: bzrlib/builtins.py:3281
+#: bzrlib/builtins.py:3429
 msgid ""
 "  If selected files are specified, only changes to those files are\n"
 "  committed.  If a directory is specified then the directory and\n"
 "  everything within it is committed."
 msgstr ""
 
-#: bzrlib/builtins.py:3285
+#: bzrlib/builtins.py:3433
 msgid ""
 "  When excludes are given, they take precedence over selected files.\n"
 "  For example, to commit only changes within foo, but not changes\n"
 "  within foo/bar::"
 msgstr ""
 
-#: bzrlib/builtins.py:3289
+#: bzrlib/builtins.py:3437
 msgid "    bzr commit foo -x foo/bar"
 msgstr ""
 
-#: bzrlib/builtins.py:3291
+#: bzrlib/builtins.py:3439
 msgid "  A selective commit after a merge is not yet supported."
 msgstr ""
 
-#: bzrlib/builtins.py:3293
+#: bzrlib/builtins.py:3441
 msgid ":Custom authors:"
 msgstr ""
 
-#: bzrlib/builtins.py:3295
+#: bzrlib/builtins.py:3443
 msgid ""
 "  If the author of the change is not the same person as the committer,\n"
 "  you can specify the author's name using the --author option. The\n"
@@ -2116,11 +2143,11 @@
 "  author."
 msgstr ""
 
-#: bzrlib/builtins.py:3302
+#: bzrlib/builtins.py:3450
 msgid ":Checks:"
 msgstr ""
 
-#: bzrlib/builtins.py:3304
+#: bzrlib/builtins.py:3452
 msgid ""
 "  A common mistake is to forget to add a new file or directory before\n"
 "  running the commit command. The --strict option checks for unknown\n"
@@ -2129,18 +2156,18 @@
 "  for details."
 msgstr ""
 
-#: bzrlib/builtins.py:3310
+#: bzrlib/builtins.py:3458
 msgid ":Things to note:"
 msgstr ""
 
-#: bzrlib/builtins.py:3312
+#: bzrlib/builtins.py:3460
 msgid ""
 "  If you accidentially commit the wrong changes or make a spelling\n"
 "  mistake in the commit message say, you can use the uncommit command\n"
 "  to undo it. See ``bzr help uncommit`` for details."
 msgstr ""
 
-#: bzrlib/builtins.py:3316
+#: bzrlib/builtins.py:3464
 msgid ""
 "  Hooks can also be configured to run after a commit. This allows you\n"
 "  to trigger updates to external systems like bug trackers. The --fixes\n"
@@ -2148,59 +2175,59 @@
 "  one or more bugs. See ``bzr help bugs`` for details."
 msgstr ""
 
-#: bzrlib/builtins.py:3326
+#: bzrlib/builtins.py:3474
 msgid "Do not consider changes made to a given path."
 msgstr ""
 
-#: bzrlib/builtins.py:3329
+#: bzrlib/builtins.py:3477
 msgid "Description of the new revision."
 msgstr ""
 
-#: bzrlib/builtins.py:3332
+#: bzrlib/builtins.py:3480
 msgid "Commit even if nothing has changed."
 msgstr ""
 
-#: bzrlib/builtins.py:3336
+#: bzrlib/builtins.py:3484
 msgid "Take commit message from this file."
 msgstr ""
 
-#: bzrlib/builtins.py:3338
+#: bzrlib/builtins.py:3486
 msgid "Refuse to commit if there are unknown files in the working tree."
 msgstr ""
 
-#: bzrlib/builtins.py:3341
+#: bzrlib/builtins.py:3489
 msgid ""
 "Manually set a commit time using commit date format, e.g. '2009-10-10 "
 "08:00:00 +0100'."
 msgstr ""
 
-#: bzrlib/builtins.py:3344
+#: bzrlib/builtins.py:3492
 msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
 msgstr ""
 
-#: bzrlib/builtins.py:3347
+#: bzrlib/builtins.py:3495
 msgid "Set the author's name, if it's different from the committer."
 msgstr ""
 
-#: bzrlib/builtins.py:3350
+#: bzrlib/builtins.py:3498
 msgid ""
 "Perform a local commit in a bound branch.  Local commits are not pushed to "
 "the master branch until a normal commit is performed."
 msgstr ""
 
-#: bzrlib/builtins.py:3356
+#: bzrlib/builtins.py:3504
 msgid ""
 "When no message is supplied, show the diff along with the status summary in "
 "the message editor."
 msgstr ""
 
-#: bzrlib/builtins.py:3359
+#: bzrlib/builtins.py:3507
 msgid ""
 "When committing to a foreign version control system do not push data that "
 "can not be natively represented."
 msgstr ""
 
-#: bzrlib/builtins.py:3377
+#: bzrlib/builtins.py:3525
 #, python-format
 msgid ""
 "No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
@@ -2208,7 +2235,7 @@
 "See \"bzr help bugs\" for more information on this feature. Commit refused."
 msgstr ""
 
-#: bzrlib/builtins.py:3386
+#: bzrlib/builtins.py:3534
 #, python-format
 msgid ""
 "Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
@@ -2216,91 +2243,91 @@
 "Commit refused."
 msgstr ""
 
-#: bzrlib/builtins.py:3395
+#: bzrlib/builtins.py:3543
 #, python-format
 msgid "Unrecognized bug %s. Commit refused."
 msgstr ""
 
-#: bzrlib/builtins.py:3398
+#: bzrlib/builtins.py:3546
 #, python-format
 msgid ""
 "%s\n"
 "Commit refused."
 msgstr ""
 
-#: bzrlib/builtins.py:3422
+#: bzrlib/builtins.py:3570
 msgid "Could not parse --commit-time: "
 msgstr ""
 
-#: bzrlib/builtins.py:3462
+#: bzrlib/builtins.py:3610
 msgid "please specify either --message or --file"
 msgstr ""
 
-#: bzrlib/builtins.py:3491
+#: bzrlib/builtins.py:3639
 msgid "please specify a commit message with either --message or --file"
 msgstr ""
 
-#: bzrlib/builtins.py:3494
+#: bzrlib/builtins.py:3642
 msgid ""
 "Empty commit message specified. Please specify a commit message with either -"
 "-message or --file or leave a blank message with --message \"\"."
 msgstr ""
 
-#: bzrlib/builtins.py:3514
+#: bzrlib/builtins.py:3662
 msgid ""
 "No changes to commit. Please 'bzr add' the files you want to commit, or use -"
 "-unchanged to force an empty commit."
 msgstr ""
 
-#: bzrlib/builtins.py:3518
+#: bzrlib/builtins.py:3666
 msgid ""
 "Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
 "resolve FILE\" to resolve."
 msgstr ""
 
-#: bzrlib/builtins.py:3522
+#: bzrlib/builtins.py:3670
 msgid "Commit refused because there are unknown files in the working tree."
 msgstr ""
 
-#: bzrlib/builtins.py:3525
+#: bzrlib/builtins.py:3673
 msgid ""
 "\n"
 "To commit to master branch, run update and then commit.\n"
 "You can also pass --local to commit to continue working disconnected."
 msgstr ""
 
-#: bzrlib/builtins.py:3533
+#: bzrlib/builtins.py:3681
 msgid ""
 "Validate working tree structure, branch consistency and repository history."
 msgstr ""
 
-#: bzrlib/builtins.py:3535
+#: bzrlib/builtins.py:3683
 msgid ""
 "This command checks various invariants about branch and repository storage\n"
 "to detect data corruption or bzr bugs."
 msgstr ""
 
-#: bzrlib/builtins.py:3538
+#: bzrlib/builtins.py:3686
 msgid ""
 "The working tree and branch checks will only give output if a problem is\n"
 "detected. The output fields of the repository check are:"
 msgstr ""
 
-#: bzrlib/builtins.py:3541
+#: bzrlib/builtins.py:3689
 msgid ""
 "revisions\n"
 "    This is just the number of revisions checked.  It doesn't\n"
 "    indicate a problem."
 msgstr ""
 
-#: bzrlib/builtins.py:3545
+#: bzrlib/builtins.py:3693
 msgid ""
 "versionedfiles\n"
 "    This is just the number of versionedfiles checked.  It\n"
 "    doesn't indicate a problem."
 msgstr ""
 
-#: bzrlib/builtins.py:3549
+#: bzrlib/builtins.py:3697
 msgid ""
 "unreferenced ancestors\n"
 "    Texts that are ancestors of other texts, but\n"
@@ -2308,14 +2335,14 @@
 "    subtle problem that Bazaar can work around."
 msgstr ""
 
-#: bzrlib/builtins.py:3554
+#: bzrlib/builtins.py:3702
 msgid ""
 "unique file texts\n"
 "    This is the total number of unique file contents\n"
 "    seen in the checked revisions.  It does not indicate a problem."
 msgstr ""
 
-#: bzrlib/builtins.py:3558
+#: bzrlib/builtins.py:3706
 msgid ""
 "repeated file texts\n"
 "    This is the total number of repeated texts seen\n"
@@ -2324,58 +2351,54 @@
 "    indicate a problem."
 msgstr ""
 
-#: bzrlib/builtins.py:3564
+#: bzrlib/builtins.py:3712
 msgid ""
 "If no restrictions are specified, all Bazaar data that is found at the "
 "given\n"
 "location will be checked."
 msgstr ""
 
-#: bzrlib/builtins.py:3567
-msgid ":Examples:"
-msgstr ""
-
-#: bzrlib/builtins.py:3569
+#: bzrlib/builtins.py:3717
 msgid "    Check the tree and branch at 'foo'::"
 msgstr ""
 
-#: bzrlib/builtins.py:3571
+#: bzrlib/builtins.py:3719
 msgid "        bzr check --tree --branch foo"
 msgstr ""
 
-#: bzrlib/builtins.py:3573
+#: bzrlib/builtins.py:3721
 msgid "    Check only the repository at 'bar'::"
 msgstr ""
 
-#: bzrlib/builtins.py:3575
+#: bzrlib/builtins.py:3723
 msgid "        bzr check --repo bar"
 msgstr ""
 
-#: bzrlib/builtins.py:3577
+#: bzrlib/builtins.py:3725
 msgid "    Check everything at 'baz'::"
 msgstr ""
 
-#: bzrlib/builtins.py:3579
+#: bzrlib/builtins.py:3727
 msgid "        bzr check baz"
 msgstr ""
 
-#: bzrlib/builtins.py:3585
+#: bzrlib/builtins.py:3733
 msgid "Check the branch related to the current directory."
 msgstr ""
 
-#: bzrlib/builtins.py:3587
+#: bzrlib/builtins.py:3735
 msgid "Check the repository related to the current directory."
 msgstr ""
 
-#: bzrlib/builtins.py:3589
+#: bzrlib/builtins.py:3737
 msgid "Check the working tree related to the current directory."
 msgstr ""
 
-#: bzrlib/builtins.py:3603
+#: bzrlib/builtins.py:3751
 msgid "Upgrade a repository, branch or working tree to a newer format."
 msgstr ""
 
-#: bzrlib/builtins.py:3605
+#: bzrlib/builtins.py:3753
 msgid ""
 "When the default format has changed after a major new release of\n"
 "Bazaar, you may be informed during certain operations that you\n"
@@ -2384,7 +2407,7 @@
 "with older repositories or with older versions of Bazaar."
 msgstr ""
 
-#: bzrlib/builtins.py:3611
+#: bzrlib/builtins.py:3759
 msgid ""
 "If you wish to upgrade to a particular format rather than the\n"
 "current default, that can be specified using the --format option.\n"
@@ -2394,7 +2417,7 @@
 "2.x default) so downgrading is not always possible."
 msgstr ""
 
-#: bzrlib/builtins.py:3618
+#: bzrlib/builtins.py:3766
 msgid ""
 "A backup.bzr.~#~ directory is created at the start of the conversion\n"
 "process (where # is a number). By default, this is left there on\n"
@@ -2405,7 +2428,7 @@
 "afterwards."
 msgstr ""
 
-#: bzrlib/builtins.py:3626
+#: bzrlib/builtins.py:3774
 msgid ""
 "If the location given is a shared repository, dependent branches\n"
 "are also converted provided the repository converts successfully.\n"
@@ -2413,156 +2436,156 @@
 "tried."
 msgstr ""
 
-#: bzrlib/builtins.py:3631
+#: bzrlib/builtins.py:3779
 msgid ""
 "For more information on upgrades, see the Bazaar Upgrade Guide,\n"
 "http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
 msgstr ""
 
-#: bzrlib/builtins.py:3639
+#: bzrlib/builtins.py:3787
 msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
 msgstr ""
 
-#: bzrlib/builtins.py:3643
+#: bzrlib/builtins.py:3791
 msgid "Branch format"
 msgstr ""
 
-#: bzrlib/builtins.py:3645
+#: bzrlib/builtins.py:3793
 msgid "Remove the backup.bzr directory if successful."
 msgstr ""
 
-#: bzrlib/builtins.py:3647
+#: bzrlib/builtins.py:3795
 msgid "Show what would be done, but don't actually do anything."
 msgstr ""
 
-#: bzrlib/builtins.py:3662
+#: bzrlib/builtins.py:3810
 msgid "Show or set bzr user id."
 msgstr ""
 
-#: bzrlib/builtins.py:3664
+#: bzrlib/builtins.py:3812
 msgid ""
 ":Examples:\n"
 "    Show the email of the current user::"
 msgstr ""
 
-#: bzrlib/builtins.py:3667
+#: bzrlib/builtins.py:3815
 msgid "        bzr whoami --email"
 msgstr ""
 
-#: bzrlib/builtins.py:3669
+#: bzrlib/builtins.py:3817
 msgid "    Set the current user::"
 msgstr ""
 
-#: bzrlib/builtins.py:3671
+#: bzrlib/builtins.py:3819
 msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
 msgstr ""
 
-#: bzrlib/builtins.py:3675
+#: bzrlib/builtins.py:3823
 msgid "Display email address only."
 msgstr ""
 
-#: bzrlib/builtins.py:3677
+#: bzrlib/builtins.py:3825
 msgid "Set identity for the current branch instead of globally."
 msgstr ""
 
-#: bzrlib/builtins.py:3701
+#: bzrlib/builtins.py:3851
 msgid "--email can only be used to display existing identity"
 msgstr ""
 
-#: bzrlib/builtins.py:3723
+#: bzrlib/builtins.py:3873
 msgid "Print or set the branch nickname."
 msgstr ""
 
-#: bzrlib/builtins.py:3725
+#: bzrlib/builtins.py:3875
 msgid ""
 "If unset, the tree root directory name is used as the nickname.\n"
 "To print the current nickname, execute with no argument."
 msgstr ""
 
-#: bzrlib/builtins.py:3728
+#: bzrlib/builtins.py:3878
 msgid ""
 "Bound branches use the nickname of its master branch unless it is set\n"
 "locally."
 msgstr ""
 
-#: bzrlib/builtins.py:3748
+#: bzrlib/builtins.py:3898
 msgid "Set/unset and display aliases."
 msgstr ""
 
-#: bzrlib/builtins.py:3750
+#: bzrlib/builtins.py:3900
 msgid ""
 ":Examples:\n"
 "    Show the current aliases::"
 msgstr ""
 
-#: bzrlib/builtins.py:3753
+#: bzrlib/builtins.py:3903
 msgid "        bzr alias"
 msgstr ""
 
-#: bzrlib/builtins.py:3755
+#: bzrlib/builtins.py:3905
 msgid "    Show the alias specified for 'll'::"
 msgstr ""
 
-#: bzrlib/builtins.py:3757
+#: bzrlib/builtins.py:3907
 msgid "        bzr alias ll"
 msgstr ""
 
-#: bzrlib/builtins.py:3759
+#: bzrlib/builtins.py:3909
 msgid "    Set an alias for 'll'::"
 msgstr ""
 
-#: bzrlib/builtins.py:3761
+#: bzrlib/builtins.py:3911
 msgid "        bzr alias ll=\"log --line -r-10..-1\""
 msgstr ""
 
-#: bzrlib/builtins.py:3763
+#: bzrlib/builtins.py:3913
 msgid "    To remove an alias for 'll'::"
 msgstr ""
 
-#: bzrlib/builtins.py:3765
+#: bzrlib/builtins.py:3915
 msgid "        bzr alias --remove ll"
 msgstr ""
 
-#: bzrlib/builtins.py:3770
+#: bzrlib/builtins.py:3920
 msgid "Remove the alias."
 msgstr ""
 
-#: bzrlib/builtins.py:3788
+#: bzrlib/builtins.py:3938
 msgid "bzr alias --remove expects an alias to remove."
 msgstr ""
 
-#: bzrlib/builtins.py:3960
+#: bzrlib/builtins.py:4119
 msgid ""
 "subunit not available. subunit needs to be installed to use --subunit."
 msgstr ""
 
-#: bzrlib/builtins.py:3977
+#: bzrlib/builtins.py:4136
 msgid ""
 "--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
 msgstr ""
 
-#: bzrlib/builtins.py:4024
+#: bzrlib/builtins.py:4183
 msgid "Show version of bzr."
 msgstr ""
 
-#: bzrlib/builtins.py:4028
+#: bzrlib/builtins.py:4187
 msgid "Print just the version number."
 msgstr ""
 
-#: bzrlib/builtins.py:4047
+#: bzrlib/builtins.py:4206
 msgid "It sure does!\n"
 msgstr ""
 
-#: bzrlib/builtins.py:4071
+#: bzrlib/builtins.py:4230
 #, python-format
 msgid "merge base is revision %s\n"
 msgstr ""
 
-#: bzrlib/builtins.py:4075
+#: bzrlib/builtins.py:4234
 msgid "Perform a three-way merge."
 msgstr ""
 
-#: bzrlib/builtins.py:4077
+#: bzrlib/builtins.py:4236
 msgid ""
 "The source of the merge can be specified either in the form of a branch,\n"
 "or in the form of a path to a file containing a merge directive generated\n"
@@ -2573,20 +2596,20 @@
 "the current working tree."
 msgstr ""
 
-#: bzrlib/builtins.py:4085
+#: bzrlib/builtins.py:4244
 msgid ""
 "When merging from a branch, by default bzr will try to merge in all new\n"
 "work from the other branch, automatically determining an appropriate base\n"
 "revision.  If this fails, you may need to give an explicit base."
 msgstr ""
 
-#: bzrlib/builtins.py:4089
+#: bzrlib/builtins.py:4248
 msgid ""
 "To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
 "try to merge in all new work up to and including revision OTHER."
 msgstr ""
 
-#: bzrlib/builtins.py:4092
+#: bzrlib/builtins.py:4251
 msgid ""
 "If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
 "through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
@@ -2597,16 +2620,24 @@
 "changes from the other branch is not stored in the commit."
 msgstr ""
 
-#: bzrlib/builtins.py:4100
+#: bzrlib/builtins.py:4259
 msgid "Revision numbers are always relative to the source branch."
 msgstr ""
 
-#: bzrlib/builtins.py:4107
+#: bzrlib/builtins.py:4168 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you should commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
 msgid ""
 "Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
 msgstr ""
 
-#: bzrlib/builtins.py:4109
+#: bzrlib/builtins.py:4268
 msgid ""
 "If there is no default branch set, the first merge will set it (use\n"
 "--no-remember to avoid setting it). After that, you can omit the branch\n"
@@ -2614,14 +2645,14 @@
 "only be saved if the remote location can be accessed."
 msgstr ""
 
-#: bzrlib/builtins.py:4114
+#: bzrlib/builtins.py:4273
 msgid ""
 "The results of the merge are placed into the destination working\n"
 "directory, where they can be reviewed (with bzr diff), tested, and then\n"
 "committed to record the result of the merge."
 msgstr ""
 
-#: bzrlib/builtins.py:4118
+#: bzrlib/builtins.py:4277
 msgid ""
 "merge refuses to run if there are any uncommitted changes, unless\n"
 "--force is given.  If --force is given, then the changes from the source \n"
@@ -2630,208 +2661,208 @@
 "merge revision which has more than two parents."
 msgstr ""
 
-#: bzrlib/builtins.py:4124
+#: bzrlib/builtins.py:4283
 msgid ""
 "If one would like to merge changes from the working tree of the other\n"
 "branch without merging any committed revisions, the --uncommitted option\n"
 "can be given."
 msgstr ""
 
-#: bzrlib/builtins.py:4128
+#: bzrlib/builtins.py:4287
 msgid ""
 "To select only some changes to merge, use \"merge -i\", which will prompt\n"
 "you to apply each diff hunk and file change, similar to \"shelve\"."
 msgstr ""
 
-#: bzrlib/builtins.py:4131
+#: bzrlib/builtins.py:4290
 msgid ""
 ":Examples:\n"
 "    To merge all new revisions from bzr.dev::"
 msgstr ""
 
-#: bzrlib/builtins.py:4134
+#: bzrlib/builtins.py:4293
 msgid "        bzr merge ../bzr.dev"
 msgstr ""
 
-#: bzrlib/builtins.py:4136
+#: bzrlib/builtins.py:4295
 msgid "    To merge changes up to and including revision 82 from bzr.dev::"
 msgstr ""
 
-#: bzrlib/builtins.py:4138
+#: bzrlib/builtins.py:4297
 msgid "        bzr merge -r 82 ../bzr.dev"
 msgstr ""
 
-#: bzrlib/builtins.py:4140
+#: bzrlib/builtins.py:4299
 msgid "    To merge the changes introduced by 82, without previous changes::"
 msgstr ""
 
-#: bzrlib/builtins.py:4142
+#: bzrlib/builtins.py:4301
 msgid "        bzr merge -r 81..82 ../bzr.dev"
 msgstr ""
 
-#: bzrlib/builtins.py:4144
+#: bzrlib/builtins.py:4303
 msgid "    To apply a merge directive contained in /tmp/merge::"
 msgstr ""
 
-#: bzrlib/builtins.py:4146
+#: bzrlib/builtins.py:4305
 msgid "        bzr merge /tmp/merge"
 msgstr ""
 
-#: bzrlib/builtins.py:4148
+#: bzrlib/builtins.py:4307
 msgid ""
 "    To create a merge revision with three parents from two branches\n"
 "    feature1a and feature1b:"
 msgstr ""
 
-#: bzrlib/builtins.py:4151
+#: bzrlib/builtins.py:4310
 msgid ""
 "        bzr merge ../feature1a\n"
 "        bzr merge ../feature1b --force\n"
 "        bzr commit -m 'revision with three parents'"
 msgstr ""
 
-#: bzrlib/builtins.py:4163
+#: bzrlib/builtins.py:4322
 msgid "Merge even if the destination tree has uncommitted changes."
 msgstr ""
 
-#: bzrlib/builtins.py:4169
+#: bzrlib/builtins.py:4328
 msgid ""
 "Apply uncommitted changes from a working copy, instead of branch changes."
 msgstr ""
 
-#: bzrlib/builtins.py:4171
+#: bzrlib/builtins.py:4330
 msgid ""
 "If the destination is already completely merged into the source, pull from "
 "the source rather than merging.  When this happens, you do not need to "
 "commit the result."
 msgstr ""
 
-#: bzrlib/builtins.py:4176
+#: bzrlib/builtins.py:4335
 msgid ""
 "Branch to merge into, rather than the one containing the working directory."
 msgstr ""
 
-#: bzrlib/builtins.py:4178
+#: bzrlib/builtins.py:4337
 msgid "Instead of merging, show a diff of the merge."
 msgstr ""
 
-#: bzrlib/builtins.py:4180
+#: bzrlib/builtins.py:4339
 msgid "Select changes interactively."
 msgstr ""
 
-#: bzrlib/builtins.py:4202
+#: bzrlib/builtins.py:4361
 msgid ""
 "Merging into empty branches not currently supported, "
 "https://bugs.launchpad.net/bzr/+bug/308562"
 msgstr ""
 
-#: bzrlib/builtins.py:4229
+#: bzrlib/builtins.py:4388
 msgid "Cannot use --uncommitted with bundles or merge directives."
 msgstr ""
 
-#: bzrlib/builtins.py:4240
+#: bzrlib/builtins.py:4399
 msgid "Cannot use --uncommitted and --revision at the same time."
 msgstr ""
 
-#: bzrlib/builtins.py:4260
+#: bzrlib/builtins.py:4419
 msgid "merger: "
 msgstr ""
 
-#: bzrlib/builtins.py:4262 bzrlib/bundle/apply_bundle.py:68
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
 msgid "Nothing to do."
 msgstr ""
 
-#: bzrlib/builtins.py:4266
+#: bzrlib/builtins.py:4425
 msgid "Cannot pull individual files"
 msgstr ""
 
-#: bzrlib/builtins.py:4274
+#: bzrlib/builtins.py:4433
 msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
 msgstr ""
 
-#: bzrlib/builtins.py:4332
+#: bzrlib/builtins.py:4491
 #, python-format
 msgid "Show-base is not supported for this merge type. %s"
 msgstr ""
 
-#: bzrlib/builtins.py:4341
+#: bzrlib/builtins.py:4500
 #, python-format
 msgid "Conflict reduction is not supported for merge type %s."
 msgstr ""
 
-#: bzrlib/builtins.py:4345
+#: bzrlib/builtins.py:4504
 msgid "Cannot do conflict reduction and show base."
 msgstr ""
 
-#: bzrlib/builtins.py:4456
+#: bzrlib/builtins.py:4615
 msgid "No location specified or remembered"
 msgstr ""
 
-#: bzrlib/builtins.py:4458
+#: bzrlib/builtins.py:4617
 msgid "{0} remembered {1} location {2}"
 msgstr ""
 
-#: bzrlib/builtins.py:4464
+#: bzrlib/builtins.py:4623
 msgid "Redo a merge."
 msgstr ""
 
-#: bzrlib/builtins.py:4466
+#: bzrlib/builtins.py:4625
 msgid ""
 "Use this if you want to try a different merge technique while resolving\n"
 "conflicts.  Some merge techniques are better than others, and remerge\n"
 "lets you try different ones on different files."
 msgstr ""
 
-#: bzrlib/builtins.py:4470
+#: bzrlib/builtins.py:4629
 msgid ""
 "The options for remerge have the same meaning and defaults as the ones for\n"
 "merge.  The difference is that remerge can (only) be run when there is a\n"
 "pending merge, and it lets you specify particular files."
 msgstr ""
 
-#: bzrlib/builtins.py:4474
+#: bzrlib/builtins.py:4633
 msgid ""
 ":Examples:\n"
 "    Re-do the merge of all conflicted files, and show the base text in\n"
 "    conflict regions, in addition to the usual THIS and OTHER texts::"
 msgstr ""
 
-#: bzrlib/builtins.py:4478
+#: bzrlib/builtins.py:4637
 msgid "        bzr remerge --show-base"
 msgstr ""
 
-#: bzrlib/builtins.py:4480
+#: bzrlib/builtins.py:4639
 msgid ""
 "    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
 "    additional processing to reduce the size of conflict regions::"
 msgstr ""
 
-#: bzrlib/builtins.py:4483
+#: bzrlib/builtins.py:4642
 msgid "        bzr remerge --merge-type weave --reprocess foobar"
 msgstr ""
 
-#: bzrlib/builtins.py:4490
+#: bzrlib/builtins.py:4649
 msgid "Show base revision text in conflicts."
 msgstr ""
 
-#: bzrlib/builtins.py:4502
+#: bzrlib/builtins.py:4661
 msgid ""
 "Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
 "merges."
 msgstr ""
 
-#: bzrlib/builtins.py:4558
+#: bzrlib/builtins.py:4717
 msgid "Revert files to a previous revision."
 msgstr ""
 
-#: bzrlib/builtins.py:4560
+#: bzrlib/builtins.py:4719
 msgid ""
 "Giving a list of files will revert only those files.  Otherwise, all files\n"
 "will be reverted.  If the revision is not specified with '--revision', the\n"
 "last committed revision is used."
 msgstr ""
 
-#: bzrlib/builtins.py:4564
+#: bzrlib/builtins.py:4723
 msgid ""
 "To remove only some changes, without reverting to a prior version, use\n"
 "merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
@@ -2840,14 +2871,14 @@
 "certain changes on a hunk-by-hunk basis, see the shelve command."
 msgstr ""
 
-#: bzrlib/builtins.py:4570
+#: bzrlib/builtins.py:4729
 msgid ""
 "By default, any files that have been manually changed will be backed up\n"
 "first.  (Files changed only by merge are not backed up.)  Backup files have\n"
 "'.~#~' appended to their name, where # is a number."
 msgstr ""
 
-#: bzrlib/builtins.py:4574
+#: bzrlib/builtins.py:4733
 msgid ""
 "When you provide files, you can use their current pathname or the pathname\n"
 "from the target revision.  So you can use revert to \"undelete\" a file by\n"
@@ -2855,7 +2886,7 @@
 "reverted."
 msgstr ""
 
-#: bzrlib/builtins.py:4579
+#: bzrlib/builtins.py:4738
 msgid ""
 "If you have newly added files since the target revision, they will be\n"
 "removed.  If the files to be removed have been changed, backups will be\n"
@@ -2863,7 +2894,7 @@
 "deleted."
 msgstr ""
 
-#: bzrlib/builtins.py:4584
+#: bzrlib/builtins.py:4743
 msgid ""
 "The working tree contains a list of revisions that have been merged but\n"
 "not yet committed. These revisions will be included as additional parents\n"
@@ -2875,7 +2906,7 @@
 "reverting any files."
 msgstr ""
 
-#: bzrlib/builtins.py:4593
+#: bzrlib/builtins.py:4752
 msgid ""
 "Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
 "changes from a branch in a single revision.  To do this, perform the merge\n"
@@ -2889,33 +2920,33 @@
 "target branches."
 msgstr ""
 
-#: bzrlib/builtins.py:4607
+#: bzrlib/builtins.py:4766
 msgid "Do not save backups of reverted files."
 msgstr ""
 
-#: bzrlib/builtins.py:4609
+#: bzrlib/builtins.py:4768
 msgid "Remove pending merge marker, without changing any files."
 msgstr ""
 
-#: bzrlib/builtins.py:4640
+#: bzrlib/builtins.py:4799
 msgid ""
 "Show help on a command or other topic.\n"
 "    "
 msgstr ""
 
-#: bzrlib/builtins.py:4645
+#: bzrlib/builtins.py:4804
 msgid "Show help on all commands."
 msgstr ""
 
-#: bzrlib/builtins.py:4674
+#: bzrlib/builtins.py:4833
 msgid "Show unmerged/unpulled revisions between two branches."
 msgstr ""
 
-#: bzrlib/builtins.py:4676
+#: bzrlib/builtins.py:4835
 msgid "OTHER_BRANCH may be local or remote."
 msgstr ""
 
-#: bzrlib/builtins.py:4678
+#: bzrlib/builtins.py:4837
 msgid ""
 "To filter on a range of revisions, you can use the command -r begin..end\n"
 "-r revision requests a specific revision, -r ..end or -r begin.. are\n"
@@ -2926,126 +2957,126 @@
 "    0 - no missing revisions"
 msgstr ""
 
-#: bzrlib/builtins.py:4688
+#: bzrlib/builtins.py:4847
 msgid ""
 "    Determine the missing revisions between this and the branch at the\n"
 "    remembered pull location::"
 msgstr ""
 
-#: bzrlib/builtins.py:4691
+#: bzrlib/builtins.py:4850
 msgid "        bzr missing"
 msgstr ""
 
-#: bzrlib/builtins.py:4693
+#: bzrlib/builtins.py:4852
 msgid "    Determine the missing revisions between this and another branch::"
 msgstr ""
 
-#: bzrlib/builtins.py:4695
+#: bzrlib/builtins.py:4854
 msgid "        bzr missing http://server/branch"
 msgstr ""
 
-#: bzrlib/builtins.py:4697
+#: bzrlib/builtins.py:4856
 msgid ""
 "    Determine the missing revisions up to a specific revision on the other\n"
 "    branch::"
 msgstr ""
 
-#: bzrlib/builtins.py:4700
+#: bzrlib/builtins.py:4859
 msgid "        bzr missing -r ..-10"
 msgstr ""
 
-#: bzrlib/builtins.py:4702
+#: bzrlib/builtins.py:4861
 msgid ""
 "    Determine the missing revisions up to a specific revision on this\n"
 "    branch::"
 msgstr ""
 
-#: bzrlib/builtins.py:4705
+#: bzrlib/builtins.py:4864
 msgid "        bzr missing --my-revision ..-10"
 msgstr ""
 
-#: bzrlib/builtins.py:4712
+#: bzrlib/builtins.py:4871
 msgid "Reverse the order of revisions."
 msgstr ""
 
-#: bzrlib/builtins.py:4714
+#: bzrlib/builtins.py:4873
 msgid "Display changes in the local branch only."
 msgstr ""
 
-#: bzrlib/builtins.py:4715
+#: bzrlib/builtins.py:4874
 msgid "Same as --mine-only."
 msgstr ""
 
-#: bzrlib/builtins.py:4717
+#: bzrlib/builtins.py:4876
 msgid "Display changes in the remote branch only."
 msgstr ""
 
-#: bzrlib/builtins.py:4718
+#: bzrlib/builtins.py:4877
 msgid "Same as --theirs-only."
 msgstr ""
 
-#: bzrlib/builtins.py:4723
+#: bzrlib/builtins.py:4882
 msgid ""
 "Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
 "details."
 msgstr ""
 
-#: bzrlib/builtins.py:4727
+#: bzrlib/builtins.py:4886
 msgid ""
 "Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
 "details."
 msgstr ""
 
-#: bzrlib/builtins.py:4730
+#: bzrlib/builtins.py:4889
 msgid "Show all revisions in addition to the mainline ones."
 msgstr ""
 
-#: bzrlib/builtins.py:4784
+#: bzrlib/builtins.py:4943
 msgid "No peer location known or specified."
 msgstr ""
 
-#: bzrlib/builtins.py:4788
+#: bzrlib/builtins.py:4947
 msgid "Using saved parent location: {0}\n"
 msgstr ""
 
-#: bzrlib/builtins.py:4821
+#: bzrlib/builtins.py:4980
 #, python-format
 msgid "You have %d extra revision:\n"
 msgid_plural "You have %d extra revisions:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bzrlib/builtins.py:4837
+#: bzrlib/builtins.py:4996
 #, python-format
 msgid "You are missing %d revision:\n"
 msgid_plural "You are missing %d revisions:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bzrlib/builtins.py:4849
+#: bzrlib/builtins.py:5008
 msgid "This branch has no new revisions.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:4852
+#: bzrlib/builtins.py:5011
 msgid "Other branch has no new revisions.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:4857
+#: bzrlib/builtins.py:5016
 msgid "Branches are up to date.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:4868
+#: bzrlib/builtins.py:5027
 msgid "Compress the data within a repository."
 msgstr ""
 
-#: bzrlib/builtins.py:4870
+#: bzrlib/builtins.py:5029
 msgid ""
 "This operation compresses the data within a bazaar repository. As\n"
 "bazaar supports automatic packing of repository, this operation is\n"
 "normally not required to be done manually."
 msgstr ""
 
-#: bzrlib/builtins.py:4874
+#: bzrlib/builtins.py:5033
 msgid ""
 "During the pack operation, bazaar takes a backup of existing repository\n"
 "data, i.e. pack files. This backup is eventually removed by bazaar\n"
@@ -3054,7 +3085,7 @@
 "used."
 msgstr ""
 
-#: bzrlib/builtins.py:4880
+#: bzrlib/builtins.py:5039
 msgid ""
 "Warning: If you use --clean-obsolete-packs and your machine crashes\n"
 "during or immediately after repacking, you may be left with a state\n"
@@ -3062,25 +3093,25 @@
 "been. In this case the repository may be unusable."
 msgstr ""
 
-#: bzrlib/builtins.py:4889
+#: bzrlib/builtins.py:5048
 msgid "Delete obsolete packs to save disk space."
 msgstr ""
 
-#: bzrlib/builtins.py:4903
+#: bzrlib/builtins.py:5062
 msgid "List the installed plugins."
 msgstr ""
 
-#: bzrlib/builtins.py:4905
+#: bzrlib/builtins.py:5064
 msgid ""
 "This command displays the list of installed plugins including\n"
 "version of plugin and a short description of each."
 msgstr ""
 
-#: bzrlib/builtins.py:4908
+#: bzrlib/builtins.py:5067
 msgid "--verbose shows the path where each plugin is located."
 msgstr ""
 
-#: bzrlib/builtins.py:4910
+#: bzrlib/builtins.py:5069
 msgid ""
 "A plugin is an external component for Bazaar that extends the\n"
 "revision control system, by adding or replacing code in Bazaar.\n"
@@ -3089,7 +3120,7 @@
 "customizing log output."
 msgstr ""
 
-#: bzrlib/builtins.py:4916
+#: bzrlib/builtins.py:5075
 msgid ""
 "See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
 "for further information on plugins including where to find them and how to\n"
@@ -3097,190 +3128,190 @@
 "plugins using the Python programming language."
 msgstr ""
 
-#: bzrlib/builtins.py:4932
+#: bzrlib/builtins.py:5091
 msgid "Show testament (signing-form) of a revision."
 msgstr ""
 
-#: bzrlib/builtins.py:4935
+#: bzrlib/builtins.py:5094
 msgid "Produce long-format testament."
 msgstr ""
 
-#: bzrlib/builtins.py:4937
+#: bzrlib/builtins.py:5096
 msgid "Produce a strict-format testament."
 msgstr ""
 
-#: bzrlib/builtins.py:4963
+#: bzrlib/builtins.py:5122
 msgid "Show the origin of each line in a file."
 msgstr ""
 
-#: bzrlib/builtins.py:4965
+#: bzrlib/builtins.py:5124
 msgid ""
 "This prints out the given file with an annotation on the left side\n"
 "indicating which revision, author and date introduced the change."
 msgstr ""
 
-#: bzrlib/builtins.py:4968
+#: bzrlib/builtins.py:5127
 msgid ""
 "If the origin is the same for a run of consecutive lines, it is\n"
 "shown only at the top, unless the --all option is given."
 msgstr ""
 
-#: bzrlib/builtins.py:4976
+#: bzrlib/builtins.py:5135
 msgid "Show annotations on all lines."
 msgstr ""
 
-#: bzrlib/builtins.py:4977
+#: bzrlib/builtins.py:5136
 msgid "Show commit date in annotations."
 msgstr ""
 
-#: bzrlib/builtins.py:5064
+#: bzrlib/builtins.py:5223
 msgid "Cannot sign a range of non-revision-history revisions"
 msgstr ""
 
-#: bzrlib/builtins.py:5076
+#: bzrlib/builtins.py:5235
 msgid "Please supply either one revision, or a range."
 msgstr ""
 
-#: bzrlib/builtins.py:5080
+#: bzrlib/builtins.py:5239
 msgid ""
 "Convert the current branch into a checkout of the supplied branch.\n"
 "If no branch is supplied, rebind to the last bound location."
 msgstr ""
 
-#: bzrlib/builtins.py:5083
+#: bzrlib/builtins.py:5242
 msgid ""
 "Once converted into a checkout, commits must succeed on the master branch\n"
 "before they will be applied to the local branch."
 msgstr ""
 
-#: bzrlib/builtins.py:5086
+#: bzrlib/builtins.py:5245
 msgid ""
 "Bound branches use the nickname of its master branch unless it is set\n"
 "locally, in which case binding will update the local nickname to be\n"
 "that of the master."
 msgstr ""
 
-#: bzrlib/builtins.py:5101
+#: bzrlib/builtins.py:5260
 msgid "No location supplied.  This format does not remember old locations."
 msgstr ""
 
-#: bzrlib/builtins.py:5106
+#: bzrlib/builtins.py:5265
 msgid "Branch is already bound"
 msgstr ""
 
-#: bzrlib/builtins.py:5108
+#: bzrlib/builtins.py:5267
 msgid "No location supplied and no previous location known"
 msgstr ""
 
-#: bzrlib/builtins.py:5114
+#: bzrlib/builtins.py:5273
 msgid "These branches have diverged. Try merging, and then bind again."
 msgstr ""
 
-#: bzrlib/builtins.py:5121
+#: bzrlib/builtins.py:5280
 msgid "Convert the current checkout into a regular branch."
 msgstr ""
 
-#: bzrlib/builtins.py:5123
+#: bzrlib/builtins.py:5282
 msgid ""
 "After unbinding, the local branch is considered independent and subsequent\n"
 "commits will be local only."
 msgstr ""
 
-#: bzrlib/builtins.py:5134
+#: bzrlib/builtins.py:5293
 msgid "Local branch is not bound"
 msgstr ""
 
-#: bzrlib/builtins.py:5138
+#: bzrlib/builtins.py:5297
 msgid "Remove the last committed revision."
 msgstr ""
 
-#: bzrlib/builtins.py:5140
+#: bzrlib/builtins.py:5299
 msgid ""
 "--verbose will print out what is being removed.\n"
 "--dry-run will go through all the motions, but not actually\n"
 "remove anything."
 msgstr ""
 
-#: bzrlib/builtins.py:5144
+#: bzrlib/builtins.py:5303
 msgid ""
 "If --revision is specified, uncommit revisions to leave the branch at the\n"
 "specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
 "branch at revision 15."
 msgstr ""
 
-#: bzrlib/builtins.py:5148
+#: bzrlib/builtins.py:5307
 msgid ""
 "Uncommit leaves the working tree ready for a new commit.  The only change\n"
 "it may make is to restore any pending merges that were present before\n"
 "the commit."
 msgstr ""
 
-#: bzrlib/builtins.py:5159
+#: bzrlib/builtins.py:5318
 msgid "Don't actually make changes."
 msgstr ""
 
-#: bzrlib/builtins.py:5160
+#: bzrlib/builtins.py:5319
 msgid "Say yes to all questions."
 msgstr ""
 
-#: bzrlib/builtins.py:5162
+#: bzrlib/builtins.py:5321
 msgid "Keep tags that point to removed revisions."
 msgstr ""
 
-#: bzrlib/builtins.py:5164
+#: bzrlib/builtins.py:5323
 msgid "Only remove the commits from the local branch when in a checkout."
 msgstr ""
 
-#: bzrlib/builtins.py:5213
+#: bzrlib/builtins.py:5372
 msgid "No revisions to uncommit.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:5228
+#: bzrlib/builtins.py:5387
 msgid "Dry-run, pretending to remove the above revisions.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:5231
+#: bzrlib/builtins.py:5390
 msgid "The above revision(s) will be removed.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:5235
+#: bzrlib/builtins.py:5394
 msgid "Uncommit these revisions"
 msgstr ""
 
-#: bzrlib/builtins.py:5238
+#: bzrlib/builtins.py:5397
 msgid "Canceled\n"
 msgstr ""
 
-#: bzrlib/builtins.py:5245
+#: bzrlib/builtins.py:5404
 #, python-format
 msgid ""
 "You can restore the old tip by running:\n"
 "  bzr pull . -r revid:%s\n"
 msgstr ""
 
-#: bzrlib/builtins.py:5250
+#: bzrlib/builtins.py:5409
 msgid "Break a dead lock."
 msgstr ""
 
-#: bzrlib/builtins.py:5252
+#: bzrlib/builtins.py:5411
 msgid ""
 "This command breaks a lock on a repository, branch, working directory or\n"
 "config file."
 msgstr ""
 
-#: bzrlib/builtins.py:5255
+#: bzrlib/builtins.py:5414
 msgid ""
 "CAUTION: Locks should only be broken when you are sure that the process\n"
 "holding the lock has been stopped."
 msgstr ""
 
-#: bzrlib/builtins.py:5258
+#: bzrlib/builtins.py:5417
 msgid ""
 "You can get information on what locks are open via the 'bzr info\n"
 "[location]' command."
 msgstr ""
 
-#: bzrlib/builtins.py:5261
+#: bzrlib/builtins.py:5420
 msgid ""
 ":Examples:\n"
 "    bzr break-lock\n"
@@ -3288,46 +3319,46 @@
 "    bzr break-lock --conf ~/.bazaar"
 msgstr ""
 
-#: bzrlib/builtins.py:5270
+#: bzrlib/builtins.py:5429
 msgid "LOCATION is the directory where the config lock is."
 msgstr ""
 
-#: bzrlib/builtins.py:5272
+#: bzrlib/builtins.py:5431
 msgid "Do not ask for confirmation before breaking the lock."
 msgstr ""
 
-#: bzrlib/builtins.py:5307
+#: bzrlib/builtins.py:5466
 msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
 msgstr ""
 
-#: bzrlib/builtins.py:5308
+#: bzrlib/builtins.py:5467
 msgid "Run the bzr server."
 msgstr ""
 
-#: bzrlib/builtins.py:5314
+#: bzrlib/builtins.py:5473
 msgid "Serve on stdin/out for use from inetd or sshd."
 msgstr ""
 
-#: bzrlib/builtins.py:5315
+#: bzrlib/builtins.py:5474
 msgid "protocol"
 msgstr ""
 
-#: bzrlib/builtins.py:5316
+#: bzrlib/builtins.py:5475
 msgid "Protocol to serve."
 msgstr ""
 
-#: bzrlib/builtins.py:5320
+#: bzrlib/builtins.py:5479
 msgid ""
 "Listen for connections on nominated port of the form [hostname:]portnumber.  "
 "Passing 0 as the port number will result in a dynamically allocated port.  "
 "The default port depends on the protocol."
 msgstr ""
 
-#: bzrlib/builtins.py:5326
+#: bzrlib/builtins.py:5485
 msgid "Serve contents of this directory."
 msgstr ""
 
-#: bzrlib/builtins.py:5328
+#: bzrlib/builtins.py:5487
 msgid ""
 "By default the server is a readonly server.  Supplying --allow-writes "
 "enables write access to the contents of the served directory and below.  "
@@ -3336,114 +3367,114 @@
 "uncontrolled write access to your file system."
 msgstr ""
 
-#: bzrlib/builtins.py:5337
+#: bzrlib/builtins.py:5496
 msgid "Override the default idle client timeout (5min)."
 msgstr ""
 
-#: bzrlib/builtins.py:5387
+#: bzrlib/builtins.py:5546
 msgid "Combine a tree into its containing tree."
 msgstr ""
 
-#: bzrlib/builtins.py:5389
+#: bzrlib/builtins.py:5548
 msgid "This command requires the target tree to be in a rich-root format."
 msgstr ""
 
-#: bzrlib/builtins.py:5391
+#: bzrlib/builtins.py:5550
 msgid ""
 "The TREE argument should be an independent tree, inside another tree, but\n"
 "not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
 "running \"bzr branch\" with the target inside a tree.)"
 msgstr ""
 
-#: bzrlib/builtins.py:5395
+#: bzrlib/builtins.py:5554
 msgid ""
 "The result is a combined tree, with the subtree no longer an independent\n"
 "part.  This is marked as a merge of the subtree into the containing tree,\n"
 "and all history is preserved."
 msgstr ""
 
-#: bzrlib/builtins.py:5413
+#: bzrlib/builtins.py:5572
 #, python-format
 msgid ""
 "Can't join trees because %s doesn't support rich root data.\n"
 "You can use bzr upgrade on the repository."
 msgstr ""
 
-#: bzrlib/builtins.py:5423 bzrlib/builtins.py:5429
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
 msgid "Cannot join {0}.  {1}"
 msgstr ""
 
-#: bzrlib/builtins.py:5433
+#: bzrlib/builtins.py:5592
 msgid "Split a subdirectory of a tree into a separate tree."
 msgstr ""
 
-#: bzrlib/builtins.py:5435
+#: bzrlib/builtins.py:5594
 msgid ""
 "This command will produce a target tree in a format that supports\n"
 "rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
 "converted into earlier formats like 'dirstate-tags'."
 msgstr ""
 
-#: bzrlib/builtins.py:5439
+#: bzrlib/builtins.py:5598
 msgid ""
 "The TREE argument should be a subdirectory of a working tree.  That\n"
 "subdirectory will be converted into an independent tree, with its own\n"
 "branch.  Commits in the top-level tree will not apply to the new subtree."
 msgstr ""
 
-#: bzrlib/builtins.py:5519
+#: bzrlib/builtins.py:5678
 msgid "No submit branch specified or known"
 msgstr ""
 
-#: bzrlib/builtins.py:5527 bzrlib/send.py:106
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
 msgid "No public branch specified or known"
 msgstr ""
 
-#: bzrlib/builtins.py:5532
+#: bzrlib/builtins.py:5691
 msgid "bzr merge-directive takes at most two one revision identifiers"
 msgstr ""
 
-#: bzrlib/builtins.py:5541
+#: bzrlib/builtins.py:5700
 msgid "No revisions to bundle."
 msgstr ""
 
-#: bzrlib/builtins.py:5560
+#: bzrlib/builtins.py:5719
 msgid "Mail or create a merge-directive for submitting changes."
 msgstr ""
 
-#: bzrlib/builtins.py:5562
+#: bzrlib/builtins.py:5721
 msgid "A merge directive provides many things needed for requesting merges:"
 msgstr ""
 
-#: bzrlib/builtins.py:5564
+#: bzrlib/builtins.py:5723
 msgid "* A machine-readable description of the merge to perform"
 msgstr ""
 
-#: bzrlib/builtins.py:5566
+#: bzrlib/builtins.py:5725
 msgid "* An optional patch that is a preview of the changes requested"
 msgstr ""
 
-#: bzrlib/builtins.py:5568
+#: bzrlib/builtins.py:5727
 msgid ""
 "* An optional bundle of revision data, so that the changes can be applied\n"
 "  directly from the merge directive, without retrieving data from a\n"
 "  branch."
 msgstr ""
 
-#: bzrlib/builtins.py:5572
+#: bzrlib/builtins.py:5731
 msgid ""
 "`bzr send` creates a compact data set that, when applied using bzr\n"
 "merge, has the same effect as merging from the source branch.  "
 msgstr ""
 
-#: bzrlib/builtins.py:5575
+#: bzrlib/builtins.py:5734
 msgid ""
 "By default the merge directive is self-contained and can be applied to any\n"
 "branch containing submit_branch in its ancestory without needing access to\n"
 "the source branch."
 msgstr ""
 
-#: bzrlib/builtins.py:5579
+#: bzrlib/builtins.py:5738
 msgid ""
 "If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
 "revisions, but only a structured request to merge from the\n"
@@ -3452,7 +3483,7 @@
 "included if known, so that people can check it later."
 msgstr ""
 
-#: bzrlib/builtins.py:5585
+#: bzrlib/builtins.py:5744
 msgid ""
 "The submit branch defaults to the parent of the source branch, but can be\n"
 "overridden.  Both submit branch and public branch will be remembered in\n"
@@ -3461,7 +3492,7 @@
 "be changed using --from."
 msgstr ""
 
-#: bzrlib/builtins.py:5591
+#: bzrlib/builtins.py:5750
 msgid ""
 "Both the submit branch and the public branch follow the usual behavior with\n"
 "respect to --remember: If there is no default location set, the first send\n"
@@ -3470,7 +3501,7 @@
 "--remember. The value will only be saved if the location can be accessed."
 msgstr ""
 
-#: bzrlib/builtins.py:5597
+#: bzrlib/builtins.py:5756
 msgid ""
 "In order to calculate those changes, bzr must analyse the submit branch.\n"
 "Therefore it is most efficient for the submit branch to be a local mirror.\n"
@@ -3478,20 +3509,20 @@
 "in the merge directive."
 msgstr ""
 
-#: bzrlib/builtins.py:5602
+#: bzrlib/builtins.py:5761
 msgid ""
 "The default behaviour is to send the merge directive by mail, unless -o is\n"
 "given, in which case it is sent to a file."
 msgstr ""
 
-#: bzrlib/builtins.py:5605
+#: bzrlib/builtins.py:5764
 msgid ""
 "Mail is sent using your preferred mail program.  This should be transparent\n"
 "on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
 "If the preferred client can't be found (or used), your editor will be used."
 msgstr ""
 
-#: bzrlib/builtins.py:5609
+#: bzrlib/builtins.py:5768
 msgid ""
 "To use a specific mail program, set the mail_client configuration option.\n"
 "(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
@@ -3503,7 +3534,7 @@
 "supported clients."
 msgstr ""
 
-#: bzrlib/builtins.py:5616
+#: bzrlib/builtins.py:5775
 msgid ""
 "If mail is being sent, a to address is required.  This can be supplied\n"
 "either on the commandline, by setting the submit_to configuration\n"
@@ -3511,7 +3542,7 @@
 "in the submit branch."
 msgstr ""
 
-#: bzrlib/builtins.py:5621
+#: bzrlib/builtins.py:5780
 msgid ""
 "Two formats are currently supported: \"4\" uses revision bundle format 4 "
 "and\n"
@@ -3521,13 +3552,13 @@
 "format 1.  It is compatible with Bazaar 0.12 - 0.18."
 msgstr ""
 
-#: bzrlib/builtins.py:5627
+#: bzrlib/builtins.py:5786
 msgid ""
 "The merge directives created by bzr send may be applied using bzr merge or\n"
 "bzr pull by specifying a file containing a merge directive as the location."
 msgstr ""
 
-#: bzrlib/builtins.py:5630
+#: bzrlib/builtins.py:5789
 msgid ""
 "bzr send makes extensive use of public locations to map local locations "
 "into\n"
@@ -3535,81 +3566,81 @@
 "set them, and use `bzr info` to display them."
 msgstr ""
 
-#: bzrlib/builtins.py:5654
+#: bzrlib/builtins.py:5813
 msgid "Write merge directive to this file or directory; use - for stdout."
 msgstr ""
 
-#: bzrlib/builtins.py:5658
+#: bzrlib/builtins.py:5817
 msgid ""
 "Refuse to send if there are uncommitted changes in the working tree, --no-"
 "strict disables the check."
 msgstr ""
 
-#: bzrlib/builtins.py:5660
+#: bzrlib/builtins.py:5819
 msgid "Mail the request to this address."
 msgstr ""
 
-#: bzrlib/builtins.py:5664
+#: bzrlib/builtins.py:5823
 msgid "Body for the email."
 msgstr ""
 
-#: bzrlib/builtins.py:5717
+#: bzrlib/builtins.py:5876
 msgid "Do not include a bundle in the merge directive."
 msgstr ""
 
-#: bzrlib/builtins.py:5718
+#: bzrlib/builtins.py:5877
 msgid "Do not include a preview patch in the merge directive."
 msgstr ""
 
-#: bzrlib/builtins.py:5721
+#: bzrlib/builtins.py:5880
 msgid "Remember submit and public branch."
 msgstr ""
 
-#: bzrlib/builtins.py:5723
+#: bzrlib/builtins.py:5882
 msgid ""
 "Branch to generate the submission from, rather than the one containing the "
 "working directory."
 msgstr ""
 
-#: bzrlib/builtins.py:5733
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
 msgid "format"
 msgstr ""
 
-#: bzrlib/builtins.py:5734
+#: bzrlib/builtins.py:5893
 msgid "Use the specified output format."
 msgstr ""
 
-#: bzrlib/builtins.py:5756
+#: bzrlib/builtins.py:5915
 msgid "Create, remove or modify a tag naming a revision."
 msgstr ""
 
-#: bzrlib/builtins.py:5758
+#: bzrlib/builtins.py:5917
 msgid ""
 "Tags give human-meaningful names to revisions.  Commands that take a -r\n"
 "(--revision) option can be given -rtag:X, where X is any previously\n"
 "created tag."
 msgstr ""
 
-#: bzrlib/builtins.py:5762
+#: bzrlib/builtins.py:5921
 msgid ""
 "Tags are stored in the branch.  Tags are copied from one branch to another\n"
 "along when you branch, push, pull or merge."
 msgstr ""
 
-#: bzrlib/builtins.py:5765
+#: bzrlib/builtins.py:5924
 msgid ""
 "It is an error to give a tag name that already exists unless you pass\n"
 "--force, in which case the tag is moved to point to the new revision."
 msgstr ""
 
-#: bzrlib/builtins.py:5768
+#: bzrlib/builtins.py:5927
 msgid ""
 "To rename a tag (change the name but keep it on the same revsion), run "
 "``bzr\n"
 "tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
 msgstr ""
 
-#: bzrlib/builtins.py:5771
+#: bzrlib/builtins.py:5930
 msgid ""
 "If no tag name is specified it will be determined through the \n"
 "'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
@@ -3617,76 +3648,76 @@
 "details."
 msgstr ""
 
-#: bzrlib/builtins.py:5781
+#: bzrlib/builtins.py:5940
 msgid "Delete this tag rather than placing it."
 msgstr ""
 
-#: bzrlib/builtins.py:5784
+#: bzrlib/builtins.py:5943
 msgid "Branch in which to place the tag."
 msgstr ""
 
-#: bzrlib/builtins.py:5786
+#: bzrlib/builtins.py:5945
 msgid "Replace existing tags."
 msgstr ""
 
-#: bzrlib/builtins.py:5801
+#: bzrlib/builtins.py:5960
 msgid "No tag specified to delete."
 msgstr ""
 
-#: bzrlib/builtins.py:5803
+#: bzrlib/builtins.py:5962
 #, python-format
 msgid "Deleted tag %s."
 msgstr ""
 
-#: bzrlib/builtins.py:5817
+#: bzrlib/builtins.py:5976
 msgid "Please specify a tag name."
 msgstr ""
 
-#: bzrlib/builtins.py:5825
+#: bzrlib/builtins.py:5984
 #, python-format
 msgid "Tag %s already exists for that revision."
 msgstr ""
 
-#: bzrlib/builtins.py:5829
+#: bzrlib/builtins.py:5988
 #, python-format
 msgid "Created tag %s."
 msgstr ""
 
-#: bzrlib/builtins.py:5831
+#: bzrlib/builtins.py:5990
 #, python-format
 msgid "Updated tag %s."
 msgstr ""
 
-#: bzrlib/builtins.py:5835
+#: bzrlib/builtins.py:5994
 msgid "List tags."
 msgstr ""
 
-#: bzrlib/builtins.py:5837
+#: bzrlib/builtins.py:5996
 msgid ""
 "This command shows a table of tag names and the revisions they reference."
 msgstr ""
 
-#: bzrlib/builtins.py:5843
+#: bzrlib/builtins.py:6002
 msgid "Branch whose tags should be displayed."
 msgstr ""
 
-#: bzrlib/builtins.py:5845
+#: bzrlib/builtins.py:6004
 msgid "Sort tags by different criteria."
 msgstr ""
 
-#: bzrlib/builtins.py:5845
+#: bzrlib/builtins.py:6004
 msgid "Sorting"
 msgstr ""
 
-#: bzrlib/builtins.py:5914
+#: bzrlib/builtins.py:6073
 msgid "Reconfigure the type of a bzr directory."
 msgstr ""
 
-#: bzrlib/builtins.py:5916
+#: bzrlib/builtins.py:6075
 msgid "A target configuration must be specified."
 msgstr ""
 
-#: bzrlib/builtins.py:5918
+#: bzrlib/builtins.py:6077
 msgid ""
 "For checkouts, the bind-to location will be auto-detected if not specified.\n"
 "The order of preference is\n"
@@ -3697,96 +3728,96 @@
 "If none of these is available, --bind-to must be specified."
 msgstr ""
 
-#: bzrlib/builtins.py:5932
+#: bzrlib/builtins.py:6091
 msgid "Tree type"
 msgstr ""
 
-#: bzrlib/builtins.py:5933
+#: bzrlib/builtins.py:6092
 msgid "The relation between branch and tree."
 msgstr ""
 
-#: bzrlib/builtins.py:5935
+#: bzrlib/builtins.py:6094
 msgid "Reconfigure to be an unbound branch with no working tree."
 msgstr ""
 
-#: bzrlib/builtins.py:5936
+#: bzrlib/builtins.py:6095
 msgid "Reconfigure to be an unbound branch with a working tree."
 msgstr ""
 
-#: bzrlib/builtins.py:5937
+#: bzrlib/builtins.py:6096
 msgid "Reconfigure to be a bound branch with a working tree."
 msgstr ""
 
-#: bzrlib/builtins.py:5938
+#: bzrlib/builtins.py:6097
 msgid "Reconfigure to be a lightweight checkout (with no local history)."
 msgstr ""
 
-#: bzrlib/builtins.py:5943
+#: bzrlib/builtins.py:6102
 msgid "Repository type"
 msgstr ""
 
-#: bzrlib/builtins.py:5944
+#: bzrlib/builtins.py:6103
 msgid "Location fo the repository."
 msgstr ""
 
-#: bzrlib/builtins.py:5946
+#: bzrlib/builtins.py:6105
 msgid ""
 "Reconfigure to be a standalone branch (i.e. stop using shared repository)."
 msgstr ""
 
-#: bzrlib/builtins.py:5948
+#: bzrlib/builtins.py:6107
 msgid "Reconfigure to use a shared repository."
 msgstr ""
 
-#: bzrlib/builtins.py:5952
+#: bzrlib/builtins.py:6111
 msgid "Trees in Repository"
 msgstr ""
 
-#: bzrlib/builtins.py:5953
+#: bzrlib/builtins.py:6112
 msgid "Whether new branches in the repository have trees."
 msgstr ""
 
-#: bzrlib/builtins.py:5955
+#: bzrlib/builtins.py:6114
 msgid ""
 "Reconfigure repository to create working trees on branches by default."
 msgstr ""
 
-#: bzrlib/builtins.py:5957
+#: bzrlib/builtins.py:6116
 msgid ""
 "Reconfigure repository to not create working trees on branches by default."
 msgstr ""
 
-#: bzrlib/builtins.py:5960
+#: bzrlib/builtins.py:6119
 msgid "Branch to bind checkout to."
 msgstr ""
 
-#: bzrlib/builtins.py:5962
+#: bzrlib/builtins.py:6121
 msgid "Perform reconfiguration even if local changes will be lost."
 msgstr ""
 
-#: bzrlib/builtins.py:5965
+#: bzrlib/builtins.py:6124
 msgid "Reconfigure a branch to be stacked on another branch."
 msgstr ""
 
-#: bzrlib/builtins.py:5969
+#: bzrlib/builtins.py:6128
 msgid ""
 "Reconfigure a branch to be unstacked.  This may require copying substantial "
 "data into it."
 msgstr ""
 
-#: bzrlib/builtins.py:5979
+#: bzrlib/builtins.py:6138
 msgid "Can't use both --stacked-on and --unstacked"
 msgstr ""
 
-#: bzrlib/builtins.py:5993
+#: bzrlib/builtins.py:6152
 msgid "No target configuration specified"
 msgstr ""
 
-#: bzrlib/builtins.py:6028
+#: bzrlib/builtins.py:6187
 msgid "Set the branch of a checkout and update."
 msgstr ""
 
-#: bzrlib/builtins.py:6030
+#: bzrlib/builtins.py:6189
 msgid ""
 "For lightweight checkouts, this changes the branch being referenced.\n"
 "For heavyweight checkouts, this checks that there are no local commits\n"
@@ -3794,17 +3825,17 @@
 "of the new location and binds to it."
 msgstr ""
 
-#: bzrlib/builtins.py:6035
+#: bzrlib/builtins.py:6194
 msgid ""
 "In both cases, the working tree is updated and uncommitted changes\n"
 "are merged. The user can commit or revert these as they desire."
 msgstr ""
 
-#: bzrlib/builtins.py:6038
+#: bzrlib/builtins.py:6197
 msgid "Pending merges need to be committed or reverted before using switch."
 msgstr ""
 
-#: bzrlib/builtins.py:6040
+#: bzrlib/builtins.py:6199
 msgid ""
 "The path to the branch to switch to can be specified relative to the parent\n"
 "directory of the current branch. For example, if you are currently in a\n"
@@ -3812,34 +3843,34 @@
 "/path/to/newbranch."
 msgstr ""
 
-#: bzrlib/builtins.py:6045
+#: bzrlib/builtins.py:6204
 msgid ""
 "Bound branches use the nickname of its master branch unless it is set\n"
 "locally, in which case switching will update the local nickname to be\n"
 "that of the master."
 msgstr ""
 
-#: bzrlib/builtins.py:6053
+#: bzrlib/builtins.py:6212
 msgid "Switch even if local commits will be lost."
 msgstr ""
 
-#: bzrlib/builtins.py:6056
+#: bzrlib/builtins.py:6215
 msgid "Create the target branch from this one before switching to it."
 msgstr ""
 
-#: bzrlib/builtins.py:6068
+#: bzrlib/builtins.py:6229
 msgid "You must supply either a revision or a location"
 msgstr ""
 
-#: bzrlib/builtins.py:6079
+#: bzrlib/builtins.py:6242
 msgid "cannot create branch without source branch"
 msgstr ""
 
-#: bzrlib/builtins.py:6143
+#: bzrlib/builtins.py:6262
 msgid "Manage filtered views."
 msgstr ""
 
-#: bzrlib/builtins.py:6145
+#: bzrlib/builtins.py:6264
 msgid ""
 "Views provide a mask over the tree so that users can focus on\n"
 "a subset of a tree when doing their work. After creating a view,\n"
@@ -3849,7 +3880,7 @@
 "must be within the current view."
 msgstr ""
 
-#: bzrlib/builtins.py:6152
+#: bzrlib/builtins.py:6271
 msgid ""
 "In most cases, a view has a short life-span: it is created to make\n"
 "a selected change and is deleted once that change is committed.\n"
@@ -3857,7 +3888,7 @@
 "and switch between them."
 msgstr ""
 
-#: bzrlib/builtins.py:6157
+#: bzrlib/builtins.py:6276
 msgid ""
 "To disable the current view without deleting it, you can switch to\n"
 "the pseudo view called ``off``. This can be useful when you need\n"
@@ -3865,197 +3896,197 @@
 "want to switch back to your view after that."
 msgstr ""
 
-#: bzrlib/builtins.py:6162
+#: bzrlib/builtins.py:6281
 msgid ""
 ":Examples:\n"
 "  To define the current view::"
 msgstr ""
 
-#: bzrlib/builtins.py:6165
+#: bzrlib/builtins.py:6284
 msgid "    bzr view file1 dir1 ..."
 msgstr ""
 
-#: bzrlib/builtins.py:6167
+#: bzrlib/builtins.py:6286
 msgid "  To list the current view::"
 msgstr ""
 
-#: bzrlib/builtins.py:6169
+#: bzrlib/builtins.py:6288
 msgid "    bzr view"
 msgstr ""
 
-#: bzrlib/builtins.py:6171
+#: bzrlib/builtins.py:6290
 msgid "  To delete the current view::"
 msgstr ""
 
-#: bzrlib/builtins.py:6173
+#: bzrlib/builtins.py:6292
 msgid "    bzr view --delete"
 msgstr ""
 
-#: bzrlib/builtins.py:6175
+#: bzrlib/builtins.py:6294
 msgid "  To disable the current view without deleting it::"
 msgstr ""
 
-#: bzrlib/builtins.py:6177
+#: bzrlib/builtins.py:6296
 msgid "    bzr view --switch off"
 msgstr ""
 
-#: bzrlib/builtins.py:6179
+#: bzrlib/builtins.py:6298
 msgid "  To define a named view and switch to it::"
 msgstr ""
 
-#: bzrlib/builtins.py:6181
+#: bzrlib/builtins.py:6300
 msgid "    bzr view --name view-name file1 dir1 ..."
 msgstr ""
 
-#: bzrlib/builtins.py:6183
+#: bzrlib/builtins.py:6302
 msgid "  To list a named view::"
 msgstr ""
 
-#: bzrlib/builtins.py:6185
+#: bzrlib/builtins.py:6304
 msgid "    bzr view --name view-name"
 msgstr ""
 
-#: bzrlib/builtins.py:6187
+#: bzrlib/builtins.py:6306
 msgid "  To delete a named view::"
 msgstr ""
 
-#: bzrlib/builtins.py:6189
+#: bzrlib/builtins.py:6308
 msgid "    bzr view --name view-name --delete"
 msgstr ""
 
-#: bzrlib/builtins.py:6191
+#: bzrlib/builtins.py:6310
 msgid "  To switch to a named view::"
 msgstr ""
 
-#: bzrlib/builtins.py:6193
+#: bzrlib/builtins.py:6312
 msgid "    bzr view --switch view-name"
 msgstr ""
 
-#: bzrlib/builtins.py:6195
+#: bzrlib/builtins.py:6314
 msgid "  To list all views defined::"
 msgstr ""
 
-#: bzrlib/builtins.py:6197
+#: bzrlib/builtins.py:6316
 msgid "    bzr view --all"
 msgstr ""
 
-#: bzrlib/builtins.py:6199
+#: bzrlib/builtins.py:6318
 msgid "  To delete all views::"
 msgstr ""
 
-#: bzrlib/builtins.py:6201
+#: bzrlib/builtins.py:6320
 msgid "    bzr view --delete --all"
 msgstr ""
 
-#: bzrlib/builtins.py:6208
+#: bzrlib/builtins.py:6327
 msgid "Apply list or delete action to all views."
 msgstr ""
 
-#: bzrlib/builtins.py:6211
+#: bzrlib/builtins.py:6330
 msgid "Delete the view."
 msgstr ""
 
-#: bzrlib/builtins.py:6214
+#: bzrlib/builtins.py:6333
 msgid "Name of the view to define, list or delete."
 msgstr ""
 
-#: bzrlib/builtins.py:6218
+#: bzrlib/builtins.py:6337
 msgid "Name of the view to switch to."
 msgstr ""
 
-#: bzrlib/builtins.py:6237
+#: bzrlib/builtins.py:6356
 msgid "Both --delete and a file list specified"
 msgstr ""
 
-#: bzrlib/builtins.py:6240
+#: bzrlib/builtins.py:6359
 msgid "Both --delete and --switch specified"
 msgstr ""
 
-#: bzrlib/builtins.py:6243
+#: bzrlib/builtins.py:6362
 msgid "Deleted all views.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:6245
+#: bzrlib/builtins.py:6364
 msgid "No current view to delete"
 msgstr ""
 
-#: bzrlib/builtins.py:6248
+#: bzrlib/builtins.py:6367
 #, python-format
 msgid "Deleted '%s' view.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:6252
+#: bzrlib/builtins.py:6371
 msgid "Both --switch and a file list specified"
 msgstr ""
 
-#: bzrlib/builtins.py:6255
+#: bzrlib/builtins.py:6374
 msgid "Both --switch and --all specified"
 msgstr ""
 
-#: bzrlib/builtins.py:6258
+#: bzrlib/builtins.py:6377
 msgid "No current view to disable"
 msgstr ""
 
-#: bzrlib/builtins.py:6260
+#: bzrlib/builtins.py:6379
 #, python-format
 msgid "Disabled '%s' view.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:6264 bzrlib/builtins.py:6286
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
 msgid "Using '{0}' view: {1}\n"
 msgstr ""
 
-#: bzrlib/builtins.py:6267
+#: bzrlib/builtins.py:6386
 msgid "Views defined:\n"
 msgstr ""
 
-#: bzrlib/builtins.py:6276
+#: bzrlib/builtins.py:6395
 msgid "No views defined.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:6283
+#: bzrlib/builtins.py:6402
 msgid "Cannot change the 'off' pseudo view"
 msgstr ""
 
-#: bzrlib/builtins.py:6291
+#: bzrlib/builtins.py:6410
 msgid "No current view.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:6294
+#: bzrlib/builtins.py:6413
 msgid "'{0}' view is: {1}\n"
 msgstr ""
 
-#: bzrlib/builtins.py:6314
+#: bzrlib/builtins.py:6433
 msgid "    <no hooks installed>\n"
 msgstr ""
 
-#: bzrlib/builtins.py:6318
+#: bzrlib/builtins.py:6437
 msgid "Remove a branch."
 msgstr ""
 
-#: bzrlib/builtins.py:6320
+#: bzrlib/builtins.py:6439
 msgid ""
 "This will remove the branch from the specified location but \n"
 "will keep any working tree or repository in place."
 msgstr ""
 
-#: bzrlib/builtins.py:6325
+#: bzrlib/builtins.py:6444
 msgid "  Remove the branch at repo/trunk::"
 msgstr ""
 
-#: bzrlib/builtins.py:6327
+#: bzrlib/builtins.py:6446
 msgid "    bzr remove-branch repo/trunk"
 msgstr ""
 
-#: bzrlib/builtins.py:6342
+#: bzrlib/builtins.py:6461
 msgid "Plaintext diff output."
 msgstr ""
 
-#: bzrlib/builtins.py:6343
+#: bzrlib/builtins.py:6462
 msgid "Temporarily set aside some changes from the current tree."
 msgstr ""
 
-#: bzrlib/builtins.py:6345
+#: bzrlib/builtins.py:6464
 msgid ""
 "Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
 "ie. out of the way, until a later time when you can bring them back from\n"
@@ -4064,11 +4095,11 @@
 "will they survive its deletion."
 msgstr ""
 
-#: bzrlib/builtins.py:6351
+#: bzrlib/builtins.py:6470
 msgid "If shelve --list is specified, previously-shelved changes are listed."
 msgstr ""
 
-#: bzrlib/builtins.py:6353
+#: bzrlib/builtins.py:6472
 msgid ""
 "Shelve is intended to help separate several sets of changes that have\n"
 "been inappropriately mingled.  If you just want to get rid of all changes\n"
@@ -4076,35 +4107,35 @@
 "shelve all text changes at once, use shelve --all."
 msgstr ""
 
-#: bzrlib/builtins.py:6358
+#: bzrlib/builtins.py:6477
 msgid ""
 "If filenames are specified, only the changes to those files will be\n"
 "shelved. Other files will be left untouched."
 msgstr ""
 
-#: bzrlib/builtins.py:6361
+#: bzrlib/builtins.py:6480
 msgid ""
 "If a revision is specified, changes since that revision will be shelved."
 msgstr ""
 
-#: bzrlib/builtins.py:6363
+#: bzrlib/builtins.py:6482
 msgid ""
 "You can put multiple items on the shelf, and by default, 'unshelve' will\n"
 "restore the most recently shelved changes."
 msgstr ""
 
-#: bzrlib/builtins.py:6366
+#: bzrlib/builtins.py:6485
 msgid ""
 "For complicated changes, it is possible to edit the changes in a separate\n"
 "editor program to decide what the file remaining in the working copy\n"
 "should look like.  To do this, add the configuration option"
 msgstr ""
 
-#: bzrlib/builtins.py:6370
+#: bzrlib/builtins.py:6489
 msgid "    change_editor = PROGRAM @new_path @old_path"
 msgstr ""
 
-#: bzrlib/builtins.py:6372
+#: bzrlib/builtins.py:6491
 msgid ""
 "where @new_path is replaced with the path of the new version of the \n"
 "file and @old_path is replaced with the path of the old version of \n"
@@ -4113,399 +4144,404 @@
 "    "
 msgstr ""
 
-#: bzrlib/builtins.py:6384
+#: bzrlib/builtins.py:6503
 msgid "Shelve all changes."
 msgstr ""
 
-#: bzrlib/builtins.py:6386
+#: bzrlib/builtins.py:6505
 msgid "Method to use for writing diffs."
 msgstr ""
 
-#: bzrlib/builtins.py:6386
+#: bzrlib/builtins.py:6505
 msgid "writer"
 msgstr ""
 
-#: bzrlib/builtins.py:6390
+#: bzrlib/builtins.py:6509
 msgid "List shelved changes."
 msgstr ""
 
-#: bzrlib/builtins.py:6392
+#: bzrlib/builtins.py:6511
 msgid "Destroy removed changes instead of shelving them."
 msgstr ""
 
-#: bzrlib/builtins.py:6421
+#: bzrlib/builtins.py:6540
 msgid "No shelved changes."
 msgstr ""
 
-#: bzrlib/builtins.py:6432
+#: bzrlib/builtins.py:6551
 msgid "Restore shelved changes."
 msgstr ""
 
-#: bzrlib/builtins.py:6434
+#: bzrlib/builtins.py:6553
 msgid ""
 "By default, the most recently shelved changes are restored. However if you\n"
 "specify a shelf by id those changes will be restored instead.  This works\n"
 "best when the changes don't depend on each other."
 msgstr ""
 
-#: bzrlib/builtins.py:6443
+#: bzrlib/builtins.py:6562
 msgid "The action to perform."
 msgstr ""
 
-#: bzrlib/builtins.py:6445
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
 msgid "Apply changes and remove from the shelf."
 msgstr ""
 
-#: bzrlib/builtins.py:6446
+#: bzrlib/builtins.py:6565
 msgid "Show changes, but do not apply or remove them."
 msgstr ""
 
-#: bzrlib/builtins.py:6447
+#: bzrlib/builtins.py:6566
 msgid ""
 "Instead of unshelving the changes, show the diff that would result from "
 "unshelving."
 msgstr ""
 
-#: bzrlib/builtins.py:6449
+#: bzrlib/builtins.py:6568
 msgid "Delete changes without applying them."
 msgstr ""
 
-#: bzrlib/builtins.py:6450
+#: bzrlib/builtins.py:6569
 msgid "Apply changes but don't delete them."
 msgstr ""
 
-#: bzrlib/builtins.py:6465
+#: bzrlib/builtins.py:6584
 msgid "Remove unwanted files from working tree."
 msgstr ""
 
-#: bzrlib/builtins.py:6467
+#: bzrlib/builtins.py:6586
 msgid ""
 "By default, only unknown files, not ignored files, are deleted.  Versioned\n"
 "files are never deleted."
 msgstr ""
 
-#: bzrlib/builtins.py:6470
+#: bzrlib/builtins.py:6589
 msgid ""
 "Another class is 'detritus', which includes files emitted by bzr during\n"
 "normal operations and selftests.  (The value of these files decreases with\n"
 "time.)"
 msgstr ""
 
-#: bzrlib/builtins.py:6474
+#: bzrlib/builtins.py:6593
 msgid ""
 "If no options are specified, unknown files are deleted.  Otherwise, option\n"
 "flags are respected, and may be combined."
 msgstr ""
 
-#: bzrlib/builtins.py:6477
+#: bzrlib/builtins.py:6596
 msgid "To check what clean-tree will do, use --dry-run."
 msgstr ""
 
-#: bzrlib/builtins.py:6480
+#: bzrlib/builtins.py:6599
 msgid "Delete all ignored files."
 msgstr ""
 
-#: bzrlib/builtins.py:6481
+#: bzrlib/builtins.py:6600
 msgid ""
 "Delete conflict files, merge and revert backups, and failed selftest dirs."
 msgstr ""
 
-#: bzrlib/builtins.py:6484
+#: bzrlib/builtins.py:6603
 msgid "Delete files unknown to bzr (default)."
 msgstr ""
 
-#: bzrlib/builtins.py:6485
+#: bzrlib/builtins.py:6604
 msgid "Show files to delete instead of deleting them."
 msgstr ""
 
-#: bzrlib/builtins.py:6487
+#: bzrlib/builtins.py:6606
 msgid "Do not prompt before deleting."
 msgstr ""
 
-#: bzrlib/bundle/__init__.py:57
+#: bzrlib/bundle/__init__.py:59
 msgid "A directory cannot be a bundle"
 msgstr ""
 
-#: bzrlib/bundle/apply_bundle.py:37
+#: bzrlib/bundle/apply_bundle.py:40
 msgid "Install revisions"
 msgstr ""
 
-#: bzrlib/bundle/commands.py:61
+#: bzrlib/bundle/commands.py:64
 msgid "--verbose requires a merge directive"
 msgstr ""
 
-#: bzrlib/bundle/commands.py:64
+#: bzrlib/bundle/commands.py:67
 msgid "Bundle format not supported"
 msgstr ""
 
-#: bzrlib/bundle/commands.py:74
+#: bzrlib/bundle/commands.py:77
 msgid "Records\n"
 msgstr ""
 
-#: bzrlib/bundle/commands.py:78
+#: bzrlib/bundle/commands.py:81
 msgid "{0}: {1} ({2} multiparent)\n"
 msgstr ""
 
-#: bzrlib/bundle/commands.py:80
+#: bzrlib/bundle/commands.py:83
 #, python-format
 msgid "unique files: %d\n"
 msgstr ""
 
-#: bzrlib/bundle/commands.py:89
+#: bzrlib/bundle/commands.py:92
 msgid "Revisions\n"
 msgstr ""
 
-#: bzrlib/bundle/commands.py:90
+#: bzrlib/bundle/commands.py:93
 #, python-format
 msgid "nicks: %s\n"
 msgstr ""
 
-#: bzrlib/bundle/commands.py:92
+#: bzrlib/bundle/commands.py:95
 #, python-format
 msgid ""
 "committers: \n"
 "%s\n"
 msgstr ""
 
-#: bzrlib/bundle/commands.py:100
+#: bzrlib/bundle/commands.py:103
 msgid "Decoded contents\n"
 msgstr ""
 
-#: bzrlib/bundle/serializer/v4.py:325
+#: bzrlib/bundle/serializer/v4.py:327
 #, python-format
 msgid "Bundling %d revision."
 msgid_plural "Bundling %d revisions."
 msgstr[0] ""
 msgstr[1] ""
 
-#: bzrlib/bzrdir.py:487
+#: bzrlib/bzrdir.py:490
 msgid ""
 "making backup of {0}\n"
 "  to {1}"
 msgstr ""
 
-#: bzrlib/bzrdir.py:510
+#: bzrlib/bzrdir.py:513
 msgid "renamed {0} to {1}"
 msgstr ""
 
-#: bzrlib/bzrdir.py:1512
+#: bzrlib/bzrdir.py:1652
 #, python-format
 msgid ""
 "Source repository format does not support stacking, using format:\n"
 "  %s"
 msgstr ""
 
-#: bzrlib/bzrdir.py:1532
+#: bzrlib/bzrdir.py:1672
 #, python-format
 msgid ""
 "Source branch format does not support stacking, using format:\n"
 "  %s"
 msgstr ""
 
-#: bzrlib/bzrdir.py:1677
+#: bzrlib/bzrdir.py:1818
 msgid "starting repository conversion"
 msgstr ""
 
-#: bzrlib/bzrdir.py:1906
+#: bzrlib/bzrdir.py:2039
 msgid "Using default stacking branch {0} at {1}"
 msgstr ""
 
-#: bzrlib/check.py:106
+#: bzrlib/check.py:108
 msgid "check"
 msgstr ""
 
-#: bzrlib/check.py:108
+#: bzrlib/check.py:110
 msgid "checking revisions"
 msgstr ""
 
-#: bzrlib/check.py:110
+#: bzrlib/check.py:112
 msgid "checking commit contents"
 msgstr ""
 
-#: bzrlib/check.py:112
+#: bzrlib/check.py:114
 msgid "checking file graphs"
 msgstr ""
 
-#: bzrlib/check.py:116
+#: bzrlib/check.py:118
 msgid "checking branches and trees"
 msgstr ""
 
-#: bzrlib/check.py:203
+#: bzrlib/check.py:205
 msgid "checked repository {0} format {1}"
 msgstr ""
 
-#: bzrlib/check.py:206
+#: bzrlib/check.py:208
 #, python-format
 msgid "%6d revisions"
 msgstr ""
 
-#: bzrlib/check.py:207
+#: bzrlib/check.py:209
 #, python-format
 msgid "%6d file-ids"
 msgstr ""
 
-#: bzrlib/check.py:209
+#: bzrlib/check.py:211
 #, python-format
 msgid "%6d unreferenced text versions"
 msgstr ""
 
-#: bzrlib/check.py:213
+#: bzrlib/check.py:215
 msgid "unreferenced version: {{{0}}} in {1}"
 msgstr ""
 
-#: bzrlib/check.py:216
+#: bzrlib/check.py:218
 #, python-format
 msgid "%6d revisions are missing inventory_sha1"
 msgstr ""
 
-#: bzrlib/check.py:219
+#: bzrlib/check.py:221
 #, python-format
 msgid "%6d revisions are mentioned but not present"
 msgstr ""
 
-#: bzrlib/check.py:222
+#: bzrlib/check.py:224
 #, python-format
 msgid "%6d ghost revisions"
 msgstr ""
 
-#: bzrlib/check.py:227
+#: bzrlib/check.py:229
 #, python-format
 msgid "%6d revisions missing parents in ancestry"
 msgstr ""
 
-#: bzrlib/check.py:231
+#: bzrlib/check.py:233
 #, python-format
 msgid "      %s should be in the ancestry for:"
 msgstr ""
 
-#: bzrlib/check.py:235
+#: bzrlib/check.py:237
 #, python-format
 msgid "%6d inconsistent parents"
 msgstr ""
 
-#: bzrlib/check.py:239
+#: bzrlib/check.py:241
 msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
 msgstr ""
 
-#: bzrlib/check.py:245
+#: bzrlib/check.py:247
 #, python-format
 msgid "%6d revisions have incorrect parents in the revision index"
 msgstr ""
 
-#: bzrlib/check.py:251
+#: bzrlib/check.py:253
 msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
 msgstr ""
 
-#: bzrlib/check.py:265
+#: bzrlib/check.py:267
 msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
 msgstr ""
 
-#: bzrlib/check.py:294
+#: bzrlib/check.py:296
 msgid ""
 "Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
 "{{{4}}}"
 msgstr ""
 
-#: bzrlib/check.py:352
+#: bzrlib/check.py:354
 #, python-format
 msgid "Checking branch at '%s'."
 msgstr ""
 
-#: bzrlib/check.py:372
+#: bzrlib/check.py:374
 #, python-format
 msgid "Checking working tree at '%s'."
 msgstr ""
 
-#: bzrlib/check.py:425 bzrlib/check.py:439
+#: bzrlib/check.py:427 bzrlib/check.py:441
 msgid "No branch found at specified location."
 msgstr ""
 
-#: bzrlib/check.py:427 bzrlib/check.py:437
+#: bzrlib/check.py:429 bzrlib/check.py:439
 msgid "No working tree found at specified location."
 msgstr ""
 
-#: bzrlib/check.py:430
+#: bzrlib/check.py:432
 #, python-format
 msgid "Checking repository at '%s'."
 msgstr ""
 
-#: bzrlib/check.py:441
+#: bzrlib/check.py:443
 msgid "No repository found at specified location."
 msgstr ""
 
-#: bzrlib/clean_tree.py:62
+#: bzrlib/clean_tree.py:63
 msgid "Nothing to delete."
 msgstr ""
 
-#: bzrlib/clean_tree.py:67
+#: bzrlib/clean_tree.py:68
 msgid "Are you sure you wish to delete these"
 msgstr ""
 
-#: bzrlib/clean_tree.py:69
+#: bzrlib/clean_tree.py:70
 msgid "Canceled"
 msgstr ""
 
-#: bzrlib/clean_tree.py:106
+#: bzrlib/clean_tree.py:107
 #, python-format
 msgid "unable to remove %s"
 msgstr ""
 
-#: bzrlib/clean_tree.py:110
+#: bzrlib/clean_tree.py:111
 msgid "deleting paths:"
 msgstr ""
 
-#: bzrlib/clean_tree.py:124
+#: bzrlib/clean_tree.py:125
 msgid "unable to remove \"{0}\": {1}."
 msgstr ""
 
-#: bzrlib/clean_tree.py:129
+#: bzrlib/clean_tree.py:130
 msgid "No files deleted."
 msgstr ""
 
-#: bzrlib/cmd_version_info.py:45
+#: bzrlib/cmd_version_info.py:47
 msgid "No known version info format {0}. Supported types are: {1}"
 msgstr ""
 
-#: bzrlib/cmd_version_info.py:50
+#: bzrlib/cmd_version_info.py:52
 msgid "Version info in Custom template-based format."
 msgstr ""
 
-#: bzrlib/cmd_version_info.py:50
+#: bzrlib/cmd_version_info.py:52
 msgid "Version info in Python format."
 msgstr ""
 
-#: bzrlib/cmd_version_info.py:50
+#: bzrlib/cmd_version_info.py:52
 msgid "Version info in RIO (simple text) format (default)."
 msgstr ""
 
-#: bzrlib/cmd_version_info.py:51
+#: bzrlib/cmd_version_info.py:53
 msgid "Show version information about this tree."
 msgstr ""
 
-#: bzrlib/cmd_version_info.py:53
+#: bzrlib/cmd_version_info.py:55
 msgid ""
 "You can use this command to add information about version into\n"
 "source code of an application. The output can be in one of the\n"
 "supported formats or in a custom format based on a template."
 msgstr ""
 
-#: bzrlib/cmd_version_info.py:57
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
 msgid "For example::"
 msgstr ""
 
-#: bzrlib/cmd_version_info.py:59
+#: bzrlib/cmd_version_info.py:61
 msgid ""
 "  bzr version-info --custom \\\n"
 "    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
 msgstr ""
 
-#: bzrlib/cmd_version_info.py:62
+#: bzrlib/cmd_version_info.py:64
 msgid ""
 "will produce a C header file with formatted string containing the\n"
 "current revision number. Other supported variables in templates are:"
 msgstr ""
 
-#: bzrlib/cmd_version_info.py:65
+#: bzrlib/cmd_version_info.py:67
 msgid ""
 "  * {date} - date of the last revision\n"
 "  * {build_date} - current date\n"
@@ -4516,66 +4552,66 @@
 "              otherwise 1"
 msgstr ""
 
-#: bzrlib/cmd_version_info.py:75
+#: bzrlib/cmd_version_info.py:77
 msgid "Select the output format."
 msgstr ""
 
-#: bzrlib/cmd_version_info.py:79
+#: bzrlib/cmd_version_info.py:81
 msgid "Include all possible information."
 msgstr ""
 
-#: bzrlib/cmd_version_info.py:80
+#: bzrlib/cmd_version_info.py:82
 msgid "Check if tree is clean."
 msgstr ""
 
-#: bzrlib/cmd_version_info.py:82
+#: bzrlib/cmd_version_info.py:84
 msgid "Include the revision-history."
 msgstr ""
 
-#: bzrlib/cmd_version_info.py:84
+#: bzrlib/cmd_version_info.py:86
 msgid "Include the last revision for each file."
 msgstr ""
 
-#: bzrlib/cmd_version_info.py:85
+#: bzrlib/cmd_version_info.py:87
 msgid "Template for the output."
 msgstr ""
 
-#: bzrlib/cmd_version_info.py:99
+#: bzrlib/cmd_version_info.py:101
 msgid "bzr version-info --revision takes exactly one revision specifier"
 msgstr ""
 
-#: bzrlib/commands.py:232
+#: bzrlib/commands.py:229
 #, python-format
 msgid "unknown command \"%s\""
 msgstr ""
 
-#: bzrlib/commands.py:479
+#: bzrlib/commands.py:476
 msgid "No help for this command."
 msgstr ""
 
-#: bzrlib/commands.py:492
+#: bzrlib/commands.py:489
 #, python-format
 msgid ":Purpose: %s\n"
 msgstr ""
 
-#: bzrlib/commands.py:494
+#: bzrlib/commands.py:491
 #, python-format
 msgid ""
 ":Usage:\n"
 "%s\n"
 msgstr ""
 
-#: bzrlib/commands.py:496
+#: bzrlib/commands.py:493
 #, python-format
 msgid ":Usage:   %s\n"
 msgstr ""
 
-#: bzrlib/commands.py:515
+#: bzrlib/commands.py:512
 #, python-format
 msgid ":Options:%s"
 msgstr ""
 
-#: bzrlib/commands.py:526
+#: bzrlib/commands.py:523
 #, python-format
 msgid ""
 ":Description:\n"
@@ -4583,240 +4619,242 @@
 "\n"
 msgstr ""
 
-#: bzrlib/commands.py:536
+#: bzrlib/commands.py:533
 #, python-format
 msgid ""
 "See bzr help %s for more details and examples.\n"
 "\n"
 msgstr ""
 
-#: bzrlib/commands.py:541
+#: bzrlib/commands.py:538
 msgid ":Aliases:  "
 msgstr ""
 
-#: bzrlib/commands.py:545
+#: bzrlib/commands.py:542
 #, python-format
 msgid ":From:     plugin \"%s\"\n"
 msgstr ""
 
-#: bzrlib/commands.py:557
+#: bzrlib/commands.py:554
 msgid ":doc:`{0} <{1}-help>`"
 msgstr ""
 
-#: bzrlib/commands.py:561
+#: bzrlib/commands.py:558
 #, python-format
 msgid ":See also: %s"
 msgstr ""
 
-#: bzrlib/commands.py:819 bzrlib/gpg.py:317
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
 msgid "Only ASCII permitted in option names"
 msgstr ""
 
-#: bzrlib/commands.py:844 bzrlib/commands.py:852
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
 msgid "command {0!r} needs one or more {1}"
 msgstr ""
 
-#: bzrlib/commands.py:861
+#: bzrlib/commands.py:858
 msgid "command {0!r} requires argument {1}"
 msgstr ""
 
-#: bzrlib/commands.py:868
+#: bzrlib/commands.py:865
 msgid "extra argument to command {0}: {1}"
 msgstr ""
 
-#: bzrlib/commands.py:965
+#: bzrlib/commands.py:962
 #, python-format
 msgid "Profile data written to \"%s\"."
 msgstr ""
 
-#: bzrlib/commit.py:116 bzrlib/commit.py:738
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
 msgid "added"
 msgstr ""
 
-#: bzrlib/commit.py:116 bzrlib/commit.py:746
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
 msgid "modified"
 msgstr ""
 
-#: bzrlib/commit.py:130
+#: bzrlib/commit.py:131
 #, python-format
 msgid "Committing%s"
 msgstr ""
 
-#: bzrlib/commit.py:133
+#: bzrlib/commit.py:134
 #, python-format
 msgid "Committed revision %d."
 msgstr ""
 
-#: bzrlib/commit.py:142
+#: bzrlib/commit.py:143
 #, python-format
 msgid "deleted %s"
 msgstr ""
 
-#: bzrlib/commit.py:145
+#: bzrlib/commit.py:146
 #, python-format
 msgid "missing %s"
 msgstr ""
 
-#: bzrlib/commit.py:510
+#: bzrlib/commit.py:511
 msgid ""
 "Conflicting tags in bound branch:\n"
 "{0}"
 msgstr ""
 
-#: bzrlib/commit.py:740
+#: bzrlib/commit.py:742
 msgid "renamed"
 msgstr ""
 
-#: bzrlib/commit.py:975
+#: bzrlib/commit.py:977
 msgid "unchanged"
 msgstr ""
 
-#: bzrlib/commit.py:997
+#: bzrlib/commit.py:999
 msgid "{0} [{1}] - Stage"
 msgstr ""
 
-#: bzrlib/commit.py:1000
+#: bzrlib/commit.py:1002
 #, python-format
 msgid "%s - Stage"
 msgstr ""
 
-#: bzrlib/commit_signature_commands.py:34
+#: bzrlib/commit_signature_commands.py:36
 msgid "Sign all commits by a given committer."
 msgstr ""
 
-#: bzrlib/commit_signature_commands.py:36
+#: bzrlib/commit_signature_commands.py:38
 msgid ""
 "If location is not specified the local tree is used.\n"
 "If committer is not specified the default committer is used."
 msgstr ""
 
-#: bzrlib/commit_signature_commands.py:39
+#: bzrlib/commit_signature_commands.py:41
 msgid "This does not sign commits that already have signatures."
 msgstr ""
 
-#: bzrlib/commit_signature_commands.py:47
+#: bzrlib/commit_signature_commands.py:49
 msgid ""
 "Don't actually sign anything, just print the revisions that would be signed."
 msgstr ""
 
-#: bzrlib/commit_signature_commands.py:101
+#: bzrlib/commit_signature_commands.py:103
 msgid "Verify all commit signatures."
 msgstr ""
 
-#: bzrlib/commit_signature_commands.py:103
+#: bzrlib/commit_signature_commands.py:105
 msgid ""
 "Verifies that all commits in the branch are signed by known GnuPG keys."
 msgstr ""
 
-#: bzrlib/commit_signature_commands.py:108
+#: bzrlib/commit_signature_commands.py:110
 msgid ""
 "Comma separated list of GPG key patterns which are acceptable for "
 "verification."
 msgstr ""
 
-#: bzrlib/commit_signature_commands.py:145
+#: bzrlib/commit_signature_commands.py:147
 msgid "Cannot verify a range of non-revision-history revisions"
 msgstr ""
 
-#: bzrlib/commit_signature_commands.py:166
+#: bzrlib/commit_signature_commands.py:168
 msgid "All commits signed with verifiable keys"
 msgstr ""
 
-#: bzrlib/config.py:451
+#: bzrlib/config.py:475
 msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
 msgstr ""
 
-#: bzrlib/config.py:2762
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
 #, python-format
 msgid "Invalid '%s', should be of the form 'name=value'"
 msgstr ""
 
-#: bzrlib/config.py:3469
+#: bzrlib/config.py:3962
 msgid "Display, set or remove a configuration option."
 msgstr ""
 
-#: bzrlib/config.py:3471
+#: bzrlib/config.py:3964
 msgid "Display the active value for a given option."
 msgstr ""
 
-#: bzrlib/config.py:3473
+#: bzrlib/config.py:3966
 msgid ""
 "If --all is specified, NAME is interpreted as a regular expression and all\n"
 "matching options are displayed mentioning their scope. The active value\n"
 "that bzr will take into account is the first one displayed for each option."
 msgstr ""
 
-#: bzrlib/config.py:3477
+#: bzrlib/config.py:3970
 msgid "If no NAME is given, --all .* is implied."
 msgstr ""
 
-#: bzrlib/config.py:3479
+#: bzrlib/config.py:3972
 msgid ""
 "Setting a value is achieved by using name=value without spaces. The value\n"
 "is set in the most relevant scope and can be checked by displaying the\n"
 "option again."
 msgstr ""
 
-#: bzrlib/config.py:3491
+#: bzrlib/config.py:3984
 msgid "Reduce the scope to the specified configuration file."
 msgstr ""
 
-#: bzrlib/config.py:3495
+#: bzrlib/config.py:3988
 msgid "Display all the defined values for the matching options."
 msgstr ""
 
-#: bzrlib/config.py:3497
+#: bzrlib/config.py:3990
 msgid "Remove the option from the configuration file."
 msgstr ""
 
-#: bzrlib/conflicts.py:48
-msgid "List files with conflicts."
-msgstr ""
-
 #: bzrlib/conflicts.py:50
-msgid ""
-"Merge will do its best to combine the changes in two branches, but there\n"
-"are some kinds of problems only a human can fix.  When it encounters those,\n"
-"it will mark a conflict.  A conflict means that you need to fix something,\n"
-"before you should commit."
+msgid "List files with conflicts."
 msgstr ""
 
-#: bzrlib/conflicts.py:55
+#: bzrlib/conflicts.py:57
 msgid ""
 "Conflicts normally are listed as short, human-readable messages.  If --text\n"
 "is supplied, the pathnames of files with text conflicts are listed,\n"
 "instead.  (This is useful for editing all files with text conflicts.)"
 msgstr ""
 
-#: bzrlib/conflicts.py:59
+#: bzrlib/conflicts.py:61
 msgid "Use bzr resolve when you have fixed a problem."
 msgstr ""
 
-#: bzrlib/conflicts.py:64
+#: bzrlib/conflicts.py:66
 msgid "List paths of files with text conflicts."
 msgstr ""
 
-#: bzrlib/conflicts.py:83
+#: bzrlib/conflicts.py:85
 msgid "Marks the conflict as resolved."
 msgstr ""
 
-#: bzrlib/conflicts.py:86
+#: bzrlib/conflicts.py:88
 msgid "Resolve the conflict preserving the version in the working tree."
 msgstr ""
 
-#: bzrlib/conflicts.py:89
+#: bzrlib/conflicts.py:91
 msgid "Resolve the conflict taking the merged version into account."
 msgstr ""
 
-#: bzrlib/conflicts.py:96
+#: bzrlib/conflicts.py:98
 msgid "How to resolve the conflict."
 msgstr ""
 
-#: bzrlib/conflicts.py:102
+#: bzrlib/conflicts.py:104
 msgid "Mark a conflict as resolved."
 msgstr ""
 
-#: bzrlib/conflicts.py:109
+#: bzrlib/conflicts.py:111
 msgid ""
 "Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
 "text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
@@ -4824,282 +4862,282 @@
 "resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
 msgstr ""
 
-#: bzrlib/conflicts.py:117
+#: bzrlib/conflicts.py:119
 msgid "Resolve all conflicts in this tree."
 msgstr ""
 
-#: bzrlib/conflicts.py:124
+#: bzrlib/conflicts.py:126
 msgid "If --all is specified, no FILE may be provided"
 msgstr ""
 
-#: bzrlib/conflicts.py:149
+#: bzrlib/conflicts.py:151
 #, python-format
 msgid "%d conflict auto-resolved."
 msgid_plural "%d conflicts auto-resolved."
 msgstr[0] ""
 msgstr[1] ""
 
-#: bzrlib/conflicts.py:152
+#: bzrlib/conflicts.py:154
 msgid "Remaining conflicts:"
 msgstr ""
 
-#: bzrlib/conflicts.py:157
+#: bzrlib/conflicts.py:159
 msgid "All conflicts resolved."
 msgstr ""
 
-#: bzrlib/conflicts.py:166
+#: bzrlib/conflicts.py:168
 msgid "{0} conflict resolved, {1} remaining"
 msgid_plural "{0} conflicts resolved, {1} remaining"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bzrlib/conflicts.py:692
-msgid "action"
-msgstr ""
-
-#: bzrlib/controldir.py:682
+#: bzrlib/controldir.py:710
 msgid "{0} is{1} redirected to {2}"
 msgstr ""
 
-#: bzrlib/diff.py:397
+#: bzrlib/diff.py:399
 #, python-format
 msgid "*** Ignoring files outside view. View is %s"
 msgstr ""
 
-#: bzrlib/errors.py:155
+#: bzrlib/errors.py:157
 msgid "The tree builder is already building a tree."
 msgstr ""
 
-#: bzrlib/errors.py:176
+#: bzrlib/errors.py:178
 msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:195
+#: bzrlib/errors.py:197
 msgid ""
 "The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
 "versions \"%(minimum)s\" to \"%(current)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:207
+#: bzrlib/errors.py:209
 msgid "The transport '%(transport)s' is only accessible within this process."
 msgstr ""
 
-#: bzrlib/errors.py:225
+#: bzrlib/errors.py:227
 msgid "Invalid revision number %(revno)s"
 msgstr ""
 
-#: bzrlib/errors.py:234
+#: bzrlib/errors.py:236
 msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
 msgstr ""
 
-#: bzrlib/errors.py:245
+#: bzrlib/errors.py:247
 msgid "Reserved revision-id {%(revision_id)s}"
 msgstr ""
 
-#: bzrlib/errors.py:259
+#: bzrlib/errors.py:261
 msgid "There is no public branch set for \"%(branch_url)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:269
+#: bzrlib/errors.py:271
 msgid ""
 "No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
 "obtain a list of topics."
 msgstr ""
 
-#: bzrlib/errors.py:278
+#: bzrlib/errors.py:280
 msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
 msgstr ""
 
-#: bzrlib/errors.py:288
+#: bzrlib/errors.py:290
 msgid ""
 "The file id \"%(file_id)s\" is not present in the repository %(repository)r"
 msgstr ""
 
-#: bzrlib/errors.py:297
+#: bzrlib/errors.py:299
 msgid "The branch '%(branch)s' is not stacked."
 msgstr ""
 
-#: bzrlib/errors.py:311
+#: bzrlib/errors.py:313
 msgid "No WorkingTree exists for \"%(base)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:320
+#: bzrlib/errors.py:322
 msgid "Not currently building a tree."
 msgstr ""
 
-#: bzrlib/errors.py:325
+#: bzrlib/errors.py:327
 msgid "%(url)s is not a local path."
 msgstr ""
 
-#: bzrlib/errors.py:353
+#: bzrlib/errors.py:355
 msgid "%(not_locked)r is not write locked but needs to be."
 msgstr ""
 
-#: bzrlib/errors.py:361
+#: bzrlib/errors.py:363
 msgid "Error in command line options"
 msgstr ""
 
-#: bzrlib/errors.py:366
+#: bzrlib/errors.py:368
 msgid "%(value)s is not an index of type %(_type)s."
 msgstr ""
 
-#: bzrlib/errors.py:376
+#: bzrlib/errors.py:378
 msgid "Error in data for index %(value)s."
 msgstr ""
 
-#: bzrlib/errors.py:385
+#: bzrlib/errors.py:387
 msgid "The key '%(key)s' is already in index '%(index)s'."
 msgstr ""
 
-#: bzrlib/errors.py:395
+#: bzrlib/errors.py:397
 msgid "The key '%(key)s' is not a valid key."
 msgstr ""
 
-#: bzrlib/errors.py:404
+#: bzrlib/errors.py:406
 msgid "Could not parse options for index %(value)s."
 msgstr ""
 
-#: bzrlib/errors.py:413
+#: bzrlib/errors.py:415
 msgid "The value '%(value)s' is not a valid value."
 msgstr ""
 
-#: bzrlib/errors.py:441
+#: bzrlib/errors.py:443
 msgid "Generic path error: %(path)r%(extra)s)"
 msgstr ""
 
-#: bzrlib/errors.py:454
+#: bzrlib/errors.py:456
 msgid "No such file: %(path)r%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:459
+#: bzrlib/errors.py:461
 msgid "File exists: %(path)r%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:465
+#: bzrlib/errors.py:467
 msgid ""
 "Could not rename %(source)s => %(dest)s because both files exist. (Use --"
 "after to tell bzr about a rename that has already happened)%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:481
+#: bzrlib/errors.py:483
 msgid "\"%(path)s\" is not a directory %(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:486
+#: bzrlib/errors.py:488
 msgid "\"%(path)s\" is not in the working directory %(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:491
+#: bzrlib/errors.py:493
 msgid "Directory not empty: \"%(path)s\"%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:496
+#: bzrlib/errors.py:498
 msgid "Hard-linking \"%(path)s\" is not supported"
 msgstr ""
 
-#: bzrlib/errors.py:511
+#: bzrlib/errors.py:513
 msgid "Device or resource busy: \"%(path)s\"%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:516
+#: bzrlib/errors.py:518
 msgid "Permission denied: \"%(path)s\"%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:521
+#: bzrlib/errors.py:523
 msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:526
+#: bzrlib/errors.py:528
 msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
 msgstr ""
 
-#: bzrlib/errors.py:537
+#: bzrlib/errors.py:539
 msgid "URLs differ by more than path: %(from_)r and %(to)r"
 msgstr ""
 
-#: bzrlib/errors.py:559
+#: bzrlib/errors.py:561
 msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
 msgstr ""
 
-#: bzrlib/errors.py:569
+#: bzrlib/errors.py:571
 msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:577
+#: bzrlib/errors.py:579
 msgid ""
 "The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
 "upgrade the branch to permit branch stacking."
 msgstr ""
 
-#: bzrlib/errors.py:588
+#: bzrlib/errors.py:590
 msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
 msgstr ""
 
-#: bzrlib/errors.py:598
+#: bzrlib/errors.py:600
 msgid ""
 "The repository '%(url)s'(%(format)s) is not a stackable format. You will "
 "need to upgrade the repository to permit branch stacking."
 msgstr ""
 
-#: bzrlib/errors.py:609
+#: bzrlib/errors.py:611
 msgid "Error reading from %(path)r."
 msgstr ""
 
-#: bzrlib/errors.py:628
+#: bzrlib/errors.py:630
 msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:644
+#: bzrlib/errors.py:646
 msgid "Path \"%(path)s\" is not unicode normalized"
 msgstr ""
 
-#: bzrlib/errors.py:652
+#: bzrlib/errors.py:654
 msgid "Not a branch: \"%(path)s\"%(detail)s."
 msgstr ""
 
-#: bzrlib/errors.py:694
+#: bzrlib/errors.py:696
 msgid "No submit branch available for branch \"%(path)s\""
 msgstr ""
 
-#: bzrlib/errors.py:703
+#: bzrlib/errors.py:710
 msgid "Already a branch: \"%(path)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:709
+#: bzrlib/errors.py:721
 msgid ""
 "Directory contains a branch, but no working tree (use bzr checkout if you "
 "wish to build a working tree): \"%(path)s\""
 msgstr ""
 
-#: bzrlib/errors.py:714
+#: bzrlib/errors.py:726
 msgid ""
 "\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
 msgstr ""
 
-#: bzrlib/errors.py:724
+#: bzrlib/errors.py:736
 msgid ""
 "Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
 msgstr ""
 
-#: bzrlib/errors.py:734
+#: bzrlib/errors.py:746
 msgid "No repository present: \"%(path)s\""
 msgstr ""
 
-#: bzrlib/errors.py:741
+#: bzrlib/errors.py:753
 msgid ""
 "Unsupported branch format: %(format)s\n"
 "Please run 'bzr upgrade'"
 msgstr ""
 
-#: bzrlib/errors.py:747
+#: bzrlib/errors.py:759
 msgid "Unknown %(kind)s format: %(format)r"
 msgstr ""
 
-#: bzrlib/errors.py:756
+#: bzrlib/errors.py:768
 msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
 msgstr ""
 
-#: bzrlib/errors.py:769
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
 msgid ""
 "%(target)s\n"
 "is not compatible with\n"
@@ -5107,442 +5145,442 @@
 "%(details)s"
 msgstr ""
 
-#: bzrlib/errors.py:785
+#: bzrlib/errors.py:809
 msgid "Revision is not compatible with %(repo_format)s"
 msgstr ""
 
-#: bzrlib/errors.py:795
+#: bzrlib/errors.py:819
 msgid "%(context_info)s%(path)s is already versioned."
 msgstr ""
 
-#: bzrlib/errors.py:816
+#: bzrlib/errors.py:840
 msgid "%(context_info)s%(path)s is not versioned."
 msgstr ""
 
-#: bzrlib/errors.py:837
+#: bzrlib/errors.py:861
 msgid "Path(s) are not versioned: %(paths_as_string)s"
 msgstr ""
 
-#: bzrlib/errors.py:848
+#: bzrlib/errors.py:872
 msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:867
+#: bzrlib/errors.py:891
 msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
 msgstr ""
 
-#: bzrlib/errors.py:875
+#: bzrlib/errors.py:899
 msgid ""
 "Filename %(filename)r is not valid in your current filesystem encoding "
 "%(fs_encoding)s"
 msgstr ""
 
-#: bzrlib/errors.py:886
+#: bzrlib/errors.py:910
 msgid "Cannot operate on \"%(filename)s\" because it is a control file"
 msgstr ""
 
-#: bzrlib/errors.py:904
+#: bzrlib/errors.py:928
 msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
 msgstr ""
 
-#: bzrlib/errors.py:943
+#: bzrlib/errors.py:967
 msgid "Cannot lock %(lock)s: %(why)s"
 msgstr ""
 
-#: bzrlib/errors.py:953
+#: bzrlib/errors.py:977
 msgid ""
 "A transaction related operation was attempted after the transaction finished."
 msgstr ""
 
-#: bzrlib/errors.py:980
+#: bzrlib/errors.py:1004
 msgid "Cannot lock: transport is read only: %(transport)s"
 msgstr ""
 
-#: bzrlib/errors.py:988
+#: bzrlib/errors.py:1012
 msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:999
+#: bzrlib/errors.py:1023
 msgid ""
 "Lock was broken while still open: %(lock)s - check storage consistency!"
 msgstr ""
 
-#: bzrlib/errors.py:1010
+#: bzrlib/errors.py:1034
 msgid ""
 "Lock was released and re-acquired before being broken: %(lock)s: held by "
 "%(holder)r, wanted to break %(target)r"
 msgstr ""
 
-#: bzrlib/errors.py:1022
+#: bzrlib/errors.py:1046
 msgid ""
 "Lock is apparently held, but corrupted: %(corruption_info)s\n"
 "Use 'bzr break-lock' to clear it"
 msgstr ""
 
-#: bzrlib/errors.py:1035
+#: bzrlib/errors.py:1059
 msgid "Lock not held: %(lock)s"
 msgstr ""
 
-#: bzrlib/errors.py:1064
+#: bzrlib/errors.py:1088
 msgid "No changes to commit"
 msgstr ""
 
-#: bzrlib/errors.py:1069
+#: bzrlib/errors.py:1093
 msgid ""
 "Selected-file commit of merges is not supported yet: files %(files_str)s"
 msgstr ""
 
-#: bzrlib/errors.py:1079
+#: bzrlib/errors.py:1103
 msgid ""
 "Excluding paths during commit is not supported by repository at "
 "%(repository)r."
 msgstr ""
 
-#: bzrlib/errors.py:1088
+#: bzrlib/errors.py:1112
 msgid ""
 "The specified commit message contains characters unsupported by the current "
 "encoding."
 msgstr ""
 
-#: bzrlib/errors.py:1094
+#: bzrlib/errors.py:1118
 msgid "Upgrade URL cannot work with readonly URLs."
 msgstr ""
 
-#: bzrlib/errors.py:1099
+#: bzrlib/errors.py:1123
 msgid "The branch format %(format)s is already at the most recent format."
 msgstr ""
 
-#: bzrlib/errors.py:1122
+#: bzrlib/errors.py:1146
 msgid "Option --change does not accept revision ranges"
 msgstr ""
 
-#: bzrlib/errors.py:1127
+#: bzrlib/errors.py:1151
 msgid "No namespace registered for string: %(spec)r"
 msgstr ""
 
-#: bzrlib/errors.py:1146
+#: bzrlib/errors.py:1170
 msgid ""
 "Requested revision: '%(spec)s' does not exist in branch: "
 "%(branch_url)s%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:1160
+#: bzrlib/errors.py:1184
 msgid ""
 "Operation denied because it would change the main history, which is not "
 "permitted by the append_revisions_only setting on branch \"%(location)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:1171
+#: bzrlib/errors.py:1195
 msgid ""
 "These branches have diverged. Use the missing command to see how.\n"
 "Use the merge command to reconcile them."
 msgstr ""
 
-#: bzrlib/errors.py:1191
+#: bzrlib/errors.py:1215
 msgid ""
 "Branches have no common ancestor, and no merge base revision was specified."
 msgstr ""
 
-#: bzrlib/errors.py:1197
+#: bzrlib/errors.py:1221
 msgid ""
 "Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
 msgstr ""
 
-#: bzrlib/errors.py:1203
+#: bzrlib/errors.py:1227
 msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
 msgstr ""
 
-#: bzrlib/errors.py:1212
+#: bzrlib/errors.py:1236
 msgid ""
 "Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
 msgstr ""
 
-#: bzrlib/errors.py:1221
+#: bzrlib/errors.py:1245
 msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
 msgstr ""
 
-#: bzrlib/errors.py:1230
+#: bzrlib/errors.py:1254
 msgid "Branch %(branch)s has no commits."
 msgstr ""
 
-#: bzrlib/errors.py:1248
+#: bzrlib/errors.py:1272
 msgid ""
 "Bound branch %(branch)s is out of date with master branch "
 "%(master)s.%(extra_help)s"
 msgstr ""
 
-#: bzrlib/errors.py:1260
+#: bzrlib/errors.py:1284
 msgid ""
 "Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
 "bound to %(remote)s."
 msgstr ""
 
-#: bzrlib/errors.py:1272
+#: bzrlib/errors.py:1296
 msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
 msgstr ""
 
-#: bzrlib/errors.py:1281
+#: bzrlib/errors.py:1305
 msgid ""
 "Unable to connect to target of bound branch %(branch)s => %(target)s: "
 "%(error)s"
 msgstr ""
 
-#: bzrlib/errors.py:1293
+#: bzrlib/errors.py:1317
 msgid "Error in processing weave: %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:1302
+#: bzrlib/errors.py:1326
 msgid "Revision {%(revision_id)s} already present in %(weave)s"
 msgstr ""
 
-#: bzrlib/errors.py:1313
+#: bzrlib/errors.py:1337
 msgid "Revision {%(revision_id)s} not present in %(weave)s"
 msgstr ""
 
-#: bzrlib/errors.py:1323
+#: bzrlib/errors.py:1347
 msgid "Weave invariant violated: %(what)s"
 msgstr ""
 
-#: bzrlib/errors.py:1332
+#: bzrlib/errors.py:1356
 msgid "Parents are mismatched between two revisions. %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:1354
+#: bzrlib/errors.py:1378
 msgid ""
 "Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
 "%(weave_b)s"
 msgstr ""
 
-#: bzrlib/errors.py:1366
+#: bzrlib/errors.py:1390
 msgid "Versioned file error"
 msgstr ""
 
-#: bzrlib/errors.py:1371
+#: bzrlib/errors.py:1395
 msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:1381
+#: bzrlib/errors.py:1405
 msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:1391
+#: bzrlib/errors.py:1415
 msgid "Text did not match its checksum: %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:1517
+#: bzrlib/errors.py:1541
 msgid "Export format %(format)r not supported"
 msgstr ""
 
-#: bzrlib/errors.py:1526
+#: bzrlib/errors.py:1550
 msgid "Transport error: %(msg)s %(orig_error)s"
 msgstr ""
 
-#: bzrlib/errors.py:1552
+#: bzrlib/errors.py:1576
 msgid "Generic bzr smart protocol error: %(details)s"
 msgstr ""
 
-#: bzrlib/errors.py:1560
+#: bzrlib/errors.py:1584
 msgid "Received bad protocol version marker: %(marker)r"
 msgstr ""
 
-#: bzrlib/errors.py:1592
+#: bzrlib/errors.py:1616
 msgid "Transport operation not possible: %(msg)s %(orig_error)s"
 msgstr ""
 
-#: bzrlib/errors.py:1597
+#: bzrlib/errors.py:1621
 msgid "Connection error: %(msg)s %(orig_error)s"
 msgstr ""
 
-#: bzrlib/errors.py:1602
+#: bzrlib/errors.py:1626
 msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
 msgstr ""
 
-#: bzrlib/errors.py:1623
+#: bzrlib/errors.py:1647
 msgid "Connection closed: %(msg)s %(orig_error)s"
 msgstr ""
 
-#: bzrlib/errors.py:1628
+#: bzrlib/errors.py:1652
 msgid "Connection Timeout: %(msg)s%(orig_error)s"
 msgstr ""
 
-#: bzrlib/errors.py:1633
+#: bzrlib/errors.py:1657
 msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:1643
+#: bzrlib/errors.py:1667
 msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
 msgstr ""
 
-#: bzrlib/errors.py:1658
+#: bzrlib/errors.py:1690
 msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:1672
+#: bzrlib/errors.py:1704
 msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:1680
+#: bzrlib/errors.py:1712
 msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:1689
+#: bzrlib/errors.py:1721
 msgid "%(source)s is%(permanently)s redirected to %(target)s"
 msgstr ""
 
-#: bzrlib/errors.py:1703
+#: bzrlib/errors.py:1735
 msgid "Too many redirections"
 msgstr ""
 
-#: bzrlib/errors.py:1708
+#: bzrlib/errors.py:1740
 msgid "Working tree has conflicts."
 msgstr ""
 
-#: bzrlib/errors.py:1712
+#: bzrlib/errors.py:1744
 msgid "Config file %(filename)s is not UTF-8 encoded\n"
 msgstr ""
 
-#: bzrlib/errors.py:1721
+#: bzrlib/errors.py:1753
 msgid ""
 "Error(s) parsing config file %(filename)s:\n"
 "%(errors)s"
 msgstr ""
 
-#: bzrlib/errors.py:1732
+#: bzrlib/errors.py:424
 msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:1740
+#: bzrlib/errors.py:1773
 msgid "%(username)r does not seem to contain a reasonable email address"
 msgstr ""
 
-#: bzrlib/errors.py:1749
+#: bzrlib/errors.py:1782
 msgid "Failed to GPG sign data with command \"%(command_line)s\""
 msgstr ""
 
-#: bzrlib/errors.py:1757
+#: bzrlib/errors.py:1790
 msgid "Failed to verify GPG signature data with error \"%(error)s\""
 msgstr ""
 
-#: bzrlib/errors.py:1765
+#: bzrlib/errors.py:1798
 msgid "Unable to import library \"%(library)s\": %(error)s"
 msgstr ""
 
-#: bzrlib/errors.py:1773
+#: bzrlib/errors.py:1806
 msgid "python-gpgme is not installed, it is needed to verify signatures"
 msgstr ""
 
-#: bzrlib/errors.py:1781
+#: bzrlib/errors.py:1814
 msgid ""
 "The working tree for %(basedir)s has changed since the last commit, but "
 "weave merge requires that it be unchanged"
 msgstr ""
 
-#: bzrlib/errors.py:1791
+#: bzrlib/errors.py:1824
 msgid ""
 "Can't reprocess and show base, because reprocessing obscures the "
 "relationship of conflicting lines to the base"
 msgstr ""
 
-#: bzrlib/errors.py:1797
+#: bzrlib/errors.py:1830
 msgid "Cycle in graph %(graph)r"
 msgstr ""
 
-#: bzrlib/errors.py:1825
+#: bzrlib/errors.py:1858
 msgid "File %(filename)s is not conflicted."
 msgstr ""
 
-#: bzrlib/errors.py:1847
+#: bzrlib/errors.py:1880
 msgid "No bundle was found in \"%(filename)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:1856
+#: bzrlib/errors.py:1889
 msgid "Unable to handle bundle version %(version)s: %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:1866
+#: bzrlib/errors.py:1899
 msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
 msgstr ""
 
-#: bzrlib/errors.py:1879
+#: bzrlib/errors.py:1912
 msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
 msgstr ""
 
-#: bzrlib/errors.py:1889
+#: bzrlib/errors.py:1922
 msgid "Key %(key)s is already present in map"
 msgstr ""
 
-#: bzrlib/errors.py:1894
+#: bzrlib/errors.py:1927
 msgid "The prefix %(prefix)s is in the help search path twice."
 msgstr ""
 
-#: bzrlib/errors.py:1904
+#: bzrlib/errors.py:1937
 msgid ""
 "No final name for trans_id %(trans_id)r\n"
 "file-id: %(file_id)r\n"
 "root trans-id: %(root_trans_id)r\n"
 msgstr ""
 
-#: bzrlib/errors.py:1936
+#: bzrlib/errors.py:1969
 msgid "Attempt to reuse a transform that has already been applied."
 msgstr ""
 
-#: bzrlib/errors.py:1941
+#: bzrlib/errors.py:1974
 msgid "Moving the root directory is not supported at this time"
 msgstr ""
 
-#: bzrlib/errors.py:1946
+#: bzrlib/errors.py:1979
 msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
 msgstr ""
 
-#: bzrlib/errors.py:1957
+#: bzrlib/errors.py:1990
 msgid ""
 "Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:1993
+#: bzrlib/errors.py:2026
 msgid ""
 "Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:2023
+#: bzrlib/errors.py:2056
 msgid "Unable to import paramiko (required for sftp support): %(error)s"
 msgstr ""
 
-#: bzrlib/errors.py:2031
+#: bzrlib/errors.py:2064
 msgid "Nothing to merge."
 msgstr ""
 
-#: bzrlib/errors.py:2036
+#: bzrlib/errors.py:2069
 msgid "Format %(format)s cannot be initialised by this version of bzr."
 msgstr ""
 
-#: bzrlib/errors.py:2045
+#: bzrlib/errors.py:2078
 msgid ""
 "Cannot convert from format %(from_format)s to format %(format)s.    "
 "%(problem)s"
 msgstr ""
 
-#: bzrlib/errors.py:2057
+#: bzrlib/errors.py:2090
 msgid "Could not find an appropriate Differ for file \"%(path)s\""
 msgstr ""
 
-#: bzrlib/errors.py:2065
+#: bzrlib/errors.py:2098
 msgid "%(exe_name)s could not be found on this machine"
 msgstr ""
 
-#: bzrlib/errors.py:2073
+#: bzrlib/errors.py:2106
 msgid "Diff is not installed on this machine: %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:2081
+#: bzrlib/errors.py:2114
 msgid "Diff3 is not installed on this machine."
 msgstr ""
 
-#: bzrlib/errors.py:2087
+#: bzrlib/errors.py:2120
 msgid "The content being inserted is already present."
 msgstr ""
 
-#: bzrlib/errors.py:2092
+#: bzrlib/errors.py:2125
 msgid ""
 "This tree contains left-over files from a failed operation.\n"
 "    Please examine %(limbo_dir)s to see if it contains any files you wish "
@@ -5550,14 +5588,14 @@
 "    keep, and delete it when you are done."
 msgstr ""
 
-#: bzrlib/errors.py:2103
+#: bzrlib/errors.py:2136
 msgid ""
 "This tree contains left-over files from a failed operation.\n"
 "    Please examine %(pending_deletion)s to see if it contains any files you\n"
 "    wish to keep, and delete it when you are done."
 msgstr ""
 
-#: bzrlib/errors.py:2113
+#: bzrlib/errors.py:2146
 msgid ""
 "Unable to delete transform temporary directory %(limbo_dir)s.\n"
 "    Please examine %(limbo_dir)s to see if it contains any files you wish "
@@ -5565,696 +5603,695 @@
 "    keep, and delete it when you are done."
 msgstr ""
 
-#: bzrlib/errors.py:2124
+#: bzrlib/errors.py:2157
 msgid ""
 "Unable to delete transform temporary directory %(pending_deletion)s.  Please "
 "examine %(pending_deletion)s to see if it contains any files you wish to "
 "keep, and delete it when you are done."
 msgstr ""
 
-#: bzrlib/errors.py:2134
+#: bzrlib/errors.py:2167
 msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
 msgstr ""
 
-#: bzrlib/errors.py:2148
+#: bzrlib/errors.py:2181
 msgid ""
 "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:2161
+#: bzrlib/errors.py:2194
 msgid "Error in merge modified format"
 msgstr ""
 
-#: bzrlib/errors.py:2166
+#: bzrlib/errors.py:2199
 msgid "Format error in conflict listings"
 msgstr ""
 
-#: bzrlib/errors.py:2170
+#: bzrlib/errors.py:2203
 msgid ""
 "Inconsistency in dirstate file %(dirstate_path)s.\n"
 "Error: %(description)s"
 msgstr ""
 
-#: bzrlib/errors.py:2181
+#: bzrlib/errors.py:2214
 msgid ""
 "An error has been detected in the repository %(repo_path)s.\n"
 "Please run bzr reconcile on this repository."
 msgstr ""
 
-#: bzrlib/errors.py:2192
+#: bzrlib/errors.py:2225
 msgid ""
 "An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
 "reason: %(reason)s"
 msgstr ""
 
-#: bzrlib/errors.py:2205
+#: bzrlib/errors.py:2238
 msgid ""
 "An inconsistent delta was supplied: %(delta)r\n"
 "reason: %(reason)s"
 msgstr ""
 
-#: bzrlib/errors.py:2217
+#: bzrlib/errors.py:2250
 msgid "To use this feature you must upgrade your branch at %(path)s."
 msgstr ""
 
-#: bzrlib/errors.py:2226
+#: bzrlib/errors.py:2259
 msgid "To use this feature you must upgrade your repository at %(path)s."
 msgstr ""
 
-#: bzrlib/errors.py:2231
+#: bzrlib/errors.py:2264
 msgid ""
 "To use this feature you must upgrade your branch at %(path)s to a format "
 "which supports rich roots."
 msgstr ""
 
-#: bzrlib/errors.py:2237
+#: bzrlib/errors.py:2270
 msgid "Cannot perform local-only commits on unbound branches."
 msgstr ""
 
-#: bzrlib/errors.py:2242
+#: bzrlib/errors.py:2275
 msgid "The method %(mname)s is not supported on objects of type %(tname)s."
 msgstr ""
 
-#: bzrlib/errors.py:2263
+#: bzrlib/errors.py:2296
 msgid "Ghost tags not supported by format %(format)r."
 msgstr ""
 
-#: bzrlib/errors.py:2271
+#: bzrlib/errors.py:2304
 msgid "File is binary but should be text."
 msgstr ""
 
-#: bzrlib/errors.py:2276
+#: bzrlib/errors.py:2309
 msgid "The path %(path)s is not permitted on this platform"
 msgstr ""
 
-#: bzrlib/errors.py:2285
+#: bzrlib/errors.py:2318
 msgid ""
 "Testament did not match expected value.\n"
 "       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
 "       {%(measured)s}"
 msgstr ""
 
-#: bzrlib/errors.py:2297
+#: bzrlib/errors.py:2330
 msgid "Not a bzr revision-bundle: %(text)r"
 msgstr ""
 
-#: bzrlib/errors.py:2306
+#: bzrlib/errors.py:2339
 msgid "Bad bzr revision-bundle: %(text)r"
 msgstr ""
 
-#: bzrlib/errors.py:2315
+#: bzrlib/errors.py:2348
 msgid "Malformed bzr revision-bundle header: %(text)r"
 msgstr ""
 
-#: bzrlib/errors.py:2320
+#: bzrlib/errors.py:2353
 msgid "Malformed patches in bzr revision-bundle: %(text)r"
 msgstr ""
 
-#: bzrlib/errors.py:2325
+#: bzrlib/errors.py:2358
 msgid "Malformed footer in bzr revision-bundle: %(text)r"
 msgstr ""
 
-#: bzrlib/errors.py:2330
+#: bzrlib/errors.py:2363
 msgid "End of line marker was not \\n in bzr revision-bundle"
 msgstr ""
 
-#: bzrlib/errors.py:2340
+#: bzrlib/errors.py:2373
 msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
 msgstr ""
 
-#: bzrlib/errors.py:2350
+#: bzrlib/errors.py:2383
 msgid "Root class for inventory serialization errors"
 msgstr ""
 
-#: bzrlib/errors.py:2354
+#: bzrlib/errors.py:2387
 msgid ""
 "The inventory was not in the expected format:\n"
 " %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:2363
+#: bzrlib/errors.py:2396
 msgid "This operation requires rich root data storage"
 msgstr ""
 
-#: bzrlib/errors.py:2376
+#: bzrlib/errors.py:2409
 msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
 msgstr ""
 
-#: bzrlib/errors.py:2385
+#: bzrlib/errors.py:2418
 msgid ""
 "Don't know how to handle SSH connections. Please set BZR_SSH environment "
 "variable."
 msgstr ""
 
-#: bzrlib/errors.py:2392
+#: bzrlib/errors.py:2425
 msgid ""
 "Could not determine revno for {%(revision_id)s} because its ancestry shows a "
 "ghost at {%(ghost_revision_id)s}"
 msgstr ""
 
-#: bzrlib/errors.py:2402
+#: bzrlib/errors.py:2435
 msgid "Ghost revision {%(revision_id)s} cannot be used here."
 msgstr ""
 
-#: bzrlib/errors.py:2453
+#: bzrlib/errors.py:2486
 msgid ""
 "A merge directive must provide either a bundle or a public branch location."
 msgstr ""
 
-#: bzrlib/errors.py:2460
+#: bzrlib/errors.py:2493
 msgid "Bad merge directive payload %(start)r"
 msgstr ""
 
-#: bzrlib/errors.py:2470
+#: bzrlib/errors.py:2503
 msgid "Preview patch does not match requested changes."
 msgstr ""
 
-#: bzrlib/errors.py:2476
+#: bzrlib/errors.py:2509
 msgid "Patch_type was %(patch_type)s, but no patch was supplied."
 msgstr ""
 
-#: bzrlib/errors.py:2486
+#: bzrlib/errors.py:2519
 msgid ""
 "Your branch does not have all of the revisions required in order to merge "
 "this merge directive and the target location specified in the merge "
 "directive is not a branch: %(location)s."
 msgstr ""
 
-#: bzrlib/errors.py:2498
+#: bzrlib/errors.py:2531
 msgid "Unsupported entry kind %(kind)s"
 msgstr ""
 
-#: bzrlib/errors.py:2506
+#: bzrlib/errors.py:2539
 msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
 msgstr ""
 
-#: bzrlib/errors.py:2516
+#: bzrlib/errors.py:2549
 msgid "Subsume target %(other_tree)s needs to be upgraded."
 msgstr ""
 
-#: bzrlib/errors.py:2535
+#: bzrlib/errors.py:2568
 msgid "No such tag: %(tag_name)s"
 msgstr ""
 
-#: bzrlib/errors.py:2543
+#: bzrlib/errors.py:2576
 msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
 msgstr ""
 
-#: bzrlib/errors.py:2552
+#: bzrlib/errors.py:2585
 msgid "Tag %(tag_name)s already exists."
 msgstr ""
 
-#: bzrlib/errors.py:2560
+#: bzrlib/errors.py:2593
 msgid ""
 "Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
 "bugs\" for more information on this feature."
 msgstr ""
 
-#: bzrlib/errors.py:2570
+#: bzrlib/errors.py:2603
 msgid ""
 "The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
 msgstr ""
 
-#: bzrlib/errors.py:2580
+#: bzrlib/errors.py:2613
 msgid ""
 "Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
 msgstr ""
 
-#: bzrlib/errors.py:2590
+#: bzrlib/errors.py:2623
 msgid "Invalid line in bugs property: '%(line)s'"
 msgstr ""
 
-#: bzrlib/errors.py:2598
+#: bzrlib/errors.py:2631
 msgid "Invalid bug status: '%(status)s'"
 msgstr ""
 
-#: bzrlib/errors.py:2606
+#: bzrlib/errors.py:2639
 msgid "Could not understand response from smart server: %(response_tuple)r"
 msgstr ""
 
-#: bzrlib/errors.py:2645
+#: bzrlib/errors.py:2678
 msgid "Server sent an unexpected error: %(error_tuple)r"
 msgstr ""
 
-#: bzrlib/errors.py:2664
+#: bzrlib/errors.py:2697
 msgid "Unrecognised container format: %(container_format)r"
 msgstr ""
 
-#: bzrlib/errors.py:2672
+#: bzrlib/errors.py:2705
 msgid "Unexpected end of container stream"
 msgstr ""
 
-#: bzrlib/errors.py:2677
+#: bzrlib/errors.py:2710
 msgid "Unknown record type: %(record_type)r"
 msgstr ""
 
-#: bzrlib/errors.py:2685
+#: bzrlib/errors.py:2718
 msgid "Invalid record: %(reason)s"
 msgstr ""
 
-#: bzrlib/errors.py:2693
+#: bzrlib/errors.py:2726
 msgid "Container has data after end marker: %(excess)r"
 msgstr ""
 
-#: bzrlib/errors.py:2701
+#: bzrlib/errors.py:2734
 msgid "Container has multiple records with the same name: %(name)s"
 msgstr ""
 
-#: bzrlib/errors.py:2714
+#: bzrlib/errors.py:2747
 msgid "Corrupt or incompatible data stream: %(reason)s"
 msgstr ""
 
-#: bzrlib/errors.py:2722
+#: bzrlib/errors.py:2755
 msgid "SMTP error: %(error)s"
 msgstr ""
 
-#: bzrlib/errors.py:2730
+#: bzrlib/errors.py:2763
 msgid "No message supplied."
 msgstr ""
 
-#: bzrlib/errors.py:2735
+#: bzrlib/errors.py:2768
 msgid "No mail-to address (--mail-to) or output (-o) specified."
 msgstr ""
 
-#: bzrlib/errors.py:2740
+#: bzrlib/errors.py:2773
 msgid "Unknown mail client: %(mail_client)s"
 msgstr ""
 
-#: bzrlib/errors.py:2748
+#: bzrlib/errors.py:2781
 msgid ""
 "Unable to find mail client with the following names: "
 "%(mail_command_list_string)s"
 msgstr ""
 
-#: bzrlib/errors.py:2758
+#: bzrlib/errors.py:2791
 msgid "SMTP connection to %(host)s refused"
 msgstr ""
 
-#: bzrlib/errors.py:2767
+#: bzrlib/errors.py:2800
 msgid "Please specify smtp_server.  No server at default %(host)s."
 msgstr ""
 
-#: bzrlib/errors.py:2781
+#: bzrlib/errors.py:2814
 msgid ""
 "'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
 "reconfigure."
 msgstr ""
 
-#: bzrlib/errors.py:2793
+#: bzrlib/errors.py:2826
 msgid "'%(display_url)s' is already a branch."
 msgstr ""
 
-#: bzrlib/errors.py:2798
+#: bzrlib/errors.py:2831
 msgid "'%(display_url)s' is already a tree."
 msgstr ""
 
-#: bzrlib/errors.py:2803
+#: bzrlib/errors.py:2836
 msgid "'%(display_url)s' is already a checkout."
 msgstr ""
 
-#: bzrlib/errors.py:2808
+#: bzrlib/errors.py:2841
 msgid "'%(display_url)s' is already a lightweight checkout."
 msgstr ""
 
-#: bzrlib/errors.py:2813
+#: bzrlib/errors.py:2846
 msgid "'%(display_url)s' is already using a shared repository."
 msgstr ""
 
-#: bzrlib/errors.py:2818
+#: bzrlib/errors.py:2851
 msgid "'%(display_url)s' is already standalone."
 msgstr ""
 
-#: bzrlib/errors.py:2823
+#: bzrlib/errors.py:2856
 msgid "Shared repository '%(display_url)s' already creates working trees."
 msgstr ""
 
-#: bzrlib/errors.py:2829
+#: bzrlib/errors.py:2862
 msgid ""
 "Shared repository '%(display_url)s' already doesn't create working trees."
 msgstr ""
 
-#: bzrlib/errors.py:2835
+#: bzrlib/errors.py:2868
 msgid "Requested reconfiguration of '%(display_url)s' is not supported."
 msgstr ""
 
-#: bzrlib/errors.py:2840
+#: bzrlib/errors.py:2873
 msgid "No location could be found to bind to at %(display_url)s."
 msgstr ""
 
-#: bzrlib/errors.py:2845
+#: bzrlib/errors.py:2878
 msgid ""
 "Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
 "status).%(more)s"
 msgstr ""
 
-#: bzrlib/errors.py:2864
+#: bzrlib/errors.py:2897
 msgid ""
 "Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
 "list).%(more)s"
 msgstr ""
 
-#: bzrlib/errors.py:2870
+#: bzrlib/errors.py:2903
 msgid "Variable {%(name)s} is not available."
 msgstr ""
 
-#: bzrlib/errors.py:2878
+#: bzrlib/errors.py:2911
 msgid "No template specified."
 msgstr ""
 
-#: bzrlib/errors.py:2883
+#: bzrlib/errors.py:2916
 msgid "Unable to create symlink %(path_str)son this platform"
 msgstr ""
 
-#: bzrlib/errors.py:2898
+#: bzrlib/errors.py:2931
 msgid ""
 "Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
 "\"original\", \"local\"."
 msgstr ""
 
-#: bzrlib/errors.py:2932
+#: bzrlib/errors.py:2965
 msgid ""
 "Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
 msgstr ""
 
-#: bzrlib/errors.py:2944
+#: bzrlib/errors.py:2977
 msgid "The \"%(config_id)s\" configuration does not exist."
 msgstr ""
 
-#: bzrlib/errors.py:2952
+#: bzrlib/errors.py:2985
 msgid "The \"%(option_name)s\" configuration option does not exist."
 msgstr ""
 
-#: bzrlib/errors.py:2960
+#: bzrlib/errors.py:2993
 msgid "The alias \"%(alias_name)s\" does not exist."
 msgstr ""
 
-#: bzrlib/errors.py:2974
+#: bzrlib/errors.py:3007
 msgid "\"%(alias_name)s\" is not a valid location alias."
 msgstr ""
 
-#: bzrlib/errors.py:2982
+#: bzrlib/errors.py:3015
 msgid "No %(alias_name)s location assigned."
 msgstr ""
 
-#: bzrlib/errors.py:2990
+#: bzrlib/errors.py:3023
 msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
 msgstr ""
 
-#: bzrlib/errors.py:3000
+#: bzrlib/errors.py:3033
 msgid "Unknown rules detected: %(unknowns_str)s."
 msgstr ""
 
-#: bzrlib/errors.py:3011
+#: bzrlib/errors.py:3044
 msgid "Tip change rejected: %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:3019
+#: bzrlib/errors.py:3052
 msgid "Shelf corrupt."
 msgstr ""
 
-#: bzrlib/errors.py:3024
+#: bzrlib/errors.py:3057
 msgid "Corruption while decompressing repository file%(orig_error)s"
 msgstr ""
 
-#: bzrlib/errors.py:3036
+#: bzrlib/errors.py:3069
 msgid "No changes are shelved with id \"%(shelf_id)d\"."
 msgstr ""
 
-#: bzrlib/errors.py:3044
+#: bzrlib/errors.py:3077
 msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
 msgstr ""
 
-#: bzrlib/errors.py:3052
+#: bzrlib/errors.py:3085
 msgid ""
 "An attempt to access a url outside the server jail was made: '%(url)s'."
 msgstr ""
 
-#: bzrlib/errors.py:3060
+#: bzrlib/errors.py:3093
 msgid "The user aborted the operation."
 msgstr ""
 
-#: bzrlib/errors.py:3065
+#: bzrlib/errors.py:3098
 msgid "Branching '%(url)s'(%(format)s) must create a working tree."
 msgstr ""
 
-#: bzrlib/errors.py:3075
+#: bzrlib/errors.py:3108
 msgid "No such view: %(view_name)s."
 msgstr ""
 
-#: bzrlib/errors.py:3085
+#: bzrlib/errors.py:3118
 msgid ""
 "Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
 "to a later format."
 msgstr ""
 
-#: bzrlib/errors.py:3094
+#: bzrlib/errors.py:3127
 msgid ""
 "Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
 msgstr ""
 
-#: bzrlib/errors.py:3161
+#: bzrlib/errors.py:3194
 msgid "%(bzrdir)r does not support co-located branches."
 msgstr ""
 
-#: bzrlib/errors.py:3167
+#: bzrlib/errors.py:3200
 msgid ""
 "Unable to determine your name.\n"
 "Please, set your name with the 'whoami' command.\n"
 "E.g. bzr whoami \"Your Name <name@example.com>\""
 msgstr ""
 
-#: bzrlib/errors.py:3176
+#: bzrlib/errors.py:3209
 msgid "Invalid pattern(s) found. %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:3184
+#: bzrlib/errors.py:3217
 msgid ""
 "Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
 "unbind` to fix."
 msgstr ""
 
-#: bzrlib/errors.py:3195
+#: bzrlib/errors.py:3228
 msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:3204
+#: bzrlib/errors.py:3237
 msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:3213
+#: bzrlib/errors.py:3246
 msgid ""
 "No compatible object available for operations from %(source)r to %(target)r."
 msgstr ""
 
-#: bzrlib/errors.py:3223
+#: bzrlib/errors.py:3256
 msgid ""
 "VFS requests over the smart server are not allowed. Encountered: %(method)s, "
 "%(arguments)s."
 msgstr ""
 
-#: bzrlib/errors.py:3233
+#: bzrlib/errors.py:3266
 msgid ""
 "Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
 "format %(format)r"
 msgstr ""
 
-#: bzrlib/errors.py:3249
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
 msgid "Binary files section encountered."
 msgstr ""
 
-#: bzrlib/errors.py:3257
+#: bzrlib/errors.py:3299
 msgid ""
 "Malformed patch header.  %(desc)s\n"
 "%(line)r"
 msgstr ""
 
-#: bzrlib/errors.py:3266
+#: bzrlib/errors.py:3308
 msgid ""
 "Malformed hunk header.  %(desc)s\n"
 "%(line)r"
 msgstr ""
 
-#: bzrlib/errors.py:3275
+#: bzrlib/errors.py:3317
 msgid ""
 "Malformed line.  %(desc)s\n"
 "%(line)r"
 msgstr ""
 
-#: bzrlib/errors.py:3285
+#: bzrlib/errors.py:3327
 msgid ""
 "Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
 "but patch says it should be \"%(patch_line)s\""
 msgstr ""
 
-#: bzrlib/export_pot.py:246
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
 #, python-format
 msgid "Exporting messages from builtin command: %s"
 msgstr ""
 
-#: bzrlib/export_pot.py:265
+#: bzrlib/export_pot.py:271
 msgid "Exporting messages from plugin command: {0} in {1}"
 msgstr ""
 
-#: bzrlib/export_pot.py:286
+#: bzrlib/export_pot.py:292
 #, python-format
 msgid "Exporting message from error: %s"
 msgstr ""
 
-#: bzrlib/fetch.py:97
+#: bzrlib/fetch.py:98
 msgid "Finding revisions"
 msgstr ""
 
-#: bzrlib/fetch.py:102
+#: bzrlib/fetch.py:103
 msgid "Fetching revisions"
 msgstr ""
 
-#: bzrlib/foreign.py:261
+#: bzrlib/foreign.py:262
 msgid "Push into a different VCS without any custom bzr metadata."
 msgstr ""
 
-#: bzrlib/foreign.py:263
+#: bzrlib/foreign.py:264
 msgid ""
 "This will afterwards rebase the local branch on the remote\n"
 "branch unless the --no-rebase option is used, in which case \n"
 "the two branches will be out of sync after the push. "
 msgstr ""
 
-#: bzrlib/foreign.py:271
-msgid ""
-"Branch to push from, rather than the one containing the working directory."
-msgstr ""
-
-#: bzrlib/foreign.py:276
+#: bzrlib/foreign.py:277
 msgid "Do not rebase after push."
 msgstr ""
 
-#: bzrlib/foreign.py:278
-msgid ""
-"Refuse to push if there are uncommitted changes in the working tree, --no-"
-"strict disables the check."
-msgstr ""
-
-#: bzrlib/foreign.py:310
+#: bzrlib/foreign.py:311
 #, python-format
 msgid "Using saved location: %s\n"
 msgstr ""
 
-#: bzrlib/foreign.py:320
+#: bzrlib/foreign.py:321
 msgid ""
 "{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
 "regular push."
 msgstr ""
 
-#: bzrlib/gpg.py:116 bzrlib/gpg.py:454
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
 msgid "{0} commits with valid signatures"
 msgstr ""
 
-#: bzrlib/gpg.py:120 bzrlib/gpg.py:459
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
 msgid "{0} commit with unknown key"
 msgid_plural "{0} commits with unknown keys"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bzrlib/gpg.py:126 bzrlib/gpg.py:466
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
 msgid "{0} commit not valid"
 msgid_plural "{0} commits not valid"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bzrlib/gpg.py:132 bzrlib/gpg.py:473
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
 msgid "{0} commit not signed"
 msgid_plural "{0} commits not signed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bzrlib/gpg.py:138 bzrlib/gpg.py:480
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
 msgid "{0} commit with key now expired"
 msgid_plural "{0} commits with key now expired"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bzrlib/gpg.py:336
+#: bzrlib/gpg.py:343
 msgid "No GnuPG key results for pattern: {0}"
 msgstr ""
 
-#: bzrlib/gpg.py:379
+#: bzrlib/gpg.py:386
 msgid "{0} signed {1} commit"
 msgid_plural "{0} signed {1} commits"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bzrlib/gpg.py:396 bzrlib/gpg.py:412
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
 msgid "{0} commit by author {1}"
 msgid_plural "{0} commits by author {1}"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bzrlib/gpg.py:426
+#: bzrlib/gpg.py:433
 msgid "Unknown key {0} signed {1} commit"
 msgid_plural "Unknown key {0} signed {1} commits"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bzrlib/gpg.py:444
+#: bzrlib/gpg.py:452
 msgid "{0} commit by author {1} with key {2} now expired"
 msgid_plural "{0} commits by author {1} with key {2} now expired"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bzrlib/groupcompress.py:1737
+#: bzrlib/groupcompress.py:1739
 #, python-format
 msgid "Insert claimed random_id=True, but then inserted %r two times"
 msgstr ""
 
-#: bzrlib/hooks.py:329
+#: bzrlib/hooks.py:331
 #, python-format
 msgid "Introduced in: %s"
 msgstr ""
 
-#: bzrlib/hooks.py:332
+#: bzrlib/hooks.py:334
 #, python-format
 msgid "Deprecated in: %s"
 msgstr ""
 
-#: bzrlib/knit.py:1764 bzrlib/knit.py:1800
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
 msgid "Walking content"
 msgstr ""
 
-#: bzrlib/knit.py:3328
+#: bzrlib/knit.py:3330
 msgid "annotating"
 msgstr ""
 
-#: bzrlib/lock.py:547
+#: bzrlib/lock.py:548
 msgid "{0!r} was {1} locked again"
 msgstr ""
 
-#: bzrlib/lockdir.py:320
+#: bzrlib/lockdir.py:321
 #, python-format
 msgid "error removing pending lock: %s"
 msgstr ""
 
-#: bzrlib/lockdir.py:615
+#: bzrlib/lockdir.py:616
 msgid "Unable to obtain"
 msgstr ""
 
-#: bzrlib/lockdir.py:617
+#: bzrlib/lockdir.py:618
 msgid "Lock owner changed for"
 msgstr ""
 
-#: bzrlib/lockdir.py:619
+#: bzrlib/lockdir.py:620
 msgid "{0} lock {1} {2}."
 msgstr ""
 
-#: bzrlib/lockdir.py:626
+#: bzrlib/lockdir.py:627
 #, python-format
 msgid "Will continue to try until %s, unless you press Ctrl-C."
 msgstr ""
 
-#: bzrlib/lockdir.py:628
+#: bzrlib/lockdir.py:629
 msgid "See \"bzr help break-lock\" for more."
 msgstr ""
 
-#: bzrlib/lockdir.py:738
+#: bzrlib/lockdir.py:739
 #, python-format
 msgid ""
 "held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
@@ -6269,226 +6306,222 @@
 msgid "invalid direction %r"
 msgstr ""
 
-#: bzrlib/log.py:621
-msgid "Start revision not found in left-hand history of end revision."
-msgstr ""
-
-#: bzrlib/log.py:667
+#: bzrlib/log.py:662
 msgid "Start revision not found in history of end revision."
 msgstr ""
 
-#: bzrlib/log.py:1085 bzrlib/log.py:1143
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
 msgid "Logging revision 0 is invalid."
 msgstr ""
 
-#: bzrlib/log.py:1087 bzrlib/log.py:1145
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
 msgid "Start revision must be older than the end revision."
 msgstr ""
 
-#: bzrlib/log.py:1832
+#: bzrlib/log.py:1827
 #, python-format
 msgid "unknown log formatter: %r"
 msgstr ""
 
-#: bzrlib/log.py:2128
+#: bzrlib/log.py:2123
 msgid "fixes bug"
 msgid_plural "fixes bugs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bzrlib/merge.py:718
+#: bzrlib/merge.py:689
 msgid "All changes applied successfully."
 msgstr ""
 
-#: bzrlib/merge.py:720
+#: bzrlib/merge.py:691
 #, python-format
 msgid "%d conflicts encountered."
 msgstr ""
 
-#: bzrlib/merge.py:868 bzrlib/merge.py:1956
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
 msgid "Preparing file merge"
 msgstr ""
 
-#: bzrlib/multiparent.py:424
+#: bzrlib/multiparent.py:426
 msgid "Importing revisions"
 msgstr ""
 
-#: bzrlib/option.py:524
+#: bzrlib/option.py:526
 msgid "Show help message."
 msgstr ""
 
-#: bzrlib/option.py:526
+#: bzrlib/option.py:528
 msgid "Only display errors and warnings."
 msgstr ""
 
-#: bzrlib/option.py:529
+#: bzrlib/option.py:531
 msgid "Show usage message and options."
 msgstr ""
 
-#: bzrlib/option.py:531
+#: bzrlib/option.py:533
 msgid "Display more information."
 msgstr ""
 
-#: bzrlib/option.py:539
+#: bzrlib/option.py:541
 msgid ""
 "Select changes introduced by the specified revision. See also \"help "
 "revisionspec\"."
 msgstr ""
 
-#: bzrlib/option.py:541
+#: bzrlib/option.py:543
 msgid "Branch to operate on, instead of working directory."
 msgstr ""
 
-#: bzrlib/option.py:543
+#: bzrlib/option.py:545
 msgid "Detailed log format."
 msgstr ""
 
-#: bzrlib/option.py:543
+#: bzrlib/option.py:545
 msgid "Format used by GNU ChangeLog files."
 msgstr ""
 
-#: bzrlib/option.py:543
+#: bzrlib/option.py:545
 msgid "Log format with one line per revision."
 msgstr ""
 
-#: bzrlib/option.py:543
+#: bzrlib/option.py:545
 msgid "Moderately short log format."
 msgstr ""
 
-#: bzrlib/option.py:543
+#: bzrlib/option.py:545
 msgid "Use specified log format."
 msgstr ""
 
-#: bzrlib/option.py:545
+#: bzrlib/option.py:547
 msgid "Log format"
 msgstr ""
 
-#: bzrlib/option.py:547
+#: bzrlib/option.py:549
 msgid "LCA-newness merge."
 msgstr ""
 
-#: bzrlib/option.py:547
+#: bzrlib/option.py:549
 msgid "Merge using external diff3."
 msgstr ""
 
-#: bzrlib/option.py:547
+#: bzrlib/option.py:549
 msgid "Native diff3-style merge."
 msgstr ""
 
-#: bzrlib/option.py:547
+#: bzrlib/option.py:549
 msgid "Select a particular merge algorithm."
 msgstr ""
 
-#: bzrlib/option.py:547
+#: bzrlib/option.py:549
 msgid "Weave-based merge."
 msgstr ""
 
-#: bzrlib/option.py:549
+#: bzrlib/option.py:551
 msgid "Merge algorithm"
 msgstr ""
 
-#: bzrlib/option.py:552
+#: bzrlib/option.py:554
 msgid "Message string."
 msgstr ""
 
-#: bzrlib/option.py:554
+#: bzrlib/option.py:556
 msgid "Use an ASCII NUL (\\0) separator rather than a newline."
 msgstr ""
 
-#: bzrlib/option.py:556
+#: bzrlib/option.py:558
 msgid "Ignore differences between branches and overwrite unconditionally."
 msgstr ""
 
-#: bzrlib/option.py:558
+#: bzrlib/option.py:560
 msgid "Remember the specified location as a default."
 msgstr ""
 
-#: bzrlib/option.py:560
+#: bzrlib/option.py:562
 msgid "Reprocess to reduce spurious conflicts."
 msgstr ""
 
-#: bzrlib/option.py:564
+#: bzrlib/option.py:566
 msgid "See \"help revisionspec\" for details."
 msgstr ""
 
-#: bzrlib/option.py:566
+#: bzrlib/option.py:568
 msgid "Show internal object ids."
 msgstr ""
 
-#: bzrlib/option.py:569
+#: bzrlib/option.py:571
 msgid "Display timezone as local, original, or utc."
 msgstr ""
 
-#: bzrlib/osutils.py:94
+#: bzrlib/osutils.py:100
 msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
 msgstr ""
 
-#: bzrlib/osutils.py:214
+#: bzrlib/osutils.py:220
 msgid "lstat/stat of ({0!r}): {1!r}"
 msgstr ""
 
-#: bzrlib/osutils.py:964 bzrlib/osutils.py:975
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
 #, python-format
 msgid "sorry, %r not allowed in path"
 msgstr ""
 
-#: bzrlib/osutils.py:1193
+#: bzrlib/osutils.py:1237
 #, python-format
 msgid "%r is too short to calculate a relative path"
 msgstr ""
 
-#: bzrlib/plugin.py:142
+#: bzrlib/plugin.py:143
 #, python-format
 msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
 msgstr ""
 
-#: bzrlib/plugins/bash_completion/bashcomp.py:408
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
 msgid "Enable completions for the selected plugin (default: all plugins)"
 msgstr ""
 
-#: bzrlib/plugins/bash_completion/bashcomp.py:409
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
 msgid "Generate a shell function for bash command line completion."
 msgstr ""
 
-#: bzrlib/plugins/bash_completion/bashcomp.py:411
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
 msgid ""
 "This command generates a shell function which can be used by bash to\n"
 "automatically complete the currently typed command when the user presses\n"
 "the completion key (usually tab)."
 msgstr ""
 
-#: bzrlib/plugins/bash_completion/bashcomp.py:415
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
 msgid ""
 "Commonly used like this:\n"
 "    eval \"`bzr bash-completion`\""
 msgstr ""
 
-#: bzrlib/plugins/bash_completion/bashcomp.py:421
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
 msgid "Name of the generated function (default: _bzr)"
 msgstr ""
 
-#: bzrlib/plugins/bash_completion/bashcomp.py:423
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
 msgid "Generate only the shell function, don't enable it"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:79
+#: bzrlib/plugins/launchpad/__init__.py:81
 msgid "Register a branch with launchpad.net."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:81
+#: bzrlib/plugins/launchpad/__init__.py:83
 msgid ""
 "This command lists a bzr branch in the directory of branches on\n"
 "launchpad.net.  Registration allows the branch to be associated with\n"
 "bugs or specifications."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:85
+#: bzrlib/plugins/launchpad/__init__.py:87
 msgid ""
 "Before using this command you must register the project to which the\n"
 "branch belongs, and create an account for yourself on launchpad.net."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:88
+#: bzrlib/plugins/launchpad/__init__.py:90
 msgid ""
 "arguments:\n"
 "    public_url: The publicly visible url for the branch to register.\n"
@@ -6500,134 +6533,134 @@
 "                otherwise error."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:97
+#: bzrlib/plugins/launchpad/__init__.py:99
 msgid ""
 "example:\n"
 "    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
 "            --project fooproject"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:104
+#: bzrlib/plugins/launchpad/__init__.py:106
 msgid "Launchpad project short name to associate with the branch."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:111
+#: bzrlib/plugins/launchpad/__init__.py:113
 msgid ""
 "Short name for the branch; by default taken from the last component of the "
 "url."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:115
+#: bzrlib/plugins/launchpad/__init__.py:117
 msgid "One-sentence description of the branch."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:118
+#: bzrlib/plugins/launchpad/__init__.py:120
 msgid "Longer description of the purpose or contents of the branch."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:121
+#: bzrlib/plugins/launchpad/__init__.py:123
 msgid "Branch author's email address, if not yourself."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:124
+#: bzrlib/plugins/launchpad/__init__.py:126
 msgid "The bug this branch fixes."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:127
+#: bzrlib/plugins/launchpad/__init__.py:129
 msgid "Prepare the request but don't actually send it."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:149
+#: bzrlib/plugins/launchpad/__init__.py:151
 msgid ""
 "register-branch requires a public branch url - see bzr help register-branch."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:157
+#: bzrlib/plugins/launchpad/__init__.py:159
 msgid "--product is deprecated; please use --project."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:189
+#: bzrlib/plugins/launchpad/__init__.py:191
 msgid "Open a Launchpad branch page in your web browser."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:194
+#: bzrlib/plugins/launchpad/__init__.py:196
 msgid "Do not actually open the browser. Just say the URL we would use."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:229
+#: bzrlib/plugins/launchpad/__init__.py:231
 #, python-format
 msgid "Opening %s in web browser"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:239
+#: bzrlib/plugins/launchpad/__init__.py:241
 msgid "Show or set the Launchpad user ID."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:241
+#: bzrlib/plugins/launchpad/__init__.py:243
 msgid ""
 "When communicating with Launchpad, some commands need to know your\n"
 "Launchpad user ID.  This command can be used to set or show the\n"
 "user ID that Bazaar will use for such communication."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:245
+#: bzrlib/plugins/launchpad/__init__.py:247
 msgid ""
 ":Examples:\n"
 "  Show the Launchpad ID of the current user::"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:248
+#: bzrlib/plugins/launchpad/__init__.py:250
 msgid "      bzr launchpad-login"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:250
+#: bzrlib/plugins/launchpad/__init__.py:252
 msgid "  Set the Launchpad ID of the current user to 'bob'::"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:252
+#: bzrlib/plugins/launchpad/__init__.py:254
 msgid "      bzr launchpad-login bob"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:259
+#: bzrlib/plugins/launchpad/__init__.py:261
 msgid "Don't check that the user name is valid."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:274
-#: bzrlib/plugins/launchpad/__init__.py:285
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
 msgid "Launchpad user ID exists and has SSH keys.\n"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:277
+#: bzrlib/plugins/launchpad/__init__.py:279
 msgid "No Launchpad user ID configured.\n"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:288
+#: bzrlib/plugins/launchpad/__init__.py:290
 #, python-format
 msgid "Launchpad user ID set to '%s'.\n"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:296
+#: bzrlib/plugins/launchpad/__init__.py:298
 msgid "Ask Launchpad to mirror a branch now."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:316
+#: bzrlib/plugins/launchpad/__init__.py:318
 msgid "Propose merging a branch on Launchpad."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:318
+#: bzrlib/plugins/launchpad/__init__.py:320
 msgid ""
 "This will open your usual editor to provide the initial comment.  When it\n"
 "has created the proposal, it will open it in your default web browser."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:321
+#: bzrlib/plugins/launchpad/__init__.py:323
 msgid ""
 "The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
 "is not supplied, the remembered submit branch will be used.  If no submit\n"
 "branch is remembered, the development focus will be used."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:325
+#: bzrlib/plugins/launchpad/__init__.py:327
 msgid ""
 "By default, the SUBMIT_BRANCH's review team will be requested to review\n"
 "the merge proposal.  This can be overriden by specifying --review (-R).\n"
@@ -6635,37 +6668,37 @@
 "may optionally be followed by '=' and the review type.  For example:"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:330
+#: bzrlib/plugins/launchpad/__init__.py:332
 msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:332
+#: bzrlib/plugins/launchpad/__init__.py:334
 msgid ""
 "This will propose a merge,  request \"jrandom\" to perform a review of\n"
 "unspecified type, and request \"review-team\" to perform a \"qa\" review."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:337
+#: bzrlib/plugins/launchpad/__init__.py:339
 msgid "Propose the merge on staging."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:339
+#: bzrlib/plugins/launchpad/__init__.py:341
 msgid "Commit message."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:341
+#: bzrlib/plugins/launchpad/__init__.py:343
 msgid "Mark the proposal as approved immediately."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:343
+#: bzrlib/plugins/launchpad/__init__.py:345
 msgid "Requested reviewer and optional type."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:380
+#: bzrlib/plugins/launchpad/__init__.py:382
 msgid "Find the proposal to merge this revision."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:382
+#: bzrlib/plugins/launchpad/__init__.py:384
 msgid ""
 "Finds the merge proposal(s) that discussed landing the specified revision.\n"
 "This works only if the selected branch was the merge proposal target, and\n"
@@ -6673,241 +6706,241 @@
 "are opened in a web browser."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:387
+#: bzrlib/plugins/launchpad/__init__.py:389
 msgid ""
 "Any revision involved in the merge may be specified-- the revision in\n"
 "which the merge was performed, or one of the revisions that was merged."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:390
+#: bzrlib/plugins/launchpad/__init__.py:392
 msgid "So, to find the merge proposal that reviewed line 1 of README::"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:392
+#: bzrlib/plugins/launchpad/__init__.py:394
 msgid "  bzr lp-find-proposal -r annotate:README:1"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:407
+#: bzrlib/plugins/launchpad/__init__.py:409
 msgid "No review found."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:408
+#: bzrlib/plugins/launchpad/__init__.py:410
 #, python-format
 msgid "%d proposals(s) found."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:418
+#: bzrlib/plugins/launchpad/__init__.py:420
 msgid "Finding revision-id"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:425
+#: bzrlib/plugins/launchpad/__init__.py:427
 msgid "Finding merge"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:430
+#: bzrlib/plugins/launchpad/__init__.py:432
 msgid "Finding revno"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:435
+#: bzrlib/plugins/launchpad/__init__.py:437
 msgid "Finding Launchpad branch"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/__init__.py:438
+#: bzrlib/plugins/launchpad/__init__.py:440
 msgid "Finding proposals"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/account.py:64
+#: bzrlib/plugins/launchpad/account.py:66
 msgid "Setting ssh/sftp usernames for launchpad.net."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/lp_api.py:239
-#: bzrlib/plugins/launchpad/lp_api.py:244
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
 #, python-format
 msgid "%s is not registered on Launchpad"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/lp_api.py:254
+#: bzrlib/plugins/launchpad/lp_api.py:256
 #, python-format
 msgid "%s has no development focus."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/lp_api.py:259
+#: bzrlib/plugins/launchpad/lp_api.py:261
 #, python-format
 msgid "development focus %s has no branch."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/lp_api.py:264
+#: bzrlib/plugins/launchpad/lp_api.py:266
 #, python-format
 msgid "source package %s has no branch."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/lp_api.py:268
+#: bzrlib/plugins/launchpad/lp_api.py:270
 #, python-format
 msgid "%s has no associated product or source package."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/lp_api.py:280
+#: bzrlib/plugins/launchpad/lp_api.py:282
 #, python-format
 msgid "%s is already up-to-date."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/lp_api.py:287
+#: bzrlib/plugins/launchpad/lp_api.py:289
 #, python-format
 msgid "Pushing to %s"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/lp_directory.py:169
+#: bzrlib/plugins/launchpad/lp_directory.py:170
 msgid ""
 "resolution for {0}\n"
 "  local: {1}\n"
 " remote: {2}"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/lp_propose.py:147
+#: bzrlib/plugins/launchpad/lp_propose.py:149
 #, python-format
 msgid "There is already a branch merge proposal: %s"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:226
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
 msgid "pb parameter to convert() is deprecated"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:229
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
 msgid "starting upgrade from format 4 to 5"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
 msgid "note: upgrade may be faster if all store files are ungzipped first"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:268
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
 msgid "converting revision"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:273
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
 msgid "upgraded to weaves:"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:274
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
 #, python-format
 msgid "%6d revisions and inventories"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:276
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
 #, python-format
 msgid "%6d revisions not present"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
 #, python-format
 msgid "%6d texts"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:314
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
 msgid "writing weave"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:318
-#: bzrlib/plugins/weave_fmt/bzrdir.py:320
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
 msgid "inventory"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:337
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
 msgid "write revision"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:351
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
 msgid "loading revision"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:356
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
 #, python-format
 msgid "revision {%s} not present in branch; will be converted as a ghost"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:496
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
 msgid "starting upgrade from format 5 to 6"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
 #, python-format
 msgid "adding prefixes to %s"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:546
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
 msgid "starting upgrade from format 6 to metadir"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:554
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
 msgid "Removing ancestry.weave"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:559
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
 msgid "Finding branch files"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
 msgid "Upgrading repository"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
 msgid "Upgrading branch"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:602
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
 msgid "No working tree."
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:609
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
 msgid "Upgrading working tree"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:630
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
 #, python-format
 msgid "Make %s lock"
 msgstr ""
 
-#: bzrlib/plugins/weave_fmt/bzrdir.py:641
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
 #, python-format
 msgid "Moving %s"
 msgstr ""
 
-#: bzrlib/push.py:54
+#: bzrlib/push.py:56
 msgid "Created new branch."
 msgstr ""
 
-#: bzrlib/push.py:96
+#: bzrlib/push.py:97
 #, python-format
 msgid ""
 "Target directory %s already contains a .bzr directory, but it is not valid."
 msgstr ""
 
-#: bzrlib/push.py:99
+#: bzrlib/push.py:101
 #, python-format
 msgid ""
 "Target directory %s already exists, but does not have a .bzr directory. "
 "Supply --use-existing-dir to push there anyway."
 msgstr ""
 
-#: bzrlib/push.py:120
+#: bzrlib/push.py:122
 #, python-format
 msgid "Too many redirections trying to make %s."
 msgstr ""
 
-#: bzrlib/push.py:145
+#: bzrlib/push.py:147
 msgid ""
 "These branches have diverged.  See \"bzr help diverged-branches\" for more "
 "information."
 msgstr ""
 
-#: bzrlib/push.py:149
+#: bzrlib/push.py:151
 #, python-format
 msgid ""
 "It is not possible to losslessly push to %s. You may want to use dpush "
 "instead."
 msgstr ""
 
-#: bzrlib/push.py:155
+#: bzrlib/push.py:157
 #, python-format
 msgid ""
 "At %s you have a valid .bzr control directory, but not a branch or "
@@ -6915,505 +6948,505 @@
 "directory out of the way and try again."
 msgstr ""
 
-#: bzrlib/reconcile.py:96
+#: bzrlib/reconcile.py:97
 #, python-format
 msgid "Reconciling branch %s"
 msgstr ""
 
-#: bzrlib/reconcile.py:102
+#: bzrlib/reconcile.py:103
 #, python-format
 msgid "Reconciling repository %s"
 msgstr ""
 
-#: bzrlib/reconcile.py:104
+#: bzrlib/reconcile.py:105
 msgid "Reconciling repository"
 msgstr ""
 
-#: bzrlib/reconcile.py:110
+#: bzrlib/reconcile.py:111
 #, python-format
 msgid "%s cannot canonicalize CHKs."
 msgstr ""
 
-#: bzrlib/reconcile.py:118
+#: bzrlib/reconcile.py:119
 msgid "Reconcile aborted: revision index has inconsistent parents."
 msgstr ""
 
-#: bzrlib/reconcile.py:120
+#: bzrlib/reconcile.py:121
 msgid "Run \"bzr check\" for more details."
 msgstr ""
 
-#: bzrlib/reconcile.py:122
+#: bzrlib/reconcile.py:123
 msgid "Reconciliation complete."
 msgstr ""
 
-#: bzrlib/reconcile.py:165
+#: bzrlib/reconcile.py:166
 msgid "Fixing last revision info {0}  => {1}"
 msgstr ""
 
-#: bzrlib/reconcile.py:172
+#: bzrlib/reconcile.py:173
 msgid "revision_history ok."
 msgstr ""
 
-#: bzrlib/reconcile.py:233
+#: bzrlib/reconcile.py:234
 msgid "Reading inventory data"
 msgstr ""
 
-#: bzrlib/reconcile.py:253 bzrlib/reconcile.py:383
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
 msgid "Inventory ok."
 msgstr ""
 
-#: bzrlib/reconcile.py:255 bzrlib/reconcile.py:385
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
 msgid "Backing up inventory"
 msgstr ""
 
-#: bzrlib/reconcile.py:257
+#: bzrlib/reconcile.py:258
 msgid "Backup inventory created."
 msgstr ""
 
-#: bzrlib/reconcile.py:273 bzrlib/reconcile.py:404
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
 msgid "Writing weave"
 msgstr ""
 
-#: bzrlib/reconcile.py:276 bzrlib/reconcile.py:407
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
 msgid "Inventory regenerated."
 msgstr ""
 
-#: bzrlib/reconcile.py:370 bzrlib/reconcile.py:372 bzrlib/reconcile.py:375
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
 msgid "Reading indexes"
 msgstr ""
 
-#: bzrlib/reconcile.py:379 bzrlib/reconcile.py:381
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
 msgid "Checking unused inventories"
 msgstr ""
 
-#: bzrlib/reconcile.py:387
+#: bzrlib/reconcile.py:388
 msgid "Backup Inventory created"
 msgstr ""
 
-#: bzrlib/reconcile.py:445
+#: bzrlib/reconcile.py:446
 msgid "Fixing text parents"
 msgstr ""
 
-#: bzrlib/reconfigure.py:52
+#: bzrlib/reconfigure.py:54
 msgid "{0} is now stacked on {1}\n"
 msgstr ""
 
-#: bzrlib/reconfigure.py:67
+#: bzrlib/reconfigure.py:69
 #, python-format
 msgid "%s is now not stacked\n"
 msgstr ""
 
-#: bzrlib/remote.py:1134 bzrlib/repository.py:287
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
 #, python-format
 msgid "bzr: ERROR (ignored): %s"
 msgstr ""
 
-#: bzrlib/remote.py:2217
+#: bzrlib/remote.py:2541
 msgid "Copying repository content as tarball..."
 msgstr ""
 
-#: bzrlib/rename_map.py:68
+#: bzrlib/rename_map.py:69
 msgid "Calculating hashes"
 msgstr ""
 
-#: bzrlib/rename_map.py:106
+#: bzrlib/rename_map.py:107
 msgid "Determining hash hits"
 msgstr ""
 
-#: bzrlib/rename_map.py:241
+#: bzrlib/rename_map.py:242
 msgid "{0} => {1}"
 msgstr ""
 
-#: bzrlib/repository.py:1781
+#: bzrlib/repository.py:1787
 msgid "Moving repository to repository.backup"
 msgstr ""
 
-#: bzrlib/repository.py:1788
+#: bzrlib/repository.py:1794
 msgid "Creating new repository"
 msgstr ""
 
-#: bzrlib/repository.py:1793
+#: bzrlib/repository.py:1799
 msgid "Copying content"
 msgstr ""
 
-#: bzrlib/repository.py:1797
+#: bzrlib/repository.py:1803
 msgid "Deleting old repository content"
 msgstr ""
 
-#: bzrlib/repository.py:1799
+#: bzrlib/repository.py:1805
 msgid "repository converted"
 msgstr ""
 
-#: bzrlib/revisionspec.py:904
+#: bzrlib/revisionspec.py:903
 msgid "Using {0} {1}"
 msgstr ""
 
-#: bzrlib/send.py:57
+#: bzrlib/send.py:58
 #, python-format
 msgid "Mail client \"%s\" does not support specifying body"
 msgstr ""
 
-#: bzrlib/send.py:61
+#: bzrlib/send.py:62
 msgid "--remember requires a branch to be specified."
 msgstr ""
 
-#: bzrlib/send.py:75
+#: bzrlib/send.py:77
 msgid "No submit branch known or specified"
 msgstr ""
 
-#: bzrlib/send.py:78
+#: bzrlib/send.py:80
 msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
 msgstr ""
 
-#: bzrlib/send.py:95
+#: bzrlib/send.py:98
 #, python-format
 msgid "No such send format '%s'."
 msgstr ""
 
-#: bzrlib/send.py:112
+#: bzrlib/send.py:114
 msgid "bzr send takes at most two one revision identifiers"
 msgstr ""
 
-#: bzrlib/send.py:125
+#: bzrlib/send.py:127
 msgid "No revisions to submit."
 msgstr ""
 
-#: bzrlib/send.py:136
+#: bzrlib/send.py:139
 msgid ""
 "- not supported for merge directives that use more than one output file."
 msgstr ""
 
-#: bzrlib/send.py:178
+#: bzrlib/send.py:185
 msgid "Format 0.9 does not permit bundle with no patch"
 msgstr ""
 
-#: bzrlib/shelf_ui.py:45
+#: bzrlib/shelf_ui.py:46
 #, python-format
 msgid "Shelve adding file \"%(path)s\"?"
 msgstr ""
 
-#: bzrlib/shelf_ui.py:46
+#: bzrlib/shelf_ui.py:47
 msgid "Shelve binary changes?"
 msgstr ""
 
-#: bzrlib/shelf_ui.py:47
+#: bzrlib/shelf_ui.py:48
 msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
 msgstr ""
 
-#: bzrlib/shelf_ui.py:49
+#: bzrlib/shelf_ui.py:50
 #, python-format
 msgid "Shelve removing file \"%(path)s\"?"
 msgstr ""
 
-#: bzrlib/shelf_ui.py:50
+#: bzrlib/shelf_ui.py:51
 #, python-format
 msgid "Shelve %d change(s)?"
 msgstr ""
 
-#: bzrlib/shelf_ui.py:51
+#: bzrlib/shelf_ui.py:52
 msgid "Shelve?"
 msgstr ""
 
-#: bzrlib/shelf_ui.py:52
+#: bzrlib/shelf_ui.py:53
 #, python-format
 msgid ""
 "Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
 msgstr ""
 
-#: bzrlib/shelf_ui.py:54
+#: bzrlib/shelf_ui.py:55
 #, python-format
 msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
 msgstr ""
 
-#: bzrlib/shelf_ui.py:69
+#: bzrlib/shelf_ui.py:70
 #, python-format
 msgid "Changes shelved with id \"%d\"."
 msgstr ""
 
-#: bzrlib/shelf_ui.py:73
+#: bzrlib/shelf_ui.py:74
 msgid "Selected changes destroyed."
 msgstr ""
 
-#: bzrlib/shelf_ui.py:77
+#: bzrlib/shelf_ui.py:78
 msgid "Selected changes:"
 msgstr ""
 
-#: bzrlib/shelf_ui.py:97
+#: bzrlib/shelf_ui.py:98
 #, python-format
 msgid "Delete file \"%(path)s\"?"
 msgstr ""
 
-#: bzrlib/shelf_ui.py:98
+#: bzrlib/shelf_ui.py:99
 msgid "Apply binary changes?"
 msgstr ""
 
-#: bzrlib/shelf_ui.py:99
+#: bzrlib/shelf_ui.py:100
 #, python-format
 msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
 msgstr ""
 
-#: bzrlib/shelf_ui.py:101
+#: bzrlib/shelf_ui.py:102
 #, python-format
 msgid "Add file \"%(path)s\"?"
 msgstr ""
 
-#: bzrlib/shelf_ui.py:102
+#: bzrlib/shelf_ui.py:103
 #, python-format
 msgid "Apply %d change(s)?"
 msgstr ""
 
-#: bzrlib/shelf_ui.py:103
+#: bzrlib/shelf_ui.py:104
 msgid "Apply change?"
 msgstr ""
 
-#: bzrlib/shelf_ui.py:104
+#: bzrlib/shelf_ui.py:105
 #, python-format
 msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
 msgstr ""
 
-#: bzrlib/shelf_ui.py:106
+#: bzrlib/shelf_ui.py:107
 #, python-format
 msgid "Rename \"%(this)s\" => \"%(other)s\"?"
 msgstr ""
 
-#: bzrlib/shelf_ui.py:401
+#: bzrlib/shelf_ui.py:402
 msgid "No changes are shelved."
 msgstr ""
 
-#: bzrlib/shelf_ui.py:459
+#: bzrlib/shelf_ui.py:460
 #, python-format
 msgid "Using changes with id \"%d\"."
 msgstr ""
 
-#: bzrlib/shelf_ui.py:463
+#: bzrlib/shelf_ui.py:464
 #, python-format
 msgid "Message: %s"
 msgstr ""
 
-#: bzrlib/shelf_ui.py:475
+#: bzrlib/shelf_ui.py:476
 #, python-format
 msgid "Deleted changes with id \"%d\"."
 msgstr ""
 
-#: bzrlib/smart/medium.py:712
+#: bzrlib/smart/medium.py:714
 msgid "HPSS calls: {0} ({1} vfs) {2}"
 msgstr ""
 
-#: bzrlib/smart/server.py:167
+#: bzrlib/smart/server.py:169
 msgid "Requested to stop gracefully"
 msgstr ""
 
-#: bzrlib/smart/server.py:177
+#: bzrlib/smart/server.py:179
 #, python-format
 msgid "Waiting for %d client(s) to finish"
 msgstr ""
 
-#: bzrlib/smart/server.py:183
+#: bzrlib/smart/server.py:185
 #, python-format
 msgid "Still waiting for %d client(s) to finish"
 msgstr ""
 
-#: bzrlib/smart/server.py:217
+#: bzrlib/smart/server.py:219
 #, python-format
 msgid "listening socket error: %s"
 msgstr ""
 
-#: bzrlib/smart/server.py:450
+#: bzrlib/smart/server.py:452
 #, python-format
 msgid "listening on port: %s"
 msgstr ""
 
-#: bzrlib/switch.py:67
+#: bzrlib/switch.py:73
 msgid "Pending merges must be committed or reverted before using switch."
 msgstr ""
 
-#: bzrlib/switch.py:94
+#: bzrlib/switch.py:100
 msgid ""
 "Cannot switch as local commits found in the checkout. Commit these to the "
 "bound branch or use --force to throw them away."
 msgstr ""
 
-#: bzrlib/switch.py:99
+#: bzrlib/switch.py:105
 #, python-format
 msgid ""
 "Unable to connect to current master branch %(target)s: %(error)s To switch "
 "anyway, use --force."
 msgstr ""
 
-#: bzrlib/switch.py:108
+#: bzrlib/switch.py:125
 msgid "Cannot switch a branch, only a checkout."
 msgstr ""
 
-#: bzrlib/switch.py:144
+#: bzrlib/switch.py:163
 #, python-format
 msgid "Tree is up to date at revision %d."
 msgstr ""
 
-#: bzrlib/switch.py:150
+#: bzrlib/switch.py:169
 #, python-format
 msgid "Updated to revision %d."
 msgstr ""
 
-#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
 msgid "Apply phase"
 msgstr ""
 
-#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
 msgid "removing file"
 msgstr ""
 
-#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
 msgid "adding file"
 msgstr ""
 
-#: bzrlib/transform.py:2580
+#: bzrlib/transform.py:2591
 msgid "Building tree"
 msgstr ""
 
-#: bzrlib/transform.py:2670 bzrlib/transform.py:2697
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
 msgid "Adding file contents"
 msgstr ""
 
-#: bzrlib/transform.py:3017
+#: bzrlib/transform.py:3028
 msgid "Resolution pass"
 msgstr ""
 
-#: bzrlib/transport/ftp/_gssapi.py:86
+#: bzrlib/transport/ftp/_gssapi.py:88
 #, python-format
 msgid "Authenticated as %s"
 msgstr ""
 
-#: bzrlib/tree.py:632
+#: bzrlib/tree.py:634
 msgid "*** {0} content-filter: {1} => {2!r}"
 msgstr ""
 
-#: bzrlib/upgrade.py:76
+#: bzrlib/upgrade.py:77
 #, python-format
 msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
 msgstr ""
 
-#: bzrlib/upgrade.py:99
+#: bzrlib/upgrade.py:100
 #, python-format
 msgid "cannot upgrade from bzrdir format %s"
 msgstr ""
 
-#: bzrlib/upgrade.py:102
+#: bzrlib/upgrade.py:103
 #, python-format
 msgid "starting upgrade of %s"
 msgstr ""
 
-#: bzrlib/upgrade.py:109
+#: bzrlib/upgrade.py:110
 msgid "finished"
 msgstr ""
 
-#: bzrlib/upgrade.py:119
+#: bzrlib/upgrade.py:120
 msgid "Deleting backup.bzr"
 msgstr ""
 
-#: bzrlib/upgrade.py:150
+#: bzrlib/upgrade.py:151
 msgid ""
 "\n"
 "SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
 msgstr ""
 
-#: bzrlib/upgrade.py:207
+#: bzrlib/upgrade.py:208
 #, python-format
 msgid "Found %d dependent branches - upgrading ..."
 msgstr ""
 
-#: bzrlib/upgrade.py:275
+#: bzrlib/upgrade.py:276
 msgid "Upgrading bzrdirs"
 msgstr ""
 
-#: bzrlib/upgrade.py:281
+#: bzrlib/upgrade.py:282
 #, python-format
 msgid "Upgrading %s"
 msgstr ""
 
-#: bzrlib/upgrade.py:282
+#: bzrlib/upgrade.py:283
 msgid "Upgrading {0} {1} ..."
 msgstr ""
 
-#: bzrlib/upgrade.py:300
+#: bzrlib/upgrade.py:301
 msgid "Removing backup ..."
 msgstr ""
 
-#: bzrlib/upgrade.py:304
+#: bzrlib/upgrade.py:305
 msgid "failed to clean-up {0}: {1}"
 msgstr ""
 
-#: bzrlib/vf_repository.py:1093
+#: bzrlib/vf_repository.py:1090
 msgid "inventories"
 msgstr ""
 
-#: bzrlib/vf_repository.py:1119
+#: bzrlib/vf_repository.py:1116
 msgid "texts"
 msgstr ""
 
-#: bzrlib/vf_repository.py:1624 bzrlib/vf_repository.py:1633
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
 msgid "Calculating text parents"
 msgstr ""
 
-#: bzrlib/vf_repository.py:1709
+#: bzrlib/vf_repository.py:1706
 msgid "Fetch texts"
 msgstr ""
 
-#: bzrlib/vf_repository.py:2538
+#: bzrlib/vf_repository.py:2535
 msgid "loading text store"
 msgstr ""
 
-#: bzrlib/vf_repository.py:2544
+#: bzrlib/vf_repository.py:2541
 msgid "checking text graph"
 msgstr ""
 
-#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
-#: bzrlib/vf_repository.py:3127
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
 msgid "Transferring revisions"
 msgstr ""
 
-#: bzrlib/win32utils.py:137
+#: bzrlib/win32utils.py:146
 msgid "Failed to GetProcessMemoryInfo()"
 msgstr ""
 
-#: bzrlib/win32utils.py:158
+#: bzrlib/win32utils.py:167
 msgid "Cannot debug memory on win32 without ctypes or win32process"
 msgstr ""
 
-#: bzrlib/win32utils.py:163
+#: bzrlib/win32utils.py:172
 msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
 msgstr ""
 
-#: bzrlib/win32utils.py:171
+#: bzrlib/win32utils.py:180
 #, python-format
 msgid "WorkingSize       %8d KiB"
 msgstr ""
 
-#: bzrlib/win32utils.py:172
+#: bzrlib/win32utils.py:181
 #, python-format
 msgid "PeakWorking       %8d KiB"
 msgstr ""
 
-#: bzrlib/win32utils.py:173
+#: bzrlib/win32utils.py:182
 #, python-format
 msgid "PagefileUsage     %8d KiB"
 msgstr ""
 
-#: bzrlib/win32utils.py:174
+#: bzrlib/win32utils.py:183
 #, python-format
 msgid "PeakPagefileUsage %8d KiB"
 msgstr ""
 
-#: bzrlib/win32utils.py:176
+#: bzrlib/win32utils.py:185
 #, python-format
 msgid "PrivateUsage      %8d KiB"
 msgstr ""
 
-#: bzrlib/win32utils.py:177
+#: bzrlib/win32utils.py:186
 #, python-format
 msgid "PageFaultCount    %8d"
 msgstr ""
 
-#: bzrlib/workingtree.py:1467
+#: bzrlib/workingtree.py:1478
 msgid "Rerun update after fixing the conflicts."
 msgstr ""
 
@@ -7423,7 +7456,7 @@
 
 #: dummy/help_topics/basic/detail.txt:1
 msgid ""
-"Bazaar 2.5b4 -- a free distributed version-control tool\n"
+"Bazaar 2.5b5 -- a free distributed version-control tool\n"
 "http://bazaar.canonical.com/"
 msgstr ""
 
@@ -7494,6 +7527,8 @@
 msgstr ""
 
 #: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
 msgid "Related commands::"
 msgstr ""
 
@@ -8783,7 +8818,7 @@
 msgid "    bzr commit --fixes <tracker>:<id>"
 msgstr ""
 
-#: en/help_topics/bugs.txt:13
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
 msgid "or::"
 msgstr ""
 
@@ -9645,7 +9680,7 @@
 "``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
 msgstr ""
 
-#: en/help_topics/configuration.txt:318
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
 msgid ""
 "   $ bzr config mypush\n"
 "   lp:~vila/bzr/832013-expand-in-stack"
@@ -10509,7 +10544,11 @@
 "--------------"
 msgstr ""
 
-#: en/help_topics/conflict-types.txt:63
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
 msgid "Typical message::"
 msgstr ""
 
@@ -10641,14 +10680,17 @@
 "copy\" has been renamed to THIS or OTHER."
 msgstr ""
 
-#: en/help_topics/conflict-types.txt:134
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
 msgid ""
 "To resolve that kind of conflict, you should rebuild FILE from either "
 "version\n"
 "or a combination of both."
 msgstr ""
 
-#: en/help_topics/conflict-types.txt:137
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
 msgid "``bzr resolve`` recognizes the following actions:"
 msgstr ""
 
@@ -10666,7 +10708,10 @@
 "``.OTHER`` files if they are still present in the working tree."
 msgstr ""
 
-#: en/help_topics/conflict-types.txt:146
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
 msgid ""
 "Bazaar cannot auto-detect when conflicts of this kind have been resolved."
 msgstr ""
@@ -10785,7 +10830,7 @@
 "Resolving this issue depends very much on the particular scenario."
 msgstr ""
 
-#: en/help_topics/conflict-types.txt:223
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
 msgid ""
 "To resolve that kind of conflict, you should either remove or rename the\n"
 "children or the directory or a combination of both."
@@ -11179,7 +11224,7 @@
 "    transition."
 msgstr ""
 
-#: en/help_topics/current-formats.txt:8
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
 msgid ""
 "\n"
 "See :doc:`formats-help` for more about storage formats."
@@ -11386,7 +11431,8 @@
 "to use as a starting point::"
 msgstr ""
 
-#: en/help_topics/eol.txt:42
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
 msgid ""
 "  [name *]\n"
 "  eol = native"
@@ -11559,7 +11605,7 @@
 "====="
 msgstr ""
 
-#: en/help_topics/hooks.txt:5
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
 msgid ""
 "Introduction\n"
 "------------"
@@ -11626,7 +11672,8 @@
 "~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
-#: en/help_topics/hooks.txt:38
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
 msgid "Introduced in: 2.2"
 msgstr ""
 
@@ -11644,7 +11691,8 @@
 "~~~~"
 msgstr ""
 
-#: en/help_topics/hooks.txt:48
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
 msgid "Introduced in: 1.8"
 msgstr ""
 
@@ -11674,7 +11722,7 @@
 "~~~~~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
-#: en/help_topics/hooks.txt:66
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
 msgid "Introduced in: 1.4"
 msgstr ""
 
@@ -11686,13 +11734,15 @@
 "uncommit will all trigger this hook."
 msgstr ""
 
-#: en/help_topics/hooks.txt:73
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
 msgid ""
 "post_commit\n"
 "~~~~~~~~~~~"
 msgstr ""
 
-#: en/help_topics/hooks.txt:76
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
 msgid "Introduced in: 0.15"
 msgstr ""
 
@@ -11863,7 +11913,8 @@
 "~~~~~~~~~~~"
 msgstr ""
 
-#: en/help_topics/hooks.txt:184
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
 msgid "Introduced in: 1.17"
 msgstr ""
 
@@ -11916,7 +11967,10 @@
 "~~~"
 msgstr ""
 
-#: en/help_topics/hooks.txt:218
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
 msgid "Introduced in: 2.4"
 msgstr ""
 
@@ -12016,7 +12070,8 @@
 "~~~~~~~~~~"
 msgstr ""
 
-#: en/help_topics/hooks.txt:278
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
 msgid "Introduced in: 1.15"
 msgstr ""
 
@@ -12093,44 +12148,74 @@
 
 #: en/help_topics/hooks.txt:323
 msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
 "MergeDirectiveHooks\n"
 "-------------------"
 msgstr ""
 
-#: en/help_topics/hooks.txt:326
+#: en/help_topics/hooks.txt:342
 msgid ""
 "merge_request_body\n"
 "~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
-#: en/help_topics/hooks.txt:329
+#: en/help_topics/hooks.txt:345
 msgid "Introduced in: 1.15.0"
 msgstr ""
 
-#: en/help_topics/hooks.txt:331
+#: en/help_topics/hooks.txt:347
 msgid ""
 "Called with a MergeRequestBodyParams when a body is needed for a merge\n"
 "request.  Callbacks must return a body.  If more than one callback is\n"
 "registered, the output of one callback is provided to the next."
 msgstr ""
 
-#: en/help_topics/hooks.txt:335
+#: en/help_topics/hooks.txt:351
 msgid ""
 "MessageEditorHooks\n"
 "------------------"
 msgstr ""
 
-#: en/help_topics/hooks.txt:338
+#: en/help_topics/hooks.txt:354
 msgid ""
 "commit_message_template\n"
 "~~~~~~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
-#: en/help_topics/hooks.txt:341
+#: en/help_topics/hooks.txt:357
 msgid "Introduced in: 1.10"
 msgstr ""
 
-#: en/help_topics/hooks.txt:343
+#: en/help_topics/hooks.txt:359
 msgid ""
 "Called when a commit message is being generated.\n"
 "commit_message_template is called with the bzrlib.commit.Commit object\n"
@@ -12141,13 +12226,13 @@
 "second, and so on."
 msgstr ""
 
-#: en/help_topics/hooks.txt:351
+#: en/help_topics/hooks.txt:367
 msgid ""
 "set_commit_message\n"
 "~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
-#: en/help_topics/hooks.txt:356
+#: en/help_topics/hooks.txt:372
 msgid ""
 "Set a fixed commit message. set_commit_message is called with the\n"
 "bzrlib.commit.Commit object (so you can also change e.g. revision\n"
@@ -12156,17 +12241,29 @@
 "should use the message editor as normal."
 msgstr ""
 
-#: en/help_topics/hooks.txt:362
+#: en/help_topics/hooks.txt:378
 msgid ""
 "MutableTreeHooks\n"
 "----------------"
 msgstr ""
 
-#: en/help_topics/hooks.txt:368
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
 msgid "Introduced in: 2.0"
 msgstr ""
 
-#: en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:394
 msgid ""
 "Called after a commit is performed on a tree. The hook is called with\n"
 "a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
@@ -12174,13 +12271,13 @@
 "that object."
 msgstr ""
 
-#: en/help_topics/hooks.txt:375
+#: en/help_topics/hooks.txt:415
 msgid ""
 "start_commit\n"
 "~~~~~~~~~~~~"
 msgstr ""
 
-#: en/help_topics/hooks.txt:380
+#: en/help_topics/hooks.txt:420
 msgid ""
 "Called before a commit is performed on a tree. The start commit hook\n"
 "is able to change the tree before the commit takes place. start_commit\n"
@@ -12188,42 +12285,42 @@
 "being performed on."
 msgstr ""
 
-#: en/help_topics/hooks.txt:385
+#: en/help_topics/hooks.txt:425
 msgid ""
 "SmartClientHooks\n"
 "----------------"
 msgstr ""
 
-#: en/help_topics/hooks.txt:388
+#: en/help_topics/hooks.txt:428
 msgid ""
 "call\n"
 "~~~~"
 msgstr ""
 
-#: en/help_topics/hooks.txt:391
+#: en/help_topics/hooks.txt:431
 msgid "Introduced in: unknown"
 msgstr ""
 
-#: en/help_topics/hooks.txt:393
+#: en/help_topics/hooks.txt:433
 msgid ""
 "Called when the smart client is submitting a request to the smart\n"
 "server. Called with a bzrlib.smart.client.CallHookParams object.\n"
 "Streaming request bodies, and responses, are not accessible."
 msgstr ""
 
-#: en/help_topics/hooks.txt:397
+#: en/help_topics/hooks.txt:437
 msgid ""
 "SmartServerHooks\n"
 "----------------"
 msgstr ""
 
-#: en/help_topics/hooks.txt:400
+#: en/help_topics/hooks.txt:440
 msgid ""
 "server_exception\n"
 "~~~~~~~~~~~~~~~~"
 msgstr ""
 
-#: en/help_topics/hooks.txt:405
+#: en/help_topics/hooks.txt:445
 msgid ""
 "Called by the bzr server when an exception occurs. server_exception is\n"
 "called with the sys.exc_info() tuple return true for the hook if the\n"
@@ -12231,17 +12328,17 @@
 "normally."
 msgstr ""
 
-#: en/help_topics/hooks.txt:410
+#: en/help_topics/hooks.txt:450
 msgid ""
 "server_started\n"
 "~~~~~~~~~~~~~~"
 msgstr ""
 
-#: en/help_topics/hooks.txt:413
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
 msgid "Introduced in: 0.16"
 msgstr ""
 
-#: en/help_topics/hooks.txt:415
+#: en/help_topics/hooks.txt:455
 msgid ""
 "Called by the bzr server when it starts serving a directory.\n"
 "server_started is called with (backing urls, public url), where\n"
@@ -12250,48 +12347,48 @@
 "served."
 msgstr ""
 
-#: en/help_topics/hooks.txt:421
+#: en/help_topics/hooks.txt:461
 msgid ""
 "server_started_ex\n"
 "~~~~~~~~~~~~~~~~~"
 msgstr ""
 
-#: en/help_topics/hooks.txt:426
+#: en/help_topics/hooks.txt:466
 msgid ""
 "Called by the bzr server when it starts serving a directory.\n"
 "server_started is called with (backing_urls, server_obj)."
 msgstr ""
 
-#: en/help_topics/hooks.txt:429
+#: en/help_topics/hooks.txt:469
 msgid ""
 "server_stopped\n"
 "~~~~~~~~~~~~~~"
 msgstr ""
 
-#: en/help_topics/hooks.txt:434
+#: en/help_topics/hooks.txt:474
 msgid ""
 "Called by the bzr server when it stops serving a directory.\n"
 "server_stopped is called with the same parameters as the\n"
 "server_started hook: (backing_urls, public_url)."
 msgstr ""
 
-#: en/help_topics/hooks.txt:438
+#: en/help_topics/hooks.txt:478
 msgid ""
 "StatusHooks\n"
 "-----------"
 msgstr ""
 
-#: en/help_topics/hooks.txt:441
+#: en/help_topics/hooks.txt:481
 msgid ""
 "post_status\n"
 "~~~~~~~~~~~"
 msgstr ""
 
-#: en/help_topics/hooks.txt:444
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
 msgid "Introduced in: 2.3"
 msgstr ""
 
-#: en/help_topics/hooks.txt:446
+#: en/help_topics/hooks.txt:486
 msgid ""
 "Called with argument StatusHookParams after Bazaar has displayed the\n"
 "status. StatusHookParams has the attributes (old_tree, new_tree,\n"
@@ -12300,13 +12397,13 @@
 "status command. to_file is the output stream for writing."
 msgstr ""
 
-#: en/help_topics/hooks.txt:452
+#: en/help_topics/hooks.txt:492
 msgid ""
 "pre_status\n"
 "~~~~~~~~~~"
 msgstr ""
 
-#: en/help_topics/hooks.txt:457
+#: en/help_topics/hooks.txt:497
 msgid ""
 "Called with argument StatusHookParams before Bazaar displays the\n"
 "status. StatusHookParams has the attributes (old_tree, new_tree,\n"
@@ -12315,19 +12412,38 @@
 "status command. to_file is the output stream for writing."
 msgstr ""
 
-#: en/help_topics/hooks.txt:463
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
 msgid ""
 "RioVersionInfoBuilderHooks\n"
 "--------------------------"
 msgstr ""
 
-#: en/help_topics/hooks.txt:466
+#: en/help_topics/hooks.txt:518
 msgid ""
 "revision\n"
 "~~~~~~~~"
 msgstr ""
 
-#: en/help_topics/hooks.txt:471
+#: en/help_topics/hooks.txt:523
 msgid ""
 "Invoked when adding information about a revision to the RIO stanza\n"
 "that is printed. revision is called with a revision object and a RIO\n"
@@ -12641,14 +12757,16 @@
 "    is specified, the parent branch is used instead."
 msgstr ""
 
-#: en/help_topics/revisionspec.txt:73
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
 msgid ""
 "    The common ancestor is the last revision that existed in both\n"
 "    branches. Usually this is the branch point, but it could also be\n"
 "    a revision that was merged."
 msgstr ""
 
-#: en/help_topics/revisionspec.txt:77
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
 msgid "    Examples::"
 msgstr ""
 
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/checkbox.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/checkbox.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/checkbox.po	1970-01-01 00:00:00.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/checkbox.po	2012-02-23 06:31:52.000000000 +0000
@@ -0,0 +1,3232 @@
+# Copyright (C) 2008 Canonical
+# This file is distributed under the same license as the apport package.
+# Marc Tardif <marc.tardif@canonical.com>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: checkbox 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-02-16 16:07+0000\n"
+"PO-Revision-Date: 2011-12-17 09:12+0000\n"
+"Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:48+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+
+#. Title of the user interface
+#: ../gtk/checkbox-gtk.ui.h:1 ../gtk/checkbox-gtk.desktop.in.h:1
+#: ../plugins/user_interface.py:42
+msgid "System Testing"
+msgstr "Test du système"
+
+#: ../gtk/checkbox-gtk.ui.h:2 ../checkbox_gtk/gtk_interface.py:538
+msgid "_Test"
+msgstr "_Tester"
+
+#: ../gtk/checkbox-gtk.ui.h:3
+msgid "_Yes"
+msgstr "_Oui"
+
+#: ../gtk/checkbox-gtk.ui.h:4
+msgid "_No"
+msgstr "_Non"
+
+#: ../gtk/checkbox-gtk.ui.h:5
+msgid "_Skip this test"
+msgstr "Pa_sser ce test"
+
+#: ../gtk/checkbox-gtk.ui.h:6 ../checkbox_cli/cli_interface.py:348
+#: ../checkbox_urwid/urwid_interface.py:261
+msgid "Further information:"
+msgstr "Pour plus d'informations :"
+
+#: ../gtk/checkbox-gtk.ui.h:7
+msgid "_Select All"
+msgstr "Tout _sélectionner"
+
+#: ../gtk/checkbox-gtk.ui.h:8
+msgid "_Deselect All"
+msgstr "Tout _désélectionner"
+
+#: ../gtk/checkbox-gtk.ui.h:9
+msgid "_Previous"
+msgstr "_Précédent"
+
+#: ../gtk/checkbox-gtk.ui.h:10
+msgid "Ne_xt"
+msgstr "Sui_vant"
+
+#: ../gtk/checkbox-gtk.desktop.in.h:2
+msgid "Test your system and submit results to the Ubuntu Friendly project"
+msgstr ""
+"Testez votre système et envoyez les résultats au projet « Ubuntu Friendly »"
+
+#. description
+#: ../jobs/audio.txt.in:7
+msgid "Test to detect audio devices"
+msgstr "Test pour détecter des périphériques audio"
+
+#. description
+#: ../jobs/audio.txt.in:16
+msgid ""
+"PURPOSE:\n"
+"    This test will check that internal speakers work correctly\n"
+"STEPS:\n"
+"    1. Make sure that no external speakers or headphones are connected\n"
+"       If testing a desktop, external speakers are allowed\n"
+"    2. Click the Test button to play a brief tone on your audio device\n"
+"VERIFICATION:\n"
+"    Did you hear a tone?"
+msgstr ""
+"Objectif : \n"
+"**** Ce test va controler si les haut-parleurs internes fonctionnent "
+"correctement\n"
+"Etapes:\n"
+"**** Assurez vous qu'aucune enceinte externe ou casque n'est connecté\n"
+"******* Si la machine testée est de type bureau , les enceintes externes "
+"sont permises.\n"
+"**** Cliquez le bouton de test faire jouer un son bref à votre périphérique "
+"audio\n"
+"Vérification:\n"
+"**** Avez vous entendu le son ?"
+
+#. description
+#: ../jobs/audio.txt.in:33
+msgid ""
+"PURPOSE:\n"
+"    This test will check that headphones connector works correctly\n"
+"STEPS:\n"
+"    1. Connect a pair of headphones to your audio device\n"
+"    2. Click the Test button to play a sound to your audio device\n"
+"VERIFICATION:\n"
+"    Did you hear a sound through the headphones and did the sound play "
+"without any distortion, clicks or other strange noises from your headphones?"
+msgstr ""
+
+#. description
+#: ../jobs/audio.txt.in:49
+msgid ""
+"PURPOSE:\n"
+"    This test will check that recording sound using the onboard microphone "
+"works correctly\n"
+"STEPS:\n"
+"    1. Disconnect any external microphones that you have plugged in\n"
+"    2. Click \"Test\", then speak into your internal microphone\n"
+"    3. After a few seconds, your speech will be played back to you.\n"
+"VERIFICATION:\n"
+"    Did you hear your speech played back?"
+msgstr ""
+
+#. description
+#: ../jobs/audio.txt.in:66
+msgid ""
+"PURPOSE:\n"
+"    This test will check that recording sound using an external microphone "
+"works correctly\n"
+"STEPS:\n"
+"    1. Connect a microphone to your microphone port\n"
+"    2. Click \"Test\", then speak into the external microphone\n"
+"    3. After a few seconds, your speech will be played back to you\n"
+"VERIFICATION:\n"
+"    Did you hear your speech played back?"
+msgstr ""
+
+#. description
+#: ../jobs/audio.txt.in:82
+msgid ""
+"PURPOSE:\n"
+"    This test will check that a USB audio device works correctly\n"
+"STEPS:\n"
+"    1. Connect a USB audio device to your system\n"
+"    2. Click \"Test\", then speak into the microphone\n"
+"    3. After a few seconds, your speech will be played back to you\n"
+"VERIFICATION:\n"
+"    Did you hear your speech played back through the USB headphones?"
+msgstr ""
+
+#. description
+#: ../jobs/audio.txt.in:99
+msgid ""
+"Play back a sound on the default output and listen for it on the  default "
+"input.  This makes the most sense when the output and input  are directly "
+"connected, as with a patch cable."
+msgstr ""
+
+#. description
+#: ../jobs/autotest.txt.in:6
+msgid ""
+"PURPOSE:\n"
+"   This test will attempt to install and run the Autotest Suite.  These "
+"tests can be destructive, so this test is blacklisted by default."
+msgstr ""
+
+#. description
+#: ../jobs/bluetooth.txt.in:8
+msgid ""
+"Automated test to store bluetooth device information in checkbox report"
+msgstr ""
+
+#. description
+#: ../jobs/bluetooth.txt.in:14
+msgid ""
+"PURPOSE:\n"
+"    This test will check that bluetooth connection works correctly\n"
+"STEPS:\n"
+"    1. Enable bluetooth on any mobile device (PDA, smartphone, etc.)\n"
+"    2. Click on the bluetooth icon in the menu bar\n"
+"    3. Select 'Setup new device'\n"
+"    4. Look for the device in the list and select it\n"
+"    5. In the device write the PIN code automatically chosen by the wizard\n"
+"    6. The device should pair with the computer\n"
+"    7. Right-click on the bluetooth icon and select browse files\n"
+"    8. Authorize the computer to browse the files in the device if needed\n"
+"    9. You should be able to browse the files\n"
+"VERIFICATION:\n"
+"    Did all the steps work?"
+msgstr ""
+
+#. description
+#: ../jobs/bluetooth.txt.in:33
+msgid ""
+"PURPOSE:\n"
+"    This test will check that you can transfer information through a "
+"bluetooth connection\n"
+"STEPS:\n"
+"    1. Make sure that you're able to browse the files in your mobile device\n"
+"    2. Copy a file from the computer to the mobile device\n"
+"    3. Copy a file from the mobile device to the computer\n"
+"VERIFICATION:\n"
+"    Were all files copied correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/bluetooth.txt.in:47
+msgid ""
+"PURPOSE:\n"
+"    This test will check that you can record and hear audio using a "
+"bluetooth audio device\n"
+"STEPS:\n"
+"    1. Enable the bluetooth headset\n"
+"    2. Click on the bluetooth icon in the menu bar\n"
+"    3. Select 'Setup new device'\n"
+"    4. Look for the device in the list and select it\n"
+"    5. In the device write the PIN code automatically chosen by the wizard\n"
+"    6. The device should pair with the computer\n"
+"    7. Click \"Test\" to record for five seconds and reproduce in the "
+"bluetooth device\n"
+"VERIFICATION:\n"
+"    Did you hear the sound you recorded in the bluetooth"
+msgstr ""
+
+#. description
+#: ../jobs/bluetooth.txt.in:65
+msgid ""
+"PURPOSE:\n"
+"    This test will check that you can use a bluetooth keyboard\n"
+"STEPS:\n"
+"    1. Enable the bluetooth keyboard\n"
+"    2. Click on the bluetooth icon in the menu bar\n"
+"    3. Select 'Setup new device'\n"
+"    4. Look for the device in the list and select it\n"
+"    5. Click \"Test\"\n"
+"    6. Enter some text\n"
+"VERIFICATION:\n"
+"    Were you able to enter some text with the bluetooth keyboard?"
+msgstr ""
+
+#. description
+#: ../jobs/bluetooth.txt.in:81
+msgid ""
+"PURPOSE:\n"
+"    This test will check that you can use a bluetooth mouse\n"
+"STEPS:\n"
+"    1. Enable the bluetooth mouse\n"
+"    2. Click on the bluetooth icon in the menu bar\n"
+"    3. Select 'Setup new device'\n"
+"    4. Look for the device in the list and select it\n"
+"    5. Move the mouse around the screen\n"
+"    6. Perform some single/double/right click operations\n"
+"VERIFICATION:\n"
+"    Did the mouse work as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/camera.txt.in:7
+msgid "This Automated test attempts to detect a camera."
+msgstr "Ce test automatisé tente de détecter un appareil photo."
+
+#. description
+#: ../jobs/camera.txt.in:16
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the built-in camera works\n"
+"STEPS:\n"
+"    1. Click on Test to display a video capture from the camera for ten "
+"seconds.\n"
+"VERIFICATION:\n"
+"    Did you see the video capture?"
+msgstr ""
+
+#. description
+#: ../jobs/camera.txt.in:33
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the built-in camera works\n"
+"STEPS:\n"
+"    1. Click on Test to display a still image from the camera\n"
+"VERIFICATION:\n"
+"    Did you see the image?"
+msgstr ""
+
+#. description
+#: ../jobs/codecs.txt.in:7
+msgid ""
+"PURPOSE:\n"
+"   This test will verify your system's ability to play Ogg Vorbis audio "
+"files.\n"
+"STEPS:\n"
+"   1. Click Test to play an Ogg Vorbis file (.ogg)\n"
+"   2. Please close the player to proceed.\n"
+"VERIFICATION:\n"
+"   Did the sample play correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/codecs.txt.in:22
+msgid ""
+"PURPOSE:\n"
+"   This test will verify your system's ability to play Wave Audio files.\n"
+"STEPS:\n"
+"   1. Select Test to play a Wave Audio format file (.wav)\n"
+"   2. Please close the player to proceed.\n"
+"VERIFICATION:\n"
+"   Did the sample play correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/cpu.txt.in:8
+msgid ""
+"Test the CPU scaling capabilities using Firmware Test Suite (fwts cpufreq)."
+msgstr ""
+
+#. description
+#: ../jobs/cpu.txt.in:15
+msgid "Test for clock jitter."
+msgstr "Test du jitter de l'horloge."
+
+#. description
+#: ../jobs/cpu.txt.in:23
+msgid "Test offlining CPUs in a multicore system."
+msgstr "Test de mise hors-ligne de processeurs dans un système multicœurs."
+
+#. description
+#: ../jobs/cpu.txt.in:30
+msgid "This test checks cpu topology for accuracy"
+msgstr ""
+
+#. description
+#: ../jobs/cpu.txt.in:38
+msgid "This test checks that CPU frequency governors are obeyed when set."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:5
+msgid "Test if the atd daemon is running when the package is installed."
+msgstr "Testez si le démon atd fonctionne quand le paquet est installé."
+
+#. description
+#: ../jobs/daemons.txt.in:11
+msgid "Test if the cron daemon is running when the package is installed."
+msgstr "Testez si le démon cron fonctionne quand le paquet est installé."
+
+#. description
+#: ../jobs/daemons.txt.in:17
+msgid "Test if the cupsd daemon is running when the package is installed."
+msgstr "Testez si le démon cupsd fonctionne quand le paquet est installé."
+
+#. description
+#: ../jobs/daemons.txt.in:23
+msgid "Test if the getty daemon is running when the package is installed."
+msgstr "Testez si le démon getty fonctionne quand le paquet est installé."
+
+#. description
+#: ../jobs/daemons.txt.in:29
+msgid "Test if the init daemon is running when the package is installed."
+msgstr "Testez si le démon init fonctionne quand le paquet est installé."
+
+#. description
+#: ../jobs/daemons.txt.in:35
+msgid "Test if the klogd daemon is running when the package is installed."
+msgstr "Testez si le démon klogd fonctionne quand le paquet est installé."
+
+#. description
+#: ../jobs/daemons.txt.in:41
+msgid "Test if the nmbd daemon is running when the package is installed."
+msgstr "Testez si le démon mnbd fonctionne quand le paquet est installé."
+
+#. description
+#: ../jobs/daemons.txt.in:47
+msgid "Test if the smbd daemon is running when the package is installed."
+msgstr "Testez si le démon smbd fonctionne quand le paquet est installé."
+
+#. description
+#: ../jobs/daemons.txt.in:53
+msgid "Test if the syslogd daemon is running when the package is installed."
+msgstr "Testez si le démon syslogd fonctionne quand le paquet est installé."
+
+#. description
+#: ../jobs/daemons.txt.in:61
+msgid "Test if the udevd daemon is running when the package is installed."
+msgstr "Testez si le démon udevd fonctionne quand le paquet est installé."
+
+#. description
+#: ../jobs/daemons.txt.in:67
+msgid "Test if the winbindd daemon is running when the package is installed."
+msgstr "Testez si le démon winbindd fonctionne quand le paquet est installé."
+
+#. description
+#: ../jobs/disk.txt.in:4
+msgid "Detects and displays disks attached to the system."
+msgstr "Détecte et affiche les disques attachés au système."
+
+#. description
+#: ../jobs/disk.txt.in:9
+msgid "Benchmark for each disk"
+msgstr ""
+
+#. description
+#: ../jobs/disk.txt.in:23
+msgid "Check stats changes for each disk"
+msgstr ""
+
+#. description
+#: ../jobs/disk.txt.in:40
+msgid "SMART test"
+msgstr "Test SMART"
+
+#. description
+#: ../jobs/disk.txt.in:56
+msgid "Maximum disk space used during a default installation test"
+msgstr ""
+"Espace disque maximal utilisé lors d'un test d'installation par défaut"
+
+#. description
+#: ../jobs/disk.txt.in:71
+msgid "Verify system storage performs at or above baseline performance"
+msgstr ""
+"Vérifiez si les performances du système de stockage sont supérieures ou "
+"égales au niveau de performance de base"
+
+#. description
+#: ../jobs/disk.txt.in:88
+msgid ""
+"Verify that storage devices, such as Fibre Channel and RAID can be detected "
+"and perform under stress."
+msgstr ""
+"Vérifiez que les appareils de stockage, tels que la « Fibre Channel » et le "
+"« RAID », peuvent être détectés et qu'ils fonctionnent en charge."
+
+#. description
+#: ../jobs/fingerprint.txt.in:3
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that a fingerprint reader will work properly for "
+"logging into your system.\n"
+"PREREQUISITES:\n"
+"   This test case assumes that there's a testing account from which test "
+"cases are run and a personal account that the tester uses to verify the "
+"fingerprint reader\n"
+"STEPS:\n"
+"   1. Click on the user switcher applet.\n"
+"   2. Select your user name.\n"
+"   3. A window should appear that provides the ability to login either "
+"typing your password or using fingerprint authentication.\n"
+"   4. Use the fingerprint reader to login.\n"
+"   5. Click on the user switcher applet.\n"
+"   6. Select the testing account to continue running tests.\n"
+"VERIFICATION:\n"
+"   Did the authentication procedure work correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/fingerprint.txt.in:20
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that a fingerprint reader can be used to unlock a "
+"locked system.\n"
+"STEPS:\n"
+"   1. Click on the user switcher applet.\n"
+"   2. Select 'Lock screen'.\n"
+"   3. Press any key or move the mouse.\n"
+"   4. A window should appear that provides the ability to unlock either "
+"typing your password or using fingerprint authentication.\n"
+"   5. Use the fingerprint reader to unlock.\n"
+"   6. Your screen should be unlocked.\n"
+"VERIFICATION:\n"
+"   Did the authentication procedure work correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/firewire.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"    This test will check the system can detect the insertion of a FireWire "
+"HDD\n"
+"STEPS:\n"
+"    1. Click 'Test' to begin the test. This test will\n"
+"       timeout and fail if the insertion has not been detected within 10 "
+"seconds.\n"
+"    2. Plug a FireWire HDD into an available FireWire port.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the "
+"automatically\n"
+"    selected result"
+msgstr ""
+
+#. description
+#: ../jobs/firewire.txt.in:19
+msgid ""
+"This is an automated test which performs read/write operations on an "
+"attached FireWire HDD"
+msgstr ""
+
+#. description
+#: ../jobs/firewire.txt.in:27
+msgid ""
+" PURPOSE:\n"
+"   This test will check the system can detect the removal of a FireWire HDD\n"
+" STEPS:\n"
+"   1. Click 'Test' to begin the test. This test will timeout and fail if\n"
+"      the removal has not been detected within 10 seconds.\n"
+"   2. Remove the previously attached FireWire HDD from the FireWire port.\n"
+" VERIFICATION:\n"
+"   The verification of this test is automated. Do not change the "
+"automatically\n"
+"   selected result"
+msgstr ""
+
+#. description
+#: ../jobs/floppy.txt.in:4
+msgid "Floppy test"
+msgstr "Test du lecteur de disquette"
+
+#. description
+#: ../jobs/graphics.txt.in:5
+msgid "Test to output the Xorg version"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:12
+msgid "Run gtkperf to make sure that GTK based test cases work"
+msgstr ""
+"Exécutez « gtkperf « pour être sûr que les tests basés sur GTK fonctionnent"
+
+#. description
+#: ../jobs/graphics.txt.in:18
+msgid ""
+"PURPOSE:\n"
+"    This test will verify that the GUI is usable after manually changing "
+"resolution\n"
+"STEPS:\n"
+"    1. Open the Displays application\n"
+"    2. Select a new resolution from the dropdown list\n"
+"    3. Click on Apply\n"
+"    4. Select the original resolution from the dropdown list\n"
+"    5. Click on Apply\n"
+"VERIFICATION:\n"
+"    Did the resolution change as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:33
+msgid ""
+"PURPOSE:\n"
+"    This test will test display rotation\n"
+"STEPS:\n"
+"    1. Open the Displays application\n"
+"    2. Select a new rotation value from the dropdown list\n"
+"    3. Click on Apply\n"
+"    4. Click on Restore Previous Configuration\n"
+"    5. Click on Apply\n"
+"    6. Repeat 2-5 for different rotation values\n"
+"VERIFICATION:\n"
+"    Did the display rotation change as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:50
+msgid "Test that the X process is running."
+msgstr "Testez que le processus de X est en cours d'exécution."
+
+#. description
+#: ../jobs/graphics.txt.in:56
+msgid "Test that the X is not running in failsafe mode."
+msgstr "Testez que X ne fonctionne pas en mode sans échec."
+
+#. description
+#: ../jobs/graphics.txt.in:63
+msgid ""
+"Test that X does not leak memory when running programs on systems with intel "
+"based graphics."
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:70
+msgid ""
+"PURPOSE:\n"
+"    This test will verify the default display resolution\n"
+"STEPS:\n"
+"    1. This display is using the following resolution:\n"
+"INFO:\n"
+"    $output\n"
+"VERIFICATION:\n"
+"    Is this acceptable for your display?"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:85
+msgid ""
+"Ensure the current resolution meets or exceeds the recommended minimum "
+"resolution (800x600). See here for details:"
+msgstr ""
+"Veillez à ce que la résolution actuelle corresponde ou dépasse la résolution "
+"minimale recommandée (800x600). Voir ici pour plus de détails :"
+
+#. description
+#: ../jobs/graphics.txt.in:85
+msgid "https://help.ubuntu.com/community/Installation/SystemRequirements"
+msgstr "https://help.ubuntu.com/community/Installation/SystemRequirements"
+
+#. description
+#: ../jobs/graphics.txt.in:95
+msgid ""
+"PURPOSE:\n"
+"    This test will test the default display\n"
+"STEPS:\n"
+"    1. Click \"Test\" to display a video test.\n"
+"VERIFICATION:\n"
+"    Do you see color bars and static?"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:106
+msgid "Check that VESA drivers are not in use"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:113
+msgid ""
+"PURPOSE:\n"
+"    This test cycles through the detected video modes\n"
+"STEPS:\n"
+"    1. Click \"Test\" to start cycling through the video modes\n"
+"VERIFICATION:\n"
+"    Did the screen appear to be working for each mode?"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:126
+msgid "Check that hardware is able to run compiz"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:133
+msgid "Check that hardware is able to run Unity 3D"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:139
+msgid ""
+"PURPOSE:\n"
+"    This test tests the basic 3D capabilities of your video card\n"
+"STEPS:\n"
+"    1. Click \"Test\" to execute an OpenGL demo. Press ESC at any time to "
+"close.\n"
+"    2. Verify that the animation is not jerky or slow.\n"
+"VERIFICATION:\n"
+"    1. Did the 3d animation appear?\n"
+"    2. Was the animation free from slowness/jerkiness?"
+msgstr ""
+
+#. description
+#: ../jobs/hibernate.txt.in:7
+msgid ""
+"PURPOSE:\n"
+"    This test will check to make sure your system can successfully hibernate "
+"(if supported)\n"
+"STEPS:\n"
+"    1. Click on Test\n"
+"    2. The system will hibernate and should wake itself within 5 minutes\n"
+"    3. If your system does not wake itself after 5 minutes, please press the "
+"power button to wake the system manually\n"
+"    4. If the system fails to resume from hibernate, please restart System "
+"Testing and mark this test as Failed\n"
+"VERIFICATION:\n"
+"    Did the system successfully hibernate and did it work properly after "
+"waking up?"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:5
+msgid "Attaches a report of installed codecs for Intel HDA"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:10
+msgid "Attaches a report of CPU information"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:15
+msgid "Attaches a copy of /var/log/dmesg to the test results"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:20
+msgid "Attaches info on DMI"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:26
+msgid "Attaches dmidecode output"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:31
+msgid "Attaches very verbose lspci output."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:40
+msgid "Attaches the contents of the various modprobe conf files."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:45
+msgid "Attaches the contents of the /etc/modules file."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:50
+msgid "attaches the contents of various sysctl config files."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:54
+msgid "Attaches a report of sysfs attributes."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:65
+msgid ""
+"Attaches a dump of the udev database showing system hardware information."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:72
+msgid "Attaches a tarball of gcov data if present."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:77
+msgid "Attaches a list of the currently running kernel modules."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:85
+msgid "Captures a screenshot."
+msgstr "Effectue une capture d'écran."
+
+#. description
+#: ../jobs/info.txt.in:91
+msgid "Attaches the screenshot captured in info/screenshot."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:96
+msgid "Gather log from the Firmware Test Suite run."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:103
+msgid "Attaches the contents of /proc/acpi/sleep if it exists."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:107
+msgid "Bootchart information."
+msgstr "Informations Bootchart."
+
+#. description
+#: ../jobs/info.txt.in:116
+msgid "SATA/IDE device information."
+msgstr "Informations sur le périphérique SATA/IDE."
+
+#. description
+#: ../jobs/info.txt.in:133
+msgid "Attaches the bootchart png file for bootchart runs"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:142
+msgid "Attaches the bootchart log for bootchart test runs."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:150
+msgid "installs the installer bootchart tarball if it exists."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:155
+msgid "Attaches the installer debug log if it exists."
+msgstr ""
+
+#. description
+#: ../jobs/input.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"    This test will test your pointing device\n"
+"STEPS:\n"
+"    1. Move the cursor using the pointing device or touch the screen.\n"
+"    2. Perform some single/double/right click operations.\n"
+"VERIFICATION:\n"
+"    Did the pointing device work as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/input.txt.in:17
+msgid ""
+"PURPOSE:\n"
+"    This test will test your keyboard\n"
+"STEPS:\n"
+"    1. Click on Test\n"
+"    2. On the open text area, use your keyboard to type something\n"
+"VERIFICATION:\n"
+"    Is your keyboard working properly?"
+msgstr ""
+
+#. description
+#: ../jobs/install.txt.in:6
+msgid ""
+"Tests to see that apt can access repositories and get updates (does not "
+"install updates). This is done to confirm that you could recover from an "
+"incomplete or broken update."
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"    This test will test the brightness key\n"
+"STEPS:\n"
+"    1. Press the brightness buttons on the keyboard\n"
+"VERIFICATION:\n"
+"    Did the brightness change following to your key presses?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:14
+msgid ""
+"PURPOSE:\n"
+"    This test will test the volume keys\n"
+"STEPS:\n"
+"    1. Press the volume buttons on the keyboard\n"
+"VERIFICATION:\n"
+"    Did the volume change following to your key presses?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:25
+msgid ""
+"PURPOSE:\n"
+"    This test will test the mute key\n"
+"STEPS:\n"
+"    1. Press the mute button on the keyboard\n"
+"VERIFICATION:\n"
+"    Did the volume mute following your key presses?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:37
+msgid ""
+"PURPOSE:\n"
+"    This test will test the sleep key\n"
+"STEPS:\n"
+"    1. Press the sleep key on the keyboard\n"
+"    2. Wake your system up by pressing the power button\n"
+"VERIFICATION:\n"
+"    Did the system go to sleep after pressing the sleep key?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:49
+msgid ""
+"PURPOSE:\n"
+"    This test will test the battery information key\n"
+"STEPS:\n"
+"    1. Press the battery information key on the keyboard\n"
+"VERIFICATION:\n"
+"    Did a notification appear showing the battery status?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:60
+msgid ""
+"PURPOSE:\n"
+"    This test will test the wireless key\n"
+"STEPS:\n"
+"    1. Press the wireless key on the keyboard\n"
+"    2. Press the same key again\n"
+"VERIFICATION:\n"
+"    Did the wireless go off on the first press and on again on the second?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:74
+msgid ""
+"PURPOSE:\n"
+"    This test will test the media keys of your keyboard\n"
+"STEPS:\n"
+"    1. Click test to open a window on which to test the media control keys.\n"
+"    2. If all the keys work, the test will be marked as passed.\n"
+"    3. If your computer has no media control keys, Skip this test.\n"
+"    VERIFICATION:\n"
+"    Do the keys work as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:3
+msgid "Audio tests"
+msgstr "Tests audio"
+
+#. description
+#: ../jobs/local.txt.in:8
+msgid "Autotest Suite tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:13
+msgid "Bluetooth tests"
+msgstr "Tests Bluetooth"
+
+#. description
+#: ../jobs/local.txt.in:18
+msgid "Camera tests"
+msgstr "Tests de la caméra"
+
+#. description
+#: ../jobs/local.txt.in:23
+msgid "Codec tests"
+msgstr "Tests de codecs"
+
+#. description
+#: ../jobs/local.txt.in:28
+msgid "CPU tests"
+msgstr "Tests du processeur"
+
+#. description
+#: ../jobs/local.txt.in:33
+msgid "System Daemon tests"
+msgstr "Tests des services système"
+
+#. description
+#: ../jobs/local.txt.in:38
+msgid "Disk tests"
+msgstr "Tests des disques"
+
+#. description
+#: ../jobs/local.txt.in:43
+msgid "Fingerprint reader tests"
+msgstr "Tests du lecteur d'empreinte digitale"
+
+#. description
+#: ../jobs/local.txt.in:48
+msgid "Firewire disk tests"
+msgstr "Tests des disques Firewire"
+
+#. description
+#: ../jobs/local.txt.in:53
+msgid "Floppy disk tests"
+msgstr "Tests du lecteur de disquette"
+
+#. description
+#: ../jobs/local.txt.in:58
+msgid "Graphics tests"
+msgstr "Tests graphiques"
+
+#. description
+#: ../jobs/local.txt.in:63
+msgid "Hibernation tests"
+msgstr "Tests de la mise en hibernation"
+
+#. description
+#: ../jobs/local.txt.in:68
+msgid "Informational tests"
+msgstr "Tests informatifs"
+
+#. description
+#: ../jobs/local.txt.in:73
+msgid "Input Devices tests"
+msgstr "Tests des périphériques d'entrée"
+
+#. description
+#: ../jobs/local.txt.in:78
+msgid "Software Installation tests"
+msgstr "Tests d'installation de logiciels"
+
+#. description
+#: ../jobs/local.txt.in:83
+msgid "Hotkey tests"
+msgstr "Tests des touches de raccourci"
+
+#. description
+#: ../jobs/local.txt.in:88
+msgid "Linux Test Project tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:93
+msgid "Mago Automated Desktop Testing"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:98
+msgid "Media Card tests"
+msgstr "Tests des cartes mémoire"
+
+#. description
+#: ../jobs/local.txt.in:103
+msgid "Memory tests"
+msgstr "Tests de la mémoire"
+
+#. description
+#: ../jobs/local.txt.in:108
+msgid "Miscellaneous tests"
+msgstr "Tests divers"
+
+#. description
+#: ../jobs/local.txt.in:113
+msgid "Monitor tests"
+msgstr "Tests de l'écran"
+
+#. description
+#: ../jobs/local.txt.in:118
+msgid "Networking tests"
+msgstr "Tests du réseau"
+
+#. description
+#: ../jobs/local.txt.in:123
+msgid "Optical Drive tests"
+msgstr "Tests des lecteurs optiques"
+
+#. description
+#: ../jobs/local.txt.in:128
+msgid "Panel Clock Verification tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:133
+msgid "PCMCIA/PCIX Card tests"
+msgstr "Tests des cartes PCMCIA/PCIX"
+
+#. description
+#: ../jobs/local.txt.in:138
+msgid "Peripheral tests"
+msgstr "Tests des périphériques"
+
+#. description
+#: ../jobs/local.txt.in:143
+msgid "Phoronix Test Suite tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:148
+msgid "Power Management tests"
+msgstr "Tests de la gestion de l'alimentation"
+
+#. description
+#: ../jobs/local.txt.in:153
+msgid "QA Regression tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:158
+msgid "Server Services checks"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:163
+msgid "Suspend tests"
+msgstr "Tests de la mise en veille"
+
+#. description
+#: ../jobs/local.txt.in:168
+msgid "Unity tests"
+msgstr "Tests de Unity"
+
+#. description
+#: ../jobs/local.txt.in:173
+msgid "USB tests"
+msgstr "Tests USB"
+
+#. description
+#: ../jobs/local.txt.in:178
+msgid "User Applications"
+msgstr "Applications de l'utilisateur"
+
+#. description
+#: ../jobs/local.txt.in:183
+msgid "Wireless networking tests"
+msgstr "Tests du réseau sans fil"
+
+#. description
+#: ../jobs/local.txt.in:188
+msgid "Stress tests"
+msgstr "Stress tests"
+
+#. description
+#: ../jobs/ltp.txt.in:3
+msgid ""
+"This test installs and runs Linux Test Project syscalls test. This can be "
+"destructive, thus this test is blacklisted by default."
+msgstr ""
+
+#. description
+#: ../jobs/mago.txt.in:8
+msgid ""
+"PURPOSE:\n"
+"   This test installs and runs the Mago Automated Desktop Testing suite."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of a Multimedia Card (MMC) media\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an MMC card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:20
+msgid ""
+"This test is automated and executes after the mediacard/mmc-insert test is "
+"run. It tests reading and writing to the MMC card."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:28
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects\n"
+"    the removal of the MMC card from the systems card reader.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the MMC card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:43
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of an MMC card after the system has been suspended\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an MMC card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:59
+msgid ""
+"This test is automated and executes after the mediacard/mmc-insert-after-"
+"suspend test is run. It tests reading and writing to the MMC card after the "
+"system has been suspended."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:67
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects the removal\n"
+"    of an MMC card from the systems card reader after the system has been "
+"suspended.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the MMC card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:81
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of a Secure Digital (SD) media card\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an SD card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:97
+msgid ""
+"This test is automated and executes after the mediacard/sd-insert test is "
+"run. It tests reading and writing to the SD card."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:105
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects\n"
+"    the removal of an SD card from the systems card reader.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the SD card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:120
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of an SD card after the system has been suspended\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an SD card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:136
+msgid ""
+"This test is automated and executes after the mediacard/sd-insert-after-"
+"suspend test is run. It tests reading and writing to the SD card after the "
+"system has been suspended."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:144
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects\n"
+"    the removal of an SD card from the systems card reader after the system "
+"has been suspended.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the SD card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:158
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of a Secure Digital High-Capacity (SDHC) media "
+"card\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an SDHC card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:174
+msgid ""
+"This test is automated and executes after the mediacard/sdhc-insert test is "
+"run. It tests reading and writing to the SDHC card."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:182
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects\n"
+"    the removal of an SDHC card from the systems card reader.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the SDHC card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:197
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of an SDHC media card after the system has been "
+"suspended\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an SDHC card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:213
+msgid ""
+"This test is automated and executes after the mediacard/sdhc-insert-after-"
+"suspend test is run. It tests reading and writing to the SDHC card after the "
+"system has been suspended."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:221
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects the removal\n"
+"    of an SDHC card from the systems card reader after the system has been "
+"suspended.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the SDHC card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:235
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of a Compact Flash (CF) media card\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert a CF card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:251
+msgid ""
+"This test is automated and executes after the mediacard/cf-insert test is "
+"run. It tests reading and writing to the CF card."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:259
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects\n"
+"    the removal of a CF card from the systems card reader.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the CF card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:274
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of a CF card after the system has been suspended\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert a CF card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:290
+msgid ""
+"This test is automated and executes after the mediacard/cf-insert-after-"
+"suspend test is run. It tests reading and writing to the CF card after the "
+"system has been suspended."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:298
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects the removal\n"
+"    of a CF card from the systems card reader after the system has been "
+"suspended.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the CF card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/memory.txt.in:5
+msgid ""
+"This test checks the amount of memory which is reporting in meminfo against "
+"the size of the memory modules detected by DMI."
+msgstr ""
+
+#. description
+#: ../jobs/memory.txt.in:14
+msgid "Test and exercise memory."
+msgstr "Testez et sollicitez la mémoire."
+
+#. description
+#: ../jobs/miscellanea.txt.in:8
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system can switch to a virtual terminal "
+"and back to X\n"
+"STEPS:\n"
+"    1. Click \"Test\" to switch to another virtual terminal and then back to "
+"X\n"
+"VERIFICATION:\n"
+"    Did your screen change temporarily to a text console and then switch "
+"back to your current session?"
+msgstr ""
+
+#. description
+#: ../jobs/miscellanea.txt.in:21
+msgid "Run Firmware Test Suite (fwts) automated tests."
+msgstr ""
+
+#. description
+#: ../jobs/miscellanea.txt.in:31
+msgid ""
+"This will run some basic connectivity tests against a BMC, verifying that "
+"IPMI works."
+msgstr ""
+"Ceci exécute quelques tests basiques de connectivité à un BMC afin de "
+"vérifier que IPMI fonctionne."
+
+#. description
+#: ../jobs/miscellanea.txt.in:37
+msgid ""
+"   Determine if we need to run tests specific to portable computers that may "
+"not apply to desktops."
+msgstr ""
+
+#. description
+#: ../jobs/miscellanea.txt.in:45
+msgid ""
+"Test that the /var/crash directory doesn't contain anything. Lists the files "
+"contained within if it does, or echoes the status of the directory (doesn't "
+"exist/is empty)"
+msgstr ""
+
+#. description
+#: ../jobs/miscellanea.txt.in:53
+msgid ""
+"Test to check that virtualization is supported and the test system has at "
+"least a minimal amount of RAM to function as an OpenStack Compute Node"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"    This test will check your VGA port. Skip if your system does not have a "
+"VGA port.\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the VGA port on your "
+"system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:15
+msgid ""
+"PURPOSE:\n"
+"    This test will check your DVI port. Skip if your system does not have a "
+"DVI port\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the DVI port on your "
+"system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:26
+msgid ""
+"PURPOSE:\n"
+"    This test will check your DisplayPort port. Skip if your system does not "
+"have a DisplayPort port\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the DisplayPort port "
+"on your system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:37
+msgid ""
+"PURPOSE:\n"
+"    This test will check your HDMI port. Skip if your system does not have a "
+"HDMI port\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the HDMI port on your "
+"system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:48
+msgid ""
+"PURPOSE:\n"
+"    This test will check your S-VIDEO port. Skip if your system does not "
+"have a S-VIDEO port\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the S-VIDEO port on "
+"your system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:59
+msgid ""
+"PURPOSE:\n"
+"    This test will check your RCA port. Skip if your system does not have a "
+"RCA port\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the RCA port on your "
+"system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:70
+msgid ""
+"PURPOSE:\n"
+"    This test will check your monitor power saving capabilities\n"
+"STEPS:\n"
+"    1. Click \"Test\" to try the power saving capabilities of your monitor\n"
+"    2. Press any key or move the mouse to recover\n"
+"VERIFICATION:\n"
+"    Did the the monitor go blank and turn on again?"
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:5
+msgid "Test to detect the available network controllers"
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:11
+msgid "Tests whether the system has a working Internet connection."
+msgstr "Teste si le système dispose d'une connexion Internet active."
+
+#. description
+#: ../jobs/networking.txt.in:16
+msgid "Network Information"
+msgstr "Informations sur le réseau"
+
+#. description
+#: ../jobs/networking.txt.in:40
+msgid ""
+"This is an automated test to gather some info on the current state of your "
+"network devices. If no devices are found, the test will exit with an error."
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:46
+msgid ""
+"PURPOSE:\n"
+"    This test will check your wired connection\n"
+"STEPS:\n"
+"    1. Click on the Network icon in the top panel\n"
+"    2. Select a network below the \"Wired network\" section\n"
+"    3. Click \"Test\" to verify that it's possible to establish a HTTP "
+"connection\n"
+"VERIFICATION:\n"
+"    Did a notification show and was the connection correctly established?"
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:59
+msgid ""
+"PURPOSE:\n"
+"    This test will check that a DSL modem can be configured and connected.\n"
+"STEPS:\n"
+"    1. Connect the telephone line to the computer\n"
+"    2. Click on the Network icon on the top panel.\n"
+"    3. Select \"Edit Connections\"\n"
+"    4. Select the \"DSL\" tab\n"
+"    5. Click on \"Add\" button\n"
+"    6. Configure the connection parameters properly\n"
+"    7. Click \"Test\" to verify that it's possible to establish an HTTP "
+"connection\n"
+"VERIFICATION:\n"
+"    Did a notification show and was the connection correctly established?"
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:76
+msgid ""
+"Automated test case to verify availability of some system on the network "
+"using ICMP ECHO packets."
+msgstr ""
+"Test automatisé pour vérifier la disponibilité d'un système sur le réseau en "
+"utilisant des paquets ICMP ECHO."
+
+#. description
+#: ../jobs/networking.txt.in:83 ../jobs/peripheral.txt.in:37
+msgid ""
+"Automated test case to make sure that it's possible to download files "
+"through HTTP"
+msgstr ""
+"Test automatisé pour s'assurer qu'il est possible de télécharger des "
+"fichiers via HTTP"
+
+#. description
+#: ../jobs/networking.txt.in:91
+msgid "Test to see if we can sync local clock to an NTP server"
+msgstr ""
+"Test pour voir si nous pouvons synchroniser l'horloge locale à un serveur NTP"
+
+#. description
+#: ../jobs/networking.txt.in:97
+msgid ""
+"Verify that an installation of checkbox-server on the network can be reached "
+"over SSH."
+msgstr ""
+"Vérifiez que l'installation de checkbox-server sur le réseau peut être "
+"atteinte via SSH."
+
+#. description
+#: ../jobs/networking.txt.in:103
+msgid "Try to enable a remote printer on the network and print a test page."
+msgstr ""
+"Essayez d'activer une imprimante distante sur le réseau et d'imprimer une "
+"page de test."
+
+#. description
+#: ../jobs/networking.txt.in:108
+msgid ""
+"Automated test to walk multiple network cards and test each one in sequence."
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:128
+msgid "Test to measure the network bandwidth"
+msgstr "Test pour mesurer la bande passante du réseau"
+
+#. description
+#: ../jobs/optical.txt.in:8
+msgid "Test to detect the optical drives"
+msgstr ""
+
+#. description
+#: ../jobs/optical.txt.in:16
+msgid ""
+"PURPOSE:\n"
+"    This test will check your optical devices ability to read CD media\n"
+"STEPS:\n"
+"    1. Insert appropriate non-blank media into your optical drive(s). Movie "
+"and Audio Disks may not work. Self-created data disks have the greatest "
+"chance of working.\n"
+"    2. If a file browser does not open automatically, open the file browser "
+"and access the disk.\n"
+"    3. Attempt to open a text file on the disk, or copy a file from the disk "
+"to your home directory.\n"
+"VERIFICATION:\n"
+"    Were you able to view files on the disk and either open a file to read "
+"or copy a file to your home directory?"
+msgstr ""
+
+#. description
+#: ../jobs/optical.txt.in:33
+msgid ""
+"PURPOSE:\n"
+"    This test will check your system's CD writing capabilities. This test "
+"requires a blank CD-R. If you do not have a blank CD-R, skip this test.\n"
+"STEPS:\n"
+"    1. Enter a blank CD-R into your drive\n"
+"    2. Click \"Test\" to begin.\n"
+"    3. When the CD tray ejects the media after burning, close it (DO NOT "
+"remove the disk, it is needed for the second portion of the test). Note, you "
+"must close the drive within 10 seconds or the test will time out.\n"
+"    4. When the test completes, proceed by clicking \"Next\"\n"
+"VERIFICATION:\n"
+"    This test should automatically select \"Yes\" if it passes, \"No\" if it "
+"fails."
+msgstr ""
+
+#. description
+#: ../jobs/optical.txt.in:47
+msgid ""
+"PURPOSE:\n"
+"    This test will check your CD audio playback capabilities\n"
+"STEPS:\n"
+"    1. Insert an audio CD in your optical drive\n"
+"    2. Open the Dash (click on the Ubuntu Circle of Friends button on the "
+"Launcher)\n"
+"    3. Click \"Listen to Music\" to open Banshee\n"
+"    4. Select the CD under \"Libraries\" in the left panel of Banshee\n"
+"    5. Click the Play button to listen to music\n"
+"    6. Stop playing after some time\n"
+"    7. Right click on the CD icon under \"Libraries\" and select \"Eject "
+"Disc\"\n"
+"    8. The CD should be ejected\n"
+"    9. Close Banshee\n"
+"VERIFICATION:\n"
+"    Did all the steps work?"
+msgstr ""
+
+#. description
+#: ../jobs/optical.txt.in:70
+msgid ""
+"PURPOSE:\n"
+"    This test will check your system's DVD writing capabilities. This test "
+"requires a blank DVD-R. If you do not have a blank DVD-R, skip this test.\n"
+"STEPS:\n"
+"    1. Enter a blank DVD-R into your drive\n"
+"    2. Click \"Test\" to begin.\n"
+"    3. When the CD tray ejects the media after burning, close it (DO NOT "
+"remove the disk, it is needed for the second portion of the test). Note, you "
+"must close the drive within 10 seconds or the test will time out.\n"
+"    4. When the test completes, proceed by clicking \"Next\"\n"
+"VERIFICATION:\n"
+"    This test should automatically select \"Yes\" if it passes, \"No\" if it "
+"fails."
+msgstr ""
+
+#. description
+#: ../jobs/optical.txt.in:84
+msgid ""
+"PURPOSE:\n"
+"    This test will check your DVD movie playback capabilities. Note that "
+"installation of non-free software (codecs, player, etc) may be required "
+"prior to performing this test.\n"
+"STEPS:\n"
+"    1. Insert a DVD that contains any movie in your optical drive\n"
+"    2. Open the Dash (click on the Ubuntu Circle of Friends button on the "
+"Launcher)\n"
+"    3. Click \"Media Apps\" and then click on \"Movie Player\"\n"
+"    4. Play the movie using Movie Player, stop the movie after verifying "
+"that it plays\n"
+"    6. Eject the DVD\n"
+"VERIFICATION:\n"
+"    Did all the steps work?"
+msgstr ""
+
+#. description
+#: ../jobs/optical.txt.in:102
+msgid ""
+"PURPOSE:\n"
+"    This test will check your DVD  playback capabilities\n"
+"STEPS:\n"
+"    1. Insert a DVD that contains any movie in your optical drive\n"
+"    2. Click \"Test\" to play the DVD in Totem\n"
+"VERIFICATION:\n"
+"    Did the file play?"
+msgstr ""
+
+#. description
+#: ../jobs/panel_clock_test.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that the desktop clock displays the correct date "
+"and time\n"
+"VERIFICATION:\n"
+"   Is the clock in the upper right corner of your desktop displaying the "
+"correct date and time for your timezone?"
+msgstr ""
+
+#. description
+#: ../jobs/panel_clock_test.txt.in:16
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that the desktop clock synchronizes with the system "
+"clock.\n"
+"STEPS:\n"
+"   1. Click the \"Test\" button and verify the clock moves ahead by 1 hour.\n"
+"   Note: It may take a minute or so for the clock to refresh\n"
+"   2. Right click on the clock, then click on \"Time & Date Settings...\"\n"
+"   3. Ensure that your clock application is set to manual.\n"
+"   4. Change the time 1 hour back\n"
+"   5. Close the window and reboot\n"
+"VERIFICATION:\n"
+"   Is your system clock displaying the correct date and time for your "
+"timezone?"
+msgstr ""
+
+#. description
+#: ../jobs/panel_reboot.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that you can reboot your system from the desktop "
+"menu\n"
+"STEPS:\n"
+"   1. Click the Gear icon in the upper right corner of the desktop and click "
+"on \"Shut Down\"\n"
+"   2. Click the \"Restart\" button on the left side of the Shut Down dialog\n"
+"   3. After logging back in, restart System Testing and it should resume "
+"here\n"
+"VERIFICATION:\n"
+"   Did your system restart and bring up the GUI login cleanly?"
+msgstr ""
+
+#. description
+#: ../jobs/pcmcia-pcix.txt.in:3
+msgid ""
+"PURPOSE:\n"
+"    This will verify that a PCMCIA or ExpressCard slot can detect inserted "
+"devices\n"
+"STEPS:\n"
+"    1. Plug a PCMCIA or ExpressCard device into the computer\n"
+"VERIFICATION:\n"
+"    Was the device correctly detected?"
+msgstr ""
+
+#. description
+#: ../jobs/peripheral.txt.in:3
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that a network printer is usable\n"
+"STEPS:\n"
+"   1. Make sure that a printer is available in your network\n"
+"   2. Click on the Gear icon in the upper right corner and then click on "
+"Printers\n"
+"   3. If the printer isn't already listed, click on Add\n"
+"   4. The printer should be detected and proper configuration values  should "
+"be displayed\n"
+"   5. Print a test page\n"
+"VERIFICATION:\n"
+"   Were you able to print a test page to the network printer?"
+msgstr ""
+
+#. description
+#: ../jobs/peripheral.txt.in:18
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that a USB DLS or Mobile Broadband modem works\n"
+"STEPS:\n"
+"   1. Connect the USB cable to the computer\n"
+"   2. Right click on the Network icon in the panel\n"
+"   3. Select 'Edit Connections'\n"
+"   4. Select the 'DSL' (for ADSL modem) or 'Mobile Broadband' (for 3G modem) "
+"tab\n"
+"   5. Click on add 'Add' button\n"
+"   6. Configure the connection parameters properly\n"
+"   7. Notify OSD should confirm that the connection has been established\n"
+"   8. Select Test to verify that it's possible to establish an HTTP "
+"connection\n"
+"VERIFICATION:\n"
+"   Was the connection correctly established?"
+msgstr ""
+
+#. description
+#: ../jobs/phoronix.txt.in:9
+msgid ""
+"PURPOSE:\n"
+"   This test will download and install the Phoronix Test Suite and run some "
+"selected benchmarking tests."
+msgstr ""
+
+#. description
+#: ../jobs/power-management.txt.in:3
+msgid ""
+"PURPOSE:\n"
+"    This test will check your system shutdown/booting cycle\n"
+"STEPS:\n"
+"    1. Shutdown your machine\n"
+"    2. Boot your machine\n"
+"    3. Repeat steps 1 and 2 at least 5 times\n"
+"VERIFICATION:\n"
+"    Did the system shutdown and rebooted correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/power-management.txt.in:15
+msgid ""
+"PURPOSE:\n"
+"    This test will check your lid sensors\n"
+"STEPS:\n"
+"    1. Close your laptop lid\n"
+"VERIFICATION:\n"
+"   Does closing your laptop lid cause your system to suspend?"
+msgstr ""
+
+#. description
+#: ../jobs/power-management.txt.in:32
+msgid ""
+"PURPOSE:\n"
+"    This test will check your lid sensors\n"
+"STEPS:\n"
+"    1. Click \"Test\"\n"
+"    2. Close and open the lid\n"
+"VERIFICATION:\n"
+"    Did the screen turn off while the lid was closed?"
+msgstr ""
+
+#. description
+#: ../jobs/power-management.txt.in:50
+msgid ""
+"PURPOSE:\n"
+"    This test will check your lid sensors\n"
+"STEPS:\n"
+"    1. Click \"Test\"\n"
+"    2. Close the lid\n"
+"    3. Wait 5 seconds with the lid closed\n"
+"    4. Open the lid\n"
+"VERIFICATION:\n"
+"    Did the system resume when the lid was opened?"
+msgstr ""
+
+#. description
+#: ../jobs/power-management.txt.in:66
+msgid "Make sure that the RTC (Real-Time Clock) device exists."
+msgstr "Assurez-vous de la présence de l'horloge temps réel (RTC)"
+
+#. description
+#: ../jobs/power-management.txt.in:71
+msgid "Test ACPI Wakealarm (fwts wakealarm) "
+msgstr ""
+
+#. description
+#: ../jobs/power-management.txt.in:80
+msgid ""
+"Check to see if CONFIG_NO_HZ is set in the kernel (this is just a simple "
+"regression check)"
+msgstr ""
+
+#. description
+#: ../jobs/qa_regression.txt.in:7
+msgid ""
+"PURPOSE:\n"
+"   This is to install and run the Ubuntu QA regression tests (destructive)"
+msgstr ""
+
+#. description
+#: ../jobs/server-services.txt.in:5
+msgid "Verifies that sshd is running."
+msgstr ""
+
+#. description
+#: ../jobs/server-services.txt.in:11
+msgid "Verifies that Print/CUPs server is running."
+msgstr ""
+
+#. description
+#: ../jobs/server-services.txt.in:18
+msgid "Verifies that DNS server is running and working."
+msgstr ""
+
+#. description
+#: ../jobs/server-services.txt.in:25
+msgid "Verifies that Samba server is running."
+msgstr ""
+
+#. description
+#: ../jobs/server-services.txt.in:32
+msgid "Verifies that the LAMP stack is running (Apache, MySQL and PHP)."
+msgstr ""
+
+#. description
+#: ../jobs/server-services.txt.in:39
+msgid "Verifies that Tomcat server is running and working."
+msgstr ""
+
+#. description
+#: ../jobs/stress.txt.in:8
+msgid ""
+"PURPOSE:\n"
+"    Create jobs that use the CPU as much as possible for two hours. The test "
+"is considered passed if the system does not freeze."
+msgstr ""
+
+#. description
+#: ../jobs/stress.txt.in:18
+msgid ""
+"PURPOSE:\n"
+"    This test will enter and resume from hibernate for 30 iterations\n"
+"STEPS:\n"
+"    1. Ensure your system has no power-on or HDD passwords set, and that "
+"grub is set to boot Ubuntu by default if you have a multi-boot set-up\n"
+"    2. Click \"Test\" to start the test (very lengthy)\n"
+"    3. If your system does not wake itself after 2 minutes, you will need to "
+"press the power button\n"
+"    4. If the system fails to resume from hibernation and must be rebooted, "
+"please restart System Testing and mark this test as Failed\n"
+"VERIFICATION:\n"
+"    Did the system successfully hibernate and wake 30 times?"
+msgstr ""
+
+#. description
+#: ../jobs/stress.txt.in:35
+msgid ""
+"PURPOSE:\n"
+"    This test will enter and resume from suspend for 30 iterations\n"
+"STEPS:\n"
+"    1. Click \"Test\" to start the test (very lengthy)\n"
+"    2. If the system fails to resume from suspend and must be rebooted, "
+"please restart System Testing and mark this test as Failed\n"
+"VERIFICATION:\n"
+"    Did the system successfully suspend and resume 30 times?"
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:4
+msgid "Record the current network before suspending."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:9
+msgid "Record the current resolution before suspending."
+msgstr "Enregistrez la résolution actuelle avant la mise en veille."
+
+#. description
+#: ../jobs/suspend.txt.in:17
+msgid "Record mixer settings before suspending."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:24
+msgid "Verify that all the CPUs are online before suspending"
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:31
+msgid ""
+"Dumps memory info to a file for comparison after suspend test has been run"
+msgstr ""
+"Écrit le contenu de la mémoire dans un fichier pour comparaison après "
+"exécution du test de mise en veille"
+
+#. description
+#: ../jobs/suspend.txt.in:49
+msgid ""
+"This test disconnects all connections and then connects to the wireless "
+"interface. It then checks the connection to confirm it's working as expected."
+msgstr ""
+"Ce test coupe toutes les connexions puis se connecte à l'interface sans fil. "
+"Il vérifie ensuite la connexion pour confirmer qu'il fonctionne comme prévu."
+
+#. description
+#: ../jobs/suspend.txt.in:83
+msgid ""
+"PURPOSE:\n"
+"    This test will check suspend and resume\n"
+"STEPS:\n"
+"    1. Click \"Test\" and your system will suspend for about 30 - 60 "
+"seconds\n"
+"    2. If your system does not wake itself up after 60 seconds, please press "
+"the power button momentarily to wake the system manually\n"
+"    3. If your system fails to wake at all and must be rebooted, restart "
+"System Testing after reboot and mark this test as Failed\n"
+"VERIFICATION:\n"
+"    Did your system suspend and resume correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:96
+msgid "Test the network after resuming."
+msgstr "Testez le réseau après la sortie de veille."
+
+#. description
+#: ../jobs/suspend.txt.in:102
+msgid ""
+"Test to see that we have the same resolution after resuming as before."
+msgstr ""
+"Testez la résolution d'écran et vérifiez qu'elle n'a pas changé après la "
+"sortie de veille."
+
+#. description
+#: ../jobs/suspend.txt.in:111
+msgid ""
+"Verify that mixer settings after suspend are the same as before suspend."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:127
+msgid "Verify that all CPUs are online after resuming."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:144
+msgid "Verify that all memory is available after resuming from suspend."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:153
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the display is correct after suspend and "
+"resume\n"
+"VERIFICATION:\n"
+"    Does the display work normally after resuming from suspend?"
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:174
+msgid ""
+"This test checks that the wireless interface is working after suspending the "
+"system. It disconnects all interfaces and then connects to the wireless "
+"interface and checks that the connection is working as expected."
+msgstr ""
+"Ce test vérifie que l'interface sans fil fonctionne après la mise en veille "
+"du système. Il déconnecte toutes les interfaces puis se connecte à "
+"l'interface sans fil et vérifie que la connexion fonctionne comme prévu."
+
+#. description
+#: ../jobs/suspend.txt.in:186
+msgid ""
+"This test grabs the hardware address of the bluetooth adapter after suspend "
+"and compares it to the address grabbed before suspend."
+msgstr ""
+"Ce test récupère l'adresse matérielle de l'adaptateur Bluetooth après la "
+"sortie de veille et la compare à l'adresse récupérée avant la mise en veille."
+
+#. description
+#: ../jobs/suspend.txt.in:196
+msgid ""
+"This is an automated Bluetooth file transfer test. It sends an image to the "
+"device specified by the BTDEVADDR environment variable."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:206
+msgid ""
+"PURPOSE:\n"
+"    This test will send the image 'JPEG_Color_Image_Ubuntu.jpg' to a "
+"specified device\n"
+"STEPS:\n"
+"    1. Click \"Test\" and you will be prompted to enter the Bluetooth device "
+"name of a device that can accept file transfers (It may take a few moments "
+"after entering the name for the file to begin sending)\n"
+"    2. Accept any prompts that appear on both devices\n"
+"VERIFICATION:\n"
+"    Was the data correctly transferred?"
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:220
+msgid ""
+"PURPOSE:\n"
+"    This test will cycle through the detected display modes\n"
+"STEPS:\n"
+"    1. Click \"Test\" and the display will cycle trough the display modes\n"
+"VERIFICATION:\n"
+"    Did your display look fine in the detected mode?"
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:232
+msgid ""
+"This test will check to make sure supported video modes work after a suspend "
+"and resume. This is done automatically by taking screenshots and uploading "
+"them as an attachment."
+msgstr ""
+"Ce test va s'assurer du bon fonctionnement des différents modes vidéo pris "
+"en charge après une mise en veille suivie d'une sortie de veille. Ceci prend "
+"automatiquement des copies d'écran et les envoie en pièce jointe."
+
+#. description
+#: ../jobs/suspend.txt.in:241
+msgid ""
+"This attaches screenshots from the "
+"suspend/cycle_resolutions_after_suspend_auto test to the results submission."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:251
+msgid ""
+"This will check to make sure that your audio device works properly after a "
+"suspend and resume.  This may work fine with speakers and onboard "
+"microphone, however, it works best if used with a cable connecting the audio-"
+"out jack to the audio-in jack."
+msgstr ""
+"Ceci va vérifier le bon fonctionnement de votre périphérique audio après une "
+"mise en veille suivie d'une sortie de veille. Cela peut fonctionner "
+"correctement avec haut-parleurs et un microphone intégrés, mais il est "
+"préférable d'utiliser un câble de raccordement entre la prise jack de sortie "
+"et celle d'entrée."
+
+#. description
+#: ../jobs/suspend.txt.in:260
+msgid "This is the automated version of suspend/suspend_advanced."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:269
+msgid ""
+"This automatically tests Wake-on-LAN capability with the aid of a suitably "
+"configured server. During this process the system will suspend, then "
+"automatically wake up after no more than 5 minutes."
+msgstr ""
+"Ceci test automatiquement les capacités Wake-on-LAN à l'aide d'un serveur "
+"configuré à cet effet. Durant le processus, le système va se mettre en "
+"veille et se réveiller automatiquement avant 5 minutes."
+
+#. description
+#: ../jobs/unity.txt.in:6
+msgid ""
+"Xlib is required for unity testing. This checks for Xlib and installs it if "
+"not available."
+msgstr ""
+"Xlib est nécessaire pour les tests de Unity. Ceci vérifie que Xlib est "
+"présent et l'installe s'il n'est pas disponible."
+
+#. description
+#: ../jobs/unity.txt.in:13
+msgid ""
+"This test will verify that Unity is running and then run the autopilot.py "
+"test against the Unity interface."
+msgstr ""
+"Ce test permettra de vérifier que Unity s’exécute et puis exécute le test "
+"autopilot.py pour l'interface Unity."
+
+#. description
+#: ../jobs/usb.txt.in:5
+msgid "Detects and shows USB devices attached to this system."
+msgstr "Détecte et affiche les périphériques USB connectés à ce système."
+
+#. description
+#: ../jobs/usb.txt.in:12
+msgid ""
+"PURPOSE:\n"
+"    This test will check that your system detects USB storage devices.\n"
+"STEPS:\n"
+"    1. Plug in one or more USB keys or hard drives.\n"
+"    2. Click on \"Test\".\n"
+"INFO:\n"
+"    $output\n"
+"VERIFICATION:\n"
+"    Were the drives detected?"
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:28
+msgid ""
+"PURPOSE:\n"
+"    This test will check your USB connection.\n"
+"STEPS:\n"
+"    1. Plug a USB keyboard into the computer.\n"
+"    2. Click on \"Test\" and enter some text.\n"
+"VERIFICATION:\n"
+"    Does the keyboard work?"
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:41
+msgid ""
+"PURPOSE:\n"
+"    This test will check your USB connection.\n"
+"STEPS:\n"
+"    1. Plug a USB mouse into the computer.\n"
+"    2. Perform some single/double/right click operations.\n"
+"VERIFICATION:\n"
+"    Does the mouse work correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:55
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects the insertion of\n"
+"    a USB storage device\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert a USB storage device (pen-drive/HDD).\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:72
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects the removal of\n"
+"    a USB storage device\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the USB device.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:88
+msgid ""
+"PURPOSE:\n"
+"    This test will check your USB connection.\n"
+"STEPS:\n"
+"    1. Plug a USB HDD or thumbdrive into the computer.\n"
+"    2. An icon should appear on the Launcher.\n"
+"    3. Click \"Test\" to begin the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:104
+msgid "This test is automated and executes after the usb/insert test is run."
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:111
+msgid ""
+"This is an automated version of usb/storage-automated and assumes that the  "
+"server has usb storage devices plugged in prior to checkbox execution. It  "
+"is intended for servers and SRU automated testing."
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:119
+msgid ""
+"PURPOSE:\n"
+"    This test will check your USB connection.\n"
+"STEPS:\n"
+"    1. Connect a USB storage device to an external USB slot on this "
+"computer.\n"
+"    2. An icon should appear on the Launcher.\n"
+"    3. Confirm that the icon appears.\n"
+"    4. Eject the device.\n"
+"    5. Repeat with each external USB slot.\n"
+"VERIFICATION:\n"
+"    Do all USB slots work with the device?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:6
+msgid ""
+"PURPOSE:\n"
+" This test will check that the update manager can find updates.\n"
+"STEPS:\n"
+" 1. Click Test to launch update-manager.\n"
+" 2. Follow the prompts and if updates are found, install them.\n"
+" 3. When Update Manager has finished, please close the app by clicking the "
+"Close button in the lower right corner.\n"
+"VERIFICATION:\n"
+" Did Update manager find and install updates (Pass if no updates are found,\n"
+" but Fail if updates are found but not installed)"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:22
+msgid ""
+"PURPOSE:\n"
+" This test will check that the file browser can create a new folder.\n"
+"STEPS:\n"
+" 1. Click Test to open the File Browser.\n"
+" 2. On the menu bar, click File -> Create Folder.\n"
+" 3. In the name box for the new folder, enter the name Test Folder and hit "
+"Enter.\n"
+" 4. Close the File browser.\n"
+"VERIFICATION:\n"
+" Do you now have a new folder called Test Folder?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:37
+msgid ""
+"PURPOSE:\n"
+" This test will check that the file browser can copy a folder\n"
+"STEPS:\n"
+" 1. Click Test to open the File Browser.\n"
+" 2. Right click on the folder called Test Folder and click on Copy.\n"
+" 3. Right Click on any white area in the window and click on Paste.\n"
+" 4. Right click on the folder called Test Folder(copy) and click Rename.\n"
+" 5. Enter the name Test Data in the name box and hit Enter.\n"
+" 6. Close the File browser.\n"
+"VERIFICATION:\n"
+" Do you now have a folder called Test Data?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:54
+msgid ""
+"PURPOSE:\n"
+" This test will verify that the file browser can move a folder.\n"
+"STEPS:\n"
+" 1. Click Test to open the File Browser.\n"
+" 2. Click and drag the folder called Test Data onto the icon called Test "
+"Folder.\n"
+" 3. Release the button.\n"
+" 4. Double click the folder called Test Folder to open it up.\n"
+" 5. Close the File Browser.\n"
+"VERIFICATION:\n"
+" Was the folder called Test Data successfully moved into the folder called "
+"Test Folder?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:70
+msgid ""
+"PURPOSE:\n"
+" This test will check that the file browser can create a new file.\n"
+"STEPS:\n"
+" 1. Click Select Test to open the File Browser.\n"
+" 2. Right click in the white space and click Create Document -> Empty "
+"Document.\n"
+" 3. Enter the name Test File 1 in the name box and hit Enter.\n"
+" 4. Close the File browser.\n"
+"VERIFICATION:\n"
+" Do you now have a file called Test File 1?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:85
+msgid ""
+"PURPOSE:\n"
+" This test will check that the file browser can copy a file.\n"
+"STEPS:\n"
+" 1. Click Test to open the File Browser.\n"
+" 2. Right click on the file called Test File 1 and click Copy.\n"
+" 3. Right click in the white space and click Paste.\n"
+" 4. Right click on the file called Test File 1(copy) and click Rename.\n"
+" 5. Enter the name Test File 2 in the name box and hit Enter.\n"
+" 6. Close the File Browser.\n"
+"VERIFICATION:\n"
+" Do you now have a file called Test File 2?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:102
+msgid ""
+"PURPOSE:\n"
+" This test will check that the file browser can move a file.\n"
+"STEPS:\n"
+" 1. Click Test to open the File Browser.\n"
+" 2. Click and drag the file called Test File 2 onto the icon for the folder "
+"called Test Data.\n"
+" 3. Release the button.\n"
+" 4. Double click the icon for Test Data to open that folder up.\n"
+" 5. Close the File Browser.\n"
+"VERIFICATION:\n"
+" Was the file Test File 2 successfully moved into the Test Data folder?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:118
+msgid ""
+"PURPOSE:\n"
+" This test will check that the file browser can delete a file.\n"
+"STEPS:\n"
+" 1. Click Test to open the File Browser.\n"
+" 2. Right click on the file called Test File 1 and click on Move To Trash.\n"
+" 3. Verify that Test File 1 has been removed.\n"
+" 4. Close the File Browser.\n"
+"VERIFICATION:\n"
+"  Is Test File 1 now gone?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:133
+msgid ""
+"PURPOSE:\n"
+" This test will check that the file browser can delete a folder.\n"
+"STEPS:\n"
+" 1. Click Test to open the File Browser.\n"
+" 2. Right click on the folder called Test Folder and click on Move To "
+"Trash.\n"
+" 3. Verify that the folder was deleted.\n"
+" 4. Close the file browser.\n"
+"VERIFICATION:\n"
+" Has Test Folder been successfully deleted?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:207
+msgid "Common Document Types Test"
+msgstr "Test des types de document communs"
+
+#. description
+#: ../jobs/user_apps.txt.in:228
+msgid ""
+"PURPOSE:\n"
+" This test will check that Firefox can render a basic web page.\n"
+"STEPS:\n"
+" 1. Select Test to launch Firefox and view the test web page.\n"
+"VERIFICATION:\n"
+" Did the Ubuntu Test page load correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:241
+msgid ""
+"PURPOSE:\n"
+" This test will check that Firefox can run a java applet in a web page. "
+"Note:\n"
+" this may require installing additional software to complete successfully.\n"
+"STEPS:\n"
+" 1. Select Test to open Firefox with the Java test page, and follow the "
+"instructions there.\n"
+"VERIFICATION:\n"
+" Did the applet display?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:255
+msgid ""
+"PURPOSE:\n"
+" This test will check that Firefox can run flash applications. Note: this "
+"may\n"
+" require installing additional software to successfully complete.\n"
+"STEPS:\n"
+" 1. Select Test to launch Firefox and view a sample Flash test.\n"
+"VERIFICATION:\n"
+" Did you see the text?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:269
+msgid ""
+"PURPOSE:\n"
+" This test will check that Firefox can play a Flash video. Note: this may\n"
+" require installing additional software to successfully complete.\n"
+"STEPS:\n"
+" 1. Select Test to launch Firefox and view a short flash video.\n"
+"VERIFICATION:\n"
+" Did the video play correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:283
+msgid ""
+"PURPOSE:\n"
+" This test will check that Firefox can play a Quicktime (.mov) video file.\n"
+" Note: this may require installing additional software to successfully\n"
+" complete.\n"
+"STEPS:\n"
+" 1. Select Test to launch Firefox with a sample video.\n"
+"VERIFICATION:\n"
+" Did the video play using a plugin?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:297
+msgid ""
+"PURPOSE:\n"
+" This test will check that Empathy messaging client works.\n"
+"STEPS:\n"
+" 1. Select Test to launch Empathy.\n"
+" 2. Configure it to connect to the Facebook Chat service.\n"
+" 3. Once you have completed the test, please quit Empathy to continue here.\n"
+"VERIFICATION:\n"
+" Were you able to connect correctly and send/receive messages?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:311
+msgid ""
+"PURPOSE:\n"
+" This test will check that Empathy messaging client works.\n"
+"STEPS:\n"
+" 1. Select Test to launch Empathy.\n"
+" 2. Configure it to connect to the Google Talk (gtalk) service.\n"
+" 3. Once you have completed the test, please quit Empathy to continue here.\n"
+"VERIFICATION:\n"
+" Were you able to connect correctly and send/receive messages?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:325
+msgid ""
+"PURPOSE:\n"
+" This test will check that Empathy messaging client works.\n"
+"STEPS:\n"
+" 1. Select Test to launch Empathy.\n"
+" 2. Configure it to connect to the Jabber service.\n"
+" 3. Once you have completed the test, please quit Empathy to continue here.\n"
+"VERIFICATION:\n"
+" Were you able to connect correctly and send/receive messages?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:339
+msgid ""
+"PURPOSE:\n"
+" This test will check that Empathy messaging client works.\n"
+"STEPS:\n"
+" 1. Select Test to launch Empathy.\n"
+" 2. Configure it to connect to the AOL Instant Messaging (AIM) service.\n"
+" 3. Once you have completed the test, please quit Empathy to continue here.\n"
+"VERIFICATION:\n"
+" Were you able to connect correctly and send/receive messages?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:353
+msgid ""
+"PURPOSE:\n"
+" This test will check that Empathy messaging client works.\n"
+"STEPS:\n"
+" 1. Select Test to launch Empathy.\n"
+" 2. Configure it to connect to the Microsoft Network (MSN) service.\n"
+" 3. Once you have completed the test, please quit Empathy to continue here.\n"
+"VERIFICATION:\n"
+" Were you able to connect correctly and send/receive messages?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:367
+msgid ""
+"PURPOSE:\n"
+" This test will check that Evolution works.\n"
+"STEPS:\n"
+" 1. Click the \"Test\" button to launch Evolution.\n"
+" 2. Configure it to connect to a POP3 account.\n"
+"VERIFICATION:\n"
+" Were you able to receive and read e-mail correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:380
+msgid ""
+"PURPOSE:\n"
+" This test will check that Evolution works.\n"
+"STEPS:\n"
+" 1. Click the \"Test\" button to launch Evolution.\n"
+" 2. Configure it to connect to a IMAP account.\n"
+"VERIFICATION:\n"
+" Were you able to receive and read e-mail correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:393
+msgid ""
+"PURPOSE:\n"
+" This test will check that Evolution works.\n"
+"STEPS:\n"
+" 1. Click the \"Test\" button to launch Evolution.\n"
+" 2. Configure it to connect to a SMTP account.\n"
+"VERIFICATION:\n"
+" Were you able to send e-mail without errors?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:406
+msgid ""
+"PURPOSE:\n"
+" This test checks that gcalctool (Calculator) works.\n"
+"STEPS:\n"
+" Click the \"Test\" button to open the calculator.\n"
+"VERIFICATION:\n"
+" Did it launch correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:419
+msgid ""
+"PURPOSE:\n"
+" This test checks that gcalctool (Calculator) works.\n"
+"STEPS:\n"
+" Click the \"Test\" button to open the calculator and perform:\n"
+" 1. Simple math functions (+,-,/,*)\n"
+" 2. Nested math functions ((,))\n"
+" 3. Fractional math\n"
+" 4. Decimal math\n"
+"VERIFICATION:\n"
+" Did the functions perform as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:436
+msgid ""
+"PURPOSE:\n"
+" This test checks that gcalctool (Calculator) works.\n"
+"STEPS:\n"
+" Click the \"Test\" button to open the calculator and perform:\n"
+"  1. Memory set\n"
+"  2. Memory reset\n"
+"  3. Memory last clear\n"
+"  4. Memory clear\n"
+"VERIFICATION:\n"
+" Did the functions perform as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:453
+msgid ""
+"PURPOSE:\n"
+" This test checks that gcalctool (Calculator) works.\n"
+"STEPS:\n"
+" Click the \"Test\" button to open the calculator and perform:\n"
+"  1. Cut\n"
+"  2. Copy\n"
+"  3. Paste\n"
+"VERIFICATION:\n"
+" Did the functions perform as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:468
+msgid ""
+"PURPOSE:\n"
+" This test checks that gedit works.\n"
+"STEPS:\n"
+" 1. Click the \"Test\" button to open gedit.\n"
+" 2. Enter some text and save the file (make a note of the file name you "
+"use), then close gedit.\n"
+"VERIFICATION:\n"
+" Did this perform as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:482
+msgid ""
+"PURPOSE:\n"
+" This test checks that gedit works.\n"
+"STEPS:\n"
+" 1. Click the \"Test\" button to open gedit, and re-open the file you "
+"created previously.\n"
+" 2. Edit then save the file, then close gedit.\n"
+"VERIFICATION:\n"
+" Did this perform as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:495
+msgid ""
+"PURPOSE:\n"
+" This test will check that Gnome Terminal works.\n"
+"STEPS:\n"
+" 1. Click the \"Test\" button to open Terminal.\n"
+" 2. Type 'ls' and press enter. You should see a list of files and folder in "
+"your home directory.\n"
+" 3. Close the terminal window.\n"
+"VERIFICATION:\n"
+" Did this perform as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:6
+msgid "Wireless scanning test. It scans and reports on discovered APs."
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:12
+msgid ""
+"PURPOSE:\n"
+"    This test will check your wireless connection.\n"
+"STEPS:\n"
+"    1. Click on the Network icon in the panel.\n"
+"    2. Select a network below the 'Wireless networks' section.\n"
+"    3. Click \"Test\" to verify that it's possible to establish an HTTP "
+"connection.\n"
+"VERIFICATION:\n"
+"    Did a notification show and was the connection correctly established?"
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:28
+msgid ""
+"Tests that the systems wireless hardware can connect to a router using WPA "
+"security and the 802.11b/g protocols."
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:38
+msgid ""
+"Tests that the systems wireless hardware can connect to a router using no "
+"security and the 802.11b/g protocols."
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:48
+msgid ""
+"Tests that the systems wireless hardware can connect to a router using WPA "
+"security and the 802.11n protocol."
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:58
+msgid ""
+"Tests that the systems wireless hardware can connect to a router using no "
+"security and the 802.11n protocol."
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:70
+msgid ""
+"Tests the performance of a systems wireless connection through the iperf "
+"tool."
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:81
+msgid ""
+"Tests the performance of a systems wireless connection through the iperf "
+"tool, using UDP packets."
+msgstr ""
+
+#: ../checkbox/application.py:66
+msgid "Usage: checkbox [OPTIONS]"
+msgstr "Utilisation : checkbox [OPTIONS]"
+
+#: ../checkbox/application.py:70
+msgid "Print version information and exit."
+msgstr "Affiche les informations de version puis quitte."
+
+#: ../checkbox/application.py:74
+msgid "The file to write the log to."
+msgstr "Le fichier où écrire le journal de ce test."
+
+#: ../checkbox/application.py:77
+msgid "One of debug, info, warning, error or critical."
+msgstr "La valeur peut être : debug, info, warning, error ou critical."
+
+#: ../checkbox/application.py:82
+msgid "Configuration override parameters."
+msgstr "Paramètres prenant le pas sur la configuration."
+
+#: ../checkbox/application.py:84
+msgid "Shorthand for --config=.*/jobs_info/blacklist."
+msgstr ""
+
+#: ../checkbox/application.py:86
+msgid "Shorthand for --config=.*/jobs_info/blacklist_file."
+msgstr ""
+
+#: ../checkbox/application.py:88
+msgid "Shorthand for --config=.*/jobs_info/whitelist."
+msgstr ""
+
+#: ../checkbox/application.py:90
+msgid "Shorthand for --config=.*/jobs_info/whitelist_file."
+msgstr ""
+
+#: ../checkbox/application.py:115
+msgid "Missing configuration file as argument.\n"
+msgstr "Fichier de configuration manquant en argument.\n"
+
+#: ../checkbox/job.py:84
+msgid "Command not found."
+msgstr ""
+
+#: ../checkbox/job.py:92
+#, python-format
+msgid "Command received signal %s: %s"
+msgstr ""
+
+#: ../checkbox/lib/signal.py:23
+msgid ""
+"Hangup detected on controlling terminal or death of controlling process"
+msgstr ""
+"Plantage détecté du terminal de contrôle ou terminaison du processus de "
+"contrôle"
+
+#: ../checkbox/lib/signal.py:24
+msgid "Interrupt from keyboard"
+msgstr "Interrompre à partir du clavier"
+
+#: ../checkbox/lib/signal.py:25
+msgid "Quit from keyboard"
+msgstr "Quitter à partir du clavier"
+
+#: ../checkbox/lib/signal.py:26
+msgid "Illegal Instruction"
+msgstr "Instruction illégale"
+
+#: ../checkbox/lib/signal.py:27
+msgid "Abort signal from abort(3)"
+msgstr "Signal d'abandon provenant de « abort(3) »"
+
+#: ../checkbox/lib/signal.py:28
+msgid "Floating point exception"
+msgstr "Exception de virgule flottante"
+
+#: ../checkbox/lib/signal.py:29
+msgid "Kill signal"
+msgstr "Signal de terminaison"
+
+#: ../checkbox/lib/signal.py:30
+msgid "Invalid memory reference"
+msgstr "Référence mémoire invalide"
+
+#: ../checkbox/lib/signal.py:31
+msgid "Broken pipe: write to pipe with no readers"
+msgstr "Tube cassé : écriture dans le tube sans lecteur"
+
+#: ../checkbox/lib/signal.py:32
+msgid "Timer signal from alarm(2)"
+msgstr "Signal d'horloge provenant de « alarm(2) »"
+
+#: ../checkbox/lib/signal.py:33
+msgid "Termination signal"
+msgstr "Signal de terminaison"
+
+#: ../checkbox/lib/signal.py:34
+msgid "User-defined signal 1"
+msgstr "Signal 1 défini par l'utilisateur"
+
+#: ../checkbox/lib/signal.py:35
+msgid "User-defined signal 2"
+msgstr "Signal 2 défini par l'utilisateur"
+
+#: ../checkbox/lib/signal.py:36
+msgid "Child stopped or terminated"
+msgstr "Arrêt ou terminaison du processus fils"
+
+#: ../checkbox/lib/signal.py:37
+msgid "Continue if stopped"
+msgstr "Continuer en cas d'arrêt"
+
+#: ../checkbox/lib/signal.py:38
+msgid "Stop process"
+msgstr "Arrêt du processus"
+
+#: ../checkbox/lib/signal.py:39
+msgid "Stop typed at tty"
+msgstr "Arrêter la sortie sur tty"
+
+#: ../checkbox/lib/signal.py:40
+msgid "tty input for background process"
+msgstr "Entrées sur tty pour le processus en arrière-plan"
+
+#: ../checkbox/lib/signal.py:41
+msgid "tty output for background process"
+msgstr "Sorties sur tty pour le processus en arrière-plan"
+
+#: ../checkbox/lib/signal.py:77
+msgid "UNKNOWN"
+msgstr "INCONNU"
+
+#: ../checkbox/lib/signal.py:89
+msgid "Unknown signal"
+msgstr "Signal inconnu"
+
+#: ../checkbox_cli/cli_interface.py:31
+#: ../checkbox_urwid/urwid_interface.py:686
+msgid "yes"
+msgstr "oui"
+
+#: ../checkbox_cli/cli_interface.py:32
+#: ../checkbox_urwid/urwid_interface.py:687
+msgid "no"
+msgstr "non"
+
+#: ../checkbox_cli/cli_interface.py:33
+#: ../checkbox_urwid/urwid_interface.py:688
+msgid "skip"
+msgstr "passer"
+
+#: ../checkbox_cli/cli_interface.py:126
+msgid "Press any key to continue..."
+msgstr "Appuyez sur une touche pour continuer..."
+
+#: ../checkbox_cli/cli_interface.py:135
+#, python-format
+msgid "Please choose (%s): "
+msgstr "Veuillez choisir (%s) : "
+
+#: ../checkbox_cli/cli_interface.py:250 ../checkbox_cli/cli_interface.py:281
+msgid "Space when finished"
+msgstr ""
+
+#: ../checkbox_cli/cli_interface.py:280
+msgid "Combine with character above to expand node"
+msgstr ""
+
+#: ../checkbox_cli/cli_interface.py:320
+msgid "test"
+msgstr "tester"
+
+#: ../checkbox_cli/cli_interface.py:344
+msgid "test again"
+msgstr "tester à nouveau"
+
+#: ../checkbox_cli/cli_interface.py:350
+msgid "Please type here and press Ctrl-D when finished:\n"
+msgstr "Veuillez saisir ici et appuyer sur Ctrl-D lorsque vous avez fini :\n"
+
+#: ../checkbox_urwid/urwid_interface.py:60
+msgid "Checkbox System Testing"
+msgstr "Test du système Checkbox"
+
+#: ../checkbox_urwid/urwid_interface.py:99
+msgid "Continue"
+msgstr "Poursuivre"
+
+#: ../checkbox_urwid/urwid_interface.py:192
+#: ../checkbox_urwid/urwid_interface.py:268
+#: ../checkbox_urwid/urwid_interface.py:418
+msgid "Previous"
+msgstr "Précédent"
+
+#: ../checkbox_urwid/urwid_interface.py:193
+#: ../checkbox_urwid/urwid_interface.py:269
+#: ../checkbox_urwid/urwid_interface.py:419
+msgid "Next"
+msgstr "Suivant"
+
+#. Show buttons
+#: ../checkbox_urwid/urwid_interface.py:416
+msgid "Select All"
+msgstr "Tout sélectionner"
+
+#: ../checkbox_urwid/urwid_interface.py:417
+msgid "Deselect All"
+msgstr "Tout désélectionner"
+
+#: ../checkbox_urwid/urwid_interface.py:774
+msgid "Test"
+msgstr "Tester"
+
+#: ../checkbox_urwid/urwid_interface.py:789
+msgid "Test Again"
+msgstr "Tester à nouveau"
+
+#: ../checkbox_gtk/gtk_interface.py:503
+msgid "_Test Again"
+msgstr "_Tester à nouveau"
+
+#: ../checkbox_gtk/gtk_interface.py:551
+msgid "Info"
+msgstr "Info"
+
+#: ../checkbox_gtk/gtk_interface.py:575
+msgid "Error"
+msgstr "Erreur"
+
+#: ../checkbox/user_interface.py:137
+#, python-format
+msgid "Unable to start web browser to open %s."
+msgstr "Impossible de lancer le navigateur Web pour ouvrir %s."
+
+#: ../plugins/apport_prompt.py:83
+msgid ""
+"Collecting information about this test.\n"
+"This might take a few minutes."
+msgstr ""
+"Collecte d'informations concernant le test.\n"
+"Ceci peut prendre quelques minutes."
+
+#: ../plugins/apport_prompt.py:118
+msgid ""
+"Collected information is being sent for bug tracking.\n"
+"This might take a few minutes."
+msgstr ""
+"Les informations collectées sont en cours d'envoi pour le système de suivi "
+"des bogues.\n"
+"Ceci peut prendre quelques minutes."
+
+#: ../plugins/apport_prompt.py:227
+#, python-format
+msgid "Test %(name)s from suite %(suite)s failed."
+msgstr ""
+
+#: ../plugins/apport_prompt.py:231
+#, python-format
+msgid "Test %s failed."
+msgstr "Le test %s a échoué."
+
+#: ../plugins/apport_prompt.py:232
+msgid "Do you want to report a bug?"
+msgstr "Souhaitez-vous signaler un bogue ?"
+
+#: ../plugins/apport_prompt.py:249
+#, python-format
+msgid "Is a package upgrade in process? Error: %s"
+msgstr "Une mise à jour de paquet est-elle en cours ? Erreur : %s"
+
+#: ../plugins/final_prompt.py:33
+msgid "Successfully finished testing!"
+msgstr "Les tests se sont terminés avec succès !"
+
+#: ../plugins/final_prompt.py:34
+msgid "_Finish"
+msgstr "_Terminer"
+
+#: ../plugins/gather_prompt.py:35
+msgid "Gathering information from your system..."
+msgstr "Collecte d'informations sur votre système..."
+
+#: ../plugins/intro_prompt.py:28
+msgid ""
+"Welcome to System Testing!\n"
+"\n"
+"Checkbox provides tests to confirm that your system is working properly. "
+"Once you are finished running the tests, you can view a summary report for "
+"your system."
+msgstr ""
+"Bienvenue dans les tests du système !\n"
+"\n"
+"Checkbox propose une batterie de tests permettant de confirmer le bon "
+"fonctionnement de votre système. Une fois ces tests effectués, un "
+"récapitulatif sera affiché pour celui-ci."
+
+#: ../plugins/intro_prompt.py:33
+msgid ""
+"\n"
+"\n"
+"Warning: Some tests could cause your system to freeze or become "
+"unresponsive. Please save all your work and close all other running "
+"applications before beginning the testing process."
+msgstr ""
+"\n"
+"\n"
+"Attention : certains tests peuvent provoquer un blocage du système. Merci de "
+"sauvegarder votre travail et de fermer toutes autres applications avant de "
+"commencer les tests."
+
+#: ../plugins/launchpad_exchange.py:136
+#, python-format
+msgid "Failed to process form: %s"
+msgstr "Échec du traitement du formulaire : %s"
+
+#: ../plugins/launchpad_exchange.py:151
+#, python-format
+msgid ""
+"Failed to contact server. Please try\n"
+"again or upload the following file name:\n"
+"%s\n"
+"\n"
+"directly to the system database:\n"
+"https://launchpad.net/+hwdb/+submit"
+msgstr ""
+"Impossible de se connecter au serveur. Merci de\n"
+"réessayer ou d'envoyer le fichier suivant :\n"
+"%s\n"
+"\n"
+"directement à la base de données du système :\n"
+"https://launchpad.net/+hwdb/+submit"
+
+#: ../plugins/launchpad_exchange.py:160
+msgid ""
+"Failed to upload to server,\n"
+"please try again later."
+msgstr ""
+"Échec de l'envoi au serveur,\n"
+"veuillez essayer à nouveau plus tard."
+
+#: ../plugins/launchpad_exchange.py:172
+msgid "Information not posted to Launchpad."
+msgstr "Les informations n'ont pas été envoyées à Launchpad."
+
+#: ../plugins/launchpad_prompt.py:74
+#, python-format
+msgid ""
+"The following report has been generated for submission to the Launchpad "
+"hardware database:\n"
+"\n"
+"  [[%s|View Report]]\n"
+"\n"
+"You can submit this information about your system by providing the email "
+"address you use to sign in to Launchpad. If you do not have a Launchpad "
+"account, please register here:\n"
+"\n"
+"  https://launchpad.net/+login"
+msgstr ""
+
+#: ../plugins/launchpad_prompt.py:93
+msgid "Email address must be in a proper format."
+msgstr "L'adresse de courriel doit être correctement formatée."
+
+#: ../plugins/launchpad_prompt.py:99
+msgid "Exchanging information with the server..."
+msgstr "Échange d'informations avec le serveur..."
+
+#: ../plugins/launchpad_report.py:164
+msgid ""
+"The generated report seems to have validation errors,\n"
+"so it might not be processed by Launchpad."
+msgstr ""
+
+#: ../plugins/lock_prompt.py:63
+msgid "There is another checkbox running. Please close it first."
+msgstr ""
+"Une autre instance de Checkbox est en cours d'exécution. Veuillez d'abord la "
+"quitter."
+
+#: ../plugins/recover_prompt.py:53
+msgid "Recover"
+msgstr ""
+
+#: ../plugins/recover_prompt.py:54
+msgid "Restart"
+msgstr ""
+
+#: ../plugins/recover_prompt.py:56
+msgid ""
+"Checkbox did not finish completely.\n"
+"Do you want to recover from the previous run?"
+msgstr ""
+"Checkbox a été interrompu avant la fin.\n"
+"Voulez-vous reprendre sa précédente exécution ?"
+
+#: ../plugins/report_prompt.py:39
+msgid "Building report..."
+msgstr "Construction du rapport..."
+
+#: ../plugins/shell_test.py:52
+#, python-format
+msgid "Running %s..."
+msgstr "Exécution de %s…"
+
+#. Get results
+#: ../plugins/suites_prompt.py:110
+msgid "Select the suites to test"
+msgstr "Sélectionnez les composants à tester"
+
+#: ../scripts/keyboard_test:21
+msgid "Enter text:\n"
+msgstr "Saisissez le texte :\n"
+
+#: ../scripts/keyboard_test:41
+msgid "Type Text"
+msgstr "Tapez le texte"
+
+#: ../scripts/internet_test:139
+msgid "No Internet connection"
+msgstr "Pas de connexion à Internet"
+
+#: ../scripts/internet_test:142
+msgid "Connection established lost a packet"
+msgstr "Connexion établie avec perte d'un paquet"
+
+#: ../scripts/internet_test:145
+msgid "Internet connection fully established"
+msgstr "Connexion Internet complètement établie"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/command-not-found.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/command-not-found.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/command-not-found.po	2012-01-02 17:27:19.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/command-not-found.po	2012-02-23 06:31:43.000000000 +0000
@@ -2,72 +2,34 @@
 msgstr ""
 "Project-Id-Version: command-not-found\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-22 18:05+0000\n"
+"POT-Creation-Date: 2007-03-20 18:10+0100\n"
 "PO-Revision-Date: 2011-01-21 07:25+0000\n"
 "Last-Translator: Bruno Bord <Unknown>\n"
 "Language-Team: Bruno Bord <bruno@jehaisleprintemps.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:37+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:40+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "X-Poedit-Country: FRANCE\n"
 "X-Poedit-Language: French\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../CommandNotFound/CommandNotFound.py:133
-#, python-format
-msgid "No command '%s' found, but there are %s similar ones"
-msgstr "Commande '%s' non trouvée, mais il y en a %s similaires"
-
 #: ../CommandNotFound/CommandNotFound.py:135
-#, python-format
-msgid "No command '%s' found, did you mean:"
-msgstr "Commande '%s' non trouvée, vouliez-vous dire :"
+msgid "Ubuntu has the following similar programs"
+msgstr "Ubuntu possède les programmes similaires suivants"
 
-#: ../CommandNotFound/CommandNotFound.py:137
-#, python-format
-msgid " Command '%s' from package '%s' (%s)"
-msgstr " La commande '%s' du paquet '%s' (%s)"
-
-#: ../CommandNotFound/CommandNotFound.py:210
-#, python-format
-msgid "Command '%(command)s' is available in '%(place)s'"
-msgstr "La commande '%(command)s' est disponible dans '%(place)s'"
-
-#: ../CommandNotFound/CommandNotFound.py:212
-#, python-format
-msgid "Command '%(command)s' is available in the following places"
-msgstr "La commande '%(command)s' est disponible aux endroits suivants"
-
-#: ../CommandNotFound/CommandNotFound.py:217
-#, python-format
-msgid ""
-"The command could not be located because '%s' is not included in the PATH "
-"environment variable."
-msgstr ""
-"La commande n'a pas pu être trouvée car  '%s' n'est pas dans la variable "
-"d'environnement PATH."
-
-#: ../CommandNotFound/CommandNotFound.py:219
-msgid ""
-"This is most likely caused by the lack of administrative privileges "
-"associated with your user account."
-msgstr ""
-"Ceci est probablement dû au manque de privilèges d'administration de votre "
-"compte."
-
-#: ../CommandNotFound/CommandNotFound.py:234
+#: ../CommandNotFound/CommandNotFound.py:139
 #, python-format
 msgid "The program '%s' is currently not installed. "
 msgstr "Le programme '%s' n'est pas encore installé. "
 
-#: ../CommandNotFound/CommandNotFound.py:236
-#: ../CommandNotFound/CommandNotFound.py:239
+#: ../CommandNotFound/CommandNotFound.py:141
+#: ../CommandNotFound/CommandNotFound.py:144
 msgid "You can install it by typing:"
 msgstr "Vous pouvez l'installer en tapant :"
 
-#: ../CommandNotFound/CommandNotFound.py:242
+#: ../CommandNotFound/CommandNotFound.py:147
 #, python-format
 msgid ""
 "To run '%(command)s' please ask your administrator to install the package "
@@ -76,45 +38,32 @@
 "Pour lancer '%(command)s', veuillez prendre contact avec votre "
 "administrateur pour installer le paquet '%(package)s'"
 
-#: ../CommandNotFound/CommandNotFound.py:244
+#: ../CommandNotFound/CommandNotFound.py:149
+#: ../CommandNotFound/CommandNotFound.py:161
 #, python-format
-msgid "You will have to enable the component called '%s'"
-msgstr "Vous devrez activer le composant appelé '%s'"
+msgid "Make sure you have the '%s' component enabled"
+msgstr "Assurez-vous que vous avez le composant '%s' activé"
 
-#: ../CommandNotFound/CommandNotFound.py:247
+#: ../CommandNotFound/CommandNotFound.py:151
 #, python-format
 msgid "The program '%s' can be found in the following packages:"
 msgstr "Le programme '%s' peut être trouvé dans les paquets suivants :"
 
-#: ../CommandNotFound/CommandNotFound.py:252
-#, python-format
-msgid "You will have to enable component called '%s'"
-msgstr "Vous devrez activer le composant appelé '%s'"
-
-#: ../CommandNotFound/CommandNotFound.py:254
-#: ../CommandNotFound/CommandNotFound.py:256
+#: ../CommandNotFound/CommandNotFound.py:155
+#: ../CommandNotFound/CommandNotFound.py:157
 #, python-format
 msgid "Try: %s <selected package>"
 msgstr "Essayez : %s <paquet sélectionné>"
 
-#: ../CommandNotFound/CommandNotFound.py:258
+#: ../CommandNotFound/CommandNotFound.py:159
 msgid "Ask your administrator to install one of them"
 msgstr "Demandez à votre administrateur d'installer l'un d'entre eux"
 
-#: ../command-not-found:58
+#: ../command-not-found:18
 #, c-format
 msgid "%prog [options] <command-name>"
 msgstr "%prog [options] <nom-de-la-commande>"
 
-#: ../command-not-found:61
+#: ../command-not-found:20
 msgid "use this path to locate data fields"
 msgstr "utilisez ce chemin pour localiser les champs de données"
-
-#: ../command-not-found:64
-msgid "ignore local binaries and display the available packages"
-msgstr "ignore les binaires locaux et affiche les paquets disponibles"
-
-#: ../command-not-found:71
-#, c-format
-msgid "%s: command not found"
-msgstr "%s : commande introuvable"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/compiz.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/compiz.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/compiz.po	2012-01-02 17:27:19.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/compiz.po	2012-02-23 06:31:42.000000000 +0000
@@ -11,71 +11,57 @@
 msgstr ""
 "Project-Id-Version: fr-compiz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-05 12:40+0000\n"
-"PO-Revision-Date: 2011-12-08 18:53+0000\n"
+"POT-Creation-Date: 2012-02-17 21:28+0000\n"
+"PO-Revision-Date: 2012-02-18 00:01+0000\n"
 "Last-Translator: alvinm93 <alvin.meimoun@laposte.net>\n"
 "Language-Team: <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:31+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:33+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
-#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1
-msgid "Desktop"
-msgstr "Bureau"
-
-#: ../gtk/gnome/50-compiz-key.xml.in.h:1
-msgid "Window Management"
-msgstr "Gestion des Fenêtres"
-
-#: ../gtk/gnome/compiz.desktop.in.h:1 ../gtk/gnome/compiz-wm.desktop.in.h:1
+#: ../gtk/gnome/compiz.desktop.in.h:1
 msgid "Compiz"
 msgstr "Compiz"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:1
-msgid "Action to take when scrolling the mouse wheel on a window title bar."
-msgstr ""
-"Action à accomplir en tournant la molette de la souris sur la barre de titre "
-"d'une fenêtre"
-
-#: ../gtk/window-decorator/gwd.schemas.in.h:2
 msgid "Blur type"
 msgstr "Type de flou"
 
+#: ../gtk/window-decorator/gwd.schemas.in.h:2
+msgid "Type of blur used for window decorations"
+msgstr "Type de flou utilisé pour les décorations des fenêtres"
+
 #: ../gtk/window-decorator/gwd.schemas.in.h:3
-msgid "Metacity theme active window opacity"
-msgstr "Opacité de la fenêtre active du thème Metacity"
+msgid "Use metacity theme"
+msgstr "Utiliser le thème Metacity"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:4
-msgid "Metacity theme active window opacity shade"
-msgstr "Nuance de l'opacité de la fenêtre active du thème Metacity"
+msgid "Use metacity theme when drawing window decorations"
+msgstr "Utiliser le thème Metacity pour dessiner les décorations de fenêtres"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:5
-msgid "Metacity theme opacity"
-msgstr "Opacité du thème Metacity"
+msgid "Title bar mouse wheel action"
+msgstr "Action de la molette de souris sur la barre de titre"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:6
-msgid "Metacity theme opacity shade"
-msgstr "Nuance de l'opacité du thème Metacity"
+msgid "Action to take when scrolling the mouse wheel on a window title bar."
+msgstr ""
+"Action à accomplir en tournant la molette de la souris sur la barre de titre "
+"d'une fenêtre"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:7
-msgid "Opacity to use for active windows with metacity theme decorations"
-msgstr ""
-"Opacité à utiliser pour les fenêtres actives avec les décorations des thèmes "
-"Metacity"
+msgid "Metacity theme opacity"
+msgstr "Opacité du thème Metacity"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:8
 msgid "Opacity to use for metacity theme decorations"
 msgstr "Opacité à utiliser pour les décorations des thèmes Metacity"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:9
-msgid ""
-"Shade active windows with metacity theme decorations from opaque to "
-"translucent"
-msgstr ""
-"Nuancer les fenêtres actives avec les décorations du thème Metacity, "
-"d'opaque à transparent"
+msgid "Metacity theme opacity shade"
+msgstr "Nuance de l'opacité du thème Metacity"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:10
 msgid ""
@@ -85,461 +71,474 @@
 "transparent"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:11
-msgid "Title bar mouse wheel action"
-msgstr "Action de la molette de souris sur la barre de titre"
+msgid "Metacity theme active window opacity"
+msgstr "Opacité de la fenêtre active du thème Metacity"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:12
-msgid "Type of blur used for window decorations"
-msgstr "Type de flou utilisé pour les décorations des fenêtres"
+msgid "Opacity to use for active windows with metacity theme decorations"
+msgstr ""
+"Opacité à utiliser pour les fenêtres actives avec les décorations des thèmes "
+"Metacity"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:13
-msgid "Use metacity theme"
-msgstr "Utiliser le thème Metacity"
+msgid "Metacity theme active window opacity shade"
+msgstr "Nuance de l'opacité de la fenêtre active du thème Metacity"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:14
-msgid "Use metacity theme when drawing window decorations"
-msgstr "Utiliser le thème Metacity pour dessiner les décorations de fenêtres"
+msgid ""
+"Shade active windows with metacity theme decorations from opaque to "
+"translucent"
+msgstr ""
+"Nuancer les fenêtres actives avec les décorations du thème Metacity, "
+"d'opaque à transparent"
+
+#: ../gtk/window-decorator/gwd.schemas.in.h:15
+msgid "Use tooltips"
+msgstr ""
+
+#: ../gtk/window-decorator/gwd.schemas.in.h:16
+msgid "Show tooltip windows on decorator functions"
+msgstr ""
 
 #: ../metadata/core.xml.in.h:1
-msgid "Active Plugins"
-msgstr "Extensions actives"
+msgid "General Options"
+msgstr "Options Générales"
 
 #: ../metadata/core.xml.in.h:2
-msgid "Audible Bell"
-msgstr "Cloche audible"
+msgid "General compiz options"
+msgstr "Options Générales de Compiz"
 
 #: ../metadata/core.xml.in.h:3
-msgid "Audible system beep"
-msgstr "Signal sonore du système audible"
+msgid "Active Plugins"
+msgstr "Extensions actives"
 
 #: ../metadata/core.xml.in.h:4
-msgid "Auto-Raise"
-msgstr "Remontée automatique"
+msgid "List of currently active plugins"
+msgstr "Liste des extensions (plugins) actuellement actives"
 
 #: ../metadata/core.xml.in.h:5
-msgid "Auto-Raise Delay"
-msgstr "Délai de remontée automatique"
+msgid "Audible Bell"
+msgstr "Cloche audible"
 
 #: ../metadata/core.xml.in.h:6
-msgid "Automatic detection of output devices"
-msgstr "Détection automatiques des périphériques de sortie"
+msgid "Audible system beep"
+msgstr "Signal sonore du système audible"
 
 #: ../metadata/core.xml.in.h:7
-msgid "Click To Focus"
-msgstr "Cliquer pour obtenir le focus"
+msgid "Ignore Hints When Maximized"
+msgstr "Ignorer les conseils lorsque la fenêtre est agrandie"
 
 #: ../metadata/core.xml.in.h:8
-msgid "Click on window moves input focus to it"
-msgstr "Si vous cliquez sur la fenêtre, vous déplacez le focus dessus"
+msgid "Ignore size increment and aspect hints when window is maximized"
+msgstr ""
+"Ignorer l'incrément de taille et les conseils d'aspect lorsque la fenêtre "
+"est agrandie"
 
 #: ../metadata/core.xml.in.h:9
-msgid "Close Window"
-msgstr "Fermer la fenêtre"
+msgid "Hide Skip Taskbar Windows"
+msgstr "Masquer les fenêtres de la barre des tâches"
 
 #: ../metadata/core.xml.in.h:10
-msgid "Close active window"
-msgstr "Fermer la fenêtre active"
+msgid "Hide windows not in taskbar when entering show desktop mode"
+msgstr ""
+"Masquer les fenêtres qui ne se trouvent pas dans la barre des tâches lorsque "
+"vous passez en mode d'affichage du bureau"
 
 #: ../metadata/core.xml.in.h:11
-msgid "Default Icon"
-msgstr "Icône par défaut"
+msgid "Edge Trigger Delay"
+msgstr "Délai de déclenchement des bordures"
 
 #: ../metadata/core.xml.in.h:12
-msgid "Default window icon image"
-msgstr "Image de l'icône de la fenêtre par défaut"
+msgid ""
+"Duration the pointer must rest in a screen edge before an edge action is "
+"taken."
+msgstr ""
+"Durée pendant laquelle le pointeur doit rester au bord de l'écran avant que "
+"l'action ait lieu."
 
 #: ../metadata/core.xml.in.h:13
-msgid "Desktop Size"
-msgstr "Taille du bureau"
+msgid "Ping Delay"
+msgstr "Délai du Ping"
 
 #: ../metadata/core.xml.in.h:14
-msgid "Detect Outputs"
-msgstr "Détection des sorties"
+msgid "Interval between ping messages"
+msgstr "Intervalle entre les messages ping"
 
 #: ../metadata/core.xml.in.h:15
-msgid "Display Settings"
-msgstr "Paramètres d'affichage"
+msgid "Default Icon"
+msgstr "Icône par défaut"
 
 #: ../metadata/core.xml.in.h:16
-msgid ""
-"Duration the pointer must rest in a screen edge before an edge action is "
-"taken."
-msgstr ""
-"Durée pendant laquelle le pointeur doit rester au bord de l'écran avant que "
-"l'action ait lieu."
+msgid "Default window icon image"
+msgstr "Image de l'icône de la fenêtre par défaut"
 
 #: ../metadata/core.xml.in.h:17
-msgid "Edge Trigger Delay"
-msgstr "Délai de déclenchement des bordures"
+msgid "Save plugin states on unload"
+msgstr "Sauvegarder l'état des extensions lors du déchargement"
 
 #: ../metadata/core.xml.in.h:18
-msgid "Focus &amp; Raise Behaviour"
-msgstr "Comportement de la prise de focus &amp; de l'augmentation"
+msgid ""
+"Save the state of plugins when they are unloaded such they will resume their "
+"past internal state when reloaded"
+msgstr ""
+"Sauvegarder l'état des extensions quand elles sont déchargées, afin qu'elles "
+"reprennent leur état interne précédent lorsqu'elles seront rechargées"
 
 #: ../metadata/core.xml.in.h:19
-msgid "Focus Prevention Level"
-msgstr "Niveau de sensibilité du Focus"
+msgid "Display Settings"
+msgstr "Paramètres d'affichage"
 
+# Traduction très peu sûre
 #: ../metadata/core.xml.in.h:20
-msgid "Focus Prevention Windows"
-msgstr "Fenêtres prévenues du Focus"
+msgid "Overlapping Output Handling"
+msgstr "Chevauchement de manipulations de sorties"
 
 #: ../metadata/core.xml.in.h:21
-msgid "Focus prevention windows"
-msgstr "fenêtres prévenues du focus"
+msgid "Which one of overlapping output devices should be preferred"
+msgstr "Quel périphérique de sortie chevauchée devrait être préférée"
 
 #: ../metadata/core.xml.in.h:22
-msgid "General Options"
-msgstr "Options Générales"
+msgid "Smart mode"
+msgstr "Mode Élégant"
 
 #: ../metadata/core.xml.in.h:23
-msgid "General compiz options"
-msgstr "Options Générales de Compiz"
+msgid "Prefer larger output"
+msgstr "Préférer une sortie plus grande"
 
 #: ../metadata/core.xml.in.h:24
-msgid "Hide Skip Taskbar Windows"
-msgstr "Masquer les fenêtres de la barre des tâches"
+msgid "Prefer smaller output"
+msgstr "Préférer une sortie plus petite"
 
 #: ../metadata/core.xml.in.h:25
-msgid "Hide all windows and focus desktop"
-msgstr "Masquer toutes les fenêtres et afficher le bureau"
+msgid "Detect Outputs"
+msgstr "Détection des sorties"
 
 #: ../metadata/core.xml.in.h:26
-msgid "Hide windows not in taskbar when entering show desktop mode"
-msgstr ""
-"Masquer les fenêtres qui ne se trouvent pas dans la barre des tâches lorsque "
-"vous passez en mode d'affichage du bureau"
+msgid "Automatic detection of output devices"
+msgstr "Détection automatiques des périphériques de sortie"
 
 #: ../metadata/core.xml.in.h:27
-msgid "High"
-msgstr "Élevé"
+msgid "Outputs"
+msgstr "Sorties"
 
 #: ../metadata/core.xml.in.h:28
-msgid "Horizontal Virtual Size"
-msgstr "Taille virtuelle horizontale"
+msgid "List of strings describing output devices"
+msgstr "Liste des chaînes décrivant les périphériques de sortie"
 
 #: ../metadata/core.xml.in.h:29
-msgid "Ignore Hints When Maximized"
-msgstr "Ignorer les conseils lorsque la fenêtre est agrandie"
+msgid "Focus &amp; Raise Behaviour"
+msgstr "Comportement de la prise de focus &amp; de l'augmentation"
 
 #: ../metadata/core.xml.in.h:30
-msgid "Ignore size increment and aspect hints when window is maximized"
-msgstr ""
-"Ignorer l'incrément de taille et les conseils d'aspect lorsque la fenêtre "
-"est agrandie"
+msgid "Click To Focus"
+msgstr "Cliquer pour obtenir le focus"
 
 #: ../metadata/core.xml.in.h:31
-msgid "Interval before raising selected windows"
-msgstr "Intervalle avant de remonter les fenêtres sélectionnées"
+msgid "Click on window moves input focus to it"
+msgstr "Si vous cliquez sur la fenêtre, vous déplacez le focus dessus"
 
 #: ../metadata/core.xml.in.h:32
-msgid "Interval between ping messages"
-msgstr "Intervalle entre les messages ping"
+msgid "Raise On Click"
+msgstr "Remonter au clic"
 
 #: ../metadata/core.xml.in.h:33
-msgid "Key bindings"
-msgstr "Assignation des touches"
+msgid "Raise windows when clicked"
+msgstr "Remonter les fenêtres lorsque vous cliquez dessus"
 
-# En français, on ne vole pas un focus mais je n'ai pas trouvé mieux.
 #: ../metadata/core.xml.in.h:34
-msgid "Level of focus stealing prevention"
-msgstr "Niveau de sensibilité du vol de Focus"
+msgid "Auto-Raise"
+msgstr "Remontée automatique"
 
 #: ../metadata/core.xml.in.h:35
-msgid "List of currently active plugins"
-msgstr "Liste des extensions (plugins) actuellement actives"
+msgid "Raise selected windows after interval"
+msgstr "Remonter les fenêtres sélectionnées après l'intervalle"
 
 #: ../metadata/core.xml.in.h:36
-msgid "List of strings describing output devices"
-msgstr "Liste des chaînes décrivant les périphériques de sortie"
+msgid "Auto-Raise Delay"
+msgstr "Délai de remontée automatique"
 
 #: ../metadata/core.xml.in.h:37
-msgid "Low"
-msgstr "Faible"
+msgid "Interval before raising selected windows"
+msgstr "Intervalle avant de remonter les fenêtres sélectionnées"
 
 #: ../metadata/core.xml.in.h:38
-msgid "Lower Window"
-msgstr "Abaisser la fenêtre"
+msgid "Focus Prevention Level"
+msgstr "Niveau de sensibilité du Focus"
 
+# En français, on ne vole pas un focus mais je n'ai pas trouvé mieux.
 #: ../metadata/core.xml.in.h:39
-msgid "Lower window beneath other windows"
-msgstr "Abaisser la fenêtre sous d'autres fenêtres"
+msgid "Level of focus stealing prevention"
+msgstr "Niveau de sensibilité du vol de Focus"
 
+# En français, on/off est compris par tout le monde et on préfèreéviter de réutiliser le mot désactivé
 #: ../metadata/core.xml.in.h:40
-msgid "Maximize Window"
-msgstr "Optimiser la fenêtre"
+msgid "Off"
+msgstr "Off"
 
 #: ../metadata/core.xml.in.h:41
-msgid "Maximize Window Horizontally"
-msgstr "Optimiser la fenêtre horizontalement"
-
-#: ../metadata/core.xml.in.h:42
-msgid "Maximize Window Vertically"
-msgstr "Optimiser la fenêtre verticalement"
+msgid "Low"
+msgstr "Faible"
+
+#: ../metadata/core.xml.in.h:42 ../plugins/resize/resize.xml.in.h:8
+msgid "Normal"
+msgstr "Normal"
 
 #: ../metadata/core.xml.in.h:43
-msgid "Maximize active window"
-msgstr "Optimiser la fenêtre active"
+msgid "High"
+msgstr "Élevé"
 
 #: ../metadata/core.xml.in.h:44
-msgid "Maximize active window horizontally"
-msgstr "Optimiser la fenêtre active horizontalement"
+msgid "Very High"
+msgstr "Très élevé"
 
 #: ../metadata/core.xml.in.h:45
-msgid "Maximize active window vertically"
-msgstr "Optimiser la fenêtre active verticalement"
+msgid "Focus Prevention Windows"
+msgstr "Fenêtres prévenues du Focus"
 
 #: ../metadata/core.xml.in.h:46
-msgid "Minimize Window"
-msgstr "Minimiser la fenêtre"
+msgid "Focus prevention windows"
+msgstr "fenêtres prévenues du focus"
 
 #: ../metadata/core.xml.in.h:47
-msgid "Minimize active window"
-msgstr "Minimiser la fenêtre active"
+msgid "Key bindings"
+msgstr "Assignation des touches"
 
-#: ../metadata/core.xml.in.h:48 ../plugins/resize/resize.xml.in.h:14
-msgid "Normal"
-msgstr "Normal"
+#: ../metadata/core.xml.in.h:48
+msgid "Close Window"
+msgstr "Fermer la fenêtre"
 
 #: ../metadata/core.xml.in.h:49
-msgid "Number of Desktops"
-msgstr "Nombre de bureaux"
+msgid "Close active window"
+msgstr "Fermer la fenêtre active"
 
 #: ../metadata/core.xml.in.h:50
-msgid "Number of virtual desktops"
-msgstr "Nombre de bureaux virtuels"
+msgid "Raise Window"
+msgstr "Remonter la fenêtre"
 
-# En français, on/off est compris par tout le monde et on préfèreéviter de réutiliser le mot désactivé
 #: ../metadata/core.xml.in.h:51
-msgid "Off"
-msgstr "Off"
+msgid "Raise window above other windows"
+msgstr "Remonter la fenêtre au-dessus des autres"
 
 #: ../metadata/core.xml.in.h:52
-msgid "Outputs"
-msgstr "Sorties"
+msgid "Lower Window"
+msgstr "Abaisser la fenêtre"
 
-# Traduction très peu sûre
 #: ../metadata/core.xml.in.h:53
-msgid "Overlapping Output Handling"
-msgstr "Chevauchement de manipulations de sorties"
+msgid "Lower window beneath other windows"
+msgstr "Abaisser la fenêtre sous d'autres fenêtres"
 
 #: ../metadata/core.xml.in.h:54
-msgid "Ping Delay"
-msgstr "Délai du Ping"
+msgid "Minimize Window"
+msgstr "Minimiser la fenêtre"
 
 #: ../metadata/core.xml.in.h:55
-msgid "Prefer larger output"
-msgstr "Préférer une sortie plus grande"
+msgid "Minimize active window"
+msgstr "Minimiser la fenêtre active"
 
 #: ../metadata/core.xml.in.h:56
-msgid "Prefer smaller output"
-msgstr "Préférer une sortie plus petite"
+msgid "Maximize Window"
+msgstr "Optimiser la fenêtre"
 
 #: ../metadata/core.xml.in.h:57
-msgid "Raise On Click"
-msgstr "Remonter au clic"
+msgid "Maximize active window"
+msgstr "Optimiser la fenêtre active"
 
 #: ../metadata/core.xml.in.h:58
-msgid "Raise Window"
-msgstr "Remonter la fenêtre"
+msgid "Unmaximize Window"
+msgstr "Restaurer la fenêtre"
 
 #: ../metadata/core.xml.in.h:59
-msgid "Raise selected windows after interval"
-msgstr "Remonter les fenêtres sélectionnées après l'intervalle"
+msgid "Unmaximize active window"
+msgstr "Restaurer la fenêtre active"
 
 #: ../metadata/core.xml.in.h:60
-msgid "Raise window above other windows"
-msgstr "Remonter la fenêtre au-dessus des autres"
+msgid "Maximize Window Horizontally"
+msgstr "Optimiser la fenêtre horizontalement"
 
 #: ../metadata/core.xml.in.h:61
-msgid "Raise windows when clicked"
-msgstr "Remonter les fenêtres lorsque vous cliquez dessus"
+msgid "Maximize active window horizontally"
+msgstr "Optimiser la fenêtre active horizontalement"
 
 #: ../metadata/core.xml.in.h:62
-msgid "Save plugin states on unload"
-msgstr "Sauvegarder l'état des extensions lors du déchargement"
+msgid "Maximize Window Vertically"
+msgstr "Optimiser la fenêtre verticalement"
 
 #: ../metadata/core.xml.in.h:63
-msgid ""
-"Save the state of plugins when they are unloaded such they will resume their "
-"past internal state when reloaded"
-msgstr ""
-"Sauvegarder l'état des extensions quand elles sont déchargées, afin qu'elles "
-"reprennent leur état interne précédent lorsqu'elles seront rechargées"
+msgid "Maximize active window vertically"
+msgstr "Optimiser la fenêtre active verticalement"
 
 #: ../metadata/core.xml.in.h:64
-msgid "Screen size multiplier for horizontal virtual size"
-msgstr "Multiplicateur de taille d'écran pour taille virtuelle horizontale"
+msgid "Window Menu"
+msgstr "Menu de la fenêtre"
 
 #: ../metadata/core.xml.in.h:65
-msgid "Screen size multiplier for vertical virtual size"
-msgstr "Multiplicateur de taille d'écran pour taille virtuelle verticale"
+msgid "Window menu key binding"
+msgstr "Touche de racourci du menu de la fenêtre"
 
 #: ../metadata/core.xml.in.h:66
-msgid "Show Desktop"
-msgstr "Afficher le Bureau"
+msgid "Window menu button binding"
+msgstr "Bouton de racourci du menu de la fenêtre"
 
 #: ../metadata/core.xml.in.h:67
-msgid "Smart mode"
-msgstr "Mode Élégant"
+msgid "Show Desktop"
+msgstr "Afficher le Bureau"
 
 #: ../metadata/core.xml.in.h:68
-msgid "Toggle Window Maximized"
-msgstr "Basculer la fenêtre agrandie"
+msgid "Hide all windows and focus desktop"
+msgstr "Masquer toutes les fenêtres et afficher le bureau"
 
 #: ../metadata/core.xml.in.h:69
-msgid "Toggle Window Maximized Horizontally"
-msgstr "Basculer la fenêtre agrandie horizontalement"
+msgid "Toggle Window Maximized"
+msgstr "Basculer la fenêtre agrandie"
 
 #: ../metadata/core.xml.in.h:70
-msgid "Toggle Window Maximized Vertically"
-msgstr "Basculer la fenêtre agrandie verticalement"
+msgid "Toggle active window maximized"
+msgstr "Basculer la fenêtre active agrandie"
 
 #: ../metadata/core.xml.in.h:71
-msgid "Toggle Window Shaded"
-msgstr "Basculer la fenêtre ombrée"
+msgid "Toggle Window Maximized Horizontally"
+msgstr "Basculer la fenêtre agrandie horizontalement"
 
 #: ../metadata/core.xml.in.h:72
-msgid "Toggle active window maximized"
-msgstr "Basculer la fenêtre active agrandie"
-
-#: ../metadata/core.xml.in.h:73
 msgid "Toggle active window maximized horizontally"
 msgstr "Basculer la fenêtre active agrandie horizontalement"
 
+#: ../metadata/core.xml.in.h:73
+msgid "Toggle Window Maximized Vertically"
+msgstr "Basculer la fenêtre agrandie verticalement"
+
 #: ../metadata/core.xml.in.h:74
 msgid "Toggle active window maximized vertically"
 msgstr "Basculer la fenêtre active agrandie verticalement"
 
 #: ../metadata/core.xml.in.h:75
-msgid "Toggle active window shaded"
-msgstr "Basculer la fenêtre active ombrée"
+msgid "Toggle Window Shaded"
+msgstr "Basculer la fenêtre ombrée"
 
 #: ../metadata/core.xml.in.h:76
-msgid "Unmaximize Window"
-msgstr "Restaurer la fenêtre"
+msgid "Toggle active window shaded"
+msgstr "Basculer la fenêtre active ombrée"
 
 #: ../metadata/core.xml.in.h:77
-msgid "Unmaximize active window"
-msgstr "Restaurer la fenêtre active"
+msgid "Desktop Size"
+msgstr "Taille du bureau"
 
 #: ../metadata/core.xml.in.h:78
-msgid "Vertical Virtual Size"
-msgstr "Taille virtuelle verticale"
+msgid "Horizontal Virtual Size"
+msgstr "Taille virtuelle horizontale"
 
 #: ../metadata/core.xml.in.h:79
-msgid "Very High"
-msgstr "Très élevé"
+msgid "Screen size multiplier for horizontal virtual size"
+msgstr "Multiplicateur de taille d'écran pour taille virtuelle horizontale"
 
 #: ../metadata/core.xml.in.h:80
-msgid "Which one of overlapping output devices should be preferred"
-msgstr "Quel périphérique de sortie chevauchée devrait être préférée"
+msgid "Vertical Virtual Size"
+msgstr "Taille virtuelle verticale"
 
 #: ../metadata/core.xml.in.h:81
-msgid "Window Menu"
-msgstr "Menu de la fenêtre"
+msgid "Screen size multiplier for vertical virtual size"
+msgstr "Multiplicateur de taille d'écran pour taille virtuelle verticale"
 
 #: ../metadata/core.xml.in.h:82
-msgid "Window menu button binding"
-msgstr "Bouton de racourci du menu de la fenêtre"
+msgid "Number of Desktops"
+msgstr "Nombre de bureaux"
 
 #: ../metadata/core.xml.in.h:83
-msgid "Window menu key binding"
-msgstr "Touche de racourci du menu de la fenêtre"
+msgid "Number of virtual desktops"
+msgstr "Nombre de bureaux virtuels"
 
 #: ../plugins/blur/blur.xml.in.h:1
-msgid "4xBilinear"
-msgstr "Bilinéaire 4x"
+msgid "Blur Windows"
+msgstr "Flouter les fenêtres"
 
 #: ../plugins/blur/blur.xml.in.h:2
-msgid "Alpha Blur"
-msgstr "Flou Alpha"
+msgid "Blur windows"
+msgstr "Flouter les fenêtres"
 
 #: ../plugins/blur/blur.xml.in.h:3
-msgid "Alpha blur windows"
-msgstr "Flou Alpha Fenêtres"
+msgid "Pulse"
+msgstr "Pulsation"
 
 #: ../plugins/blur/blur.xml.in.h:4
-msgid "Blur Filter"
-msgstr "Filtre flou"
+msgid "Pulse effect"
+msgstr "Effet de pulsation"
 
 #: ../plugins/blur/blur.xml.in.h:5
-msgid "Blur Occlusion"
-msgstr "Occlusion Floue"
+msgid "Blur Speed"
+msgstr "Vitesse de flou"
 
 #: ../plugins/blur/blur.xml.in.h:6
-msgid "Blur Saturation"
-msgstr "Saturation du flou"
+msgid "Window blur speed"
+msgstr "Vitesse de floutage de la fenêtre"
 
 #: ../plugins/blur/blur.xml.in.h:7
-msgid "Blur Speed"
-msgstr "Vitesse de flou"
+msgid "Focus blur windows"
+msgstr "Le focus floute les fenêtres"
 
 #: ../plugins/blur/blur.xml.in.h:8
-msgid "Blur Windows"
-msgstr "Flouter les fenêtres"
+msgid "Windows that should be affected by focus blur"
+msgstr "Types de fenêtres devant utiliser le flou du focus"
 
 #: ../plugins/blur/blur.xml.in.h:9
-msgid "Blur behind translucent parts of windows"
-msgstr "Flou derrière les parties transparentes des fenêtres"
+msgid "Focus Blur"
+msgstr "Flou du focus"
 
 #: ../plugins/blur/blur.xml.in.h:10
-msgid "Blur saturation"
-msgstr "Saturation du flou"
+msgid "Blur windows that doesn't have focus"
+msgstr "Flouter les fenêtres qui n'ont pas le focus"
 
 #: ../plugins/blur/blur.xml.in.h:11
-msgid "Blur windows"
-msgstr "Flouter les fenêtres"
+msgid "Alpha blur windows"
+msgstr "Flou Alpha Fenêtres"
 
 #: ../plugins/blur/blur.xml.in.h:12
-msgid "Blur windows that doesn't have focus"
-msgstr "Flouter les fenêtres qui n'ont pas le focus"
+msgid "Windows that should be use alpha blur by default"
+msgstr "Types de fenêtres devant utiliser le fondu par défaut"
 
 #: ../plugins/blur/blur.xml.in.h:13
-msgid "Disable blurring of screen regions obscured by other windows."
-msgstr ""
-"Désactiver le flou des régions de l'écran obscurcies par d'autres fenêtres"
+msgid "Alpha Blur"
+msgstr "Flou Alpha"
 
 #: ../plugins/blur/blur.xml.in.h:14
-msgid "Filter method used for blurring"
-msgstr "Méthode de filtrage utilisée pour le flou"
+msgid "Blur behind translucent parts of windows"
+msgstr "Flou derrière les parties transparentes des fenêtres"
 
 #: ../plugins/blur/blur.xml.in.h:15
-msgid "Focus Blur"
-msgstr "Flou du focus"
+msgid "Blur Filter"
+msgstr "Filtre flou"
 
 #: ../plugins/blur/blur.xml.in.h:16
-msgid "Focus blur windows"
-msgstr "Le focus floute les fenêtres"
+msgid "Filter method used for blurring"
+msgstr "Méthode de filtrage utilisée pour le flou"
 
 #: ../plugins/blur/blur.xml.in.h:17
+msgid "4xBilinear"
+msgstr "Bilinéaire 4x"
+
+#: ../plugins/blur/blur.xml.in.h:18
 msgid "Gaussian"
 msgstr "Gaussien"
 
-#: ../plugins/blur/blur.xml.in.h:18
+#: ../plugins/blur/blur.xml.in.h:19 ../plugins/decor/decor.xml.in.h:17
+#: ../plugins/switcher/switcher.xml.in.h:25
+msgid "Mipmap"
+msgstr "Mipmap"
+
+#: ../plugins/blur/blur.xml.in.h:20
 msgid "Gaussian Radius"
 msgstr "Rayon Gaussien"
 
-#: ../plugins/blur/blur.xml.in.h:19
-msgid "Gaussian Strength"
-msgstr "Puissance Gaussienne"
-
-#: ../plugins/blur/blur.xml.in.h:20
+#: ../plugins/blur/blur.xml.in.h:21
 msgid "Gaussian radius"
 msgstr "Rayon Gaussien"
 
-#: ../plugins/blur/blur.xml.in.h:21
-msgid "Gaussian strength"
-msgstr "Puissance Gaussienne"
-
 #: ../plugins/blur/blur.xml.in.h:22
-msgid "Independent texture fetch"
-msgstr "Récupérer la texture indépendante"
+msgid "Gaussian Strength"
+msgstr "Puissance Gaussienne"
 
-#: ../plugins/blur/blur.xml.in.h:23 ../plugins/decor/decor.xml.in.h:10
-#: ../plugins/switcher/switcher.xml.in.h:16
-msgid "Mipmap"
-msgstr "Mipmap"
+#: ../plugins/blur/blur.xml.in.h:23
+msgid "Gaussian strength"
+msgstr "Puissance Gaussienne"
 
 #: ../plugins/blur/blur.xml.in.h:24
 msgid "Mipmap LOD"
@@ -550,1063 +549,1004 @@
 msgstr "Niveau de détail des Mipmap"
 
 #: ../plugins/blur/blur.xml.in.h:26
-msgid "Pulse"
-msgstr "Pulsation"
+msgid "Blur Saturation"
+msgstr "Saturation du flou"
 
 #: ../plugins/blur/blur.xml.in.h:27
-msgid "Pulse effect"
-msgstr "Effet de pulsation"
+msgid "Blur saturation"
+msgstr "Saturation du flou"
 
 #: ../plugins/blur/blur.xml.in.h:28
-msgid ""
-"Use the available texture units to do as many as possible independent "
-"texture fetches."
-msgstr ""
-"utiliser les unités de texture disponible pour récupérer autant que possible "
-"la texture indépendante"
+msgid "Blur Occlusion"
+msgstr "Occlusion Floue"
 
 #: ../plugins/blur/blur.xml.in.h:29
-msgid "Window blur speed"
-msgstr "Vitesse de floutage de la fenêtre"
+msgid "Disable blurring of screen regions obscured by other windows."
+msgstr ""
+"Désactiver le flou des régions de l'écran obscurcies par d'autres fenêtres"
 
 #: ../plugins/blur/blur.xml.in.h:30
-msgid "Windows that should be affected by focus blur"
-msgstr "Types de fenêtres devant utiliser le flou du focus"
+msgid "Independent texture fetch"
+msgstr "Récupérer la texture indépendante"
 
 #: ../plugins/blur/blur.xml.in.h:31
-msgid "Windows that should be use alpha blur by default"
-msgstr "Types de fenêtres devant utiliser le fondu par défaut"
+msgid ""
+"Use the available texture units to do as many as possible independent "
+"texture fetches."
+msgstr ""
+"utiliser les unités de texture disponible pour récupérer autant que possible "
+"la texture indépendante"
 
 #: ../plugins/commands/commands.xml.in.h:1
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command0"
-msgstr "Un raccourci qui exécutera la commande shell command0"
+#: ../plugins/gnomecompat/gnomecompat.xml.in.h:7
+msgid "Commands"
+msgstr "Commandes"
 
 #: ../plugins/commands/commands.xml.in.h:2
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command1"
-msgstr "Un raccourci qui exécutera la commande shell command1"
+msgid "Assigns bundings to arbitrary commands"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:3
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command10"
-msgstr "Un raccourci qui exécutera la commande shell command10"
+msgid "Command line 0"
+msgstr "Ligne de commande 0"
 
 #: ../plugins/commands/commands.xml.in.h:4
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command11"
-msgstr "Un raccourci qui exécutera la commande shell command11"
+msgid "Command line to be executed in shell when run_command0 is invoked"
+msgstr ""
+"Ligne de commande à exécuter dans le shell lorsque run_command0 est appelé"
 
 #: ../plugins/commands/commands.xml.in.h:5
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command12"
-msgstr ""
-"Une liaison clavier qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command12"
+msgid "Command line 1"
+msgstr "Ligne de commande 1"
 
 #: ../plugins/commands/commands.xml.in.h:6
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command13"
+msgid "Command line to be executed in shell when run_command1 is invoked"
 msgstr ""
-"Une liaison clavier qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command13"
+"Ligne de commande à exécuter dans le shell lorsque run_command1 est appelé"
 
 #: ../plugins/commands/commands.xml.in.h:7
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command14"
-msgstr ""
-"Une liaison clavier qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command14"
+msgid "Command line 2"
+msgstr "Ligne de commande 2"
 
 #: ../plugins/commands/commands.xml.in.h:8
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command2"
-msgstr "Un raccourci qui exécutera la commande shell command2"
+msgid "Command line to be executed in shell when run_command2 is invoked"
+msgstr ""
+"Ligne de commande à exécuter dans le shell lorsque run_command2 est appelé"
 
 #: ../plugins/commands/commands.xml.in.h:9
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command3"
-msgstr "Un raccourci qui exécutera la commande shell command3"
+msgid "Command line 3"
+msgstr "Ligne de commande 3"
 
 #: ../plugins/commands/commands.xml.in.h:10
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command4"
-msgstr "Un raccourci qui exécutera la commande shell command4"
+msgid "Command line to be executed in shell when run_command3 is invoked"
+msgstr ""
+"Ligne de commande à exécuter dans le shell lorsque run_command3 est appelé"
 
 #: ../plugins/commands/commands.xml.in.h:11
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command5"
-msgstr "Un raccourci qui exécutera la commande shell command5"
+msgid "Command line 4"
+msgstr "Ligne de commande 4"
 
 #: ../plugins/commands/commands.xml.in.h:12
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command6"
-msgstr "Un raccourci qui exécutera la commande shell command6"
+msgid "Command line to be executed in shell when run_command4 is invoked"
+msgstr ""
+"Ligne de commande à exécuter dans le shell lorsque run_command4 est appelé"
 
 #: ../plugins/commands/commands.xml.in.h:13
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command7"
-msgstr "Un raccourci qui exécutera la commande shell command7"
+msgid "Command line 5"
+msgstr "Ligne de commande 5"
 
 #: ../plugins/commands/commands.xml.in.h:14
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command8"
-msgstr "Un raccourci qui exécutera la commande shell command8"
+msgid "Command line to be executed in shell when run_command5 is invoked"
+msgstr ""
+"Ligne de commande à exécuter dans le shell lorsque run_command5 est appelé"
 
 #: ../plugins/commands/commands.xml.in.h:15
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command9"
-msgstr "Un raccourci qui exécutera la commande shell command9"
+msgid "Command line 6"
+msgstr "Ligne de commande 6"
 
 #: ../plugins/commands/commands.xml.in.h:16
-msgid ""
-"A button bunding that when invoked, will run the shell command identified by "
-"command15"
+msgid "Command line to be executed in shell when run_command6 is invoked"
 msgstr ""
-"Une liaison clavier qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command15"
+"Ligne de commande à exécuter dans le shell lorsque run_command6 est appelé"
 
 #: ../plugins/commands/commands.xml.in.h:17
-msgid ""
-"A button bunding that when invoked, will run the shell command identified by "
-"command16"
-msgstr ""
-"Une liaison clavier qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command16"
+msgid "Command line 7"
+msgstr "Ligne de commande 7"
 
 #: ../plugins/commands/commands.xml.in.h:18
-msgid ""
-"A button bunding that when invoked, will run the shell command identified by "
-"command17"
+msgid "Command line to be executed in shell when run_command7 is invoked"
 msgstr ""
-"Une liaison clavier qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command17"
+"Ligne de commande à exécuter dans le shell lorsque run_command7 est appelé"
 
 #: ../plugins/commands/commands.xml.in.h:19
-msgid ""
-"A button bunding that when invoked, will run the shell command identified by "
-"command18"
-msgstr ""
-"Une liaison clavier qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command18"
+msgid "Command line 8"
+msgstr "Ligne de commande 8"
 
 #: ../plugins/commands/commands.xml.in.h:20
-msgid ""
-"A button bunding that when invoked, will run the shell command identified by "
-"command19"
+msgid "Command line to be executed in shell when run_command8 is invoked"
 msgstr ""
-"Une liaison clavier qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command19"
+"Ligne de commande à exécuter dans le shell lorsque run_command8 est appelé"
 
 #: ../plugins/commands/commands.xml.in.h:21
-msgid ""
-"A button bunding that when invoked, will run the shell command identified by "
-"command20"
-msgstr ""
-"Une liaison souris qui, lorsqu'elle est appelée, exécutera la commande shell "
-"identifiée par command20"
+msgid "Command line 9"
+msgstr "Ligne de commande 9"
 
 #: ../plugins/commands/commands.xml.in.h:22
-msgid ""
-"A edge binding that when invoked, will run the shell command identified by "
-"command12"
+msgid "Command line to be executed in shell when run_command9 is invoked"
 msgstr ""
-"Une liaison de coin qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command12"
+"Ligne de commande à exécuter dans le shell lorsque run_command9 est appelé"
 
 #: ../plugins/commands/commands.xml.in.h:23
-msgid ""
-"A edge binding that when invoked, will run the shell command identified by "
-"command13"
-msgstr ""
-"Une liaison de coin qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command13"
+msgid "Command line 10"
+msgstr "Ligne de commande 10"
 
 #: ../plugins/commands/commands.xml.in.h:24
-msgid ""
-"A edge binding that when invoked, will run the shell command identified by "
-"command14"
+msgid "Command line to be executed in shell when run_command10 is invoked"
 msgstr ""
-"Une liaison de coin qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command14"
+"Ligne de commande à exécuter dans le shell lorsque run_command10 est appelé"
 
 #: ../plugins/commands/commands.xml.in.h:25
-msgid ""
-"A edge bunding that when invoked, will run the shell command identified by "
-"command15"
-msgstr ""
-"Une liaison de coin qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command15"
+msgid "Command line 11"
+msgstr "Ligne de commande 11"
 
 #: ../plugins/commands/commands.xml.in.h:26
-msgid ""
-"A edge bunding that when invoked, will run the shell command identified by "
-"command16"
+msgid "Command line to be executed in shell when run_command11 is invoked"
 msgstr ""
-"Une liaison de coin qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command16"
+"Ligne de commande à exécuter dans le shell lorsque run_command11 est appelé"
 
 #: ../plugins/commands/commands.xml.in.h:27
-msgid ""
-"A edge bunding that when invoked, will run the shell command identified by "
-"command17"
-msgstr ""
-"Une liaison de coin qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command17"
+msgid "Command line 12"
+msgstr "Ligne de commande 12"
 
 #: ../plugins/commands/commands.xml.in.h:28
-msgid ""
-"A edge bunding that when invoked, will run the shell command identified by "
-"command18"
+msgid "Command line to be executed in shell when run_command12 is invoked"
 msgstr ""
-"Une liaison de coin qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command18"
 
 #: ../plugins/commands/commands.xml.in.h:29
-msgid ""
-"A edge bunding that when invoked, will run the shell command identified by "
-"command19"
+msgid "Command line 13"
 msgstr ""
-"Une liaison de coin qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command19"
 
 #: ../plugins/commands/commands.xml.in.h:30
-msgid ""
-"A edge bunding that when invoked, will run the shell command identified by "
-"command20"
+msgid "Command line to be executed in shell when run_command13 is invoked"
 msgstr ""
-"Une liaison de coin qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command20"
 
 #: ../plugins/commands/commands.xml.in.h:31
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command0"
+msgid "Command line 14"
 msgstr ""
-"Raccourci qui, lorsqu'il est appelé, exécute la commande du shell identifiée "
-"par command0"
 
 #: ../plugins/commands/commands.xml.in.h:32
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command1"
+msgid "Command line to be executed in shell when run_command14 is invoked"
 msgstr ""
-"Raccourci qui, lorsqu'il est appelé, exécute la commande du shell identifiée "
-"par command1"
 
 #: ../plugins/commands/commands.xml.in.h:33
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command10"
+msgid "Command line 15"
 msgstr ""
-"Raccourci qui, lorsqu'il est appelé, exécute la commande du shell identifiée "
-"par command10"
 
 #: ../plugins/commands/commands.xml.in.h:34
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command11"
+msgid "Command line to be executed in shell when run_command15 is invoked"
 msgstr ""
-"Raccourci qui, lorsqu'il est appelé, exécute la commande du shell identifiée "
-"par command11"
 
 #: ../plugins/commands/commands.xml.in.h:35
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command12"
+msgid "Command line 16"
 msgstr ""
-"Une liaison clavier qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command12"
 
 #: ../plugins/commands/commands.xml.in.h:36
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command13"
+msgid "Command line to be executed in shell when run_command16 is invoked"
 msgstr ""
-"Une liaison clavier qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command13"
 
 #: ../plugins/commands/commands.xml.in.h:37
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command14"
+msgid "Command line 17"
 msgstr ""
-"Une liaison clavier qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command14"
 
 #: ../plugins/commands/commands.xml.in.h:38
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command15"
+msgid "Command line to be executed in shell when run_command17 is invoked"
 msgstr ""
-"Une liaison clavier qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command15"
 
 #: ../plugins/commands/commands.xml.in.h:39
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command16"
+msgid "Command line 18"
 msgstr ""
-"Une liaison clavier qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command16"
 
 #: ../plugins/commands/commands.xml.in.h:40
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command17"
+msgid "Command line to be executed in shell when run_command18 is invoked"
 msgstr ""
-"Une liaison clavier qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command17"
 
 #: ../plugins/commands/commands.xml.in.h:41
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command18"
+msgid "Command line 19"
 msgstr ""
-"Une liaison clavier qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command18"
 
 #: ../plugins/commands/commands.xml.in.h:42
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command19"
+msgid "Command line to be executed in shell when run_command19 is invoked"
 msgstr ""
-"Une liaison clavier qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command19"
 
 #: ../plugins/commands/commands.xml.in.h:43
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command2"
+msgid "Command line 20"
 msgstr ""
-"Raccourci qui, lorsqu'il est appelé, exécute la commande du shell identifiée "
-"par command2"
 
 #: ../plugins/commands/commands.xml.in.h:44
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command20"
+msgid "Command line to be executed in shell when run_command20 is invoked"
 msgstr ""
-"Une liaison clavier qui, lorsqu'elle est appelée, exécutera la commande "
-"shell identifiée par command20"
 
 #: ../plugins/commands/commands.xml.in.h:45
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command3"
-msgstr ""
-"Raccourci qui, lorsqu'il est appelé, exécute la commande du shell identifiée "
-"par command3"
+msgid "Key Bindings"
+msgstr "Assignation des touches"
 
 #: ../plugins/commands/commands.xml.in.h:46
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command4"
-msgstr ""
-"Raccourci qui, lorsqu'il est appelé, exécute la commande du shell identifiée "
-"par command4"
+msgid "Run command 0"
+msgstr "Exécuter la commande 0"
 
 #: ../plugins/commands/commands.xml.in.h:47
 msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command5"
+"A keybunding that when invoked, will run the shell command identified by "
+"command0"
 msgstr ""
-"Raccourci qui, lorsqu'il est appelé, exécute la commande du shell identifiée "
-"par command5"
 
 #: ../plugins/commands/commands.xml.in.h:48
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command6"
-msgstr ""
-"Raccourci qui, lorsqu'il est appelé, exécute la commande du shell identifiée "
-"par command6"
+msgid "Run command 1"
+msgstr "Exécuter la commande 1"
 
 #: ../plugins/commands/commands.xml.in.h:49
 msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command7"
+"A keybunding that when invoked, will run the shell command identified by "
+"command1"
 msgstr ""
-"Raccourci qui, lorsqu'il est appelé, exécute la commande du shell identifiée "
-"par command7"
 
 #: ../plugins/commands/commands.xml.in.h:50
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command8"
-msgstr ""
-"Raccourci qui, lorsqu'il est appelé, exécute la commande du shell identifiée "
-"par command8"
+msgid "Run command 2"
+msgstr "Exécuter la commande 2"
 
 #: ../plugins/commands/commands.xml.in.h:51
 msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command9"
+"A keybunding that when invoked, will run the shell command identified by "
+"command2"
 msgstr ""
-"Raccourci qui, lorsqu'il est appelé, exécute la commande du shell identifiée "
-"par command9"
 
 #: ../plugins/commands/commands.xml.in.h:52
-msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command0"
-msgstr ""
-"Une liaison avec un bord de l'écran qui, lorsqu'invoquée, exécutera la "
-"commande command0"
+msgid "Run command 3"
+msgstr "Exécuter la commande 3"
 
 #: ../plugins/commands/commands.xml.in.h:53
 msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command1"
+"A keybunding that when invoked, will run the shell command identified by "
+"command3"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:54
-msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command10"
-msgstr ""
+msgid "Run command 4"
+msgstr "Exécuter la commande 4"
 
 #: ../plugins/commands/commands.xml.in.h:55
 msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command11"
+"A keybunding that when invoked, will run the shell command identified by "
+"command4"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:56
-msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command2"
-msgstr ""
+msgid "Run command 5"
+msgstr "Exécuter la commande 5"
 
 #: ../plugins/commands/commands.xml.in.h:57
 msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command3"
+"A keybunding that when invoked, will run the shell command identified by "
+"command5"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:58
-msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command4"
-msgstr ""
+msgid "Run command 6"
+msgstr "Exécuter la commande 6"
 
 #: ../plugins/commands/commands.xml.in.h:59
 msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command5"
+"A keybunding that when invoked, will run the shell command identified by "
+"command6"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:60
-msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command6"
-msgstr ""
+msgid "Run command 7"
+msgstr "Exécuter la commande 7"
 
 #: ../plugins/commands/commands.xml.in.h:61
 msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
+"A keybunding that when invoked, will run the shell command identified by "
 "command7"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:62
-msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command8"
-msgstr ""
+msgid "Run command 8"
+msgstr "Exécuter la commande 8"
 
 #: ../plugins/commands/commands.xml.in.h:63
 msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command9"
+"A keybunding that when invoked, will run the shell command identified by "
+"command8"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:64
-msgid "Assigns bindings to arbitrary commands"
-msgstr "Assignation de commandes arbitraires"
+msgid "Run command 9"
+msgstr "Exécuter la commande 9"
 
 #: ../plugins/commands/commands.xml.in.h:65
-msgid "Button Bindings"
-msgstr "Assignation des boutons"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command9"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:66
-msgid "Command line 0"
-msgstr "Ligne de commande 0"
+msgid "Run command 10"
+msgstr "Exécuter la commande 10"
 
 #: ../plugins/commands/commands.xml.in.h:67
-msgid "Command line 1"
-msgstr "Ligne de commande 1"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command10"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:68
-msgid "Command line 10"
-msgstr "Ligne de commande 10"
+msgid "Run command 11"
+msgstr "Exécuter la commande 11"
 
 #: ../plugins/commands/commands.xml.in.h:69
-msgid "Command line 11"
-msgstr "Ligne de commande 11"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command11"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:70
-msgid "Command line 12"
-msgstr "Ligne de commande 12"
+msgid "Run command 12"
+msgstr "Exécuter la commande 12"
 
 #: ../plugins/commands/commands.xml.in.h:71
-msgid "Command line 13"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command12"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:72
-msgid "Command line 14"
-msgstr ""
+msgid "Run command 13"
+msgstr "Exécuter la commande 13"
 
 #: ../plugins/commands/commands.xml.in.h:73
-msgid "Command line 15"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command13"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:74
-msgid "Command line 16"
-msgstr ""
+msgid "Run command 14"
+msgstr "Exécuter la commande 14"
 
 #: ../plugins/commands/commands.xml.in.h:75
-msgid "Command line 17"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command14"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:76
-msgid "Command line 18"
-msgstr ""
+msgid "Run command 15"
+msgstr "Exécuter la commande 15"
 
 #: ../plugins/commands/commands.xml.in.h:77
-msgid "Command line 19"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command15"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:78
-msgid "Command line 2"
-msgstr "Ligne de commande 2"
+msgid "Run command 16"
+msgstr "Exécuter la commande 16"
 
 #: ../plugins/commands/commands.xml.in.h:79
-msgid "Command line 20"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command16"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:80
-msgid "Command line 3"
-msgstr "Ligne de commande 3"
+msgid "Run command 17"
+msgstr "Exécuter la commande 17"
 
 #: ../plugins/commands/commands.xml.in.h:81
-msgid "Command line 4"
-msgstr "Ligne de commande 4"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command17"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:82
-msgid "Command line 5"
-msgstr "Ligne de commande 5"
+msgid "Run command 18"
+msgstr "Exécuter la commande 18"
 
 #: ../plugins/commands/commands.xml.in.h:83
-msgid "Command line 6"
-msgstr "Ligne de commande 6"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command18"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:84
-msgid "Command line 7"
-msgstr "Ligne de commande 7"
+msgid "Run command 19"
+msgstr "Exécuter la commande 19"
 
 #: ../plugins/commands/commands.xml.in.h:85
-msgid "Command line 8"
-msgstr "Ligne de commande 8"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command19"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:86
-msgid "Command line 9"
-msgstr "Ligne de commande 9"
+msgid "Run command 20"
+msgstr "Exécuter la commande 20"
 
 #: ../plugins/commands/commands.xml.in.h:87
-msgid "Command line to be executed in shell when run_command0 is invoked"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command20"
 msgstr ""
-"Ligne de commande à exécuter dans le shell lorsque run_command0 est appelé"
 
 #: ../plugins/commands/commands.xml.in.h:88
-msgid "Command line to be executed in shell when run_command1 is invoked"
-msgstr ""
-"Ligne de commande à exécuter dans le shell lorsque run_command1 est appelé"
+msgid "Button Bindings"
+msgstr "Assignation des boutons"
 
 #: ../plugins/commands/commands.xml.in.h:89
-msgid "Command line to be executed in shell when run_command10 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command0"
 msgstr ""
-"Ligne de commande à exécuter dans le shell lorsque run_command10 est appelé"
 
 #: ../plugins/commands/commands.xml.in.h:90
-msgid "Command line to be executed in shell when run_command11 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command1"
 msgstr ""
-"Ligne de commande à exécuter dans le shell lorsque run_command11 est appelé"
 
 #: ../plugins/commands/commands.xml.in.h:91
-msgid "Command line to be executed in shell when run_command12 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command2"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:92
-msgid "Command line to be executed in shell when run_command13 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command3"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:93
-msgid "Command line to be executed in shell when run_command14 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command4"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:94
-msgid "Command line to be executed in shell when run_command15 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command5"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:95
-msgid "Command line to be executed in shell when run_command16 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command6"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:96
-msgid "Command line to be executed in shell when run_command17 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command7"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:97
-msgid "Command line to be executed in shell when run_command18 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command8"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:98
-msgid "Command line to be executed in shell when run_command19 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command9"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:99
-msgid "Command line to be executed in shell when run_command2 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command10"
 msgstr ""
-"Ligne de commande à exécuter dans le shell lorsque run_command2 est appelé"
 
 #: ../plugins/commands/commands.xml.in.h:100
-msgid "Command line to be executed in shell when run_command20 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command11"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:101
-msgid "Command line to be executed in shell when run_command3 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command12"
 msgstr ""
-"Ligne de commande à exécuter dans le shell lorsque run_command3 est appelé"
 
 #: ../plugins/commands/commands.xml.in.h:102
-msgid "Command line to be executed in shell when run_command4 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command13"
 msgstr ""
-"Ligne de commande à exécuter dans le shell lorsque run_command4 est appelé"
 
 #: ../plugins/commands/commands.xml.in.h:103
-msgid "Command line to be executed in shell when run_command5 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command14"
 msgstr ""
-"Ligne de commande à exécuter dans le shell lorsque run_command5 est appelé"
 
 #: ../plugins/commands/commands.xml.in.h:104
-msgid "Command line to be executed in shell when run_command6 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command15"
 msgstr ""
-"Ligne de commande à exécuter dans le shell lorsque run_command6 est appelé"
+"Une liaison clavier qui, lorsqu'elle est appelée, exécutera la commande "
+"shell identifiée par command15"
 
 #: ../plugins/commands/commands.xml.in.h:105
-msgid "Command line to be executed in shell when run_command7 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command16"
 msgstr ""
-"Ligne de commande à exécuter dans le shell lorsque run_command7 est appelé"
+"Une liaison clavier qui, lorsqu'elle est appelée, exécutera la commande "
+"shell identifiée par command16"
 
 #: ../plugins/commands/commands.xml.in.h:106
-msgid "Command line to be executed in shell when run_command8 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command17"
 msgstr ""
-"Ligne de commande à exécuter dans le shell lorsque run_command8 est appelé"
+"Une liaison clavier qui, lorsqu'elle est appelée, exécutera la commande "
+"shell identifiée par command17"
 
 #: ../plugins/commands/commands.xml.in.h:107
-msgid "Command line to be executed in shell when run_command9 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command18"
 msgstr ""
-"Ligne de commande à exécuter dans le shell lorsque run_command9 est appelé"
+"Une liaison clavier qui, lorsqu'elle est appelée, exécutera la commande "
+"shell identifiée par command18"
 
 #: ../plugins/commands/commands.xml.in.h:108
-#: ../plugins/gnomecompat/gnomecompat.xml.in.h:1
-msgid "Commands"
-msgstr "Commandes"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command19"
+msgstr ""
+"Une liaison clavier qui, lorsqu'elle est appelée, exécutera la commande "
+"shell identifiée par command19"
 
 #: ../plugins/commands/commands.xml.in.h:109
-msgid "Edge Bindings"
-msgstr "Assignation des bords"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command20"
+msgstr ""
+"Une liaison souris qui, lorsqu'elle est appelée, exécutera la commande shell "
+"identifiée par command20"
 
 #: ../plugins/commands/commands.xml.in.h:110
-msgid "Key Bindings"
-msgstr "Assignation des touches"
+msgid "Edge Bindings"
+msgstr "Assignation des bords"
 
 #: ../plugins/commands/commands.xml.in.h:111
-msgid "Run command 0"
-msgstr "Exécuter la commande 0"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command0"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:112
-msgid "Run command 1"
-msgstr "Exécuter la commande 1"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command1"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:113
-msgid "Run command 10"
-msgstr "Exécuter la commande 10"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command2"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:114
-msgid "Run command 11"
-msgstr "Exécuter la commande 11"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command3"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:115
-msgid "Run command 12"
-msgstr "Exécuter la commande 12"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command4"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:116
-msgid "Run command 13"
-msgstr "Exécuter la commande 13"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command5"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:117
-msgid "Run command 14"
-msgstr "Exécuter la commande 14"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command6"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:118
-msgid "Run command 15"
-msgstr "Exécuter la commande 15"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command7"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:119
-msgid "Run command 16"
-msgstr "Exécuter la commande 16"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command8"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:120
-msgid "Run command 17"
-msgstr "Exécuter la commande 17"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command9"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:121
-msgid "Run command 18"
-msgstr "Exécuter la commande 18"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command10"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:122
-msgid "Run command 19"
-msgstr "Exécuter la commande 19"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command11"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:123
-msgid "Run command 2"
-msgstr "Exécuter la commande 2"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command12"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:124
-msgid "Run command 20"
-msgstr "Exécuter la commande 20"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command13"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:125
-msgid "Run command 3"
-msgstr "Exécuter la commande 3"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command14"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:126
-msgid "Run command 4"
-msgstr "Exécuter la commande 4"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command15"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:127
-msgid "Run command 5"
-msgstr "Exécuter la commande 5"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command16"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:128
-msgid "Run command 6"
-msgstr "Exécuter la commande 6"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command17"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:129
-msgid "Run command 7"
-msgstr "Exécuter la commande 7"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command18"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:130
-msgid "Run command 8"
-msgstr "Exécuter la commande 8"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command19"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:131
-msgid "Run command 9"
-msgstr "Exécuter la commande 9"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command20"
+msgstr ""
 
 #: ../plugins/composite/composite.xml.in.h:1
-msgid ""
-"Allow drawing of fullscreen windows to not be redirected to offscreen pixmaps"
+msgid "Composite"
 msgstr ""
-"Empêcher la redirection vers des pixmaps hors de l'écran lors de l'affichage "
-"des fenêtres plein écran"
 
 #: ../plugins/composite/composite.xml.in.h:2
-msgid "Automatic detection of refresh rate"
-msgstr "Détection automatique de la fréquence de rafraîchissement"
+msgid "Composite plugin"
+msgstr ""
 
 #: ../plugins/composite/composite.xml.in.h:3
-msgid "Composite"
-msgstr ""
+msgid "Slow Animations"
+msgstr "Ralentir les animations"
 
 #: ../plugins/composite/composite.xml.in.h:4
-msgid "Composite plugin"
-msgstr ""
+msgid "Toggle use of slow animations"
+msgstr "Basculer l'utilisation d'animations lentes"
 
 #: ../plugins/composite/composite.xml.in.h:5
 msgid "Detect Refresh Rate"
 msgstr "Détecter la fréquence de rafraîchissement"
 
-# coloration trouvé plus juste que peinture
 #: ../plugins/composite/composite.xml.in.h:6
-msgid "Force independent output painting."
-msgstr "Forcer le rendement indépendant de coloration"
+msgid "Automatic detection of refresh rate"
+msgstr "Détection automatique de la fréquence de rafraîchissement"
 
 #: ../plugins/composite/composite.xml.in.h:7
-msgid ""
-"Paint each output device independly, even if the output devices overlap"
-msgstr ""
-"Peindre chaque sortie de périphérique indépendamment, même si elles se "
-"chevauchent."
-
-#: ../plugins/composite/composite.xml.in.h:8
 msgid "Refresh Rate"
 msgstr "Fréquence de rafraîchissement"
 
+#: ../plugins/composite/composite.xml.in.h:8
+msgid "The rate at which the screen is redrawn (times/second)"
+msgstr "Vitesse à laquelle l'écran est redessiné (fois/seconde)"
+
 #: ../plugins/composite/composite.xml.in.h:9
-msgid "Slow Animations"
-msgstr "Ralentir les animations"
+msgid "Unredirect Fullscreen Windows"
+msgstr "Ne pas rediriger les fenêtres plein écran"
 
 #: ../plugins/composite/composite.xml.in.h:10
-msgid "The rate at which the screen is redrawn (times/second)"
-msgstr "Vitesse à laquelle l'écran est redessiné (fois/seconde)"
+msgid ""
+"Allow drawing of fullscreen windows to not be redirected to offscreen pixmaps"
+msgstr ""
+"Empêcher la redirection vers des pixmaps hors de l'écran lors de l'affichage "
+"des fenêtres plein écran"
 
+# coloration trouvé plus juste que peinture
 #: ../plugins/composite/composite.xml.in.h:11
-msgid "Toggle use of slow animations"
-msgstr "Basculer l'utilisation d'animations lentes"
+msgid "Force independent output painting."
+msgstr "Forcer le rendement indépendant de coloration"
 
 #: ../plugins/composite/composite.xml.in.h:12
-msgid "Unredirect Fullscreen Windows"
-msgstr "Ne pas rediriger les fenêtres plein écran"
+msgid ""
+"Paint each output device independly, even if the output devices overlap"
+msgstr ""
+"Peindre chaque sortie de périphérique indépendamment, même si elles se "
+"chevauchent."
 
 #: ../plugins/copytex/copytex.xml.in.h:1
-msgid "Copy pixmap content to texture"
+msgid "Copy to texture"
 msgstr ""
 
 #: ../plugins/copytex/copytex.xml.in.h:2
-msgid "Copy to texture"
+msgid "Copy pixmap content to texture"
 msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:1
-msgid "Allow mipmaps to be generated for decoration textures"
-msgstr "Permettre la génération de mipmaps pour les textures de décoration"
+msgid "Window Decoration"
+msgstr "Décoration de la fenêtre"
 
 #: ../plugins/decor/decor.xml.in.h:2
-msgid "Command"
-msgstr "Commande"
+msgid "Window decorations"
+msgstr "Décorations des fenêtres"
 
 #: ../plugins/decor/decor.xml.in.h:3
-msgid "Decoration windows"
-msgstr "Décoration des fenêtres"
+msgid "Active Shadow"
+msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:4
-msgid ""
-"Decorator command line that is executed if no decorator is already running"
-msgstr ""
-"Ligne de commande du décorateur qui est exécutée si aucun décorateur ne "
-"fonctionne"
+msgid "Shadow Radius"
+msgstr "Rayon de l'ombre"
 
 #: ../plugins/decor/decor.xml.in.h:5
-msgid "Drop shadow X offset"
-msgstr "Décalage X de l'ombre des gouttes"
+msgid "Drop shadow radius"
+msgstr "Rayon de l'ombre des gouttes"
 
 #: ../plugins/decor/decor.xml.in.h:6
-msgid "Drop shadow Y offset"
-msgstr "Décalage Y de l'ombre des gouttes"
+msgid "Shadow Opacity"
+msgstr "Opacité de l'ombre"
 
 #: ../plugins/decor/decor.xml.in.h:7
-msgid "Drop shadow color"
-msgstr "Couleur de l'ombre des gouttes"
-
-#: ../plugins/decor/decor.xml.in.h:8
 msgid "Drop shadow opacity"
 msgstr "Opacité de l'ombre des gouttes"
 
-#: ../plugins/decor/decor.xml.in.h:9
-msgid "Drop shadow radius"
-msgstr "Rayon de l'ombre des gouttes"
-
-#: ../plugins/decor/decor.xml.in.h:11
+#: ../plugins/decor/decor.xml.in.h:8
 msgid "Shadow Color"
 msgstr "Couleur de l'ombre"
 
-#: ../plugins/decor/decor.xml.in.h:12
+#: ../plugins/decor/decor.xml.in.h:9
+msgid "Drop shadow color"
+msgstr "Couleur de l'ombre des gouttes"
+
+#: ../plugins/decor/decor.xml.in.h:10
 msgid "Shadow Offset X"
 msgstr "Décalage X de l'ombre"
 
-#: ../plugins/decor/decor.xml.in.h:13
+#: ../plugins/decor/decor.xml.in.h:11
+msgid "Drop shadow X offset"
+msgstr "Décalage X de l'ombre des gouttes"
+
+#: ../plugins/decor/decor.xml.in.h:12
 msgid "Shadow Offset Y"
 msgstr "Décalage Y de l'ombre"
 
+#: ../plugins/decor/decor.xml.in.h:13
+msgid "Drop shadow Y offset"
+msgstr "Décalage Y de l'ombre des gouttes"
+
 #: ../plugins/decor/decor.xml.in.h:14
-msgid "Shadow Opacity"
-msgstr "Opacité de l'ombre"
+msgid "Inactive Shadow"
+msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:15
-msgid "Shadow Radius"
-msgstr "Rayon de l'ombre"
+msgid "Command"
+msgstr "Commande"
 
 #: ../plugins/decor/decor.xml.in.h:16
-msgid "Shadow windows"
-msgstr "Ombrer les fenêtres"
-
-#: ../plugins/decor/decor.xml.in.h:17
-msgid "Window Decoration"
-msgstr "Décoration de la fenêtre"
+msgid ""
+"Decorator command line that is executed if no decorator is already running"
+msgstr ""
+"Ligne de commande du décorateur qui est exécutée si aucun décorateur ne "
+"fonctionne"
 
 #: ../plugins/decor/decor.xml.in.h:18
-msgid "Window decorations"
-msgstr "Décorations des fenêtres"
+msgid "Allow mipmaps to be generated for decoration textures"
+msgstr "Permettre la génération de mipmaps pour les textures de décoration"
 
 #: ../plugins/decor/decor.xml.in.h:19
+msgid "Decoration windows"
+msgstr "Décoration des fenêtres"
+
+#: ../plugins/decor/decor.xml.in.h:20
 msgid "Windows that should be decorated"
 msgstr "Types de fenêtres devant être décorées"
 
-#: ../plugins/decor/decor.xml.in.h:20
+#: ../plugins/decor/decor.xml.in.h:21
+msgid "Shadow windows"
+msgstr "Ombrer les fenêtres"
+
+#: ../plugins/decor/decor.xml.in.h:22
 msgid "Windows that should have a shadow"
 msgstr "Types de fenêtres devant avoir une ombre"
 
+#: ../plugins/fade/fade.xml.in.h:1
+msgid "Fading Windows"
+msgstr "Types de fenêtres à animer"
+
 #: ../plugins/fade/fade.xml.in.h:2
-#, no-c-format
-msgid "Brightness (in %) of unresponsive windows"
-msgstr "Luminosité (en %) des fenêtres ne répondant pas"
+msgid "Fade in windows when mapped and fade out windows when unmapped"
+msgstr "Apparition/disparition en fondu des fenêtres à l'ouverture/fermeture"
 
 #: ../plugins/fade/fade.xml.in.h:3
-msgid "Constant speed"
-msgstr "Vitesse constante"
+msgid "Fade Mode"
+msgstr "Mode de Fondu"
 
 #: ../plugins/fade/fade.xml.in.h:4
-msgid "Constant time"
-msgstr "Temps constant"
+msgid "Window fade mode"
+msgstr "Mode de fondu de la fenêtre"
 
 #: ../plugins/fade/fade.xml.in.h:5
-msgid "Dim Unresponsive Windows"
-msgstr "Fenêtres ne répondant pas ternes"
+msgid "Constant speed"
+msgstr "Vitesse constante"
 
 #: ../plugins/fade/fade.xml.in.h:6
-msgid "Dim windows that are not responding to window manager requests"
-msgstr ""
-"Les Fenêtres ternes qui ne répondent pas aux requêtes du gestionnaire de "
-"fenêtres."
+msgid "Constant time"
+msgstr "Temps constant"
 
 #: ../plugins/fade/fade.xml.in.h:7
-msgid "Fade Mode"
-msgstr "Mode de Fondu"
-
-#: ../plugins/fade/fade.xml.in.h:8
 msgid "Fade Speed"
 msgstr "Vitesse de fondu"
 
+#: ../plugins/fade/fade.xml.in.h:8
+msgid "Window fade speed"
+msgstr "Vitesse de fondu de la fenêtre"
+
 #: ../plugins/fade/fade.xml.in.h:9
 msgid "Fade Time"
 msgstr "Temps de Fondu"
 
 #: ../plugins/fade/fade.xml.in.h:10
-msgid "Fade effect on system beep"
-msgstr "Effet de fondu au signal sonore du système"
+msgid "Window fade time (in ms) in \"Constant time\" mode"
+msgstr ""
+"Temps (en ms) du fondu d'une fenêtre dans le mode de \"Vitesse constante\""
 
 #: ../plugins/fade/fade.xml.in.h:11
-msgid "Fade in windows when mapped and fade out windows when unmapped"
-msgstr "Apparition/disparition en fondu des fenêtres à l'ouverture/fermeture"
-
-#: ../plugins/fade/fade.xml.in.h:12
 msgid "Fade windows"
 msgstr "Fondu des Fenêtres"
 
+#: ../plugins/fade/fade.xml.in.h:12
+msgid "Windows that should be fading"
+msgstr "Types de Fenêtres devant utiliser le fondu"
+
 #: ../plugins/fade/fade.xml.in.h:13
-msgid "Fading Windows"
-msgstr "Types de fenêtres à animer"
+msgid "Visual Bell"
+msgstr "Cloche visuelle"
 
 #: ../plugins/fade/fade.xml.in.h:14
+msgid "Fade effect on system beep"
+msgstr "Effet de fondu au signal sonore du système"
+
+#: ../plugins/fade/fade.xml.in.h:15
 msgid "Fullscreen Visual Bell"
 msgstr "Cloche visuelle plein écran"
 
-#: ../plugins/fade/fade.xml.in.h:15
+#: ../plugins/fade/fade.xml.in.h:16
 msgid "Fullscreen fade effect on system beep"
 msgstr "Effet de fondu plein écran au signal sonore du système"
 
 #: ../plugins/fade/fade.xml.in.h:17
-#, no-c-format
-msgid "Saturation (in %) of unresponsive windows"
-msgstr "Saturation (en %) des fenêtres ne répondant pas"
+msgid "Dim Unresponsive Windows"
+msgstr "Fenêtres ne répondant pas ternes"
 
 #: ../plugins/fade/fade.xml.in.h:18
-msgid "Unresponsive Window Brightness"
-msgstr "Luminosité d'une fenêtre ne répondant pas"
+msgid "Dim windows that are not responding to window manager requests"
+msgstr ""
+"Les Fenêtres ternes qui ne répondent pas aux requêtes du gestionnaire de "
+"fenêtres."
 
 #: ../plugins/fade/fade.xml.in.h:19
-msgid "Unresponsive Window Saturation"
-msgstr "Saturation d'une fenêtre ne répondant pas"
-
-#: ../plugins/fade/fade.xml.in.h:20
-msgid "Visual Bell"
-msgstr "Cloche visuelle"
+msgid "Unresponsive Window Brightness"
+msgstr "Luminosité d'une fenêtre ne répondant pas"
 
 #: ../plugins/fade/fade.xml.in.h:21
-msgid "Window fade mode"
-msgstr "Mode de fondu de la fenêtre"
+#, no-c-format
+msgid "Brightness (in %) of unresponsive windows"
+msgstr "Luminosité (en %) des fenêtres ne répondant pas"
 
 #: ../plugins/fade/fade.xml.in.h:22
-msgid "Window fade speed"
-msgstr "Vitesse de fondu de la fenêtre"
-
-#: ../plugins/fade/fade.xml.in.h:23
-msgid "Window fade time (in ms) in \"Constant time\" mode"
-msgstr ""
-"Temps (en ms) du fondu d'une fenêtre dans le mode de \"Vitesse constante\""
+msgid "Unresponsive Window Saturation"
+msgstr "Saturation d'une fenêtre ne répondant pas"
 
 #: ../plugins/fade/fade.xml.in.h:24
-msgid "Windows that should be fading"
-msgstr "Types de Fenêtres devant utiliser le fondu"
+#, no-c-format
+msgid "Saturation (in %) of unresponsive windows"
+msgstr "Saturation (en %) des fenêtres ne répondant pas"
 
-#: ../plugins/gnomecompat/gnomecompat.xml.in.h:2
+#: ../plugins/gnomecompat/gnomecompat.xml.in.h:1
 msgid "Gnome Compatibility"
 msgstr "Compatibilité avec Gnome"
 
-#: ../plugins/gnomecompat/gnomecompat.xml.in.h:3
-msgid "Open a terminal"
-msgstr "Ouvrir un terminal"
-
-#: ../plugins/gnomecompat/gnomecompat.xml.in.h:4
+#: ../plugins/gnomecompat/gnomecompat.xml.in.h:2
 msgid "Options that keep Compiz compatible to the Gnome desktop environment"
 msgstr ""
 "Options qui rendent Compiz compatible avec l'environnement de bureau Gnome"
 
+#: ../plugins/gnomecompat/gnomecompat.xml.in.h:3
+msgid "Show Main Menu"
+msgstr "Afficher le menu principal"
+
+#: ../plugins/gnomecompat/gnomecompat.xml.in.h:4
+msgid "Show the main menu"
+msgstr "Afficher le menu principal"
+
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:5
 msgid "Run Dialog"
 msgstr "Boîte de dialogue d'exécution"
 
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:6
-msgid "Run terminal command"
-msgstr "Commande pour lancer le Terminal"
+msgid "Show Run Application dialog"
+msgstr "Afficher la boîte de dialogue d'exécution de l'application"
 
-#: ../plugins/gnomecompat/gnomecompat.xml.in.h:7
+#: ../plugins/gnomecompat/gnomecompat.xml.in.h:8
 msgid "Screenshot command line"
 msgstr "Ligne de commande de capture d'écran"
 
-#: ../plugins/gnomecompat/gnomecompat.xml.in.h:8
-msgid "Show Main Menu"
-msgstr "Afficher le menu principal"
-
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:9
-msgid "Show Run Application dialog"
-msgstr "Afficher la boîte de dialogue d'exécution de l'application"
+msgid "Take a screenshot"
+msgstr "Faire une capture d'écran"
 
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:10
-msgid "Show the main menu"
-msgstr "Afficher le menu principal"
+msgid "Window screenshot command line"
+msgstr "Ligne de commande de capture de fenêtre"
 
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:11
-msgid "Take a screenshot"
-msgstr "Faire une capture d'écran"
-
-#: ../plugins/gnomecompat/gnomecompat.xml.in.h:12
 msgid "Take a screenshot of a window"
 msgstr "Faire une capture d'écran d'une fenêtre"
 
+#: ../plugins/gnomecompat/gnomecompat.xml.in.h:12
+msgid "Run terminal command"
+msgstr "Commande pour lancer le Terminal"
+
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:13
 msgid "Terminal command line"
 msgstr "Commande à lancer pour le Terminal"
 
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:14
-msgid "Window screenshot command line"
-msgstr "Ligne de commande de capture de fenêtre"
+msgid "Open a terminal"
+msgstr "Ouvrir un terminal"
 
 #: ../plugins/imgpng/imgpng.xml.in.h:1
 msgid "Png"
@@ -1617,28 +1557,20 @@
 msgstr "Chargeur d'Images png"
 
 #: ../plugins/imgsvg/imgsvg.xml.in.h:1
-msgid "Set overlay"
-msgstr ""
-
-#: ../plugins/imgsvg/imgsvg.xml.in.h:2
-msgid "Set window overlay"
-msgstr ""
-
-#: ../plugins/imgsvg/imgsvg.xml.in.h:3
 msgid "Svg"
 msgstr "Svg"
 
-#: ../plugins/imgsvg/imgsvg.xml.in.h:4
+#: ../plugins/imgsvg/imgsvg.xml.in.h:2
 msgid "Svg image loader"
 msgstr "Chargeur d'images Svg"
 
-#: ../plugins/ini/ini.xml.in.h:1
-msgid "Ini"
-msgstr "Ini (Ne pas modifier)"
-
-#: ../plugins/ini/ini.xml.in.h:2
-msgid "Ini Flat File Backend"
-msgstr "Ini Flat File Backend"
+#: ../plugins/imgsvg/imgsvg.xml.in.h:3
+msgid "Set overlay"
+msgstr ""
+
+#: ../plugins/imgsvg/imgsvg.xml.in.h:4
+msgid "Set window overlay"
+msgstr ""
 
 #: ../plugins/inotify/inotify.xml.in.h:1
 msgid "File Watcher"
@@ -1649,45 +1581,42 @@
 msgstr "Extension pour la notification de modification de fichier"
 
 #: ../plugins/move/move.xml.in.h:1
-msgid "Constrain Y"
-msgstr "Contraindre Y"
+msgid "Move Window"
+msgstr "Déplacer la fenêtre"
 
 #: ../plugins/move/move.xml.in.h:2
-msgid "Constrain Y coordinate to workspace area"
-msgstr ""
-"Contraindre la coordonnée Y à être dans la zone de l'espace de travail"
+msgid "Move window"
+msgstr "Déplacer la fenêtre"
 
 #: ../plugins/move/move.xml.in.h:3
-msgid ""
-"Do not update the server-side position of windows until finished moving"
-msgstr ""
-"Ne pas mettre à jour la position de la fenêtre coté serveur, tant que son "
-"mouvement n'est pas fini"
-
-#: ../plugins/move/move.xml.in.h:4
 msgid "Initiate Window Move"
 msgstr "Lancer le déplacement de fenêtre"
 
-#: ../plugins/move/move.xml.in.h:5
-msgid "Lazy Positioning"
-msgstr "Positionnement souple"
+#: ../plugins/move/move.xml.in.h:4
+msgid "Start moving window"
+msgstr "Démarrer le déplacement de la fenêtre"
+
+#: ../plugins/move/move.xml.in.h:5 ../plugins/scale/scale.xml.in.h:12
+#: ../plugins/switcher/switcher.xml.in.h:31
+msgid "Opacity"
+msgstr "Opacité"
 
 #: ../plugins/move/move.xml.in.h:6
-msgid "Move Window"
-msgstr "Déplacer la fenêtre"
+msgid "Opacity level of moving windows"
+msgstr "Niveau d'opacité pour déplacer des fenêtres"
 
 #: ../plugins/move/move.xml.in.h:7
-msgid "Move window"
-msgstr "Déplacer la fenêtre"
+msgid "Constrain Y"
+msgstr "Contraindre Y"
 
-#: ../plugins/move/move.xml.in.h:8 ../plugins/scale/scale.xml.in.h:29
-#: ../plugins/switcher/switcher.xml.in.h:23
-msgid "Opacity"
-msgstr "Opacité"
+#: ../plugins/move/move.xml.in.h:8
+msgid "Constrain Y coordinate to workspace area"
+msgstr ""
+"Contraindre la coordonnée Y à être dans la zone de l'espace de travail"
 
 #: ../plugins/move/move.xml.in.h:9
-msgid "Opacity level of moving windows"
-msgstr "Niveau d'opacité pour déplacer des fenêtres"
+msgid "Snapoff maximized windows"
+msgstr "Désactiver l'alignement des fenêtres agrandies"
 
 #: ../plugins/move/move.xml.in.h:10
 msgid "Snapoff and auto unmaximized maximized windows when dragging"
@@ -1696,250 +1625,253 @@
 "lorsque vous les faites glisser"
 
 #: ../plugins/move/move.xml.in.h:11
-msgid "Snapoff maximized windows"
-msgstr "Désactiver l'alignement des fenêtres agrandies"
+msgid "Lazy Positioning"
+msgstr "Positionnement souple"
 
 #: ../plugins/move/move.xml.in.h:12
-msgid "Start moving window"
-msgstr "Démarrer le déplacement de la fenêtre"
+msgid ""
+"Do not update the server-side position of windows until finished moving"
+msgstr ""
+"Ne pas mettre à jour la position de la fenêtre coté serveur, tant que son "
+"mouvement n'est pas fini"
 
 #: ../plugins/opengl/opengl.xml.in.h:1
-msgid "Best"
-msgstr "Meilleur"
+msgid "OpenGL"
+msgstr ""
 
 #: ../plugins/opengl/opengl.xml.in.h:2
-msgid "Fast"
-msgstr "Rapide"
+msgid "OpenGL Plugin"
+msgstr ""
 
 #: ../plugins/opengl/opengl.xml.in.h:3
-msgid "Good"
-msgstr "Bon"
+msgid "Texture Filter"
+msgstr "Filtre de texture"
 
 #: ../plugins/opengl/opengl.xml.in.h:4
-msgid "If available use compression for textures converted from images"
-msgstr ""
-"Si elle est disponible, utiliser la compression des textures venant d'images "
-"converties"
+msgid "Texture filtering"
+msgstr "Filtrage de texture"
 
 #: ../plugins/opengl/opengl.xml.in.h:5
-msgid "Lighting"
-msgstr "Éclairage"
+msgid "Fast"
+msgstr "Rapide"
 
 #: ../plugins/opengl/opengl.xml.in.h:6
-msgid "Only perform screen updates during vertical blanking period"
-msgstr ""
-"N'effectuer les mises à jour de l'écran que lors de la période de vidage "
-"vertical"
+msgid "Good"
+msgstr "Bon"
 
 #: ../plugins/opengl/opengl.xml.in.h:7
-msgid "OpenGL"
-msgstr ""
+msgid "Best"
+msgstr "Meilleur"
 
 #: ../plugins/opengl/opengl.xml.in.h:8
-msgid "OpenGL Plugin"
-msgstr ""
+msgid "Lighting"
+msgstr "Éclairage"
 
 #: ../plugins/opengl/opengl.xml.in.h:9
-msgid "Sync To VBlank"
-msgstr "Sync vers VBlank"
+msgid "Use diffuse light when screen is transformed"
+msgstr "Utiliser la lumière diffuse lorsque l'écran est transformé"
 
 #: ../plugins/opengl/opengl.xml.in.h:10
-msgid "Texture Compression"
-msgstr "Compression de texture"
+msgid "Sync To VBlank"
+msgstr "Sync vers VBlank"
 
 #: ../plugins/opengl/opengl.xml.in.h:11
-msgid "Texture Filter"
-msgstr "Filtre de texture"
+msgid "Only perform screen updates during vertical blanking period"
+msgstr ""
+"N'effectuer les mises à jour de l'écran que lors de la période de vidage "
+"vertical"
 
 #: ../plugins/opengl/opengl.xml.in.h:12
-msgid "Texture filtering"
-msgstr "Filtrage de texture"
+msgid "Texture Compression"
+msgstr "Compression de texture"
 
 #: ../plugins/opengl/opengl.xml.in.h:13
-msgid "Use diffuse light when screen is transformed"
-msgstr "Utiliser la lumière diffuse lorsque l'écran est transformé"
+msgid "If available use compression for textures converted from images"
+msgstr ""
+"Si elle est disponible, utiliser la compression des textures venant d'images "
+"converties"
 
 #: ../plugins/place/place.xml.in.h:1
-msgid "Algorithm to use for window placement"
-msgstr "Algorithme à utiliser pour le déplacement des fenêtres"
+msgid "Place Windows"
+msgstr "Placer des fenêtres"
 
 #: ../plugins/place/place.xml.in.h:2
-msgid "Cascade"
-msgstr "Cascade"
+msgid "Place windows at appropriate positions when mapped"
+msgstr ""
+"Placer des fenêtres aux positions correctes lorsqu'elles sont mappées"
 
 #: ../plugins/place/place.xml.in.h:3
-msgid "Centered"
-msgstr "Centré"
+msgid "Workarounds"
+msgstr "Solutions"
 
 #: ../plugins/place/place.xml.in.h:4
-msgid "Fixed Window Placement"
-msgstr "Placement des fenêtres fixes"
+msgid "Window placement workarounds"
+msgstr "Solutions de placement de fenêtre"
 
 #: ../plugins/place/place.xml.in.h:5
-msgid "Force Placement Windows"
-msgstr "Forcer le Placement d'une fenêtre"
+msgid "Placement Mode"
+msgstr "Mode de placement"
 
 #: ../plugins/place/place.xml.in.h:6
-msgid "Horizontal viewport positions"
-msgstr "Positions du viewport horizontal"
+msgid "Algorithm to use for window placement"
+msgstr "Algorithme à utiliser pour le déplacement des fenêtres"
 
 #: ../plugins/place/place.xml.in.h:7
-msgid "Keep In Workarea"
-msgstr "Garder dans la Zone de Travail"
+msgid "Cascade"
+msgstr "Cascade"
 
 #: ../plugins/place/place.xml.in.h:8
-msgid ""
-"Keep placed window in work area, even if that means that the position might "
-"differ from the specified position"
-msgstr ""
-"Garder la fenêtre dans la zone de travail, même si cela signifie que la "
-"position peut différer de celle spécifiée"
+msgid "Centered"
+msgstr "Centré"
 
 #: ../plugins/place/place.xml.in.h:9
+msgid "Smart"
+msgstr "Intelligent"
+
+#: ../plugins/place/place.xml.in.h:10
 msgid "Maximize"
 msgstr "Maximiser"
 
-#: ../plugins/place/place.xml.in.h:10
-msgid "Mode"
+#: ../plugins/place/place.xml.in.h:11
+msgid "Random"
+msgstr "Aléatoire"
+
+#: ../plugins/place/place.xml.in.h:12
+msgid "Pointer"
 msgstr ""
 
-#: ../plugins/place/place.xml.in.h:11 ../plugins/scale/scale.xml.in.h:25
+#: ../plugins/place/place.xml.in.h:13 ../plugins/scale/scale.xml.in.h:26
 msgid "Multi Output Mode"
 msgstr "Mode de sorties multiples"
 
-#: ../plugins/place/place.xml.in.h:12
-msgid "Place Windows"
-msgstr "Placer des fenêtres"
-
-#: ../plugins/place/place.xml.in.h:13
-msgid "Place across all outputs"
-msgstr "Placer à travers toutes les sorties"
-
 #: ../plugins/place/place.xml.in.h:14
-msgid "Place windows at appropriate positions when mapped"
+msgid ""
+"Selects how window placement should behave if multiple outputs are selected"
 msgstr ""
-"Placer des fenêtres aux positions correctes lorsqu'elles sont mappées"
+"Sélectionne comme un emplacement de fenêtre pourrait se comporter si "
+"plusieurs sorties sont sélectionnées"
 
 #: ../plugins/place/place.xml.in.h:15
-msgid "Placement Mode"
-msgstr "Mode de placement"
+msgid "Use active output device"
+msgstr "Utilise la périphérique de sortie actif"
 
 #: ../plugins/place/place.xml.in.h:16
-msgid "Pointer"
-msgstr ""
+msgid "Use output device with pointer"
+msgstr "Utilise la périphérique de sortie avec le pointeur"
 
 #: ../plugins/place/place.xml.in.h:17
-msgid "Positioned windows"
-msgstr "Fenêtres positionnées"
+msgid "Use output device of focussed window"
+msgstr "Utilise la périphérique de sortie sur la fenêtre active"
 
 #: ../plugins/place/place.xml.in.h:18
-msgid "Positioning modes"
-msgstr ""
+msgid "Place across all outputs"
+msgstr "Placer à travers toutes les sorties"
 
 #: ../plugins/place/place.xml.in.h:19
-msgid "Random"
-msgstr "Aléatoire"
+msgid "Force Placement Windows"
+msgstr "Forcer le Placement d'une fenêtre"
 
 #: ../plugins/place/place.xml.in.h:20
 msgid ""
-"Selects how window placement should behave if multiple outputs are selected"
+"Windows that should forcedly be placed, even if they indicate the window "
+"manager should avoid placing them."
 msgstr ""
-"Sélectionne comme un emplacement de fenêtre pourrait se comporter si "
-"plusieurs sorties sont sélectionnées"
+"Les fenêtres pourrait être forcées à se situer, même si elles indiquent que "
+"le gestionnaire de fenêtre pourrait éviter de les situer."
 
 #: ../plugins/place/place.xml.in.h:21
-msgid "Smart"
-msgstr "Intelligent"
+msgid "Fixed Window Placement"
+msgstr "Placement des fenêtres fixes"
 
 #: ../plugins/place/place.xml.in.h:22
-msgid "Use active output device"
-msgstr "Utilise la périphérique de sortie actif"
+msgid "Windows with fixed positions"
+msgstr "Fenêtres avec des positions fixes"
 
 #: ../plugins/place/place.xml.in.h:23
-msgid "Use output device of focussed window"
-msgstr "Utilise la périphérique de sortie sur la fenêtre active"
+msgid "Positioned windows"
+msgstr "Fenêtres positionnées"
 
 #: ../plugins/place/place.xml.in.h:24
-msgid "Use output device with pointer"
-msgstr "Utilise la périphérique de sortie avec le pointeur"
+msgid "Windows that should be positioned by default"
+msgstr "Fenêtres devant être positionnées par défaut"
 
 #: ../plugins/place/place.xml.in.h:25
-msgid "Vertical viewport positions"
-msgstr "Positions du viewport vertical"
+msgid "X Positions"
+msgstr "Positions en X"
 
 #: ../plugins/place/place.xml.in.h:26
-msgid "Viewport positioned windows"
-msgstr "Fenêtres positionnées sur un bureau"
+msgid "X position values"
+msgstr "Valeurs de la position en X"
 
 #: ../plugins/place/place.xml.in.h:27
-msgid "Window placement workarounds"
-msgstr "Solutions de placement de fenêtre"
+msgid "Y Positions"
+msgstr "Positions en Y"
 
 #: ../plugins/place/place.xml.in.h:28
-msgid "Windows"
-msgstr "Fenêtres"
+msgid "Y position values"
+msgstr "Valeurs de la position en Y"
 
 #: ../plugins/place/place.xml.in.h:29
-msgid "Windows that should be positioned by default"
-msgstr "Fenêtres devant être positionnées par défaut"
+msgid "Keep In Workarea"
+msgstr "Garder dans la Zone de Travail"
 
 #: ../plugins/place/place.xml.in.h:30
-msgid "Windows that should be positioned in specific viewports by default"
+msgid ""
+"Keep placed window in work area, even if that means that the position might "
+"differ from the specified position"
 msgstr ""
-"Types de fenêtres qui devraient être positionnées sur un bureau spécifique "
-"par défaut"
+"Garder la fenêtre dans la zone de travail, même si cela signifie que la "
+"position peut différer de celle spécifiée"
 
 #: ../plugins/place/place.xml.in.h:31
-msgid ""
-"Windows that should forcedly be placed, even if they indicate the window "
-"manager should avoid placing them."
+msgid "Windows with fixed placement mode"
 msgstr ""
-"Les fenêtres pourrait être forcées à se situer, même si elles indiquent que "
-"le gestionnaire de fenêtre pourrait éviter de les situer."
 
 #: ../plugins/place/place.xml.in.h:32
-msgid "Windows that should have a certain positioning mo+de"
-msgstr ""
+msgid "Windows"
+msgstr "Fenêtres"
 
 #: ../plugins/place/place.xml.in.h:33
-msgid "Windows with fixed placement mode"
+msgid "Windows that should have a certain positioning mo+de"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:34
-msgid "Windows with fixed positions"
-msgstr "Fenêtres avec des positions fixes"
+msgid "Mode"
+msgstr ""
 
 #: ../plugins/place/place.xml.in.h:35
-msgid "Windows with fixed viewport"
-msgstr "Fenêtres avec un \"viewport\" fixe"
+msgid "Positioning modes"
+msgstr ""
 
 #: ../plugins/place/place.xml.in.h:36
-msgid "Workarounds"
-msgstr "Solutions"
+msgid "Windows with fixed viewport"
+msgstr "Fenêtres avec un \"viewport\" fixe"
 
 #: ../plugins/place/place.xml.in.h:37
-msgid "X Positions"
-msgstr "Positions en X"
+msgid "Viewport positioned windows"
+msgstr "Fenêtres positionnées sur un bureau"
 
 #: ../plugins/place/place.xml.in.h:38
-msgid "X Viewport Positions"
-msgstr "Positions du viewport en X"
+msgid "Windows that should be positioned in specific viewports by default"
+msgstr ""
+"Types de fenêtres qui devraient être positionnées sur un bureau spécifique "
+"par défaut"
 
 #: ../plugins/place/place.xml.in.h:39
-msgid "X position values"
-msgstr "Valeurs de la position en X"
+msgid "X Viewport Positions"
+msgstr "Positions du viewport en X"
 
 #: ../plugins/place/place.xml.in.h:40
-msgid "Y Positions"
-msgstr "Positions en Y"
+msgid "Horizontal viewport positions"
+msgstr "Positions du viewport horizontal"
 
 #: ../plugins/place/place.xml.in.h:41
 msgid "Y Viewport Positions"
 msgstr "Positions du viewport en Y"
 
 #: ../plugins/place/place.xml.in.h:42
-msgid "Y position values"
-msgstr "Valeurs de la position en Y"
+msgid "Vertical viewport positions"
+msgstr "Positions du viewport vertical"
 
 #: ../plugins/regex/regex.xml.in.h:1
 msgid "Regex Matching"
@@ -1950,131 +1882,133 @@
 msgstr "Correspondance Regex"
 
 #: ../plugins/resize/resize.xml.in.h:1
-msgid "Additional Modifier Keys"
-msgstr ""
+msgid "Resize Window"
+msgstr "Redimensionner la Fenêtre"
 
 #: ../plugins/resize/resize.xml.in.h:2
-msgid "Alt"
-msgstr ""
+msgid "Resize window"
+msgstr "Redimensionner la fenêtre"
 
-#: ../plugins/resize/resize.xml.in.h:3 ../plugins/scale/scale.xml.in.h:5
-#: ../plugins/switcher/switcher.xml.in.h:6
+#: ../plugins/resize/resize.xml.in.h:3 ../plugins/scale/scale.xml.in.h:30
+#: ../plugins/switcher/switcher.xml.in.h:2
 msgid "Bindings"
 msgstr "Assignations"
 
 #: ../plugins/resize/resize.xml.in.h:4
-msgid "Border Color"
-msgstr "Couleur de Bordure"
+msgid "Initiate Window Resize"
+msgstr "Lancer le redimensionnement de fenêtre"
 
 #: ../plugins/resize/resize.xml.in.h:5
-msgid "Border color used for outline and rectangle resize modes"
-msgstr ""
-"Couleur de la bordure utilisée pour les modes de redimensionnement "
-"Rectangulaire et Contour"
+msgid "Start resizing window"
+msgstr "Commencer à redimensionner la fenêtre"
 
 #: ../plugins/resize/resize.xml.in.h:6
-msgid "Centered Modifier"
-msgstr ""
-
-#: ../plugins/resize/resize.xml.in.h:7
-msgid "Control"
-msgstr ""
-
-#: ../plugins/resize/resize.xml.in.h:8
 msgid "Default Resize Mode"
 msgstr "Mode de redimensionnement par défaut"
 
-#: ../plugins/resize/resize.xml.in.h:9
+#: ../plugins/resize/resize.xml.in.h:7
 msgid "Default mode used for window resizing"
 msgstr "Mode utilisé par défaut pour le redimentionnement de fenêtre"
 
+#: ../plugins/resize/resize.xml.in.h:9
+msgid "Outline"
+msgstr "Contour"
+
 #: ../plugins/resize/resize.xml.in.h:10
-msgid "Fill Color"
-msgstr "Couleur de Remplissage"
+msgid "Rectangle"
+msgstr "Rectangle"
 
 #: ../plugins/resize/resize.xml.in.h:11
-msgid "Fill color used for rectangle resize mode"
-msgstr ""
-"Couleur de remplissage pour le mode de redimensionnement rectangulaire"
+msgid "Stretch"
+msgstr "Étirer"
 
 #: ../plugins/resize/resize.xml.in.h:12
-msgid "Initiate Window Resize"
-msgstr "Lancer le redimensionnement de fenêtre"
+msgid "Border Color"
+msgstr "Couleur de Bordure"
 
 #: ../plugins/resize/resize.xml.in.h:13
-msgid "Meta"
+msgid "Border color used for outline and rectangle resize modes"
 msgstr ""
+"Couleur de la bordure utilisée pour les modes de redimensionnement "
+"Rectangulaire et Contour"
+
+#: ../plugins/resize/resize.xml.in.h:14
+msgid "Fill Color"
+msgstr "Couleur de Remplissage"
 
 #: ../plugins/resize/resize.xml.in.h:15
-msgid "Normal Resize Windows"
-msgstr "Redimensionne les fenêtres en mode Normal"
+msgid "Fill color used for rectangle resize mode"
+msgstr ""
+"Couleur de remplissage pour le mode de redimensionnement rectangulaire"
 
 #: ../plugins/resize/resize.xml.in.h:16
-msgid "Outline"
-msgstr "Contour"
+msgid "Specific Window Matches"
+msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:17
-msgid "Outline Modifier"
-msgstr ""
+msgid "Normal Resize Windows"
+msgstr "Redimensionne les fenêtres en mode Normal"
 
 #: ../plugins/resize/resize.xml.in.h:18
-msgid "Outline Resize Windows"
-msgstr "Redimensionne les fenêtres en mode Contour"
+msgid "Windows that normal resize should be used for"
+msgstr "Types de fenêtres qui devraient utiliser le redimensionnement Normal"
 
 #: ../plugins/resize/resize.xml.in.h:19
-msgid "Rectangle"
-msgstr "Rectangle"
+msgid "Outline Resize Windows"
+msgstr "Redimensionne les fenêtres en mode Contour"
 
 #: ../plugins/resize/resize.xml.in.h:20
-msgid "Rectangle Modifier"
+msgid "Windows that outline resize should be used for"
 msgstr ""
+"Types de fenêtres qui devraient utiliser le redimensionnement Contour"
 
 #: ../plugins/resize/resize.xml.in.h:21
 msgid "Rectangle Resize Windows"
 msgstr "Redimensionne les fenêtres en mode Rectangle"
 
 #: ../plugins/resize/resize.xml.in.h:22
-msgid "Resize Window"
-msgstr "Redimensionner la Fenêtre"
+msgid "Windows that rectangle resize should be used for"
+msgstr ""
+"Types de fenêtres qui devraient utiliser le redimensionnement Rectangle"
 
 #: ../plugins/resize/resize.xml.in.h:23
-msgid "Resize window"
-msgstr "Redimensionner la fenêtre"
+msgid "Stretch Resize Windows"
+msgstr "Redimensionne les fenêtres en mode Étiré"
 
 #: ../plugins/resize/resize.xml.in.h:24
-msgid "Shift"
-msgstr ""
+msgid "Windows that stretch resize should be used for"
+msgstr "Types de fenêtres qui devraient utiliser le redimensionnement Étiré"
 
 #: ../plugins/resize/resize.xml.in.h:25
-msgid "Specific Window Matches"
+msgid "Additional Modifier Keys"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:26
-msgid "Start resizing window"
-msgstr "Commencer à redimensionner la fenêtre"
+msgid "Outline Modifier"
+msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:27
-msgid "Stretch"
-msgstr "Étirer"
+msgid "Use these bindings to resize with an outline."
+msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:28
-msgid "Stretch Modifier"
+msgid "Shift"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:29
-msgid "Stretch Resize Windows"
-msgstr "Redimensionne les fenêtres en mode Étiré"
+msgid "Alt"
+msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:30
-msgid "Use these bindings to resize by stretching."
+msgid "Control"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:31
-msgid "Use these bindings to resize from the center."
+msgid "Meta"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:32
-msgid "Use these bindings to resize with an outline."
+msgid "Rectangle Modifier"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:33
@@ -2082,491 +2016,443 @@
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:34
-msgid "Windows that normal resize should be used for"
-msgstr "Types de fenêtres qui devraient utiliser le redimensionnement Normal"
+msgid "Stretch Modifier"
+msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:35
-msgid "Windows that outline resize should be used for"
+msgid "Use these bindings to resize by stretching."
 msgstr ""
-"Types de fenêtres qui devraient utiliser le redimensionnement Contour"
 
 #: ../plugins/resize/resize.xml.in.h:36
-msgid "Windows that rectangle resize should be used for"
+msgid "Centered Modifier"
 msgstr ""
-"Types de fenêtres qui devraient utiliser le redimensionnement Rectangle"
 
 #: ../plugins/resize/resize.xml.in.h:37
-msgid "Windows that stretch resize should be used for"
-msgstr "Types de fenêtres qui devraient utiliser le redimensionnement Étiré"
+msgid "Use these bindings to resize from the center."
+msgstr ""
 
-#: ../plugins/scale/scale.xml.in.h:1 ../plugins/switcher/switcher.xml.in.h:2
-msgid "Amount of opacity in percent"
-msgstr "Quantité d'opacité en pourcentage"
+#: ../plugins/scale/scale.xml.in.h:1
+msgid "Scale"
+msgstr "Échelle"
 
 #: ../plugins/scale/scale.xml.in.h:2
-msgid "Appearance"
-msgstr "Apparence"
+msgid "Scale windows"
+msgstr "Mettre toutes les fenêtres à la même échelle"
 
 #: ../plugins/scale/scale.xml.in.h:3
-msgid "Behaviour"
-msgstr "Comportement"
+msgid "Appearance"
+msgstr "Apparence"
 
 #: ../plugins/scale/scale.xml.in.h:4
-msgid "Big"
-msgstr "Grand"
+msgid "Spacing"
+msgstr "Espacement"
 
-#: ../plugins/scale/scale.xml.in.h:6
-msgid "Button Bindings Toggle Scale Mode"
-msgstr "Assignation des boutons de bascule du mode échelle"
+#: ../plugins/scale/scale.xml.in.h:5
+msgid "Space between windows"
+msgstr "Espace entre les fenêtres"
+
+#: ../plugins/scale/scale.xml.in.h:6 ../plugins/switcher/switcher.xml.in.h:19
+msgid "Speed"
+msgstr "Vitesse"
 
 #: ../plugins/scale/scale.xml.in.h:7
-msgid ""
-"Button bindings toggle scale mode instead of enabling it when pressed and "
-"disabling it when released."
-msgstr ""
+msgid "Scale speed"
+msgstr "Vitesse de mise à l'échelle"
 
-#: ../plugins/scale/scale.xml.in.h:8
-msgid "Click Desktop to Show Desktop"
-msgstr "Cliquez sur le Bureau pour l'afficher"
+#: ../plugins/scale/scale.xml.in.h:8 ../plugins/switcher/switcher.xml.in.h:21
+msgid "Timestep"
+msgstr "Intervalle"
 
 #: ../plugins/scale/scale.xml.in.h:9
+msgid "Scale timestep"
+msgstr "Intervalle de mise à l'échelle"
+
+#: ../plugins/scale/scale.xml.in.h:10
 msgid "Darken Background"
 msgstr "Assombrir l'arrière-plan"
 
-#: ../plugins/scale/scale.xml.in.h:10
+#: ../plugins/scale/scale.xml.in.h:11
 msgid "Darken background when scaling windows"
 msgstr "Assombrir l'arrière-plan lors de la Mise à l'Échelle des fenêtres"
 
-#: ../plugins/scale/scale.xml.in.h:11
-msgid "Drag and Drop Distance"
-msgstr ""
-
-#: ../plugins/scale/scale.xml.in.h:12
-msgid "Drag and Drop Hover Timeout"
-msgstr ""
-
-#: ../plugins/scale/scale.xml.in.h:13
-msgid "Emblem"
-msgstr "Emblème"
+#: ../plugins/scale/scale.xml.in.h:13 ../plugins/switcher/switcher.xml.in.h:32
+msgid "Amount of opacity in percent"
+msgstr "Quantité d'opacité en pourcentage"
 
 #: ../plugins/scale/scale.xml.in.h:14
-msgid "Enter Show Desktop mode when Desktop is clicked during Scale"
-msgstr ""
-"Entrer en mode Affichage Du Bureau quand celui-ci est cliqué pendant la Mise "
-"à l'Échelle"
+msgid "Overlay Icon"
+msgstr "Superposer l'icône"
 
 #: ../plugins/scale/scale.xml.in.h:15
-msgid "Initiate Window Picker"
-msgstr "Lancer le sélecteur de fenêtre"
+msgid "Overlay an icon on windows once they are scaled"
+msgstr ""
+"Superposer une icône sur les fenêtres lorsqu'elles ont été mises à l'échelle"
 
 #: ../plugins/scale/scale.xml.in.h:16
-msgid "Initiate Window Picker For All Windows"
-msgstr "Lancer le sélecteur de fenêtre pour toutes les fenêtres"
+msgid "None"
+msgstr "Aucun"
 
 #: ../plugins/scale/scale.xml.in.h:17
-msgid "Initiate Window Picker For Window Group"
-msgstr "Lancer le sélecteur de fenêtre pour un groupe de fenêtres"
+msgid "Emblem"
+msgstr "Emblème"
 
 #: ../plugins/scale/scale.xml.in.h:18
-msgid "Initiate Window Picker For Windows on Current Output"
-msgstr ""
-"Lancer le sélecteur de fenêtre pour les fenêtres sur la sortie actuelle"
+msgid "Big"
+msgstr "Grand"
 
 #: ../plugins/scale/scale.xml.in.h:19
-msgid "Key Bindings Toggle Scale Mode"
-msgstr "Assignation des touches de bascule du mode échelle"
+msgid "Behaviour"
+msgstr "Comportement"
 
 #: ../plugins/scale/scale.xml.in.h:20
-msgid ""
-"Key bindings toggle scale mode instead of enabling it when pressed and "
-"disabling it when released."
-msgstr ""
-"Assignation des boutons de bascule du mode échelle au lieu de l'activer en "
-"pressant et le désactiver en relâchant."
+msgid "Scale Windows"
+msgstr "Mettre les fenêtres à l'échelle"
 
 #: ../plugins/scale/scale.xml.in.h:21
-msgid "Layout and start transforming all windows"
-msgstr "Disposer et commencer à transformer toutes les fenêtres"
+msgid "Windows that should be scaled in scale mode"
+msgstr "Types de fenêtres à mettre à l'échelle en mode Échelle"
 
 #: ../plugins/scale/scale.xml.in.h:22
-msgid "Layout and start transforming window group"
-msgstr "Disposer et commencer à transformer un groupe de fenêtres"
+msgid "Drag and Drop Hover Timeout"
+msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:23
-msgid "Layout and start transforming windows"
-msgstr "Disposer et commencer à transformer les fenêtres"
+msgid ""
+"Time (in ms) before scale mode is terminated when hovering over a window "
+"dragging and dropping an item"
+msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:24
-msgid "Layout and start transforming windows on current output"
+msgid "Drag and Drop Distance"
 msgstr ""
-"Disposer et commencer à transformer des fenêtres sur la sortie actuelle"
 
-#: ../plugins/scale/scale.xml.in.h:26
-msgid "None"
-msgstr "Aucun"
+#: ../plugins/scale/scale.xml.in.h:25
+msgid "The minimum distance (in px) beyond which the timeout is reset."
+msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:27
-msgid "On all output devices"
-msgstr "Sur tous les périphériques de sortie"
+msgid "Selects where windows are scaled if multiple output devices are used."
+msgstr ""
+"Choisir où les fenêtres sont mises à l'échelle si plusieurs périphériques de "
+"sortie sont utilisés."
 
 #: ../plugins/scale/scale.xml.in.h:28
 msgid "On current output device"
 msgstr "Sur le périphérique de sortie courant"
 
-#: ../plugins/scale/scale.xml.in.h:30
-msgid "Overlay Icon"
-msgstr "Superposer l'icône"
+#: ../plugins/scale/scale.xml.in.h:29
+msgid "On all output devices"
+msgstr "Sur tous les périphériques de sortie"
 
 #: ../plugins/scale/scale.xml.in.h:31
-msgid "Overlay an icon on windows once they are scaled"
-msgstr ""
-"Superposer une icône sur les fenêtres lorsqu'elles ont été mises à l'échelle"
+msgid "Key Bindings Toggle Scale Mode"
+msgstr "Assignation des touches de bascule du mode échelle"
 
 #: ../plugins/scale/scale.xml.in.h:32
-msgid "Scale"
-msgstr "Échelle"
+msgid ""
+"Key bindings toggle scale mode instead of enabling it when pressed and "
+"disabling it when released."
+msgstr ""
+"Assignation des boutons de bascule du mode échelle au lieu de l'activer en "
+"pressant et le désactiver en relâchant."
 
 #: ../plugins/scale/scale.xml.in.h:33
-msgid "Scale Windows"
-msgstr "Mettre les fenêtres à l'échelle"
+msgid "Button Bindings Toggle Scale Mode"
+msgstr "Assignation des boutons de bascule du mode échelle"
 
 #: ../plugins/scale/scale.xml.in.h:34
-msgid "Scale speed"
-msgstr "Vitesse de mise à l'échelle"
+msgid ""
+"Button bindings toggle scale mode instead of enabling it when pressed and "
+"disabling it when released."
+msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:35
-msgid "Scale timestep"
-msgstr "Intervalle de mise à l'échelle"
+msgid "Initiate Window Picker"
+msgstr "Lancer le sélecteur de fenêtre"
 
 #: ../plugins/scale/scale.xml.in.h:36
-msgid "Scale windows"
-msgstr "Mettre toutes les fenêtres à la même échelle"
+msgid "Layout and start transforming windows"
+msgstr "Disposer et commencer à transformer les fenêtres"
 
 #: ../plugins/scale/scale.xml.in.h:37
-msgid "Selects where windows are scaled if multiple output devices are used."
-msgstr ""
-"Choisir où les fenêtres sont mises à l'échelle si plusieurs périphériques de "
-"sortie sont utilisés."
+msgid "Initiate Window Picker For All Windows"
+msgstr "Lancer le sélecteur de fenêtre pour toutes les fenêtres"
 
 #: ../plugins/scale/scale.xml.in.h:38
-msgid "Space between windows"
-msgstr "Espace entre les fenêtres"
+msgid "Layout and start transforming all windows"
+msgstr "Disposer et commencer à transformer toutes les fenêtres"
 
 #: ../plugins/scale/scale.xml.in.h:39
-msgid "Spacing"
-msgstr "Espacement"
+msgid "Initiate Window Picker For Window Group"
+msgstr "Lancer le sélecteur de fenêtre pour un groupe de fenêtres"
 
-#: ../plugins/scale/scale.xml.in.h:40 ../plugins/switcher/switcher.xml.in.h:40
-#: ../plugins/zoom/zoom.xml.in.h:3
-msgid "Speed"
-msgstr "Vitesse"
+#: ../plugins/scale/scale.xml.in.h:40
+msgid "Layout and start transforming window group"
+msgstr "Disposer et commencer à transformer un groupe de fenêtres"
 
 #: ../plugins/scale/scale.xml.in.h:41
-msgid "The minimum distance (in px) beyond which the timeout is reset."
+msgid "Initiate Window Picker For Windows on Current Output"
 msgstr ""
+"Lancer le sélecteur de fenêtre pour les fenêtres sur la sortie actuelle"
 
 #: ../plugins/scale/scale.xml.in.h:42
-msgid ""
-"Time (in ms) before scale mode is terminated when hovering over a window "
-"dragging and dropping an item"
+msgid "Layout and start transforming windows on current output"
 msgstr ""
+"Disposer et commencer à transformer des fenêtres sur la sortie actuelle"
 
-#: ../plugins/scale/scale.xml.in.h:43 ../plugins/switcher/switcher.xml.in.h:44
-#: ../plugins/zoom/zoom.xml.in.h:4
-msgid "Timestep"
-msgstr "Intervalle"
+#: ../plugins/scale/scale.xml.in.h:43
+msgid "Click Desktop to Show Desktop"
+msgstr "Cliquez sur le Bureau pour l'afficher"
 
 #: ../plugins/scale/scale.xml.in.h:44
-msgid "Windows that should be scaled in scale mode"
-msgstr "Types de fenêtres à mettre à l'échelle en mode Échelle"
-
-#: ../plugins/switcher/switcher.xml.in.h:1
-msgid "Amount of brightness in percent"
-msgstr "Quantité de luminosité en pourcentage"
+msgid "Enter Show Desktop mode when Desktop is clicked during Scale"
+msgstr ""
+"Entrer en mode Affichage Du Bureau quand celui-ci est cliqué pendant la Mise "
+"à l'Échelle"
+
+#: ../plugins/switcher/switcher.xml.in.h:1
+msgid "Application Switcher"
+msgstr "Sélecteur d'Application"
 
 #: ../plugins/switcher/switcher.xml.in.h:3
-msgid "Amount of saturation in percent"
-msgstr "Quantité de saturation en pourcentage"
+msgid "Next window"
+msgstr "Fenêtre suivante"
 
 #: ../plugins/switcher/switcher.xml.in.h:4
-msgid "Application Switcher"
-msgstr "Sélecteur d'Application"
+msgid "Popup switcher if not visible and select next window"
+msgstr ""
+"Afficher le sélecteur s'il n'est pas visible et sélectionner la fenêtre "
+"suivante"
 
 #: ../plugins/switcher/switcher.xml.in.h:5
-msgid "Auto Rotate"
-msgstr "Rotation automatique"
+msgid "Prev window"
+msgstr "Fenêtre précédente"
+
+#: ../plugins/switcher/switcher.xml.in.h:6
+msgid "Popup switcher if not visible and select previous window"
+msgstr ""
+"Afficher le sélecteur s'il n'est pas visible et sélectionner la fenêtre "
+"précédente"
 
 #: ../plugins/switcher/switcher.xml.in.h:7
-msgid "Brightness"
-msgstr "Luminosité"
+msgid "Next window (All windows)"
+msgstr "Fenêtre suivante (toutes les fenêtres)"
 
 #: ../plugins/switcher/switcher.xml.in.h:8
-msgid "Bring To Front"
-msgstr "Placer au-dessus"
+msgid ""
+"Popup switcher if not visible and select next window out of all windows"
+msgstr ""
+"Afficher le sélecteur s'il n'est pas visible et sélectionner la fenêtre "
+"suivante parmi toutes les fenêtres"
 
 #: ../plugins/switcher/switcher.xml.in.h:9
-msgid "Bring selected window to front"
-msgstr "Placer la fenêtre sélectionnée au-dessus"
+msgid "Prev window (All windows)"
+msgstr "Fenêtre précédente (toutes les fenêtres)"
 
 #: ../plugins/switcher/switcher.xml.in.h:10
-msgid "Distance desktop should be zoom out while switching windows"
+msgid ""
+"Popup switcher if not visible and select previous window out of all windows"
 msgstr ""
-"Le bureau à distance doit être en zoom arrière lors du passage d'une fenêtre "
-"à une autre"
+"Afficher le sélecteur s'il n'est pas visible et sélectionner la fenêtre "
+"précédente parmi toutes les fenêtres"
 
 #: ../plugins/switcher/switcher.xml.in.h:11
-msgid "Focus on Switch"
-msgstr ""
+msgid "Next window (No popup)"
+msgstr "Fenêtre suivante (pas de sélecteur)"
 
 #: ../plugins/switcher/switcher.xml.in.h:12
-msgid "Focus windows when they are visible during the switch"
-msgstr ""
+msgid "Select next window without showing the popup window."
+msgstr "Sélectionner la fenêtre suivante sans montrer le sélecteur"
 
 #: ../plugins/switcher/switcher.xml.in.h:13
-msgid "Generate mipmaps when possible for higher quality scaling"
-msgstr ""
-"Générer des mipmaps dans la mesure du possible pour une mise à l'échelle de "
-"meilleure qualité"
+msgid "Prev window (No popup)"
+msgstr "Fenêtre précédente (pas de sélecteur)"
 
 #: ../plugins/switcher/switcher.xml.in.h:14
-msgid "Icon"
-msgstr "Icône"
+msgid "Select previous window without showing the popup window."
+msgstr "Sélectionner la fenêtre précédente sans montrer le sélecteur"
 
 #: ../plugins/switcher/switcher.xml.in.h:15
-msgid "Minimized"
-msgstr "Minimisé"
-
-#: ../plugins/switcher/switcher.xml.in.h:17
 msgid "Next Panel"
 msgstr "Panneau Suivant"
 
-#: ../plugins/switcher/switcher.xml.in.h:18
-msgid "Next window"
-msgstr "Fenêtre suivante"
+# Ca ne veut rien dire...
+#: ../plugins/switcher/switcher.xml.in.h:16
+msgid "Select next panel type window."
+msgstr "Sélectionner la prochaine fenêtre de la police du panneau"
 
-#: ../plugins/switcher/switcher.xml.in.h:19
-msgid "Next window (All windows)"
-msgstr "Fenêtre suivante (toutes les fenêtres)"
+#: ../plugins/switcher/switcher.xml.in.h:17
+msgid "Prev Panel"
+msgstr "Panneau Précédent"
 
-#: ../plugins/switcher/switcher.xml.in.h:20
-msgid "Next window (No popup)"
-msgstr "Fenêtre suivante (pas de sélecteur)"
+#: ../plugins/switcher/switcher.xml.in.h:18
+msgid "Select previous panel type window."
+msgstr "Sélectionner la précédente fenêtre de la police du panneau"
 
-#: ../plugins/switcher/switcher.xml.in.h:21
-msgid "Only show icon"
-msgstr "Ne montrer que l'icône"
+#: ../plugins/switcher/switcher.xml.in.h:20
+msgid "Switcher speed"
+msgstr "Vitesse du sélecteur"
 
 #: ../plugins/switcher/switcher.xml.in.h:22
-msgid "Only show the window icon and do not display a thumbnail at all"
-msgstr "Ne montrer que l'icône de la fenêtre et ne pas afficher de miniature"
+msgid "Switcher timestep"
+msgstr "Intervalle du sélecteur"
 
-#: ../plugins/switcher/switcher.xml.in.h:24
-msgid "Popup switcher if not visible and select next window"
-msgstr ""
-"Afficher le sélecteur s'il n'est pas visible et sélectionner la fenêtre "
-"suivante"
+#: ../plugins/switcher/switcher.xml.in.h:23
+msgid "Switcher windows"
+msgstr "Types de fenêtres du sélecteur"
 
-#: ../plugins/switcher/switcher.xml.in.h:25
-msgid ""
-"Popup switcher if not visible and select next window out of all windows"
-msgstr ""
-"Afficher le sélecteur s'il n'est pas visible et sélectionner la fenêtre "
-"suivante parmi toutes les fenêtres"
+#: ../plugins/switcher/switcher.xml.in.h:24
+msgid "Windows that should be shown in switcher"
+msgstr "Types de fenêtres à afficher dans le sélecteur"
 
 #: ../plugins/switcher/switcher.xml.in.h:26
-msgid "Popup switcher if not visible and select previous window"
+msgid "Generate mipmaps when possible for higher quality scaling"
 msgstr ""
-"Afficher le sélecteur s'il n'est pas visible et sélectionner la fenêtre "
-"précédente"
+"Générer des mipmaps dans la mesure du possible pour une mise à l'échelle de "
+"meilleure qualité"
 
 #: ../plugins/switcher/switcher.xml.in.h:27
-msgid ""
-"Popup switcher if not visible and select previous window out of all windows"
-msgstr ""
-"Afficher le sélecteur s'il n'est pas visible et sélectionner la fenêtre "
-"précédente parmi toutes les fenêtres"
+msgid "Saturation"
+msgstr "Saturation"
 
 #: ../plugins/switcher/switcher.xml.in.h:28
-msgid "Prev Panel"
-msgstr "Panneau Précédent"
+msgid "Amount of saturation in percent"
+msgstr "Quantité de saturation en pourcentage"
 
 #: ../plugins/switcher/switcher.xml.in.h:29
-msgid "Prev window"
-msgstr "Fenêtre précédente"
+msgid "Brightness"
+msgstr "Luminosité"
 
 #: ../plugins/switcher/switcher.xml.in.h:30
-msgid "Prev window (All windows)"
-msgstr "Fenêtre précédente (toutes les fenêtres)"
-
-#: ../plugins/switcher/switcher.xml.in.h:31
-msgid "Prev window (No popup)"
-msgstr "Fenêtre précédente (pas de sélecteur)"
-
-#: ../plugins/switcher/switcher.xml.in.h:32
-msgid "Rotate to the selected window while switching"
-msgstr "Tourner vers la fenêtre sélectionnée pendant la commutation"
+msgid "Amount of brightness in percent"
+msgstr "Quantité de luminosité en pourcentage"
 
 #: ../plugins/switcher/switcher.xml.in.h:33
-msgid "Saturation"
-msgstr "Saturation"
+msgid "Focus on Switch"
+msgstr ""
 
-# Ca ne veut rien dire...
 #: ../plugins/switcher/switcher.xml.in.h:34
-msgid "Select next panel type window."
-msgstr "Sélectionner la prochaine fenêtre de la police du panneau"
+msgid "Focus windows when they are visible during the switch"
+msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:35
-msgid "Select next window without showing the popup window."
-msgstr "Sélectionner la fenêtre suivante sans montrer le sélecteur"
+msgid "Bring To Front"
+msgstr "Placer au-dessus"
 
 #: ../plugins/switcher/switcher.xml.in.h:36
-msgid "Select previous panel type window."
-msgstr "Sélectionner la précédente fenêtre de la police du panneau"
+msgid "Bring selected window to front"
+msgstr "Placer la fenêtre sélectionnée au-dessus"
 
 #: ../plugins/switcher/switcher.xml.in.h:37
-msgid "Select previous window without showing the popup window."
-msgstr "Sélectionner la fenêtre précédente sans montrer le sélecteur"
+msgid "Zoom"
+msgstr "Zoom"
 
 #: ../plugins/switcher/switcher.xml.in.h:38
-msgid "Show icon next to thumbnail"
-msgstr "Afficher l'icône à côté de la miniature"
+msgid "Distance desktop should be zoom out while switching windows"
+msgstr ""
+"Le bureau à distance doit être en zoom arrière lors du passage d'une fenêtre "
+"à une autre"
 
 #: ../plugins/switcher/switcher.xml.in.h:39
-msgid "Show minimized windows"
-msgstr "Afficher des fenêtres réduites"
+msgid "Icon"
+msgstr "Icône"
+
+#: ../plugins/switcher/switcher.xml.in.h:40
+msgid "Show icon next to thumbnail"
+msgstr "Afficher l'icône à côté de la miniature"
 
 #: ../plugins/switcher/switcher.xml.in.h:41
-msgid "Switcher speed"
-msgstr "Vitesse du sélecteur"
+msgid "Only show icon"
+msgstr "Ne montrer que l'icône"
 
 #: ../plugins/switcher/switcher.xml.in.h:42
-msgid "Switcher timestep"
-msgstr "Intervalle du sélecteur"
+msgid "Only show the window icon and do not display a thumbnail at all"
+msgstr "Ne montrer que l'icône de la fenêtre et ne pas afficher de miniature"
 
 #: ../plugins/switcher/switcher.xml.in.h:43
-msgid "Switcher windows"
-msgstr "Types de fenêtres du sélecteur"
+msgid "Minimized"
+msgstr "Minimisé"
+
+#: ../plugins/switcher/switcher.xml.in.h:44
+msgid "Show minimized windows"
+msgstr "Afficher des fenêtres réduites"
 
 #: ../plugins/switcher/switcher.xml.in.h:45
-msgid "Windows that should be shown in switcher"
-msgstr "Types de fenêtres à afficher dans le sélecteur"
+msgid "Auto Rotate"
+msgstr "Rotation automatique"
 
 #: ../plugins/switcher/switcher.xml.in.h:46
-msgid "Zoom"
-msgstr "Zoom"
+msgid "Rotate to the selected window while switching"
+msgstr "Tourner vers la fenêtre sélectionnée pendant la commutation"
 
 #: ../plugins/water/water.xml.in.h:1
-msgid "Add line"
-msgstr "Ajouter une ligne"
+msgid "Water Effect"
+msgstr "Effet d'eau"
 
 #: ../plugins/water/water.xml.in.h:2
-msgid "Add point"
-msgstr "Ajouter un point"
-
-#: ../plugins/water/water.xml.in.h:3
 msgid "Adds water effects to different desktop actions"
 msgstr "Ajoute des effets d'eau à différentes opérations du bureau"
 
-#: ../plugins/water/water.xml.in.h:4
-msgid "Delay (in ms) between each rain-drop"
-msgstr "Délai (en ms) entre chaque goutte de pluie"
+#: ../plugins/water/water.xml.in.h:3
+msgid "Initiate"
+msgstr "Lancer"
 
-#: ../plugins/water/water.xml.in.h:5
+#: ../plugins/water/water.xml.in.h:4
 msgid "Enable pointer water effects"
 msgstr "Activer les effets d'eau du pointeur"
 
-#: ../plugins/water/water.xml.in.h:6 ../plugins/zoom/zoom.xml.in.h:2
-msgid "Initiate"
-msgstr "Lancer"
+#: ../plugins/water/water.xml.in.h:5
+msgid "Toggle rain"
+msgstr "Activer/désactiver la pluie"
+
+#: ../plugins/water/water.xml.in.h:6
+msgid "Toggle rain effect"
+msgstr "Activer/désactiver l'effet de pluie"
 
 #: ../plugins/water/water.xml.in.h:7
-msgid "Line"
-msgstr "Ligne"
+msgid "Toggle wiper"
+msgstr "Activer/désactiver l'essuie-glace"
 
 #: ../plugins/water/water.xml.in.h:8
-msgid "Offset Scale"
-msgstr "Échelle de décalage"
+msgid "Toggle wiper effect"
+msgstr "Activer/désactiver l'effet d'essuie-glace"
 
 #: ../plugins/water/water.xml.in.h:9
-msgid "Point"
-msgstr "Point"
+msgid "Offset Scale"
+msgstr "Échelle de décalage"
 
 #: ../plugins/water/water.xml.in.h:10
-msgid "Rain Delay"
-msgstr "Délai de pluie"
+msgid "Water offset scale"
+msgstr "Échelle de décalage d'eau"
 
 #: ../plugins/water/water.xml.in.h:11
-msgid "Title wave"
-msgstr "Vague sur le titre"
+msgid "Rain Delay"
+msgstr "Délai de pluie"
 
 #: ../plugins/water/water.xml.in.h:12
-msgid "Toggle rain"
-msgstr "Activer/désactiver la pluie"
+msgid "Delay (in ms) between each rain-drop"
+msgstr "Délai (en ms) entre chaque goutte de pluie"
 
 #: ../plugins/water/water.xml.in.h:13
-msgid "Toggle rain effect"
-msgstr "Activer/désactiver l'effet de pluie"
+msgid "Title wave"
+msgstr "Vague sur le titre"
 
 #: ../plugins/water/water.xml.in.h:14
-msgid "Toggle wiper"
-msgstr "Activer/désactiver l'essuie-glace"
+msgid "Wave effect from window title"
+msgstr "Effet de vague sur le titre de la fenêtre"
 
 #: ../plugins/water/water.xml.in.h:15
-msgid "Toggle wiper effect"
-msgstr "Activer/désactiver l'effet d'essuie-glace"
+msgid "Point"
+msgstr "Point"
 
 #: ../plugins/water/water.xml.in.h:16
-msgid "Water Effect"
-msgstr "Effet d'eau"
+msgid "Add point"
+msgstr "Ajouter un point"
 
 #: ../plugins/water/water.xml.in.h:17
-msgid "Water offset scale"
-msgstr "Échelle de décalage d'eau"
+msgid "Line"
+msgstr "Ligne"
 
 #: ../plugins/water/water.xml.in.h:18
-msgid "Wave effect from window title"
-msgstr "Effet de vague sur le titre de la fenêtre"
-
-#: ../plugins/zoom/zoom.xml.in.h:1
-msgid "Filter Linear"
-msgstr "Filtre linéaire"
-
-#: ../plugins/zoom/zoom.xml.in.h:5
-msgid "Use linear filter when zoomed in"
-msgstr "Utiliser le filtre linéaire pour le zoom avant"
-
-#: ../plugins/zoom/zoom.xml.in.h:6
-msgid "Zoom Desktop"
-msgstr "Zoom du Bureau"
-
-#: ../plugins/zoom/zoom.xml.in.h:7
-msgid "Zoom In"
-msgstr "Zoom avant"
-
-#: ../plugins/zoom/zoom.xml.in.h:8
-msgid "Zoom Out"
-msgstr "Zoom arrière"
-
-#: ../plugins/zoom/zoom.xml.in.h:9
-msgid "Zoom Pan"
-msgstr "Zoom Panoramique"
-
-#: ../plugins/zoom/zoom.xml.in.h:10
-msgid "Zoom Speed"
-msgstr "Vitesse du zoom"
-
-#: ../plugins/zoom/zoom.xml.in.h:11
-msgid "Zoom Timestep"
-msgstr "Intervalle du zoom"
-
-#: ../plugins/zoom/zoom.xml.in.h:12
-msgid "Zoom and pan desktop cube"
-msgstr "Zoom et panoramique du cube du bureau"
-
-#: ../plugins/zoom/zoom.xml.in.h:13
-msgid "Zoom factor"
-msgstr "Facteur de zoom"
-
-#: ../plugins/zoom/zoom.xml.in.h:14
-msgid "Zoom pan"
-msgstr "Zoom panoramique"
+msgid "Add line"
+msgstr "Ajouter une ligne"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/coreutils.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/coreutils.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/coreutils.po	2012-01-02 17:26:44.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/coreutils.po	2012-02-23 06:31:11.000000000 +0000
@@ -18,8 +18,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:21+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:34+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: lib/argmatch.c:133
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/cpio.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/cpio.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/cpio.po	2012-01-02 17:26:44.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/cpio.po	2012-02-23 06:31:11.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:22+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:36+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: gnu/argmatch.c:135
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/cpplib-4.4.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/cpplib-4.4.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/cpplib-4.4.po	2012-01-02 17:27:30.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/cpplib-4.4.po	2012-02-23 06:31:54.000000000 +0000
@@ -126,8 +126,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 18:22+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:08+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: charset.c:674
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/cpplib-4.5.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/cpplib-4.5.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/cpplib-4.5.po	2012-01-02 17:27:33.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/cpplib-4.5.po	2012-02-23 06:31:57.000000000 +0000
@@ -120,14 +120,14 @@
 "Project-Id-Version: GNU cpplib 4.3.0\n"
 "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
 "POT-Creation-Date: 2010-04-06 14:10+0000\n"
-"PO-Revision-Date: 2011-12-13 05:04+0000\n"
+"PO-Revision-Date: 2012-01-30 19:36+0000\n"
 "Last-Translator: FX <Unknown>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:05+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:45+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: charset.c:674
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/cpplib-4.6.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/cpplib-4.6.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/cpplib-4.6.po	2012-01-02 17:27:36.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/cpplib-4.6.po	2012-02-23 06:31:59.000000000 +0000
@@ -120,14 +120,14 @@
 "Project-Id-Version: GNU cpplib 4.3.0\n"
 "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
 "POT-Creation-Date: 2011-06-21 10:26+0000\n"
-"PO-Revision-Date: 2011-12-17 23:34+0000\n"
+"PO-Revision-Date: 2012-02-17 02:19+0000\n"
 "Last-Translator: FX <Unknown>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:36+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 02:14+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: charset.c:674
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/cpplib.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/cpplib.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/cpplib.po	2012-01-02 17:27:19.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/cpplib.po	2012-02-23 06:31:43.000000000 +0000
@@ -125,8 +125,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:33+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:37+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: charset.c:654
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/cracklib.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/cracklib.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/cracklib.po	2012-01-02 17:26:44.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/cracklib.po	2012-02-23 06:31:11.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:23+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:36+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: lib/fascist.c:550
 msgid "you are not registered in the password file"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/cryptsetup-luks.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/cryptsetup-luks.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/cryptsetup-luks.po	2012-01-02 17:26:58.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/cryptsetup-luks.po	2012-02-23 06:31:25.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:33+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:14+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: luks/keyencryption.c:61
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/cryptsetup.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/cryptsetup.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/cryptsetup.po	2012-01-02 17:26:58.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/cryptsetup.po	2012-02-23 06:31:25.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:33+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:14+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: lib/libdevmapper.c:120
 msgid "Cannot initialize device-mapper. Is dm_mod kernel module loaded?\n"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/cwidget.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/cwidget.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/cwidget.po	2012-01-02 17:27:26.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/cwidget.po	2012-02-23 06:31:49.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:04+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:03+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/cwidget/config/column_definition.cc:273
 msgid "Bad format parameter"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/dctrl-tools.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/dctrl-tools.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/dctrl-tools.po	2012-01-02 17:27:19.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/dctrl-tools.po	2012-02-23 06:31:43.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:36+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:38+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: lib/ifile.c:54
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/debconf.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/debconf.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/debconf.po	2012-01-02 17:26:44.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/debconf.po	2012-02-23 06:31:11.000000000 +0000
@@ -8,15 +8,15 @@
 msgstr ""
 "Project-Id-Version: debconf 1.4.69\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-30 12:23-0400\n"
+"POT-Creation-Date: 2012-02-10 22:59+0000\n"
 "PO-Revision-Date: 2011-01-03 06:26+0000\n"
 "Last-Translator: Steve Petruzzello <Unknown>\n"
 "Language-Team: French Translators <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:23+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:36+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 "X-Poedit-Language: French\n"
 "X-Poedit-SourceCharset: ISO-8859-15\n"
@@ -224,7 +224,7 @@
 "quittez. Debconf se servira alors des valeurs qui y sont indiquées pour "
 "configurer le système."
 
-#: ../Debconf/FrontEnd/Gnome.pm:97 ../Debconf/FrontEnd/Kde.pm:100
+#: ../Debconf/FrontEnd/Gnome.pm:144 ../Debconf/FrontEnd/Kde.pm:100
 #: ../Debconf/FrontEnd/Kde.pm:104
 #, perl-format
 msgid "Debconf on %s"
@@ -290,51 +290,51 @@
 msgid "Template #%s in %s does not contain a 'Template:' line\n"
 msgstr "Le message n° %s de %s ne contient pas de ligne « Template: »\n"
 
-#: ../dpkg-preconfigure:121
+#: ../dpkg-preconfigure:125
 #, perl-format
 msgid "must specify some debs to preconfigure"
 msgstr "Vous devez indiquer des paquets à préconfigurer"
 
-#: ../dpkg-preconfigure:126
+#: ../dpkg-preconfigure:130
 msgid "delaying package configuration, since apt-utils is not installed"
 msgstr ""
 "la configuration des paquets est différée, car apt-utils n'est pas installé"
 
-#: ../dpkg-preconfigure:133
+#: ../dpkg-preconfigure:137
 #, perl-format
 msgid "unable to re-open stdin: %s"
 msgstr "impossible de réouvrir stdin : %s"
 
-#: ../dpkg-preconfigure:164 ../dpkg-preconfigure:176
+#: ../dpkg-preconfigure:168 ../dpkg-preconfigure:180
 #, perl-format
 msgid "apt-extracttemplates failed: %s"
 msgstr "Échec d'apt-extracttemplates : %s"
 
-#: ../dpkg-preconfigure:168 ../dpkg-preconfigure:180
+#: ../dpkg-preconfigure:172 ../dpkg-preconfigure:184
 #, perl-format
 msgid "Extracting templates from packages: %d%%"
 msgstr "Extraction des modèles depuis les paquets : %d%%"
 
-#: ../dpkg-preconfigure:190
+#: ../dpkg-preconfigure:194
 msgid "Preconfiguring packages ...\n"
 msgstr "Préconfiguration des paquets...\n"
 
-#: ../dpkg-preconfigure:202
+#: ../dpkg-preconfigure:206
 #, perl-format
 msgid "template parse error: %s"
 msgstr "erreur d'analyse de message : %s"
 
-#: ../dpkg-preconfigure:216
+#: ../dpkg-preconfigure:220
 #, perl-format
 msgid "debconf: can't chmod: %s"
 msgstr "debconf : impossible de changer le mode : %s"
 
-#: ../dpkg-preconfigure:227
+#: ../dpkg-preconfigure:231
 #, perl-format
 msgid "%s failed to preconfigure, with exit status %s"
 msgstr "Échec de la préconfiguration de %s, avec le code d'erreur %s"
 
-#: ../dpkg-reconfigure:103
+#: ../dpkg-reconfigure:107
 msgid ""
 "Usage: dpkg-reconfigure [options] packages\n"
 "  -a,  --all\t\t\tReconfigure all packages.\n"
@@ -353,26 +353,26 @@
 "reload\t\tne pas recharger les modèles. (à utiliser\n"
 "                         \t avec précaution)"
 
-#: ../dpkg-reconfigure:117
+#: ../dpkg-reconfigure:121
 #, perl-format
 msgid "%s must be run as root"
 msgstr "%s doit être lancé par le superutilisateur"
 
-#: ../dpkg-reconfigure:150
+#: ../dpkg-reconfigure:154
 msgid "please specify a package to reconfigure"
 msgstr "Veuillez indiquer un paquet à reconfigurer."
 
-#: ../dpkg-reconfigure:171
+#: ../dpkg-reconfigure:175
 #, perl-format
 msgid "%s is not installed"
 msgstr "%s n'est pas installé"
 
-#: ../dpkg-reconfigure:175
+#: ../dpkg-reconfigure:179
 #, perl-format
 msgid "%s is broken or not fully installed"
 msgstr "%s est cassé ou partiellement installé"
 
-#: ../dpkg-reconfigure:254
+#: ../dpkg-reconfigure:258
 #, perl-format
 msgid "Cannot read status file: %s"
 msgstr "Impossible de lire le fichier d'état : %s"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/debian-tasks.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/debian-tasks.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/debian-tasks.po	2012-01-02 17:27:15.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/debian-tasks.po	2012-02-23 06:31:39.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:53+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:52+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #. Description
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/debianutils.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/debianutils.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/debianutils.po	2012-01-02 17:26:44.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/debianutils.po	2012-02-23 06:31:11.000000000 +0000
@@ -14,15 +14,15 @@
 msgstr ""
 "Project-Id-Version: debianutils\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-01 20:54-0500\n"
+"POT-Creation-Date: 2012-01-30 23:31-0500\n"
 "PO-Revision-Date: 2011-07-14 06:56+0000\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:23+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:37+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 # type: TH
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/desktop_kcm-gtk.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/desktop_kcm-gtk.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/desktop_kcm-gtk.po	2012-01-02 17:27:31.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/desktop_kcm-gtk.po	2012-02-23 06:31:55.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 18:31+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:16+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: kcmgtk.desktop:2
 msgctxt "Name"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/devscripts.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/devscripts.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/devscripts.po	2012-01-02 17:26:45.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/devscripts.po	2012-02-23 06:31:11.000000000 +0000
@@ -14,14 +14,14 @@
 "Project-Id-Version: devscripts\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-12-17 20:24-0800\n"
-"PO-Revision-Date: 2011-12-19 01:51+0000\n"
+"PO-Revision-Date: 2012-02-16 06:27+0000\n"
 "Last-Translator: taffit <Unknown>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:26+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:37+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 # type: TH
@@ -112,7 +112,7 @@
 
 # type: TP
 #. type: TP
-#: ../scripts/annotate-output.1:16 ../scripts/chdist.pl:37 ../scripts/dcontrol.pl:256 ../scripts/debcheckout.pl:93 ../scripts/debsnap.1:57 ../scripts/dget.pl:592 ../scripts/dpkg-depcheck.1:96 ../scripts/getbuildlog.1:25 ../scripts/mk-build-deps.pl:79 ../scripts/rmadison.pl:249 ../doc/suspicious-source.1:35 ../doc/what-patch.1:17 ../doc/wrap-and-sort.1:34
+#: ../scripts/annotate-output.1:16 ../scripts/chdist.pl:37 ../scripts/dcontrol.pl:256 ../scripts/dd-list.1:59 ../scripts/debcheckout.pl:93 ../scripts/debsnap.1:57 ../scripts/dget.pl:592 ../scripts/dpkg-depcheck.1:96 ../scripts/getbuildlog.1:25 ../scripts/mk-build-deps.pl:79 ../scripts/rmadison.pl:249 ../doc/suspicious-source.1:35 ../doc/what-patch.1:17 ../doc/wrap-and-sort.1:34
 #, no-wrap
 msgid "B<-h>, B<--help>"
 msgstr "B<-h>, B<--help>"
@@ -5367,7 +5367,7 @@
 
 # type: TP
 #. type: TP
-#: ../scripts/dcontrol.pl:260 ../scripts/dget.pl:596 ../scripts/getbuildlog.1:28
+#: ../scripts/dcontrol.pl:260 ../scripts/dd-list.1:96 ../scripts/dget.pl:596 ../scripts/getbuildlog.1:28
 #, no-wrap
 msgid "B<-V>, B<--version>"
 msgstr "B<-V>, B<--version>"
@@ -5438,7 +5438,7 @@
 #: ../scripts/dd-list.1:16
 #, no-wrap
 msgid "2011-10-27"
-msgstr ""
+msgstr "27 octobre 2011"
 
 # type: TH
 #. type: TH
@@ -5459,9 +5459,12 @@
 #: ../scripts/dd-list.1:26
 msgid ""
 "B<dd-list> [B<-hiusV>] [B<--help>] [B<--stdin>] [B<--sources "
-">I<sources_file>] [B<--dctrl>] [B<--version>] [B<--uploaders>] [I<package> "
+">I<Sources_file>] [B<--dctrl>] [B<--version>] [B<--uploaders>] [I<package> "
 "...]"
 msgstr ""
+"B<dd-list> [B<-hiusV>] [B<--help>] [B<--stdin>] [B<--sources> "
+"I<fichier_Sources>] [B<--dctrl>] [B<--version>] [B<--uploaders>] [I<paquet> "
+"...]"
 
 # type: Plain text
 #. type: Plain text
@@ -5533,24 +5536,16 @@
 "qui demandent l'attention de leurs responsables, par exemple lorsqu'ils "
 "doivent être reconstruits suite à une transition de bibliothèque."
 
-# type: TP
-#. type: TP
-#: ../scripts/dd-list.1:59
-#, no-wrap
-msgid "B<-h>,B<--help>"
-msgstr "B<-h>, B<--help>"
-
 #. type: Plain text
 #: ../scripts/dd-list.1:62
 msgid "Print brief help message."
 msgstr "Afficher un bref message d'aide."
 
-# type: TP
 #. type: TP
 #: ../scripts/dd-list.1:62
 #, no-wrap
-msgid "B<-i>,B<--stdin>"
-msgstr "B<-i>,B<--stdin>"
+msgid "B<-i>, B<--stdin>"
+msgstr "B<-i>, B<--stdin>"
 
 #. type: Plain text
 #: ../scripts/dd-list.1:66
@@ -5562,11 +5557,10 @@
 "depuis la ligne de commande. Les noms de paquets doivent être séparés par "
 "des espaces."
 
-# type: TP
 #. type: TP
 #: ../scripts/dd-list.1:66
 #, no-wrap
-msgid "B<-d>,B<--dctrl>"
+msgid "B<-d>, B<--dctrl>"
 msgstr "B<-d>, B<--dctrl>"
 
 #. type: Plain text
@@ -5596,28 +5590,31 @@
 #. type: TP
 #: ../scripts/dd-list.1:76
 #, no-wrap
-msgid "B<-s>,B<--sources> I<SOURCES_FILE>"
-msgstr ""
+msgid "B<-s>, B<--sources> I<Sources_file>"
+msgstr "B<-s>, B<--sources> I<fichier_Sources>"
 
 #. type: Plain text
 #: ../scripts/dd-list.1:80
 msgid ""
-"Read package information from the specified I<SOURCES_FILE>s.  This can be "
+"Read package information from the specified I<Sources_file>s.  This can be "
 "given multiple times."
 msgstr ""
+"Lire les renseignements sur le paquet depuis le (ou les) I<fichier_Sources> "
+"indiqué(s). Cette option peut être indiquée plusieurs fois."
 
 #. type: Plain text
 #: ../scripts/dd-list.1:83
 msgid ""
-"If no I<SOURCES_FILES> are specified, any files matching "
+"If no I<Sources_file>s are specified, any files matching "
 "I</var/lib/apt/lists/*_source_Sources> will be used."
 msgstr ""
+"Si aucun I<fichier_Sources> n'est indiqué, tous les fichiers correspondant à "
+"I</var/lib/apt/lists/*_source_Sources> seront utilisés."
 
-# type: TP
 #. type: TP
 #: ../scripts/dd-list.1:83
 #, no-wrap
-msgid "B<-u>,B<--uploaders>"
+msgid "B<-u>, B<--uploaders>"
 msgstr "B<-u>, B<--uploaders>"
 
 #. type: Plain text
@@ -5632,12 +5629,11 @@
 "défaut, utilisez --nouploaders si ce n'est pas ce que vous souhaitez. Les "
 "uploaders sont indiqués avec un « (U) » ajouté en fin de nom de paquet."
 
-# type: TP
 #. type: TP
 #: ../scripts/dd-list.1:88
 #, no-wrap
-msgid "B<-nou>,B<--nouploaders>"
-msgstr "B<-nou>,B<--nouploaders>"
+msgid "B<-nou>, B<--nouploaders>"
+msgstr "B<-nou>, B<--nouploaders>"
 
 #. type: Plain text
 #: ../scripts/dd-list.1:91
@@ -5646,11 +5642,10 @@
 "N'afficher que la liste des responsables (Maintainers) d'un paquet, pas les "
 "Uploaders."
 
-# type: TP
 #. type: TP
 #: ../scripts/dd-list.1:91
 #, no-wrap
-msgid "B<-b>,B<--print-binary>"
+msgid "B<-b>, B<--print-binary>"
 msgstr "B<-b>, B<--print-binary>"
 
 #. type: Plain text
@@ -5664,13 +5659,6 @@
 "paquets source (sans effet avec B<--dctrl> si la ligne I<Package:> contient "
 "des noms de paquets source)."
 
-# type: TP
-#. type: TP
-#: ../scripts/dd-list.1:96
-#, no-wrap
-msgid "B<-V>,B<--version>"
-msgstr "B<-V>, B<--version>"
-
 #. --------------------------------------------------------------------
 #. type: Plain text
 #: ../scripts/dd-list.1:100
@@ -5763,7 +5751,6 @@
 msgstr "Vérification du nom du répertoire"
 
 # NOTE: presque identique
-# type: Plain text
 #. type: Plain text
 #: ../scripts/debc.1:39
 msgid ""
@@ -5773,25 +5760,25 @@
 "the name of the parent directory once it finds the I<debian/changelog> file, "
 "and check that the directory name corresponds to the package name.  "
 "Precisely how it does this is controlled by two configuration file variables "
-"DEVSCRIPTS_CHECK_DIRNAME_LEVEL and DEVSCRIPTS_CHECK_DIRNAME_REGEX, and their "
-"corresponding command-line options B<--check-dirname-level> and B<--check-"
-"dirname-regex>."
+"B<DEVSCRIPTS_CHECK_DIRNAME_LEVEL> and B<DEVSCRIPTS_CHECK_DIRNAME_REGEX>, and "
+"their corresponding command-line options B<--check-dirname-level> and B<--"
+"check-dirname-regex>."
 msgstr ""
-"Comme certains autres scripts du paquet B<devscripts>, B<debc> parcourt une "
+"Comme plusieurs autres scripts du paquet B<devscripts>, B<debc> parcourt une "
 "arborescence de répertoires jusqu'à trouver un fichier I<debian/changelog>. "
 "Pour éviter les problèmes posés par les fichiers égarés, il examine le nom "
 "du répertoire parent une fois qu'il a trouvé le fichier I<debian/changelog>, "
 "et vérifie que le nom du répertoire correspond au nom du paquet. La méthode "
 "précise utilisée est contrôlée par les deux variables du fichier de "
-"configuration DEVSCRIPTS_CHECK_DIRNAME_LEVEL et "
-"DEVSCRIPTS_CHECK_DIRNAME_REGEX, et les options en ligne de commande "
+"configuration B<DEVSCRIPTS_CHECK_DIRNAME_LEVEL> et "
+"B<DEVSCRIPTS_CHECK_DIRNAME_REGEX>, et les options en ligne de commande "
 "associées B<--check-dirname-level> et B<--check-dirname-regex>."
 
-# type: Plain text
 #. type: Plain text
-#: ../scripts/debc.1:41 ../scripts/debclean.1:37 ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/uscan.1:296
-msgid "DEVSCRIPTS_CHECK_DIRNAME_LEVEL can take the following values:"
-msgstr "DEVSCRIPTS_CHECK_DIRNAME_LEVEL peut prendre les valeurs suivantes :"
+#: ../scripts/debc.1:41 ../scripts/debchange.1:119 ../scripts/debclean.1:37 ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/debuild.1:63 ../scripts/uscan.1:296
+msgid "B<DEVSCRIPTS_CHECK_DIRNAME_LEVEL> can take the following values:"
+msgstr ""
+"B<DEVSCRIPTS_CHECK_DIRNAME_LEVEL> peut prendre les valeurs suivantes :"
 
 # type: TP
 #. type: TP
@@ -5838,8 +5825,8 @@
 msgid ""
 "The directory name is checked by testing whether the current directory name "
 "(as determined by B<pwd>(1)) matches the regex given by the configuration "
-"file option DEVSCRIPTS_CHECK_DIRNAME_REGEX or by the command line option B<--"
-"check-dirname-regex> I<regex>.  Here I<regex> is a Perl regex (see "
+"file option B<DEVSCRIPTS_CHECK_DIRNAME_REGEX> or by the command line option "
+"B<--check-dirname-regex> I<regex>.  Here I<regex> is a Perl regex (see "
 "B<perlre>(3perl)), which will be anchored at the beginning and the end.  If "
 "I<regex> contains a '/', then it must match the full directory path.  If "
 "not, then it must match the full directory name.  If I<regex> contains the "
@@ -5850,33 +5837,31 @@
 msgstr ""
 "Le nom du répertoire est vérifié en testant si le nom du répertoire courant "
 "(donné par B<pwd>(1)) correspond à l'expression rationnelle donnée par la "
-"variable DEVSCRIPTS_CHECK_DIRNAME_REGEX du fichier de configuration ou par "
-"l'option B<--check-dirname-regex> I<regex>. Il s'agit d'une expression "
+"variable B<DEVSCRIPTS_CHECK_DIRNAME_REGEX> du fichier de configuration ou "
+"par l'option B<--check-dirname-regex> I<regex>. Il s'agit d'une expression "
 "rationnelle Perl (voir B<perlre>(1)), qui sera ancrée à son début et à sa "
 "fin. Si elle contient un « / », alors elle doit correspondre au chemin "
 "complet. Si elle contient la chaîne « PACKAGE », cette chaîne sera remplacée "
-"par le nom du paquet source déterminé par le fichier changelog. La valeur "
-"par défaut de cette expression rationnelle est « PACKAGE(-.+)? », ce qui "
-"correspond aux répertoires nommés PACKAGE ou PACKAGE-version."
+"par le nom du paquet source déterminé par le journal de modifications. La "
+"valeur par défaut de cette expression rationnelle est « PACKAGE(-.+)? », ce "
+"qui correspond aux répertoires nommés PACKAGE ou PACKAGE-version."
 
-# type: TP
 #. type: TP
-#: ../scripts/debc.1:71 ../scripts/debi.1:72 ../scripts/debrelease.1:81 ../scripts/debsign.1:90
+#: ../scripts/debc.1:71 ../scripts/debi.1:72 ../scripts/debrelease.1:81
 #, no-wrap
-msgid "B<--debs-dir> I<DIR>"
-msgstr "B<--debs-dir> I<RÉP>"
+msgid "B<--debs-dir> I<directory>"
+msgstr "B<--debs-dir> I<répertoire>"
 
 #. type: Plain text
 #: ../scripts/debc.1:77
 msgid ""
-"Look for the I<.changes>, I<.deb> and I<.udeb> files in directory I<DIR> "
-"instead of the parent of the source directory.  This should either be an "
-"absolute path or relative to the top of the source directory."
-msgstr ""
-"Chercher les fichiers I<.changes>, I<.deb> et I<.udeb> dans le répertoire "
-"I<RÉP> au lieu du répertoire parent du répertoire source. Cela doit être "
-"soit un chemin absolu, soit un chemin relatif à la racine du répertoire "
-"source."
+"Look for the I<.changes>, I<.deb> and I<.udeb> files in I<directory> instead "
+"of the parent of the source directory.  This should either be an absolute "
+"path or relative to the top of the source directory."
+msgstr ""
+"Chercher les fichiers I<.changes>, I<.deb> et I<.udeb> dans le I<répertoire> "
+"au lieu du répertoire parent du répertoire source. Cela doit être soit un "
+"chemin absolu, soit un chemin relatif à la racine du répertoire source."
 
 # type: TP
 #. type: TP
@@ -5885,15 +5870,14 @@
 msgid "B<--check-dirname-level> I<N>"
 msgstr "B<--check-dirname-level> I<N>"
 
-# type: Plain text
 #. type: Plain text
-#: ../scripts/debc.1:81 ../scripts/debc.1:85 ../scripts/debclean.1:73 ../scripts/debclean.1:77 ../scripts/debi.1:91 ../scripts/debi.1:95 ../scripts/debrelease.1:91 ../scripts/debrelease.1:95
+#: ../scripts/debc.1:81 ../scripts/debc.1:85 ../scripts/debclean.1:73 ../scripts/debclean.1:77 ../scripts/debi.1:91 ../scripts/debi.1:95 ../scripts/debrelease.1:91 ../scripts/debrelease.1:95 ../scripts/debuild.1:280 ../scripts/debuild.1:284 ../scripts/uscan.1:435 ../scripts/uscan.1:439
 msgid ""
-"See the above section \"Directory name checking\" for an explanation of this "
+"See the above section B<Directory name checking> for an explanation of this "
 "option."
 msgstr ""
-"Veuillez consulter la section ci-dessus « Vérification du nom du "
-"répertoire » pour une explication de cette option."
+"Veuillez consulter la section B<Vérification du nom du répertoire> ci-dessus "
+"pour une explication de cette option."
 
 # type: TP
 #. type: TP
@@ -5951,20 +5935,19 @@
 msgid "B<DEVSCRIPTS_CHECK_DIRNAME_LEVEL>, B<DEVSCRIPTS_CHECK_DIRNAME_REGEX>"
 msgstr "B<DEVSCRIPTS_CHECK_DIRNAME_LEVEL>, B<DEVSCRIPTS_CHECK_DIRNAME_REGEX>"
 
-# type: Plain text
 #. type: Plain text
-#: ../scripts/debc.1:115 ../scripts/debclean.1:107 ../scripts/debi.1:132 ../scripts/debrelease.1:132
+#: ../scripts/debc.1:115 ../scripts/debclean.1:107 ../scripts/debi.1:132 ../scripts/debrelease.1:132 ../scripts/debuild.1:367
 msgid ""
-"See the above section \"Directory name checking\" for an explanation of "
-"these variables.  Note that these are package-wide configuration variables, "
-"and will therefore affect all B<devscripts> scripts which check their value, "
-"as described in their respective manpages and in B<devscripts.conf>(5)."
+"See the above section B<Directory name checking> for an explanation of these "
+"variables.  Note that these are package-wide configuration variables, and "
+"will therefore affect all B<devscripts> scripts which check their value, as "
+"described in their respective manpages and in B<devscripts.conf>(5)."
 msgstr ""
-"Veuillez consulter la section « Vérification du nom du répertoire » ci-"
-"dessus pour une explication de ces variables. Notez que ce sont des "
-"variables de configuration pour tous les outils du paquet B<devscripts> ; "
-"elles impacteront tous les scripts qui les utilisent, comme indiqué dans "
-"leurs pages de manuel respectives et dans B<devscripts.conf>(5)."
+"Veuillez consulter la section B<Vérification du nom du répertoire> ci-dessus "
+"pour une explication de ces variables. Notez que ce sont des variables de "
+"configuration pour tous les outils du paquet B<devscripts> ; elles "
+"impacteront tous les scripts qui les utilisent, comme indiqué dans leurs "
+"pages de manuel respectives et dans B<devscripts.conf>(5)."
 
 # type: Plain text
 #. type: Plain text
@@ -6250,12 +6233,6 @@
 "associées B<--check-dirname-level> et B<--check-dirname-regex>."
 
 #. type: Plain text
-#: ../scripts/debchange.1:119 ../scripts/debuild.1:63
-msgid "B<DEVSCRIPTS_CHECK_DIRNAME_LEVEL> can take the following values:"
-msgstr ""
-"B<DEVSCRIPTS_CHECK_DIRNAME_LEVEL> peut prendre les valeurs suivantes :"
-
-#. type: Plain text
 #: ../scripts/debchange.1:142
 msgid ""
 "The directory name is checked by testing whether the current directory name "
@@ -7824,7 +7801,6 @@
 "B<debclean> utilise B<debuild>(1) pour nettoyer l'arborescence des sources."
 
 # NOTE: presque identique
-# type: Plain text
 #. type: Plain text
 #: ../scripts/debclean.1:35
 msgid ""
@@ -7834,9 +7810,9 @@
 "potential problems, it will examine the name of the parent directory once it "
 "finds a I<debian/changelog> file, and check that the directory name "
 "corresponds to the package name.  Precisely how it does this is controlled "
-"by two configuration file variables DEVSCRIPTS_CHECK_DIRNAME_LEVEL and "
-"DEVSCRIPTS_CHECK_DIRNAME_REGEX, and their corresponding command-line options "
-"B<--check-dirname-level> and B<--check-dirname-regex>."
+"by two configuration file variables B<DEVSCRIPTS_CHECK_DIRNAME_LEVEL> and "
+"B<DEVSCRIPTS_CHECK_DIRNAME_REGEX>, and their corresponding command-line "
+"options B<--check-dirname-level> and B<--check-dirname-regex>."
 msgstr ""
 "Comme certains autres scripts du paquet B<devscripts>, B<debclean> parcourt "
 "une arborescence de répertoires pour trouver des fichiers "
@@ -7844,8 +7820,8 @@
 "égarés, il examine le nom du répertoire parent une fois qu'il a trouvé le "
 "fichier I<debian/changelog>, et vérifie que le nom du répertoire correspond "
 "au nom du paquet. La façon précise utilisée est contrôlée par les deux "
-"variables du fichier de configuration DEVSCRIPTS_CHECK_DIRNAME_LEVEL et "
-"DEVSCRIPTS_CHECK_DIRNAME_REGEX, et les options en ligne de commande "
+"variables du fichier de configuration B<DEVSCRIPTS_CHECK_DIRNAME_LEVEL> et "
+"B<DEVSCRIPTS_CHECK_DIRNAME_REGEX>, et les options en ligne de commande "
 "associées B<--check-dirname-level> et B<--check-dirname-regex>."
 
 # type: TP
@@ -9104,9 +9080,9 @@
 "the name of the parent directory once it finds the I<debian/changelog> file, "
 "and check that the directory name corresponds to the package name.  "
 "Precisely how it does this is controlled by two configuration file variables "
-"DEVSCRIPTS_CHECK_DIRNAME_LEVEL and DEVSCRIPTS_CHECK_DIRNAME_REGEX, and their "
-"corresponding command-line options B<--check-dirname-level> and B<--check-"
-"dirname-regex>."
+"B<DEVSCRIPTS_CHECK_DIRNAME_LEVEL> and B<DEVSCRIPTS_CHECK_DIRNAME_REGEX>, and "
+"their corresponding command-line options B<--check-dirname-level> and B<--"
+"check-dirname-regex>."
 msgstr ""
 "Comme plusieurs autres scripts du paquet B<devscripts>, B<debi> parcourt une "
 "arborescence de répertoires jusqu'à trouver un fichier I<debian/changelog>. "
@@ -9114,20 +9090,20 @@
 "du répertoire parent une fois qu'il a trouvé le fichier I<debian/changelog>, "
 "et vérifie que le nom du répertoire correspond au nom du paquet. La méthode "
 "précise utilisée est contrôlée par les deux variables du fichier de "
-"configuration DEVSCRIPTS_CHECK_DIRNAME_LEVEL et "
-"DEVSCRIPTS_CHECK_DIRNAME_REGEX, et les options en ligne de commande "
+"configuration B<DEVSCRIPTS_CHECK_DIRNAME_LEVEL> et "
+"B<DEVSCRIPTS_CHECK_DIRNAME_REGEX>, et les options en ligne de commande "
 "associées B<--check-dirname-level> et B<--check-dirname-regex>."
 
 #. type: Plain text
 #: ../scripts/debi.1:78 ../scripts/debrelease.1:87
 msgid ""
-"Look for the I<.changes> and I<.deb> files in directory I<DIR> instead of "
-"the parent of the source directory.  This should either be an absolute path "
-"or relative to the top of the source directory."
-msgstr ""
-"Chercher les fichiers I<.changes> et I<.deb> dans le répertoire I<RÉP> au "
-"lieu du répertoire parent du répertoire source. Cela doit être soit un "
-"chemin absolu, soit un chemin relatif à la racine du répertoire source."
+"Look for the I<.changes> and I<.deb> files in I<directory> instead of the "
+"parent of the source directory.  This should either be an absolute path or "
+"relative to the top of the source directory."
+msgstr ""
+"Chercher les fichiers I<.changes> et I<.deb> dans le I<répertoire> au lieu "
+"du répertoire parent du répertoire source. Cela doit être soit un chemin "
+"absolu, soit un chemin relatif à la racine du répertoire source."
 
 # type: TP
 #. type: TP
@@ -9140,6 +9116,8 @@
 #: ../scripts/debi.1:81
 msgid "Search for a multiarch I<.changes> file, as created by B<dpkg-cross>."
 msgstr ""
+"Chercher un fichier I<.changes> multiarchitecture, tel que créé par B<dpkg-"
+"cross>."
 
 #. type: TP
 #: ../scripts/debi.1:81
@@ -9155,7 +9133,7 @@
 "binary packages when you don't want to have all the binaries installed at "
 "once."
 msgstr ""
-"Ne faire que mettre à jour les paquets déjà installés sur le système, plutôt "
+"Limiter les mises à jour aux paquets déjà installés sur le système, plutôt "
 "que d'installer tous les paquets listés dans le fichier I<.changes>. C'est "
 "utile pour les paquets qui produisent plusieurs paquets binaires quand vous "
 "ne souhaitez pas que tous les paquets binaires soient installés à la fois."
@@ -9170,19 +9148,22 @@
 #: ../scripts/debi.1:98
 msgid "Attempt to satisfy the I<Depends> of a package when installing it."
 msgstr ""
+"Essayer de satisfaire les dépendances d'un paquet lors de son installation."
 
 #. type: TP
 #: ../scripts/debi.1:98
 #, no-wrap
-msgid "B<--tool> I<TOOL>"
-msgstr ""
+msgid "B<--tool> I<tool>"
+msgstr "B<--tool> I<outil>"
 
 #. type: Plain text
 #: ../scripts/debi.1:102
 msgid ""
-"Use the specified tool for installing the dependencies of the package(s) to "
-"be installed.  By default, B<apt-get> is used."
+"Use the specified I<tool> for installing the dependencies of the package(s) "
+"to be installed.  By default, B<apt-get> is used."
 msgstr ""
+"Utiliser l'I<outil> indiqué pour installer les dépendances des paquets à "
+"installer. Par défaut, B<apt-get> est utilisé."
 
 #. type: Plain text
 #: ../scripts/debi.1:125
@@ -9358,9 +9339,9 @@
 "potential problems, it will examine the name of the parent directory once it "
 "finds the I<debian/changelog> file, and check that the directory name "
 "corresponds to the package name.  Precisely how it does this is controlled "
-"by two configuration file variables DEVSCRIPTS_CHECK_DIRNAME_LEVEL and "
-"DEVSCRIPTS_CHECK_DIRNAME_REGEX, and their corresponding command-line options "
-"B<--check-dirname-level> and B<--check-dirname-regex>."
+"by two configuration file variables B<DEVSCRIPTS_CHECK_DIRNAME_LEVEL> and "
+"B<DEVSCRIPTS_CHECK_DIRNAME_REGEX>, and their corresponding command-line "
+"options B<--check-dirname-level> and B<--check-dirname-regex>."
 msgstr ""
 "Comme plusieurs autres scripts du paquet B<devscripts>, B<debrelease> "
 "parcourt une arborescence de répertoires jusqu'à ce qu'il trouve un fichier "
@@ -9368,8 +9349,8 @@
 "égarés, il examine le nom du répertoire parent une fois qu'il a trouvé le "
 "fichier I<debian/changelog>, et vérifie que le nom du répertoire correspond "
 "au nom du paquet. La façon précise utilisée est contrôlée par les deux "
-"variables du fichier de configuration DEVSCRIPTS_CHECK_DIRNAME_LEVEL et "
-"DEVSCRIPTS_CHECK_DIRNAME_REGEX, et les options en ligne de commande "
+"variables du fichier de configuration B<DEVSCRIPTS_CHECK_DIRNAME_LEVEL> et "
+"B<DEVSCRIPTS_CHECK_DIRNAME_REGEX>, et les options en ligne de commande "
 "associées B<--check-dirname-level> et B<--check-dirname-regex>."
 
 # type: TP
@@ -10262,7 +10243,7 @@
 "nom de répertoire absolu ou relatif au répertoire personnel distant. B<scp> "
 "sera utilisé pour le transfert. La syntaxe "
 "[I<nom_utilisateur>@]I<hôte_distant>:I<fichier_changes> est également "
-"permise. Les jockers (B<*> etc.) sont autorisés."
+"permise. Les jokers (B<*>, etc.) sont autorisés."
 
 # type: TP
 #. type: TP
@@ -10275,8 +10256,10 @@
 #: ../scripts/debsign.1:52
 msgid ""
 "When B<debsign> needs to execute GPG to sign it will run I<progname> "
-"(searching the B<PATH> if necessary), instead of gpg."
+"(searching the B<PATH> if necessary), instead of B<gpg>."
 msgstr ""
+"Lorsque B<debsign> doit exécuter GPG pour signer, il exécutera I<programme> "
+"(en le cherchant dans B<PATH> si nécessaire), au lieu de B<gpg>."
 
 # type: TP
 #. type: TP
@@ -10359,6 +10342,13 @@
 "fichier a déjà été signé. Si aucune option n'est fournie alors qu'un fichier "
 "signé est trouvé, il est demandé si la signature actuelle doit être utilisée."
 
+# type: TP
+#. type: TP
+#: ../scripts/debsign.1:90
+#, no-wrap
+msgid "B<--debs-dir> I<DIR>"
+msgstr "B<--debs-dir> I<RÉP>"
+
 #. type: Plain text
 #: ../scripts/debsign.1:96
 msgid ""
@@ -10587,7 +10577,7 @@
 "multiple architectures."
 msgstr ""
 "Indiquer l'architecture des paquets binaires téléchargés, ce qui implique "
-"l'option B<--binary>. Cette option peut-être indiquée plusieurs fois afin de "
+"l'option B<--binary>. Cette option peut être indiquée plusieurs fois afin de "
 "télécharger les paquets binaires pour plusieurs architectures."
 
 #. type: Plain text
@@ -11548,15 +11538,6 @@
 "options ultérieures en ligne de commande."
 
 #. type: Plain text
-#: ../scripts/debuild.1:280 ../scripts/debuild.1:284 ../scripts/uscan.1:435 ../scripts/uscan.1:439
-msgid ""
-"See the above section B<Directory name checking> for an explanation of this "
-"option."
-msgstr ""
-"Veuillez consulter la section B<Vérification du nom du répertoire> ci-dessus "
-"pour une explication de cette option."
-
-#. type: Plain text
 #: ../scripts/debuild.1:287
 msgid "Do not run B<dpkg-checkbuilddeps> to check build dependencies."
 msgstr ""
@@ -11812,20 +11793,6 @@
 "l'utilisation de cette option est la même que celle décrite pour la variable "
 "B<DEBUILD_DPKG_BUILDPACKAGE_OPTS>."
 
-#. type: Plain text
-#: ../scripts/debuild.1:367
-msgid ""
-"See the above section B<Directory name checking> for an explanation of these "
-"variables.  Note that these are package-wide configuration variables, and "
-"will therefore affect all B<devscripts> scripts which check their value, as "
-"described in their respective manpages and in B<devscripts.conf>(5)."
-msgstr ""
-"Veuillez consulter la section B<Vérification du nom du répertoire> ci-dessus "
-"pour une explication de ces variables. Notez que ce sont des variables de "
-"configuration pour tous les outils du paquet B<devscripts> ; elles "
-"impacteront tous les scripts qui les utilisent, comme indiqué dans leurs "
-"pages de manuel respectives et dans B<devscripts.conf>(5)."
-
 # type: Plain text
 #. type: Plain text
 #: ../scripts/debuild.1:371
@@ -12032,14 +11999,18 @@
 #. type: Plain text
 #: ../scripts/dep3changelog.1:4
 msgid ""
-"dep3changelog - Generate a changelog entry from a DEP3-style patch header"
+"dep3changelog - generate a changelog entry from a DEP3-style patch header"
 msgstr ""
+"dep3changelog - Préparer une entrée du journal de modifications à partir de "
+"l'en-tête d'un correctif compatible DEP3"
 
 #. type: Plain text
 #: ../scripts/dep3changelog.1:6
 msgid ""
-"B<dep3changelog> I<patch> [I<patch> ...] [I<options>] [-- [I<dch_options>]"
+"B<dep3changelog> I<patch> [I<patch> ...] [I<options>] [-- [I<dch_options>]]"
 msgstr ""
+"B<dep3changelog> I<correctif> [I<correctif> ...] [I<options>] [-- "
+"[I<options_dch>]]"
 
 #. type: Plain text
 #: ../scripts/dep3changelog.1:15
@@ -12053,6 +12024,16 @@
 "generated changelog entries are passed to B<debchange> as an argument along "
 "with the given I<dch_options>."
 msgstr ""
+"B<dep3changelog> extrait les en-têtes d'un correctif DEP3 à partir des "
+"fichiers I<correctif> donnés et construit une entrée du journal de "
+"modifications pour chaque correctif. Si l'auteur du correctif est différent "
+"de celui détecté par les variables d'environnement B<DEBEMAIL>, B<NAME>, "
+"B<DEBEMAIL> ou B<EMAIL>, « Thanks to I<auteur> E<lt>I<adresse>E<gt> » est "
+"ajouté à l'entrée du journal de modifications pour ce correctif. Tous les "
+"champs B<bug-debian> et B<bug-ubuntu> sont ajoutés en « Closes » de l'entrée "
+"du journal de modifications. Les entrées du journal de modifications "
+"préparées sont passées en argument à B<debchange> avec les I<options_dch> "
+"données."
 
 #. type: Plain text
 #: ../scripts/dep3changelog.1:28
@@ -12560,6 +12541,8 @@
 #: ../scripts/devscripts.1:85
 msgid "generate a changelog entry from a DEP3-style patch header"
 msgstr ""
+"préparer une entrée du journal de modifications à partir de l'en-tête d'un "
+"correctif compatible DEP3"
 
 #. type: IP
 #: ../scripts/devscripts.1:85
@@ -18113,6 +18096,22 @@
 "I<E<lt>packageE<gt>_E<lt>versionE<gt>.orig.tar.{gz|bz2|lzma|xz}> as "
 "described by the help for the B<--symlink> option."
 msgstr ""
+"La version courante (amont) peut être indiquée comme le second paramètre "
+"dans la ligne du fichier I<watch>. Si elle vaut I<debian> ou est absente, "
+"alors la version courante Debian (telle qu'elle est déterminée par "
+"I<debian/changelog>) est utilisée pour déterminer la version amont courante. "
+"La version amont courante peut aussi être indiquée par l'option B<--upstream-"
+"version> en ligne de commande, qui spécifie le numéro de version amont du "
+"paquet actuellement installé (c'est-à-dire, le numéro de version Debian sans "
+"epoch ni version Debian). Le numéro de version amont sera alors modifié en "
+"utilisant l'option B<dversionmangle> si elle est indiquée, tel que cela est "
+"décrit plus bas. Si la version la plus récente disponible est plus récente "
+"que la version courante, alors elle sera téléchargée dans le répertoire "
+"parent, sans que l'option B<--report> ou B<--report-status> ait été "
+"utilisée. Une fois que le fichier a été téléchargé, un lien symbolique vers "
+"le fichier est créé depuis le paquet "
+"I<E<lt>paquetE<gt>_E<lt>versionE<gt>.orig.tar.{gz|bz2|lzma|xz}> conformément "
+"à l'aide décrite pour l'option B<--symlink>."
 
 #. type: Plain text
 #: ../scripts/uscan.1:190
@@ -18283,6 +18282,11 @@
 "ed*)/.a$1/>'. These backreferences must use the `B<$1>' syntax, as the `B<\\"
 "e1>' syntax is not supported."
 msgstr ""
+"Si l'opération « B<s> » est utilisée, le remplacement peut contenir des "
+"références arrières aux expressions entre parenthèses de l'expression "
+"rationnelle correspondante, comme « B<s/-alpha(\\ed*)/.a$1/> ». Ces "
+"références arrières doivent utiliser la syntaxe « B<$1> », puisque la "
+"syntaxe « B<\\e1> » n'est pas permise."
 
 # type: TP
 #. type: TP
@@ -18576,6 +18580,12 @@
 "I<.tar.lzma>, I<.tlz>, I<.tlzm>, and I<.tlzma>), and orig.tar.xz (for "
 "upstream I<.tar.xz> and I<.txz>).  (This is the default behaviour.)"
 msgstr ""
+"Faire des liens symboliques orig.tar.gz vers les fichiers téléchargés s'ils "
+"ont des extensions I<.tar.gz> ou I<.tgz>. Cela fonctionne aussi pour "
+"orig.tar.bz2 (pour les fichiers amont en I<.tar.bz2>, I<.tbz> et I<.tbz2>), "
+"orig.tar.lzma (pour les fichiers amont en I<.tar.lzma>, I<.tlz>, I<.tlzm> et "
+"I<.tlzma>) et orig.tar.xz (pour les fichiers amont en I<.tar.xz> et "
+"I<.txz>). C'est le comportement par défaut."
 
 # type: TP
 #. type: TP
@@ -18591,6 +18601,9 @@
 "I<orig.tar.gz>, I<orig.tar.bz2>, I<orig.tar.lzma>, or I<orig.tar.xz> names "
 "as described above."
 msgstr ""
+"Au lieu de créer des liens symboliques, renommer les fichiers téléchargés "
+"avec leur nom Debian I<orig.tar.gz>, I<orig.tar.bz2>, I<orig.tar.lzma> ou "
+"I<orig.tar.xz> conformément à la description ci-dessus."
 
 # type: TP
 #. type: TP
@@ -18606,11 +18619,20 @@
 "it to a gzip tar archive, which is still currently required as a member of a "
 "Debian source package. Does nothing if the downloaded archive is not an lzma "
 "tar archive, xz tar archive, bzip tar archive or a zip archive (i.e. it "
-"doesn't match a .tlz, .tlzm, .tlzma, .tar.lzma, .txz, \\^.tar.xz .tbz, "
+"doesn't match a .tlz, .tlzm, .tlzma, .tar.lzma, .txz, \\^.tar.xz, .tbz, "
 ".tbz2, .tar.bz2 or .zip extension). The unzip package must be installed in "
 "order to repack .zip archives, the xz-utils package must be installed to "
 "repack lzma or xz tar archives."
 msgstr ""
+"Après avoir téléchargé une archive tar compressée avec lzma ou xz ou bzip ou "
+"une archive zip, la rempaqueter dans une archive tar compressée avec gzip, "
+"ce qui est toujours nécessaire pour les paquets source Debian. Ne rien faire "
+"si l'archive téléchargée n'est ni une archive tar compressée avec lzma ou xz "
+"ou bzip ni une archive zip (c'est-à-dire si elle ne finit pas par "
+"l'extension .tlz, .tlzm, .tlzma, tar.lzma, .txz, .tar.xz, .tbz, .tbz2, "
+".tar.bz2 ou .zip). Le paquet unzip doit être installé pour rempaqueter les "
+"archives .zip, le paquet xz-utils doit être installé pour rempaqueter les "
+"archives tar compressées avec lzma ou xz."
 
 # type: TP
 #. type: TP
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/diffutils.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/diffutils.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/diffutils.po	2012-01-02 17:27:16.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/diffutils.po	2012-02-23 06:31:39.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:56+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:56+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: lib/c-stack.c:204 lib/c-stack.c:297
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/dnsmasq.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/dnsmasq.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/dnsmasq.po	2012-01-02 17:26:58.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/dnsmasq.po	2012-02-23 06:31:25.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:33+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:14+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: cache.c:764
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/doc-base.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/doc-base.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/doc-base.po	2012-01-02 17:26:46.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/doc-base.po	2012-02-23 06:31:12.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:29+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:39+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: ../../install-docs.in:97
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/dpkg-dev.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/dpkg-dev.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/dpkg-dev.po	2012-01-02 17:26:46.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/dpkg-dev.po	2012-02-23 06:31:12.000000000 +0000
@@ -17,8 +17,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:32+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:41+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: scripts/dpkg-architecture.pl:36 scripts/dpkg-buildflags.pl:31
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/dpkg.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/dpkg.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/dpkg.po	2012-01-02 17:26:46.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/dpkg.po	2012-02-23 06:31:12.000000000 +0000
@@ -20,8 +20,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:30+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:40+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: lib/dpkg/ar.c:66
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/dselect.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/dselect.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/dselect.po	2012-01-02 17:26:46.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/dselect.po	2012-02-23 06:31:12.000000000 +0000
@@ -57,8 +57,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:32+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:41+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: dselect/basecmds.cc:125
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/duplicity.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/duplicity.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/duplicity.po	2012-01-02 17:26:58.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/duplicity.po	2012-02-23 06:31:25.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:33+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:14+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../bin/duplicity:98
 msgid "Reuse configured PASSPHRASE as SIGN_PASSPHRASE"
@@ -98,91 +98,91 @@
 msgid "Backup Statistics"
 msgstr "Statistiques de sauvegarde"
 
-#: ../bin/duplicity:624
+#: ../bin/duplicity:625
 #, python-format
 msgid "%s not found in archive, no files restored."
 msgstr "%s n’a pas été trouvé dans l’archive, aucun fichier restauré."
 
-#: ../bin/duplicity:628
+#: ../bin/duplicity:629
 msgid "No files found in archive - nothing restored."
 msgstr "Aucun fichier trouvé dans l’archive – rien à restaurer."
 
-#: ../bin/duplicity:661
+#: ../bin/duplicity:662
 #, python-format
 msgid "Processed volume %d of %d"
 msgstr "Le volume %d sur %d a été traité"
 
-#: ../bin/duplicity:686
+#: ../bin/duplicity:687
 #, python-format
 msgid "Invalid data - %s hash mismatch for file:"
 msgstr ""
 
-#: ../bin/duplicity:688
+#: ../bin/duplicity:689
 #, python-format
 msgid "Calculated hash: %s"
 msgstr "Empreinte calculée : %s"
 
-#: ../bin/duplicity:689
+#: ../bin/duplicity:690
 #, python-format
 msgid "Manifest hash: %s"
 msgstr "Empreinte manifeste : %s"
 
-#: ../bin/duplicity:727
+#: ../bin/duplicity:728
 #, python-format
 msgid "Volume was signed by key %s, not %s"
 msgstr "Le volume a été signé par la clé %s et non pas %s"
 
-#: ../bin/duplicity:757
+#: ../bin/duplicity:758
 #, python-format
 msgid "Verify complete: %s, %s."
 msgstr "Vérification complète : %s, %s."
 
-#: ../bin/duplicity:758
+#: ../bin/duplicity:759
 #, python-format
 msgid "%d file compared"
 msgid_plural "%d files compared"
 msgstr[0] "%d fichier comparé"
 msgstr[1] "%d fichiers comparés"
 
-#: ../bin/duplicity:760
+#: ../bin/duplicity:761
 #, python-format
 msgid "%d difference found"
 msgid_plural "%d differences found"
 msgstr[0] "%d différence trouvée"
 msgstr[1] "%d différences trouvées"
 
-#: ../bin/duplicity:779
+#: ../bin/duplicity:780
 msgid "No extraneous files found, nothing deleted in cleanup."
 msgstr ""
 "Aucun fichier étranger détecté, aucune suppression effectuée lors du "
 "nettoyage."
 
-#: ../bin/duplicity:784
+#: ../bin/duplicity:785
 msgid "Deleting this file from backend:"
 msgid_plural "Deleting these files from backend:"
 msgstr[0] "Supprimer ce fichier de l’arrière plan :"
 msgstr[1] "Supprimer ces fichiers de l’arrière plan :"
 
-#: ../bin/duplicity:796
+#: ../bin/duplicity:797
 msgid "Found the following file to delete:"
 msgid_plural "Found the following files to delete:"
 msgstr[0] "Le fichier suivant a été trouvé pour la suppression :"
 msgstr[1] "Les fichiers suivants ont été trouvés pour la suppression :"
 
-#: ../bin/duplicity:800
+#: ../bin/duplicity:801
 msgid "Run duplicity again with the --force option to actually delete."
 msgstr ""
 "Exécutez duplicity à nouveau avec l’option --force pour supprimer réellement."
 
-#: ../bin/duplicity:839
+#: ../bin/duplicity:840
 msgid "There are backup set(s) at time(s):"
 msgstr "Il y a un ou plusieurs jeux de sauvegarde datés du :"
 
-#: ../bin/duplicity:841
+#: ../bin/duplicity:842
 msgid "Which can't be deleted because newer sets depend on them."
 msgstr "Qui ne peuvent être supprimés car de nouveaux jeux en dépendent."
 
-#: ../bin/duplicity:845
+#: ../bin/duplicity:846
 msgid ""
 "Current active backup chain is older than specified time.  However, it will "
 "not be deleted.  To remove all your backups, manually purge the repository."
@@ -191,91 +191,91 @@
 "indiquée. Cependant elle ne sera pas supprimée. Pour ôter toutes vos "
 "sauvegardes, purgez manuellement leur dépôt."
 
-#: ../bin/duplicity:851
+#: ../bin/duplicity:852
 msgid "No old backup sets found, nothing deleted."
 msgstr ""
 "Aucun ancien jeu de sauvegarde n’a été trouvé, rien n’a été supprimé."
 
-#: ../bin/duplicity:854
+#: ../bin/duplicity:855
 msgid "Deleting backup set at time:"
 msgid_plural "Deleting backup sets at times:"
 msgstr[0] "Suppression du jeu de sauvegarde daté du :"
 msgstr[1] "Suppression des jeux de sauvegarde datés du :"
 
-#: ../bin/duplicity:871
+#: ../bin/duplicity:872
 msgid "Found old backup set at the following time:"
 msgid_plural "Found old backup sets at the following times:"
 msgstr[0] "Ancien jeu de sauvegarde trouvé à la date du :"
 msgstr[1] "Anciens jeux de sauvegarde trouvés aux dates du :"
 
-#: ../bin/duplicity:875
+#: ../bin/duplicity:876
 msgid "Rerun command with --force option to actually delete."
 msgstr ""
 "Veuillez relancer la commande avec l'option --force pour forcer la "
 "suppression."
 
-#: ../bin/duplicity:953
+#: ../bin/duplicity:954
 #, python-format
 msgid "Deleting local %s (not authoritative at backend)."
 msgstr "Supprime le %s local (ne fait pas autorité au niveau du serveur)."
 
-#: ../bin/duplicity:957
+#: ../bin/duplicity:958
 #, python-format
 msgid "Unable to delete %s: %s"
 msgstr ""
 
-#: ../bin/duplicity:985 ../duplicity/dup_temp.py:260
+#: ../bin/duplicity:986 ../duplicity/dup_temp.py:260
 #, python-format
 msgid "Failed to read %s: %s"
 msgstr "Impossible de lire %s : %s"
 
-#: ../bin/duplicity:996
+#: ../bin/duplicity:997
 #, python-format
 msgid "Copying %s to local cache."
 msgstr "Copie de %s vers le cache local."
 
-#: ../bin/duplicity:1044
+#: ../bin/duplicity:1045
 msgid "Local and Remote metadata are synchronized, no sync needed."
 msgstr ""
 "Les métadonnées locales et distantes sont déjà synchronisées. Aucune "
 "synchronisation nécessaire."
 
-#: ../bin/duplicity:1049
+#: ../bin/duplicity:1050
 msgid "Synchronizing remote metadata to local cache..."
 msgstr "Synchronisation des métadonnées distantes vers le cache local..."
 
-#: ../bin/duplicity:1062
+#: ../bin/duplicity:1063
 msgid "Sync would copy the following from remote to local:"
 msgstr ""
 "La synchronisation va copier localement les éléments suivants à partir de "
 "l’hôte distant :"
 
-#: ../bin/duplicity:1065
+#: ../bin/duplicity:1066
 msgid "Sync would remove the following spurious local files:"
 msgstr "La synchronisation va supprimer les fichiers parasites suivants :"
 
-#: ../bin/duplicity:1108
+#: ../bin/duplicity:1109
 msgid "Unable to get free space on temp."
 msgstr "Impossible de déterminer l’espace libre dans le dossier temporaire."
 
-#: ../bin/duplicity:1116
+#: ../bin/duplicity:1117
 #, python-format
 msgid "Temp space has %d available, backup needs approx %d."
 msgstr ""
 "Il y a %d d’espace temporaire disponible, la sauvegarde nécessite environ %d."
 
-#: ../bin/duplicity:1119
+#: ../bin/duplicity:1120
 #, python-format
 msgid "Temp has %d available, backup will use approx %d."
 msgstr ""
 "Il y a %d d’espace temporaire disponible, la sauvegarde va nécessiter "
 "environ %d."
 
-#: ../bin/duplicity:1127
+#: ../bin/duplicity:1128
 msgid "Unable to get max open files."
 msgstr "Impossible d’obtenir le maximum de fichiers ouverts."
 
-#: ../bin/duplicity:1131
+#: ../bin/duplicity:1132
 #, python-format
 msgid ""
 "Max open files of %s is too low, should be >= 1024.\n"
@@ -285,7 +285,7 @@
 ">= 1024.\n"
 "Utilisez « ulimit -n 1024 » (ou supérieur) pour corriger.\n"
 
-#: ../bin/duplicity:1180
+#: ../bin/duplicity:1181
 msgid ""
 "RESTART: The first volume failed to upload before termination.\n"
 "         Restart is impossible...starting backup from beginning."
@@ -295,7 +295,7 @@
 "              Le redémarrage est impossible... lancement de la sauvegarde "
 "depuis le début."
 
-#: ../bin/duplicity:1186
+#: ../bin/duplicity:1187
 #, python-format
 msgid ""
 "RESTART: Volumes %d to %d failed to upload before termination.\n"
@@ -305,7 +305,7 @@
 "fin.\n"
 "              Redémarrage de la sauvegarde au volume %d."
 
-#: ../bin/duplicity:1193
+#: ../bin/duplicity:1194
 #, python-format
 msgid ""
 "RESTART: Impossible backup state: manifest has %d vols, remote has %d vols.\n"
@@ -319,45 +319,45 @@
 "              sauvegarde partielle puis reprendre la sauvegarde depuis le "
 "début."
 
-#: ../bin/duplicity:1273
+#: ../bin/duplicity:1274
 #, python-format
 msgid "Last %s backup left a partial set, restarting."
 msgstr "La dernière sauvegarde %s a laissé un jeu partiel, redémarrage."
 
-#: ../bin/duplicity:1277
+#: ../bin/duplicity:1278
 #, python-format
 msgid "Cleaning up previous partial %s backup set, restarting."
 msgstr "Nettoyage du dernier jeu partiel de sauvegarde %s, redémarrage."
 
-#: ../bin/duplicity:1288
+#: ../bin/duplicity:1289
 msgid "Last full backup date:"
 msgstr "Date de dernière sauvegarde intégrale :"
 
-#: ../bin/duplicity:1290
+#: ../bin/duplicity:1291
 msgid "Last full backup date: none"
 msgstr "Date de dernière sauvegarde intégrale : aucune"
 
-#: ../bin/duplicity:1292
+#: ../bin/duplicity:1293
 msgid "Last full backup is too old, forcing full backup"
 msgstr ""
 "La dernière sauvegarde intégrale est trop ancienne, forçage d’une nouvelle "
 "sauvegarde intégrale"
 
-#: ../bin/duplicity:1390
+#: ../bin/duplicity:1391
 msgid "INT intercepted...exiting."
 msgstr ""
 
-#: ../bin/duplicity:1396
+#: ../bin/duplicity:1397
 #, python-format
 msgid "GPG error detail: %s"
 msgstr "Détails de l’erreur GPG : %s"
 
-#: ../bin/duplicity:1405
+#: ../bin/duplicity:1406
 #, python-format
 msgid "User error detail: %s"
 msgstr "Détails de l’erreur utilisateur : %s"
 
-#: ../bin/duplicity:1414
+#: ../bin/duplicity:1415
 #, python-format
 msgid "Backend error detail: %s"
 msgstr "Détails de l’erreur de sauvegarde : %s"
@@ -399,26 +399,26 @@
 msgid "task execution done (success: %s)"
 msgstr "exécution de tâche réalisée (succès : %s)"
 
-#: ../duplicity/backend.py:485 ../duplicity/backend.py:509
+#: ../duplicity/backend.py:487 ../duplicity/backend.py:511
 #, python-format
 msgid "Reading results of '%s'"
 msgstr "Lecture des résultats de « %s »"
 
-#: ../duplicity/backend.py:524
+#: ../duplicity/backend.py:526
 #, python-format
 msgid "Running '%s' failed with code %d (attempt #%d)"
 msgid_plural "Running '%s' failed with code %d (attempt #%d)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../duplicity/backend.py:528
+#: ../duplicity/backend.py:530
 #, python-format
 msgid ""
 "Error is:\n"
 "%s"
 msgstr ""
 
-#: ../duplicity/backend.py:530
+#: ../duplicity/backend.py:532
 #, python-format
 msgid "Giving up trying to execute '%s' after %d attempt"
 msgid_plural "Giving up trying to execute '%s' after %d attempts"
@@ -559,7 +559,7 @@
 msgstr[0] "ainsi que %d jeu incomplet de sauvegarde."
 msgstr[1] "ainsi que %d jeux incomplets de sauvegarde."
 
-#. "cleanup" is a hard-coded command, so do not translate it
+#. TRANSL: "cleanup" is a hard-coded command, so do not translate it
 #: ../duplicity/collections.py:655
 msgid ""
 "These may be deleted by running duplicity with the \"cleanup\" command."
@@ -690,70 +690,70 @@
 "version future.\n"
 "L’utilisation des noms de fichiers par défaut est fortement suggérée."
 
-#: ../duplicity/commandline.py:211
+#: ../duplicity/commandline.py:214
 msgid "Unable to load gio module"
 msgstr "Impossible de charger le module gio"
 
-#: ../duplicity/commandline.py:233
+#: ../duplicity/commandline.py:236
 #, python-format
 msgid "Error opening file %s"
 msgstr "Erreur lors de l’ouverture du fichier %s"
 
-#. Used in usage help to represent a Unix-style path name. Example:
+#. TRANSL: Used in usage help to represent a Unix-style path name. Example:
 #. --archive-dir <path>
-#: ../duplicity/commandline.py:254 ../duplicity/commandline.py:262
-#: ../duplicity/commandline.py:279 ../duplicity/commandline.py:333
-#: ../duplicity/commandline.py:494 ../duplicity/commandline.py:710
+#: ../duplicity/commandline.py:257 ../duplicity/commandline.py:265
+#: ../duplicity/commandline.py:282 ../duplicity/commandline.py:339
+#: ../duplicity/commandline.py:505 ../duplicity/commandline.py:721
 msgid "path"
 msgstr "chemin"
 
-#. Used in usage help to represent an ID for a GnuPG key. Example:
+#. TRANSL: Used in usage help to represent an ID for a GnuPG key. Example:
 #. --encrypt-key <gpg_key_id>
-#: ../duplicity/commandline.py:274 ../duplicity/commandline.py:281
-#: ../duplicity/commandline.py:483 ../duplicity/commandline.py:683
+#: ../duplicity/commandline.py:277 ../duplicity/commandline.py:284
+#: ../duplicity/commandline.py:494 ../duplicity/commandline.py:694
 msgid "gpg-key-id"
 msgstr "identifiant_clé_gpg"
 
-#. Used in usage help to represent a "glob" style pattern for
+#. TRANSL: Used in usage help to represent a "glob" style pattern for
 #. matching one or more files, as described in the documentation.
 #. Example:
 #. --exclude <shell_pattern>
-#: ../duplicity/commandline.py:289 ../duplicity/commandline.py:373
-#: ../duplicity/commandline.py:733
+#: ../duplicity/commandline.py:292 ../duplicity/commandline.py:379
+#: ../duplicity/commandline.py:744
 msgid "shell_pattern"
 msgstr "motif_shell"
 
-#. Used in usage help to represent the name of a file. Example:
+#. TRANSL: Used in usage help to represent the name of a file. Example:
 #. --log-file <filename>
-#: ../duplicity/commandline.py:295 ../duplicity/commandline.py:302
-#: ../duplicity/commandline.py:307 ../duplicity/commandline.py:375
-#: ../duplicity/commandline.py:380 ../duplicity/commandline.py:391
-#: ../duplicity/commandline.py:679
+#: ../duplicity/commandline.py:298 ../duplicity/commandline.py:305
+#: ../duplicity/commandline.py:310 ../duplicity/commandline.py:381
+#: ../duplicity/commandline.py:386 ../duplicity/commandline.py:397
+#: ../duplicity/commandline.py:690
 msgid "filename"
 msgstr "nom_de_fichier"
 
-#. Used in usage help to represent a regular expression (regexp).
-#: ../duplicity/commandline.py:314 ../duplicity/commandline.py:382
+#. TRANSL: Used in usage help to represent a regular expression (regexp).
+#: ../duplicity/commandline.py:317 ../duplicity/commandline.py:388
 msgid "regular_expression"
 msgstr "expression_régulière"
 
-#. Used in usage help to represent a time spec for a previous
+#. TRANSL: Used in usage help to represent a time spec for a previous
 #. point in time, as described in the documentation. Example:
 #. duplicity remove-older-than time [options] target_url
-#: ../duplicity/commandline.py:345 ../duplicity/commandline.py:435
-#: ../duplicity/commandline.py:765
+#: ../duplicity/commandline.py:351 ../duplicity/commandline.py:444
+#: ../duplicity/commandline.py:776
 msgid "time"
 msgstr "temps"
 
-#. Used in usage help. (Should be consistent with the "Options:"
+#. TRANSL: Used in usage help. (Should be consistent with the "Options:"
 #. header.) Example:
 #. duplicity [full|incremental] [options] source_dir target_url
-#: ../duplicity/commandline.py:349 ../duplicity/commandline.py:438
-#: ../duplicity/commandline.py:491 ../duplicity/commandline.py:698
+#: ../duplicity/commandline.py:355 ../duplicity/commandline.py:447
+#: ../duplicity/commandline.py:502 ../duplicity/commandline.py:709
 msgid "options"
 msgstr "options"
 
-#: ../duplicity/commandline.py:358
+#: ../duplicity/commandline.py:364
 #, python-format
 msgid ""
 "Running in 'ignore errors' mode due to %s; please re-consider if this was "
@@ -762,234 +762,233 @@
 "Exécution en mode « ignorer les erreurs » à cause de %s ; veuillez "
 "reconsidérer si ceci n’était pas souhaité"
 
-#. Used in usage help to represent an imap mailbox
-#: ../duplicity/commandline.py:371
+#. TRANSL: Used in usage help to represent an imap mailbox
+#: ../duplicity/commandline.py:377
 msgid "imap_mailbox"
 msgstr "boîte_aux_lettres_IMAP"
 
-#: ../duplicity/commandline.py:385
+#: ../duplicity/commandline.py:391
 msgid "file_descriptor"
 msgstr "descripteur_fichier"
 
-#. Used in usage help (noun)
-#: ../duplicity/commandline.py:396
+#. TRANSL: Used in usage help (noun)
+#: ../duplicity/commandline.py:402
 msgid "backup name"
 msgstr "nom_sauvegarde"
 
-#. Used in usage help to represent a desired number of
+#. TRANSL: Used in usage help to represent a desired number of
 #. something. Example:
 #. --num-retries <number>
-#: ../duplicity/commandline.py:412 ../duplicity/commandline.py:459
-#: ../duplicity/commandline.py:524 ../duplicity/commandline.py:693
+#: ../duplicity/commandline.py:421 ../duplicity/commandline.py:468
+#: ../duplicity/commandline.py:535 ../duplicity/commandline.py:704
 msgid "number"
 msgstr "nombre"
 
-#. noun
-#: ../duplicity/commandline.py:469 ../duplicity/commandline.py:473
-#: ../duplicity/commandline.py:664
+#. TRANSL: noun
+#: ../duplicity/commandline.py:675
 msgid "command"
 msgstr "commande"
 
-#. Used in usage help. Example:
+#. TRANSL: Used in usage help. Example:
 #. --timeout <seconds>
-#: ../duplicity/commandline.py:499 ../duplicity/commandline.py:727
+#: ../duplicity/commandline.py:510 ../duplicity/commandline.py:738
 msgid "seconds"
 msgstr "secondes"
 
-#. abbreviation for "character" (noun)
-#: ../duplicity/commandline.py:505 ../duplicity/commandline.py:661
+#. TRANSL: abbreviation for "character" (noun)
+#: ../duplicity/commandline.py:516 ../duplicity/commandline.py:672
 msgid "char"
 msgstr "caract."
 
-#: ../duplicity/commandline.py:627
+#: ../duplicity/commandline.py:638
 #, python-format
 msgid "Using archive dir: %s"
 msgstr "Utilisation du répertoire d’archive : %s"
 
-#: ../duplicity/commandline.py:628
+#: ../duplicity/commandline.py:639
 #, python-format
 msgid "Using backup name: %s"
 msgstr "Utilisation du nom de sauvegarde : %s"
 
-#: ../duplicity/commandline.py:635
+#: ../duplicity/commandline.py:646
 #, python-format
 msgid "Command line error: %s"
 msgstr "Erreur de ligne de commande : %s"
 
-#: ../duplicity/commandline.py:636
+#: ../duplicity/commandline.py:647
 msgid "Enter 'duplicity --help' for help screen."
 msgstr "Entrez « duplicity --help » pour afficher l’écran d’aide."
 
-#. Used in usage help to represent a Unix-style path name. Example:
+#. TRANSL: Used in usage help to represent a Unix-style path name. Example:
 #. rsync://user[:password]@other_host[:port]//absolute_path
-#: ../duplicity/commandline.py:649
+#: ../duplicity/commandline.py:660
 msgid "absolute_path"
 msgstr "chemin_absolu"
 
-#. Used in usage help. Example:
+#. TRANSL: Used in usage help. Example:
 #. tahoe://alias/some_dir
-#: ../duplicity/commandline.py:653
+#: ../duplicity/commandline.py:664
 msgid "alias"
 msgstr "alias"
 
-#. Used in help to represent a "bucket name" for Amazon Web
+#. TRANSL: Used in help to represent a "bucket name" for Amazon Web
 #. Services' Simple Storage Service (S3). Example:
 #. s3://other.host/bucket_name[/prefix]
-#: ../duplicity/commandline.py:658
+#: ../duplicity/commandline.py:669
 msgid "bucket_name"
 msgstr ""
 
-#. Used in usage help to represent the name of a container in
+#. TRANSL: Used in usage help to represent the name of a container in
 #. Amazon Web Services' Cloudfront. Example:
 #. cf+http://container_name
-#: ../duplicity/commandline.py:669
+#: ../duplicity/commandline.py:680
 msgid "container_name"
 msgstr ""
 
-#. noun
-#: ../duplicity/commandline.py:672
+#. TRANSL: noun
+#: ../duplicity/commandline.py:683
 msgid "count"
 msgstr ""
 
-#. Used in usage help to represent the name of a file directory
-#: ../duplicity/commandline.py:675
+#. TRANSL: Used in usage help to represent the name of a file directory
+#: ../duplicity/commandline.py:686
 msgid "directory"
 msgstr ""
 
-#. Used in usage help, e.g. to represent the name of a code
+#. TRANSL: Used in usage help, e.g. to represent the name of a code
 #. module. Example:
 #. rsync://user[:password]@other.host[:port]::/module/some_dir
-#: ../duplicity/commandline.py:688
+#: ../duplicity/commandline.py:699
 msgid "module"
 msgstr ""
 
-#. Used in usage help to represent an internet hostname. Example:
+#. TRANSL: Used in usage help to represent an internet hostname. Example:
 #. ftp://user[:password]@other.host[:port]/some_dir
-#: ../duplicity/commandline.py:702
+#: ../duplicity/commandline.py:713
 msgid "other.host"
 msgstr ""
 
-#. Used in usage help. Example:
+#. TRANSL: Used in usage help. Example:
 #. ftp://user[:password]@other.host[:port]/some_dir
-#: ../duplicity/commandline.py:706
+#: ../duplicity/commandline.py:717
 msgid "password"
 msgstr ""
 
-#. Used in usage help to represent a TCP port number. Example:
+#. TRANSL: Used in usage help to represent a TCP port number. Example:
 #. ftp://user[:password]@other.host[:port]/some_dir
-#: ../duplicity/commandline.py:714
+#: ../duplicity/commandline.py:725
 msgid "port"
 msgstr ""
 
-#. Used in usage help. This represents a string to be used as a
+#. TRANSL: Used in usage help. This represents a string to be used as a
 #. prefix to names for backup files created by Duplicity. Example:
 #. s3://other.host/bucket_name[/prefix]
-#: ../duplicity/commandline.py:719
+#: ../duplicity/commandline.py:730
 msgid "prefix"
 msgstr ""
 
-#. Used in usage help to represent a Unix-style path name. Example:
+#. TRANSL: Used in usage help to represent a Unix-style path name. Example:
 #. rsync://user[:password]@other.host[:port]/relative_path
-#: ../duplicity/commandline.py:723
+#: ../duplicity/commandline.py:734
 msgid "relative_path"
 msgstr ""
 
-#. Used in usage help to represent the name of a single file
+#. TRANSL: Used in usage help to represent the name of a single file
 #. directory or a Unix-style path to a directory. Example:
 #. file:///some_dir
-#: ../duplicity/commandline.py:738
+#: ../duplicity/commandline.py:749
 msgid "some_dir"
 msgstr ""
 
-#. Used in usage help to represent the name of a single file
+#. TRANSL: Used in usage help to represent the name of a single file
 #. directory or a Unix-style path to a directory where files will be
 #. coming FROM. Example:
 #. duplicity [full|incremental] [options] source_dir target_url
-#: ../duplicity/commandline.py:744
+#: ../duplicity/commandline.py:755
 msgid "source_dir"
 msgstr ""
 
-#. Used in usage help to represent a URL files will be coming
+#. TRANSL: Used in usage help to represent a URL files will be coming
 #. FROM. Example:
 #. duplicity [restore] [options] source_url target_dir
-#: ../duplicity/commandline.py:749
+#: ../duplicity/commandline.py:760
 msgid "source_url"
 msgstr ""
 
-#. Used in usage help to represent the name of a single file
+#. TRANSL: Used in usage help to represent the name of a single file
 #. directory or a Unix-style path to a directory. where files will be
 #. going TO. Example:
 #. duplicity [restore] [options] source_url target_dir
-#: ../duplicity/commandline.py:755
+#: ../duplicity/commandline.py:766
 msgid "target_dir"
 msgstr ""
 
-#. Used in usage help to represent a URL files will be going TO.
+#. TRANSL: Used in usage help to represent a URL files will be going TO.
 #. Example:
 #. duplicity [full|incremental] [options] source_dir target_url
-#: ../duplicity/commandline.py:760
+#: ../duplicity/commandline.py:771
 msgid "target_url"
 msgstr ""
 
-#. Used in usage help to represent a user name (i.e. login).
+#. TRANSL: Used in usage help to represent a user name (i.e. login).
 #. Example:
 #. ftp://user[:password]@other.host[:port]/some_dir
-#: ../duplicity/commandline.py:770
+#: ../duplicity/commandline.py:781
 msgid "user"
 msgstr ""
 
-#. Header in usage help
-#: ../duplicity/commandline.py:787
+#. TRANSL: Header in usage help
+#: ../duplicity/commandline.py:798
 msgid "Backends and their URL formats:"
 msgstr ""
 
-#. Header in usage help
-#: ../duplicity/commandline.py:809
+#. TRANSL: Header in usage help
+#: ../duplicity/commandline.py:820
 msgid "Commands:"
 msgstr ""
 
-#: ../duplicity/commandline.py:833
+#: ../duplicity/commandline.py:844
 #, python-format
 msgid ""
 "Specified archive directory '%s' does not exist, or is not a directory"
 msgstr ""
 
-#: ../duplicity/commandline.py:842
+#: ../duplicity/commandline.py:853
 #, python-format
 msgid ""
 "Sign key should be an 8 character hex string, like 'AA0E73D2'.\n"
 "Received '%s' instead."
 msgstr ""
 
-#: ../duplicity/commandline.py:902
+#: ../duplicity/commandline.py:913
 #, python-format
 msgid ""
 "Restore destination directory %s already exists.\n"
 "Will not overwrite."
 msgstr ""
 
-#: ../duplicity/commandline.py:907
+#: ../duplicity/commandline.py:918
 #, python-format
 msgid "Verify directory %s does not exist"
 msgstr ""
 
-#: ../duplicity/commandline.py:913
+#: ../duplicity/commandline.py:924
 #, python-format
 msgid "Backup source directory %s does not exist."
 msgstr ""
 
-#: ../duplicity/commandline.py:942
+#: ../duplicity/commandline.py:953
 #, python-format
 msgid "Command line warning: %s"
 msgstr ""
 
-#: ../duplicity/commandline.py:942
+#: ../duplicity/commandline.py:953
 msgid ""
 "Selection options --exclude/--include\n"
 "currently work only when backing up,not restoring."
 msgstr ""
 
-#: ../duplicity/commandline.py:990
+#: ../duplicity/commandline.py:1001
 #, python-format
 msgid ""
 "Bad URL '%s'.\n"
@@ -997,7 +996,7 @@
 "\"file:///usr/local\".  See the man page for more information."
 msgstr ""
 
-#: ../duplicity/commandline.py:1015
+#: ../duplicity/commandline.py:1026
 msgid "Main action: "
 msgstr ""
 
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/e2fsprogs.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/e2fsprogs.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/e2fsprogs.po	2012-01-02 17:26:44.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/e2fsprogs.po	2012-02-23 06:31:10.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:18+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:34+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: e2fsck/badblocks.c:22 misc/mke2fs.c:157
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ecryptfs-utils.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ecryptfs-utils.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ecryptfs-utils.po	2012-01-02 17:27:25.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ecryptfs-utils.po	2012-02-23 06:31:48.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ecryptfs-utils\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-12-14 20:26+0000\n"
+"POT-Creation-Date: 2012-02-17 03:43+0000\n"
 "PO-Revision-Date: 2010-02-21 18:27+0000\n"
 "Last-Translator: Sun Wukong <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:49+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:49+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../src/desktop/ecryptfs-mount-private.desktop.in.h:1
 msgid "Access Your Private Data"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/eject.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/eject.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/eject.po	2012-01-02 17:26:46.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/eject.po	2012-02-23 06:31:12.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:33+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:42+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../eject.c:155
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/elfutils.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/elfutils.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/elfutils.po	2012-01-02 17:27:22.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/elfutils.po	2012-02-23 06:31:46.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:22+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:22+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: lib/xmalloc.c:51 lib/xmalloc.c:65 lib/xmalloc.c:79 src/readelf.c:2829
 #: src/readelf.c:3168 src/unstrip.c:2098 src/unstrip.c:2306
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/enscript.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/enscript.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/enscript.po	2012-01-02 17:26:46.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/enscript.po	2012-02-23 06:31:12.000000000 +0000
@@ -14,8 +14,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:33+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:42+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: compat/getopt.c:628
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/example-content.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/example-content.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/example-content.po	2012-01-02 17:27:19.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/example-content.po	2012-02-23 06:31:42.000000000 +0000
@@ -7,20 +7,20 @@
 msgstr ""
 "Project-Id-Version: example-content\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-22 22:50+0000\n"
+"POT-Creation-Date: 2012-01-30 12:22+0000\n"
 "PO-Revision-Date: 2009-03-30 06:31+0000\n"
 "Last-Translator: Bruno Patri <Unknown>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:29+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:32+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../data/examples.desktop.in.h:1
-msgid "Example content for Ubuntu"
-msgstr "Exemples de contenu pour Ubuntu"
-
-#: ../data/examples.desktop.in.h:2
 msgid "Examples"
 msgstr "Exemples"
+
+#: ../data/examples.desktop.in.h:2
+msgid "Example content for Ubuntu"
+msgstr "Exemples de contenu pour Ubuntu"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/failsafexinit.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/failsafexinit.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/failsafexinit.po	2012-01-02 17:26:52.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/failsafexinit.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,190 +0,0 @@
-# French translation for xorg
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the xorg package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: xorg\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-04-05 21:41+0000\n"
-"PO-Revision-Date: 2010-10-06 16:15+0000\n"
-"Last-Translator: 65GYgzf <Unknown>\n"
-"Language-Team: French <fr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:37+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
-
-#: debian/local/Failsafe/failsafeXinit:36
-msgid "Ubuntu Failsafe-X"
-msgstr "Mode graphique sans échec pour Ubuntu"
-
-#: debian/local/Failsafe/failsafeXinit:51
-msgid "What would you like to do?"
-msgstr "Que souhaitez-vous faire ?"
-
-#: debian/local/Failsafe/failsafeXinit:52
-#: debian/local/Failsafe/failsafeXinit:71
-#: debian/local/Failsafe/failsafeXinit:84
-msgid "Choice"
-msgstr "Choix"
-
-#: debian/local/Failsafe/failsafeXinit:53
-msgid "Run Ubuntu in low-graphics mode for just one session"
-msgstr "Lancer Ubuntu en mode basse résolution uniquement pour cette session"
-
-#: debian/local/Failsafe/failsafeXinit:54
-msgid "Reconfigure graphics"
-msgstr "Reconfigurer les paramètres graphiques"
-
-#: debian/local/Failsafe/failsafeXinit:55
-msgid "Troubleshoot the error"
-msgstr "Réparer l'erreur"
-
-#: debian/local/Failsafe/failsafeXinit:56
-msgid "Exit to console login"
-msgstr "Quitter vers le mode console"
-
-#: debian/local/Failsafe/failsafeXinit:57
-msgid "Restart X"
-msgstr "Relancer l'interface graphique"
-
-#: debian/local/Failsafe/failsafeXinit:68
-msgid "Reconfiguration"
-msgstr "Reconfiguration"
-
-#: debian/local/Failsafe/failsafeXinit:69
-msgid "How would you like to reconfigure your display?"
-msgstr "Comment souhaitez-vous reconfigurer votre écran ?"
-
-#: debian/local/Failsafe/failsafeXinit:72
-msgid "Use default (generic) configuration"
-msgstr "Utiliser la configuration par défaut (generic)"
-
-#: debian/local/Failsafe/failsafeXinit:73
-msgid "Create new configuration for this hardware"
-msgstr "Créer une nouvelle configuration pour ce matériel"
-
-#: debian/local/Failsafe/failsafeXinit:74
-msgid "Use your backed-up configuration"
-msgstr "Utiliser votre configuration sauvegardée"
-
-#: debian/local/Failsafe/failsafeXinit:81
-msgid "Troubleshooting"
-msgstr "Dépannage"
-
-#: debian/local/Failsafe/failsafeXinit:82
-msgid "What information would you like to review?"
-msgstr "Quelles informations souhaitez-vous vérifier ?"
-
-#: debian/local/Failsafe/failsafeXinit:85
-msgid "Review the xserver log file"
-msgstr "Examiner le fichier journal du serveur graphique (xorg)"
-
-#: debian/local/Failsafe/failsafeXinit:86
-msgid "Review the startup errors"
-msgstr "Examiner les erreurs de démarrage"
-
-#: debian/local/Failsafe/failsafeXinit:87
-msgid "Edit configuration file"
-msgstr "Modifier le fichier de configuration"
-
-#: debian/local/Failsafe/failsafeXinit:88
-msgid "Archive configuration and logs"
-msgstr "Archiver la configuration et les journaux"
-
-#: debian/local/Failsafe/failsafeXinit:99
-msgid ""
-"A bug report has been written.\\nYou can send it next time you log in."
-msgstr ""
-"Un rapport d'anomalie a été écrit.\\nVous pourrez l'envoyer durant votre "
-"prochaine connexion."
-
-#: debian/local/Failsafe/failsafeXinit:101
-msgid "Your bug could not be recorded successfully.\\n"
-msgstr "Votre anomalie n'a pas pu être enregistrée correctement.\\n"
-
-#: debian/local/Failsafe/failsafeXinit:104
-#, sh-format
-msgid "Cannot file bug:  \\$apport_hook is not present."
-msgstr ""
-"Impossible de signaler l'anomalie : \\$apport_hook n'est pas présent."
-
-#: debian/local/Failsafe/failsafeXinit:113
-msgid ""
-"Your config could not be backed up.\\nDo you want to continue anyway?\\n"
-msgstr ""
-"Votre configuration ne peut pas être sauvegardée.\\nSouhaitez-vous tout de "
-"même continuer ?\\n"
-
-#: debian/local/Failsafe/failsafeXinit:122
-msgid ""
-"Your configuration has been restored to default,\\nand your old "
-"configuration backed up.\\nPlease restart.\\n"
-msgstr ""
-"Votre configuration a été restaurée avec les valeurs par défaut,\\net votre "
-"ancienne configuration a été sauvegardée.\\nVeuillez redémarrer.\\n"
-
-#: debian/local/Failsafe/failsafeXinit:124
-msgid ""
-"Failure restoring configuration to default.\\nYour config has not been "
-"changed."
-msgstr ""
-"Impossible de restaurer votre configuration avec les valeurs par défaut.\\"
-"nVotre configuration n'a pas été modifiée."
-
-#: debian/local/Failsafe/failsafeXinit:133
-msgid ""
-"A new configuration has been generated,\\nand your old configuration backed "
-"up.\\nPlease restart.\\n"
-msgstr ""
-"Une nouvelle configuration a été générée,\\net votre ancienne configuration "
-"a été sauvegardée.\\nVeuillez redémarrer.\\n"
-
-#: debian/local/Failsafe/failsafeXinit:135
-msgid "Could not generate a new configuration"
-msgstr "Impossible de créer une nouvelle configuration"
-
-#: debian/local/Failsafe/failsafeXinit:149
-msgid "Sorry, this option is not implemented yet"
-msgstr "Désolé, cette option n'est pas encore disponible"
-
-#: debian/local/Failsafe/failsafeXinit:177
-#, sh-format
-msgid "Relevant configuration and log files have been saved to:\\n"
-msgstr ""
-"La configuration et les fichiers journaux adéquats ont été sauvegardés "
-"sur :\\n"
-
-#: debian/local/Failsafe/failsafeXinit:177
-msgid "Bug reports can be submitted at http://www.launchpad.net/ubuntu/.\\n"
-msgstr ""
-"Les rapports d'anomalies peuvent être soumis sur "
-"http://www.launchpad.net/ubuntu/.\\n"
-
-#: debian/local/Failsafe/failsafeXinit:184
-msgid ""
-"<big><b>Ubuntu is running in low-graphics mode</b></big>\\n\\nYour screen, "
-"graphics card, and input device settings\\ncould not be detected correctly.  "
-"You will need to configure these yourself."
-msgstr ""
-"<big><b>Ubuntu fonctionne en mode graphique basse résolution</b></big>\\n\\"
-"nVotre écran, votre carte graphique et vos paramètres de périphériques "
-"d'entrée\\npourraient ne pas avoir été détectés correctement. Vous devrez "
-"les configurer vous-même."
-
-#: debian/local/Failsafe/failsafeXinit:186
-msgid ""
-"<big><b>Ubuntu is running in low-graphics mode</b></big>\\n\\nThe following "
-"error was encountered.  You may need\\nto update your configuration to solve "
-"this.\\n\\n"
-msgstr ""
-"<big><b>Ubuntu fonctionne en mode graphique basse résolution</b></big>\\n\\"
-"nL'erreur suivante est survenue. Vous aurez peut-être besoin\\nde mettre à "
-"jour votre configuration afin de résoudre cela.\\n\\n"
-
-#: debian/local/Failsafe/failsafeXinit:230
-msgid "Stand by one minute while the display restarts..."
-msgstr "Patientez une minute pendant le redémarrage de l'affichage..."
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/fetchmail.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/fetchmail.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/fetchmail.po	2012-01-02 17:26:47.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/fetchmail.po	2012-02-23 06:31:13.000000000 +0000
@@ -19,8 +19,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:43+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:49+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: checkalias.c:179
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/findutils.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/findutils.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/findutils.po	2012-01-02 17:26:47.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/findutils.po	2012-02-23 06:31:13.000000000 +0000
@@ -11,15 +11,15 @@
 "Project-Id-Version: GNU findutils 4.4.0\n"
 "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
 "POT-Creation-Date: 2009-05-12 09:47+0100\n"
-"PO-Revision-Date: 2010-12-10 04:57+0000\n"
+"PO-Revision-Date: 2012-01-24 04:36+0000\n"
 "Last-Translator: Nicolas Provost <nprovost@quadriv.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:45+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:50+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: gnulib/lib/argmatch.c:133
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/flex.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/flex.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/flex.po	2012-01-02 17:26:47.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/flex.po	2012-02-23 06:31:13.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:46+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:50+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: dfa.c:61
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/fluid.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/fluid.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/fluid.po	2012-01-02 17:26:58.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/fluid.po	2012-02-23 06:31:25.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:35+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:16+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: fluid.cxx:1573
 msgid "&File"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/FontForge.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/FontForge.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/FontForge.po	2012-01-02 17:26:48.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/FontForge.po	2012-02-23 06:31:13.000000000 +0000
@@ -14,8 +14,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:47+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:52+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: alignment.c:297 anchorsaway.c:1274 combinations.c:1115 cvhints.c:483
 #: cvhints.c:786 displayfonts.c:1132 displayfonts.c:1633
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/freetype.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/freetype.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/freetype.po	2012-01-02 17:27:19.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/freetype.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,894 +0,0 @@
-# French messages for FreeType, without accents.
-# Copyright (C) 1998-2002 David Turner
-# David Turner <david.turner@freetype.org>, 1998
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: FreeType 1.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2002-11-08 18:11+0000\n"
-"PO-Revision-Date: 2010-11-16 21:05+0000\n"
-"Last-Translator: Antoine Leca <Unknown>\n"
-"Language-Team: French\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:34+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
-
-#: lib/extend/ftxerr18.c:40
-msgid ""
-"Welcome to the translation of the Freetype v.1 library!\n"
-"\n"
-"This message is not really part of the library (it is bracketed by\n"
-" #if 0 / #endif), but is really intended to be the first one in the .po\n"
-"file, and the first one that a new translator should see, to give hints.\n"
-"\n"
-"First, while this .po might seems big, the real interesting part of it\n"
-"is only the messages in this file, lib/extend/ftxerr18.c. The other\n"
-"messages are part of the demonstration programs, and are more intended\n"
-"to help grasping how to use i18n with the Freetype library. So the real\n"
-"work is the about 65 first ones. Unfortunately they are the harder ones!\n"
-"\n"
-"A difficulty is that there are some specialized vocabulary, about\n"
-"``faces'', ``glyph'' and similar things. These are typographical things,\n"
-"and this should be researched before attempting to translate the whole\n"
-"thing. A quick look across the TrueType documentation might help to\n"
-"understand many things, too.\n"
-"\n"
-"Best wiches for your translation!\n"
-"Antoine Leca - 2002-11-08"
-msgstr "(Lu - Antoine Leca, 2002-11-08)"
-
-#: lib/extend/ftxerr18.c:77
-msgid "Successful function call, no error."
-msgstr "Appel de fonction reussi, pas d'erreur."
-
-#: lib/extend/ftxerr18.c:80
-msgid "Invalid face handle."
-msgstr "Mauvais handle d'oeil (face)."
-
-#: lib/extend/ftxerr18.c:82
-msgid "Invalid instance handle."
-msgstr "Mauvais handle d'instance."
-
-#: lib/extend/ftxerr18.c:84
-msgid "Invalid glyph handle."
-msgstr "Mauvais handle de glyphe."
-
-#: lib/extend/ftxerr18.c:86
-msgid "Invalid charmap handle."
-msgstr "Mauvais handle d'encodage (charmap)."
-
-#: lib/extend/ftxerr18.c:88
-msgid "Invalid result address."
-msgstr "Mauvaise adresse de resultat."
-
-#: lib/extend/ftxerr18.c:90
-msgid "Invalid glyph index."
-msgstr "Numero de glyphe incorrect."
-
-#: lib/extend/ftxerr18.c:92
-msgid "Invalid argument."
-msgstr "Argument incorrect."
-
-#: lib/extend/ftxerr18.c:94
-msgid "Could not open file."
-msgstr "Le fichier n'a pas pu etre ouvert."
-
-#: lib/extend/ftxerr18.c:96
-msgid "File is not a TrueType collection."
-msgstr "Ce fichier n'est pas une collection."
-
-#: lib/extend/ftxerr18.c:98
-msgid "Mandatory table missing."
-msgstr "Il manque une table critique."
-
-#: lib/extend/ftxerr18.c:100
-msgid "Invalid horizontal metrics (hmtx table broken)."
-msgstr "Metriques horizontales (table `hmtx') incorrectes."
-
-#: lib/extend/ftxerr18.c:102
-msgid "Invalid charmap format."
-msgstr "Format d'encodage (charmap) invalide."
-
-#: lib/extend/ftxerr18.c:104
-msgid "Invalid ppem value."
-msgstr "Taille en pixels incorrecte."
-
-#: lib/extend/ftxerr18.c:106
-msgid "Invalid vertical metrics (vmtx table broken)."
-msgstr "Metriques verticales (table `vmtx') incorrectes."
-
-#: lib/extend/ftxerr18.c:109
-msgid "Invalid file format."
-msgstr "Format de fichier invalide."
-
-#: lib/extend/ftxerr18.c:112
-msgid "Invalid engine."
-msgstr "Mauvaise instance de bibliotheque (engine)"
-
-#: lib/extend/ftxerr18.c:114
-msgid "Too many extensions."
-msgstr "Trop d'extensions utilisees (max: 8)."
-
-#: lib/extend/ftxerr18.c:116
-msgid "Extensions unsupported."
-msgstr "Extensions non disponibles."
-
-#: lib/extend/ftxerr18.c:118
-msgid "Invalid extension id."
-msgstr "Mauvais numero d'extension."
-
-#: lib/extend/ftxerr18.c:121
-msgid "No vertical data in font."
-msgstr "Pas de donnees verticales dans cette police."
-
-#: lib/extend/ftxerr18.c:124
-msgid "Maximum Profile (maxp) table missing."
-msgstr "Il manque la table `maxp'."
-
-#: lib/extend/ftxerr18.c:126
-msgid "Font Header (head) table missing."
-msgstr "Il manque l'en-tete de police (head)."
-
-#: lib/extend/ftxerr18.c:128
-msgid "Horizontal Header (hhea) table missing."
-msgstr "Il manque l'en-tete pour l'horizontale (hhea)."
-
-#: lib/extend/ftxerr18.c:130
-msgid "Index to Location (loca) table missing."
-msgstr "Il manque les index de glyphes (table `loca')."
-
-#: lib/extend/ftxerr18.c:132
-msgid "Naming (name) table missing."
-msgstr "Il manque la table des noms (name)."
-
-#: lib/extend/ftxerr18.c:134
-msgid "Character to Glyph Index Mapping (cmap) tables missing."
-msgstr "Il manque la table des encodages (cmap)."
-
-#: lib/extend/ftxerr18.c:136
-msgid "Horizontal Metrics (hmtx) table missing."
-msgstr "Il manque les metriques horizontales (hmtx)."
-
-#: lib/extend/ftxerr18.c:138
-msgid "OS/2 table missing."
-msgstr "Il manque la table `OS/2'."
-
-#: lib/extend/ftxerr18.c:140
-msgid "PostScript (post) table missing."
-msgstr "Il manque la table Postscript (post)."
-
-#: lib/extend/ftxerr18.c:142
-msgid "Glyph (glyf) table missing."
-msgstr "Il manque les glyphes (table `glyf')."
-
-#: lib/extend/ftxerr18.c:147
-msgid "Out of memory."
-msgstr "Pas assez de memoire."
-
-#: lib/extend/ftxerr18.c:152
-msgid "Invalid file offset."
-msgstr "Adresse dans le fichier incorrecte."
-
-#: lib/extend/ftxerr18.c:154
-msgid "Invalid file read."
-msgstr "Lecture du fichier impossible."
-
-#: lib/extend/ftxerr18.c:156
-msgid "Invalid frame access."
-msgstr "Fenetre d'access incorrecte."
-
-#: lib/extend/ftxerr18.c:161
-msgid "Too many points."
-msgstr "Trop de points."
-
-#: lib/extend/ftxerr18.c:163
-msgid "Too many contours."
-msgstr "Trop de contours."
-
-#: lib/extend/ftxerr18.c:165
-msgid "Invalid composite glyph."
-msgstr "Glyphe compose invalide."
-
-#: lib/extend/ftxerr18.c:167
-msgid "Too many instructions."
-msgstr "Trop d'instructions."
-
-#: lib/extend/ftxerr18.c:169
-msgid "Too many function definitions (FDEF)."
-msgstr "Trop de definitions de fonctions (FDEF)."
-
-#: lib/extend/ftxerr18.c:174
-msgid "Invalid opcode."
-msgstr "Code-operation invalide."
-
-#: lib/extend/ftxerr18.c:176
-msgid "Too few arguments."
-msgstr "Il manque un ou des arguments."
-
-#: lib/extend/ftxerr18.c:178
-msgid "Stack overflow."
-msgstr "Debordement de la pile."
-
-#: lib/extend/ftxerr18.c:180
-msgid "Code overflow."
-msgstr "Debordement dans le code."
-
-#: lib/extend/ftxerr18.c:182
-msgid "Bad argument."
-msgstr "Mauvais argument."
-
-#: lib/extend/ftxerr18.c:184
-msgid "Divide by zero."
-msgstr "Division par zero."
-
-#: lib/extend/ftxerr18.c:186
-msgid "Storage overflow."
-msgstr "Depassement de capacite (stockage)."
-
-#: lib/extend/ftxerr18.c:188
-msgid "Control Value (cvt) table overflow."
-msgstr "Depassement de capacite (tableau cvt)."
-
-#: lib/extend/ftxerr18.c:190
-msgid "Invalid reference."
-msgstr "Reference incorrecte."
-
-#: lib/extend/ftxerr18.c:192
-msgid "Invalid distance."
-msgstr "Distance incorrecte."
-
-#: lib/extend/ftxerr18.c:194
-msgid "Interpolate twilight points."
-msgstr "Interpolation de points de repere."
-
-#: lib/extend/ftxerr18.c:196
-msgid "`DEBUG' opcode found."
-msgstr "Le code `DEBUG' a ete rencontre."
-
-#: lib/extend/ftxerr18.c:198
-msgid "`ENDF' in byte-code stream."
-msgstr "'ENDF' invalide dans les instructions d'un glyphe."
-
-#: lib/extend/ftxerr18.c:200
-msgid "Out of code ranges."
-msgstr "Pas assez d'espace d'execution (code ranges)."
-
-#: lib/extend/ftxerr18.c:202
-msgid "Nested function definitions."
-msgstr "Definitions imbriquees de fonction."
-
-#: lib/extend/ftxerr18.c:204
-msgid "Invalid code range."
-msgstr "Espace d'execution (code range) incorrect."
-
-#: lib/extend/ftxerr18.c:206
-msgid "Invalid displacement."
-msgstr "Deplacement invalide."
-
-#: lib/extend/ftxerr18.c:208
-msgid "Endless loop encountered while executing instructions."
-msgstr "Arret force d'une boucle infinie."
-
-#: lib/extend/ftxerr18.c:213
-msgid "Nested frame access."
-msgstr "Fenetres d'acces imbriquees."
-
-#: lib/extend/ftxerr18.c:215
-msgid "Invalid cache list."
-msgstr "(Mauvaise liste chainee de caches)."
-
-#: lib/extend/ftxerr18.c:217
-msgid "Could not find context."
-msgstr "Contexte introuvable."
-
-#: lib/extend/ftxerr18.c:219
-msgid "Unlisted object."
-msgstr "Objet non chaine dans le cache."
-
-#: lib/extend/ftxerr18.c:224
-msgid "Raster pool overflow."
-msgstr "Debordement de memoire de la trameuse."
-
-#: lib/extend/ftxerr18.c:226
-msgid "Raster: negative height encountered."
-msgstr "Trameuse: hauteur negative."
-
-#: lib/extend/ftxerr18.c:228
-msgid "Raster: invalid value."
-msgstr "Trameuse: valeur incorrecte."
-
-#: lib/extend/ftxerr18.c:230
-msgid "Raster not initialized."
-msgstr "Trameuse: non initialisee."
-
-#: lib/extend/ftxerr18.c:235
-msgid "Invalid kerning (kern) table format."
-msgstr "Format de table de crenage (kern) invalide."
-
-#: lib/extend/ftxerr18.c:237
-msgid "Invalid kerning (kern) table."
-msgstr "Table de crenage (kern) incorrecte."
-
-#: lib/extend/ftxerr18.c:240
-msgid "Invalid PostScript (post) table format."
-msgstr "Format de table Postscript (post) invalide."
-
-#: lib/extend/ftxerr18.c:242
-msgid "Invalid PostScript (post) table."
-msgstr "Table Postscript (post) incorrecte."
-
-#: lib/extend/ftxerr18.c:247
-msgid "Invalid TrueType Open subtable format."
-msgstr "Format de table TrueType Open invalide."
-
-#: lib/extend/ftxerr18.c:249
-msgid "Invalid TrueType Open subtable."
-msgstr "Sous-table TrueType Open incorrecte."
-
-#: lib/extend/ftxerr18.c:251
-msgid "Glyph(s) not covered by lookup."
-msgstr "Des glyphes sont absents d'une table de recherche (lookup)."
-
-#: lib/extend/ftxerr18.c:253
-msgid "Too many nested context substitutions."
-msgstr "Substitutions contextuelles imbriquees trop profondement."
-
-#: lib/extend/ftxerr18.c:255
-msgid "No MM (Adobe MultipleMaster) interpreter available."
-msgstr "Pas d'interpreteur MM (Adobe MultipleMaster) disponible."
-
-#: lib/extend/ftxerr18.c:258
-msgid "Invalid glyph substitution (GSUB) table format."
-msgstr "Format de la table de substitution de glyphes (GSUB) invalide."
-
-#: lib/extend/ftxerr18.c:260
-msgid "Invalid glyph substitution (GSUB) table."
-msgstr "Table de substitution de glyphes (GSUB) incorrecte."
-
-#: lib/extend/ftxerr18.c:263
-msgid "Invalid glyph positioning (GPOS) table format."
-msgstr "Format de table de positionnement des glyphes (GPOS) invalide."
-
-#: lib/extend/ftxerr18.c:265
-msgid "Invalid glyph positioning (GPOS) table."
-msgstr "Table de positionnement des glyphes (GPOS) incorrecte."
-
-#: lib/extend/ftxerr18.c:268
-msgid "Invalid glyph definition (GDEF) table format."
-msgstr "Format de table de definition des glyphes (GDEF) invalide."
-
-#: lib/extend/ftxerr18.c:270
-msgid "Invalid glyph definition (GDEF) table."
-msgstr "Table de definition des glyphes (GDEF) incorrecte."
-
-#: lib/extend/ftxerr18.c:277
-msgid "Invalid Error Number."
-msgstr "Numero d'erreur inconnu ?"
-
-#: test/fterror.c:49
-msgid ""
-"fterror: test TT_ErrToString18 functionality\n"
-"\n"
-msgstr ""
-"fterror: teste la fonctionnalite TT_ErrToString18\n"
-"\n"
-
-#: test/fterror.c:50
-msgid ""
-"  with an optional numerical argument, dumps the associated message.\n"
-"\n"
-msgstr ""
-"  avec un argument numerique optionnel, ecrit le message associe.\n"
-"\n"
-
-#: test/fterror.c:73
-msgid "Start of fterror.\n"
-msgstr "Debut de fterror.\n"
-
-#: test/fterror.c:81
-msgid "End of fterror.\n"
-msgstr "Fin de fterror.\n"
-
-#: test/fterror.c:96
-#, c-format
-msgid "Freetype error code 0x%04lX (%lu): %s\n"
-msgstr "Code d'erreur FreeType 0x%04lX (%lu) : %s\n"
-
-#: test/ftdump.c:169 test/ftlint.c:207 test/ftmetric.c:294
-msgid "Could not create glyph container.\n"
-msgstr "Impossible de creer un conteneur de glyphe.\n"
-
-#: test/ftdump.c:179 test/ftlint.c:215 test/ftmetric.c:303 test/ftsbit.c:214
-msgid "Could not create instance.\n"
-msgstr "Impossible de creer une instance\n"
-
-#: test/ftdump.c:188
-msgid "Could not create second instance.\n"
-msgstr "Impossible de creer une deuxieme instance.\n"
-
-#: test/ftdump.c:194
-msgid "Memory footprint statistics:\n"
-msgstr "Statistiques de consommation de la memoire:\n"
-
-#: test/ftdump.c:202
-msgid "face object"
-msgstr "objet oeil"
-
-#: test/ftdump.c:203
-msgid "glyph object"
-msgstr "objet glyphe"
-
-#: test/ftdump.c:204
-msgid "instance object"
-msgstr "objet instance"
-
-#: test/ftdump.c:208
-msgid "exec. context object"
-msgstr "objet contexte"
-
-#: test/ftdump.c:215
-msgid "total memory usage"
-msgstr "consommation totale de memoire"
-
-#: test/ftdump.c:223 test/ftdump.c:579 test/ftdump.c:789 test/ftdump.c:993
-#: test/ftdump.c:1139 test/ftlint.c:274 test/ftlint.c:287 test/ftmetric.c:390
-#: test/ftsbit.c:286
-#, c-format
-msgid "FreeType error message: %s\n"
-msgstr "Message d'erreur FreeType : %s\n"
-
-#: test/ftdump.c:300
-msgid "font name table entries\n"
-msgstr "Elements du tableau des noms\n"
-
-#: test/ftdump.c:310
-#, c-format
-msgid ""
-"PostScript name: %s\n"
-"\n"
-msgstr ""
-"Nom Postscript : %s\n"
-"\n"
-
-#: test/ftdump.c:333
-msgid "character map encodings\n"
-msgstr "Encodages des caracteres\n"
-
-#: test/ftdump.c:340 test/ftdump.c:488
-msgid "The file doesn't seem to have any encoding table.\n"
-msgstr "Cette police ne semble pas avoir de table d'encodage.\n"
-
-#: test/ftdump.c:344 test/ftdump.c:492
-#, c-format
-msgid ""
-"There are %hu encodings:\n"
-"\n"
-msgstr ""
-"Il y a %hu encodage(s) :\n"
-"\n"
-
-#: test/ftdump.c:349
-#, c-format
-msgid "encoding %2u: "
-msgstr "encodage %2u : "
-
-#: test/ftdump.c:376 test/ftdump.c:385 test/ftdump.c:452
-#, c-format
-msgid "Unknown value %hu"
-msgstr "(valeur inconnue %hu)"
-
-#: test/ftdump.c:459
-msgid "Unknown"
-msgstr "(inconnu)"
-
-#: test/ftdump.c:481
-msgid "ftxcmap test\n"
-msgstr "Test de ftxcmap\n"
-
-#: test/ftdump.c:498
-#, c-format
-msgid "encoding %2u:\n"
-msgstr "encodage %2u :\n"
-
-#: test/ftdump.c:503
-#, c-format
-msgid "first: glyph index %hu, character code 0x%lx\n"
-msgstr "premier : glyphe numero %hu, caractere code 0x%lx\n"
-
-#: test/ftdump.c:507
-#, c-format
-msgid "next:  glyph index %hu, character code 0x%lx\n"
-msgstr "suivant : glyphe numero %hu, caractere code 0x%lx\n"
-
-#: test/ftdump.c:511
-#, c-format
-msgid "last:  glyph index %hu, character code 0x%lx\n"
-msgstr "dernier : glyphe numero %hu, caractere code 0x%lx\n"
-
-#: test/ftdump.c:533 test/ftmetric.c:284
-msgid "Error while retrieving embedded bitmaps table.\n"
-msgstr "Erreur pendant la recuperation de la table des bitmaps.\n"
-
-#: test/ftdump.c:537
-msgid "embedded bitmap table\n"
-msgstr "Table des bitmaps incorpores\n"
-
-#: test/ftdump.c:540
-#, c-format
-msgid " version of embedded bitmap table:  0x%lx\n"
-msgstr " version de la table de bitmaps : 0x%lx\n"
-
-#: test/ftdump.c:542
-#, c-format
-msgid " number of embedded bitmap strikes: %lu\n"
-msgstr " nombre de tailles de bitmaps : %lu\n"
-
-#: test/ftdump.c:552
-#, c-format
-msgid "  bitmap strike %hu/%lu: "
-msgstr "  taille de bitmap %hu sur %lu : "
-
-#: test/ftdump.c:555
-#, c-format
-msgid "%hux%hu pixels, %hu-bit depth, glyphs [%hu..%hu]\n"
-msgstr "%hux%hu pixels par %hu bit(s), glyphes de %hu a %hu\n"
-
-#: test/ftdump.c:564
-#, c-format
-msgid "      range format (%hu:%hu) glyphs %hu..%hu\n"
-msgstr "      format intervalle (%hu:%hu) glyphes %hu a %hu\n"
-
-#: test/ftdump.c:615
-msgid "Error while loading GSUB table.\n"
-msgstr "Erreur en chargeant la table GSUB.\n"
-
-#: test/ftdump.c:619
-msgid "GSUB table\n"
-msgstr "Table des substitutions de glyphes (GSUB)\n"
-
-#: test/ftdump.c:626
-msgid "Error while querying GSUB script list.\n"
-msgstr "Erreur en demandant la liste des ecritures dans GSUB.\n"
-
-#: test/ftdump.c:639
-#, c-format
-msgid "Error while selecting GSUB script `%4.4s'.\n"
-msgstr "Erreur en selectionnant l'ecriture `%4.4s' dans GSUB.\n"
-
-#: test/ftdump.c:644 test/ftdump.c:848
-#, c-format
-msgid "  script `%4.4s' (index %hu):\n"
-msgstr "  Ecriture `%4.4s' (numero %hu)\n"
-
-#: test/ftdump.c:652
-#, c-format
-msgid ""
-"Error while querying GSUB default language system for script `%4.4s'.\n"
-msgstr ""
-"Erreur en cherchant les informations pour les langues standards de `%4.4s' "
-"dans GSUB.\n"
-
-#: test/ftdump.c:657 test/ftdump.c:861
-msgid "    default language system:\n"
-msgstr "    langue standard :\n"
-
-#: test/ftdump.c:670
-#, c-format
-msgid ""
-"Error while selecting GSUB feature `%4.4s'\n"
-"for default language system of script `%4.4s'.\n"
-msgstr ""
-"Erreur en selectionnant dans GSUB l'information `%4.4s'\n"
-"pour la langue standard de l'ecriture `%4.4s'.\n"
-
-#: test/ftdump.c:676 test/ftdump.c:757 test/ftdump.c:880 test/ftdump.c:961
-#, c-format
-msgid "      feature `%4.4s' (index %hu; lookup "
-msgstr "      information `%4.4s' (numero %hu ; table(s) de recherche "
-
-#: test/ftdump.c:692
-#, c-format
-msgid "Error while querying GSUB language list for script `%4.4s'.\n"
-msgstr ""
-"Erreur en demandant la liste des langues pour l'ecriture `%4.4s' dans GSUB.\n"
-
-#: test/ftdump.c:709
-#, c-format
-msgid "Error while selecting GSUB language `%4.4s' for script `%4.4s'.\n"
-msgstr ""
-"Erreur en selectionnant la langue `%4.4s' pour l'ecriture `%4.4s' dans "
-"GSUB.\n"
-
-#: test/ftdump.c:714 test/ftdump.c:918
-#, c-format
-msgid "    language `%4.4s' (index %hu):\n"
-msgstr "    langue `%4.4s' (numero %hu) :\n"
-
-#: test/ftdump.c:719 test/ftdump.c:923
-#, c-format
-msgid "      required feature index %hu (lookup "
-msgstr ""
-
-#: test/ftdump.c:734
-#, c-format
-msgid ""
-"Error while querying GSUB feature list\n"
-"for script `%4.4s', language `%4.4s'.\n"
-msgstr ""
-"Erreur en recherchant dans GSUB la liste des informations\n"
-"pour l'ecriture `%4.4s', langue `%4.4s'.\n"
-
-#: test/ftdump.c:751
-#, c-format
-msgid ""
-"Error while selecting GSUB feature `%4.4s'\n"
-"for script `%4.4s', language `%4.4s'.\n"
-msgstr ""
-"Erreur en selectionnant dans GSUB l'information `%4.4s'\n"
-"pour l'ecriture `%4.4s', langue `%4.4s'.\n"
-
-#: test/ftdump.c:776 test/ftdump.c:980
-msgid ""
-"Lookups:\n"
-"\n"
-msgstr ""
-"Tables de recherche :\n"
-"\n"
-
-#: test/ftdump.c:779 test/ftdump.c:983
-#, c-format
-msgid "  %hu: type %hu, flag 0x%x\n"
-msgstr "  %4hu : type %hu, drapeaux 0x%x\n"
-
-#: test/ftdump.c:819
-msgid "Error while loading GPOS table.\n"
-msgstr "Erreur en chargeant la table GPOS.\n"
-
-#: test/ftdump.c:823
-msgid "GPOS table\n"
-msgstr "Table des repositionnement de glyphes (GPOS)\n"
-
-#: test/ftdump.c:830
-msgid "Error while querying GPOS script list.\n"
-msgstr "Erreur en demandant la liste des ecritures dans GPOS.\n"
-
-#: test/ftdump.c:843
-#, c-format
-msgid "Error while selecting GPOS script `%4.4s'.\n"
-msgstr "Erreur en selectionnant l'ecriture `%4.4s' dans GPOS.\n"
-
-#: test/ftdump.c:856
-#, c-format
-msgid ""
-"Error while querying GPOS default language system for script `%4.4s'.\n"
-msgstr ""
-"Erreur en cherchant les informations pour les langues standards de `%4.4s' "
-"dans GPOS.\n"
-
-#: test/ftdump.c:874
-#, c-format
-msgid ""
-"Error while selecting GPOS feature `%4.4s'\n"
-"for default language system of script `%4.4s'.\n"
-msgstr ""
-"Erreur en selectionnant dans GPOS l'information `%4.4s'\n"
-"pour la langue standard de l'ecriture `%4.4s'.\n"
-
-#: test/ftdump.c:896
-#, c-format
-msgid "Error while querying GPOS language list for script `%4.4s'.\n"
-msgstr ""
-"Erreur en demandant la liste des langues pour l'ecriture `%4.4s' dans GPOS.\n"
-
-#: test/ftdump.c:913
-#, c-format
-msgid "Error while selecting GPOS language `%4.4s' for script `%4.4s'.\n"
-msgstr ""
-"Erreur en selectionnant la langue `%4.4s' pour l'ecriture `%4.4s' dans "
-"GPOS.\n"
-
-#: test/ftdump.c:938
-#, c-format
-msgid ""
-"Error while querying GPOS feature list\n"
-"for script `%4.4s', language `%4.4s'.\n"
-msgstr ""
-"Erreur en recherchant dans GPOS la liste des informations\n"
-"pour l'ecriture `%4.4s', langue `%4.4s'.\n"
-
-#: test/ftdump.c:955
-#, c-format
-msgid ""
-"Error while selecting GPOS feature `%4.4s'\n"
-"for script `%4.4s', language `%4.4s'.\n"
-msgstr ""
-"Erreur en selectionnant dans GPOS l'information `%4.4s'\n"
-"pour l'ecriture `%4.4s', langue `%4.4s'.\n"
-
-#: test/ftdump.c:1018
-msgid "ftdump: Simple TrueType Dumper -- part of the FreeType project"
-msgstr "ftdump : utilitaire d'informations TrueType -- www.freetype.org"
-
-#: test/ftdump.c:1022
-#, c-format
-msgid ""
-"Usage: %s fontname[.ttf|.ttc]\n"
-"\n"
-msgstr ""
-"Utilisation : %s nompolice[.ttf|.ttc]\n"
-"\n"
-
-#: test/ftdump.c:1054 test/ftlint.c:134 test/ftmetric.c:228 test/ftsbit.c:127
-msgid "Error while initializing engine.\n"
-msgstr "Erreur lors de l'initialisation de FreeType.\n"
-
-#: test/ftdump.c:1061 test/ftmetric.c:236 test/ftsbit.c:134
-msgid "Error while initializing embedded bitmap extension.\n"
-msgstr "Erreur lors de l'initialisation de l'extension `bitmaps'.\n"
-
-#: test/ftdump.c:1068
-msgid "Error while initializing GSUB extension.\n"
-msgstr "Erreur lors de l'initialisation de l'extension `GSUB'.\n"
-
-#: test/ftdump.c:1075
-msgid "Error while initializing GPOS extension.\n"
-msgstr "Erreur lors de l'initialisation de l'extension `GPOS'.\n"
-
-#: test/ftdump.c:1091 test/ftlint.c:187 test/ftmetric.c:251 test/ftsbit.c:182
-#, c-format
-msgid "Could not find or open %s.\n"
-msgstr "Impossible de trouver ou d'ouvrir %s.\n"
-
-#: test/ftdump.c:1094 test/ftlint.c:193 test/ftmetric.c:254 test/ftsbit.c:188
-#, c-format
-msgid "Error while opening %s.\n"
-msgstr "Erreur lors de l'ouverture de %s.\n"
-
-#: test/ftlint.c:94
-msgid ""
-"ftlint: Simple TrueType instruction tester -- part of the FreeType project"
-msgstr ""
-"ftlint : verificateur simple d'instructions TrueType - www.freetype.org"
-
-#: test/ftlint.c:99
-#, c-format
-msgid ""
-"Usage: %s ppem fontname[.ttf|.ttc] [fontname2..]\n"
-"\n"
-msgstr ""
-"Utilisation : %s ppem nompolice[.ttf|.ttc] [nompolice2...]\n"
-"\n"
-
-#: test/ftlint.c:226 test/ftsbit.c:225
-#, c-format
-msgid "Could not set point size to %d.\n"
-msgstr "Impossible de selectionner la taille %d.\n"
-
-#: test/ftlint.c:239
-msgid ""
-"Error with\n"
-"  "
-msgstr ""
-"Erreur avec\n"
-"  "
-
-#: test/ftlint.c:240
-#, c-format
-msgid "glyph %4u: %s\n"
-msgstr "glyphe %4u : %s\n"
-
-#: test/ftlint.c:253
-msgid "1 fail.\n"
-msgstr "1 echec.\n"
-
-#: test/ftlint.c:255
-#, c-format
-msgid "%d fails.\n"
-msgstr "%d echecs.\n"
-
-#: test/ftmetric.c:70
-msgid ""
-"ftmetric: Simple TTF metrics/glyph dumper -- part of the FreeType project"
-msgstr "ftmetric : affichage des metriques TrueType -- www.freetype.org"
-
-#: test/ftmetric.c:74
-#, c-format
-msgid ""
-"Usage: %s [options below] point fontname[.ttf|.ttc]\n"
-"\n"
-"  -B        show sbit's metrics (default: none)\n"
-"  -c C      use C'th font index of TrueType collection  (default: 0)\n"
-"  -i index  glyph index (default: 0)\n"
-"  -r R      use resolution R dpi (default: 72)\n"
-"\n"
-msgstr ""
-"Utilisation : %s [options] point nompolice[.ttf|.ttc]\n"
-"\n"
-"  -B        montrer les metriques des bitmaps (defaut : non)\n"
-"  -c C      utilise la police numero C d'une collection (defaut : 0)\n"
-"  -i index  numero du glyphe (default : 0)\n"
-"  -r R      resolution en dpi (defaut : 72)\n"
-"\n"
-
-#: test/ftmetric.c:261
-#, c-format
-msgid "There are %d fonts in this collection.\n"
-msgstr "Il y a %d polices dans cette collection.\n"
-
-#: test/ftmetric.c:266
-#, c-format
-msgid "There is no collection with index %d in this font file.\n"
-msgstr "Il n'y a aucune police d'indice %d dans cette collection.\n"
-
-#: test/ftmetric.c:280
-msgid "There is no embedded bitmap data in the font.\n"
-msgstr "Il n'y a pas de bitmaps dans cette police.\n"
-
-#: test/ftmetric.c:310
-msgid "Could not set device resolutions.\n"
-msgstr "Impossible de changer la resolution.\n"
-
-#: test/ftmetric.c:317
-msgid "Could not reset instance.\n"
-msgstr "Impossible de changer la taile.\n"
-
-#: test/ftmetric.c:323
-#, c-format
-msgid "Instance metrics: ppemX %d, ppemY %d\n"
-msgstr "Metriques de l'instance : ppemX %d ppemY %d\n"
-
-#: test/ftmetric.c:333 test/ftsbit.c:234
-msgid "Could not allocate glyph bitmap container.\n"
-msgstr "Impossible d'allouer un conteneur de glyphe.\n"
-
-#: test/ftmetric.c:341 test/ftsbit.c:258
-#, c-format
-msgid "Can't load bitmap for glyph %d.\n"
-msgstr "Impossible de charger le bitmap du glyphe %d.\n"
-
-#: test/ftmetric.c:368
-msgid "Outline's metrics"
-msgstr "Metriques du dessin vectorise"
-
-#: test/ftmetric.c:370
-msgid "Outline glyph\n"
-msgstr "glyphe du dessin vectorise\n"
-
-#: test/ftsbit.c:90
-msgid "ftsbit: Simple TrueType `sbit' dumper -- part of the FreeType project"
-msgstr "ftsbit : affichage des `sbit' TrueType -- www.freetype.org"
-
-#: test/ftsbit.c:95
-#, c-format
-msgid ""
-"Usage: %s ppem fontname[.ttf|.ttc] glyph_index [glyph_index2..]\n"
-"\n"
-msgstr ""
-"Utilisation : %s ppm nompolice[.ttf|.ttc] numero_glyphe [numero_glyphe2...]\n"
-"\n"
-
-#: test/ftsbit.c:200
-msgid "Could not find embedded bitmaps in this font.\n"
-msgstr "Pas de bitmaps dans cette police.\n"
-
-#: test/ftsbit.c:206
-msgid "Error while loading embedded bitmaps.\n"
-msgstr "Erreur lors du chargement des bitmaps.\n"
-
-#: test/ftsbit.c:252
-#, c-format
-msgid "  no bitmap for glyph %d.\n"
-msgstr "  pas de bitmap pour le glyphe %d.\n"
-
-#: test/ftsbit.c:264
-#, c-format
-msgid "glyph index %d = %dx%d pixels, "
-msgstr "glyphe numero %d = %dx%d pixels, "
-
-#: test/ftsbit.c:267
-#, c-format
-msgid "advance = %ld, minBearing = [%ld,%ld]\n"
-msgstr "chasse = %ld, approches = [%ld,%ld]\n"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/friendly-recovery.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/friendly-recovery.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/friendly-recovery.po	2012-01-02 17:27:25.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/friendly-recovery.po	2012-02-23 06:31:48.000000000 +0000
@@ -7,69 +7,187 @@
 msgstr ""
 "Project-Id-Version: friendly-recovery\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-07 17:09-0400\n"
-"PO-Revision-Date: 2011-09-24 11:19+0000\n"
-"Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
+"POT-Creation-Date: 2012-02-16 12:08-0500\n"
+"PO-Revision-Date: 2012-02-19 15:42+0000\n"
+"Last-Translator: demonipuch <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:56+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:56+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
-#: ../lib/recovery-mode/recovery-menu:7
+#: ../lib/recovery-mode/options/apt-snapshots:20
 #, sh-format
-msgid "Recovery Menu"
-msgstr "Menu de récupération"
+msgid "Revert to old snapshot and reboot"
+msgstr ""
 
-#: ../lib/recovery-mode/recovery-menu:13
+#: ../lib/recovery-mode/options/apt-snapshots:31
 #, sh-format
-msgid "   Resume normal boot"
-msgstr "   Reprendre le démarrage normal"
+msgid "Snapshot"
+msgstr ""
 
-#: ../lib/recovery-mode/recovery-menu:26
+#: ../lib/recovery-mode/options/clean:6
 #, sh-format
-msgid "Couldn't find whiptail, starting root shell instead of recovery menu."
-msgstr ""
-"Impossible de trouver whiptail, démarrage du mode console root à la place du "
-"menu de restauration."
+msgid "Try to make free space"
+msgstr "Essayer de libérer de l'espace"
 
-#: ../lib/recovery-mode/options/dpkg:6
+#: ../lib/recovery-mode/options/clean:12
 #, sh-format
-msgid "Repair broken packages"
-msgstr "Réparer les paquets cassés"
+msgid ""
+"Trying to find packages you don't need (apt-get autoremove), please review "
+"carefully."
+msgstr ""
 
-#: ../lib/recovery-mode/options/dpkg:33
+#: ../lib/recovery-mode/options/clean:16 ../lib/recovery-mode/options/dpkg:41
+#: ../lib/recovery-mode/options/grub:16 ../lib/recovery-mode/recovery-menu:84
 #, sh-format
 msgid "Finished, please press ENTER"
 msgstr "Terminé, veuillez appuyer sur Entrée"
 
-#: ../lib/recovery-mode/options/fsck:8
-#, sh-format
-msgid "Reboot into file system check"
-msgstr "Redémarrer en mode vérification du système de fichiers"
-
-#: ../lib/recovery-mode/options/root:6
+#: ../lib/recovery-mode/options/dpkg:6
 #, sh-format
-msgid "Drop to root shell prompt"
-msgstr "Passer sur une console administrateur (root)"
+msgid "Repair broken packages"
+msgstr "Réparer les paquets cassés"
 
 #: ../lib/recovery-mode/options/failsafeX:11
 #, sh-format
 msgid "Run in failsafe graphic mode"
 msgstr "Démarrer en mode graphique sans échec"
 
-#: ../lib/recovery-mode/options/netroot:6
+#: ../lib/recovery-mode/options/fsck:6
 #, sh-format
-msgid "Drop to root shell prompt with networking"
-msgstr "Passer sur une console administrateur (root) avec gestion du réseau"
+msgid "Check all file systems"
+msgstr "Vérifier tous les systèmes de fichiers"
 
 #: ../lib/recovery-mode/options/grub:6
 #, sh-format
 msgid "Update grub bootloader"
 msgstr "Mettre à jour le chargeur d'amorçage GRUB"
 
-#: ../lib/recovery-mode/options/clean:6
+#: ../lib/recovery-mode/options/network:6
 #, sh-format
-msgid "Try to make free space"
-msgstr "Essayer de libérer de l'espace"
+msgid "Enable networking"
+msgstr ""
+
+#: ../lib/recovery-mode/options/root:9
+#, sh-format
+msgid "Drop to root shell prompt"
+msgstr "Passer sur une console administrateur (root)"
+
+#: ../lib/recovery-mode/options/system-summary:9
+#: ../lib/recovery-mode/options/system-summary:57
+#, sh-format
+msgid "System summary"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:15
+#, sh-format
+msgid "Read-only mode"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:17
+#, sh-format
+msgid "Read/Write mode"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:21
+#, sh-format
+msgid "none"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:23
+#, sh-format
+msgid "IP configured"
+msgstr "IP configurée"
+
+#: ../lib/recovery-mode/options/system-summary:25
+#, sh-format
+msgid "IP and DNS configured"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:36
+#, sh-format
+msgid "No software RAID detected (mdstat)"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:39
+#, sh-format
+msgid "=== General information ==="
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:40
+#, sh-format
+msgid "System mode:"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:41
+#, sh-format
+msgid "CPU information:"
+msgstr "Informations CPU:"
+
+#: ../lib/recovery-mode/options/system-summary:42
+#, sh-format
+msgid "Network connectivity:"
+msgstr "Connectivité réseau:"
+
+#: ../lib/recovery-mode/options/system-summary:44
+#, sh-format
+msgid "=== Detailed disk usage ==="
+msgstr "=== Utilisation détaillée des disques ==="
+
+#: ../lib/recovery-mode/options/system-summary:47
+#, sh-format
+msgid "=== Software RAID state ==="
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:50
+#, sh-format
+msgid "=== Detailed memory usage ==="
+msgstr "=== Utilisation détaillée de la mémoire ==="
+
+#: ../lib/recovery-mode/options/system-summary:53
+#, sh-format
+msgid "=== Detailed network configuration ==="
+msgstr "=== Configuration réseau détaillée ==="
+
+#: ../lib/recovery-mode/recovery-menu:20
+#, sh-format
+msgid "Recovery Menu (filesystem state: read-only)"
+msgstr ""
+
+#: ../lib/recovery-mode/recovery-menu:22
+#, sh-format
+msgid "Recovery Menu (filesystem state: read/write)"
+msgstr ""
+
+#: ../lib/recovery-mode/recovery-menu:26
+#, sh-format
+msgid "   Resume normal boot"
+msgstr "   Reprendre le démarrage normal"
+
+#: ../lib/recovery-mode/recovery-menu:47
+#, sh-format
+msgid ""
+"You are now going to exit the recovery mode and continue the boot sequence. "
+"Please note that some graphic drivers require a full graphical boot and so "
+"will fail when resuming from recovery.\n"
+"If that's the case, simply reboot from the login screen and then perform a "
+"standard boot."
+msgstr ""
+
+#: ../lib/recovery-mode/recovery-menu:67
+#, sh-format
+msgid ""
+"Continuing will remount your / filesystem in read/write mode and mount any "
+"other filesystem defined in /etc/fstab.\n"
+"Do you wish to continue?"
+msgstr ""
+
+#: ../lib/recovery-mode/recovery-menu:95
+#, sh-format
+msgid ""
+"The option you selected requires your filesystem to be in read-only mode. "
+"Unfortunately another option you selected earlier, made you exit this mode.\n"
+"The easiest way of getting back in read-only mode is to reboot your system."
+msgstr ""
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gas.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gas.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gas.po	2012-01-02 17:26:43.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gas.po	2012-02-23 06:31:10.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:13+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:31+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: app.c:488 app.c:502
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gawk.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gawk.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gawk.po	2012-01-02 17:26:48.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gawk.po	2012-02-23 06:31:14.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:50+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:53+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: array.c:112
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gcc-4.4.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gcc-4.4.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gcc-4.4.po	2012-01-02 17:27:31.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gcc-4.4.po	2012-02-23 06:31:55.000000000 +0000
@@ -128,8 +128,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 18:23+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:09+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: c-decl.c:3819
 msgid "<anonymous>"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gcc-4.5.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gcc-4.5.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gcc-4.5.po	2012-01-02 17:27:34.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gcc-4.5.po	2012-02-23 06:31:58.000000000 +0000
@@ -122,15 +122,15 @@
 "Project-Id-Version: GNU gcc 3.4.3\n"
 "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
 "POT-Creation-Date: 2010-04-06 14:11+0000\n"
-"PO-Revision-Date: 2011-12-13 06:07+0000\n"
+"PO-Revision-Date: 2012-01-30 20:26+0000\n"
 "Last-Translator: FX <Unknown>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:07+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:46+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: c-decl.c:4573 c-pretty-print.c:403 c-typeck.c:5590 toplev.c:1652
 #: cp/error.c:581 cp/error.c:854
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gcc-4.6.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gcc-4.6.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gcc-4.6.po	2012-01-02 17:27:36.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gcc-4.6.po	2012-02-23 06:32:00.000000000 +0000
@@ -122,15 +122,15 @@
 "Project-Id-Version: GNU gcc 3.4.3\n"
 "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
 "POT-Creation-Date: 2011-06-21 10:27+0000\n"
-"PO-Revision-Date: 2011-12-17 23:17+0000\n"
+"PO-Revision-Date: 2012-02-17 01:27+0000\n"
 "Last-Translator: FX <Unknown>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:38+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 02:15+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: c-decl.c:4660 c-typeck.c:5853 toplev.c:1013 c-family/c-pretty-print.c:423
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gdb.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gdb.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gdb.po	2012-01-02 17:26:48.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gdb.po	2012-02-23 06:31:14.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: gdb\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-12-07 22:12+0100\n"
+"POT-Creation-Date: 2012-01-24 09:23+0000\n"
 "PO-Revision-Date: 2011-07-31 17:34+0000\n"
 "Last-Translator: Pipet Mathieu <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:53+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:56+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ada-exp.y:259
 msgid "Invalid conversion"
@@ -73,12 +73,12 @@
 msgid "Internal error in encoding of renaming declaration"
 msgstr "Erreur interne dans l'encodage d'une déclaration de renommage"
 
-#: ada-exp.y:1036 c-exp.y:740 objc-exp.y:628 p-exp.y:647
+#: ada-exp.y:1036 c-exp.y:740 objc-exp.y:628 p-exp.y:646
 #, possible-c-format
 msgid "No file or function \"%s\"."
 msgstr "Pas de fichier ou de fonction \"%s\"."
 
-#: ada-exp.y:1038 c-exp.y:754 m2-exp.y:565 objc-exp.y:639 p-exp.y:658
+#: ada-exp.y:1038 c-exp.y:754 m2-exp.y:565 objc-exp.y:639 p-exp.y:657
 #, possible-c-format
 msgid "No function \"%s\" in specified context."
 msgstr "Pas de fonction \"%s\"  dans le contexte spécifié"
@@ -102,9 +102,9 @@
 msgid "No definition of \"%s\" found."
 msgstr "Aucune définition de \"%s\" trouvée."
 
-#: ada-exp.y:1395 c-exp.y:845 c-exp.y:897 cli/cli-cmds.c:913 f-exp.y:520
-#: linespec.c:1823 linespec.c:2109 objc-exp.y:721 objc-exp.y:775 p-exp.y:717
-#: p-exp.y:786 source.c:179 symtab.c:2858
+#: ada-exp.y:1395 c-exp.y:860 c-exp.y:912 cli/cli-cmds.c:915 f-exp.y:519
+#: linespec.c:2133 linespec.c:2959 objc-exp.y:721 objc-exp.y:775 p-exp.y:716
+#: p-exp.y:785 source.c:177 symtab.c:3030
 msgid "No symbol table is loaded.  Use the \"file\" command."
 msgstr ""
 "Aucune table de symboles n'est chargée. Utiliser la commande \" file \""
@@ -128,442 +128,453 @@
 msgid "Invalid use of type."
 msgstr "Utilisation du type incorecte."
 
-#: ada-lang.c:504
+#: ada-lang.c:511
 #, possible-c-format
 msgid "Unable to find field %s in struct %s.  Aborting"
 msgstr "Impossible de trouver le champ %s dans la structure %s. Abandon"
 
-#: ada-lang.c:625
+#: ada-lang.c:632
 msgid "object size is larger than varsize-limit"
 msgstr "la taille de l'objet est plus que grande que varsize-limit"
 
-#: ada-lang.c:689
+#: ada-lang.c:696
 msgid "Unexpected type in ada_discrete_type_high_bound."
 msgstr "Type inattendu dans ada_discrete_type_high_bound."
 
-#: ada-lang.c:709
+#: ada-lang.c:716
 msgid "Unexpected type in ada_discrete_type_low_bound."
 msgstr "Type inattendu dans ada_discrete_type_low_bound."
 
-#: ada-lang.c:768
+#: ada-lang.c:775
 msgid "Invalid address for Ada main program name."
 msgstr "Adresse invalide pour le nom du principal programme Ada"
 
-#: ada-lang.c:848
+#: ada-lang.c:855
 #, possible-c-format
 msgid "invalid Ada operator name: %s"
 msgstr "%s est un nom d'opérateur Ada invalide"
 
-#: ada-lang.c:1507 ada-lang.c:1525 ada-lang.c:1539 ada-lang.c:1607
+#: ada-lang.c:1517 ada-lang.c:1535 ada-lang.c:1549 ada-lang.c:1617
 msgid "Bad GNAT array descriptor"
 msgstr "mauvais descripteur du tableau GNAT"
 
-#: ada-lang.c:1644
+#: ada-lang.c:1654
 msgid "Bad GNAT array descriptor bounds"
 msgstr "mauvais descripteur de limites du tableau GNAT"
 
-#: ada-lang.c:1887
+#: ada-lang.c:1897
 msgid "Bounds unavailable for null array pointer."
 msgstr "Limites non disponible pour un tableau de pointeur null"
 
-#: ada-lang.c:1976
+#: ada-lang.c:1986
 msgid "could not understand bit size information on packed array"
 msgstr ""
 "Impossible de comprendre les informations de taille de bit sur la matrice "
 "empaquetée"
 
-#: ada-lang.c:2056
+#: ada-lang.c:2066
 msgid "could not find bounds information on packed array"
 msgstr ""
 "Impossible de trouver des informations de limites sur la matrice empaquetée"
 
-#: ada-lang.c:2063
+#: ada-lang.c:2073
 msgid "could not understand bounds information on packed array"
 msgstr ""
 "Impossible de comprendre les informations de limites sur la matrice "
 "empaquetée"
 
-#: ada-lang.c:2097
+#: ada-lang.c:2107
 msgid "can't unpack array"
 msgstr "Impossible de dépaqueter le tableau"
 
-#: ada-lang.c:2150
+#: ada-lang.c:2160
 msgid "attempt to do packed indexing of something other than a packed array"
 msgstr ""
 "Tentative de créer une indexation empaquetée d'autre chose que d'un tableau "
 "empaqueté."
 
-#: ada-lang.c:2160
+#: ada-lang.c:2170
 msgid "don't know bounds of array"
 msgstr "ne connaît pas les limites du tableau"
 
-#: ada-lang.c:2166
+#: ada-lang.c:2176
 #, possible-c-format
 msgid "packed array index %ld out of bounds"
 msgstr "index du tableau empaqueté %|d hors limites"
 
-#: ada-lang.c:2445 ada-lang.c:8551 valops.c:1217
+#: ada-lang.c:2455 ada-lang.c:8728 valops.c:1218
 msgid "Left operand of assignment is not a modifiable lvalue."
 msgstr ""
 "L'opérande de gauche de l'assignation n'est pas une |valeur modifiable."
 
-#: ada-lang.c:2542 ada-lang.c:2563
+#: ada-lang.c:2552 ada-lang.c:2573
 #, possible-c-format
 msgid "too many subscripts (%d expected)"
 msgstr "trop d'indices (%d attendu)"
 
-#: ada-lang.c:2694
+#: ada-lang.c:2704
 #, possible-c-format
 msgid "invalid dimension number to '%s"
 msgstr ""
 
-#: ada-lang.c:2713
+#: ada-lang.c:2723
 msgid "attempt to take bound of something that is not an array"
 msgstr ""
 "tentative d'évaluer les limites de quelque chose qui n'est pas un tableau"
 
-#: ada-lang.c:2833
+#: ada-lang.c:2843
 msgid "Could not find operator name for opcode"
 msgstr "N'est pas parvenu à trouver un nom d'opérateur pour opcode"
 
-#: ada-lang.c:3023
+#: ada-lang.c:3033
 msgid "Unexpected operator during name resolution"
 msgstr "opérateur non attendu lors de la résolution du nom"
 
-#: ada-lang.c:3087
+#: ada-lang.c:3097
 #, possible-c-format
 msgid "No definition found for %s"
 msgstr "Aucune définition trouvée pour %s"
 
-#: ada-lang.c:3099 ada-lang.c:3151
+#: ada-lang.c:3109 ada-lang.c:3161
 #, possible-c-format
 msgid "Could not find a match for %s"
 msgstr "N'est pas parvenu à trouver une correspondance pour %s"
 
-#: ada-lang.c:3104 ada-lang.c:3384
+#: ada-lang.c:3114 ada-lang.c:3394
 #, possible-c-format
 msgid "Multiple matches for %s\n"
 msgstr "Correspondances multiples pour %s\n"
 
-#: ada-lang.c:3472
+#: ada-lang.c:3482
 msgid "Request to select 0 symbols!"
 msgstr "sélection du symbole 0 requis!"
 
-#: ada-lang.c:3477 linespec.c:542
+#: ada-lang.c:3487 linespec.c:626
 msgid ""
 "canceled because the command is ambiguous\n"
 "See set/show multiple-symbol."
 msgstr ""
 
-#: ada-lang.c:3487
+#: ada-lang.c:3497
 msgid "[0] cancel\n"
 msgstr "[0] annuler\n"
 
-#: ada-lang.c:3489
+#: ada-lang.c:3499
 msgid "[1] all\n"
 msgstr "[1] tout\n"
 
-#: ada-lang.c:3504
+#: ada-lang.c:3514
 #, possible-c-format
 msgid "[%d] %s at <no source file available>:%d\n"
 msgstr "[%d] %s a <aucun fichier source disponible>:%d\n"
 
-#: ada-lang.c:3509 ada-lang.c:3523
+#: ada-lang.c:3519 ada-lang.c:3533
 #, possible-c-format
 msgid "[%d] %s at %s:%d\n"
 msgstr "[%d] %s a %s:%d\n"
 
-#: ada-lang.c:3533
+#: ada-lang.c:3543
 #, possible-c-format
 msgid "'(%s) (enumeral)\n"
 msgstr "'(%s) (Pointeur)\n"
 
-#: ada-lang.c:3538
+#: ada-lang.c:3548
 #, possible-c-format
 msgid "[%d] %s in %s (enumeral)\n"
 msgstr "[%d] %s dans %s (Pointeur)\n"
 
-#: ada-lang.c:3539
+#: ada-lang.c:3549
 #, possible-c-format
 msgid "[%d] %s at %s:?\n"
 msgstr "[%d] %s à %s:?\n"
 
-#: ada-lang.c:3545
+#: ada-lang.c:3555
 #, possible-c-format
 msgid "[%d] %s (enumeral)\n"
 msgstr "[%d] %s (Pointeur)\n"
 
-#: ada-lang.c:3546
+#: ada-lang.c:3556
 #, possible-c-format
 msgid "[%d] %s at ?\n"
 msgstr "[%d] %s à ?\n"
 
-#: ada-lang.c:3593 ada-lang.c:3607 linespec.c:610
+#: ada-lang.c:3603 ada-lang.c:3617 linespec.c:649
 msgid "one or more choice numbers"
 msgstr "un ou plusieurs numéros du choix"
 
-#: ada-lang.c:3614
+#: ada-lang.c:3624
 msgid "Argument must be choice number"
 msgstr "L'argument doit être un numéro du choix"
 
-#: ada-lang.c:3618
+#: ada-lang.c:3628
 msgid "cancelled"
 msgstr "annulé"
 
-#: ada-lang.c:3645
+#: ada-lang.c:3655
 #, possible-c-format
 msgid "Select no more than %d of the above"
 msgstr "Choisir au plus %d affichés au-dessus."
 
 #. PNH: Do we ever get here?  See ada_search_struct_field,
 #. find_struct_field.
-#: ada-lang.c:6361
+#: ada-lang.c:6540
 msgid "Cannot assign this kind of variant record"
 msgstr "Ne peut assigner ce type d'enregistrent variant"
 
-#: ada-lang.c:6458 valops.c:2350
+#: ada-lang.c:6637 valops.c:2350
 #, possible-c-format
 msgid "There is no member named %s."
 msgstr "Il n'y a pas de membre nommé %s."
 
-#: ada-lang.c:6464
+#: ada-lang.c:6643
 msgid "Attempt to extract a component of a value that is not a record."
 msgstr ""
 "Tentative d'extraction d'un composant d'une valeur qui n'est pas un "
 "enregistrement"
 
-#: ada-lang.c:6515
+#: ada-lang.c:6694
 msgid "Type (null) is not a structure or union type"
 msgstr "Le type ( null ) n 'est pas du type structure ou union"
 
 #. XXX: type_sprint
-#: ada-lang.c:6519 ada-lang.c:6598 ada-lang.c:6605
+#: ada-lang.c:6698 ada-lang.c:6777 ada-lang.c:6784
 msgid "Type "
 msgstr "Type "
 
-#: ada-lang.c:6521
+#: ada-lang.c:6700
 msgid " is not a structure or union type"
 msgstr " n'est pas de type structure ou union"
 
-#: ada-lang.c:6600
+#: ada-lang.c:6779
 msgid " has no component named <null>"
 msgstr " est dépourvu de composant nommé <null>"
 
-#: ada-lang.c:6607
+#: ada-lang.c:6786
 #, possible-c-format
 msgid " has no component named %s"
 msgstr " est dépourvu de composant nommé %s"
 
-#: ada-lang.c:6946
+#: ada-lang.c:7125
 msgid "unexpected null name on descriptive type"
 msgstr ""
 
-#: ada-lang.c:7300
+#: ada-lang.c:7479
 #, possible-c-format
 msgid "Invalid type size for `%s' detected: %d."
 msgstr "Détection d'un type de taille invalide pour '%s' : %d."
 
-#: ada-lang.c:7303
+#: ada-lang.c:7482
 #, possible-c-format
 msgid "Invalid type size for <unnamed> detected: %d."
 msgstr "Détection d'un type de taille invalide pour <innommé> : %d."
 
-#: ada-lang.c:7314
+#: ada-lang.c:7493
 msgid "record type with dynamic size is larger than varsize-limit"
 msgstr ""
 "Le type d'enregistrement de taille dynamique est supérieur à la taille-"
 "limite de la variable"
 
-#: ada-lang.c:7627
+#: ada-lang.c:7806
 msgid "array type with dynamic size is larger than varsize-limit"
 msgstr ""
 "Le type de matrice de taille dynamique est supérieur à la taille-limite de "
 "la variable"
 
-#: ada-lang.c:7983
+#: ada-lang.c:8162
 msgid "'POS only defined on discrete types"
 msgstr "'POS est défini uniquement à partir de types discrets"
 
-#: ada-lang.c:7995
+#: ada-lang.c:8174
 msgid "enumeration value is invalid: can't find 'POS"
 msgstr "La valeur d'énumération est invalide : impossible de trouver ' POS"
 
-#: ada-lang.c:8013
+#: ada-lang.c:8192
 msgid "'VAL only defined on discrete types"
 msgstr "'VAL est défini uniquement à partir de types discrets"
 
-#: ada-lang.c:8015
+#: ada-lang.c:8194
 msgid "'VAL requires integral argument"
 msgstr "'VAL nécessite un argument entier"
 
-#: ada-lang.c:8022
+#: ada-lang.c:8201
 msgid "argument to 'VAL out of range"
 msgstr "L'argument de 'VAL est hors champ"
 
-#: ada-lang.c:8359
+#: ada-lang.c:8538
 msgid "Incompatible types in assignment"
 msgstr "Les types dans la requête sont incompatibles"
 
-#: ada-lang.c:8393
+#: ada-lang.c:8572
 #, possible-c-format
 msgid "second operand of %s must not be zero."
 msgstr "la seconde opérande de %s doit être différente de zéro"
 
-#: ada-lang.c:8438
+#: ada-lang.c:8617
 msgid "Attempt to compare array with non-array"
 msgstr "Tentative  de comparaison entre une matrice et un autre type d'objet"
 
-#: ada-lang.c:8569
+#: ada-lang.c:8746
 msgid "Left-hand side must be array or record."
 msgstr "la partie située à gauche doit être un tableau ou un enregistrement"
 
-#: ada-lang.c:8594
+#: ada-lang.c:8771
 msgid "Misplaced 'others' clause"
 msgstr "'autres' clauses mal placées"
 
-#: ada-lang.c:8599
+#: ada-lang.c:8776
 msgid "Internal error: bad aggregate clause"
 msgstr "mauvaise clause d'agrégation"
 
-#: ada-lang.c:8621
+#: ada-lang.c:8798
 msgid "Extra components in aggregate ignored."
 msgstr "Composants supplémentaires dans l'ensemble ignorés."
 
-#: ada-lang.c:8688
+#: ada-lang.c:8865
 msgid "Invalid record component association."
 msgstr "Association de composant enregistré invalide."
 
-#: ada-lang.c:8694
+#: ada-lang.c:8871
 #, possible-c-format
 msgid "Unknown component name: %s."
 msgstr "Nom de composant inconnu : %s."
 
-#: ada-lang.c:8699
+#: ada-lang.c:8876
 msgid "Index in component association out of bounds."
 msgstr "Index dans l'association de composant hors limites."
 
-#: ada-lang.c:8775
+#: ada-lang.c:8952
 msgid "Internal error: miscounted aggregate components."
 msgstr ""
 
-#: ada-lang.c:9144
+#: ada-lang.c:9321
 msgid "Fixed-point values must be assigned to fixed-point variables"
 msgstr ""
 
-#: ada-lang.c:9161
+#: ada-lang.c:9338
 msgid "Operands of fixed-point addition must have the same type"
 msgstr ""
 
-#: ada-lang.c:9183
+#: ada-lang.c:9360
 msgid "Operands of fixed-point subtraction must have the same type"
 msgstr ""
 
 #. Only encountered when an unresolved symbol occurs in a
 #. context other than a function call, in which case, it is
 #. invalid.
-#: ada-lang.c:9285 ada-lang.c:9355
+#: ada-lang.c:9462 ada-lang.c:9532
 #, possible-c-format
 msgid "Unexpected unresolved symbol, %s, during evaluation"
 msgstr ""
 
-#: ada-lang.c:9404
+#: ada-lang.c:9581
 #, possible-c-format
 msgid "cannot subscript or call something of type `%s'"
 msgstr ""
 
-#: ada-lang.c:9423
+#: ada-lang.c:9600
 msgid "cannot subscript or call a record"
 msgstr ""
 
-#: ada-lang.c:9425
+#: ada-lang.c:9602
 #, possible-c-format
 msgid "wrong number of subscripts; expecting %d"
 msgstr ""
 
-#: ada-lang.c:9437 ada-lang.c:9451
+#: ada-lang.c:9614 ada-lang.c:9628
 msgid "element type of array unknown"
 msgstr "type de l'élément du tableau inconnu"
 
-#: ada-lang.c:9460
+#: ada-lang.c:9637
 msgid "Attempt to index or call something other than an array or function"
 msgstr ""
 "Tente d'indexer ou d'appeler autre chose qu'un tableau ou une fonction"
 
-#: ada-lang.c:9490
+#: ada-lang.c:9667
 msgid "cannot slice a packed array"
 msgstr "Impossible de découper un tableau groupé"
 
-#: ada-lang.c:9518 valops.c:3682
+#: ada-lang.c:9695 valops.c:3681
 msgid "cannot take slice of non-array"
 msgstr ""
 
-#: ada-lang.c:9556
+#: ada-lang.c:9734
 msgid "Membership test incompletely implemented; always returns true"
 msgstr ""
 
-#: ada-lang.c:9645
+#: ada-lang.c:9823
 #, possible-c-format
 msgid "Invalid operand to '%s"
 msgstr "Opérande invalide pour '%s"
 
 #. Should never happen.
-#: ada-lang.c:9670 ada-lang.c:9695 ada-lang.c:9725
+#: ada-lang.c:9848 ada-lang.c:9873 ada-lang.c:9903
 msgid "unexpected attribute encountered"
 msgstr "Attribut non attendu rencontré"
 
-#: ada-lang.c:9703
+#: ada-lang.c:9881
 msgid "the 'length attribute applies only to array types"
 msgstr "L'attribut longueur ne s'applique qu'a des tableaux"
 
-#: ada-lang.c:9707
+#: ada-lang.c:9885
 msgid "unimplemented type attribute"
 msgstr "Type d'attribut non implémenté"
 
-#: ada-lang.c:9775
+#: ada-lang.c:9953
 msgid "'modulus must be applied to modular type"
 msgstr ""
 
-#: ada-lang.c:9871
+#: ada-lang.c:10049
 msgid "Attempt to dereference null array pointer."
 msgstr ""
 
-#: ada-lang.c:9899 eval.c:2638 eval.c:3052 valops.c:1786
+#: ada-lang.c:10077 eval.c:2639 eval.c:3049 valops.c:1786
 msgid "Attempt to take contents of a non-pointer value."
 msgstr ""
 
-#: ada-lang.c:9967 eval.c:2859
+#: ada-lang.c:10145 eval.c:2856
 msgid "Attempt to use a type name as an expression"
 msgstr "Tente d'utiliser un nom de type comme expression"
 
-#: ada-lang.c:9979
+#: ada-lang.c:10157
 #, possible-c-format
 msgid ""
 "Undefined name, ambiguous name, or renaming used in component association: "
 "%s."
 msgstr ""
 
-#: ada-lang.c:9982
+#: ada-lang.c:10160
 msgid "Aggregates only allowed on the right of an assignment"
 msgstr ""
 
-#: ada-lang.c:9985
+#: ada-lang.c:10163
 msgid "aggregate apparently mangled"
 msgstr ""
 
-#: ada-lang.c:10280
+#: ada-lang.c:10458
 msgid "Unknown lower bound, using 1."
 msgstr "Limite inférieur inconnue. La valeur 1 sera utilisée."
 
-#: ada-lang.c:10299
+#: ada-lang.c:10477
 #, possible-c-format
 msgid "Unknown upper bound, using %ld."
 msgstr "Valeur superieure inconnue. La valeur %ld sera utilisée."
 
-#: ada-lang.c:10527
+#: ada-lang.c:10683
+msgid ""
+"Your Ada runtime appears to be missing some debugging information.\n"
+"Cannot insert Ada exception catchpoint in this configuration."
+msgstr ""
+
+#: ada-lang.c:10693
+#, possible-c-format
+msgid "Symbol \"%s\" is not a function (class = %d)"
+msgstr "Le symbole \"%s\" n'est pas une fonction (classe = %d)"
+
+#: ada-lang.c:10736
 msgid "Unable to insert catchpoint.  Is this an Ada main program?"
 msgstr ""
 
-#: ada-lang.c:10535
+#: ada-lang.c:10744
 msgid "Unable to insert catchpoint. Try to start the program first."
 msgstr ""
 "Impossible d'insérer un catchpoint. Essayez d'abord de lancer le programme."
@@ -574,95 +585,95 @@
 #. configurable run time mode, or that a-except as been optimized
 #. out by the linker...  In any case, at this point it is not worth
 #. supporting this feature.
-#: ada-lang.c:10544
-msgid "Cannot insert catchpoints in this configuration."
-msgstr "Ne peut insérer de catchpoints pour cette configuration."
+#: ada-lang.c:10753
+msgid "Cannot insert Ada exception catchpoints in this configuration."
+msgstr ""
 
-#: ada-lang.c:10713 ada-lang.c:10855 ada-lang.c:10888 ada-lang.c:10917
+#: ada-lang.c:10912 ada-lang.c:11272 ada-lang.c:11316 ada-lang.c:11347
 msgid "unexpected catchpoint type"
 msgstr "type de catchpoint inattendu"
 
-#: ada-lang.c:10739
+#: ada-lang.c:10938
 #, possible-c-format
 msgid "failed to get exception name: %s"
 msgstr "nom d'exception inconnu : %s"
 
-#: ada-lang.c:10836
+#: ada-lang.c:11052
 #, possible-c-format
-msgid "`%s' Ada exception"
+msgid ""
+"failed to reevaluate internal exception condition for catchpoint %d: %s"
 msgstr ""
 
-#: ada-lang.c:10871
-#, possible-c-format
-msgid "Catchpoint %d: `%s' Ada exception"
+#: ada-lang.c:11143
+msgid "Error in testing exception condition:\n"
 msgstr ""
 
-#: ada-lang.c:10874
+#: ada-lang.c:11253 ada-lang.c:11297
 #, possible-c-format
-msgid "Catchpoint %d: all Ada exceptions"
+msgid "`%s' Ada exception"
 msgstr ""
 
-#: ada-lang.c:10879
-#, possible-c-format
-msgid "Catchpoint %d: unhandled Ada exceptions"
+#: ada-lang.c:11287 breakpoint.c:9796
+msgid "Temporary catchpoint "
 msgstr ""
 
-#: ada-lang.c:10884
-#, possible-c-format
-msgid "Catchpoint %d: failed Ada assertions"
+#: ada-lang.c:11288 breakpoint.c:9797
+msgid "Catchpoint "
+msgstr ""
+
+#: ada-lang.c:11304
+msgid "all Ada exceptions"
+msgstr ""
+
+#: ada-lang.c:11308
+msgid "unhandled Ada exceptions"
+msgstr ""
+
+#: ada-lang.c:11312
+msgid "failed Ada assertions"
 msgstr ""
 
-#: ada-lang.c:11111 breakpoint.c:613 breakpoint.c:624
+#: ada-lang.c:11573 breakpoint.c:645 breakpoint.c:658
 msgid "Junk at end of expression"
 msgstr "Caractères invalides à la fin de l'expression"
 
-#: ada-lang.c:11156 ada-lang.c:11179
+#: ada-lang.c:11620 ada-lang.c:11643
 #, possible-c-format
 msgid "unexpected catchpoint kind (%d)"
 msgstr "type de catchpoint inattendu (%d)"
 
-#: ada-lang.c:11287
-#, possible-c-format
-msgid "Unable to break on '%s' in this configuration."
-msgstr "Impossible de s'arrêter sur '%s' pour cette configuration."
-
-#: ada-lang.c:11291
-#, possible-c-format
-msgid "Symbol \"%s\" is not a function (class = %d)"
-msgstr "Le symbole \"%s\" n'est pas une fonction (classe = %d)"
-
-#: ada-lang.c:11360 breakpoint.c:7843 breakpoint.c:9311 breakpoint.c:9440
-#: breakpoint.c:9484 breakpoint.c:9630 breakpoint.c:12185
+#: ada-lang.c:11806 breakpoint.c:7635 breakpoint.c:9544 breakpoint.c:9673
+#: breakpoint.c:9718 breakpoint.c:9861 breakpoint.c:13030 skip.c:191
 msgid "Junk at end of arguments."
 msgstr "Caractères invalides à la fin d'arguments."
 
 #. XXX: gdb_sprint_host_address, type_sprint
-#: ada-lang.c:11541
+#: ada-lang.c:12006
 msgid "Type @"
 msgstr "Type @"
 
-#: ada-lang.c:11899
+#: ada-lang.c:12366
 msgid "\"set ada\" must be followed by the name of a setting.\n"
 msgstr ""
 
-#: ada-lang.c:11918
+#: ada-lang.c:12428
 msgid "Prefix command for changing Ada-specfic settings"
 msgstr ""
 
-#: ada-lang.c:11922
+#: ada-lang.c:12432
 msgid "Generic command for showing Ada-specific settings."
 msgstr ""
 
-#: ada-lang.c:11926
+#: ada-lang.c:12436
 msgid "Enable or disable an optimization trusting PAD types over XVS types"
 msgstr ""
 
-#: ada-lang.c:11927
+#: ada-lang.c:12437
 msgid ""
 "Show whether an optimization trusting PAD types over XVS types is activated"
 msgstr ""
 
-#: ada-lang.c:11929
+#: ada-lang.c:12439
 msgid ""
 "This is related to the encoding used by the GNAT compiler.  The debugger\n"
 "should normally trust the contents of PAD types, but certain older versions\n"
@@ -674,6 +685,18 @@
 "this option to \"off\" unless necessary."
 msgstr ""
 
+#: ada-lang.c:12449
+msgid ""
+"Catch Ada exceptions, when raised.\n"
+"With an argument, catch only exceptions with the given name."
+msgstr ""
+
+#: ada-lang.c:12456
+msgid ""
+"Catch failed Ada assertions, when raised.\n"
+"With an argument, catch only exceptions with the given name."
+msgstr ""
+
 #: ada-lex.l:129 ada-lex.l:133
 msgid "Based real literals not implemented yet."
 msgstr "Les expressions de réels ne sont pas encore implémentés."
@@ -687,153 +710,149 @@
 msgid "Invalid character '%s' in expression."
 msgstr "Caractère invalide '%s' dans l'expression."
 
-#: ada-lex.l:343
+#: ada-lex.l:342
 #, possible-c-format
 msgid "Invalid base: %d."
 msgstr "Base invalide : %d."
 
-#: ada-lex.l:354 ada-lex.l:361
+#: ada-lex.l:353 ada-lex.l:360
 msgid "Integer literal out of range"
 msgstr "Expression entière hors de l'interval"
 
-#: ada-lex.l:356
+#: ada-lex.l:355
 #, possible-c-format
 msgid "Invalid digit `%c' in based literal"
 msgstr ""
 
-#: ada-lex.l:602
+#: ada-lex.l:601
 #, possible-c-format
 msgid "ambiguous attribute name: `%s'"
 msgstr "Nom attribué ambigü : '%s'"
 
-#: ada-lex.l:605
+#: ada-lex.l:604
 #, possible-c-format
 msgid "unrecognized attribute: `%s'"
 msgstr "attribut inconnu : '%s'"
 
-#: ada-tasks.c:59 ada-tasks.c:81
+#: ada-tasks.c:66 ada-tasks.c:88
 msgid "Unactivated"
 msgstr ""
 
-#: ada-tasks.c:60 ada-tasks.c:82
+#: ada-tasks.c:67 ada-tasks.c:89
 msgid "Runnable"
 msgstr ""
 
-#: ada-tasks.c:61 ada-tasks.c:83
+#: ada-tasks.c:68 ada-tasks.c:90
 msgid "Terminated"
 msgstr ""
 
-#: ada-tasks.c:62
+#: ada-tasks.c:69
 msgid "Child Activation Wait"
 msgstr ""
 
-#: ada-tasks.c:63
+#: ada-tasks.c:70
 msgid "Accept or Select Term"
 msgstr ""
 
-#: ada-tasks.c:64 ada-tasks.c:86
+#: ada-tasks.c:71 ada-tasks.c:93
 msgid "Waiting on entry call"
 msgstr ""
 
-#: ada-tasks.c:65
+#: ada-tasks.c:72
 msgid "Async Select Wait"
 msgstr ""
 
-#: ada-tasks.c:66 ada-tasks.c:88
+#: ada-tasks.c:73 ada-tasks.c:95
 msgid "Delay Sleep"
 msgstr ""
 
-#: ada-tasks.c:67
+#: ada-tasks.c:74
 msgid "Child Termination Wait"
 msgstr ""
 
-#: ada-tasks.c:68
+#: ada-tasks.c:75
 msgid "Wait Child in Term Alt"
 msgstr ""
 
-#: ada-tasks.c:73 ada-tasks.c:95
+#: ada-tasks.c:80 ada-tasks.c:102
 msgid "Asynchronous Hold"
 msgstr ""
 
-#: ada-tasks.c:75 ada-tasks.c:97
+#: ada-tasks.c:82 ada-tasks.c:104
 msgid "Activating"
 msgstr ""
 
-#: ada-tasks.c:76
+#: ada-tasks.c:83
 msgid "Selective Wait"
 msgstr ""
 
-#: ada-tasks.c:84
+#: ada-tasks.c:91
 msgid "Waiting for child activation"
 msgstr ""
 
-#: ada-tasks.c:85
+#: ada-tasks.c:92
 msgid "Blocked in accept or select with terminate"
 msgstr ""
 
-#: ada-tasks.c:87
+#: ada-tasks.c:94
 msgid "Asynchronous Selective Wait"
 msgstr ""
 
-#: ada-tasks.c:89
+#: ada-tasks.c:96
 msgid "Waiting for children termination"
 msgstr ""
 
-#: ada-tasks.c:90
+#: ada-tasks.c:97
 msgid "Waiting for children in terminate alternative"
 msgstr ""
 
-#: ada-tasks.c:98
+#: ada-tasks.c:105
 msgid "Blocked in selective wait statement"
 msgstr ""
 
-#: ada-tasks.c:279
+#: ada-tasks.c:414
 msgid "Unknown task name format. Aborting"
 msgstr ""
 
-#: ada-tasks.c:404
+#: ada-tasks.c:488
 msgid "Cannot find Ada_Task_Control_Block type. Aborting"
 msgstr ""
 
-#: ada-tasks.c:417
+#: ada-tasks.c:501
 msgid "Cannot find Common_ATCB type. Aborting"
 msgstr ""
 
-#: ada-tasks.c:419
+#: ada-tasks.c:503
 msgid "Cannot find Private_Data type. Aborting"
 msgstr ""
 
-#: ada-tasks.c:421
+#: ada-tasks.c:505
 msgid "Cannot find Entry_Call_Record type. Aborting"
 msgstr ""
 
-#: ada-tasks.c:695
+#: ada-tasks.c:942
 msgid "Cannot inspect Ada tasks when program is not running"
 msgstr ""
 
-#: ada-tasks.c:703
+#: ada-tasks.c:970 ada-tasks.c:1120 ada-tasks.c:1284
 msgid "Your application does not use any Ada tasks.\n"
 msgstr ""
 
-#: ada-tasks.c:745
+#: ada-tasks.c:1081
 #, possible-c-format
-msgid " Accepting RV with %-4d"
+msgid "Accepting RV with %-4d"
 msgstr ""
 
-#: ada-tasks.c:748
+#: ada-tasks.c:1087
 #, possible-c-format
-msgid " Waiting on RV with %-3d"
+msgid "Waiting on RV with %-3d"
 msgstr ""
 
-#: ada-tasks.c:757
-msgid " <no name>\n"
+#: ada-tasks.c:1097
+msgid "<no name>"
 msgstr ""
 
-#: ada-tasks.c:769
-msgid "  ID       TID P-ID Pri State                  Name\n"
-msgstr ""
-
-#: ada-tasks.c:785 ada-tasks.c:898
+#: ada-tasks.c:1125 ada-tasks.c:1236
 #, possible-c-format
 msgid ""
 "Task ID %d not known.  Use the \"info tasks\" command to\n"
@@ -841,98 +860,98 @@
 msgstr ""
 
 #. Print the Ada task ID.
-#: ada-tasks.c:790
+#: ada-tasks.c:1130
 #, possible-c-format
 msgid "Ada Task: %s\n"
 msgstr ""
 
-#: ada-tasks.c:795
+#: ada-tasks.c:1135
 #, possible-c-format
 msgid "Name: %s\n"
 msgstr ""
 
-#: ada-tasks.c:797
+#: ada-tasks.c:1137
 msgid "<no name>\n"
 msgstr ""
 
 #. Print the TID and LWP.
-#: ada-tasks.c:800
+#: ada-tasks.c:1140
 #, possible-c-format
 msgid "Thread: %#lx\n"
 msgstr ""
 
-#: ada-tasks.c:801
+#: ada-tasks.c:1141
 #, possible-c-format
 msgid "LWP: %#lx\n"
 msgstr ""
 
-#: ada-tasks.c:811
+#: ada-tasks.c:1151
 #, possible-c-format
 msgid "Parent: %d"
 msgstr ""
 
-#: ada-tasks.c:817
+#: ada-tasks.c:1157
 msgid "No parent\n"
 msgstr ""
 
 #. Print the base priority.
-#: ada-tasks.c:820
+#: ada-tasks.c:1160
 #, possible-c-format
 msgid "Base Priority: %d\n"
 msgstr ""
 
-#: ada-tasks.c:829
+#: ada-tasks.c:1169
 #, possible-c-format
 msgid "State: Accepting rendezvous with %d"
 msgstr ""
 
-#: ada-tasks.c:835
+#: ada-tasks.c:1175
 #, possible-c-format
 msgid "State: Waiting on task %d's entry"
 msgstr ""
 
-#: ada-tasks.c:839
+#: ada-tasks.c:1179
 #, possible-c-format
 msgid "State: %s"
 msgstr ""
 
-#: ada-tasks.c:883
+#: ada-tasks.c:1220
 msgid "[Current task is unknown]\n"
 msgstr ""
 
-#: ada-tasks.c:885
+#: ada-tasks.c:1222
 #, possible-c-format
 msgid "[Current task is %d]\n"
 msgstr ""
 
-#: ada-tasks.c:903
+#: ada-tasks.c:1241
 #, possible-c-format
 msgid "Cannot switch to task %d: Task is no longer running"
 msgstr ""
 
-#: ada-tasks.c:923
+#: ada-tasks.c:1261
 #, possible-c-format
 msgid ""
 "Unable to compute thread ID for task %d.\n"
 "Cannot switch to this task."
 msgstr ""
 
-#: ada-tasks.c:929
+#: ada-tasks.c:1267
 #, possible-c-format
 msgid "[Switching to task %d]\n"
 msgstr ""
 
-#: ada-tasks.c:961
+#: ada-tasks.c:1303
 msgid ""
 "Task switching not supported when debugging from core files\n"
 "(use thread support instead)"
 msgstr ""
 
-#: ada-tasks.c:1013
+#: ada-tasks.c:1401
 msgid "Provide information about all known Ada tasks"
 msgstr ""
 
-#: ada-tasks.c:1015
+#: ada-tasks.c:1403
 msgid ""
 "Use this command to switch between Ada tasks.\n"
 "Without argument, this command simply prints the current task ID"
@@ -942,38 +961,38 @@
 msgid "<undecipherable array type>"
 msgstr ""
 
-#: ada-typeprint.c:651
+#: ada-typeprint.c:655
 msgid " <incomplete type> end record"
 msgstr " <type incomplet> fin d'enregistrement"
 
-#: ada-typeprint.c:821
+#: ada-typeprint.c:816
 #, possible-c-format
 msgid "<%d-byte integer>"
 msgstr "<integer %d-byte >"
 
-#: ada-typeprint.c:843
+#: ada-typeprint.c:838
 #, possible-c-format
 msgid "<%d-byte float>"
 msgstr "<float %d-byte>"
 
-#: ada-typeprint.c:856
+#: ada-typeprint.c:851
 msgid "array (?) of ? (<mal-formed descriptor>)"
 msgstr ""
 
-#: ada-valprint.c:218 ada-valprint.c:524 c-lang.c:522
+#: ada-valprint.c:217 ada-valprint.c:523 valprint.c:1808
 #, possible-c-format
 msgid " <repeats %u times>"
 msgstr " <se répète %u fois>"
 
-#: ada-valprint.c:452
+#: ada-valprint.c:451
 msgid "internal error: unhandled type in ada_print_scalar"
 msgstr "erreur interne : type non géré dans ada_print_scalar"
 
-#: ada-valprint.c:456 typeprint.c:270
+#: ada-valprint.c:455 typeprint.c:269
 msgid "Invalid type code in symbol table."
 msgstr "Type de code invalide dans la table de symbole."
 
-#: ada-valprint.c:1123
+#: ada-valprint.c:1132
 msgid "<optimized out or zero length>"
 msgstr "<sortie optimisée ou longueur nulle>"
 
@@ -1020,7 +1039,7 @@
 msgstr "fini"
 
 #. i18n: Like "Thread-Id %d, [state] unknown"
-#: aix-thread.c:563 python/py-auto-load.c:431
+#: aix-thread.c:563
 msgid "unknown"
 msgstr "inconnue"
 
@@ -1092,44 +1111,85 @@
 msgid "Enables debugging output (used to debug GDB)."
 msgstr "Activer la sortie de débogage (utilisé pour déboguer GDB)"
 
+#: alphabsd-nat.c:96 alphabsd-nat.c:128 amd64bsd-nat.c:53 amd64bsd-nat.c:87
+#: amd64-linux-nat.c:165 amd64-linux-nat.c:220 hppabsd-nat.c:134
+#: hppabsd-nat.c:164 hppanbsd-nat.c:172 hppanbsd-nat.c:202 i386bsd-nat.c:141
+#: i386bsd-nat.c:192 i386-linux-nat.c:266 i386-linux-nat.c:281
+#: m32r-linux-nat.c:115 m32r-linux-nat.c:164 m68kbsd-nat.c:121
+#: m68kbsd-nat.c:151 m68klinux-nat.c:263 m68klinux-nat.c:278 m88kbsd-nat.c:73
+#: m88kbsd-nat.c:89 mips64obsd-nat.c:87 mips64obsd-nat.c:103
+#: mips-linux-nat.c:235 mips-linux-nat.c:292 mipsnbsd-nat.c:53
+#: mipsnbsd-nat.c:84 ppcnbsd-nat.c:92 ppcnbsd-nat.c:123 ppcobsd-nat.c:82
+#: ppcobsd-nat.c:118 s390-nat.c:247 s390-nat.c:264 shnbsd-nat.c:54
+#: shnbsd-nat.c:75 sparc-nat.c:172 sparc-nat.c:208 vaxbsd-nat.c:73
+#: vaxbsd-nat.c:89 xtensa-linux-nat.c:194 xtensa-linux-nat.c:213
+msgid "Couldn't get registers"
+msgstr "Ne peux pas donner le registre"
+
+#: alphabsd-nat.c:110 alphabsd-nat.c:147 amd64bsd-nat.c:66 amd64bsd-nat.c:105
+#: amd64-linux-nat.c:192 amd64-linux-nat.c:255 hppabsd-nat.c:145
+#: hppabsd-nat.c:179 hppanbsd-nat.c:183 hppanbsd-nat.c:217 i386bsd-nat.c:165
+#: i386bsd-nat.c:172 i386bsd-nat.c:228 i386-linux-nat.c:330
+#: i386-linux-nat.c:344 m68kbsd-nat.c:132 m68kbsd-nat.c:166
+#: m68klinux-nat.c:360 m68klinux-nat.c:374 mipsnbsd-nat.c:67
+#: mipsnbsd-nat.c:103 ppcobsd-nat.c:99 ppcobsd-nat.c:139 s390-nat.c:284
+#: s390-nat.c:301 sparc-nat.c:184
+msgid "Couldn't get floating point status"
+msgstr ""
+
+#: alphabsd-nat.c:134 amd64bsd-nat.c:93 amd64-linux-nat.c:225
+#: hppabsd-nat.c:170 hppanbsd-nat.c:208 i386bsd-nat.c:198 i386-linux-nat.c:286
+#: m32r-linux-nat.c:169 m68kbsd-nat.c:157 m68klinux-nat.c:283 m88kbsd-nat.c:95
+#: mips64obsd-nat.c:109 mipsnbsd-nat.c:90 ppcnbsd-nat.c:130 ppcobsd-nat.c:129
+#: s390-nat.c:269 sparc-nat.c:213 vaxbsd-nat.c:95 xtensa-linux-nat.c:221
+msgid "Couldn't write registers"
+msgstr ""
+
+#: alphabsd-nat.c:153 amd64bsd-nat.c:111 amd64-linux-nat.c:260
+#: hppabsd-nat.c:185 hppanbsd-nat.c:223 i386bsd-nat.c:234 i386-linux-nat.c:349
+#: m68kbsd-nat.c:172 m68klinux-nat.c:379 mipsnbsd-nat.c:109 ppcobsd-nat.c:146
+#: s390-nat.c:306
+msgid "Couldn't write floating point status"
+msgstr ""
+
 #: alpha-nat.c:132
 #, possible-c-format
 msgid "Register %s not found in core file."
 msgstr "Registre %s Non trouvé dans le fichier core."
 
-#: alpha-tdep.c:262
+#: alpha-tdep.c:261
 msgid "Cannot retrieve value from floating point register"
 msgstr ""
 
-#: alpha-tdep.c:277
+#: alpha-tdep.c:276
 msgid "Cannot store value in floating point register"
 msgstr ""
 
-#: alpha-tdep.c:504 alpha-tdep.c:528 alpha-tdep.c:574 alpha-tdep.c:599
+#: alpha-tdep.c:503 alpha-tdep.c:527 alpha-tdep.c:573 alpha-tdep.c:598
 msgid "unknown floating point width"
 msgstr "largeur de virgule flottante inconnue"
 
 #. FIXME: 128-bit long doubles are returned like structures:
 #. by writing into indirect storage provided by the caller
 #. as the first argument.
-#: alpha-tdep.c:570 alpha-tdep.c:595
+#: alpha-tdep.c:569 alpha-tdep.c:594
 msgid "Cannot set a 128-bit long double return value."
 msgstr ""
 
-#: alpha-tdep.c:1013
+#: alpha-tdep.c:1100
 #, possible-c-format
 msgid ""
 "Hit beginning of text section without finding enclosing function for address "
 "%s"
 msgstr ""
 
-#: alpha-tdep.c:1016
+#: alpha-tdep.c:1103
 #, possible-c-format
 msgid ""
 "Hit heuristic-fence-post without finding enclosing function for address %s"
 msgstr ""
 
-#: alpha-tdep.c:1021
+#: alpha-tdep.c:1108
 msgid ""
 "This warning occurs if you are debugging a function without any symbols\n"
 "(for example, in a stripped executable).  In that case, you may wish to\n"
@@ -1140,163 +1200,122 @@
 "(more likely) you have encountered a bug in GDB.\n"
 msgstr ""
 
-#: alpha-tdep.c:1793 mips-tdep.c:6552
+#: alpha-tdep.c:1883 mips-tdep.c:6523
 msgid "Set the distance searched for the start of a function."
 msgstr "Regler le rayon de recherche de début d'une fonction"
 
-#: alpha-tdep.c:1794 mips-tdep.c:6553
+#: alpha-tdep.c:1884 mips-tdep.c:6524
 msgid "Show the distance searched for the start of a function."
 msgstr "Afficher le rayon de recherche de début d'une fonction"
 
-#: alpha-tdep.c:1795 mips-tdep.c:6554
+#: alpha-tdep.c:1885 mips-tdep.c:6525
 msgid ""
 "If you are debugging a stripped executable, GDB needs to search through the\n"
 "program for the start of a function.  This command sets the distance of the\n"
 "search.  The only need to set it is when debugging a stripped executable."
 msgstr ""
 
-#: alphabsd-nat.c:97 alphabsd-nat.c:129 amd64-linux-nat.c:166
-#: amd64-linux-nat.c:221 amd64bsd-nat.c:54 amd64bsd-nat.c:88 hppabsd-nat.c:135
-#: hppabsd-nat.c:165 hppanbsd-nat.c:172 hppanbsd-nat.c:202
-#: i386-linux-nat.c:267 i386-linux-nat.c:282 i386bsd-nat.c:142
-#: i386bsd-nat.c:193 m32r-linux-nat.c:116 m32r-linux-nat.c:165
-#: m68kbsd-nat.c:122 m68kbsd-nat.c:152 m68klinux-nat.c:264 m68klinux-nat.c:279
-#: m88kbsd-nat.c:74 m88kbsd-nat.c:90 mips-linux-nat.c:236 mips-linux-nat.c:293
-#: mips64obsd-nat.c:88 mips64obsd-nat.c:104 mipsnbsd-nat.c:53
-#: mipsnbsd-nat.c:84 ppcnbsd-nat.c:93 ppcnbsd-nat.c:124 ppcobsd-nat.c:83
-#: ppcobsd-nat.c:119 s390-nat.c:148 s390-nat.c:165 shnbsd-nat.c:55
-#: shnbsd-nat.c:76 sparc-nat.c:171 sparc-nat.c:207 vaxbsd-nat.c:74
-#: vaxbsd-nat.c:90 xtensa-linux-nat.c:194 xtensa-linux-nat.c:213
-msgid "Couldn't get registers"
-msgstr "Ne peux pas donner le registre"
-
-#: alphabsd-nat.c:111 alphabsd-nat.c:148 amd64-linux-nat.c:193
-#: amd64-linux-nat.c:256 amd64bsd-nat.c:67 amd64bsd-nat.c:106
-#: hppabsd-nat.c:146 hppabsd-nat.c:180 hppanbsd-nat.c:183 hppanbsd-nat.c:217
-#: i386-linux-nat.c:331 i386-linux-nat.c:345 i386bsd-nat.c:166
-#: i386bsd-nat.c:173 i386bsd-nat.c:229 m68kbsd-nat.c:133 m68kbsd-nat.c:167
-#: m68klinux-nat.c:361 m68klinux-nat.c:375 mipsnbsd-nat.c:67
-#: mipsnbsd-nat.c:103 ppcobsd-nat.c:100 ppcobsd-nat.c:140 s390-nat.c:185
-#: s390-nat.c:202 sparc-nat.c:183
-msgid "Couldn't get floating point status"
+#: amd64fbsd-nat.c:187
+#, possible-c-format
+msgid ""
+"offsetof (struct sigcontext, sc_rip) yields %d instead of %d.\n"
+"Please report this to <bug-gdb@gnu.org>."
 msgstr ""
+"offsetof (struct sigcontext, sc_rip) a rapporté %d à la place de %d.\n"
+"Merci de signaler cela à <bug-gdb@gnu.org>."
 
-#: alphabsd-nat.c:135 amd64-linux-nat.c:226 amd64bsd-nat.c:94
-#: hppabsd-nat.c:171 hppanbsd-nat.c:208 i386-linux-nat.c:287 i386bsd-nat.c:199
-#: m32r-linux-nat.c:170 m68kbsd-nat.c:158 m68klinux-nat.c:284 m88kbsd-nat.c:96
-#: mips64obsd-nat.c:110 mipsnbsd-nat.c:90 ppcnbsd-nat.c:131 ppcobsd-nat.c:130
-#: s390-nat.c:170 sparc-nat.c:212 vaxbsd-nat.c:96 xtensa-linux-nat.c:221
-msgid "Couldn't write registers"
+#: amd64fbsd-nat.c:200
+#, possible-c-format
+msgid ""
+"offsetof (struct sigcontext, sc_rsp) yields %d instead of %d.\n"
+"Please report this to <bug-gdb@gnu.org>."
 msgstr ""
+"offsetof (struct sigcontext, sc_rsp) a rapporté %d à la place de %d.\n"
+"Merci de signaler cela à <bug-gdb@gnu.org>."
 
-#: alphabsd-nat.c:154 amd64-linux-nat.c:261 amd64bsd-nat.c:112
-#: hppabsd-nat.c:186 hppanbsd-nat.c:223 i386-linux-nat.c:350 i386bsd-nat.c:235
-#: m68kbsd-nat.c:173 m68klinux-nat.c:380 mipsnbsd-nat.c:109 ppcobsd-nat.c:147
-#: s390-nat.c:207
-msgid "Couldn't write floating point status"
+#: amd64fbsd-nat.c:213
+#, possible-c-format
+msgid ""
+"offsetof (struct sigcontext, sc_rbp) yields %d instead of %d.\n"
+"Please report this to <bug-gdb@gnu.org>."
 msgstr ""
+"offsetof (struct sigcontext, sc_rbp) a rapporté %d à la place de %d.\n"
+"Merci de signaler cela à <bug-gdb@gnu.org>."
 
-#: amd64-linux-nat.c:186 amd64-linux-nat.c:245
+#: amd64-linux-nat.c:185 amd64-linux-nat.c:244
 msgid "Couldn't get extended state status"
 msgstr ""
 
-#: amd64-linux-nat.c:251 i386-linux-nat.c:416
+#: amd64-linux-nat.c:250 i386-linux-nat.c:415
 msgid "Couldn't write extended state status"
 msgstr ""
 
-#: amd64-linux-nat.c:290 i386-linux-nat.c:678
+#: amd64-linux-nat.c:283 i386-linux-nat.c:671
 msgid "Couldn't read debug register"
 msgstr "Impossible de lire le registre de débogage"
 
-#: amd64-linux-nat.c:313 i386-linux-nat.c:701 mips-linux-nat.c:881
-#: mips-linux-nat.c:899
+#: amd64-linux-nat.c:303 i386-linux-nat.c:691 mips-linux-nat.c:879
+#: mips-linux-nat.c:897
 msgid "Couldn't write debug register"
 msgstr ""
 
-#: amd64-linux-nat.c:733
+#: amd64-linux-nat.c:720
 msgid "Couldn't get CS register"
 msgstr ""
 
-#: amd64-linux-tdep.c:1202 i386-linux-tdep.c:434
+#: amd64-linux-tdep.c:1201 i386-linux-tdep.c:433
 #, possible-c-format
 msgid "Process record and replay target doesn't support syscall number %s\n"
 msgstr ""
 
-#: amd64-tdep.c:188 avr-tdep.c:1344 cris-tdep.c:1852 s390-tdep.c:159
+#: amd64-tdep.c:190 avr-tdep.c:1343 cris-tdep.c:1851 s390-tdep.c:193
 #, possible-c-format
 msgid "Unmapped DWARF Register #%d encountered."
 msgstr ""
 
 #. We shouldn't get here.
-#: amd64-tdep.c:1091
+#: amd64-tdep.c:1107
 msgid "unable to find free reg"
 msgstr ""
 
-#: amd64fbsd-nat.c:188
-#, possible-c-format
-msgid ""
-"offsetof (struct sigcontext, sc_rip) yields %d instead of %d.\n"
-"Please report this to <bug-gdb@gnu.org>."
-msgstr ""
-"offsetof (struct sigcontext, sc_rip) a rapporté %d à la place de %d.\n"
-"Merci de signaler cela à <bug-gdb@gnu.org>."
-
-#: amd64fbsd-nat.c:201
-#, possible-c-format
-msgid ""
-"offsetof (struct sigcontext, sc_rsp) yields %d instead of %d.\n"
-"Please report this to <bug-gdb@gnu.org>."
-msgstr ""
-"offsetof (struct sigcontext, sc_rsp) a rapporté %d à la place de %d.\n"
-"Merci de signaler cela à <bug-gdb@gnu.org>."
-
-#: amd64fbsd-nat.c:214
-#, possible-c-format
-msgid ""
-"offsetof (struct sigcontext, sc_rbp) yields %d instead of %d.\n"
-"Please report this to <bug-gdb@gnu.org>."
-msgstr ""
-"offsetof (struct sigcontext, sc_rbp) a rapporté %d à la place de %d.\n"
-"Merci de signaler cela à <bug-gdb@gnu.org>."
-
-#: arch-utils.c:215 m32c-tdep.c:2599 m32c-tdep.c:2620
+#: arch-utils.c:214 m32c-tdep.c:2598 m32c-tdep.c:2619
 msgid "No virtual frame pointer available"
 msgstr ""
 
-#: arch-utils.c:278
+#: arch-utils.c:277
 msgid "The target endianness is set automatically (currently big endian)\n"
 msgstr ""
 
-#: arch-utils.c:281
+#: arch-utils.c:280
 msgid ""
 "The target endianness is set automatically (currently little endian)\n"
 msgstr ""
 
-#: arch-utils.c:286
+#: arch-utils.c:285
 msgid "The target is assumed to be big endian\n"
 msgstr ""
 
-#: arch-utils.c:289
+#: arch-utils.c:288
 msgid "The target is assumed to be little endian\n"
 msgstr ""
 
-#: arch-utils.c:304
+#: arch-utils.c:303
 msgid "set_endian: architecture update failed"
 msgstr "set_endian : échec de mise à jour de l'architecture"
 
-#: arch-utils.c:310
+#: arch-utils.c:309
 msgid "Little endian target not supported by GDB\n"
 msgstr ""
 
-#: arch-utils.c:318
+#: arch-utils.c:317
 msgid "Big endian target not supported by GDB\n"
 msgstr ""
 
-#: arch-utils.c:324
+#: arch-utils.c:323
 msgid "set_endian: bad value"
 msgstr ""
 
-#: arch-utils.c:383
+#: arch-utils.c:382
 #, possible-c-format
 msgid ""
 "Selected architecture %s is not compatible with reported target architecture "
@@ -1307,7 +1326,7 @@
 
 #. We have no idea which one is better.  This is a bug, but not
 #. a critical problem; warn the user.
-#: arch-utils.c:407
+#: arch-utils.c:406
 #, possible-c-format
 msgid ""
 "Selected architecture %s is ambiguous with reported target architecture %s"
@@ -1315,267 +1334,322 @@
 "L'architecture %s sélectionnée est ambigu avec l'architecture cible %s "
 "signalée"
 
-#: arch-utils.c:438
+#: arch-utils.c:437
 #, possible-c-format
 msgid "The target architecture is set automatically (currently %s)\n"
 msgstr ""
 "L'architecture cible est mise en place automatiquement (actuellement %s)\n"
 
-#: arch-utils.c:442
+#: arch-utils.c:441
 #, possible-c-format
 msgid "The target architecture is assumed to be %s\n"
 msgstr "L'architecture cible est supposée être %s\n"
 
-#: arch-utils.c:462
+#: arch-utils.c:461
 msgid "could not select an architecture automatically"
 msgstr "ne peut sélectionner une architecture automatiquement"
 
-#: arch-utils.c:469
+#: arch-utils.c:468
 msgid "set_architecture: bfd_scan_arch failed"
 msgstr "set_architecture: bfd_scan_arch a échoué"
 
-#: arch-utils.c:473
+#: arch-utils.c:472
 #, possible-c-format
 msgid "Architecture `%s' not recognized.\n"
 msgstr "Architecture `%s' non reconnue.\n"
 
-#: arch-utils.c:558
+#: arch-utils.c:557
 msgid "Architecture of file not recognized."
 msgstr "L'architecture  du fichier est non reconnu."
 
-#: arch-utils.c:605
+#: arch-utils.c:604
 msgid "initialize_current_architecture: No arch"
 msgstr "initialize_current_architecture : Pas d'arch"
 
-#: arch-utils.c:609
+#: arch-utils.c:608
 msgid "initialize_current_architecture: Arch not found"
 msgstr "initialize_current_architecture : Arch introuvable"
 
-#: arch-utils.c:652
+#: arch-utils.c:651
 msgid ""
 "initialize_current_architecture: Selection of initial architecture failed"
 msgstr ""
 "initialize_current_architecture : Echec de sélection de l'architecture "
 "initiale"
 
-#: arch-utils.c:666
+#: arch-utils.c:665
 msgid "Set architecture of target."
 msgstr "Définit l'architecture de la cible."
 
-#: arch-utils.c:667
+#: arch-utils.c:666
 msgid "Show architecture of target."
 msgstr "Montre l'architecture de la cible."
 
-#: arch-utils.c:799
+#: arch-utils.c:793
+msgid "This architecture has no method to collect a return address."
+msgstr ""
+
+#: arch-utils.c:806
 msgid "Set endianness of target."
 msgstr ""
 
-#: arch-utils.c:800
+#: arch-utils.c:807
 msgid "Show endianness of target."
 msgstr ""
 
-#: arm-linux-nat.c:108
+#: arm-linux-nat.c:107
 msgid "Unable to fetch floating point register."
 msgstr ""
 
-#: arm-linux-nat.c:138 arm-linux-nat.c:167 arm-linux-nat.c:204
+#: arm-linux-nat.c:137 arm-linux-nat.c:166 arm-linux-nat.c:203
 msgid "Unable to fetch the floating point registers."
 msgstr ""
 
-#: arm-linux-nat.c:183
+#: arm-linux-nat.c:182
 msgid "Unable to store floating point register."
 msgstr ""
 
-#: arm-linux-nat.c:220
+#: arm-linux-nat.c:219
 msgid "Unable to store floating point registers."
 msgstr ""
 
-#: arm-linux-nat.c:240
+#: arm-linux-nat.c:239
 msgid "Unable to fetch general register."
 msgstr ""
 
-#: arm-linux-nat.c:282 arm-linux-nat.c:321 arm-linux-nat.c:355
+#: arm-linux-nat.c:281 arm-linux-nat.c:320 arm-linux-nat.c:354
 msgid "Unable to fetch general registers."
 msgstr ""
 
-#: arm-linux-nat.c:337
+#: arm-linux-nat.c:336
 msgid "Unable to store general register."
 msgstr ""
 
-#: arm-linux-nat.c:373
+#: arm-linux-nat.c:372
 msgid "Unable to store general registers."
 msgstr ""
 
-#: arm-linux-nat.c:395 arm-linux-nat.c:424
+#: arm-linux-nat.c:394 arm-linux-nat.c:423
 msgid "Unable to fetch WMMX registers."
 msgstr ""
 
-#: arm-linux-nat.c:450
+#: arm-linux-nat.c:449
 msgid "Unable to store WMMX registers."
 msgstr ""
 
-#: arm-linux-nat.c:472
+#: arm-linux-nat.c:471
 msgid "Unable to fetch VFP registers."
 msgstr ""
 
-#: arm-linux-nat.c:496
+#: arm-linux-nat.c:495
 msgid "Unable to fetch VFP registers (for update)."
 msgstr ""
 
-#: arm-linux-nat.c:511
+#: arm-linux-nat.c:510
 msgid "Unable to store VFP registers."
 msgstr ""
 
-#: arm-linux-nat.c:980
+#: arm-linux-nat.c:979
 msgid "Unexpected error setting breakpoint address"
 msgstr ""
 
-#: arm-linux-nat.c:983
+#: arm-linux-nat.c:982
 msgid "Unexpected error setting breakpoint"
 msgstr ""
 
-#: arm-linux-nat.c:1025
+#: arm-linux-nat.c:1024
 msgid "Unexpected error clearing breakpoint"
 msgstr ""
 
-#: arm-linux-tdep.c:1109
+#: arm-linux-tdep.c:1103
 msgid "arm_linux_init_abi: Floating point model not supported"
 msgstr ""
 
+#: armnbsd-nat.c:88
+msgid "unable to fetch general register"
+msgstr ""
+
+#: armnbsd-nat.c:141 armnbsd-nat.c:189 armnbsd-nat.c:227
+msgid "unable to fetch general registers"
+msgstr ""
+
+#: armnbsd-nat.c:159
+msgid "unable to fetch floating-point register"
+msgstr ""
+
+#: armnbsd-nat.c:289 armnbsd-nat.c:372
+#, possible-c-format
+msgid "unable to write register %d to inferior"
+msgstr ""
+
+#: armnbsd-nat.c:337
+msgid "unable to store general registers"
+msgstr ""
+
+#: armnbsd-nat.c:351
+msgid "unable to fetch floating-point registers"
+msgstr ""
+
+#: armnbsd-nat.c:394
+msgid "unable to store floating-point registers"
+msgstr ""
+
+#: armnbsd-nat.c:446
+msgid "wrong size of register set in core file"
+msgstr ""
+
+#: armnbsd-nat.c:458
+msgid "wrong size of FPA register set in core file"
+msgstr ""
+
+#: armnbsd-tdep.c:64 arm-tdep.c:10079
+msgid "arm_gdbarch_init: bad byte order for float format"
+msgstr "arm_gdbarch_init : ordre de byte incorrect pour le format float"
+
 #. multiply
-#: arm-tdep.c:1579 arm-tdep.c:4623 arm-tdep.c:4644 arm-tdep.c:4759
+#: arm-tdep.c:1574 arm-tdep.c:4608 arm-tdep.c:4629 arm-tdep.c:4744
 msgid "Invalid update to pc in instruction"
 msgstr ""
 
-#: arm-tdep.c:1649
+#: arm-tdep.c:1644
 msgid "bad value in switch"
 msgstr ""
 
-#: arm-tdep.c:3017
+#: arm-tdep.c:3007
 #, possible-c-format
 msgid "Unexpected register %d"
 msgstr ""
 
 #. Should never happen.
-#: arm-tdep.c:3284
+#: arm-tdep.c:3274
 msgid "unknown type alignment"
 msgstr "type d'alignement inconnu"
 
-#: arm-tdep.c:3345 arm-tdep.c:3367
+#: arm-tdep.c:3335 arm-tdep.c:3357
 #, possible-c-format
 msgid "Invalid VFP CPRC type: %d."
 msgstr ""
 
-#: arm-tdep.c:3801
+#: arm-tdep.c:3791
 #, c-format
 msgid "Hardware FPU type %d\n"
 msgstr "Hardware FPU type %d\n"
 
-#: arm-tdep.c:3803
+#: arm-tdep.c:3793
 #, c-format
 msgid "Software FPU type %d\n"
 msgstr "Software FPU type %d\n"
 
 #. i18n: [floating point unit] mask
-#: arm-tdep.c:3805
+#: arm-tdep.c:3795
 msgid "mask: "
 msgstr "masque : "
 
 #. i18n: [floating point unit] flags
-#: arm-tdep.c:3808
+#: arm-tdep.c:3798
 msgid "flags: "
 msgstr ""
 
-#: arm-tdep.c:4037
+#: arm-tdep.c:4027
 #, possible-c-format
 msgid "Bad REGNUM %d"
 msgstr "Mauvais REGNUM %d"
 
-#: arm-tdep.c:4844
+#: arm-tdep.c:4828
 msgid "Bad bit-field extraction\n"
 msgstr ""
 
-#: arm-tdep.c:4865 arm-tdep.c:4871
+#: arm-tdep.c:4849 arm-tdep.c:4855
 msgid "Infinite loop detected"
 msgstr "Boucle infinie détectée"
 
 #. Unpredictable behaviour.  Try to do something sensible (switch to ARM
 #. mode, align dest to 4 bytes).
-#: arm-tdep.c:5440
+#: arm-tdep.c:5425
 msgid "Single-stepping BX to non-word-aligned ARM instruction."
 msgstr ""
 
-#: arm-tdep.c:5502
+#: arm-tdep.c:5487
 msgid "Instruction wrote to PC in an unexpected way when single-stepping"
 msgstr ""
 
-#: arm-tdep.c:5508
+#: arm-tdep.c:5493
 msgid "Invalid argument to displaced_write_reg"
 msgstr ""
 
-#: arm-tdep.c:6099
+#: arm-tdep.c:6454
 msgid "copy_extra_ld_st: instruction decode error"
 msgstr ""
 
-#: arm-tdep.c:6292
+#: arm-tdep.c:6768
 msgid "Cannot single-step exception return"
 msgstr ""
 
-#: arm-tdep.c:6412
+#: arm-tdep.c:6888
 #, possible-c-format
 msgid "displaced: LDM: move loaded register r%d to r%d\n"
 msgstr ""
 
-#: arm-tdep.c:6417
+#: arm-tdep.c:6893
 #, possible-c-format
 msgid "displaced: LDM: register r%d already in the right place\n"
 msgstr ""
 
-#: arm-tdep.c:6437
+#: arm-tdep.c:6913
 #, possible-c-format
 msgid "displaced: LDM: restored clobbered register r%d\n"
 msgstr ""
 
-#: arm-tdep.c:6479
+#: arm-tdep.c:6956 arm-tdep.c:7067
 msgid "displaced: Unpredictable LDM or STM with base register r15"
 msgstr ""
 
-#: arm-tdep.c:6548
+#: arm-tdep.c:7025 arm-tdep.c:7111
 #, possible-c-format
 msgid ""
 "displaced: LDM r%d%s, {..., pc}: original reg list %.4x, modified list %.4x\n"
 msgstr ""
 
-#: arm-tdep.c:7076
-msgid "Displaced stepping is only supported in ARM mode"
+#: arm-tdep.c:8070
+#, possible-c-format
+msgid ""
+"displaced: POP {..., pc}: original reg list %.4x, modified list %.4x\n"
+msgstr ""
+
+#: arm-tdep.c:8187
+msgid "thumb_process_displaced_16bit_insn: Instruction decode error"
+msgstr ""
+
+#: arm-tdep.c:8395
+msgid "thumb_process_displaced_32bit_insn: Instruction decode error"
 msgstr ""
 
-#: arm-tdep.c:7134
+#: arm-tdep.c:8479
 msgid "arm_process_displaced_insn: Instruction decode error"
 msgstr ""
 
-#: arm-tdep.c:7411
+#: arm-tdep.c:8756
 msgid "arm_extract_return_value: Floating point model not supported"
 msgstr "arm_extract_return_value : Modèle de virgule flottante non supporté"
 
-#: arm-tdep.c:7602
+#: arm-tdep.c:8947
 msgid "arm_store_return_value: Floating point model not supported"
 msgstr "arm_store_return_value : Modèle de virgule flottante non supporté"
 
-#: arm-tdep.c:7825
+#: arm-tdep.c:9176
 msgid "\"set arm\" must be followed by an apporpriate subcommand.\n"
 msgstr "\"set arm\" doit être suivit par une sous-commande appropriée.\n"
 
-#: arm-tdep.c:7849 rs6000-tdep.c:4204 rs6000-tdep.c:4231
+#: arm-tdep.c:9200 rs6000-tdep.c:4202 rs6000-tdep.c:4229
 msgid "could not update architecture"
 msgstr ""
 
-#: arm-tdep.c:7866
+#: arm-tdep.c:9217
 #, possible-c-format
 msgid "Invalid fp model accepted: %s."
 msgstr ""
 
-#: arm-tdep.c:7880
+#: arm-tdep.c:9231
 #, possible-c-format
 msgid ""
 "The current ARM floating point model is \"auto\" (currently \"%s\").\n"
@@ -1583,34 +1657,34 @@
 "Le modèle ARM actuel de virgule flottante est \"auto\" (actuellement "
 "\"%s\").\n"
 
-#: arm-tdep.c:7884
+#: arm-tdep.c:9235
 #, possible-c-format
 msgid "The current ARM floating point model is \"%s\".\n"
 msgstr "Le modèle ARM actuel de virgule flottante est \"%s\".\n"
 
-#: arm-tdep.c:7903
+#: arm-tdep.c:9254
 #, possible-c-format
 msgid "Invalid ABI accepted: %s."
 msgstr "ABI invalide accepté : %s"
 
-#: arm-tdep.c:7917
+#: arm-tdep.c:9268
 #, possible-c-format
 msgid "The current ARM ABI is \"auto\" (currently \"%s\").\n"
 msgstr ""
 
-#: arm-tdep.c:7921
+#: arm-tdep.c:9272
 #, possible-c-format
 msgid "The current ARM ABI is \"%s\".\n"
 msgstr ""
 
-#: arm-tdep.c:7932
+#: arm-tdep.c:9283
 #, possible-c-format
 msgid ""
 "The current execution mode assumed (when symbols are unavailable) is "
 "\"%s\".\n"
 msgstr ""
 
-#: arm-tdep.c:7944
+#: arm-tdep.c:9295
 #, possible-c-format
 msgid ""
 "The current execution mode assumed (even when symbols are available) is "
@@ -1618,61 +1692,57 @@
 msgstr ""
 
 #. Leave it as "auto".
-#: arm-tdep.c:8428
+#: arm-tdep.c:9779
 #, possible-c-format
 msgid "unknown ARM EABI version 0x%x"
 msgstr "ARM EABI version 0x%x inconnue"
 
-#: arm-tdep.c:8728 armnbsd-tdep.c:65
-msgid "arm_gdbarch_init: bad byte order for float format"
-msgstr "arm_gdbarch_init : ordre de byte incorrect pour le format float"
-
-#: arm-tdep.c:8906
+#: arm-tdep.c:10257
 #, possible-c-format
 msgid "arm_dump_tdep: Lowest pc = 0x%lx"
 msgstr ""
 
-#: arm-tdep.c:8953 arm-tdep.c:8957
+#: arm-tdep.c:10304 arm-tdep.c:10308
 msgid "Various ARM-specific commands."
 msgstr ""
 
-#: arm-tdep.c:8988
+#: arm-tdep.c:10339
 msgid "The valid values are:\n"
 msgstr "Les valeurs valides sont :\n"
 
-#: arm-tdep.c:8990
+#: arm-tdep.c:10341
 msgid "The default is \"std\"."
 msgstr ""
 
-#: arm-tdep.c:8996
+#: arm-tdep.c:10347
 msgid "Set the disassembly style."
 msgstr ""
 
-#: arm-tdep.c:8997
+#: arm-tdep.c:10348
 msgid "Show the disassembly style."
 msgstr ""
 
-#: arm-tdep.c:9005
+#: arm-tdep.c:10356
 msgid "Set usage of ARM 32-bit mode."
 msgstr ""
 
-#: arm-tdep.c:9006
+#: arm-tdep.c:10357
 msgid "Show usage of ARM 32-bit mode."
 msgstr ""
 
-#: arm-tdep.c:9007
+#: arm-tdep.c:10358
 msgid "When off, a 26-bit PC will be used."
 msgstr ""
 
-#: arm-tdep.c:9015
+#: arm-tdep.c:10366
 msgid "Set the floating point type."
 msgstr ""
 
-#: arm-tdep.c:9016
+#: arm-tdep.c:10367
 msgid "Show the floating point type."
 msgstr ""
 
-#: arm-tdep.c:9017
+#: arm-tdep.c:10368
 msgid ""
 "auto - Determine the FP typefrom the OS-ABI.\n"
 "softfpa - Software FP, mixed-endian doubles on little-endian ARMs.\n"
@@ -1681,606 +1751,569 @@
 "vfp - VFP co-processor."
 msgstr ""
 
-#: arm-tdep.c:9027
+#: arm-tdep.c:10378
 msgid "Set the ABI."
 msgstr ""
 
-#: arm-tdep.c:9028
+#: arm-tdep.c:10379
 msgid "Show the ABI."
 msgstr ""
 
-#: arm-tdep.c:9036
+#: arm-tdep.c:10387
 msgid "Set the mode assumed when symbols are unavailable."
 msgstr ""
 
-#: arm-tdep.c:9037
+#: arm-tdep.c:10388
 msgid "Show the mode assumed when symbols are unavailable."
 msgstr ""
 
-#: arm-tdep.c:9042
+#: arm-tdep.c:10393
 msgid "Set the mode assumed even when symbols are available."
 msgstr ""
 
-#: arm-tdep.c:9043
+#: arm-tdep.c:10394
 msgid "Show the mode assumed even when symbols are available."
 msgstr ""
 
-#: arm-tdep.c:9049
+#: arm-tdep.c:10400
 msgid "Set ARM debugging."
 msgstr ""
 
-#: arm-tdep.c:9050
+#: arm-tdep.c:10401
 msgid "Show ARM debugging."
 msgstr ""
 
-#: arm-tdep.c:9051
+#: arm-tdep.c:10402
 msgid "When on, arm-specific debugging is enabled."
 msgstr ""
 
-#: armnbsd-nat.c:88
-msgid "unable to fetch general register"
-msgstr ""
-
-#: armnbsd-nat.c:141 armnbsd-nat.c:189 armnbsd-nat.c:227
-msgid "unable to fetch general registers"
-msgstr ""
-
-#: armnbsd-nat.c:159
-msgid "unable to fetch floating-point register"
-msgstr ""
-
-#: armnbsd-nat.c:289 armnbsd-nat.c:372
-#, possible-c-format
-msgid "unable to write register %d to inferior"
-msgstr ""
-
-#: armnbsd-nat.c:337
-msgid "unable to store general registers"
-msgstr ""
-
-#: armnbsd-nat.c:351
-msgid "unable to fetch floating-point registers"
-msgstr ""
-
-#: armnbsd-nat.c:394
-msgid "unable to store floating-point registers"
-msgstr ""
-
-#: armnbsd-nat.c:446
-msgid "wrong size of register set in core file"
-msgstr ""
-
-#: armnbsd-nat.c:458
-msgid "wrong size of FPA register set in core file"
-msgstr ""
-
-#: auxv.c:342
+#: auxv.c:419
 msgid "End of vector"
 msgstr ""
 
-#: auxv.c:343 auxv.c:364
+#: auxv.c:420 auxv.c:441
 msgid "Entry should be ignored"
 msgstr ""
 
-#: auxv.c:344
+#: auxv.c:421
 msgid "File descriptor of program"
 msgstr ""
 
-#: auxv.c:345
+#: auxv.c:422
 msgid "Program headers for program"
 msgstr ""
 
-#: auxv.c:346
+#: auxv.c:423
 msgid "Size of program header entry"
 msgstr ""
 
-#: auxv.c:347
+#: auxv.c:424
 msgid "Number of program headers"
 msgstr ""
 
-#: auxv.c:348
+#: auxv.c:425
 msgid "System page size"
 msgstr ""
 
-#: auxv.c:349
+#: auxv.c:426
 msgid "Base address of interpreter"
 msgstr ""
 
-#: auxv.c:350
+#: auxv.c:427
 msgid "Flags"
 msgstr "Drapeaux"
 
-#: auxv.c:351
+#: auxv.c:428
 msgid "Entry point of program"
 msgstr ""
 
-#: auxv.c:352
+#: auxv.c:429
 msgid "Program is not ELF"
 msgstr ""
 
-#: auxv.c:353 auxv.c:372
+#: auxv.c:430 auxv.c:449
 msgid "Real user ID"
 msgstr ""
 
-#: auxv.c:354 auxv.c:371
+#: auxv.c:431 auxv.c:448
 msgid "Effective user ID"
 msgstr ""
 
-#: auxv.c:355 auxv.c:374
+#: auxv.c:432 auxv.c:451
 msgid "Real group ID"
 msgstr ""
 
-#: auxv.c:356 auxv.c:373
+#: auxv.c:433 auxv.c:450
 msgid "Effective group ID"
 msgstr ""
 
-#: auxv.c:357
+#: auxv.c:434
 msgid "Frequency of times()"
 msgstr ""
 
-#: auxv.c:358
+#: auxv.c:435
 msgid "String identifying platform"
 msgstr ""
 
-#: auxv.c:359 auxv.c:380
+#: auxv.c:436 auxv.c:457
 msgid "Machine-dependent CPU capability hints"
 msgstr ""
 
-#: auxv.c:360
+#: auxv.c:437
 msgid "Used FPU control word"
 msgstr ""
 
-#: auxv.c:361
+#: auxv.c:438
 msgid "Data cache block size"
 msgstr ""
 
-#: auxv.c:362
+#: auxv.c:439
 msgid "Instruction cache block size"
 msgstr ""
 
-#: auxv.c:363
+#: auxv.c:440
 msgid "Unified cache block size"
 msgstr ""
 
-#: auxv.c:365
+#: auxv.c:442
 msgid "String identifying base platform"
 msgstr ""
 
-#: auxv.c:366
+#: auxv.c:443
 msgid "Address of 16 random bytes"
 msgstr ""
 
-#: auxv.c:367
+#: auxv.c:444
 msgid "File name of executable"
 msgstr ""
 
-#: auxv.c:368
+#: auxv.c:445
 msgid "Boolean, was exec setuid-like?"
 msgstr ""
 
-#: auxv.c:369
+#: auxv.c:446
 msgid "Special system info/entry points"
 msgstr ""
 
-#: auxv.c:370
+#: auxv.c:447
 msgid "System-supplied DSO's ELF header"
 msgstr ""
 
-#: auxv.c:375
+#: auxv.c:452
 msgid "Dynamic linker's ELF header"
 msgstr ""
 
-#: auxv.c:376
+#: auxv.c:453
 msgid "Dynamic linker's section headers"
 msgstr ""
 
-#: auxv.c:377
+#: auxv.c:454
 msgid "String giving name of dynamic linker"
 msgstr ""
 
-#: auxv.c:378
+#: auxv.c:455
 msgid "Large pagesize"
 msgstr ""
 
-#: auxv.c:379
+#: auxv.c:456
 msgid "Platform name string"
 msgstr ""
 
-#: auxv.c:381
+#: auxv.c:458
 msgid "Should flush icache?"
 msgstr ""
 
-#: auxv.c:382
+#: auxv.c:459
 msgid "CPU name string"
 msgstr ""
 
-#: auxv.c:383
+#: auxv.c:460
 msgid "COFF entry point address"
 msgstr ""
 
-#: auxv.c:384
+#: auxv.c:461
 msgid "COFF executable file descriptor"
 msgstr ""
 
-#: auxv.c:386
+#: auxv.c:463
 msgid "Canonicalized file name given to execve"
 msgstr ""
 
-#: auxv.c:387
+#: auxv.c:464
 msgid "String for name of MMU module"
 msgstr ""
 
-#: auxv.c:388
+#: auxv.c:465
 msgid "Dynamic linker's data segment address"
 msgstr ""
 
-#: auxv.c:390
+#: auxv.c:467
 msgid "AF_SUN_ flags passed from the kernel"
 msgstr ""
 
-#: auxv.c:430
+#: auxv.c:505
 msgid "The program has no auxiliary information now."
 msgstr ""
 
-#: auxv.c:436
+#: auxv.c:511
 msgid "No auxiliary vector found, or failed reading it."
 msgstr ""
 
-#: auxv.c:438
+#: auxv.c:513
 msgid "Auxiliary vector is empty."
 msgstr ""
 
-#: auxv.c:449
+#: auxv.c:524
 msgid ""
 "Display the inferior's auxiliary vector.\n"
 "This is information provided by the operating system at program startup."
 msgstr ""
 
-#: avr-tdep.c:374 avr-tdep.c:392 i386-tdep.c:276 i386-tdep.c:2624
-#: i386-tdep.c:2714 i386-tdep.c:2783 s390-tdep.c:197 s390-tdep.c:216
-#: s390-tdep.c:279 s390-tdep.c:328 sparc64-tdep.c:320 spu-tdep.c:180
-#: spu-tdep.c:248 spu-tdep.c:309
+#: avr-tdep.c:373 avr-tdep.c:391 i386-tdep.c:277 i386-tdep.c:2790
+#: i386-tdep.c:2894 i386-tdep.c:2977 s390-tdep.c:231 s390-tdep.c:250
+#: s390-tdep.c:313 s390-tdep.c:362 sparc64-tdep.c:339 spu-tdep.c:179
+#: spu-tdep.c:247 spu-tdep.c:308
 msgid "invalid regnum"
 msgstr "regnum invalide"
 
-#: avr-tdep.c:635
+#: avr-tdep.c:634
 #, possible-c-format
 msgid "Num pushes too large: %d\n"
 msgstr ""
 
-#: avr-tdep.c:1486
+#: avr-tdep.c:1485
 msgid "ERR: info io_registers NOT supported by current target\n"
 msgstr ""
 
-#: avr-tdep.c:1494
+#: avr-tdep.c:1493
 msgid "Error fetching number of io registers\n"
 msgstr ""
 
-#: avr-tdep.c:1503
+#: avr-tdep.c:1502
 #, possible-c-format
 msgid ""
 "Target has %u io registers:\n"
 "\n"
 msgstr ""
 
-#: avr-tdep.c:1552
+#: avr-tdep.c:1551
 msgid "query remote avr target for io space register values"
 msgstr ""
 
-#: ax-gdb.c:508
+#: ax-gdb.c:549
 msgid "gen_fetch: strange size"
 msgstr ""
 
-#: ax-gdb.c:520
+#: ax-gdb.c:561
 msgid "gen_fetch: bad type code"
 msgstr ""
 
-#: ax-gdb.c:637
+#: ax-gdb.c:678
 msgid "gen_var_ref: LOC_CONST_BYTES symbols are not supported"
 msgstr ""
 
-#: ax-gdb.c:669
+#: ax-gdb.c:710
 #, possible-c-format
 msgid "Cannot compute value of typedef `%s'."
 msgstr ""
 
-#: ax-gdb.c:701
+#: ax-gdb.c:742
 #, possible-c-format
 msgid "Couldn't resolve symbol `%s'."
 msgstr ""
 
-#: ax-gdb.c:725
+#: ax-gdb.c:766
 #, possible-c-format
 msgid "Cannot find value of botched symbol `%s'."
 msgstr ""
 
-#: ax-gdb.c:761
+#: ax-gdb.c:802
 msgid "Value not scalar: cannot be an rvalue."
 msgstr ""
 
-#: ax-gdb.c:1006
+#: ax-gdb.c:1047
 msgid "Invalid type cast: intended type must be scalar."
 msgstr ""
 
-#: ax-gdb.c:1029
+#: ax-gdb.c:1070
 msgid "Casts to requested type are not yet implemented."
 msgstr ""
 
-#: ax-gdb.c:1097
+#: ax-gdb.c:1138
 msgid ""
 "First argument of `-' is a pointer, but second argument is neither\n"
 "an integer nor a pointer of the same type."
 msgstr ""
 
-#: ax-gdb.c:1150
+#: ax-gdb.c:1191
 #, possible-c-format
 msgid "Invalid combination of types in %s."
 msgstr ""
 
-#: ax-gdb.c:1167
+#: ax-gdb.c:1208
 msgid "Invalid type of operand to `!'."
 msgstr ""
 
-#: ax-gdb.c:1178
+#: ax-gdb.c:1219
 msgid "Invalid type of operand to `~'."
 msgstr ""
 
-#: ax-gdb.c:1196
+#: ax-gdb.c:1237
 msgid "gen_deref: expected a pointer"
 msgstr ""
 
-#: ax-gdb.c:1205 valops.c:926
+#: ax-gdb.c:1246 valops.c:926
 msgid "Attempt to dereference a generic pointer."
 msgstr ""
 
-#: ax-gdb.c:1226
+#: ax-gdb.c:1267
 msgid "Operand of `&' is an rvalue, which has no address."
 msgstr ""
 
-#: ax-gdb.c:1229
+#: ax-gdb.c:1270
 msgid "Operand of `&' is in a register, and has no address."
 msgstr ""
 
-#: ax-gdb.c:1301
+#: ax-gdb.c:1342
 msgid "gen_bitfield_ref: bitfield too wide"
 msgstr ""
 
-#: ax-gdb.c:1453 ax-gdb.c:1595
+#: ax-gdb.c:1494 ax-gdb.c:1636
 #, possible-c-format
 msgid "static field `%s' has been optimized out, cannot use"
 msgstr ""
 
-#: ax-gdb.c:1465
+#: ax-gdb.c:1506
 msgid "find_field: anonymous unions not supported"
 msgstr ""
 
-#: ax-gdb.c:1513
+#: ax-gdb.c:1554
 #, possible-c-format
 msgid "The left operand of `%s' is not a %s."
 msgstr ""
 
-#: ax-gdb.c:1519
+#: ax-gdb.c:1560
 msgid "Structure does not live in memory."
 msgstr ""
 
-#: ax-gdb.c:1525
+#: ax-gdb.c:1566
 #, possible-c-format
 msgid "Couldn't find member named `%s' in struct/union/class `%s'"
 msgstr ""
 
-#: ax-gdb.c:1583
+#: ax-gdb.c:1624
 msgid "non-aggregate type to gen_struct_elt_for_reference"
 msgstr ""
 
-#: ax-gdb.c:1601 valops.c:3279
+#: ax-gdb.c:1642 valops.c:3298
 msgid "pointers to bitfield members not allowed"
 msgstr ""
 
 #. FIXME we need a way to do "want_address" equivalent
-#: ax-gdb.c:1605 valops.c:3288
+#: ax-gdb.c:1646 valops.c:3307
 #, possible-c-format
 msgid "Cannot reference non-static field \"%s\""
 msgstr ""
 
-#: ax-gdb.c:1626 eval.c:1574 valops.c:3463
+#: ax-gdb.c:1667 eval.c:1593 valops.c:3482
 #, possible-c-format
 msgid "No symbol \"%s\" in namespace \"%s\"."
 msgstr ""
 
-#: ax-gdb.c:1656 ax-gdb.c:1974 ax-gdb.c:2157
+#: ax-gdb.c:1697 ax-gdb.c:2015 ax-gdb.c:2197
 #, possible-c-format
 msgid "`%s' has been optimized out, cannot use"
 msgstr ""
 
-#: ax-gdb.c:1680
+#: ax-gdb.c:1721
 msgid "non-aggregate type in gen_aggregate_elt_ref"
 msgstr ""
 
-#: ax-gdb.c:1707
+#: ax-gdb.c:1748
 msgid "Left operand of `@' must be an object in memory."
 msgstr ""
 
-#: ax-gdb.c:1715
+#: ax-gdb.c:1756
 msgid "Right operand of `@' must be a constant, in agent expressions."
 msgstr ""
 
-#: ax-gdb.c:1718
+#: ax-gdb.c:1759
 msgid "Right operand of `@' must be an integer."
 msgstr ""
 
-#: ax-gdb.c:1721
+#: ax-gdb.c:1762
 msgid "Right operand of `@' must be positive."
 msgstr ""
 
-#: ax-gdb.c:1900 ax-gdb.c:1936
+#: ax-gdb.c:1941 ax-gdb.c:1977
 #, possible-c-format
 msgid "$%s is not a trace state variable, may not assign to it"
 msgstr ""
 
-#: ax-gdb.c:1904 ax-gdb.c:1940
+#: ax-gdb.c:1945 ax-gdb.c:1981
 msgid "May only assign to trace state variables"
 msgstr ""
 
-#: ax-gdb.c:1989 tracepoint.c:1370
+#: ax-gdb.c:2030 tracepoint.c:1468
 #, possible-c-format
 msgid "Register $%s not available"
 msgstr ""
 
-#: ax-gdb.c:1993
+#: ax-gdb.c:2034
 #, possible-c-format
 msgid "'%s' is a user-register; GDB cannot yet trace user-register contents."
 msgstr ""
 
-#: ax-gdb.c:2019
+#: ax-gdb.c:2060
 #, possible-c-format
 msgid ""
 "$%s is not a trace state variable; GDB agent expressions cannot use "
 "convenience variables."
 msgstr ""
 
-#: ax-gdb.c:2098
+#: ax-gdb.c:2139
 msgid "Argument of unary `*' is not a pointer."
 msgstr ""
 
-#: ax-gdb.c:2134
+#: ax-gdb.c:2175
 msgid "gen_expr: unhandled struct case"
 msgstr ""
 
-#: ax-gdb.c:2152
+#: ax-gdb.c:2192
 #, possible-c-format
 msgid "no `%s' found"
 msgstr ""
 
-#: ax-gdb.c:2174 eval.c:808 eval.c:2952
+#: ax-gdb.c:2214 eval.c:806 eval.c:2949
 #, possible-c-format
 msgid "There is no field named %s"
 msgstr ""
 
-#: ax-gdb.c:2180
+#: ax-gdb.c:2220
 msgid "Attempt to use a type name as an expression."
 msgstr ""
 
-#: ax-gdb.c:2183
+#: ax-gdb.c:2223
 #, possible-c-format
 msgid "Unsupported operator %s (%d) in expression."
 msgstr ""
 
-#: ax-gdb.c:2259
+#: ax-gdb.c:2299
 msgid "cannot subscript requested type: cannot call user defined functions"
 msgstr ""
 
-#: ax-gdb.c:2272 eval.c:2246 eval.c:2301 eval.c:2331 jv-lang.c:981
+#: ax-gdb.c:2312 eval.c:2247 eval.c:2302 eval.c:2332 jv-lang.c:989
 #: m2-lang.c:265
 #, possible-c-format
 msgid "cannot subscript something of type `%s'"
 msgstr ""
 
-#: ax-gdb.c:2275 eval.c:2249 eval.c:2334 jv-lang.c:983 m2-lang.c:268
+#: ax-gdb.c:2315 eval.c:2250 eval.c:2335 jv-lang.c:991 m2-lang.c:268
 msgid "cannot subscript requested type"
 msgstr ""
 
-#: ax-gdb.c:2280 valarith.c:960
+#: ax-gdb.c:2320 valarith.c:952
 msgid "Argument to arithmetic operation not a number or boolean."
 msgstr ""
 
-#: ax-gdb.c:2335
+#: ax-gdb.c:2375
 msgid "gen_expr: op case sets don't match"
 msgstr ""
 
-#: ax-gdb.c:2461 ax-gdb.c:2497
+#: ax-gdb.c:2527 ax-gdb.c:2579
 msgid "GDB can't do agent expression translation with overlays."
 msgstr ""
 
-#: ax-gdb.c:2464 ax-gdb.c:2500
+#: ax-gdb.c:2530 ax-gdb.c:2582
 msgid "expression to translate"
 msgstr "expression à traduire"
 
-#: ax-gdb.c:2524
+#: ax-gdb.c:2606
 msgid "Translate an expression into remote agent bytecode for tracing."
 msgstr ""
 
-#: ax-gdb.c:2529
+#: ax-gdb.c:2611
 msgid "Translate an expression into remote agent bytecode for evaluation."
 msgstr ""
 
-#: ax-general.c:129
+#: ax-general.c:128
 msgid "GDB bug: ax-general.c (read_const): incomplete constant"
 msgstr ""
 
-#: ax-general.c:153
+#: ax-general.c:152
 msgid "GDB bug: ax-general.c (ax_pick): stack depth out of range"
 msgstr ""
 
-#: ax-general.c:166
+#: ax-general.c:165
 msgid "GDB bug: ax-general.c (generic_ext): bit count out of range"
 msgstr ""
 
-#: ax-general.c:169
+#: ax-general.c:168
 msgid "GDB bug: ax-general.c (generic_ext): opcode has inadequate range"
 msgstr ""
 
-#: ax-general.c:200
+#: ax-general.c:199
 msgid ""
 "GDB bug: ax-general.c (ax_trace_quick): size out of range for trace_quick"
 msgstr ""
 
-#: ax-general.c:236
+#: ax-general.c:235
 msgid "GDB bug: ax-general.c (ax_label): label target out of range"
 msgstr ""
 
 #. FIXME: floating-point support not present yet.
-#: ax-general.c:282
+#: ax-general.c:281
 msgid "GDB bug: ax-general.c (ax_const_d): floating point not supported yet"
 msgstr ""
 
-#: ax-general.c:296 ax-general.c:410
+#: ax-general.c:295 ax-general.c:409
 #, possible-c-format
 msgid "'%s' is a pseudo-register; GDB cannot yet trace its contents."
 msgstr ""
 
-#: ax-general.c:300 ax-general.c:414
+#: ax-general.c:299 ax-general.c:413
 #, possible-c-format
 msgid "Trace '%s' failed."
 msgstr ""
 
-#: ax-general.c:307
+#: ax-general.c:306
 msgid "GDB bug: ax-general.c (ax_reg): register number out of range"
 msgstr ""
 
-#: ax-general.c:325
+#: ax-general.c:324
 #, possible-c-format
 msgid "ax-general.c (ax_tsv): variable number is %d, out of range"
 msgstr ""
 
-#: ax-general.c:357
+#: ax-general.c:356
 #, possible-c-format
 msgid "Scope: %s\n"
 msgstr ""
 
-#: ax-general.c:358
+#: ax-general.c:357
 msgid "Reg mask:"
 msgstr ""
 
-#: ax-general.c:360
+#: ax-general.c:359
 #, possible-c-format
 msgid " %02x"
 msgstr ""
 
-#: ax-general.c:361 darwin-nat-info.c:295 darwin-nat-info.c:588
-#: darwin-nat-info.c:795 darwin-nat.c:531
+#: ax-general.c:360 darwin-nat.c:544 darwin-nat-info.c:294
+#: darwin-nat-info.c:587 darwin-nat-info.c:795
 msgid "\n"
 msgstr ""
 
-#: ax-general.c:367
+#: ax-general.c:366
 msgid "GDB bug: ax-general.c (ax_print): opcode map out of sync"
 msgstr ""
 
-#: ax-general.c:376
+#: ax-general.c:375
 #, possible-c-format
 msgid "%3d  <bad opcode %02x>\n"
 msgstr ""
 
-#: ax-general.c:382
+#: ax-general.c:381
 #, possible-c-format
 msgid "%3d  <incomplete opcode %s>\n"
 msgstr ""
@@ -2390,586 +2423,512 @@
 msgid "    Maximum hash chain length: %3d\n"
 msgstr ""
 
-#: bfd-target.c:92
+#: bfd-target.c:91
 msgid "BFD backed target"
 msgstr ""
 
-#: bfd-target.c:93
+#: bfd-target.c:92
 msgid "You should never see this"
 msgstr ""
 
-#: bfin-tdep.c:454
+#: bfin-tdep.c:453
 msgid ""
 "Function Prologue not recognised; pc will point to ENTRY_POINT of the "
 "function"
 msgstr ""
 
-#: bfin-tdep.c:702 bfin-tdep.c:722 xtensa-tdep.c:338 xtensa-tdep.c:643
-#: xtensa-tdep.c:742
+#: bfin-tdep.c:701 bfin-tdep.c:721 xtensa-tdep.c:336 xtensa-tdep.c:641
+#: xtensa-tdep.c:740
 #, possible-c-format
 msgid "invalid register number %d"
 msgstr ""
 
-#: breakpoint.c:276
+#: block.c:201
+#, possible-c-format
+msgid ""
+"DW_OP_GNU_entry_value resolving cannot find DW_TAG_GNU_call_site %s in %s"
+msgstr ""
+
+#: breakpoint.c:309
 #, possible-c-format
 msgid "Debugger's willingness to use watchpoint hardware is %s.\n"
 msgstr ""
 
-#: breakpoint.c:292
+#: breakpoint.c:325
 #, possible-c-format
 msgid "Debugger's behavior regarding pending breakpoints is %s.\n"
 msgstr ""
 
-#: breakpoint.c:308
+#: breakpoint.c:341
 #, possible-c-format
 msgid "Automatic usage of hardware breakpoints is %s.\n"
 msgstr ""
 
-#: breakpoint.c:334
+#: breakpoint.c:367
 #, possible-c-format
 msgid "Always inserted breakpoint mode is %s (currently %s).\n"
 msgstr ""
 
-#: breakpoint.c:339
+#: breakpoint.c:372
 #, possible-c-format
 msgid "Always inserted breakpoint mode is %s.\n"
 msgstr ""
 
-#: breakpoint.c:596
+#: breakpoint.c:626
 #, possible-c-format
 msgid "Breakpoint %d now unconditional.\n"
 msgstr ""
 
-#: breakpoint.c:642
+#: breakpoint.c:676
 msgid "breakpoint number"
 msgstr ""
 
-#: breakpoint.c:647
+#: breakpoint.c:681
 #, possible-c-format
 msgid "Bad breakpoint argument: '%s'"
 msgstr ""
 
-#: breakpoint.c:658
+#: breakpoint.c:692
 msgid ""
 "Cannot set a condition where a Python 'stop' method has been defined in the "
 "breakpoint."
 msgstr ""
 
-#: breakpoint.c:664 breakpoint.c:11289
+#: breakpoint.c:698 breakpoint.c:12114
 #, possible-c-format
 msgid "No breakpoint number %d."
 msgstr ""
 
-#: breakpoint.c:681
+#: breakpoint.c:715
 msgid "The 'while-stepping' command can only be used for tracepoints"
 msgstr ""
 
-#: breakpoint.c:691
+#: breakpoint.c:725
 msgid "The 'collect' command can only be used for tracepoints"
 msgstr ""
 
-#: breakpoint.c:694
+#: breakpoint.c:728
 msgid "The 'teval' command can only be used for tracepoints"
 msgstr ""
 
-#: breakpoint.c:729
+#: breakpoint.c:769
 msgid "The 'while-stepping' command cannot be used for fast tracepoint"
 msgstr ""
 
-#: breakpoint.c:732
+#: breakpoint.c:772
 msgid "The 'while-stepping' command cannot be used for static tracepoint"
 msgstr ""
 
-#: breakpoint.c:736
+#: breakpoint.c:776
 msgid "The 'while-stepping' command can be used only once"
 msgstr ""
 
-#: breakpoint.c:751
+#: breakpoint.c:791
 msgid "The 'while-stepping' command cannot be nested"
 msgstr ""
 
-#: breakpoint.c:884
+#: breakpoint.c:924
 #, possible-c-format
 msgid "Type commands for breakpoint(s) %s, one per line."
 msgstr ""
 
-#: breakpoint.c:957
+#: breakpoint.c:997
 msgid "No breakpoints specified."
 msgstr ""
 
-#: breakpoint.c:1075
+#: breakpoint.c:1117
 #, possible-c-format
 msgid "reading through apparently deleted breakpoint #%d?"
 msgstr ""
 
-#: breakpoint.c:1477
+#: breakpoint.c:1520
+msgid "Target does not support this type of hardware watchpoint."
+msgstr ""
+
+#: breakpoint.c:1523
+msgid ""
+"There are not enough available hardware resources for this watchpoint."
+msgstr ""
+
+#: breakpoint.c:1539
+msgid "Expression cannot be implemented with read/access watchpoint."
+msgstr ""
+
+#: breakpoint.c:1573
 #, possible-c-format
 msgid ""
 "Watchpoint %d deleted because the program has left the block\n"
 "in which its expression is valid.\n"
 msgstr ""
 
-#: breakpoint.c:1591
+#: breakpoint.c:1705
 msgid ""
 "Note: automatically using hardware breakpoints for read-only addresses.\n"
 msgstr ""
 
-#: breakpoint.c:1600
+#: breakpoint.c:1714
 #, possible-c-format
 msgid "cannot set software breakpoint at readonly address %s"
 msgstr ""
 
-#: breakpoint.c:1630
+#: breakpoint.c:1739
 #, possible-c-format
 msgid "hardware breakpoint %d not supported in overlay!"
 msgstr ""
 
-#: breakpoint.c:1776
+#: breakpoint.c:1881
 #, possible-c-format
 msgid ""
 "Error inserting catchpoint %d: Your system does not support this type\n"
 "of catchpoint."
 msgstr ""
 
-#: breakpoint.c:1780
+#: breakpoint.c:1885
 #, possible-c-format
 msgid "Error inserting catchpoint %d."
 msgstr ""
 
-#: breakpoint.c:2496
+#: breakpoint.c:2597
 msgid "Cannot detach breakpoints of inferior_ptid"
 msgstr ""
 
-#: breakpoint.c:2623
+#: breakpoint.c:2717
 #, possible-c-format
 msgid "Could not remove hardware watchpoint %d."
 msgstr ""
 
-#: breakpoint.c:3298
+#: breakpoint.c:3424
 msgid "<unreadable>"
 msgstr ""
 
+#: breakpoint.c:3471
+msgid "print_bp_stop_message: unrecognized enum value"
+msgstr ""
+
 #. Did we stop because the user set the stop_on_solib_events
 #. variable?  (If so, we report this as a generic, "Stopped due
 #. to shlib event" message.)
-#: breakpoint.c:3375 infrun.c:5816
+#: breakpoint.c:3520 breakpoint.c:11123
 msgid "Stopped due to shared library event\n"
 msgstr ""
 
-#. Not sure how we will get here.
-#. GDB should not stop for these breakpoints.
-#: breakpoint.c:3382
-msgid "Thread Event Breakpoint: gdb should not stop!\n"
-msgstr ""
-
-#. By analogy with the thread event, GDB should not stop for these.
-#: breakpoint.c:3388
-msgid "Overlay Event Breakpoint: gdb should not stop!\n"
-msgstr ""
-
-#. These should never be enabled.
-#: breakpoint.c:3394
-msgid "Longjmp Master Breakpoint: gdb should not stop!\n"
-msgstr ""
-
-#. These should never be enabled.
-#: breakpoint.c:3400
-msgid "std::terminate Master Breakpoint: gdb should not stop!\n"
-msgstr ""
-
-#. These should never be enabled.
-#: breakpoint.c:3407
-msgid "Exception Master Breakpoint: gdb should not stop!\n"
-msgstr ""
-
-#: breakpoint.c:3561
-msgid "print_bp_stop_message: unrecognized enum value"
-msgstr ""
-
 #. Error from catch_errors.
-#: breakpoint.c:4046
+#: breakpoint.c:3962
 #, possible-c-format
 msgid "Watchpoint %d deleted.\n"
 msgstr ""
 
-#: breakpoint.c:4151
+#: breakpoint.c:4077
 msgid "Watchpoint condition cannot be tested in the current scope"
 msgstr ""
 
-#: breakpoint.c:4522
+#: breakpoint.c:4448
 msgid "bpstat_what: tracepoint encountered"
 msgstr ""
 
-#: breakpoint.c:4535
+#: breakpoint.c:4461
 #, possible-c-format
 msgid "bpstat_what: unhandled bptype %d"
 msgstr ""
 
-#: breakpoint.c:4754
+#: breakpoint.c:4682
 #, possible-c-format
 msgid "bptypes table does not describe type #%d."
 msgstr ""
 
-#: breakpoint.c:4845
+#: breakpoint.c:4772
 msgid "print_one_breakpoint: bp_none encountered\n"
 msgstr ""
 
-#: breakpoint.c:5417
+#: breakpoint.c:5359
 msgid "Note: breakpoint "
 msgstr "Note : point d'arrêt "
 
 #. if (others == ???)
-#: breakpoint.c:5419
+#: breakpoint.c:5361
 msgid "Note: breakpoints "
 msgstr "Note : points d'arrêt "
 
-#: breakpoint.c:5440
+#: breakpoint.c:5381
 msgid "also set at pc "
 msgstr ""
 
-#: breakpoint.c:5612
+#: breakpoint.c:5561
 #, possible-c-format
 msgid "Breakpoint %d address previously adjusted from %s to %s."
 msgstr ""
 
-#: breakpoint.c:5615
+#: breakpoint.c:5564
 #, possible-c-format
 msgid "Breakpoint address adjusted from %s to %s."
 msgstr ""
 
-#: breakpoint.c:5715
+#: breakpoint.c:5664
 msgid "unknown breakpoint type"
 msgstr ""
 
-#: breakpoint.c:6204
+#: breakpoint.c:6166
 #, possible-c-format
 msgid "Temporarily disabling breakpoints for unloaded shared library \"%s\""
 msgstr ""
 
-#: breakpoint.c:6250
+#: breakpoint.c:6286
 #, possible-c-format
-msgid ""
-"\n"
-"Catchpoint %d (forked process %d), "
+msgid "Catchpoint %d (fork)"
 msgstr ""
 
-#: breakpoint.c:6287
+#: breakpoint.c:6394
 #, possible-c-format
-msgid "Catchpoint %d (fork)"
+msgid "Catchpoint %d (vfork)"
 msgstr ""
 
-#: breakpoint.c:6349
+#: breakpoint.c:6682
 #, possible-c-format
-msgid ""
-"\n"
-"Catchpoint %d (vforked process %d), "
+msgid "Catchpoint %d (syscalls"
 msgstr ""
 
-#: breakpoint.c:6385
+#: breakpoint.c:6684
 #, possible-c-format
-msgid "Catchpoint %d (vfork)"
+msgid "Catchpoint %d (syscall"
 msgstr ""
 
-#: breakpoint.c:6557
-#, possible-c-format
-msgid ""
-"\n"
-"Catchpoint %d (call to syscall %s), "
-msgstr ""
-
-#: breakpoint.c:6560
-#, possible-c-format
-msgid ""
-"\n"
-"Catchpoint %d (returned from syscall %s), "
-msgstr ""
-
-#: breakpoint.c:6634
-#, possible-c-format
-msgid "Catchpoint %d (syscalls"
-msgstr ""
-
-#: breakpoint.c:6636
-#, possible-c-format
-msgid "Catchpoint %d (syscall"
-msgstr ""
-
-#: breakpoint.c:6653
+#: breakpoint.c:6701
 #, possible-c-format
 msgid "Catchpoint %d (any syscall)"
 msgstr ""
 
-#: breakpoint.c:6800
-#, possible-c-format
-msgid ""
-"\n"
-"Catchpoint %d (exec'd %s), "
-msgstr ""
-
-#: breakpoint.c:6830
+#: breakpoint.c:6902
 #, possible-c-format
 msgid "Catchpoint %d (exec)"
 msgstr ""
 
-#: breakpoint.c:7116
-#, possible-c-format
-msgid "(apparently deleted?) Eventpoint %d: "
-msgstr ""
-
-#: breakpoint.c:7159
-msgid "Temporary breakpoint"
-msgstr ""
-
-#: breakpoint.c:7161
-msgid "Breakpoint"
-msgstr ""
-
-#: breakpoint.c:7162 breakpoint.c:7183 breakpoint.c:7193 breakpoint.c:7203
-#, possible-c-format
-msgid " %d"
-msgstr ""
-
-#: breakpoint.c:7164
-msgid " at gnu-indirect-function resolver"
-msgstr ""
-
-#: breakpoint.c:7173
-#, possible-c-format
-msgid "Hardware assisted breakpoint %d"
-msgstr ""
-
-#: breakpoint.c:7182
-msgid "Tracepoint"
-msgstr ""
-
-#: breakpoint.c:7192
-msgid "Fast tracepoint"
-msgstr ""
-
-#: breakpoint.c:7202
-msgid "Static tracepoint"
-msgstr ""
-
-#: breakpoint.c:7234
-#, possible-c-format
-msgid " (%s) pending."
-msgstr ""
-
-#: breakpoint.c:7357 breakpoint.c:11504
+#: breakpoint.c:7264 breakpoint.c:12318
 msgid "No hardware breakpoint support in the target."
 msgstr ""
 
-#: breakpoint.c:7359 breakpoint.c:8551 breakpoint.c:11506
+#: breakpoint.c:7266 breakpoint.c:8335 breakpoint.c:12320
 msgid "Hardware breakpoints used exceeds limit."
 msgstr ""
 
-#: breakpoint.c:7412 breakpoint.c:7421
+#: breakpoint.c:7317 breakpoint.c:7326
 #, possible-c-format
 msgid "Probed static tracepoint marker \"%s\"\n"
 msgstr ""
 
-#: breakpoint.c:7426
+#: breakpoint.c:7331
 msgid "Couldn't determine the static tracepoint marker to probe"
 msgstr ""
 
-#: breakpoint.c:7450
+#: breakpoint.c:7350
 #, possible-c-format
 msgid "Garbage %s follows condition"
 msgstr ""
 
-#: breakpoint.c:7688
+#: breakpoint.c:7502
 msgid "No default breakpoint address now."
 msgstr ""
 
-#: breakpoint.c:7767
+#: breakpoint.c:7567
 #, possible-c-format
 msgid "May not have a fast tracepoint at 0x%s%s"
 msgstr ""
 
-#: breakpoint.c:7826
+#: breakpoint.c:7618
 msgid "Junk after thread keyword."
 msgstr ""
 
-#: breakpoint.c:7828 breakpoint.c:8888 thread.c:1246
+#: breakpoint.c:7620 breakpoint.c:9098 thread.c:1239
 #, possible-c-format
 msgid "Unknown thread %d."
 msgstr ""
 
-#: breakpoint.c:7838
+#: breakpoint.c:7630
 msgid "Junk after task keyword."
 msgstr ""
 
-#: breakpoint.c:7840
+#: breakpoint.c:7632
 #, possible-c-format
 msgid "Unknown task %d."
 msgstr ""
 
-#: breakpoint.c:7871
+#: breakpoint.c:7663
 #, possible-c-format
 msgid "No known static tracepoint marker named %s"
 msgstr ""
 
-#: breakpoint.c:7976
-msgid "Make breakpoint pending on future shared library load? "
+#: breakpoint.c:7766
+#, possible-c-format
+msgid "Make %s pending on future shared library load? "
 msgstr ""
 
-#: breakpoint.c:8153
+#: breakpoint.c:7944
 msgid ""
 "Multiple breakpoints were set.\n"
 "Use the \"delete\" command to delete unwanted breakpoints."
 msgstr ""
 
-#: breakpoint.c:8208
+#: breakpoint.c:7998 linespec.c:2429
 #, possible-c-format
 msgid "No line %d in file \"%s\"."
 msgstr "Aucune ligne %d dans le fichier \"%s\"."
 
-#: breakpoint.c:8282
+#: breakpoint.c:8072
 msgid ""
 "Specify the type of breakpoint to set.\n"
 "Usage: stop in <function | address>\n"
 "       stop at <line>\n"
 msgstr ""
 
-#: breakpoint.c:8315
+#: breakpoint.c:8105
 msgid "Usage: stop in <function | address>\n"
 msgstr ""
 
-#: breakpoint.c:8347
+#: breakpoint.c:8137
 msgid "Usage: stop at <line>\n"
 msgstr ""
 
-#: breakpoint.c:8468
+#: breakpoint.c:8262
 #, possible-c-format
 msgid "Hardware assisted ranged breakpoint %d from %s to %s."
 msgstr ""
 
-#: breakpoint.c:8519 breakpoint.c:8613
+#: breakpoint.c:8303 breakpoint.c:8383
 msgid "Could not find location of the end of the range."
 msgstr ""
 
-#: breakpoint.c:8544
+#: breakpoint.c:8328
 msgid "This target does not support hardware ranged breakpoints."
 msgstr ""
 
-#: breakpoint.c:8554
+#: breakpoint.c:8339
 msgid "No address range specified."
 msgstr ""
 
-#: breakpoint.c:8572
+#: breakpoint.c:8349
 msgid "Too few arguments."
 msgstr ""
 
-#: breakpoint.c:8574
+#: breakpoint.c:8351
 msgid "Could not find location of the beginning of the range."
 msgstr ""
 
-#: breakpoint.c:8576 breakpoint.c:8615
+#: breakpoint.c:8357 breakpoint.c:8388
 msgid "Cannot create a ranged breakpoint with multiple locations."
 msgstr ""
 
-#: breakpoint.c:8621
-msgid "Invalid address range, end preceeds start."
+#: breakpoint.c:8396
+msgid "Invalid address range, end precedes start."
 msgstr ""
 
 #. Length overflowed.
-#: breakpoint.c:8626
+#: breakpoint.c:8401
 msgid "Address range too large."
 msgstr ""
 
-#: breakpoint.c:8884
-#, possible-c-format
-msgid "Invalid thread ID specification %s."
+#: breakpoint.c:8788 breakpoint.c:8911 breakpoint.c:8967 breakpoint.c:8998
+msgid "Invalid hardware watchpoint type."
 msgstr ""
 
-#: breakpoint.c:8916
-#, possible-c-format
-msgid "Cannot watch constant value `%.*s'."
+#: breakpoint.c:8819
+msgid "Invalid watchpoint type."
 msgstr ""
 
-#: breakpoint.c:8953
-msgid "Junk at end of command."
+#: breakpoint.c:8915
+msgid ""
+"\n"
+"Check the underlying instruction at PC for the memory\n"
+"address and value which triggered this watchpoint.\n"
 msgstr ""
 
-#: breakpoint.c:8964
-msgid "Expression cannot be implemented with read/access watchpoint."
+#: breakpoint.c:9086
+msgid "You can specify only one thread."
 msgstr ""
 
-#: breakpoint.c:8972
-msgid "Target does not support this type of hardware watchpoint."
+#: breakpoint.c:9094
+#, possible-c-format
+msgid "Invalid thread ID specification %s."
 msgstr ""
 
-#: breakpoint.c:8975
-msgid "Target can only support one kind of HW watchpoint at a time."
+#: breakpoint.c:9108
+msgid "You can specify only one mask."
 msgstr ""
 
-#: breakpoint.c:9305
-msgid "Couldn't get information on specified line."
+#: breakpoint.c:9146
+#, possible-c-format
+msgid "Cannot watch constant value `%.*s'."
 msgstr ""
 
-#: breakpoint.c:9457
-msgid "unsupported or unknown fork kind; cannot catch it"
+#: breakpoint.c:9167
+msgid "This target does not support masked watchpoints."
 msgstr ""
 
-#: breakpoint.c:9556
-msgid "Temporary catchpoint "
+#: breakpoint.c:9169
+msgid "Invalid mask or memory region."
 msgstr ""
 
-#: breakpoint.c:9557
-msgid "Catchpoint "
+#: breakpoint.c:9195
+msgid "Junk at end of command."
+msgstr ""
+
+#: breakpoint.c:9538
+msgid "Couldn't get information on specified line."
+msgstr ""
+
+#: breakpoint.c:9690
+msgid "unsupported or unknown fork kind; cannot catch it"
 msgstr ""
 
-#: breakpoint.c:9559
+#: breakpoint.c:9799
 msgid " (throw)"
 msgstr ""
 
-#: breakpoint.c:9560
+#: breakpoint.c:9800
 msgid " (catch)"
 msgstr ""
 
-#: breakpoint.c:9634
+#: breakpoint.c:9865
 msgid "Unsupported or unknown exception event; cannot catch it"
 msgstr ""
 
-#: breakpoint.c:9639
+#: breakpoint.c:9870
 msgid "Unsupported with this platform/compiler combination."
 msgstr ""
 
 #. Here we have to issue an error instead of a warning,
 #. because GDB cannot do anything useful if there's no
 #. syscall number to be caught.
-#: breakpoint.c:9786
+#: breakpoint.c:9966
 #, possible-c-format
 msgid "Unknown syscall name '%s'."
 msgstr ""
 
-#: breakpoint.c:9810
+#: breakpoint.c:9990
 msgid ""
 "The feature 'catch syscall' is not supported on this architecture yet."
 msgstr ""
 
-#: breakpoint.c:9862 breakpoint.c:9869
+#: breakpoint.c:10021 breakpoint.c:10028
 msgid "Catch requires an event name."
 msgstr ""
 
-#: breakpoint.c:9901
+#: breakpoint.c:10085
 msgid "No source file specified."
 msgstr "Aucun fichier source spécifié."
 
-#: breakpoint.c:9986
+#: breakpoint.c:10175
 #, possible-c-format
 msgid "No breakpoint at %s."
 msgstr "Aucun point d'arrêt à %s."
 
-#: breakpoint.c:9988
+#: breakpoint.c:10177
 msgid "No breakpoint at this line."
 msgstr "Aucun point d'arrêt à cette ligne."
 
-#: breakpoint.c:9996
+#: breakpoint.c:10200
 msgid "Deleted breakpoint "
 msgstr "Point d'arrêt supprimé "
 
-#: breakpoint.c:9998
+#: breakpoint.c:10202
 msgid "Deleted breakpoints "
 msgstr ""
 
@@ -2981,136 +2940,196 @@
 #. Note that at this point, old_loc->owner is still
 #. valid, as delete_breakpoint frees the breakpoint
 #. only after calling us.
-#: breakpoint.c:10277
+#: breakpoint.c:10547
 #, possible-c-format
 msgid "warning: Error removing breakpoint %d\n"
 msgstr ""
 
-#: breakpoint.c:10382
+#: breakpoint.c:10651
 msgid "allegedly permanent breakpoint is not actually inserted"
 msgstr ""
 
-#: breakpoint.c:10408
+#: breakpoint.c:10683
 msgid "another breakpoint was inserted on top of a permanent breakpoint"
 msgstr ""
 
-#: breakpoint.c:10626
+#: breakpoint.c:10763
+#, possible-c-format
+msgid " (%s) pending."
+msgstr ""
+
+#: breakpoint.c:11040
+msgid "Temporary breakpoint"
+msgstr ""
+
+#: breakpoint.c:11042
+msgid "Breakpoint"
+msgstr ""
+
+#: breakpoint.c:11043 breakpoint.c:11261 breakpoint.c:11265 breakpoint.c:11269
+#, possible-c-format
+msgid " %d"
+msgstr ""
+
+#: breakpoint.c:11045
+msgid " at gnu-indirect-function resolver"
+msgstr ""
+
+#: breakpoint.c:11048
+#, possible-c-format
+msgid "Hardware assisted breakpoint %d"
+msgstr ""
+
+#: breakpoint.c:11069
+#, possible-c-format
+msgid "unhandled breakpoint type %d"
+msgstr ""
+
+#. Not sure how we will get here.
+#. GDB should not stop for these breakpoints.
+#: breakpoint.c:11132
+msgid "Thread Event Breakpoint: gdb should not stop!\n"
+msgstr ""
+
+#. By analogy with the thread event, GDB should not stop for these.
+#: breakpoint.c:11137
+msgid "Overlay Event Breakpoint: gdb should not stop!\n"
+msgstr ""
+
+#. These should never be enabled.
+#: breakpoint.c:11142
+msgid "Longjmp Master Breakpoint: gdb should not stop!\n"
+msgstr ""
+
+#. These should never be enabled.
+#: breakpoint.c:11147
+msgid "std::terminate Master Breakpoint: gdb should not stop!\n"
+msgstr ""
+
+#. These should never be enabled.
+#: breakpoint.c:11153
+msgid "Exception Master Breakpoint: gdb should not stop!\n"
+msgstr ""
+
+#: breakpoint.c:11260
+msgid "Tracepoint"
+msgstr ""
+
+#: breakpoint.c:11264
+msgid "Fast tracepoint"
+msgstr ""
+
+#: breakpoint.c:11268
+msgid "Static tracepoint"
+msgstr ""
+
+#: breakpoint.c:11273 breakpoint.c:11292
+#, possible-c-format
+msgid "unhandled tracepoint type %d"
+msgstr ""
+
+#: breakpoint.c:11486
 msgid "Delete all breakpoints? "
 msgstr ""
 
-#: breakpoint.c:10742
+#: breakpoint.c:11593
 #, possible-c-format
 msgid "static tracepoint %d changed probed marker from %s to %s"
 msgstr ""
 
-#: breakpoint.c:10776
+#: breakpoint.c:11628
 #, possible-c-format
 msgid ""
 "marker for static tracepoint %d (%s) not found at previous line number"
 msgstr ""
 
-#: breakpoint.c:10874
-#, possible-c-format
-msgid "failed to reevaluate condition for breakpoint %d: %s"
-msgstr ""
-
-#: breakpoint.c:10970
+#: breakpoint.c:11726
 #, possible-c-format
-msgid "marker %s not found"
+msgid "Could not reset ranged breakpoint %d: multiple locations found\n"
 msgstr ""
 
-#: breakpoint.c:11087
+#: breakpoint.c:11766
 #, possible-c-format
-msgid "attempted to reset apparently deleted breakpoint #%d?"
+msgid "failed to reevaluate condition for breakpoint %d: %s"
 msgstr ""
 
-#: breakpoint.c:11149
+#: breakpoint.c:11857
 #, possible-c-format
-msgid "Deleting unknown breakpoint type %d\n"
+msgid "marker %s not found"
 msgstr ""
 
-#: breakpoint.c:11264
+#: breakpoint.c:12089
 #, possible-c-format
 msgid "Ignore count ignored for tracepoint %d."
 msgstr ""
 
-#: breakpoint.c:11273
+#: breakpoint.c:12098
 #, possible-c-format
 msgid "Will stop next time breakpoint %d is reached."
 msgstr ""
 
-#: breakpoint.c:11277
+#: breakpoint.c:12102
 #, possible-c-format
 msgid "Will ignore next crossing of breakpoint %d."
 msgstr ""
 
-#: breakpoint.c:11280
+#: breakpoint.c:12105
 #, possible-c-format
 msgid "Will ignore next %d crossings of breakpoint %d."
 msgstr ""
 
-#: breakpoint.c:11301
+#: breakpoint.c:12126
 msgid "a breakpoint number"
 msgstr ""
 
-#: breakpoint.c:11305
+#: breakpoint.c:12130
 #, possible-c-format
 msgid "bad breakpoint number: '%s'"
 msgstr ""
 
-#: breakpoint.c:11307
+#: breakpoint.c:12132
 msgid "Second argument (specified ignore-count) is missing."
 msgstr ""
 
-#: breakpoint.c:11330
+#: breakpoint.c:12155
 msgid "one or more breakpoint numbers"
 msgstr ""
 
-#: breakpoint.c:11343
+#: breakpoint.c:12168
 #, possible-c-format
 msgid "bad breakpoint number at or near '%s'"
 msgstr ""
 
-#: breakpoint.c:11372
+#: breakpoint.c:12180
 #, possible-c-format
 msgid "No breakpoint number %d.\n"
 msgstr ""
 
-#: breakpoint.c:11392 breakpoint.c:11401
+#: breakpoint.c:12200 breakpoint.c:12209
 #, possible-c-format
 msgid "Bad breakpoint number '%s'"
 msgstr ""
 
-#: breakpoint.c:11406 breakpoint.c:11413
+#: breakpoint.c:12214 breakpoint.c:12221
 #, possible-c-format
 msgid "Bad breakpoint location number '%s'"
 msgstr ""
 
-#: breakpoint.c:11462
-#, possible-c-format
-msgid "attempted to disable apparently deleted breakpoint #%d?"
-msgstr ""
-
-#: breakpoint.c:11519
+#: breakpoint.c:12340
 #, possible-c-format
 msgid "Cannot enable watchpoint %d: "
 msgstr ""
 
-#: breakpoint.c:11564
-#, possible-c-format
-msgid "attempted to enable apparently deleted breakpoint #%d?"
-msgstr ""
-
-#: breakpoint.c:11664 symtab.c:4443
+#: breakpoint.c:12507 symtab.c:4681
 msgid "Empty line specification."
 msgstr ""
 
-#: breakpoint.c:11674 symtab.c:4454
+#: breakpoint.c:12515 symtab.c:4691
 #, possible-c-format
 msgid "Junk at end of line specification: %s"
 msgstr ""
 
-#: breakpoint.c:11756
+#: breakpoint.c:12597
 #, possible-c-format
 msgid "Could not insert single-step breakpoint at %s"
 msgstr ""
@@ -3119,81 +3138,76 @@
 #. address.  Since there is no way to confirm that the address
 #. means the same thing as when the trace was started, warn the
 #. user.
-#: breakpoint.c:12007
+#: breakpoint.c:12850
 #, possible-c-format
 msgid "Uploaded tracepoint %d has no source location, using raw address"
 msgstr ""
 
-#: breakpoint.c:12016
+#: breakpoint.c:12859
 #, possible-c-format
 msgid "Uploaded tracepoint %d condition has no source form, ignoring it"
 msgstr ""
 
-#: breakpoint.c:12063
+#: breakpoint.c:12906
 #, possible-c-format
 msgid "Uploaded tracepoint %d actions have no source form, ignoring them"
 msgstr ""
 
-#: breakpoint.c:12134
+#: breakpoint.c:12980
 msgid "Delete all tracepoints? "
 msgstr ""
 
-#: breakpoint.c:12156
+#: breakpoint.c:12999
 #, possible-c-format
 msgid "Setting tracepoint %d's passcount to %d\n"
 msgstr ""
 
-#: breakpoint.c:12173
+#: breakpoint.c:13016
 msgid "passcount command requires an argument (count + optional TP num)"
 msgstr ""
 
-#: breakpoint.c:12264
+#: breakpoint.c:13114
 msgid "tracepoint number"
 msgstr ""
 
-#: breakpoint.c:12272
+#: breakpoint.c:13122
 #, possible-c-format
 msgid "bad tracepoint number at or near '%s'\n"
 msgstr ""
 
-#: breakpoint.c:12275
+#: breakpoint.c:13125
 msgid "Tracepoint argument missing and no previous tracepoint\n"
 msgstr ""
 
-#: breakpoint.c:12307
+#: breakpoint.c:13169
 msgid "Argument required (file name in which to save)"
 msgstr ""
 
-#: breakpoint.c:12333
+#: breakpoint.c:13195
 msgid "Nothing to save."
 msgstr ""
 
-#: breakpoint.c:12341
+#: breakpoint.c:13203
 #, possible-c-format
 msgid "Unable to open file '%s' for saving (%s)"
 msgstr ""
 
-#: breakpoint.c:12387
-#, possible-c-format
-msgid "unhandled breakpoint type %d"
-msgstr ""
-
-#: breakpoint.c:12464
+#: breakpoint.c:13273
 #, possible-c-format
 msgid "Saved to file '%s'.\n"
 msgstr ""
 
-#: breakpoint.c:12564
+#: breakpoint.c:13371
 msgid "\"save\" must be followed by the name of a save subcommand.\n"
 msgstr ""
 
-#: breakpoint.c:12602
+#: breakpoint.c:13598
 msgid ""
 "Set ignore-count of breakpoint number N to COUNT.\n"
 "Usage is `ignore N COUNT'."
 msgstr ""
 
-#: breakpoint.c:12608
+#: breakpoint.c:13604
 msgid ""
 "Set commands to be executed when a breakpoint is hit.\n"
 "Give breakpoint number as argument after \"commands\".\n"
@@ -3204,14 +3218,14 @@
 "then no output is printed when it is hit, except what the commands print."
 msgstr ""
 
-#: breakpoint.c:12617
+#: breakpoint.c:13613
 msgid ""
 "Specify breakpoint number N to break only if COND is true.\n"
 "Usage is `condition N COND', where N is an integer and COND is an\n"
 "expression to be evaluated whenever breakpoint N is reached."
 msgstr ""
 
-#: breakpoint.c:12622
+#: breakpoint.c:13618
 msgid ""
 "Set a temporary breakpoint.\n"
 "Like \"break\" except the breakpoint is only temporary,\n"
@@ -3220,7 +3234,7 @@
 "\n"
 msgstr ""
 
-#: breakpoint.c:12631
+#: breakpoint.c:13627
 msgid ""
 "Set a hardware assisted breakpoint.\n"
 "Like \"break\" except the breakpoint requires hardware support,\n"
@@ -3228,7 +3242,7 @@
 "\n"
 msgstr ""
 
-#: breakpoint.c:12639
+#: breakpoint.c:13635
 msgid ""
 "Set a temporary hardware assisted breakpoint.\n"
 "Like \"hbreak\" except the breakpoint is only temporary,\n"
@@ -3236,7 +3250,7 @@
 "\n"
 msgstr ""
 
-#: breakpoint.c:12647 breakpoint.c:12655
+#: breakpoint.c:13643 breakpoint.c:13651
 msgid ""
 "Enable some breakpoints.\n"
 "Give breakpoint numbers (separated by spaces) as arguments.\n"
@@ -3245,7 +3259,7 @@
 "With a subcommand you can enable temporarily."
 msgstr ""
 
-#: breakpoint.c:12664
+#: breakpoint.c:13660
 msgid ""
 "Enable some breakpoints.\n"
 "Give breakpoint numbers (separated by spaces) as arguments.\n"
@@ -3253,36 +3267,36 @@
 "May be abbreviated to simply \"enable\".\n"
 msgstr ""
 
-#: breakpoint.c:12671 breakpoint.c:12686
+#: breakpoint.c:13667 breakpoint.c:13682
 msgid ""
 "Enable breakpoints for one hit.  Give breakpoint numbers.\n"
 "If a breakpoint is hit while enabled in this fashion, it becomes disabled."
 msgstr ""
 
-#: breakpoint.c:12676 breakpoint.c:12681
+#: breakpoint.c:13672 breakpoint.c:13677
 msgid ""
 "Enable breakpoints and delete when hit.  Give breakpoint numbers.\n"
 "If a breakpoint is hit while enabled in this fashion, it is deleted."
 msgstr ""
 
-#: breakpoint.c:12691 breakpoint.c:12700
+#: breakpoint.c:13687 breakpoint.c:13696
 msgid ""
 "Disable some breakpoints.\n"
 "Arguments are breakpoint numbers with spaces in between.\n"
 "To disable all breakpoints, give no argument.\n"
-"A disabled breakpoint is not forgotten, but has no effect until reenabled."
+"A disabled breakpoint is not forgotten, but has no effect until re-enabled."
 msgstr ""
 
-#: breakpoint.c:12706
+#: breakpoint.c:13702
 msgid ""
 "Disable some breakpoints.\n"
 "Arguments are breakpoint numbers with spaces in between.\n"
 "To disable all breakpoints, give no argument.\n"
-"A disabled breakpoint is not forgotten, but has no effect until reenabled.\n"
+"A disabled breakpoint is not forgotten, but has no effect until re-enabled.\n"
 "This command may be abbreviated \"disable\"."
 msgstr ""
 
-#: breakpoint.c:12714
+#: breakpoint.c:13710
 msgid ""
 "Delete some breakpoints or auto-display expressions.\n"
 "Arguments are breakpoint numbers with spaces in between.\n"
@@ -3292,14 +3306,14 @@
 "The \"unset\" command is also an alias for \"delete\"."
 msgstr ""
 
-#: breakpoint.c:12725
+#: breakpoint.c:13721
 msgid ""
 "Delete some breakpoints.\n"
 "Arguments are breakpoint numbers with spaces in between.\n"
 "To delete all breakpoints, give no argument.\n"
 msgstr ""
 
-#: breakpoint.c:12730
+#: breakpoint.c:13726
 msgid ""
 "Delete some breakpoints or auto-display expressions.\n"
 "Arguments are breakpoint numbers with spaces in between.\n"
@@ -3307,7 +3321,7 @@
 "This command may be abbreviated \"delete\"."
 msgstr ""
 
-#: breakpoint.c:12737
+#: breakpoint.c:13733
 msgid ""
 "Clear breakpoint at specified line or function.\n"
 "Argument may be line number, function name, or \"*\" and an address.\n"
@@ -3322,23 +3336,23 @@
 "See also the \"delete\" command which clears breakpoints by number."
 msgstr ""
 
-#: breakpoint.c:12750
+#: breakpoint.c:13746
 msgid "Set breakpoint at specified line or function.\n"
 msgstr ""
 
-#: breakpoint.c:12765
+#: breakpoint.c:13761
 msgid "Break in function/address or break at a line in the current file."
 msgstr ""
 
-#: breakpoint.c:12769
+#: breakpoint.c:13765
 msgid "Break in function or address."
 msgstr ""
 
-#: breakpoint.c:12771
+#: breakpoint.c:13767
 msgid "Break at a line in the current file."
 msgstr ""
 
-#: breakpoint.c:12772 breakpoint.c:12808
+#: breakpoint.c:13768 breakpoint.c:13804
 msgid ""
 "Status of user-settable breakpoints, or breakpoint number NUMBER.\n"
 "The \"Type\" column indicates one of:\n"
@@ -3360,7 +3374,7 @@
 "breakpoint set."
 msgstr ""
 
-#: breakpoint.c:12789
+#: breakpoint.c:13785
 msgid ""
 "Status of specified breakpoints (all user-settable breakpoints if no "
 "argument).\n"
@@ -3383,7 +3397,7 @@
 "breakpoint set."
 msgstr ""
 
-#: breakpoint.c:12824
+#: breakpoint.c:13820
 msgid ""
 "Status of all breakpoints, or breakpoint number NUMBER.\n"
 "The \"Type\" column indicates one of:\n"
@@ -3409,42 +3423,42 @@
 "breakpoint set."
 msgstr ""
 
-#: breakpoint.c:12845
+#: breakpoint.c:13841
 msgid "Set catchpoints to catch events."
 msgstr ""
 
 #. allow-unknown
-#: breakpoint.c:12850
+#: breakpoint.c:13846
 msgid "Set temporary catchpoints to catch events."
 msgstr ""
 
 #. allow-unknown
 #. Add catch and tcatch sub-commands.
-#: breakpoint.c:12856
+#: breakpoint.c:13852
 msgid ""
 "Catch an exception, when caught.\n"
 "With an argument, catch only exceptions with the given name."
 msgstr ""
 
-#: breakpoint.c:12863
+#: breakpoint.c:13859
 msgid ""
 "Catch an exception, when thrown.\n"
 "With an argument, catch only exceptions with the given name."
 msgstr ""
 
-#: breakpoint.c:12870
+#: breakpoint.c:13866
 msgid "Catch calls to fork."
 msgstr ""
 
-#: breakpoint.c:12875
+#: breakpoint.c:13871
 msgid "Catch calls to vfork."
 msgstr ""
 
-#: breakpoint.c:12880
+#: breakpoint.c:13876
 msgid "Catch calls to exec."
 msgstr ""
 
-#: breakpoint.c:12885
+#: breakpoint.c:13881
 msgid ""
 "Catch system calls by their names and/or numbers.\n"
 "Arguments say which system calls to catch.  If no arguments\n"
@@ -3453,19 +3467,7 @@
 "(if your system supports that), or system call numbers."
 msgstr ""
 
-#: breakpoint.c:12895
-msgid ""
-"Catch Ada exceptions, when raised.\n"
-"With an argument, catch only exceptions with the given name."
-msgstr ""
-
-#: breakpoint.c:12902
-msgid ""
-"Catch failed Ada assertions, when raised.\n"
-"With an argument, catch only exceptions with the given name."
-msgstr ""
-
-#: breakpoint.c:12910
+#: breakpoint.c:13892
 msgid ""
 "Set a watchpoint for an expression.\n"
 "Usage: watch [-l|-location] EXPRESSION\n"
@@ -3475,7 +3477,7 @@
 "the memory to which it refers."
 msgstr ""
 
-#: breakpoint.c:12919
+#: breakpoint.c:13901
 msgid ""
 "Set a read watchpoint for an expression.\n"
 "Usage: rwatch [-l|-location] EXPRESSION\n"
@@ -3485,7 +3487,7 @@
 "the memory to which it refers."
 msgstr ""
 
-#: breakpoint.c:12928
+#: breakpoint.c:13910
 msgid ""
 "Set a watchpoint for an expression.\n"
 "Usage: awatch [-l|-location] EXPRESSION\n"
@@ -3495,19 +3497,19 @@
 "the memory to which it refers."
 msgstr ""
 
-#: breakpoint.c:12937
+#: breakpoint.c:13919
 msgid "Status of specified watchpoints (all watchpoints if no argument)."
 msgstr ""
 
-#: breakpoint.c:12943
+#: breakpoint.c:13925
 msgid "Set debugger's willingness to use watchpoint hardware."
 msgstr ""
 
-#: breakpoint.c:12944
+#: breakpoint.c:13926
 msgid "Show debugger's willingness to use watchpoint hardware."
 msgstr ""
 
-#: breakpoint.c:12945
+#: breakpoint.c:13927
 msgid ""
 "If zero, gdb will not use hardware for new watchpoints, even if\n"
 "such is available.  (However, any hardware watchpoints that were\n"
@@ -3516,19 +3518,25 @@
 msgstr ""
 
 #. Tracepoint manipulation commands.
-#: breakpoint.c:12958
+#: breakpoint.c:13940
 msgid ""
 "Set a tracepoint at specified line or function.\n"
 "\n"
 msgstr ""
 
-#: breakpoint.c:12970
+#: breakpoint.c:13943 breakpoint.c:13955
+msgid ""
+"\n"
+"Do \"help tracepoints\" for info on other tracepoint commands."
+msgstr ""
+
+#: breakpoint.c:13952
 msgid ""
 "Set a fast tracepoint at specified line or function.\n"
 "\n"
 msgstr ""
 
-#: breakpoint.c:12977
+#: breakpoint.c:13959
 msgid ""
 "Set a static tracepoint at specified line, function or marker.\n"
 "\n"
@@ -3556,35 +3564,35 @@
 "Do \"help tracepoints\" for info on other tracepoint commands."
 msgstr ""
 
-#: breakpoint.c:13003
+#: breakpoint.c:13985
 msgid ""
 "Status of specified tracepoints (all tracepoints if no argument).\n"
 "Convenience variable \"$tpnum\" contains the number of the\n"
 "last tracepoint set."
 msgstr ""
 
-#: breakpoint.c:13010
+#: breakpoint.c:13992
 msgid ""
 "Delete specified tracepoints.\n"
 "Arguments are tracepoint numbers, separated by spaces.\n"
 "No argument means delete all tracepoints."
 msgstr ""
 
-#: breakpoint.c:13016
+#: breakpoint.c:13998
 msgid ""
 "Disable specified tracepoints.\n"
 "Arguments are tracepoint numbers, separated by spaces.\n"
 "No argument means disable all tracepoints."
 msgstr ""
 
-#: breakpoint.c:13023
+#: breakpoint.c:14005
 msgid ""
 "Enable specified tracepoints.\n"
 "Arguments are tracepoint numbers, separated by spaces.\n"
 "No argument means enable all tracepoints."
 msgstr ""
 
-#: breakpoint.c:13030
+#: breakpoint.c:14012
 msgid ""
 "Set the passcount for a tracepoint.\n"
 "The trace will end when the tracepoint has been passed 'count' times.\n"
@@ -3592,12 +3600,12 @@
 "if TPNUM is omitted, passcount refers to the last tracepoint defined."
 msgstr ""
 
-#: breakpoint.c:13037
+#: breakpoint.c:14019
 msgid "Save breakpoint definitions as a script."
 msgstr ""
 
 #. allow-unknown
-#: breakpoint.c:13041
+#: breakpoint.c:14023
 msgid ""
 "Save current breakpoint definitions as a script.\n"
 "This includes all types of breakpoints (breakpoints, watchpoints,\n"
@@ -3605,29 +3613,29 @@
 "session to restore them."
 msgstr ""
 
-#: breakpoint.c:13049
+#: breakpoint.c:14031
 msgid ""
 "Save current tracepoint definitions as a script.\n"
 "Use the 'source' command in another debug session to restore them."
 msgstr ""
 
 #. allow-unknown
-#: breakpoint.c:13058 breakpoint.c:13064
+#: breakpoint.c:14040 breakpoint.c:14046
 msgid ""
 "Breakpoint specific settings\n"
 "Configure various breakpoint-specific variables such as\n"
 "pending breakpoint behavior"
 msgstr ""
 
-#: breakpoint.c:13072
+#: breakpoint.c:14054
 msgid "Set debugger's behavior regarding pending breakpoints."
 msgstr ""
 
-#: breakpoint.c:13073
+#: breakpoint.c:14055
 msgid "Show debugger's behavior regarding pending breakpoints."
 msgstr ""
 
-#: breakpoint.c:13074
+#: breakpoint.c:14056
 msgid ""
 "If on, an unrecognized breakpoint location will cause gdb to create a\n"
 "pending breakpoint.  If off, an unrecognized breakpoint location results in\n"
@@ -3635,15 +3643,15 @@
 "user-query to see if a pending breakpoint should be created."
 msgstr ""
 
-#: breakpoint.c:13087
+#: breakpoint.c:14069
 msgid "Set automatic usage of hardware breakpoints."
 msgstr ""
 
-#: breakpoint.c:13088
+#: breakpoint.c:14070
 msgid "Show automatic usage of hardware breakpoints."
 msgstr ""
 
-#: breakpoint.c:13089
+#: breakpoint.c:14071
 msgid ""
 "If set, the debugger will automatically use hardware breakpoints for\n"
 "breakpoints set with \"break\" but falling in read-only memory.  If not "
@@ -3651,15 +3659,15 @@
 "a warning will be emitted for such breakpoints."
 msgstr ""
 
-#: breakpoint.c:13099
+#: breakpoint.c:14081
 msgid "Set mode for inserting breakpoints."
 msgstr ""
 
-#: breakpoint.c:13100
+#: breakpoint.c:14082
 msgid "Show mode for inserting breakpoints."
 msgstr ""
 
-#: breakpoint.c:13101
+#: breakpoint.c:14083
 msgid ""
 "When this mode is off, breakpoints are inserted in inferior when it is\n"
 "resumed, and removed when execution stops.  When this mode is on,\n"
@@ -3671,7 +3679,7 @@
 "inferior in all-stop mode, gdb behaves as if always-inserted mode is off."
 msgstr ""
 
-#: breakpoint.c:13115
+#: breakpoint.c:14097
 msgid ""
 "Set a breakpoint for an address range.\n"
 "break-range START-LOCATION, END-LOCATION\n"
@@ -3689,96 +3697,96 @@
 "range (including START-LOCATION and END-LOCATION)."
 msgstr ""
 
-#: bsd-kvm.c:155
+#: bsd-kvm.c:154
 #, possible-c-format
 msgid "\tUsing the kernel crash dump %s.\n"
 msgstr ""
 
-#: bsd-kvm.c:158
+#: bsd-kvm.c:157
 msgid "\tUsing the currently running kernel.\n"
 msgstr ""
 
 #. i18n: PCB == "Process Control Block".
-#: bsd-kvm.c:252
+#: bsd-kvm.c:251
 msgid "Cannot find a valid PCB"
 msgstr ""
 
-#: bsd-kvm.c:273
+#: bsd-kvm.c:272
 msgid "proc address"
 msgstr ""
 
-#: bsd-kvm.c:276 bsd-kvm.c:304
+#: bsd-kvm.c:275 bsd-kvm.c:303
 msgid "No kernel memory image."
 msgstr ""
 
 #. i18n: PCB == "Process Control Block".
-#: bsd-kvm.c:301
+#: bsd-kvm.c:300
 msgid "pcb address"
 msgstr ""
 
-#: bsd-kvm.c:346
+#: bsd-kvm.c:345
 msgid "Kernel memory interface"
 msgstr ""
 
-#: bsd-kvm.c:347
+#: bsd-kvm.c:346
 msgid ""
 "Use a kernel virtual memory image as a target.\n"
 "Optionally specify the filename of a core dump."
 msgstr ""
 
-#: bsd-kvm.c:364
+#: bsd-kvm.c:363
 msgid "Generic command for manipulating the kernel memory interface."
 msgstr ""
 
-#: bsd-kvm.c:370
+#: bsd-kvm.c:369
 msgid "Set current context from proc address"
 msgstr ""
 
 #. i18n: PCB == "Process Control Block".
-#: bsd-kvm.c:374
+#: bsd-kvm.c:373
 msgid "Set current context from pcb address"
 msgstr ""
 
-#: bsd-uthread.c:101
+#: bsd-uthread.c:100
 msgid "Bad magic"
 msgstr "Mauvaise magie, blah"
 
-#: buildsym.c:329
+#: buildsym.c:324
 #, possible-c-format
 msgid "block end address less than block start address in %s (patched it)"
 msgstr ""
 
-#: buildsym.c:336
+#: buildsym.c:331
 #, possible-c-format
 msgid "block end address %s less than block start address %s (patched it)"
 msgstr ""
 
-#: buildsym.c:369
+#: buildsym.c:364
 #, possible-c-format
 msgid "inner block not inside outer block in %s"
 msgstr ""
 
-#: buildsym.c:375
+#: buildsym.c:370
 #, possible-c-format
 msgid "inner block (%s-%s) not inside outer block (%s-%s)"
 msgstr ""
 
-#: buildsym.c:514
+#: buildsym.c:509
 #, possible-c-format
 msgid "block at %s out of order"
 msgstr ""
 
 #. We should always be able to find the objfile ...
-#: buildsym.c:688 buildsym.c:702 dbxread.c:3094 exec.c:444 exec.c:626
-#: language.c:514 language.c:912 mdebugread.c:3700 minsyms.c:161 monitor.c:327
-#: monitor.c:357 monitor.c:1321 printcmd.c:499 printcmd.c:835 printcmd.c:2663
-#: psymtab.c:673 psymtab.c:691 remote-mips.c:2702 target.c:916 target.c:1001
-#: target.c:1016 target.c:1043 utils.c:2389 utils.c:3283 utils.c:3326
-#: utils.c:3493 valprint.c:634
+#: buildsym.c:683 buildsym.c:697 dbxread.c:3096 exec.c:442 exec.c:624
+#: language.c:513 language.c:911 mdebugread.c:3705 minsyms.c:159 monitor.c:325
+#: monitor.c:355 monitor.c:1321 printcmd.c:495 printcmd.c:831 printcmd.c:2677
+#: psymtab.c:702 psymtab.c:720 remote-mips.c:2700 target.c:960 target.c:1045
+#: target.c:1060 target.c:1087 utils.c:2049 utils.c:2987 utils.c:3030
+#: utils.c:3197 valprint.c:639
 msgid "failed internal consistency check"
 msgstr ""
 
-#: buildsym.c:968
+#: buildsym.c:963
 msgid "Context stack not empty in end_symtab"
 msgstr ""
 
@@ -3786,309 +3794,191 @@
 msgid "Undefined string concatenation."
 msgstr ""
 
-#: c-exp.y:764 m2-exp.y:589 objc-exp.y:649 p-exp.y:668
+#: c-exp.y:764
+#, possible-c-format
+msgid "@entry can be used only for function parameters, not for \"%s\""
+msgstr ""
+
+#: c-exp.y:779 m2-exp.y:589 objc-exp.y:649 p-exp.y:667
 #, possible-c-format
 msgid "No symbol \"%s\" in specified context."
 msgstr ""
 
-#: c-exp.y:781 c-exp.y:797 objc-exp.y:664 objc-exp.y:678 p-exp.y:683
+#: c-exp.y:796 c-exp.y:812 objc-exp.y:664 objc-exp.y:678 p-exp.y:682
 #, possible-c-format
 msgid "`%s' is not defined as an aggregate type."
 msgstr ""
 
-#: c-exp.y:816
+#: c-exp.y:831
 #, possible-c-format
 msgid "No type \"%s\" within class or namespace \"%s\"."
 msgstr ""
 
-#: c-exp.y:847 c-exp.y:899 f-exp.y:522 m2-exp.y:638 objc-exp.y:724
-#: objc-exp.y:778 objc-exp.y:861 p-exp.y:720 p-exp.y:789 printcmd.c:1241
-#: valops.c:2693
+#: c-exp.y:862 c-exp.y:914 f-exp.y:521 m2-exp.y:638 objc-exp.y:724
+#: objc-exp.y:778 objc-exp.y:861 p-exp.y:719 p-exp.y:788 printcmd.c:1237
+#: valops.c:2697
 #, possible-c-format
 msgid "No symbol \"%s\" in current context."
 msgstr ""
 
-#: c-exp.y:1530 objc-exp.y:1105 p-exp.y:964
+#: c-exp.y:1545 objc-exp.y:1105 p-exp.y:963
 msgid "Numeric constant too large."
 msgstr ""
 
-#: c-exp.y:1630
+#: c-exp.y:1645
 msgid "\\x escape without a following hex digit"
 msgstr ""
 
-#: c-exp.y:1680
+#: c-exp.y:1695
 #, possible-c-format
 msgid "\\%c escape without a following hex digit"
 msgstr ""
 
-#: c-exp.y:1847 macroexp.c:398 objc-exp.y:1513 p-exp.y:1375
+#: c-exp.y:1862 macroexp.c:397 objc-exp.y:1513 p-exp.y:1374
 msgid "Unterminated string in expression."
 msgstr ""
 
-#: c-exp.y:1849 linespec.c:1019 macroexp.c:344 objc-exp.y:1283 p-exp.y:1204
+#: c-exp.y:1864 linespec.c:1058 macroexp.c:343 objc-exp.y:1283 p-exp.y:1203
 msgid "Unmatched single quote."
 msgstr ""
 
-#: c-exp.y:2221 f-exp.y:1102 m2-exp.y:955 objc-exp.y:1399 p-exp.y:1302
+#: c-exp.y:2236 f-exp.y:1101 m2-exp.y:955 objc-exp.y:1399 p-exp.y:1301
 #, possible-c-format
 msgid "Invalid number \"%s\"."
 msgstr ""
 
-#: c-exp.y:2264 objc-exp.y:1270 p-exp.y:1191
+#: c-exp.y:2293 objc-exp.y:1270 p-exp.y:1190
 msgid "Empty character constant."
 msgstr ""
 
-#: c-exp.y:2272 objc-exp.y:1288 p-exp.y:1210
+#: c-exp.y:2301 objc-exp.y:1288 p-exp.y:1209
 msgid "Invalid character constant."
 msgstr ""
 
 #. We must have come across a bad character (e.g. ';').
-#: c-exp.y:2281 f-exp.y:1136 m2-exp.y:964 objc-exp.y:1525 p-exp.y:1387
+#: c-exp.y:2310 f-exp.y:1135 m2-exp.y:964 objc-exp.y:1525 p-exp.y:1386
 #, possible-c-format
 msgid "Invalid character '%c' in expression."
 msgstr ""
 
-#: c-exp.y:2661 f-exp.y:1227 m2-exp.y:1093 objc-exp.y:1785 p-exp.y:1742
+#: c-exp.y:2690 f-exp.y:1226 m2-exp.y:1093 objc-exp.y:1785 p-exp.y:1741
 #, possible-c-format
 msgid "A %s in expression, near `%s'."
 msgstr ""
 
-#: c-lang.c:68 c-lang.c:1012
-msgid "unhandled c_string_type"
+#: charset.c:217
+#, possible-c-format
+msgid "The host character set is \"auto; currently %s\".\n"
 msgstr ""
 
-#: c-lang.c:731
+#: charset.c:220
 #, possible-c-format
-msgid "Error reading string from inferior: %s"
+msgid "The host character set is \"%s\".\n"
 msgstr ""
 
-#: c-lang.c:765
+#: charset.c:230
 #, possible-c-format
-msgid "Trying to read string with inappropriate type `%s'."
+msgid "The target character set is \"auto; currently %s\".\n"
 msgstr ""
 
-#: c-lang.c:769
-msgid "Trying to read string with inappropriate type."
+#: charset.c:234
+#, possible-c-format
+msgid "The target character set is \"%s\".\n"
 msgstr ""
 
-#: c-lang.c:870
-msgid "Malformed escape sequence"
+#: charset.c:247
+#, possible-c-format
+msgid "The target wide character set is \"auto; currently %s\".\n"
 msgstr ""
 
-#: c-lang.c:897
-msgid "\\x used with no following hex digits."
+#: charset.c:251
+#, possible-c-format
+msgid "The target wide character set is \"%s\".\n"
 msgstr ""
 
-#: c-lang.c:919
-msgid "\\u used with no following hex digits"
+#: charset.c:326 charset.c:332
+#, possible-c-format
+msgid "Cannot convert between character sets `%s' and `%s'"
 msgstr ""
 
-#: c-lang.c:1071
-msgid "Could not convert character constant to target character set"
+#: charset.c:488 charset.c:595
+msgid "Converting character sets"
 msgstr ""
 
-#. To avoid memory corruption.
-#: c-lang.c:1097 eval.c:992
-msgid "Too many array elements"
+#: charset.c:524
+#, possible-c-format
+msgid "Could not convert character to `%s' character set"
 msgstr ""
 
-#: c-typeprint.c:334
-msgid "type not handled in c_type_print_varspec_prefix()"
+#: charset.c:555 charset.c:696
+msgid "Internal error while converting character sets"
 msgstr ""
 
-#: c-typeprint.c:692
-msgid "type not handled in c_type_print_varspec_suffix()"
+#. No valid charset found, generate error here.
+#: charset.c:1002
+msgid "Unable to find a vaild charset for string conversions"
 msgstr ""
 
-#: c-typeprint.c:738 m2-typeprint.c:83
-msgid "<type unknown>"
+#: charset.c:1045
+msgid "Set the host and target character sets."
 msgstr ""
 
-#: c-typeprint.c:766
-msgid "<unnamed typedef>"
+#: charset.c:1046
+msgid "Show the host and target character sets."
 msgstr ""
 
-#: c-typeprint.c:826
-msgid "<incomplete type>\n"
+#: charset.c:1047
+msgid ""
+"The `host character set' is the one used by the system GDB is running on.\n"
+"The `target character set' is the one used by the program being debugged.\n"
+"You may only use supersets of ASCII for your host character set; GDB does\n"
+"not support any others.\n"
+"To see a list of the character sets GDB supports, type `set charset <TAB>'."
 msgstr ""
 
-#: c-typeprint.c:829
-msgid "<no data fields>\n"
+#: charset.c:1061
+msgid "Set the host character set."
 msgstr ""
 
-#: c-typeprint.c:1052
-#, possible-c-format
-msgid "<undefined type> %s;\n"
+#: charset.c:1062
+msgid "Show the host character set."
 msgstr ""
 
-#: c-typeprint.c:1095
-#, possible-c-format
-msgid "<badly mangled name '%s'>"
+#: charset.c:1063
+msgid ""
+"The `host character set' is the one used by the system GDB is running on.\n"
+"You may only use supersets of ASCII for your host character set; GDB does\n"
+"not support any others.\n"
+"To see a list of the character sets GDB supports, type `set host-charset "
+"<TAB>'."
 msgstr ""
 
-#: c-typeprint.c:1158
-#, possible-c-format
-msgid " (Local at %s:%d)\n"
+#: charset.c:1073
+msgid "Set the target character set."
 msgstr ""
 
-#: c-typeprint.c:1217
-msgid "struct <unknown>"
+#: charset.c:1074
+msgid "Show the target character set."
 msgstr ""
 
-#. This should not occur.
-#: c-typeprint.c:1226
-msgid "<range type>"
+#: charset.c:1075
+msgid ""
+"The `target character set' is the one used by the program being debugged.\n"
+"GDB translates characters and strings between the host and target\n"
+"character sets as needed.\n"
+"To see a list of the character sets GDB supports, type `set target-"
+"charset'<TAB>"
 msgstr ""
 
-#. At least for dump_symtab, it is important that this not
-#. be an error ().
-#: c-typeprint.c:1248
-#, possible-c-format
-msgid "<invalid type code %d>"
-msgstr ""
-
-#: c-valprint.c:177
-msgid "Could not determine the array high bound"
-msgstr ""
-
-#: c-valprint.c:227
-#, possible-c-format
-msgid "%d vtable entries"
-msgstr ""
-
-#. This happens (without TYPE_FLAG_STUB set) on systems which
-#. don't use dbx xrefs (NO_DBX_XREFS in gcc) if a file has a
-#. "struct foo *bar" and no complete type for struct foo in that
-#. file.
-#. This happens (without TYPE_FLAG_STUB set) on systems which don't use
-#. dbx xrefs (NO_DBX_XREFS in gcc) if a file has a "struct foo *bar"
-#. and no complete type for struct foo in that file.
-#: c-valprint.c:597 m2-valprint.c:581 m2-valprint.c:661 valprint.c:361
-msgid "<incomplete type>"
-msgstr ""
-
-#: c-valprint.c:626
-#, possible-c-format
-msgid "Invalid C/C++ type code %d in symbol table."
-msgstr ""
-
-#: c-valprint.c:743
-msgid " [incomplete object]"
-msgstr ""
-
-#: charset.c:218
-#, possible-c-format
-msgid "The host character set is \"auto; currently %s\".\n"
-msgstr ""
-
-#: charset.c:221
-#, possible-c-format
-msgid "The host character set is \"%s\".\n"
-msgstr ""
-
-#: charset.c:231
-#, possible-c-format
-msgid "The target character set is \"auto; currently %s\".\n"
-msgstr ""
-
-#: charset.c:235
-#, possible-c-format
-msgid "The target character set is \"%s\".\n"
-msgstr ""
-
-#: charset.c:248
-#, possible-c-format
-msgid "The target wide character set is \"auto; currently %s\".\n"
-msgstr ""
-
-#: charset.c:252
-#, possible-c-format
-msgid "The target wide character set is \"%s\".\n"
-msgstr ""
-
-#: charset.c:327 charset.c:333
-#, possible-c-format
-msgid "Cannot convert between character sets `%s' and `%s'"
-msgstr ""
-
-#: charset.c:489 charset.c:596
-msgid "Converting character sets"
-msgstr ""
-
-#: charset.c:525
-#, possible-c-format
-msgid "Could not convert character to `%s' character set"
-msgstr ""
-
-#: charset.c:556 charset.c:697
-msgid "Internal error while converting character sets"
-msgstr ""
-
-#. No valid charset found, generate error here.
-#: charset.c:986
-msgid "Unable to find a vaild charset for string conversions"
-msgstr ""
-
-#: charset.c:1029
-msgid "Set the host and target character sets."
-msgstr ""
-
-#: charset.c:1030
-msgid "Show the host and target character sets."
-msgstr ""
-
-#: charset.c:1031
-msgid ""
-"The `host character set' is the one used by the system GDB is running on.\n"
-"The `target character set' is the one used by the program being debugged.\n"
-"You may only use supersets of ASCII for your host character set; GDB does\n"
-"not support any others.\n"
-"To see a list of the character sets GDB supports, type `set charset <TAB>'."
-msgstr ""
-
-#: charset.c:1045
-msgid "Set the host character set."
-msgstr ""
-
-#: charset.c:1046
-msgid "Show the host character set."
-msgstr ""
-
-#: charset.c:1047
-msgid ""
-"The `host character set' is the one used by the system GDB is running on.\n"
-"You may only use supersets of ASCII for your host character set; GDB does\n"
-"not support any others.\n"
-"To see a list of the character sets GDB supports, type `set host-charset "
-"<TAB>'."
-msgstr ""
-
-#: charset.c:1057
-msgid "Set the target character set."
-msgstr ""
-
-#: charset.c:1058
-msgid "Show the target character set."
-msgstr ""
-
-#: charset.c:1059
-msgid ""
-"The `target character set' is the one used by the program being debugged.\n"
-"GDB translates characters and strings between the host and target\n"
-"character sets as needed.\n"
-"To see a list of the character sets GDB supports, type `set target-"
-"charset'<TAB>"
-msgstr ""
-
-#: charset.c:1070
+#: charset.c:1086
 msgid "Set the target wide character set."
 msgstr ""
 
-#: charset.c:1071
+#: charset.c:1087
 msgid "Show the target wide character set."
 msgstr ""
 
-#: charset.c:1072
+#: charset.c:1088
 msgid ""
 "The `target wide character set' is the one used by the program being "
 "debugged.\n"
@@ -4099,454 +3989,244 @@
 "`set target-wide-charset'<TAB>"
 msgstr ""
 
-#: cli/cli-utils.c:53
-msgid "History value must have integer type."
-msgstr ""
-
-#: cli/cli-utils.c:74
-msgid "Convenience variable must have integer value.\n"
-msgstr ""
-
-#: cli/cli-utils.c:151
-msgid "inverted range"
-msgstr ""
-
-#: cli/cli-utils.c:165
-msgid "negative value"
-msgstr "valeur négative"
-
-#: cli/cli-utils.c:207
-msgid "Args must be numbers or '$' variables."
-msgstr ""
-
-#: cli/cli-logging.c:46
-#, possible-c-format
-msgid "The current logfile is \"%s\".\n"
-msgstr ""
-
-#: cli/cli-logging.c:56
-#, possible-c-format
-msgid ""
-"Currently logging to %s.  Turn the logging off and on to make the new "
-"setting effective."
-msgstr ""
-
-#: cli/cli-logging.c:65
-#, possible-c-format
-msgid "Whether logging overwrites or appends to the log file is %s.\n"
-msgstr ""
-
-#: cli/cli-logging.c:110 cli/cli-logging.c:188 cli/cli-logging.c:198
-msgid "set logging"
-msgstr ""
-
-#: cli/cli-logging.c:133 cli/cli-logging.c:230 top.c:492
-msgid "Current output protocol does not support redirection"
-msgstr ""
-
-#: cli/cli-logging.c:143
-#, possible-c-format
-msgid "The logging output mode is %s.\n"
-msgstr ""
-
-#: cli/cli-logging.c:262
-msgid ""
-"\"set logging\" lets you log output to a file.\n"
-"Usage: set logging on [FILENAME]\n"
-"       set logging off\n"
-"       set logging file FILENAME\n"
-"       set logging overwrite [on|off]\n"
-"       set logging redirect [on|off]\n"
-msgstr ""
-
-#: cli/cli-logging.c:274
-#, possible-c-format
-msgid "Currently logging to \"%s\".\n"
-msgstr ""
-
-#: cli/cli-logging.c:277
-#, possible-c-format
-msgid "Future logs will be written to %s.\n"
-msgstr ""
-
-#: cli/cli-logging.c:281
-msgid "Logs will overwrite the log file.\n"
-msgstr ""
-
-#: cli/cli-logging.c:283
-msgid "Logs will be appended to the log file.\n"
-msgstr ""
-
-#: cli/cli-logging.c:288
-msgid "Output is being sent only to the log file.\n"
-msgstr ""
-
-#: cli/cli-logging.c:290
-msgid "Output is being logged and displayed.\n"
-msgstr ""
-
-#: cli/cli-logging.c:295
-msgid "Output will be sent only to the log file.\n"
-msgstr ""
-
-#: cli/cli-logging.c:297
-msgid "Output will be logged and displayed.\n"
-msgstr ""
-
-#: cli/cli-logging.c:310
-msgid "Set logging options"
-msgstr ""
-
-#: cli/cli-logging.c:313
-msgid "Show logging options"
-msgstr ""
-
-#: cli/cli-logging.c:315
-msgid "Set whether logging overwrites or appends to the log file."
-msgstr ""
-
-#: cli/cli-logging.c:316
-msgid "Show whether logging overwrites or appends to the log file."
-msgstr ""
-
-#: cli/cli-logging.c:317
-msgid "If set, logging overrides the log file."
-msgstr ""
-
-#: cli/cli-logging.c:322
-msgid "Set the logging output mode."
-msgstr ""
-
-#: cli/cli-logging.c:323
-msgid "Show the logging output mode."
-msgstr ""
-
-#: cli/cli-logging.c:324
-msgid ""
-"If redirect is off, output will go to both the screen and the log file.\n"
-"If redirect is on, output will go only to the log file."
-msgstr ""
-
-#: cli/cli-logging.c:330
-msgid "Set the current logfile."
-msgstr ""
-
-#: cli/cli-logging.c:331
-msgid "Show the current logfile."
-msgstr ""
-
-#: cli/cli-logging.c:332
-msgid "The logfile is used when directing GDB's output."
-msgstr ""
-
-#: cli/cli-logging.c:338
-msgid "Enable logging."
-msgstr ""
-
-#: cli/cli-logging.c:340
-msgid "Disable logging."
-msgstr ""
-
-#: cli/cli-script.c:91
-msgid "if/while commands require arguments."
-msgstr ""
-
-#: cli/cli-script.c:126
-msgid "Error reading in canned sequence of commands."
-msgstr ""
-
-#: cli/cli-script.c:328
-msgid "Max user call depth exceeded -- command aborted."
-msgstr ""
-
-#: cli/cli-script.c:347
-msgid "Error executing canned sequence of commands."
-msgstr ""
-
-#: cli/cli-script.c:574
-msgid "Invalid control type in canned commands structure."
-msgstr ""
-
-#: cli/cli-script.c:638
-msgid "arg_cleanup called with no user args.\n"
+#: c-lang.c:68 c-lang.c:616
+msgid "unhandled c_string_type"
 msgstr ""
 
-#: cli/cli-script.c:677
+#: c-lang.c:335
 #, possible-c-format
-msgid "user defined function may only have %d arguments."
+msgid "Error reading string from inferior: %s"
 msgstr ""
 
-#: cli/cli-script.c:776
+#: c-lang.c:369
 #, possible-c-format
-msgid "Missing argument %d in user function."
-msgstr ""
-
-#: cli/cli-script.c:876
-msgid "Control nesting too deep!"
-msgstr ""
-
-#: cli/cli-script.c:1072
-msgid "Recursed on a simple control type."
-msgstr ""
-
-#: cli/cli-script.c:1075
-msgid "Allocated body is smaller than this command type needs."
+msgid "Trying to read string with inappropriate type `%s'."
 msgstr ""
 
-#: cli/cli-script.c:1370
-msgid "name of command to define"
+#: c-lang.c:373
+msgid "Trying to read string with inappropriate type."
 msgstr ""
 
-#: cli/cli-script.c:1392
-#, possible-c-format
-msgid "\"%s\" is not a prefix command."
+#: c-lang.c:474
+msgid "Malformed escape sequence"
 msgstr ""
 
-#: cli/cli-script.c:1403
-#, possible-c-format
-msgid "Junk in argument list: \"%s\""
+#: c-lang.c:501
+msgid "\\x used with no following hex digits."
 msgstr ""
 
-#: cli/cli-script.c:1452
-#, possible-c-format
-msgid "Redefine command \"%s\"? "
+#: c-lang.c:523
+msgid "\\u used with no following hex digits"
 msgstr ""
 
-#: cli/cli-script.c:1454
-#, possible-c-format
-msgid "Really redefine built-in command \"%s\"? "
+#: c-lang.c:675
+msgid "Could not convert character constant to target character set"
 msgstr ""
 
-#: cli/cli-script.c:1456
-#, possible-c-format
-msgid "Command \"%s\" not redefined."
+#. To avoid memory corruption.
+#: c-lang.c:701 eval.c:1011
+msgid "Too many array elements"
 msgstr ""
 
-#: cli/cli-script.c:1483
+#: cli/cli-cmds.c:219
 #, possible-c-format
-msgid "Your new `%s' command does not hook any existing command."
+msgid "Argument required (%s)."
 msgstr ""
 
-#: cli/cli-script.c:1486
-msgid "Proceed? "
+#: cli/cli-cmds.c:229
+msgid "\"info\" must be followed by the name of an info command.\n"
 msgstr ""
 
-#: cli/cli-script.c:1487 cli/cli-cmds.c:341 infcmd.c:1119 infcmd.c:1133
-#: infcmd.c:2236 symfile.c:1104 symfile.c:1269 symfile.c:2359
-#: tracepoint.c:1915 tracepoint.c:1921
+#: cli/cli-cmds.c:336 cli/cli-script.c:1501 infcmd.c:1140 infcmd.c:1154
+#: infcmd.c:2288 symfile.c:1103 symfile.c:1268 symfile.c:2360
+#: tracepoint.c:2165 tracepoint.c:2171
 msgid "Not confirmed."
 msgstr ""
 
-#. Should never come here as hookc would be 0.
-#: cli/cli-script.c:1527 complaints.c:305 exceptions.c:153 exceptions.c:170
-#: exceptions.c:197 exceptions.c:263 hppa-tdep.c:3099 hppa-tdep.c:3112
-#: infcall.c:672 infcmd.c:1415 infrun.c:3238 language.c:798 language.c:824
-#: mi/mi-out.c:332 mi/mi-out.c:351 mips-tdep.c:256 mips-tdep.c:313
-#: mips-tdep.c:1427 mips-tdep.c:4118 mips-tdep.c:5105 mn10300-tdep.c:127
-#: reggroups.c:220 remote.c:6408 utils.c:1187 utils.c:1206
-msgid "bad switch"
-msgstr ""
-
-#: cli/cli-script.c:1547
-#, possible-c-format
-msgid "Command \"%s\" is built-in."
-msgstr ""
-
-#: cli/cli-script.c:1614
-msgid "called with NULL file pointer!"
-msgstr ""
-
-#: cli/cli-script.c:1642
-#, possible-c-format
-msgid ""
-"%s:%d: Error in sourced command file:\n"
-"%s"
-msgstr ""
-
-#: cli/cli-script.c:1645
-msgid "bad reason"
-msgstr ""
-
-#: cli/cli-decode.c:1297
-#, possible-c-format
-msgid "Undefined %scommand: \"%s\".  Try \"help%s%.*s\"."
-msgstr ""
-
-#: cli/cli-decode.c:1330
-#, possible-c-format
-msgid "Lack of needed %scommand"
-msgstr ""
-
-#: cli/cli-decode.c:1395
-#, possible-c-format
-msgid "Ambiguous %scommand \"%s\": %s."
-msgstr ""
-
-#: cli/cli-decode.c:1779
-msgid "Invalid command"
-msgstr ""
-
-#: cli/cli-cmds.c:214
-#, possible-c-format
-msgid "Argument required (%s)."
-msgstr ""
-
-#: cli/cli-cmds.c:224
-msgid "\"info\" must be followed by the name of an info command.\n"
-msgstr ""
-
-#: cli/cli-cmds.c:352
+#: cli/cli-cmds.c:347
 #, possible-c-format
 msgid "The \"pwd\" command does not take an argument: %s"
 msgstr ""
 
-#: cli/cli-cmds.c:354
+#: cli/cli-cmds.c:349
 #, possible-c-format
 msgid "Error finding name of working directory: %s"
 msgstr ""
 
-#: cli/cli-cmds.c:358
+#: cli/cli-cmds.c:353
 #, possible-c-format
 msgid ""
 "Working directory %s\n"
 " (canonically %s).\n"
 msgstr ""
 
-#: cli/cli-cmds.c:361
+#: cli/cli-cmds.c:356
 #, possible-c-format
 msgid "Working directory %s.\n"
 msgstr ""
 
-#: cli/cli-cmds.c:377
+#: cli/cli-cmds.c:372
 msgid "new working directory"
 msgstr ""
 
-#: cli/cli-cmds.c:473
+#: cli/cli-cmds.c:468
 #, possible-c-format
 msgid "Script filename extension recognition is \"%s\".\n"
 msgstr ""
 
-#: cli/cli-cmds.c:575
+#: cli/cli-cmds.c:572
 msgid "source command requires file name of file to source."
 msgstr ""
 
-#: cli/cli-cmds.c:756
+#: cli/cli-cmds.c:757
 msgid "Fork failed"
 msgstr ""
 
-#: cli/cli-cmds.c:782
+#: cli/cli-cmds.c:783
 msgid "No default source file yet."
 msgstr ""
 
-#: cli/cli-cmds.c:808 cli/cli-cmds.c:970
+#: cli/cli-cmds.c:810 cli/cli-cmds.c:975
 msgid "Junk at end of line specification."
 msgstr ""
 
 #. FIXME-32x64--assumes sal.pc fits in long.
-#: cli/cli-cmds.c:820 cli/cli-cmds.c:989
+#: cli/cli-cmds.c:822 cli/cli-cmds.c:994
 #, possible-c-format
 msgid "No source file for address %s."
 msgstr ""
 
-#: cli/cli-cmds.c:840 cli/cli-cmds.c:1010
+#: cli/cli-cmds.c:842 cli/cli-cmds.c:1015
 #, possible-c-format
 msgid "No line number known for %s."
 msgstr ""
 
-#: cli/cli-cmds.c:974
+#: cli/cli-cmds.c:979
 msgid "Specified start and end are in different files."
 msgstr ""
 
-#: cli/cli-cmds.c:976
+#: cli/cli-cmds.c:981
 msgid "Two empty args do not say what lines to list."
 msgstr ""
 
-#: cli/cli-cmds.c:1019 cli/cli-cmds.c:1025
+#: cli/cli-cmds.c:1024 cli/cli-cmds.c:1030
 msgid "No default source file yet.  Do \"help list\"."
 msgstr ""
 
 #. Assume g++ compiled code; old GDB 4.16 behaviour.
-#: cli/cli-cmds.c:1091 dwarf2loc.c:1002 python/py-symbol.c:278 stack.c:1740
-#: stack.c:1748 stack.c:1822 valops.c:1495
+#: cli/cli-cmds.c:1096 dwarf2loc.c:1862 python/py-symbol.c:295 stack.c:2050
+#: stack.c:2058 stack.c:2132 valops.c:1499
 msgid "No frame selected."
 msgstr ""
 
-#: cli/cli-cmds.c:1095 tui/tui-stack.c:383
+#: cli/cli-cmds.c:1100
 msgid "No function contains program counter for selected frame."
 msgstr ""
 
-#: cli/cli-cmds.c:1139
+#: cli/cli-cmds.c:1144
 msgid "Missing modifier."
 msgstr ""
 
-#: cli/cli-cmds.c:1152
+#: cli/cli-cmds.c:1157
 msgid "Invalid disassembly modifier."
 msgstr ""
 
-#: cli/cli-cmds.c:1174
+#: cli/cli-cmds.c:1179
 msgid "No function contains specified address."
 msgstr ""
 
-#: cli/cli-cmds.c:1234
-msgid "Not a user command."
+#: cli/cli-cmds.c:1239
+msgid "Not a user command."
+msgstr ""
+
+#: cli/cli-cmds.c:1262
+msgid "REGEXP string is empty"
+msgstr ""
+
+#: cli/cli-cmds.c:1278
+#, possible-c-format
+msgid "Error in regular expression: %s"
+msgstr ""
+
+#: cli/cli-cmds.c:1340
+msgid "Usage: alias [-a] [--] ALIAS = COMMAND"
+msgstr ""
+
+#: cli/cli-cmds.c:1379
+#, possible-c-format
+msgid "Invalid command name: %s"
+msgstr ""
+
+#: cli/cli-cmds.c:1381
+#, possible-c-format
+msgid "Invalid command element name: %s"
+msgstr ""
+
+#: cli/cli-cmds.c:1395
+#, possible-c-format
+msgid "Invalid command to alias to: %s"
+msgstr ""
+
+#: cli/cli-cmds.c:1402
+#, possible-c-format
+msgid "Alias already exists: %s"
 msgstr ""
 
-#: cli/cli-cmds.c:1257
-msgid "REGEXP string is empty"
+#: cli/cli-cmds.c:1427
+msgid "Mismatched command length between ALIAS and COMMAND."
 msgstr ""
 
-#: cli/cli-cmds.c:1273
-#, possible-c-format
-msgid "Error in regular expression: %s"
+#: cli/cli-cmds.c:1447
+msgid "ALIAS and COMMAND prefixes do not match."
 msgstr ""
 
-#: cli/cli-cmds.c:1288
+#: cli/cli-cmds.c:1467
 #, possible-c-format
 msgid "file: \"%s\", line number: %d\n"
 msgstr ""
 
-#: cli/cli-cmds.c:1295
+#: cli/cli-cmds.c:1553
 msgid "\"set debug\" must be followed by the name of a debug subcommand.\n"
 msgstr ""
 
-#: cli/cli-cmds.c:1342
+#: cli/cli-cmds.c:1601
 #, possible-c-format
 msgid "Verbose printing of informational messages is %s.\n"
 msgstr ""
 
-#: cli/cli-cmds.c:1345
+#: cli/cli-cmds.c:1604
 #, possible-c-format
 msgid "Verbosity is %s.\n"
 msgstr ""
 
-#: cli/cli-cmds.c:1352
+#: cli/cli-cmds.c:1611
 #, possible-c-format
 msgid "History expansion on command input is %s.\n"
 msgstr ""
 
-#: cli/cli-cmds.c:1360
+#: cli/cli-cmds.c:1619
 #, possible-c-format
 msgid "Baud rate for remote serial I/O is %s.\n"
 msgstr ""
 
-#: cli/cli-cmds.c:1368
+#: cli/cli-cmds.c:1627
 #, possible-c-format
 msgid "Debugging of remote protocol is %s.\n"
 msgstr ""
 
-#: cli/cli-cmds.c:1377
+#: cli/cli-cmds.c:1636
 #, possible-c-format
 msgid "Timeout limit to wait for target to respond is %s.\n"
 msgstr ""
 
-#: cli/cli-cmds.c:1386
+#: cli/cli-cmds.c:1645
 #, possible-c-format
 msgid "The max call depth for user-defined commands is %s.\n"
 msgstr ""
 
 #. Define the classes of commands.
-#. They will appear in the help list in the reverse of this order.
-#: cli/cli-cmds.c:1400
+#. They will appear in the help list in alphabetical order.
+#: cli/cli-cmds.c:1659
 msgid ""
 "Maintenance commands.\n"
 "Some gdb commands are provided just for use by gdb maintainers.\n"
@@ -4554,42 +4234,42 @@
 "well documented as user commands."
 msgstr ""
 
-#: cli/cli-cmds.c:1406
+#: cli/cli-cmds.c:1665
 msgid "Obscure features."
 msgstr ""
 
-#: cli/cli-cmds.c:1408
+#: cli/cli-cmds.c:1667
 msgid "Aliases of other commands."
 msgstr ""
 
-#: cli/cli-cmds.c:1409
+#: cli/cli-cmds.c:1668
 msgid ""
 "User-defined commands.\n"
 "The commands in this class are those defined by the user.\n"
 "Use the \"define\" command to define a command."
 msgstr ""
 
-#: cli/cli-cmds.c:1413
+#: cli/cli-cmds.c:1672
 msgid "Support facilities."
 msgstr ""
 
-#: cli/cli-cmds.c:1415
+#: cli/cli-cmds.c:1674
 msgid "Status inquiries."
 msgstr ""
 
-#: cli/cli-cmds.c:1416
+#: cli/cli-cmds.c:1675
 msgid "Specifying and examining files."
 msgstr ""
 
-#: cli/cli-cmds.c:1419
+#: cli/cli-cmds.c:1678
 msgid "Making program stop at certain points."
 msgstr ""
 
-#: cli/cli-cmds.c:1420
+#: cli/cli-cmds.c:1679
 msgid "Examining data."
 msgstr ""
 
-#: cli/cli-cmds.c:1421
+#: cli/cli-cmds.c:1680
 msgid ""
 "Examining the stack.\n"
 "The stack is made up of stack frames.  Gdb assigns numbers to stack frames\n"
@@ -4601,23 +4281,23 @@
 "The commands below can be used to select other frames by number or address."
 msgstr ""
 
-#: cli/cli-cmds.c:1430
+#: cli/cli-cmds.c:1689
 msgid "Running the program."
 msgstr ""
 
 #. Define general commands.
-#: cli/cli-cmds.c:1434
+#: cli/cli-cmds.c:1693
 msgid "Print working directory.  This is used for your program as well."
 msgstr ""
 
-#: cli/cli-cmds.c:1437
+#: cli/cli-cmds.c:1696
 msgid ""
 "Set working directory to DIR for debugger and program being debugged.\n"
 "The change does not take effect for the program being debugged\n"
 "until the next time it is started."
 msgstr ""
 
-#: cli/cli-cmds.c:1443
+#: cli/cli-cmds.c:1702
 msgid ""
 "Print a constant string.  Give string as argument.\n"
 "C escape sequences may be used in the argument.\n"
@@ -4628,14 +4308,14 @@
 "to be printed or after trailing whitespace."
 msgstr ""
 
-#: cli/cli-cmds.c:1451
+#: cli/cli-cmds.c:1710
 msgid ""
 "Document a user-defined command.\n"
 "Give command name as argument.  Give documentation on following lines.\n"
 "End with a line of just \"end\"."
 msgstr ""
 
-#: cli/cli-cmds.c:1455
+#: cli/cli-cmds.c:1714
 msgid ""
 "Define a new command name.  Command name is argument.\n"
 "Definition appears on following lines, one command per line.\n"
@@ -4644,7 +4324,7 @@
 "Commands defined in this way may have up to ten arguments."
 msgstr ""
 
-#: cli/cli-cmds.c:1462
+#: cli/cli-cmds.c:1721
 #, possible-c-format
 msgid ""
 "Read commands from a file named FILE.\n"
@@ -4658,15 +4338,15 @@
 "when GDB is started."
 msgstr ""
 
-#: cli/cli-cmds.c:1477
+#: cli/cli-cmds.c:1736
 msgid "Set mode for script filename extension recognition."
 msgstr ""
 
-#: cli/cli-cmds.c:1478
+#: cli/cli-cmds.c:1737
 msgid "Show mode for script filename extension recognition."
 msgstr ""
 
-#: cli/cli-cmds.c:1479
+#: cli/cli-cmds.c:1738
 msgid ""
 "off  == no filename extension recognition (all sourced files are GDB "
 "scripts)\n"
@@ -4676,71 +4356,71 @@
 "supported"
 msgstr ""
 
-#: cli/cli-cmds.c:1489
+#: cli/cli-cmds.c:1748
 msgid "Exit gdb."
 msgstr ""
 
-#: cli/cli-cmds.c:1491
+#: cli/cli-cmds.c:1750
 msgid "Print list of commands."
 msgstr ""
 
-#: cli/cli-cmds.c:1496
+#: cli/cli-cmds.c:1755
 msgid "Set verbosity."
 msgstr ""
 
-#: cli/cli-cmds.c:1497
+#: cli/cli-cmds.c:1756
 msgid "Show verbosity."
 msgstr ""
 
-#: cli/cli-cmds.c:1504
+#: cli/cli-cmds.c:1763
 msgid "Generic command for setting command history parameters."
 msgstr ""
 
-#: cli/cli-cmds.c:1507
+#: cli/cli-cmds.c:1766
 msgid "Generic command for showing command history parameters."
 msgstr ""
 
-#: cli/cli-cmds.c:1510
+#: cli/cli-cmds.c:1769
 msgid "Set history expansion on command input."
 msgstr ""
 
-#: cli/cli-cmds.c:1511
+#: cli/cli-cmds.c:1770
 msgid "Show history expansion on command input."
 msgstr ""
 
-#: cli/cli-cmds.c:1512
+#: cli/cli-cmds.c:1771
 msgid "Without an argument, history expansion is enabled."
 msgstr ""
 
-#: cli/cli-cmds.c:1518
+#: cli/cli-cmds.c:1777
 msgid "Generic command for showing things about the program being debugged."
 msgstr ""
 
-#: cli/cli-cmds.c:1525
+#: cli/cli-cmds.c:1784
 msgid "List the completions for the rest of the line as a command."
 msgstr ""
 
-#: cli/cli-cmds.c:1527
+#: cli/cli-cmds.c:1786
 msgid "Generic command for showing things about the debugger."
 msgstr ""
 
 #. Another way to get at the same thing.
-#: cli/cli-cmds.c:1531
+#: cli/cli-cmds.c:1790
 msgid "Show all GDB settings."
 msgstr ""
 
-#: cli/cli-cmds.c:1533
+#: cli/cli-cmds.c:1792
 msgid ""
 "Show the history of commands you typed.\n"
 "You can supply a command number to start with, or a `+' to start after\n"
 "the previous command number shown."
 msgstr ""
 
-#: cli/cli-cmds.c:1540
+#: cli/cli-cmds.c:1799
 msgid "Show what version of GDB this is."
 msgstr ""
 
-#: cli/cli-cmds.c:1542
+#: cli/cli-cmds.c:1801
 msgid ""
 "Execute nested commands WHILE the conditional expression is non zero.\n"
 "The conditional expression must follow the word `while' and must in turn be\n"
@@ -4748,7 +4428,7 @@
 "and should be terminated by the word `end'."
 msgstr ""
 
-#: cli/cli-cmds.c:1548
+#: cli/cli-cmds.c:1807
 msgid ""
 "Execute nested commands once IF the conditional expression is non zero.\n"
 "The conditional expression must follow the word `if' and must in turn be\n"
@@ -4759,63 +4439,63 @@
 
 #. If target is open when baud changes, it doesn't take effect until
 #. the next open (I think, not sure).
-#: cli/cli-cmds.c:1557
+#: cli/cli-cmds.c:1816
 msgid "Set baud rate for remote serial I/O."
 msgstr ""
 
-#: cli/cli-cmds.c:1558
+#: cli/cli-cmds.c:1817
 msgid "Show baud rate for remote serial I/O."
 msgstr ""
 
-#: cli/cli-cmds.c:1559
+#: cli/cli-cmds.c:1818
 msgid ""
 "This value is used to set the speed of the serial port when debugging\n"
 "using remote targets."
 msgstr ""
 
-#: cli/cli-cmds.c:1566
+#: cli/cli-cmds.c:1825
 msgid "Set debugging of remote protocol."
 msgstr ""
 
-#: cli/cli-cmds.c:1567
+#: cli/cli-cmds.c:1826
 msgid "Show debugging of remote protocol."
 msgstr ""
 
-#: cli/cli-cmds.c:1568
+#: cli/cli-cmds.c:1827
 msgid ""
 "When enabled, each packet sent or received with the remote target\n"
 "is displayed."
 msgstr ""
 
-#: cli/cli-cmds.c:1575
+#: cli/cli-cmds.c:1834
 msgid "Set timeout limit to wait for target to respond."
 msgstr ""
 
-#: cli/cli-cmds.c:1576
+#: cli/cli-cmds.c:1835
 msgid "Show timeout limit to wait for target to respond."
 msgstr ""
 
-#: cli/cli-cmds.c:1577
+#: cli/cli-cmds.c:1836
 msgid ""
 "This value is used to set the time limit for gdb to wait for a response\n"
 "from the target."
 msgstr ""
 
-#: cli/cli-cmds.c:1585
+#: cli/cli-cmds.c:1844
 msgid "Generic command for setting gdb debugging flags"
 msgstr ""
 
-#: cli/cli-cmds.c:1589
+#: cli/cli-cmds.c:1848
 msgid "Generic command for showing gdb debugging flags"
 msgstr ""
 
-#: cli/cli-cmds.c:1592
+#: cli/cli-cmds.c:1851
 msgid ""
 "Execute the rest of the line as a shell command.\n"
 "With no arguments, run an inferior shell."
 msgstr ""
 
-#: cli/cli-cmds.c:1597
+#: cli/cli-cmds.c:1856
 msgid ""
 "Edit specified file or function.\n"
 "With no argument, edits file containing most recent line listed.\n"
@@ -4827,7 +4507,7 @@
 "Uses EDITOR environment variable contents as editor (or ex as default)."
 msgstr ""
 
-#: cli/cli-cmds.c:1609
+#: cli/cli-cmds.c:1868
 msgid ""
 "List specified function or line.\n"
 "With no argument, lists ten more lines after or around previous listing.\n"
@@ -4844,7 +4524,7 @@
 "arg."
 msgstr ""
 
-#: cli/cli-cmds.c:1632
+#: cli/cli-cmds.c:1891
 msgid ""
 "Disassemble a specified section of memory.\n"
 "Default is the function surrounding the pc of the selected frame.\n"
@@ -4856,394 +4536,705 @@
 "  in the form of \"start,end\", or \"start,+length\"."
 msgstr ""
 
-#: cli/cli-cmds.c:1653
+#: cli/cli-cmds.c:1905
 msgid "Run the ``make'' program using the rest of the line as arguments."
 msgstr ""
 
-#: cli/cli-cmds.c:1656
+#: cli/cli-cmds.c:1908
 msgid ""
 "Show definitions of user defined commands.\n"
 "Argument is the name of the user defined command.\n"
 "With no argument, show definitions of all user defined commands."
 msgstr ""
 
-#: cli/cli-cmds.c:1661
+#: cli/cli-cmds.c:1913
 msgid "Search for commands matching a REGEXP"
 msgstr ""
 
-#: cli/cli-cmds.c:1664
+#: cli/cli-cmds.c:1916
 msgid "Set the max call depth for user-defined commands."
 msgstr ""
 
-#: cli/cli-cmds.c:1665
+#: cli/cli-cmds.c:1917
 msgid "Show the max call depth for user-defined commands."
 msgstr ""
 
-#: cli/cli-cmds.c:1671
+#: cli/cli-cmds.c:1923
 msgid "Set tracing of GDB CLI commands."
 msgstr ""
 
-#: cli/cli-cmds.c:1672
+#: cli/cli-cmds.c:1924
 msgid "Show state of GDB CLI command tracing."
 msgstr ""
 
-#: cli/cli-cmds.c:1673
+#: cli/cli-cmds.c:1925
 msgid "When 'on', each command is displayed as it is executed."
 msgstr ""
 
-#: cli/cli-dump.c:76
+#: cli/cli-cmds.c:1931
+msgid ""
+"Define a new command that is an alias of an existing command.\n"
+"Usage: alias [-a] [--] ALIAS = COMMAND\n"
+"ALIAS is the name of the alias command to create.\n"
+"COMMAND is the command being aliased to.\n"
+"If \"-a\" is specified, the command is an abbreviation,\n"
+"and will not appear in help command list output.\n"
+"\n"
+"Examples:\n"
+"Make \"spe\" an alias of \"set print elements\":\n"
+"  alias spe = set print elements\n"
+"Make \"elms\" an alias of \"elements\" in the \"set print\" command:\n"
+"  alias -a set print elms = set print elements"
+msgstr ""
+
+#: cli/cli-decode.c:1330
+#, possible-c-format
+msgid "Undefined %scommand: \"%s\".  Try \"help%s%.*s\"."
+msgstr ""
+
+#: cli/cli-decode.c:1363
+#, possible-c-format
+msgid "Lack of needed %scommand"
+msgstr ""
+
+#: cli/cli-decode.c:1428
+#, possible-c-format
+msgid "Ambiguous %scommand \"%s\": %s."
+msgstr ""
+
+#: cli/cli-decode.c:1812
+msgid "Invalid command"
+msgstr ""
+
+#: cli/cli-dump.c:75
 msgid "Missing filename."
 msgstr ""
 
-#: cli/cli-dump.c:117 cli/cli-dump.c:137
+#: cli/cli-dump.c:116 cli/cli-dump.c:136
 #, possible-c-format
 msgid "Failed to open %s: %s."
 msgstr ""
 
-#: cli/cli-dump.c:122
+#: cli/cli-dump.c:121
 #, possible-c-format
 msgid "'%s' is not a recognized file format."
 msgstr ""
 
-#: cli/cli-dump.c:141
+#: cli/cli-dump.c:140
 #, possible-c-format
 msgid "bfd_openw_with_cleanup: %s."
 msgstr ""
 
-#. Append to existing file.
-#. FIXME -- doesn't work...
-#: cli/cli-dump.c:145
-msgid "bfd_openw does not work with append."
+#. Append to existing file.
+#. FIXME -- doesn't work...
+#: cli/cli-dump.c:144
+msgid "bfd_openw does not work with append."
+msgstr ""
+
+#: cli/cli-dump.c:147
+#, possible-c-format
+msgid "bfd_openw_with_cleanup: unknown mode %s."
+msgstr ""
+
+#: cli/cli-dump.c:163
+msgid ""
+"\"dump\" must be followed by a subcommand.\n"
+"\n"
+msgstr ""
+
+#: cli/cli-dump.c:170
+msgid ""
+"\"append\" must be followed by a subcommand.\n"
+"\n"
+msgstr ""
+
+#: cli/cli-dump.c:205
+#, possible-c-format
+msgid "writing dump file '%s' (%s)"
+msgstr ""
+
+#: cli/cli-dump.c:226
+msgid "Missing start address."
+msgstr ""
+
+#: cli/cli-dump.c:231
+msgid "Missing stop address."
+msgstr ""
+
+#: cli/cli-dump.c:237
+msgid "Invalid memory address range (start >= end)."
+msgstr ""
+
+#: cli/cli-dump.c:277
+#, possible-c-format
+msgid "No value to %s."
+msgstr ""
+
+#: cli/cli-dump.c:280
+msgid "Invalid expression."
+msgstr ""
+
+#: cli/cli-dump.c:299
+msgid "value is not an lval: address assumed to be zero"
+msgstr ""
+
+#. No, no useable data in this section.
+#: cli/cli-dump.c:459
+#, possible-c-format
+msgid "skipping section %s...\n"
+msgstr ""
+
+#: cli/cli-dump.c:478
+#, possible-c-format
+msgid "Failed to read bfd file %s: '%s'."
+msgstr ""
+
+#: cli/cli-dump.c:501 cli/cli-dump.c:553
+#, possible-c-format
+msgid "restore: memory write failed (%s)."
+msgstr ""
+
+#: cli/cli-dump.c:524
+#, possible-c-format
+msgid "Start address is greater than length of binary file %s."
+msgstr ""
+
+#: cli/cli-dump.c:599
+msgid "Start must be less than end."
+msgstr ""
+
+#: cli/cli-dump.c:668
+msgid "Dump target code/data to a local file."
+msgstr ""
+
+#: cli/cli-dump.c:673
+msgid "Append target code/data to a local file."
+msgstr ""
+
+#: cli/cli-dump.c:689
+msgid "Write target code/data to an srec file."
+msgstr ""
+
+#: cli/cli-dump.c:695
+msgid "Write target code/data to an intel hex file."
+msgstr ""
+
+#: cli/cli-dump.c:701
+msgid "Write target code/data to a tekhex file."
+msgstr ""
+
+#: cli/cli-dump.c:707
+msgid "Write target code/data to a raw binary file."
+msgstr ""
+
+#: cli/cli-dump.c:713
+msgid "Append target code/data to a raw binary file."
+msgstr ""
+
+#: cli/cli-dump.c:718
+msgid ""
+"Write contents of memory to an srec file.\n"
+"Arguments are FILE START STOP.  Writes the contents of memory\n"
+"within the range [START .. STOP) to the specified FILE in srec format."
+msgstr ""
+
+#: cli/cli-dump.c:724
+msgid ""
+"Write the value of an expression to an srec file.\n"
+"Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n"
+"to the specified FILE in srec format."
+msgstr ""
+
+#: cli/cli-dump.c:730
+msgid ""
+"Write contents of memory to an ihex file.\n"
+"Arguments are FILE START STOP.  Writes the contents of memory within\n"
+"the range [START .. STOP) to the specified FILE in intel hex format."
+msgstr ""
+
+#: cli/cli-dump.c:736
+msgid ""
+"Write the value of an expression to an ihex file.\n"
+"Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n"
+"to the specified FILE in intel hex format."
+msgstr ""
+
+#: cli/cli-dump.c:742
+msgid ""
+"Write contents of memory to a tekhex file.\n"
+"Arguments are FILE START STOP.  Writes the contents of memory\n"
+"within the range [START .. STOP) to the specified FILE in tekhex format."
+msgstr ""
+
+#: cli/cli-dump.c:748
+msgid ""
+"Write the value of an expression to a tekhex file.\n"
+"Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n"
+"to the specified FILE in tekhex format."
+msgstr ""
+
+#: cli/cli-dump.c:754
+msgid ""
+"Write contents of memory to a raw binary file.\n"
+"Arguments are FILE START STOP.  Writes the contents of memory\n"
+"within the range [START .. STOP) to the specified FILE in binary format."
+msgstr ""
+
+#: cli/cli-dump.c:760
+msgid ""
+"Write the value of an expression to a raw binary file.\n"
+"Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n"
+"to the specified FILE in raw target ordered bytes."
+msgstr ""
+
+#: cli/cli-dump.c:766
+msgid ""
+"Append contents of memory to a raw binary file.\n"
+"Arguments are FILE START STOP.  Writes the contents of memory within the\n"
+"range [START .. STOP) to the specified FILE in raw target ordered bytes."
+msgstr ""
+
+#: cli/cli-dump.c:772
+msgid ""
+"Append the value of an expression to a raw binary file.\n"
+"Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n"
+"to the specified FILE in raw target ordered bytes."
+msgstr ""
+
+#: cli/cli-dump.c:778
+msgid ""
+"Restore the contents of FILE to target memory.\n"
+"Arguments are FILE OFFSET START END where all except FILE are optional.\n"
+"OFFSET will be added to the base address of the file (default zero).\n"
+"If START and END are given, only the file contents within that range\n"
+"(file relative) will be restored to target memory."
+msgstr ""
+
+#: cli/cli-logging.c:45
+#, possible-c-format
+msgid "The current logfile is \"%s\".\n"
+msgstr ""
+
+#: cli/cli-logging.c:55
+#, possible-c-format
+msgid ""
+"Currently logging to %s.  Turn the logging off and on to make the new "
+"setting effective."
+msgstr ""
+
+#: cli/cli-logging.c:64
+#, possible-c-format
+msgid "Whether logging overwrites or appends to the log file is %s.\n"
+msgstr ""
+
+#: cli/cli-logging.c:110 cli/cli-logging.c:188 cli/cli-logging.c:198
+msgid "set logging"
+msgstr ""
+
+#: cli/cli-logging.c:133 cli/cli-logging.c:230 top.c:522
+msgid "Current output protocol does not support redirection"
+msgstr ""
+
+#: cli/cli-logging.c:143
+#, possible-c-format
+msgid "The logging output mode is %s.\n"
+msgstr ""
+
+#: cli/cli-logging.c:262
+msgid ""
+"\"set logging\" lets you log output to a file.\n"
+"Usage: set logging on [FILENAME]\n"
+"       set logging off\n"
+"       set logging file FILENAME\n"
+"       set logging overwrite [on|off]\n"
+"       set logging redirect [on|off]\n"
+msgstr ""
+
+#: cli/cli-logging.c:274
+#, possible-c-format
+msgid "Currently logging to \"%s\".\n"
+msgstr ""
+
+#: cli/cli-logging.c:277
+#, possible-c-format
+msgid "Future logs will be written to %s.\n"
+msgstr ""
+
+#: cli/cli-logging.c:281
+msgid "Logs will overwrite the log file.\n"
+msgstr ""
+
+#: cli/cli-logging.c:283
+msgid "Logs will be appended to the log file.\n"
+msgstr ""
+
+#: cli/cli-logging.c:288
+msgid "Output is being sent only to the log file.\n"
+msgstr ""
+
+#: cli/cli-logging.c:290
+msgid "Output is being logged and displayed.\n"
+msgstr ""
+
+#: cli/cli-logging.c:295
+msgid "Output will be sent only to the log file.\n"
+msgstr ""
+
+#: cli/cli-logging.c:297
+msgid "Output will be logged and displayed.\n"
+msgstr ""
+
+#: cli/cli-logging.c:310
+msgid "Set logging options"
+msgstr ""
+
+#: cli/cli-logging.c:313
+msgid "Show logging options"
+msgstr ""
+
+#: cli/cli-logging.c:315
+msgid "Set whether logging overwrites or appends to the log file."
+msgstr ""
+
+#: cli/cli-logging.c:316
+msgid "Show whether logging overwrites or appends to the log file."
 msgstr ""
 
-#: cli/cli-dump.c:148
-#, possible-c-format
-msgid "bfd_openw_with_cleanup: unknown mode %s."
+#: cli/cli-logging.c:317
+msgid "If set, logging overrides the log file."
 msgstr ""
 
-#: cli/cli-dump.c:164
-msgid ""
-"\"dump\" must be followed by a subcommand.\n"
-"\n"
+#: cli/cli-logging.c:322
+msgid "Set the logging output mode."
 msgstr ""
 
-#: cli/cli-dump.c:171
-msgid ""
-"\"append\" must be followed by a subcommand.\n"
-"\n"
+#: cli/cli-logging.c:323
+msgid "Show the logging output mode."
 msgstr ""
 
-#: cli/cli-dump.c:206
-#, possible-c-format
-msgid "writing dump file '%s' (%s)"
+#: cli/cli-logging.c:324
+msgid ""
+"If redirect is off, output will go to both the screen and the log file.\n"
+"If redirect is on, output will go only to the log file."
 msgstr ""
 
-#: cli/cli-dump.c:227
-msgid "Missing start address."
+#: cli/cli-logging.c:330
+msgid "Set the current logfile."
 msgstr ""
 
-#: cli/cli-dump.c:232
-msgid "Missing stop address."
+#: cli/cli-logging.c:331
+msgid "Show the current logfile."
 msgstr ""
 
-#: cli/cli-dump.c:238
-msgid "Invalid memory address range (start >= end)."
+#: cli/cli-logging.c:332
+msgid "The logfile is used when directing GDB's output."
 msgstr ""
 
-#: cli/cli-dump.c:278
-#, possible-c-format
-msgid "No value to %s."
+#: cli/cli-logging.c:338
+msgid "Enable logging."
 msgstr ""
 
-#: cli/cli-dump.c:281
-msgid "Invalid expression."
+#: cli/cli-logging.c:340
+msgid "Disable logging."
 msgstr ""
 
-#: cli/cli-dump.c:300
-msgid "value is not an lval: address assumed to be zero"
+#: cli/cli-script.c:90
+msgid "if/while commands require arguments."
 msgstr ""
 
-#. No, no useable data in this section.
-#: cli/cli-dump.c:460
-#, possible-c-format
-msgid "skipping section %s...\n"
+#: cli/cli-script.c:125
+msgid "Error reading in canned sequence of commands."
 msgstr ""
 
-#: cli/cli-dump.c:479
-#, possible-c-format
-msgid "Failed to read bfd file %s: '%s'."
+#: cli/cli-script.c:327
+msgid "Max user call depth exceeded -- command aborted."
 msgstr ""
 
-#: cli/cli-dump.c:502 cli/cli-dump.c:554
-#, possible-c-format
-msgid "restore: memory write failed (%s)."
+#: cli/cli-script.c:349
+msgid "Error executing canned sequence of commands."
 msgstr ""
 
-#: cli/cli-dump.c:525
-#, possible-c-format
-msgid "Start address is greater than length of binary file %s."
+#: cli/cli-script.c:576
+msgid "Invalid control type in canned commands structure."
 msgstr ""
 
-#: cli/cli-dump.c:600
-msgid "Start must be less than end."
+#: cli/cli-script.c:652
+msgid "arg_cleanup called with no user args.\n"
 msgstr ""
 
-#: cli/cli-dump.c:669
-msgid "Dump target code/data to a local file."
+#: cli/cli-script.c:691
+#, possible-c-format
+msgid "user defined function may only have %d arguments."
 msgstr ""
 
-#: cli/cli-dump.c:674
-msgid "Append target code/data to a local file."
+#: cli/cli-script.c:790
+#, possible-c-format
+msgid "Missing argument %d in user function."
 msgstr ""
 
-#: cli/cli-dump.c:690
-msgid "Write target code/data to an srec file."
+#: cli/cli-script.c:890
+msgid "Control nesting too deep!"
 msgstr ""
 
-#: cli/cli-dump.c:696
-msgid "Write target code/data to an intel hex file."
+#: cli/cli-script.c:1086
+msgid "Recursed on a simple control type."
 msgstr ""
 
-#: cli/cli-dump.c:702
-msgid "Write target code/data to a tekhex file."
+#: cli/cli-script.c:1089
+msgid "Allocated body is smaller than this command type needs."
 msgstr ""
 
-#: cli/cli-dump.c:708
-msgid "Write target code/data to a raw binary file."
+#: cli/cli-script.c:1384
+msgid "name of command to define"
 msgstr ""
 
-#: cli/cli-dump.c:714
-msgid "Append target code/data to a raw binary file."
+#: cli/cli-script.c:1406
+#, possible-c-format
+msgid "\"%s\" is not a prefix command."
 msgstr ""
 
-#: cli/cli-dump.c:719
-msgid ""
-"Write contents of memory to an srec file.\n"
-"Arguments are FILE START STOP.  Writes the contents of memory\n"
-"within the range [START .. STOP) to the specifed FILE in srec format."
+#: cli/cli-script.c:1417
+#, possible-c-format
+msgid "Junk in argument list: \"%s\""
 msgstr ""
 
-#: cli/cli-dump.c:725
-msgid ""
-"Write the value of an expression to an srec file.\n"
-"Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n"
-"to the specified FILE in srec format."
+#: cli/cli-script.c:1466
+#, possible-c-format
+msgid "Redefine command \"%s\"? "
 msgstr ""
 
-#: cli/cli-dump.c:731
-msgid ""
-"Write contents of memory to an ihex file.\n"
-"Arguments are FILE START STOP.  Writes the contents of memory within\n"
-"the range [START .. STOP) to the specifed FILE in intel hex format."
+#: cli/cli-script.c:1468
+#, possible-c-format
+msgid "Really redefine built-in command \"%s\"? "
 msgstr ""
 
-#: cli/cli-dump.c:737
-msgid ""
-"Write the value of an expression to an ihex file.\n"
-"Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n"
-"to the specified FILE in intel hex format."
+#: cli/cli-script.c:1470
+#, possible-c-format
+msgid "Command \"%s\" not redefined."
 msgstr ""
 
-#: cli/cli-dump.c:743
-msgid ""
-"Write contents of memory to a tekhex file.\n"
-"Arguments are FILE START STOP.  Writes the contents of memory\n"
-"within the range [START .. STOP) to the specifed FILE in tekhex format."
+#: cli/cli-script.c:1497
+#, possible-c-format
+msgid "Your new `%s' command does not hook any existing command."
 msgstr ""
 
-#: cli/cli-dump.c:749
-msgid ""
-"Write the value of an expression to a tekhex file.\n"
-"Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n"
-"to the specified FILE in tekhex format."
+#: cli/cli-script.c:1500
+msgid "Proceed? "
 msgstr ""
 
-#: cli/cli-dump.c:755
-msgid ""
-"Write contents of memory to a raw binary file.\n"
-"Arguments are FILE START STOP.  Writes the contents of memory\n"
-"within the range [START .. STOP) to the specifed FILE in binary format."
+#. Should never come here as hookc would be 0.
+#: cli/cli-script.c:1541 complaints.c:305 exceptions.c:143 exceptions.c:160
+#: exceptions.c:187 exceptions.c:239 hppa-tdep.c:3098 hppa-tdep.c:3111
+#: infcall.c:671 infcmd.c:1460 infrun.c:3306 language.c:797 language.c:823
+#: mi/mi-out.c:348 mi/mi-out.c:367 mips-tdep.c:254 mips-tdep.c:311
+#: mips-tdep.c:1411 mips-tdep.c:4086 mips-tdep.c:5073 mn10300-tdep.c:126
+#: reggroups.c:219 remote.c:6492 utils.c:987 utils.c:1006
+msgid "bad switch"
 msgstr ""
 
-#: cli/cli-dump.c:761
-msgid ""
-"Write the value of an expression to a raw binary file.\n"
-"Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n"
-"to the specified FILE in raw target ordered bytes."
+#: cli/cli-script.c:1561
+#, possible-c-format
+msgid "Command \"%s\" is built-in."
 msgstr ""
 
-#: cli/cli-dump.c:767
-msgid ""
-"Append contents of memory to a raw binary file.\n"
-"Arguments are FILE START STOP.  Writes the contents of memory within the\n"
-"range [START .. STOP) to the specifed FILE in raw target ordered bytes."
+#: cli/cli-script.c:1615
+msgid "called with NULL file pointer!"
 msgstr ""
 
-#: cli/cli-dump.c:773
+#: cli/cli-script.c:1643
+#, possible-c-format
 msgid ""
-"Append the value of an expression to a raw binary file.\n"
-"Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n"
-"to the specified FILE in raw target ordered bytes."
+"%s:%d: Error in sourced command file:\n"
+"%s"
 msgstr ""
 
-#: cli/cli-dump.c:779
-msgid ""
-"Restore the contents of FILE to target memory.\n"
-"Arguments are FILE OFFSET START END where all except FILE are optional.\n"
-"OFFSET will be added to the base address of the file (default zero).\n"
-"If START and END are given, only the file contents within that range\n"
-"(file relative) will be restored to target memory."
+#: cli/cli-script.c:1646
+msgid "bad reason"
 msgstr ""
 
-#: cli/cli-setshow.c:60
+#: cli/cli-setshow.c:59
 msgid "\"on\", \"off\" or \"auto\" expected."
 msgstr ""
 
-#: cli/cli-setshow.c:89
+#: cli/cli-setshow.c:88
 msgid "\"on\" or \"off\" expected."
 msgstr ""
 
-#: cli/cli-setshow.c:193
+#: cli/cli-setshow.c:194
 msgid "filename to set it to."
 msgstr ""
 
-#: cli/cli-setshow.c:214 cli/cli-setshow.c:224 cli/cli-setshow.c:236
-#: cli/cli-setshow.c:241
+#: cli/cli-setshow.c:215 cli/cli-setshow.c:225 cli/cli-setshow.c:237
+#: cli/cli-setshow.c:242
 msgid "integer to set it to."
 msgstr ""
 
-#: cli/cli-setshow.c:229
+#: cli/cli-setshow.c:230
 #, possible-c-format
 msgid "integer %u out of range"
 msgstr ""
 
-#: cli/cli-setshow.c:272
+#: cli/cli-setshow.c:273
 #, possible-c-format
 msgid "Requires an argument. Valid arguments are %s."
 msgstr ""
 
-#: cli/cli-setshow.c:301
+#: cli/cli-setshow.c:302
 #, possible-c-format
 msgid "Undefined item: \"%s\"."
 msgstr ""
 
-#: cli/cli-setshow.c:304
+#: cli/cli-setshow.c:305
 #, possible-c-format
 msgid "Ambiguous item \"%s\"."
 msgstr ""
 
-#: cli/cli-setshow.c:310 cli/cli-setshow.c:381
+#: cli/cli-setshow.c:311 cli/cli-setshow.c:379
 msgid "gdb internal error: bad var_type in do_setshow_command"
 msgstr ""
 
-#: cli/cli-setshow.c:355
+#: cli/cli-setshow.c:356
 msgid "do_setshow_command: invalid var_auto_boolean"
 msgstr ""
 
-#: cli/cli-setshow.c:405
+#: cli/cli-setshow.c:403
 msgid "gdb internal error: bad cmd_type in do_setshow_command"
 msgstr ""
 
-#: coffread.c:592
+#: cli/cli-utils.c:53
+msgid "History value must have integer type."
+msgstr ""
+
+#: cli/cli-utils.c:74
+msgid "Convenience variable must have integer value.\n"
+msgstr ""
+
+#: cli/cli-utils.c:151
+msgid "inverted range"
+msgstr ""
+
+#: cli/cli-utils.c:165
+msgid "negative value"
+msgstr "valeur négative"
+
+#: cli/cli-utils.c:207
+msgid "Args must be numbers or '$' variables."
+msgstr ""
+
+#: coffread.c:594
 #, possible-c-format
 msgid "\"%s\": error reading line numbers."
 msgstr ""
 
-#: coffread.c:600
+#: coffread.c:602
 #, possible-c-format
 msgid "\"%s\": can't get string table"
 msgstr ""
 
-#: coffread.c:624
+#: coffread.c:626
 #, possible-c-format
 msgid ""
 "The debugging information in `%s' is corrupted.\n"
 "The file has a `.stabs' section, but no `.stabstr' section."
 msgstr ""
 
-#: coffread.c:822
+#: coffread.c:824
 #, possible-c-format
 msgid "Bad n_sclass for symbol %s"
 msgstr ""
 
-#: coffread.c:989
+#: coffread.c:991
 #, possible-c-format
 msgid "`.bf' symbol %d has no aux entry"
 msgstr ""
 
-#: coffread.c:1007
+#: coffread.c:1009
 msgid "Bad coff function information."
 msgstr ""
 
-#: coffread.c:1016
+#: coffread.c:1018
 #, possible-c-format
 msgid ""
 "`.ef' symbol without matching `.bf' symbol ignored starting at symnum %d"
 msgstr ""
 
-#: coffread.c:1028
+#: coffread.c:1030
 #, possible-c-format
 msgid "Unmatched .ef symbol(s) ignored starting at symnum %d"
 msgstr ""
 
-#: coffread.c:1037
+#: coffread.c:1039
 #, possible-c-format
 msgid "`.ef' symbol %d has no aux entry"
 msgstr ""
 
-#: coffread.c:1085
+#: coffread.c:1087
 #, possible-c-format
 msgid ""
 "`.eb' symbol without matching `.bb' symbol ignored starting at symnum %d"
 msgstr ""
 
-#: coffread.c:1095 xcoffread.c:173
+#: coffread.c:1097 xcoffread.c:189
 #, possible-c-format
 msgid "Mismatched .eb symbol ignored starting at symnum %d"
 msgstr ""
 
-#: coffread.c:1156 coffread.c:1163 coffread.c:1173
+#: coffread.c:1158 coffread.c:1165 coffread.c:1175
 #, possible-c-format
 msgid "%s: error reading symbols"
 msgstr ""
 
-#: coffread.c:1186
+#: coffread.c:1188
 #, c-format
 msgid "thumb symbol %s, class 0x%x\n"
 msgstr ""
 
-#: coffread.c:1313
+#: coffread.c:1315
 msgid "coff file name too long"
 msgstr ""
 
-#: coffread.c:1400
+#: coffread.c:1402
 #, possible-c-format
 msgid "Line number pointer %ld lower than start of line numbers"
 msgstr ""
 
-#: coffread.c:1796
+#: coffread.c:1798
 #, possible-c-format
 msgid "Symbol table entry for %s has bad tagndx value"
 msgstr ""
 
-#: coffread.c:1966
+#: coffread.c:1968
 #, possible-c-format
 msgid "Unexpected type for symbol %s"
 msgstr ""
 
-#: common/signals.c:352
+#: common/common-utils.c:136
+msgid "vasprintf call failed"
+msgstr ""
+
+#: common/gdb_assert.h:54
+#, possible-c-format
+msgid "%s: Assertion `%s' failed."
+msgstr ""
+
+#: common/gdb_assert.h:58
+#, possible-c-format
+msgid "Assertion `%s' failed."
+msgstr ""
+
+#: common/signals.c:350
 msgid ""
 "GDB bug: target.c (target_signal_from_host): unrecognized real-time signal"
 msgstr ""
 
 #. The user might be trying to do "signal SIGSAK" where this system
 #. doesn't have SIGSAK.
-#: common/signals.c:647
+#: common/signals.c:645
 #, possible-c-format
 msgid "Signal %s does not exist on this system."
 msgstr ""
 
-#: common/signals.c:670
+#: common/signals.c:668
 msgid ""
 "Only signals 1-15 are valid as numeric signals.\n"
 "Use \"info signals\" for a list of symbolic signals."
@@ -5270,63 +5261,55 @@
 msgid "Various kinds of warranty you do not have."
 msgstr ""
 
-#: core-regset.c:76 m68klinux-nat.c:533
-msgid "Wrong size gregset in core file."
-msgstr ""
-
-#: core-regset.c:86 m68klinux-nat.c:543
-msgid "Wrong size fpregset in core file."
-msgstr ""
-
-#: corefile.c:77
+#: corefile.c:76
 msgid "GDB can't read core files on this machine."
 msgstr ""
 
-#: corefile.c:191
+#: corefile.c:190
 msgid "core file may not match specified executable file."
 msgstr ""
 
-#: corefile.c:193
+#: corefile.c:192
 msgid "exec file is newer than core file."
 msgstr ""
 
-#: corefile.c:209
+#: corefile.c:208
 msgid ""
 "No executable file specified.\n"
 "Use the \"file\" or \"exec-file\" command."
 msgstr ""
 
-#: corefile.c:224
+#: corefile.c:223
 #, possible-c-format
 msgid "Cannot access memory at address %s"
 msgstr ""
 
-#: corefile.c:228
+#: corefile.c:227
 #, possible-c-format
 msgid "Error accessing memory address %s: %s."
 msgstr ""
 
-#: corefile.c:422
+#: corefile.c:421
 #, possible-c-format
 msgid "The current BFD target is \"%s\".\n"
 msgstr ""
 
-#: corefile.c:453
+#: corefile.c:452
 msgid ""
 "Use FILE as core dump for examining memory and registers.\n"
 "No arg means have no core file.  This command has been superseded by the\n"
 "`target core' and `detach' commands."
 msgstr ""
 
-#: corefile.c:461
+#: corefile.c:460
 msgid "Set the current BFD target."
 msgstr ""
 
-#: corefile.c:462
+#: corefile.c:461
 msgid "Show the current BFD target."
 msgstr ""
 
-#: corefile.c:463
+#: corefile.c:462
 msgid "Use `set gnutarget auto' to specify automatic detection."
 msgstr ""
 
@@ -5354,7 +5337,7 @@
 msgid "\"%s\" is not a core dump: %s"
 msgstr ""
 
-#: corelow.c:369 record.c:833
+#: corelow.c:369 record.c:849
 #, possible-c-format
 msgid "\"%s\": Can't find sections: %s"
 msgstr ""
@@ -5409,35 +5392,43 @@
 msgid "init_core_ops: core target already exists (\"%s\")."
 msgstr ""
 
-#: cp-abi.c:44
+#: core-regset.c:76 m68klinux-nat.c:532
+msgid "Wrong size gregset in core file."
+msgstr ""
+
+#: core-regset.c:86 m68klinux-nat.c:542
+msgid "Wrong size fpregset in core file."
+msgstr ""
+
+#: cp-abi.c:43
 msgid "ABI doesn't define required function is_constructor_name"
 msgstr ""
 
-#: cp-abi.c:52
+#: cp-abi.c:51
 msgid "ABI doesn't define required function is_destructor_name"
 msgstr ""
 
-#: cp-abi.c:60
+#: cp-abi.c:59
 msgid "ABI doesn't define required function is_vtable_name"
 msgstr ""
 
-#: cp-abi.c:68
+#: cp-abi.c:67
 msgid "ABI doesn't define required function is_operator_name"
 msgstr ""
 
-#: cp-abi.c:91
+#: cp-abi.c:90
 msgid "Cannot determine virtual baseclass offset of incomplete object"
 msgstr ""
 
-#: cp-abi.c:134 cp-abi.c:142 cp-abi.c:151 cp-abi.c:169
+#: cp-abi.c:133 cp-abi.c:141 cp-abi.c:150 cp-abi.c:168
 msgid "GDB does not support pointers to methods on this target"
 msgstr ""
 
-#: cp-abi.c:203
+#: cp-abi.c:202
 msgid "Too many C++ ABIs, please increase CP_ABI_MAX in cp-abi.c"
 msgstr ""
 
-#: cp-abi.c:221
+#: cp-abi.c:220
 #, possible-c-format
 msgid "Cannot find C++ ABI \"%s\" to set it as auto default."
 msgstr ""
@@ -5447,56 +5438,56 @@
 msgid "Could not find \"%s\" in ABI list"
 msgstr ""
 
-#: cp-abi.c:328
+#: cp-abi.c:330
 msgid ""
 "Set the ABI used for inspecting C++ objects.\n"
 "\"set cp-abi\" with no arguments will list the available ABIs."
 msgstr ""
 
-#: cp-abi.c:334
+#: cp-abi.c:336
 msgid "Show the ABI used for inspecting C++ objects."
 msgstr ""
 
-#: cp-name-parser.y:1571
+#: cp-name-parser.y:1570
 msgid "empty character constant"
 msgstr ""
 
-#: cp-name-parser.y:1578
+#: cp-name-parser.y:1577
 msgid "invalid character constant"
 msgstr ""
 
-#: cp-name-parser.y:1702
+#: cp-name-parser.y:1701
 msgid "invalid number"
 msgstr ""
 
 #. These can't occur in C++ names.
-#: cp-name-parser.y:1778
+#: cp-name-parser.y:1777
 msgid "unexpected string literal"
 msgstr ""
 
 #. We must have come across a bad character (e.g. ';').
-#: cp-name-parser.y:1785
+#: cp-name-parser.y:1784
 msgid "invalid character"
 msgstr ""
 
-#: cp-namespace.c:709
+#: cp-namespace.c:719
 msgid "cp_lookup_nested_type called on a non-aggregate type."
 msgstr ""
 
-#: cp-namespace.c:1009
-msgid "Possible namespaces:\n"
+#: cp-namespace.c:800
+msgid "The `maint namespace' command was removed.\n"
 msgstr ""
 
-#: cp-namespace.c:1031
-msgid "Print the list of possible C++ namespaces."
+#: cp-namespace.c:813
+msgid "Deprecated placeholder for removed functionality."
 msgstr ""
 
-#: cp-support.c:985
+#: cp-support.c:1387
 #, possible-c-format
 msgid "RTTI symbol not found for class '%s'"
 msgstr ""
 
-#: cp-support.c:991
+#: cp-support.c:1393
 #, possible-c-format
 msgid "RTTI symbol for class '%s' is not a type"
 msgstr ""
@@ -5505,1086 +5496,1190 @@
 #. symbols for namespaces with the same name as the struct.
 #. This warning is an indication of a bug in the lookup order
 #. or a bug in the way that the symbol tables are populated.
-#: cp-support.c:1006
+#: cp-support.c:1408
 #, possible-c-format
 msgid "RTTI symbol for class '%s' is a namespace"
 msgstr ""
 
-#: cp-support.c:1009
+#: cp-support.c:1411
 #, possible-c-format
 msgid "RTTI symbol for class '%s' has bad type"
 msgstr ""
 
-#: cp-support.c:1021
+#: cp-support.c:1423
 msgid "\"maintenance cplus\" must be followed by the name of a command.\n"
 msgstr ""
 
-#: cp-support.c:1162
+#: cp-support.c:1564
 msgid "C++ maintenance commands."
 msgstr ""
 
-#: cp-support.c:1173
+#: cp-support.c:1575
 msgid "Print the first class/namespace component of NAME."
 msgstr ""
 
-#: cp-valprint.c:47
+#: cp-valprint.c:46
 #, possible-c-format
 msgid "Printing of C++ virtual function tables is %s.\n"
 msgstr ""
 
-#: cp-valprint.c:59
+#: cp-valprint.c:58
 #, possible-c-format
 msgid "Printing of object's derived type based on vtable info is %s.\n"
 msgstr ""
 
-#: cp-valprint.c:70
+#: cp-valprint.c:69
 #, possible-c-format
 msgid "Printing of C++ static members is %s.\n"
 msgstr ""
 
-#: cp-valprint.c:314 jv-valprint.c:408 p-valprint.c:803 valprint.c:282
+#: cp-valprint.c:313 jv-valprint.c:407 p-valprint.c:812 valprint.c:283
 msgid "<synthetic pointer>"
 msgstr ""
 
-#: cp-valprint.c:808
+#: cp-valprint.c:352 mi/mi-cmd-stack.c:302 python/py-prettyprint.c:293
+#: stack.c:286
+#, possible-c-format
+msgid "<error reading variable: %s>"
+msgstr ""
+
+#: cp-valprint.c:817
 msgid "Set printing of C++ static members."
 msgstr ""
 
-#: cp-valprint.c:809
+#: cp-valprint.c:818
 msgid "Show printing of C++ static members."
 msgstr ""
 
-#: cp-valprint.c:816
+#: cp-valprint.c:825
 msgid "Set printing of C++ virtual function tables."
 msgstr ""
 
-#: cp-valprint.c:817
+#: cp-valprint.c:826
 msgid "Show printing of C++ virtual function tables."
 msgstr ""
 
-#: cp-valprint.c:824
+#: cp-valprint.c:833
 msgid "Set printing of object's derived type based on vtable info."
 msgstr ""
 
-#: cp-valprint.c:825
+#: cp-valprint.c:834
 msgid "Show printing of object's derived type based on vtable info."
 msgstr ""
 
-#: cris-tdep.c:291 i386-linux-tdep.c:341
+#: cris-tdep.c:290 i386-linux-tdep.c:340
 msgid "Couldn't recognize signal trampoline."
 msgstr ""
 
 #. Invalid (unimplemented) register.  Should not happen as there are
 #. no unimplemented CRISv32 registers.
-#: cris-tdep.c:1698
+#: cris-tdep.c:1697
 #, possible-c-format
 msgid "crisv32_register_type: unknown regno %d"
 msgstr ""
 
-#: cris-tdep.c:1732
+#: cris-tdep.c:1731
 msgid "cris_store_return_value: type length too large."
 msgstr ""
 
-#: cris-tdep.c:1903
+#: cris-tdep.c:1902
 msgid "cris_extract_return_value: type length too large"
 msgstr ""
 
 #. Could not find a target.  Things are likely to go downhill
 #. from here.
-#: cris-tdep.c:2146
+#: cris-tdep.c:2145
 msgid "CRIS software single step could not find a step target."
 msgstr ""
 
-#: cris-tdep.c:3932 irix5-nat.c:240 mips-linux-tdep.c:625
+#: cris-tdep.c:3931 irix5-nat.c:239 mips-linux-tdep.c:624
 msgid "wrong size gregset struct in core file"
 msgstr ""
 
-#: cris-tdep.c:3972
+#: cris-tdep.c:3971
 msgid "Set the current CRIS version."
 msgstr ""
 
-#: cris-tdep.c:3973
-msgid "Show the current CRIS version."
+#: cris-tdep.c:3972
+msgid "Show the current CRIS version."
+msgstr ""
+
+#: cris-tdep.c:3973
+msgid ""
+"Set to 10 for CRISv10 or 32 for CRISv32 if autodetection fails.\n"
+"Defaults to 10. "
+msgstr ""
+
+#: cris-tdep.c:3983
+msgid "Set the current CRIS mode."
+msgstr ""
+
+#: cris-tdep.c:3984
+msgid "Show the current CRIS mode."
+msgstr ""
+
+#: cris-tdep.c:3985
+msgid ""
+"Set to CRIS_MODE_GURU when debugging in guru mode.\n"
+"Makes GDB use the NRP register instead of the ERP register in certain cases."
+msgstr ""
+
+#: cris-tdep.c:3994
+msgid "Set the usage of Dwarf-2 CFI for CRIS."
+msgstr ""
+
+#: cris-tdep.c:3995
+msgid "Show the usage of Dwarf-2 CFI for CRIS."
+msgstr ""
+
+#: cris-tdep.c:3996
+msgid "Set this to \"off\" if using gcc-cris < R59."
+msgstr ""
+
+#: cris-tdep.c:4034 cris-tdep.c:4060
+msgid "cris_gdbarch_update: failed to update architecture."
+msgstr ""
+
+#: cris-tdep.c:4119
+msgid "cris_gdbarch_init: big endian byte order in info"
+msgstr ""
+
+#: cris-tdep.c:4124
+msgid "cris_gdbarch_init: unknown byte order in info"
+msgstr ""
+
+#: cris-tdep.c:4154
+msgid "cris_gdbarch_init: unsupported CRIS version"
+msgstr ""
+
+#: cris-tdep.c:4196
+msgid "cris_gdbarch_init: unknown CRIS version"
+msgstr ""
+
+#: c-typeprint.c:333
+msgid "type not handled in c_type_print_varspec_prefix()"
+msgstr ""
+
+#: c-typeprint.c:691
+msgid "type not handled in c_type_print_varspec_suffix()"
+msgstr ""
+
+#: c-typeprint.c:734 m2-typeprint.c:82
+msgid "<type unknown>"
+msgstr ""
+
+#: c-typeprint.c:762
+msgid "<unnamed typedef>"
+msgstr ""
+
+#: c-typeprint.c:822
+msgid "<incomplete type>\n"
+msgstr ""
+
+#: c-typeprint.c:825
+msgid "<no data fields>\n"
 msgstr ""
 
-#: cris-tdep.c:3974
-msgid ""
-"Set to 10 for CRISv10 or 32 for CRISv32 if autodetection fails.\n"
-"Defaults to 10. "
+#: c-typeprint.c:1053
+#, possible-c-format
+msgid "<undefined type> %s;\n"
 msgstr ""
 
-#: cris-tdep.c:3984
-msgid "Set the current CRIS mode."
+#: c-typeprint.c:1102
+#, possible-c-format
+msgid "<badly mangled name '%s'>"
 msgstr ""
 
-#: cris-tdep.c:3985
-msgid "Show the current CRIS mode."
+#: c-typeprint.c:1165
+#, possible-c-format
+msgid " (Local at %s:%d)\n"
 msgstr ""
 
-#: cris-tdep.c:3986
-msgid ""
-"Set to CRIS_MODE_GURU when debugging in guru mode.\n"
-"Makes GDB use the NRP register instead of the ERP register in certain cases."
+#: c-typeprint.c:1224
+msgid "struct <unknown>"
 msgstr ""
 
-#: cris-tdep.c:3995
-msgid "Set the usage of Dwarf-2 CFI for CRIS."
+#. This should not occur.
+#: c-typeprint.c:1233
+msgid "<range type>"
 msgstr ""
 
-#: cris-tdep.c:3996
-msgid "Show the usage of Dwarf-2 CFI for CRIS."
+#. At least for dump_symtab, it is important that this not
+#. be an error ().
+#: c-typeprint.c:1255
+#, possible-c-format
+msgid "<invalid type code %d>"
 msgstr ""
 
-#: cris-tdep.c:3997
-msgid "Set this to \"off\" if using gcc-cris < R59."
+#: c-valprint.c:176
+msgid "Could not determine the array high bound"
 msgstr ""
 
-#: cris-tdep.c:4035 cris-tdep.c:4061
-msgid "cris_gdbarch_update: failed to update architecture."
+#: c-valprint.c:226
+#, possible-c-format
+msgid "%d vtable entries"
 msgstr ""
 
-#: cris-tdep.c:4120
-msgid "cris_gdbarch_init: big endian byte order in info"
+#. This happens (without TYPE_FLAG_STUB set) on systems which
+#. don't use dbx xrefs (NO_DBX_XREFS in gcc) if a file has a
+#. "struct foo *bar" and no complete type for struct foo in that
+#. file.
+#. This happens (without TYPE_FLAG_STUB set) on systems which don't use
+#. dbx xrefs (NO_DBX_XREFS in gcc) if a file has a "struct foo *bar"
+#. and no complete type for struct foo in that file.
+#: c-valprint.c:605 m2-valprint.c:581 m2-valprint.c:661 valprint.c:362
+msgid "<incomplete type>"
 msgstr ""
 
-#: cris-tdep.c:4125
-msgid "cris_gdbarch_init: unknown byte order in info"
+#: c-valprint.c:634
+#, possible-c-format
+msgid "Invalid C/C++ type code %d in symbol table."
 msgstr ""
 
-#: cris-tdep.c:4155
-msgid "cris_gdbarch_init: unsupported CRIS version"
+#: c-valprint.c:751
+msgid " [incomplete object]"
 msgstr ""
 
-#: cris-tdep.c:4197
-msgid "cris_gdbarch_init: unknown CRIS version"
+#: darwin-nat.c:186
+#, possible-c-format
+msgid "[%d inferior]: "
 msgstr ""
 
-#: darwin-nat-info.c:54
-#, possible-c-format
-msgid "%s must be specified with 0x..."
+#: darwin-nat.c:198
+msgid "[UNKNOWN]"
 msgstr ""
 
-#: darwin-nat-info.c:58
+#: darwin-nat.c:200
 #, possible-c-format
-msgid ":\t%#lx\n"
+msgid "Mach error at \"%s:%u\" in function \"%s\": %s (0x%lx)"
 msgstr ""
 
-#: darwin-nat-info.c:61
-#, possible-c-format
-msgid ":\t%u.%06u sec\n"
+#: darwin-nat.c:232
+#, c-format
+msgid "unknown (%d)"
 msgstr ""
 
-#: darwin-nat-info.c:87
+#: darwin-nat.c:257
 #, possible-c-format
-msgid "%d processes:\n"
+msgid "ptrace (%s, %d, 0x%x, %d): %d (%s)\n"
 msgstr ""
 
-#: darwin-nat-info.c:98
-#, possible-c-format
-msgid "    %s is %d has task %#x\n"
+#: darwin-nat.c:259
+msgid "no error"
 msgstr ""
 
-#: darwin-nat-info.c:104
+#: darwin-nat.c:325
 #, possible-c-format
-msgid "    %s is %d unknown task port\n"
+msgid " new_ix:%d/%d, old_ix:%d/%d, new_id:%x old_id:%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:122 darwin-nat-info.c:814 darwin-nat-info.c:835
-msgid "No inferior running\n"
+#: darwin-nat.c:484
+msgid "message header:\n"
 msgstr ""
 
-#: darwin-nat-info.c:130
+#: darwin-nat.c:485
 #, possible-c-format
-msgid "cannot parse task id '%s'\n"
+msgid " bits: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:154
+#: darwin-nat.c:486
 #, possible-c-format
-msgid "TASK_BASIC_INFO for 0x%x:\n"
+msgid " size: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:166
-msgid ""
-"\n"
-"TASK_EVENTS_INFO:\n"
+#: darwin-nat.c:487
+#, possible-c-format
+msgid " remote-port: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:182
-msgid ""
-"\n"
-"TASK_THREAD_TIMES_INFO:\n"
+#: darwin-nat.c:488
+#, possible-c-format
+msgid " local-port: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:212
+#: darwin-nat.c:489
 #, possible-c-format
-msgid "Ports for task 0x%x:\n"
+msgid " reserved: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:213
-msgid "port   type\n"
+#: darwin-nat.c:490
+#, possible-c-format
+msgid " id: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:233
+#: darwin-nat.c:509
 #, possible-c-format
-msgid "%04x: %08x "
+msgid "body: descriptor_count=%u\n"
 msgstr ""
 
-#: darwin-nat-info.c:240
+#: darwin-nat.c:518
 #, possible-c-format
-msgid " %s("
+msgid " descr %d: type=%u (port) name=0x%x, dispo=%d\n"
 msgstr ""
 
-#: darwin-nat-info.c:243
-msgid "??"
+#: darwin-nat.c:522
+#, possible-c-format
+msgid " descr %d: type=%u\n"
 msgstr ""
 
-#: darwin-nat-info.c:245
+#: darwin-nat.c:532
 #, possible-c-format
-msgid "%u"
+msgid "NDR: mig=%02x if=%02x encod=%02x int=%02x char=%02x float=%02x\n"
 msgstr ""
 
-#: darwin-nat-info.c:246
-msgid " refs)"
+#: darwin-nat.c:540
+msgid "  data:"
 msgstr ""
 
-#: darwin-nat-info.c:252
-msgid " gdb-task"
+#: darwin-nat.c:682
+#, possible-c-format
+msgid "darwin_resume_thread: state=%d, thread=0x%x, step=%d nsignal=%d\n"
 msgstr ""
 
-#: darwin-nat-info.c:254
-msgid " host-self"
+#: darwin-nat.c:695
+#, possible-c-format
+msgid "ptrace THUP: res=%d\n"
 msgstr ""
 
-#: darwin-nat-info.c:256
-msgid " gdb-exception"
+#: darwin-nat.c:702
+#, possible-c-format
+msgid "darwin_resume_thread: kill 0x%x %d: %d\n"
 msgstr ""
 
-#: darwin-nat-info.c:258
-msgid " gdb-port_set"
+#. Set single step.
+#: darwin-nat.c:708
+#, possible-c-format
+msgid "darwin_set_sstep (thread=%x, enable=%d)\n"
 msgstr ""
 
-#: darwin-nat-info.c:264
-msgid " inferior-task"
+#: darwin-nat.c:797
+#, possible-c-format
+msgid "darwin_resume: pid=%d, tid=0x%x, step=%d, signal=%d\n"
 msgstr ""
 
-#: darwin-nat-info.c:266
-msgid " inferior-notify"
+#. Should not happen...
+#: darwin-nat.c:877
+#, possible-c-format
+msgid "darwin_wait: ill-formatted message (id=%x)\n"
 msgstr ""
 
-#: darwin-nat-info.c:275
-msgid " inferior-excp-port"
+#: darwin-nat.c:890
+#, possible-c-format
+msgid "darwin_wait: thread=%x, got %s\n"
 msgstr ""
 
-#: darwin-nat-info.c:287
+#: darwin-nat.c:913
 #, possible-c-format
-msgid " inferior-thread for 0x%x"
+msgid "  (signal %d: %s)\n"
 msgstr ""
 
-#: darwin-nat-info.c:316
+#: darwin-nat.c:958
 #, possible-c-format
-msgid "Port 0x%lx in task 0x%lx:\n"
+msgid "wait4: res=%d: %s\n"
 msgstr ""
 
-#: darwin-nat-info.c:318
+#: darwin-nat.c:974
 #, possible-c-format
-msgid "  port set: 0x%x\n"
+msgid "darwin_wait: pid=%d exit, status=%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:319
+#: darwin-nat.c:984
 #, possible-c-format
-msgid "     seqno: 0x%x\n"
+msgid "darwin_wait: pid=%d\n"
 msgstr ""
 
-#: darwin-nat-info.c:320
+#: darwin-nat.c:991
 #, possible-c-format
-msgid "   mscount: 0x%x\n"
+msgid "Bad local-port: %x\n"
 msgstr ""
 
-#: darwin-nat-info.c:321
+#: darwin-nat.c:1041
 #, possible-c-format
-msgid "    qlimit: 0x%x\n"
+msgid "darwin_wait: waiting for a message pid=%d thread=%lx\n"
 msgstr ""
 
-#: darwin-nat-info.c:322
+#: darwin-nat.c:1075
 #, possible-c-format
-msgid "  msgcount: 0x%x\n"
+msgid "mach_msg: ret=%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:323
+#: darwin-nat.c:1109
 #, possible-c-format
-msgid "  sorights: 0x%x\n"
+msgid "darwin_wait: mach_msg(pending) ret=%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:324
+#: darwin-nat.c:1127
 #, possible-c-format
-msgid "   srights: 0x%x\n"
+msgid "darwin_wait: thread %x hit a non-gdb breakpoint\n"
 msgstr ""
 
-#: darwin-nat-info.c:325
-#, possible-c-format
-msgid " pdrequest: 0x%x\n"
+#: darwin-nat.c:1131
+msgid "darwin_wait: unhandled pending message\n"
 msgstr ""
 
-#: darwin-nat-info.c:326
+#: darwin-nat.c:1255
 #, possible-c-format
-msgid " nsrequest: 0x%x\n"
+msgid "cannot kill: %s"
 msgstr ""
 
-#: darwin-nat-info.c:327
+#: darwin-nat.c:1321
 #, possible-c-format
-msgid "     flags: 0x%x\n"
+msgid "Failed to kill inferior: ptrace returned %d [%s] (pid=%d)"
 msgstr ""
 
-#: darwin-nat-info.c:336
-msgid "Task and port"
+#: darwin-nat.c:1370
+#, possible-c-format
+msgid ""
+"Unable to find Mach task port for process-id %d: %s (0x%lx).\n"
+" (please check gdb is codesigned - see taskgated(8))"
 msgstr ""
 
-#: darwin-nat-info.c:358
+#: darwin-nat.c:1375
 #, possible-c-format
-msgid "Threads in task %#x:\n"
+msgid "inferior task: 0x%x, pid: %d\n"
 msgstr ""
 
-#: darwin-nat-info.c:361
+#: darwin-nat.c:1486
 #, possible-c-format
-msgid "    %#x\n"
+msgid "unable to create a pipe: %s"
 msgstr ""
 
-#: darwin-nat-info.c:381
-msgid "Thread"
+#. Trying to masturbate?
+#: darwin-nat.c:1573 gnu-nat.c:2167 inf-ptrace.c:205 inf-ttrace.c:743
+msgid "I refuse to debug myself!"
 msgstr ""
 
-#: darwin-nat-info.c:384
-msgid "THREAD_BASIC_INFO\n"
+#: darwin-nat.c:1580 inf-ptrace.c:220 inf-ttrace.c:750
+#, possible-c-format
+msgid "Attaching to program: %s, %s\n"
 msgstr ""
 
-#: darwin-nat-info.c:435
-msgid "share"
+#: darwin-nat.c:1583 inf-ptrace.c:223 inf-ttrace.c:753 procfs.c:3303
+#, possible-c-format
+msgid "Attaching to %s\n"
 msgstr ""
 
-#: darwin-nat-info.c:437
-msgid "copy "
+#: darwin-nat.c:1590
+#, possible-c-format
+msgid "Can't attach to process %d: %s (%d)"
 msgstr ""
 
-#: darwin-nat-info.c:439
-msgid "none "
+#: darwin-nat.c:1635 inf-ptrace.c:282 inf-ttrace.c:798 procfs.c:3329
+#, possible-c-format
+msgid "Detaching from program: %s, %s\n"
 msgstr ""
 
-#: darwin-nat-info.c:441
-msgid "???  "
+#: darwin-nat.c:1651
+#, possible-c-format
+msgid "Unable to detach from process-id %d: %s (%d)"
 msgstr ""
 
-#: darwin-nat-info.c:451
-msgid "cow"
+#: darwin-nat.c:1679
+#, c-format
+msgid "Thread 0x%lx of process %u"
 msgstr ""
 
-#: darwin-nat-info.c:453
-msgid "private"
+#: darwin-nat.c:1712
+#, possible-c-format
+msgid "darwin_read_write_inferior(task=%x, %s, len=%d)\n"
 msgstr ""
 
-#: darwin-nat-info.c:455
-msgid "empty"
+#: darwin-nat.c:1721
+#, possible-c-format
+msgid "darwin_read_write_inferior: mach_vm_read failed at %s: %s"
 msgstr ""
 
-#: darwin-nat-info.c:457
-msgid "shared"
+#: darwin-nat.c:1753
+#, possible-c-format
+msgid "darwin_read_write_inferior: mach_vm_region_recurse failed at %s: %s\n"
 msgstr ""
 
-#: darwin-nat-info.c:459
-msgid "true-shrd"
+#: darwin-nat.c:1761
+#, possible-c-format
+msgid ""
+"darwin_read_write_inferior: mach_vm_region_recurse addr=%s, start=%s, "
+"len=%s\n"
 msgstr ""
 
-#: darwin-nat-info.c:461
-msgid "prv-alias"
+#: darwin-nat.c:1770
+#, possible-c-format
+msgid "No memory at %s (vs %s+0x%x).  Nothing written"
 msgstr ""
 
-#: darwin-nat-info.c:463
-msgid "shr-alias"
+#: darwin-nat.c:1788
+#, possible-c-format
+msgid "darwin_read_write_inf: mach_vm_protect max failed at %s: %s"
 msgstr ""
 
-#: darwin-nat-info.c:465
-msgid "???"
+#: darwin-nat.c:1803
+#, possible-c-format
+msgid "darwin_read_write_inf: mach_vm_protect failed at %s (len=0x%lx): %s"
 msgstr ""
 
-#: darwin-nat-info.c:475 darwin-nat-info.c:763
-msgid "default"
+#: darwin-nat.c:1817
+#, possible-c-format
+msgid "darwin_read_write_inferior: mach_vm_write failed: %s"
 msgstr ""
 
-#: darwin-nat-info.c:477
-msgid "malloc"
+#: darwin-nat.c:1865
+#, possible-c-format
+msgid "darwin_xfer_memory(%s, %d, %c)\n"
 msgstr ""
 
-#: darwin-nat-info.c:479
-msgid "malloc_small"
+#: darwin-nat.c:1883
+#, possible-c-format
+msgid "darwin_xfer_partial(%s, %d, rbuf=%s, wbuf=%s) pid=%u\n"
 msgstr ""
 
-#: darwin-nat-info.c:481
-msgid "malloc_large"
+#: darwin-nat.c:2037
+msgid "Darwin child process"
 msgstr ""
 
-#: darwin-nat-info.c:483
-msgid "malloc_huge"
+#: darwin-nat.c:2039
+msgid "Darwin child process (started by the \"run\" command)."
 msgstr ""
 
-#: darwin-nat-info.c:485
-msgid "sbrk"
+#: darwin-nat.c:2063
+#, possible-c-format
+msgid "GDB task: 0x%lx, pid: %d\n"
 msgstr ""
 
-#: darwin-nat-info.c:487
-msgid "realloc"
+#: darwin-nat.c:2067
+msgid "Set if printing inferior communication debugging statements."
 msgstr ""
 
-#: darwin-nat-info.c:489
-msgid "malloc_tiny"
+#: darwin-nat.c:2068
+msgid "Show if printing inferior communication debugging statements."
 msgstr ""
 
-#: darwin-nat-info.c:491
-msgid "analysis_tool"
+#: darwin-nat.c:2074
+msgid "Set if mach exceptions are caught."
 msgstr ""
 
-#: darwin-nat-info.c:493
-msgid "mach_msg"
+#: darwin-nat.c:2075
+msgid "Show if mach exceptions are caught."
 msgstr ""
 
-#: darwin-nat-info.c:495
-msgid "iokit"
+#: darwin-nat.c:2076
+msgid ""
+"When this mode is on, all low level exceptions are reported before being\n"
+"reported by the kernel."
 msgstr ""
 
-#: darwin-nat-info.c:497
-msgid "stack"
+#: darwin-nat-info.c:53
+#, possible-c-format
+msgid "%s must be specified with 0x..."
 msgstr ""
 
-#: darwin-nat-info.c:499
-msgid "guard"
+#: darwin-nat-info.c:57
+#, possible-c-format
+msgid ":\t%#lx\n"
 msgstr ""
 
-#: darwin-nat-info.c:501
-msgid "shared_pmap"
+#: darwin-nat-info.c:60
+#, possible-c-format
+msgid ":\t%u.%06u sec\n"
 msgstr ""
 
-#: darwin-nat-info.c:503
-msgid "dylib"
+#: darwin-nat-info.c:86
+#, possible-c-format
+msgid "%d processes:\n"
 msgstr ""
 
-#: darwin-nat-info.c:505
-msgid "appkit"
+#: darwin-nat-info.c:97
+#, possible-c-format
+msgid "    %s is %d has task %#x\n"
 msgstr ""
 
-#: darwin-nat-info.c:507
-msgid "foundation"
+#: darwin-nat-info.c:103
+#, possible-c-format
+msgid "    %s is %d unknown task port\n"
 msgstr ""
 
-#: darwin-nat-info.c:532
-msgid "No memory regions."
+#: darwin-nat-info.c:121 darwin-nat-info.c:814 darwin-nat-info.c:835
+msgid "No inferior running\n"
 msgstr ""
 
-#: darwin-nat-info.c:576
+#: darwin-nat-info.c:129
 #, possible-c-format
-msgid "%s-%s %s/%s  %s %s %s"
+msgid "cannot parse task id '%s'\n"
 msgstr ""
 
-#: darwin-nat-info.c:582
-msgid "shrd"
+#: darwin-nat-info.c:153
+#, possible-c-format
+msgid "TASK_BASIC_INFO for 0x%x:\n"
 msgstr ""
 
-#: darwin-nat-info.c:582
-msgid "priv"
+#: darwin-nat-info.c:165
+msgid ""
+"\n"
+"TASK_EVENTS_INFO:\n"
 msgstr ""
 
-#: darwin-nat-info.c:583
-msgid "reserved"
+#: darwin-nat-info.c:181
+msgid ""
+"\n"
+"TASK_THREAD_TIMES_INFO:\n"
 msgstr ""
 
-#: darwin-nat-info.c:583
-msgid "not-rsvd"
+#: darwin-nat-info.c:211
+#, possible-c-format
+msgid "Ports for task 0x%x:\n"
 msgstr ""
 
-#: darwin-nat-info.c:586
-#, possible-c-format
-msgid " (%d sub-rgn)"
+#: darwin-nat-info.c:212
+msgid "port   type\n"
 msgstr ""
 
-#: darwin-nat-info.c:674
-msgid "sm "
+#: darwin-nat-info.c:232
+#, possible-c-format
+msgid "%04x: %08x "
 msgstr ""
 
-#: darwin-nat-info.c:674
-msgid "obj"
+#: darwin-nat-info.c:239
+#, possible-c-format
+msgid " %s("
 msgstr ""
 
-#: darwin-nat-info.c:743
-msgid "Inferior not available"
+#: darwin-nat-info.c:242
+msgid "??"
 msgstr ""
 
-#: darwin-nat-info.c:754
+#: darwin-nat-info.c:244
 #, possible-c-format
-msgid "%d exceptions:\n"
+msgid "%u"
 msgstr ""
 
-#: darwin-nat-info.c:759
-#, possible-c-format
-msgid "port 0x%04x, behavior: "
+#: darwin-nat-info.c:245
+msgid " refs)"
 msgstr ""
 
-#: darwin-nat-info.c:766
-msgid "state"
+#: darwin-nat-info.c:251
+msgid " gdb-task"
 msgstr ""
 
-#: darwin-nat-info.c:769
-msgid "state-identity"
+#: darwin-nat-info.c:253
+msgid " host-self"
 msgstr ""
 
-#: darwin-nat-info.c:772
-#, possible-c-format
-msgid "0x%x"
+#: darwin-nat-info.c:255
+msgid " gdb-exception"
 msgstr ""
 
-#: darwin-nat-info.c:774
-msgid ", masks:"
+#: darwin-nat-info.c:257
+msgid " gdb-port_set"
 msgstr ""
 
-#: darwin-nat-info.c:776
-msgid " BAD_ACCESS"
+#: darwin-nat-info.c:263
+msgid " inferior-task"
 msgstr ""
 
-#: darwin-nat-info.c:778
-msgid " BAD_INSTRUCTION"
+#: darwin-nat-info.c:265
+msgid " inferior-notify"
 msgstr ""
 
-#: darwin-nat-info.c:780
-msgid " ARITHMETIC"
+#: darwin-nat-info.c:274
+msgid " inferior-excp-port"
 msgstr ""
 
-#: darwin-nat-info.c:782
-msgid " EMULATION"
+#: darwin-nat-info.c:286
+#, possible-c-format
+msgid " inferior-thread for 0x%x"
 msgstr ""
 
-#: darwin-nat-info.c:784
-msgid " SOFTWARE"
+#: darwin-nat-info.c:315
+#, possible-c-format
+msgid "Port 0x%lx in task 0x%lx:\n"
 msgstr ""
 
-#: darwin-nat-info.c:786
-msgid " BREAKPOINT"
+#: darwin-nat-info.c:317
+#, possible-c-format
+msgid "  port set: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:788
-msgid " SYSCALL"
+#: darwin-nat-info.c:318
+#, possible-c-format
+msgid "     seqno: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:790
-msgid " MACH_SYSCALL"
+#: darwin-nat-info.c:319
+#, possible-c-format
+msgid "   mscount: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:792
-msgid " RPC_ALERT"
+#: darwin-nat-info.c:320
+#, possible-c-format
+msgid "    qlimit: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:794
-msgid " CRASH"
+#: darwin-nat-info.c:321
+#, possible-c-format
+msgid "  msgcount: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:828
-msgid "Parameter is saved, host or none"
+#: darwin-nat-info.c:322
+#, possible-c-format
+msgid "  sorights: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:850
-msgid "Get list of tasks in system."
+#: darwin-nat-info.c:323
+#, possible-c-format
+msgid "   srights: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:852
-msgid "Get list of ports in a task."
+#: darwin-nat-info.c:324
+#, possible-c-format
+msgid " pdrequest: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:854
-msgid "Get info on a specific port."
+#: darwin-nat-info.c:325
+#, possible-c-format
+msgid " nsrequest: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:856
-msgid "Get info on a specific task."
+#: darwin-nat-info.c:326
+#, possible-c-format
+msgid "     flags: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:858
-msgid "Get list of threads in a task."
+#: darwin-nat-info.c:335
+msgid "Task and port"
 msgstr ""
 
-#: darwin-nat-info.c:860
-msgid "Get info on a specific thread."
+#: darwin-nat-info.c:357
+#, possible-c-format
+msgid "Threads in task %#x:\n"
 msgstr ""
 
-#: darwin-nat-info.c:863
-msgid "Get information on all mach region for the task."
+#: darwin-nat-info.c:360
+#, possible-c-format
+msgid "    %#x\n"
 msgstr ""
 
-#: darwin-nat-info.c:865
-msgid "Get information on all mach sub region for the task."
+#: darwin-nat-info.c:380
+msgid "Thread"
 msgstr ""
 
-#: darwin-nat-info.c:867
-msgid "Get information on mach region at given address."
+#: darwin-nat-info.c:383
+msgid "THREAD_BASIC_INFO\n"
 msgstr ""
 
-#: darwin-nat-info.c:870
-msgid "Disp mach exceptions."
+#: darwin-nat-info.c:434
+msgid "share"
 msgstr ""
 
-#: darwin-nat.c:185
-#, possible-c-format
-msgid "[%d inferior]: "
+#: darwin-nat-info.c:436
+msgid "copy "
 msgstr ""
 
-#: darwin-nat.c:197
-msgid "[UNKNOWN]"
+#: darwin-nat-info.c:438
+msgid "none "
 msgstr ""
 
-#: darwin-nat.c:199
-#, possible-c-format
-msgid "Mach error at \"%s:%u\" in function \"%s\": %s (0x%lx)"
+#: darwin-nat-info.c:440
+msgid "???  "
 msgstr ""
 
-#: darwin-nat.c:231
-#, c-format
-msgid "unknown (%d)"
+#: darwin-nat-info.c:450
+msgid "cow"
 msgstr ""
 
-#: darwin-nat.c:244
-#, possible-c-format
-msgid "ptrace (%s, %d, 0x%x, %d): %d (%s)\n"
+#: darwin-nat-info.c:452
+msgid "private"
 msgstr ""
 
-#: darwin-nat.c:246
-msgid "no error"
+#: darwin-nat-info.c:454
+msgid "empty"
 msgstr ""
 
-#: darwin-nat.c:312
-#, possible-c-format
-msgid " new_ix:%d/%d, old_ix:%d/%d, new_id:%x old_id:%x\n"
+#: darwin-nat-info.c:456
+msgid "shared"
 msgstr ""
 
-#: darwin-nat.c:471
-msgid "message header:\n"
+#: darwin-nat-info.c:458
+msgid "true-shrd"
 msgstr ""
 
-#: darwin-nat.c:472
-#, possible-c-format
-msgid " bits: 0x%x\n"
+#: darwin-nat-info.c:460
+msgid "prv-alias"
 msgstr ""
 
-#: darwin-nat.c:473
-#, possible-c-format
-msgid " size: 0x%x\n"
+#: darwin-nat-info.c:462
+msgid "shr-alias"
 msgstr ""
 
-#: darwin-nat.c:474
-#, possible-c-format
-msgid " remote-port: 0x%x\n"
+#: darwin-nat-info.c:464
+msgid "???"
 msgstr ""
 
-#: darwin-nat.c:475
-#, possible-c-format
-msgid " local-port: 0x%x\n"
+#: darwin-nat-info.c:474 darwin-nat-info.c:763
+msgid "default"
 msgstr ""
 
-#: darwin-nat.c:476
-#, possible-c-format
-msgid " reserved: 0x%x\n"
+#: darwin-nat-info.c:476
+msgid "malloc"
 msgstr ""
 
-#: darwin-nat.c:477
-#, possible-c-format
-msgid " id: 0x%x\n"
+#: darwin-nat-info.c:478
+msgid "malloc_small"
 msgstr ""
 
-#: darwin-nat.c:496
-#, possible-c-format
-msgid "body: descriptor_count=%u\n"
+#: darwin-nat-info.c:480
+msgid "malloc_large"
 msgstr ""
 
-#: darwin-nat.c:505
-#, possible-c-format
-msgid " descr %d: type=%u (port) name=0x%x, dispo=%d\n"
+#: darwin-nat-info.c:482
+msgid "malloc_huge"
 msgstr ""
 
-#: darwin-nat.c:509
-#, possible-c-format
-msgid " descr %d: type=%u\n"
+#: darwin-nat-info.c:484
+msgid "sbrk"
 msgstr ""
 
-#: darwin-nat.c:519
-#, possible-c-format
-msgid "NDR: mig=%02x if=%02x encod=%02x int=%02x char=%02x float=%02x\n"
+#: darwin-nat-info.c:486
+msgid "realloc"
 msgstr ""
 
-#: darwin-nat.c:527
-msgid "  data:"
+#: darwin-nat-info.c:488
+msgid "malloc_tiny"
 msgstr ""
 
-#: darwin-nat.c:666
-#, possible-c-format
-msgid "darwin_resume_thread: state=%d, thread=0x%x, step=%d nsignal=%d\n"
+#: darwin-nat-info.c:490
+msgid "analysis_tool"
 msgstr ""
 
-#: darwin-nat.c:679
-#, possible-c-format
-msgid "ptrace THUP: res=%d\n"
+#: darwin-nat-info.c:492
+msgid "mach_msg"
 msgstr ""
 
-#: darwin-nat.c:686
-#, possible-c-format
-msgid "darwin_resume_thread: kill 0x%x %d: %d\n"
+#: darwin-nat-info.c:494
+msgid "iokit"
 msgstr ""
 
-#. Set single step.
-#: darwin-nat.c:692
-#, possible-c-format
-msgid "darwin_set_sstep (thread=%x, enable=%d)\n"
+#: darwin-nat-info.c:496
+msgid "stack"
 msgstr ""
 
-#: darwin-nat.c:781
-#, possible-c-format
-msgid "darwin_resume: pid=%d, tid=0x%x, step=%d, signal=%d\n"
+#: darwin-nat-info.c:498
+msgid "guard"
 msgstr ""
 
-#. Should not happen...
-#: darwin-nat.c:861
-#, possible-c-format
-msgid "darwin_wait: ill-formatted message (id=%x)\n"
+#: darwin-nat-info.c:500
+msgid "shared_pmap"
 msgstr ""
 
-#: darwin-nat.c:874
-#, possible-c-format
-msgid "darwin_wait: thread=%x, got %s\n"
+#: darwin-nat-info.c:502
+msgid "dylib"
 msgstr ""
 
-#: darwin-nat.c:897
-#, possible-c-format
-msgid "  (signal %d: %s)\n"
+#: darwin-nat-info.c:504
+msgid "appkit"
 msgstr ""
 
-#: darwin-nat.c:942
-#, possible-c-format
-msgid "wait4: res=%d: %s\n"
+#: darwin-nat-info.c:506
+msgid "foundation"
 msgstr ""
 
-#: darwin-nat.c:958
-#, possible-c-format
-msgid "darwin_wait: pid=%d exit, status=%x\n"
+#: darwin-nat-info.c:531
+msgid "No memory regions."
 msgstr ""
 
-#: darwin-nat.c:968
+#: darwin-nat-info.c:575
 #, possible-c-format
-msgid "darwin_wait: pid=%d\n"
+msgid "%s-%s %s/%s  %s %s %s"
 msgstr ""
 
-#: darwin-nat.c:975
-#, possible-c-format
-msgid "Bad local-port: %x\n"
+#: darwin-nat-info.c:581
+msgid "shrd"
 msgstr ""
 
-#: darwin-nat.c:1025
-#, possible-c-format
-msgid "darwin_wait: waiting for a message pid=%d thread=%lx\n"
+#: darwin-nat-info.c:581
+msgid "priv"
 msgstr ""
 
-#: darwin-nat.c:1059
-#, possible-c-format
-msgid "mach_msg: ret=%x\n"
+#: darwin-nat-info.c:582
+msgid "reserved"
 msgstr ""
 
-#: darwin-nat.c:1093
-#, possible-c-format
-msgid "darwin_wait: mach_msg(pending) ret=%x\n"
+#: darwin-nat-info.c:582
+msgid "not-rsvd"
 msgstr ""
 
-#: darwin-nat.c:1111
+#: darwin-nat-info.c:585
 #, possible-c-format
-msgid "darwin_wait: thread %x hit a non-gdb breakpoint\n"
+msgid " (%d sub-rgn)"
 msgstr ""
 
-#: darwin-nat.c:1115
-msgid "darwin_wait: unhandled pending message\n"
+#: darwin-nat-info.c:674
+msgid "sm "
 msgstr ""
 
-#: darwin-nat.c:1239
-#, possible-c-format
-msgid "cannot kill: %s"
+#: darwin-nat-info.c:674
+msgid "obj"
 msgstr ""
 
-#: darwin-nat.c:1351
-#, possible-c-format
-msgid ""
-"Unable to find Mach task port for process-id %d: %s (0x%lx).\n"
-" (please check gdb is codesigned - see taskgated(8))"
+#: darwin-nat-info.c:743
+msgid "Inferior not available"
 msgstr ""
 
-#: darwin-nat.c:1356
+#: darwin-nat-info.c:754
 #, possible-c-format
-msgid "inferior task: 0x%x, pid: %d\n"
+msgid "%d exceptions:\n"
 msgstr ""
 
-#: darwin-nat.c:1467
+#: darwin-nat-info.c:759
 #, possible-c-format
-msgid "unable to create a pipe: %s"
+msgid "port 0x%04x, behavior: "
 msgstr ""
 
-#. Trying to masturbate?
-#: darwin-nat.c:1520 gnu-nat.c:2166 inf-ptrace.c:206 inf-ttrace.c:744
-msgid "I refuse to debug myself!"
+#: darwin-nat-info.c:766
+msgid "state"
 msgstr ""
 
-#: darwin-nat.c:1527 inf-ptrace.c:221 inf-ttrace.c:751
-#, possible-c-format
-msgid "Attaching to program: %s, %s\n"
+#: darwin-nat-info.c:769
+msgid "state-identity"
 msgstr ""
 
-#: darwin-nat.c:1530 inf-ptrace.c:224 inf-ttrace.c:754 procfs.c:3305
+#: darwin-nat-info.c:772
 #, possible-c-format
-msgid "Attaching to %s\n"
+msgid "0x%x"
 msgstr ""
 
-#: darwin-nat.c:1537
-#, possible-c-format
-msgid "Can't attach to process %d: %s (%d)"
+#: darwin-nat-info.c:774
+msgid ", masks:"
 msgstr ""
 
-#: darwin-nat.c:1582 inf-ptrace.c:283 inf-ttrace.c:799 procfs.c:3331
-#, possible-c-format
-msgid "Detaching from program: %s, %s\n"
+#: darwin-nat-info.c:776
+msgid " BAD_ACCESS"
 msgstr ""
 
-#: darwin-nat.c:1598
-#, possible-c-format
-msgid "Unable to detach from process-id %d: %s (%d)"
+#: darwin-nat-info.c:778
+msgid " BAD_INSTRUCTION"
 msgstr ""
 
-#: darwin-nat.c:1622
-#, c-format
-msgid "Thread 0x%lx of process %u"
+#: darwin-nat-info.c:780
+msgid " ARITHMETIC"
 msgstr ""
 
-#: darwin-nat.c:1655
-#, possible-c-format
-msgid "darwin_read_write_inferior(task=%x, %s, len=%d)\n"
+#: darwin-nat-info.c:782
+msgid " EMULATION"
 msgstr ""
 
-#: darwin-nat.c:1664
-#, possible-c-format
-msgid "darwin_read_write_inferior: mach_vm_read failed at %s: %s"
+#: darwin-nat-info.c:784
+msgid " SOFTWARE"
 msgstr ""
 
-#: darwin-nat.c:1696
-#, possible-c-format
-msgid "darwin_read_write_inferior: mach_vm_region_recurse failed at %s: %s\n"
+#: darwin-nat-info.c:786
+msgid " BREAKPOINT"
 msgstr ""
 
-#: darwin-nat.c:1704
-#, possible-c-format
-msgid ""
-"darwin_read_write_inferior: mach_vm_region_recurse addr=%s, start=%s, "
-"len=%s\n"
+#: darwin-nat-info.c:788
+msgid " SYSCALL"
 msgstr ""
 
-#: darwin-nat.c:1713
-#, possible-c-format
-msgid "No memory at %s (vs %s+0x%x).  Nothing written"
+#: darwin-nat-info.c:790
+msgid " MACH_SYSCALL"
 msgstr ""
 
-#: darwin-nat.c:1731
-#, possible-c-format
-msgid "darwin_read_write_inf: mach_vm_protect max failed at %s: %s"
+#: darwin-nat-info.c:792
+msgid " RPC_ALERT"
 msgstr ""
 
-#: darwin-nat.c:1746
-#, possible-c-format
-msgid "darwin_read_write_inf: mach_vm_protect failed at %s (len=0x%lx): %s"
+#: darwin-nat-info.c:794
+msgid " CRASH"
 msgstr ""
 
-#: darwin-nat.c:1760
-#, possible-c-format
-msgid "darwin_read_write_inferior: mach_vm_write failed: %s"
+#: darwin-nat-info.c:828
+msgid "Parameter is saved, host or none"
 msgstr ""
 
-#: darwin-nat.c:1782
-#, possible-c-format
-msgid "darwin_xfer_memory(%s, %d, %c)\n"
+#: darwin-nat-info.c:850
+msgid "Get list of tasks in system."
 msgstr ""
 
-#: darwin-nat.c:1800
-#, possible-c-format
-msgid "darwin_xfer_partial(%s, %d, rbuf=%s, wbuf=%s) pid=%u\n"
+#: darwin-nat-info.c:852
+msgid "Get list of ports in a task."
 msgstr ""
 
-#: darwin-nat.c:1943
-msgid "Darwin child process"
+#: darwin-nat-info.c:854
+msgid "Get info on a specific port."
 msgstr ""
 
-#: darwin-nat.c:1945
-msgid "Darwin child process (started by the \"run\" command)."
+#: darwin-nat-info.c:856
+msgid "Get info on a specific task."
 msgstr ""
 
-#: darwin-nat.c:1969
-#, possible-c-format
-msgid "GDB task: 0x%lx, pid: %d\n"
+#: darwin-nat-info.c:858
+msgid "Get list of threads in a task."
 msgstr ""
 
-#: darwin-nat.c:1973
-msgid "Set if printing inferior communication debugging statements."
+#: darwin-nat-info.c:860
+msgid "Get info on a specific thread."
 msgstr ""
 
-#: darwin-nat.c:1974
-msgid "Show if printing inferior communication debugging statements."
+#: darwin-nat-info.c:863
+msgid "Get information on all mach region for the task."
 msgstr ""
 
-#: darwin-nat.c:1980
-msgid "Set if mach exceptions are caught."
+#: darwin-nat-info.c:865
+msgid "Get information on all mach sub region for the task."
 msgstr ""
 
-#: darwin-nat.c:1981
-msgid "Show if mach exceptions are caught."
+#: darwin-nat-info.c:867
+msgid "Get information on mach region at given address."
 msgstr ""
 
-#: darwin-nat.c:1982
-msgid ""
-"When this mode is on, all low level exceptions are reported before being\n"
-"reported by the kernel."
+#: darwin-nat-info.c:870
+msgid "Disp mach exceptions."
 msgstr ""
 
-#: dbxread.c:168 mdebugread.c:3436
+#: dbxread.c:170 mdebugread.c:3441
 #, possible-c-format
 msgid "unknown symbol type %s"
 msgstr ""
 
-#: dbxread.c:175
+#: dbxread.c:177
 #, possible-c-format
 msgid "N_LBRAC/N_RBRAC symbol mismatch at symtab pos %d"
 msgstr ""
 
-#: dbxread.c:182
+#: dbxread.c:184
 #, possible-c-format
 msgid "\"repeated\" header file %s not previously seen, at symtab pos %d"
 msgstr ""
 
-#: dbxread.c:227
+#: dbxread.c:229
 msgid "Can't find any code sections in symbol file"
 msgstr ""
 
-#: dbxread.c:646
+#: dbxread.c:648
 msgid "Can't find .text section in symbol file"
 msgstr ""
 
-#: dbxread.c:708
+#: dbxread.c:710
 #, possible-c-format
 msgid "ridiculous string table size (%d bytes)."
 msgstr ""
 
-#: dbxread.c:833
+#: dbxread.c:835
 msgid "Premature end of file reading symbol table"
 msgstr ""
 
-#: dbxread.c:974
+#: dbxread.c:976
 #, possible-c-format
 msgid "bad string table offset in symbol %d"
 msgstr ""
 
-#: dbxread.c:1178 mdebugread.c:2245 xcoffread.c:2156
+#: dbxread.c:1180 mdebugread.c:2250 xcoffread.c:2182
 #, possible-c-format
 msgid "function `%s' appears to be defined outside of all compilation units"
 msgstr ""
 
-#: dbxread.c:1429
+#: dbxread.c:1431
 #, possible-c-format
 msgid "string table offset backs up at %d"
 msgstr ""
 
-#: dbxread.c:1577
+#: dbxread.c:1579
 #, possible-c-format
 msgid "N_BINCL %s not in entries for any file, at symtab pos %d"
 msgstr ""
 
-#: dbxread.c:2038 mdebugread.c:3371 xcoffread.c:2872
+#: dbxread.c:2040 mdebugread.c:3376 xcoffread.c:2898
 #, possible-c-format
 msgid "unknown symbol descriptor `%c'"
 msgstr ""
 
-#: dbxread.c:2607
+#: dbxread.c:2609
 msgid "First symbol in segment of executable not a source symbol"
 msgstr ""
 
-#: dbxread.c:2884
+#: dbxread.c:2886
 msgid ""
 "misplaced N_LBRAC entry; discarding local symbols which have no enclosing "
 "block"
 msgstr ""
 
-#: dbxread.c:2905
+#: dbxread.c:2907
 msgid "block start larger than block end"
 msgstr ""
 
-#: dbxread.c:3199
+#: dbxread.c:3201
 #, possible-c-format
 msgid "unmatched N_LBRAC before symtab pos %d"
 msgstr ""
 
-#: dbxread.c:3357 dbxread.c:3451 dbxread.c:3548
+#: dbxread.c:3359 dbxread.c:3453 dbxread.c:3549
 #, possible-c-format
 msgid "ridiculous string table size: %d bytes"
 msgstr ""
 
-#: dbxread.c:3524
+#: dbxread.c:3525
 #, possible-c-format
 msgid ""
 "stabsect_build_psymtabs:  Found stabs (%s), but not string section (%s)"
 msgstr ""
 
-#: dbxread.c:3535
+#: dbxread.c:3536
 #, possible-c-format
 msgid "Can't find %s section in symbol file"
 msgstr ""
 
-#: dcache.c:134
+#: dcache.c:140
 #, possible-c-format
 msgid "Deprecated remotecache flag is %s.\n"
 msgstr ""
 
-#: dcache.c:550 dcache.c:611
+#: dcache.c:570 dcache.c:633
 msgid "No data cache available.\n"
 msgstr ""
 
-#: dcache.c:565
+#: dcache.c:585
 msgid "No such cache line exists.\n"
 msgstr ""
 
-#: dcache.c:571 dcache.c:627
+#: dcache.c:591 dcache.c:649
 #, possible-c-format
 msgid "Line %d: address %s [%d hits]\n"
 msgstr ""
 
-#: dcache.c:598
+#: dcache.c:618
 msgid "Usage: info dcache [linenumber]\n"
 msgstr ""
 
-#: dcache.c:606
+#: dcache.c:626
 #, possible-c-format
-msgid "Dcache line width %d, maximum size %d\n"
+msgid "Dcache %u lines of %u bytes each.\n"
 msgstr ""
 
-#: dcache.c:615
+#: dcache.c:637
 #, possible-c-format
 msgid "Contains data for %s\n"
 msgstr ""
 
-#: dcache.c:635
+#: dcache.c:657
 #, possible-c-format
 msgid "Cache state: %d active lines, %d hits\n"
 msgstr ""
 
-#: dcache.c:642
+#: dcache.c:667
+msgid "Dcache size must be greater than 0."
+msgstr ""
+
+#: dcache.c:682
+#, possible-c-format
+msgid "Invalid dcache line size: %u (must be power of 2)."
+msgstr ""
+
+#: dcache.c:706
 msgid "Set cache use for remote targets."
 msgstr ""
 
-#: dcache.c:643
+#: dcache.c:707
 msgid "Show cache use for remote targets."
 msgstr ""
 
-#: dcache.c:644
+#: dcache.c:708
 msgid ""
 "This used to enable the data cache for remote targets.  The cache\n"
 "functionality is now controlled by the memory region system and the\n"
@@ -6592,7 +6687,7 @@
 "exists only for compatibility reasons."
 msgstr ""
 
-#: dcache.c:654
+#: dcache.c:718
 msgid ""
 "Print information on the dcache performance.\n"
 "With no arguments, this command prints the cache configuration and a\n"
@@ -6600,6 +6695,31 @@
 "the contents of a given line."
 msgstr ""
 
+#: dcache.c:724
+msgid "Use this command to set number of lines in dcache and line-size."
+msgstr ""
+
+#. allow_unknown
+#: dcache.c:727
+msgid "Show dcachesettings."
+msgstr ""
+
+#: dcache.c:732
+msgid "Set dcache line size in bytes (must be power of 2)."
+msgstr ""
+
+#: dcache.c:733
+msgid "Show dcache line size."
+msgstr ""
+
+#: dcache.c:740
+msgid "Set number of dcache lines."
+msgstr ""
+
+#: dcache.c:741
+msgid "Show number of dcache lines."
+msgstr ""
+
 #: dec-thread.c:355
 #, possible-c-format
 msgid "unable to get thread info, ignoring thread %ld"
@@ -6626,36 +6746,62 @@
 msgid "Show debugging of DEC threads module."
 msgstr ""
 
-#: demangle.c:61
+#: demangle.c:54
+#, possible-c-format
+msgid "Demangling of encoded C++/ObjC names when displaying symbols is %s.\n"
+msgstr ""
+
+#: demangle.c:67
+#, possible-c-format
+msgid "Demangling of C++/ObjC names in disassembly listings is %s.\n"
+msgstr ""
+
+#: demangle.c:86
 #, possible-c-format
 msgid "The current C++ demangling style is \"%s\".\n"
 msgstr ""
 
-#: demangle.c:114
+#: demangle.c:136
 #, possible-c-format
 msgid "Unknown demangling style `%s'.\n"
 msgstr ""
 
-#: demangle.c:117
+#: demangle.c:139
 msgid ""
 "The currently understood settings are:\n"
 "\n"
 msgstr ""
 
-#: demangle.c:139
+#: demangle.c:161
 #, possible-c-format
 msgid "`%s' style demangling chosen as the default."
 msgstr ""
 
-#: demangle.c:200
+#: demangle.c:220
+msgid "Set demangling of encoded C++/ObjC names when displaying symbols."
+msgstr ""
+
+#: demangle.c:221
+msgid "Show demangling of encoded C++/ObjC names when displaying symbols."
+msgstr ""
+
+#: demangle.c:227
+msgid "Set demangling of C++/ObjC names in disassembly listings."
+msgstr ""
+
+#: demangle.c:228
+msgid "Show demangling of C++/ObjC names in disassembly listings."
+msgstr ""
+
+#: demangle.c:240
 msgid "Set the current C++ demangling style."
 msgstr ""
 
-#: demangle.c:201
+#: demangle.c:241
 msgid "Show the current C++ demangling style."
 msgstr ""
 
-#: demangle.c:202
+#: demangle.c:242
 msgid ""
 "Use `set demangle-style' without arguments for a list of demangling styles."
 msgstr ""
@@ -6688,11 +6834,11 @@
 msgid "Can't read elf symbols from %s: %s"
 msgstr ""
 
-#: dictionary.c:588
+#: dictionary.c:587
 msgid "dict_add_symbol: non-expandable dictionary"
 msgstr ""
 
-#: doublest.c:806
+#: doublest.c:801
 #, possible-c-format
 msgid "Unrecognized %d-bit floating-point type."
 msgstr ""
@@ -6704,7 +6850,7 @@
 #. assumption might be wrong on targets that support
 #. floating-point types that only differ in endianness for
 #. example.  So we warn instead, and zero out the target buffer.
-#: doublest.c:887
+#: doublest.c:882
 msgid "Can't convert floating-point number to desired type."
 msgstr ""
 
@@ -6717,7 +6863,7 @@
 msgid "File is not an object file\n"
 msgstr ""
 
-#: dsrec.c:129 dsrec.c:143 symfile.c:1959
+#: dsrec.c:129 dsrec.c:143 symfile.c:1958
 msgid "Canceled the download"
 msgstr ""
 
@@ -6726,35 +6872,145 @@
 msgid "make_srec:  Bad address (%s), or bad flags (0x%x)."
 msgstr ""
 
-#: dummy-frame.c:314
+#: dummy-frame.c:312
 msgid "maintenance print dummy-frames"
 msgstr ""
 
-#: dummy-frame.c:327
+#: dummy-frame.c:325
 msgid "Print the contents of the internal dummy-frame stack."
 msgstr ""
 
-#: dwarf2-frame.c:319
-msgid "Support for DW_OP_fbreg is unimplemented"
+#: dwarf2expr.c:80
+#, possible-c-format
+msgid "Unsupported address size in DWARF expressions: %d bits"
 msgstr ""
 
-#: dwarf2-frame.c:328
-msgid "Support for DW_OP_call_frame_cfa is unimplemented"
+#: dwarf2expr.c:183
+msgid "dwarf expression stack underflow"
 msgstr ""
 
-#: dwarf2-frame.c:336
-msgid "Support for DW_OP_GNU_implicit_pointer is unimplemented"
+#: dwarf2expr.c:193 dwarf2expr.c:293
+#, possible-c-format
+msgid "Asked for position %d of stack, stack only has %d elements on it."
+msgstr ""
+
+#: dwarf2expr.c:207
+msgid "integral type expected in DWARF expression"
+msgstr ""
+
+#: dwarf2expr.c:227
+msgid "no unsigned variant found for type, while evaluating DWARF expression"
+msgstr ""
+
+#: dwarf2expr.c:249
+msgid "no signed variant found for type, while evaluating DWARF expression"
+msgstr ""
+
+#: dwarf2expr.c:386
+msgid "read_uleb128: Corrupted DWARF expression."
+msgstr ""
+
+#: dwarf2expr.c:413
+msgid "read_sleb128: Corrupted DWARF expression."
+msgstr ""
+
+#: dwarf2expr.c:441
+#, possible-c-format
+msgid ""
+"DWARF-2 expression error: `%s' operations must be used either alone or in "
+"conjunction with DW_OP_piece or DW_OP_bit_piece."
+msgstr ""
+
+#: dwarf2expr.c:475
+msgid "Could not find type for DW_OP_GNU_const_type"
+msgstr ""
+
+#: dwarf2expr.c:477
+msgid "DW_OP_GNU_const_type has different sizes for type and data"
+msgstr ""
+
+#: dwarf2expr.c:661
+#, possible-c-format
+msgid "DWARF-2 expression error: Loop detected (%d)."
+msgstr ""
+
+#: dwarf2expr.c:824
+msgid ""
+"DWARF-2 expression error: DW_OP_reg operations must be used either alone or "
+"in conjunction with DW_OP_piece or DW_OP_bit_piece."
+msgstr ""
+
+#: dwarf2expr.c:848 dwarf2loc.c:2595
+msgid "DW_OP_implicit_value: too few bytes available."
+msgstr ""
+
+#: dwarf2expr.c:869
+msgid ""
+"DWARF-2 expression error: DW_OP_GNU_implicit_pointer is not allowed in frame "
+"context"
+msgstr ""
+
+#: dwarf2expr.c:959
+msgid "Not implemented: computing frame base using explicit value operator"
+msgstr ""
+
+#: dwarf2expr.c:989
+#, possible-c-format
+msgid "Not enough elements for DW_OP_swap.  Need 2, have %d."
+msgstr ""
+
+#: dwarf2expr.c:1009
+#, possible-c-format
+msgid "Not enough elements for DW_OP_rot.  Need 3, have %d."
+msgstr ""
+
+#: dwarf2expr.c:1122
+msgid "Incompatible types on DWARF stack"
+msgstr ""
+
+#: dwarf2expr.c:1245
+msgid "Can't be reached."
+msgstr ""
+
+#: dwarf2expr.c:1331
+msgid ""
+"DWARF-2 expression error: DW_OP_GNU_uninit must always be the very last op."
 msgstr ""
 
-#: dwarf2-frame.c:343
-msgid "Support for DW_OP_GNU_push_tls_address is unimplemented"
+#: dwarf2expr.c:1357
+msgid "DW_OP_GNU_entry_value: too few bytes available."
 msgstr ""
 
-#: dwarf2-frame.c:353
-msgid "Support for DW_OP_call* is invalid in CFI"
+#: dwarf2expr.c:1382
+msgid ""
+"DWARF-2 expression error: DW_OP_GNU_entry_value is supported only for single "
+"DW_OP_reg* or for DW_OP_breg*(0)+DW_OP_deref*"
+msgstr ""
+
+#: dwarf2expr.c:1444
+msgid "DW_OP_GNU_reinterpret has wrong size"
+msgstr ""
+
+#: dwarf2expr.c:1453
+#, possible-c-format
+msgid "Unhandled dwarf expression opcode 0x%x"
+msgstr ""
+
+#: dwarf2expr.c:1479 dwarf2expr.c:1487 dwarf2expr.c:1495 dwarf2expr.c:1503
+#: dwarf2expr.c:1511
+#, possible-c-format
+msgid "%s is invalid in this context"
+msgstr ""
+
+#: dwarf2expr.c:1519
+msgid "Support for typed DWARF is not supported in this context"
 msgstr ""
 
-#: dwarf2-frame.c:377
+#: dwarf2expr.c:1531
+msgid "Support for DW_OP_GNU_entry_value is unimplemented"
+msgstr ""
+
+#: dwarf2-frame.c:336
 #, possible-c-format
 msgid ""
 "incomplete CFI data; DW_CFA_restore unspecified\n"
@@ -6764,716 +7020,863 @@
 #. This is actually invalid DWARF, but if we ever do run across
 #. it somehow, we might as well support it.  So, instead, report
 #. it as unimplemented.
-#: dwarf2-frame.c:422
+#: dwarf2-frame.c:392
 msgid ""
 "Not implemented: computing unwound register using explicit value operator"
 msgstr ""
 
-#: dwarf2-frame.c:550
+#: dwarf2-frame.c:524
 #, possible-c-format
 msgid "bad CFI data; mismatched DW_CFA_restore_state at %s"
 msgstr ""
 
-#: dwarf2-frame.c:710
+#: dwarf2-frame.c:684
 msgid "Unknown CFI encountered."
 msgstr ""
 
-#: dwarf2-frame.c:926
+#: dwarf2-frame.c:905
 msgid "Could not compute CFA; needed to translate this expression"
 msgstr ""
 
-#: dwarf2-frame.c:956 dwarf2loc.c:1407
+#: dwarf2-frame.c:935 dwarf2loc.c:2331
 #, possible-c-format
 msgid "Unable to access DWARF register number %d"
 msgstr ""
 
-#: dwarf2-frame.c:980 dwarf2-frame.c:1098
+#: dwarf2-frame.c:959 dwarf2-frame.c:1105
 msgid "Unknown CFA rule."
 msgstr ""
 
-#: dwarf2-frame.c:1153
+#: dwarf2-frame.c:1160
 #, possible-c-format
 msgid "incomplete CFI data; unspecified registers (e.g., %s) at %s"
 msgstr ""
 
-#: dwarf2-frame.c:1325
+#: dwarf2-frame.c:1354
 msgid "Unknown register rule."
 msgstr ""
 
-#: dwarf2-frame.c:1435
+#: dwarf2-frame.c:1492
 msgid "can't compute CFA for this frame"
 msgstr ""
 
-#: dwarf2-frame.c:1562
+#: dwarf2-frame.c:1619
 msgid "Unsupported address size"
 msgstr ""
 
-#: dwarf2-frame.c:1579
+#: dwarf2-frame.c:1636
 msgid "Unsupported encoding: DW_EH_PE_indirect"
 msgstr ""
 
-#: dwarf2-frame.c:1612 dwarf2-frame.c:1660
+#: dwarf2-frame.c:1669 dwarf2-frame.c:1717
 msgid "Invalid or unsupported encoding"
 msgstr ""
 
-#: dwarf2-frame.c:2152
+#: dwarf2-frame.c:1927
+msgid "Found a CIE when not expecting it."
+msgstr ""
+
+#: dwarf2-frame.c:2096
+msgid "Found an FDE when not expecting it."
+msgstr ""
+
+#: dwarf2-frame.c:2234
 #, possible-c-format
 msgid "Corrupt data in %s:%s; align 4 workaround apparently succeeded"
 msgstr ""
 
-#: dwarf2-frame.c:2159
+#: dwarf2-frame.c:2241
 #, possible-c-format
 msgid "Corrupt data in %s:%s; align 8 workaround apparently succeeded"
 msgstr ""
 
-#: dwarf2-frame.c:2167
+#: dwarf2-frame.c:2249
 #, possible-c-format
 msgid "Corrupt data in %s:%s"
 msgstr ""
 
-#: dwarf2expr.c:122
-msgid "dwarf expression stack underflow"
+#: dwarf2-frame.c:2340
+#, possible-c-format
+msgid "skipping .eh_frame info of %s: %s"
 msgstr ""
 
-#: dwarf2expr.c:132 dwarf2expr.c:187
+#: dwarf2-frame.c:2380
 #, possible-c-format
-msgid "Asked for position %d of stack, stack only has %d elements on it."
+msgid "skipping .debug_frame info of %s: %s"
 msgstr ""
 
-#: dwarf2expr.c:171
-msgid "Unsupported address size.\n"
+#: dwarf2loc.c:90
+msgid "dwarf2_find_location_expression: Corrupted DWARF expression."
 msgstr ""
 
-#: dwarf2expr.c:279
-msgid "read_uleb128: Corrupted DWARF expression."
+#: dwarf2loc.c:243
+#, possible-c-format
+msgid "Could not find the frame base for \"%s\"."
 msgstr ""
 
-#: dwarf2expr.c:305
-msgid "read_sleb128: Corrupted DWARF expression."
+#: dwarf2loc.c:333
+#, possible-c-format
+msgid "Entry values and tail call frames debugging is %s.\n"
 msgstr ""
 
-#: dwarf2expr.c:332
+#: dwarf2loc.c:362
+#, possible-c-format
+msgid "DW_AT_GNU_call_site_target is not specified at %s in %s"
+msgstr ""
+
+#: dwarf2loc.c:374
 #, possible-c-format
 msgid ""
-"DWARF-2 expression error: `%s' operations must be used either alone or in "
-"conjuction with DW_OP_piece or DW_OP_bit_piece."
+"DW_AT_GNU_call_site_target DWARF block resolving requires known frame which "
+"is currently not available at %s in %s"
 msgstr ""
 
-#: dwarf2expr.c:354
+#: dwarf2loc.c:405
 #, possible-c-format
-msgid "DWARF-2 expression error: Loop detected (%d)."
+msgid "Cannot find function \"%s\" for a call site target at %s in %s"
 msgstr ""
 
-#: dwarf2expr.c:500
-msgid ""
-"DWARF-2 expression error: DW_OP_reg operations must be used either alone or "
-"in conjuction with DW_OP_piece or DW_OP_bit_piece."
+#: dwarf2loc.c:418
+msgid "invalid call site target kind"
 msgstr ""
 
-#: dwarf2expr.c:522 dwarf2loc.c:1671
-msgid "DW_OP_implicit_value: too few bytes available."
+#: dwarf2loc.c:434
+#, possible-c-format
+msgid ""
+"DW_TAG_GNU_call_site resolving failed to find function name for address %s"
 msgstr ""
 
-#: dwarf2expr.c:625
-msgid "Not implemented: computing frame base using explicit value operator"
+#: dwarf2loc.c:503
+#, possible-c-format
+msgid ""
+"DW_OP_GNU_entry_value resolving has found function \"%s\" at %s can call "
+"itself via tail calls"
 msgstr ""
 
-#: dwarf2expr.c:654
+#: dwarf2loc.c:669
 #, possible-c-format
-msgid "Not enough elements for DW_OP_swap.  Need 2, have %d."
+msgid "Unable to find function for PC %s"
 msgstr ""
 
-#: dwarf2expr.c:674
+#: dwarf2loc.c:768
 #, possible-c-format
-msgid "Not enough elements for DW_OP_rot.  Need 3, have %d."
+msgid ""
+"There are no unambiguously determinable intermediate callers or callees "
+"between caller function \"%s\" at %s and callee function \"%s\" at %s"
 msgstr ""
 
-#: dwarf2expr.c:760 dwarf2expr.c:768 valarith.c:1159 valarith.c:1170
-#: valarith.c:1285 valarith.c:1296
-msgid "Division by zero"
+#: dwarf2loc.c:845
+#, possible-c-format
+msgid ""
+"DW_OP_GNU_entry_value resolving callee gdbarch %s (of %s (%s)) does not "
+"match caller gdbarch %s"
 msgstr ""
 
-#: dwarf2expr.c:812
-msgid "Can't be reached."
+#: dwarf2loc.c:857
+#, possible-c-format
+msgid "DW_OP_GNU_entry_value resolving requires caller of %s (%s)"
 msgstr ""
 
-#: dwarf2expr.c:890
+#: dwarf2loc.c:873
+#, possible-c-format
 msgid ""
-"DWARF-2 expression error: DW_OP_GNU_uninit must always be the very last op."
+"DW_OP_GNU_entry_value resolving expects callee %s at %s but the called frame "
+"is for %s at %s"
 msgstr ""
 
-#: dwarf2expr.c:916
+#. DW_TAG_GNU_call_site_parameter will be missing just if GCC could not
+#. determine its value.
+#: dwarf2loc.c:903
 #, possible-c-format
-msgid "Unhandled dwarf expression opcode 0x%x"
+msgid "Cannot find matching parameter at DW_TAG_GNU_call_site %s at %s"
 msgstr ""
 
-#: dwarf2loc.c:88
-msgid "dwarf2_find_location_expression: Corrupted DWARF expression."
+#: dwarf2loc.c:939 dwarf2loc.c:986
+msgid "Cannot resolve DW_AT_GNU_call_site_data_value"
 msgstr ""
 
-#: dwarf2loc.c:220
-#, possible-c-format
-msgid "Could not find the frame base for \"%s\"."
+#: dwarf2loc.c:1150
+msgid ""
+"DWARF-2 expression error: DW_OP_GNU_entry_value is supported only for single "
+"DW_OP_reg* or for DW_OP_fbreg(*)"
 msgstr ""
 
-#: dwarf2loc.c:519
+#: dwarf2loc.c:1388
 msgid "Should not be able to create a lazy value with an enclosing type"
 msgstr ""
 
-#: dwarf2loc.c:611 dwarf2loc.c:1159
+#: dwarf2loc.c:1480 dwarf2loc.c:2044
 #, possible-c-format
 msgid "Unable to access DWARF register number %s"
 msgstr ""
 
-#: dwarf2loc.c:676 dwarf2loc.c:1235
+#: dwarf2loc.c:1537 dwarf2loc.c:2137
 msgid "invalid location type"
 msgstr ""
 
-#: dwarf2loc.c:798
+#: dwarf2loc.c:1659
 msgid ""
 "Can't do read-modify-write to update bitfield; containing word has been "
 "optimized out"
 msgstr ""
 
-#: dwarf2loc.c:803
+#: dwarf2loc.c:1664
 msgid ""
 "Can't do read-modify-write to update bitfield; containing word is unavailable"
 msgstr ""
 
-#: dwarf2loc.c:818
+#: dwarf2loc.c:1679
 #, possible-c-format
 msgid "Unable to write to DWARF register number %s"
 msgstr ""
 
-#: dwarf2loc.c:996
+#: dwarf2loc.c:1856
 msgid "Invalid use of DW_OP_GNU_implicit_pointer"
 msgstr ""
 
-#: dwarf2loc.c:1059
+#: dwarf2loc.c:1926
 msgid "access outside bounds of object referenced via synthetic pointer"
 msgstr ""
 
-#: dwarf2loc.c:1155
+#: dwarf2loc.c:2039
 msgid "cannot use offset on synthetic pointer to register"
 msgstr ""
 
-#: dwarf2loc.c:1388
+#: dwarf2loc.c:2312
 #, possible-c-format
 msgid "DWARF operator %s cannot be translated to an agent expression"
 msgstr ""
 
-#: dwarf2loc.c:1391
+#: dwarf2loc.c:2315
 #, possible-c-format
 msgid ""
 "Unknown DWARF operator 0x%02x cannot be translated to an agent expression"
 msgstr ""
 
-#: dwarf2loc.c:1673
+#: dwarf2loc.c:2597
 #, possible-c-format
 msgid "Cannot translate DW_OP_implicit_value of %d bytes"
 msgstr ""
 
-#: dwarf2loc.c:1757
+#: dwarf2loc.c:2681
 msgid "No block found for address"
 msgstr ""
 
-#: dwarf2loc.c:1762
+#: dwarf2loc.c:2686
 msgid "No function found for block"
 msgstr ""
 
 #. Note that dwarf_stack_op_name will never return
 #. NULL here.
-#: dwarf2loc.c:1833
+#: dwarf2loc.c:2757
 #, possible-c-format
 msgid "Unsupported size %d in %s"
 msgstr ""
 
-#: dwarf2loc.c:2021
+#: dwarf2loc.c:2945
 msgid "Cannot translate empty pieces to agent expressions"
 msgstr ""
 
-#: dwarf2loc.c:2034
+#: dwarf2loc.c:2958
 msgid "Expression pieces exceed word size"
 msgstr ""
 
-#: dwarf2loc.c:2120
+#: dwarf2loc.c:3044
 msgid "invalid label"
 msgstr ""
 
-#: dwarf2loc.c:2178 dwarf2loc.c:2188
+#: dwarf2loc.c:3125 dwarf2loc.c:3134
 #, possible-c-format
 msgid "a variable in $%s"
 msgstr ""
 
-#: dwarf2loc.c:2209
+#: dwarf2loc.c:3155
 #, possible-c-format
 msgid "No block found for address for symbol \"%s\"."
 msgstr ""
 
-#: dwarf2loc.c:2215
+#: dwarf2loc.c:3161
 #, possible-c-format
 msgid "No function found for block for symbol \"%s\"."
 msgstr ""
 
-#: dwarf2loc.c:2228
+#: dwarf2loc.c:3174
 #, possible-c-format
 msgid "Unexpected opcode after DW_OP_breg%u for symbol \"%s\"."
 msgstr ""
 
-#: dwarf2loc.c:2248
+#: dwarf2loc.c:3192
 #, possible-c-format
 msgid "a variable at frame base reg $%s offset %s+%s"
 msgstr ""
 
-#: dwarf2loc.c:2262
+#: dwarf2loc.c:3204
 #, possible-c-format
 msgid "a variable at offset %s from base reg $%s"
 msgstr ""
 
-#: dwarf2loc.c:2293
+#: dwarf2loc.c:3235
 #, possible-c-format
 msgid ""
 "a thread-local variable at offset 0x%s in the thread-local storage for `%s'"
 msgstr ""
 
-#: dwarf2loc.c:2304
+#: dwarf2loc.c:3246
 #, possible-c-format
 msgid "the constant %d"
 msgstr ""
 
-#: dwarf2loc.c:2325
-msgid "a complex DWARF expression:\n"
-msgstr ""
-
-#: dwarf2loc.c:2339
+#: dwarf2loc.c:3278
 #, possible-c-format
 msgid "Unrecognized DWARF opcode 0x%02x at %ld"
 msgstr ""
 
-#: dwarf2loc.c:2603
+#: dwarf2loc.c:3617
 msgid ", and "
 msgstr ""
 
-#: dwarf2loc.c:2636
+#: dwarf2loc.c:3633
+msgid "a complex DWARF expression:\n"
+msgstr ""
+
+#: dwarf2loc.c:3655
 #, possible-c-format
 msgid "an empty %s-byte piece"
 msgstr ""
 
-#: dwarf2loc.c:2639
+#: dwarf2loc.c:3658
 #, possible-c-format
 msgid " [%s-byte piece]"
 msgstr ""
 
-#: dwarf2loc.c:2651
+#: dwarf2loc.c:3670
 #, possible-c-format
 msgid "an empty %s-bit piece"
 msgstr ""
 
-#: dwarf2loc.c:2655
+#: dwarf2loc.c:3674
 #, possible-c-format
 msgid " [%s-bit piece, offset %s bits]"
 msgstr ""
 
-#: dwarf2loc.c:2667
+#: dwarf2loc.c:3686
 #, possible-c-format
 msgid "Corrupted DWARF2 expression for \"%s\"."
 msgstr ""
 
-#: dwarf2loc.c:2783
+#: dwarf2loc.c:3823
 msgid "multi-location:\n"
 msgstr ""
 
-#: dwarf2loc.c:2789
+#: dwarf2loc.c:3829
 #, possible-c-format
 msgid "Corrupted DWARF expression for symbol \"%s\"."
 msgstr ""
 
-#: dwarf2loc.c:2808
+#: dwarf2loc.c:3848
 #, possible-c-format
 msgid "  Base address %s"
 msgstr ""
 
 #. (It would improve readability to print only the minimum
 #. necessary digits of the second number of the range.)
-#: dwarf2loc.c:2826
+#: dwarf2loc.c:3866
 #, possible-c-format
 msgid "  Range %s-%s: "
 msgstr ""
 
-#: dwarf2read.c:801
+#: dwarf2loc.c:3914
+msgid "Set entry values and tail call frames debugging."
+msgstr ""
+
+#: dwarf2loc.c:3916
+msgid "Show entry values and tail call frames debugging."
+msgstr ""
+
+#: dwarf2loc.c:3918
+msgid ""
+"When non-zero, the process of determining parameter values from function "
+"entry point and tail call frames will be printed."
+msgstr ""
+
+#: dwarf2read.c:822
 #, possible-c-format
 msgid ""
 "The upper bound on the age of cached dwarf2 compilation units is %s.\n"
 msgstr ""
 
-#: dwarf2read.c:813
+#: dwarf2read.c:834
 msgid "statement list doesn't fit in .debug_line section"
 msgstr ""
 
-#: dwarf2read.c:820
+#: dwarf2read.c:841
 msgid ".debug_line section has line data without a file"
 msgstr ""
 
-#: dwarf2read.c:827
+#: dwarf2read.c:848
 msgid ".debug_line section has line program sequence without an end"
 msgstr ""
 
-#: dwarf2read.c:834
+#: dwarf2read.c:855
 msgid "location expression too complex"
 msgstr ""
 
-#: dwarf2read.c:842
+#: dwarf2read.c:863
 #, possible-c-format
 msgid "const value length mismatch for '%s', got %d, expected %d"
 msgstr ""
 
-#: dwarf2read.c:850
-msgid "macro info runs off end of `.debug_macinfo' section"
+#: dwarf2read.c:871
+#, possible-c-format
+msgid "macro info runs off end of `%s' section"
 msgstr ""
 
-#: dwarf2read.c:857
+#: dwarf2read.c:879
 #, possible-c-format
 msgid ""
 "macro debug info contains a malformed macro definition:\n"
 "`%s'"
 msgstr ""
 
-#: dwarf2read.c:866
+#: dwarf2read.c:888
 #, possible-c-format
 msgid "invalid attribute class or form for '%s' in '%s'"
 msgstr ""
 
-#: dwarf2read.c:1453
+#: dwarf2read.c:1518
 #, possible-c-format
 msgid ""
 "Support for zlib-compressed DWARF data (from '%s') is disabled in this copy "
 "of GDB"
 msgstr ""
 
-#: dwarf2read.c:1469 dwarf2read.c:1610
+#: dwarf2read.c:1534 dwarf2read.c:1672
 #, possible-c-format
 msgid "Dwarf Error: Can't read DWARF data from '%s'"
 msgstr ""
 
-#: dwarf2read.c:1476
+#: dwarf2read.c:1541
 #, possible-c-format
 msgid "Dwarf Error: Corrupt DWARF ZLIB header from '%s'"
 msgstr ""
 
-#: dwarf2read.c:1501
+#: dwarf2read.c:1566
 #, possible-c-format
 msgid "Dwarf Error: setting up DWARF uncompression in '%s': %d"
 msgstr ""
 
-#: dwarf2read.c:1507
+#: dwarf2read.c:1572
 #, possible-c-format
 msgid "Dwarf Error: zlib error uncompressing from '%s': %d"
 msgstr ""
 
-#: dwarf2read.c:1514
+#: dwarf2read.c:1579
 #, possible-c-format
 msgid "Dwarf Error: concluding DWARF uncompression in '%s': %d"
 msgstr ""
 
-#: dwarf2read.c:2461
+#: dwarf2read.c:2621
 #, possible-c-format
 msgid "  Number of unread CUs: %d\n"
 msgstr ""
 
-#: dwarf2read.c:2675
+#: dwarf2read.c:2853
 #, possible-c-format
 msgid "(Internal error: pc %s in read in CU, but not in symtab.)"
 msgstr ""
 
-#: dwarf2read.c:2834
+#: dwarf2read.c:3016
 msgid "read_comp_unit_head: dwarf from non elf file"
 msgstr ""
 
-#: dwarf2read.c:2850
+#: dwarf2read.c:3043
 #, possible-c-format
 msgid ""
 "Dwarf Error: wrong version in compilation unit header (is %d, should be 2, "
 "3, or 4) [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:2857
+#: dwarf2read.c:3050
 #, possible-c-format
 msgid ""
 "Dwarf Error: bad offset (0x%lx) in compilation unit header (offset 0x%lx + "
 "6) [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:2865
+#: dwarf2read.c:3058
 #, possible-c-format
 msgid ""
 "Dwarf Error: bad length (0x%lx) in compilation unit header (offset 0x%lx + "
 "0) [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:3056
+#: dwarf2read.c:3261
 msgid "debug type entry runs off end of `.debug_types' section, ignored"
 msgstr ""
 
-#: dwarf2read.c:3116
+#: dwarf2read.c:3299
+#, possible-c-format
+msgid ""
+"debug type entry at offset 0x%x is duplicate to the entry at offset 0x%x, "
+"signature 0x%s"
+msgstr ""
+
+#: dwarf2read.c:3341
 msgid "missing `.debug_types' section for DW_FORM_ref_sig8 die"
 msgstr ""
 
-#: dwarf2read.c:3777
+#: dwarf2read.c:4013
 #, possible-c-format
 msgid "unhandled containing DIE tag %d for DIE at %d"
 msgstr ""
 
-#: dwarf2read.c:4111 dwarf2read.c:9096
+#: dwarf2read.c:4347 dwarf2read.c:9705
 msgid "malformed enumerator DIE ignored"
 msgstr ""
 
-#: dwarf2read.c:4139
+#: dwarf2read.c:4385
 #, possible-c-format
 msgid "Dwarf Error: Could not find abbrev number %d [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:4190 dwarf2read.c:9312
+#: dwarf2read.c:4436 dwarf2read.c:9921
 msgid "ignoring absolute DW_AT_sibling"
 msgstr ""
 
-#: dwarf2read.c:4266 dwarf2read.c:9746
+#: dwarf2read.c:4512 dwarf2read.c:10366
 #, possible-c-format
 msgid "Dwarf Error: Cannot handle %s in DWARF reader [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:4312
+#: dwarf2read.c:4558
 #, possible-c-format
 msgid "bug: psymtab for %s is already read in."
 msgstr ""
 
-#: dwarf2read.c:4319 mdebugread.c:281
+#: dwarf2read.c:4565 mdebugread.c:286
 #, possible-c-format
 msgid "Reading in symbols for %s..."
 msgstr ""
 
-#: dwarf2read.c:4348 mdebugread.c:294 psymtab.c:102 symfile.c:1156
+#: dwarf2read.c:4594 mdebugread.c:299 psymtab.c:102 symfile.c:1158
 msgid "done.\n"
 msgstr ""
 
-#: dwarf2read.c:4780
+#: dwarf2read.c:5005
 #, possible-c-format
 msgid "Tag '%s' has unexpected children"
 msgstr ""
 
-#: dwarf2read.c:4970
+#: dwarf2read.c:5195
 msgid "template parameter missing DW_AT_type"
 msgstr ""
 
-#: dwarf2read.c:4986
+#: dwarf2read.c:5211
 msgid "template parameter missing DW_AT_const_value"
 msgstr ""
 
-#: dwarf2read.c:5181
+#: dwarf2read.c:5406
 #, possible-c-format
 msgid ""
 "Computed physname <%s> does not match demangled <%s> (from linkage <%s>) - "
 "DIE at 0x%x [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:5228
+#: dwarf2read.c:5455 dwarf2read.c:5551
 #, possible-c-format
 msgid "Tag '%s' has no DW_AT_import"
 msgstr ""
 
-#: dwarf2read.c:5527
+#: dwarf2read.c:5542
+#, possible-c-format
+msgid ""
+"child DW_TAG_imported_declaration expected - DIE at 0x%x [in module %s]"
+msgstr ""
+
+#: dwarf2read.c:5563
+#, possible-c-format
+msgid ""
+"child DW_TAG_imported_declaration has unknown imported name - DIE at 0x%x "
+"[in module %s]"
+msgstr ""
+
+#: dwarf2read.c:5751
+msgid "CU refers to both DW_AT_GNU_macros and DW_AT_macro_info"
+msgstr ""
+
+#: dwarf2read.c:5841
 #, possible-c-format
 msgid "Dwarf Error: Missing children for type unit [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:5617
+#: dwarf2read.c:5931
 #, possible-c-format
 msgid "DIE 0x%x and its abstract origin 0x%x have different tags"
 msgstr ""
 
-#: dwarf2read.c:5660
+#: dwarf2read.c:5974
 #, possible-c-format
 msgid "Child DIE 0x%x and its abstract origin 0x%x have different tags"
 msgstr ""
 
-#: dwarf2read.c:5665
+#: dwarf2read.c:5979
 #, possible-c-format
 msgid "Child DIE 0x%x and its abstract origin 0x%x have different parents"
 msgstr ""
 
-#: dwarf2read.c:5678
+#: dwarf2read.c:5992
 #, possible-c-format
 msgid ""
 "Multiple children of DIE 0x%x refer to DIE 0x%x as their abstract origin"
 msgstr ""
 
-#: dwarf2read.c:5740
+#: dwarf2read.c:6054
 #, possible-c-format
 msgid "missing name for subprogram DIE at %d"
 msgstr ""
 
-#: dwarf2read.c:5750
+#: dwarf2read.c:6064
 #, possible-c-format
 msgid "cannot get low and high bounds for subprogram DIE at %d"
 msgstr ""
 
-#: dwarf2read.c:5977
+#: dwarf2read.c:6279
+#, possible-c-format
+msgid "missing DW_AT_low_pc for DW_TAG_GNU_call_site DIE 0x%x [in module %s]"
+msgstr ""
+
+#: dwarf2read.c:6295
+#, possible-c-format
+msgid "Duplicate PC %s for DW_TAG_GNU_call_site DIE 0x%x [in module %s]"
+msgstr ""
+
+#: dwarf2read.c:6310
+#, possible-c-format
+msgid ""
+"Tag %d is not DW_TAG_GNU_call_site_parameter in DW_TAG_GNU_call_site child "
+"DIE 0x%x [in module %s]"
+msgstr ""
+
+#: dwarf2read.c:6368
+#, possible-c-format
+msgid ""
+"Cannot find function owning DW_TAG_GNU_call_site DIE 0x%x [in module %s]"
+msgstr ""
+
+#: dwarf2read.c:6406
+#, possible-c-format
+msgid ""
+"DW_AT_GNU_call_site_target target DIE has invalid physname, for referencing "
+"DIE 0x%x [in module %s]"
+msgstr ""
+
+#: dwarf2read.c:6419
+#, possible-c-format
+msgid ""
+"DW_AT_GNU_call_site_target target DIE has invalid low pc, for referencing "
+"DIE 0x%x [in module %s]"
+msgstr ""
+
+#: dwarf2read.c:6428
+#, possible-c-format
+msgid ""
+"DW_TAG_GNU_call_site DW_AT_GNU_call_site_target is neither block nor "
+"reference, for DIE 0x%x [in module %s]"
+msgstr ""
+
+#: dwarf2read.c:6457
+#, possible-c-format
+msgid ""
+"No DW_FORM_block* DW_AT_location for DW_TAG_GNU_call_site child DIE 0x%x [in "
+"module %s]"
+msgstr ""
+
+#: dwarf2read.c:6470
+#, possible-c-format
+msgid ""
+"Only single DW_OP_reg or DW_OP_fbreg is supported for DW_FORM_block* "
+"DW_AT_location for DW_TAG_GNU_call_site child DIE 0x%x [in module %s]"
+msgstr ""
+
+#: dwarf2read.c:6481
+#, possible-c-format
+msgid ""
+"No DW_FORM_block* DW_AT_GNU_call_site_value for DW_TAG_GNU_call_site child "
+"DIE 0x%x [in module %s]"
+msgstr ""
+
+#: dwarf2read.c:6499
+#, possible-c-format
+msgid ""
+"No DW_FORM_block* DW_AT_GNU_call_site_data_value for DW_TAG_GNU_call_site "
+"child DIE 0x%x [in module %s]"
+msgstr ""
+
+#: dwarf2read.c:6543
 #, possible-c-format
 msgid "Offset %d out of bounds for DW_AT_ranges attribute"
 msgstr ""
 
-#: dwarf2read.c:6031 dwarf2read.c:6329
+#: dwarf2read.c:6597 dwarf2read.c:6896
 msgid "Invalid .debug_ranges data (no base address)"
 msgstr ""
 
-#: dwarf2read.c:6039 dwarf2read.c:6338
+#: dwarf2read.c:6605 dwarf2read.c:6905
 msgid "Invalid .debug_ranges data (inverted range)"
 msgstr ""
 
-#: dwarf2read.c:6297
+#: dwarf2read.c:6864
 #, possible-c-format
 msgid "Offset %lu out of bounds for DW_AT_ranges attribute"
 msgstr ""
 
-#: dwarf2read.c:6765
+#: dwarf2read.c:7332
 #, possible-c-format
 msgid "unsupported accessibility %d"
 msgstr ""
 
-#: dwarf2read.c:6777
+#: dwarf2read.c:7344
 msgid "unexpected virtuality in component of Ada type"
 msgstr ""
 
-#: dwarf2read.c:6802
+#: dwarf2read.c:7369
 msgid "unexpected member function in Ada type"
 msgstr ""
 
-#: dwarf2read.c:6885
+#: dwarf2read.c:7452
 #, possible-c-format
 msgid "member function type missing for '%s'"
 msgstr ""
 
-#: dwarf2read.c:6974
+#: dwarf2read.c:7541
 #, possible-c-format
 msgid ""
 "Member function \"%s\" (offset %d) is virtual but the vtable offset is not "
 "specified"
 msgstr ""
 
-#: dwarf2read.c:6994
+#: dwarf2read.c:7561
 msgid "unexpected member functions in Ada type"
 msgstr ""
 
-#: dwarf2read.c:7321
+#: dwarf2read.c:7888
 #, possible-c-format
 msgid "virtual function table pointer not found when defining class '%s'"
 msgstr ""
 
-#: dwarf2read.c:7643
+#: dwarf2read.c:8234
 msgid ""
 "DW_AT_byte_size for array type smaller than the total size of elements"
 msgstr ""
 
-#: dwarf2read.c:7863
+#: dwarf2read.c:8454
 #, possible-c-format
 msgid "DW_TAG_module has no name, offset 0x%x"
 msgstr ""
 
-#: dwarf2read.c:7970
+#: dwarf2read.c:8561
 #, possible-c-format
 msgid "invalid pointer size %d"
 msgstr ""
 
-#: dwarf2read.c:8342
+#: dwarf2read.c:8933
 msgid "DW_AT_name missing from DW_TAG_base_type"
 msgstr ""
 
-#: dwarf2read.c:8389
+#: dwarf2read.c:8986
 #, possible-c-format
 msgid "unsupported DW_AT_encoding: '%s'"
 msgstr ""
 
-#: dwarf2read.c:8750
+#: dwarf2read.c:9345
 #, possible-c-format
 msgid "Dwarf Error: could not find abbrev number %d [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:9364
+#: dwarf2read.c:9689
+#, possible-c-format
+msgid ""
+"DW_TAG_typedef has childen - GCC PR debug/47510 bug - DIE at 0x%x [in module "
+"%s]"
+msgstr ""
+
+#: dwarf2read.c:9973
 #, possible-c-format
 msgid "DW_AT_low_pc %s is zero for DIE at 0x%x [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:9375
+#: dwarf2read.c:9984
 #, possible-c-format
 msgid ""
 "DW_AT_low_pc %s is not < DW_AT_high_pc %s for DIE at 0x%x [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:9474
+#: dwarf2read.c:10083
 #, possible-c-format
 msgid "could not find partial DIE 0x%x in cache [from module %s]\n"
 msgstr ""
 
-#: dwarf2read.c:9763
+#: dwarf2read.c:10383
 #, possible-c-format
 msgid "Suspicious DW_AT_byte_size value treated as zero instead of %s"
 msgstr ""
 
-#: dwarf2read.c:9847
+#: dwarf2read.c:10467
 #, possible-c-format
 msgid "read_address: bad switch, signed [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:9866
+#: dwarf2read.c:10486
 #, possible-c-format
 msgid "read_address: bad switch, unsigned [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:9960
+#: dwarf2read.c:10580
 msgid "intermixed 32-bit and 64-bit DWARF sections"
 msgstr ""
 
-#: dwarf2read.c:9996
+#: dwarf2read.c:10616
 #, possible-c-format
 msgid "read_offset_1: bad switch [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:10039
+#: dwarf2read.c:10654
 #, possible-c-format
 msgid "DW_FORM_strp used without .debug_str section [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:10045
+#: dwarf2read.c:10657
 #, possible-c-format
 msgid "DW_FORM_strp pointing outside of .debug_str section [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:10372
+#: dwarf2read.c:10992
 msgid "missing .debug_line section"
 msgstr ""
 
-#: dwarf2read.c:10421
+#: dwarf2read.c:11041
 msgid "invalid maximum_ops_per_instruction in `.debug_line' section"
 msgstr ""
 
-#: dwarf2read.c:10472
+#: dwarf2read.c:11092
 msgid "line number info header doesn't fit in `.debug_line' section"
 msgstr ""
 
-#: dwarf2read.c:10519
+#: dwarf2read.c:11139
 #, possible-c-format
 msgid "misplaced first line number at 0x%lx for '%s'"
 msgstr ""
 
-#: dwarf2read.c:10756
+#: dwarf2read.c:11358
 #, possible-c-format
 msgid ".debug_line address at offset 0x%lx is 0 [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:10793 dwarf2read.c:10802
+#: dwarf2read.c:11395 dwarf2read.c:11404
 msgid "mangled .debug_line section"
 msgstr ""
 
-#: dwarf2read.c:11159
+#: dwarf2read.c:11795
 msgid "file index out of range"
 msgstr ""
 
@@ -7481,499 +7884,520 @@
 #. trash data, but since we must specifically ignore things
 #. we don't recognize, there is nothing else we should do at
 #. this point.
-#: dwarf2read.c:11429
+#: dwarf2read.c:12057
 #, possible-c-format
 msgid "unsupported tag: '%s'"
 msgstr ""
 
-#: dwarf2read.c:11597
+#: dwarf2read.c:12225
 #, possible-c-format
 msgid "unsupported const value attribute form: '%s'"
 msgstr ""
 
-#: dwarf2read.c:11717
+#: dwarf2read.c:12345
 #, possible-c-format
 msgid ""
 "Dwarf Error: Problem turning containing type into gdb type [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:11749 dwarf2read.c:13720
+#: dwarf2read.c:12377 dwarf2read.c:14432
 #, possible-c-format
 msgid ""
 "Dwarf Error: Cannot find signatured DIE referenced from DIE at 0x%x [in "
 "module %s]"
 msgstr ""
 
-#: dwarf2read.c:11760
+#: dwarf2read.c:12388
 #, possible-c-format
 msgid "Dwarf Error: Bad type attribute %s [in module %s]"
 msgstr ""
 
 #. read_type_die already issued a complaint.
-#: dwarf2read.c:11784
+#: dwarf2read.c:12412
 #, possible-c-format
 msgid "<unknown type in %s, CU 0x%x, DIE 0x%x>"
 msgstr ""
 
-#: dwarf2read.c:11886
+#: dwarf2read.c:12514
 #, possible-c-format
 msgid "unexpected tag in read_type_die: '%s'"
 msgstr ""
 
-#: dwarf2read.c:12061
+#: dwarf2read.c:12730
 #, possible-c-format
 msgid "template param type '%s' defined within parent '%s'"
 msgstr ""
 
-#: dwarf2read.c:13487
+#: dwarf2read.c:14179
 #, possible-c-format
 msgid "unsupported die ref attribute form: '%s'"
 msgstr ""
 
-#: dwarf2read.c:13509
+#: dwarf2read.c:14201
 #, possible-c-format
 msgid "Attribute value is not a constant (%s)"
 msgstr ""
 
-#: dwarf2read.c:13573
+#: dwarf2read.c:14265
 #, possible-c-format
 msgid "Dwarf Error: Expected reference attribute [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:13641
+#: dwarf2read.c:14333
 #, possible-c-format
 msgid ""
 "Dwarf Error: Cannot find DIE at 0x%x referenced from DIE at 0x%x [in module "
 "%s]"
 msgstr ""
 
-#: dwarf2read.c:13666
+#: dwarf2read.c:14363
 #, possible-c-format
 msgid "Dwarf Error: Cannot find DIE at 0x%x referenced in module %s"
 msgstr ""
 
-#: dwarf2read.c:13692
+#: dwarf2read.c:14390
 #, possible-c-format
 msgid ""
 "Dwarf Error: DIE at 0x%x referenced in module %s is neither DW_FORM_block* "
 "nor DW_FORM_exprloc"
 msgstr ""
 
-#: dwarf2read.c:13740
+#: dwarf2read.c:14452
 #, possible-c-format
 msgid ""
 "Dwarf Error: Cannot find signatured DIE at 0x%x referenced from DIE at 0x%x "
 "[in module %s]"
 msgstr ""
 
-#: dwarf2read.c:14074
+#: dwarf2read.c:14798
 #, possible-c-format
 msgid "unsupported stack op: '%s'"
 msgstr ""
 
-#: dwarf2read.c:14077
+#: dwarf2read.c:14801
 #, possible-c-format
 msgid "unsupported stack op: '%02x'"
 msgstr ""
 
-#: dwarf2read.c:14089
+#: dwarf2read.c:14813
 msgid "location description stack overflow"
 msgstr ""
 
-#: dwarf2read.c:14096
+#: dwarf2read.c:14820
 msgid "location description stack underflow"
 msgstr ""
 
-#: dwarf2read.c:14192
+#: dwarf2read.c:14916
 #, possible-c-format
 msgid "bad file number in macro information (%d)"
 msgstr ""
 
-#: dwarf2read.c:14247
+#: dwarf2read.c:14971
 #, possible-c-format
 msgid ""
 "macro definition contains spaces in formal argument list:\n"
 "`%s'"
 msgstr ""
 
-#: dwarf2read.c:14414
-msgid "missing .debug_macinfo section"
+#: dwarf2read.c:15187
+#, possible-c-format
+msgid "invalid form 0x%x in `%s'"
+msgstr ""
+
+#: dwarf2read.c:15216
+#, possible-c-format
+msgid "unrecognized DW_MACFINO opcode 0x%x"
+msgstr ""
+
+#: dwarf2read.c:15260
+#, possible-c-format
+msgid "unrecognized version `%d' in .debug_macro section"
 msgstr ""
 
-#: dwarf2read.c:14555
+#: dwarf2read.c:15388
 #, possible-c-format
 msgid "debug info with no main source gives macro %s on line %d: %s"
 msgstr ""
 
-#: dwarf2read.c:14558 dwarf2read.c:14570
+#: dwarf2read.c:15390 dwarf2read.c:15399
 msgid "definition"
 msgstr ""
 
-#: dwarf2read.c:14560 dwarf2read.c:14572
+#: dwarf2read.c:15390 dwarf2read.c:15399
 msgid "undefinition"
 msgstr ""
 
-#: dwarf2read.c:14561 dwarf2read.c:14573
-msgid "something-or-other"
-msgstr ""
-
-#: dwarf2read.c:14567
+#: dwarf2read.c:15397
 #, possible-c-format
 msgid "debug info gives %s macro %s with %s line %d: %s"
 msgstr ""
 
-#: dwarf2read.c:14568 dwarf2read.c:14598
+#: dwarf2read.c:15398 dwarf2read.c:15428
 msgid "command-line"
 msgstr ""
 
-#: dwarf2read.c:14568
+#: dwarf2read.c:15398
 msgid "in-file"
 msgstr ""
 
-#: dwarf2read.c:14574 dwarf2read.c:14599
+#: dwarf2read.c:15400 dwarf2read.c:15429
 msgid "zero"
 msgstr ""
 
-#: dwarf2read.c:14574 dwarf2read.c:14599
+#: dwarf2read.c:15400 dwarf2read.c:15429
 msgid "non-zero"
 msgstr ""
 
-#: dwarf2read.c:14596
+#: dwarf2read.c:15426
 #, possible-c-format
 msgid "debug info gives source %d included from %s at %s line %d"
 msgstr ""
 
-#: dwarf2read.c:14598
+#: dwarf2read.c:15428
 msgid "file"
 msgstr ""
 
-#: dwarf2read.c:14616
+#: dwarf2read.c:15447
 msgid "macro debug info has an unmatched `close_file' directive"
 msgstr ""
 
-#: dwarf2read.c:14642
+#: dwarf2read.c:15473
 msgid "no terminating 0-type entry for macros in `.debug_macinfo' section"
 msgstr ""
 
-#: dwarf2read.c:14765
+#: dwarf2read.c:15540
+#, possible-c-format
+msgid "missing %s section"
+msgstr ""
+
+#: dwarf2read.c:15772
 msgid "Location list used without specifying the CU base address."
 msgstr ""
 
-#: dwarf2read.c:14902
+#: dwarf2read.c:15931
 #, possible-c-format
 msgid ""
 "Dwarf Error: could not find partial DIE containing offset 0x%lx [in module "
 "%s]"
 msgstr ""
 
-#: dwarf2read.c:14914
+#: dwarf2read.c:15943
 #, possible-c-format
 msgid "invalid dwarf2 offset %u"
 msgstr ""
 
-#: dwarf2read.c:14930
+#: dwarf2read.c:15959
 #, possible-c-format
 msgid "no compilation unit with offset %u."
 msgstr ""
 
-#: dwarf2read.c:15209
+#: dwarf2read.c:16238
 #, possible-c-format
 msgid "A problem internal to GDB: DIE 0x%x has type already set"
 msgstr ""
 
-#: dwarf2read.c:15853
+#: dwarf2read.c:16896
 msgid "Ada is not currently supported by the index"
 msgstr ""
 
-#: dwarf2read.c:15886
+#: dwarf2read.c:16929
 msgid "couldn't data write to file"
 msgstr ""
 
-#: dwarf2read.c:15976
+#: dwarf2read.c:17012
 msgid "Cannot use an index to create the index"
 msgstr ""
 
-#: dwarf2read.c:15987
+#: dwarf2read.c:17015
+msgid "Cannot make an index when the file has multiple .debug_types sections"
+msgstr ""
+
+#: dwarf2read.c:17026
 #, possible-c-format
 msgid "Can't open `%s' for writing"
 msgstr ""
 
-#: dwarf2read.c:16210
+#: dwarf2read.c:17184
 msgid "usage: save gdb-index DIRECTORY"
 msgstr ""
 
-#: dwarf2read.c:16231
+#: dwarf2read.c:17205
 #, possible-c-format
 msgid "Error while writing index for `%s': "
 msgstr ""
 
-#: dwarf2read.c:16246
+#: dwarf2read.c:17220
 #, possible-c-format
 msgid "Whether to always disassemble DWARF expressions is %s.\n"
 msgstr ""
 
-#: dwarf2read.c:16256
+#: dwarf2read.c:17230
 #, possible-c-format
 msgid "Whether to check \"physname\" is %s.\n"
 msgstr ""
 
-#: dwarf2read.c:16270
+#: dwarf2read.c:17244
 msgid ""
 "Set DWARF 2 specific variables.\n"
 "Configure DWARF 2 variables such as the cache size"
 msgstr ""
 
 #. allow-unknown
-#: dwarf2read.c:16276
+#: dwarf2read.c:17250
 msgid ""
 "Show DWARF 2 specific variables\n"
 "Show DWARF 2 variables such as the cache size"
 msgstr ""
 
-#: dwarf2read.c:16283
+#: dwarf2read.c:17257
 msgid "Set the upper bound on the age of cached dwarf2 compilation units."
 msgstr ""
 
-#: dwarf2read.c:16284
+#: dwarf2read.c:17258
 msgid "Show the upper bound on the age of cached dwarf2 compilation units."
 msgstr ""
 
-#: dwarf2read.c:16285
+#: dwarf2read.c:17259
 msgid ""
 "A higher limit means that cached compilation units will be stored\n"
 "in memory longer, and more total memory will be used.  Zero disables\n"
 "caching, which can slow down startup."
 msgstr ""
 
-#: dwarf2read.c:16295
+#: dwarf2read.c:17269
 msgid "Set whether `info address' always disassembles DWARF expressions."
 msgstr ""
 
-#: dwarf2read.c:16296
+#: dwarf2read.c:17270
 msgid "Show whether `info address' always disassembles DWARF expressions."
 msgstr ""
 
-#: dwarf2read.c:16297
+#: dwarf2read.c:17271
 msgid ""
 "When enabled, DWARF expressions are always printed in an assembly-like\n"
 "syntax.  When disabled, expressions will be printed in a more\n"
 "conversational style, when possible."
 msgstr ""
 
-#: dwarf2read.c:16306
+#: dwarf2read.c:17280
 msgid "Set debugging of the dwarf2 DIE reader."
 msgstr ""
 
-#: dwarf2read.c:16307
+#: dwarf2read.c:17281
 msgid "Show debugging of the dwarf2 DIE reader."
 msgstr ""
 
-#: dwarf2read.c:16308
+#: dwarf2read.c:17282
 msgid ""
 "When enabled (non-zero), DIEs are dumped after they are read in.\n"
 "The value is the maximum depth to print."
 msgstr ""
 
-#: dwarf2read.c:16315
+#: dwarf2read.c:17289
 msgid "Set cross-checking of \"physname\" code against demangler."
 msgstr ""
 
-#: dwarf2read.c:16316
+#: dwarf2read.c:17290
 msgid "Show cross-checking of \"physname\" code against demangler."
 msgstr ""
 
-#: dwarf2read.c:16317
+#: dwarf2read.c:17291
 msgid ""
 "When enabled, GDB's internal \"physname\" code is checked against\n"
 "the demangler."
 msgstr ""
 
-#: dwarf2read.c:16324
+#: dwarf2read.c:17298
 msgid ""
 "Save a gdb-index file.\n"
 "Usage: save gdb-index DIRECTORY"
 msgstr ""
 
-#: elfread.c:146
+#: elfread.c:144
 #, possible-c-format
 msgid "Loadable segment \"%s\" outside of ELF segments"
 msgstr ""
 
-#: elfread.c:489
+#: elfread.c:478
 #, possible-c-format
 msgid "elf/stab section information %s without a preceding file symbol"
 msgstr ""
 
-#: elfread.c:501
+#: elfread.c:490
 #, possible-c-format
 msgid "duplicated elf/stab section information for %s"
 msgstr ""
 
 #. This case indicates buggy inferior program, the resolved address
 #. should never change.
-#: elfread.c:781
+#: elfread.c:770
 #, possible-c-format
 msgid ""
 "gnu-indirect-function \"%s\" has changed its resolved function_address from "
 "%s to %s"
 msgstr ""
 
-#: elfread.c:1036
+#: elfread.c:1025
 #, possible-c-format
 msgid ""
 "handle_inferior_event: Invalid gnu-indirect-function breakpoint type %d"
 msgstr ""
 
-#: elfread.c:1098
+#: elfread.c:1087
 #, possible-c-format
 msgid "File \"%s\" has no build-id, file skipped"
 msgstr ""
 
-#: elfread.c:1101
+#: elfread.c:1090
 #, possible-c-format
 msgid "File \"%s\" has a different build-id, file skipped"
 msgstr ""
 
-#: elfread.c:1189
+#: elfread.c:1178
 #, possible-c-format
 msgid "\"%s\": separate debug info file has no debug info"
 msgstr ""
 
-#: elfread.c:1256 elfread.c:1267 elfread.c:1292 machoread.c:637
-#: machoread.c:651
+#: elfread.c:1245 elfread.c:1256 elfread.c:1281 machoread.c:863
+#: machoread.c:882
 #, possible-c-format
 msgid "Can't read symbols from %s: %s"
 msgstr ""
 
-#: elfread.c:1534
+#: elfread.c:1540
 #, possible-c-format
 msgid "elf/stab section information questionable for %s"
 msgstr ""
 
-#: elfread.c:1554
+#: elfread.c:1560
 #, possible-c-format
 msgid "elf/stab section information missing for %s"
 msgstr ""
 
-#: eval.c:371 valops.c:2026
+#: eval.c:369 valops.c:2026
 #, possible-c-format
 msgid "there is no field named %s"
 msgstr ""
 
-#: eval.c:397
+#: eval.c:395
 msgid "too many initializers"
 msgstr ""
 
-#: eval.c:401
+#: eval.c:399
 msgid "don't know which variant you want to set"
 msgstr ""
 
-#: eval.c:472
+#: eval.c:470
 msgid "tuple range index out of range"
 msgstr ""
 
-#: eval.c:484
+#: eval.c:482
 msgid "tuple index out of range"
 msgstr ""
 
-#: eval.c:878
+#: eval.c:875
+#, possible-c-format
+msgid "Symbol \"%s\" does not have any specific entry value"
+msgstr ""
+
+#: eval.c:897
 #, possible-c-format
 msgid "Register $%s not available."
 msgstr ""
 
-#: eval.c:892
+#: eval.c:911
 #, possible-c-format
 msgid "Value of register %s not available."
 msgstr ""
 
-#: eval.c:1018
+#: eval.c:1037
 msgid "(power)set type with unknown size"
 msgstr ""
 
 #. different element modes.
-#: eval.c:1053
+#: eval.c:1072
 msgid "POWERSET tuple elements of different mode"
 msgstr ""
 
-#: eval.c:1057
+#: eval.c:1076
 msgid "incompatible POWERSET tuple elements"
 msgstr ""
 
-#: eval.c:1060
+#: eval.c:1079
 msgid "empty POWERSET tuple range"
 msgstr ""
 
-#: eval.c:1064
+#: eval.c:1083
 msgid "POWERSET tuple element out of range"
 msgstr ""
 
-#: eval.c:1241
+#: eval.c:1260
 msgid "no 'respondsTo:' or 'respondsToSelector:' method"
 msgstr ""
 
-#: eval.c:1250
+#: eval.c:1269
 msgid "no 'methodFor:' or 'methodForSelector:' method"
 msgstr ""
 
-#: eval.c:1269
+#: eval.c:1288
 msgid "Target does not respond to this message selector."
 msgstr ""
 
-#: eval.c:1355
+#: eval.c:1374
 msgid ""
 "method address has symbol information with non-function type; skipping"
 msgstr ""
 
-#: eval.c:1408
+#: eval.c:1427
 msgid ""
 "Expression of type other than \"method returning ...\" used as a method"
 msgstr ""
 
-#: eval.c:1474
+#: eval.c:1493
 msgid "Non-pointer-to-member value used in pointer-to-member construct"
 msgstr ""
 
 #. For the time being, we don't handle this.
-#: eval.c:1714
+#: eval.c:1721
 #, possible-c-format
 msgid "Call to overloaded function %s requires `this' pointer"
 msgstr ""
 
-#: eval.c:1815
+#: eval.c:1816
 msgid "Cannot evaluate function -- may be inlined"
 msgstr ""
 
-#: eval.c:1840
+#: eval.c:1841
 msgid ""
 "Expression of type other than \"Function returning ...\" used as function"
 msgstr ""
 
-#: eval.c:1918
+#: eval.c:1919
 msgid "Cannot perform substring on this type"
 msgstr ""
 
-#: eval.c:2053
+#: eval.c:2054
 msgid "non-pointer-to-member value used in pointer-to-member construct"
 msgstr ""
 
-#: eval.c:2225
+#: eval.c:2226
 msgid "':' operator used in invalid context"
 msgstr ""
 
-#: eval.c:2347
+#: eval.c:2348
 #, possible-c-format
 msgid "Too many subscripts for F77 (%d Max)"
 msgstr ""
 
-#: eval.c:2352
+#: eval.c:2353
 msgid "Wrong number of subscripts"
 msgstr ""
 
-#: eval.c:2546
+#: eval.c:2547
 msgid "Non-integral right operand for \"@\" operator."
 msgstr ""
 
-#: eval.c:2617
+#: eval.c:2618
 msgid "Attempt to dereference pointer to member without an object"
 msgstr ""
 
@@ -7985,143 +8409,132 @@
 #. If there are any cases landing here which mean a user error,
 #. then they should be separate cases, with more descriptive
 #. error messages.
-#: eval.c:2871
+#: eval.c:2868
 msgid "GDB does not (yet) know how to evaluate that kind of expression"
 msgstr ""
 
-#: eval.c:2937
+#: eval.c:2934
 msgid "Attempt to take address of register or constant."
 msgstr ""
 
-#: eval.c:2970 valops.c:1645 valops.c:1660 valops.c:1694
+#: eval.c:2967 valops.c:1645 valops.c:1660 valops.c:1694
 msgid "Attempt to take address of value not located in memory."
 msgstr ""
 
-#: eval.c:3089
+#: eval.c:3086
 msgid "Internal error in eval_type."
 msgstr ""
 
-#: eval.c:3100
+#: eval.c:3097
 msgid "Can't get dimensions for a non-array type"
 msgstr ""
 
 #: event-loop.c:552 event-loop.c:561 event-loop.c:625 event-loop.c:704
-#: event-loop.c:810 event-loop.c:876 event-loop.c:950 event-loop.c:1383
+#: event-loop.c:806 event-loop.c:872 event-loop.c:946 event-loop.c:1379
 msgid "use_poll without HAVE_POLL"
 msgstr ""
 
-#: event-loop.c:796
-#, possible-c-format
-msgid "Hangup detected on fd %d\n"
-msgstr ""
-
-#: event-loop.c:799
+#: event-loop.c:795
 #, possible-c-format
 msgid "Error detected on fd %d\n"
 msgstr ""
 
-#: event-loop.c:802
+#: event-loop.c:798
 #, possible-c-format
 msgid "Invalid or non-`poll'able fd %d\n"
 msgstr ""
 
-#: event-loop.c:817
+#: event-loop.c:813
 #, possible-c-format
 msgid "Exception condition detected on fd %d\n"
 msgstr ""
 
-#. The prompt stack has not been initialized to "", we are
-#. using gdb w/o the --async switch.
-#: event-top.c:340
-msgid "Command has same effect as set annotate"
-msgstr ""
-
-#: event-top.c:426
+#: event-top.c:367
 msgid "error detected on stdin\n"
 msgstr ""
 
 #. This message is based on ANSI C, section 4.7.  Note that integer
 #. divide by zero causes this, so "float" is a misnomer.
-#: event-top.c:1003
+#: event-top.c:951
 msgid "Erroneous arithmetic operation."
 msgstr ""
 
-#: exceptions.c:136 exceptions.c:194
+#: exceptions.c:126 exceptions.c:184
 msgid "bad state"
 msgstr ""
 
-#: exceptions.c:333
+#: exceptions.c:309
 msgid "Bad switch."
 msgstr ""
 
-#: exec.c:80
+#: exec.c:78
 #, possible-c-format
 msgid "Writing into executable and core files is %s.\n"
 msgstr ""
 
-#: exec.c:178 exec.c:209
+#: exec.c:176 exec.c:207
 msgid "No executable file now.\n"
 msgstr ""
 
-#: exec.c:244
+#: exec.c:242
 #, possible-c-format
 msgid "\"%s\": could not open as an executable file: %s"
 msgstr ""
 
-#: exec.c:260
+#: exec.c:258
 #, possible-c-format
 msgid "\"%s\": not in executable format: %s"
 msgstr ""
 
-#: exec.c:276 exec.c:286
+#: exec.c:274 exec.c:284
 #, possible-c-format
 msgid "\"%s\": can't find the file sections: %s"
 msgstr ""
 
-#: exec.c:327
+#: exec.c:325
 msgid ""
 "A program is being debugged already.\n"
 "Are you sure you want to change the file? "
 msgstr ""
 
-#: exec.c:329
+#: exec.c:327
 msgid "File not changed."
 msgstr ""
 
-#: exec.c:345
+#: exec.c:343
 msgid "No executable file name was specified"
 msgstr ""
 
-#: exec.c:707 maint.c:373 maint.c:405
+#: exec.c:705 maint.c:361 maint.c:393
 #, possible-c-format
 msgid "file type %s.\n"
 msgstr ""
 
-#: exec.c:732
+#: exec.c:730
 #, possible-c-format
 msgid "Cannot find section for the entry point of %s."
 msgstr ""
 
-#: exec.c:738
+#: exec.c:736
 #, possible-c-format
 msgid "\tEntry point: %s\n"
 msgstr ""
 
-#: exec.c:773
+#: exec.c:771
 #, possible-c-format
 msgid "\tMapping info for file `%s'.\n"
 msgstr ""
 
-#: exec.c:806
+#: exec.c:804
 msgid "Must specify section name and its virtual address"
 msgstr ""
 
-#: exec.c:834
+#: exec.c:832
 #, possible-c-format
 msgid "Section %s not found"
 msgstr ""
 
-#: exec.c:921
+#: exec.c:919
 msgid ""
 "Use FILE as program to be debugged.\n"
 "It is read for its symbols, for getting the contents of pure memory,\n"
@@ -8131,7 +8544,7 @@
 "No arg means to have no executable file and no symbols."
 msgstr ""
 
-#: exec.c:931
+#: exec.c:929
 msgid ""
 "Use FILE as program for getting contents of pure memory.\n"
 "If FILE cannot be found as specified, your execution directory path\n"
@@ -8139,7 +8552,7 @@
 "No arg means have no executable file."
 msgstr ""
 
-#: exec.c:938
+#: exec.c:936
 msgid ""
 "Change the base address of section SECTION of the exec file to ADDR.\n"
 "This can be used if the exec file does not contain section addresses,\n"
@@ -8148,19 +8561,19 @@
 "``info files'' command lists all the sections and their addresses."
 msgstr ""
 
-#: exec.c:945
+#: exec.c:943
 msgid "Set writing into executable and core files."
 msgstr ""
 
-#: exec.c:946
+#: exec.c:944
 msgid "Show writing into executable and core files."
 msgstr ""
 
-#: exec.c:958
+#: exec.c:956
 msgid "Can't create a corefile"
 msgstr ""
 
-#: expprint.c:234
+#: expprint.c:243
 msgid "bad selector"
 msgstr ""
 
@@ -8169,89 +8582,22 @@
 #. Not found; don't try to keep going because we don't know how
 #. to interpret further elements.  For example, this happens
 #. if opcode is OP_TYPE.
-#: expprint.c:495 expprint.c:574
+#: expprint.c:504 expprint.c:580
 msgid "Invalid expression"
 msgstr ""
 
-#: f-exp.y:761 m2-exp.y:726
-msgid "Overflow on numeric constant."
-msgstr ""
-
-#: f-lang.c:557
-msgid "Malformed function STAB found in add_common_block()"
-msgstr ""
-
-#: f-lang.c:605
-msgid "Attempt to add COMMON entry with no block open!"
-msgstr ""
-
-#: f-lang.c:798
-msgid "cannot get .bf node off empty list"
-msgstr ""
-
-#: f-typeprint.c:386
-#, possible-c-format
-msgid "Invalid type code (%d) in symbol table."
-msgstr ""
-
-#: f-valprint.c:67
-msgid "Lower bound may not be '*' in F77"
-msgstr ""
-
-#: f-valprint.c:230
-#, possible-c-format
-msgid "Type node corrupt! F77 arrays cannot have %d subscripts (%d Max)"
-msgstr ""
-
-#: f-valprint.c:491
-#, possible-c-format
-msgid "Invalid F77 type code %d in symbol table."
-msgstr ""
-
-#: f-valprint.c:504
-msgid ""
-"All COMMON blocks visible at this level:\n"
-"\n"
-msgstr ""
-
-#. We have been told to display the contents of F77 COMMON
-#. block supposedly visible in this function.  Let us
-#. first make sure that it is visible and if so, let
-#. us display its contents.
-#: f-valprint.c:533 f-valprint.c:623
-msgid "No frame selected"
-msgstr ""
-
-#. Got no 'funname', code below will fail.
-#: f-valprint.c:573
-msgid "No function found for frame."
-msgstr ""
-
-#: f-valprint.c:590
-msgid "Contents of blank COMMON block:\n"
-msgstr ""
-
-#: f-valprint.c:592
+#: expprint.c:514
 #, possible-c-format
-msgid "Contents of F77 COMMON block '%s':\n"
+msgid "<language %s has no 'this'>"
 msgstr ""
 
-#: f-valprint.c:604
+#: fbsd-nat.c:108
 #, possible-c-format
-msgid "Cannot locate the common block %s in function '%s'\n"
-msgstr ""
-
-#: f-valprint.c:621
-msgid "Cannot deal with NULL common name!"
-msgstr ""
-
-#: f-valprint.c:673 f-valprint.c:676
-msgid "Print out the values contained in a Fortran COMMON block."
+msgid "Couldn't open %s."
 msgstr ""
 
-#: fbsd-nat.c:109
-#, possible-c-format
-msgid "Couldn't open %s."
+#: f-exp.y:760 m2-exp.y:726
+msgid "Overflow on numeric constant."
 msgstr ""
 
 #: filesystem.c:67
@@ -8295,35 +8641,35 @@
 msgid "Invalid size granularity."
 msgstr ""
 
-#: findcmd.c:135
+#: findcmd.c:136
 msgid "Empty search range.\n"
 msgstr ""
 
-#: findcmd.c:139
+#: findcmd.c:140
 msgid "Invalid length."
 msgstr ""
 
-#: findcmd.c:143
+#: findcmd.c:144
 msgid "Search space too large."
 msgstr ""
 
-#: findcmd.c:153
-msgid "Invalid search space, end preceeds start."
+#: findcmd.c:154
+msgid "Invalid search space, end precedes start."
 msgstr ""
 
-#: findcmd.c:159
+#: findcmd.c:160
 msgid "Overflow in address range computation, choose smaller range."
 msgstr ""
 
-#: findcmd.c:226
+#: findcmd.c:227
 msgid "Missing search pattern."
 msgstr ""
 
-#: findcmd.c:231
+#: findcmd.c:232
 msgid "Search space too small to contain pattern."
 msgstr ""
 
-#: findcmd.c:325
+#: findcmd.c:326
 msgid ""
 "Search memory for a sequence of bytes.\n"
 "Usage:\n"
@@ -8341,369 +8687,438 @@
 "Convenience variable \"$numfound\" is set to the number of matches."
 msgstr ""
 
-#: findvar.c:61 findvar.c:96
+#: findvar.c:60 findvar.c:95
 #, possible-c-format
 msgid "That operation is not available on integers of more than %d bytes."
 msgstr ""
 
-#: findvar.c:177
+#: findvar.c:176
 msgid "extract_typed_address: type is not a pointer or reference"
 msgstr ""
 
-#: findvar.c:250
+#: findvar.c:249
 msgid "store_typed_address: type is not a pointer or reference"
 msgstr ""
 
-#: findvar.c:507
-msgid "Cannot look up value of a typedef"
+#: findvar.c:479 findvar.c:492
+#, possible-c-format
+msgid "Unknown argument list address for `%s'."
+msgstr ""
+
+#: findvar.c:508
+#, possible-c-format
+msgid "Cannot look up value of a typedef `%s'."
+msgstr ""
+
+#: findvar.c:535 findvar.c:546
+#, possible-c-format
+msgid "Value of register variable not available for `%s'."
+msgstr ""
+
+#: findvar.c:568
+#, possible-c-format
+msgid "No global symbol \"%s\"."
+msgstr ""
+
+#: findvar.c:587
+#, possible-c-format
+msgid "Cannot look up value of a botched symbol `%s'."
+msgstr ""
+
+#: f-lang.c:101
+msgid "unrecognized character type"
+msgstr ""
+
+#: f-lang.c:484
+msgid "Malformed function STAB found in add_common_block()"
 msgstr ""
 
-#: findvar.c:533 findvar.c:543
-msgid "Value of register variable not available."
+#: f-lang.c:532
+msgid "Attempt to add COMMON entry with no block open!"
 msgstr ""
 
-#: findvar.c:586
-msgid "Cannot look up value of a botched symbol."
+#: f-lang.c:725
+msgid "cannot get .bf node off empty list"
 msgstr ""
 
-#: fork-child.c:318
+#: fork-child.c:331
 msgid "setpgrp failed in child"
 msgstr ""
 
-#: fork-child.c:473
+#: fork-child.c:463
 #, possible-c-format
 msgid "During startup program terminated with signal %s, %s."
 msgstr ""
 
-#: fork-child.c:482
+#: fork-child.c:472
 #, possible-c-format
 msgid "During startup program exited with code %d."
 msgstr ""
 
-#: fork-child.c:485
+#: fork-child.c:475
 msgid "During startup program exited normally."
 msgstr ""
 
-#: fork-child.c:553
+#: fork-child.c:543
 msgid ""
 "Set a wrapper for running programs.\n"
 "The wrapper prepares the system and environment for the new program."
 msgstr ""
 
-#: fork-child.c:556
+#: fork-child.c:546
 msgid "Show the wrapper for running programs."
 msgstr ""
 
-#: fork-child.c:562
+#: fork-child.c:552
 msgid "Disable use of an execution wrapper."
 msgstr ""
 
-#: frame-unwind.c:133
-msgid "frame_unwind_find_by_frame failed"
-msgstr ""
-
-#: frame.c:174
+#: frame.c:173
 #, possible-c-format
 msgid "Frame debugging is %s.\n"
 msgstr ""
 
-#: frame.c:185
+#: frame.c:184
 #, possible-c-format
 msgid "Whether backtraces should continue past \"main\" is %s.\n"
 msgstr ""
 
-#: frame.c:195
+#: frame.c:194
 #, possible-c-format
 msgid ""
 "Whether backtraces should continue past the entry point of a program is %s.\n"
 msgstr ""
 
-#: frame.c:206
+#: frame.c:205
 #, possible-c-format
 msgid "An upper bound on the number of backtrace levels is %s.\n"
 msgstr ""
 
-#: frame.c:682
+#: frame.c:681
 msgid "No unwind_pc method"
 msgstr ""
 
-#: frame.c:702 frame.c:770
+#: frame.c:701 frame.c:769
 msgid "PC not available"
 msgstr ""
 
-#: frame.c:816
+#: frame.c:815
 msgid "Cannot pop the initial frame."
 msgstr ""
 
-#: frame.c:917
+#: frame.c:916
 #, possible-c-format
 msgid "Register %d was optimized out"
 msgstr ""
 
-#: frame.c:920
+#: frame.c:919
 #, possible-c-format
 msgid "Register %d is not available"
 msgstr ""
 
-#: frame.c:1049
+#: frame.c:1048
 msgid "Attempt to assign to a value that was optimized out."
 msgstr ""
 
-#: frame.c:1066
+#: frame.c:1065
 msgid "Attempt to assign to an unmodifiable value."
 msgstr ""
 
-#: frame.c:1123
+#: frame.c:1122
 #, possible-c-format
 msgid ""
 "Bad debug information detected: Attempt to read %d bytes from registers."
 msgstr ""
 
-#: frame.c:1289 ia64-tdep.c:1932 ia64-tdep.c:2309 libunwind-frame.c:335
+#: frame.c:1288 ia64-tdep.c:1931 ia64-tdep.c:2308 libunwind-frame.c:334
 msgid "No registers."
 msgstr ""
 
-#: frame.c:1291 stack.c:1315 stack.c:1928 thread.c:1288
+#: frame.c:1290 stack.c:1655 stack.c:2238 thread.c:1281
 msgid "No stack."
 msgstr ""
 
-#: frame.c:1293
+#: frame.c:1292
 msgid "No memory."
 msgstr ""
 
-#: frame.c:1298
+#: frame.c:1297
 msgid "No selected thread."
 msgstr ""
 
-#: frame.c:1300 infcmd.c:1744
+#: frame.c:1299 infcmd.c:1796
 msgid "Invalid selected thread."
 msgstr ""
 
-#: frame.c:1302
+#: frame.c:1301
 msgid "Target is executing."
 msgstr ""
 
-#: frame.c:2323
+#: frame.c:2328
 msgid "Missing unwind SP method"
 msgstr ""
 
-#: frame.c:2349
-msgid "unwinder did not report frame ID"
-msgstr ""
-
-#: frame.c:2352
-msgid "Not enough registers or memory available to unwind further"
-msgstr ""
-
-#: frame.c:2355
-msgid "previous frame inner to this frame (corrupt stack?)"
-msgstr ""
-
-#: frame.c:2358
-msgid "previous frame identical to this frame (corrupt stack?)"
-msgstr ""
-
-#: frame.c:2361
-msgid "frame did not save the PC"
-msgstr ""
-
-#: frame.c:2439
+#: frame.c:2432
 msgid ""
 "Set backtrace specific variables.\n"
 "Configure backtrace variables such as the backtrace limit"
 msgstr ""
 
 #. allow-unknown
-#: frame.c:2444
+#: frame.c:2437
 msgid ""
 "Show backtrace specific variables\n"
 "Show backtrace variables such as the backtrace limit"
 msgstr ""
 
-#: frame.c:2451
+#: frame.c:2444
 msgid "Set whether backtraces should continue past \"main\"."
 msgstr ""
 
-#: frame.c:2452
+#: frame.c:2445
 msgid "Show whether backtraces should continue past \"main\"."
 msgstr ""
 
-#: frame.c:2453
+#: frame.c:2446
 msgid ""
 "Normally the caller of \"main\" is not of interest, so GDB will terminate\n"
 "the backtrace at \"main\".  Set this variable if you need to see the rest\n"
 "of the stack trace."
 msgstr ""
 
-#: frame.c:2463
+#: frame.c:2456
 msgid ""
 "Set whether backtraces should continue past the entry point of a program."
 msgstr ""
 
-#: frame.c:2465
+#: frame.c:2458
 msgid ""
 "Show whether backtraces should continue past the entry point of a program."
 msgstr ""
 
-#: frame.c:2467
+#: frame.c:2460
 msgid ""
 "Normally there are no callers beyond the entry point of a program, so GDB\n"
 "will terminate the backtrace there.  Set this variable if you need to see\n"
 "the rest of the stack trace."
 msgstr ""
 
-#: frame.c:2477
-msgid "Set an upper bound on the number of backtrace levels."
+#: frame.c:2470
+msgid "Set an upper bound on the number of backtrace levels."
+msgstr ""
+
+#: frame.c:2471
+msgid "Show the upper bound on the number of backtrace levels."
+msgstr ""
+
+#: frame.c:2472
+msgid ""
+"No more than the specified number of frames can be displayed or examined.\n"
+"Zero is unlimited."
+msgstr ""
+
+#. Debug this files internals.
+#: frame.c:2481
+msgid "Set frame debugging."
+msgstr ""
+
+#: frame.c:2482
+msgid "Show frame debugging."
+msgstr ""
+
+#: frame.c:2483
+msgid "When non-zero, frame specific internal debugging is enabled."
+msgstr ""
+
+#: frame-unwind.c:132
+msgid "frame_unwind_find_by_frame failed"
+msgstr ""
+
+#: frv-linux-tdep.c:210
+msgid "Can't read realtime sigtramp frame."
+msgstr ""
+
+#: frv-linux-tdep.c:217
+msgid "not a signal trampoline"
+msgstr ""
+
+#: frv-tdep.c:427
+#, possible-c-format
+msgid "Bad register number %d"
+msgstr ""
+
+#: frv-tdep.c:1145
+#, possible-c-format
+msgid "Illegal return value length: %d"
+msgstr ""
+
+#: frv-tdep.c:1350
+#, possible-c-format
+msgid "Don't know how to return a %d-byte value."
+msgstr ""
+
+#: f-typeprint.c:381
+#, possible-c-format
+msgid "Invalid type code (%d) in symbol table."
+msgstr ""
+
+#: f-valprint.c:67
+msgid "Lower bound may not be '*' in F77"
 msgstr ""
 
-#: frame.c:2478
-msgid "Show the upper bound on the number of backtrace levels."
+#: f-valprint.c:230
+#, possible-c-format
+msgid "Type node corrupt! F77 arrays cannot have %d subscripts (%d Max)"
 msgstr ""
 
-#: frame.c:2479
-msgid ""
-"No more than the specified number of frames can be displayed or examined.\n"
-"Zero is unlimited."
+#: f-valprint.c:514
+#, possible-c-format
+msgid "Invalid F77 type code %d in symbol table."
 msgstr ""
 
-#. Debug this files internals.
-#: frame.c:2488
-msgid "Set frame debugging."
+#: f-valprint.c:527
+msgid ""
+"All COMMON blocks visible at this level:\n"
+"\n"
 msgstr ""
 
-#: frame.c:2489
-msgid "Show frame debugging."
+#. We have been told to display the contents of F77 COMMON
+#. block supposedly visible in this function.  Let us
+#. first make sure that it is visible and if so, let
+#. us display its contents.
+#: f-valprint.c:556 f-valprint.c:646
+msgid "No frame selected"
 msgstr ""
 
-#: frame.c:2490
-msgid "When non-zero, frame specific internal debugging is enabled."
+#. Got no 'funname', code below will fail.
+#: f-valprint.c:596
+msgid "No function found for frame."
 msgstr ""
 
-#: frv-linux-tdep.c:211
-msgid "Can't read realtime sigtramp frame."
+#: f-valprint.c:613
+msgid "Contents of blank COMMON block:\n"
 msgstr ""
 
-#: frv-linux-tdep.c:218
-msgid "not a signal trampoline"
+#: f-valprint.c:615
+#, possible-c-format
+msgid "Contents of F77 COMMON block '%s':\n"
 msgstr ""
 
-#: frv-tdep.c:428
+#: f-valprint.c:627
 #, possible-c-format
-msgid "Bad register number %d"
+msgid "Cannot locate the common block %s in function '%s'\n"
 msgstr ""
 
-#: frv-tdep.c:1146
-#, possible-c-format
-msgid "Illegal return value length: %d"
+#: f-valprint.c:644
+msgid "Cannot deal with NULL common name!"
 msgstr ""
 
-#: frv-tdep.c:1351
-#, possible-c-format
-msgid "Don't know how to return a %d-byte value."
+#: f-valprint.c:696 f-valprint.c:699
+msgid "Print out the values contained in a Fortran COMMON block."
 msgstr ""
 
-#: gcore.c:57
+#: gcore.c:56
 #, possible-c-format
 msgid "Failed to open '%s' for output."
 msgstr ""
 
-#: gcore.c:85
+#: gcore.c:84
 #, possible-c-format
 msgid "Failed to create 'note' section for corefile: %s"
 msgstr ""
 
-#: gcore.c:95
+#: gcore.c:94
 msgid "gcore: failed to get corefile memory sections from target."
 msgstr ""
 
-#: gcore.c:101
+#: gcore.c:100
 #, possible-c-format
 msgid "writing note section (%s)"
 msgstr ""
 
-#: gcore.c:171
+#: gcore.c:170
 msgid "Can't find default bfd machine type (need execfile)."
 msgstr ""
 
-#: gcore.c:185
+#: gcore.c:184
 msgid "Can't find bfd architecture for corefile (need execfile)."
 msgstr ""
 
-#: gcore.c:446
+#: gcore.c:445
 #, possible-c-format
 msgid "Couldn't make gcore segment: %s"
 msgstr ""
 
-#: gcore.c:540
+#: gcore.c:539
 #, possible-c-format
 msgid "Memory read failed for corefile section, %s bytes at %s."
 msgstr ""
 
-#: gcore.c:548
+#: gcore.c:547
 #, possible-c-format
 msgid "Failed to write corefile contents (%s)."
 msgstr ""
 
-#: gcore.c:581
+#: gcore.c:580
 msgid ""
 "Save a core file with the current state of the debugged process.\n"
 "Argument is optional filename.  Default filename is 'core.<process_id>'."
 msgstr ""
 
-#: gdb_assert.h:49
-#, possible-c-format
-msgid "%s: Assertion `%s' failed."
-msgstr ""
-
-#: gdb_assert.h:53
-#, possible-c-format
-msgid "Assertion `%s' failed."
-msgstr ""
-
 #: gdbarch.c:67
 #, possible-c-format
 msgid "Architecture debugging is %s.\n"
 msgstr ""
 
-#: gdbarch.c:711
+#: gdbarch.c:722
 #, possible-c-format
 msgid "verify_gdbarch: the following are invalid ...%s"
 msgstr ""
 
-#: gdbarch.c:3996
+#: gdbarch.c:4077
 msgid "gdbarch_architecture_names: multi-arch unknown"
 msgstr ""
 
-#: gdbarch.c:4022
+#: gdbarch.c:4103
 #, possible-c-format
 msgid "gdbarch: Attempt to register unknown architecture (%d)"
 msgstr ""
 
-#: gdbarch.c:4033
+#: gdbarch.c:4114
 #, possible-c-format
-msgid "gdbarch: Duplicate registraration of architecture (%s)"
+msgid "gdbarch: Duplicate registration of architecture (%s)"
 msgstr ""
 
-#: gdbarch.c:4222
+#: gdbarch.c:4303
 msgid "Set architecture debugging."
 msgstr ""
 
-#: gdbarch.c:4223
+#: gdbarch.c:4304
 msgid "Show architecture debugging."
 msgstr ""
 
-#: gdbarch.c:4224
+#: gdbarch.c:4305
 msgid "When non-zero, architecture debugging is enabled."
 msgstr ""
 
-#: gdbtypes.c:123
+#: gdb-dlfcn.c:82 gdb-dlfcn.c:96
+#, possible-c-format
+msgid "Could not load %s: %s"
+msgstr ""
+
+#: gdbserver/thread-db.c:725
+#, possible-c-format
+msgid "libthread-db-search-path component too long, ignored: %s."
+msgstr ""
+
+#: gdbtypes.c:121
 #, possible-c-format
 msgid ""
 "Resolution of opaque struct/class/union types (if set before loading "
 "symbols) is %s.\n"
 msgstr ""
 
-#: gdbtypes.c:133
+#: gdbtypes.c:131
 #, possible-c-format
 msgid "Debugging of C++ overloading is %s.\n"
 msgstr ""
@@ -8713,107 +9128,118 @@
 msgid "Unknown address space specifier: \"%s\""
 msgstr ""
 
-#: gdbtypes.c:1134
+#: gdbtypes.c:1130
+#, possible-c-format
+msgid "Invalid anonymous type %s [in module %s], GCC PR debug/47510 bug?"
+msgstr ""
+
+#: gdbtypes.c:1160
 #, possible-c-format
 msgid "No type named %s."
 msgstr ""
 
-#: gdbtypes.c:1179 objc-lang.c:97
+#: gdbtypes.c:1205 objc-lang.c:96
 #, possible-c-format
 msgid "No struct type named %s."
 msgstr ""
 
-#: gdbtypes.c:1183 gdbtypes.c:1259 objc-lang.c:104
+#: gdbtypes.c:1209 gdbtypes.c:1285 objc-lang.c:103
 #, possible-c-format
 msgid "This context has class, union or enum %s, not a struct."
 msgstr ""
 
-#: gdbtypes.c:1201
+#: gdbtypes.c:1227
 #, possible-c-format
 msgid "No union type named %s."
 msgstr ""
 
 #. If we get here, it's not a union.
-#: gdbtypes.c:1209
+#: gdbtypes.c:1235
 #, possible-c-format
 msgid "This context has class, struct or enum %s, not a union."
 msgstr ""
 
-#: gdbtypes.c:1225
+#: gdbtypes.c:1251
 #, possible-c-format
 msgid "No enum type named %s."
 msgstr ""
 
-#: gdbtypes.c:1229
+#: gdbtypes.c:1255
 #, possible-c-format
 msgid "This context has class, struct or union %s, not an enum."
 msgstr ""
 
-#: gdbtypes.c:1255
+#: gdbtypes.c:1281
 #, possible-c-format
 msgid "No template type named %s."
 msgstr ""
 
-#: gdbtypes.c:1297
+#: gdbtypes.c:1323
 #, possible-c-format
 msgid "Type %s is not a structure or union type."
 msgstr ""
 
-#: gdbtypes.c:1351
+#: gdbtypes.c:1377
 #, possible-c-format
 msgid "Type %s has no component named %s."
 msgstr ""
 
-#: gdbtypes.c:1413
+#: gdbtypes.c:1439
 msgid "stub type has NULL name"
 msgstr ""
 
-#: gdbtypes.c:1695
+#: gdbtypes.c:1725
 #, possible-c-format
 msgid "Internal: Cannot demangle mangled name `%s'."
 msgstr ""
 
-#: gdbtypes.c:2801
+#: gdbtypes.c:2841
 #, possible-c-format
 msgid ") length %d\n"
 msgstr ""
 
-#: gdbtypes.c:2941
+#: gdbtypes.c:2981
 msgid " <same as already seen type>\n"
 msgstr ""
 
-#: gdbtypes.c:3367
+#: gdbtypes.c:3408
 #, possible-c-format
 msgid "Unexpected type field location kind: %d"
 msgstr ""
 
-#: gdbtypes.c:3961
+#: gdbtypes.c:4005
 msgid "Set debugging of C++ overloading."
 msgstr ""
 
-#: gdbtypes.c:3962
+#: gdbtypes.c:4006
 msgid "Show debugging of C++ overloading."
 msgstr ""
 
-#: gdbtypes.c:3963
+#: gdbtypes.c:4007
 msgid "When enabled, ranking of the functions is displayed."
 msgstr ""
 
-#: gdbtypes.c:3972
+#: gdbtypes.c:4016
 msgid ""
 "Set resolution of opaque struct/class/union types (if set before loading "
 "symbols)."
 msgstr ""
 
-#: gdbtypes.c:3974
+#: gdbtypes.c:4018
 msgid ""
 "Show resolution of opaque struct/class/union types (if set before loading "
 "symbols)."
 msgstr ""
 
+#. A helper macro that returns the name of a type or "unnamed type" if the type
+#. has no name.
+#: gdbtypes.h:1208
+msgid "<unnamed type>"
+msgstr ""
+
 #. A helper macro that returns the name of an error type.  If the type
 #. has a name, it is used; otherwise, a default is used.
-#: gdbtypes.h:1117
+#: gdbtypes.h:1213
 msgid "<error type>"
 msgstr ""
 
@@ -8942,105 +9368,105 @@
 msgid "ptrace (PTRACE_TRACEME) failed!"
 msgstr ""
 
-#: gnu-nat.c:2256
+#: gnu-nat.c:2257
 msgid "to_stop target function not implemented"
 msgstr ""
 
-#: gnu-nat.c:2290
+#: gnu-nat.c:2291
 #, possible-c-format
 msgid "Read from inferior faulted: %s"
 msgstr ""
 
-#: gnu-nat.c:2296
+#: gnu-nat.c:2297
 #, possible-c-format
 msgid "gnu_read_inferior vm_deallocate failed: %s"
 msgstr ""
 
-#: gnu-nat.c:2382
+#: gnu-nat.c:2383
 #, possible-c-format
 msgid "No memory at 0x%x. Nothing written"
 msgstr ""
 
-#: gnu-nat.c:2391
+#: gnu-nat.c:2392
 #, possible-c-format
 msgid "Memory at address 0x%x is unwritable. Nothing written"
 msgstr ""
 
-#: gnu-nat.c:2466
+#: gnu-nat.c:2467
 #, possible-c-format
 msgid "%s: %s"
 msgstr ""
 
-#: gnu-nat.c:2542
+#: gnu-nat.c:2543
 #, possible-c-format
 msgid "vm_region failed: %s"
 msgstr ""
 
-#: gnu-nat.c:2697
+#: gnu-nat.c:2698
 #, possible-c-format
 msgid "Illegal argument for \"%s\" command, should be an integer."
 msgstr ""
 
-#: gnu-nat.c:2709
+#: gnu-nat.c:2710
 #, possible-c-format
 msgid "Illegal argument for \"%s\" command, should be \"%s\" or \"%s\"."
 msgstr ""
 
-#: gnu-nat.c:2721
+#: gnu-nat.c:2722
 #, possible-c-format
 msgid "Garbage after \"%s\" command: `%s'"
 msgstr ""
 
-#: gnu-nat.c:2732
+#: gnu-nat.c:2733
 msgid "No current thread."
 msgstr ""
 
-#: gnu-nat.c:2743
+#: gnu-nat.c:2744
 msgid "No current process."
 msgstr ""
 
-#: gnu-nat.c:2857
+#: gnu-nat.c:2858
 msgid "No inferior task."
 msgstr ""
 
-#: gnu-nat.c:2863
+#: gnu-nat.c:2864
 #, possible-c-format
 msgid "Couldn't extract send right %d from inferior: %s"
 msgstr ""
 
-#: gnu-nat.c:2879
+#: gnu-nat.c:2880
 #, possible-c-format
 msgid "Can't set exception port for %s: %s"
 msgstr ""
 
-#: gnu-nat.c:2890
+#: gnu-nat.c:2891
 msgid "No argument to \"set task exception-port\" command."
 msgstr ""
 
-#: gnu-nat.c:2916
+#: gnu-nat.c:2917
 msgid ""
 "Illegal argument to \"set signal-thread\" command.\n"
 "Should be an integer thread ID, or `none'."
 msgstr ""
 
-#: gnu-nat.c:2926
+#: gnu-nat.c:2927
 #, possible-c-format
 msgid ""
 "Thread ID %s not known.  Use the \"info threads\" command to\n"
 "see the IDs of currently known threads."
 msgstr ""
 
-#: gnu-nat.c:3062
+#: gnu-nat.c:3063
 #, possible-c-format
 msgid "%ld: %s."
 msgstr ""
 
-#: gnu-nat.c:3072 utils.c:1393
+#: gnu-nat.c:3073 utils.c:1193
 #, possible-c-format
 msgid "%s."
 msgstr ""
 
-#: gnu-nat.c:3112
+#: gnu-nat.c:3113
 msgid ""
 "Set whether the new threads are suspended while gdb has control.\n"
 "This property normally has no effect because the whole task is\n"
@@ -9048,79 +9474,79 @@
 "The default value is \"off\"."
 msgstr ""
 
-#: gnu-nat.c:3118
+#: gnu-nat.c:3119
 msgid "Show whether new threads are suspended while gdb has control."
 msgstr ""
 
-#: gnu-nat.c:3122
+#: gnu-nat.c:3123
 msgid ""
 "Set whether new threads are allowed to run (once gdb has noticed them)."
 msgstr ""
 
-#: gnu-nat.c:3125
+#: gnu-nat.c:3126
 msgid ""
 "Show whether new threads are allowed to run (once gdb has noticed them)."
 msgstr ""
 
-#: gnu-nat.c:3130
+#: gnu-nat.c:3131
 msgid "Set the default detach-suspend-count value for new threads."
 msgstr ""
 
-#: gnu-nat.c:3133
+#: gnu-nat.c:3134
 msgid "Show the default detach-suspend-count value for new threads."
 msgstr ""
 
-#: gnu-nat.c:3136
+#: gnu-nat.c:3137
 msgid ""
 "Set whether the inferior process's signals will be intercepted.\n"
 "Mach exceptions (such as breakpoint traps) are not affected."
 msgstr ""
 
-#: gnu-nat.c:3141
+#: gnu-nat.c:3142
 msgid "Show whether the inferior process's signals will be intercepted."
 msgstr ""
 
-#: gnu-nat.c:3146
+#: gnu-nat.c:3147
 msgid ""
 "Set the thread that gdb thinks is the libc signal thread.\n"
 "This thread is run when delivering a signal to a non-stopped process."
 msgstr ""
 
-#: gnu-nat.c:3151
+#: gnu-nat.c:3152
 msgid "Set the thread that gdb thinks is the libc signal thread."
 msgstr ""
 
-#: gnu-nat.c:3156
+#: gnu-nat.c:3157
 msgid ""
 "Set whether gdb thinks the inferior process is stopped as with SIGSTOP.\n"
 "Stopped process will be continued by sending them a signal."
 msgstr ""
 
-#: gnu-nat.c:3160
+#: gnu-nat.c:3161
 msgid ""
 "Show whether gdb thinks the inferior process is stopped as with SIGSTOP."
 msgstr ""
 
-#: gnu-nat.c:3164
+#: gnu-nat.c:3165
 msgid ""
 "Set whether exceptions in the inferior process will be trapped.\n"
 "When exceptions are turned off, neither breakpoints nor single-stepping\n"
 "will work."
 msgstr ""
 
-#: gnu-nat.c:3171
+#: gnu-nat.c:3172
 msgid "Show whether exceptions in the inferior process will be trapped."
 msgstr ""
 
-#: gnu-nat.c:3176
+#: gnu-nat.c:3177
 msgid "Command prefix for setting task attributes."
 msgstr ""
 
-#: gnu-nat.c:3179
+#: gnu-nat.c:3180
 msgid "Command prefix for showing task attributes."
 msgstr ""
 
-#: gnu-nat.c:3182
+#: gnu-nat.c:3183
 msgid ""
 "Set whether the task is suspended while gdb has control.\n"
 "A value of \"on\" takes effect immediately, otherwise nothing happens\n"
@@ -9129,19 +9555,19 @@
 "used to pause individual threads by default instead."
 msgstr ""
 
-#: gnu-nat.c:3190
+#: gnu-nat.c:3191
 msgid "Show whether the task is suspended while gdb has control."
 msgstr ""
 
-#: gnu-nat.c:3194
+#: gnu-nat.c:3195
 msgid "Set the suspend count will leave on the thread when detaching."
 msgstr ""
 
-#: gnu-nat.c:3197
+#: gnu-nat.c:3198
 msgid "Show the suspend count will leave on the thread when detaching."
 msgstr ""
 
-#: gnu-nat.c:3201
+#: gnu-nat.c:3202
 msgid ""
 "Set the task exception port to which we forward exceptions.\n"
 "The argument should be the value of the send right in the task."
@@ -9149,54 +9575,54 @@
 
 #. A convenient way of turning on all options require to noninvasively
 #. debug running tasks.
-#: gnu-nat.c:3211
+#: gnu-nat.c:3212
 msgid ""
 "Set task options so that we interfere as little as possible.\n"
 "This is the same as setting `task pause', `exceptions', and\n"
 "`signals' to the opposite value."
 msgstr ""
 
-#: gnu-nat.c:3219
+#: gnu-nat.c:3220
 msgid "Show information about the task's send rights"
 msgstr ""
 
-#: gnu-nat.c:3222
+#: gnu-nat.c:3223
 msgid "Show information about the task's receive rights"
 msgstr ""
 
-#: gnu-nat.c:3225
+#: gnu-nat.c:3226
 msgid "Show information about the task's port rights"
 msgstr ""
 
-#: gnu-nat.c:3228
+#: gnu-nat.c:3229
 msgid "Show information about the task's port sets"
 msgstr ""
 
-#: gnu-nat.c:3231
+#: gnu-nat.c:3232
 msgid "Show information about the task's dead names"
 msgstr ""
 
-#: gnu-nat.c:3309
+#: gnu-nat.c:3310
 msgid "No argument to \"set thread exception-port\" command."
 msgstr ""
 
-#: gnu-nat.c:3352
+#: gnu-nat.c:3353
 msgid "Command prefix for setting thread properties."
 msgstr ""
 
-#: gnu-nat.c:3355
+#: gnu-nat.c:3356
 msgid "Command prefix for setting default thread properties."
 msgstr ""
 
-#: gnu-nat.c:3359
+#: gnu-nat.c:3360
 msgid "Command prefix for showing thread properties."
 msgstr ""
 
-#: gnu-nat.c:3362
+#: gnu-nat.c:3363
 msgid "Command prefix for showing default thread properties."
 msgstr ""
 
-#: gnu-nat.c:3366
+#: gnu-nat.c:3367
 msgid ""
 "Set whether the current thread is suspended while gdb has control.\n"
 "A value of \"on\" takes effect immediately, otherwise nothing happens\n"
@@ -9206,90 +9632,90 @@
 "The default value is \"off\"."
 msgstr ""
 
-#: gnu-nat.c:3374
+#: gnu-nat.c:3375
 msgid "Show whether the current thread is suspended while gdb has control."
 msgstr ""
 
-#: gnu-nat.c:3379
+#: gnu-nat.c:3380
 msgid "Set whether the current thread is allowed to run."
 msgstr ""
 
-#: gnu-nat.c:3382
+#: gnu-nat.c:3383
 msgid "Show whether the current thread is allowed to run."
 msgstr ""
 
-#: gnu-nat.c:3385
+#: gnu-nat.c:3386
 msgid ""
 "Set the suspend count will leave on the thread when detaching.\n"
 "Note that this is relative to suspend count when gdb noticed the thread;\n"
 "use the `thread takeover-suspend-count' to force it to an absolute value."
 msgstr ""
 
-#: gnu-nat.c:3390
+#: gnu-nat.c:3391
 msgid ""
 "Show the suspend count will leave on the thread when detaching.\n"
 "Note that this is relative to suspend count when gdb noticed the thread;\n"
 "use the `thread takeover-suspend-count' to force it to an absolute value."
 msgstr ""
 
-#: gnu-nat.c:3396
+#: gnu-nat.c:3397
 msgid ""
 "Set the thread exception port to which we forward exceptions.\n"
 "This overrides the task exception port.\n"
 "The argument should be the value of the send right in the task."
 msgstr ""
 
-#: gnu-nat.c:3405
+#: gnu-nat.c:3406
 msgid ""
 "Force the threads absolute suspend-count to be gdb's.\n"
 "Prior to giving this command, gdb's thread suspend-counts are relative\n"
 "to the thread's initial suspend-count when gdb notices the threads."
 msgstr ""
 
-#: gnu-nat.c:3422
+#: gnu-nat.c:3423
 msgid "Set debugging output for the gnu backend."
 msgstr ""
 
-#: gnu-nat.c:3423
+#: gnu-nat.c:3424
 msgid "Show debugging output for the gnu backend."
 msgstr ""
 
-#: gnu-nat.c:3450
+#: gnu-nat.c:3451
 #, possible-c-format
 msgid "Error flushing inferior's cache : %s"
 msgstr ""
 
-#: gnu-v2-abi.c:178
+#: gnu-v2-abi.c:179
 msgid "I'm confused:  virtual function table has bad type"
 msgstr ""
 
-#: gnu-v2-abi.c:374
+#: gnu-v2-abi.c:375
 msgid "Virtual baseclass pointer is not available"
 msgstr ""
 
-#: gnu-v2-abi.c:396
+#: gnu-v2-abi.c:397
 msgid "Baseclass offset not found"
 msgstr ""
 
-#: gnu-v3-abi.c:317
+#: gnu-v3-abi.c:320
 #, possible-c-format
 msgid "can't find linker symbol for virtual table for `%s' value"
 msgstr ""
 
-#: gnu-v3-abi.c:320
+#: gnu-v3-abi.c:323
 #, possible-c-format
 msgid "  found `%s' instead"
 msgstr ""
 
-#: gnu-v3-abi.c:390
+#: gnu-v3-abi.c:393
 msgid "Only classes can have virtual functions."
 msgstr ""
 
-#: gnu-v3-abi.c:440
+#: gnu-v3-abi.c:443
 msgid "Expected a negative vbase offset (old compiler?)"
 msgstr ""
 
-#: gnu-v3-abi.c:444
+#: gnu-v3-abi.c:447
 msgid "Misaligned vbase offset."
 msgstr ""
 
@@ -9427,255 +9853,331 @@
 "the `info dos ldt' command."
 msgstr ""
 
-#: h8300-tdep.c:774 h8300-tdep.c:808
+#: h8300-tdep.c:773 h8300-tdep.c:807
 msgid "I don't know how this 8 byte value is returned."
 msgstr ""
 
 #. long long, double and long double
 #. are all defined as 4 byte types so
 #. far so this shouldn't happen.
-#: h8300-tdep.c:872
+#: h8300-tdep.c:871
 msgid "I don't know how to return an 8 byte value."
 msgstr ""
 
-#: h8300-tdep.c:957
+#: h8300-tdep.c:956
 #, possible-c-format
 msgid "h8300_register_name: illegal register number %d"
 msgstr ""
 
-#: h8300-tdep.c:975
+#: h8300-tdep.c:974
 #, possible-c-format
 msgid "h8300s_register_name: illegal register number %d"
 msgstr ""
 
-#: h8300-tdep.c:993
+#: h8300-tdep.c:992
 #, possible-c-format
 msgid "h8300sx_register_name: illegal register number %d"
 msgstr ""
 
-#: h8300-tdep.c:1129
+#: h8300-tdep.c:1128
 #, possible-c-format
 msgid "h8300_register_type: illegal register number %d"
 msgstr ""
 
-#: hppa-hpux-nat.c:112 hppa-hpux-nat.c:126
+#: hppa-hpux-nat.c:111 hppa-hpux-nat.c:125
 #, possible-c-format
 msgid "Couldn't read register %s (#%d): %s"
 msgstr ""
 
-#: hppa-hpux-nat.c:198 hppa-hpux-nat.c:212
+#: hppa-hpux-nat.c:197 hppa-hpux-nat.c:211
 #, possible-c-format
 msgid "Couldn't write register %s (#%d): %s"
 msgstr ""
 
 #. Should never happen.
-#: hppa-hpux-tdep.c:150 hppa-hpux-tdep.c:281
+#: hppa-hpux-tdep.c:149 hppa-hpux-tdep.c:280
 msgid "Unable to find branch in parameter relocation stub."
 msgstr ""
 
-#: hppa-hpux-tdep.c:426
+#: hppa-hpux-tdep.c:425
 msgid "Unable to find branch in linker stub"
 msgstr ""
 
-#: hppa-hpux-tdep.c:444
+#: hppa-hpux-tdep.c:443
 #, possible-c-format
 msgid "Unable to find ldil X,%%r1 before ble Y(%%sr4,%%r1)."
 msgstr ""
 
-#: hppa-hpux-tdep.c:481
+#: hppa-hpux-tdep.c:480
 #, possible-c-format
 msgid "Unable to find symbol for 0x%lx"
 msgstr ""
 
-#: hppa-hpux-tdep.c:489
+#: hppa-hpux-tdep.c:488
 #, possible-c-format
 msgid "Unable to find library symbol for %s."
 msgstr ""
 
-#: hppa-hpux-tdep.c:522
+#: hppa-hpux-tdep.c:521
 #, possible-c-format
 msgid "Unable to find restore of %%rp before bv (%%rp)."
 msgstr ""
 
-#: hppa-hpux-tdep.c:871 hppa-hpux-tdep.c:969
+#: hppa-hpux-tdep.c:870 hppa-hpux-tdep.c:968
 msgid "Internal error creating objfile private data."
 msgstr ""
 
-#: hppa-hpux-tdep.c:1122
+#: hppa-hpux-tdep.c:1121
 msgid ""
 "Cannot find suitable address to place dummy breakpoint; nested calls may "
 "fail."
 msgstr ""
 
-#: hppa-hpux-tdep.c:1226
+#: hppa-hpux-tdep.c:1225
 msgid ""
 "Cannot call external function not referenced by application (no import "
 "stub).\n"
 msgstr ""
 
-#: hppa-hpux-tdep.c:1237 hppa-hpux-tdep.c:1263
+#: hppa-hpux-tdep.c:1236 hppa-hpux-tdep.c:1262
 msgid "Cannot make interspace call from here."
 msgstr ""
 
-#: hppa-hpux-tdep.c:1372
+#: hppa-hpux-tdep.c:1371
 msgid "Register set contents too small"
 msgstr ""
 
-#: hppa-linux-nat.c:158 ia64-linux-nat.c:310
+#: hppa-linux-nat.c:157 ia64-linux-nat.c:309
 #, possible-c-format
 msgid "Invalid register number %d."
 msgstr ""
 
-#: hppa-linux-nat.c:235 i386-linux-nat.c:166 ia64-linux-nat.c:711
-#: inf-ptrace.c:692 m68klinux-nat.c:122
+#: hppa-linux-nat.c:234 i386-linux-nat.c:165 ia64-linux-nat.c:708
+#: inf-ptrace.c:691 m68klinux-nat.c:121
 #, possible-c-format
 msgid "Couldn't read register %s (#%d): %s."
 msgstr ""
 
-#: hppa-linux-nat.c:263 i386-linux-nat.c:195 ia64-linux-nat.c:770
-#: inf-ptrace.c:751 m68klinux-nat.c:180
+#: hppa-linux-nat.c:262 i386-linux-nat.c:194 ia64-linux-nat.c:767
+#: inf-ptrace.c:750 m68klinux-nat.c:179
 #, possible-c-format
 msgid "Couldn't write register %s (#%d): %s."
 msgstr ""
 
-#: hppa-linux-tdep.c:50 hppa-tdep.c:674
+#: hppa-linux-tdep.c:49 hppa-tdep.c:673
 #, possible-c-format
 msgid "Unmapped DWARF DBX Register #%d encountered."
 msgstr ""
 
-#: hppa-tdep.c:488
+#: hppa-tdep.c:487
 msgid "Internal error reading unwind information."
 msgstr ""
 
-#: hppa-tdep.c:1913
+#: hppa-tdep.c:1912
 #, possible-c-format
 msgid "Cannot read instruction at %s."
 msgstr ""
 
-#: hppa-tdep.c:2411
+#: hppa-tdep.c:2410
 msgid "Requesting registers from null frame."
 msgstr ""
 
-#: hppa-tdep.c:2940
+#: hppa-tdep.c:2939
 #, possible-c-format
 msgid "Cannot resolve PLT stub at %s."
 msgstr ""
 
-#: hppa-tdep.c:3047
+#: hppa-tdep.c:3046
 #, possible-c-format
 msgid "Unsupported address size: %d"
 msgstr ""
 
-#: hppa-tdep.c:3156
+#: hppa-tdep.c:3155
 msgid "Print unwind table entry at given address."
 msgstr ""
 
 #. Debug this files internals.
-#: hppa-tdep.c:3160
+#: hppa-tdep.c:3159
 msgid ""
 "Set whether hppa target specific debugging information should be displayed."
 msgstr ""
 
-#: hppa-tdep.c:3162
+#: hppa-tdep.c:3161
 msgid "Show whether hppa target specific debugging information is displayed."
 msgstr ""
 
-#: hppa-tdep.c:3163
+#: hppa-tdep.c:3162
 msgid ""
 "This flag controls whether hppa target specific debugging information is\n"
 "displayed.  This information is particularly useful for debugging frame\n"
 "unwinding problems."
 msgstr ""
 
-#: i386-darwin-nat.c:72 i386-darwin-nat.c:116
+#: i386bsd-nat.c:220
+msgid "Couldn't write XMM registers"
+msgstr ""
+
+#: i386bsd-nat.c:273
+msgid "Couldn't get debug registers"
+msgstr ""
+
+#: i386bsd-nat.c:284
+msgid "Couldn't write debug registers"
+msgstr ""
+
+#: i386bsd-nat.c:316
+msgid "Couldn't read debug registers"
+msgstr ""
+
+#: i386bsd-nat.c:363
+#, possible-c-format
+msgid ""
+"offsetof (struct sigcontext, sc_pc) yields %d instead of %d.\n"
+"Please report this to <bug-gdb@gnu.org>."
+msgstr ""
+
+#: i386bsd-nat.c:376
+#, possible-c-format
+msgid ""
+"offsetof (struct sigcontext, sc_sp) yields %d instead of %d.\n"
+"Please report this to <bug-gdb@gnu.org>."
+msgstr ""
+
+#: i386bsd-nat.c:389
+#, possible-c-format
+msgid ""
+"offsetof (struct sigcontext, sc_fp) yields %d instead of %d.\n"
+"Please report this to <bug-gdb@gnu.org>."
+msgstr ""
+
+#: i386-darwin-nat.c:71 i386-darwin-nat.c:115
 #, possible-c-format
 msgid "Error calling thread_get_state for GP registers for thread 0x%ulx"
 msgstr ""
 
-#: i386-darwin-nat.c:92 i386-darwin-nat.c:141
+#: i386-darwin-nat.c:91 i386-darwin-nat.c:140
 #, possible-c-format
 msgid "Error calling thread_get_state for float registers for thread 0x%ulx"
 msgstr ""
 
-#: i386-darwin-nat.c:153
+#: i386-darwin-nat.c:152
 #, possible-c-format
 msgid "unknown register %d"
 msgstr ""
 
-#: i386-darwin-nat.c:304 i386-darwin-nat.c:370
+#: i386-darwin-nat.c:303 i386-darwin-nat.c:369
 #, possible-c-format
 msgid "Error reading debug registers thread 0x%x via thread_get_state\n"
 msgstr ""
 
-#: i386-darwin-nat.c:343
+#: i386-darwin-nat.c:342
 #, possible-c-format
 msgid "Error writing debug registers thread 0x%x via thread_get_state\n"
 msgstr ""
 
-#: i386-darwin-nat.c:544
+#: i386-darwin-nat.c:543
 #, possible-c-format
 msgid "darwin_set_sstep: error %x, thread=%x\n"
 msgstr ""
 
-#: i386-darwin-nat.c:584
+#: i386-darwin-nat.c:583
 #, possible-c-format
 msgid "darwin_set_sstep: unknown flavour: %d"
 msgstr ""
 
-#: i386-linux-nat.c:387 i386-linux-nat.c:410
+#: i386gnu-nat.c:77 i386gnu-nat.c:185
+#, possible-c-format
+msgid "Couldn't fetch floating-point state from %s"
+msgstr ""
+
+#: i386gnu-nat.c:125
+#, possible-c-format
+msgid "Can't fetch registers from thread %s: No such thread"
+msgstr ""
+
+#: i386gnu-nat.c:136
+#, possible-c-format
+msgid "Couldn't fetch registers from %s"
+msgstr ""
+
+#: i386gnu-nat.c:198
+#, possible-c-format
+msgid "Couldn't store floating-point state into %s"
+msgstr ""
+
+#: i386gnu-nat.c:218
+#, possible-c-format
+msgid "Couldn't store registers into thread %s: No such thread"
+msgstr ""
+
+#: i386gnu-nat.c:235
+#, possible-c-format
+msgid "Couldn't store registers into %s"
+msgstr ""
+
+#: i386gnu-nat.c:256
+#, possible-c-format
+msgid "Register %s changed after the thread was aborted"
+msgstr ""
+
+#: i386gnu-nat.c:263
+msgid "... also writing this register!  Suspicious..."
+msgstr ""
+
+#: i386-linux-nat.c:386 i386-linux-nat.c:409
 msgid "Couldn't read extended state status"
 msgstr ""
 
-#: i386-linux-nat.c:443 i386-linux-nat.c:470
+#: i386-linux-nat.c:442 i386-linux-nat.c:469
 msgid "Couldn't read floating-point and SSE registers"
 msgstr ""
 
-#: i386-linux-nat.c:476
+#: i386-linux-nat.c:475
 msgid "Couldn't write floating-point and SSE registers"
 msgstr ""
 
-#: i386-linux-nat.c:579 m32r-linux-nat.c:218 m68klinux-nat.c:452
+#: i386-linux-nat.c:578 m32r-linux-nat.c:217 m68klinux-nat.c:451
 #, possible-c-format
 msgid "Got request for bad register number %d."
 msgstr ""
 
-#: i386-linux-nat.c:648 m32r-linux-nat.c:243 m68klinux-nat.c:500
+#: i386-linux-nat.c:647 m32r-linux-nat.c:242 m68klinux-nat.c:499
 #, possible-c-format
 msgid "Got request to store bad register number %d."
 msgstr ""
 
-#: i386-linux-tdep.c:606
+#: i386-linux-tdep.c:605
 msgid "Couldn't read `xcr0' bytes from `.reg-xstate' section in core file."
 msgstr ""
 
-#: i386-nat.c:272
+#: i386-nat.c:311
 msgid "The i386 doesn't support data-read watchpoints.\n"
 msgstr ""
 
-#: i386-nat.c:284
+#: i386-nat.c:323
 #, possible-c-format
 msgid "Invalid hardware breakpoint type %d in i386_length_and_rw_bits.\n"
 msgstr ""
 
-#: i386-nat.c:302
+#: i386-nat.c:341
 #, possible-c-format
 msgid "Invalid hardware breakpoint length %d in i386_length_and_rw_bits.\n"
 msgstr ""
 
-#: i386-nat.c:461
+#: i386-nat.c:491
 #, possible-c-format
 msgid "Invalid value %d of operation in i386_handle_nonaligned_watchpoint.\n"
 msgstr ""
 
-#: i386-nat.c:661
+#: i386-nat.c:755
 msgid "Set whether to show variables that mirror the x86 debug registers."
 msgstr ""
 
-#: i386-nat.c:662
+#: i386-nat.c:756
 msgid "Show whether to show variables that mirror the x86 debug registers."
 msgstr ""
 
-#: i386-nat.c:663 mips-linux-nat.c:1058
+#: i386-nat.c:757 mips-linux-nat.c:1056
 msgid ""
 "Use \"on\" to enable, \"off\" to disable.\n"
 "If enabled, the debug registers values are shown when GDB inserts\n"
@@ -9683,43 +10185,43 @@
 "triggers a breakpoint or watchpoint."
 msgstr ""
 
-#: i386-tdep.c:2276
+#: i386-tdep.c:2442
 msgid "Cannot find floating-point return value."
 msgstr ""
 
-#: i386-tdep.c:2307 m68k-tdep.c:313
+#: i386-tdep.c:2473 m68k-tdep.c:311
 #, possible-c-format
 msgid "Cannot extract return value of %d bytes long."
 msgstr ""
 
-#: i386-tdep.c:2329
+#: i386-tdep.c:2495
 msgid "Cannot set floating-point return value."
 msgstr ""
 
-#: i386-tdep.c:2372 m68k-tdep.c:355
+#: i386-tdep.c:2538 m68k-tdep.c:353
 #, possible-c-format
 msgid "Cannot store return value of %d bytes long."
 msgstr ""
 
-#: i386-tdep.c:3399 i386-tdep.c:3440 i386-tdep.c:3476 i386-tdep.c:3549
-#: i386-tdep.c:3818 i386-tdep.c:3916 i386-tdep.c:5619 i386-tdep.c:6095
-#: i386-tdep.c:6368
+#: i386-tdep.c:3593 i386-tdep.c:3634 i386-tdep.c:3670 i386-tdep.c:3743
+#: i386-tdep.c:4012 i386-tdep.c:4110 i386-tdep.c:5813 i386-tdep.c:6289
+#: i386-tdep.c:6562
 #, possible-c-format
 msgid "Process record: error reading memory at addr %s len = 1.\n"
 msgstr ""
 
-#: i386-tdep.c:3461 i386-tdep.c:3488
+#: i386-tdep.c:3655 i386-tdep.c:3682
 #, possible-c-format
 msgid "Process record: error reading memory at addr %s len = 4.\n"
 msgstr ""
 
-#: i386-tdep.c:3534 i386-tdep.c:3561
+#: i386-tdep.c:3728 i386-tdep.c:3755
 #, possible-c-format
 msgid "Process record: error reading memory at addr %s len = 2.\n"
 msgstr ""
 
-#: i386-tdep.c:3662 i386-tdep.c:4567 i386-tdep.c:5258 i386-tdep.c:5825
-#: i386-tdep.c:5882
+#: i386-tdep.c:3856 i386-tdep.c:4761 i386-tdep.c:5452 i386-tdep.c:6019
+#: i386-tdep.c:6076
 #, possible-c-format
 msgid ""
 "Process record ignores the memory change of instruction at address %s\n"
@@ -9727,206 +10229,130 @@
 "Do you want to stop the program?"
 msgstr ""
 
-#: i386-tdep.c:4588
+#: i386-tdep.c:4782
 #, possible-c-format
 msgid "Process record: error reading memory at addr 0x%s len = 8.\n"
 msgstr ""
 
-#: i386-tdep.c:4601
+#: i386-tdep.c:4795
 #, possible-c-format
 msgid "Process record: error reading memory at addr 0x%s len = 4.\n"
 msgstr ""
 
-#: i386-tdep.c:4614
+#: i386-tdep.c:4808
 #, possible-c-format
 msgid "Process record: error reading memory at addr 0x%s len = 2.\n"
 msgstr ""
 
-#: i386-tdep.c:5593
+#: i386-tdep.c:5787
 #, possible-c-format
 msgid "Process record: error reading memory at addr 0x%s len = 1.\n"
 msgstr ""
 
 #. XXX
 #. int3
-#: i386-tdep.c:5605
+#: i386-tdep.c:5799
 msgid "Process record does not support instruction int3.\n"
 msgstr ""
 
-#: i386-tdep.c:5628
+#: i386-tdep.c:5822
 #, possible-c-format
 msgid "Process record does not support instruction int 0x%02x.\n"
 msgstr ""
 
 #. XXX
 #. into
-#: i386-tdep.c:5642
+#: i386-tdep.c:5836
 msgid "Process record does not support instruction into.\n"
 msgstr ""
 
 #. bound
-#: i386-tdep.c:5653
+#: i386-tdep.c:5847
 msgid "Process record does not support instruction bound.\n"
 msgstr ""
 
 #. wrmsr
-#: i386-tdep.c:5689
+#: i386-tdep.c:5883
 msgid "Process record does not support instruction wrmsr.\n"
 msgstr ""
 
 #. rdmsr
-#: i386-tdep.c:5696
+#: i386-tdep.c:5890
 msgid "Process record does not support instruction rdmsr.\n"
 msgstr ""
 
-#: i386-tdep.c:5717
+#: i386-tdep.c:5911
 msgid "Process record does not support instruction sysenter.\n"
 msgstr ""
 
 #. sysexit
-#: i386-tdep.c:5729
+#: i386-tdep.c:5923
 msgid "Process record does not support instruction sysexit.\n"
 msgstr ""
 
-#: i386-tdep.c:5740
+#: i386-tdep.c:5934
 msgid "Process record does not support instruction syscall.\n"
 msgstr ""
 
 #. sysret
-#: i386-tdep.c:5752
+#: i386-tdep.c:5946
 msgid "Process record does not support instruction sysret.\n"
 msgstr ""
 
 #. hlt
-#: i386-tdep.c:5766
+#: i386-tdep.c:5960
 msgid "Process record does not support instruction hlt.\n"
 msgstr ""
 
-#: i386-tdep.c:6902
+#: i386-tdep.c:7096
 #, possible-c-format
 msgid "Process record does not support instruction 0x%02x at address %s.\n"
 msgstr ""
 
-#: i386-tdep.c:6949
+#: i386-tdep.c:7164
 #, possible-c-format
 msgid ""
 "; instruction is only %d bytes long, need at least %d bytes for the jump"
 msgstr ""
 
-#: i386-tdep.c:7338
+#: i386-tdep.c:7560
 msgid "Set the disassembly flavor."
 msgstr ""
 
-#: i386-tdep.c:7339
+#: i386-tdep.c:7561
 msgid "Show the disassembly flavor."
 msgstr ""
 
-#: i386-tdep.c:7340
+#: i386-tdep.c:7562
 msgid ""
 "The valid values are \"att\" and \"intel\", and the default value is \"att\"."
 msgstr ""
 
-#: i386-tdep.c:7349
+#: i386-tdep.c:7571
 msgid "Set the convention for returning small structs."
 msgstr ""
 
-#: i386-tdep.c:7350
+#: i386-tdep.c:7572
 msgid "Show the convention for returning small structs."
 msgstr ""
 
-#: i386-tdep.c:7351
+#: i386-tdep.c:7573
 msgid ""
 "Valid values are \"default\", \"pcc\" and \"reg\", and the default value\n"
 "is \"default\"."
 msgstr ""
 
-#: i386bsd-nat.c:221
-msgid "Couldn't write XMM registers"
-msgstr ""
-
-#: i386bsd-nat.c:274
-msgid "Couldn't get debug registers"
-msgstr ""
-
-#: i386bsd-nat.c:285
-msgid "Couldn't write debug registers"
-msgstr ""
-
-#: i386bsd-nat.c:323
-msgid "Couldn't read debug registers"
-msgstr ""
-
-#: i386bsd-nat.c:373
-#, possible-c-format
-msgid ""
-"offsetof (struct sigcontext, sc_pc) yields %d instead of %d.\n"
-"Please report this to <bug-gdb@gnu.org>."
-msgstr ""
-
-#: i386bsd-nat.c:386
-#, possible-c-format
-msgid ""
-"offsetof (struct sigcontext, sc_sp) yields %d instead of %d.\n"
-"Please report this to <bug-gdb@gnu.org>."
-msgstr ""
-
-#: i386bsd-nat.c:399
-#, possible-c-format
-msgid ""
-"offsetof (struct sigcontext, sc_fp) yields %d instead of %d.\n"
-"Please report this to <bug-gdb@gnu.org>."
-msgstr ""
-
-#: i386gnu-nat.c:77 i386gnu-nat.c:185
-#, possible-c-format
-msgid "Couldn't fetch floating-point state from %s"
-msgstr ""
-
-#: i386gnu-nat.c:125
-#, possible-c-format
-msgid "Can't fetch registers from thread %s: No such thread"
-msgstr ""
-
-#: i386gnu-nat.c:136
-#, possible-c-format
-msgid "Couldn't fetch registers from %s"
-msgstr ""
-
-#: i386gnu-nat.c:198
-#, possible-c-format
-msgid "Couldn't store floating-point state into %s"
-msgstr ""
-
-#: i386gnu-nat.c:218
-#, possible-c-format
-msgid "Couldn't store registers into thread %s: No such thread"
-msgstr ""
-
-#: i386gnu-nat.c:235
-#, possible-c-format
-msgid "Couldn't store registers into %s"
-msgstr ""
-
-#: i386gnu-nat.c:256
-#, possible-c-format
-msgid "Register %s changed after the thread was aborted"
-msgstr ""
-
-#: i386gnu-nat.c:263
-msgid "... also writing this register!  Suspicious..."
-msgstr ""
-
-#: i387-tdep.c:323 m68k-tdep.c:218
+#: i387-tdep.c:322 m68k-tdep.c:216
 msgid ""
 "Cannot convert floating-point register value to non-floating-point type."
 msgstr ""
 
-#: i387-tdep.c:354 m68k-tdep.c:250
+#: i387-tdep.c:353 m68k-tdep.c:248
 msgid ""
 "Cannot convert non-floating-point type to floating-point register value."
 msgstr ""
 
-#: i387-tdep.c:1045 i387-tdep.c:1090
+#: i387-tdep.c:1044 i387-tdep.c:1089
 msgid "invalid i387 regclass"
 msgstr ""
 
@@ -9945,134 +10371,76 @@
 msgid "failed to write register value for %s."
 msgstr ""
 
-#: ia64-tdep.c:536
-msgid ""
-"Can't fetch instructions for slot numbers greater than 2.\n"
-"Using slot 0 instead"
-msgstr ""
-
-#: ia64-tdep.c:652 ia64-tdep.c:839
-msgid "Can't insert breakpoint for slot numbers greater than 2."
-msgstr ""
-
-#: ia64-tdep.c:685 ia64-tdep.c:867
-msgid "Can't insert breakpoint for non-existing slot X"
-msgstr ""
-
-#: ia64-tdep.c:723
-#, possible-c-format
-msgid "Address %s already contains a breakpoint."
-msgstr ""
-
-#: ia64-tdep.c:776
-#, possible-c-format
-msgid ""
-"Cannot remove breakpoint at address %s from non-existing X-type slot, memory "
-"has changed underneath"
-msgstr ""
-
-#: ia64-tdep.c:797
-#, possible-c-format
+#: ia64-tdep.c:535
 msgid ""
-"Cannot remove breakpoint at address %s, no break instruction at such address."
-msgstr ""
-
-#: inf-child.c:80 windows-nat.c:1923
-msgid "Use the \"run\" command to start a Unix child process."
-msgstr ""
-
-#: inf-loop.c:54
-msgid "error detected from target.\n"
-msgstr ""
-
-#: inf-loop.c:140
-msgid "completed.\n"
-msgstr ""
-
-#: inf-loop.c:162
-msgid "Event type not recognized.\n"
-msgstr ""
-
-#: inf-ptrace.c:236
-msgid "This system does not support attaching to a process"
-msgstr ""
-
-#: inf-ptrace.c:300
-msgid "This system does not support detaching from a process"
-msgstr ""
-
-#: inf-ptrace.c:407 rs6000-nat.c:549
-#, possible-c-format
-msgid "Child process unexpectedly missing: %s.\n"
-msgstr ""
-
-#: inf-ptrace.c:611 inf-ttrace.c:1244
-#, possible-c-format
-msgid "\tUsing the running image of %s %s.\n"
-msgstr ""
-
-#: inf-ttrace.c:465
-#, possible-c-format
-msgid "Attaching after fork to child process %ld.\n"
+"Can't fetch instructions for slot numbers greater than 2.\n"
+"Using slot 0 instead"
 msgstr ""
 
-#: inf-ttrace.c:475
-#, possible-c-format
-msgid "Detaching after fork from child process %ld.\n"
+#: ia64-tdep.c:651 ia64-tdep.c:838
+msgid "Can't insert breakpoint for slot numbers greater than 2."
 msgstr ""
 
-#: inf-ttrace.c:701
-msgid "TT_PROC_GET_FIRST_LWP_STATE ttrace call failed"
+#: ia64-tdep.c:684 ia64-tdep.c:866
+msgid "Can't insert breakpoint for non-existing slot X"
 msgstr ""
 
-#: inf-ttrace.c:722
-msgid "TT_PROC_GET_NEXT_LWP_STATE ttrace call failed"
+#: ia64-tdep.c:722
+#, possible-c-format
+msgid "Address %s already contains a breakpoint."
 msgstr ""
 
-#: inf-ttrace.c:1096 linux-nat.c:1302 procfs.c:3911 procfs.c:4049
+#: ia64-tdep.c:775
 #, possible-c-format
-msgid "[%s exited]\n"
+msgid ""
+"Cannot remove breakpoint at address %s from non-existing X-type slot, memory "
+"has changed underneath"
 msgstr ""
 
-#: inf-ttrace.c:1112
+#: ia64-tdep.c:796
 #, possible-c-format
-msgid "[%s has been terminated]\n"
+msgid ""
+"Cannot remove breakpoint at address %s, no break instruction at such address."
 msgstr ""
 
-#: infcall.c:81
+#: infcall.c:79
 #, possible-c-format
 msgid "Coercion of floats to doubles when calling functions is %s.\n"
 msgstr ""
 
-#: infcall.c:99
+#: infcall.c:97
 #, possible-c-format
 msgid ""
 "Unwinding of stack if a signal is received while in a call dummy is %s.\n"
 msgstr ""
 
-#: infcall.c:125
+#: infcall.c:123
 #, possible-c-format
 msgid ""
 "Unwind stack if a C++ exception is unhandled while in a call dummy is %s.\n"
 msgstr ""
 
-#: infcall.c:318
+#: infcall.c:316
 msgid "Invalid data type for function to be called."
 msgstr ""
 
-#: infcall.c:496
+#: infcall.c:492
 msgid "May not call functions while looking at trace frames."
 msgstr ""
 
-#: infcall.c:502
+#: infcall.c:495
+msgid "Cannot call functions in reverse mode."
+msgstr ""
+
+#: infcall.c:501
 msgid "This target does not support function calls."
 msgstr ""
 
-#: infcall.c:676
+#: infcall.c:675
 msgid "Too few arguments in function call."
 msgstr ""
 
-#: infcall.c:853
+#: infcall.c:852
 #, possible-c-format
 msgid ""
 "%s\n"
@@ -10085,7 +10453,7 @@
 #. We could discard the dummy frame here given that the program exited,
 #. but it will get garbage collected the next time the program is
 #. run anyway.
-#: infcall.c:881
+#: infcall.c:880
 #, possible-c-format
 msgid ""
 "The program being debugged exited while in a function called from GDB.\n"
@@ -10093,7 +10461,7 @@
 "(%s) will be abandoned."
 msgstr ""
 
-#: infcall.c:901
+#: infcall.c:900
 #, possible-c-format
 msgid ""
 "The program received a signal in another thread while\n"
@@ -10103,7 +10471,7 @@
 "When the function is done executing, GDB will silently stop."
 msgstr ""
 
-#: infcall.c:909
+#: infcall.c:908
 #, possible-c-format
 msgid ""
 "The program stopped in another thread while making a function call from "
@@ -10115,7 +10483,7 @@
 
 #. FIXME: Insert a bunch of wrap_here; name can be very
 #. long if it's a C++ name with arguments and stuff.
-#: infcall.c:942
+#: infcall.c:941
 #, possible-c-format
 msgid ""
 "The program being debugged was signaled while in a function called from "
@@ -10128,7 +10496,7 @@
 
 #. FIXME: Insert a bunch of wrap_here; name can be very
 #. long if it's a C++ name with arguments and stuff.
-#: infcall.c:960
+#: infcall.c:959
 #, possible-c-format
 msgid ""
 "The program being debugged was signaled while in a function called from "
@@ -10140,7 +10508,7 @@
 "When the function is done executing, GDB will silently stop."
 msgstr ""
 
-#: infcall.c:981
+#: infcall.c:980
 #, possible-c-format
 msgid ""
 "The program being debugged entered a std::terminate call, most likely\n"
@@ -10160,7 +10528,7 @@
 #. someday this will be implemented (it would not be easy).
 #. FIXME: Insert a bunch of wrap_here; name can be very long if it's
 #. a C++ name with arguments and stuff.
-#: infcall.c:1008
+#: infcall.c:1007
 #, possible-c-format
 msgid ""
 "The program being debugged stopped while in a function called from GDB.\n"
@@ -10170,19 +10538,19 @@
 msgstr ""
 
 #. The above code errors out, so ...
-#: infcall.c:1017
+#: infcall.c:1016
 msgid "... should not be here"
 msgstr ""
 
-#: infcall.c:1080
+#: infcall.c:1079
 msgid "Set coercion of floats to doubles when calling functions."
 msgstr ""
 
-#: infcall.c:1081
+#: infcall.c:1080
 msgid "Show coercion of floats to doubles when calling functions"
 msgstr ""
 
-#: infcall.c:1082
+#: infcall.c:1081
 msgid ""
 "Variables of type float should generally be converted to doubles before\n"
 "calling an unprototyped function, and left alone when calling a prototyped\n"
@@ -10193,16 +10561,16 @@
 "The default is to perform the conversion.\n"
 msgstr ""
 
-#: infcall.c:1095
+#: infcall.c:1094
 msgid "Set unwinding of stack if a signal is received while in a call dummy."
 msgstr ""
 
-#: infcall.c:1096
+#: infcall.c:1095
 msgid ""
 "Show unwinding of stack if a signal is received while in a call dummy."
 msgstr ""
 
-#: infcall.c:1097
+#: infcall.c:1096
 msgid ""
 "The unwindonsignal lets the user determine what gdb should do if a signal\n"
 "is received while in a function called from gdb (call dummy).  If set, gdb\n"
@@ -10211,17 +10579,17 @@
 "The default is to stop in the frame where the signal was received."
 msgstr ""
 
-#: infcall.c:1107
+#: infcall.c:1106
 msgid ""
 "Set unwinding of stack if std::terminate is called while in call dummy."
 msgstr ""
 
-#: infcall.c:1108
+#: infcall.c:1107
 msgid ""
 "Show unwinding of stack if std::terminate() is called while in a call dummy."
 msgstr ""
 
-#: infcall.c:1110
+#: infcall.c:1109
 msgid ""
 "The unwind on terminating exception flag lets the user determine\n"
 "what gdb should do if a std::terminate() call is made from the\n"
@@ -10231,281 +10599,287 @@
 "The default is to unwind the frame."
 msgstr ""
 
-#: infcmd.c:127 infcmd.c:2234 infcmd.c:2619 remote-sim.c:886
+#: inf-child.c:79 windows-nat.c:1907
+msgid "Use the \"run\" command to start a Unix child process."
+msgstr ""
+
+#: infcmd.c:128 infcmd.c:2286 infcmd.c:2674 linux-fork.c:658 remote-sim.c:888
 msgid "The program is not being run."
 msgstr ""
 
-#: infcmd.c:206
+#: infcmd.c:207
 #, possible-c-format
 msgid "Terminal for future runs of program being debugged is \"%s\".\n"
 msgstr ""
 
-#: infcmd.c:342
+#: infcmd.c:343
 msgid "can't handle command-line argument containing whitespace"
 msgstr ""
 
-#: infcmd.c:479
+#: infcmd.c:442
+msgid ""
+"platform-specific solib_create_inferior_hook did not load initial shared "
+"libraries."
+msgstr ""
+
+#: infcmd.c:488
 msgid ""
 "The program being debugged has been started already.\n"
 "Start it from the beginning? "
 msgstr ""
 
-#: infcmd.c:481
+#: infcmd.c:490
 msgid "Program not restarted."
 msgstr ""
 
-#: infcmd.c:525
+#: infcmd.c:535
 msgid "The target does not support running in non-stop mode."
 msgstr ""
 
-#: infcmd.c:547 infcmd.c:720 infcmd.c:863 infcmd.c:1092 infcmd.c:1196
-#: infcmd.c:1332 infcmd.c:1368 infcmd.c:1642 infcmd.c:2463
+#: infcmd.c:557 infcmd.c:730 infcmd.c:873 infcmd.c:1113 infcmd.c:1217
+#: infcmd.c:1366 infcmd.c:1402 infcmd.c:1698 infcmd.c:2518
 msgid "Asynchronous execution not supported on this target."
 msgstr ""
 
-#: infcmd.c:630
+#: infcmd.c:640
 msgid "No symbol table loaded.  Use the \"file\" command."
 msgstr ""
 
-#: infcmd.c:662
+#: infcmd.c:672
 msgid "Cannot execute this command without a live selected thread."
 msgstr ""
 
-#: infcmd.c:673
+#: infcmd.c:683
 msgid "Cannot execute this command while looking at trace frames."
 msgstr ""
 
-#: infcmd.c:742
+#: infcmd.c:752
 msgid "`-a' is meaningless in all-stop mode."
 msgstr ""
 
-#: infcmd.c:745
+#: infcmd.c:755
 msgid "Can't resume all threads and specify proceed count simultaneously."
 msgstr ""
 
-#: infcmd.c:791
+#: infcmd.c:801
 msgid "Continuing.\n"
 msgstr ""
 
-#: infcmd.c:1023
+#: infcmd.c:1044
 msgid "Cannot find bounds of current function"
 msgstr ""
 
-#: infcmd.c:1026
+#: infcmd.c:1047
 #, possible-c-format
 msgid ""
 "Single stepping until exit from function %s,\n"
 "which has no line number information.\n"
 msgstr ""
 
-#: infcmd.c:1095
+#: infcmd.c:1116
 msgid "starting address"
 msgstr ""
 
-#: infcmd.c:1100
+#: infcmd.c:1121
 msgid "Unreasonable jump request"
 msgstr ""
 
-#: infcmd.c:1107
+#: infcmd.c:1128
 msgid "No source file has been specified."
 msgstr ""
 
-#: infcmd.c:1116
+#: infcmd.c:1137
 #, possible-c-format
 msgid "Line %d is not in `%s'.  Jump anyway? "
 msgstr ""
 
-#: infcmd.c:1130
+#: infcmd.c:1151
 msgid "WARNING!!!  Destination is in unmapped overlay!  Jump anyway? "
 msgstr ""
 
-#: infcmd.c:1143
+#: infcmd.c:1164
 msgid "Continuing at "
 msgstr ""
 
-#: infcmd.c:1166
+#: infcmd.c:1187
 msgid "Usage: go <location>\n"
 msgstr ""
 
-#: infcmd.c:1207
+#: infcmd.c:1228
 msgid "signal number"
 msgstr ""
 
-#: infcmd.c:1228
+#: infcmd.c:1249
 msgid "Continuing with no signal.\n"
 msgstr ""
 
-#: infcmd.c:1230
+#: infcmd.c:1251
 #, possible-c-format
 msgid "Continuing with signal %s.\n"
 msgstr ""
 
-#: infcmd.c:1284
+#: infcmd.c:1313
 msgid "Execution is not within a known function."
 msgstr ""
 
-#: infcmd.c:1359
+#: infcmd.c:1393
 msgid "a location"
 msgstr ""
 
-#: infcmd.c:1482
+#: infcmd.c:1546
 msgid "finish_command: function has no target type"
 msgstr ""
 
-#: infcmd.c:1531
+#: infcmd.c:1595
 msgid "Finish: couldn't find function."
 msgstr ""
 
-#: infcmd.c:1646
-msgid "Asynchronous 'finish' not supported in reverse."
-msgstr ""
-
-#: infcmd.c:1657
+#: infcmd.c:1709
 msgid "The \"finish\" command does not take any arguments."
 msgstr ""
 
 #. Finishing from an inline frame is completely different.  We don't
 #. try to show the "return value" - no way to locate it.  So we do
 #. not need a completion.
-#: infcmd.c:1659 infcmd.c:1668
+#: infcmd.c:1711 infcmd.c:1720
 msgid "No selected frame."
 msgstr ""
 
-#: infcmd.c:1661
+#: infcmd.c:1713
 msgid "\"finish\" not meaningful in the outermost frame."
 msgstr ""
 
-#: infcmd.c:1689 infcmd.c:1708
+#: infcmd.c:1741 infcmd.c:1760
 msgid "Run till exit from "
 msgstr ""
 
-#: infcmd.c:1706
+#: infcmd.c:1758
 msgid "Run back to call of "
 msgstr ""
 
-#: infcmd.c:1730
+#: infcmd.c:1782
 msgid "The program being debugged is not being run.\n"
 msgstr ""
 
-#: infcmd.c:1746
+#: infcmd.c:1798 infrun.c:6500
 msgid "Selected thread is running."
 msgstr ""
 
-#: infcmd.c:1753
+#: infcmd.c:1805
 #, possible-c-format
 msgid "Program stopped at %s.\n"
 msgstr ""
 
-#: infcmd.c:1756
+#: infcmd.c:1808
 msgid "It stopped after being stepped.\n"
 msgstr ""
 
-#: infcmd.c:1765
+#: infcmd.c:1817
 msgid "It stopped at a breakpoint that has since been deleted.\n"
 msgstr ""
 
-#: infcmd.c:1769
+#: infcmd.c:1821
 #, possible-c-format
 msgid "It stopped at breakpoint %d.\n"
 msgstr ""
 
-#: infcmd.c:1775
+#: infcmd.c:1827
 #, possible-c-format
 msgid "It stopped with signal %s, %s.\n"
 msgstr ""
 
-#: infcmd.c:1782
+#: infcmd.c:1834
 msgid "Type \"info stack\" or \"info registers\" for more information.\n"
 msgstr ""
 
-#: infcmd.c:1827
+#: infcmd.c:1879
 msgid "environment variable and value"
 msgstr ""
 
-#: infcmd.c:1851
+#: infcmd.c:1903
 msgid "environment variable to set"
 msgstr ""
 
-#: infcmd.c:1873
+#: infcmd.c:1925
 #, possible-c-format
 msgid "Setting environment variable \"%s\" to null value.\n"
 msgstr ""
 
 #. If there is no argument, delete all environment variables.
 #. Ask for confirmation if reading from the terminal.
-#: infcmd.c:1890
+#: infcmd.c:1942
 msgid "Delete all environment variables? "
 msgstr ""
 
-#: infcmd.c:2068 infcmd.c:2219 infcmd.c:2739
+#: infcmd.c:2120 infcmd.c:2271 infcmd.c:2795
 msgid "The program has no registers now."
 msgstr ""
 
-#: infcmd.c:2096
+#: infcmd.c:2148
 msgid "Missing register name"
 msgstr ""
 
 #. Nothing matched.
-#: infcmd.c:2170
+#: infcmd.c:2222
 #, possible-c-format
 msgid "Invalid register `%.*s'"
 msgstr ""
 
-#: infcmd.c:2235
+#: infcmd.c:2287
 msgid "Kill the program being debugged? "
 msgstr ""
 
-#: infcmd.c:2249
+#: infcmd.c:2301
 #, possible-c-format
 msgid "In %s,\n"
 msgstr ""
 
-#: infcmd.c:2443 target.c:2428
+#: infcmd.c:2498 target.c:2522
 msgid "A program is being debugged already.  Kill it? "
 msgstr ""
 
-#: infcmd.c:2446
+#: infcmd.c:2501
 msgid "Not killed."
 msgstr ""
 
-#: infcmd.c:2454
+#: infcmd.c:2509
 msgid "Cannot attach to this target in non-stop mode"
 msgstr ""
 
-#: infcmd.c:2699
+#: infcmd.c:2755
 msgid "-a is meaningless in all-stop mode."
 msgstr ""
 
-#: infcmd.c:2747
+#: infcmd.c:2803
 msgid "\"unset\" must be followed by the name of an unset subcommand.\n"
 msgstr ""
 
-#: infcmd.c:2759
+#: infcmd.c:2815
 msgid "Set terminal for future runs of program being debugged."
 msgstr ""
 
-#: infcmd.c:2760
+#: infcmd.c:2816
 msgid "Show terminal for future runs of program being debugged."
 msgstr ""
 
-#: infcmd.c:2761
+#: infcmd.c:2817
 msgid "Usage: set inferior-tty /dev/pts/1"
 msgstr ""
 
-#: infcmd.c:2769
+#: infcmd.c:2825
 msgid "Set argument list to give program being debugged when it is started."
 msgstr ""
 
-#: infcmd.c:2770
+#: infcmd.c:2826
 msgid "Show argument list to give program being debugged when it is started."
 msgstr ""
 
-#: infcmd.c:2771
+#: infcmd.c:2827
 msgid ""
 "Follow this command with any number of args, to be passed to the program."
 msgstr ""
 
-#: infcmd.c:2777
+#: infcmd.c:2833
 msgid ""
 "The environment to give the program, or one variable's value.\n"
 "With an argument VAR, prints the value of environment variable VAR to\n"
@@ -10513,17 +10887,17 @@
 "environment to be given to the program."
 msgstr ""
 
-#: infcmd.c:2785
+#: infcmd.c:2841
 msgid "Complement to certain \"set\" commands."
 msgstr ""
 
-#: infcmd.c:2788
+#: infcmd.c:2844
 msgid ""
 "Cancel environment variable VAR for the program.\n"
 "This does not affect the program until the next \"run\" command."
 msgstr ""
 
-#: infcmd.c:2794
+#: infcmd.c:2850
 msgid ""
 "Set environment variable value to give the program.\n"
 "Arguments are VAR VALUE where VAR is variable name and VALUE is value.\n"
@@ -10531,7 +10905,7 @@
 "This does not affect the program until the next \"run\" command."
 msgstr ""
 
-#: infcmd.c:2802
+#: infcmd.c:2858
 msgid ""
 "Add directory DIR(s) to beginning of search path for object files.\n"
 "$cwd in the path means the current working directory.\n"
@@ -10540,7 +10914,7 @@
 "fully linked executable files and separately compiled object files as needed."
 msgstr ""
 
-#: infcmd.c:2811
+#: infcmd.c:2867
 msgid ""
 "Current search path for finding object files.\n"
 "$cwd in the path means the current working directory.\n"
@@ -10549,11 +10923,11 @@
 "fully linked executable files and separately compiled object files as needed."
 msgstr ""
 
-#: infcmd.c:2822
+#: infcmd.c:2878
 msgid "Kill execution of program being debugged."
 msgstr ""
 
-#: infcmd.c:2825
+#: infcmd.c:2881
 msgid ""
 "Attach to a process or file outside of GDB.\n"
 "This command attaches to another target, of the same type as your last\n"
@@ -10568,45 +10942,45 @@
 "to specify the program, and to load its symbol table."
 msgstr ""
 
-#: infcmd.c:2838
+#: infcmd.c:2894
 msgid ""
 "Detach a process or file previously attached.\n"
 "If a process, it is no longer traced, and it continues its execution.  If\n"
 "you were debugging a file, the file is closed and gdb no longer accesses it."
 msgstr ""
 
-#: infcmd.c:2844
+#: infcmd.c:2900
 msgid ""
 "Disconnect from a target.\n"
 "The target will wait for another debugger to connect.  Not available for\n"
 "all targets."
 msgstr ""
 
-#: infcmd.c:2849
+#: infcmd.c:2905
 msgid ""
 "Continue program giving it signal specified by the argument.\n"
 "An argument of \"0\" means continue program without giving it a signal."
 msgstr ""
 
-#: infcmd.c:2853
+#: infcmd.c:2909
 msgid ""
 "Step one instruction exactly.\n"
 "Argument N means do this N times (or till program stops for another reason)."
 msgstr ""
 
-#: infcmd.c:2859
+#: infcmd.c:2915
 msgid ""
 "Step one instruction, but proceed through subroutine calls.\n"
 "Argument N means do this N times (or till program stops for another reason)."
 msgstr ""
 
-#: infcmd.c:2865
+#: infcmd.c:2921
 msgid ""
 "Execute until selected stack frame returns.\n"
 "Upon return, the value returned is printed and put in the value history."
 msgstr ""
 
-#: infcmd.c:2870
+#: infcmd.c:2926
 msgid ""
 "Step program, proceeding through subroutine calls.\n"
 "Like the \"step\" command as long as subroutine calls do not happen;\n"
@@ -10614,34 +10988,34 @@
 "Argument N means do this N times (or till program stops for another reason)."
 msgstr ""
 
-#: infcmd.c:2880
+#: infcmd.c:2936
 msgid ""
 "Step program until it reaches a different source line.\n"
 "Argument N means do this N times (or till program stops for another reason)."
 msgstr ""
 
-#: infcmd.c:2886
+#: infcmd.c:2942
 msgid ""
 "Execute until the program reaches a source line greater than the current\n"
 "or a specified location (same args as break command) within the current "
 "frame."
 msgstr ""
 
-#: infcmd.c:2893
+#: infcmd.c:2949
 msgid ""
 "Continue the program up to the given location (same form as args for break "
 "command).\n"
 "Execution will also stop upon exit from the current stack frame."
 msgstr ""
 
-#: infcmd.c:2899
+#: infcmd.c:2955
 msgid ""
 "Continue program being debugged at specified line or address.\n"
 "Give as argument either LINENUM or *ADDR, where ADDR is an expression\n"
 "for an address to start at."
 msgstr ""
 
-#: infcmd.c:2907
+#: infcmd.c:2963
 msgid ""
 "Usage: go <location>\n"
 "Continue program being debugged, stopping at specified line or \n"
@@ -10651,7 +11025,7 @@
 "This command is a combination of tbreak and jump."
 msgstr ""
 
-#: infcmd.c:2920
+#: infcmd.c:2976
 msgid ""
 "Continue program being debugged, after signal or breakpoint.\n"
 "If proceeding from breakpoint, a number N may be used as an argument,\n"
@@ -10664,7 +11038,7 @@
 "Specifying -a and an ignore count simultaneously is an error."
 msgstr ""
 
-#: infcmd.c:2933
+#: infcmd.c:2989
 msgid ""
 "Start debugged program.  You may specify arguments to give it.\n"
 "Args may include \"*\", or \"[...]\"; they are expanded using \"sh\".\n"
@@ -10676,18 +11050,18 @@
 "use \"set args\" without arguments."
 msgstr ""
 
-#: infcmd.c:2946
+#: infcmd.c:3002
 msgid "Start debugged program with no arguments."
 msgstr ""
 
-#: infcmd.c:2948
+#: infcmd.c:3004
 msgid ""
 "Run the debugged program until the beginning of the main procedure.\n"
 "You may specify arguments to give to your program, just as with the\n"
 "\"run\" command."
 msgstr ""
 
-#: infcmd.c:2955
+#: infcmd.c:3011
 msgid ""
 "Interrupt the execution of the debugged program.\n"
 "If non-stop mode is enabled, interrupt only the current thread,\n"
@@ -10695,143 +11069,143 @@
 "interrupt all running threads in non-stop mode, use the -a option."
 msgstr ""
 
-#: infcmd.c:2960 infcmd.c:2966
+#: infcmd.c:3016 infcmd.c:3022
 msgid ""
 "List of integer registers and their contents, for selected stack frame.\n"
 "Register name as argument means describe only that register."
 msgstr ""
 
-#: infcmd.c:2969
+#: infcmd.c:3025
 msgid ""
 "List of all registers and their contents, for selected stack frame.\n"
 "Register name as argument means describe only that register."
 msgstr ""
 
-#: infcmd.c:2974
+#: infcmd.c:3030
 msgid "Execution status of the program."
 msgstr ""
 
-#: infcmd.c:2977
+#: infcmd.c:3033
 msgid "Print the status of the floating point unit\n"
 msgstr ""
 
-#: infcmd.c:2980
+#: infcmd.c:3036
 msgid "Print the status of the vector unit\n"
 msgstr ""
 
-#: inferior.c:153
+#: inferior.c:154
 #, possible-c-format
 msgid "[New inferior %d]\n"
 msgstr ""
 
-#: inferior.c:240 inferior.c:296
+#: inferior.c:241 inferior.c:297
 #, possible-c-format
 msgid "[Inferior %d exited]\n"
 msgstr ""
 
-#: inferior.c:323
+#: inferior.c:324
 #, possible-c-format
 msgid "[Inferior %d detached]\n"
 msgstr ""
 
-#: inferior.c:597
+#: inferior.c:598
 msgid ""
 "\n"
 "\tis vfork child of inferior "
 msgstr ""
 
-#: inferior.c:602
+#: inferior.c:603
 msgid ""
 "\n"
 "\tis vfork parent of inferior "
 msgstr ""
 
-#: inferior.c:621
+#: inferior.c:622
 msgid "Requires argument (inferior id(s) to detach)"
 msgstr ""
 
-#: inferior.c:630 inferior.c:666 inferior.c:697 inferior.c:770 inferior.c:914
+#: inferior.c:631 inferior.c:667 inferior.c:698 inferior.c:771 inferior.c:915
 #, possible-c-format
 msgid "Inferior ID %d not known."
 msgstr ""
 
-#: inferior.c:639 inferior.c:675
+#: inferior.c:640 inferior.c:676
 #, possible-c-format
 msgid "Inferior ID %d has no threads."
 msgstr ""
 
-#: inferior.c:657
+#: inferior.c:658
 msgid "Requires argument (inferior id(s) to kill)"
 msgstr ""
 
-#: inferior.c:699
+#: inferior.c:700
 #, possible-c-format
 msgid "[Switching to inferior %d [%s] (%s)]\n"
 msgstr ""
 
-#: inferior.c:704
+#: inferior.c:705
 msgid "<noexec>"
 msgstr ""
 
-#: inferior.c:714 mi/mi-main.c:374
+#: inferior.c:715 mi/mi-main.c:372
 msgid "Inferior has no threads."
 msgstr ""
 
-#: inferior.c:719
+#: inferior.c:720
 #, possible-c-format
 msgid "[Switching to thread %d (%s)] "
 msgstr ""
 
-#: inferior.c:760
+#: inferior.c:761
 msgid "Requires an argument (inferior id(s) to remove)"
 msgstr ""
 
-#: inferior.c:776
+#: inferior.c:777
 #, possible-c-format
 msgid "Can not remove current symbol inferior %d."
 msgstr ""
 
-#: inferior.c:782
+#: inferior.c:783
 #, possible-c-format
 msgid "Can not remove active inferior %d."
 msgstr ""
 
-#: inferior.c:832 inferior.c:895
+#: inferior.c:833 inferior.c:896
 msgid "No argument to -copies"
 msgstr ""
 
-#: inferior.c:839
+#: inferior.c:840
 msgid "No argument to -exec"
 msgstr ""
 
-#: inferior.c:844 inferior.c:918
+#: inferior.c:845 inferior.c:919
 msgid "Invalid argument"
 msgstr ""
 
-#: inferior.c:854
+#: inferior.c:855
 #, possible-c-format
 msgid "Added inferior %d\n"
 msgstr ""
 
-#: inferior.c:899
+#: inferior.c:900
 msgid "Invalid copies number"
 msgstr ""
 
-#: inferior.c:945
+#: inferior.c:946
 #, possible-c-format
 msgid "Added inferior %d.\n"
 msgstr ""
 
-#: inferior.c:960
+#: inferior.c:961
 #, possible-c-format
 msgid "Printing of inferior events is %s.\n"
 msgstr ""
 
-#: inferior.c:1078
+#: inferior.c:1079
 msgid "IDs of specified inferiors (all inferiors if no argument)."
 msgstr ""
 
-#: inferior.c:1080
+#: inferior.c:1081
 msgid ""
 "Add a new inferior.\n"
 "Usage: add-inferior [-copies <N>] [-exec <FILENAME>]\n"
@@ -10840,13 +11214,13 @@
 "as main program."
 msgstr ""
 
-#: inferior.c:1087
+#: inferior.c:1088
 msgid ""
 "Remove inferior ID (or list of IDs).\n"
 "Usage: remove-inferiors ID..."
 msgstr ""
 
-#: inferior.c:1091
+#: inferior.c:1092
 msgid ""
 "Clone inferior ID.\n"
 "Usage: clone-inferior [-copies <N>] [ID]\n"
@@ -10856,61 +11230,65 @@
 "that is cloned."
 msgstr ""
 
-#: inferior.c:1099
+#: inferior.c:1100
 msgid "Detach from inferior ID (or list of IDS)."
 msgstr ""
 
-#: inferior.c:1103
+#: inferior.c:1104
 msgid "Kill inferior ID (or list of IDs)."
 msgstr ""
 
-#: inferior.c:1107
+#: inferior.c:1108
 msgid ""
 "Use this command to switch between inferiors.\n"
 "The new inferior ID must be currently known."
 msgstr ""
 
-#: inferior.c:1113
+#: inferior.c:1114
 msgid "Set printing of inferior events (e.g., inferior start and exit)."
 msgstr ""
 
-#: inferior.c:1114
+#: inferior.c:1115
 msgid "Show printing of inferior events (e.g., inferior start and exit)."
 msgstr ""
 
-#: inflow.c:575
+#: inf-loop.c:137
+msgid "Event type not recognized.\n"
+msgstr ""
+
+#: inflow.c:573
 msgid "This GDB does not control a terminal.\n"
 msgstr ""
 
-#: inflow.c:585
+#: inflow.c:583
 msgid "Inferior's terminal status (currently saved by GDB):\n"
 msgstr ""
 
 #. Mention GDB in warning because it will appear in the inferior's
 #. terminal instead of GDB's.
-#: inflow.c:733
+#: inflow.c:731
 #, possible-c-format
 msgid "GDB: Failed to set controlling terminal: %s"
 msgstr ""
 
-#: inflow.c:822
+#: inflow.c:820
 #, possible-c-format
 msgid "Failed to create new terminal session: setsid: %s"
 msgstr ""
 
-#: inflow.c:884
+#: inflow.c:882
 msgid "Print inferior's saved terminal status."
 msgstr ""
 
-#: inflow.c:887
+#: inflow.c:885
 msgid "Set whether GDB's standard input is a terminal."
 msgstr ""
 
-#: inflow.c:888
+#: inflow.c:886
 msgid "Show whether GDB's standard input is a terminal."
 msgstr ""
 
-#: inflow.c:889
+#: inflow.c:887
 msgid ""
 "If on, GDB assumes that standard input is a terminal.  In practice, it\n"
 "means that GDB should wait for the user to answer queries associated to\n"
@@ -10920,60 +11298,78 @@
 "input settings."
 msgstr ""
 
-#: infrun.c:120
+#: inf-ptrace.c:235
+msgid "This system does not support attaching to a process"
+msgstr ""
+
+#: inf-ptrace.c:299
+msgid "This system does not support detaching from a process"
+msgstr ""
+
+#: inf-ptrace.c:406 rs6000-nat.c:548
+#, possible-c-format
+msgid "Child process unexpectedly missing: %s.\n"
+msgstr ""
+
+#: inf-ptrace.c:610 inf-ttrace.c:1243
+#, possible-c-format
+msgid "\tUsing the running image of %s %s.\n"
+msgstr ""
+
+#: infrun.c:117
 #, possible-c-format
 msgid "Mode of the step operation is %s.\n"
 msgstr ""
 
-#: infrun.c:141
+#: infrun.c:138
 #, possible-c-format
 msgid "Displace stepping debugging is %s.\n"
 msgstr ""
 
-#: infrun.c:149
+#: infrun.c:146
 #, possible-c-format
 msgid "Inferior debugging is %s.\n"
 msgstr ""
 
-#: infrun.c:163
+#: infrun.c:160
 #, possible-c-format
 msgid "Disabling randomization of debuggee's virtual address space is %s.\n"
 msgstr ""
 
-#: infrun.c:167
+#: infrun.c:164
 msgid ""
 "Disabling randomization of debuggee's virtual address space is unsupported "
 "on\n"
 "this platform.\n"
 msgstr ""
 
-#: infrun.c:177
+#: infrun.c:174
 msgid ""
 "Disabling randomization of debuggee's virtual address space is unsupported "
 "on\n"
 "this platform."
 msgstr ""
 
-#: infrun.c:252 infrun.c:6932 target.c:4108 target.c:4156
+#: infrun.c:249 infrun.c:7038 target.c:4273 target.c:4321
 msgid "Cannot change this setting while the inferior is running."
 msgstr ""
 
-#: infrun.c:278 infrun.c:308
+#: infrun.c:275 infrun.c:305
 #, possible-c-format
 msgid "Observer mode is now %s.\n"
 msgstr ""
 
-#: infrun.c:286
+#: infrun.c:283
 #, possible-c-format
 msgid "Observer mode is %s.\n"
 msgstr ""
 
-#: infrun.c:360
+#: infrun.c:357
 #, possible-c-format
 msgid "Stopping for shared library events is %s.\n"
 msgstr ""
 
-#: infrun.c:407
+#: infrun.c:404
 #, possible-c-format
 msgid "Debugger response to a program call of fork or vfork is \"%s\".\n"
 msgstr ""
@@ -10984,164 +11380,180 @@
 #. forked.  In that case, the resume command
 #. issued is most likely not applicable to the
 #. child, so just warn, and refuse to resume.
-#: infrun.c:548
+#: infrun.c:545
 msgid "Not resuming: switched threads before following fork child.\n"
 msgstr ""
 
-#: infrun.c:796
+#: infrun.c:793
 #, possible-c-format
 msgid "Follow exec mode is \"%s\".\n"
 msgstr ""
 
 #. What is this a.out's name?
-#: infrun.c:848
+#: infrun.c:845
 #, possible-c-format
 msgid "%s is executing new program: %s\n"
 msgstr ""
 
-#: infrun.c:1207
+#: infrun.c:1204
 #, possible-c-format
 msgid ""
 "Debugger's willingness to use displaced stepping to step over breakpoints is "
 "%s (currently %s).\n"
 msgstr ""
 
-#: infrun.c:1212
+#: infrun.c:1209
 #, possible-c-format
 msgid ""
 "Debugger's willingness to use displaced stepping to step over breakpoints is "
 "%s.\n"
 msgstr ""
 
-#: infrun.c:1590
+#: infrun.c:1594
 #, possible-c-format
 msgid "Mode for locking scheduler during execution is \"%s\".\n"
 msgstr ""
 
-#: infrun.c:1601
+#: infrun.c:1605
 #, possible-c-format
 msgid "Target '%s' cannot support this command."
 msgstr ""
 
-#: infrun.c:1690
+#: infrun.c:1735
 msgid ""
 "The program is stopped at a permanent breakpoint, but GDB does not know\n"
 "how to step past a permanent breakpoint on this architecture.  Try using\n"
 "a command like `return' or `jump' to continue execution."
 msgstr ""
 
-#: infrun.c:2629
+#: infrun.c:2654
 msgid "Program exited while detaching"
 msgstr ""
 
-#: infrun.c:3020
+#: infrun.c:2839
+msgid "completed.\n"
+msgstr ""
+
+#: infrun.c:3031
 msgid "Cannot execute this command while the selected thread is running."
 msgstr ""
 
-#: infrun.c:3840
+#: infrun.c:3966
 msgid "Cannot step over breakpoint hit in wrong thread"
 msgstr ""
 
-#: infrun.c:5725 linux-fork.c:375 linux-fork.c:407
+#: infrun.c:5882 linux-fork.c:374 linux-fork.c:406
 #, possible-c-format
 msgid "[Switching to %s]\n"
 msgstr ""
 
-#: infrun.c:5736
+#: infrun.c:5893
+msgid "No unwaited-for children left.\n"
+msgstr ""
+
+#: infrun.c:5901
 msgid ""
 "Cannot remove breakpoints because program is no longer writable.\n"
 "Further execution is probably impossible.\n"
 msgstr ""
 
-#: infrun.c:5847
+#: infrun.c:6001
 msgid "Unknown value."
 msgstr ""
 
-#: infrun.c:6016
+#: infrun.c:6172
 msgid "Signal        Stop\tPrint\tPass to program\tDescription\n"
 msgstr ""
 
-#: infrun.c:6053
+#: infrun.c:6209
 msgid "signal to handle"
 msgstr ""
 
 #. Not a number and not a recognized flag word => complain.
-#: infrun.c:6156
+#: infrun.c:6312
 #, possible-c-format
 msgid "Unrecognized or ambiguous flag word: \"%s\"."
 msgstr ""
 
-#: infrun.c:6171
+#: infrun.c:6327
 #, possible-c-format
 msgid ""
 "%s is used by the debugger.\n"
 "Are you sure you want to change it? "
 msgstr ""
 
-#: infrun.c:6179
+#: infrun.c:6335
 msgid "Not confirmed, unchanged.\n"
 msgstr ""
 
-#: infrun.c:6226
+#: infrun.c:6382
 msgid "xdb command"
 msgstr ""
 
-#: infrun.c:6277
+#: infrun.c:6433
 msgid "Invalid signal handling flag.\n"
 msgstr ""
 
-#: infrun.c:6324
+#: infrun.c:6480
 msgid ""
 "\n"
 "Use the \"handle\" command to change these tables.\n"
 msgstr ""
 
-#: infrun.c:6354
+#: infrun.c:6492
+msgid "No thread selected."
+msgstr ""
+
+#: infrun.c:6496
+msgid "The current thread has terminated"
+msgstr ""
+
+#: infrun.c:6531
 msgid "Unable to read siginfo"
 msgstr ""
 
-#: infrun.c:6373
+#: infrun.c:6552
 msgid "Unable to write siginfo"
 msgstr ""
 
-#: infrun.c:6601
+#: infrun.c:6780
 msgid "Unable to restore previously selected frame."
 msgstr ""
 
-#: infrun.c:6897
+#: infrun.c:7005
 msgid "Target does not support this operation."
 msgstr ""
 
-#: infrun.c:6907
+#: infrun.c:7015
 msgid "Forward.\n"
 msgstr ""
 
-#: infrun.c:6910
+#: infrun.c:7018
 msgid "Reverse.\n"
 msgstr ""
 
-#: infrun.c:6914
+#: infrun.c:7022
 #, possible-c-format
-msgid "Forward (target `%s' does not support exec-direction).\n"
+msgid "bogus execution_direction value: %d"
 msgstr ""
 
-#: infrun.c:6943
+#: infrun.c:7049
 #, possible-c-format
 msgid "Controlling the inferior in non-stop mode is %s.\n"
 msgstr ""
 
-#: infrun.c:6951
+#: infrun.c:7057
 #, possible-c-format
 msgid "Resuming the execution of threads of all processes is %s.\n"
 msgstr ""
 
-#: infrun.c:6961 infrun.c:6983
+#: infrun.c:7067 infrun.c:7089
 msgid ""
 "What debugger does when program gets various signals.\n"
 "Specify a signal as argument to print info on that signal only."
 msgstr ""
 
-#: infrun.c:6966
+#: infrun.c:7072
 msgid ""
 "Specify how to handle a signal.\n"
 "Args are signals and actions to apply to those signals.\n"
@@ -11159,7 +11571,7 @@
 "Pass and Stop may be combined."
 msgstr ""
 
-#: infrun.c:6986
+#: infrun.c:7092
 msgid ""
 "Specify how to handle a signal.\n"
 "Args are signals and actions to apply to those signals.\n"
@@ -11178,46 +11590,46 @@
 "Pass and Stop may be combined."
 msgstr ""
 
-#: infrun.c:7006
+#: infrun.c:7112
 msgid ""
 "There is no `stop' command, but you can set a hook on `stop'.\n"
 "This allows you to set a list of commands to be run each time execution\n"
 "of the program stops."
 msgstr ""
 
-#: infrun.c:7011
+#: infrun.c:7117
 msgid "Set inferior debugging."
 msgstr ""
 
-#: infrun.c:7012
+#: infrun.c:7118
 msgid "Show inferior debugging."
 msgstr ""
 
-#: infrun.c:7013
+#: infrun.c:7119
 msgid "When non-zero, inferior specific debugging is enabled."
 msgstr ""
 
-#: infrun.c:7020
+#: infrun.c:7126
 msgid "Set displaced stepping debugging."
 msgstr ""
 
-#: infrun.c:7021
+#: infrun.c:7127
 msgid "Show displaced stepping debugging."
 msgstr ""
 
-#: infrun.c:7022
+#: infrun.c:7128
 msgid "When non-zero, displaced stepping specific debugging is enabled."
 msgstr ""
 
-#: infrun.c:7029
+#: infrun.c:7135
 msgid "Set whether gdb controls the inferior in non-stop mode."
 msgstr ""
 
-#: infrun.c:7030
+#: infrun.c:7136
 msgid "Show whether gdb controls the inferior in non-stop mode."
 msgstr ""
 
-#: infrun.c:7031
+#: infrun.c:7137
 msgid ""
 "When debugging a multi-threaded program and this setting is\n"
 "off (the default, also called all-stop mode), when one thread stops\n"
@@ -11232,30 +11644,30 @@
 "leave it stopped or free to run as needed."
 msgstr ""
 
-#: infrun.c:7103
+#: infrun.c:7209
 msgid "Set stopping for shared library events."
 msgstr ""
 
-#: infrun.c:7104
+#: infrun.c:7210
 msgid "Show stopping for shared library events."
 msgstr ""
 
-#: infrun.c:7105
+#: infrun.c:7211
 msgid ""
 "If nonzero, gdb will give control to the user when the dynamic linker\n"
 "notifies gdb of shared library events.  The most common event of interest\n"
 "to the user would be loading/unloading of a new library."
 msgstr ""
 
-#: infrun.c:7115
+#: infrun.c:7221
 msgid "Set debugger response to a program call of fork or vfork."
 msgstr ""
 
-#: infrun.c:7116
+#: infrun.c:7222
 msgid "Show debugger response to a program call of fork or vfork."
 msgstr ""
 
-#: infrun.c:7117
+#: infrun.c:7223
 msgid ""
 "A fork or vfork creates a new process.  follow-fork-mode can be:\n"
 "  parent  - the original process is debugged after a fork\n"
@@ -11264,15 +11676,15 @@
 "By default, the debugger will follow the parent process."
 msgstr ""
 
-#: infrun.c:7129
+#: infrun.c:7235
 msgid "Set debugger response to a program call of exec."
 msgstr ""
 
-#: infrun.c:7130
+#: infrun.c:7236
 msgid "Show debugger response to a program call of exec."
 msgstr ""
 
-#: infrun.c:7131
+#: infrun.c:7237
 msgid ""
 "An exec call replaces the program image of a process.\n"
 "\n"
@@ -11291,15 +11703,15 @@
 "By default, the debugger will use the same inferior."
 msgstr ""
 
-#: infrun.c:7152
+#: infrun.c:7258
 msgid "Set mode for locking scheduler during execution."
 msgstr ""
 
-#: infrun.c:7153
+#: infrun.c:7259
 msgid "Show mode for locking scheduler during execution."
 msgstr ""
 
-#: infrun.c:7154
+#: infrun.c:7260
 msgid ""
 "off  == no locking (threads may preempt at any time)\n"
 "on   == full locking (no thread except the current thread may run)\n"
@@ -11308,15 +11720,15 @@
 "\tOther threads may run while stepping over a function call ('next')."
 msgstr ""
 
-#: infrun.c:7164
+#: infrun.c:7270
 msgid "Set mode for resuming threads of all processes."
 msgstr ""
 
-#: infrun.c:7165
+#: infrun.c:7271
 msgid "Show mode for resuming threads of all processes."
 msgstr ""
 
-#: infrun.c:7166
+#: infrun.c:7272
 msgid ""
 "When on, execution commands (such as 'continue' or 'next') resume all\n"
 "threads of all processes.  When off (which is the default), execution\n"
@@ -11325,30 +11737,30 @@
 "mode (see help set scheduler-locking)."
 msgstr ""
 
-#: infrun.c:7176
+#: infrun.c:7282
 msgid "Set mode of the step operation."
 msgstr ""
 
-#: infrun.c:7177
+#: infrun.c:7283
 msgid "Show mode of the step operation."
 msgstr ""
 
-#: infrun.c:7178
+#: infrun.c:7284
 msgid ""
 "When set, doing a step over a function without debug line information\n"
 "will stop at the first instruction of that function. Otherwise, the\n"
 "function is skipped and the step command stops at a different source line."
 msgstr ""
 
-#: infrun.c:7188
+#: infrun.c:7294
 msgid "Set debugger's willingness to use displaced stepping."
 msgstr ""
 
-#: infrun.c:7189
+#: infrun.c:7295
 msgid "Show debugger's willingness to use displaced stepping."
 msgstr ""
 
-#: infrun.c:7190
+#: infrun.c:7296
 msgid ""
 "If on, gdb will use displaced stepping to step over breakpoints if it is\n"
 "supported by the target architecture.  If off, gdb will not use displaced\n"
@@ -11360,57 +11772,57 @@
 "use it in all-stop mode (see help set non-stop)."
 msgstr ""
 
-#: infrun.c:7202
+#: infrun.c:7308
 msgid ""
 "Set direction of execution.\n"
 "Options are 'forward' or 'reverse'."
 msgstr ""
 
-#: infrun.c:7204
+#: infrun.c:7310
 msgid "Show direction of execution (forward/reverse)."
 msgstr ""
 
-#: infrun.c:7205
+#: infrun.c:7311
 msgid "Tells gdb whether to execute forward or backward."
 msgstr ""
 
 #. Set/show detach-on-fork: user-settable mode.
-#: infrun.c:7211
+#: infrun.c:7317
 msgid "Set whether gdb will detach the child of a fork."
 msgstr ""
 
-#: infrun.c:7212
+#: infrun.c:7318
 msgid "Show whether gdb will detach the child of a fork."
 msgstr ""
 
-#: infrun.c:7213
+#: infrun.c:7319
 msgid "Tells gdb whether to detach the child of a fork."
 msgstr ""
 
-#: infrun.c:7220
+#: infrun.c:7326
 msgid "Set disabling of debuggee's virtual address space randomization."
 msgstr ""
 
-#: infrun.c:7221
+#: infrun.c:7327
 msgid "Show disabling of debuggee's virtual address space randomization."
 msgstr ""
 
-#: infrun.c:7222
+#: infrun.c:7328
 msgid ""
 "When this mode is on (which is the default), randomization of the virtual\n"
 "address space is disabled.  Standalone programs run with the randomization\n"
 "enabled by default on some platforms."
 msgstr ""
 
-#: infrun.c:7248
+#: infrun.c:7352
 msgid "Set whether gdb controls the inferior in observer mode."
 msgstr ""
 
-#: infrun.c:7249
+#: infrun.c:7353
 msgid "Show whether gdb controls the inferior in observer mode."
 msgstr ""
 
-#: infrun.c:7250
+#: infrun.c:7354
 msgid ""
 "In observer mode, GDB can get data from the inferior, but not\n"
 "affect its execution.  Registers and memory may not be changed,\n"
@@ -11418,7 +11830,35 @@
 "or signalled."
 msgstr ""
 
-#: interps.c:158
+#: inf-ttrace.c:464
+#, possible-c-format
+msgid "Attaching after fork to child process %ld.\n"
+msgstr ""
+
+#: inf-ttrace.c:474
+#, possible-c-format
+msgid "Detaching after fork from child process %ld.\n"
+msgstr ""
+
+#: inf-ttrace.c:700
+msgid "TT_PROC_GET_FIRST_LWP_STATE ttrace call failed"
+msgstr ""
+
+#: inf-ttrace.c:721
+msgid "TT_PROC_GET_NEXT_LWP_STATE ttrace call failed"
+msgstr ""
+
+#: inf-ttrace.c:1095 linux-nat.c:1254 procfs.c:3909 procfs.c:4047
+#, possible-c-format
+msgid "[%s exited]\n"
+msgstr ""
+
+#: inf-ttrace.c:1111
+#, possible-c-format
+msgid "[%s has been terminated]\n"
+msgstr ""
+
+#: interps.c:157
 #, possible-c-format
 msgid "Could not suspend interpreter \"%s\"."
 msgstr ""
@@ -11428,30 +11868,30 @@
 msgid "Failed to initialize new interp \"%s\" %s"
 msgstr ""
 
-#: interps.c:376
+#: interps.c:392
 msgid "interpreter-exec command"
 msgstr ""
 
-#: interps.c:386
+#: interps.c:402
 msgid "usage: interpreter-exec <interpreter> [ <command> ... ]"
 msgstr ""
 
-#: interps.c:392
+#: interps.c:408
 #, possible-c-format
 msgid "Could not find interpreter \"%s\"."
 msgstr ""
 
-#: interps.c:399
+#: interps.c:415
 #, possible-c-format
 msgid "Could not switch to interpreter \"%s\"."
 msgstr ""
 
-#: interps.c:410
+#: interps.c:426
 #, possible-c-format
 msgid "error in command: \"%s\"."
 msgstr ""
 
-#: interps.c:491
+#: interps.c:507
 msgid ""
 "Execute a command in an interpreter.  It takes two arguments:\n"
 "The first argument is the name of the interpreter to use.\n"
@@ -11463,236 +11903,305 @@
 msgid "breakpoint_from_pc: invalid breakpoint address 0x%lx"
 msgstr ""
 
-#: jit.c:54
+#: jit.c:68
 #, possible-c-format
 msgid "JIT debugging is %s.\n"
 msgstr ""
 
+#: jit.c:154
+#, possible-c-format
+msgid "Opening shared object %s.\n"
+msgstr ""
+
+#: jit.c:161
+#, possible-c-format
+msgid "Could not locate initialization function: %s."
+msgstr ""
+
+#: jit.c:165
+msgid "Reader not GPL compatible."
+msgstr ""
+
+#: jit.c:169
+msgid "Reader version does not match GDB version."
+msgstr ""
+
+#: jit.c:189
+msgid "No reader name provided."
+msgstr ""
+
 #: jit.c:192
+msgid "JIT reader already loaded.  Run jit-reader-unload first."
+msgstr ""
+
+#: jit.c:207
+msgid "No JIT reader loaded."
+msgstr ""
+
+#: jit.c:305
 msgid "Unable to read JIT descriptor from remote memory!"
 msgstr ""
 
-#: jit.c:225
+#: jit.c:339
 msgid "Unable to read JIT code entry from remote memory!"
 msgstr ""
 
-#: jit.c:271
+#: jit.c:799
+msgid "Error opening JITed symbol file, ignoring it.\n"
+msgstr ""
+
+#: jit.c:807
 msgid "JITed symbol file is not an object file, ignoring it.\n"
 msgstr ""
 
-#: jit.c:280
+#: jit.c:816
 #, possible-c-format
 msgid ""
 "JITed object file architecture %s is not compatible with target architecture "
 "%s."
 msgstr ""
 
-#: jit.c:421
+#: jit.c:966
+#, possible-c-format
+msgid "Could not recognize DWARF regnum %d"
+msgstr ""
+
+#: jit.c:1069
+msgid "Successfully unwound frame using JIT reader.\n"
+msgstr ""
+
+#: jit.c:1074
+msgid "Could not unwind frame using JIT reader.\n"
+msgstr ""
+
+#: jit.c:1217
 msgid "Unsupported JIT protocol version in descriptor!"
 msgstr ""
 
-#: jit.c:531
+#: jit.c:1327
 #, possible-c-format
 msgid "Unable to find JITed code entry at address: %s\n"
 msgstr ""
 
-#: jit.c:539
+#: jit.c:1335
 msgid "Unknown action_flag value in JIT descriptor!"
 msgstr ""
 
-#: jit.c:552
+#: jit.c:1371
 msgid "Set JIT debugging."
 msgstr ""
 
-#: jit.c:553
+#: jit.c:1372
 msgid "Show JIT debugging."
 msgstr ""
 
-#: jit.c:554
+#: jit.c:1373
 msgid "When non-zero, JIT debugging is enabled."
 msgstr ""
 
-#: jv-exp.y:396
+#: jit.c:1388
+msgid ""
+"Load FILE as debug info reader and unwinder for JIT compiled code.\n"
+"Usage: jit-reader-load FILE\n"
+"Try to load file FILE as a debug info reader (and unwinder) for\n"
+"JIT compiled code.  The file is loaded from "
+msgstr ""
+
+#: jit.c:1392
+msgid ""
+",\n"
+"relocated relative to the GDB executable if required."
+msgstr ""
+
+#: jit.c:1394
+msgid ""
+"Unload the currently loaded JIT debug info reader.\n"
+"Usage: jit-reader-unload FILE\n"
+"\n"
+"Do \"help jit-reader-load\" for info on loading debug info readers."
+msgstr ""
+
+#: jv-exp.y:395
 msgid "FIXME - ClassInstanceCreationExpression"
 msgstr ""
 
-#: jv-exp.y:415 jv-exp.y:418
+#: jv-exp.y:414 jv-exp.y:417
 msgid "FIXME - ArrayCreationExpression"
 msgstr ""
 
-#: jv-exp.y:464 jv-exp.y:466
+#: jv-exp.y:463 jv-exp.y:465
 msgid "Form of method invocation not implemented"
 msgstr ""
 
-#: jv-exp.y:555
+#: jv-exp.y:554
 msgid "Invalid cast expression"
 msgstr ""
 
-#: jv-exp.y:795
+#: jv-exp.y:794
 msgid "Numeric constant too large"
 msgstr ""
 
-#: jv-exp.y:905
+#: jv-exp.y:904
 msgid "Empty character constant"
 msgstr ""
 
-#: jv-exp.y:918
+#: jv-exp.y:917
 msgid "Unmatched single quote"
 msgstr ""
 
-#: jv-exp.y:923
+#: jv-exp.y:922
 msgid "Invalid character constant"
 msgstr ""
 
-#: jv-exp.y:1008
+#: jv-exp.y:1007
 #, possible-c-format
 msgid "Invalid number \"%s\""
 msgstr ""
 
-#: jv-exp.y:1080
+#: jv-exp.y:1079
 msgid "Unterminated string in expression"
 msgstr ""
 
 #. We must have come across a bad character (e.g. ';').
-#: jv-exp.y:1092
+#: jv-exp.y:1091
 #, possible-c-format
 msgid "Invalid character '%c' in expression"
 msgstr ""
 
-#: jv-exp.y:1203
+#: jv-exp.y:1202
 #, possible-c-format
 msgid "%s: near `%s'"
 msgstr ""
 
-#: jv-exp.y:1205
+#: jv-exp.y:1204
 #, possible-c-format
 msgid "error in expression, near `%s'"
 msgstr ""
 
-#: jv-exp.y:1214
+#: jv-exp.y:1213
 #, possible-c-format
 msgid "No class named `%s'"
 msgstr ""
 
-#: jv-exp.y:1352
+#: jv-exp.y:1351
 #, possible-c-format
 msgid "unknown type `%.*s'"
 msgstr ""
 
-#: jv-exp.y:1395
+#: jv-exp.y:1394
 msgid "No symbol table is loaded.  Use the \"file\" command"
 msgstr ""
 
-#: jv-exp.y:1397
+#: jv-exp.y:1396
 #, possible-c-format
 msgid "No symbol \"%s\" in current context"
 msgstr ""
 
-#: jv-lang.c:609
+#: jv-lang.c:599
 msgid "cannot find java.lang.Object"
 msgstr ""
 
-#: jv-lang.c:679 jv-lang.c:755
+#: jv-lang.c:663 jv-lang.c:739
 #, possible-c-format
 msgid "unknown signature '%c' for primitive type"
 msgstr ""
 
-#: jv-lang.c:855
+#: jv-lang.c:839
 msgid "not implemented - java_value_string"
 msgstr ""
 
-#: jv-lang.c:968
+#: jv-lang.c:976
 #, possible-c-format
 msgid "array index (%ld) out of bounds (length: %ld)"
 msgstr ""
 
-#: language.c:132
+#: language.c:131
 #, possible-c-format
 msgid "The current source language is \"auto; currently %s\".\n"
 msgstr ""
 
-#: language.c:137
+#: language.c:136
 #, possible-c-format
 msgid "The current source language is \"%s\".\n"
 msgstr ""
 
-#: language.c:217
+#: language.c:216
 #, possible-c-format
 msgid "Type checking is \"auto; currently %s\".\n"
 msgstr ""
 
-#: language.c:221
+#: language.c:220
 #, possible-c-format
 msgid "Type checking is \"%s\".\n"
 msgstr ""
 
-#: language.c:225 language.c:259
+#: language.c:224 language.c:258
 msgid "the current type check setting does not match the language.\n"
 msgstr ""
 
-#: language.c:256
+#: language.c:255
 #, possible-c-format
 msgid "Unrecognized type check setting: \"%s\""
 msgstr ""
 
-#: language.c:290
+#: language.c:289
 #, possible-c-format
 msgid "Range checking is \"auto; currently %s\".\n"
 msgstr ""
 
-#: language.c:294
+#: language.c:293
 #, possible-c-format
 msgid "Range checking is \"%s\".\n"
 msgstr ""
 
-#: language.c:298 language.c:333
+#: language.c:297 language.c:332
 msgid "the current range check setting does not match the language.\n"
 msgstr ""
 
-#: language.c:330
+#: language.c:329
 #, possible-c-format
 msgid "Unrecognized range check setting: \"%s\""
 msgstr ""
 
-#: language.c:361
+#: language.c:360
 #, possible-c-format
 msgid "Case sensitivity in name search is \"auto; currently %s\".\n"
 msgstr ""
 
-#: language.c:367
+#: language.c:366
 #, possible-c-format
 msgid "Case sensitivity in name search is \"%s\".\n"
 msgstr ""
 
-#: language.c:371 language.c:404
+#: language.c:370 language.c:403
 msgid "the current case sensitivity setting does not match the language.\n"
 msgstr ""
 
-#: language.c:460
+#: language.c:459
 #, possible-c-format
 msgid "Current language:  %s\n"
 msgstr ""
 
-#: language.c:465
+#: language.c:464
 #, possible-c-format
 msgid "Type checking:     %s\n"
 msgstr ""
 
-#: language.c:467
+#: language.c:466
 #, possible-c-format
 msgid "Range checking:    %s\n"
 msgstr ""
 
-#: language.c:469
+#: language.c:468
 #, possible-c-format
 msgid "Case sensitivity:  %s\n"
 msgstr ""
 
-#: language.c:614 typeprint.c:66
+#: language.c:613 typeprint.c:65
 msgid "Language not supported."
 msgstr ""
 
-#: language.c:941
+#: language.c:940
 msgid ""
 "Set the current source language.\n"
 "The currently understood settings are:\n"
@@ -11700,284 +12209,273 @@
 "local or auto    Automatic setting based on source file\n"
 msgstr ""
 
-#: language.c:969
+#: language.c:968
 msgid "Show the current source language."
 msgstr ""
 
-#: language.c:1067
+#: language.c:1066
 msgid "Getting a string is unsupported in this language."
 msgstr ""
 
-#: language.c:1081
+#: language.c:1080
 msgid "Attempted to parse an expression with unknown language"
 msgstr ""
 
-#: language.c:1088
+#: language.c:1087
 msgid "internal error - unimplemented function unk_lang_emit_char called."
 msgstr ""
 
-#: language.c:1095
+#: language.c:1094
 msgid "internal error - unimplemented function unk_lang_printchar called."
 msgstr ""
 
-#: language.c:1105
+#: language.c:1104
 msgid "internal error - unimplemented function unk_lang_printstr called."
 msgstr ""
 
-#: language.c:1113
+#: language.c:1112
 msgid "internal error - unimplemented function unk_lang_print_type called."
 msgstr ""
 
-#: language.c:1124
+#: language.c:1123
 msgid "internal error - unimplemented function unk_lang_val_print called."
 msgstr ""
 
-#: language.c:1132
+#: language.c:1131
 msgid "internal error - unimplemented function unk_lang_value_print called."
 msgstr ""
 
-#: language.c:1385
+#: language.c:1390
 msgid "Set the status of the type/range checker."
 msgstr ""
 
-#: language.c:1391
+#: language.c:1396
 msgid "Show the status of the type/range checker."
 msgstr ""
 
-#: language.c:1397
+#: language.c:1402
 msgid "Set type checking.  (on/warn/off/auto)"
 msgstr ""
 
-#: language.c:1398
+#: language.c:1403
 msgid "Show type checking.  (on/warn/off/auto)"
 msgstr ""
 
-#: language.c:1405
+#: language.c:1410
 msgid "Set range checking.  (on/warn/off/auto)"
 msgstr ""
 
-#: language.c:1406
+#: language.c:1411
 msgid "Show range checking.  (on/warn/off/auto)"
 msgstr ""
 
-#: language.c:1412
+#: language.c:1417
 msgid "Set case sensitivity in name search.  (on/off/auto)"
 msgstr ""
 
-#: language.c:1413
+#: language.c:1418
 msgid "Show case sensitivity in name search.  (on/off/auto)"
 msgstr ""
 
-#: language.c:1414
+#: language.c:1419
 msgid ""
 "For Fortran the default is off; for other languages the default is on."
 msgstr ""
 
-#: libunwind-frame.c:212
+#: libunwind-frame.c:211
 msgid "Can't get libunwind sp register."
 msgstr ""
 
-#: linespec.c:577
+#: linespec.c:637
 msgid ""
 "[0] cancel\n"
 "[1] all\n"
 msgstr ""
 
-#: linespec.c:589
-#, possible-c-format
-msgid "[%d] %s at ?FILE:%d [No symtab? Probably broken debug info...]\n"
-msgstr ""
-
-#: linespec.c:597
-msgid "?HERE\n"
-msgstr ""
-
-#: linespec.c:621
-msgid "Arguments must be choice numbers."
-msgstr ""
-
-#: linespec.c:626
+#: linespec.c:659
 msgid "canceled"
 msgstr ""
 
-#: linespec.c:649
+#: linespec.c:675
 #, possible-c-format
 msgid "No choice number %d.\n"
 msgstr ""
 
-#: linespec.c:667
+#: linespec.c:687
 #, possible-c-format
 msgid "duplicate request for %d ignored.\n"
 msgstr ""
 
-#: linespec.c:1207 linespec.c:1458
+#. The error message doesn't really matter, because this case
+#. should only hit during breakpoint reset.
+#: linespec.c:1295
+msgid "cannot evaluate expressions while program space is in startup"
+msgstr ""
+
+#: linespec.c:1386 linespec.c:1591
 msgid "malformed template specification in command"
 msgstr ""
 
-#: linespec.c:1314
-#, possible-c-format
-msgid "debugging symbol \"%s\" does not match selector; ignoring"
+#. End if symbol found.
+#. We couldn't find a class, so we're in case 2 above.  We check the
+#. entire name as a symbol instead.  The simplest way to do this is
+#. to just throw an exception and let our caller fall through to
+#. decode_variable.
+#: linespec.c:1726
+msgid "see caller, this text doesn't matter"
 msgstr ""
 
-#: linespec.c:1771
+#: linespec.c:2135
 #, possible-c-format
-msgid "the class `%s' does not have any method instance named %s"
+msgid "No source file named %s."
 msgstr ""
 
-#: linespec.c:1825
+#: linespec.c:2432
 #, possible-c-format
-msgid "No source file named %s."
+msgid "No line %d in the current file."
 msgstr ""
 
-#: linespec.c:1994
+#: linespec.c:2481
 msgid "History values used in line specs must have integer values."
 msgstr ""
 
-#: linespec.c:2019
+#: linespec.c:2509
 msgid "Convenience variables used in line specs must have integer values."
 msgstr ""
 
-#: linespec.c:2110
-#, possible-c-format
-msgid "Function \"%s\" not defined."
-msgstr ""
-
-#. NOT_FOUND_ERROR is not correct but it ensures COPY will be
-#. searched also as a minimal symbol.
-#: linespec.c:2185
+#: linespec.c:2961
 #, possible-c-format
-msgid "\"%s\" is not a function"
+msgid "Function \"%s\" not defined in \"%s\"."
 msgstr ""
 
-#. This can happen if it is compiled with a compiler which doesn't
-#. put out line numbers for variables.
-#. FIXME: Shouldn't we just set .line and .symtab to zero
-#. and return?  For example, "info line foo" could print
-#. the address.
-#: linespec.c:2205
+#: linespec.c:2964
 #, possible-c-format
-msgid "Line number not known for symbol \"%s\""
+msgid "Function \"%s\" not defined."
 msgstr ""
 
-#: linux-fork.c:395 linux-fork.c:540
+#: linux-fork.c:394 linux-fork.c:539
 #, possible-c-format
 msgid "Unable to detach %s"
 msgstr ""
 
-#: linux-fork.c:489
+#: linux-fork.c:488
 msgid "Requires argument (checkpoint id to delete)"
 msgstr ""
 
-#: linux-fork.c:493 linux-fork.c:533
+#: linux-fork.c:492 linux-fork.c:532
 #, possible-c-format
 msgid "No such checkpoint id, %s"
 msgstr ""
 
-#: linux-fork.c:496
+#: linux-fork.c:495
 msgid "Please switch to another checkpoint before deleting the current one"
 msgstr ""
 
-#: linux-fork.c:500
+#: linux-fork.c:499
 #, possible-c-format
 msgid "Unable to kill pid %s"
 msgstr ""
 
-#: linux-fork.c:507
+#: linux-fork.c:506
 #, possible-c-format
 msgid "Killed %s\n"
 msgstr ""
 
-#: linux-fork.c:519
+#: linux-fork.c:518
 #, possible-c-format
 msgid "Unable to wait pid %s"
 msgstr ""
 
-#: linux-fork.c:529
+#: linux-fork.c:528
 msgid "Requires argument (checkpoint id to detach)"
 msgstr ""
 
-#: linux-fork.c:536
+#: linux-fork.c:535
 msgid "Please switch to another checkpoint before detaching the current one"
 msgstr ""
 
-#: linux-fork.c:543
+#: linux-fork.c:542
 #, possible-c-format
 msgid "Detached %s\n"
 msgstr ""
 
-#: linux-fork.c:581
+#: linux-fork.c:580
 msgid " (main process)"
 msgstr ""
 
-#: linux-fork.c:582
+#: linux-fork.c:581
 msgid " at "
 msgstr ""
 
-#: linux-fork.c:587
+#: linux-fork.c:586
 #, possible-c-format
 msgid ", file %s"
 msgstr ""
 
-#: linux-fork.c:589
+#: linux-fork.c:588
 #, possible-c-format
 msgid ", line %d"
 msgstr ""
 
-#: linux-fork.c:604
+#: linux-fork.c:603
 #, possible-c-format
 msgid "No checkpoint number %d.\n"
 msgstr ""
 
-#: linux-fork.c:606
+#: linux-fork.c:605
 msgid "No checkpoints.\n"
 msgstr ""
 
-#: linux-fork.c:639
+#: linux-fork.c:663
+msgid "checkpoint: can't checkpoint multiple threads."
+msgstr ""
+
+#: linux-fork.c:673
 msgid "checkpoint: can't find fork function in inferior."
 msgstr ""
 
 #. Probably can't happen.
-#: linux-fork.c:651
+#: linux-fork.c:685
 msgid "checkpoint: call_function_by_hand returned null."
 msgstr ""
 
-#: linux-fork.c:659
+#: linux-fork.c:693
 #, possible-c-format
 msgid "checkpoint: fork returned pid %ld.\n"
 msgstr ""
 
-#: linux-fork.c:666
+#: linux-fork.c:700
 #, possible-c-format
 msgid "   gdb says parent = %ld.\n"
 msgstr ""
 
-#: linux-fork.c:673
+#: linux-fork.c:707
 msgid "Failed to find new fork"
 msgstr ""
 
-#: linux-fork.c:694
+#: linux-fork.c:728
 #, possible-c-format
 msgid "Switching to %s\n"
 msgstr ""
 
-#: linux-fork.c:707
+#: linux-fork.c:741
 msgid "Requires argument (checkpoint id to restart)"
 msgstr ""
 
-#: linux-fork.c:710
+#: linux-fork.c:744
 #, possible-c-format
 msgid "Not found: checkpoint id %s"
 msgstr ""
 
 #. Checkpoint command: create a fork of the inferior process
 #. and set it aside for later debugging.
-#: linux-fork.c:723
+#: linux-fork.c:757
 msgid "Fork a duplicate process (experimental)."
 msgstr ""
 
 #. Restart command: restore the context of a specified checkpoint
 #. process.
-#: linux-fork.c:729
+#: linux-fork.c:763
 msgid ""
 "restart <n>: restore program context from a checkpoint.\n"
 "Argument 'n' is checkpoint ID, as displayed by 'info checkpoints'."
@@ -11985,63 +12483,58 @@
 
 #. Delete checkpoint command: kill the process and remove it from
 #. the fork list.
-#: linux-fork.c:736
+#: linux-fork.c:770
 msgid "Delete a checkpoint (experimental)."
 msgstr ""
 
 #. Detach checkpoint command: release the process to run independently,
 #. and remove it from the fork list.
-#: linux-fork.c:743
+#: linux-fork.c:777
 msgid "Detach from a checkpoint (experimental)."
 msgstr ""
 
-#: linux-fork.c:751
+#: linux-fork.c:785
 msgid "IDs of currently known checkpoints."
 msgstr ""
 
-#: linux-nat.c:234
+#: linux-nat.c:199
 #, possible-c-format
 msgid "Debugging of GNU/Linux lwp module is %s.\n"
 msgstr ""
 
-#: linux-nat.c:244
-#, possible-c-format
-msgid "Debugging of GNU/Linux async lwp module is %s.\n"
-msgstr ""
-
-#: linux-nat.c:450
+#: linux-nat.c:405
 #, possible-c-format
 msgid "linux_test_for_tracefork: waitpid: unexpected result %d."
 msgstr ""
 
-#: linux-nat.c:452
+#: linux-nat.c:407
 #, possible-c-format
 msgid "linux_test_for_tracefork: waitpid: unexpected status %d."
 msgstr ""
 
-#: linux-nat.c:461 linux-nat.c:513
+#: linux-nat.c:416 linux-nat.c:468
 msgid "linux_test_for_tracefork: failed to kill child"
 msgstr ""
 
-#: linux-nat.c:468
+#: linux-nat.c:423
 msgid "linux_test_for_tracefork: failed to wait for killed child"
 msgstr ""
 
-#: linux-nat.c:471
+#: linux-nat.c:426
 #, possible-c-format
 msgid ""
 "linux_test_for_tracefork: unexpected wait status 0x%x from killed child"
 msgstr ""
 
-#: linux-nat.c:485
+#: linux-nat.c:440
 msgid "linux_test_for_tracefork: failed to resume child"
 msgstr ""
 
-#: linux-nat.c:502
+#: linux-nat.c:457
 msgid "linux_test_for_tracefork: failed to kill second child"
 msgstr ""
 
-#: linux-nat.c:508
+#: linux-nat.c:463
 #, possible-c-format
 msgid ""
 "linux_test_for_tracefork: unexpected result from waitpid (%d, status 0x%x)"
@@ -12052,24 +12545,24 @@
 #. the parent stays blocked.  If we're telling the parent to run
 #. in the foreground, the user will not be able to ctrl-c to get
 #. back the terminal, effectively hanging the debug session.
-#: linux-nat.c:660
+#: linux-nat.c:613
 msgid ""
 "Can not resume the parent process over vfork in the foreground while\n"
 "holding the child stopped.  Try \"set detach-on-fork\" or \"set schedule-"
 "multiple\".\n"
 msgstr ""
 
-#: linux-nat.c:859
+#: linux-nat.c:810
 #, possible-c-format
 msgid "Attaching after process %d vfork to child process %d.\n"
 msgstr ""
 
-#: linux-nat.c:864
+#: linux-nat.c:815
 #, possible-c-format
 msgid "Attaching after process %d fork to child process %d.\n"
 msgstr ""
 
-#: linux-nat.c:1412
+#: linux-nat.c:1336
 #, possible-c-format
 msgid "%s is a cloned process"
 msgstr ""
@@ -12079,322 +12572,344 @@
 #. creation is interrupted; as of Linux kernel 2.6.19, a
 #. bug may place threads in the thread list and then fail
 #. to create them.
-#: linux-nat.c:1474
+#: linux-nat.c:1439
 #, possible-c-format
 msgid "Can't attach %s: %s"
 msgstr ""
 
-#: linux-nat.c:1550
+#: linux-nat.c:1519
 #, possible-c-format
 msgid "Error disabling address space randomization: %s"
 msgstr ""
 
-#: linux-nat.c:1566
+#: linux-nat.c:1535
 #, possible-c-format
 msgid "Error restoring address space randomization: %s"
 msgstr ""
 
-#: linux-nat.c:1603
+#: linux-nat.c:1572
 msgid "Unable to attach: program exited normally."
 msgstr ""
 
-#: linux-nat.c:1605
+#: linux-nat.c:1574
 #, possible-c-format
 msgid "Unable to attach: program exited with code %d."
 msgstr ""
 
-#: linux-nat.c:1616
+#: linux-nat.c:1585
 #, possible-c-format
 msgid "Unable to attach: program terminated with signal %s, %s."
 msgstr ""
 
-#: linux-nat.c:1623
+#: linux-nat.c:1592
 #, possible-c-format
 msgid "unexpected status %d for PID %ld"
 msgstr ""
 
-#: linux-nat.c:1760
+#: linux-nat.c:1729
 #, possible-c-format
 msgid "Can't detach %s: %s"
 msgstr ""
 
-#: linux-nat.c:2192
+#: linux-nat.c:2175
 msgid "waiting for new child"
 msgstr ""
 
-#: linux-nat.c:2195
+#: linux-nat.c:2178
 #, possible-c-format
 msgid "wait returned unexpected PID %d"
 msgstr ""
 
-#: linux-nat.c:2198
+#: linux-nat.c:2181
 #, possible-c-format
 msgid "wait returned unexpected status 0x%x"
 msgstr ""
 
-#: linux-nat.c:2371
+#: linux-nat.c:2383
 #, possible-c-format
 msgid "unknown ptrace event %d"
 msgstr ""
 
-#: linux-nat.c:4178
+#: linux-nat.c:2400 linux-nat.c:4827 linux-nat.c:4907 linux-nat.c:4921
+#: linux-nat.c:5019
+#, possible-c-format
+msgid "unable to open /proc file '%s'"
+msgstr ""
+
+#: linux-nat.c:4393
 #, possible-c-format
 msgid "Could not open %s."
 msgstr ""
 
-#: linux-nat.c:4605 procfs.c:5432
+#: linux-nat.c:4803
+#, possible-c-format
+msgid "Too many parameters: %s"
+msgstr ""
+
+#: linux-nat.c:4806 procfs.c:5435
 msgid "No current process: you must name one."
 msgstr ""
 
-#: linux-nat.c:4609
+#: linux-nat.c:4810
 #, possible-c-format
 msgid "No /proc directory: '%s'"
 msgstr ""
 
-#: linux-nat.c:4611
+#: linux-nat.c:4812
 #, possible-c-format
 msgid "process %ld\n"
 msgstr ""
 
-#: linux-nat.c:4622
+#: linux-nat.c:4823
 #, possible-c-format
 msgid "unable to read '%s'"
 msgstr ""
 
-#: linux-nat.c:4626 linux-nat.c:4706 linux-nat.c:4720 linux-nat.c:4818
-#, possible-c-format
-msgid "unable to open /proc file '%s'"
-msgstr ""
-
-#: linux-nat.c:4635 linux-nat.c:4644
+#: linux-nat.c:4836 linux-nat.c:4845
 #, possible-c-format
 msgid "unable to read link '%s'"
 msgstr ""
 
 #. No output for summary mode.
-#: linux-nat.c:4656 procfs.c:5367
+#: linux-nat.c:4857 procfs.c:5370
 msgid ""
 "Mapped address spaces:\n"
 "\n"
 msgstr ""
 
-#: linux-nat.c:4733
+#: linux-nat.c:4934
 #, possible-c-format
 msgid "Process: %d\n"
 msgstr ""
 
-#: linux-nat.c:4735
+#: linux-nat.c:4936
 #, possible-c-format
 msgid "Exec file: %s\n"
 msgstr ""
 
-#: linux-nat.c:4737
+#: linux-nat.c:4938
 #, possible-c-format
 msgid "State: %c\n"
 msgstr ""
 
-#: linux-nat.c:4739
+#: linux-nat.c:4940
 #, possible-c-format
 msgid "Parent process: %d\n"
 msgstr ""
 
-#: linux-nat.c:4741
+#: linux-nat.c:4942
 #, possible-c-format
 msgid "Process group: %d\n"
 msgstr ""
 
-#: linux-nat.c:4743
+#: linux-nat.c:4944
 #, possible-c-format
 msgid "Session id: %d\n"
 msgstr ""
 
-#: linux-nat.c:4745
+#: linux-nat.c:4946
 #, possible-c-format
 msgid "TTY: %d\n"
 msgstr ""
 
-#: linux-nat.c:4747
+#: linux-nat.c:4948
 #, possible-c-format
 msgid "TTY owner process group: %d\n"
 msgstr ""
 
-#: linux-nat.c:4749
+#: linux-nat.c:4950
 #, possible-c-format
 msgid "Flags: 0x%lx\n"
 msgstr ""
 
-#: linux-nat.c:4751
+#: linux-nat.c:4952
 #, possible-c-format
 msgid "Minor faults (no memory page): %lu\n"
 msgstr ""
 
-#: linux-nat.c:4754
+#: linux-nat.c:4955
 #, possible-c-format
 msgid "Minor faults, children: %lu\n"
 msgstr ""
 
-#: linux-nat.c:4757
+#: linux-nat.c:4958
 #, possible-c-format
 msgid "Major faults (memory page faults): %lu\n"
 msgstr ""
 
-#: linux-nat.c:4760
+#: linux-nat.c:4961
 #, possible-c-format
 msgid "Major faults, children: %lu\n"
 msgstr ""
 
-#: linux-nat.c:4763
+#: linux-nat.c:4964
 #, possible-c-format
 msgid "utime: %ld\n"
 msgstr ""
 
-#: linux-nat.c:4765
+#: linux-nat.c:4966
 #, possible-c-format
 msgid "stime: %ld\n"
 msgstr ""
 
-#: linux-nat.c:4767
+#: linux-nat.c:4968
 #, possible-c-format
 msgid "utime, children: %ld\n"
 msgstr ""
 
-#: linux-nat.c:4769
+#: linux-nat.c:4970
 #, possible-c-format
 msgid "stime, children: %ld\n"
 msgstr ""
 
-#: linux-nat.c:4771
+#: linux-nat.c:4972
 #, possible-c-format
 msgid "jiffies remaining in current time slice: %ld\n"
 msgstr ""
 
-#: linux-nat.c:4774
+#: linux-nat.c:4975
 #, possible-c-format
 msgid "'nice' value: %ld\n"
 msgstr ""
 
-#: linux-nat.c:4776
+#: linux-nat.c:4977
 #, possible-c-format
 msgid "jiffies until next timeout: %lu\n"
 msgstr ""
 
-#: linux-nat.c:4779
+#: linux-nat.c:4980
 #, possible-c-format
 msgid "jiffies until next SIGALRM: %lu\n"
 msgstr ""
 
-#: linux-nat.c:4782
+#: linux-nat.c:4983
 #, possible-c-format
 msgid "start time (jiffies since system boot): %ld\n"
 msgstr ""
 
-#: linux-nat.c:4785
+#: linux-nat.c:4986
 #, possible-c-format
 msgid "Virtual memory size: %lu\n"
 msgstr ""
 
-#: linux-nat.c:4788
+#: linux-nat.c:4989
 #, possible-c-format
 msgid "Resident set size: %lu\n"
 msgstr ""
 
-#: linux-nat.c:4791
+#: linux-nat.c:4992
 #, possible-c-format
 msgid "rlim: %lu\n"
 msgstr ""
 
-#: linux-nat.c:4793
+#: linux-nat.c:4994
 #, possible-c-format
 msgid "Start of text: 0x%lx\n"
 msgstr ""
 
-#: linux-nat.c:4795
+#: linux-nat.c:4996
 #, possible-c-format
 msgid "End of text: 0x%lx\n"
 msgstr ""
 
-#: linux-nat.c:4797
+#: linux-nat.c:4998
 #, possible-c-format
 msgid "Start of stack: 0x%lx\n"
 msgstr ""
 
 #. FIXME arch?
-#: linux-nat.c:4801
+#: linux-nat.c:5002
 #, possible-c-format
 msgid "Kernel stack pointer: 0x%lx\n"
 msgstr ""
 
 #. FIXME arch?
-#: linux-nat.c:4803
+#: linux-nat.c:5004
 #, possible-c-format
 msgid "Kernel instr pointer: 0x%lx\n"
 msgstr ""
 
-#: linux-nat.c:4805
+#: linux-nat.c:5006
 #, possible-c-format
 msgid "Pending signals bitmap: 0x%lx\n"
 msgstr ""
 
-#: linux-nat.c:4807
+#: linux-nat.c:5008
 #, possible-c-format
 msgid "Blocked signals bitmap: 0x%lx\n"
 msgstr ""
 
-#: linux-nat.c:4809
+#: linux-nat.c:5010
 #, possible-c-format
 msgid "Ignored signals bitmap: 0x%lx\n"
 msgstr ""
 
-#: linux-nat.c:4811
+#: linux-nat.c:5012
 #, possible-c-format
 msgid "Catched signals bitmap: 0x%lx\n"
 msgstr ""
 
 #. FIXME arch?
-#: linux-nat.c:4813
+#: linux-nat.c:5014
 #, possible-c-format
 msgid "wchan (system call): 0x%lx\n"
 msgstr ""
 
-#: linux-nat.c:4972 linux-nat.c:4985
+#: linux-nat.c:5237 linux-nat.c:5250
 #, possible-c-format
 msgid "Could not parse signal set: %s"
 msgstr ""
 
-#: linux-nat.c:5019
+#: linux-nat.c:5284
 #, possible-c-format
 msgid "Could not open %s"
 msgstr ""
 
-#: linux-nat.c:5804
+#: linux-nat.c:5883
 msgid ""
 "Show /proc process information about any running process.\n"
-"Specify any process id, or use the program being debugged by default.\n"
-"Specify any of the following keywords for detailed info:\n"
-"  mappings -- list of mapped memory regions.\n"
-"  stat     -- list a bunch of random process info.\n"
-"  status   -- list a different bunch of random process info.\n"
-"  all      -- list all available /proc info."
+"Specify any process id, or use the program being debugged by default."
 msgstr ""
 
-#: linux-nat.c:5814
-msgid "Set debugging of GNU/Linux lwp module."
+#. allow-unknown
+#: linux-nat.c:5889
+msgid "List of mapped memory regions."
 msgstr ""
 
-#: linux-nat.c:5815
-msgid "Show debugging of GNU/Linux lwp module."
+#: linux-nat.c:5893
+msgid "List process info from /proc/PID/stat."
 msgstr ""
 
-#: linux-nat.c:5816 linux-nat.c:5825
-msgid "Enables printf debugging output."
+#: linux-nat.c:5897
+msgid "List process info from /proc/PID/status."
+msgstr ""
+
+#: linux-nat.c:5901
+msgid "List current working directory of the process."
+msgstr ""
+
+#: linux-nat.c:5905
+msgid "List command line arguments of the process."
+msgstr ""
+
+#: linux-nat.c:5909
+msgid "List absolute filename for executable of the process."
+msgstr ""
+
+#: linux-nat.c:5913
+msgid "List all available /proc info."
+msgstr ""
+
+#: linux-nat.c:5918
+msgid "Set debugging of GNU/Linux lwp module."
 msgstr ""
 
-#: linux-nat.c:5823
-msgid "Set debugging of GNU/Linux async lwp module."
+#: linux-nat.c:5919
+msgid "Show debugging of GNU/Linux lwp module."
 msgstr ""
 
-#: linux-nat.c:5824
-msgid "Show debugging of GNU/Linux async lwp module."
+#: linux-nat.c:5920
+msgid "Enables printf debugging output."
 msgstr ""
 
 #: linux-record.c:245
@@ -12453,179 +12968,176 @@
 msgid "Process record and replay target doesn't support syscall number %d\n"
 msgstr ""
 
-#: linux-thread-db.c:86
+#: linux-thread-db.c:97
 #, possible-c-format
 msgid "libthread-db debugging is %s.\n"
 msgstr ""
 
-#: linux-thread-db.c:388
+#: linux-thread-db.c:398
 #, possible-c-format
 msgid "thread_get_info_callback: cannot get thread info: %s"
 msgstr ""
 
-#: linux-thread-db.c:434
+#: linux-thread-db.c:447
 #, possible-c-format
 msgid "Cannot find user-level thread for LWP %ld: %s"
 msgstr ""
 
-#: linux-thread-db.c:493 linux-thread-db.c:1204
+#: linux-thread-db.c:506 linux-thread-db.c:1334
 #, possible-c-format
 msgid "Cannot get thread info: %s"
 msgstr ""
 
-#: linux-thread-db.c:506
+#: linux-thread-db.c:519
 #, possible-c-format
 msgid "Symbol \"%s\" not found in libthread_db: %s"
 msgstr ""
 
-#: linux-thread-db.c:580
+#: linux-thread-db.c:593
 #, possible-c-format
 msgid "Unable to set global thread event mask: %s"
 msgstr ""
 
-#: linux-thread-db.c:594
+#: linux-thread-db.c:607
 #, possible-c-format
 msgid "Unable to get location for thread creation breakpoint: %s"
 msgstr ""
 
-#: linux-thread-db.c:603
+#: linux-thread-db.c:616
 #, possible-c-format
 msgid "Unable to get location for thread death breakpoint: %s"
 msgstr ""
 
-#: linux-thread-db.c:663
+#: linux-thread-db.c:676
 #, possible-c-format
 msgid "Cannot initialize libthread_db: %s"
 msgstr ""
 
-#: linux-thread-db.c:680
+#: linux-thread-db.c:693
 #, possible-c-format
 msgid "td_ta_new failed: %s\n"
 msgstr ""
 
-#: linux-thread-db.c:694
+#: linux-thread-db.c:707
 #, possible-c-format
 msgid "td_ta_new failed: %s"
 msgstr ""
 
-#: linux-thread-db.c:728 sol-thread.c:675
+#: linux-thread-db.c:741 sol-thread.c:674
 msgid "[Thread debugging using libthread_db enabled]\n"
 msgstr ""
 
-#: linux-thread-db.c:738
+#: linux-thread-db.c:751
 #, possible-c-format
 msgid "Using host libthread_db library \"%s\".\n"
 msgstr ""
 
-#: linux-thread-db.c:770
+#: linux-thread-db.c:783
 #, possible-c-format
 msgid "Trying host libthread_db library: %s.\n"
 msgstr ""
 
-#: linux-thread-db.c:776
+#: linux-thread-db.c:789
 #, possible-c-format
 msgid "dlopen failed: %s.\n"
 msgstr ""
 
-#: linux-thread-db.c:790
+#: linux-thread-db.c:803
 #, possible-c-format
 msgid "Host %s resolved to: %s.\n"
 msgstr ""
 
-#: linux-thread-db.c:830 linux-thread-db.c:846
-#, possible-c-format
-msgid "libthread_db_search_path component too long, ignored: %s."
-msgstr ""
-
-#: linux-thread-db.c:907
+#: linux-thread-db.c:831
 #, possible-c-format
 msgid ""
 "Expected absolute pathname for libpthread in the inferior, but got %s."
 msgstr ""
 
-#: linux-thread-db.c:912
+#: linux-thread-db.c:966
 #, possible-c-format
-msgid "Unexpected: path to libpthread in the inferior is too long: %s"
+msgid "thread_db_load_search returning %d\n"
 msgstr ""
 
-#: linux-thread-db.c:921
+#: linux-thread-db.c:1013
 msgid ""
 "Unable to find libthread_db matching inferior's thread library, thread "
 "debugging will not be available."
 msgstr ""
 
-#: linux-thread-db.c:1080
+#: linux-thread-db.c:1210
 #, possible-c-format
 msgid "Cannot enable thread event reporting for %s: %s"
 msgstr ""
 
-#: linux-thread-db.c:1198
+#: linux-thread-db.c:1328
 #, possible-c-format
 msgid "Cannot get thread event message: %s"
 msgstr ""
 
-#: linux-thread-db.c:1220
+#: linux-thread-db.c:1350
 msgid "Spurious thread death event."
 msgstr ""
 
-#: linux-thread-db.c:1227
+#: linux-thread-db.c:1357
 msgid "Spurious thread event."
 msgstr ""
 
-#: linux-thread-db.c:1332
+#: linux-thread-db.c:1462
 #, possible-c-format
 msgid "find_new_threads_callback: cannot get thread info: %s"
 msgstr ""
 
-#: linux-thread-db.c:1352
+#: linux-thread-db.c:1484
 #, possible-c-format
 msgid "Cannot enable thread event reporting for LWP %d: %s"
 msgstr ""
 
-#: linux-thread-db.c:1420
+#: linux-thread-db.c:1553
 #, possible-c-format
 msgid "Found %d new threads in iteration %d.\n"
 msgstr ""
 
-#: linux-thread-db.c:1476
+#: linux-thread-db.c:1595
 #, possible-c-format
 msgid "Cannot find new threads: %s"
 msgstr ""
 
-#: linux-thread-db.c:1580
+#: linux-thread-db.c:1711
 msgid "No TLS library support"
 msgstr ""
 
-#: linux-thread-db.c:1600
+#: linux-thread-db.c:1731
 msgid "TLS not allocated yet"
 msgstr ""
 
-#: linux-thread-db.c:1621
+#: linux-thread-db.c:1752
 msgid "TLS not supported on this target"
 msgstr ""
 
-#: linux-thread-db.c:1715
+#: linux-thread-db.c:1846
 msgid "Set search path for libthread_db."
 msgstr ""
 
-#: linux-thread-db.c:1716
+#: linux-thread-db.c:1847
 msgid "Show the current search path or libthread_db."
 msgstr ""
 
-#: linux-thread-db.c:1717
+#: linux-thread-db.c:1848
 msgid ""
-"This path is used to search for libthread_db to be loaded into gdb itself."
+"This path is used to search for libthread_db to be loaded into gdb itself.\n"
+"Its value is a colon (':') separate list of directories to search.\n"
+"Setting the search path to an empty list resets it to its default value."
 msgstr ""
 
-#: linux-thread-db.c:1725
+#: linux-thread-db.c:1858
 msgid "Set libthread-db debugging."
 msgstr ""
 
-#: linux-thread-db.c:1726
+#: linux-thread-db.c:1859
 msgid "Show libthread-db debugging."
 msgstr ""
 
-#: linux-thread-db.c:1727
+#: linux-thread-db.c:1860
 msgid "When non-zero, libthread-db debugging is enabled."
 msgstr ""
 
@@ -12687,38 +13199,38 @@
 msgid "unbounded structure missing _m2_contents field"
 msgstr ""
 
-#: m2-typeprint.c:118
+#: m2-typeprint.c:117
 msgid "method"
 msgstr ""
 
 #. i18n: Do not translate the "struct" part!
-#: m2-typeprint.c:138
+#: m2-typeprint.c:137
 msgid "undef"
 msgstr ""
 
-#: m2-typeprint.c:142
+#: m2-typeprint.c:141
 msgid "error"
 msgstr ""
 
-#: m2-typeprint.c:264
+#: m2-typeprint.c:263
 msgid "is unknown"
 msgstr ""
 
-#: m2-typeprint.c:417
+#: m2-typeprint.c:416
 msgid "long_set failed to find discrete bounds for its subtype"
 msgstr ""
 
-#: m2-typeprint.c:420 m2-valprint.c:86
+#: m2-typeprint.c:419 m2-valprint.c:86
 msgid "expecting long_set"
 msgstr ""
 
 #. i18n: Do not translate the "SET OF" part!
-#: m2-typeprint.c:472
+#: m2-typeprint.c:471
 msgid "SET OF <unknown>"
 msgstr ""
 
 #. i18n: Do not translate "CASE" and "OF".
-#: m2-typeprint.c:559
+#: m2-typeprint.c:558
 msgid "CASE <variant> OF\n"
 msgstr ""
 
@@ -12739,26 +13251,26 @@
 msgid "Invalid m2 type code %d in symbol table."
 msgstr ""
 
-#: m32c-tdep.c:2251
+#: m32c-tdep.c:2250
 msgid ""
 "The return value is stored in memory at 'mem0', but GDB cannot find\n"
 "its address."
 msgstr ""
 
-#: m32c-tdep.c:2283
+#: m32c-tdep.c:2282
 msgid ""
 "The return value is stored in memory at 'mem0', but GDB cannot find\n"
 " its address."
 msgstr ""
 
-#: m32c-tdep.c:2464
+#: m32c-tdep.c:2463
 #, possible-c-format
 msgid ""
 "Cannot convert code address %s to function pointer:\n"
 "couldn't find a symbol at that address, to find trampoline."
 msgstr ""
 
-#: m32c-tdep.c:2498
+#: m32c-tdep.c:2497
 #, possible-c-format
 msgid ""
 "Cannot convert code address %s to function pointer:\n"
@@ -12832,198 +13344,253 @@
 msgid "Determine the IP address for M32R-EVA target board."
 msgstr ""
 
-#: m32r-rom.c:618
-msgid "Set IP address for download server (GDB's host computer)."
+#: m32r-rom.c:618
+msgid "Set IP address for download server (GDB's host computer)."
+msgstr ""
+
+#: m32r-rom.c:619
+msgid "Show IP address for download server (GDB's host computer)."
+msgstr ""
+
+#: m32r-rom.c:620
+msgid "Determine the IP address for download server (GDB's host computer)."
+msgstr ""
+
+#: m32r-rom.c:628
+msgid "Upload the srec file via the monitor's Ethernet upload capability."
+msgstr ""
+
+#: m32r-rom.c:631
+msgid "test upload command."
+msgstr ""
+
+#: m68hc11-tdep.c:255
+msgid ""
+"No frame soft register found in the symbol table.\n"
+"Stack backtrace will not work."
+msgstr ""
+
+#: m68hc11-tdep.c:1283
+msgid "return of value > 4 is not supported."
+msgstr ""
+
+#: m68hc11-tdep.c:1321 sh64-tdep.c:1277 sh-tdep.c:1322
+msgid "bad size for return value"
+msgstr ""
+
+#: m68k-tdep.c:179
+#, possible-c-format
+msgid "m68k_register_name: illegal register number %d"
+msgstr ""
+
+#: m68k-tdep.c:1029
+msgid "m68k_get_longjmp_target: not implemented"
+msgstr ""
+
+#: machoread.c:221
+msgid "Unexpected empty N_SO stab"
+msgstr ""
+
+#: machoread.c:240
+#, possible-c-format
+msgid "%s: Unexpected debug stab outside SO markers"
+msgstr ""
+
+#. Unexpected empty N_SO.
+#: machoread.c:257
+msgid "Empty SO section"
 msgstr ""
 
-#: m32r-rom.c:619
-msgid "Show IP address for download server (GDB's host computer)."
+#: machoread.c:268
+msgid "Three SO in a raw"
 msgstr ""
 
-#: m32r-rom.c:620
-msgid "Determine the IP address for download server (GDB's host computer)."
+#: machoread.c:277
+#, possible-c-format
+msgid "stabs debugging not supported for %s"
 msgstr ""
 
-#: m32r-rom.c:628
-msgid "Upload the srec file via the monitor's Ethernet upload capability."
+#: machoread.c:290
+msgid "Unexpected stab after SO"
 msgstr ""
 
-#: m32r-rom.c:631
-msgid "test upload command."
+#: machoread.c:307
+msgid "Missing nul SO"
 msgstr ""
 
-#: m68hc11-tdep.c:256
-msgid ""
-"No frame soft register found in the symbol table.\n"
-"Stack backtrace will not work."
+#: machoread.c:337
+msgid "unhandled stab for dwarf OSO file"
 msgstr ""
 
-#: m68hc11-tdep.c:1284
-msgid "return of value > 4 is not supported."
+#: machoread.c:344
+msgid "non-debugging symbol within SO"
 msgstr ""
 
-#: m68hc11-tdep.c:1322 sh-tdep.c:1324 sh64-tdep.c:1279
-msgid "bad size for return value"
+#: machoread.c:350
+msgid "missing nul SO"
 msgstr ""
 
-#: m68k-tdep.c:181
+#: machoread.c:438
 #, possible-c-format
-msgid "m68k_register_name: illegal register number %d"
+msgid "can't find symbol '%s' in minsymtab"
 msgstr ""
 
-#: m68k-tdep.c:1031
-msgid "m68k_get_longjmp_target: not implemented"
+#: machoread.c:463
+#, possible-c-format
+msgid "Loading debugging symbols from oso: %s\n"
 msgstr ""
 
-#: machoread.c:322
+#: machoread.c:467 symfile.c:1690 symfile.c:1740
 #, possible-c-format
-msgid "Loading symbols from oso: %s\n"
+msgid "`%s': can't read symbols: %s."
 msgstr ""
 
-#: machoread.c:326 symfile.c:1691 symfile.c:1741
+#: machoread.c:475
 #, possible-c-format
-msgid "`%s': can't read symbols: %s."
+msgid "`%s': file time stamp mismatch."
 msgstr ""
 
-#: machoread.c:359
+#: machoread.c:484
 #, possible-c-format
-msgid "resolve sect %s with %s\n"
+msgid "`%s': can't create hash table"
 msgstr ""
 
-#: machoread.c:365 machoread.c:763
+#: machoread.c:533
 #, possible-c-format
-msgid "can't find symbol '%s' in minsymtab"
+msgid "Duplicated symbol %s in symbol table"
 msgstr ""
 
-#: machoread.c:376
+#: machoread.c:540
 #, possible-c-format
-msgid "can't find section '%s' in OSO file %s"
+msgid "Adding symbol %s (addr: %s)\n"
 msgstr ""
 
-#: machoread.c:383
+#: machoread.c:614
 #, possible-c-format
-msgid "  %s: %s\n"
+msgid "resolve sect %s with %s (set to %s)\n"
 msgstr ""
 
-#: machoread.c:457
+#: machoread.c:692
 #, possible-c-format
 msgid "Could not open OSO archive file \"%s\""
 msgstr ""
 
-#: machoread.c:464
+#: machoread.c:699
 #, possible-c-format
 msgid "OSO archive file \"%s\" not an archive."
 msgstr ""
 
-#: machoread.c:474
+#: machoread.c:709
 #, possible-c-format
 msgid "Could not read archive members out of OSO archive \"%s\""
 msgstr ""
 
-#: machoread.c:518
+#: machoread.c:753
 #, possible-c-format
 msgid "Could not find specified archive member for OSO name \"%s\""
 msgstr ""
 
-#: machoread.c:529 symfile.c:1683 symfile.c:1729
+#: machoread.c:764 symfile.c:1682 symfile.c:1728
 #, possible-c-format
 msgid "`%s': can't open to read symbols: %s."
 msgstr ""
 
-#: machoread.c:578 machoread.c:601
+#: machoread.c:808 machoread.c:831
 #, possible-c-format
 msgid "can't find UUID in %s"
 msgstr ""
 
-#: machoread.c:585
+#: machoread.c:815
 #, possible-c-format
 msgid "can't open dsym file %s"
 msgstr ""
 
-#: machoread.c:593
+#: machoread.c:823
 #, possible-c-format
 msgid "bad dsym file format: %s"
 msgstr ""
 
-#: machoread.c:609
+#: machoread.c:839
 #, possible-c-format
 msgid "dsym file UUID doesn't match the one in %s"
 msgstr ""
 
-#: machoread.c:675
+#: machoread.c:907
 msgid "dsym file found\n"
 msgstr ""
 
-#: machoread.c:731
+#: machoread.c:955
 #, possible-c-format
 msgid "Relocate section '%s' of %s\n"
 msgstr ""
 
-#: machoread.c:862
+#: machoread.c:1045
 msgid "Set if printing Mach-O symbols processing."
 msgstr ""
 
-#: machoread.c:863
+#: machoread.c:1046
 msgid "Show if printing Mach-O symbols processing."
 msgstr ""
 
-#: macrocmd.c:63
+#: macrocmd.c:71
 msgid ""
 "You must follow the `macro expand' command with the expression you\n"
 "want to expand."
 msgstr ""
 
-#: macrocmd.c:99
+#: macrocmd.c:105
 msgid ""
 "You must follow the `macro expand-once' command with the expression\n"
 "you want to expand."
 msgstr ""
 
-#: macrocmd.c:146
+#: macrocmd.c:227
+#, possible-c-format
 msgid ""
-"You must follow the `info macro' command with the name of the macro\n"
-"whose definition you want to see."
+"Unrecognized option '%s' to info macro command.  Try \"help info macro\"."
 msgstr ""
 
-#: macrocmd.c:152
-msgid "GDB has no preprocessor macro information for that code."
+#: macrocmd.c:237
+msgid ""
+"You must follow the `info macro' command with the name of the macro\n"
+"whose definition you want to see."
 msgstr ""
 
-#: macrocmd.c:269
+#: macrocmd.c:370
 msgid "usage: macro define NAME[(ARGUMENT-LIST)] [REPLACEMENT-LIST]"
 msgstr ""
 
-#: macrocmd.c:279 macrocmd.c:354
+#: macrocmd.c:380 macrocmd.c:455
 msgid "Invalid macro name."
 msgstr ""
 
-#: macrocmd.c:307
+#: macrocmd.c:408
 msgid "Macro is missing an argument."
 msgstr ""
 
-#: macrocmd.c:313
+#: macrocmd.c:414
 msgid "Two macro arguments with identical names."
 msgstr ""
 
-#: macrocmd.c:323
+#: macrocmd.c:424
 msgid "',' or ')' expected at end of macro arguments."
 msgstr ""
 
-#: macrocmd.c:349
+#: macrocmd.c:450
 msgid "usage: macro undef NAME"
 msgstr ""
 
-#: macrocmd.c:397
+#: macrocmd.c:498
 msgid "Prefix for commands dealing with C preprocessor macros."
 msgstr ""
 
-#: macrocmd.c:400
+#: macrocmd.c:501
 msgid ""
 "Fully expand any C/C++ preprocessor macro invocations in EXPRESSION.\n"
 "Show the expanded expression."
 msgstr ""
 
-#: macrocmd.c:405
+#: macrocmd.c:506
 msgid ""
 "Expand C/C++ preprocessor macro invocations appearing directly in "
 "EXPRESSION.\n"
@@ -13038,11 +13605,24 @@
 "expression work together to yield a pre-processed expression."
 msgstr ""
 
-#: macrocmd.c:420
-msgid "Show the definition of MACRO, and its source location."
+#: macrocmd.c:521
+msgid ""
+"Show the definition of MACRO, and it's source location.\n"
+"Usage: info macro [-a|-all] [--] MACRO\n"
+"Options: \n"
+"  -a, --all    Output all definitions of MACRO in the current compilation "
+"unit.\n"
+"  --           Specify the end of arguments and the beginning of the MACRO."
+msgstr ""
+
+#: macrocmd.c:531
+msgid ""
+"Show the definitions of all macros at LINESPEC, or the current source "
+"location.\n"
+"Usage: info macros [LINESPEC]"
 msgstr ""
 
-#: macrocmd.c:423
+#: macrocmd.c:536
 msgid ""
 "Define a new C/C++ preprocessor macro.\n"
 "The GDB command `macro define DEFINITION' is equivalent to placing a\n"
@@ -13053,152 +13633,152 @@
 "  (gdb) macro define MIN(x,y) ((x) < (y) ? (x) : (y))"
 msgstr ""
 
-#: macrocmd.c:433
+#: macrocmd.c:546
 msgid ""
 "Remove the definition of the C/C++ preprocessor macro with the given name."
 msgstr ""
 
-#: macrocmd.c:438
+#: macrocmd.c:551
 msgid "List all the macros defined using the `macro define' command."
 msgstr ""
 
-#: macroexp.c:236
+#: macroexp.c:235
 msgid "Unterminated comment in macro expansion."
 msgstr ""
 
-#: macroexp.c:348
+#: macroexp.c:347
 msgid "A character constant must contain at least one character."
 msgstr ""
 
-#: macroexp.c:405
+#: macroexp.c:404
 msgid "Newline characters may not appear in string constants."
 msgstr ""
 
-#: macroexp.c:636
+#: macroexp.c:635
 msgid "unable to avoid splicing tokens during macro expansion"
 msgstr ""
 
-#: macroexp.c:812
+#: macroexp.c:811
 #, possible-c-format
 msgid "Malformed argument list for macro `%s'."
 msgstr ""
 
-#: macroexp.c:983
+#: macroexp.c:982
 msgid "Stringification operator requires an argument."
 msgstr ""
 
-#: macroexp.c:988
+#: macroexp.c:987
 msgid "Argument to stringification operator must name a macro parameter."
 msgstr ""
 
-#: macroexp.c:1002
+#: macroexp.c:1001
 msgid "Stray splicing operator"
 msgstr ""
 
-#: macroexp.c:1034
+#: macroexp.c:1033
 msgid "Splicing operator at end of macro"
 msgstr ""
 
-#: macroexp.c:1243
+#: macroexp.c:1242
 #, possible-c-format
 msgid "Wrong number of arguments to macro `%s' (expected %d, got %d)."
 msgstr ""
 
-#: macroexp.c:1277
+#: macroexp.c:1276
 msgid "bad macro definition kind"
 msgstr ""
 
-#: macroexp.c:1409
+#: macroexp.c:1408
 msgid "Expand-once not implemented yet."
 msgstr ""
 
-#: macroscope.c:79
+#: macroscope.c:78
 #, possible-c-format
 msgid ""
 "symtab found for `%s', but that file\n"
 "is not covered in the compilation unit's macro information"
 msgstr ""
 
-#: macrotab.c:474
+#: macrotab.c:473
 #, possible-c-format
 msgid "both `%s' and `%s' allegedly #included at %s:%d"
 msgstr ""
 
-#: macrotab.c:734
+#: macrotab.c:733
 #, possible-c-format
 msgid "macro `%s' redefined at %s:%d; original definition at %s:%d"
 msgstr ""
 
-#: macrotab.c:837
+#: macrotab.c:836
 #, possible-c-format
 msgid "macro '%s' is #undefined twice, at %s:%d and %s:%d"
 msgstr ""
 
-#: macrotab.c:857
+#: macrotab.c:856
 #, possible-c-format
 msgid "no definition for macro `%s' in scope to #undef at %s:%d"
 msgstr ""
 
-#: main.c:338
+#: main.c:345
 #, possible-c-format
 msgid "%s: warning: error finding working directory: %s\n"
 msgstr ""
 
-#: main.c:498
+#: main.c:504
 #, possible-c-format
 msgid "%s: TUI mode is not supported\n"
 msgstr ""
 
-#: main.c:573
+#: main.c:579
 #, possible-c-format
 msgid "%s: unable to load tclcommand file \"%s\""
 msgstr ""
 
-#: main.c:621
+#: main.c:627
 #, possible-c-format
 msgid "warning: could not set baud rate to `%s'.\n"
 msgstr ""
 
-#: main.c:638
+#: main.c:644
 #, possible-c-format
 msgid "warning: could not set timeout limit to `%s'.\n"
 msgstr ""
 
-#: main.c:647
+#: main.c:653
 #, possible-c-format
 msgid "Use `%s --help' for a complete list of options.\n"
 msgstr ""
 
-#: main.c:678
+#: main.c:684
 #, possible-c-format
 msgid "%s: `--args' specified but no program specified\n"
 msgstr ""
 
-#: main.c:715
+#: main.c:721
 #, possible-c-format
 msgid "Excess command line arguments ignored. (%s%s)\n"
 msgstr ""
 
-#: main.c:771
+#: main.c:777
 #, possible-c-format
 msgid "Interpreter `%s' unrecognized"
 msgstr ""
 
-#: main.c:802
+#: main.c:808
 msgid ""
 "\n"
 "warning: "
 msgstr ""
 
-#: main.c:858
+#: main.c:864
 msgid "Can't attach to process and specify a core file at the same time."
 msgstr ""
 
-#: main.c:891
+#: main.c:897
 msgid "warning: "
 msgstr ""
 
-#: main.c:965
+#: main.c:971
 msgid ""
 "This is the GNU debugger.  Usage:\n"
 "\n"
@@ -13209,12 +13789,12 @@
 "\n"
 msgstr ""
 
-#: main.c:971
+#: main.c:977
 msgid ""
 "  --args             Arguments after executable-file are passed to inferior\n"
 msgstr ""
 
-#: main.c:974
+#: main.c:980
 msgid ""
 "  -b BAUDRATE        Set serial port baud rate used for remote debugging.\n"
 "  --batch            Exit after processing options.\n"
@@ -13231,7 +13811,7 @@
 "  --pid=PID          Attach to running process PID.\n"
 msgstr ""
 
-#: main.c:989
+#: main.c:995
 msgid ""
 "  --dbx              DBX compatibility mode.\n"
 "  --directory=DIR    Search for source files in DIR.\n"
@@ -13241,27 +13821,27 @@
 "  --help             Print this message.\n"
 msgstr ""
 
-#: main.c:997
+#: main.c:1003
 msgid ""
 "  --interpreter=INTERP\n"
 "                     Select a specific interpreter / user interface\n"
 msgstr ""
 
-#: main.c:1001
+#: main.c:1007
 msgid ""
 "  -l TIMEOUT         Set timeout in seconds for remote debugging.\n"
 "  --nw\t\t     Do not use a window interface.\n"
 "  --nx               Do not read "
 msgstr ""
 
-#: main.c:1006
+#: main.c:1012
 msgid ""
 " file.\n"
 "  --quiet            Do not print version number on startup.\n"
 "  --readnow          Fully read symbol files on first access.\n"
 msgstr ""
 
-#: main.c:1010
+#: main.c:1016
 msgid ""
 "  --se=FILE          Use FILE as symbol file and executable file.\n"
 "  --symbols=SYMFILE  Read symbols from SYMFILE.\n"
@@ -13269,11 +13849,11 @@
 "debugged.\n"
 msgstr ""
 
-#: main.c:1016
+#: main.c:1022
 msgid "  --tui              Use a terminal user interface.\n"
 msgstr ""
 
-#: main.c:1020
+#: main.c:1026
 msgid ""
 "  --version          Print version information and then exit.\n"
 "  -w                 Use a window interface.\n"
@@ -13281,35 +13861,35 @@
 "  --xdb              XDB compatibility mode.\n"
 msgstr ""
 
-#: main.c:1026
+#: main.c:1032
 msgid ""
 "\n"
 "At startup, GDB reads the following init files and executes their commands:\n"
 msgstr ""
 
-#: main.c:1030
+#: main.c:1036
 #, possible-c-format
 msgid "   * system-wide init file: %s\n"
 msgstr ""
 
-#: main.c:1034
+#: main.c:1040
 #, possible-c-format
 msgid "   * user-specific init file: %s\n"
 msgstr ""
 
-#: main.c:1038
+#: main.c:1044
 #, possible-c-format
 msgid "   * local init file: ./%s\n"
 msgstr ""
 
-#: main.c:1041
+#: main.c:1047
 msgid ""
 "\n"
 "For more information, type \"help\" from within GDB, or consult the\n"
 "GDB manual (available as on-line info or a printed manual).\n"
 msgstr ""
 
-#: main.c:1046
+#: main.c:1052
 #, possible-c-format
 msgid "Report bugs to \"%s\".\n"
 msgstr ""
@@ -13319,126 +13899,126 @@
 msgid "Watchdog timer is %s.\n"
 msgstr ""
 
-#: maint.c:94
+#: maint.c:82
 msgid ""
 "\"maintenance\" must be followed by the name of a maintenance command.\n"
 msgstr ""
 
-#: maint.c:103
+#: maint.c:91
 msgid "Should GDB dump core? "
 msgstr ""
 
-#: maint.c:154
+#: maint.c:142
 msgid "\"maintenance demangle\" takes an argument to demangle.\n"
 msgstr ""
 
-#: maint.c:168
+#: maint.c:156
 #, possible-c-format
 msgid "Can't demangle \"%s\"\n"
 msgstr ""
 
-#: maint.c:177
+#: maint.c:165
 msgid "\"maintenance time\" takes a numeric argument.\n"
 msgstr ""
 
-#: maint.c:198
+#: maint.c:186
 msgid ""
 "\"maintenance info\" must be followed by the name of an info command.\n"
 msgstr ""
 
-#: maint.c:370
+#: maint.c:358
 msgid "Exec file:\n"
 msgstr ""
 
-#: maint.c:388
+#: maint.c:376
 #, possible-c-format
 msgid "  Object file: %s\n"
 msgstr ""
 
-#: maint.c:402
+#: maint.c:390
 msgid "Core file:\n"
 msgstr ""
 
-#: maint.c:430 regcache.c:1281
+#: maint.c:418 regcache.c:1363
 msgid "maintenance print architecture"
 msgstr ""
 
-#: maint.c:444
+#: maint.c:432
 msgid ""
 "\"maintenance print\" must be followed by the name of a print command.\n"
 msgstr ""
 
-#: maint.c:464
+#: maint.c:452
 msgid "requires argument (address or section + address)"
 msgstr ""
 
 #. End of command?
-#: maint.c:474
+#: maint.c:462
 msgid "Need to specify <section-name> and <address>"
 msgstr ""
 
-#: maint.c:486
+#: maint.c:474
 #, possible-c-format
 msgid "Unknown section %s."
 msgstr ""
 
-#: maint.c:515
+#: maint.c:503
 #, possible-c-format
 msgid "%s + %s in section %s of %s\n"
 msgstr ""
 
-#: maint.c:519
+#: maint.c:507
 #, possible-c-format
 msgid "%s + %s in section %s\n"
 msgstr ""
 
-#: maint.c:523
+#: maint.c:511
 #, possible-c-format
 msgid "%s + %s\n"
 msgstr ""
 
-#: maint.c:526
+#: maint.c:514
 #, possible-c-format
 msgid "no symbol at %s:%s\n"
 msgstr ""
 
-#: maint.c:529
+#: maint.c:517
 #, possible-c-format
 msgid "no symbol at %s\n"
 msgstr ""
 
-#: maint.c:544
+#: maint.c:532
 msgid ""
 "\"maintenance deprecate\" takes an argument,\n"
 "the command you want to deprecate, and optionally the replacement command\n"
 "enclosed in quotes.\n"
 msgstr ""
 
-#: maint.c:559
+#: maint.c:547
 msgid ""
 "\"maintenance undeprecate\" takes an argument, \n"
 "the command you want to undeprecate.\n"
 msgstr ""
 
-#: maint.c:591
+#: maint.c:579
 #, possible-c-format
 msgid "Can't find command '%s' to deprecate.\n"
 msgstr ""
 
-#: maint.c:658
+#: maint.c:646
 msgid "\"maintenance set\" must be followed by the name of a set command.\n"
 msgstr ""
 
-#: maint.c:676
+#: maint.c:664
 #, possible-c-format
 msgid "Internal profiling is %s.\n"
 msgstr ""
 
-#: maint.c:738
+#: maint.c:726
 msgid "Profiling support is not available on this system."
 msgstr ""
 
-#: maint.c:745
+#: maint.c:733
 msgid ""
 "Commands for use by GDB maintainers.\n"
 "Includes commands to dump specific internal GDB structures in\n"
@@ -13446,11 +14026,11 @@
 "to test internal functions such as the C++/ObjC demangler, etc."
 msgstr ""
 
-#: maint.c:755
+#: maint.c:743
 msgid "Commands for showing internal info about the program being debugged."
 msgstr ""
 
-#: maint.c:761
+#: maint.c:749
 msgid ""
 "List the BFD sections of the exec and core files. \n"
 "Arguments may be any combination of:\n"
@@ -13463,95 +14043,95 @@
 "lists all sections from all object files, including shared libraries."
 msgstr ""
 
-#: maint.c:774
+#: maint.c:762
 msgid "Maintenance command for printing GDB internal state."
 msgstr ""
 
-#: maint.c:778
+#: maint.c:766
 msgid ""
 "Set GDB internal variables used by the GDB maintainer.\n"
 "Configure variables internal to GDB that aid in GDB's maintenance"
 msgstr ""
 
-#: maint.c:785
+#: maint.c:773
 msgid ""
 "Show GDB internal variables used by the GDB maintainer.\n"
 "Configure variables internal to GDB that aid in GDB's maintenance"
 msgstr ""
 
-#: maint.c:793
+#: maint.c:781
 msgid ""
 "Get fatal error; make debugger dump its core.\n"
 "GDB sets its handling of SIGQUIT back to SIG_DFL and then sends\n"
 "itself a SIGQUIT signal."
 msgstr ""
 
-#: maint.c:801
+#: maint.c:789
 msgid ""
 "Give GDB an internal error.\n"
 "Cause GDB to behave as if an internal error was detected."
 msgstr ""
 
-#: maint.c:807
+#: maint.c:795
 msgid ""
 "Give GDB an internal warning.\n"
 "Cause GDB to behave as if an internal warning was reported."
 msgstr ""
 
-#: maint.c:812
+#: maint.c:800
 msgid ""
 "Demangle a C++/ObjC mangled name.\n"
 "Call internal GDB demangler routine to demangle a C++ link name\n"
 "and prints the result."
 msgstr ""
 
-#: maint.c:818
+#: maint.c:806
 msgid ""
 "Set the display of time usage.\n"
 "If nonzero, will cause the execution time for each command to be\n"
 "displayed, following the command's output."
 msgstr ""
 
-#: maint.c:824
+#: maint.c:812
 msgid ""
 "Set the display of space usage.\n"
 "If nonzero, will cause the execution space for each command to be\n"
 "displayed, following the command's output."
 msgstr ""
 
-#: maint.c:830
+#: maint.c:818
 msgid ""
 "Print a type chain for a given symbol.\n"
 "For each node in a type chain, print the raw data for each member of\n"
 "the type structure, and the interpretation of the data."
 msgstr ""
 
-#: maint.c:836
+#: maint.c:824
 msgid ""
 "Print dump of current symbol definitions.\n"
 "Entries in the full symbol table are dumped to file OUTFILE.\n"
 "If a SOURCE file is specified, dump only that file's symbols."
 msgstr ""
 
-#: maint.c:842
+#: maint.c:830
 msgid ""
 "Print dump of current minimal symbol definitions.\n"
 "Entries in the minimal symbol table are dumped to file OUTFILE.\n"
 "If a SOURCE file is specified, dump only that file's minimal symbols."
 msgstr ""
 
-#: maint.c:848
+#: maint.c:836
 msgid ""
 "Print dump of current partial symbol definitions.\n"
 "Entries in the partial symbol table are dumped to file OUTFILE.\n"
 "If a SOURCE file is specified, dump only that file's partial symbols."
 msgstr ""
 
-#: maint.c:855
+#: maint.c:843
 msgid "Print dump of current object file definitions."
 msgstr ""
 
-#: maint.c:858
+#: maint.c:846
 msgid ""
 "List the full symbol tables for all object files.\n"
 "This does not include information about individual symbols, blocks, or\n"
@@ -13559,32 +14139,32 @@
 "With an argument REGEXP, list the symbol tables whose names that match that."
 msgstr ""
 
-#: maint.c:865
+#: maint.c:853
 msgid ""
 "List the partial symbol tables for all object files.\n"
 "This does not include information about individual partial symbols,\n"
 "just the symbol table structures themselves."
 msgstr ""
 
-#: maint.c:872
+#: maint.c:860
 msgid "Print statistics about internal gdb state."
 msgstr ""
 
-#: maint.c:876
+#: maint.c:864
 msgid ""
 "Print the internal architecture configuration.\n"
 "Takes an optional file parameter."
 msgstr ""
 
-#: maint.c:882
+#: maint.c:870
 msgid "Check consistency of psymtabs and symtabs."
 msgstr ""
 
-#: maint.c:887
+#: maint.c:875
 msgid "Translate a section name and address to a symbol."
 msgstr ""
 
-#: maint.c:890
+#: maint.c:878
 msgid ""
 "Deprecate a command.  Note that this is just in here so the \n"
 "testsuite can check the command deprecator. You probably shouldn't use "
@@ -13594,7 +14174,7 @@
 "replacement is optional."
 msgstr ""
 
-#: maint.c:897
+#: maint.c:885
 msgid ""
 "Undeprecate a command.  Note that this is just in here so the \n"
 "testsuite can check the command deprecator. You probably shouldn't use "
@@ -13602,278 +14182,274 @@
 "If you decide you want to use it: maintenance undeprecate 'commandname'"
 msgstr ""
 
-#: maint.c:903
+#: maint.c:891
 msgid "Set watchdog timer."
 msgstr ""
 
-#: maint.c:904
+#: maint.c:892
 msgid "Show watchdog timer."
 msgstr ""
 
-#: maint.c:905
+#: maint.c:893
 msgid ""
 "When non-zero, this timeout is used instead of waiting forever for a target\n"
 "to finish a low-level step or continue operation.  If the specified amount\n"
 "of time passes without a response from the target, an error occurs."
 msgstr ""
 
-#: maint.c:914
+#: maint.c:902
 msgid "Set internal profiling."
 msgstr ""
 
-#: maint.c:915
+#: maint.c:903
 msgid "Show internal profiling."
 msgstr ""
 
-#: maint.c:916
+#: maint.c:904
 msgid "When enabled GDB is profiled."
 msgstr ""
 
-#: mdebugread.c:127
+#: mdebugread.c:132
 #, possible-c-format
 msgid "bad aux index at symbol %s"
 msgstr ""
 
-#: mdebugread.c:133
+#: mdebugread.c:138
 #, possible-c-format
 msgid "unknown external symbol %s"
 msgstr ""
 
-#: mdebugread.c:139
+#: mdebugread.c:144
 #, possible-c-format
 msgid "cannot map ECOFF basic type 0x%x for %s"
 msgstr ""
 
-#: mdebugread.c:147
+#: mdebugread.c:152
 #, possible-c-format
 msgid "guessed tag type of %s incorrectly"
 msgstr ""
 
-#: mdebugread.c:153
+#: mdebugread.c:158
 #, possible-c-format
 msgid "bad rfd entry for %s: file %d, index %d"
 msgstr ""
 
-#: mdebugread.c:160
+#: mdebugread.c:165
 #, possible-c-format
 msgid "unexpected type code for %s"
 msgstr ""
 
-#: mdebugread.c:377
+#: mdebugread.c:382
 #, possible-c-format
 msgid ""
 "\n"
 "%s not compiled with -g, debugging support is limited.\n"
 msgstr ""
 
-#: mdebugread.c:380
+#: mdebugread.c:385
 msgid "You should compile with -g2 or -g3 for best debugging support.\n"
 msgstr ""
 
-#: mdebugread.c:725 mdebugread.c:1337
+#: mdebugread.c:730 mdebugread.c:1342
 #, possible-c-format
 msgid "unknown symbol type 0x%x"
 msgstr ""
 
-#: mdebugread.c:942
+#: mdebugread.c:947
 #, possible-c-format
 msgid "declaration block contains unhandled symbol type %d"
 msgstr ""
 
-#: mdebugread.c:1225
+#: mdebugread.c:1230
 #, possible-c-format
 msgid "stEnd with storage class %d not handled"
 msgstr ""
 
-#: mdebugread.c:1602
+#: mdebugread.c:1607
 #, possible-c-format
 msgid "can't handle TIR fBitfield for %s"
 msgstr ""
 
-#: mdebugread.c:1632
+#: mdebugread.c:1637
 #, possible-c-format
 msgid "unable to cross ref btIndirect for %s"
 msgstr ""
 
-#: mdebugread.c:1749
+#: mdebugread.c:1754
 #, possible-c-format
 msgid "unable to cross ref btTypedef for %s"
 msgstr ""
 
-#: mdebugread.c:1796
+#: mdebugread.c:1801
 #, possible-c-format
 msgid "illegal TIR continued for %s"
 msgstr ""
 
-#: mdebugread.c:1859
+#: mdebugread.c:1864
 #, possible-c-format
 msgid "illegal array index type for %s, assuming int"
 msgstr ""
 
-#: mdebugread.c:1907
+#: mdebugread.c:1912
 #, possible-c-format
 msgid "unknown type qualifier 0x%x"
 msgstr ""
 
-#: mdebugread.c:1942
+#: mdebugread.c:1947
 #, possible-c-format
 msgid "can't handle PDR for static proc at 0x%lx"
 msgstr ""
 
-#: mdebugread.c:2004
+#: mdebugread.c:2009
 #, possible-c-format
 msgid "PDR for %s, but no symbol"
 msgstr ""
 
-#: mdebugread.c:2129
+#: mdebugread.c:2134
 #, possible-c-format
 msgid "Warning: %s `%s' is undefined (in %s)\n"
 msgstr ""
 
-#: mdebugread.c:2231
+#: mdebugread.c:2236
 #, possible-c-format
 msgid "guessed size of linetable for %s incorrectly"
 msgstr ""
 
-#: mdebugread.c:2509
+#: mdebugread.c:2514
 #, possible-c-format
 msgid "bad ifd for external symbol: %d (max %ld)"
 msgstr ""
 
-#: mdebugread.c:2516
+#: mdebugread.c:2521
 #, possible-c-format
 msgid "bad iss for external symbol: %ld (max %ld)"
 msgstr ""
 
-#: mdebugread.c:3536
+#: mdebugread.c:3541
 #, possible-c-format
 msgid "bad proc end in aux found from symbol %s"
 msgstr ""
 
-#: mdebugread.c:3651
+#: mdebugread.c:3656
 #, possible-c-format
 msgid "bad aux index at block symbol %s"
 msgstr ""
 
 #. Both complaints are valid:  one gives symbol name,
 #. the other the offending symbol type.
-#: mdebugread.c:3671
+#: mdebugread.c:3676
 #, possible-c-format
 msgid "unknown local symbol %s"
 msgstr ""
 
-#: mdebugread.c:3673
+#: mdebugread.c:3678
 #, possible-c-format
 msgid "with type %d"
 msgstr ""
 
-#: mdebugread.c:3836
+#: mdebugread.c:3841
 #, possible-c-format
 msgid "bad file number %ld"
 msgstr ""
 
-#: mdebugread.c:4148
+#: mdebugread.c:4153
 #, possible-c-format
 msgid "unknown stabs symbol %s"
 msgstr ""
 
-#: mdebugread.c:4335
+#: mdebugread.c:4347
 #, possible-c-format
 msgid "File %s contains %d unresolved references:"
 msgstr ""
 
-#: mdebugread.c:4512
+#: mdebugread.c:4524
 #, possible-c-format
 msgid "illegal tq0 in forward typedef for %s"
 msgstr ""
 
-#: mdebugread.c:4550
+#: mdebugread.c:4562
 #, possible-c-format
 msgid "illegal bt %d in forward typedef for %s"
 msgstr ""
 
-#: mdebugread.c:4917
+#: mdebugread.c:4930
 #, possible-c-format
 msgid "Error reading ECOFF debugging information: %s"
 msgstr ""
 
-#: mem-break.c:54 microblaze-linux-tdep.c:53 ppc-linux-tdep.c:211
-msgid "Software breakpoints not implemented for this target."
-msgstr ""
-
-#: memattr.c:78
+#: memattr.c:77
 msgid "Unknown memory addresses will be treated as inaccessible.\n"
 msgstr ""
 
-#: memattr.c:81
+#: memattr.c:80
 msgid "Unknown memory addresses will be treated as RAM.\n"
 msgstr ""
 
-#: memattr.c:148
+#: memattr.c:147
 msgid ""
 "Switching to manual control of memory regions; use \"mem auto\" to fetch "
 "regions from the target again."
 msgstr ""
 
-#: memattr.c:184
+#: memattr.c:183
 msgid "invalid memory region: low >= high\n"
 msgstr ""
 
-#: memattr.c:213
+#: memattr.c:212
 msgid "overlapping memory region\n"
 msgstr ""
 
-#: memattr.c:324
+#: memattr.c:323
 msgid "No mem"
 msgstr ""
 
-#: memattr.c:346
+#: memattr.c:345
 msgid "no lo address"
 msgstr ""
 
-#: memattr.c:351
+#: memattr.c:350
 msgid "no hi address"
 msgstr ""
 
-#: memattr.c:369
+#: memattr.c:368
 msgid "region bounds not 16 bit aligned"
 msgstr ""
 
-#: memattr.c:375
+#: memattr.c:374
 msgid "region bounds not 32 bit aligned"
 msgstr ""
 
-#: memattr.c:381
+#: memattr.c:380
 msgid "region bounds not 64 bit aligned"
 msgstr ""
 
-#: memattr.c:405
+#: memattr.c:404
 #, possible-c-format
 msgid "unknown attribute: %s"
 msgstr ""
 
-#: memattr.c:420
+#: memattr.c:419
 msgid "Using memory regions provided by the target.\n"
 msgstr ""
 
-#: memattr.c:422
+#: memattr.c:421
 msgid "Using user-defined memory regions.\n"
 msgstr ""
 
-#: memattr.c:428
+#: memattr.c:427
 msgid "There are no memory regions defined.\n"
 msgstr ""
 
-#: memattr.c:561 memattr.c:608 memattr.c:650 memattr.c:660
+#: memattr.c:560 memattr.c:607 memattr.c:649 memattr.c:659
 #, possible-c-format
 msgid "No memory region number %d.\n"
 msgstr ""
 
-#: memattr.c:679
+#: memattr.c:678
 msgid "Delete all memory regions? "
 msgstr ""
 
-#: memattr.c:708
+#: memattr.c:707
 msgid ""
 "Define attributes for memory region or reset memory region handling to\n"
 "target-based.\n"
@@ -13884,7 +14460,7 @@
 "      <cache> may be cache or nocache"
 msgstr ""
 
-#: memattr.c:717
+#: memattr.c:716
 msgid ""
 "Enable memory region.\n"
 "Arguments are the code numbers of the memory regions to enable.\n"
@@ -13892,7 +14468,7 @@
 "Do \"info mem\" to see current list of code numbers."
 msgstr ""
 
-#: memattr.c:723
+#: memattr.c:722
 msgid ""
 "Disable memory region.\n"
 "Arguments are the code numbers of the memory regions to disable.\n"
@@ -13900,7 +14476,7 @@
 "Do \"info mem\" to see current list of code numbers."
 msgstr ""
 
-#: memattr.c:729
+#: memattr.c:728
 msgid ""
 "Delete memory region.\n"
 "Arguments are the code numbers of the memory regions to delete.\n"
@@ -13908,198 +14484,223 @@
 "Do \"info mem\" to see current list of code numbers."
 msgstr ""
 
-#: memattr.c:736
+#: memattr.c:735
 msgid "Memory region attributes"
 msgstr ""
 
 #. allow-unknown
-#: memattr.c:738 memattr.c:742
+#: memattr.c:737 memattr.c:741
 msgid "Memory regions settings"
 msgstr ""
 
-#: memattr.c:748
+#: memattr.c:747
 msgid "Set handling of unknown memory regions."
 msgstr ""
 
-#: memattr.c:749
+#: memattr.c:748
 msgid "Show handling of unknown memory regions."
 msgstr ""
 
-#: memattr.c:750
+#: memattr.c:749
 msgid ""
 "If on, and some memory map is defined, debugger will emit errors on\n"
 "accesses to memory not defined in the memory map. If off, accesses to all\n"
 "memory addresses will be allowed."
 msgstr ""
 
-#: memory-map.c:38
+#: mem-break.c:54 microblaze-linux-tdep.c:53 ppc-linux-tdep.c:210
+msgid "Software breakpoints not implemented for this target."
+msgstr ""
+
+#: memory-map.c:37
 msgid ""
 "Can not parse XML memory map; XML support was disabled at compile time"
 msgstr ""
 
-#: memory-map.c:90
+#: memory-map.c:89
 msgid "Flash block size is not set"
 msgstr ""
 
-#: memory-map.c:125
+#: memory-map.c:124
 #, possible-c-format
 msgid "Unknown property \"%s\""
 msgstr ""
 
-#: memory-map.c:187
+#: memory-map.c:186
 msgid "target memory map"
 msgstr ""
 
 #. Return values larger than a single register are returned in
 #. memory, pointed to by R0.  Unfortunately, we can't count on R0
 #. pointing to the return buffer, so we raise an error here.
-#: mep-tdep.c:2191 mep-tdep.c:2218
+#: mep-tdep.c:2190 mep-tdep.c:2217
 msgid ""
 "GDB cannot set return values larger than four bytes; the Media Processor's\n"
 "calling conventions do not provide enough information to do this.\n"
 "Try using the 'return' command with no argument."
 msgstr ""
 
-#: mep-tdep.c:2434
+#: mep-tdep.c:2433
 #, possible-c-format
 msgid ""
 "the MeP module '%s' is %s-endian, but the executable\n"
 "%s is %s-endian."
 msgstr ""
 
-#: mep-tdep.c:2439
+#: mep-tdep.c:2438
 #, possible-c-format
 msgid ""
 "the selected MeP module is %s-endian, but the executable\n"
 "%s is %s-endian."
 msgstr ""
 
-#. mi_error_message = xstrprintf ("-var-create: Usage:
-#. ...."); return MI_CMD_ERROR;
-#: mi/mi-cmd-var.c:113
-msgid "-var-create: Usage: NAME FRAME EXPRESSION."
+#: mi/mi-cmd-break.c:140
+msgid "-break-insert: Missing <location>"
 msgstr ""
 
-#: mi/mi-cmd-var.c:133
-msgid "-var-create: name of object must begin with a letter"
+#: mi/mi-cmd-break.c:142
+msgid "-break-insert: Garbage following <location>"
 msgstr ""
 
-#: mi/mi-cmd-var.c:153
-msgid "-var-create: unable to create variable object"
+#: mi/mi-cmd-break.c:191
+msgid "Usage: tracepoint-number passcount"
 msgstr ""
 
-#: mi/mi-cmd-var.c:172
-msgid "-var-delete: Usage: [-c] EXPRESSION."
+#: mi/mi-cmd-break.c:204
+#, possible-c-format
+msgid "Could not find tracepoint %d"
 msgstr ""
 
-#: mi/mi-cmd-var.c:184
-msgid ""
-"-var-delete: Missing required argument after '-c': variable object name"
+#: mi/mi-cmd-break.c:252
+msgid "-break-watch: Missing <expression>"
 msgstr ""
 
-#: mi/mi-cmd-var.c:187
-msgid "-var-delete: Illegal variable object name"
+#: mi/mi-cmd-break.c:254
+msgid "-break-watch: Garbage following <expression>"
 msgstr ""
 
-#: mi/mi-cmd-var.c:195
-msgid "-var-delete: Invalid option."
+#: mi/mi-cmd-break.c:270
+msgid "-break-watch: Unknown watchpoint type."
 msgstr ""
 
-#: mi/mi-cmd-var.c:237
-msgid ""
-"Must specify the format as: \"natural\", \"binary\", \"decimal\", "
-"\"hexadecimal\", or \"octal\""
+#: mi/mi-cmd-break.c:301
+#, possible-c-format
+msgid "USAGE: %s <BKPT> [<COMMAND> [<COMMAND>...]]"
 msgstr ""
 
-#: mi/mi-cmd-var.c:249
-msgid "-var-set-format: Usage: NAME FORMAT."
+#: mi/mi-cmd-break.c:305
+#, possible-c-format
+msgid "breakpoint number argument \"%s\" is not a number."
 msgstr ""
 
-#: mi/mi-cmd-var.c:274
-msgid "Usage: NAME VISUALIZER_FUNCTION."
+#: mi/mi-cmd-break.c:308
+#, possible-c-format
+msgid "junk at the end of breakpoint number argument \"%s\"."
 msgstr ""
 
-#: mi/mi-cmd-var.c:279 varobj.c:704
-msgid "Variable object not found"
+#: mi/mi-cmd-break.c:313
+#, possible-c-format
+msgid "breakpoint %d not found."
 msgstr ""
 
-#: mi/mi-cmd-var.c:291
-msgid "-var-set-format: Usage: NAME FROZEN_FLAG."
+#: mi/mi-cmd-disas.c:136
+msgid ""
+"-data-disassemble: Usage: ( [-f filename -l linenum [-n howmany]] | [-s "
+"startaddr -e endaddr]) [--] mode."
 msgstr ""
 
-#: mi/mi-cmd-var.c:300
-msgid "Invalid flag value"
+#: mi/mi-cmd-disas.c:140
+msgid ""
+"-data-disassemble: Usage: [-f filename -l linenum [-n howmany]] [-s "
+"startaddr -e endaddr] [--] mode."
 msgstr ""
 
-#: mi/mi-cmd-var.c:317
-msgid "-var-show-format: Usage: NAME."
+#: mi/mi-cmd-disas.c:145
+msgid "-data-disassemble: Mode argument must be 0, 1, 2, or 3."
 msgstr ""
 
-#: mi/mi-cmd-var.c:334
-msgid "-var-info-num-children: Usage: NAME."
+#: mi/mi-cmd-disas.c:162
+msgid "-data-disassemble: Invalid filename."
+msgstr ""
+
+#: mi/mi-cmd-disas.c:164
+msgid "-data-disassemble: Invalid line number"
+msgstr ""
+
+#: mi/mi-cmd-disas.c:166
+msgid "-data-disassemble: No function contains specified address"
+msgstr ""
+
+#: mi/mi-cmd-env.c:74
+msgid "-environment-pwd: No arguments required"
 msgstr ""
 
-#: mi/mi-cmd-var.c:357
+#: mi/mi-cmd-env.c:85
 #, possible-c-format
-msgid ""
-"Unknown value for PRINT_VALUES\n"
-"Must be: 0 or \"%s\", 1 or \"%s\", 2 or \"%s\""
+msgid "-environment-pwd: error finding name of working directory: %s"
 msgstr ""
 
-#: mi/mi-cmd-var.c:406
-msgid "-var-list-children: Usage: [PRINT_VALUES] NAME [FROM TO]"
+#: mi/mi-cmd-env.c:96
+msgid "-environment-cd: Usage DIRECTORY"
 msgstr ""
 
-#: mi/mi-cmd-var.c:472
-msgid "-var-info-type: Usage: NAME."
+#: mi/mi-cmd-env.c:260
+msgid "-inferior-tty-show: Usage: No args"
 msgstr ""
 
-#: mi/mi-cmd-var.c:487
-msgid "Usage: NAME."
+#: mi/mi-cmd-file.c:39
+msgid "-file-list-exec-source-file: Usage: No args"
 msgstr ""
 
-#: mi/mi-cmd-var.c:504
-msgid "-var-info-expression: Usage: NAME."
+#: mi/mi-cmd-file.c:49
+msgid "-file-list-exec-source-file: No symtab"
 msgstr ""
 
-#: mi/mi-cmd-var.c:523
-msgid "-var-show-attributes: Usage: NAME."
+#: mi/mi-cmd-file.c:90
+msgid "-file-list-exec-source-files: Usage: No args"
 msgstr ""
 
-#: mi/mi-cmd-var.c:573
-msgid "Cannot specify format more than once"
+#: mi/mi-cmd-stack.c:57
+msgid "-stack-list-frames: Usage: [FRAME_LOW FRAME_HIGH]"
 msgstr ""
 
-#: mi/mi-cmd-var.c:582
-msgid "Usage: [-f FORMAT] NAME"
+#: mi/mi-cmd-stack.c:80
+msgid "-stack-list-frames: Not enough frames in stack."
 msgstr ""
 
-#: mi/mi-cmd-var.c:585
-msgid "Garbage at end of command"
+#: mi/mi-cmd-stack.c:107
+msgid "-stack-info-depth: Usage: [MAX_DEPTH]"
 msgstr ""
 
-#: mi/mi-cmd-var.c:613
-msgid "-var-assign: Usage: NAME EXPRESSION."
+#: mi/mi-cmd-stack.c:137
+#, possible-c-format
+msgid ""
+"Unknown value for PRINT_VALUES: must be: 0 or \"%s\", 1 or \"%s\", 2 or "
+"\"%s\""
 msgstr ""
 
-#: mi/mi-cmd-var.c:619
-msgid "-var-assign: Variable object is not editable"
+#: mi/mi-cmd-stack.c:151
+msgid "-stack-list-locals: Usage: PRINT_VALUES"
 msgstr ""
 
-#: mi/mi-cmd-var.c:624
-msgid "-var-assign: Could not assign expression to variable object"
+#: mi/mi-cmd-stack.c:173
+msgid "-stack-list-arguments: Usage: PRINT_VALUES [FRAME_LOW FRAME_HIGH]"
 msgstr ""
 
-#: mi/mi-cmd-var.c:675
-msgid "-var-update: Usage: [PRINT_VALUES] NAME."
+#: mi/mi-cmd-stack.c:199
+msgid "-stack-list-arguments: Not enough frames in stack."
 msgstr ""
 
-#: mi/mi-cmd-var.c:822
-msgid "-enable-pretty-printing: no arguments allowed"
+#: mi/mi-cmd-stack.c:232
+msgid "Usage: PRINT_VALUES"
 msgstr ""
 
-#: mi/mi-cmd-var.c:833
-msgid "-var-set-update-range: Usage: VAROBJ FROM TO"
+#: mi/mi-cmd-stack.c:440
+msgid "-stack-select-frame: Usage: FRAME_SPEC"
+msgstr ""
+
+#: mi/mi-cmd-stack.c:449
+msgid "-stack-info-frame: No arguments required"
 msgstr ""
 
 #: mi/mi-cmd-target.c:40
@@ -14114,512 +14715,482 @@
 msgid "-target-file-delete: Usage: REMOTE_FILE"
 msgstr ""
 
-#: mi/mi-cmd-stack.c:56
-msgid "-stack-list-frames: Usage: [FRAME_LOW FRAME_HIGH]"
+#. mi_error_message = xstrprintf ("-var-create: Usage:
+#. ...."); return MI_CMD_ERROR;
+#: mi/mi-cmd-var.c:115
+msgid "-var-create: Usage: NAME FRAME EXPRESSION."
 msgstr ""
 
-#: mi/mi-cmd-stack.c:79
-msgid "-stack-list-frames: Not enough frames in stack."
+#: mi/mi-cmd-var.c:135
+msgid "-var-create: name of object must begin with a letter"
 msgstr ""
 
-#: mi/mi-cmd-stack.c:106
-msgid "-stack-info-depth: Usage: [MAX_DEPTH]"
+#: mi/mi-cmd-var.c:155
+msgid "-var-create: unable to create variable object"
 msgstr ""
 
-#: mi/mi-cmd-stack.c:136
-#, possible-c-format
+#: mi/mi-cmd-var.c:175
+msgid "-var-delete: Usage: [-c] EXPRESSION."
+msgstr ""
+
+#: mi/mi-cmd-var.c:187
 msgid ""
-"Unknown value for PRINT_VALUES: must be: 0 or \"%s\", 1 or \"%s\", 2 or "
-"\"%s\""
+"-var-delete: Missing required argument after '-c': variable object name"
 msgstr ""
 
-#: mi/mi-cmd-stack.c:150
-msgid "-stack-list-locals: Usage: PRINT_VALUES"
+#: mi/mi-cmd-var.c:190
+msgid "-var-delete: Illegal variable object name"
 msgstr ""
 
-#: mi/mi-cmd-stack.c:171
-msgid "-stack-list-arguments: Usage: PRINT_VALUES [FRAME_LOW FRAME_HIGH]"
+#: mi/mi-cmd-var.c:198
+msgid "-var-delete: Invalid option."
 msgstr ""
 
-#: mi/mi-cmd-stack.c:197
-msgid "-stack-list-arguments: Not enough frames in stack."
+#: mi/mi-cmd-var.c:240
+msgid ""
+"Must specify the format as: \"natural\", \"binary\", \"decimal\", "
+"\"hexadecimal\", or \"octal\""
 msgstr ""
 
-#: mi/mi-cmd-stack.c:230
-msgid "Usage: PRINT_VALUES"
+#: mi/mi-cmd-var.c:253
+msgid "-var-set-format: Usage: NAME FORMAT."
 msgstr ""
 
-#: mi/mi-cmd-stack.c:354 mi/mi-cmd-stack.c:377 python/py-prettyprint.c:293
-#, possible-c-format
-msgid "<error reading variable: %s>"
+#: mi/mi-cmd-var.c:278
+msgid "Usage: NAME VISUALIZER_FUNCTION."
 msgstr ""
 
-#: mi/mi-cmd-stack.c:402
-msgid "-stack-select-frame: Usage: FRAME_SPEC"
+#: mi/mi-cmd-var.c:283 varobj.c:734
+msgid "Variable object not found"
 msgstr ""
 
-#: mi/mi-cmd-stack.c:411
-msgid "-stack-info-frame: No arguments required"
+#: mi/mi-cmd-var.c:295
+msgid "-var-set-format: Usage: NAME FROZEN_FLAG."
 msgstr ""
 
-#: mi/mi-cmd-disas.c:136
-msgid ""
-"-data-disassemble: Usage: ( [-f filename -l linenum [-n howmany]] | [-s "
-"startaddr -e endaddr]) [--] mode."
+#: mi/mi-cmd-var.c:304
+msgid "Invalid flag value"
 msgstr ""
 
-#: mi/mi-cmd-disas.c:140
+#: mi/mi-cmd-var.c:322
+msgid "-var-show-format: Usage: NAME."
+msgstr ""
+
+#: mi/mi-cmd-var.c:340
+msgid "-var-info-num-children: Usage: NAME."
+msgstr ""
+
+#: mi/mi-cmd-var.c:363
+#, possible-c-format
 msgid ""
-"-data-disassemble: Usage: [-f filename -l linenum [-n howmany]] [-s "
-"startaddr -e endaddr] [--] mode."
+"Unknown value for PRINT_VALUES\n"
+"Must be: 0 or \"%s\", 1 or \"%s\", 2 or \"%s\""
 msgstr ""
 
-#: mi/mi-cmd-disas.c:145
-msgid "-data-disassemble: Mode argument must be 0, 1, 2, or 3."
+#: mi/mi-cmd-var.c:413
+msgid "-var-list-children: Usage: [PRINT_VALUES] NAME [FROM TO]"
 msgstr ""
 
-#: mi/mi-cmd-disas.c:162
-msgid "-data-disassemble: Invalid filename."
+#: mi/mi-cmd-var.c:480
+msgid "-var-info-type: Usage: NAME."
 msgstr ""
 
-#: mi/mi-cmd-disas.c:164
-msgid "-data-disassemble: Invalid line number"
+#: mi/mi-cmd-var.c:496
+msgid "Usage: NAME."
+msgstr ""
+
+#: mi/mi-cmd-var.c:514
+msgid "-var-info-expression: Usage: NAME."
+msgstr ""
+
+#: mi/mi-cmd-var.c:534
+msgid "-var-show-attributes: Usage: NAME."
+msgstr ""
+
+#: mi/mi-cmd-var.c:585
+msgid "Cannot specify format more than once"
+msgstr ""
+
+#: mi/mi-cmd-var.c:594
+msgid "Usage: [-f FORMAT] NAME"
+msgstr ""
+
+#: mi/mi-cmd-var.c:597
+msgid "Garbage at end of command"
+msgstr ""
+
+#: mi/mi-cmd-var.c:626
+msgid "-var-assign: Usage: NAME EXPRESSION."
+msgstr ""
+
+#: mi/mi-cmd-var.c:632
+msgid "-var-assign: Variable object is not editable"
+msgstr ""
+
+#: mi/mi-cmd-var.c:637
+msgid "-var-assign: Could not assign expression to variable object"
+msgstr ""
+
+#: mi/mi-cmd-var.c:689
+msgid "-var-update: Usage: [PRINT_VALUES] NAME."
 msgstr ""
 
-#: mi/mi-cmd-disas.c:166
-msgid "-data-disassemble: No function contains specified address"
+#: mi/mi-cmd-var.c:837
+msgid "-enable-pretty-printing: no arguments allowed"
 msgstr ""
 
-#: mi/mi-cmd-env.c:73
-msgid "-environment-pwd: No arguments required"
+#: mi/mi-cmd-var.c:848
+msgid "-var-set-update-range: Usage: VAROBJ FROM TO"
 msgstr ""
 
-#: mi/mi-cmd-env.c:84
+#: mi/mi-cmds.c:218
 #, possible-c-format
-msgid "-environment-pwd: error finding name of working directory: %s"
+msgid "command `%s' appears to be duplicated"
 msgstr ""
 
-#: mi/mi-cmd-env.c:95
-msgid "-environment-cd: Usage DIRECTORY"
+#: mi/mi-console.c:68
+msgid "mi_console_file_delete: bad magic number"
 msgstr ""
 
-#: mi/mi-cmd-env.c:257
-msgid "-inferior-tty-show: Usage: No args"
+#: mi/mi-console.c:98
+msgid "mi_console_file_transform: bad magic number"
+msgstr ""
+
+#: mi/mi-console.c:126
+msgid "mi_console_file_flush: bad magic number"
 msgstr ""
 
-#: mi/mi-getopt.c:37
+#: mi/mi-getopt.c:36
 msgid "mi_getopt_long: optind out of bounds"
 msgstr ""
 
-#: mi/mi-getopt.c:63
+#: mi/mi-getopt.c:62
 #, possible-c-format
 msgid "%s: Option %s requires an argument"
 msgstr ""
 
-#: mi/mi-getopt.c:75
+#: mi/mi-getopt.c:74
 #, possible-c-format
 msgid "%s: Unknown option ``%s''"
 msgstr ""
 
-#: mi/mi-cmds.c:217
+#: mi/mi-interp.c:219
+msgid "-interpreter-exec: Usage: -interpreter-exec interp command"
+msgstr ""
+
+#: mi/mi-interp.c:224
 #, possible-c-format
-msgid "command `%s' appears to be duplicated"
+msgid "-interpreter-exec: could not find interpreter \"%s\""
 msgstr ""
 
-#: mi/mi-main.c:289 mi/mi-main.c:295 reverse.c:54 reverse.c:61
+#: mi/mi-interp.c:228
 #, possible-c-format
-msgid "Target %s does not support this command."
+msgid ""
+"-interpreter-exec: interpreter \"%s\" does not support command execution"
 msgstr ""
 
-#: mi/mi-main.c:292
+#: mi/mi-main.c:290
 msgid "Already in reverse mode."
 msgstr ""
 
-#: mi/mi-main.c:423
+#: mi/mi-main.c:293 reverse.c:57
+#, possible-c-format
+msgid "Target %s does not support this command."
+msgstr ""
+
+#: mi/mi-main.c:421
 msgid "Usage: -target-detach [pid | thread-group]"
 msgstr ""
 
-#: mi/mi-main.c:438
+#: mi/mi-main.c:436
 #, possible-c-format
 msgid "Invalid syntax of thread-group id '%s'"
 msgstr ""
 
-#: mi/mi-main.c:442
+#: mi/mi-main.c:440
 #, possible-c-format
 msgid "Non-existent thread-group id '%d'"
 msgstr ""
 
-#: mi/mi-main.c:452
+#: mi/mi-main.c:450
 #, possible-c-format
 msgid "Invalid identifier '%s'"
 msgstr ""
 
-#: mi/mi-main.c:459
+#: mi/mi-main.c:457
 msgid "Thread group is empty"
 msgstr ""
 
-#: mi/mi-main.c:474
+#: mi/mi-main.c:472
 msgid "-thread-select: USAGE: threadnum."
 msgstr ""
 
-#: mi/mi-main.c:492
+#: mi/mi-main.c:490
 msgid "-thread-list-ids: No arguments required."
 msgstr ""
 
-#: mi/mi-main.c:507
+#: mi/mi-main.c:505 mi/mi-main.c:2515
 msgid "Invalid MI command"
 msgstr ""
 
-#: mi/mi-main.c:830
+#: mi/mi-main.c:831
 msgid "only '0' and '1' are valid values for the '--recurse' option"
 msgstr ""
 
-#: mi/mi-main.c:842 mi/mi-main.c:847
+#: mi/mi-main.c:843 mi/mi-main.c:848
 #, possible-c-format
 msgid "invalid syntax of group id '%s'"
 msgstr ""
 
-#: mi/mi-main.c:868
+#: mi/mi-main.c:869
 #, possible-c-format
 msgid "Non-existent thread group id '%d'"
 msgstr ""
 
-#: mi/mi-main.c:930 mi/mi-main.c:1007 mi/mi-main.c:1106 mi/mi-main.c:1220
+#: mi/mi-main.c:932 mi/mi-main.c:1010 mi/mi-main.c:1110 mi/mi-main.c:1225
 msgid "bad register number"
 msgstr ""
 
-#: mi/mi-main.c:982 mi/mi-main.c:1001
+#: mi/mi-main.c:985 mi/mi-main.c:1004
 msgid "-data-list-changed-registers: Unable to read register contents."
 msgstr ""
 
-#: mi/mi-main.c:1063
+#: mi/mi-main.c:1067
 msgid ""
 "-data-list-register-values: Usage: -data-list-register-values <format> "
 "[<regnum1>...<regnumN>]"
 msgstr ""
 
-#: mi/mi-main.c:1129
+#: mi/mi-main.c:1134
 msgid "Optimized out"
 msgstr ""
 
-#: mi/mi-main.c:1188
+#: mi/mi-main.c:1193
 msgid ""
 "-data-write-register-values: Usage: -data-write-register-values <format> "
 "[<regnum1> <value1>...<regnumN> <valueN>]"
 msgstr ""
 
-#: mi/mi-main.c:1194
+#: mi/mi-main.c:1199
 msgid "-data-write-register-values: No registers."
 msgstr ""
 
-#: mi/mi-main.c:1197
+#: mi/mi-main.c:1202
 msgid "-data-write-register-values: No regs and values specified."
 msgstr ""
 
-#: mi/mi-main.c:1200
+#: mi/mi-main.c:1205
 msgid "-data-write-register-values: Regs and vals are not in pairs."
 msgstr ""
 
-#: mi/mi-main.c:1241
+#: mi/mi-main.c:1247
 msgid ""
 "-data-evaluate-expression: Usage: -data-evaluate-expression expression"
 msgstr ""
 
-#: mi/mi-main.c:1328
+#: mi/mi-main.c:1335
 msgid ""
 "-data-read-memory: Usage: ADDR WORD-FORMAT WORD-SIZE NR-ROWS NR-COLS "
 "[ASCHAR]."
 msgstr ""
 
-#: mi/mi-main.c:1365
+#: mi/mi-main.c:1372
 msgid "-data-read-memory: invalid number of rows."
 msgstr ""
 
-#: mi/mi-main.c:1370
+#: mi/mi-main.c:1377
 msgid "-data-read-memory: invalid number of columns."
 msgstr ""
 
-#: mi/mi-main.c:1389 mi/mi-main.c:1522
+#: mi/mi-main.c:1396 mi/mi-main.c:1530
 msgid "Unable to read memory."
 msgstr ""
 
-#: mi/mi-main.c:1512
+#: mi/mi-main.c:1520
 msgid "Usage: [ -o OFFSET ] ADDR LENGTH."
 msgstr ""
 
-#: mi/mi-main.c:1614
+#: mi/mi-main.c:1622
 msgid ""
 "-data-write-memory: Usage: [-o COLUMN_OFFSET] ADDR FORMAT WORD-SIZE VALUE."
 msgstr ""
 
-#: mi/mi-main.c:1655
+#: mi/mi-main.c:1663
 msgid "Usage: ADDR DATA."
 msgstr ""
 
-#: mi/mi-main.c:1673
+#: mi/mi-main.c:1681
 msgid "Could not write memory"
 msgstr ""
 
-#: mi/mi-main.c:1699
+#: mi/mi-main.c:1707
 #, possible-c-format
 msgid "-enable-timings: Usage: %s {yes|no}"
 msgstr ""
 
-#: mi/mi-main.c:1723
+#: mi/mi-main.c:1734
 msgid "-list-features should be passed no arguments"
 msgstr ""
 
-#: mi/mi-main.c:1743
+#: mi/mi-main.c:1755
 msgid "-list-target-features should be passed no arguments"
 msgstr ""
 
-#: mi/mi-main.c:1752
+#: mi/mi-main.c:1764
 msgid "-add-inferior should be passed no arguments"
 msgstr ""
 
-#: mi/mi-main.c:1778
+#: mi/mi-main.c:1790
 msgid "-remove-inferior should be passed a single argument"
 msgstr ""
 
-#: mi/mi-main.c:1781
+#: mi/mi-main.c:1793
 msgid "the thread group id is syntactically invalid"
 msgstr ""
 
-#: mi/mi-main.c:1785
+#: mi/mi-main.c:1797
 msgid "the specified thread group does not exist"
 msgstr ""
 
-#: mi/mi-main.c:1788
+#: mi/mi-main.c:1800
 msgid "cannot remove an active inferior"
 msgstr ""
 
-#: mi/mi-main.c:1797
+#: mi/mi-main.c:1809
 msgid "Cannot remove last inferior"
 msgstr ""
 
-#: mi/mi-main.c:2032
+#: mi/mi-main.c:2043
 msgid "Cannot specify --thread-group together with --all"
 msgstr ""
 
-#: mi/mi-main.c:2035
+#: mi/mi-main.c:2046
 msgid "Cannot specify --thread together with --all"
 msgstr ""
 
-#: mi/mi-main.c:2038
+#: mi/mi-main.c:2049
 msgid "Cannot specify --thread together with --thread-group"
 msgstr ""
 
-#: mi/mi-main.c:2041
+#: mi/mi-main.c:2052
 msgid "Cannot specify --frame without --thread"
 msgstr ""
 
-#: mi/mi-main.c:2049
+#: mi/mi-main.c:2060
 msgid "Invalid thread group for the --thread-group option"
 msgstr ""
 
-#: mi/mi-main.c:2067
+#: mi/mi-main.c:2078
 #, possible-c-format
 msgid "Invalid thread id: %d"
 msgstr ""
 
-#: mi/mi-main.c:2070
+#: mi/mi-main.c:2081
 #, possible-c-format
 msgid "Thread id: %d has terminated"
 msgstr ""
 
-#: mi/mi-main.c:2085
+#: mi/mi-main.c:2096
 #, possible-c-format
 msgid "Invalid frame id: %d"
 msgstr ""
 
-#: mi/mi-main.c:2329
+#: mi/mi-main.c:2342
 msgid "Usage: -trace-define-variable VARIABLE [VALUE]"
 msgstr ""
 
-#: mi/mi-main.c:2343
+#: mi/mi-main.c:2356
 msgid "Invalid name of trace variable"
 msgstr ""
 
-#: mi/mi-main.c:2361
+#: mi/mi-main.c:2374
 msgid "-trace-list-variables: no arguments are allowed"
 msgstr ""
 
-#: mi/mi-main.c:2372
+#: mi/mi-main.c:2385
 msgid "trace selection mode is required"
 msgstr ""
 
-#: mi/mi-main.c:2383 tracepoint.c:2084 tracepoint.c:2142 tracepoint.c:2160
-#: tracepoint.c:2199 tracepoint.c:2263 tracepoint.c:2296
+#: mi/mi-main.c:2396 tracepoint.c:2335 tracepoint.c:2393 tracepoint.c:2411
+#: tracepoint.c:2450 tracepoint.c:2514 tracepoint.c:2547
 msgid "May not look at trace frames while trace is running."
 msgstr ""
 
-#: mi/mi-main.c:2388
+#: mi/mi-main.c:2401
 msgid "frame number is required"
 msgstr ""
 
-#: mi/mi-main.c:2394
+#: mi/mi-main.c:2407
 msgid "tracepoint number is required"
 msgstr ""
 
-#: mi/mi-main.c:2400
+#: mi/mi-main.c:2413
 msgid "PC is required"
 msgstr ""
 
-#: mi/mi-main.c:2406 mi/mi-main.c:2413
+#: mi/mi-main.c:2419 mi/mi-main.c:2426
 msgid "Start and end PC are required"
 msgstr ""
 
-#: mi/mi-main.c:2425
+#: mi/mi-main.c:2438
 msgid "Line is required"
 msgstr ""
 
-#: mi/mi-main.c:2433 mi/mi-main.c:2438
+#: mi/mi-main.c:2446 mi/mi-main.c:2451
 msgid "Could not find the specified line"
 msgstr ""
 
-#: mi/mi-main.c:2443
+#: mi/mi-main.c:2456
 #, possible-c-format
 msgid "Invalid mode '%s'"
 msgstr ""
 
-#: mi/mi-main.c:2458
+#: mi/mi-main.c:2471
 msgid "Usage: -trace-save [-r] filename"
 msgstr ""
 
-#: mi/mi-main.c:2466
+#: mi/mi-main.c:2479
 #, possible-c-format
 msgid "Invalid option: %s"
 msgstr ""
 
-#: mi/mi-console.c:69
-msgid "mi_console_file_delete: bad magic number"
-msgstr ""
-
-#: mi/mi-console.c:99
-msgid "mi_console_file_transform: bad magic number"
-msgstr ""
-
-#: mi/mi-console.c:127
-msgid "mi_console_file_flush: bad magic number"
-msgstr ""
-
-#: mi/mi-cmd-break.c:140
-msgid "-break-insert: Missing <location>"
-msgstr ""
-
-#: mi/mi-cmd-break.c:142
-msgid "-break-insert: Garbage following <location>"
-msgstr ""
-
-#: mi/mi-cmd-break.c:193
-msgid "Usage: tracepoint-number passcount"
-msgstr ""
-
-#: mi/mi-cmd-break.c:206
-#, possible-c-format
-msgid "Cound not find tracepoint %d"
-msgstr ""
-
-#: mi/mi-cmd-break.c:254
-msgid "-break-watch: Missing <expression>"
-msgstr ""
-
-#: mi/mi-cmd-break.c:256
-msgid "-break-watch: Garbage following <expression>"
-msgstr ""
-
-#: mi/mi-cmd-break.c:272
-msgid "-break-watch: Unknown watchpoint type."
-msgstr ""
-
-#: mi/mi-cmd-break.c:303
-#, possible-c-format
-msgid "USAGE: %s <BKPT> [<COMMAND> [<COMMAND>...]]"
-msgstr ""
-
-#: mi/mi-cmd-break.c:307
-#, possible-c-format
-msgid "breakpoint number argument \"%s\" is not a number."
-msgstr ""
-
-#: mi/mi-cmd-break.c:310
-#, possible-c-format
-msgid "junk at the end of breakpoint number argument \"%s\"."
-msgstr ""
-
-#: mi/mi-cmd-break.c:315
-#, possible-c-format
-msgid "breakpoint %d not found."
-msgstr ""
-
-#: mi/mi-common.c:54
-msgid "async_reason_string_lookup is inconsistent"
-msgstr ""
-
-#: mi/mi-interp.c:195
-msgid "-interpreter-exec: Usage: -interpreter-exec interp command"
-msgstr ""
-
-#: mi/mi-interp.c:200
-#, possible-c-format
-msgid "-interpreter-exec: could not find interpreter \"%s\""
-msgstr ""
-
-#: mi/mi-interp.c:204
-#, possible-c-format
-msgid ""
-"-interpreter-exec: interpreter \"%s\" does not support command execution"
-msgstr ""
-
-#: mi/mi-symbol-cmds.c:42
-msgid "-symbol-list-lines: Usage: SOURCE_FILENAME"
-msgstr ""
-
-#: mi/mi-symbol-cmds.c:48
-msgid "-symbol-list-lines: Unknown source file name."
-msgstr ""
-
-#: mi/mi-parse.c:287
+#: mi/mi-parse.c:286
 #, possible-c-format
 msgid "Undefined MI command: %s"
 msgstr ""
 
-#: mi/mi-parse.c:321
+#: mi/mi-parse.c:320
 msgid "Duplicate '--thread-group' option"
 msgstr ""
 
-#: mi/mi-parse.c:324
+#: mi/mi-parse.c:323
 msgid "Invalid thread group id"
 msgstr ""
 
-#: mi/mi-parse.c:332
+#: mi/mi-parse.c:331
 msgid "Duplicate '--thread' option"
 msgstr ""
 
-#: mi/mi-parse.c:340
+#: mi/mi-parse.c:339
 msgid "Duplicate '--frame' option"
 msgstr ""
 
-#: mi/mi-parse.c:348
+#: mi/mi-parse.c:347
 #, possible-c-format
 msgid "Invalid value for the '%s' option"
 msgstr ""
 
-#: mi/mi-parse.c:359
+#: mi/mi-parse.c:358
 #, possible-c-format
 msgid "Problem parsing arguments: %s %s"
 msgstr ""
 
-#: mi/mi-cmd-file.c:39
-msgid "-file-list-exec-source-file: Usage: No args"
-msgstr ""
-
-#: mi/mi-cmd-file.c:49
-msgid "-file-list-exec-source-file: No symtab"
+#: mi/mi-symbol-cmds.c:42
+msgid "-symbol-list-lines: Usage: SOURCE_FILENAME"
 msgstr ""
 
-#: mi/mi-cmd-file.c:87
-msgid "-file-list-exec-source-files: Usage: No args"
+#: mi/mi-symbol-cmds.c:48
+msgid "-symbol-list-lines: Unknown source file name."
 msgstr ""
 
 #: microblaze-tdep.c:145
@@ -14646,157 +15217,162 @@
 msgid "When non-zero, microblaze specific debugging is enabled."
 msgstr ""
 
-#: minsyms.c:716
+#: minsyms.c:759
 #, possible-c-format
 msgid ""
 "GDB cannot resolve STT_GNU_IFUNC symbol at address %s without the ELF "
 "support compiled in."
 msgstr ""
 
-#: minsyms.c:727
+#: minsyms.c:770
 #, possible-c-format
 msgid ""
 "GDB cannot resolve STT_GNU_IFUNC symbol \"%s\" without the ELF support "
 "compiled in."
 msgstr ""
 
-#: minsyms.c:738
+#: minsyms.c:781
 msgid "elf_gnu_ifunc_resolver_stop cannot be reached."
 msgstr ""
 
-#: minsyms.c:747
+#: minsyms.c:790
 msgid "elf_gnu_ifunc_resolver_return_stop cannot be reached."
 msgstr ""
 
-#: mips-linux-nat.c:77 mips-linux-nat.c:112
+#: mips-linux-nat.c:76 mips-linux-nat.c:111
 #, possible-c-format
 msgid "Bogon register number %d."
 msgstr ""
 
-#: mips-linux-nat.c:255 mips-linux-nat.c:307 ppcnbsd-nat.c:105
-#: ppcnbsd-nat.c:140
+#: mips-linux-nat.c:254 mips-linux-nat.c:306 ppcnbsd-nat.c:104
+#: ppcnbsd-nat.c:139
 msgid "Couldn't get FP registers"
 msgstr ""
 
-#: mips-linux-nat.c:298 shnbsd-nat.c:84
+#: mips-linux-nat.c:297 shnbsd-nat.c:83
 msgid "Couldn't set registers"
 msgstr ""
 
-#: mips-linux-nat.c:313 ppcnbsd-nat.c:147
+#: mips-linux-nat.c:312 ppcnbsd-nat.c:146
 msgid "Couldn't set FP registers"
 msgstr ""
 
-#: mips-linux-nat.c:481 mips-linux-nat.c:498 mips-linux-nat.c:515
-#: mips-linux-nat.c:532 mips-linux-nat.c:553 mips-linux-nat.c:570
-#: mips-linux-nat.c:589
+#: mips-linux-nat.c:480 mips-linux-nat.c:497 mips-linux-nat.c:514
+#: mips-linux-nat.c:531 mips-linux-nat.c:552 mips-linux-nat.c:569
+#: mips-linux-nat.c:588
 msgid "Unrecognized watch register style"
 msgstr ""
 
-#: mips-linux-nat.c:1056
+#: mips-linux-nat.c:1054
 msgid "Set whether to show variables that mirror the mips debug registers."
 msgstr ""
 
-#: mips-linux-nat.c:1057
+#: mips-linux-nat.c:1055
 msgid "Show whether to show variables that mirror the mips debug registers."
 msgstr ""
 
-#: mips-linux-tdep.c:648
+#: mips-linux-tdep.c:647
 msgid "wrong size fpregset struct in core file"
 msgstr ""
 
-#: mips-tdep.c:493
+#: mipsread.c:84
+#, possible-c-format
+msgid "Error reading symbol table: %s"
+msgstr ""
+
+#: mips-tdep.c:491
 #, possible-c-format
 msgid "mips_register_name: bad register number %d"
 msgstr ""
 
-#: mips-tdep.c:594 mips-tdep.c:623 mips-tdep.c:663
+#: mips-tdep.c:592 mips-tdep.c:621 mips-tdep.c:661
 msgid "bad register size"
 msgstr ""
 
-#: mips-tdep.c:695
+#: mips-tdep.c:693
 msgid "32-bit compatibility mode not supported"
 msgstr ""
 
-#: mips-tdep.c:778
+#: mips-tdep.c:776
 msgid "mips_register_to_value: unrecognized case"
 msgstr ""
 
-#: mips-tdep.c:826
+#: mips-tdep.c:824
 msgid "mips_value_to_register: unrecognized case"
 msgstr ""
 
-#: mips-tdep.c:954
+#: mips-tdep.c:952
 msgid "mips_mask_address_p: bad switch"
 msgstr ""
 
-#: mips-tdep.c:980
+#: mips-tdep.c:978
 msgid "show_mask_address: bad switch"
 msgstr ""
 
-#: mips-tdep.c:1863
+#: mips-tdep.c:1830
 msgid "Invalid number of argument registers encoded in SAVE."
 msgstr ""
 
-#: mips-tdep.c:1868
+#: mips-tdep.c:1835
 msgid "Invalid number of static registers encoded in SAVE."
 msgstr ""
 
-#: mips-tdep.c:2759
+#: mips-tdep.c:2727
 #, possible-c-format
 msgid "GDB can't find the start of the function at %s."
 msgstr ""
 
-#: mips-tdep.c:4557 mips-tdep.c:4594 mips-tdep.c:4830 sh64-tdep.c:2056
+#: mips-tdep.c:4525 mips-tdep.c:4562 mips-tdep.c:4798 sh64-tdep.c:2054
 #, possible-c-format
 msgid "can't read register %d (%s)"
 msgstr ""
 
-#: mips-tdep.c:4603
+#: mips-tdep.c:4571
 msgid "mips_read_fp_register_double: bad access to odd-numbered FP register"
 msgstr ""
 
-#: mips-tdep.c:4866 sh64-tdep.c:2216 sh64-tdep.c:2274
+#: mips-tdep.c:4834 sh64-tdep.c:2214 sh64-tdep.c:2272
 msgid "Not a valid register for the current processor type"
 msgstr ""
 
-#: mips-tdep.c:5136 mips-tdep.c:5150 mips-tdep.c:5164
+#: mips-tdep.c:5104 mips-tdep.c:5118 mips-tdep.c:5132
 msgid "set mipsfpu failed"
 msgstr ""
 
-#: mips-tdep.c:5615
+#: mips-tdep.c:5586
 #, possible-c-format
 msgid "unsupported ABI %s."
 msgstr ""
 
-#: mips-tdep.c:5629
+#: mips-tdep.c:5600
 msgid "unrecognized .gcc_compiled_longXX"
 msgstr ""
 
-#: mips-tdep.c:5641
+#: mips-tdep.c:5612
 msgid "unknown ABI string"
 msgstr ""
 
-#: mips-tdep.c:6153 mips-tdep.c:6202
+#: mips-tdep.c:6124 mips-tdep.c:6173
 msgid "unknown ABI in switch"
 msgstr ""
 
-#: mips-tdep.c:6481
+#: mips-tdep.c:6452
 msgid "mips_abi_strings out of sync"
 msgstr ""
 
-#: mips-tdep.c:6497 mips-tdep.c:6501
+#: mips-tdep.c:6468 mips-tdep.c:6472
 msgid "Various MIPS specific commands."
 msgstr ""
 
-#: mips-tdep.c:6506
+#: mips-tdep.c:6477
 msgid "Set the MIPS ABI used by this program."
 msgstr ""
 
-#: mips-tdep.c:6507
+#: mips-tdep.c:6478
 msgid "Show the MIPS ABI used by this program."
 msgstr ""
 
-#: mips-tdep.c:6508
+#: mips-tdep.c:6479
 msgid ""
 "This option can be set to one of:\n"
 "  auto  - the default ABI associated with the current binary\n"
@@ -14808,141 +15384,136 @@
 "  eabi64"
 msgstr ""
 
-#: mips-tdep.c:6525
+#: mips-tdep.c:6496
 msgid "Set use of MIPS floating-point coprocessor."
 msgstr ""
 
-#: mips-tdep.c:6528
+#: mips-tdep.c:6499
 msgid "Select single-precision MIPS floating-point coprocessor."
 msgstr ""
 
-#: mips-tdep.c:6531
+#: mips-tdep.c:6502
 msgid "Select double-precision MIPS floating-point coprocessor."
 msgstr ""
 
-#: mips-tdep.c:6537
+#: mips-tdep.c:6508
 msgid "Select no MIPS floating-point coprocessor."
 msgstr ""
 
-#: mips-tdep.c:6542
+#: mips-tdep.c:6513
 msgid "Select MIPS floating-point coprocessor automatically."
 msgstr ""
 
-#: mips-tdep.c:6545
+#: mips-tdep.c:6516
 msgid "Show current use of MIPS floating-point coprocessor target."
 msgstr ""
 
-#: mips-tdep.c:6566
+#: mips-tdep.c:6537
 msgid "Set zeroing of upper 32 bits of 64-bit addresses."
 msgstr ""
 
-#: mips-tdep.c:6567
+#: mips-tdep.c:6538
 msgid "Show zeroing of upper 32 bits of 64-bit addresses."
 msgstr ""
 
-#: mips-tdep.c:6568
+#: mips-tdep.c:6539
 msgid ""
 "Use \"on\" to enable the masking, \"off\" to disable it and \"auto\" to\n"
 "allow GDB to determine the correct value."
 msgstr ""
 
-#: mips-tdep.c:6577
+#: mips-tdep.c:6548
 msgid ""
 "Set compatibility with 64-bit MIPS target that transfers 32-bit quantities."
 msgstr ""
 
-#: mips-tdep.c:6579
+#: mips-tdep.c:6550
 msgid ""
 "Show compatibility with 64-bit MIPS target that transfers 32-bit quantities."
 msgstr ""
 
-#: mips-tdep.c:6581
+#: mips-tdep.c:6552
 msgid ""
 "Use \"on\" to enable backward compatibility with older MIPS 64 GDB+target\n"
 "that would transfer 32 bits for some registers (e.g. SR, FSR) and\n"
 "64 bits for others.  Use \"off\" to disable compatibility mode"
 msgstr ""
 
-#: mips-tdep.c:6593
+#: mips-tdep.c:6564
 msgid "Set mips debugging."
 msgstr ""
 
-#: mips-tdep.c:6594
+#: mips-tdep.c:6565
 msgid "Show mips debugging."
 msgstr ""
 
-#: mips-tdep.c:6595
+#: mips-tdep.c:6566
 msgid "When non-zero, mips specific debugging is enabled."
 msgstr ""
 
-#: mipsread.c:85
-#, possible-c-format
-msgid "Error reading symbol table: %s"
-msgstr ""
-
-#: mn10300-tdep.c:195
+#: mn10300-tdep.c:194
 #, possible-c-format
 msgid "Cannot store return value %d bytes long."
 msgstr ""
 
-#: mn10300-tdep.c:227
+#: mn10300-tdep.c:226
 #, possible-c-format
 msgid "Cannot extract return value %d bytes long."
 msgstr ""
 
-#: mn10300-tdep.c:1377
+#: mn10300-tdep.c:1376
 #, possible-c-format
 msgid "Bogus register number in debug info: %d"
 msgstr ""
 
-#: mn10300-tdep.c:1420
+#: mn10300-tdep.c:1419
 msgid "mn10300_gdbarch_init: Unknown mn10300 variant"
 msgstr ""
 
-#: monitor.c:221
+#: monitor.c:219
 #, possible-c-format
 msgid "%s (%s): %s: %s%c"
 msgstr ""
 
-#: monitor.c:225
+#: monitor.c:223
 #, possible-c-format
 msgid "%s (%s): %s: %s"
 msgstr ""
 
-#: monitor.c:242
+#: monitor.c:240
 #, possible-c-format
 msgid "Invalid hex digit %d"
 msgstr ""
 
-#: monitor.c:414 monitor.c:490
+#: monitor.c:412 monitor.c:488
 msgid "Timeout reading from remote system."
 msgstr ""
 
-#: monitor.c:416 monitor.c:492
+#: monitor.c:414 monitor.c:490
 msgid "remote-monitor"
 msgstr ""
 
-#: monitor.c:486
+#: monitor.c:484
 msgid "GDB serial timeout has expired.  Target detached."
 msgstr ""
 
-#: monitor.c:704
+#: monitor.c:702
 #, possible-c-format
 msgid "compile_pattern: Can't compile pattern string `%s': %s!"
 msgstr ""
 
-#: monitor.c:722
+#: monitor.c:720
 msgid "Magic number of monitor_ops struct wrong."
 msgstr ""
 
-#: monitor.c:728
+#: monitor.c:726
 #, possible-c-format
 msgid ""
 "Use `target %s DEVICE-NAME' to use a serial port, or\n"
 "`target %s HOST-NAME:PORT-NUMBER' to use a network connection."
 msgstr ""
 
-#: monitor.c:829
+#: monitor.c:827
 #, possible-c-format
 msgid "Remote target %s connected to %s\n"
 msgstr ""
@@ -14957,7 +15528,7 @@
 msgid "monitor_supply_register (%d):  bad value from monitor: %s."
 msgstr ""
 
-#: monitor.c:1033 nto-procfs.c:694 remote-mips.c:2276 remote.c:4770
+#: monitor.c:1033 nto-procfs.c:693 remote.c:4850 remote-mips.c:2274
 msgid ""
 "Interrupted while waiting for the program.\n"
 "Give up (and stop debugging it)? "
@@ -15034,74 +15605,74 @@
 msgid "Process record: error reading memory at addr 0x%s len = %d.\n"
 msgstr ""
 
-#: mt-tdep.c:304
+#: mt-tdep.c:303
 #, possible-c-format
 msgid "mt_register_type: illegal register number %d"
 msgstr ""
 
-#: nto-procfs.c:102
+#: nto-procfs.c:101
 msgid "Lost the QNX node.  Debug session probably over."
 msgstr ""
 
-#: nto-procfs.c:168
+#: nto-procfs.c:167
 msgid "Invalid procfs arg"
 msgstr ""
 
-#: nto-procfs.c:177 nto-procfs.c:195
+#: nto-procfs.c:176 nto-procfs.c:194
 msgid "Devctl failed."
 msgstr ""
 
-#: nto-procfs.c:187
+#: nto-procfs.c:186
 msgid "alloca failed."
 msgstr ""
 
-#: nto-procfs.c:202
+#: nto-procfs.c:201
 msgid "Invalid target CPU."
 msgstr ""
 
-#: nto-procfs.c:626 procfs.c:3295
+#: nto-procfs.c:625 procfs.c:3293
 msgid "Attaching GDB to itself is not a good idea..."
 msgstr ""
 
-#: nto-procfs.c:668
+#: nto-procfs.c:667
 #, possible-c-format
 msgid "Couldn't open proc file %s, error %d (%s)"
 msgstr ""
 
-#: nto-procfs.c:671
+#: nto-procfs.c:670
 msgid "Couldn't stop process"
 msgstr ""
 
-#: nto-procfs.c:1010
+#: nto-procfs.c:1009
 msgid "run error!\n"
 msgstr ""
 
-#: nto-procfs.c:1184
+#: nto-procfs.c:1183
 #, possible-c-format
 msgid "Error spawning %s: %d (%s)"
 msgstr ""
 
-#: nto-procfs.c:1453
+#: nto-procfs.c:1452
 msgid "pidlist"
 msgstr ""
 
-#: nto-procfs.c:1454
+#: nto-procfs.c:1453
 msgid "memory information"
 msgstr ""
 
-#: nto-procfs.c:1484
+#: nto-procfs.c:1483
 msgid "Failed to set hardware watchpoint"
 msgstr ""
 
-#: nto-tdep.c:405
+#: nto-tdep.c:404
 msgid "Set QNX NTO internal debugging."
 msgstr ""
 
-#: nto-tdep.c:406
+#: nto-tdep.c:405
 msgid "Show QNX NTO internal debugging."
 msgstr ""
 
-#: nto-tdep.c:407
+#: nto-tdep.c:406
 msgid ""
 "When non-zero, nto specific debug info is\n"
 "displayed. Different information is displayed\n"
@@ -15131,118 +15702,118 @@
 msgid "A %s near end of expression."
 msgstr ""
 
-#: objc-lang.c:129
+#: objc-lang.c:128
 msgid "no way to lookup Objective-C classes"
 msgstr ""
 
-#: objc-lang.c:158
+#: objc-lang.c:157
 msgid "no way to lookup Objective-C selectors"
 msgstr ""
 
-#: objc-lang.c:206
+#: objc-lang.c:205
 msgid "NSString: internal error -- no way to create new NSString"
 msgstr ""
 
-#: objc-lang.c:628
+#: objc-lang.c:629
 #, possible-c-format
 msgid "Can't find selector \"%s\""
 msgstr ""
 
-#: objc-lang.c:675
+#: objc-lang.c:676
 msgid "internal: compare_selectors(1)"
 msgstr ""
 
-#: objc-lang.c:680
+#: objc-lang.c:681
 msgid "internal: compare_selectors(2)"
 msgstr ""
 
-#: objc-lang.c:725 objc-lang.c:876
+#: objc-lang.c:726 objc-lang.c:877
 #, possible-c-format
 msgid "Regexp is too long: %s"
 msgstr ""
 
-#: objc-lang.c:738 objc-lang.c:889 symtab.c:3093 thread.c:1327
+#: objc-lang.c:739 objc-lang.c:890 symtab.c:3283 thread.c:1320
 #, possible-c-format
 msgid "Invalid regexp (%s): %s"
 msgstr ""
 
-#: objc-lang.c:758
+#: objc-lang.c:759
 #, possible-c-format
 msgid "Bad method name '%s'"
 msgstr ""
 
-#: objc-lang.c:775
+#: objc-lang.c:776
 #, possible-c-format
 msgid ""
 "Selectors matching \"%s\":\n"
 "\n"
 msgstr ""
 
-#: objc-lang.c:822
+#: objc-lang.c:823
 #, possible-c-format
 msgid "No selectors matching \"%s\"\n"
 msgstr ""
 
-#: objc-lang.c:841
+#: objc-lang.c:842
 msgid "internal: compare_classes(1)"
 msgstr ""
 
-#: objc-lang.c:913
+#: objc-lang.c:914
 #, possible-c-format
 msgid ""
 "Classes matching \"%s\":\n"
 "\n"
 msgstr ""
 
-#: objc-lang.c:952
+#: objc-lang.c:953
 #, possible-c-format
 msgid "No classes matching \"%s\"\n"
 msgstr ""
 
-#: objc-lang.c:1469
+#: objc-lang.c:1354
 msgid "Unable to locate _NSPrintForDebugger in child process"
 msgstr ""
 
-#: objc-lang.c:1475
+#: objc-lang.c:1360
 msgid "object returns null description"
 msgstr ""
 
-#: objc-lang.c:1486
+#: objc-lang.c:1371
 msgid "<object returns empty description>"
 msgstr ""
 
 #. INFO SELECTORS command.
-#: objc-lang.c:1643
+#: objc-lang.c:1528
 msgid "All Objective-C selectors, or those matching REGEXP."
 msgstr ""
 
 #. INFO CLASSES   command.
-#: objc-lang.c:1645
+#: objc-lang.c:1530
 msgid "All Objective-C classes, or those matching REGEXP."
 msgstr ""
 
-#: objc-lang.c:1647
+#: objc-lang.c:1532
 msgid "Ask an Objective-C object to print itself."
 msgstr ""
 
-#: objfiles.c:231 solib.c:510 symfile.c:2541
+#: objfiles.c:222 solib.c:481 symfile.c:2540
 #, possible-c-format
 msgid "Can't find the file sections in `%s': %s"
 msgstr ""
 
-#: objfiles.c:353
+#: objfiles.c:340
 msgid "Entry point address is not known."
 msgstr ""
 
-#: objfiles.c:442
+#: objfiles.c:429
 msgid "put_objfile_before: before objfile not in list"
 msgstr ""
 
-#: objfiles.c:494
+#: objfiles.c:481
 msgid "unlink_objfile: objfile already unlinked"
 msgstr ""
 
-#: objfiles.c:1229
+#: objfiles.c:1217
 #, possible-c-format
 msgid ""
 "unexpected overlap between:\n"
@@ -15251,43 +15822,43 @@
 "Will ignore section B"
 msgstr ""
 
-#: objfiles.c:1514
+#: objfiles.c:1502
 #, possible-c-format
 msgid "cannot close \"%s\": %s"
 msgstr ""
 
-#: objfiles.h:669
+#: objfiles.h:641
 msgid "sect_index_data not initialized"
 msgstr ""
 
-#: objfiles.h:675
+#: objfiles.h:647
 msgid "sect_index_rodata not initialized"
 msgstr ""
 
-#: objfiles.h:681
+#: objfiles.h:653
 msgid "sect_index_text not initialized"
 msgstr ""
 
-#: observer.c:63
+#: observer.c:62
 #, possible-c-format
 msgid "Observer debugging is %s.\n"
 msgstr ""
 
 #. We should never reach this point.  However, this should not be
 #. a very serious error, so simply report a warning to the user.
-#: observer.c:155
+#: observer.c:154
 msgid "Failed to detach observer"
 msgstr ""
 
-#: observer.c:209
+#: observer.c:208
 msgid "Set observer debugging."
 msgstr ""
 
-#: observer.c:210
+#: observer.c:209
 msgid "Show observer debugging."
 msgstr ""
 
-#: observer.c:211
+#: observer.c:210
 msgid "When non-zero, observer debugging is enabled."
 msgstr ""
 
@@ -15296,113 +15867,113 @@
 msgid "Invalid OpenCL vector size: %d"
 msgstr ""
 
-#: opencl-lang.c:185 opencl-lang.c:214 opencl-lang.c:446 opencl-lang.c:563
-#: opencl-lang.c:656 opencl-lang.c:875 valarith.c:1418 valarith.c:1774
-#: valarith.c:1810 valops.c:556 valops.c:899
+#: opencl-lang.c:185 opencl-lang.c:214 opencl-lang.c:447 opencl-lang.c:564
+#: opencl-lang.c:657 opencl-lang.c:876 valarith.c:1410 valarith.c:1766
+#: valarith.c:1802 valops.c:554 valops.c:897
 msgid "Could not determine the vector bounds"
 msgstr ""
 
-#: opencl-lang.c:454
+#: opencl-lang.c:455
 msgid "Invalid OpenCL vector size"
 msgstr ""
 
-#: opencl-lang.c:501 opencl-lang.c:521 opencl-lang.c:526 opencl-lang.c:530
-#: opencl-lang.c:540
+#: opencl-lang.c:502 opencl-lang.c:522 opencl-lang.c:527 opencl-lang.c:531
+#: opencl-lang.c:541
 #, possible-c-format
 msgid "Invalid OpenCL vector component accessor %s"
 msgstr ""
 
-#: opencl-lang.c:625
+#: opencl-lang.c:626
 msgid "Attempt to perform an unsupported operation"
 msgstr ""
 
-#: opencl-lang.c:649
+#: opencl-lang.c:650
 msgid "Vector operations are not supported on scalar types"
 msgstr ""
 
-#: opencl-lang.c:663 opencl-lang.c:882 valarith.c:1428
+#: opencl-lang.c:664 opencl-lang.c:883 valarith.c:1420
 msgid "Cannot perform operation on vectors with different types"
 msgstr ""
 
-#: opencl-lang.c:718 valarith.c:1471
+#: opencl-lang.c:719 valarith.c:1463
 msgid "Argument to operation not a number or boolean."
 msgstr ""
 
 #. Throw an error if arg2 or arg3 aren't vectors.
-#: opencl-lang.c:865
+#: opencl-lang.c:866
 msgid "Cannot perform conditional operation on incompatible types"
 msgstr ""
 
-#: opencl-lang.c:888
+#: opencl-lang.c:889
 msgid "Cannot perform conditional operation on vectors with different sizes"
 msgstr ""
 
-#: osabi.c:140
+#: osabi.c:139
 #, possible-c-format
 msgid ""
 "gdbarch_register_osabi: An attempt to register a handler for OS ABI \"%s\" "
 "for architecture %s was made.  The handler will not be registered"
 msgstr ""
 
-#: osabi.c:158
+#: osabi.c:157
 #, possible-c-format
 msgid ""
 "gdbarch_register_osabi: A handler for OS ABI \"%s\" has already been "
 "registered for architecture %s"
 msgstr ""
 
-#: osabi.c:252
+#: osabi.c:251
 #, possible-c-format
 msgid ""
 "gdbarch_lookup_osabi: invalid OS ABI (%d) from sniffer for architecture %s "
 "flavour %d"
 msgstr ""
 
-#: osabi.c:271
+#: osabi.c:270
 #, possible-c-format
 msgid ""
 "gdbarch_lookup_osabi: multiple %sspecific OS ABI match for architecture %s "
 "flavour %d: first match \"%s\", second match \"%s\""
 msgstr ""
 
-#: osabi.c:462
+#: osabi.c:461
 #, possible-c-format
 msgid "generic_elf_osabi_sniff_abi_tag_sections: unknown OS number %d"
 msgstr ""
 
-#: osabi.c:602
+#: osabi.c:597
 #, possible-c-format
 msgid "Invalid OS ABI \"%s\" passed to command handler."
 msgstr ""
 
-#: osabi.c:610
+#: osabi.c:605
 msgid "Updating OS ABI failed."
 msgstr ""
 
-#: osabi.c:619
+#: osabi.c:614
 #, possible-c-format
 msgid "The current OS ABI is \"auto\" (currently \"%s\").\n"
 msgstr ""
 
-#: osabi.c:623
+#: osabi.c:618
 #, possible-c-format
 msgid "The current OS ABI is \"%s\".\n"
 msgstr ""
 
-#: osabi.c:627
+#: osabi.c:622
 #, possible-c-format
 msgid "The default OS ABI is \"%s\".\n"
 msgstr ""
 
-#: osabi.c:639
+#: osabi.c:634
 msgid "_initialize_gdb_osabi: gdb_osabi_names[] is inconsistent"
 msgstr ""
 
-#: osabi.c:649
+#: osabi.c:644
 msgid "Set OS ABI of target."
 msgstr ""
 
-#: osabi.c:650
+#: osabi.c:645
 msgid "Show OS ABI of target."
 msgstr ""
 
@@ -15430,466 +16001,454 @@
 msgid "Can not fetch data now."
 msgstr ""
 
-#: osdata.c:306
+#: osdata.c:307
 msgid "Available types of OS data not reported."
 msgstr ""
 
-#: osdata.c:372
+#: osdata.c:392
 msgid "Show OS data ARG."
 msgstr ""
 
-#: p-typeprint.c:301
-msgid "type not handled in pascal_type_print_varspec_prefix()"
-msgstr ""
-
-#: p-typeprint.c:420
-msgid "type not handled in pascal_type_print_varspec_suffix()"
-msgstr ""
-
-#: p-valprint.c:566
-#, possible-c-format
-msgid "Invalid pascal type code %d in symbol table."
-msgstr ""
-
-#: p-valprint.c:615
-#, possible-c-format
-msgid "Printing of pascal static members is %s.\n"
-msgstr ""
-
-#: p-valprint.c:1066
-msgid "Set printing of pascal static members."
-msgstr ""
-
-#: p-valprint.c:1067
-msgid "Show printing of pascal static members."
-msgstr ""
-
-#: parse.c:110
+#: parse.c:109
 #, possible-c-format
 msgid "Expression debugging is %s.\n"
 msgstr ""
 
-#: parse.c:121
+#: parse.c:120
 #, possible-c-format
 msgid "Parser debugging is %s.\n"
 msgstr ""
 
-#: parse.c:833
+#: parse.c:832
 msgid "?error in operator_length_standard"
 msgstr ""
 
-#: parse.c:1104
+#: parse.c:1103
 msgid "expression to compute"
 msgstr ""
 
-#: parse.c:1217
+#: parse.c:1216
 msgid "Junk after end of expression."
 msgstr ""
 
-#: parse.c:1653
+#: parse.c:1652
 msgid "Set expression debugging."
 msgstr ""
 
-#: parse.c:1654
+#: parse.c:1653
 msgid "Show expression debugging."
 msgstr ""
 
-#: parse.c:1655
+#: parse.c:1654
 msgid ""
 "When non-zero, the internal representation of expressions will be printed."
 msgstr ""
 
-#: parse.c:1662
+#: parse.c:1661
 msgid "Set parser debugging."
 msgstr ""
 
-#: parse.c:1663
+#: parse.c:1662
 msgid "Show parser debugging."
 msgstr ""
 
-#: parse.c:1664
+#: parse.c:1663
 msgid "When non-zero, expression parser tracing will be enabled."
 msgstr ""
 
-#: ppc-linux-nat.c:426 ppc-linux-nat.c:894
+#: ppc-linux-nat.c:425 ppc-linux-nat.c:893
 msgid "Unable to fetch VSX register"
 msgstr ""
 
-#: ppc-linux-nat.c:455 ppc-linux-nat.c:924
+#: ppc-linux-nat.c:454 ppc-linux-nat.c:923
 msgid "Unable to fetch AltiVec register"
 msgstr ""
 
 #. Anything else needs to be reported.
-#: ppc-linux-nat.c:493 ppc-linux-nat.c:2356
+#: ppc-linux-nat.c:492 ppc-linux-nat.c:2428
 msgid "Unable to fetch SPE registers"
 msgstr ""
 
-#: ppc-linux-nat.c:628
+#: ppc-linux-nat.c:627
 #, possible-c-format
 msgid "fetch_register: unexpected byte order: %d"
 msgstr ""
 
-#: ppc-linux-nat.c:686 ppc-linux-nat.c:2369
+#: ppc-linux-nat.c:685 ppc-linux-nat.c:2441
 msgid "Unable to fetch VSX registers"
 msgstr ""
 
-#: ppc-linux-nat.c:705 ppc-linux-nat.c:2382
+#: ppc-linux-nat.c:704 ppc-linux-nat.c:2454
 msgid "Unable to fetch AltiVec registers"
 msgstr ""
 
-#: ppc-linux-nat.c:732 ppc-linux-nat.c:1206
+#: ppc-linux-nat.c:731 ppc-linux-nat.c:1205
 msgid "Couldn't get general-purpose registers."
 msgstr ""
 
-#: ppc-linux-nat.c:784 ppc-linux-nat.c:1268
+#: ppc-linux-nat.c:783 ppc-linux-nat.c:1267
 msgid "Couldn't get floating-point registers."
 msgstr ""
 
-#: ppc-linux-nat.c:902
+#: ppc-linux-nat.c:901
 msgid "Unable to store VSX register"
 msgstr ""
 
-#: ppc-linux-nat.c:938
+#: ppc-linux-nat.c:937
 msgid "Unable to store AltiVec register"
 msgstr ""
 
 #. Anything else needs to be reported.
-#: ppc-linux-nat.c:965
+#: ppc-linux-nat.c:964
 msgid "Unable to set SPE registers"
 msgstr ""
 
-#: ppc-linux-nat.c:1152
+#: ppc-linux-nat.c:1151
 msgid "Couldn't get VSX registers"
 msgstr ""
 
-#: ppc-linux-nat.c:1158
+#: ppc-linux-nat.c:1157
 msgid "Couldn't write VSX registers"
 msgstr ""
 
-#: ppc-linux-nat.c:1175
+#: ppc-linux-nat.c:1174
 msgid "Couldn't get AltiVec registers"
 msgstr ""
 
-#: ppc-linux-nat.c:1181
+#: ppc-linux-nat.c:1180
 msgid "Couldn't write AltiVec registers"
 msgstr ""
 
-#: ppc-linux-nat.c:1218
+#: ppc-linux-nat.c:1217
 msgid "Couldn't set general-purpose registers."
 msgstr ""
 
-#: ppc-linux-nat.c:1280
+#: ppc-linux-nat.c:1279
 msgid "Couldn't set floating-point registers."
 msgstr ""
 
-#: ppc-linux-nat.c:1586
+#: ppc-linux-nat.c:1585
 msgid "Unexpected error setting breakpoint or watchpoint"
 msgstr ""
 
-#: ppc-linux-nat.c:1633
+#: ppc-linux-nat.c:1632
 msgid "Unexpected error deleting breakpoint or watchpoint"
 msgstr ""
 
-#: ppc-linux-tdep.c:1068
+#: ppc-linux-nat.c:2290
+msgid "The given mask covers kernel address space and cannot be used.\n"
+msgstr ""
+
+#: ppc-linux-tdep.c:1067
 msgid "Cannot find AT_ENTRY auxiliary vector entry."
 msgstr ""
 
 #. Can't happen.
-#: ppc-sysv-tdep.c:664
+#: ppc-sysv-tdep.c:672
 msgid "Unknown decimal float size."
 msgstr ""
 
-#: printcmd.c:114
+#: printcmd.c:110
 #, possible-c-format
 msgid ""
 "The largest offset that will be printed in <symbol+1234> form is %s.\n"
 msgstr ""
 
-#: printcmd.c:126
+#: printcmd.c:122
 #, possible-c-format
 msgid "Printing of source filename and line number with <symbol> is %s.\n"
 msgstr ""
 
-#: printcmd.c:451 printcmd.c:527
+#: printcmd.c:447 printcmd.c:523
 #, possible-c-format
 msgid "Undefined output size \"%c\"."
 msgstr ""
 
-#: printcmd.c:549
+#: printcmd.c:545
 #, possible-c-format
 msgid "Undefined output format \"%c\"."
 msgstr ""
 
-#: printcmd.c:862
+#: printcmd.c:858
 #, possible-c-format
 msgid "Unable to display strings with size '%c', using 'b' instead."
 msgstr ""
 
-#: printcmd.c:930
+#: printcmd.c:926
 #, possible-c-format
 msgid "Size letters are meaningless in \"%s\" command."
 msgstr ""
 
-#: printcmd.c:932
+#: printcmd.c:928
 #, possible-c-format
 msgid "Item count other than 1 is meaningless in \"%s\" command."
 msgstr ""
 
-#: printcmd.c:935
+#: printcmd.c:931
 #, possible-c-format
 msgid "Format letter \"%c\" is meaningless in \"%s\" command."
 msgstr ""
 
-#: printcmd.c:1102
+#: printcmd.c:1098
 msgid "address"
 msgstr ""
 
-#: printcmd.c:1124
+#: printcmd.c:1120
 msgid "mapped"
 msgstr ""
 
-#: printcmd.c:1124
+#: printcmd.c:1120
 msgid "unmapped"
 msgstr ""
 
-#: printcmd.c:1145
+#: printcmd.c:1141
 #, possible-c-format
 msgid "%s in load address range of %s overlay section %s of %s\n"
 msgstr ""
 
-#: printcmd.c:1149
+#: printcmd.c:1145
 #, possible-c-format
 msgid "%s in load address range of section %s of %s\n"
 msgstr ""
 
-#: printcmd.c:1154
+#: printcmd.c:1150
 #, possible-c-format
 msgid "%s in %s overlay section %s of %s\n"
 msgstr ""
 
-#: printcmd.c:1157
+#: printcmd.c:1153
 #, possible-c-format
 msgid "%s in section %s of %s\n"
 msgstr ""
 
-#: printcmd.c:1162
+#: printcmd.c:1158
 #, possible-c-format
 msgid "%s in load address range of %s overlay section %s\n"
 msgstr ""
 
-#: printcmd.c:1166
+#: printcmd.c:1162
 #, possible-c-format
 msgid "%s in load address range of section %s\n"
 msgstr ""
 
-#: printcmd.c:1170
+#: printcmd.c:1166
 #, possible-c-format
 msgid "%s in %s overlay section %s\n"
 msgstr ""
 
-#: printcmd.c:1173
+#: printcmd.c:1169
 #, possible-c-format
 msgid "%s in section %s\n"
 msgstr ""
 
-#: printcmd.c:1180
+#: printcmd.c:1176
 #, possible-c-format
 msgid "No symbol matches %s.\n"
 msgstr ""
 
-#: printcmd.c:1197
+#: printcmd.c:1193
 msgid "Argument required."
 msgstr ""
 
-#: printcmd.c:1294
+#: printcmd.c:1290
 #, possible-c-format
 msgid "an argument in register %s"
 msgstr ""
 
-#: printcmd.c:1297
+#: printcmd.c:1293
 #, possible-c-format
 msgid "a variable in register %s"
 msgstr ""
 
-#: printcmd.c:1302 printcmd.c:1372
+#: printcmd.c:1298 printcmd.c:1368
 msgid "static storage at address "
 msgstr ""
 
-#: printcmd.c:1308 printcmd.c:1345 printcmd.c:1377
+#: printcmd.c:1304 printcmd.c:1341 printcmd.c:1373
 msgid ""
 ",\n"
 " -- loaded at "
 msgstr ""
 
-#: printcmd.c:1310 printcmd.c:1347 printcmd.c:1379
+#: printcmd.c:1306 printcmd.c:1343 printcmd.c:1375
 #, possible-c-format
 msgid " in overlay section %s"
 msgstr ""
 
-#: printcmd.c:1318
+#: printcmd.c:1314
 #, possible-c-format
 msgid "address of an argument in register %s"
 msgstr ""
 
-#: printcmd.c:1323
+#: printcmd.c:1319
 #, possible-c-format
 msgid "an argument at offset %ld"
 msgstr ""
 
-#: printcmd.c:1327
+#: printcmd.c:1323
 #, possible-c-format
 msgid "a local variable at frame offset %ld"
 msgstr ""
 
-#: printcmd.c:1331
+#: printcmd.c:1327
 #, possible-c-format
 msgid "a reference argument at offset %ld"
 msgstr ""
 
-#: printcmd.c:1335
+#: printcmd.c:1331
 msgid "a typedef"
 msgstr ""
 
-#: printcmd.c:1339
+#: printcmd.c:1335
 msgid "a function at address "
 msgstr ""
 
-#: printcmd.c:1366
+#: printcmd.c:1362
 #, possible-c-format
 msgid ""
 "a thread-local variable at offset %s in the thread-local storage for `%s'"
 msgstr ""
 
-#: printcmd.c:1388
+#: printcmd.c:1384
 msgid "optimized out"
 msgstr ""
 
-#: printcmd.c:1392
+#: printcmd.c:1388
 msgid "of unknown (botched) type"
 msgstr ""
 
-#: printcmd.c:1446
+#: printcmd.c:1442
 msgid "starting display address"
 msgstr ""
 
-#: printcmd.c:1605
+#: printcmd.c:1601
 msgid "one or more display numbers"
 msgstr ""
 
-#: printcmd.c:1615
+#: printcmd.c:1611
 #, possible-c-format
 msgid "bad display number at or near '%s'"
 msgstr ""
 
-#: printcmd.c:1624 printcmd.c:1814
+#: printcmd.c:1620 printcmd.c:1827
 #, possible-c-format
 msgid "No display number %d.\n"
 msgstr ""
 
-#: printcmd.c:1649
+#: printcmd.c:1645
 msgid "Delete all auto-display expressions? "
 msgstr ""
 
-#: printcmd.c:1699
+#: printcmd.c:1696
 #, possible-c-format
 msgid "Unable to display \"%s\": %s"
 msgstr ""
 
-#: printcmd.c:1824
+#: printcmd.c:1759
 #, possible-c-format
-msgid "Disabling display %d to avoid infinite recursion.\n"
+msgid "<error: %s>\n"
+msgstr ""
+
+#: printcmd.c:1791 value.c:2118
+#, possible-c-format
+msgid "<error: %s>"
 msgstr ""
 
 #: printcmd.c:1837
+#, possible-c-format
+msgid "Disabling display %d to avoid infinite recursion.\n"
+msgstr ""
+
+#: printcmd.c:1850
 msgid "There are no auto-display expressions now.\n"
 msgstr ""
 
-#: printcmd.c:1839
+#: printcmd.c:1852
 msgid ""
 "Auto-display expressions now in effect:\n"
 "Num Enb Expression\n"
 msgstr ""
 
-#: printcmd.c:1852
+#: printcmd.c:1865
 msgid " (cannot be evaluated in the current context)"
 msgstr ""
 
-#: printcmd.c:1989
+#: printcmd.c:2003
 msgid "format-control string and values to print"
 msgstr ""
 
-#: printcmd.c:1995
+#: printcmd.c:2009
 msgid "Bad format string, missing '\"'."
 msgstr ""
 
-#: printcmd.c:2008
+#: printcmd.c:2022
 msgid "Bad format string, non-terminated '\"'."
 msgstr ""
 
 #. ??? TODO: handle other escape sequences.
-#: printcmd.c:2042
+#: printcmd.c:2056
 #, possible-c-format
 msgid "Unrecognized escape character \\%c in format string."
 msgstr ""
 
-#: printcmd.c:2058
+#: printcmd.c:2072
 msgid "Invalid argument syntax"
 msgstr ""
 
-#: printcmd.c:2248
+#: printcmd.c:2262
 msgid "`*' not supported for precision or width in printf"
 msgstr ""
 
-#: printcmd.c:2251
+#: printcmd.c:2265
 msgid "Format specifier `n' not supported in printf"
 msgstr ""
 
-#: printcmd.c:2254
+#: printcmd.c:2268
 msgid "Incomplete format specifier at end of format string"
 msgstr ""
 
-#: printcmd.c:2257
+#: printcmd.c:2271
 #, possible-c-format
 msgid "Unrecognized format specifier '%c' in printf"
 msgstr ""
 
-#: printcmd.c:2261
+#: printcmd.c:2275
 #, possible-c-format
 msgid "Inappropriate modifiers to format specifier '%c' in printf"
 msgstr ""
 
-#: printcmd.c:2320
+#: printcmd.c:2334
 msgid "Wrong number of arguments for specified format-string"
 msgstr ""
 
-#: printcmd.c:2416
+#: printcmd.c:2430
 #, possible-c-format
 msgid "expected wchar_t argument for %%lc"
 msgstr ""
 
-#: printcmd.c:2446 printcmd.c:2463 value.c:2123
+#: printcmd.c:2460 printcmd.c:2477 value.c:2152
 msgid "Invalid floating value found in program."
 msgstr ""
 
-#: printcmd.c:2470
+#: printcmd.c:2484
 msgid "long double not supported in printf"
 msgstr ""
 
-#: printcmd.c:2481
+#: printcmd.c:2495
 msgid "long long not supported in printf"
 msgstr ""
 
-#: printcmd.c:2716
+#: printcmd.c:2730
 msgid "Describe where symbol SYM is stored."
 msgstr ""
 
-#: printcmd.c:2718
+#: printcmd.c:2732
 msgid ""
 "Describe what symbol is at location ADDR.\n"
 "Only for symbols with fixed locations (global or static scope)."
 msgstr ""
 
-#: printcmd.c:2722
+#: printcmd.c:2736
 msgid ""
 "Examine memory: x/FMT ADDRESS.\n"
 "ADDRESS is an expression for the memory address to examine.\n"
@@ -15905,15 +16464,15 @@
 "with this command or \"print\"."
 msgstr ""
 
-#: printcmd.c:2737
+#: printcmd.c:2751
 msgid "Print line number and file of definition of variable."
 msgstr ""
 
-#: printcmd.c:2740
+#: printcmd.c:2754
 msgid "Expressions to display when program stops, with code numbers."
 msgstr ""
 
-#: printcmd.c:2743
+#: printcmd.c:2757
 msgid ""
 "Cancel some expressions to be displayed when program stops.\n"
 "Arguments are the code numbers of the expressions to stop displaying.\n"
@@ -15922,7 +16481,7 @@
 "Do \"info display\" to see current list of code numbers."
 msgstr ""
 
-#: printcmd.c:2751
+#: printcmd.c:2765
 msgid ""
 "Print value of expression EXP each time the program stops.\n"
 "/FMT may be used before EXP as in the \"print\" command.\n"
@@ -15934,7 +16493,7 @@
 "Use \"undisplay\" to cancel display requests previously made."
 msgstr ""
 
-#: printcmd.c:2760
+#: printcmd.c:2774
 msgid ""
 "Enable some expressions to be displayed when program stops.\n"
 "Arguments are the code numbers of the expressions to resume displaying.\n"
@@ -15942,7 +16501,7 @@
 "Do \"info display\" to see current list of code numbers."
 msgstr ""
 
-#: printcmd.c:2766
+#: printcmd.c:2780
 msgid ""
 "Disable some expressions to be displayed when program stops.\n"
 "Arguments are the code numbers of the expressions to stop displaying.\n"
@@ -15950,7 +16509,7 @@
 "Do \"info display\" to see current list of code numbers."
 msgstr ""
 
-#: printcmd.c:2772
+#: printcmd.c:2786
 msgid ""
 "Cancel some expressions to be displayed when program stops.\n"
 "Arguments are the code numbers of the expressions to stop displaying.\n"
@@ -15958,19 +16517,19 @@
 "Do \"info display\" to see current list of code numbers."
 msgstr ""
 
-#: printcmd.c:2778
+#: printcmd.c:2792
 msgid ""
 "printf \"printf format string\", arg1, arg2, arg3, ..., argn\n"
 "This is useful for formatted output in user-defined commands."
 msgstr ""
 
-#: printcmd.c:2782
+#: printcmd.c:2796
 msgid ""
 "Like \"print\" but don't put in value history and don't print newline.\n"
 "This is useful in user-defined commands."
 msgstr ""
 
-#: printcmd.c:2786 printcmd.c:2798
+#: printcmd.c:2800 printcmd.c:2812
 msgid ""
 "Evaluate expression EXP and assign result to variable VAR, using assignment\n"
 "syntax appropriate for the current language (VAR = EXP or VAR := EXP for\n"
@@ -15984,7 +16543,7 @@
 msgstr ""
 
 #. "call" is the same as "set", but handy for dbx users to call fns.
-#: printcmd.c:2809
+#: printcmd.c:2823
 msgid ""
 "Call a function in the program.\n"
 "The argument is the function name and arguments, in the notation of the\n"
@@ -15992,7 +16551,7 @@
 "history, if it is not void."
 msgstr ""
 
-#: printcmd.c:2816
+#: printcmd.c:2830
 msgid ""
 "Evaluate expression EXP and assign result to variable VAR, using assignment\n"
 "syntax appropriate for the current language (VAR = EXP or VAR := EXP for\n"
@@ -16002,7 +16561,7 @@
 "This may usually be abbreviated to simply \"set\"."
 msgstr ""
 
-#: printcmd.c:2825
+#: printcmd.c:2839
 msgid ""
 "Print value of expression EXP.\n"
 "Variables accessible are those of the lexical environment of the selected\n"
@@ -16028,29 +16587,29 @@
 "but no count or size letter (see \"x\" command)."
 msgstr ""
 
-#: printcmd.c:2850
+#: printcmd.c:2864
 msgid ""
 "Same as \"print\" command, except that if you are running in the epoch\n"
 "environment, the value is printed in its own window."
 msgstr ""
 
-#: printcmd.c:2856
+#: printcmd.c:2870
 msgid "Set the largest offset that will be printed in <symbol+1234> form."
 msgstr ""
 
-#: printcmd.c:2857
+#: printcmd.c:2871
 msgid "Show the largest offset that will be printed in <symbol+1234> form."
 msgstr ""
 
-#: printcmd.c:2863
+#: printcmd.c:2877
 msgid "Set printing of source filename and line number with <symbol>."
 msgstr ""
 
-#: printcmd.c:2864
+#: printcmd.c:2878
 msgid "Show printing of source filename and line number with <symbol>."
 msgstr ""
 
-#: printcmd.c:2870
+#: printcmd.c:2884
 msgid ""
 "Convert \"printf format string\", arg1, arg2, arg3, ..., argn to\n"
 "a command line, and call it."
@@ -16072,12 +16631,12 @@
 msgid "Show filename for /proc tracefile."
 msgstr ""
 
-#: procfs.c:490
+#: procfs.c:489
 #, possible-c-format
 msgid "procfs: couldn't find pid %d (kernel thread %d) in procinfo list."
 msgstr ""
 
-#: procfs.c:494
+#: procfs.c:493
 #, possible-c-format
 msgid "procfs: couldn't find pid %d in procinfo list."
 msgstr ""
@@ -16087,177 +16646,177 @@
 msgid "load_syscalls: Can't open /proc/%d/sysent"
 msgstr ""
 
-#: procfs.c:896 procfs.c:911
+#: procfs.c:897 procfs.c:911
 #, possible-c-format
 msgid "load_syscalls: Error reading /proc/%d/sysent"
 msgstr ""
 
-#: procfs.c:901
+#: procfs.c:902
 #, possible-c-format
 msgid "load_syscalls: /proc/%d/sysent contains no syscalls!"
 msgstr ""
 
-#: procfs.c:1444
+#: procfs.c:1442
 #, possible-c-format
 msgid "procfs: modify_flag failed to turn %s %s"
 msgstr ""
 
-#: procfs.c:1721
+#: procfs.c:1719
 msgid "procfs: set_traced_signals failed"
 msgstr ""
 
-#: procfs.c:2813
+#: procfs.c:2811
 #, possible-c-format
 msgid "procfs_find_LDT_entry: could not find procinfo for %d:%ld."
 msgstr ""
 
-#: procfs.c:2820
+#: procfs.c:2818
 #, possible-c-format
 msgid "procfs_find_LDT_entry: could not read gregs for %d:%ld."
 msgstr ""
 
-#: procfs.c:3302
+#: procfs.c:3300
 #, possible-c-format
 msgid "Attaching to program `%s', %s\n"
 msgstr ""
 
-#: procfs.c:3352
+#: procfs.c:3350
 msgid "procfs: out of memory in 'attach'"
 msgstr ""
 
-#: procfs.c:3441
+#: procfs.c:3439
 msgid "Was stopped when attached, make it runnable again? "
 msgstr ""
 
-#: procfs.c:3484
+#: procfs.c:3482
 #, possible-c-format
 msgid "procfs: fetch_registers failed to find procinfo for %s"
 msgstr ""
 
-#: procfs.c:3533
+#: procfs.c:3531
 #, possible-c-format
 msgid "procfs: store_registers: failed to find procinfo for %s"
 msgstr ""
 
-#: procfs.c:3640
+#: procfs.c:3638
 msgid "Unable to remove __dbx_link breakpoint."
 msgstr ""
 
-#: procfs.c:3695
+#: procfs.c:3693
 #, possible-c-format
 msgid "Failed to create a bfd: %s."
 msgstr ""
 
-#: procfs.c:3716
+#: procfs.c:3714
 msgid "Failed to insert dbx_link breakpoint."
 msgstr ""
 
 #. /proc file not found; presumably child has terminated.
 #. "wait" for the child's exit.
 #. wrong child?
-#: procfs.c:3855
+#: procfs.c:3853
 #, possible-c-format
 msgid "procfs: couldn't stop process %d: wait returned %d."
 msgstr ""
 
-#: procfs.c:3963
+#: procfs.c:3961
 msgid "procfs: trapped on entry to "
 msgstr ""
 
-#: procfs.c:3973 procfs.c:4076
+#: procfs.c:3971 procfs.c:4074
 #, possible-c-format
 msgid "%ld syscall arguments:\n"
 msgstr ""
 
-#: procfs.c:4066
+#: procfs.c:4064
 msgid "procfs: trapped on exit from "
 msgstr ""
 
-#: procfs.c:4095
+#: procfs.c:4093
 #, possible-c-format
 msgid "Retry #%d:\n"
 msgstr ""
 
-#: procfs.c:4171 procfs.c:4179
+#: procfs.c:4169 procfs.c:4177
 msgid "child stopped for unknown reason:\n"
 msgstr ""
 
-#: procfs.c:4173 procfs.c:4181
+#: procfs.c:4171 procfs.c:4179
 msgid "... giving up..."
 msgstr ""
 
-#: procfs.c:4204
+#: procfs.c:4202
 msgid "procfs: ...giving up..."
 msgstr ""
 
-#: procfs.c:4459
+#: procfs.c:4457
 msgid ""
 "resume: target already running.  Pretend to resume, and hope for the best!"
 msgstr ""
 
-#: procfs.c:4495
+#: procfs.c:4493
 #, possible-c-format
 msgid "\tUsing the running image of %s %s via /proc.\n"
 msgstr ""
 
-#: procfs.c:4631
+#: procfs.c:4629
 msgid "procfs: out of memory in 'init_inferior'"
 msgstr ""
 
-#: procfs.c:4740
+#: procfs.c:4738
 msgid "procfs: create_procinfo failed in child."
 msgstr ""
 
 #. Not found.  This must be an error rather than merely passing
 #. the file to execlp(), because execlp() would try all the
 #. exec()s, causing GDB to get confused.
-#: procfs.c:4911
+#: procfs.c:4909
 #, possible-c-format
 msgid "procfs:%d -- Can't find shell %s in PATH"
 msgstr ""
 
-#: procfs.c:5453
+#: procfs.c:5456
 #, possible-c-format
 msgid "process %d flags:\n"
 msgstr ""
 
-#: procfs.c:5463
+#: procfs.c:5466
 #, possible-c-format
 msgid "thread %d flags:\n"
 msgstr ""
 
-#: procfs.c:5523
+#: procfs.c:5526
 msgid "you must be debugging a process to use this command."
 msgstr ""
 
-#: procfs.c:5526
+#: procfs.c:5529
 msgid "system call to trace"
 msgstr ""
 
-#: procfs.c:5567
+#: procfs.c:5570
 msgid ""
 "Show /proc process information about any running process.\n"
 "Specify process id, or use the program being debugged by default.\n"
 "Specify keyword 'mappings' for detailed info on memory mappings."
 msgstr ""
 
-#: procfs.c:5572
+#: procfs.c:5575
 msgid "Give a trace of entries into the syscall."
 msgstr ""
 
-#: procfs.c:5574
+#: procfs.c:5577
 msgid "Give a trace of exits from the syscall."
 msgstr ""
 
-#: procfs.c:5576
+#: procfs.c:5579
 msgid "Cancel a trace of entries into the syscall."
 msgstr ""
 
-#: procfs.c:5578
+#: procfs.c:5581
 msgid "Cancel a trace of exits from the syscall."
 msgstr ""
 
-#: procfs.c:5774
+#: procfs.c:5777
 msgid "gcore not implemented for this host."
 msgstr ""
 
@@ -16270,1023 +16829,1081 @@
 msgid "Info about currently known program spaces."
 msgstr ""
 
-#: psymtab.c:88 symfile.c:1118
+#: psymtab.c:88 symfile.c:1120
 #, possible-c-format
 msgid "Reading symbols from %s..."
 msgstr ""
 
-#: psymtab.c:98 symfile.c:1147
+#: psymtab.c:98 symfile.c:1149
 msgid "(no debugging symbols found)..."
 msgstr ""
 
-#: psymtab.c:197
-#, possible-c-format
-msgid "Internal: readin %s pst for `%s' found when no symtab found."
-msgstr ""
-
 #. Might want to error() here (in case symtab is corrupt and
 #. will cause a core dump), but maybe we can successfully
 #. continue, so let's not.
-#: psymtab.c:366
+#: psymtab.c:394
 #, possible-c-format
 msgid "(Internal error: pc %s in read in psymtab, but not in symtab.)\n"
 msgstr ""
 
-#: psymtab.c:806
+#: psymtab.c:842
 msgid "select_source_symtab: readin pst found and no symtabs."
 msgstr ""
 
-#: psymtab.c:1002
+#: psymtab.c:1040
 #, possible-c-format
 msgid "  Number of psym tables (not yet expanded): %d\n"
 msgstr ""
 
-#: psymtab.c:1676
+#: psymtab.c:1722
 msgid ""
 "print-psymbols takes an output file name and optional symbol file name"
 msgstr ""
 
-#: python/py-value.c:132
-msgid "Value object creation takes only 1 argument"
+#: p-typeprint.c:300
+msgid "type not handled in pascal_type_print_varspec_prefix()"
 msgstr ""
 
-#: python/py-value.c:140
-msgid "Could not allocate memory to create Value object."
+#: p-typeprint.c:419
+msgid "type not handled in pascal_type_print_varspec_suffix()"
 msgstr ""
 
-#: python/py-value.c:386
-msgid "Argument must be a type."
+#: p-valprint.c:575
+#, possible-c-format
+msgid "Invalid pascal type code %d in symbol table."
+msgstr ""
+
+#: p-valprint.c:624
+#, possible-c-format
+msgid "Printing of pascal static members is %s.\n"
+msgstr ""
+
+#: p-valprint.c:1075
+msgid "Set printing of pascal static members."
+msgstr ""
+
+#: p-valprint.c:1076
+msgid "Show printing of pascal static members."
+msgstr ""
+
+#: python/py-auto-load.c:260
+#, possible-c-format
+msgid "Invalid entry in %s section"
+msgstr ""
+
+#: python/py-auto-load.c:275
+#, possible-c-format
+msgid "Non-null-terminated path in %s: %s"
+msgstr ""
+
+#: python/py-auto-load.c:282
+#, possible-c-format
+msgid "Empty path in %s"
+msgstr ""
+
+#: python/py-auto-load.c:304
+#, possible-c-format
+msgid ""
+"Missing auto-load scripts referenced in section %s\n"
+"of file %s\n"
+"Use `info auto-load-scripts [REGEXP]' to list them."
+msgstr ""
+
+#: python/py-auto-load.c:345
+#, possible-c-format
+msgid "Couldn't read %s section of %s"
+msgstr ""
+
+#: python/py-auto-load.c:549 solib.c:882 solib.c:964 xcoffsolib.c:113
+#, possible-c-format
+msgid "Invalid regexp: %s"
+msgstr ""
+
+#: python/py-auto-load.c:613
+msgid "Set the debugger's behaviour regarding auto-loaded scripts."
+msgstr ""
+
+#: python/py-auto-load.c:614
+msgid "Show the debugger's behaviour regarding auto-loaded scripts."
 msgstr ""
 
-#: python/py-value.c:438 python/py-value.c:901 python/py-value.c:938
-msgid "Invalid operation on gdb.Value."
+#: python/py-auto-load.c:615
+msgid ""
+"If enabled, auto-loaded scripts are loaded when the debugger reads\n"
+"an executable or shared library."
 msgstr ""
 
-#: python/py-value.c:482
-msgid "Cannot subscript requested type."
+#: python/py-auto-load.c:624
+msgid ""
+"Print the list of automatically loaded scripts.\n"
+"Usage: info auto-load-scripts [REGEXP]"
 msgstr ""
 
-#: python/py-value.c:499
-msgid "Setting of struct elements is not currently supported."
+#. Require a valid block.  All access to block_object->block should be
+#. gated by this call.
+#: python/py-block.c:64
+msgid "Block is invalid."
 msgstr ""
 
-#: python/py-value.c:518
-msgid "Value is not callable (not TYPE_CODE_FUNC)."
+#. Require a valid block.  This macro is called during block iterator
+#. creation, and at each next call.
+#: python/py-block.c:76
+msgid "Source block for iterator is invalid."
 msgstr ""
 
-#: python/py-value.c:980
-msgid "Cannot convert value to int."
+#: python/py-block.c:322
+msgid "Symbol is null."
 msgstr ""
 
-#: python/py-value.c:1005
-msgid "Cannot convert value to long."
+#: python/py-block.c:391 python/py-frame.c:239
+msgid "Cannot locate object file for block."
 msgstr ""
 
-#: python/py-value.c:1031
-msgid "Cannot convert value to float."
+#: python/py-breakpoint.c:124
+msgid "Cannot delete `enabled' attribute."
 msgstr ""
 
-#: python/py-value.c:1171
-#, possible-c-format
-msgid "Could not convert Python object: %s."
+#: python/py-breakpoint.c:131
+msgid "The value of `enabled' must be a boolean."
 msgstr ""
 
-#: python/py-param.c:133
-msgid "String required for filename."
+#: python/py-breakpoint.c:163
+msgid "Cannot delete `silent' attribute."
 msgstr ""
 
-#: python/py-param.c:166
-msgid "ENUM arguments must be a string."
+#: python/py-breakpoint.c:169
+msgid "The value of `silent' must be a boolean."
 msgstr ""
 
-#: python/py-param.c:180
-msgid "The value must be member of an enumeration."
+#: python/py-breakpoint.c:194
+msgid "Cannot delete `thread' attribute."
 msgstr ""
 
-#: python/py-param.c:191
-msgid "A boolean argument is required."
+#: python/py-breakpoint.c:205
+msgid "Invalid thread ID."
 msgstr ""
 
-#: python/py-param.c:204
-msgid "A boolean or None is required"
+#: python/py-breakpoint.c:214
+msgid "The value of `thread' must be an integer or None."
 msgstr ""
 
-#: python/py-param.c:232
-msgid "The value must be integer."
+#: python/py-breakpoint.c:237
+msgid "Cannot delete `task' attribute."
 msgstr ""
 
-#: python/py-param.c:257
-msgid "Range exceeded."
+#: python/py-breakpoint.c:254
+msgid "Invalid task ID."
 msgstr ""
 
-#: python/py-param.c:267
-msgid "Unhandled type in parameter value."
+#: python/py-breakpoint.c:263
+msgid "The value of `task' must be an integer or None."
 msgstr ""
 
-#: python/py-param.c:284
-msgid "Cannot delete a parameter's value."
+#: python/py-breakpoint.c:308
+msgid "Cannot delete `ignore_count' attribute."
 msgstr ""
 
-#: python/py-param.c:314 python/py-cmd.c:505
-msgid "This command is not documented."
+#: python/py-breakpoint.c:314
+msgid "The value of `ignore_count' must be an integer."
 msgstr ""
 
-#: python/py-param.c:340
-msgid "Parameter must return a string value."
+#: python/py-breakpoint.c:344
+msgid "Cannot delete `hit_count' attribute."
 msgstr ""
 
-#: python/py-param.c:567
-msgid "An enumeration is required for PARAM_ENUM."
+#: python/py-breakpoint.c:357
+msgid "The value of `hit_count' must be zero."
 msgstr ""
 
-#: python/py-param.c:574
-msgid "The enumeration is not a sequence."
+#: python/py-breakpoint.c:439
+msgid "Cannot delete `condition' attribute."
 msgstr ""
 
-#: python/py-param.c:584
-msgid "The enumeration is empty."
+#: python/py-breakpoint.c:642
+msgid "Cannot understand watchpoint access type."
 msgstr ""
 
-#: python/py-param.c:605
-msgid "The enumeration item not a string."
+#: python/py-breakpoint.c:646
+msgid "Do not understand breakpoint type to set."
 msgstr ""
 
-#: python/py-param.c:667 python/py-cmd.c:441
-msgid "Invalid command class argument."
+#: python/py-breakpoint.c:826
+msgid "Error while creating breakpoint from GDB."
 msgstr ""
 
-#: python/py-param.c:679
-msgid "Invalid parameter class argument."
+#: python/py-breakpoint.c:921
+msgid ""
+"Cannot set 'stop' method.  There is an existing GDB condition attached to "
+"the breakpoint."
 msgstr ""
 
-#: python/py-param.c:686
-msgid "Only PARAM_ENUM accepts a fourth argument."
+#: python/py-cmd.c:125 python/py-cmd.c:220
+msgid "Invalid invocation of Python command object."
 msgstr ""
 
-#: python/py-function.c:48
-msgid "Could not convert value to Python object."
+#: python/py-cmd.c:134
+msgid "Python command object missing 'invoke' method."
 msgstr ""
 
-#: python/py-function.c:73
-msgid "No method named 'invoke' in object."
+#: python/py-cmd.c:143
+msgid "Could not convert arguments to Python string."
 msgstr ""
 
 #. An error occurred computing the string representation of the
 #. error message.  This is rare, but we should inform the user.
-#: python/py-function.c:99
+#: python/py-cmd.c:171
 msgid ""
-"An error occurred in a Python convenience function\n"
+"An error occurred in a Python command\n"
 "and then another occurred computing the error message.\n"
 msgstr ""
 
-#: python/py-function.c:119
+#: python/py-cmd.c:190
 #, possible-c-format
-msgid "Error occurred in Python convenience function: %s"
+msgid "Error occurred in Python command: %s"
 msgstr ""
 
-#: python/py-function.c:122
-msgid "Error occurred in Python convenience function."
+#: python/py-cmd.c:192
+msgid "Error occurred in Python command."
 msgstr ""
 
-#: python/py-function.c:138 python/py-prettyprint.c:642 python/python.c:187
-#: python/python.c:208
-msgid "Error while executing Python code."
+#: python/py-cmd.c:230 python/py-cmd.c:233
+msgid "Could not convert argument to Python string."
 msgstr ""
 
-#: python/py-function.c:173
-msgid "This function is not documented."
+#: python/py-cmd.c:331
+msgid "No command name found."
 msgstr ""
 
-#. Require a valid symbol.  All access to symbol_object->symbol should be
-#. gated by this call.
-#: python/py-symbol.c:48
-msgid "Symbol is invalid."
+#: python/py-cmd.c:363
+#, possible-c-format
+msgid "Could not find command prefix %s."
 msgstr ""
 
-#: python/py-type.c:293
-msgid "Array bound must be an integer"
+#: python/py-cmd.c:377
+#, possible-c-format
+msgid "'%s' is not a prefix command."
 msgstr ""
 
-#: python/py-type.c:309
-msgid "Array length must not be negative"
+#: python/py-cmd.c:425
+msgid "Command object already initialized."
 msgstr ""
 
-#: python/py-type.c:355
-msgid "This type does not have a range."
+#: python/py-cmd.c:441 python/py-param.c:669
+msgid "Invalid command class argument."
 msgstr ""
 
-#: python/py-type.c:428
-msgid "Type does not have a target."
+#: python/py-cmd.c:448
+msgid "Invalid completion type argument."
 msgstr ""
 
-#: python/py-type.c:585
-msgid "Null type name."
+#: python/py-cmd.c:505 python/py-param.c:314
+msgid "This command is not documented."
 msgstr ""
 
-#: python/py-type.c:604
-msgid "Type is not a template."
+#: python/py-finishbreakpoint.c:190
+msgid "\"FinishBreakpoint\" not meaningful in the outermost frame."
 msgstr ""
 
-#: python/py-type.c:616 python/py-type.c:669
-#, possible-c-format
-msgid "No argument %d in template."
+#: python/py-finishbreakpoint.c:196
+msgid "\"FinishBreakpoint\" cannot be set on a dummy frame."
 msgstr ""
 
-#: python/py-type.c:648 python/py-frame.c:429
-msgid "Second argument must be block."
+#: python/py-finishbreakpoint.c:204 python/py-finishbreakpoint.c:305
+msgid "Invalid ID for the `frame' object."
 msgstr ""
 
-#: python/py-type.c:680
-msgid "Template argument is optimized out"
+#: python/py-finishbreakpoint.c:219
+msgid "No thread currently selected."
 msgstr ""
 
-#: python/py-type.c:1038
-msgid "'block' argument must be a Block."
+#: python/py-finishbreakpoint.c:229
+msgid "The value of `internal' must be a boolean."
 msgstr ""
 
-#. Require a valid symbol table.  All access to symtab_object->symtab
-#. should be gated by this call.
-#: python/py-symtab.c:50
-msgid "Symbol Table is invalid."
+#. Require a valid frame.  This must be called inside a TRY_CATCH, or
+#. another context in which a gdb exception is allowed.
+#: python/py-frame.c:54
+msgid "Frame is invalid."
 msgstr ""
 
-#. Require a valid symbol table and line object.  All access to
-#. sal_object->sal should be gated by this call.
-#: python/py-symtab.c:80
-msgid "Symbol Table and Line is invalid."
+#: python/py-frame.c:292
+msgid "Could not allocate frame object."
 msgstr ""
 
-#: python/py-prettyprint.c:291 valprint.c:393
-msgid "<error reading variable>"
+#: python/py-frame.c:441 python/py-type.c:859
+msgid "Second argument must be block."
 msgstr ""
 
-#: python/py-prettyprint.c:815
-msgid "Argument must be a gdb.Value."
+#: python/py-frame.c:459
+#, possible-c-format
+msgid "Variable '%s' not found."
 msgstr ""
 
-#: python/py-objfile.c:101
-msgid "Cannot delete the pretty_printers attribute."
+#: python/py-frame.c:470
+msgid "Argument must be a symbol or string."
 msgstr ""
 
-#: python/py-objfile.c:108
-msgid "The pretty_printers attribute must be a list."
+#: python/py-frame.c:559
+msgid "Invalid frame stop reason."
 msgstr ""
 
-#: python/py-auto-load.c:200
-#, possible-c-format
-msgid "Invalid entry in %s section"
+#: python/py-function.c:86
+msgid "No method named 'invoke' in object."
 msgstr ""
 
-#: python/py-auto-load.c:215
-#, possible-c-format
-msgid "Non-null-terminated path in %s: %s"
+#. An error occurred computing the string representation of the
+#. error message.  This is rare, but we should inform the user.
+#: python/py-function.c:113
+msgid ""
+"An error occurred in a Python convenience function\n"
+"and then another occurred computing the error message.\n"
 msgstr ""
 
-#: python/py-auto-load.c:222
+#: python/py-function.c:133
 #, possible-c-format
-msgid "Empty path in %s"
+msgid "Error occurred in Python convenience function: %s"
 msgstr ""
 
-#: python/py-auto-load.c:272
-#, possible-c-format
-msgid "%s (referenced in %s): %s"
+#: python/py-function.c:136
+msgid "Error occurred in Python convenience function."
 msgstr ""
 
-#: python/py-auto-load.c:306
-#, possible-c-format
-msgid "Couldn't read %s section of %s"
+#: python/py-function.c:152 python/py-prettyprint.c:642 python/python.c:252
+#: python/python.c:274
+msgid "Error while executing Python code."
 msgstr ""
 
-#: python/py-auto-load.c:429
-#, possible-c-format
-msgid "Script name: %s\n"
+#: python/py-function.c:188
+msgid "This function is not documented."
 msgstr ""
 
-#: python/py-auto-load.c:430
-#, possible-c-format
-msgid "  Full name: %s\n"
+#. Require that INFERIOR be a valid inferior ID.
+#: python/py-inferior.c:75
+msgid "Inferior no longer exists."
 msgstr ""
 
-#: python/py-auto-load.c:451 solib.c:920 solib.c:1014 xcoffsolib.c:113
-#, possible-c-format
-msgid "Invalid regexp: %s"
+#: python/py-inferior.c:449
+msgid "Could not allocate memory buffer object."
 msgstr ""
 
-#: python/py-auto-load.c:453
+#: python/py-inferior.c:526
 #, possible-c-format
-msgid "Objfile scripts matching %s:\n"
+msgid "Memory buffer for address %s, which is %s bytes long."
 msgstr ""
 
-#: python/py-auto-load.c:458
-msgid "Objfile scripts:\n"
+#: python/py-inferior.c:540
+msgid "The memory buffer supports only one segment."
 msgstr ""
 
-#: python/py-auto-load.c:480
-msgid "Set the debugger's behaviour regarding auto-loaded scripts."
+#: python/py-inferior.c:607
+msgid "Search range is empty."
 msgstr ""
 
-#: python/py-auto-load.c:481
-msgid "Show the debugger's behaviour regarding auto-loaded scripts."
+#: python/py-inferior.c:615
+msgid "The search range is too large."
 msgstr ""
 
-#: python/py-auto-load.c:482
-msgid ""
-"If enabled, auto-loaded scripts are loaded when the debugger reads\n"
-"an executable or shared library."
+#: python/py-inferior.c:626
+msgid "The pattern is not a Python buffer."
 msgstr ""
 
-#: python/py-auto-load.c:491
-msgid "Print dump of auto-loaded section scripts matching REGEXP."
+#. Require that INFERIOR be a valid inferior ID.
+#: python/py-infthread.c:34 python/py-infthread.c:91
+msgid "Thread no longer exists."
 msgstr ""
 
-#: python/python.c:102
-msgid "internal error: Unhandled Python exception"
+#: python/py-infthread.c:98
+msgid "Cannot delete `name' attribute."
 msgstr ""
 
-#: python/python.c:177
-msgid "Invalid \"python\" block structure."
+#: python/py-infthread.c:106
+msgid "The value of `name' must be a string."
 msgstr ""
 
-#: python/python.c:283
-msgid "Programmer error: unhandled type."
+#: python/py-lazy-string.c:105
+msgid "Cannot create a value from NULL."
 msgstr ""
 
-#: python/python.c:310
-#, possible-c-format
-msgid "Could not find parameter `%s'."
+#: python/py-lazy-string.c:135
+msgid "Cannot create a lazy string with address 0x0, and a non-zero length."
 msgstr ""
 
-#: python/python.c:314
-#, possible-c-format
-msgid "`%s' is not a parameter."
+#: python/py-lazy-string.c:143
+msgid "A lazy string's type cannot be NULL."
 msgstr ""
 
-#: python/python.c:642
-msgid "Posted event is not callable"
+#: python/py-objfile.c:101
+msgid "Cannot delete the pretty_printers attribute."
 msgstr ""
 
-#: python/python.c:889 python/python.c:903 python/python.c:910
-msgid "Python scripting is not supported in this copy of GDB."
+#: python/py-objfile.c:108
+msgid "The pretty_printers attribute must be a list."
 msgstr ""
 
-#: python/python.c:917
-msgid "gdbpy_should_stop called when Python scripting is  not supported."
+#: python/py-param.c:133
+msgid "String required for filename."
 msgstr ""
 
-#: python/python.c:925
-msgid ""
-"gdbpy_breakpoint_has_py_cond called when Python scripting is not supported."
+#: python/py-param.c:166
+msgid "ENUM arguments must be a string."
 msgstr ""
 
-#: python/python.c:964
-msgid ""
-"Evaluate a Python command.\n"
-"\n"
-"The command can be given as an argument, for instance:\n"
-"\n"
-"    python print 23\n"
-"\n"
-"If no argument is given, the following lines are read and used\n"
-"as the Python commands.  Type a line containing \"end\" to indicate\n"
-"the end of the command."
+#: python/py-param.c:180
+msgid "The value must be member of an enumeration."
 msgstr ""
 
-#: python/python.c:975
-msgid ""
-"Evaluate a Python command.\n"
-"\n"
-"Python scripting is not supported in this copy of GDB.\n"
-"This command is only a placeholder."
+#: python/py-param.c:191
+msgid "A boolean argument is required."
 msgstr ""
 
-#: python/python.c:984 python/python.c:988
-msgid "Prefix command for python maintenance settings."
+#: python/py-param.c:204
+msgid "A boolean or None is required"
 msgstr ""
 
-#: python/python.c:993
-msgid "Enable or disable printing of Python stack dump on error."
+#: python/py-param.c:232
+msgid "The value must be integer."
 msgstr ""
 
-#: python/python.c:994
-msgid "Show whether Python stack will be printed on error."
+#: python/py-param.c:257
+msgid "Range exceeded."
 msgstr ""
 
-#: python/python.c:995
-msgid "Enables or disables printing of Python stack traces."
+#: python/py-param.c:267
+msgid "Unhandled type in parameter value."
 msgstr ""
 
-#. Require that INFERIOR be a valid inferior ID.
-#: python/py-inferior.c:74
-msgid "Inferior no longer exists."
+#: python/py-param.c:284
+msgid "Cannot delete a parameter's value."
 msgstr ""
 
-#: python/py-inferior.c:407
-msgid "Could not allocate memory buffer object."
+#: python/py-param.c:341
+msgid "Parameter must return a string value."
 msgstr ""
 
-#: python/py-inferior.c:483
-#, possible-c-format
-msgid "Memory buffer for address %s, which is %s bytes long."
+#: python/py-param.c:569
+msgid "An enumeration is required for PARAM_ENUM."
 msgstr ""
 
-#: python/py-inferior.c:497
-msgid "The memory buffer supports only one segment."
+#: python/py-param.c:576
+msgid "The enumeration is not a sequence."
 msgstr ""
 
-#: python/py-inferior.c:564
-msgid "Search range is empty."
+#: python/py-param.c:586
+msgid "The enumeration is empty."
 msgstr ""
 
-#: python/py-inferior.c:572
-msgid "The search range is too large."
+#: python/py-param.c:607
+msgid "The enumeration item not a string."
+msgstr ""
+
+#: python/py-param.c:681
+msgid "Invalid parameter class argument."
+msgstr ""
+
+#: python/py-param.c:688
+msgid "Only PARAM_ENUM accepts a fourth argument."
+msgstr ""
+
+#: python/py-prettyprint.c:291 valprint.c:394
+msgid "<error reading variable>"
+msgstr ""
+
+#: python/py-prettyprint.c:815
+msgid "Argument must be a gdb.Value."
 msgstr ""
 
-#: python/py-inferior.c:583
-msgid "The pattern is not a Python buffer."
+#. Require a valid symbol.  All access to symbol_object->symbol should be
+#. gated by this call.
+#: python/py-symbol.c:48
+msgid "Symbol is invalid."
 msgstr ""
 
-#: python/py-utils.c:79
-msgid "Expected a string or unicode object."
+#. Require a valid symbol table.  All access to symtab_object->symtab
+#. should be gated by this call.
+#: python/py-symtab.c:50
+msgid "Symbol Table is invalid."
 msgstr ""
 
-#: python/py-utils.c:322
-msgid "Overflow converting to address."
+#. Require a valid symbol table and line object.  All access to
+#. sal_object->sal should be gated by this call.
+#: python/py-symtab.c:80
+msgid "Symbol Table and Line is invalid."
 msgstr ""
 
-#. Require that INFERIOR be a valid inferior ID.
-#: python/py-infthread.c:34 python/py-infthread.c:92
-msgid "Thread no longer exists."
+#: python/py-type.c:470
+msgid "Array bound must be an integer"
 msgstr ""
 
-#: python/py-infthread.c:99
-msgid "Cannot delete `name' attribute."
+#: python/py-type.c:486
+msgid "Array length must not be negative"
 msgstr ""
 
-#: python/py-infthread.c:107
-msgid "The value of `name' must be a string."
+#: python/py-type.c:532
+msgid "This type does not have a range."
 msgstr ""
 
-#. Require a valid frame.  This must be called inside a TRY_CATCH, or
-#. another context in which a gdb exception is allowed.
-#: python/py-frame.c:54
-msgid "Frame is invalid."
+#: python/py-type.c:605
+msgid "Type does not have a target."
 msgstr ""
 
-#: python/py-frame.c:232 python/py-block.c:314
-msgid "Cannot locate object file for block."
+#: python/py-type.c:786
+msgid "Null type name."
 msgstr ""
 
-#: python/py-frame.c:284
-msgid "Could not allocate frame object."
+#: python/py-type.c:813
+msgid "Type is not a template."
 msgstr ""
 
-#: python/py-frame.c:447
+#: python/py-type.c:826 python/py-type.c:880
 #, possible-c-format
-msgid "Variable '%s' not found."
+msgid "No argument %d in template."
 msgstr ""
 
-#: python/py-frame.c:458
-msgid "Argument must be a symbol or string."
+#: python/py-type.c:891
+msgid "Template argument is optimized out"
 msgstr ""
 
-#: python/py-frame.c:473
+#: python/py-type.c:1044
 #, possible-c-format
-msgid "Variable cannot be found for symbol '%s'."
+msgid "Unsupported field kind %d by check_types_equal"
 msgstr ""
 
-#: python/py-frame.c:556
-msgid "Invalid frame stop reason."
+#: python/py-type.c:1482
+msgid "'block' argument must be a Block."
 msgstr ""
 
-#. Require a valid block.  All access to block_object->block should be
-#. gated by this call.
-#: python/py-block.c:64
-msgid "Block is invalid."
+#: python/py-utils.c:79
+msgid "Expected a string or unicode object."
 msgstr ""
 
-#. Require a valid block.  This macro is called during block iterator
-#. creation, and at each next call.
-#: python/py-block.c:76
-msgid "Source block for iterator is invalid."
+#: python/py-utils.c:322
+msgid "Overflow converting to address."
 msgstr ""
 
-#: python/py-block.c:251
-msgid "Symbol is null."
+#: python/py-value.c:132
+msgid "Value object creation takes only 1 argument"
 msgstr ""
 
-#. Require that BREAKPOINT be a valid breakpoint ID; throw a Python
-#. exception if it is invalid.
-#. Require that BREAKPOINT be a valid breakpoint ID; throw a Python
-#. exception if it is invalid.  This macro is for use in setter functions.
-#: python/py-breakpoint.c:64 python/py-breakpoint.c:74
-#, possible-c-format
-msgid "Breakpoint %d is invalid."
+#: python/py-value.c:140
+msgid "Could not allocate memory to create Value object."
 msgstr ""
 
-#: python/py-breakpoint.c:159
-msgid "Cannot delete `enabled' attribute."
+#: python/py-value.c:391
+msgid "Argument must be a type."
 msgstr ""
 
-#: python/py-breakpoint.c:166
-msgid "The value of `enabled' must be a boolean."
+#: python/py-value.c:443 python/py-value.c:982 python/py-value.c:1019
+msgid "Invalid operation on gdb.Value."
 msgstr ""
 
-#: python/py-breakpoint.c:192
-msgid "Cannot delete `silent' attribute."
+#: python/py-value.c:487
+msgid "Cannot subscript requested type."
 msgstr ""
 
-#: python/py-breakpoint.c:198
-msgid "The value of `silent' must be a boolean."
+#: python/py-value.c:504
+msgid "Setting of struct elements is not currently supported."
 msgstr ""
 
-#: python/py-breakpoint.c:223
-msgid "Cannot delete `thread' attribute."
+#: python/py-value.c:529
+msgid "Value is not callable (not TYPE_CODE_FUNC)."
 msgstr ""
 
-#: python/py-breakpoint.c:234
-msgid "Invalid thread ID."
+#: python/py-value.c:536
+msgid "Inferior arguments must be provided in a tuple."
 msgstr ""
 
-#: python/py-breakpoint.c:243
-msgid "The value of `thread' must be an integer or None."
+#: python/py-value.c:1060
+msgid "Cannot convert value to int."
 msgstr ""
 
-#: python/py-breakpoint.c:264
-msgid "Cannot delete `task' attribute."
+#: python/py-value.c:1083
+msgid "Cannot convert value to long."
 msgstr ""
 
-#: python/py-breakpoint.c:275
-msgid "Invalid task ID."
+#: python/py-value.c:1106
+msgid "Cannot convert value to float."
 msgstr ""
 
-#: python/py-breakpoint.c:284
-msgid "The value of `task' must be an integer or None."
+#: python/py-value.c:1242
+#, possible-c-format
+msgid "Could not convert Python object: %s."
 msgstr ""
 
-#: python/py-breakpoint.c:323
-msgid "Cannot delete `ignore_count' attribute."
+#. Require that BREAKPOINT be a valid breakpoint ID; throw a Python
+#. exception if it is invalid.
+#. Require that BREAKPOINT be a valid breakpoint ID; throw a Python
+#. exception if it is invalid.  This macro is for use in setter functions.
+#: python/python-internal.h:146 python/python-internal.h:156
+#, possible-c-format
+msgid "Breakpoint %d is invalid."
 msgstr ""
 
-#: python/py-breakpoint.c:329
-msgid "The value of `ignore_count' must be an integer."
+#: python/python.c:121
+msgid "internal error: Unhandled Python exception"
 msgstr ""
 
-#: python/py-breakpoint.c:354
-msgid "Cannot delete `hit_count' attribute."
+#: python/python.c:195
+#, possible-c-format
+msgid "Error while opening file: %s"
 msgstr ""
 
-#: python/py-breakpoint.c:367
-msgid "The value of `hit_count' must be zero."
+#: python/python.c:244
+msgid "Invalid \"python\" block structure."
 msgstr ""
 
-#: python/py-breakpoint.c:449
-msgid "Cannot delete `condition' attribute."
+#: python/python.c:348
+msgid "Programmer error: unhandled type."
 msgstr ""
 
-#: python/py-breakpoint.c:648
-msgid "Cannot understand watchpoint access type."
+#: python/python.c:376
+#, possible-c-format
+msgid "Could not find parameter `%s'."
 msgstr ""
 
-#: python/py-breakpoint.c:652
-msgid "Do not understand breakpoint type to set."
+#: python/python.c:380
+#, possible-c-format
+msgid "`%s' is not a parameter."
 msgstr ""
 
-#: python/py-breakpoint.c:825
-msgid "Error while creating breakpoint from GDB."
+#: python/python.c:711
+msgid "Posted event is not callable"
 msgstr ""
 
-#: python/py-breakpoint.c:918
-msgid ""
-"Cannot set 'stop' method.  There is an existing GDB condition attached to "
-"the breakpoint."
+#: python/python.c:792
+msgid "Return from prompt_hook must be either a Python string, or None"
 msgstr ""
 
-#: python/py-lazy-string.c:104
-msgid "Cannot create a value from NULL."
+#: python/python.c:931
+msgid "Error occurred computing Python errormessage.\n"
 msgstr ""
 
-#: python/py-lazy-string.c:129
-msgid "Cannot create a lazy string with address 0x0, and a non-zero length."
+#: python/python.c:1064 python/python.c:1078 python/python.c:1085
+msgid "Python scripting is not supported in this copy of GDB."
 msgstr ""
 
-#: python/py-lazy-string.c:137
-msgid "A lazy string's type cannot be NULL."
+#: python/python.c:1092
+msgid "gdbpy_should_stop called when Python scripting is  not supported."
 msgstr ""
 
-#: python/py-cmd.c:126 python/py-cmd.c:220
-msgid "Invalid invocation of Python command object."
+#: python/python.c:1100
+msgid ""
+"gdbpy_breakpoint_has_py_cond called when Python scripting is not supported."
 msgstr ""
 
-#: python/py-cmd.c:135
-msgid "Python command object missing 'invoke' method."
+#: python/python.c:1152
+#, possible-c-format
+msgid "The mode of Python stack printing on error is \"%s\".\n"
 msgstr ""
 
-#: python/py-cmd.c:144
-msgid "Could not convert arguments to Python string."
+#: python/python.c:1195
+msgid ""
+"Evaluate a Python command.\n"
+"\n"
+"The command can be given as an argument, for instance:\n"
+"\n"
+"    python print 23\n"
+"\n"
+"If no argument is given, the following lines are read and used\n"
+"as the Python commands.  Type a line containing \"end\" to indicate\n"
+"the end of the command."
 msgstr ""
 
-#. An error occurred computing the string representation of the
-#. error message.  This is rare, but we should inform the user.
-#: python/py-cmd.c:172
+#: python/python.c:1206
 msgid ""
-"An error occurred in a Python command\n"
-"and then another occurred computing the error message.\n"
+"Evaluate a Python command.\n"
+"\n"
+"Python scripting is not supported in this copy of GDB.\n"
+"This command is only a placeholder."
 msgstr ""
 
-#: python/py-cmd.c:191
-#, possible-c-format
-msgid "Error occurred in Python command: %s"
+#: python/python.c:1215 python/python.c:1219
+msgid "Prefix command for python maintenance settings."
 msgstr ""
 
-#: python/py-cmd.c:193
-msgid "Error occurred in Python command."
+#: python/python.c:1224
+msgid "Enable or disable printing of Python stack dump on error."
 msgstr ""
 
-#: python/py-cmd.c:230 python/py-cmd.c:233
-msgid "Could not convert argument to Python string."
+#: python/python.c:1225
+msgid "Show whether Python stack will be printed on error."
 msgstr ""
 
-#: python/py-cmd.c:330
-msgid "No command name found."
+#: python/python.c:1226
+msgid "Enables or disables printing of Python stack traces."
 msgstr ""
 
-#: python/py-cmd.c:362
-#, possible-c-format
-msgid "Could not find command prefix %s."
+#: python/python.c:1244 python/python.c:1249
+msgid "Prefix command for python preference settings."
 msgstr ""
 
-#: python/py-cmd.c:376
-#, possible-c-format
-msgid "'%s' is not a prefix command."
+#: python/python.c:1254
+msgid "Set mode for Python stack dump on error."
 msgstr ""
 
-#: python/py-cmd.c:425
-msgid "Command object already initialized."
+#: python/python.c:1255
+msgid "Show the mode of Python stack printing on error."
 msgstr ""
 
-#: python/py-cmd.c:448
-msgid "Invalid completion type argument."
+#: python/python.c:1256
+msgid ""
+"none  == no stack or message will be printed.\n"
+"full == a message and a stack will be printed.\n"
+"message == an error message without a stack will be printed."
 msgstr ""
 
-#: ravenscar-thread.c:393
+#: ravenscar-thread.c:396
 msgid "\"set ravenscar\" must be followed by the name of a setting.\n"
 msgstr ""
 
-#: ravenscar-thread.c:414
+#: ravenscar-thread.c:417
 msgid "Support for Ravenscar task/thread switching is enabled\n"
 msgstr ""
 
-#: ravenscar-thread.c:417
+#: ravenscar-thread.c:420
 msgid "Support for Ravenscar task/thread switching is disabled\n"
 msgstr ""
 
-#: ravenscar-thread.c:437
+#: ravenscar-thread.c:440
 msgid "Prefix command for changing Ravenscar-specific settings"
 msgstr ""
 
-#: ravenscar-thread.c:441
+#: ravenscar-thread.c:444
 msgid "Prefix command for showing Ravenscar-specific settings"
 msgstr ""
 
-#: ravenscar-thread.c:445
+#: ravenscar-thread.c:448
 msgid "Enable or disable support for GNAT Ravenscar tasks"
 msgstr ""
 
-#: ravenscar-thread.c:446
+#: ravenscar-thread.c:449
 msgid "Show whether support for GNAT Ravenscar tasks is enabled"
 msgstr ""
 
-#: ravenscar-thread.c:448
+#: ravenscar-thread.c:451
 msgid ""
 "Enable or disable support for task/thread switching with the GNAT\n"
 "Ravenscar run-time library for bareboard configuration."
 msgstr ""
 
-#: record.c:554
+#: record.c:557
 msgid ""
 "Do you want to auto delete previous execution log entries when record/replay "
 "buffer becomes full (record stop-at-limit)?"
 msgstr ""
 
-#: record.c:562
+#: record.c:565
 msgid "Process record: stopped by user."
 msgstr ""
 
-#: record.c:632
+#: record.c:635
 msgid "Process record: inferior program stopped."
 msgstr ""
 
-#: record.c:634 record.c:1475 record.c:1484 record.c:1490
+#: record.c:637 record.c:1573 record.c:1582 record.c:1588
 msgid "Process record: failed to record execution log."
 msgstr ""
 
-#: record.c:742
+#: record.c:745
 #, possible-c-format
 msgid "Process record: error reading memory at addr = %s len = %d."
 msgstr ""
 
-#: record.c:755
+#: record.c:758
 #, possible-c-format
 msgid "Process record: error writing memory at addr = %s len = %d."
 msgstr ""
 
-#: record.c:851
+#: record.c:867
 msgid "Process record: the program is not being run."
 msgstr ""
 
-#: record.c:853
+#: record.c:869
 msgid ""
 "Process record target can't debug inferior in non-stop mode (non-stop)."
 msgstr ""
 
-#: record.c:856
-msgid ""
-"Process record target can't debug inferior in asynchronous mode (target-"
-"async)."
-msgstr ""
-
-#: record.c:860
+#: record.c:873
 msgid ""
 "Process record: the current architecture doesn't support record function."
 msgstr ""
 
-#: record.c:864
+#: record.c:877
 msgid "Could not find 'to_resume' method on the target stack."
 msgstr ""
 
-#: record.c:866
+#: record.c:879
 msgid "Could not find 'to_wait' method on the target stack."
 msgstr ""
 
-#: record.c:868
+#: record.c:881
 msgid "Could not find 'to_store_registers' method on the target stack."
 msgstr ""
 
-#: record.c:871
+#: record.c:884
 msgid "Could not find 'to_insert_breakpoint' method on the target stack."
 msgstr ""
 
-#: record.c:874
+#: record.c:887
 msgid "Could not find 'to_remove_breakpoint' method on the target stack."
 msgstr ""
 
-#: record.c:877
+#: record.c:890
 msgid "Could not find 'to_stopped_by_watchpoint' method on the target stack."
 msgstr ""
 
-#: record.c:880
+#: record.c:893
 msgid "Could not find 'to_stopped_data_address' method on the target stack."
 msgstr ""
 
-#: record.c:898
+#: record.c:911
 msgid ""
 "Process record target already running.  Use \"record stop\" to stop record "
 "target first."
 msgstr ""
 
-#: record.c:948
+#: record.c:964
 msgid "Could not find 'to_xfer_partial' method on the target stack."
 msgstr ""
 
-#: record.c:1517
+#: record.c:1615
 msgid ""
 "Because GDB is in replay mode, changing the value of a register will make "
 "the execution log unusable from this point onward.  Change all registers?"
 msgstr ""
 
-#: record.c:1523
+#: record.c:1621
 #, possible-c-format
 msgid ""
 "Because GDB is in replay mode, changing the value of a register will make "
 "the execution log unusable from this point onward.  Change register %s?"
 msgstr ""
 
-#: record.c:1545 record.c:1578
+#: record.c:1643 record.c:1676
 msgid "Process record canceled the operation."
 msgstr ""
 
 #. Let user choose if he wants to write memory or not.
-#: record.c:1574
+#: record.c:1672
 #, possible-c-format
 msgid ""
 "Because GDB is in replay mode, writing to memory will make the execution log "
 "unusable from this point onward.  Write memory at address %s?"
 msgstr ""
 
-#: record.c:1709 reverse.c:275
+#: record.c:1807 reverse.c:271
 #, possible-c-format
 msgid "Unbalanced quotes: %s"
 msgstr ""
 
-#: record.c:1811 record.c:1898 target.c:526
+#: record.c:1956 record.c:2043 target.c:524
 msgid "You can't do that without a process to debug."
 msgstr ""
 
-#: record.c:1967
+#: record.c:2116
 #, possible-c-format
 msgid "Debugging of process record target is %s.\n"
 msgstr ""
 
-#: record.c:1989
+#: record.c:2138
 msgid ""
 "Delete the log from this point forward and begin to record the running "
 "message at current PC?"
 msgstr ""
 
-#: record.c:1995
+#: record.c:2144
 msgid "Already at end of record list.\n"
 msgstr ""
 
-#: record.c:1999 record.c:2014
+#: record.c:2148 record.c:2163
 msgid "Process record is not started.\n"
 msgstr ""
 
-#: record.c:2010
+#: record.c:2159
 msgid "Process record is stopped and all execution logs are deleted.\n"
 msgstr ""
 
-#: record.c:2039
+#: record.c:2188
 msgid "\"set record\" must be followed by an apporpriate subcommand.\n"
 msgstr ""
 
-#: record.c:2060
+#: record.c:2209
 msgid "Replay mode:\n"
 msgstr ""
 
-#: record.c:2062
+#: record.c:2211
 msgid "Record mode:\n"
 msgstr ""
 
 #. Display instruction number for first instruction in the log.
-#: record.c:2074
+#: record.c:2223
 #, possible-c-format
 msgid "Lowest recorded instruction number is %s.\n"
 msgstr ""
 
-#: record.c:2079
+#: record.c:2228
 #, possible-c-format
 msgid "Current instruction number is %s.\n"
 msgstr ""
 
 #. Display instruction number for last instruction in the log.
-#: record.c:2083
+#: record.c:2232
 #, possible-c-format
 msgid "Highest recorded instruction number is %s.\n"
 msgstr ""
 
 #. Display log count.
-#: record.c:2087
+#: record.c:2236
 #, possible-c-format
 msgid "Log contains %d instructions.\n"
 msgstr ""
 
-#: record.c:2092
+#: record.c:2241
 msgid "No instructions have been logged.\n"
 msgstr ""
 
-#: record.c:2097
+#: record.c:2246
 msgid "target record is not active.\n"
 msgstr ""
 
 #. Display max log size.
-#: record.c:2101
+#: record.c:2250
 #, possible-c-format
 msgid "Max logged instructions is %d.\n"
 msgstr ""
 
-#: record.c:2157
+#: record.c:2306
 #, possible-c-format
 msgid "Failed to read %d bytes from core file %s ('%s')."
 msgstr ""
 
-#: record.c:2229
+#: record.c:2378
 #, possible-c-format
 msgid "Version mis-match or file format error in core file %s."
 msgstr ""
 
-#: record.c:2334
+#: record.c:2483
 #, possible-c-format
 msgid "Bad entry type in core file %s."
 msgstr ""
 
-#: record.c:2355
+#: record.c:2504
 #, possible-c-format
 msgid "Auto increase record/replay buffer limit to %d."
 msgstr ""
 
 #. Succeeded.
-#: record.c:2360
+#: record.c:2509
 #, possible-c-format
 msgid "Restored records from core file %s.\n"
 msgstr ""
 
-#: record.c:2376
+#: record.c:2525
 #, possible-c-format
 msgid "Failed to write %d bytes to core file %s ('%s')."
 msgstr ""
 
-#: record.c:2421
+#: record.c:2570
 msgid ""
 "This command can only be used with target 'record'.\n"
 "Use 'target record' first.\n"
 msgstr ""
 
-#: record.c:2488
+#: record.c:2637
 #, possible-c-format
 msgid "Failed to create 'precord' section for corefile %s: %s"
 msgstr ""
 
 #. Succeeded.
-#: record.c:2617
+#: record.c:2766
 #, possible-c-format
 msgid "Saved core file %s with execution log.\n"
 msgstr ""
 
-#: record.c:2662
+#: record.c:2811
 msgid "Command requires an argument (insn number to go to)."
 msgstr ""
 
-#: record.c:2696
+#: record.c:2845
 #, possible-c-format
 msgid "Target insn '%s' not found."
 msgstr ""
 
-#: record.c:2698
+#: record.c:2847
 #, possible-c-format
 msgid "Already at insn '%s'."
 msgstr ""
 
-#: record.c:2701
+#: record.c:2850
 #, possible-c-format
 msgid "Go forward to insn number %s\n"
 msgstr ""
 
-#: record.c:2707
+#: record.c:2856
 #, possible-c-format
 msgid "Go backward to insn number %s\n"
 msgstr ""
 
-#: record.c:2732
+#: record.c:2881
 msgid "Set debugging of record/replay feature."
 msgstr ""
 
-#: record.c:2733
+#: record.c:2882
 msgid "Show debugging of record/replay feature."
 msgstr ""
 
-#: record.c:2734
+#: record.c:2883
 msgid ""
 "When enabled, debugging output for record/replay feature is displayed."
 msgstr ""
 
-#: record.c:2740
+#: record.c:2889
 msgid "Abbreviated form of \"target record\" command."
 msgstr ""
 
-#: record.c:2746
+#: record.c:2895
 msgid "Set record options"
 msgstr ""
 
-#: record.c:2750
+#: record.c:2899
 msgid "Show record options"
 msgstr ""
 
-#: record.c:2754
+#: record.c:2903
 msgid "Info record options"
 msgstr ""
 
-#: record.c:2759
+#: record.c:2908
 msgid ""
 "Save the execution log to a file.\n"
 "Argument is optional filename.\n"
 "Default filename is 'gdb_record.<process_id>'."
 msgstr ""
 
-#: record.c:2766
+#: record.c:2915
 msgid ""
 "Restore the execution log from a file.\n"
 "Argument is filename.  File must be created with 'record save'."
 msgstr ""
 
-#: record.c:2772
+#: record.c:2921
 msgid "Delete the rest of execution log and start recording it anew."
 msgstr ""
 
-#: record.c:2778
+#: record.c:2927
 msgid "Stop the record/replay target."
 msgstr ""
 
-#: record.c:2784
+#: record.c:2933
 msgid ""
 "Set whether record/replay stops when record/replay buffer becomes full."
 msgstr ""
 
-#: record.c:2785
+#: record.c:2934
 msgid ""
 "Show whether record/replay stops when record/replay buffer becomes full."
 msgstr ""
 
-#: record.c:2787
+#: record.c:2936
 msgid ""
 "Default is ON.\n"
 "When ON, if the record/replay buffer becomes full, ask user what to do.\n"
@@ -17294,1588 +17911,1617 @@
 "delete the oldest recorded instruction to make room for each new one."
 msgstr ""
 
-#: record.c:2795
+#: record.c:2944
 msgid "Set record/replay buffer limit."
 msgstr ""
 
-#: record.c:2796
+#: record.c:2945
 msgid "Show record/replay buffer limit."
 msgstr ""
 
-#: record.c:2796
+#: record.c:2945
 msgid ""
 "Set the maximum number of instructions to be stored in the\n"
 "record/replay buffer.  Zero means unlimited.  Default is 200000."
 msgstr ""
 
-#: record.c:2802
+#: record.c:2951
 msgid ""
 "Restore the program to its state at instruction number N.\n"
 "Argument is instruction number, as shown by 'info record'."
 msgstr ""
 
-#: record.c:2808
+#: record.c:2957
 msgid ""
 "Set whether query if PREC cannot record memory change of next instruction."
 msgstr ""
 
-#: record.c:2810
+#: record.c:2959
 msgid ""
 "Show whether query if PREC cannot record memory change of next instruction."
 msgstr ""
 
-#: record.c:2812
+#: record.c:2961
 msgid ""
 "Default is OFF.\n"
 "When ON, query if PREC cannot record memory change of next instruction."
 msgstr ""
 
-#: regcache.c:993
+#: regcache.c:1057
 msgid "PC register is not available"
 msgstr ""
 
-#: regcache.c:999
+#: regcache.c:1063
 msgid "regcache_read_pc: Unable to find PC"
 msgstr ""
 
-#: regcache.c:1015
+#: regcache.c:1079
 msgid "regcache_write_pc: Unable to update PC"
 msgstr ""
 
-#: regcache.c:1029
+#: regcache.c:1093
 msgid "Register cache flushed.\n"
 msgstr ""
 
-#: regcache.c:1049
+#: regcache.c:1113
 msgid "Bad switch"
 msgstr ""
 
-#: regcache.c:1324
+#: regcache.c:1412
 msgid "Force gdb to flush its register cache (maintainer command)"
 msgstr ""
 
-#: regcache.c:1327
+#: regcache.c:1415
 msgid ""
 "Print the internal register configuration.\n"
 "Takes an optional file parameter."
 msgstr ""
 
-#: regcache.c:1331
+#: regcache.c:1419
 msgid ""
 "Print the internal register configuration including raw values.\n"
 "Takes an optional file parameter."
 msgstr ""
 
-#: regcache.c:1336
+#: regcache.c:1424
 msgid ""
 "Print the internal register configuration including cooked values.\n"
 "Takes an optional file parameter."
 msgstr ""
 
-#: regcache.c:1341
+#: regcache.c:1429
 msgid ""
 "Print the internal register configuration including each register's group.\n"
 "Takes an optional file parameter."
 msgstr ""
 
-#: reggroups.c:249
+#: regcache.c:1434
+msgid ""
+"Print the internal register configuration including each register's\n"
+"remote register number and buffer offset in the g/G packets.\n"
+"Takes an optional file parameter."
+msgstr ""
+
+#: reggroups.c:248
 msgid "maintenance print reggroups"
 msgstr ""
 
-#: reggroups.c:290
+#: reggroups.c:289
 msgid ""
 "Print the internal register group names.\n"
 "Takes an optional file parameter."
 msgstr ""
 
-#: remote-fileio.c:1460
-msgid "Illegal argument for \"set remote system-call-allowed\" command"
+#. malformed packet error
+#. general case:
+#: remote.c:425
+msgid "remote.c: error in outgoing packet."
 msgstr ""
 
-#: remote-fileio.c:1467
+#: remote.c:427
 #, possible-c-format
-msgid "Garbage after \"show remote system-call-allowed\" command: `%s'"
+msgid "remote.c: error in outgoing packet at field #%ld."
 msgstr ""
 
-#: remote-fileio.c:1482
-msgid "Set if the host system(3) call is allowed for the target."
+#: remote.c:430
+#, possible-c-format
+msgid "trace API error 0x%s."
 msgstr ""
 
-#: remote-fileio.c:1486
-msgid "Show if the host system(3) call is allowed for the target."
+#: remote.c:432
+#, possible-c-format
+msgid "Target returns error code '%s'."
 msgstr ""
 
-#: remote-m32r-sdi.c:331
-msgid "Cannot pass arguments to remote STDEBUG process"
+#: remote.c:461
+#, possible-c-format
+msgid "invalid qRelocInsn packet: %s"
 msgstr ""
 
-#: remote-m32r-sdi.c:334 remote-mips.c:2332
-msgid "No executable file specified"
+#: remote.c:495
+msgid "warning: relocating instruction: "
 msgstr ""
 
-#: remote-m32r-sdi.c:393
-msgid "Connection refused."
+#: remote.c:761
+msgid ""
+"Send the ASCII ETX character (Ctrl-c) to the remote target to interrupt the "
+"execution of the program.\n"
 msgstr ""
 
-#: remote-m32r-sdi.c:396 remote-m32r-sdi.c:399
-msgid "Cannot connect to SDI target."
+#: remote.c:766
+msgid ""
+"send a break signal to the remote target to interrupt the execution of the "
+"program.\n"
 msgstr ""
 
-#: remote-m32r-sdi.c:726 remote-m32r-sdi.c:732 remote-m32r-sdi.c:748
-#: remote.c:6673
-msgid "Remote connection closed"
+#: remote.c:770
+msgid ""
+"Send a break signal and 'g' a.k.a. Magic SysRq g to the remote target to "
+"interrupt the execution of Linux kernel.\n"
 msgstr ""
 
-#: remote-m32r-sdi.c:1190
-msgid "Too many breakpoints"
+#: remote.c:775 remote.c:3148
+#, possible-c-format
+msgid "Invalid value for interrupt_sequence_mode: %s."
+msgstr ""
+
+#: remote.c:919
+msgid "Argument required (integer, `fixed' or `limited')."
 msgstr ""
 
-#: remote-m32r-sdi.c:1259
+#: remote.c:932
 #, possible-c-format
-msgid "Unknown option `%s'"
+msgid "Invalid %s (bad syntax)."
 msgstr ""
 
-#: remote-m32r-sdi.c:1274 symfile.c:2085
+#: remote.c:939
 #, possible-c-format
-msgid "\"%s\" is not an object file: %s"
+msgid "Invalid %s (too large)."
 msgstr ""
 
-#: remote-m32r-sdi.c:1325
+#: remote.c:945
 #, possible-c-format
-msgid "Error while downloading %s section."
+msgid ""
+"The target may not be able to correctly handle a %s\n"
+"of %ld bytes. Change the packet size? "
 msgstr ""
 
-#: remote-m32r-sdi.c:1444
-msgid "Too many watchpoints"
+#: remote.c:948
+msgid "Packet size not changed."
 msgstr ""
 
-#: remote-m32r-sdi.c:1686
-msgid "Reset SDI connection."
+#: remote.c:958
+#, possible-c-format
+msgid "The %s is %ld. "
 msgstr ""
 
-#: remote-m32r-sdi.c:1689
-msgid "Show status of SDI connection."
+#: remote.c:960
+#, possible-c-format
+msgid "Packets are fixed at %ld bytes.\n"
 msgstr ""
 
-#: remote-m32r-sdi.c:1692
-msgid "Debug M32R/Chaos."
+#: remote.c:963
+#, possible-c-format
+msgid "Packets are limited to %ld bytes.\n"
 msgstr ""
 
-#: remote-m32r-sdi.c:1695
-msgid "Use debug DMA mem access."
+#: remote.c:1087
+#, possible-c-format
+msgid "Support for the `%s' packet is auto-detected, currently %s.\n"
 msgstr ""
 
-#: remote-m32r-sdi.c:1697
-msgid "Use mon code mem access."
+#: remote.c:1093
+#, possible-c-format
+msgid "Support for the `%s' packet is currently %s.\n"
 msgstr ""
 
-#: remote-m32r-sdi.c:1700
-msgid "Set breakpoints by IB break."
+#: remote.c:1188
+msgid "packet_ok: attempt to use a disabled packet"
 msgstr ""
 
-#: remote-m32r-sdi.c:1702
-msgid "Set breakpoints by dbt."
+#. If the stub previously indicated that the packet was
+#. supported then there is a protocol error..
+#: remote.c:1202
+#, possible-c-format
+msgid "Protocol error: %s (%s) conflicting enabled responses."
 msgstr ""
 
-#: remote-mips.c:676
-msgid "Watchdog has expired.  Target detached."
+#. The user set it wrong.
+#: remote.c:1206
+#, possible-c-format
+msgid "Enabled packet %s (%s) not recognized by stub"
 msgstr ""
 
-#: remote-mips.c:680
-msgid "End of file from remote"
+#: remote.c:1295 remote.c:1316
+#, possible-c-format
+msgid "Could not find config for %s"
+msgstr ""
+
+#. Error of some sort.
+#. We're out of sync with the target now.  Did it continue
+#. or not?  We can't tell which thread it was in non-stop,
+#. so just ignore this.
+#. Error of some sort.
+#. We're out of sync with the target now.  Did it continue or
+#. not?  Not is more likely, so report a stop.
+#: remote.c:1433 remote.c:2827 remote.c:2867 remote.c:2984 remote.c:3886
+#: remote.c:5464 remote.c:5563 remote.c:6783
+#, possible-c-format
+msgid "Remote failure reply: %s"
 msgstr ""
 
-#: remote-mips.c:682
+#: remote.c:1912
 #, possible-c-format
-msgid "Error reading from remote: %s"
+msgid "invalid remote ptid: %s"
 msgstr ""
 
-#. At this point, about the only thing we can do is abort the command
-#. in progress and get back to command level as quickly as possible.
-#: remote-mips.c:717
-msgid "Remote board reset, debug protocol re-initialized."
+#: remote.c:2243
+msgid "Incomplete response to threadinfo request."
 msgstr ""
 
-#: remote-mips.c:775
-#, possible-c-format
-msgid "Debug protocol failure:  more than %d characters before a sync."
+#. This is an answer to a different request.
+#: remote.c:2246
+msgid "ERROR RMT Thread info mismatch."
 msgstr ""
 
-#: remote-mips.c:864
-#, possible-c-format
-msgid "MIPS protocol data packet too long: %s"
+#: remote.c:2260
+msgid "ERROR RMT: threadinfo tag mismatch."
 msgstr ""
 
-#: remote-mips.c:902 remote-mips.c:1163 remote-mips.c:1204
-#, possible-c-format
-msgid "write to target failed: %s"
+#: remote.c:2268
+msgid "ERROR RMT: length of threadid is not 16."
 msgstr ""
 
-#: remote-mips.c:1010
-msgid "Remote did not acknowledge packet"
+#: remote.c:2283
+msgid "ERROR RMT: 'exists' length too long."
 msgstr ""
 
-#: remote-mips.c:1041 remote-mips.c:1081
-msgid "Timed out waiting for remote packet"
+#: remote.c:2307
+msgid "ERROR RMT: unknown thread info tag."
 msgstr ""
 
-#: remote-mips.c:1103
-msgid "Timed out waiting for packet"
+#. FIXME: This is a good reason to drop the packet.
+#. Possably, there is a duplicate response.
+#. Possabilities :
+#. retransmit immediatly - race conditions
+#. retransmit after timeout - yes
+#. exit
+#. wait for packet, then exit
+#. 
+#: remote.c:2411
+msgid "HMM: threadlist did not echo arg thread, dropping it."
 msgstr ""
 
-#: remote-mips.c:1261
-msgid "mips_request: Trying to send command before reply"
+#: remote.c:2418
+msgid "RMT ERROR : failed to get remote thread list."
 msgstr ""
 
-#: remote-mips.c:1281
-msgid "mips_request: Trying to get reply before command"
+#: remote.c:2426
+msgid "RMT ERROR: threadlist response longer than requested."
 msgstr ""
 
-#: remote-mips.c:1292
-msgid "Bad response from remote board"
+#: remote.c:2463
+msgid "Remote fetch threadlist -infinite loop-."
 msgstr ""
 
-#: remote-mips.c:1368
-msgid "Failed to initialize (didn't receive packet)."
+#. paranoia
+#: remote.c:2628
+msgid "Command can only be used when connected to the remote target."
 msgstr ""
 
-#: remote-mips.c:1418
-msgid "internal error: mips_initialize called twice"
+#: remote.c:2645
+msgid "threads"
 msgstr ""
 
-#: remote-mips.c:1492
-msgid "Failed to initialize."
+#: remote.c:2744
+msgid "remote_threads_extra_info"
 msgstr ""
 
-#: remote-mips.c:1549
-msgid ""
-"To open a MIPS remote debugging connection, you need to specify what\n"
-"serial device is attached to the target board (e.g., /dev/ttya).\n"
-"If you want to use TFTP to download to the board, specify the name of a\n"
-"temporary file to be used by GDB for downloads as the second argument.\n"
-"This filename must be in the form host:filename, where host is the name\n"
-"of the host running the TFTP server, and the file must be readable by the\n"
-"world.  If the local name of the temporary file differs from the name as\n"
-"seen from the board via TFTP, specify that name as the third parameter.\n"
+#: remote.c:3019 remote.c:3046
+#, possible-c-format
+msgid "Target reported unsupported offsets: %s"
 msgstr ""
 
-#: remote-mips.c:1603
-msgid "Unable to open UDP port"
+#: remote.c:3044
+#, possible-c-format
+msgid "Malformed response to offset query, %s"
 msgstr ""
 
-#: remote-mips.c:1746 remote.c:4087
-msgid "Argument given to \"detach\" when remotely debugging."
+#: remote.c:3092
+msgid "Can not handle qOffsets TextSeg response with this symbol file"
 msgstr ""
 
-#: remote-mips.c:1853
-#, possible-c-format
-msgid "Remote failure: %s"
+#: remote.c:3224
+msgid "Non-stop mode requested, but remote does not support non-stop"
 msgstr ""
 
-#: remote-mips.c:2051
+#: remote.c:3231
 #, possible-c-format
-msgid "Can't read register %d: %s"
+msgid "Remote refused setting non-stop mode with: %s"
 msgstr ""
 
-#: remote-mips.c:2090
+#: remote.c:3247
 #, possible-c-format
-msgid "Can't write register %d: %s"
+msgid "Remote refused setting all-stop mode with: %s"
 msgstr ""
 
-#: remote-mips.c:2325
-msgid "Can't pass arguments to remote MIPS board; arguments ignored."
+#: remote.c:3259 remote.c:3365
+msgid "The target is not running (try extended-remote?)"
 msgstr ""
 
-#: remote-mips.c:2584
-#, possible-c-format
-msgid "mips_common_breakpoint: Attempt to clear bogus breakpoint at %s"
+#: remote.c:3380
+msgid "remote didn't report the current thread in non-stop mode"
 msgstr ""
 
-#: remote-mips.c:2599 remote-mips.c:2652 remote-mips.c:2724
-#, possible-c-format
-msgid "mips_common_breakpoint: Bad response from remote board: %s"
+#: remote.c:3407
+msgid "Trace is already running on the target.\n"
 msgstr ""
 
-#: remote-mips.c:2763
-msgid "Timeout during download."
+#: remote.c:3532
+msgid ""
+"The remote protocol may be unreliable over UDP.\n"
+"Some events may be lost, rendering further debugging impossible."
 msgstr ""
 
-#: remote-mips.c:2773
+#: remote.c:3568
 #, possible-c-format
-msgid "Download got unexpected ack char: 0x%x, retrying."
+msgid "Remote refused setting permissions with: %s"
 msgstr ""
 
-#: remote-mips.c:3516
-msgid "mips_load:  Couldn't get into monitor mode."
+#: remote.c:3605
+#, possible-c-format
+msgid "Remote qSupported response supplied an unexpected value for \"%s\"."
 msgstr ""
 
-#: remote-mips.c:3674
-msgid "Set timeout in seconds for remote MIPS serial I/O."
+#: remote.c:3629
+#, possible-c-format
+msgid "Remote target reported \"%s\" without a size."
 msgstr ""
 
-#: remote-mips.c:3675
-msgid "Show timeout in seconds for remote MIPS serial I/O."
+#: remote.c:3638
+#, possible-c-format
+msgid "Remote target reported \"%s\" with a bad size: \"%s\"."
 msgstr ""
 
-#: remote-mips.c:3682
-msgid "Set retransmit timeout in seconds for remote MIPS serial I/O."
+#: remote.c:3645
+#, possible-c-format
+msgid "limiting remote suggested packet size (%d bytes) to %d"
 msgstr ""
 
-#: remote-mips.c:3683
-msgid "Show retransmit timeout in seconds for remote MIPS serial I/O."
+#: remote.c:3916
+msgid "empty item in \"qSupported\" response"
 msgstr ""
 
-#: remote-mips.c:3684
-msgid ""
-"This is the number of seconds to wait for an acknowledgement to a packet\n"
-"before resending the packet."
+#: remote.c:3947
+#, possible-c-format
+msgid "unrecognized item \"%s\" in \"qSupported\" response"
 msgstr ""
 
-#: remote-mips.c:3692
+#: remote.c:3995
 msgid ""
-"Set the maximum number of characters to ignore when scanning for a SYN."
+"To open a remote debug connection, you need to specify what\n"
+"serial device is attached to the remote system\n"
+"(e.g. /dev/ttyS0, /dev/ttya, COM1, etc.)."
 msgstr ""
 
-#: remote-mips.c:3693
-msgid ""
-"Show the maximum number of characters to ignore when scanning for a SYN."
+#: remote.c:4010
+msgid "Already connected to a remote target.  Disconnect? "
 msgstr ""
 
-#: remote-mips.c:3694
-msgid ""
-"This is the maximum number of characters GDB will ignore when trying to\n"
-"synchronize with the remote system.  A value of -1 means that there is no\n"
-"limit. (Note that these characters are printed out even though they are\n"
-"ignored.)"
+#: remote.c:4013
+msgid "Still connected."
 msgstr ""
 
-#: remote-mips.c:3704
-msgid "Set the prompt that GDB expects from the monitor."
+#: remote.c:4167 remote-mips.c:1744
+msgid "Argument given to \"detach\" when remotely debugging."
 msgstr ""
 
-#: remote-mips.c:3705
-msgid "Show the prompt that GDB expects from the monitor."
+#: remote.c:4170
+msgid "No process to detach from."
 msgstr ""
 
-#: remote-mips.c:3712
-msgid "Set printing of monitor warnings."
+#: remote.c:4184
+msgid "Remote doesn't know how to detach"
 msgstr ""
 
-#: remote-mips.c:3713
-msgid "Show printing of monitor warnings."
+#: remote.c:4186
+msgid "Can't detach process."
 msgstr ""
 
-#: remote-mips.c:3714
-msgid ""
-"When enabled, monitor warnings about hardware breakpoints will be displayed."
+#: remote.c:4191
+#, possible-c-format
+msgid "Detached from remote %s.\n"
 msgstr ""
 
-#: remote-mips.c:3721
-msgid "Send a packet to PMON (must be in debug mode)."
+#: remote.c:4196
+msgid "Detached from remote process.\n"
 msgstr ""
 
-#: remote-mips.c:3723
-msgid ""
-"Set zeroing of upper 32 bits of 64-bit addresses when talking to PMON "
-"targets."
+#: remote.c:4198
+msgid "Ending remote debugging.\n"
 msgstr ""
 
-#: remote-mips.c:3724
-msgid ""
-"Show zeroing of upper 32 bits of 64-bit addresses when talking to PMON "
-"targets."
+#: remote.c:4224
+msgid "Argument given to \"disconnect\" when remotely debugging."
 msgstr ""
 
-#: remote-mips.c:3725
-msgid "Use \"on\" to enable the masking and \"off\" to disable it."
+#: remote.c:4251 remote.c:4276
+msgid "This target does not support attaching to a process"
 msgstr ""
 
-#: remote-sim.c:189
+#: remote.c:4261
 #, possible-c-format
-msgid "Unable to create simulator instance for inferior %d."
+msgid "Attached to %s\n"
 msgstr ""
 
-#: remote-sim.c:204
+#: remote.c:4271
 #, possible-c-format
-msgid ""
-"Inferior %d and inferior %d would have identical simulator state.\n"
-"(This simulator does not support the running of more than one inferior.)"
+msgid "Attaching to %s failed with: %s"
 msgstr ""
 
-#: remote-sim.c:531
-msgid "Register size different to expected"
+#: remote.c:4278
+#, possible-c-format
+msgid "Attaching to %s failed"
 msgstr ""
 
-#: remote-sim.c:534
+#: remote.c:4361
 #, possible-c-format
-msgid "Register %d not updated"
+msgid "Reply contains invalid hex digit %d"
 msgstr ""
 
-#: remote-sim.c:536
+#: remote.c:4577
 #, possible-c-format
-msgid "Register %s not updated"
+msgid "Unexpected vCont reply in non-stop mode: %s"
 msgstr ""
 
-#: remote-sim.c:575
-msgid "program to load"
+#: remote.c:4617
+#, possible-c-format
+msgid " - Can't pass signal %d to target in reverse: ignored."
 msgstr ""
 
-#: remote-sim.c:583
-msgid "GDB sim does not yet support a load offset."
+#: remote.c:4622
+msgid "Remote reverse-step not supported."
 msgstr ""
 
-#: remote-sim.c:592
-msgid "unable to load program"
+#: remote.c:4625
+msgid "Remote reverse-continue not supported."
 msgstr ""
 
-#: remote-sim.c:619
-msgid "No executable file specified."
+#: remote.c:4763
+msgid "Remote server does not support stopping threads"
 msgstr ""
 
-#: remote-sim.c:621 remote-sim.c:1083
-msgid "No program loaded."
+#: remote.c:4796
+#, possible-c-format
+msgid "Stopping %s failed: %s"
 msgstr ""
 
-#: remote-sim.c:726
-msgid "unable to create simulator instance"
+#: remote.c:5153
+#, possible-c-format
+msgid ""
+"Malformed packet(a) (missing colon): %s\n"
+"Packet: '%s'\n"
 msgstr ""
 
-#: remote-sim.c:853
+#: remote.c:5209
 #, possible-c-format
-msgid "gdbsim_resume: pid %d, step %d, signal %d\n"
+msgid ""
+"Malformed packet(b) (missing colon): %s\n"
+"Packet: '%s'\n"
 msgstr ""
 
-#: remote-sim.c:932
+#: remote.c:5215
 #, possible-c-format
-msgid "Can't stop pid %d.  No inferior found."
+msgid ""
+"Remote sent bad register number %s: %s\n"
+"Packet: '%s'\n"
 msgstr ""
 
-#: remote-sim.c:989
+#: remote.c:5227
 #, possible-c-format
-msgid "Unable to wait for pid %d.  Inferior not found."
+msgid "Remote reply is too short: %s"
 msgstr ""
 
-#. PREVIOUSLY: The user may give a command before the simulator
-#. is opened. [...] (??? assuming of course one wishes to
-#. continue to allow commands to be sent to unopened simulators,
-#. which isn't entirely unreasonable).
-#. The simulator is a builtin abstraction of a remote target.
-#. Consistent with that model, access to the simulator, via sim
-#. commands, is restricted to the period when the channel to the
-#. simulator is open.
-#: remote-sim.c:1186
-msgid "Not connected to the simulator target"
+#: remote.c:5233
+#, possible-c-format
+msgid ""
+"Remote register badly formatted: %s\n"
+"here: %s"
 msgstr ""
 
-#: remote-sim.c:1294
-msgid "Send a command to the simulator."
+#: remote.c:5295 remote.c:5298
+#, possible-c-format
+msgid "unknown stop reply packet: %s"
 msgstr ""
 
-#. malformed packet error
-#. general case:
-#: remote.c:418
-msgid "remote.c: error in outgoing packet."
+#: remote.c:5305
+#, possible-c-format
+msgid "No process or thread specified in stop reply: %s"
 msgstr ""
 
-#: remote.c:420
+#: remote.c:5470 remote.c:5612
 #, possible-c-format
-msgid "remote.c: error in outgoing packet at field #%ld."
+msgid "Invalid remote reply: %s"
 msgstr ""
 
-#: remote.c:423
+#: remote.c:5699
 #, possible-c-format
-msgid "trace API error 0x%s."
+msgid "Could not fetch register \"%s\"; remote failure reply '%s'"
 msgstr ""
 
-#: remote.c:425
+#: remote.c:5718
+msgid "fetch_register_using_p: early buf termination"
+msgstr ""
+
+#: remote.c:5756
 #, possible-c-format
-msgid "Target returns error code '%s'."
+msgid "Remote 'g' packet reply is of odd length: %s"
 msgstr ""
 
-#: remote.c:454
+#: remote.c:5775
 #, possible-c-format
-msgid "invalid qRelocInsn packet: %s"
+msgid "Remote 'g' packet reply is too long: %s"
 msgstr ""
 
-#: remote.c:488
-msgid "warning: relocating instruction: "
+#: remote.c:5818 remote.c:5836
+msgid "unexpected end of 'g' packet reply"
 msgstr ""
 
-#: remote.c:719
-msgid ""
-"Send the ASCII ETX character (Ctrl-c) to the remote target to interrupt the "
-"execution of the program.\n"
+#: remote.c:5877
+msgid "could not set remote traceframe"
 msgstr ""
 
-#: remote.c:724
-msgid ""
-"send a break signal to the remote target to interrupt the execution of the "
-"program.\n"
+#: remote.c:5985
+#, possible-c-format
+msgid "Could not write register \"%s\"; remote failure reply '%s'"
 msgstr ""
 
-#: remote.c:728
-msgid ""
-"Send a break signal and 'g' a.k.a. Magic SysRq g to the remote target to "
-"interrupt the execution of Linux kernel.\n"
+#: remote.c:5990
+msgid "Bad result from packet_ok"
 msgstr ""
 
-#: remote.c:733 remote.c:3116
+#: remote.c:6031
 #, possible-c-format
-msgid "Invalid value for interrupt_sequence_mode: %s."
+msgid "Could not write registers; remote failure reply '%s'"
 msgstr ""
 
-#: remote.c:877
-msgid "Argument required (integer, `fixed' or `limited')."
+#: remote.c:6211
+msgid "Received too much data from remote target; ignoring overflow."
 msgstr ""
 
-#: remote.c:890
-#, possible-c-format
-msgid "Invalid %s (bad syntax)."
+#: remote.c:6228
+msgid "Unmatched escape character in target response."
 msgstr ""
 
-#: remote.c:897
-#, possible-c-format
-msgid "Invalid %s (too large)."
+#: remote.c:6327
+msgid "remote_write_bytes_aux: bad packet format"
 msgstr ""
 
-#: remote.c:903
-#, possible-c-format
-msgid ""
-"The target may not be able to correctly handle a %s\n"
-"of %ld bytes. Change the packet size? "
+#: remote.c:6374
+msgid "minimum packet size too small to write data"
+msgstr ""
+
+#: remote.c:6490
+msgid "remote_write_bytes: bad internal state"
+msgstr ""
+
+#: remote.c:6640
+msgid "Too long remote packet."
+msgstr ""
+
+#: remote.c:6643 remote.c:8556
+msgid "Communication problem with target."
 msgstr ""
 
-#: remote.c:906
-msgid "Packet size not changed."
+#: remote.c:6682
+msgid "Remote target does not support flash erase"
 msgstr ""
 
-#: remote.c:916
-#, possible-c-format
-msgid "The %s is %ld. "
+#: remote.c:6684
+msgid "Error erasing flash with vFlashErase packet"
 msgstr ""
 
-#: remote.c:918
-#, possible-c-format
-msgid "Packets are fixed at %ld bytes.\n"
+#: remote.c:6724
+msgid "Remote target does not support vFlashDone"
 msgstr ""
 
-#: remote.c:921
-#, possible-c-format
-msgid "Packets are limited to %ld bytes.\n"
+#: remote.c:6726
+msgid "Error finishing flash operation"
 msgstr ""
 
-#: remote.c:1045
-#, possible-c-format
-msgid "Support for the `%s' packet is auto-detected, currently %s.\n"
+#: remote.c:6757 remote-m32r-sdi.c:725 remote-m32r-sdi.c:731
+#: remote-m32r-sdi.c:747
+msgid "Remote connection closed"
 msgstr ""
 
-#: remote.c:1051
-#, possible-c-format
-msgid "Support for the `%s' packet is currently %s.\n"
+#: remote.c:6761
+msgid "Remote communication error.  Target disconnected."
 msgstr ""
 
-#: remote.c:1146
-msgid "packet_ok: attempt to use a disabled packet"
+#: remote.c:6850
+msgid "Cannot execute this command while the target is running."
 msgstr ""
 
-#. If the stub previously indicated that the packet was
-#. supported then there is a protocol error..
-#: remote.c:1160
-#, possible-c-format
-msgid "Protocol error: %s (%s) conflicting enabled responses."
+#: remote.c:6890
+msgid "putpkt: write failed"
 msgstr ""
 
-#. The user set it wrong.
-#: remote.c:1164
+#: remote.c:7176
 #, possible-c-format
-msgid "Enabled packet %s (%s) not recognized by stub"
+msgid "Invalid run length encoding: %s\n"
 msgstr ""
 
-#: remote.c:1250 remote.c:1271
-#, possible-c-format
-msgid "Could not find config for %s"
+#: remote.c:7282
+msgid "Watchdog timeout has expired.  Target detached."
 msgstr ""
 
-#. Error of some sort.
-#. We're out of sync with the target now.  Did it continue
-#. or not?  We can't tell which thread it was in non-stop,
-#. so just ignore this.
-#. Error of some sort.
-#. We're out of sync with the target now.  Did it continue or
-#. not?  Not is more likely, so report a stop.
-#: remote.c:1388 remote.c:2782 remote.c:2822 remote.c:2939 remote.c:3804
-#: remote.c:5380 remote.c:5479 remote.c:6699
-#, possible-c-format
-msgid "Remote failure reply: %s"
+#. We have tried hard enough, and just can't receive the
+#. packet/notification.  Give up.
+#: remote.c:7303
+msgid "Ignoring packet error, continuing...\n"
 msgstr ""
 
-#: remote.c:1867
-#, possible-c-format
-msgid "invalid remote ptid: %s"
+#: remote.c:7439
+msgid "Can't kill process"
 msgstr ""
 
-#: remote.c:2198
-msgid "Incomplete response to threadinfo request."
+#: remote.c:7547
+msgid "Target does not support QDisableRandomization."
 msgstr ""
 
-#. This is an answer to a different request.
-#: remote.c:2201
-msgid "ERROR RMT Thread info mismatch."
+#: remote.c:7549
+#, possible-c-format
+msgid "Bogus QDisableRandomization reply from target: %s"
 msgstr ""
 
-#: remote.c:2215
-msgid "ERROR RMT: threadinfo tag mismatch."
+#: remote.c:7567
+msgid "Remote file name too long for run packet"
 msgstr ""
 
-#: remote.c:2223
-msgid "ERROR RMT: length of threadid is not 16."
+#: remote.c:7582
+msgid "Argument list too long for run packet"
 msgstr ""
 
-#: remote.c:2238
-msgid "ERROR RMT: 'exists' length too long."
+#: remote.c:7605
+msgid ""
+"Running the default executable on the remote target failed; try \"set remote "
+"exec-file\"?"
 msgstr ""
 
-#: remote.c:2262
-msgid "ERROR RMT: unknown thread info tag."
+#: remote.c:7608
+#, possible-c-format
+msgid "Running \"%s\" on the remote target failed"
 msgstr ""
 
-#. FIXME: This is a good reason to drop the packet.
-#. Possably, there is a duplicate response.
-#. Possabilities :
-#. retransmit immediatly - race conditions
-#. retransmit after timeout - yes
-#. exit
-#. wait for packet, then exit
-#. 
-#: remote.c:2366
-msgid "HMM: threadlist did not echo arg thread, dropping it."
+#: remote.c:7638
+msgid "Remote target does not support \"set remote exec-file\""
 msgstr ""
 
-#: remote.c:2373
-msgid "RMT ERROR : failed to get remote thread list."
+#: remote.c:7640
+msgid "Remote target does not support \"set args\" or run <ARGS>"
 msgstr ""
 
-#: remote.c:2381
-msgid "RMT ERROR: threadlist response longer than requested."
+#: remote.c:7772
+#, possible-c-format
+msgid "hw_bp_to_z: bad watchpoint type %d"
 msgstr ""
 
-#: remote.c:2418
-msgid "Remote fetch threadlist -infinite loop-."
+#: remote.c:7806
+msgid "remote_insert_watchpoint: reached end of function"
 msgstr ""
 
-#. paranoia
-#: remote.c:2583
-msgid "Command can only be used when connected to the remote target."
+#: remote.c:7838
+msgid "remote_remove_watchpoint: reached end of function"
 msgstr ""
 
-#: remote.c:2600
-msgid "threads"
+#: remote.c:7946
+msgid "remote_insert_hw_breakpoint: reached end of function"
 msgstr ""
 
-#: remote.c:2699
-msgid "remote_threads_extra_info"
+#: remote.c:7981
+msgid "remote_remove_hw_breakpoint: reached end of function"
 msgstr ""
 
-#: remote.c:2974 remote.c:3001
-#, possible-c-format
-msgid "Target reported unsupported offsets: %s"
+#: remote.c:8038
+msgid "remote target does not support this operation"
 msgstr ""
 
-#: remote.c:2999
-#, possible-c-format
-msgid "Malformed response to offset query, %s"
+#: remote.c:8066
+msgid "command cannot be used without an exec file"
 msgstr ""
 
-#: remote.c:3047
-msgid "Can not handle qOffsets TextSeg response with this symbol file"
+#: remote.c:8091
+#, possible-c-format
+msgid "target memory fault, section %s, range %s -- %s"
 msgstr ""
 
-#: remote.c:3193
-msgid "Non-stop mode requested, but remote does not support non-stop"
+#: remote.c:8109
+msgid ""
+"One or more sections of the remote executable does not match\n"
+"the loaded file\n"
 msgstr ""
 
-#: remote.c:3200
+#: remote.c:8112
 #, possible-c-format
-msgid "Remote refused setting non-stop mode with: %s"
+msgid "No loaded section named '%s'.\n"
 msgstr ""
 
-#: remote.c:3216
+#: remote.c:8212
 #, possible-c-format
-msgid "Remote refused setting all-stop mode with: %s"
+msgid "Unknown remote qXfer reply: %s"
 msgstr ""
 
-#: remote.c:3228 remote.c:3323
-msgid "The target is not running (try extended-remote?)"
+#: remote.c:8218
+msgid "Remote qXfer reply contained no data."
 msgstr ""
 
-#: remote.c:3338
-msgid "remote didn't report the current thread in non-stop mode"
+#: remote.c:8407
+msgid "remote query is only available after target open"
 msgstr ""
 
-#: remote.c:3365
-msgid "Trace is already running on the target.\n"
+#: remote.c:8498
+msgid "Pattern is too large to transmit to remote target."
 msgstr ""
 
-#: remote.c:3490
-msgid ""
-"The remote protocol may be unreliable over UDP.\n"
-"Some events may be lost, rendering further debugging impossible."
+#: remote.c:8520 remote.c:8525
+#, possible-c-format
+msgid "Unknown qSearch:memory reply: %s"
 msgstr ""
 
-#: remote.c:3526
-#, possible-c-format
-msgid "Remote refused setting permissions with: %s"
+#: remote.c:8538
+msgid "remote rcmd is only available after target open"
 msgstr ""
 
-#: remote.c:3563
+#: remote.c:8550
 #, possible-c-format
-msgid "Remote qSupported response supplied an unexpected value for \"%s\"."
+msgid "\"monitor\" command ``%s'' is too long."
 msgstr ""
 
-#: remote.c:3587
-#, possible-c-format
-msgid "Remote target reported \"%s\" without a size."
+#: remote.c:8568 remote.c:9811 remote.c:10084 remote.c:10174 remote.c:10274
+#: remote.c:10321 remote.c:10398 remote.c:10460 remote.c:10488
+msgid "Target does not support this command."
 msgstr ""
 
-#: remote.c:3596
-#, possible-c-format
-msgid "Remote target reported \"%s\" with a bad size: \"%s\"."
+#: remote.c:8579
+msgid "Protocol error with Rcmd"
 msgstr ""
 
-#: remote.c:3603
-#, possible-c-format
-msgid "limiting remote suggested packet size (%d bytes) to %d"
+#: remote.c:8615 remote.c:9514 remote.c:9602 remote.c:9653
+msgid "command can only be used with remote target"
 msgstr ""
 
-#: remote.c:3834
-msgid "empty item in \"qSupported\" response"
+#: remote.c:8618
+msgid "remote-packet command requires packet text as argument"
 msgstr ""
 
-#: remote.c:3865
-#, possible-c-format
-msgid "unrecognized item \"%s\" in \"qSupported\" response"
+#: remote.c:8659
+msgid "Remote threadset test\n"
 msgstr ""
 
-#: remote.c:3913
-msgid ""
-"To open a remote debug connection, you need to specify what\n"
-"serial device is attached to the remote system\n"
-"(e.g. /dev/ttyS0, /dev/ttya, COM1, etc.)."
+#: remote.c:8765
+msgid "Fetch and print the remote list of thread identifiers, one pkt only"
 msgstr ""
 
-#: remote.c:3928
-msgid "Already connected to a remote target.  Disconnect? "
+#: remote.c:8768
+msgid "Fetch and display info about one thread"
 msgstr ""
 
-#: remote.c:3931
-msgid "Still connected."
+#: remote.c:8770
+msgid "Test setting to a different thread"
 msgstr ""
 
-#: remote.c:4090
-msgid "No process to detach from."
+#: remote.c:8772
+msgid "Iterate through updating all remote thread info"
 msgstr ""
 
-#: remote.c:4104
-msgid "Remote doesn't know how to detach"
+#: remote.c:8774
+msgid " Remote thread alive test "
 msgstr ""
 
-#: remote.c:4106
-msgid "Can't detach process."
+#: remote.c:8859
+msgid "Remote target doesn't support qGetTLSAddr packet"
 msgstr ""
 
-#: remote.c:4111
-#, possible-c-format
-msgid "Detached from remote %s.\n"
+#: remote.c:8862
+msgid "Remote target failed to process qGetTLSAddr request"
 msgstr ""
 
-#: remote.c:4116
-msgid "Detached from remote process.\n"
+#: remote.c:8866
+msgid "TLS not supported or disabled on this target"
 msgstr ""
 
-#: remote.c:4118
-msgid "Ending remote debugging.\n"
+#: remote.c:8903
+msgid "Remote target doesn't support qGetTIBAddr packet"
 msgstr ""
 
-#: remote.c:4144
-msgid "Argument given to \"disconnect\" when remotely debugging."
+#: remote.c:8905
+msgid "Remote target failed to process qGetTIBAddr request"
 msgstr ""
 
-#: remote.c:4171 remote.c:4196
-msgid "This target does not support attaching to a process"
+#: remote.c:8908
+msgid "qGetTIBAddr not supported or disabled on this target"
 msgstr ""
 
-#: remote.c:4181
+#: remote.c:8956
 #, possible-c-format
-msgid "Attached to %s\n"
+msgid "Duplicate g packet description added for size %d"
 msgstr ""
 
-#: remote.c:4191
-#, possible-c-format
-msgid "Attaching to %s failed with: %s"
+#: remote.c:9023 remote.c:9044 remote.c:9066
+msgid "Packet too long for target."
 msgstr ""
 
-#: remote.c:4198
+#: remote.c:9298
 #, possible-c-format
-msgid "Attaching to %s failed"
+msgid "Read returned %d, but %d bytes."
 msgstr ""
 
-#: remote.c:4281
+#: remote.c:9397
 #, possible-c-format
-msgid "Reply contains invalid hex digit %d"
+msgid "Unknown remote I/O error %d"
 msgstr ""
 
-#: remote.c:4497
+#: remote.c:9399
 #, possible-c-format
-msgid "Unexpected vCont reply in non-stop mode: %s"
+msgid "Remote I/O error: %s"
 msgstr ""
 
-#: remote.c:4537
+#: remote.c:9548
 #, possible-c-format
-msgid " - Can't pass signal %d to target in reverse: ignored."
+msgid "Error reading %s."
 msgstr ""
 
-#: remote.c:4542
-msgid "Remote reverse-step not supported."
+#: remote.c:9571
+#, possible-c-format
+msgid "Remote write of %d bytes returned 0!"
 msgstr ""
 
-#: remote.c:4545
-msgid "Remote reverse-continue not supported."
+#: remote.c:9588
+#, possible-c-format
+msgid "Successfully sent file \"%s\".\n"
 msgstr ""
 
-#: remote.c:4683
-msgid "Remote server does not support stopping threads"
+#: remote.c:9643
+#, possible-c-format
+msgid "Successfully fetched file \"%s\".\n"
 msgstr ""
 
-#: remote.c:4716
+#: remote.c:9660
 #, possible-c-format
-msgid "Stopping %s failed: %s"
+msgid "Successfully deleted file \"%s\".\n"
 msgstr ""
 
-#: remote.c:5069
-#, possible-c-format
-msgid ""
-"Malformed packet(a) (missing colon): %s\n"
-"Packet: '%s'\n"
+#: remote.c:9670
+msgid "file to put"
 msgstr ""
 
-#: remote.c:5125
-#, possible-c-format
-msgid ""
-"Malformed packet(b) (missing colon): %s\n"
-"Packet: '%s'\n"
+#: remote.c:9675
+msgid "Invalid parameters to remote put"
 msgstr ""
 
-#: remote.c:5131
-#, possible-c-format
-msgid ""
-"Remote sent bad register number %s: %s\n"
-"Packet: '%s'\n"
+#: remote.c:9689
+msgid "file to get"
 msgstr ""
 
-#: remote.c:5143
-#, possible-c-format
-msgid "Remote reply is too short: %s"
+#: remote.c:9694
+msgid "Invalid parameters to remote get"
 msgstr ""
 
-#: remote.c:5149
-#, possible-c-format
-msgid ""
-"Remote register badly formatted: %s\n"
-"here: %s"
+#: remote.c:9708
+msgid "file to delete"
 msgstr ""
 
-#: remote.c:5211 remote.c:5214
-#, possible-c-format
-msgid "unknown stop reply packet: %s"
+#: remote.c:9713
+msgid "Invalid parameters to remote delete"
 msgstr ""
 
-#: remote.c:5221
-#, possible-c-format
-msgid "No process or thread specified in stop reply: %s"
+#: remote.c:9856 remote.c:9871 remote.c:10030 remote.c:10041
+msgid "Target does not support source download."
 msgstr ""
 
-#: remote.c:5386 remote.c:5528
-#, possible-c-format
-msgid "Invalid remote reply: %s"
+#: remote.c:9923
+msgid "Fast tracepoint not valid during download"
 msgstr ""
 
-#: remote.c:5615
+#. Fast tracepoints are functionally identical to regular
+#. tracepoints, so don't take lack of support as a reason to
+#. give up on the trace run.
+#: remote.c:9930
 #, possible-c-format
-msgid "Could not fetch register \"%s\"; remote failure reply '%s'"
+msgid ""
+"Target does not support fast tracepoints, downloading %d as regular "
+"tracepoint"
 msgstr ""
 
-#: remote.c:5634
-msgid "fetch_register_using_p: early buf termination"
+#: remote.c:9944
+msgid "Static tracepoint not valid during download"
 msgstr ""
 
-#: remote.c:5672
-#, possible-c-format
-msgid "Remote 'g' packet reply is of odd length: %s"
+#. Fast tracepoints are functionally identical to regular
+#. tracepoints, so don't take lack of support as a reason
+#. to give up on the trace run.
+#: remote.c:9950
+msgid "Target does not support static tracepoints"
 msgstr ""
 
-#: remote.c:5691
+#: remote.c:9970
 #, possible-c-format
-msgid "Remote 'g' packet reply is too long: %s"
-msgstr ""
-
-#: remote.c:5734 remote.c:5752
-msgid "unexpected end of 'g' packet reply"
+msgid "Target does not support conditional tracepoints, ignoring tp %d cond"
 msgstr ""
 
-#: remote.c:5793
-msgid "could not set remote traceframe"
+#: remote.c:9979
+msgid "Target does not support tracepoints."
 msgstr ""
 
-#: remote.c:5901
-#, possible-c-format
-msgid "Could not write register \"%s\"; remote failure reply '%s'"
+#: remote.c:9996 remote.c:10013
+msgid "Error on target while setting tracepoints."
 msgstr ""
 
-#: remote.c:5906
-msgid "Bad result from packet_ok"
+#: remote.c:10078
+msgid "Trace state variable name too long for tsv definition packet"
 msgstr ""
 
-#: remote.c:5947
-#, possible-c-format
-msgid "Could not write registers; remote failure reply '%s'"
+#: remote.c:10086
+msgid "Error on target while downloading trace state variable."
 msgstr ""
 
-#: remote.c:6127
-msgid "Received too much data from remote target; ignoring overflow."
+#: remote.c:10100
+msgid ""
+"Target does not support enabling tracepoints while a trace run is ongoing."
 msgstr ""
 
-#: remote.c:6144
-msgid "Unmatched escape character in target response."
+#: remote.c:10102
+msgid "Error on target while enabling tracepoint."
 msgstr ""
 
-#: remote.c:6243
-msgid "remote_write_bytes_aux: bad packet format"
+#: remote.c:10116
+msgid ""
+"Target does not support disabling tracepoints while a trace run is ongoing."
 msgstr ""
 
-#: remote.c:6290
-msgid "minumum packet size too small to write data"
+#: remote.c:10118
+msgid "Error on target while disabling tracepoint."
 msgstr ""
 
-#: remote.c:6406
-msgid "remote_write_bytes: bad internal state"
+#: remote.c:10154
+msgid "Too many sections for read-only sections definition packet."
 msgstr ""
 
-#: remote.c:6556
-msgid "Too long remote packet."
+#: remote.c:10176 remote.c:10276 remote.c:10346 remote.c:10349 remote.c:10400
+#: remote.c:10462 remote.c:10490 remote.c:10579
+#, possible-c-format
+msgid "Bogus reply from target: %s"
 msgstr ""
 
-#: remote.c:6559 remote.c:8441
-msgid "Communication problem with target."
+#: remote.c:10216
+#, possible-c-format
+msgid "Bogus trace status reply from target: %s"
 msgstr ""
 
-#: remote.c:6598
-msgid "Remote target does not support flash erase"
+#: remote.c:10315
+#, possible-c-format
+msgid "Unknown trace find type %d"
 msgstr ""
 
-#: remote.c:6600
-msgid "Error erasing flash with vFlashErase packet"
+#: remote.c:10330
+msgid "Unable to parse trace frame number"
 msgstr ""
 
-#: remote.c:6640
-msgid "Remote target does not support vFlashDone"
+#: remote.c:10340
+msgid "Unable to parse tracepoint number"
 msgstr ""
 
-#: remote.c:6642
-msgid "Error finishing flash operation"
+#: remote.c:10392
+msgid "Remote file name too long for trace save packet"
 msgstr ""
 
-#: remote.c:6677
-msgid "Remote communication error.  Target disconnected."
+#: remote.c:10465
+msgid "Target does not support disconnected tracing."
 msgstr ""
 
-#: remote.c:6766
-msgid "Cannot execute this command while the target is running."
+#. set/show remote ...
+#. allow-unknown
+#: remote.c:10918 remote.c:10924
+msgid ""
+"Remote protocol specific variables\n"
+"Configure various remote-protocol specific variables such as\n"
+"the packets being used"
 msgstr ""
 
-#: remote.c:6806
-msgid "putpkt: write failed"
+#. allow-unknown
+#: remote.c:10931
+msgid ""
+"Compare section data on target to the exec file.\n"
+"Argument is a single section name (default: all loaded sections)."
 msgstr ""
 
-#: remote.c:7092
-#, possible-c-format
-msgid "Invalid run length encoding: %s\n"
+#: remote.c:10936
+msgid ""
+"Send an arbitrary packet to a remote target.\n"
+"   maintenance packet TEXT\n"
+"If GDB is talking to an inferior via the GDB serial protocol, then\n"
+"this command sends the string TEXT to the inferior, and displays the\n"
+"response packet.  GDB supplies the initial `$' character, and the\n"
+"terminating `#' character and checksum."
 msgstr ""
 
-#: remote.c:7198
-msgid "Watchdog timeout has expired.  Target detached."
+#: remote.c:10945
+msgid "Set whether to send break if interrupted."
 msgstr ""
 
-#. We have tried hard enough, and just can't receive the
-#. packet/notification.  Give up.
-#: remote.c:7219
-msgid "Ignoring packet error, continuing...\n"
+#: remote.c:10946
+msgid "Show whether to send break if interrupted."
 msgstr ""
 
-#: remote.c:7347
-msgid "Can't kill process"
+#: remote.c:10947
+msgid "If set, a break, instead of a cntrl-c, is sent to the remote target."
 msgstr ""
 
-#: remote.c:7455
-msgid "Target does not support QDisableRandomization."
+#: remote.c:10960
+msgid "Set interrupt sequence to remote target."
 msgstr ""
 
-#: remote.c:7457
-#, possible-c-format
-msgid "Bogus QDisableRandomization reply from target: %s"
+#: remote.c:10961
+msgid "Show interrupt sequence to remote target."
 msgstr ""
 
-#: remote.c:7475
-msgid "Remote file name too long for run packet"
+#: remote.c:10962
+msgid ""
+"Valid value is \"Ctrl-C\", \"BREAK\" or \"BREAK-g\". The default is \"Ctrl-"
+"C\"."
 msgstr ""
 
-#: remote.c:7490
-msgid "Argument list too long for run packet"
+#: remote.c:10969
+msgid ""
+"Set whether interrupt-sequence is sent to remote target when gdb connects to."
 msgstr ""
 
-#: remote.c:7513
+#: remote.c:10970
 msgid ""
-"Running the default executable on the remote target failed; try \"set remote "
-"exec-file\"?"
+"\t\tShow whether interrupt-sequence is sent to remote target when gdb "
+"connects to."
 msgstr ""
 
-#: remote.c:7516
-#, possible-c-format
-msgid "Running \"%s\" on the remote target failed"
+#: remote.c:10971
+msgid "\t\tIf set, interrupt sequence is sent to remote target."
 msgstr ""
 
-#: remote.c:7546
-msgid "Remote target does not support \"set remote exec-file\""
+#. Install commands for configuring memory read/write packets.
+#: remote.c:10978
+msgid "Set the maximum number of bytes per memory write packet (deprecated)."
 msgstr ""
 
-#: remote.c:7548
-msgid "Remote target does not support \"set args\" or run <ARGS>"
+#: remote.c:10981
+msgid ""
+"Show the maximum number of bytes per memory write packet (deprecated)."
 msgstr ""
 
-#: remote.c:7680
-#, possible-c-format
-msgid "hw_bp_to_z: bad watchpoint type %d"
+#: remote.c:10985
+msgid ""
+"Set the maximum number of bytes per memory-write packet.\n"
+"Specify the number of bytes in a packet or 0 (zero) for the\n"
+"default packet size.  The actual limit is further reduced\n"
+"dependent on the target.  Specify ``fixed'' to disable the\n"
+"further restriction and ``limit'' to enable that restriction."
 msgstr ""
 
-#: remote.c:7714
-msgid "remote_insert_watchpoint: reached end of function"
+#: remote.c:10993
+msgid ""
+"Set the maximum number of bytes per memory-read packet.\n"
+"Specify the number of bytes in a packet or 0 (zero) for the\n"
+"default packet size.  The actual limit is further reduced\n"
+"dependent on the target.  Specify ``fixed'' to disable the\n"
+"further restriction and ``limit'' to enable that restriction."
 msgstr ""
 
-#: remote.c:7746
-msgid "remote_remove_watchpoint: reached end of function"
+#: remote.c:11002
+msgid "Show the maximum number of bytes per memory-write packet."
 msgstr ""
 
-#: remote.c:7840
-msgid "remote_insert_hw_breakpoint: reached end of function"
+#: remote.c:11006
+msgid "Show the maximum number of bytes per memory-read packet."
 msgstr ""
 
-#: remote.c:7875
-msgid "remote_remove_hw_breakpoint: reached end of function"
+#: remote.c:11010
+msgid "Set the maximum number of target hardware watchpoints."
 msgstr ""
 
-#: remote.c:7932
-msgid "remote target does not support this operation"
+#: remote.c:11011
+msgid "Show the maximum number of target hardware watchpoints."
 msgstr ""
 
-#: remote.c:7960
-msgid "command cannot be used without an exec file"
+#: remote.c:11012 remote.c:11021 remote.c:11030
+msgid "Specify a negative limit for unlimited."
 msgstr ""
 
-#: remote.c:7985
-#, possible-c-format
-msgid "target memory fault, section %s, range %s -- %s"
+#: remote.c:11019
+msgid "Set the maximum length (in bytes) of a target hardware watchpoint."
 msgstr ""
 
-#: remote.c:8003
-msgid ""
-"One or more sections of the remote executable does not match\n"
-"the loaded file\n"
+#: remote.c:11020
+msgid "Show the maximum length (in bytes) of a target hardware watchpoint."
 msgstr ""
 
-#: remote.c:8006
-#, possible-c-format
-msgid "No loaded section named '%s'.\n"
+#: remote.c:11028
+msgid "Set the maximum number of target hardware breakpoints."
 msgstr ""
 
-#: remote.c:8106
-#, possible-c-format
-msgid "Unknown remote qXfer reply: %s"
+#: remote.c:11029
+msgid "Show the maximum number of target hardware breakpoints."
 msgstr ""
 
-#: remote.c:8112
-msgid "Remote qXfer reply contained no data."
+#: remote.c:11038
+msgid "Set the maximum size of the address (in bits) in a memory packet."
 msgstr ""
 
-#: remote.c:8292
-msgid "remote query is only available after target open"
+#: remote.c:11039
+msgid "Show the maximum size of the address (in bits) in a memory packet."
 msgstr ""
 
-#: remote.c:8383
-msgid "Pattern is too large to transmit to remote target."
+#: remote.c:11197
+msgid "Set use of remote protocol `Z' packets"
 msgstr ""
 
-#: remote.c:8405 remote.c:8410
-#, possible-c-format
-msgid "Unknown qSearch:memory reply: %s"
+#: remote.c:11198
+msgid "Show use of remote protocol `Z' packets "
 msgstr ""
 
-#: remote.c:8423
-msgid "remote rcmd is only available after target open"
+#: remote.c:11199
+msgid ""
+"When set, GDB will attempt to use the remote breakpoint and watchpoint\n"
+"packets."
 msgstr ""
 
-#: remote.c:8435
-#, possible-c-format
-msgid "\"monitor\" command ``%s'' is too long."
+#: remote.c:11208
+msgid ""
+"Manipulate files on the remote system\n"
+"Transfer files to and from the remote target system."
 msgstr ""
 
-#: remote.c:8453 remote.c:9672 remote.c:9931 remote.c:9989 remote.c:10044
-#: remote.c:10091 remote.c:10168 remote.c:10230 remote.c:10258
-msgid "Target does not support this command."
+#: remote.c:11215
+msgid "Copy a local file to the remote system."
 msgstr ""
 
-#: remote.c:8464
-msgid "Protocol error with Rcmd"
+#: remote.c:11219
+msgid "Copy a remote file to the local system."
 msgstr ""
 
-#: remote.c:8500 remote.c:9399 remote.c:9487 remote.c:9538
-msgid "command can only be used with remote target"
+#: remote.c:11223
+msgid "Delete a remote file."
 msgstr ""
 
-#: remote.c:8503
-msgid "remote-packet command requires packet text as argument"
+#: remote.c:11228
+msgid "Set the remote pathname for \"run\""
 msgstr ""
 
-#: remote.c:8544
-msgid "Remote threadset test\n"
+#: remote.c:11229
+msgid "Show the remote pathname for \"run\""
 msgstr ""
 
-#: remote.c:8650
-msgid "Fetch and print the remote list of thread identifiers, one pkt only"
+#: remote-fileio.c:1451
+msgid "Illegal argument for \"set remote system-call-allowed\" command"
 msgstr ""
 
-#: remote.c:8653
-msgid "Fetch and display info about one thread"
+#: remote-fileio.c:1458
+#, possible-c-format
+msgid "Garbage after \"show remote system-call-allowed\" command: `%s'"
 msgstr ""
 
-#: remote.c:8655
-msgid "Test setting to a different thread"
+#: remote-fileio.c:1473
+msgid "Set if the host system(3) call is allowed for the target."
 msgstr ""
 
-#: remote.c:8657
-msgid "Iterate through updating all remote thread info"
+#: remote-fileio.c:1477
+msgid "Show if the host system(3) call is allowed for the target."
 msgstr ""
 
-#: remote.c:8659
-msgid " Remote thread alive test "
+#: remote-m32r-sdi.c:330
+msgid "Cannot pass arguments to remote STDEBUG process"
 msgstr ""
 
-#: remote.c:8744
-msgid "Remote target doesn't support qGetTLSAddr packet"
+#: remote-m32r-sdi.c:333 remote-mips.c:2330
+msgid "No executable file specified"
 msgstr ""
 
-#: remote.c:8747
-msgid "Remote target failed to process qGetTLSAddr request"
+#: remote-m32r-sdi.c:392
+msgid "Connection refused."
 msgstr ""
 
-#: remote.c:8751
-msgid "TLS not supported or disabled on this target"
+#: remote-m32r-sdi.c:395 remote-m32r-sdi.c:398
+msgid "Cannot connect to SDI target."
 msgstr ""
 
-#: remote.c:8788
-msgid "Remote target doesn't support qGetTIBAddr packet"
+#: remote-m32r-sdi.c:1189
+msgid "Too many breakpoints"
 msgstr ""
 
-#: remote.c:8790
-msgid "Remote target failed to process qGetTIBAddr request"
+#: remote-m32r-sdi.c:1258
+#, possible-c-format
+msgid "Unknown option `%s'"
 msgstr ""
 
-#: remote.c:8793
-msgid "qGetTIBAddr not supported or disabled on this target"
+#: remote-m32r-sdi.c:1273 symfile.c:2085
+#, possible-c-format
+msgid "\"%s\" is not an object file: %s"
 msgstr ""
 
-#: remote.c:8841
+#: remote-m32r-sdi.c:1324
 #, possible-c-format
-msgid "Duplicate g packet description added for size %d"
+msgid "Error while downloading %s section."
 msgstr ""
 
-#: remote.c:8908 remote.c:8929 remote.c:8951
-msgid "Packet too long for target."
+#: remote-m32r-sdi.c:1443
+msgid "Too many watchpoints"
 msgstr ""
 
-#: remote.c:9183
-#, possible-c-format
-msgid "Read returned %d, but %d bytes."
+#: remote-m32r-sdi.c:1685
+msgid "Reset SDI connection."
 msgstr ""
 
-#: remote.c:9282
-#, possible-c-format
-msgid "Unknown remote I/O error %d"
+#: remote-m32r-sdi.c:1688
+msgid "Show status of SDI connection."
 msgstr ""
 
-#: remote.c:9284
-#, possible-c-format
-msgid "Remote I/O error: %s"
+#: remote-m32r-sdi.c:1691
+msgid "Debug M32R/Chaos."
 msgstr ""
 
-#: remote.c:9433
-#, possible-c-format
-msgid "Error reading %s."
+#: remote-m32r-sdi.c:1694
+msgid "Use debug DMA mem access."
 msgstr ""
 
-#: remote.c:9456
-#, possible-c-format
-msgid "Remote write of %d bytes returned 0!"
+#: remote-m32r-sdi.c:1696
+msgid "Use mon code mem access."
 msgstr ""
 
-#: remote.c:9473
-#, possible-c-format
-msgid "Successfully sent file \"%s\".\n"
+#: remote-m32r-sdi.c:1699
+msgid "Set breakpoints by IB break."
 msgstr ""
 
-#: remote.c:9528
-#, possible-c-format
-msgid "Successfully fetched file \"%s\".\n"
+#: remote-m32r-sdi.c:1701
+msgid "Set breakpoints by dbt."
 msgstr ""
 
-#: remote.c:9545
-#, possible-c-format
-msgid "Successfully deleted file \"%s\".\n"
+#: remote-mips.c:674
+msgid "Watchdog has expired.  Target detached."
 msgstr ""
 
-#: remote.c:9555
-msgid "file to put"
+#: remote-mips.c:678
+msgid "End of file from remote"
 msgstr ""
 
-#: remote.c:9560
-msgid "Invalid parameters to remote put"
+#: remote-mips.c:680
+#, possible-c-format
+msgid "Error reading from remote: %s"
 msgstr ""
 
-#: remote.c:9574
-msgid "file to get"
+#. At this point, about the only thing we can do is abort the command
+#. in progress and get back to command level as quickly as possible.
+#: remote-mips.c:715
+msgid "Remote board reset, debug protocol re-initialized."
 msgstr ""
 
-#: remote.c:9579
-msgid "Invalid parameters to remote get"
+#: remote-mips.c:773
+#, possible-c-format
+msgid "Debug protocol failure:  more than %d characters before a sync."
 msgstr ""
 
-#: remote.c:9593
-msgid "file to delete"
+#: remote-mips.c:862
+#, possible-c-format
+msgid "MIPS protocol data packet too long: %s"
 msgstr ""
 
-#: remote.c:9598
-msgid "Invalid parameters to remote delete"
+#: remote-mips.c:900 remote-mips.c:1161 remote-mips.c:1202
+#, possible-c-format
+msgid "write to target failed: %s"
 msgstr ""
 
-#: remote.c:9717 remote.c:9732 remote.c:9894 remote.c:9905
-msgid "Target does not support source download."
+#: remote-mips.c:1008
+msgid "Remote did not acknowledge packet"
 msgstr ""
 
-#: remote.c:9787
-msgid "Fast tracepoint not valid during download"
+#: remote-mips.c:1039 remote-mips.c:1079
+msgid "Timed out waiting for remote packet"
 msgstr ""
 
-#. Fast tracepoints are functionally identical to regular
-#. tracepoints, so don't take lack of support as a reason to
-#. give up on the trace run.
-#: remote.c:9794
-#, possible-c-format
-msgid ""
-"Target does not support fast tracepoints, downloading %d as regular "
-"tracepoint"
+#: remote-mips.c:1101
+msgid "Timed out waiting for packet"
 msgstr ""
 
-#: remote.c:9808
-msgid "Static tracepoint not valid during download"
+#: remote-mips.c:1259
+msgid "mips_request: Trying to send command before reply"
 msgstr ""
 
-#. Fast tracepoints are functionally identical to regular
-#. tracepoints, so don't take lack of support as a reason
-#. to give up on the trace run.
-#: remote.c:9814
-msgid "Target does not support static tracepoints"
+#: remote-mips.c:1279
+msgid "mips_request: Trying to get reply before command"
 msgstr ""
 
-#: remote.c:9834
-#, possible-c-format
-msgid "Target does not support conditional tracepoints, ignoring tp %d cond"
+#: remote-mips.c:1290
+msgid "Bad response from remote board"
 msgstr ""
 
-#: remote.c:9843
-msgid "Target does not support tracepoints."
+#: remote-mips.c:1366
+msgid "Failed to initialize (didn't receive packet)."
 msgstr ""
 
-#: remote.c:9860 remote.c:9877
-msgid "Error on target while setting tracepoints."
+#: remote-mips.c:1416
+msgid "internal error: mips_initialize called twice"
 msgstr ""
 
-#: remote.c:9925
-msgid "Trace state variable name too long for tsv definition packet"
+#: remote-mips.c:1490
+msgid "Failed to initialize."
 msgstr ""
 
-#: remote.c:9933
-msgid "Error on target while downloading trace state variable."
+#: remote-mips.c:1547
+msgid ""
+"To open a MIPS remote debugging connection, you need to specify what\n"
+"serial device is attached to the target board (e.g., /dev/ttya).\n"
+"If you want to use TFTP to download to the board, specify the name of a\n"
+"temporary file to be used by GDB for downloads as the second argument.\n"
+"This filename must be in the form host:filename, where host is the name\n"
+"of the host running the TFTP server, and the file must be readable by the\n"
+"world.  If the local name of the temporary file differs from the name as\n"
+"seen from the board via TFTP, specify that name as the third parameter.\n"
 msgstr ""
 
-#: remote.c:9969
-msgid "Too many sections for read-only sections definition packet."
+#: remote-mips.c:1601
+msgid "Unable to open UDP port"
 msgstr ""
 
-#: remote.c:9991 remote.c:10046 remote.c:10116 remote.c:10119 remote.c:10170
-#: remote.c:10232 remote.c:10260
+#: remote-mips.c:1851
 #, possible-c-format
-msgid "Bogus reply from target: %s"
+msgid "Remote failure: %s"
 msgstr ""
 
-#: remote.c:10031
+#: remote-mips.c:2049
 #, possible-c-format
-msgid "Bogus trace status reply from target: %s"
+msgid "Can't read register %d: %s"
 msgstr ""
 
-#: remote.c:10085
+#: remote-mips.c:2088
 #, possible-c-format
-msgid "Unknown trace find type %d"
+msgid "Can't write register %d: %s"
 msgstr ""
 
-#: remote.c:10100
-msgid "Unable to parse trace frame number"
+#: remote-mips.c:2323
+msgid "Can't pass arguments to remote MIPS board; arguments ignored."
 msgstr ""
 
-#: remote.c:10110
-msgid "Unable to parse tracepoint number"
+#: remote-mips.c:2582
+#, possible-c-format
+msgid "mips_common_breakpoint: Attempt to clear bogus breakpoint at %s"
 msgstr ""
 
-#: remote.c:10162
-msgid "Remote file name too long for trace save packet"
+#: remote-mips.c:2597 remote-mips.c:2650 remote-mips.c:2722
+#, possible-c-format
+msgid "mips_common_breakpoint: Bad response from remote board: %s"
 msgstr ""
 
-#: remote.c:10235
-msgid "Target does not support disconnected tracing."
+#: remote-mips.c:2761
+msgid "Timeout during download."
 msgstr ""
 
-#: remote.c:10460
-msgid "Calling remote_async when async is masked"
+#: remote-mips.c:2771
+#, possible-c-format
+msgid "Download got unexpected ack char: 0x%x, retrying."
 msgstr ""
 
-#. set/show remote ...
-#. allow-unknown
-#: remote.c:10620 remote.c:10626
-msgid ""
-"Remote protocol specific variables\n"
-"Configure various remote-protocol specific variables such as\n"
-"the packets being used"
+#: remote-mips.c:3520
+msgid "mips_load:  Couldn't get into monitor mode."
 msgstr ""
 
-#. allow-unknown
-#: remote.c:10633
-msgid ""
-"Compare section data on target to the exec file.\n"
-"Argument is a single section name (default: all loaded sections)."
+#: remote-mips.c:3678
+msgid "Set timeout in seconds for remote MIPS serial I/O."
 msgstr ""
 
-#: remote.c:10638
-msgid ""
-"Send an arbitrary packet to a remote target.\n"
-"   maintenance packet TEXT\n"
-"If GDB is talking to an inferior via the GDB serial protocol, then\n"
-"this command sends the string TEXT to the inferior, and displays the\n"
-"response packet.  GDB supplies the initial `$' character, and the\n"
-"terminating `#' character and checksum."
+#: remote-mips.c:3679
+msgid "Show timeout in seconds for remote MIPS serial I/O."
 msgstr ""
 
-#: remote.c:10647
-msgid "Set whether to send break if interrupted."
+#: remote-mips.c:3686
+msgid "Set retransmit timeout in seconds for remote MIPS serial I/O."
 msgstr ""
 
-#: remote.c:10648
-msgid "Show whether to send break if interrupted."
+#: remote-mips.c:3687
+msgid "Show retransmit timeout in seconds for remote MIPS serial I/O."
 msgstr ""
 
-#: remote.c:10649
-msgid "If set, a break, instead of a cntrl-c, is sent to the remote target."
+#: remote-mips.c:3688
+msgid ""
+"This is the number of seconds to wait for an acknowledgement to a packet\n"
+"before resending the packet."
 msgstr ""
 
-#: remote.c:10662
-msgid "Set interrupt sequence to remote target."
+#: remote-mips.c:3696
+msgid ""
+"Set the maximum number of characters to ignore when scanning for a SYN."
 msgstr ""
 
-#: remote.c:10663
-msgid "Show interrupt sequence to remote target."
+#: remote-mips.c:3697
+msgid ""
+"Show the maximum number of characters to ignore when scanning for a SYN."
 msgstr ""
 
-#: remote.c:10664
+#: remote-mips.c:3698
 msgid ""
-"Valid value is \"Ctrl-C\", \"BREAK\" or \"BREAK-g\". The default is \"Ctrl-"
-"C\"."
+"This is the maximum number of characters GDB will ignore when trying to\n"
+"synchronize with the remote system.  A value of -1 means that there is no\n"
+"limit. (Note that these characters are printed out even though they are\n"
+"ignored.)"
 msgstr ""
 
-#: remote.c:10671
-msgid ""
-"Set whether interrupt-sequence is sent to remote target when gdb connects to."
+#: remote-mips.c:3708
+msgid "Set the prompt that GDB expects from the monitor."
 msgstr ""
 
-#: remote.c:10672
-msgid ""
-"\t\tShow whether interrupt-sequence is sent to remote target when gdb "
-"connects to."
+#: remote-mips.c:3709
+msgid "Show the prompt that GDB expects from the monitor."
 msgstr ""
 
-#: remote.c:10673
-msgid "\t\tIf set, interrupt sequence is sent to remote target."
+#: remote-mips.c:3716
+msgid "Set printing of monitor warnings."
 msgstr ""
 
-#. Install commands for configuring memory read/write packets.
-#: remote.c:10680
-msgid "Set the maximum number of bytes per memory write packet (deprecated)."
+#: remote-mips.c:3717
+msgid "Show printing of monitor warnings."
 msgstr ""
 
-#: remote.c:10683
+#: remote-mips.c:3718
 msgid ""
-"Show the maximum number of bytes per memory write packet (deprecated)."
+"When enabled, monitor warnings about hardware breakpoints will be displayed."
 msgstr ""
 
-#: remote.c:10687
-msgid ""
-"Set the maximum number of bytes per memory-write packet.\n"
-"Specify the number of bytes in a packet or 0 (zero) for the\n"
-"default packet size.  The actual limit is further reduced\n"
-"dependent on the target.  Specify ``fixed'' to disable the\n"
-"further restriction and ``limit'' to enable that restriction."
+#: remote-mips.c:3725
+msgid "Send a packet to PMON (must be in debug mode)."
 msgstr ""
 
-#: remote.c:10695
+#: remote-mips.c:3727
 msgid ""
-"Set the maximum number of bytes per memory-read packet.\n"
-"Specify the number of bytes in a packet or 0 (zero) for the\n"
-"default packet size.  The actual limit is further reduced\n"
-"dependent on the target.  Specify ``fixed'' to disable the\n"
-"further restriction and ``limit'' to enable that restriction."
+"Set zeroing of upper 32 bits of 64-bit addresses when talking to PMON "
+"targets."
 msgstr ""
 
-#: remote.c:10704
-msgid "Show the maximum number of bytes per memory-write packet."
+#: remote-mips.c:3728
+msgid ""
+"Show zeroing of upper 32 bits of 64-bit addresses when talking to PMON "
+"targets."
 msgstr ""
 
-#: remote.c:10708
-msgid "Show the maximum number of bytes per memory-read packet."
+#: remote-mips.c:3729
+msgid "Use \"on\" to enable the masking and \"off\" to disable it."
 msgstr ""
 
-#: remote.c:10712
-msgid "Set the maximum number of target hardware watchpoints."
+#: remote-sim.c:187
+#, possible-c-format
+msgid "Unable to create simulator instance for inferior %d."
 msgstr ""
 
-#: remote.c:10713
-msgid "Show the maximum number of target hardware watchpoints."
+#: remote-sim.c:202
+#, possible-c-format
+msgid ""
+"Inferior %d and inferior %d would have identical simulator state.\n"
+"(This simulator does not support the running of more than one inferior.)"
 msgstr ""
 
-#: remote.c:10714 remote.c:10723
-msgid "Specify a negative limit for unlimited."
+#: remote-sim.c:529
+msgid "Register size different to expected"
 msgstr ""
 
-#: remote.c:10721
-msgid "Set the maximum number of target hardware breakpoints."
+#: remote-sim.c:532
+#, possible-c-format
+msgid "Register %d not updated"
 msgstr ""
 
-#: remote.c:10722
-msgid "Show the maximum number of target hardware breakpoints."
+#: remote-sim.c:534
+#, possible-c-format
+msgid "Register %s not updated"
 msgstr ""
 
-#: remote.c:10731
-msgid "Set the maximum size of the address (in bits) in a memory packet."
+#: remote-sim.c:573
+msgid "program to load"
 msgstr ""
 
-#: remote.c:10732
-msgid "Show the maximum size of the address (in bits) in a memory packet."
+#: remote-sim.c:581
+msgid "GDB sim does not yet support a load offset."
 msgstr ""
 
-#: remote.c:10881
-msgid "Set use of remote protocol `Z' packets"
+#: remote-sim.c:590
+msgid "unable to load program"
 msgstr ""
 
-#: remote.c:10882
-msgid "Show use of remote protocol `Z' packets "
+#: remote-sim.c:617
+msgid "No executable file specified."
 msgstr ""
 
-#: remote.c:10883
-msgid ""
-"When set, GDB will attempt to use the remote breakpoint and watchpoint\n"
-"packets."
+#: remote-sim.c:619 remote-sim.c:1085
+msgid "No program loaded."
 msgstr ""
 
-#: remote.c:10892
-msgid ""
-"Manipulate files on the remote system\n"
-"Transfer files to and from the remote target system."
+#: remote-sim.c:728
+msgid "unable to create simulator instance"
 msgstr ""
 
-#: remote.c:10899
-msgid "Copy a local file to the remote system."
+#: remote-sim.c:855
+#, possible-c-format
+msgid "gdbsim_resume: pid %d, step %d, signal %d\n"
 msgstr ""
 
-#: remote.c:10903
-msgid "Copy a remote file to the local system."
+#: remote-sim.c:934
+#, possible-c-format
+msgid "Can't stop pid %d.  No inferior found."
 msgstr ""
 
-#: remote.c:10907
-msgid "Delete a remote file."
+#: remote-sim.c:991
+#, possible-c-format
+msgid "Unable to wait for pid %d.  Inferior not found."
 msgstr ""
 
-#: remote.c:10912
-msgid "Set the remote pathname for \"run\""
+#. PREVIOUSLY: The user may give a command before the simulator
+#. is opened. [...] (??? assuming of course one wishes to
+#. continue to allow commands to be sent to unopened simulators,
+#. which isn't entirely unreasonable).
+#. The simulator is a builtin abstraction of a remote target.
+#. Consistent with that model, access to the simulator, via sim
+#. commands, is restricted to the period when the channel to the
+#. simulator is open.
+#: remote-sim.c:1188
+msgid "Not connected to the simulator target"
 msgstr ""
 
-#: remote.c:10913
-msgid "Show the remote pathname for \"run\""
+#: remote-sim.c:1310
+msgid "Send a command to the simulator."
 msgstr ""
 
-#: reverse.c:57
+#: reverse.c:53
 #, possible-c-format
 msgid "Already in reverse mode.  Use '%s' or 'set exec-dir forward'."
 msgstr ""
 
-#: reverse.c:146
+#: reverse.c:142
 msgid "target_get_bookmark failed."
 msgstr ""
 
-#: reverse.c:170
+#: reverse.c:166
 #, possible-c-format
 msgid "Saved bookmark %d at %s\n"
 msgstr ""
 
-#: reverse.c:229
+#: reverse.c:225
 msgid "No bookmarks."
 msgstr ""
 
-#: reverse.c:235
+#: reverse.c:231
 msgid "Delete all bookmarks? "
 msgstr ""
 
 #. Not found.
-#: reverse.c:247
+#: reverse.c:243
 #, possible-c-format
 msgid "No bookmark #%d."
 msgstr ""
 
-#: reverse.c:260 thread.c:1323
+#: reverse.c:256 thread.c:1316
 msgid "Command requires an argument."
 msgstr ""
 
 #. Not found.
-#: reverse.c:293
+#: reverse.c:289
 #, possible-c-format
 msgid "goto-bookmark: no bookmark found for '%s'."
 msgstr ""
 
-#: reverse.c:329
+#: reverse.c:325
 msgid "No bookmarks.\n"
 msgstr ""
 
-#: reverse.c:352
+#: reverse.c:348
 msgid ""
 "Step program backward until it reaches the beginning of another source "
 "line.\n"
 "Argument N means do this N times (or till program stops for another reason)."
 msgstr ""
 
-#: reverse.c:358
+#: reverse.c:354
 msgid ""
 "Step program backward, proceeding through subroutine calls.\n"
 "Like the \"reverse-step\" command as long as subroutine calls do not "
@@ -18884,19 +19530,19 @@
 "Argument N means do this N times (or till program stops for another reason)."
 msgstr ""
 
-#: reverse.c:366
+#: reverse.c:362
 msgid ""
 "Step backward exactly one instruction.\n"
 "Argument N means do this N times (or till program stops for another reason)."
 msgstr ""
 
-#: reverse.c:372
+#: reverse.c:368
 msgid ""
 "Step backward one instruction, but proceed through called subroutines.\n"
 "Argument N means do this N times (or till program stops for another reason)."
 msgstr ""
 
-#: reverse.c:378
+#: reverse.c:374
 msgid ""
 "Continue program being debugged but run it in reverse.\n"
 "If proceeding from breakpoint, a number N may be used as an argument,\n"
@@ -18904,18 +19550,18 @@
 "the breakpoint won't break until the Nth time it is reached)."
 msgstr ""
 
-#: reverse.c:385
+#: reverse.c:381
 msgid "Execute backward until just before selected stack frame is called."
 msgstr ""
 
-#: reverse.c:388
+#: reverse.c:384
 msgid ""
 "Set a bookmark in the program's execution history.\n"
 "A bookmark represents a point in the execution history \n"
 "that can be returned to at a later point in the debug session."
 msgstr ""
 
-#: reverse.c:392
+#: reverse.c:388
 msgid ""
 "Status of user-settable bookmarks.\n"
 "Bookmarks are user-settable markers representing a point in the \n"
@@ -18923,14 +19569,14 @@
 "session."
 msgstr ""
 
-#: reverse.c:397
+#: reverse.c:393
 msgid ""
 "Delete a bookmark from the bookmark list.\n"
 "Argument is a bookmark number or numbers,\n"
 " or no argument to delete all bookmarks.\n"
 msgstr ""
 
-#: reverse.c:402
+#: reverse.c:398
 msgid ""
 "Go to an earlier-bookmarked point in the program's execution history.\n"
 "Argument is the bookmark number of a bookmark saved earlier by using \n"
@@ -18940,34 +19586,34 @@
 msgstr ""
 
 #. FIXME: this happens 3 times at the start of each 64-bit program.
-#: rs6000-nat.c:262
+#: rs6000-nat.c:261
 msgid "ptrace read"
 msgstr ""
 
-#: rs6000-nat.c:330
+#: rs6000-nat.c:329
 msgid "ptrace write"
 msgstr ""
 
-#: rs6000-nat.c:613
+#: rs6000-nat.c:612
 msgid "pt_continue"
 msgstr ""
 
-#: rs6000-nat.c:757 solib.c:403
+#: rs6000-nat.c:756 solib.c:390
 #, possible-c-format
 msgid "Could not open `%s' as an executable file: %s"
 msgstr ""
 
-#: rs6000-nat.c:777
+#: rs6000-nat.c:776
 #, possible-c-format
 msgid "\"%s\": member \"%s\" missing."
 msgstr ""
 
-#: rs6000-nat.c:784
+#: rs6000-nat.c:783
 #, possible-c-format
 msgid "\"%s\": member \"%s\" not in executable format: %s."
 msgstr ""
 
-#: rs6000-nat.c:795
+#: rs6000-nat.c:794
 #, possible-c-format
 msgid "\"%s\": not in executable format: %s."
 msgstr ""
@@ -18975,17 +19621,17 @@
 #. The kernel sets ld_info to -1, if the process is still using the
 #. object, and the object is removed.  Keep the symbol info for the
 #. removed object and issue a warning.
-#: rs6000-nat.c:839
+#: rs6000-nat.c:838
 #, possible-c-format
 msgid "%s (fd=%d) has disappeared, keeping its symbols"
 msgstr ""
 
-#: rs6000-nat.c:868
+#: rs6000-nat.c:867
 #, possible-c-format
 msgid "Unable to stat %s, keeping its symbols"
 msgstr ""
 
-#: rs6000-nat.c:917
+#: rs6000-nat.c:916
 #, possible-c-format
 msgid ""
 "Symbol file %s\n"
@@ -18996,78 +19642,78 @@
 "symbols to the proper address)."
 msgstr ""
 
-#: rs6000-nat.c:951
+#: rs6000-nat.c:950
 msgid "vmap_exec: vmap or table->sections == 0."
 msgstr ""
 
-#: rs6000-nat.c:1025
+#: rs6000-nat.c:1024
 msgid "rs6000_create_inferior: failed to select architecture"
 msgstr ""
 
-#: rs6000-nat.c:1072
+#: rs6000-nat.c:1071
 msgid "ptrace ldinfo"
 msgstr ""
 
-#: rs6000-nat.c:1214
+#: rs6000-nat.c:1213
 #, possible-c-format
 msgid "Unable to find TOC entry for pc %s."
 msgstr ""
 
-#: rs6000-tdep.c:2804
+#: rs6000-tdep.c:2802
 #, possible-c-format
 msgid "rs6000_pseudo_register_read: called on unexpected register '%s' (%d)"
 msgstr ""
 
-#: rs6000-tdep.c:2829
+#: rs6000-tdep.c:2827
 #, possible-c-format
 msgid "rs6000_pseudo_register_write: called on unexpected register '%s' (%d)"
 msgstr ""
 
-#: rs6000-tdep.c:4184
+#: rs6000-tdep.c:4182
 msgid "\"set powerpc\" must be followed by an appropriate subcommand.\n"
 msgstr ""
 
-#: rs6000-tdep.c:4225
+#: rs6000-tdep.c:4223
 #, possible-c-format
 msgid "Invalid vector ABI accepted: %s."
 msgstr ""
 
-#: rs6000-tdep.c:4241
+#: rs6000-tdep.c:4239
 #, possible-c-format
 msgid "Use of exact watchpoints is %s.\n"
 msgstr ""
 
-#: rs6000-tdep.c:4279 rs6000-tdep.c:4283
+#: rs6000-tdep.c:4277 rs6000-tdep.c:4281
 msgid "Various PowerPC-specific commands."
 msgstr ""
 
-#: rs6000-tdep.c:4289
+#: rs6000-tdep.c:4287
 msgid "Set whether to use a soft-float ABI."
 msgstr ""
 
-#: rs6000-tdep.c:4290
+#: rs6000-tdep.c:4288
 msgid "Show whether to use a soft-float ABI."
 msgstr ""
 
-#: rs6000-tdep.c:4297
+#: rs6000-tdep.c:4295
 msgid "Set the vector ABI."
 msgstr ""
 
-#: rs6000-tdep.c:4298
+#: rs6000-tdep.c:4296
 msgid "Show the vector ABI."
 msgstr ""
 
-#: rs6000-tdep.c:4304
+#: rs6000-tdep.c:4302
 msgid ""
 "Set whether to use just one debug register for watchpoints on scalars."
 msgstr ""
 
-#: rs6000-tdep.c:4306
+#: rs6000-tdep.c:4304
 msgid ""
 "Show whether to use just one debug register for watchpoints on scalars."
 msgstr ""
 
-#: rs6000-tdep.c:4308
+#: rs6000-tdep.c:4306
 msgid ""
 "If true, GDB will use only one debug register when watching a variable of\n"
 "scalar type, thus assuming that the variable is accessed through the "
@@ -19075,49 +19721,57 @@
 "of its first byte."
 msgstr ""
 
-#: s390-nat.c:277 s390-nat.c:318
+#: s390-nat.c:325 s390-nat.c:347
+msgid "Couldn't get register set"
+msgstr ""
+
+#: s390-nat.c:353
+msgid "Couldn't set register set"
+msgstr ""
+
+#: s390-nat.c:458 s390-nat.c:499
 msgid "Couldn't retrieve watchpoint status"
 msgstr ""
 
-#: s390-nat.c:287
+#: s390-nat.c:468
 msgid "Couldn't clear watchpoint status"
 msgstr ""
 
-#: s390-nat.c:334
+#: s390-nat.c:515
 msgid "Couldn't modify watchpoint status"
 msgstr ""
 
-#: s390-tdep.c:2408
+#: s390-tdep.c:2644
 msgid "Stack overflow"
 msgstr ""
 
-#: s390-tdep.c:2511
+#: s390-tdep.c:2747
 msgid "unknown argument type"
 msgstr ""
 
-#: s390-tdep.c:2610 s390-tdep.c:2643
+#: s390-tdep.c:2857 s390-tdep.c:2890
 msgid "invalid return type"
 msgstr ""
 
-#: s390-tdep.c:2614 spu-tdep.c:1484
+#: s390-tdep.c:2861 spu-tdep.c:1491
 msgid "Cannot set function return value."
 msgstr ""
 
-#: s390-tdep.c:2647 spu-tdep.c:1500
+#: s390-tdep.c:2894 spu-tdep.c:1507
 msgid "Function return value unknown."
 msgstr ""
 
-#: score-tdep.c:160 score-tdep.c:253 score-tdep.c:323 score-tdep.c:832
+#: score-tdep.c:159 score-tdep.c:252 score-tdep.c:322 score-tdep.c:831
 #, possible-c-format
 msgid "Error: target_read_memory in file:%s, line:%d!"
 msgstr ""
 
-#: score-tdep.c:441
+#: score-tdep.c:440
 #, possible-c-format
 msgid "Error: score_xfer_register in file:%s, line:%d!"
 msgstr ""
 
-#: score-tdep.c:820
+#: score-tdep.c:819
 #, possible-c-format
 msgid "Error: malloc size < 0 in file:%s, line:%d!"
 msgstr ""
@@ -19125,7 +19779,7 @@
 #. The sentinel frame is used as a starting point for creating the
 #. previous (inner most) frame.  That frame's THIS_ID method will be
 #. called to determine the inner most frame's ID.  Not this one.
-#: sentinel-frame.c:81
+#: sentinel-frame.c:66
 msgid "sentinel_frame_this_id called"
 msgstr ""
 
@@ -19201,60 +19855,120 @@
 msgid "Print DOS serial port status."
 msgstr ""
 
-#: ser-mingw.c:175
+#: serial.c:389
+msgid "serial_readchar: blocking read in async mode"
+msgstr ""
+
+#: serial.c:568
+msgid "serial: FD not valid"
+msgstr ""
+
+#: serial.c:701 serial.c:739
+msgid "connect"
+msgstr ""
+
+#: serial.c:774
+msgid ""
+"Connect the terminal directly up to the command monitor.\n"
+"Use <CR>~. or <CR>~^D to break out."
+msgstr ""
+
+#: serial.c:779
+msgid "Set default serial/parallel port configuration."
+msgstr ""
+
+#: serial.c:785
+msgid "Show default serial/parallel port configuration."
+msgstr ""
+
+#: serial.c:791
+msgid "Set filename for remote session recording."
+msgstr ""
+
+#: serial.c:792
+msgid "Show filename for remote session recording."
+msgstr ""
+
+#: serial.c:793
+msgid ""
+"This file is used to record the remote session for future playback\n"
+"by gdbserver."
+msgstr ""
+
+#: serial.c:801
+msgid "Set numerical base for remote session logging"
+msgstr ""
+
+#: serial.c:802
+msgid "Show numerical base for remote session logging"
+msgstr ""
+
+#: serial.c:809
+msgid "Set serial debugging."
+msgstr ""
+
+#: serial.c:810
+msgid "Show serial debugging."
+msgstr ""
+
+#: serial.c:811
+msgid "When non-zero, serial port debugging is enabled."
+msgstr ""
+
+#: ser-mingw.c:174
 msgid "SetCommState failed"
 msgstr ""
 
-#: ser-mingw.c:268
+#: ser-mingw.c:267
 msgid "ser_windows_wait_handle: reseting mask failed"
 msgstr ""
 
-#: ser-mingw.c:271
+#: ser-mingw.c:270
 msgid "ser_windows_wait_handle: reseting mask failed (2)"
 msgstr ""
 
-#: ser-mingw.c:846
+#: ser-mingw.c:845
 msgid "child command"
 msgstr ""
 
-#: ser-mingw.c:852
+#: ser-mingw.c:851
 msgid "missing child command"
 msgstr ""
 
-#: ser-mingw.c:879
+#: ser-mingw.c:878
 #, possible-c-format
 msgid "error starting child process '%s': %s: %s"
 msgstr ""
 
-#: ser-mingw.c:882
+#: ser-mingw.c:881
 #, possible-c-format
 msgid "error starting child process '%s': %s"
 msgstr ""
 
-#: ser-tcp.c:181
+#: ser-tcp.c:183
 msgid "net_open: No colon in host name!"
 msgstr ""
 
 #. allow-unknown
-#: ser-tcp.c:406 ser-tcp.c:411
+#: ser-tcp.c:408 ser-tcp.c:413
 msgid ""
 "TCP protocol specific variables\n"
 "Configure variables specific to remote TCP connections"
 msgstr ""
 
-#: ser-tcp.c:418
+#: ser-tcp.c:420
 msgid "Set auto-retry on socket connect"
 msgstr ""
 
-#: ser-tcp.c:419
+#: ser-tcp.c:421
 msgid "Show auto-retry on socket connect"
 msgstr ""
 
-#: ser-tcp.c:425
+#: ser-tcp.c:427
 msgid "Set timeout limit for socket connection"
 msgstr ""
 
-#: ser-tcp.c:426
+#: ser-tcp.c:428
 msgid "Show timeout limit for socket connection"
 msgstr ""
 
@@ -19293,311 +20007,449 @@
 "when debugging using remote targets."
 msgstr ""
 
-#: serial.c:391
-msgid "serial_readchar: blocking read in async mode"
+#: sh64-tdep.c:1591
+msgid "sh64_register_convert_to_virtual called with non DR register number"
 msgstr ""
 
-#: serial.c:570
-msgid "serial: FD not valid"
+#: sh64-tdep.c:1616
+msgid "sh64_register_convert_to_raw called with non DR register number"
 msgstr ""
 
-#: serial.c:703 serial.c:741
-msgid "connect"
+#: sh64-tdep.c:2096
+#, possible-c-format
+msgid "Invalid pseudo register number %d\n"
+msgstr ""
+
+#: sh64-tdep.c:2191
+#, possible-c-format
+msgid "Invalid register number %d\n"
+msgstr ""
+
+#: sh64-tdep.c:2275
+msgid "Not a valid register for the current processor mode."
+msgstr ""
+
+#: sh-tdep.c:2276
+msgid "sh_register_convert_to_raw called with non DR register number"
+msgstr ""
+
+#: sh-tdep.c:3097
+msgid "Print all registers"
+msgstr ""
+
+#: sh-tdep.c:3106
+msgid "Set calling convention used when calling target functions from GDB."
+msgstr ""
+
+#: sh-tdep.c:3108
+msgid "Show calling convention used when calling target functions from GDB."
 msgstr ""
 
-#: serial.c:776
+#: sh-tdep.c:3110
 msgid ""
-"Connect the terminal directly up to the command monitor.\n"
-"Use <CR>~. or <CR>~^D to break out."
+"gcc       - Use GCC calling convention (default).\n"
+"renesas   - Enforce Renesas calling convention."
 msgstr ""
 
-#: serial.c:781
-msgid "Set default serial/parallel port configuration."
+#: skip.c:99
+msgid "No default file now."
 msgstr ""
 
-#: serial.c:787
-msgid "Show default serial/parallel port configuration."
+#: skip.c:108
+#, possible-c-format
+msgid "No source file named %s.\n"
 msgstr ""
 
-#: serial.c:793
-msgid "Set filename for remote session recording."
+#: skip.c:109
+msgid "Ignore file pending future shared library load? "
+msgstr ""
+
+#: skip.c:129
+#, possible-c-format
+msgid "File %s will be skipped when stepping.\n"
+msgstr ""
+
+#: skip.c:143
+msgid "No default function now."
+msgstr ""
+
+#: skip.c:148
+#, possible-c-format
+msgid "No function found containing current program point %s."
+msgstr ""
+
+#: skip.c:176
+#, possible-c-format
+msgid "No function found named %s.\n"
+msgstr ""
+
+#: skip.c:178
+msgid "Ignore function pending future shared library load? "
+msgstr ""
+
+#: skip.c:189
+msgid "Specify just one function at a time."
+msgstr ""
+
+#: skip.c:204
+#, possible-c-format
+msgid "No function found containing program point %s."
 msgstr ""
 
-#: serial.c:794
-msgid "Show filename for remote session recording."
+#: skip.c:237
+msgid "Not skipping any files or functions.\n"
 msgstr ""
 
-#: serial.c:795
-msgid ""
-"This file is used to record the remote session for future playback\n"
-"by gdbserver."
+#: skip.c:241
+#, possible-c-format
+msgid "No skiplist entries found with number %s.\n"
 msgstr ""
 
-#: serial.c:803
-msgid "Set numerical base for remote session logging"
+#: skip.c:284
+msgid "Skiplist entry should have either a filename or a function name."
 msgstr ""
 
-#: serial.c:804
-msgid "Show numerical base for remote session logging"
+#: skip.c:347 skip.c:364 skip.c:393
+#, possible-c-format
+msgid "No skiplist entries found with number %s."
 msgstr ""
 
-#: serial.c:811
-msgid "Set serial debugging."
+#: skip.c:414
+#, possible-c-format
+msgid "Function %s at %s will be skipped when stepping.\n"
 msgstr ""
 
-#: serial.c:812
-msgid "Show serial debugging."
+#: skip.c:417
+#, possible-c-format
+msgid ""
+"Function %s will be skipped when stepping, pending shared library load.\n"
 msgstr ""
 
-#: serial.c:813
-msgid "When non-zero, serial port debugging is enabled."
+#: skip.c:553
+msgid ""
+"Ignore a function while stepping.\n"
+"Usage: skip [FUNCTION NAME]\n"
+"If no function name is given, ignore the current function."
 msgstr ""
 
-#: sh-tdep.c:2278
-msgid "sh_register_convert_to_raw called with non DR register number"
+#: skip.c:559
+msgid ""
+"Ignore a file while stepping.\n"
+"Usage: skip file [FILENAME]\n"
+"If no filename is given, ignore the current file."
 msgstr ""
 
-#: sh-tdep.c:3099
-msgid "Print all registers"
+#: skip.c:566
+msgid ""
+"Ignore a function while stepping.\n"
+"Usage: skip function [FUNCTION NAME]\n"
+"If no function name is given, skip the current function."
 msgstr ""
 
-#: sh-tdep.c:3108
-msgid "Set calling convention used when calling target functions from GDB."
+#: skip.c:573
+msgid ""
+"Enable skip entries.  You can specify numbers (e.g. \"skip enable 1 3\"), "
+"ranges (e.g. \"skip enable 4-8\"), or both (e.g. \"skip enable 1 3 4-8\").\n"
+"\n"
+"If you don't specify any numbers or ranges, we'll enable all skip entries.\n"
+"\n"
+"Usage: skip enable [NUMBERS AND/OR RANGES]"
 msgstr ""
 
-#: sh-tdep.c:3110
-msgid "Show calling convention used when calling target functions from GDB."
+#: skip.c:580
+msgid ""
+"Disable skip entries.  You can specify numbers (e.g. \"skip disable 1 3\"), "
+"ranges (e.g. \"skip disable 4-8\"), or both (e.g. \"skip disable 1 3 4-"
+"8\").\n"
+"\n"
+"If you don't specify any numbers or ranges, we'll disable all skip entries.\n"
+"\n"
+"Usage: skip disable [NUMBERS AND/OR RANGES]"
 msgstr ""
 
-#: sh-tdep.c:3112
+#: skip.c:587
 msgid ""
-"gcc       - Use GCC calling convention (default).\n"
-"renesas   - Enforce Renesas calling convention."
+"Delete skip entries.  You can specify numbers (e.g. \"skip delete 1 3\"), "
+"ranges (e.g. \"skip delete 4-8\"), or both (e.g. \"skip delete 1 3 4-8\").\n"
+"\n"
+"If you don't specify any numbers or ranges, we'll delete all skip entries.\n"
+"\n"
+"Usage: skip delete [NUMBERS AND/OR RANGES]"
 msgstr ""
 
-#: sh64-tdep.c:1593
-msgid "sh64_register_convert_to_virtual called with non DR register number"
+#: skip.c:594
+msgid ""
+"Display the status of skips.  You can specify numbers (e.g. \"skip info 1 "
+"3\"), ranges (e.g. \"skip info 4-8\"), or both (e.g. \"skip info 1 3 4-"
+"8\").\n"
+"\n"
+"If you don't specify any numbers or ranges, we'll show all skips.\n"
+"\n"
+"Usage: skip info [NUMBERS AND/OR RANGES]\n"
+"The \"Type\" column indicates one of:\n"
+"\tfile        - ignored file\n"
+"\tfunction    - ignored function"
 msgstr ""
 
-#: sh64-tdep.c:1618
-msgid "sh64_register_convert_to_raw called with non DR register number"
+#: solib.c:103
+#, possible-c-format
+msgid ""
+"The search path for loading non-absolute shared library symbol files is %s.\n"
 msgstr ""
 
-#: sh64-tdep.c:2098
+#: solib.c:427
 #, possible-c-format
-msgid "Invalid pseudo register number %d\n"
+msgid "`%s': not in executable format: %s"
 msgstr ""
 
-#: sh64-tdep.c:2193
+#: solib.c:434
 #, possible-c-format
-msgid "Invalid register number %d\n"
+msgid ""
+"`%s': Shared library architecture %s is not compatible with target "
+"architecture %s."
 msgstr ""
 
-#: sh64-tdep.c:2277
-msgid "Not a valid register for the current processor mode."
+#: solib.c:476
+msgid "Shared library file name is too long."
 msgstr ""
 
-#: sol-thread.c:261
+#: solib.c:619
 #, possible-c-format
-msgid "thread_to_lwp: td_ta_map_id2thr %s"
+msgid "Error while reading shared library symbols for %s:\n"
 msgstr ""
 
-#: sol-thread.c:267
+#: solib.c:625
 #, possible-c-format
-msgid "thread_to_lwp: td_thr_get_info: %s"
+msgid "Loaded symbols for %s\n"
 msgstr ""
 
-#: sol-thread.c:273
-#, possible-c-format
-msgid "thread_to_lwp: thread state not active: %s"
+#: solib.c:810 solib.c:1261
+msgid "Error while mapping shared library sections:\n"
 msgstr ""
 
-#: sol-thread.c:304
+#: solib.c:826
 #, possible-c-format
-msgid "lwp_to_thread: td_ta_map_lwp2thr: %s."
+msgid ""
+"Could not load shared library symbols for %s.\n"
+"Do you need \"set solib-search-path\" or \"set sysroot\"?"
 msgstr ""
 
-#: sol-thread.c:310
+#: solib.c:831
 #, possible-c-format
-msgid "lwp_to_thread: td_thr_validate: %s."
+msgid ""
+"Could not load shared library symbols for %d libraries, e.g. %s.\n"
+"Use the \"info sharedlibrary\" command to see the complete listing.\n"
+"Do you need \"set solib-search-path\" or \"set sysroot\"?"
 msgstr ""
 
-#: sol-thread.c:316
+#: solib.c:915
 #, possible-c-format
-msgid "lwp_to_thread: td_thr_get_info: %s."
+msgid "Symbols already loaded for %s\n"
 msgstr ""
 
-#. Inactive thread.
-#: sol-thread.c:368 sol-thread.c:404
-msgid "This version of Solaris can't start inactive threads."
+#: solib.c:1044
+msgid "No shared libraries matched.\n"
 msgstr ""
 
-#: sol-thread.c:370 sol-thread.c:406
-#, possible-c-format
-msgid "Specified thread %ld seems to have terminated"
+#: solib.c:1047
+msgid "No shared libraries loaded at this time.\n"
 msgstr ""
 
-#: sol-thread.c:464
-msgid "sol_thread_fetch_registers: thread == 0"
+#: solib.c:1053
+msgid "(*): Shared library is missing debugging information.\n"
 msgstr ""
 
-#: sol-thread.c:468
+#: solib.c:1333
 #, possible-c-format
-msgid "sol_thread_fetch_registers: td_ta_map_id2thr: %s"
+msgid "Autoloading of shared library symbols is %s.\n"
 msgstr ""
 
-#: sol-thread.c:475
-#, possible-c-format
-msgid "sol_thread_fetch_registers: td_thr_getgregs %s"
+#: solib.c:1458 xcoffsolib.c:165
+msgid "Load shared object library symbols for files matching REGEXP."
 msgstr ""
 
-#: sol-thread.c:485
-#, possible-c-format
-msgid "sol_thread_fetch_registers: td_thr_getfpregs %s"
+#: solib.c:1460
+msgid "Status of loaded shared object libraries."
 msgstr ""
 
-#: sol-thread.c:499
-#, possible-c-format
-msgid "sol_thread_fetch_registers: td_thr_getxregsize %s"
+#: solib.c:1462
+msgid "Unload all shared object library symbols."
 msgstr ""
 
-#: sol-thread.c:507
-#, possible-c-format
-msgid "sol_thread_fetch_registers: td_thr_getxregs %s"
+#: solib.c:1465 xcoffsolib.c:170
+msgid "Set autoloading of shared library symbols."
 msgstr ""
 
-#: sol-thread.c:541
-#, possible-c-format
-msgid "sol_thread_store_registers: td_ta_map_id2thr %s"
+#: solib.c:1466 xcoffsolib.c:171
+msgid "Show autoloading of shared library symbols."
 msgstr ""
 
-#: sol-thread.c:554
-#, possible-c-format
-msgid "sol_thread_store_registers: td_thr_getgregs %s"
+#: solib.c:1467 xcoffsolib.c:172
+msgid ""
+"If \"on\", symbols from all shared object libraries will be loaded\n"
+"automatically when the inferior begins execution, when the dynamic linker\n"
+"informs gdb that a new library has been loaded, or when attaching to the\n"
+"inferior.  Otherwise, symbols must be loaded manually, using `sharedlibrary'."
 msgstr ""
 
-#: sol-thread.c:558
-#, possible-c-format
-msgid "sol_thread_store_registers: td_thr_getfpregs %s"
+#: solib.c:1478
+msgid "Set an alternate system root."
 msgstr ""
 
-#: sol-thread.c:568 sol-thread.c:598
-#, possible-c-format
-msgid "sol_thread_store_registers: td_thr_getxregsize %s"
+#: solib.c:1479
+msgid "Show the current system root."
 msgstr ""
 
-#: sol-thread.c:576
-#, possible-c-format
-msgid "sol_thread_store_registers: td_thr_getxregs %s"
+#: solib.c:1480
+msgid ""
+"The system root is used to load absolute shared library symbol files.\n"
+"For other (relative) files, you can add directories using\n"
+"`set solib-search-path'."
 msgstr ""
 
-#: sol-thread.c:587
-#, possible-c-format
-msgid "sol_thread_store_registers: td_thr_setgregs %s"
+#: solib.c:1494
+msgid ""
+"Set the search path for loading non-absolute shared library symbol files."
 msgstr ""
 
-#: sol-thread.c:591
-#, possible-c-format
-msgid "sol_thread_store_registers: td_thr_setfpregs %s"
+#: solib.c:1496
+msgid ""
+"Show the search path for loading non-absolute shared library symbol files."
+msgstr ""
+
+#: solib.c:1498
+msgid ""
+"This takes precedence over the environment variables PATH and "
+"LD_LIBRARY_PATH."
 msgstr ""
 
-#: sol-thread.c:662
+#: solib-darwin.c:456
 #, possible-c-format
-msgid "sol_thread_new_objfile: td_init: %s"
+msgid "`%s': not a shared-library: %s"
 msgstr ""
 
-#: sol-thread.c:690
+#: solib-dsbt.c:207
 #, possible-c-format
-msgid "Cannot initialize thread debugging library: %s"
+msgid "Unsupported map version: %d\n"
 msgstr ""
 
-#: sol-thread.c:1275
-msgid "info sol-thread: failed to get info for thread."
+#: solib-dsbt.c:303
+msgid "Error reading DSBT exec loadmap"
 msgstr ""
 
-#: sol-thread.c:1388
-msgid "Show info on Solaris user threads."
+#: solib-dsbt.c:313
+msgid "Error reading DSBT interp loadmap"
 msgstr ""
 
-#: solib-darwin.c:436
-#, possible-c-format
-msgid "`%s': not a shared-library: %s"
+#: solib-dsbt.c:679
+msgid ""
+"dsbt_current_sos: Unable to read link map entry.  Shared object chain may be "
+"incomplete."
 msgstr ""
 
-#: solib-frv.c:479
+#: solib-dsbt.c:693
 msgid ""
-"frv_current_sos: Unable to read link map entry.  Shared object chain may be "
+"dsbt_current_sos: Unable to read dsbt index.  Shared object chain may be "
 "incomplete."
 msgstr ""
 
-#: solib-frv.c:506
+#: solib-dsbt.c:714
 msgid ""
-"frv_current_sos: Unable to fetch load map.  Shared object chain may be "
+"dsbt_current_sos: Unable to fetch load map.  Shared object chain may be "
 "incomplete."
 msgstr ""
 
-#: solib-frv.c:528
+#: solib-dsbt.c:730 solib-frv.c:409
 #, possible-c-format
 msgid "Can't read pathname for link map entry: %s."
 msgstr ""
 
-#: solib-frv.c:599 solib-svr4.c:1589
+#: solib-dsbt.c:780 solib-frv.c:480 solib-svr4.c:1680
 msgid ""
 "Unable to find dynamic linker breakpoint function.\n"
 "GDB will be unable to debug shared library initializers\n"
 "and track explicitly loaded dynamic code."
 msgstr ""
 
-#: solib-frv.c:698
-msgid "Unable to determine dynamic linker loadmap address."
-msgstr ""
-
-#: solib-frv.c:712
-#, possible-c-format
-msgid "Unable to load dynamic linker loadmap at address %s."
-msgstr ""
-
-#: solib-frv.c:745
+#: solib-dsbt.c:901 solib-frv.c:623
 msgid "Could not find symbol _dl_debug_addr in dynamic linker"
 msgstr ""
 
-#: solib-frv.c:769
+#: solib-dsbt.c:922 solib-frv.c:647
 #, possible-c-format
 msgid ""
 "Unable to fetch contents of _dl_debug_addr (at address %s) from dynamic "
 "linker"
 msgstr ""
 
-#: solib-frv.c:795
+#: solib-dsbt.c:948 solib-frv.c:673
 #, possible-c-format
 msgid ""
 "Unable to fetch _dl_debug_addr->r_brk (at address %s) from dynamic linker"
 msgstr ""
 
-#: solib-frv.c:807
+#: solib-dsbt.c:1110 solib-frv.c:863 solib-irix.c:408 solib-sunos.c:654
+msgid "shared library handler failed to enable breakpoint"
+msgstr ""
+
+#: solib-dsbt.c:1164
+#, possible-c-format
+msgid "solib-dsbt debugging is %s.\n"
+msgstr ""
+
+#: solib-dsbt.c:1190
+msgid "Set internal debugging of shared library code for DSBT ELF."
+msgstr ""
+
+#: solib-dsbt.c:1191
+msgid "Show internal debugging of shared library code for DSBT ELF."
+msgstr ""
+
+#: solib-dsbt.c:1192
+msgid "When non-zero, DSBT solib specific internal debugging is enabled."
+msgstr ""
+
+#: solib-frv.c:360
+msgid ""
+"frv_current_sos: Unable to read link map entry.  Shared object chain may be "
+"incomplete."
+msgstr ""
+
+#: solib-frv.c:387
+msgid ""
+"frv_current_sos: Unable to fetch load map.  Shared object chain may be "
+"incomplete."
+msgstr ""
+
+#: solib-frv.c:575
+msgid "Unable to determine dynamic linker loadmap address."
+msgstr ""
+
+#: solib-frv.c:589
+#, possible-c-format
+msgid "Unable to load dynamic linker loadmap at address %s."
+msgstr ""
+
+#: solib-frv.c:685
 #, possible-c-format
 msgid ""
 "Unable to fetch _dl_debug_addr->.r_brk entry point (at address %s) from "
 "dynamic linker"
 msgstr ""
 
-#: solib-frv.c:934
+#: solib-frv.c:796
 msgid "Unable to load the executable's loadmap."
 msgstr ""
 
-#: solib-frv.c:1017 solib-irix.c:459 solib-sunos.c:758
-msgid "shared library handler failed to enable breakpoint"
-msgstr ""
-
-#: solib-frv.c:1343
+#: solib-frv.c:1189
 msgid "Set internal debugging of shared library code for FR-V."
 msgstr ""
 
-#: solib-frv.c:1344
+#: solib-frv.c:1190
 msgid "Show internal debugging of shared library code for FR-V."
 msgstr ""
 
-#: solib-frv.c:1345
+#: solib-frv.c:1191
 msgid "When non-zero, FR-V solib specific internal debugging is enabled."
 msgstr ""
 
@@ -19656,26 +20508,26 @@
 msgid "Unable to fetch shared library obj_info or obj_list info."
 msgstr ""
 
-#: solib-irix.c:489 solib-sunos.c:805
+#: solib-irix.c:438 solib-sunos.c:701
 msgid "shared library handler failed to disable breakpoint"
 msgstr ""
 
-#: solib-irix.c:575
+#: solib-irix.c:507
 #, possible-c-format
 msgid "current_sos: truncating name of %d characters to only %d characters"
 msgstr ""
 
-#: solib-irix.c:583 solib-som.c:605 solib-sunos.c:444 solib-svr4.c:1178
+#: solib-irix.c:515 solib-som.c:604 solib-sunos.c:405 solib-svr4.c:1224
 #, possible-c-format
 msgid "Can't read pathname for load map: %s."
 msgstr ""
 
-#: solib-irix.c:642 solib-osf.c:589 solib-pa64.c:532 solib-som.c:702
-#: solib-svr4.c:1012
+#: solib-irix.c:559 solib-osf.c:589 solib-pa64.c:495 solib-som.c:701
+#: solib-svr4.c:898
 msgid "Attempt to reload symbols from process? "
 msgstr ""
 
-#: solib-irix.c:665 solib-som.c:724 solib-svr4.c:1043
+#: solib-irix.c:582 solib-som.c:723 solib-svr4.c:938
 #, possible-c-format
 msgid "failed to read exec filename from attached file: %s"
 msgstr ""
@@ -19685,31 +20537,31 @@
 msgid "unable to read shared sec name at 0x%lx"
 msgstr ""
 
-#: solib-pa64.c:144
+#: solib-pa64.c:143
 msgid "No object file symbols."
 msgstr ""
 
-#: solib-pa64.c:154
+#: solib-pa64.c:153
 msgid "Unable to read in .dynamic section information."
 msgstr ""
 
-#: solib-pa64.c:163
+#: solib-pa64.c:162
 msgid "Error while reading in load map pointer."
 msgstr ""
 
-#: solib-pa64.c:178
+#: solib-pa64.c:177
 msgid "Error trying to get information about dynamic linker."
 msgstr ""
 
-#: solib-pa64.c:234 solib-pa64.c:248
+#: solib-pa64.c:233 solib-pa64.c:247
 msgid "Error while reading in .dynamic section of the program."
 msgstr ""
 
-#: solib-pa64.c:356
+#: solib-pa64.c:318
 msgid "Unable to read the .dynamic section."
 msgstr ""
 
-#: solib-pa64.c:361 solib-som.c:323
+#: solib-pa64.c:323 solib-som.c:322
 msgid ""
 "Private mapping of shared library text was not specified\n"
 "by the executable; setting a breakpoint in a shared library which\n"
@@ -19717,74 +20569,74 @@
 "manpage for methods to privately map shared library text."
 msgstr ""
 
-#: solib-pa64.c:373
+#: solib-pa64.c:335
 msgid "Unable to modify dynamic linker flags."
 msgstr ""
 
-#: solib-pa64.c:410
+#: solib-pa64.c:372
 #, possible-c-format
 msgid "Unable to grok dynamic linker %s as an object file"
 msgstr ""
 
 #. For a SOM-only target, there is no pa64 solib support.  This is needed
 #. for hppa-hpux-tdep.c to build.
-#: solib-pa64.c:690
+#: solib-pa64.c:653
 msgid "Cannot select pa64 solib support for this configuration."
 msgstr ""
 
-#: solib-som.c:226
+#: solib-som.c:225
 msgid ""
 "Unable to write __d_pid.\n"
 "Suggest linking with /opt/langtools/lib/end.o.\n"
 "GDB will be unable to track shl_load/shl_unload calls"
 msgstr ""
 
-#: solib-som.c:247
+#: solib-som.c:246
 msgid ""
 "Unable to find _DLD_HOOK symbol in object file.\n"
 "Suggest linking with /opt/langtools/lib/end.o.\n"
 "GDB will be unable to track shl_load/shl_unload calls"
 msgstr ""
 
-#: solib-som.c:270
+#: solib-som.c:269
 msgid ""
 "Unable to find __dld_hook symbol in object file.\n"
 "Suggest linking with /opt/langtools/lib/end.o.\n"
 "GDB will be unable to track shl_load/shl_unload calls"
 msgstr ""
 
-#: solib-som.c:284
+#: solib-som.c:283
 msgid ""
 "Unable to find __dld_d_trap symbol in object file.\n"
 "Suggest linking with /opt/langtools/lib/end.o.\n"
 "GDB will be unable to track shl_load/shl_unload calls"
 msgstr ""
 
-#: solib-som.c:304 solib-som.c:535
+#: solib-som.c:303 solib-som.c:534
 msgid "Unable to find __dld_flags symbol in object file."
 msgstr ""
 
-#: solib-som.c:312
+#: solib-som.c:311
 msgid "Unable to read __dld_flags."
 msgstr ""
 
-#: solib-som.c:337
+#: solib-som.c:336
 msgid "Unable to write __dld_flags."
 msgstr ""
 
-#: solib-som.c:350
+#: solib-som.c:349
 msgid "Unable to find _start symbol in object file."
 msgstr ""
 
-#: solib-som.c:540
+#: solib-som.c:539
 msgid "__dld_list is not valid according to __dld_flags."
 msgstr ""
 
-#: solib-som.c:550
+#: solib-som.c:549
 msgid "Unable to find dynamic library list."
 msgstr ""
 
-#: solib-som.c:856
+#: solib-som.c:855
 msgid "Unable to find $PRIVATE$ in shared library!"
 msgstr ""
 
@@ -19793,344 +20645,353 @@
 msgid "Cannot read SPE executable at %s"
 msgstr ""
 
-#: solib-sunos.c:543
+#: solib-sunos.c:492
 msgid "stopped at unknown breakpoint while handling shared libraries"
 msgstr ""
 
-#: solib-svr4.c:246
+#: solib-svr4.c:156
+#, possible-c-format
+msgid "Error reading shared library list entry at %s"
+msgstr ""
+
+#: solib-svr4.c:264
 #, possible-c-format
 msgid ""
 "Using PIC (Position Independent Code) prelink displacement %s for \"%s\".\n"
 msgstr ""
 
-#: solib-svr4.c:252
+#. There is no way to verify the library file matches.  prelink
+#. can during prelinking of an unprelinked file (or unprelinking
+#. of a prelinked file) shift the DYNAMIC segment by arbitrary
+#. offset without any page size alignment.  There is no way to
+#. find out the ELF header and/or Program Headers for a limited
+#. verification if it they match.  One could do a verification
+#. of the DYNAMIC segment.  Still the found address is the best
+#. one GDB could find.
+#: solib-svr4.c:280
 #, possible-c-format
 msgid ""
 ".dynamic section for \"%s\" is not at the expected address (wrong library or "
 "version mismatch?)"
 msgstr ""
 
-#: solib-svr4.c:1154
-msgid "Corrupted shared library list"
+#: solib-svr4.c:1033
+#, possible-c-format
+msgid "SVR4 Library list has unsupported version \"%s\""
+msgstr ""
+
+#: solib-svr4.c:1090 solib-target.c:232
+msgid "target library list"
+msgstr ""
+
+#: solib-svr4.c:1198
+#, possible-c-format
+msgid "Corrupted shared library list: %s != %s"
 msgstr ""
 
 #. It can be printed repeatedly as there is no easy way to check
 #. the executable symbols/file has been already relocated to
 #. displacement.
-#: solib-svr4.c:2038
+#: solib-svr4.c:2107
 #, possible-c-format
 msgid ""
 "Using PIE (Position Independent Executable) displacement %s for \"%s\".\n"
 msgstr ""
 
-#: solib-target.c:69
+#: solib-target.c:67
 msgid ""
 "Can not parse XML library list; XML support was disabled at compile time"
 msgstr ""
 
-#: solib-target.c:94 solib-target.c:111
+#: solib-target.c:92 solib-target.c:109
 msgid "Library list with both segments and sections"
 msgstr ""
 
-#: solib-target.c:142
+#: solib-target.c:140
 msgid "No segment or section bases defined"
 msgstr ""
 
-#: solib-target.c:157
+#: solib-target.c:155
 #, possible-c-format
 msgid "Library list has unsupported version \"%s\""
 msgstr ""
 
-#: solib-target.c:234
-msgid "target library list"
-msgstr ""
-
-#: solib-target.c:356
+#: solib-target.c:354
 #, possible-c-format
 msgid ""
 "Could not relocate shared library \"%s\": wrong number of ALLOC sections"
 msgstr ""
 
-#: solib-target.c:405
+#: solib-target.c:403
 #, possible-c-format
 msgid "Could not relocate shared library \"%s\": no segments"
 msgstr ""
 
-#: solib-target.c:421
+#: solib-target.c:419
 #, possible-c-format
 msgid "Could not relocate shared library \"%s\": bad offsets"
 msgstr ""
 
-#: solib.c:105
+#: sol-thread.c:260
 #, possible-c-format
-msgid ""
-"The search path for loading non-absolute shared library symbol files is %s.\n"
+msgid "thread_to_lwp: td_ta_map_id2thr %s"
 msgstr ""
 
-#: solib.c:440
+#: sol-thread.c:266
 #, possible-c-format
-msgid "`%s': not in executable format: %s"
+msgid "thread_to_lwp: td_thr_get_info: %s"
 msgstr ""
 
-#: solib.c:447
+#: sol-thread.c:272
 #, possible-c-format
-msgid ""
-"`%s': Shared library architecture %s is not compatible with target "
-"architecture %s."
+msgid "thread_to_lwp: thread state not active: %s"
 msgstr ""
 
-#: solib.c:505
-msgid "Shared library file name is too long."
+#: sol-thread.c:303
+#, possible-c-format
+msgid "lwp_to_thread: td_ta_map_lwp2thr: %s."
 msgstr ""
 
-#: solib.c:657
+#: sol-thread.c:309
 #, possible-c-format
-msgid "Error while reading shared library symbols for %s:\n"
+msgid "lwp_to_thread: td_thr_validate: %s."
 msgstr ""
 
-#: solib.c:663
+#: sol-thread.c:315
 #, possible-c-format
-msgid "Loaded symbols for %s\n"
+msgid "lwp_to_thread: td_thr_get_info: %s."
 msgstr ""
 
-#: solib.c:839 solib.c:1363
-msgid "Error while mapping shared library sections:\n"
+#. Inactive thread.
+#: sol-thread.c:367 sol-thread.c:403
+msgid "This version of Solaris can't start inactive threads."
 msgstr ""
 
-#: solib.c:855
+#: sol-thread.c:369 sol-thread.c:405
 #, possible-c-format
-msgid ""
-"Could not load shared library symbols for %s.\n"
-"Do you need \"set solib-search-path\" or \"set sysroot\"?"
+msgid "Specified thread %ld seems to have terminated"
 msgstr ""
 
-#: solib.c:860
-#, possible-c-format
-msgid ""
-"Could not load shared library symbols for %d libraries, e.g. %s.\n"
-"Use the \"info sharedlibrary\" command to see the complete listing.\n"
-"Do you need \"set solib-search-path\" or \"set sysroot\"?"
+#: sol-thread.c:463
+msgid "sol_thread_fetch_registers: thread == 0"
 msgstr ""
 
-#: solib.c:953
+#: sol-thread.c:467
 #, possible-c-format
-msgid "Symbols already loaded for %s\n"
-msgstr ""
-
-#: solib.c:1094
-msgid "No shared libraries matched.\n"
+msgid "sol_thread_fetch_registers: td_ta_map_id2thr: %s"
 msgstr ""
 
-#: solib.c:1097
-msgid "No shared libraries loaded at this time.\n"
+#: sol-thread.c:474
+#, possible-c-format
+msgid "sol_thread_fetch_registers: td_thr_getgregs %s"
 msgstr ""
 
-#: solib.c:1103
-msgid "(*): Shared library is missing debugging information.\n"
+#: sol-thread.c:484
+#, possible-c-format
+msgid "sol_thread_fetch_registers: td_thr_getfpregs %s"
 msgstr ""
 
-#: solib.c:1435
+#: sol-thread.c:498
 #, possible-c-format
-msgid "Autoloading of shared library symbols is %s.\n"
+msgid "sol_thread_fetch_registers: td_thr_getxregsize %s"
 msgstr ""
 
-#: solib.c:1464 xcoffsolib.c:165
-msgid "Load shared object library symbols for files matching REGEXP."
+#: sol-thread.c:506
+#, possible-c-format
+msgid "sol_thread_fetch_registers: td_thr_getxregs %s"
 msgstr ""
 
-#: solib.c:1466
-msgid "Status of loaded shared object libraries."
+#: sol-thread.c:540
+#, possible-c-format
+msgid "sol_thread_store_registers: td_ta_map_id2thr %s"
 msgstr ""
 
-#: solib.c:1468
-msgid "Unload all shared object library symbols."
+#: sol-thread.c:553
+#, possible-c-format
+msgid "sol_thread_store_registers: td_thr_getgregs %s"
 msgstr ""
 
-#: solib.c:1471 xcoffsolib.c:170
-msgid "Set autoloading of shared library symbols."
+#: sol-thread.c:557
+#, possible-c-format
+msgid "sol_thread_store_registers: td_thr_getfpregs %s"
 msgstr ""
 
-#: solib.c:1472 xcoffsolib.c:171
-msgid "Show autoloading of shared library symbols."
+#: sol-thread.c:567 sol-thread.c:597
+#, possible-c-format
+msgid "sol_thread_store_registers: td_thr_getxregsize %s"
 msgstr ""
 
-#: solib.c:1473 xcoffsolib.c:172
-msgid ""
-"If \"on\", symbols from all shared object libraries will be loaded\n"
-"automatically when the inferior begins execution, when the dynamic linker\n"
-"informs gdb that a new library has been loaded, or when attaching to the\n"
-"inferior.  Otherwise, symbols must be loaded manually, using `sharedlibrary'."
+#: sol-thread.c:575
+#, possible-c-format
+msgid "sol_thread_store_registers: td_thr_getxregs %s"
 msgstr ""
 
-#: solib.c:1484
-msgid "Set an alternate system root."
+#: sol-thread.c:586
+#, possible-c-format
+msgid "sol_thread_store_registers: td_thr_setgregs %s"
 msgstr ""
 
-#: solib.c:1485
-msgid "Show the current system root."
+#: sol-thread.c:590
+#, possible-c-format
+msgid "sol_thread_store_registers: td_thr_setfpregs %s"
 msgstr ""
 
-#: solib.c:1486
-msgid ""
-"The system root is used to load absolute shared library symbol files.\n"
-"For other (relative) files, you can add directories using\n"
-"`set solib-search-path'."
+#: sol-thread.c:661
+#, possible-c-format
+msgid "sol_thread_new_objfile: td_init: %s"
 msgstr ""
 
-#: solib.c:1500
-msgid ""
-"Set the search path for loading non-absolute shared library symbol files."
+#: sol-thread.c:689
+#, possible-c-format
+msgid "Cannot initialize thread debugging library: %s"
 msgstr ""
 
-#: solib.c:1502
-msgid ""
-"Show the search path for loading non-absolute shared library symbol files."
+#: sol-thread.c:1274
+msgid "info sol-thread: failed to get info for thread."
 msgstr ""
 
-#: solib.c:1504
-msgid ""
-"This takes precedence over the environment variables PATH and "
-"LD_LIBRARY_PATH."
+#: sol-thread.c:1387
+msgid "Show info on Solaris user threads."
 msgstr ""
 
-#: somread.c:86
+#: somread.c:74
 msgid "Couldn't read symbol dictionary!"
 msgstr ""
 
-#: somread.c:97
+#: somread.c:85
 msgid "Can't read in HP string table."
 msgstr ""
 
-#: somread.c:281
+#: somread.c:269
 #, possible-c-format
 msgid "Invalid symbol data; bad HP string table offset: %d"
 msgstr ""
 
-#: source.c:109
+#: source.c:107
 #, possible-c-format
 msgid "Number of source lines gdb will list by default is %s.\n"
 msgstr ""
 
-#: source.c:292
+#: source.c:290
 msgid "Can't find a default source file"
 msgstr ""
 
-#: source.c:392
+#: source.c:400
 msgid "Reinitialize source path to empty? "
 msgstr ""
 
-#: source.c:562
+#: source.c:570
 #, possible-c-format
 msgid "%s is not a directory."
 msgstr ""
 
-#: source.c:637
+#: source.c:645
 msgid "No current source file.\n"
 msgstr ""
 
-#: source.c:640
+#: source.c:648
 #, possible-c-format
 msgid "Current source file is %s\n"
 msgstr ""
 
-#: source.c:642
+#: source.c:650
 #, possible-c-format
 msgid "Compilation directory is %s\n"
 msgstr ""
 
-#: source.c:644
+#: source.c:652
 #, possible-c-format
 msgid "Located in %s\n"
 msgstr ""
 
-#: source.c:646
+#: source.c:654
 #, possible-c-format
 msgid "Contains %d line%s.\n"
 msgstr ""
 
-#: source.c:649
+#: source.c:657
 #, possible-c-format
 msgid "Source language is %s.\n"
 msgstr ""
 
-#: source.c:650
+#: source.c:658
 #, possible-c-format
 msgid "Compiled with %s debugging format.\n"
 msgstr ""
 
-#: source.c:651
+#: source.c:659
 #, possible-c-format
 msgid "%s preprocessor macro info.\n"
 msgstr ""
 
-#: source.c:1146
+#: source.c:1159
 msgid "Source file is more recent than executable."
 msgstr ""
 
-#: source.c:1389
+#: source.c:1341
 #, possible-c-format
 msgid "Line number %d out of range; %s has %d lines."
 msgstr ""
 
-#: source.c:1493
+#: source.c:1451
 msgid "No line number information available"
 msgstr ""
 
 #. Is there any case in which we get here, and have an address
 #. which the user would want to see?  If we have debugging symbols
 #. and no line numbers?
-#: source.c:1550
+#: source.c:1508
 #, possible-c-format
 msgid "Line number %d is out of range for \"%s\".\n"
 msgstr ""
 
-#: source.c:1586 source.c:1675
+#: source.c:1544 source.c:1633
 msgid "Expression not found"
 msgstr ""
 
-#: source.c:1643 source.c:1726
+#: source.c:1601 source.c:1684
 msgid "Expression not found\n"
 msgstr ""
 
-#: source.c:1836
+#: source.c:1794
 msgid "Too many arguments in command"
 msgstr ""
 
-#: source.c:1845
+#: source.c:1803
 #, possible-c-format
 msgid "Source path substitution rule matching `%s':\n"
 msgstr ""
 
-#: source.c:1847
+#: source.c:1805
 msgid "List of all source path substitution rules:\n"
 msgstr ""
 
-#: source.c:1871 source.c:1924
+#: source.c:1829 source.c:1882
 msgid "Incorrect usage, too many arguments in command"
 msgstr ""
 
-#: source.c:1881
+#: source.c:1839
 msgid "Delete all source path substitution rules? "
 msgstr ""
 
-#: source.c:1882
+#: source.c:1840
 msgid "Canceled"
 msgstr ""
 
-#: source.c:1904
+#: source.c:1862
 #, possible-c-format
 msgid "No substitution rule defined for `%s'"
 msgstr ""
 
-#: source.c:1921
+#: source.c:1879
 msgid "Incorrect usage, too few arguments in command"
 msgstr ""
 
-#: source.c:1927
+#: source.c:1885
 msgid "First argument must be at least one character long"
 msgstr ""
 
-#: source.c:1962
+#: source.c:1920
 msgid ""
 "Add directory DIR to beginning of search path for source files.\n"
 "Forget cached info on source file locations and line positions.\n"
@@ -20139,15 +21000,15 @@
 "With no argument, reset the search path to $cdir:$cwd, the default."
 msgstr ""
 
-#: source.c:1978
+#: source.c:1936
 msgid "Set the search path for finding source files."
 msgstr ""
 
-#: source.c:1980
+#: source.c:1938
 msgid "Show the search path for finding source files."
 msgstr ""
 
-#: source.c:1982
+#: source.c:1940
 msgid ""
 "$cwd in the path means the current working directory.\n"
 "$cdir in the path means the compilation directory of the source file.\n"
@@ -20156,18 +21017,18 @@
 "Setting the value to an empty string sets it to $cdir:$cwd, the default."
 msgstr ""
 
-#: source.c:1995
+#: source.c:1953
 msgid ""
 "Current search path for finding source files.\n"
 "$cwd in the path means the current working directory.\n"
 "$cdir in the path means the compilation directory of the source file."
 msgstr ""
 
-#: source.c:2003
+#: source.c:1961
 msgid "Information about the current source file."
 msgstr ""
 
-#: source.c:2005
+#: source.c:1963
 msgid ""
 "Core addresses of the code for a source line.\n"
 "Line can be specified as\n"
@@ -20182,28 +21043,28 @@
 "The address is also stored as the value of \"$_\"."
 msgstr ""
 
-#: source.c:2017
+#: source.c:1975
 msgid ""
 "Search for regular expression (see regex(3)) from last line listed.\n"
 "The matching line number is also stored as the value of \"$_\"."
 msgstr ""
 
-#: source.c:2022
+#: source.c:1980
 msgid ""
 "Search backward for regular expression (see regex(3)) from last line "
 "listed.\n"
 "The matching line number is also stored as the value of \"$_\"."
 msgstr ""
 
-#: source.c:2033
+#: source.c:1991
 msgid "Set number of source lines gdb will list by default."
 msgstr ""
 
-#: source.c:2034
+#: source.c:1992
 msgid "Show number of source lines gdb will list by default."
 msgstr ""
 
-#: source.c:2041
+#: source.c:1999
 msgid ""
 "Usage: set substitute-path FROM TO\n"
 "Add a substitution rule replacing FROM into TO in source file names.\n"
@@ -20211,7 +21072,7 @@
 "is replaced by the new one."
 msgstr ""
 
-#: source.c:2049
+#: source.c:2007
 msgid ""
 "Usage: unset substitute-path [FROM]\n"
 "Delete the rule for substituting FROM in source file names.  If FROM\n"
@@ -20219,329 +21080,329 @@
 "If the debugger cannot find a rule for FROM, it will display a warning."
 msgstr ""
 
-#: source.c:2057
+#: source.c:2015
 msgid ""
 "Usage: show substitute-path [FROM]\n"
 "Print the rule for substituting FROM in source file names. If FROM\n"
 "is not specified, print all substitution rules."
 msgstr ""
 
-#: sparc-nat.c:233
+#: sparc-nat.c:234
 msgid "Couldn't get floating-point registers"
 msgstr ""
 
-#: sparc-nat.c:246
+#: sparc-nat.c:247
 msgid "Couldn't write floating-point registers"
 msgstr ""
 
-#: sparc-nat.c:294
+#: sparc-nat.c:295
 msgid "Couldn't get StackGhost cookie"
 msgstr ""
 
-#: spu-linux-nat.c:460
+#: spu-linux-nat.c:459
 #, possible-c-format
 msgid "Child process unexpectedly missing: %s"
 msgstr ""
 
-#: spu-tdep.c:1607 spu-tdep.c:1611
+#: spu-tdep.c:1614 spu-tdep.c:1618
 msgid "Could not determine address of single-step breakpoint."
 msgstr ""
 
-#: spu-tdep.c:2029 spu-tdep.c:2086 spu-tdep.c:2207 spu-tdep.c:2448
-#: spu-tdep.c:2527
+#: spu-tdep.c:2036 spu-tdep.c:2093 spu-tdep.c:2214 spu-tdep.c:2456
+#: spu-tdep.c:2535
 msgid "\"info spu\" is only supported on the SPU architecture."
 msgstr ""
 
-#: spu-tdep.c:2037
+#: spu-tdep.c:2044
 msgid "Could not read event_status."
 msgstr ""
 
-#: spu-tdep.c:2045
+#: spu-tdep.c:2052
 msgid "Could not read event_mask."
 msgstr ""
 
-#: spu-tdep.c:2060
+#: spu-tdep.c:2067
 #, possible-c-format
 msgid "Event Status 0x%s\n"
 msgstr ""
 
-#: spu-tdep.c:2061
+#: spu-tdep.c:2068
 #, possible-c-format
 msgid "Event Mask   0x%s\n"
 msgstr ""
 
-#: spu-tdep.c:2093
+#: spu-tdep.c:2100
 msgid "Could not read signal1."
 msgstr ""
 
-#: spu-tdep.c:2104
+#: spu-tdep.c:2111
 msgid "Could not read signal1_type."
 msgstr ""
 
-#: spu-tdep.c:2111
+#: spu-tdep.c:2118
 msgid "Could not read signal2."
 msgstr ""
 
-#: spu-tdep.c:2122
+#: spu-tdep.c:2129
 msgid "Could not read signal2_type."
 msgstr ""
 
-#: spu-tdep.c:2140
+#: spu-tdep.c:2147
 #, possible-c-format
 msgid "Signal 1 control word 0x%s "
 msgstr ""
 
-#: spu-tdep.c:2142
+#: spu-tdep.c:2149
 msgid "Signal 1 not pending "
 msgstr ""
 
-#: spu-tdep.c:2145 spu-tdep.c:2155
+#: spu-tdep.c:2152 spu-tdep.c:2162
 msgid "(Type Or)\n"
 msgstr ""
 
-#: spu-tdep.c:2147 spu-tdep.c:2157
+#: spu-tdep.c:2154 spu-tdep.c:2164
 msgid "(Type Overwrite)\n"
 msgstr ""
 
-#: spu-tdep.c:2150
+#: spu-tdep.c:2157
 #, possible-c-format
 msgid "Signal 2 control word 0x%s "
 msgstr ""
 
-#: spu-tdep.c:2152
+#: spu-tdep.c:2159
 msgid "Signal 2 not pending "
 msgstr ""
 
-#: spu-tdep.c:2217
+#: spu-tdep.c:2224
 msgid "Could not read mbox_info."
 msgstr ""
 
-#: spu-tdep.c:2226
+#: spu-tdep.c:2233
 msgid "Could not read ibox_info."
 msgstr ""
 
-#: spu-tdep.c:2235
+#: spu-tdep.c:2242
 msgid "Could not read wbox_info."
 msgstr ""
 
-#: spu-tdep.c:2456
+#: spu-tdep.c:2464
 msgid "Could not read dma_info."
 msgstr ""
 
-#: spu-tdep.c:2486 spu-tdep.c:2558
+#: spu-tdep.c:2494 spu-tdep.c:2567
 msgid "no query pending"
 msgstr ""
 
-#: spu-tdep.c:2491 spu-tdep.c:2559
+#: spu-tdep.c:2499 spu-tdep.c:2568
 msgid "'any' query pending"
 msgstr ""
 
-#: spu-tdep.c:2492 spu-tdep.c:2560
+#: spu-tdep.c:2500 spu-tdep.c:2569
 msgid "'all' query pending"
 msgstr ""
 
-#: spu-tdep.c:2493 spu-tdep.c:2561
+#: spu-tdep.c:2501 spu-tdep.c:2570
 msgid "undefined query type"
 msgstr ""
 
-#: spu-tdep.c:2496 spu-tdep.c:2564
+#: spu-tdep.c:2504 spu-tdep.c:2573
 #, possible-c-format
 msgid "Tag-Group Status  0x%s\n"
 msgstr ""
 
-#: spu-tdep.c:2498 spu-tdep.c:2566
+#: spu-tdep.c:2506 spu-tdep.c:2575
 #, possible-c-format
 msgid "Tag-Group Mask    0x%s (%s)\n"
 msgstr ""
 
-#: spu-tdep.c:2500
+#: spu-tdep.c:2508
 #, possible-c-format
 msgid "Stall-and-Notify  0x%s\n"
 msgstr ""
 
-#: spu-tdep.c:2502
+#: spu-tdep.c:2510
 #, possible-c-format
 msgid "Atomic Cmd Status 0x%s\n"
 msgstr ""
 
-#: spu-tdep.c:2535
+#: spu-tdep.c:2543
 msgid "Could not read proxydma_info."
 msgstr ""
 
-#: spu-tdep.c:2578
+#: spu-tdep.c:2587
 msgid "\"info spu\" must be followed by the name of an SPU facility.\n"
 msgstr ""
 
-#: spu-tdep.c:2602
+#: spu-tdep.c:2611
 #, possible-c-format
 msgid "Stopping for new SPE threads is %s.\n"
 msgstr ""
 
-#: spu-tdep.c:2610
+#: spu-tdep.c:2619
 #, possible-c-format
 msgid "Automatic software-cache flush is %s.\n"
 msgstr ""
 
-#: spu-tdep.c:2751 spu-tdep.c:2754 spu-tdep.c:2789
+#: spu-tdep.c:2760 spu-tdep.c:2763 spu-tdep.c:2798
 msgid "Various SPU specific commands."
 msgstr ""
 
-#: spu-tdep.c:2760
+#: spu-tdep.c:2769
 msgid "Set whether to stop for new SPE threads."
 msgstr ""
 
-#: spu-tdep.c:2762
+#: spu-tdep.c:2771
 msgid "Show whether to stop for new SPE threads."
 msgstr ""
 
-#: spu-tdep.c:2764
+#: spu-tdep.c:2773
 msgid ""
 "Use \"on\" to give control to the user when a new SPE thread\n"
 "enters its \"main\" function.\n"
 "Use \"off\" to disable stopping for new SPE threads."
 msgstr ""
 
-#: spu-tdep.c:2775
+#: spu-tdep.c:2784
 msgid "Set whether to automatically flush the software-managed cache."
 msgstr ""
 
-#: spu-tdep.c:2777
+#: spu-tdep.c:2786
 msgid "Show whether to automatically flush the software-managed cache."
 msgstr ""
 
-#: spu-tdep.c:2779
+#: spu-tdep.c:2788
 msgid ""
 "Use \"on\" to automatically flush the software-managed cache\n"
 "whenever SPE execution stops.\n"
 "Use \"off\" to never automatically flush the software-managed cache."
 msgstr ""
 
-#: spu-tdep.c:2794
+#: spu-tdep.c:2803
 msgid "Display SPU event facility status.\n"
 msgstr ""
 
-#: spu-tdep.c:2797
+#: spu-tdep.c:2806
 msgid "Display SPU signal notification facility status.\n"
 msgstr ""
 
-#: spu-tdep.c:2800
+#: spu-tdep.c:2809
 msgid "Display SPU mailbox facility status.\n"
 msgstr ""
 
-#: spu-tdep.c:2803
+#: spu-tdep.c:2812
 msgid "Display MFC DMA status.\n"
 msgstr ""
 
-#: spu-tdep.c:2806
+#: spu-tdep.c:2815
 msgid "Display MFC Proxy-DMA status.\n"
 msgstr ""
 
-#: stabsread.c:167
+#: stabsread.c:166
 #, possible-c-format
 msgid "invalid C++ abbreviation `%s'"
 msgstr ""
 
-#: stabsread.c:174
+#: stabsread.c:173
 #, possible-c-format
 msgid "register number %d too large (max %d) in symbol %s"
 msgstr ""
 
-#: stabsread.c:236
+#: stabsread.c:235
 #, possible-c-format
 msgid ""
 "Invalid symbol data: type number (%d,%d) out of range at symtab pos %d."
 msgstr ""
 
-#: stabsread.c:288
+#: stabsread.c:287
 msgid "GDB internal error: bad real_filenum"
 msgstr ""
 
-#: stabsread.c:642
+#: stabsread.c:641
 #, possible-c-format
 msgid "Bad stabs string '%s'"
 msgstr ""
 
-#: stabsread.c:706
+#: stabsread.c:705
 #, possible-c-format
 msgid "Unknown C++ symbol name `%s'"
 msgstr ""
 
-#: stabsread.c:1477
+#: stabsread.c:1476
 msgid "couldn't parse type; debugger out of date?"
 msgstr ""
 
-#: stabsread.c:1598
+#: stabsread.c:1597
 #, possible-c-format
 msgid "Unrecognized cross-reference type `%c'"
 msgstr ""
 
-#: stabsread.c:1826
+#: stabsread.c:1825
 #, possible-c-format
 msgid ""
 "Prototyped function type didn't end arguments with `#':\n"
 "%s"
 msgstr ""
 
-#: stabsread.c:1939
+#: stabsread.c:1938
 #, possible-c-format
 msgid "invalid (minimal) member type data format at symtab pos %d."
 msgstr ""
 
-#: stabsread.c:2045
+#: stabsread.c:2044
 msgid "GDB internal error, type is NULL in stabsread.c."
 msgstr ""
 
-#: stabsread.c:2073
+#: stabsread.c:2072
 #, possible-c-format
 msgid "Unknown builtin type %d"
 msgstr ""
 
-#: stabsread.c:2248
+#: stabsread.c:2247
 #, possible-c-format
 msgid "Method has bad physname %s\n"
 msgstr ""
 
-#: stabsread.c:2447
+#: stabsread.c:2446
 #, possible-c-format
 msgid "const/volatile indicator missing, got '%c'"
 msgstr ""
 
-#: stabsread.c:2531
+#: stabsread.c:2530
 #, possible-c-format
 msgid "member function type missing, got '%c'"
 msgstr ""
 
-#: stabsread.c:2800
+#: stabsread.c:2799
 #, possible-c-format
 msgid "C++ abbreviated type name unknown at symtab pos %d"
 msgstr ""
 
-#: stabsread.c:3161
+#: stabsread.c:3160
 #, possible-c-format
 msgid "Unknown virtual character `%c' for baseclass"
 msgstr ""
 
-#: stabsread.c:3179
+#: stabsread.c:3178
 #, possible-c-format
 msgid "Unknown visibility `%c' for baseclass"
 msgstr ""
 
-#: stabsread.c:3288
+#: stabsread.c:3287
 #, possible-c-format
 msgid "virtual function table pointer not found when defining class `%s'"
 msgstr ""
 
-#: stabsread.c:3401
+#: stabsread.c:3400
 #, possible-c-format
 msgid "Unknown visibility `%c' for field"
 msgstr ""
 
-#: stabsread.c:3443
+#: stabsread.c:3442
 #, possible-c-format
 msgid "struct/union type gets multiply defined: %s%s"
 msgstr ""
 
-#: stabsread.c:4246
+#: stabsread.c:4245
 #, possible-c-format
 msgid "base type %d of range type is not defined"
 msgstr ""
@@ -20550,102 +21411,102 @@
 #. output contained `(0,41),(0,42)=@s8;-16;,(0,43),(0,1);' where should
 #. have been present ";-16,(0,43)" reference instead.  This way the
 #. excessive ";" marker prematurely stops the parameters parsing.
-#: stabsread.c:4286
+#: stabsread.c:4285
 msgid "Invalid (empty) method arguments"
 msgstr ""
 
-#: stabsread.c:4330
+#: stabsread.c:4329
 msgid "Invalid symbol data: common block within common block"
 msgstr ""
 
-#: stabsread.c:4356
+#: stabsread.c:4355
 msgid "ECOMM symbol unmatched by BCOMM"
 msgstr ""
 
-#: stabsread.c:4560
+#: stabsread.c:4559
 msgid "need a type name"
 msgstr ""
 
-#: stabsread.c:4587
+#: stabsread.c:4586
 #, possible-c-format
 msgid "forward-referenced types left unresolved, type code %d."
 msgstr ""
 
-#: stabsread.c:4738
+#: stabsread.c:4737
 #, possible-c-format
 msgid "%s: common block `%s' from global_sym_chain unresolved"
 msgstr ""
 
-#: stabsread.c:4819 stabsread.c:4824
+#: stabsread.c:4818 stabsread.c:4823
 #, possible-c-format
 msgid "invalid symbol name \"%s\""
 msgstr ""
 
-#: stack.c:470
+#: stack.c:717
 #, possible-c-format
 msgid "Debugger's willingness to use disassemble-next-line is %s.\n"
 msgstr ""
 
-#: stack.c:927 stack.c:1007
+#: stack.c:1265 stack.c:1345
 msgid "Too many args in frame specification"
 msgstr ""
 
-#: stack.c:1094
+#: stack.c:1432
 #, possible-c-format
 msgid "Stack level %d, frame at "
 msgstr ""
 
-#: stack.c:1099
+#: stack.c:1437
 msgid "Stack frame at "
 msgstr ""
 
-#: stack.c:1134
+#: stack.c:1472
 #, possible-c-format
 msgid " Outermost frame: %s\n"
 msgstr ""
 
-#: stack.c:1392
+#: stack.c:1732
 msgid "(More stack frames follow...)\n"
 msgstr ""
 
-#: stack.c:1402
+#: stack.c:1742
 #, possible-c-format
 msgid "Backtrace stopped: %s\n"
 msgstr ""
 
-#: stack.c:1637
+#: stack.c:1947
 msgid "PC unavailable, cannot determine locals.\n"
 msgstr ""
 
-#: stack.c:1658
+#: stack.c:1968
 msgid "No locals.\n"
 msgstr ""
 
-#: stack.c:1694
+#: stack.c:2004
 msgid "blockvector blotch"
 msgstr ""
 
-#: stack.c:1696
+#: stack.c:2006
 msgid "blockvector botch"
 msgstr ""
 
-#: stack.c:1733
+#: stack.c:2043
 msgid "No catches.\n"
 msgstr ""
 
-#: stack.c:1796
+#: stack.c:2106
 msgid "PC unavailable, cannot determine args.\n"
 msgstr ""
 
-#: stack.c:1803
+#: stack.c:2113
 msgid "No symbol table info available.\n"
 msgstr ""
 
-#: stack.c:1816
+#: stack.c:2126
 msgid "No arguments.\n"
 msgstr ""
 
-#: stack.c:1945
+#: stack.c:2255
 msgid "Initial frame selected; you cannot go up."
 msgstr ""
 
@@ -20653,40 +21514,40 @@
 #. "down" means to really go down (and let me know if that is
 #. impossible), but "down 9999" can be used to mean go all the
 #. way down without getting an error.
-#: stack.c:1982
+#: stack.c:2292
 msgid "Bottom (innermost) frame selected; you cannot go down."
 msgstr ""
 
-#: stack.c:2016
+#: stack.c:2326
 msgid "Can not force return from an inlined function."
 msgstr ""
 
-#: stack.c:2039
+#: stack.c:2349
 msgid ""
 "Return value type not available for selected stack frame.\n"
 "Please use an explicit cast of the value to return."
 msgstr ""
 
-#: stack.c:2080
+#: stack.c:2390
 #, possible-c-format
 msgid "%sMake selected stack frame return now? "
 msgstr ""
 
-#: stack.c:2083
+#: stack.c:2393
 #, possible-c-format
 msgid "%sMake %s return now? "
 msgstr ""
 
-#: stack.c:2086
+#: stack.c:2396
 msgid "Not confirmed"
 msgstr ""
 
-#: stack.c:2172
+#: stack.c:2486
 #, possible-c-format
 msgid "'%s' not within current stack frame.\n"
 msgstr ""
 
-#: stack.c:2226
+#: stack.c:2540
 msgid ""
 "Make selected stack frame return to its caller.\n"
 "Control remains in the debugger, but when you continue\n"
@@ -20694,31 +21555,31 @@
 "If an argument is given, it is an expression for the value to return."
 msgstr ""
 
-#: stack.c:2232
+#: stack.c:2546
 msgid ""
 "Select and print stack frame that called this one.\n"
 "An argument says how many frames up to go."
 msgstr ""
 
-#: stack.c:2235
+#: stack.c:2549
 msgid ""
 "Same as the `up' command, but does not print anything.\n"
 "This is useful in command scripts."
 msgstr ""
 
-#: stack.c:2239
+#: stack.c:2553
 msgid ""
 "Select and print stack frame called by this one.\n"
 "An argument says how many frames down to go."
 msgstr ""
 
-#: stack.c:2244
+#: stack.c:2558
 msgid ""
 "Same as the `down' command, but does not print anything.\n"
 "This is useful in command scripts."
 msgstr ""
 
-#: stack.c:2248
+#: stack.c:2562
 msgid ""
 "Select and print a stack frame.\n"
 "With no argument, print the selected stack frame.  (See also \"info "
@@ -20729,25 +21590,25 @@
 "a command file or a user-defined command."
 msgstr ""
 
-#: stack.c:2261
+#: stack.c:2575
 msgid "Print the current stack frame.\n"
 msgstr ""
 
-#: stack.c:2264
+#: stack.c:2578
 msgid ""
 "Select a stack frame without printing anything.\n"
 "An argument specifies the frame to select.\n"
 "It can be a stack frame number or the address of the frame.\n"
 msgstr ""
 
-#: stack.c:2269
+#: stack.c:2583
 msgid ""
 "Print backtrace of all stack frames, or innermost COUNT frames.\n"
 "With a negative argument, print outermost -COUNT frames.\n"
 "Use of the 'full' qualifier also prints the values of the local variables.\n"
 msgstr ""
 
-#: stack.c:2277
+#: stack.c:2591
 msgid ""
 "Print backtrace of all stack frames, or innermost COUNT frames\n"
 "and the values of the local variables.\n"
@@ -20755,55 +21616,55 @@
 "Usage: T <count>\n"
 msgstr ""
 
-#: stack.c:2286
+#: stack.c:2600
 msgid "Backtrace of the stack, or innermost COUNT frames."
 msgstr ""
 
-#: stack.c:2289
+#: stack.c:2603
 msgid "All about selected stack frame, or frame at ADDR."
 msgstr ""
 
-#: stack.c:2292
+#: stack.c:2606
 msgid "Local variables of current stack frame."
 msgstr ""
 
-#: stack.c:2294
+#: stack.c:2608
 msgid "Argument variables of current stack frame."
 msgstr ""
 
-#: stack.c:2297
+#: stack.c:2611
 msgid "Argument and local variables of current stack frame."
 msgstr ""
 
-#: stack.c:2300
+#: stack.c:2614
 msgid ""
 "Select the stack frame that contains <func>.\n"
 "Usage: func <name>\n"
 msgstr ""
 
-#: stack.c:2305
+#: stack.c:2619
 msgid "Exceptions that can be caught in the current stack frame."
 msgstr ""
 
-#: stack.c:2309
+#: stack.c:2623
 msgid "Set printing of non-scalar frame arguments"
 msgstr ""
 
-#: stack.c:2310
+#: stack.c:2624
 msgid "Show printing of non-scalar frame arguments"
 msgstr ""
 
-#: stack.c:2314
+#: stack.c:2628
 msgid ""
 "Set whether to disassemble next source line or insn when execution stops."
 msgstr ""
 
-#: stack.c:2316
+#: stack.c:2630
 msgid ""
 "Show whether to disassemble next source line or insn when execution stops."
 msgstr ""
 
-#: stack.c:2318
+#: stack.c:2632
 msgid ""
 "If ON, GDB will display disassembly of the next source line, in addition\n"
 "to displaying the source line itself.  If the next source line cannot\n"
@@ -20816,121 +21677,104 @@
 "source line."
 msgstr ""
 
-#: std-regs.c:83
-msgid "Standard register ``$sp'' is not available for this target"
-msgstr ""
-
-#: std-regs.c:93
-msgid "Standard register ``$ps'' is not available for this target"
-msgstr ""
-
-#: symfile-mem.c:77
-msgid "add-symbol-file-from-memory not supported for this target"
-msgstr ""
-
-#: symfile-mem.c:82
-msgid "Failed to read a valid object file image from memory."
-msgstr ""
-
-#: symfile-mem.c:95
-#, possible-c-format
-msgid "Got object file from memory but can't read symbols: %s."
+#: stack.c:2649
+msgid "Set printing of function arguments at function entry"
 msgstr ""
 
-#: symfile-mem.c:128
-msgid "add-symbol-file-from-memory requires an expression argument"
+#: stack.c:2651
+msgid "Show printing of function arguments at function entry"
 msgstr ""
 
-#: symfile-mem.c:138
-msgid "Must use symbol-file or exec-file before add-symbol-file-from-memory."
+#: stack.c:2653
+msgid ""
+"GDB can sometimes determine the values of function arguments at entry,\n"
+"in addition to their current values.  This option tells GDB whether\n"
+"to print the current value, the value at entry (marked as val@entry),\n"
+"or both.  Note that one or both of these values may be <optimized out>."
 msgstr ""
 
-#: symfile-mem.c:193
-msgid ""
-"Could not load vsyscall page because no executable was specified\n"
-"try using the \"file\" command first."
+#: std-regs.c:82
+msgid "Standard register ``$sp'' is not available for this target"
 msgstr ""
 
-#: symfile-mem.c:221
-msgid ""
-"Load the symbols out of memory from a dynamically loaded object file.\n"
-"Give an expression for the address of the file's shared object file header."
+#: std-regs.c:92
+msgid "Standard register ``$ps'' is not available for this target"
 msgstr ""
 
-#: symfile.c:163
+#: symfile.c:162
 #, possible-c-format
 msgid "Dynamic symbol table reloading multiple times in one run is %s.\n"
 msgstr ""
 
-#: symfile.c:618
+#: symfile.c:614
 #, possible-c-format
 msgid "no loadable sections found in added symbol-file %s"
 msgstr ""
 
-#: symfile.c:733
+#: symfile.c:729
 #, possible-c-format
 msgid "section %s not found in %s"
 msgstr ""
 
-#: symfile.c:1103
+#: symfile.c:1102
 #, possible-c-format
 msgid "Load new symbol table from \"%s\"? "
 msgstr ""
 
-#: symfile.c:1135
+#: symfile.c:1137
 msgid "expanding to full symbols..."
 msgstr ""
 
-#: symfile.c:1266
+#: symfile.c:1265
 #, possible-c-format
 msgid "Discard symbol table from `%s'? "
 msgstr ""
 
-#: symfile.c:1268
+#: symfile.c:1267
 msgid "Discard symbol table? "
 msgstr ""
 
-#: symfile.c:1279
+#: symfile.c:1278
 msgid "No symbol file now.\n"
 msgstr ""
 
-#: symfile.c:1323 symfile.c:1336
+#: symfile.c:1322 symfile.c:1335
 #, possible-c-format
 msgid "Problem reading \"%s\" for CRC: %s"
 msgstr ""
 
-#: symfile.c:1420
+#: symfile.c:1419
 #, possible-c-format
 msgid ""
 "the debug information found in \"%s\" does not match \"%s\" (CRC mismatch).\n"
 msgstr ""
 
-#: symfile.c:1436
+#: symfile.c:1435
 #, possible-c-format
 msgid ""
 "The directory where separate debug symbols are searched for is \"%s\".\n"
 msgstr ""
 
-#: symfile.c:1597 tracepoint.c:2863
+#: symfile.c:1596 tracepoint.c:3127
 #, possible-c-format
 msgid "unknown option `%s'"
 msgstr ""
 
-#: symfile.c:1608
+#: symfile.c:1607
 msgid "no symbol file name was specified"
 msgstr ""
 
-#: symfile.c:1796
+#: symfile.c:1795
 #, possible-c-format
 msgid "I'm sorry, Dave, I can't do that.  Symbol format `%s' unknown."
 msgstr ""
 
-#: symfile.c:1943
+#: symfile.c:1942
 #, possible-c-format
 msgid "Download verify read failed at %s"
 msgstr ""
 
-#: symfile.c:1946
+#: symfile.c:1945
 #, possible-c-format
 msgid "Download verify compare failed at %s"
 msgstr ""
@@ -20952,17 +21796,17 @@
 msgid "Load failed"
 msgstr ""
 
-#: symfile.c:2246
+#: symfile.c:2247
 msgid "add-symbol-file takes a file name and an address"
 msgstr ""
 
-#: symfile.c:2313
+#: symfile.c:2314
 msgid ""
-"USAGE: add-symbol-file <filename> <textaddress> [-mapped] [-readnow] [-s "
-"<secname> <addr>]*"
+"USAGE: add-symbol-file <filename> <textaddress> [-readnow] [-s <secname> "
+"<addr>]*"
 msgstr ""
 
-#: symfile.c:2324
+#: symfile.c:2325
 #, possible-c-format
 msgid "The address where %s has been loaded is missing"
 msgstr ""
@@ -20972,125 +21816,125 @@
 #. functions.  We have to split this up into separate print
 #. statements because hex_string returns a local static
 #. string.
-#: symfile.c:2332
+#: symfile.c:2333
 #, possible-c-format
 msgid "add symbol table from file \"%s\" at\n"
 msgstr ""
 
 #. FIXME, should use print_sys_errmsg but it's not filtered.
-#: symfile.c:2408
+#: symfile.c:2409
 #, possible-c-format
 msgid "`%s' has disappeared; keeping its symbols.\n"
 msgstr ""
 
-#: symfile.c:2420
+#: symfile.c:2421
 #, possible-c-format
 msgid "`%s' has changed; re-reading symbols.\n"
 msgstr ""
 
-#: symfile.c:2451
+#: symfile.c:2475
 #, possible-c-format
 msgid "Can't close BFD for %s: %s"
 msgstr ""
 
-#: symfile.c:2455
+#: symfile.c:2479
 #, possible-c-format
 msgid "Can't open %s to read symbols."
 msgstr ""
 
-#: symfile.c:2460
+#: symfile.c:2484
 #, possible-c-format
 msgid "Can't read symbols from %s: %s."
 msgstr ""
 
-#: symfile.c:2577
+#: symfile.c:2576
 msgid "(no debugging symbols found)\n"
 msgstr ""
 
-#: symfile.c:2647
+#: symfile.c:2646
 #, possible-c-format
 msgid "Mapping between filename extension and source language is \"%s\".\n"
 msgstr ""
 
-#: symfile.c:2661
+#: symfile.c:2660
 #, possible-c-format
 msgid "'%s': Filename extension must begin with '.'"
 msgstr ""
 
-#: symfile.c:2668 symfile.c:2680
+#: symfile.c:2667 symfile.c:2679
 #, possible-c-format
 msgid "'%s': two arguments required -- filename extension and language"
 msgstr ""
 
-#: symfile.c:2716
+#: symfile.c:2715
 msgid "Filename extensions and the languages they represent:"
 msgstr ""
 
-#: symfile.c:3197
+#: symfile.c:3196
 msgid "No sections are mapped.\n"
 msgstr ""
 
-#: symfile.c:3210 symfile.c:3255
+#: symfile.c:3209 symfile.c:3254
 msgid ""
 "Overlay debugging not enabled.  Use either the 'overlay auto' or\n"
 "the 'overlay manual' command."
 msgstr ""
 
-#: symfile.c:3215 symfile.c:3260
+#: symfile.c:3214 symfile.c:3259
 msgid "Argument required: name of an overlay section"
 msgstr ""
 
-#: symfile.c:3234
+#: symfile.c:3233
 #, possible-c-format
 msgid "Note: section %s unmapped by overlap\n"
 msgstr ""
 
-#: symfile.c:3241 symfile.c:3271
+#: symfile.c:3240 symfile.c:3270
 #, possible-c-format
 msgid "No overlay section called %s"
 msgstr ""
 
-#: symfile.c:3267
+#: symfile.c:3266
 #, possible-c-format
 msgid "Section %s is not mapped"
 msgstr ""
 
-#: symfile.c:3284
+#: symfile.c:3283
 msgid "Automatic overlay debugging enabled."
 msgstr ""
 
-#: symfile.c:3297
+#: symfile.c:3296
 msgid "Overlay debugging enabled."
 msgstr ""
 
-#: symfile.c:3310
+#: symfile.c:3309
 msgid "Overlay debugging disabled."
 msgstr ""
 
-#: symfile.c:3321
+#: symfile.c:3320
 msgid "This target does not know how to read its overlay state."
 msgstr ""
 
-#: symfile.c:3421
+#: symfile.c:3420
 msgid ""
 "Error reading inferior's overlay table: couldn't find `_novlys' variable\n"
 "in inferior.  Use `overlay manual' mode."
 msgstr ""
 
-#: symfile.c:3430 symfile.c:3516
+#: symfile.c:3429 symfile.c:3515
 msgid ""
 "Error reading inferior's overlay table: couldn't find `_ovly_table' array\n"
 "in inferior.  Use `overlay manual' mode."
 msgstr ""
 
-#: symfile.c:3735
+#: symfile.c:3734
 msgid ""
 "Load symbol table from executable file FILE.\n"
 "The `file' command can also load symbol tables, as well as setting the file\n"
 "to execute."
 msgstr ""
 
-#: symfile.c:3741
+#: symfile.c:3740
 msgid ""
 "Load symbols from FILE, assuming FILE has been dynamically loaded.\n"
 "Usage: add-symbol-file FILE ADDR [-s <SECT> <SECT_ADDR> -s <SECT> "
@@ -21101,179 +21945,219 @@
 "with the text.  SECT is a section name to be loaded at SECT_ADDR."
 msgstr ""
 
-#: symfile.c:3751
+#: symfile.c:3750
 msgid ""
 "Dynamically load FILE into the running program, and record its symbols\n"
 "for access from GDB.\n"
 "A load OFFSET may also be given."
 msgstr ""
 
-#: symfile.c:3758
+#: symfile.c:3757
 msgid "Set dynamic symbol table reloading multiple times in one run."
 msgstr ""
 
-#: symfile.c:3759
+#: symfile.c:3758
 msgid "Show dynamic symbol table reloading multiple times in one run."
 msgstr ""
 
-#: symfile.c:3766
+#: symfile.c:3765
 msgid "Commands for debugging overlays."
 msgstr ""
 
-#: symfile.c:3773
+#: symfile.c:3772
 msgid "Assert that an overlay section is mapped."
 msgstr ""
 
-#: symfile.c:3776
+#: symfile.c:3775
 msgid "Assert that an overlay section is unmapped."
 msgstr ""
 
-#: symfile.c:3779
+#: symfile.c:3778
 msgid "List mappings of overlay sections."
 msgstr ""
 
-#: symfile.c:3782
+#: symfile.c:3781
 msgid "Enable overlay debugging."
 msgstr ""
 
-#: symfile.c:3784
+#: symfile.c:3783
 msgid "Disable overlay debugging."
 msgstr ""
 
-#: symfile.c:3786
+#: symfile.c:3785
 msgid "Enable automatic overlay debugging."
 msgstr ""
 
-#: symfile.c:3788
+#: symfile.c:3787
 msgid "Read the overlay mapping state from the target."
 msgstr ""
 
-#: symfile.c:3793
+#: symfile.c:3792
 msgid "Set mapping between filename extension and source language."
 msgstr ""
 
-#: symfile.c:3794
+#: symfile.c:3793
 msgid "Show mapping between filename extension and source language."
 msgstr ""
 
-#: symfile.c:3795
+#: symfile.c:3794
 msgid "Usage: set extension-language .foo bar"
 msgstr ""
 
-#: symfile.c:3802
+#: symfile.c:3801
 msgid "All filename extensions associated with a source language."
 msgstr ""
 
-#: symfile.c:3805
+#: symfile.c:3804
 msgid "Set the directories where separate debug symbols are searched for."
 msgstr ""
 
-#: symfile.c:3806
+#: symfile.c:3805
 msgid "Show the directories where separate debug symbols are searched for."
 msgstr ""
 
-#: symfile.c:3807
+#: symfile.c:3806
 msgid ""
 "Separate debug symbols are first searched for in the same\n"
 "directory as the binary, then in the `"
 msgstr ""
 
-#: symmisc.c:133
+#: symfile.c:3808
+msgid ""
+"' subdirectory,\n"
+"and lastly at the path of the directory of the binary with\n"
+"each global debug-file-directory component prepended."
+msgstr ""
+
+#: symfile-mem.c:77
+msgid "add-symbol-file-from-memory not supported for this target"
+msgstr ""
+
+#: symfile-mem.c:82
+msgid "Failed to read a valid object file image from memory."
+msgstr ""
+
+#: symfile-mem.c:95
+#, possible-c-format
+msgid "Got object file from memory but can't read symbols: %s."
+msgstr ""
+
+#: symfile-mem.c:129
+msgid "add-symbol-file-from-memory requires an expression argument"
+msgstr ""
+
+#: symfile-mem.c:139
+msgid "Must use symbol-file or exec-file before add-symbol-file-from-memory."
+msgstr ""
+
+#: symfile-mem.c:194
+msgid ""
+"Could not load vsyscall page because no executable was specified\n"
+"try using the \"file\" command first."
+msgstr ""
+
+#: symfile-mem.c:222
+msgid ""
+"Load the symbols out of memory from a dynamically loaded object file.\n"
+"Give an expression for the address of the file's shared object file header."
+msgstr ""
+
+#: symmisc.c:92
 #, possible-c-format
 msgid "Byte cache statistics for '%s':\n"
 msgstr ""
 
-#: symmisc.c:154
+#: symmisc.c:113
 #, possible-c-format
 msgid "Statistics for '%s':\n"
 msgstr ""
 
-#: symmisc.c:156
+#: symmisc.c:115
 #, possible-c-format
 msgid "  Number of \"stab\" symbols read: %d\n"
 msgstr ""
 
-#: symmisc.c:159
+#: symmisc.c:118
 #, possible-c-format
 msgid "  Number of \"minimal\" symbols read: %d\n"
 msgstr ""
 
-#: symmisc.c:162
+#: symmisc.c:121
 #, possible-c-format
 msgid "  Number of \"partial\" symbols read: %d\n"
 msgstr ""
 
-#: symmisc.c:165
+#: symmisc.c:124
 #, possible-c-format
 msgid "  Number of \"full\" symbols read: %d\n"
 msgstr ""
 
-#: symmisc.c:168
+#: symmisc.c:127
 #, possible-c-format
 msgid "  Number of \"types\" defined: %d\n"
 msgstr ""
 
-#: symmisc.c:181
+#: symmisc.c:140
 #, possible-c-format
 msgid "  Number of symbol tables: %d\n"
 msgstr ""
 
-#: symmisc.c:182
+#: symmisc.c:141
 #, possible-c-format
 msgid "  Number of symbol tables with line tables: %d\n"
 msgstr ""
 
-#: symmisc.c:184
+#: symmisc.c:143
 #, possible-c-format
 msgid "  Number of symbol tables with blockvectors: %d\n"
 msgstr ""
 
-#: symmisc.c:188
+#: symmisc.c:147
 #, possible-c-format
 msgid "  Space used by a.out string tables: %d\n"
 msgstr ""
 
-#: symmisc.c:190
+#: symmisc.c:149
 #, possible-c-format
 msgid "  Total memory used for objfile obstack: %d\n"
 msgstr ""
 
-#: symmisc.c:192
+#: symmisc.c:151
 #, possible-c-format
 msgid "  Total memory used for psymbol cache: %d\n"
 msgstr ""
 
-#: symmisc.c:195
+#: symmisc.c:154
 #, possible-c-format
 msgid "  Total memory used for macro cache: %d\n"
 msgstr ""
 
-#: symmisc.c:197
+#: symmisc.c:156
 #, possible-c-format
 msgid "  Total memory used for file name cache: %d\n"
 msgstr ""
 
-#: symmisc.c:315
+#: symmisc.c:274
 #, possible-c-format
 msgid "internal error:  minimal symbol count %d != %d"
 msgstr ""
 
-#: symmisc.c:456
+#: symmisc.c:415
 msgid ""
 "Arguments missing: an output file name and an optional symbol file name"
 msgstr ""
 
-#: symmisc.c:676
+#: symmisc.c:635
 msgid ""
 "print-msymbols takes an output file name and optional symbol file name"
 msgstr ""
 
-#: symtab.c:1156
+#: symtab.c:1249
 #, possible-c-format
 msgid "Internal error: `%s' is not an aggregate"
 msgstr ""
 
-#: symtab.c:1408
+#: symtab.c:1501
 #, possible-c-format
 msgid ""
 "Internal: %s symbol `%s' found in %s psymtab but not in symtab.\n"
@@ -21282,7 +22166,7 @@
 msgstr ""
 
 #. FIXME; error is wrong in one case.
-#: symtab.c:1577
+#: symtab.c:1670
 #, possible-c-format
 msgid ""
 "Internal: global symbol `%s' found in %s psymtab but not in symtab.\n"
@@ -21290,181 +22174,104 @@
 "(if a template, try specifying an instantiation: %s<type>)."
 msgstr ""
 
-#: symtab.c:2672
+#: symtab.c:2844
 msgid "mismatched quoting on brackets, try 'operator\\[\\]'"
 msgstr ""
 
-#: symtab.c:2680
+#: symtab.c:2852
 msgid "nothing is allowed between '[' and ']'"
 msgstr ""
 
-#: symtab.c:2736
+#: symtab.c:2908
 msgid "`operator ()' must be specified without whitespace in `()'"
 msgstr ""
 
-#: symtab.c:2742
+#: symtab.c:2914
 msgid "`operator ?:' must be specified without whitespace in `?:'"
 msgstr ""
 
-#: symtab.c:2748
+#: symtab.c:2920
 msgid "`operator []' must be specified without whitespace in `[]'"
 msgstr ""
 
-#: symtab.c:2753
+#: symtab.c:2925
 #, possible-c-format
 msgid "`operator %s' not supported"
 msgstr ""
 
-#: symtab.c:3046
-msgid "must search on specific domain"
-msgstr ""
-
-#: symtab.c:4774 symtab.c:4777 symtab.c:4804
+#: symtab.c:4805 symtab.c:4808 symtab.c:4835
 msgid "All global and static variable names, or those matching REGEXP."
 msgstr ""
 
-#: symtab.c:4781
+#: symtab.c:4812
 msgid "All function names, or those matching REGEXP."
 msgstr ""
 
-#: symtab.c:4792
+#: symtab.c:4823
 msgid "All type names, or those matching REGEXP."
 msgstr ""
 
-#: symtab.c:4795
+#: symtab.c:4826
 msgid "Source files in the program."
 msgstr ""
 
-#: symtab.c:4798
+#: symtab.c:4829
 msgid "Set a breakpoint for all functions matching REGEXP."
 msgstr ""
 
-#: symtab.c:4803
+#: symtab.c:4834
 msgid "Source files in the program"
 msgstr ""
 
-#: symtab.c:4810
+#: symtab.c:4841
 msgid ""
 "Set the debugger behavior when more than one symbol are possible matches\n"
 "in an expression."
 msgstr ""
 
-#: symtab.c:4812
+#: symtab.c:4843
 msgid "Show how the debugger handles ambiguities in expressions."
 msgstr ""
 
-#: symtab.c:4813
+#: symtab.c:4844
 msgid ""
 "Valid values are \"ask\", \"all\", \"cancel\", and the default is \"all\"."
 msgstr ""
 
-#: symtab.h:734
-msgid "Section index is uninitialized"
-msgstr ""
-
-#: target-descriptions.c:307
-msgid "Architecture rejected target-supplied description"
-msgstr ""
-
-#: target-descriptions.c:315
-msgid ""
-"Target-supplied registers are not supported by the current architecture"
-msgstr ""
-
-#: target-descriptions.c:342
-msgid "Could not remove target-supplied description"
-msgstr ""
-
-#: target-descriptions.c:933 target-descriptions.c:955
-#, possible-c-format
-msgid "Register \"%s\" has an unsupported size (%d bits)"
-msgstr ""
-
-#: target-descriptions.c:1446
-#, possible-c-format
-msgid "Attempted to add duplicate compatible architecture \"%s\""
-msgstr ""
-
-#: target-descriptions.c:1466
-#, possible-c-format
-msgid "Attempted to add duplicate property \"%s\""
-msgstr ""
-
-#: target-descriptions.c:1524
-#, possible-c-format
-msgid "The target description will be read from \"%s\".\n"
-msgstr ""
-
-#: target-descriptions.c:1527
-msgid "The target description will be read from the target.\n"
-msgstr ""
-
-#: target-descriptions.c:1561
-msgid "There is no target description to print."
-msgstr ""
-
-#: target-descriptions.c:1564
-msgid "The current target description did not come from an XML file."
-msgstr ""
-
-#: target-descriptions.c:1680
-#, possible-c-format
-msgid "C output is not supported type \"%s\"."
-msgstr ""
-
-#: target-descriptions.c:1713
-msgid "Set target description specific variables."
-msgstr ""
-
-#. allow-unknown
-#: target-descriptions.c:1717
-msgid "Show target description specific variables."
-msgstr ""
-
-#. allow-unknown
-#: target-descriptions.c:1721
-msgid "Unset target description specific variables."
-msgstr ""
-
-#: target-descriptions.c:1728
-msgid "Set the file to read for an XML target description"
-msgstr ""
-
-#: target-descriptions.c:1729
-msgid "Show the file to read for an XML target description"
+#: symtab.c:4849
+msgid "Set whether a source file may have multiple base names."
 msgstr ""
 
-#: target-descriptions.c:1730
-msgid ""
-"When set, GDB will read the target description from a local\n"
-"file instead of querying the remote target."
+#: symtab.c:4850
+msgid "Show whether a source file may have multiple base names."
 msgstr ""
 
-#: target-descriptions.c:1737
+#: symtab.c:4851
 msgid ""
-"Unset the file to read for an XML target description.  When unset,\n"
-"GDB will read the description from the target."
-msgstr ""
-
-#: target-descriptions.c:1742
-msgid "Print the current target description as a C source file."
+"(A \"base name\" is the name of a file with the directory part removed.\n"
+"Example: The base name of \"/home/user/hello.c\" is \"hello.c\".)\n"
+"If set, GDB will canonicalize file names (e.g., expand symlinks)\n"
+"before comparing them.  Canonicalization is an expensive operation,\n"
+"but it allows the same file be known by more than one base name.\n"
+"If not set (the default), all source files are assumed to have just\n"
+"one base name, and gdb will do file name comparisons more efficiently."
 msgstr ""
 
-#: target-memory.c:431
-msgid "Error writing data to flash"
+#: symtab.h:747
+msgid "Section index is uninitialized"
 msgstr ""
 
-#: target.c:214
+#: target.c:212
 #, possible-c-format
 msgid "Target debugging is %s.\n"
 msgstr ""
 
-#: target.c:245
+#: target.c:243
 #, possible-c-format
 msgid "Cache use for stack accesses is %s.\n"
 msgstr ""
 
-#: target.c:428
+#: target.c:426
 msgid ""
 "Connect to a target machine or process.\n"
 "The first argument is the type or protocol of the target machine.\n"
@@ -21473,42 +22280,42 @@
 "`help target ' followed by the protocol name."
 msgstr ""
 
-#: target.c:490
+#: target.c:488
 msgid "could not find a target to create inferior"
 msgstr ""
 
-#: target.c:519
+#: target.c:517
 #, possible-c-format
 msgid "You can't do that when your target is `%s'"
 msgstr ""
 
-#: target.c:532
+#: target.c:530
 msgid "No saved terminal information.\n"
 msgstr ""
 
-#: target.c:958
+#: target.c:1002
 msgid "Attempt to unpush the dummy target"
 msgstr ""
 
-#: target.c:1085
+#: target.c:1129
 msgid "TLS load module not found"
 msgstr ""
 
-#: target.c:1099
+#: target.c:1143
 msgid "Cannot find thread-local variables in this thread library."
 msgstr ""
 
-#: target.c:1104
+#: target.c:1148
 #, possible-c-format
 msgid "Cannot find shared library `%s' in dynamic linker's load module list"
 msgstr ""
 
-#: target.c:1107
+#: target.c:1151
 #, possible-c-format
 msgid "Cannot find executable file `%s' in dynamic linker's load module list"
 msgstr ""
 
-#: target.c:1112
+#: target.c:1156
 #, possible-c-format
 msgid ""
 "The inferior has not yet allocated storage for thread-local variables in\n"
@@ -21516,7 +22323,7 @@
 "for %s"
 msgstr ""
 
-#: target.c:1118
+#: target.c:1162
 #, possible-c-format
 msgid ""
 "The inferior has not yet allocated storage for thread-local variables in\n"
@@ -21524,90 +22331,90 @@
 "for %s"
 msgstr ""
 
-#: target.c:1126
+#: target.c:1170
 #, possible-c-format
 msgid ""
 "Cannot find thread-local storage for %s, shared library %s:\n"
 "%s"
 msgstr ""
 
-#: target.c:1131
+#: target.c:1175
 #, possible-c-format
 msgid ""
 "Cannot find thread-local storage for %s, executable file %s:\n"
 "%s"
 msgstr ""
 
-#: target.c:1145
+#: target.c:1189
 msgid "Cannot find thread-local variables on this target"
 msgstr ""
 
-#: target.c:1475
+#: target.c:1515
 msgid "Writing to flash memory forbidden in this context"
 msgstr ""
 
-#: target.c:1592
+#: target.c:1667
 #, possible-c-format
 msgid "Writing to memory is not allowed (addr %s, len %s)"
 msgstr ""
 
-#: target.c:1756
+#: target.c:1850
 msgid "Overlapping regions in memory map: ignoring"
 msgstr ""
 
-#: target.c:1806
+#: target.c:1900
 #, possible-c-format
 msgid "Mode for reading from readonly sections is %s.\n"
 msgstr ""
 
-#: target.c:2266
+#: target.c:2360
 #, possible-c-format
 msgid "target object %d, annex %s, contained unexpected null characters"
 msgstr ""
 
-#: target.c:2305
+#: target.c:2399
 msgid "May not insert breakpoints"
 msgstr ""
 
-#: target.c:2322
+#: target.c:2416
 msgid "May not remove breakpoints"
 msgstr ""
 
-#: target.c:2336
+#: target.c:2430
 #, possible-c-format
 msgid "Symbols from \"%s\".\n"
 msgstr ""
 
-#: target.c:2346
+#: target.c:2440
 msgid "\tWhile running this, GDB does not access memory from...\n"
 msgstr ""
 
-#: target.c:2431
+#: target.c:2525
 msgid "Program not killed."
 msgstr ""
 
-#: target.c:2473
+#: target.c:2567
 msgid "could not find a target to detach"
 msgstr ""
 
-#: target.c:2639
+#: target.c:2733
 msgid "could not find a target to follow fork"
 msgstr ""
 
-#: target.c:2665
+#: target.c:2759
 msgid "could not find a target to follow mourn inferior"
 msgstr ""
 
-#: target.c:2716
+#: target.c:2810
 msgid "Unable to allocate memory to perform the search."
 msgstr ""
 
-#: target.c:2724 target.c:2778
+#: target.c:2818 target.c:2872
 #, possible-c-format
 msgid "Unable to access target memory at %s, halting search."
 msgstr ""
 
-#: target.c:2867
+#: target.c:2961
 #, possible-c-format
 msgid ""
 "The \"%s\" target does not support \"run\".  Try \"help target\" or "
@@ -21617,297 +22424,389 @@
 #. This function is only called if the target is running.  In that
 #. case there should have been a process_stratum target and it
 #. should either know how to create inferiors, or not...
-#: target.c:2875
+#: target.c:2969
 msgid "No targets found"
 msgstr ""
 
-#: target.c:2907
+#: target.c:3001
 #, possible-c-format
 msgid "Don't know how to %s.  Try \"help target\"."
 msgstr ""
 
-#: target.c:3062
+#: target.c:3156
 #, possible-c-format
 msgid "Can't determine the current address space of thread %s\n"
 msgstr ""
 
-#: target.c:3213 target.c:3221
+#: target.c:3307 target.c:3315
 msgid "Command not implemented for this target."
 msgstr ""
 
-#: target.c:3315
+#: target.c:3409
 msgid "could not find a target to attach"
 msgstr ""
 
-#: target.c:3364
+#: target.c:3458
 msgid "May not interrupt or stop the target, ignoring attempt"
 msgstr ""
 
-#: target.c:3481
+#: target.c:3577
 #, possible-c-format
 msgid "Writing to registers is not allowed (regno %d)"
 msgstr ""
 
-#: target.c:4075
+#: target.c:4240
 msgid "\"monitor\" command not supported by this target."
 msgstr ""
 
-#: target.c:4086
+#: target.c:4251
 msgid "The current target stack is:\n"
 msgstr ""
 
-#: target.c:4120
+#: target.c:4285
 #, possible-c-format
 msgid "Controlling the inferior in asynchronous mode is %s.\n"
 msgstr ""
 
-#: target.c:4189
+#: target.c:4354
 msgid "Set target debugging."
 msgstr ""
 
-#: target.c:4190
+#: target.c:4355
 msgid "Show target debugging."
 msgstr ""
 
-#: target.c:4191
+#: target.c:4356
 msgid ""
 "When non-zero, target debugging is enabled.  Higher numbers are more\n"
 "verbose.  Changes do not take effect until the next \"run\" or \"target\"\n"
 "command."
 msgstr ""
 
-#: target.c:4200
+#: target.c:4365
 msgid "Set mode for reading from readonly sections."
 msgstr ""
 
-#: target.c:4201
+#: target.c:4366
 msgid "Show mode for reading from readonly sections."
 msgstr ""
 
-#: target.c:4202
+#: target.c:4367
 msgid ""
 "When this mode is on, memory reads from readonly sections (such as .text)\n"
 "will be read from the object file instead of from the target.  This will\n"
 "result in significant performance improvement for remote targets."
 msgstr ""
 
-#: target.c:4211
+#: target.c:4376
 msgid "Send a command to the remote monitor (remote targets only)."
 msgstr ""
 
-#: target.c:4214
+#: target.c:4379
 msgid "Print the name of each layer of the internal target stack."
 msgstr ""
 
-#: target.c:4218
+#: target.c:4383
 msgid "Set whether gdb controls the inferior in asynchronous mode."
 msgstr ""
 
-#: target.c:4219
+#: target.c:4384
 msgid "Show whether gdb controls the inferior in asynchronous mode."
 msgstr ""
 
-#: target.c:4220
+#: target.c:4385
 msgid "Tells gdb whether to control the inferior in asynchronous mode."
 msgstr ""
 
-#: target.c:4228
+#: target.c:4393
 msgid "Set cache use for stack access."
 msgstr ""
 
-#: target.c:4229
+#: target.c:4394
 msgid "Show cache use for stack access."
 msgstr ""
 
-#: target.c:4230
+#: target.c:4395
 msgid ""
 "When on, use the data cache for all stack access, regardless of any\n"
 "configured memory regions.  This improves remote performance significantly.\n"
 "By default, caching for stack access is on."
 msgstr ""
 
-#: target.c:4239
+#: target.c:4404
 msgid "Set permission to write into registers."
 msgstr ""
 
-#: target.c:4240
+#: target.c:4405
 msgid "Show permission to write into registers."
 msgstr ""
 
-#: target.c:4241
+#: target.c:4406
 msgid ""
 "When this permission is on, GDB may write into the target's registers.\n"
 "Otherwise, any sort of write attempt will result in an error."
 msgstr ""
 
-#: target.c:4248
+#: target.c:4413
 msgid "Set permission to write into target memory."
 msgstr ""
 
-#: target.c:4249
+#: target.c:4414
 msgid "Show permission to write into target memory."
 msgstr ""
 
-#: target.c:4250
+#: target.c:4415
 msgid ""
 "When this permission is on, GDB may write into the target's memory.\n"
 "Otherwise, any sort of write attempt will result in an error."
 msgstr ""
 
-#: target.c:4257
+#: target.c:4422
 msgid "Set permission to insert breakpoints in the target."
 msgstr ""
 
-#: target.c:4258
+#: target.c:4423
 msgid "Show permission to insert breakpoints in the target."
 msgstr ""
 
-#: target.c:4259
+#: target.c:4424
 msgid ""
 "When this permission is on, GDB may insert breakpoints in the program.\n"
 "Otherwise, any sort of insertion attempt will result in an error."
 msgstr ""
 
-#: target.c:4266
+#: target.c:4431
 msgid "Set permission to insert tracepoints in the target."
 msgstr ""
 
-#: target.c:4267
+#: target.c:4432
 msgid "Show permission to insert tracepoints in the target."
 msgstr ""
 
-#: target.c:4268
+#: target.c:4433
 msgid ""
 "When this permission is on, GDB may insert tracepoints in the program.\n"
 "Otherwise, any sort of insertion attempt will result in an error."
 msgstr ""
 
-#: target.c:4275
-msgid "Set permission to insert fast tracepoints in the target."
+#: target.c:4440
+msgid "Set permission to insert fast tracepoints in the target."
+msgstr ""
+
+#: target.c:4441
+msgid "Show permission to insert fast tracepoints in the target."
+msgstr ""
+
+#: target.c:4442
+msgid ""
+"When this permission is on, GDB may insert fast tracepoints.\n"
+"Otherwise, any sort of insertion attempt will result in an error."
+msgstr ""
+
+#: target.c:4449
+msgid "Set permission to interrupt or signal the target."
+msgstr ""
+
+#: target.c:4450
+msgid "Show permission to interrupt or signal the target."
+msgstr ""
+
+#: target.c:4451
+msgid ""
+"When this permission is on, GDB may interrupt/stop the target's execution.\n"
+"Otherwise, any attempt to interrupt or stop will be ignored."
+msgstr ""
+
+#: target-descriptions.c:306
+msgid "Architecture rejected target-supplied description"
+msgstr ""
+
+#: target-descriptions.c:314
+msgid ""
+"Target-supplied registers are not supported by the current architecture"
+msgstr ""
+
+#: target-descriptions.c:341
+msgid "Could not remove target-supplied description"
+msgstr ""
+
+#: target-descriptions.c:932 target-descriptions.c:954
+#, possible-c-format
+msgid "Register \"%s\" has an unsupported size (%d bits)"
+msgstr ""
+
+#: target-descriptions.c:1445
+#, possible-c-format
+msgid "Attempted to add duplicate compatible architecture \"%s\""
+msgstr ""
+
+#: target-descriptions.c:1465
+#, possible-c-format
+msgid "Attempted to add duplicate property \"%s\""
+msgstr ""
+
+#: target-descriptions.c:1523
+#, possible-c-format
+msgid "The target description will be read from \"%s\".\n"
+msgstr ""
+
+#: target-descriptions.c:1526
+msgid "The target description will be read from the target.\n"
+msgstr ""
+
+#: target-descriptions.c:1560
+msgid "There is no target description to print."
+msgstr ""
+
+#: target-descriptions.c:1563
+msgid "The current target description did not come from an XML file."
+msgstr ""
+
+#: target-descriptions.c:1679
+#, possible-c-format
+msgid "C output is not supported type \"%s\"."
+msgstr ""
+
+#: target-descriptions.c:1712
+msgid "Set target description specific variables."
+msgstr ""
+
+#. allow-unknown
+#: target-descriptions.c:1716
+msgid "Show target description specific variables."
+msgstr ""
+
+#. allow-unknown
+#: target-descriptions.c:1720
+msgid "Unset target description specific variables."
+msgstr ""
+
+#: target-descriptions.c:1727
+msgid "Set the file to read for an XML target description"
 msgstr ""
 
-#: target.c:4276
-msgid "Show permission to insert fast tracepoints in the target."
+#: target-descriptions.c:1728
+msgid "Show the file to read for an XML target description"
 msgstr ""
 
-#: target.c:4277
+#: target-descriptions.c:1729
 msgid ""
-"When this permission is on, GDB may insert fast tracepoints.\n"
-"Otherwise, any sort of insertion attempt will result in an error."
+"When set, GDB will read the target description from a local\n"
+"file instead of querying the remote target."
 msgstr ""
 
-#: target.c:4284
-msgid "Set permission to interrupt or signal the target."
+#: target-descriptions.c:1736
+msgid ""
+"Unset the file to read for an XML target description.  When unset,\n"
+"GDB will read the description from the target."
 msgstr ""
 
-#: target.c:4285
-msgid "Show permission to interrupt or signal the target."
+#: target-descriptions.c:1741
+msgid "Print the current target description as a C source file."
 msgstr ""
 
-#: target.c:4286
-msgid ""
-"When this permission is on, GDB may interrupt/stop the target's execution.\n"
-"Otherwise, any attempt to interrupt or stop will be ignored."
+#: target-memory.c:430
+msgid "Error writing data to flash"
 msgstr ""
 
-#: thread.c:250
+#: thread.c:239
 #, possible-c-format
 msgid "[New %s]\n"
 msgstr ""
 
-#: thread.c:810
+#: thread.c:803
 msgid "No threads.\n"
 msgstr ""
 
-#: thread.c:812
+#: thread.c:805
 #, possible-c-format
 msgid "No threads match '%s'.\n"
 msgstr ""
 
-#: thread.c:838
+#: thread.c:831
 msgid "Requested thread not found in requested process"
 msgstr ""
 
-#: thread.c:1065
+#: thread.c:1058
 #, possible-c-format
 msgid "Couldn't restore frame #%d in current thread, at reparsed frame #0\n"
 msgstr ""
 
-#: thread.c:1186 thread.c:1225
+#: thread.c:1179 thread.c:1218
 msgid "Please specify a command following the thread ID list"
 msgstr ""
 
-#: thread.c:1201 thread.c:1253
+#: thread.c:1194 thread.c:1246
 #, possible-c-format
 msgid ""
 "\n"
 "Thread %d (%s):\n"
 msgstr ""
 
-#: thread.c:1220
+#: thread.c:1213
 msgid "Please specify a thread ID list"
 msgstr ""
 
-#: thread.c:1248
+#: thread.c:1241
 #, possible-c-format
 msgid "Thread %d has terminated."
 msgstr ""
 
-#: thread.c:1274 thread.c:1303
+#: thread.c:1267 thread.c:1296
 msgid "No thread selected"
 msgstr ""
 
-#: thread.c:1279
+#: thread.c:1272
 #, possible-c-format
 msgid "[Current thread is %d (%s) (exited)]\n"
 msgstr ""
 
-#: thread.c:1283
+#: thread.c:1276
 #, possible-c-format
 msgid "[Current thread is %d (%s)]\n"
 msgstr ""
 
-#: thread.c:1334
+#: thread.c:1327
 #, possible-c-format
 msgid "Thread %d has name '%s'\n"
 msgstr ""
 
-#: thread.c:1342
+#: thread.c:1335
 #, possible-c-format
 msgid "Thread %d has target name '%s'\n"
 msgstr ""
 
-#: thread.c:1350
+#: thread.c:1343
 #, possible-c-format
 msgid "Thread %d has target id '%s'\n"
 msgstr ""
 
-#: thread.c:1358
+#: thread.c:1351
 #, possible-c-format
 msgid "Thread %d has extra info '%s'\n"
 msgstr ""
 
-#: thread.c:1364
+#: thread.c:1357
 #, possible-c-format
 msgid "No threads match '%s'\n"
 msgstr ""
 
-#: thread.c:1374
+#: thread.c:1367
 #, possible-c-format
 msgid "Printing of thread events is %s.\n"
 msgstr ""
 
-#: thread.c:1389 windows-tdep.c:373
+#: thread.c:1382 windows-tdep.c:373
 #, possible-c-format
 msgid "Thread ID %d not known."
 msgstr ""
 
-#: thread.c:1392 windows-tdep.c:376
+#: thread.c:1385 windows-tdep.c:376
 #, possible-c-format
 msgid "Thread ID %d has terminated."
 msgstr ""
 
-#: thread.c:1458
+#: thread.c:1451
 msgid ""
 "Display currently known threads.\n"
 "Usage: info threads [ID]...\n"
@@ -21915,139 +22814,154 @@
 "If no arguments, all threads are displayed."
 msgstr ""
 
-#: thread.c:1463
+#: thread.c:1456
 msgid ""
 "Use this command to switch between threads.\n"
 "The new thread ID must be currently known."
 msgstr ""
 
-#: thread.c:1469
+#: thread.c:1462
 msgid "Apply a command to a list of threads."
 msgstr ""
 
-#: thread.c:1473
+#: thread.c:1466
 msgid "Apply a command to all threads."
 msgstr ""
 
-#: thread.c:1476
+#: thread.c:1469
 msgid ""
 "Set the current thread's name.\n"
 "Usage: thread name [NAME]\n"
 "If NAME is not given, then any existing name is removed."
 msgstr ""
 
-#: thread.c:1480
+#: thread.c:1473
 msgid ""
 "Find threads that match a regular expression.\n"
 "Usage: thread find REGEXP\n"
 "Will display thread ids whose name, target ID, or extra info matches REGEXP."
 msgstr ""
 
-#: thread.c:1490
+#: thread.c:1483
 msgid "Set printing of thread events (such as thread start and exit)."
 msgstr ""
 
-#: thread.c:1491
+#: thread.c:1484
 msgid "Show printing of thread events (such as thread start and exit)."
 msgstr ""
 
-#: top.c:105
+#: tic6x-tdep.c:894
+#, possible-c-format
+msgid "unexpected length %d of type"
+msgstr ""
+
+#: tic6x-tdep.c:1152
+#, possible-c-format
+msgid "unexpected type %d of arg %d"
+msgstr ""
+
+#: tic6x-tdep.c:1157
+#, possible-c-format
+msgid "unexpected length %d of arg %d"
+msgstr ""
+
+#: top.c:108
 #, possible-c-format
 msgid "Whether to confirm potentially dangerous operations is %s.\n"
 msgstr ""
 
-#: top.c:424
+#: top.c:437
 msgid "That is not a command, just a help topic."
 msgstr ""
 
-#: top.c:660
+#: top.c:693
 #, possible-c-format
 msgid "Saving of the history record on exit is %s.\n"
 msgstr ""
 
-#: top.c:669
+#: top.c:702
 #, possible-c-format
 msgid "The size of the command history is %s.\n"
 msgstr ""
 
-#: top.c:678
+#: top.c:711
 #, possible-c-format
 msgid "The filename in which to record the command history is \"%s\".\n"
 msgstr ""
 
-#: top.c:1107
+#: top.c:1139
 msgid ""
 "\n"
 "For bug reporting instructions, please see:\n"
 msgstr ""
 
-#: top.c:1182
+#: top.c:1219
 #, possible-c-format
 msgid "\tInferior %d [%s] will be detached.\n"
 msgstr ""
 
-#: top.c:1186
+#: top.c:1223
 #, possible-c-format
 msgid "\tInferior %d [%s] will be killed.\n"
 msgstr ""
 
-#: top.c:1215
+#: top.c:1252
 msgid ""
 "A debugging session is active.\n"
 "Do you still want to close the debugger?"
 msgstr ""
 
-#: top.c:1219
+#: top.c:1256
 msgid ""
 "A debugging session is active.\n"
 "\n"
 msgstr ""
 
-#: top.c:1221
+#: top.c:1258
 msgid ""
 "\n"
 "Quit anyway? "
 msgstr ""
 
-#: top.c:1400
+#: top.c:1438
 msgid "History size must be non-negative"
 msgstr ""
 
-#: top.c:1407
+#: top.c:1445
 msgid ""
 "\"set history\" must be followed by the name of a history subcommand.\n"
 msgstr ""
 
-#: top.c:1484
+#: top.c:1522
 #, possible-c-format
 msgid "Gdb's prompt is \"%s\".\n"
 msgstr ""
 
-#: top.c:1491
+#: top.c:1529
 #, possible-c-format
 msgid "Editing of command lines as they are typed is %s.\n"
 msgstr ""
 
-#: top.c:1500
+#: top.c:1538
 #, possible-c-format
 msgid "Annotation_level is %s.\n"
 msgstr ""
 
-#: top.c:1507
+#: top.c:1545
 #, possible-c-format
 msgid ""
 "Notification of completion for asynchronous execution commands is %s.\n"
 msgstr ""
 
-#: top.c:1551
+#: top.c:1579
 msgid "Set gdb's prompt"
 msgstr ""
 
-#: top.c:1552
+#: top.c:1580
 msgid "Show gdb's prompt"
 msgstr ""
 
-#: top.c:1557
+#: top.c:1585
 msgid ""
 "Don't repeat this command.\n"
 "Primarily used inside of user-defined commands that should not be repeated "
@@ -22055,620 +22969,668 @@
 "hitting return."
 msgstr ""
 
-#: top.c:1563
+#: top.c:1591
 msgid "Set editing of command lines as they are typed."
 msgstr ""
 
-#: top.c:1564
+#: top.c:1592
 msgid "Show editing of command lines as they are typed."
 msgstr ""
 
-#: top.c:1565
+#: top.c:1593
 msgid ""
 "Use \"on\" to enable the editing, and \"off\" to disable it.\n"
 "Without an argument, command line editing is enabled.  To edit, use\n"
 "EMACS-like or VI-like commands like control-P or ESC."
 msgstr ""
 
-#: top.c:1573
+#: top.c:1601
 msgid "Set saving of the history record on exit."
 msgstr ""
 
-#: top.c:1574
+#: top.c:1602
 msgid "Show saving of the history record on exit."
 msgstr ""
 
-#: top.c:1575
+#: top.c:1603
 msgid ""
 "Use \"on\" to enable the saving, and \"off\" to disable it.\n"
 "Without an argument, saving is enabled."
 msgstr ""
 
-#: top.c:1582
+#: top.c:1610
 msgid "Set the size of the command history,"
 msgstr ""
 
-#: top.c:1583
+#: top.c:1611
 msgid "Show the size of the command history,"
 msgstr ""
 
-#: top.c:1584
+#: top.c:1612
 msgid "ie. the number of previous commands to keep a record of."
 msgstr ""
 
-#: top.c:1590
+#: top.c:1618
 msgid "Set the filename in which to record the command history"
 msgstr ""
 
-#: top.c:1591
+#: top.c:1619
 msgid "Show the filename in which to record the command history"
 msgstr ""
 
-#: top.c:1592
+#: top.c:1620
 msgid "(the list of previous commands of which a record is kept)."
 msgstr ""
 
-#: top.c:1598
+#: top.c:1626
 msgid "Set whether to confirm potentially dangerous operations."
 msgstr ""
 
-#: top.c:1599
+#: top.c:1627
 msgid "Show whether to confirm potentially dangerous operations."
 msgstr ""
 
-#: top.c:1605
+#: top.c:1633
 msgid "Set annotation_level."
 msgstr ""
 
-#: top.c:1606
+#: top.c:1634
 msgid "Show annotation_level."
 msgstr ""
 
-#: top.c:1607
+#: top.c:1635
 msgid ""
 "0 == normal;     1 == fullname (for use when running under emacs)\n"
 "2 == output annotated suitably for use by programs that control GDB."
 msgstr ""
 
-#: top.c:1615
+#: top.c:1643
 msgid "Set notification of completion for asynchronous execution commands."
 msgstr ""
 
-#: top.c:1616
+#: top.c:1644
 msgid "Show notification of completion for asynchronous execution commands."
 msgstr ""
 
-#: top.c:1617
+#: top.c:1645
 msgid "Use \"on\" to enable the notification, and \"off\" to disable it."
 msgstr ""
 
-#: top.c:1624
+#: top.c:1652
 msgid "Set GDB's data directory."
 msgstr ""
 
-#: top.c:1625
+#: top.c:1653
 msgid "Show GDB's data directory."
 msgstr ""
 
-#: top.c:1626
+#: top.c:1654
 msgid "When set, GDB uses the specified path to search for data files."
 msgstr ""
 
-#: tracepoint.c:354
+#: tracepoint.c:364
 #, possible-c-format
 msgid "No trace variable named \"$%s\", not deleting"
 msgstr ""
 
-#: tracepoint.c:370
+#: tracepoint.c:380
 msgid "trace state variable name"
 msgstr ""
 
-#: tracepoint.c:377
+#: tracepoint.c:387
 msgid "No expression?"
 msgstr ""
 
-#: tracepoint.c:391
+#: tracepoint.c:401
 msgid "Syntax must be $NAME [ = EXPR ]"
 msgstr ""
 
-#: tracepoint.c:394
+#: tracepoint.c:404
 msgid "No name given"
 msgstr ""
 
-#: tracepoint.c:397
+#: tracepoint.c:407
 msgid "Must supply a non-empty variable name"
 msgstr ""
 
-#: tracepoint.c:404
+#: tracepoint.c:414
 #, possible-c-format
 msgid "Trace state variable $%s now has initial value %s.\n"
 msgstr ""
 
-#: tracepoint.c:415
+#: tracepoint.c:425
 #, possible-c-format
 msgid "Trace state variable $%s created, with initial value %s.\n"
 msgstr ""
 
-#: tracepoint.c:431
+#: tracepoint.c:441
 msgid "Delete all trace state variables? "
 msgstr ""
 
-#: tracepoint.c:445
+#: tracepoint.c:455
 #, possible-c-format
 msgid "Name \"%s\" not prefixed with '$', ignoring"
 msgstr ""
 
-#: tracepoint.c:463
+#: tracepoint.c:474
 msgid "No trace state variables.\n"
 msgstr ""
 
-#: tracepoint.c:555
+#: tracepoint.c:566
 msgid "This command cannot be used at the top level."
 msgstr ""
 
-#: tracepoint.c:561 tracepoint.c:567 tracepoint.c:573
+#: tracepoint.c:572 tracepoint.c:578 tracepoint.c:584
 msgid "This command can only be used in a tracepoint actions list."
 msgstr ""
 
-#: tracepoint.c:608
+#: tracepoint.c:617
+msgid "Target does not support \"/s\" option for string tracing."
+msgstr ""
+
+#: tracepoint.c:620
+#, possible-c-format
+msgid "Undefined collection format \"%c\"."
+msgstr ""
+
+#: tracepoint.c:659
 msgid "expression is malformed"
 msgstr ""
 
-#: tracepoint.c:614
+#: tracepoint.c:665
 msgid "expression has min height < 0"
 msgstr ""
 
-#: tracepoint.c:623 tracepoint.c:707 tracepoint.c:742
+#: tracepoint.c:674 tracepoint.c:764 tracepoint.c:799
 msgid "Expression is too complicated."
 msgstr ""
 
-#: tracepoint.c:653
+#: tracepoint.c:705
 #, possible-c-format
 msgid "`%s' is not a tracepoint action, or is ambiguous."
 msgstr ""
 
-#: tracepoint.c:686
+#: tracepoint.c:743
 #, possible-c-format
 msgid "constant `%s' (value %ld) will not be collected."
 msgstr ""
 
-#: tracepoint.c:694
+#: tracepoint.c:751
 #, possible-c-format
 msgid "`%s' is optimized away and cannot be collected."
 msgstr ""
 
-#: tracepoint.c:762
+#: tracepoint.c:819
 #, possible-c-format
 msgid "while-stepping step count `%s' is malformed."
 msgstr ""
 
-#: tracepoint.c:769
+#: tracepoint.c:826
 #, possible-c-format
 msgid "`%s' is not a supported tracepoint action."
 msgstr ""
 
-#: tracepoint.c:868
+#: tracepoint.c:925
 #, possible-c-format
 msgid "Internal: register number %d too large for tracepoint"
 msgstr ""
 
-#: tracepoint.c:1111
+#: tracepoint.c:1168
 msgid "Can't collect locals; no symbol table info available.\n"
 msgstr ""
 
-#: tracepoint.c:1118
+#: tracepoint.c:1175
 msgid "No locals found in scope."
 msgstr ""
 
-#: tracepoint.c:1126
+#: tracepoint.c:1183
 msgid "Can't collect args; no symbol table info available."
 msgstr ""
 
-#: tracepoint.c:1132
+#: tracepoint.c:1189
 msgid "No args found in scope."
 msgstr ""
 
-#: tracepoint.c:1309 tracepoint.c:2512
+#: tracepoint.c:1366 tracepoint.c:2763
 #, possible-c-format
 msgid "Bad action list item: %s"
 msgstr ""
 
-#: tracepoint.c:1477
+#: tracepoint.c:1575
 #, possible-c-format
 msgid "Invalid tracepoint command '%s'"
 msgstr ""
 
-#: tracepoint.c:1572
+#: tracepoint.c:1692
+msgid "Pending tracepoints will not be resolved while GDB is disconnected\n"
+msgstr ""
+
+#: tracepoint.c:1713
 msgid "No tracepoints defined, not starting trace"
 msgstr ""
 
-#: tracepoint.c:1585
+#: tracepoint.c:1728
 #, possible-c-format
 msgid "May not insert %stracepoints, skipping tracepoint %d"
 msgstr ""
 
-#: tracepoint.c:1593
+#: tracepoint.c:1735
+msgid "No tracepoints enabled"
+msgstr ""
+
+#: tracepoint.c:1741
 msgid "No tracepoints enabled, not starting trace"
 msgstr ""
 
-#: tracepoint.c:1599
+#: tracepoint.c:1748
 msgid "No tracepoints that may be downloaded, not starting trace"
 msgstr ""
 
-#: tracepoint.c:1655
+#: tracepoint.c:1828
 msgid "A trace is running already.  Start a new run? "
 msgstr ""
 
-#: tracepoint.c:1656
+#: tracepoint.c:1829
 msgid "New trace run not started."
 msgstr ""
 
-#: tracepoint.c:1667
+#: tracepoint.c:1844
 msgid "Trace is not running."
 msgstr ""
 
-#: tracepoint.c:1692
+#: tracepoint.c:1881
 msgid "Using a trace file.\n"
 msgstr ""
 
-#: tracepoint.c:1695
+#: tracepoint.c:1884
 msgid "Trace can not be run on this target.\n"
 msgstr ""
 
-#: tracepoint.c:1702
+#: tracepoint.c:1891
 msgid "Run/stop status is unknown.\n"
 msgstr ""
 
-#: tracepoint.c:1706
+#: tracepoint.c:1895
 msgid "Trace is running on the target.\n"
 msgstr ""
 
-#: tracepoint.c:1713
+#: tracepoint.c:1902
 msgid "No trace has been run on the target.\n"
 msgstr ""
 
-#: tracepoint.c:1716
+#: tracepoint.c:1906
+#, possible-c-format
+msgid "Trace stopped by a tstop command (%s).\n"
+msgstr ""
+
+#: tracepoint.c:1909
 msgid "Trace stopped by a tstop command.\n"
 msgstr ""
 
-#: tracepoint.c:1719
+#: tracepoint.c:1912
 msgid "Trace stopped because the buffer was full.\n"
 msgstr ""
 
-#: tracepoint.c:1722
+#: tracepoint.c:1915
 msgid "Trace stopped because of disconnection.\n"
 msgstr ""
 
-#: tracepoint.c:1725
+#: tracepoint.c:1918
 #, possible-c-format
 msgid "Trace stopped by tracepoint %d.\n"
 msgstr ""
 
-#: tracepoint.c:1730
+#: tracepoint.c:1923
 #, possible-c-format
 msgid "Trace stopped by an error (%s, tracepoint %d).\n"
 msgstr ""
 
-#: tracepoint.c:1734
+#: tracepoint.c:1927
 #, possible-c-format
 msgid "Trace stopped by an error (%s).\n"
 msgstr ""
 
-#: tracepoint.c:1738
+#: tracepoint.c:1931
 msgid "Trace stopped for an unknown reason.\n"
 msgstr ""
 
-#: tracepoint.c:1741
+#: tracepoint.c:1934
 #, possible-c-format
 msgid "Trace stopped for some other reason (%d).\n"
 msgstr ""
 
-#: tracepoint.c:1750
+#: tracepoint.c:1943
 #, possible-c-format
 msgid "Buffer contains %d trace frames (of %d created total).\n"
 msgstr ""
 
-#: tracepoint.c:1756
+#: tracepoint.c:1949
 #, possible-c-format
 msgid "Collected %d trace frames.\n"
 msgstr ""
 
-#: tracepoint.c:1764
+#: tracepoint.c:1957
 #, possible-c-format
 msgid "Trace buffer has %d bytes of %d bytes free"
 msgstr ""
 
-#: tracepoint.c:1767
+#: tracepoint.c:1960
 #, possible-c-format
 msgid " (%d%% full)"
 msgstr ""
 
-#: tracepoint.c:1771
+#: tracepoint.c:1964
 msgid ".\n"
 msgstr ""
 
-#: tracepoint.c:1774
+#: tracepoint.c:1967
 #, possible-c-format
 msgid "Trace buffer has %d bytes free.\n"
 msgstr ""
 
-#: tracepoint.c:1779
+#: tracepoint.c:1972
 msgid "Trace will continue if GDB disconnects.\n"
 msgstr ""
 
-#: tracepoint.c:1781
+#: tracepoint.c:1974
 msgid "Trace will stop if GDB disconnects.\n"
 msgstr ""
 
-#: tracepoint.c:1784
+#: tracepoint.c:1977
 msgid "Trace buffer is circular.\n"
 msgstr ""
 
-#: tracepoint.c:1788
+#: tracepoint.c:1980
+#, possible-c-format
+msgid "Trace user is %s.\n"
+msgstr ""
+
+#: tracepoint.c:1983
+#, possible-c-format
+msgid "Trace notes: %s.\n"
+msgstr ""
+
+#: tracepoint.c:1987
 #, possible-c-format
 msgid "Looking at trace frame %d, tracepoint %d.\n"
 msgstr ""
 
-#: tracepoint.c:1791
+#: tracepoint.c:1990
 msgid "Not looking at any trace frame.\n"
 msgstr ""
 
-#: tracepoint.c:1913
+#. Reporting a run time is more readable than two long numbers.
+#: tracepoint.c:2000
+#, possible-c-format
+msgid "Trace started at %ld.%06ld secs, stopped %ld.%06ld secs later.\n"
+msgstr ""
+
+#: tracepoint.c:2007
+#, possible-c-format
+msgid "Trace started at %ld.%06ld secs.\n"
+msgstr ""
+
+#: tracepoint.c:2012
+#, possible-c-format
+msgid "Trace stopped at %ld.%06ld secs.\n"
+msgstr ""
+
+#: tracepoint.c:2163
 msgid "Trace is running and will continue after detach; detach anyway? "
 msgstr ""
 
-#: tracepoint.c:1919
+#: tracepoint.c:2169
 msgid "Trace is running but will stop on detach; detach anyway? "
 msgstr ""
 
-#: tracepoint.c:1986
+#: tracepoint.c:2237
 msgid "Target failed to find requested trace frame."
 msgstr ""
 
-#: tracepoint.c:2024
+#: tracepoint.c:2275
 #, possible-c-format
 msgid "Found trace frame %d, tracepoint %d\n"
 msgstr ""
 
-#: tracepoint.c:2033
+#: tracepoint.c:2284
 msgid "No longer looking at any trace frame\n"
 msgstr ""
 
 #. This case may never occur, check.
-#: tracepoint.c:2035
+#: tracepoint.c:2286
 msgid "No trace frame found\n"
 msgstr ""
 
-#: tracepoint.c:2096
+#: tracepoint.c:2347
 msgid "not debugging trace buffer"
 msgstr ""
 
-#: tracepoint.c:2098
+#: tracepoint.c:2349
 msgid "already at start of trace buffer"
 msgstr ""
 
-#: tracepoint.c:2109
+#: tracepoint.c:2360
 #, possible-c-format
 msgid "invalid input (%d is less than zero)"
 msgstr ""
 
-#: tracepoint.c:2165
+#: tracepoint.c:2416
 msgid "No current tracepoint -- please supply an argument."
 msgstr ""
 
-#: tracepoint.c:2217
+#: tracepoint.c:2468
 msgid "No line number information available."
 msgstr ""
 
-#: tracepoint.c:2237
+#: tracepoint.c:2488
 msgid "Cannot find a good line."
 msgstr ""
 
 #. Is there any case in which we get here, and have an address
 #. which the user would want to see?  If we have debugging
 #. symbols and no line numbers?
-#: tracepoint.c:2244
+#: tracepoint.c:2495
 #, possible-c-format
 msgid "Line number %d is out of range for \"%s\"."
 msgstr ""
 
-#: tracepoint.c:2336
+#: tracepoint.c:2587
 msgid "requires an argument (function, line or *addr) to define a scope"
 msgstr ""
 
-#: tracepoint.c:2584
+#: tracepoint.c:2840
 msgid "No current trace frame."
 msgstr ""
 
-#: tracepoint.c:2591
+#: tracepoint.c:2847
 #, possible-c-format
 msgid "No known tracepoint matches 'current' tracepoint #%d."
 msgstr ""
 
-#: tracepoint.c:2647
+#: tracepoint.c:2903
 msgid "Buffer too small for source encoding"
 msgstr ""
 
-#: tracepoint.c:2652
+#: tracepoint.c:2908
 msgid "Source string too long for buffer"
 msgstr ""
 
-#: tracepoint.c:2687
+#: tracepoint.c:2943
 #, possible-c-format
 msgid "Target failed to save trace data to '%s'."
 msgstr ""
 
-#: tracepoint.c:2701
+#: tracepoint.c:2957
 #, possible-c-format
 msgid "Unable to open file '%s' for saving trace data (%s)"
 msgstr ""
 
-#: tracepoint.c:2826
+#: tracepoint.c:3090
 msgid "Failure to get requested trace buffer data"
 msgstr ""
 
-#: tracepoint.c:2853 tracepoint.c:2869
+#: tracepoint.c:3117 tracepoint.c:3133
 msgid "file in which to save trace data"
 msgstr ""
 
-#: tracepoint.c:2874
+#: tracepoint.c:3138
 #, possible-c-format
 msgid "Trace data saved to file '%s'.\n"
 msgstr ""
 
-#: tracepoint.c:2950
+#: tracepoint.c:3244
 msgid "could not change traceframe"
 msgstr ""
 
-#: tracepoint.c:3127
+#: tracepoint.c:3443
 #, possible-c-format
 msgid "Assuming tracepoint %d is same as target's tracepoint %d at %s.\n"
 msgstr ""
 
-#: tracepoint.c:3135
+#: tracepoint.c:3452
 #, possible-c-format
 msgid "Created tracepoint %d for target's tracepoint %d at %s.\n"
 msgstr ""
 
-#: tracepoint.c:3140
+#: tracepoint.c:3457
 #, possible-c-format
 msgid ""
 "Failed to create tracepoint for target's tracepoint %d at %s, skipping it.\n"
 msgstr ""
 
-#: tracepoint.c:3221
+#: tracepoint.c:3546
 #, possible-c-format
 msgid "Assuming trace state variable $%s is same as target's variable %d.\n"
 msgstr ""
 
-#: tracepoint.c:3229
+#: tracepoint.c:3554
 #, possible-c-format
 msgid "Created trace state variable $%s for target's variable %d.\n"
 msgstr ""
 
-#: tracepoint.c:3287
+#: tracepoint.c:3612
 msgid "Premature end of file while reading trace file"
 msgstr ""
 
-#: tracepoint.c:3308
+#: tracepoint.c:3633
 msgid "No trace file specified."
 msgstr ""
 
-#: tracepoint.c:3341
+#: tracepoint.c:3666
 msgid "File is not a valid trace file."
 msgstr ""
 
-#: tracepoint.c:3381
+#: tracepoint.c:3706
 msgid "Excessively long lines in trace file"
 msgstr ""
 
-#: tracepoint.c:3390
+#: tracepoint.c:3715
 msgid "No register block size recorded in trace file"
 msgstr ""
 
-#: tracepoint.c:3404
+#: tracepoint.c:3729
 msgid "No traceframes present in this file."
 msgstr ""
 
-#: tracepoint.c:3447
+#: tracepoint.c:3772
 #, possible-c-format
 msgid "Ignoring trace file definition \"%s\""
 msgstr ""
 
-#: tracepoint.c:3475
+#: tracepoint.c:3806
 #, possible-c-format
 msgid ""
 "Malformed trace status, at %s\n"
 "Status line: '%s'\n"
 msgstr ""
 
-#: tracepoint.c:3622
+#: tracepoint.c:4015
 #, possible-c-format
 msgid "Unrecognized char '%c' in tracepoint definition, skipping rest"
 msgstr ""
 
 #. Don't error out, the target might be sending us optional
 #. info that we don't care about.
-#: tracepoint.c:3670
+#: tracepoint.c:4069
 #, possible-c-format
 msgid "Unrecognized tracepoint piece '%c', ignoring"
 msgstr ""
 
-#: tracepoint.c:3793
+#: tracepoint.c:4199
 msgid "could not set tfile's traceframe"
 msgstr ""
 
-#: tracepoint.c:3868
+#: tracepoint.c:4274
 msgid "unknown tfind type"
 msgstr ""
 
-#: tracepoint.c:3956
+#: tracepoint.c:4362
 #, possible-c-format
 msgid "Unknown block type '%c' (0x%x) in trace frame"
 msgstr ""
 
-#: tracepoint.c:4044
+#: tracepoint.c:4450
 #, possible-c-format
 msgid "Tracepoint %d has multiple locations, cannot infer $pc"
 msgstr ""
 
-#: tracepoint.c:4052
+#: tracepoint.c:4458
 #, possible-c-format
 msgid "Tracepoint %d does while-stepping, cannot infer $pc"
 msgstr ""
 
-#: tracepoint.c:4076
+#: tracepoint.c:4482
 msgid "tfile_xfer_partial: trace file is read-only"
 msgstr ""
 
-#: tracepoint.c:4251
+#: tracepoint.c:4657
 #, possible-c-format
 msgid ""
 "Unhandled trace block type (%d) '%c ' while building trace frame info."
 msgstr ""
 
-#: tracepoint.c:4317
+#: tracepoint.c:4724
 #, possible-c-format
 msgid "bad marker definition: %s"
 msgstr ""
 
-#: tracepoint.c:4430
+#: tracepoint.c:4838
 msgid "Data: \""
 msgstr ""
 
-#: tracepoint.c:4444
+#: tracepoint.c:4852
 msgid "Probed by static tracepoints: "
 msgstr ""
 
-#: tracepoint.c:4553
+#: tracepoint.c:4962
 msgid ""
 "Can not parse XML trace frame info; XML support was disabled at compile time"
 msgstr ""
 
-#: tracepoint.c:4624
+#: tracepoint.c:5033
 msgid "trace frame info"
 msgstr ""
 
-#: tracepoint.c:4740
+#: tracepoint.c:5149
 msgid "List the variables local to a scope"
 msgstr ""
 
-#: tracepoint.c:4743
+#: tracepoint.c:5152
 msgid "Tracing of program execution without stopping the program."
 msgstr ""
 
-#: tracepoint.c:4747
+#: tracepoint.c:5156
 msgid "Print everything collected at the current tracepoint."
 msgstr ""
 
-#: tracepoint.c:4749
+#: tracepoint.c:5158
 msgid ""
 "Save the trace data to a file.\n"
 "Use the '-r' option to direct the target to save directly to the file,\n"
 "using its own filesystem."
 msgstr ""
 
-#: tracepoint.c:4754
+#: tracepoint.c:5163
 msgid ""
 "Define a trace state variable.\n"
 "Argument is a $-prefixed name, optionally followed\n"
@@ -22676,7 +23638,7 @@
 "at the start of tracing."
 msgstr ""
 
-#: tracepoint.c:4761
+#: tracepoint.c:5170
 msgid ""
 "Delete one or more trace state variables.\n"
 "Arguments are the names of the variables to delete.\n"
@@ -22684,33 +23646,33 @@
 msgstr ""
 
 #. FIXME add a trace variable completer.
-#: tracepoint.c:4767
+#: tracepoint.c:5176
 msgid "Status of trace state variables and their values.\n"
 msgstr ""
 
-#: tracepoint.c:4772
+#: tracepoint.c:5181
 msgid "List target static tracepoints markers.\n"
 msgstr ""
 
-#: tracepoint.c:4776
+#: tracepoint.c:5185
 msgid ""
 "Select a trace frame;\n"
 "No argument means forward by one frame; '-' means backward by one frame."
 msgstr ""
 
-#: tracepoint.c:4781
+#: tracepoint.c:5190
 msgid ""
 "Select a trace frame whose PC is outside the given range (exclusive).\n"
 "Usage: tfind outside addr1, addr2"
 msgstr ""
 
-#: tracepoint.c:4786
+#: tracepoint.c:5195
 msgid ""
 "Select a trace frame whose PC is in the given range (inclusive).\n"
 "Usage: tfind range addr1,addr2"
 msgstr ""
 
-#: tracepoint.c:4791
+#: tracepoint.c:5200
 msgid ""
 "Select a trace frame by source line.\n"
 "Argument can be a line number (with optional source file),\n"
@@ -22718,45 +23680,53 @@
 "Default argument is 'the next source line that was traced'."
 msgstr ""
 
-#: tracepoint.c:4798
+#: tracepoint.c:5207
 msgid ""
 "Select a trace frame by tracepoint number.\n"
 "Default is the tracepoint for the current trace frame."
 msgstr ""
 
-#: tracepoint.c:4803
+#: tracepoint.c:5212
 msgid ""
 "Select a trace frame by PC.\n"
 "Default is the current PC, or the PC of the current trace frame."
 msgstr ""
 
-#: tracepoint.c:4808
+#: tracepoint.c:5217
 msgid ""
 "Synonym for 'none'.\n"
 "De-select any trace frame and resume 'live' debugging."
 msgstr ""
 
-#: tracepoint.c:4814
+#: tracepoint.c:5223
 msgid "De-select any trace frame and resume 'live' debugging."
 msgstr ""
 
-#: tracepoint.c:4818
+#: tracepoint.c:5227
 msgid "Select the first trace frame in the trace buffer."
 msgstr ""
 
-#: tracepoint.c:4822
+#: tracepoint.c:5231
 msgid "Display the status of the current trace data collection."
 msgstr ""
 
-#: tracepoint.c:4825
-msgid "Stop trace data collection."
+#: tracepoint.c:5233
+msgid ""
+"Stop trace data collection.\n"
+"Usage: tstop [ <notes> ... ]\n"
+"Any arguments supplied are recorded with the trace as a stop reason and\n"
+"reported by tstatus (if the target supports trace notes)."
 msgstr ""
 
-#: tracepoint.c:4828
-msgid "Start trace data collection."
+#: tracepoint.c:5239
+msgid ""
+"Start trace data collection.\n"
+"Usage: tstart [ <notes> ... ]\n"
+"Any arguments supplied are recorded with the trace as a note and\n"
+"reported by tstatus (if the target supports trace notes)."
 msgstr ""
 
-#: tracepoint.c:4830
+#: tracepoint.c:5245
 msgid ""
 "Ends a list of commands or actions.\n"
 "Several GDB commands allow you to enter a list of commands or actions.\n"
@@ -22766,7 +23736,7 @@
 "Note: the \"end\" command cannot be used at the gdb prompt."
 msgstr ""
 
-#: tracepoint.c:4837
+#: tracepoint.c:5252
 msgid ""
 "Specify single-stepping behavior at a tracepoint.\n"
 "Argument is number of instructions to trace in single-step mode\n"
@@ -22777,7 +23747,7 @@
 "Note: this command can only be used in a tracepoint \"actions\" list."
 msgstr ""
 
-#: tracepoint.c:4848
+#: tracepoint.c:5263
 msgid ""
 "Specify one or more data items to be collected at a tracepoint.\n"
 "Accepts a comma-separated list of (one or more) expressions.  GDB will\n"
@@ -22790,7 +23760,7 @@
 "Note: this command can only be used in a tracepoint \"actions\" list."
 msgstr ""
 
-#: tracepoint.c:4859
+#: tracepoint.c:5274
 msgid ""
 "Specify one or more expressions to be evaluated at a tracepoint.\n"
 "Accepts a comma-separated list of (one or more) expressions.\n"
@@ -22798,7 +23768,7 @@
 "Note: this command can only be used in a tracepoint \"actions\" list."
 msgstr ""
 
-#: tracepoint.c:4865
+#: tracepoint.c:5280
 msgid ""
 "Specify the actions to be taken at a tracepoint.\n"
 "Tracepoint actions may include collecting of specified data,\n"
@@ -22806,49 +23776,109 @@
 "depending on target's capabilities."
 msgstr ""
 
-#: tracepoint.c:4873
+#: tracepoint.c:5288
 msgid "Set the list of expressions to collect by default"
 msgstr ""
 
-#: tracepoint.c:4874
+#: tracepoint.c:5289
 msgid "Show the list of expressions to collect by default"
 msgstr ""
 
-#: tracepoint.c:4880
+#: tracepoint.c:5295
 msgid "Set whether tracing continues after GDB disconnects."
 msgstr ""
 
-#: tracepoint.c:4881
+#: tracepoint.c:5296
 msgid "Show whether tracing continues after GDB disconnects."
 msgstr ""
 
-#: tracepoint.c:4882
+#: tracepoint.c:5297
 msgid ""
 "Use this to continue a tracing run even if GDB disconnects\n"
 "or detaches from the target.  You can reconnect later and look at\n"
 "trace data collected in the meantime."
 msgstr ""
 
-#: tracepoint.c:4892
+#: tracepoint.c:5307
 msgid "Set target's use of circular trace buffer."
 msgstr ""
 
-#: tracepoint.c:4893
+#: tracepoint.c:5308
 msgid "Show target's use of circular trace buffer."
 msgstr ""
 
-#: tracepoint.c:4894
+#: tracepoint.c:5309
 msgid ""
 "Use this to make the trace buffer into a circular buffer,\n"
 "which will discard traceframes (oldest first) instead of filling\n"
 "up and stopping the trace run."
 msgstr ""
 
-#: tui/tui.c:369
-msgid "TUI mode not allowed"
+#: tracepoint.c:5319
+msgid "Set the user name to use for current and future trace runs"
+msgstr ""
+
+#: tracepoint.c:5320
+msgid "Show the user name to use for current and future trace runs"
+msgstr ""
+
+#: tracepoint.c:5326
+msgid "Set notes string to use for current and future trace runs"
+msgstr ""
+
+#: tracepoint.c:5327
+msgid "Show the notes string to use for current and future trace runs"
+msgstr ""
+
+#: tracepoint.c:5333
+msgid "Set notes string to use for future tstop commands"
+msgstr ""
+
+#: tracepoint.c:5334
+msgid "Show the notes string to use for future tstop commands"
+msgstr ""
+
+#: tui/tui-file.c:80
+msgid "tui_file_delete: bad magic number"
 msgstr ""
 
-#: tui/tui-layout.c:389
+#: tui/tui-file.c:130
+msgid "tui_file_isatty: bad magic number"
+msgstr ""
+
+#: tui/tui-file.c:144
+msgid "tui_file_rewind: bad magic number"
+msgstr ""
+
+#: tui/tui-file.c:157
+msgid "tui_file_put: bad magic number"
+msgstr ""
+
+#: tui/tui-file.c:194
+msgid "tui_file_get_strbuf: bad magic number"
+msgstr ""
+
+#: tui/tui-file.c:209
+msgid "tui_file_adjust_strbuf: bad magic number"
+msgstr ""
+
+#: tui/tui-file.c:237
+msgid "tui_file_flush: bad magic number"
+msgstr ""
+
+#: tui/tui-hooks.c:80
+msgid "(y or n) "
+msgstr ""
+
+#: tui/tui-hooks.c:113
+msgid "Please answer y or n.\n"
+msgstr ""
+
+#: tui/tui-interp.c:140
+msgid "tui_exec called"
+msgstr ""
+
+#: tui/tui-layout.c:388
 msgid ""
 "Change the layout of windows.\n"
 "Usage: layout prev | next | <layout_name> \n"
@@ -22864,108 +23894,120 @@
 "           the window that has current logical focus.\n"
 msgstr ""
 
-#: tui/tui-layout.c:404
+#: tui/tui-layout.c:403
 msgid "Toggle between Source/Command and Disassembly/Command layouts.\n"
 msgstr ""
 
-#: tui/tui-layout.c:406
+#: tui/tui-layout.c:405
 msgid ""
 "Toggle between Source/Command or Disassembly/Command and \n"
 "Source/Disassembly/Command layouts.\n"
 msgstr ""
 
-#: tui/tui-layout.c:441
+#: tui/tui-layout.c:440
 msgid "Ambiguous command input."
 msgstr ""
 
-#: tui/tui-layout.c:614
+#: tui/tui-layout.c:613
 #, possible-c-format
 msgid ""
 "Invalid layout specified.\n"
 "%s"
 msgstr ""
 
-#: tui/tui-stack.c:360 valprint.c:305
-msgid "<unavailable>"
+#: tui/tui-regs.c:624
+msgid "\"tui reg\" must be followed by the name of a tui reg command.\n"
 msgstr ""
 
-#: tui/tui-stack.c:452
-msgid ""
-"Update the source window and locator to display the current execution "
-"point.\n"
+#: tui/tui-regs.c:640
+msgid "TUI commands to control the register window."
 msgstr ""
 
-#: tui/tui-file.c:81
-msgid "tui_file_delete: bad magic number"
+#: tui/tui-regs.c:645
+msgid "Display only floating point registers."
 msgstr ""
 
-#: tui/tui-file.c:131
-msgid "tui_file_isatty: bad magic number"
+#: tui/tui-regs.c:648
+msgid "Display only general registers."
 msgstr ""
 
-#: tui/tui-file.c:145
-msgid "tui_file_rewind: bad magic number"
+#: tui/tui-regs.c:651
+msgid "Display only system registers."
 msgstr ""
 
-#: tui/tui-file.c:158
-msgid "tui_file_put: bad magic number"
+#: tui/tui-regs.c:654
+msgid "Display next register group."
 msgstr ""
 
-#: tui/tui-file.c:195
-msgid "tui_file_get_strbuf: bad magic number"
+#: tui/tui-regs.c:660
+msgid "Display only floating point registers\n"
 msgstr ""
 
-#: tui/tui-file.c:210
-msgid "tui_file_adjust_strbuf: bad magic number"
+#: tui/tui-regs.c:662
+msgid "Display only general registers\n"
 msgstr ""
 
-#: tui/tui-file.c:238
-msgid "tui_file_flush: bad magic number"
+#: tui/tui-regs.c:664
+msgid "Display only special registers\n"
 msgstr ""
 
-#: tui/tui-interp.c:132
-msgid "tui_exec called"
+#: tui/tui-regs.c:666
+msgid "Scroll the registers window forward\n"
+msgstr ""
+
+#: tui/tui-regs.c:668
+msgid "Scroll the register window backward\n"
+msgstr ""
+
+#: tui/tui-stack.c:360 valprint.c:306
+msgid "<unavailable>"
+msgstr ""
+
+#: tui/tui-stack.c:455
+msgid ""
+"Update the source window and locator to display the current execution "
+"point.\n"
 msgstr ""
 
-#: tui/tui-win.c:212
+#: tui/tui-win.c:211
 #, possible-c-format
 msgid ""
 "The attribute mode to use for the active TUI window border is \"%s\".\n"
 msgstr ""
 
-#: tui/tui-win.c:224
+#: tui/tui-win.c:223
 #, possible-c-format
 msgid "The attribute mode to use for the TUI window borders is \"%s\".\n"
 msgstr ""
 
-#: tui/tui-win.c:236
+#: tui/tui-win.c:235
 #, possible-c-format
 msgid "The kind of border for TUI windows is \"%s\".\n"
 msgstr ""
 
-#: tui/tui-win.c:335
+#: tui/tui-win.c:334
 msgid "\"tui\" must be followed by the name of a tui command.\n"
 msgstr ""
 
-#: tui/tui-win.c:345
+#: tui/tui-win.c:344
 msgid "Text User Interface commands."
 msgstr ""
 
-#: tui/tui-win.c:365 tui/tui-win.c:369
+#: tui/tui-win.c:364 tui/tui-win.c:368
 msgid "TUI configuration variables"
 msgstr ""
 
-#: tui/tui-win.c:374
+#: tui/tui-win.c:373
 msgid "Refresh the terminal display.\n"
 msgstr ""
 
-#: tui/tui-win.c:377
+#: tui/tui-win.c:376
 msgid ""
 "Set the width (in characters) of tab stops.\n"
 "Usage: tabset <n>\n"
 msgstr ""
 
-#: tui/tui-win.c:380
+#: tui/tui-win.c:379
 msgid ""
 "Set the height of a specified window.\n"
 "Usage: winheight <win_name> [+ | -] <#lines>\n"
@@ -22976,11 +24018,11 @@
 "regs : the register display\n"
 msgstr ""
 
-#: tui/tui-win.c:390
+#: tui/tui-win.c:389
 msgid "List of all displayed windows.\n"
 msgstr ""
 
-#: tui/tui-win.c:391
+#: tui/tui-win.c:390
 msgid ""
 "Set focus to named window or next/prev window.\n"
 "Usage: focus {<win> | next | prev}\n"
@@ -22991,45 +24033,45 @@
 "cmd  : the command window\n"
 msgstr ""
 
-#: tui/tui-win.c:400
+#: tui/tui-win.c:399
 msgid ""
 "Scroll window forward.\n"
 "Usage: + [win] [n]\n"
 msgstr ""
 
-#: tui/tui-win.c:403
+#: tui/tui-win.c:402
 msgid ""
 "Scroll window backward.\n"
 "Usage: - [win] [n]\n"
 msgstr ""
 
-#: tui/tui-win.c:406
+#: tui/tui-win.c:405
 msgid ""
 "Scroll window forward.\n"
 "Usage: < [win] [n]\n"
 msgstr ""
 
-#: tui/tui-win.c:409
+#: tui/tui-win.c:408
 msgid ""
 "Scroll window backward.\n"
 "Usage: > [win] [n]\n"
 msgstr ""
 
-#: tui/tui-win.c:413
+#: tui/tui-win.c:412
 msgid ""
 "XDB compatibility command for setting the height of a command window.\n"
 "Usage: w <#lines>\n"
 msgstr ""
 
-#: tui/tui-win.c:419
+#: tui/tui-win.c:418
 msgid "Set the kind of border for TUI windows."
 msgstr ""
 
-#: tui/tui-win.c:420
+#: tui/tui-win.c:419
 msgid "Show the kind of border for TUI windows."
 msgstr ""
 
-#: tui/tui-win.c:421
+#: tui/tui-win.c:420
 msgid ""
 "This variable controls the border of TUI windows:\n"
 "space           use a white space\n"
@@ -23037,15 +24079,15 @@
 "acs             use the Alternate Character Set"
 msgstr ""
 
-#: tui/tui-win.c:431
+#: tui/tui-win.c:430
 msgid "Set the attribute mode to use for the TUI window borders."
 msgstr ""
 
-#: tui/tui-win.c:432
+#: tui/tui-win.c:431
 msgid "Show the attribute mode to use for the TUI window borders."
 msgstr ""
 
-#: tui/tui-win.c:433
+#: tui/tui-win.c:432
 msgid ""
 "This variable controls the attributes to use for the window borders:\n"
 "normal          normal display\n"
@@ -23057,15 +24099,15 @@
 "bold-standout   use extra bright or bold with standout mode"
 msgstr ""
 
-#: tui/tui-win.c:447
+#: tui/tui-win.c:446
 msgid "Set the attribute mode to use for the active TUI window border."
 msgstr ""
 
-#: tui/tui-win.c:448
+#: tui/tui-win.c:447
 msgid "Show the attribute mode to use for the active TUI window border."
 msgstr ""
 
-#: tui/tui-win.c:449
+#: tui/tui-win.c:448
 msgid ""
 "This variable controls the attributes to use for the active window border:\n"
 "normal          normal display\n"
@@ -23077,165 +24119,120 @@
 "bold-standout   use extra bright or bold with standout mode"
 msgstr ""
 
-#: tui/tui-win.c:930 tui/tui-win.c:1036 tui/tui-win.c:1598
+#: tui/tui-win.c:929 tui/tui-win.c:1035 tui/tui-win.c:1597
 msgid ""
 "Invalid window specified. \n"
 "The window name specified must be valid and visible.\n"
 msgstr ""
 
-#: tui/tui-win.c:941
+#: tui/tui-win.c:940
 #, possible-c-format
 msgid "Focus set to %s window.\n"
 msgstr ""
 
-#: tui/tui-win.c:946
+#: tui/tui-win.c:945
 #, possible-c-format
 msgid ""
 "Incorrect Number of Arguments.\n"
 "%s"
 msgstr ""
 
-#: tui/tui-win.c:1004
+#: tui/tui-win.c:1003
 msgid "Tab widths greater than 0 must be specified."
 msgstr ""
 
-#: tui/tui-win.c:1071 tui/tui-win.c:1077 tui/tui-win.c:1121 tui/tui-win.c:1125
-#: tui/tui-win.c:1129
+#: tui/tui-win.c:1070 tui/tui-win.c:1076 tui/tui-win.c:1120 tui/tui-win.c:1124
+#: tui/tui-win.c:1128
 #, possible-c-format
 msgid ""
 "Invalid window height specified.\n"
 "%s"
 msgstr ""
 
-#: tui/tui-regs.c:625
-msgid "\"tui reg\" must be followed by the name of a tui reg command.\n"
-msgstr ""
-
-#: tui/tui-regs.c:641
-msgid "TUI commands to control the register window."
-msgstr ""
-
-#: tui/tui-regs.c:646
-msgid "Display only floating point registers."
-msgstr ""
-
-#: tui/tui-regs.c:649
-msgid "Display only general registers."
-msgstr ""
-
-#: tui/tui-regs.c:652
-msgid "Display only system registers."
-msgstr ""
-
-#: tui/tui-regs.c:655
-msgid "Display next register group."
-msgstr ""
-
-#: tui/tui-regs.c:661
-msgid "Display only floating point registers\n"
-msgstr ""
-
-#: tui/tui-regs.c:663
-msgid "Display only general registers\n"
-msgstr ""
-
-#: tui/tui-regs.c:665
-msgid "Display only special registers\n"
-msgstr ""
-
-#: tui/tui-regs.c:667
-msgid "Scroll the registers window forward\n"
-msgstr ""
-
-#: tui/tui-regs.c:669
-msgid "Scroll the register window backward\n"
-msgstr ""
-
-#: tui/tui-hooks.c:81
-msgid "(y or n) "
-msgstr ""
-
-#: tui/tui-hooks.c:114
-msgid "Please answer y or n.\n"
+#: tui/tui.c:368
+msgid "TUI mode not allowed"
 msgstr ""
 
-#: typeprint.c:266
+#: typeprint.c:265
 msgid "internal error: unhandled type in print_type_scalar"
 msgstr ""
 
-#: typeprint.c:315
+#: typeprint.c:314
 msgid ""
 "Print definition of type TYPE.\n"
 "Argument may be a type name defined by typedef, or \"struct STRUCT-TAG\"\n"
 "or \"class CLASS-NAME\" or \"union UNION-TAG\" or \"enum ENUM-TAG\".\n"
-"The selected stack frame's lexical context is used to look up the name."
+"The selected stack frame's lexical context is used to look up the name.\n"
+"Contrary to \"whatis\", \"ptype\" always unrolls any typedefs."
 msgstr ""
 
 #: typeprint.c:322
-msgid "Print data type of expression EXP."
+msgid ""
+"Print data type of expression EXP.\n"
+"Only one level of typedefs is unrolled.  See also \"ptype\"."
 msgstr ""
 
-#: ui-file.c:168
+#: ui-file.c:178
 msgid "ui_file_data: bad magic number"
 msgstr ""
 
-#: ui-file.c:368
+#: ui-file.c:393
 msgid "mem_file_delete: bad magic number"
 msgstr ""
 
-#: ui-file.c:387
+#: ui-file.c:412
 msgid "mem_file_rewind: bad magic number"
 msgstr ""
 
-#: ui-file.c:400
+#: ui-file.c:425
 msgid "mem_file_put: bad magic number"
 msgstr ""
 
-#: ui-file.c:414
+#: ui-file.c:439
 msgid "mem_file_write: bad magic number"
 msgstr ""
 
-#: ui-file.c:481
+#: ui-file.c:512
 msgid "stdio_file_delete: bad magic number"
 msgstr ""
 
-#: ui-file.c:496
+#: ui-file.c:527
 msgid "stdio_file_flush: bad magic number"
 msgstr ""
 
-#: ui-file.c:507
+#: ui-file.c:538
 msgid "stdio_file_read: bad magic number"
 msgstr ""
 
-#: ui-file.c:532
+#: ui-file.c:561
 msgid "stdio_file_write: bad magic number"
 msgstr ""
 
-#: ui-file.c:545
+#: ui-file.c:596
 msgid "stdio_file_fputs: bad magic number"
 msgstr ""
 
-#: ui-file.c:558
+#: ui-file.c:609
 msgid "stdio_file_isatty: bad magic number"
 msgstr ""
 
-#: ui-file.c:624
+#: ui-file.c:675
 msgid "tee_file_delete: bad magic number"
 msgstr ""
 
-#: ui-file.c:640
+#: ui-file.c:691
 msgid "tee_file_flush: bad magic number"
 msgstr ""
 
-#: ui-file.c:652
+#: ui-file.c:703
 msgid "tee_file_write: bad magic number"
 msgstr ""
 
-#: ui-file.c:664
+#: ui-file.c:715
 msgid "tee_file_fputs: bad magic number"
 msgstr ""
 
-#: ui-file.c:676
+#: ui-file.c:727
 msgid "tee_file_isatty: bad magic number"
 msgstr ""
 
@@ -23274,65 +24271,55 @@
 "table_body."
 msgstr ""
 
-#: ui-out.c:1088
+#: ui-out.c:1090
 msgid ""
 "table_body missing; table fields must be specified after table_body and "
 "inside a list."
 msgstr ""
 
-#: ui-out.c:1105
+#: ui-out.c:1107
 msgid "ui-out internal error in handling headers."
 msgstr ""
 
-#: utils.c:147
-#, possible-c-format
-msgid "Demangling of encoded C++/ObjC names when displaying symbols is %s.\n"
-msgstr ""
-
-#: utils.c:162
-#, possible-c-format
-msgid "Demangling of C++/ObjC names in disassembly listings is %s.\n"
-msgstr ""
-
-#: utils.c:176
+#: utils.c:148
 #, possible-c-format
 msgid "Printing of 8-bit characters in strings as \\nnn is %s.\n"
 msgstr ""
 
-#: utils.c:198
+#: utils.c:170
 #, possible-c-format
 msgid "State of pagination is %s.\n"
 msgstr ""
 
-#: utils.c:325
+#: utils.c:309
 msgid "Cannot restore redirection of the current output protocol"
 msgstr ""
 
-#: utils.c:575
+#: utils.c:628
 msgid "free_current_contents: NULL pointer"
 msgstr ""
 
-#: utils.c:646
+#: utils.c:705
 #, possible-c-format
-msgid "Startup time: %ld.%06ld\n"
+msgid "Startup time: %ld.%06ld (cpu), %ld.%06ld (wall)\n"
 msgstr ""
 
-#: utils.c:647
+#: utils.c:706
 #, possible-c-format
-msgid "Command execution time: %ld.%06ld\n"
+msgid "Command execution time: %ld.%06ld (cpu), %ld.%06ld (wall)\n"
 msgstr ""
 
-#: utils.c:660
+#: utils.c:721
 #, possible-c-format
 msgid "Space used: %ld (%s%ld during startup)\n"
 msgstr ""
 
-#: utils.c:661
+#: utils.c:722
 #, possible-c-format
 msgid "Space used: %ld (%s%ld for this command)\n"
 msgstr ""
 
-#: utils.c:1072
+#: utils.c:872
 #, possible-c-format
 msgid ""
 "%s\n"
@@ -23340,7 +24327,7 @@
 "time.\n"
 msgstr ""
 
-#: utils.c:1180
+#: utils.c:980
 #, possible-c-format
 msgid ""
 "%s\n"
@@ -23350,74 +24337,70 @@
 #. Default (yes/batch case) is to dump core.  This leaves a GDB
 #. `dropping' so that it is easier to see that something went
 #. wrong in GDB.
-#: utils.c:1198
+#: utils.c:998
 #, possible-c-format
 msgid ""
 "%s\n"
 "Create a core file of GDB? "
 msgstr ""
 
-#: utils.c:1310
+#: utils.c:1110
 #, possible-c-format
 msgid "Configure what GDB does when %s is detected."
 msgstr ""
 
-#: utils.c:1313
+#: utils.c:1113
 #, possible-c-format
 msgid "Show what GDB does when %s is detected."
 msgstr ""
 
 #. allow-unknown
-#: utils.c:1330
+#: utils.c:1130
 #, possible-c-format
 msgid "Set whether GDB should quit when an %s is detected"
 msgstr ""
 
-#: utils.c:1333
+#: utils.c:1133
 #, possible-c-format
 msgid "Show whether GDB will quit when an %s is detected"
 msgstr ""
 
-#: utils.c:1350
+#: utils.c:1150
 #, possible-c-format
 msgid "Set whether GDB should create a core file of GDB when %s is detected"
 msgstr ""
 
-#: utils.c:1353
+#: utils.c:1153
 #, possible-c-format
 msgid "Show whether GDB will create a core file of GDB when %s is detected"
 msgstr ""
 
-#: utils.c:1447
+#: utils.c:1247
 #, possible-c-format
 msgid "virtual memory exhausted: can't allocate %ld bytes."
 msgstr ""
 
-#: utils.c:1452
+#: utils.c:1252
 msgid "virtual memory exhausted."
 msgstr ""
 
-#: utils.c:1578
-msgid "vasprintf call failed"
-msgstr ""
-
-#: utils.c:1738
+#: utils.c:1398
 #, possible-c-format
 msgid "(%s or %s) [answered %c; input not from terminal]\n"
 msgstr ""
 
-#: utils.c:1763
+#: utils.c:1423
 #, possible-c-format
 msgid "(%s or %s) "
 msgstr ""
 
 #. Invalid entries are not defaulted and require another selection.
-#: utils.c:1827
+#: utils.c:1487
 #, possible-c-format
 msgid "Please answer %s or %s.\n"
 msgstr ""
 
-#: utils.c:2004
+#: utils.c:1664
 #, possible-c-format
 msgid ""
 "The escape sequence `\\%c' is equivalent to plain `%c', which has no "
@@ -23425,410 +24408,393 @@
 "in the `%s' character set."
 msgstr ""
 
-#: utils.c:2109
+#: utils.c:1769
 #, possible-c-format
 msgid "Number of lines gdb thinks are in a page is %s.\n"
 msgstr ""
 
-#: utils.c:2120
+#: utils.c:1780
 #, possible-c-format
 msgid "Number of characters gdb thinks are in a line is %s.\n"
 msgstr ""
 
-#: utils.c:3116
+#: utils.c:2813
 #, possible-c-format
 msgid "Timestamping debugging messages is %s.\n"
 msgstr ""
 
-#: utils.c:3124
+#: utils.c:2821
 msgid "Set number of characters gdb thinks are in a line."
 msgstr ""
 
-#: utils.c:3125
+#: utils.c:2822
 msgid "Show number of characters gdb thinks are in a line."
 msgstr ""
 
-#: utils.c:3131
+#: utils.c:2828
 msgid "Set number of lines gdb thinks are in a page."
 msgstr ""
 
-#: utils.c:3132
+#: utils.c:2829
 msgid "Show number of lines gdb thinks are in a page."
 msgstr ""
 
-#: utils.c:3140
-msgid "Set demangling of encoded C++/ObjC names when displaying symbols."
-msgstr ""
-
-#: utils.c:3141
-msgid "Show demangling of encoded C++/ObjC names when displaying symbols."
-msgstr ""
-
-#: utils.c:3148
+#: utils.c:2838
 msgid "Set state of pagination."
 msgstr ""
 
-#: utils.c:3149
+#: utils.c:2839
 msgid "Show state of pagination."
 msgstr ""
 
-#: utils.c:3158
+#: utils.c:2848
 msgid "Enable pagination"
 msgstr ""
 
-#: utils.c:3160
+#: utils.c:2850
 msgid "Disable pagination"
 msgstr ""
 
-#: utils.c:3164
+#: utils.c:2854
 msgid "Set printing of 8-bit characters in strings as \\nnn."
 msgstr ""
 
-#: utils.c:3165
+#: utils.c:2855
 msgid "Show printing of 8-bit characters in strings as \\nnn."
 msgstr ""
 
-#: utils.c:3171
-msgid "Set demangling of C++/ObjC names in disassembly listings."
-msgstr ""
-
-#: utils.c:3172
-msgid "Show demangling of C++/ObjC names in disassembly listings."
-msgstr ""
-
-#: utils.c:3179
+#: utils.c:2862
 msgid "Set timestamping of debugging messages."
 msgstr ""
 
-#: utils.c:3180
+#: utils.c:2863
 msgid "Show timestamping of debugging messages."
 msgstr ""
 
-#: utils.c:3181
+#: utils.c:2864
 msgid ""
 "When set, debugging messages will be marked with seconds and microseconds."
 msgstr ""
 
-#: utils.c:3441
+#: utils.c:3145
 msgid "hex_string_custom: insufficient space to store result"
 msgstr ""
 
-#: utils.c:3536
+#: utils.c:3240
 #, possible-c-format
 msgid "invalid hex \"%s\""
 msgstr ""
 
-#: utils.c:3549
+#: utils.c:3253
 #, possible-c-format
 msgid "invalid decimal \"%s\""
 msgstr ""
 
-#: utils.c:3998
+#: utils.c:3713
 msgid "process-id to attach"
 msgstr ""
 
-#: utils.c:4004
+#: utils.c:3719
 #, possible-c-format
 msgid "Illegal process-id: %s."
 msgstr ""
 
-#: valarith.c:74
+#: valarith.c:73
 msgid ""
 "Cannot perform pointer math on incomplete types, try casting to a known "
 "type, or void *."
 msgstr ""
 
-#: valarith.c:77
+#: valarith.c:76
 #, possible-c-format
 msgid ""
 "Cannot perform pointer math on incomplete type \"%s\", try casting to a "
 "known type, or void *."
 msgstr ""
 
-#: valarith.c:124
+#: valarith.c:123
 msgid ""
 "First argument of `-' is a pointer and second argument is neither\n"
 "an integer nor a pointer of the same type."
 msgstr ""
 
-#: valarith.c:131
+#: valarith.c:130
 msgid ""
 "Type size unknown, assuming 1. Try casting to a known type, or void *."
 msgstr ""
 
-#: valarith.c:176
+#: valarith.c:175
 msgid "array or string index out of range"
 msgstr ""
 
-#: valarith.c:188
+#: valarith.c:187
 msgid "not an array or string"
 msgstr ""
 
-#: valarith.c:206
+#: valarith.c:205
 msgid "no such vector element"
 msgstr ""
 
-#: valarith.c:243
+#: valarith.c:242
 msgid "bitstring index out of range"
 msgstr ""
 
-#: valarith.c:363
+#: valarith.c:355
 #, possible-c-format
 msgid "Could not find %s."
 msgstr ""
 
-#: valarith.c:409
+#: valarith.c:401
 msgid "Can't do that binary op on that type"
 msgstr ""
 
-#: valarith.c:495 valarith.c:521
+#: valarith.c:487 valarith.c:513
 msgid "Invalid binary operation specified."
 msgstr ""
 
-#: valarith.c:546 valarith.c:650
+#: valarith.c:538 valarith.c:642
 #, possible-c-format
 msgid "member function %s not found"
 msgstr ""
 
-#: valarith.c:573
+#: valarith.c:565
 msgid "Can't do that unary op on that type"
 msgstr ""
 
-#: valarith.c:625
+#: valarith.c:617
 msgid "Invalid unary operation specified."
 msgstr ""
 
-#: valarith.c:749
+#: valarith.c:741
 msgid "unimplemented support for bitstring/boolean repeats"
 msgstr ""
 
-#: valarith.c:753
+#: valarith.c:745
 msgid "can't repeat values of that type"
 msgstr ""
 
-#: valarith.c:763
+#: valarith.c:755
 msgid "Strings can only be concatenated with other strings."
 msgstr ""
 
-#: valarith.c:798
+#: valarith.c:790
 msgid ""
 "Bitstrings or booleans can only be concatenated with other bitstrings or "
 "booleans."
 msgstr ""
 
-#: valarith.c:801
+#: valarith.c:793
 msgid "unimplemented support for bitstring/boolean concatenation."
 msgstr ""
 
 #. We don't know how to concatenate these operands.
-#: valarith.c:806
+#: valarith.c:798
 msgid "illegal operands for concatenation."
 msgstr ""
 
-#: valarith.c:820 valarith.c:851
+#: valarith.c:812 valarith.c:843
 msgid "Attempt to raise 0 to negative power."
 msgstr ""
 
 #. The DFP extension to the C language does not allow mixing of
 #. * decimal float types with other float types in expressions
 #. * (see WDTR 24732, page 12).
-#: valarith.c:894
+#: valarith.c:886
 msgid ""
 "Mixing decimal floating types with other floating types is not allowed."
 msgstr ""
 
-#: valarith.c:913 valarith.c:932
+#: valarith.c:905 valarith.c:924
 #, possible-c-format
 msgid "Don't know how to convert from %s to %s."
 msgstr ""
 
-#: valarith.c:1000
+#: valarith.c:992
 msgid "Operation not valid for decimal floating point number."
 msgstr ""
 
-#: valarith.c:1038
+#: valarith.c:1030
 #, possible-c-format
 msgid "Cannot perform exponentiation: %s"
 msgstr ""
 
-#: valarith.c:1051
+#: valarith.c:1043
 msgid "Integer-only operation on floating point number."
 msgstr ""
 
-#: valarith.c:1099
+#: valarith.c:1091
 msgid "Invalid operation on booleans."
 msgstr ""
 
-#: valarith.c:1249 valarith.c:1379
+#: valarith.c:1151 valarith.c:1162 valarith.c:1277 valarith.c:1288
+msgid "Division by zero"
+msgstr ""
+
+#: valarith.c:1241 valarith.c:1371
 msgid "Invalid binary operation on numbers."
 msgstr ""
 
-#: valarith.c:1414
+#: valarith.c:1406
 msgid "Vector operations are only supported among vectors"
 msgstr ""
 
-#: valarith.c:1616
+#: valarith.c:1608
 msgid "Invalid type combination in equality test."
 msgstr ""
 
-#: valarith.c:1698
+#: valarith.c:1690
 msgid "Invalid type combination in ordering comparison."
 msgstr ""
 
-#: valarith.c:1731
+#: valarith.c:1723
 msgid "Argument to positive operation not a number."
 msgstr ""
 
-#: valarith.c:1786
+#: valarith.c:1778
 msgid "Argument to negate operation not a number."
 msgstr ""
 
-#: valarith.c:1821
+#: valarith.c:1813
 msgid "Argument to complement operation not an integer, boolean."
 msgstr ""
 
-#: valarith.c:1862
+#: valarith.c:1854
 msgid "Second argument of 'IN' has wrong type"
 msgstr ""
 
-#: valarith.c:1867
+#: valarith.c:1859
 msgid "First argument of 'IN' has wrong type"
 msgstr ""
 
-#: valarith.c:1871
+#: valarith.c:1863
 msgid "First argument of 'IN' not in range"
 msgstr ""
 
-#: valops.c:125
+#: valops.c:123
 #, possible-c-format
 msgid "Overload resolution in evaluating C++ functions is %s.\n"
 msgstr ""
 
-#: valops.c:144
+#: valops.c:142
 #, possible-c-format
 msgid "\"%s\" exists in this program but is not a function."
 msgstr ""
 
-#: valops.c:178
+#: valops.c:176
 msgid ""
 "evaluation of this expression requires the target program to be active"
 msgstr ""
 
-#: valops.c:181
+#: valops.c:179
 #, possible-c-format
 msgid ""
 "evaluation of this expression requires the program to have a function \"%s\"."
 msgstr ""
 
-#: valops.c:205
+#: valops.c:203
 msgid ""
 "No memory available to program now: you need to start the target first"
 msgstr ""
 
-#: valops.c:208
+#: valops.c:206
 msgid "No memory available to program: call to malloc failed"
 msgstr ""
 
-#: valops.c:413
+#: valops.c:411
 msgid "array element type size does not divide object size in cast"
 msgstr ""
 
-#: valops.c:528
+#: valops.c:526
 msgid "value truncated"
 msgstr ""
 
-#: valops.c:589
+#: valops.c:587
 msgid "Invalid cast."
 msgstr ""
 
-#: valops.c:640
+#: valops.c:638
 msgid "Invalid reinterpret_cast"
 msgstr ""
 
-#: valops.c:754
+#: valops.c:752
 msgid "Argument to dynamic_cast must be a pointer or reference type"
 msgstr ""
 
-#: valops.c:757
+#: valops.c:755
 msgid "Argument to dynamic_cast must be pointer to class or `void *'"
 msgstr ""
 
-#: valops.c:765
+#: valops.c:763
 msgid "Argument to dynamic_cast does not have pointer type"
 msgstr ""
 
-#: valops.c:770
+#: valops.c:768
 msgid "Argument to dynamic_cast does not have pointer to class type"
 msgstr ""
 
-#: valops.c:783
+#: valops.c:781
 msgid "Argument to dynamic_cast does not have class type"
 msgstr ""
 
-#: valops.c:796
+#: valops.c:794
 msgid "Ambiguous dynamic_cast"
 msgstr ""
 
-#: valops.c:801
+#: valops.c:799
 msgid "Couldn't determine value's most derived type for dynamic_cast"
 msgstr ""
 
-#: valops.c:853
+#: valops.c:851
 msgid "dynamic_cast failed"
 msgstr ""
 
-#: valops.c:911
+#: valops.c:909
 msgid "Not a numeric type."
 msgstr ""
 
-#: valops.c:998 valops.c:1351 value.c:813
+#: valops.c:998 valops.c:1352 value.c:826
 msgid "value has been optimized out"
 msgstr ""
 
-#: valops.c:1116
+#: valops.c:1117
 msgid "Unexpected lazy value type."
 msgstr ""
 
-#: valops.c:1281 valops.c:1342
+#: valops.c:1282 valops.c:1343
 #, possible-c-format
 msgid "Can't handle bitfields which don't fit in a %d bit word."
 msgstr ""
 
-#: valops.c:1314
+#: valops.c:1315
 msgid "Value being assigned to is no longer active."
 msgstr ""
 
-#: valops.c:1354 value.c:820
+#: valops.c:1355 value.c:833
 msgid "value is not available"
 msgstr ""
 
-#: valops.c:1387
+#: valops.c:1392
 msgid "Left operand of assignment is not an lvalue."
 msgstr ""
 
-#: valops.c:1470
+#: valops.c:1475
 msgid "Only values in memory can be extended with '@'."
 msgstr ""
 
-#: valops.c:1472
+#: valops.c:1477
 #, possible-c-format
 msgid "Invalid number %d of repetitions."
 msgstr ""
 
-#: valops.c:1503
+#: valops.c:1507
 #, possible-c-format
 msgid "No frame is currently executing in block %s."
 msgstr ""
 
-#: valops.c:1506
+#: valops.c:1510
 msgid "No frame is currently executing in specified block"
 msgstr ""
 
-#: valops.c:1512
-#, possible-c-format
-msgid "Address of symbol \"%s\" is unknown."
-msgstr ""
-
 #: valops.c:1551
 #, possible-c-format
 msgid "Address requested for identifier \"%s\" which is in register $%s"
@@ -23898,7 +24864,7 @@
 "Attempt to extract a component of a value that is not a struct or union"
 msgstr ""
 
-#: valops.c:2599
+#: valops.c:2601
 #, possible-c-format
 msgid "Couldn't find method %s%s%s"
 msgstr ""
@@ -23907,97 +24873,91 @@
 #. FIXME: GDB does not support the general ambiguous case.
 #. All candidates should be collected and presented the
 #. user.
-#: valops.c:2707
+#: valops.c:2711
 msgid "Ambiguous overload resolution"
 msgstr ""
 
 #. Incomparable top contenders.
 #. This is an error incompatible candidates
 #. should not have been proposed.
-#: valops.c:2712
+#: valops.c:2716
 msgid "Internal error: incompatible overload candidates proposed"
 msgstr ""
 
-#: valops.c:2724
+#: valops.c:2728
 msgid "Internal error: unexpected overload comparison result"
 msgstr ""
 
-#: valops.c:2740
+#: valops.c:2744
 #, possible-c-format
 msgid "Cannot resolve method %s%s%s to any overloaded instance"
 msgstr ""
 
-#: valops.c:2745
+#: valops.c:2749
 #, possible-c-format
 msgid "Cannot resolve function %s to any overloaded instance"
 msgstr ""
 
-#: valops.c:2751
+#: valops.c:2755
 #, possible-c-format
 msgid ""
 "Using non-standard conversion to match method %s%s%s to supplied arguments"
 msgstr ""
 
-#: valops.c:2757
+#: valops.c:2761
 #, possible-c-format
 msgid ""
 "Using non-standard conversion to match function %s to supplied arguments"
 msgstr ""
 
-#: valops.c:3117
+#: valops.c:3136
 msgid "name of destructor must equal name of class"
 msgstr ""
 
-#: valops.c:3183
+#: valops.c:3202
 msgid "non-aggregate type in value_aggregate_elt"
 msgstr ""
 
-#: valops.c:3259
+#: valops.c:3278
 msgid "Internal error: non-aggregate type to value_struct_elt_for_reference"
 msgstr ""
 
-#: valops.c:3272
+#: valops.c:3291
 #, possible-c-format
 msgid "static field %s has been optimized out"
 msgstr ""
 
-#: valops.c:3334
+#: valops.c:3353
 msgid "no member function matches that type instantiation"
 msgstr ""
 
-#: valops.c:3360
+#: valops.c:3379
 #, possible-c-format
 msgid "non-unique member `%s' requires type instantiation"
 msgstr ""
 
-#: valops.c:3367
+#: valops.c:3386
 msgid "no matching member function"
 msgstr ""
 
-#: valops.c:3398
+#: valops.c:3417
 #, possible-c-format
 msgid "Cannot reference virtual member function \"%s\""
 msgstr ""
 
-#: valops.c:3576
+#: valops.c:3602
 #, possible-c-format
 msgid ""
 "Couldn't retrieve complete object of RTTI type %s; object may be in "
 "register(s)."
 msgstr ""
 
-#: valops.c:3610
-msgid "no frame selected"
-msgstr ""
-
-#: valops.c:3622
-#, possible-c-format
-msgid "no `%s' in nameless context"
+#: valops.c:3634
+msgid "no `this' in current language"
 msgstr ""
 
-#: valops.c:3631
-#, possible-c-format
-msgid "no args, no `%s'"
+#: valops.c:3636
+msgid "no frame selected"
 msgstr ""
 
 #: valops.c:3642
@@ -24005,240 +24965,235 @@
 msgid "current stack frame does not contain a variable named `%s'"
 msgstr ""
 
-#: valops.c:3650
-#, possible-c-format
-msgid "`%s' argument unreadable"
-msgstr ""
-
-#: valops.c:3686
+#: valops.c:3685
 msgid "slice from bad array or bitstring"
 msgstr ""
 
-#: valops.c:3690
+#: valops.c:3689
 msgid "slice out of range"
 msgstr ""
 
-#: valops.c:3714
+#: valops.c:3713
 msgid "internal error accessing bitstring"
 msgstr ""
 
-#: valops.c:3808
+#: valops.c:3807
 msgid "cannot cast non-number to complex"
 msgstr ""
 
-#: valops.c:3815
+#: valops.c:3814
 msgid "Set overload resolution in evaluating C++ functions."
 msgstr ""
 
-#: valops.c:3816
+#: valops.c:3815
 msgid "Show overload resolution in evaluating C++ functions."
 msgstr ""
 
-#: valprint.c:121
+#: valprint.c:122
 #, possible-c-format
 msgid "Limit on string chars or array elements to print is %s.\n"
 msgstr ""
 
-#: valprint.c:135
+#: valprint.c:136
 #, possible-c-format
 msgid "Default input radix for entering numbers is %s.\n"
 msgstr ""
 
-#: valprint.c:145
+#: valprint.c:146
 #, possible-c-format
 msgid "Default output radix for printing of values is %s.\n"
 msgstr ""
 
-#: valprint.c:156
+#: valprint.c:157
 #, possible-c-format
 msgid "Printing of array indexes is %s.\n"
 msgstr ""
 
-#: valprint.c:167
+#: valprint.c:168
 #, possible-c-format
 msgid "Threshold for repeated print elements is %s.\n"
 msgstr ""
 
-#: valprint.c:178
+#: valprint.c:179
 #, possible-c-format
 msgid "Printing of char arrays to stop at first null char is %s.\n"
 msgstr ""
 
-#: valprint.c:189
+#: valprint.c:190
 #, possible-c-format
 msgid "Prettyprinting of structures is %s.\n"
 msgstr ""
 
-#: valprint.c:198
+#: valprint.c:199
 #, possible-c-format
 msgid "Prettyprinting of arrays is %s.\n"
 msgstr ""
 
-#: valprint.c:209
+#: valprint.c:210
 #, possible-c-format
 msgid "Printing of unions interior to structures is %s.\n"
 msgstr ""
 
-#: valprint.c:219
+#: valprint.c:220
 #, possible-c-format
 msgid "Printing of addresses is %s.\n"
 msgstr ""
 
-#: valprint.c:299
+#: valprint.c:300
 msgid "<optimized out>"
 msgstr ""
 
-#: valprint.c:311
+#: valprint.c:312
 msgid "<invalid address>"
 msgstr ""
 
-#: valprint.c:407
+#: valprint.c:409
 msgid "<address of value unknown>"
 msgstr ""
 
-#: valprint.c:419
+#: valprint.c:424
 #, possible-c-format
 msgid "<internal function %s>"
 msgstr ""
 
-#: valprint.c:656
+#: valprint.c:661
 msgid "Value out of range."
 msgstr ""
 
-#: valprint.c:899 valprint.c:949
+#: valprint.c:904 valprint.c:954
 msgid "Internal error in octal conversion;"
 msgstr ""
 
-#: valprint.c:1223
+#: valprint.c:1228
 msgid "unable to get bounds of array, assuming null array"
 msgstr ""
 
-#: valprint.c:1605
+#: valprint.c:2054
 #, possible-c-format
 msgid "Nonsense input radix ``decimal %u''; input radix unchanged."
 msgstr ""
 
-#: valprint.c:1611
+#: valprint.c:2060
 #, possible-c-format
 msgid "Input radix now set to decimal %u, hex %x, octal %o.\n"
 msgstr ""
 
-#: valprint.c:1647
+#: valprint.c:2096
 #, possible-c-format
 msgid "Unsupported output radix ``decimal %u''; output radix unchanged."
 msgstr ""
 
-#: valprint.c:1654
+#: valprint.c:2103
 #, possible-c-format
 msgid "Output radix now set to decimal %u, hex %x, octal %o.\n"
 msgstr ""
 
-#: valprint.c:1678
+#: valprint.c:2127
 #, possible-c-format
 msgid "Input and output radices now set to decimal %u, hex %x, octal %o.\n"
 msgstr ""
 
-#: valprint.c:1693
+#: valprint.c:2142
 #, possible-c-format
 msgid "Input and output radices set to decimal %u, hex %x, octal %o.\n"
 msgstr ""
 
-#: valprint.c:1699
+#: valprint.c:2148
 #, possible-c-format
 msgid "Input radix set to decimal %u, hex %x, octal %o.\n"
 msgstr ""
 
-#: valprint.c:1702
+#: valprint.c:2151
 #, possible-c-format
 msgid "Output radix set to decimal %u, hex %x, octal %o.\n"
 msgstr ""
 
-#: valprint.c:1728
+#: valprint.c:2177
 msgid "Generic command for setting how things print."
 msgstr ""
 
-#: valprint.c:1735
+#: valprint.c:2184
 msgid "Generic command for showing print settings."
 msgstr ""
 
-#: valprint.c:1741
+#: valprint.c:2190
 msgid "Set limit on string chars or array elements to print."
 msgstr ""
 
-#: valprint.c:1742
+#: valprint.c:2191
 msgid "Show limit on string chars or array elements to print."
 msgstr ""
 
-#: valprint.c:1743
+#: valprint.c:2192
 msgid "\"set print elements 0\" causes there to be no limit."
 msgstr ""
 
-#: valprint.c:1750
+#: valprint.c:2199
 msgid "Set printing of char arrays to stop at first null char."
 msgstr ""
 
-#: valprint.c:1751
+#: valprint.c:2200
 msgid "Show printing of char arrays to stop at first null char."
 msgstr ""
 
-#: valprint.c:1758
+#: valprint.c:2207
 msgid "Set threshold for repeated print elements."
 msgstr ""
 
-#: valprint.c:1759
+#: valprint.c:2208
 msgid "Show threshold for repeated print elements."
 msgstr ""
 
-#: valprint.c:1760
+#: valprint.c:2209
 msgid ""
 "\"set print repeats 0\" causes all elements to be individually printed."
 msgstr ""
 
-#: valprint.c:1767
+#: valprint.c:2216
 msgid "Set prettyprinting of structures."
 msgstr ""
 
-#: valprint.c:1768
+#: valprint.c:2217
 msgid "Show prettyprinting of structures."
 msgstr ""
 
-#: valprint.c:1775
+#: valprint.c:2224
 msgid "Set printing of unions interior to structures."
 msgstr ""
 
-#: valprint.c:1776
+#: valprint.c:2225
 msgid "Show printing of unions interior to structures."
 msgstr ""
 
-#: valprint.c:1783
+#: valprint.c:2232
 msgid "Set prettyprinting of arrays."
 msgstr ""
 
-#: valprint.c:1784
+#: valprint.c:2233
 msgid "Show prettyprinting of arrays."
 msgstr ""
 
-#: valprint.c:1791
+#: valprint.c:2240
 msgid "Set printing of addresses."
 msgstr ""
 
-#: valprint.c:1792
+#: valprint.c:2241
 msgid "Show printing of addresses."
 msgstr ""
 
-#: valprint.c:1799
+#: valprint.c:2248
 msgid "Set default input radix for entering numbers."
 msgstr ""
 
-#: valprint.c:1800
+#: valprint.c:2249
 msgid "Show default input radix for entering numbers."
 msgstr ""
 
-#: valprint.c:1807
+#: valprint.c:2256
 msgid "Set default output radix for printing of values."
 msgstr ""
 
-#: valprint.c:1808
+#: valprint.c:2257
 msgid "Show default output radix for printing of values."
 msgstr ""
 
@@ -24249,104 +25204,104 @@
 #. add_show_from_set() commands aren't really appropriate.
 #. FIXME: i18n: With the new add_setshow_integer command, that is no
 #. longer true - show can display anything.
-#: valprint.c:1821
+#: valprint.c:2270
 msgid ""
 "Set default input and output number radices.\n"
 "Use 'set input-radix' or 'set output-radix' to independently set each.\n"
 "Without an argument, sets both radices back to the default value of 10."
 msgstr ""
 
-#: valprint.c:1826
+#: valprint.c:2275
 msgid ""
 "Show the default input and output number radices.\n"
 "Use 'show input-radix' or 'show output-radix' to independently show each."
 msgstr ""
 
-#: valprint.c:1832
+#: valprint.c:2281
 msgid "Set printing of array indexes."
 msgstr ""
 
-#: valprint.c:1833
+#: valprint.c:2282
 msgid "Show printing of array indexes"
 msgstr ""
 
-#: value.c:1420
+#: value.c:1439
 msgid "The history is empty."
 msgstr ""
 
-#: value.c:1422
+#: value.c:1441
 msgid "There is only one value in the history."
 msgstr ""
 
-#: value.c:1424
+#: value.c:1443
 #, possible-c-format
 msgid "History does not go back to $$%d."
 msgstr ""
 
-#: value.c:1427
+#: value.c:1446
 #, possible-c-format
 msgid "History has not yet reached $%d."
 msgstr ""
 
-#: value.c:1576
+#: value.c:1595
 msgid "Init-if-undefined requires an assignment expression."
 msgstr ""
 
-#: value.c:1581
+#: value.c:1600
 msgid "The first parameter to init-if-undefined should be a GDB variable."
 msgstr ""
 
-#: value.c:1720
+#: value.c:1739
 msgid "bad kind"
 msgstr ""
 
 #. We can never get a component of any other kind.
-#: value.c:1809
+#: value.c:1828
 msgid "set_internalvar_component"
 msgstr ""
 
-#: value.c:1820
+#: value.c:1839
 #, possible-c-format
 msgid "Cannot overwrite convenience function %s"
 msgstr ""
 
-#: value.c:2093
+#: value.c:2122
 msgid ""
 "No debugger convenience variables now defined.\n"
 "Convenience variables have names starting with \"$\";\n"
 "use \"set\" as in \"set $foo = 5\" to define them.\n"
 msgstr ""
 
-#: value.c:2287
+#: value.c:2316
 msgid "Value can't be converted to integer."
 msgstr ""
 
 #. FIXME: would like to include fieldval in the message, but
 #. we don't have a sprintf_longest.
-#: value.c:2814
+#: value.c:2846
 #, possible-c-format
 msgid "Value does not fit in %d bits."
 msgstr ""
 
-#: value.c:2865
+#: value.c:2897
 #, possible-c-format
 msgid "Unexpected type (%d) encountered for integer constant."
 msgstr ""
 
-#: value.c:2901
+#: value.c:2933
 #, possible-c-format
 msgid "Unexpected type (%d) encountered for unsigned integer constant."
 msgstr ""
 
-#: value.c:2980
+#: value.c:3025
 msgid "Unexpected type encountered for floating constant."
 msgstr ""
 
-#: value.c:3092
+#: value.c:3161
 msgid "Function return type unknown."
 msgstr ""
 
-#: value.c:3124
+#: value.c:3193
 msgid ""
 "Debugger convenience (\"$foo\") variables.\n"
 "These variables are created when you assign them values;\n"
@@ -24357,11 +25312,11 @@
 "\"$__\" holds the contents of the last address examined with \"x\"."
 msgstr ""
 
-#: value.c:3134
+#: value.c:3203
 msgid "Elements of value history around item number IDX (or last ten)."
 msgstr ""
 
-#: value.c:3138
+#: value.c:3207
 msgid ""
 "Initialize a convenience variable if necessary.\n"
 "init-if-undefined VARIABLE = EXPRESSION\n"
@@ -24370,103 +25325,103 @@
 "VARIABLE is already initialized."
 msgstr ""
 
-#: value.c:3145
+#: value.c:3214
 msgid "Placeholder command for showing help on convenience functions."
 msgstr ""
 
-#: varobj.c:53
+#: varobj.c:52
 #, possible-c-format
 msgid "Varobj debugging is %s.\n"
 msgstr ""
 
-#: varobj.c:612
+#: varobj.c:642
 msgid "Failed to find the specified frame"
 msgstr ""
 
-#: varobj.c:764
+#: varobj.c:794
 #, possible-c-format
 msgid "varobj_delete: assertion failed - mycount(=%d) <> 0"
 msgstr ""
 
-#: varobj.c:1000
+#: varobj.c:1030
 msgid "Null value returned for children"
 msgstr ""
 
-#: varobj.c:1006
+#: varobj.c:1036
 msgid "Returned value is not iterable"
 msgstr ""
 
-#: varobj.c:1013
+#: varobj.c:1043
 msgid "Could not get children iterator"
 msgstr ""
 
-#: varobj.c:1098
+#: varobj.c:1128
 msgid "Invalid item from the child list"
 msgstr ""
 
-#: varobj.c:1414
+#: varobj.c:1444
 msgid "Cannot instantiate printer for default visualizer"
 msgstr ""
 
-#: varobj.c:1714
+#: varobj.c:1744
 #, possible-c-format
 msgid "Could not evaluate visualizer expression: %s"
 msgstr ""
 
-#: varobj.c:1726
+#: varobj.c:1756
 msgid "Python support required"
 msgstr ""
 
-#: varobj.c:2037
+#: varobj.c:2067
 msgid "Duplicate variable object name"
 msgstr ""
 
-#: varobj.c:2120
+#: varobj.c:2150
 #, possible-c-format
 msgid "Assertion failed: Could not find varobj \"%s\" in root list"
 msgstr ""
 
-#: varobj.c:3622
+#: varobj.c:3725
 msgid "Set varobj debugging."
 msgstr ""
 
-#: varobj.c:3623
+#: varobj.c:3726
 msgid "Show varobj debugging."
 msgstr ""
 
-#: varobj.c:3624
+#: varobj.c:3727
 msgid "When non-zero, varobj debugging is enabled."
 msgstr ""
 
-#: vax-nat.c:81
+#: vax-nat.c:80
 msgid "Unable to determine location of registers"
 msgstr ""
 
-#: windows-nat.c:315
+#: windows-nat.c:299
 #, possible-c-format
 msgid "SuspendThread failed. (winerr %d)"
 msgstr ""
 
-#: windows-nat.c:562
+#: windows-nat.c:546
 msgid "Can't get module info"
 msgstr ""
 
-#: windows-nat.c:572
+#: windows-nat.c:556
 #, possible-c-format
 msgid "Error getting dll name: %lu."
 msgstr ""
 
-#: windows-nat.c:575
+#: windows-nat.c:559
 #, possible-c-format
 msgid "Error converting dll name to POSIX: %d."
 msgstr ""
 
-#: windows-nat.c:580
+#: windows-nat.c:564
 #, possible-c-format
 msgid "Error getting dll name: %u."
 msgstr ""
 
-#: windows-nat.c:739
+#: windows-nat.c:723
 msgid "dll path too long"
 msgstr ""
 
@@ -24477,147 +25432,147 @@
 #. 4 mysterious UNLOAD_DLL_DEBUG_EVENTs during the startup phase (these
 #. events are apparently caused by the WOW layer, the interface between
 #. 32bit and 64bit worlds).
-#: windows-nat.c:893
+#: windows-nat.c:877
 #, possible-c-format
 msgid "dll starting at %s not found."
 msgstr ""
 
-#: windows-nat.c:915
+#: windows-nat.c:899
 msgid "dll-symbols requires a file name"
 msgstr ""
 
-#: windows-nat.c:1293
+#: windows-nat.c:1277
 #, possible-c-format
 msgid "OpenProcess call failed, GetLastError = %lud"
 msgstr ""
 
-#: windows-nat.c:1418
+#: windows-nat.c:1402
 msgid "Could not interrupt program.  Press Ctrl-c in the program console."
 msgstr ""
 
-#: windows-nat.c:1526
+#: windows-nat.c:1510
 #, possible-c-format
 msgid "During startup program exited with code 0x%x."
 msgstr ""
 
-#: windows-nat.c:1829
+#: windows-nat.c:1813
 msgid "Can't attach to process."
 msgstr ""
 
-#: windows-nat.c:1861
+#: windows-nat.c:1845
 #, possible-c-format
 msgid "Can't detach process %lu (error %lu)"
 msgstr ""
 
-#: windows-nat.c:2004
+#: windows-nat.c:2030
 msgid "No executable specified, use `target exec'."
 msgstr ""
 
-#: windows-nat.c:2021 windows-nat.c:2026
+#: windows-nat.c:2047 windows-nat.c:2052
 #, possible-c-format
 msgid "Error starting executable: %d"
 msgstr ""
 
-#: windows-nat.c:2039
+#: windows-nat.c:2065
 #, possible-c-format
 msgid "Error starting executable via shell: %d"
 msgstr ""
 
-#: windows-nat.c:2133
+#: windows-nat.c:2186
 #, possible-c-format
 msgid "Warning: Failed to open TTY %s, error %#x."
 msgstr ""
 
-#: windows-nat.c:2160
+#: windows-nat.c:2238
 #, possible-c-format
 msgid "Error creating process %s, (error %d)."
 msgstr ""
 
-#: windows-nat.c:2446
+#: windows-nat.c:2524
 msgid "Load dll library symbols from FILE."
 msgstr ""
 
-#: windows-nat.c:2456
+#: windows-nat.c:2534
 msgid "Set use of shell to start subprocess."
 msgstr ""
 
-#: windows-nat.c:2457
+#: windows-nat.c:2535
 msgid "Show use of shell to start subprocess."
 msgstr ""
 
-#: windows-nat.c:2464
+#: windows-nat.c:2542
 msgid "Break when an exception is detected in the Cygwin DLL itself."
 msgstr ""
 
-#: windows-nat.c:2465
+#: windows-nat.c:2543
 msgid "Show whether gdb breaks on exceptions in the Cygwin DLL itself."
 msgstr ""
 
-#: windows-nat.c:2472
+#: windows-nat.c:2550
 msgid "Set creation of new console when creating child process."
 msgstr ""
 
-#: windows-nat.c:2473
+#: windows-nat.c:2551
 msgid "Show creation of new console when creating child process."
 msgstr ""
 
-#: windows-nat.c:2479
+#: windows-nat.c:2557
 msgid "Set creation of new group when creating child process."
 msgstr ""
 
-#: windows-nat.c:2480
+#: windows-nat.c:2558
 msgid "Show creation of new group when creating child process."
 msgstr ""
 
-#: windows-nat.c:2486
+#: windows-nat.c:2564
 msgid "Set whether to display execution in child process."
 msgstr ""
 
-#: windows-nat.c:2487
+#: windows-nat.c:2565
 msgid "Show whether to display execution in child process."
 msgstr ""
 
-#: windows-nat.c:2493
+#: windows-nat.c:2571
 msgid "Set whether to display kernel events in child process."
 msgstr ""
 
-#: windows-nat.c:2494
+#: windows-nat.c:2572
 msgid "Show whether to display kernel events in child process."
 msgstr ""
 
-#: windows-nat.c:2500
+#: windows-nat.c:2578
 msgid "Set whether to display memory accesses in child process."
 msgstr ""
 
-#: windows-nat.c:2501
+#: windows-nat.c:2579
 msgid "Show whether to display memory accesses in child process."
 msgstr ""
 
-#: windows-nat.c:2508
+#: windows-nat.c:2586
 msgid "Set whether to display kernel exceptions in child process."
 msgstr ""
 
-#: windows-nat.c:2509
+#: windows-nat.c:2587
 msgid "Show whether to display kernel exceptions in child process."
 msgstr ""
 
-#: windows-nat.c:2518
+#: windows-nat.c:2596
 msgid "Display selectors infos."
 msgstr ""
 
-#: windows-nat.c:2534
+#: windows-nat.c:2612
 #, possible-c-format
 msgid "Invalid register %d in cygwin_set_dr.\n"
 msgstr ""
 
-#: windows-nat.c:2599
+#: windows-nat.c:2677
 #, possible-c-format
 msgid "obsolete '%s' found. Rename to '%s'."
 msgstr ""
 
 #. This will probably fail on Windows 9x/Me.  Let the user know
 #. that we're missing some functionality.
-#: windows-nat.c:2726
+#: windows-nat.c:2804
 msgid ""
 "cannot automatically find executable file or library to read symbols.\n"
 "Use \"file\" or \"dll\" command to load executable/libraries directly."
@@ -24686,11 +25641,11 @@
 "even if their meaning is unknown."
 msgstr ""
 
-#: xcoffread.c:159
+#: xcoffread.c:175
 msgid "line numbers off, `.bf' symbol not found"
 msgstr ""
 
-#: xcoffread.c:166
+#: xcoffread.c:182
 #, possible-c-format
 msgid "Mismatched .ef symbol ignored starting at symnum %d"
 msgstr ""
@@ -24700,72 +25655,72 @@
 #. This can happen with old versions of GCC.
 #. GCC 2.3.3-930426 does not exhibit this on a test case which
 #. a user said produced the message for him.
-#: xcoffread.c:500
+#: xcoffread.c:516
 msgid "Nested C_BINCL symbols"
 msgstr ""
 
-#: xcoffread.c:517
+#: xcoffread.c:533
 msgid "Mismatched C_BINCL/C_EINCL pair"
 msgstr "Paire C_BINCL/C_EINCL non-concordante"
 
-#: xcoffread.c:803
+#: xcoffread.c:823
 msgid "Bad line table offset in C_EINCL directive"
 msgstr "Ligne incorrecte de décalage de table dans la directive C_EINCL"
 
-#: xcoffread.c:910 xcoffread.c:926
+#: xcoffread.c:930 xcoffread.c:946
 msgid "Unexpected symbol continuation"
 msgstr "Suite de symboles inattendue"
 
-#: xcoffread.c:1373
+#: xcoffread.c:1393
 #, possible-c-format
 msgid "Unrecognized storage class %d."
 msgstr "Classe de stockage non reconnue %d."
 
-#: xcoffread.c:1558
+#: xcoffread.c:1578
 #, possible-c-format
 msgid "Unexpected storage class: %d"
 msgstr "Classe de stockage inattendue : %d"
 
-#: xcoffread.c:1642
+#: xcoffread.c:1666
 msgid "Invalid symbol offset"
 msgstr "Décalage de symbole incorrect"
 
-#: xcoffread.c:1924
+#: xcoffread.c:1950
 #, possible-c-format
 msgid "cannot seek to string table in %s: %s"
 msgstr ""
 
-#: xcoffread.c:1952
+#: xcoffread.c:1978
 #, possible-c-format
 msgid "cannot read string table from %s: %s"
 msgstr "impossible de lire le tableau de chaînes depuis %s : %s"
 
-#: xcoffread.c:1955
+#: xcoffread.c:1981
 msgid "bad symbol file: string table does not end with null character"
 msgstr ""
 "fichier de symboles incorrect : le tableau de chaînes ne finit pas avec un "
 "caractère 0"
 
-#: xcoffread.c:2339
+#: xcoffread.c:2365
 msgid "More than one XMC_TC0 symbol found."
 msgstr "Plus d'un symbol XMC_TC0 a été trouvé."
 
-#: xcoffread.c:2492
+#: xcoffread.c:2518
 #, possible-c-format
 msgid "Storage class %d not recognized during scan"
 msgstr "La classe de stockage %d n'a pas été reconnu lors du balayage"
 
-#: xcoffread.c:2967
+#: xcoffread.c:2993
 #, possible-c-format
 msgid "Error reading .debug section of `%s': %s"
 msgstr "Erreur lors de la lecture de .debug section de `%s' : %s"
 
-#: xcoffread.c:2982
+#: xcoffread.c:3008
 #, possible-c-format
 msgid "Error reading symbols from %s: %s"
 msgstr "Erreur lors de la lecture des symboles de %s : %s"
 
-#: xcoffread.c:2995
+#: xcoffread.c:3021
 msgid "reading symbol table"
 msgstr "lecture de la table de symboles"
 
@@ -24773,136 +25728,136 @@
 msgid "Status of loaded shared object libraries"
 msgstr "Etat de chargement de la bibliothèque d'objets partagés"
 
-#: xml-support.c:196
+#: xml-support.c:195
 #, possible-c-format
 msgid "Entering element <%s>"
 msgstr ""
 
-#: xml-support.c:223
+#: xml-support.c:222
 #, possible-c-format
 msgid "Element <%s> unknown"
 msgstr ""
 
-#: xml-support.c:228
+#: xml-support.c:227
 #, possible-c-format
 msgid "Element <%s> only expected once"
 msgstr ""
 
-#: xml-support.c:252
+#: xml-support.c:251
 #, possible-c-format
 msgid "Attribute \"%s\" missing a value"
 msgstr ""
 
-#: xml-support.c:259
+#: xml-support.c:258
 #, possible-c-format
 msgid "Required attribute \"%s\" of <%s> not specified"
 msgstr ""
 
-#: xml-support.c:268
+#: xml-support.c:267
 #, possible-c-format
 msgid "Parsing attribute %s=\"%s\""
 msgstr ""
 
-#: xml-support.c:295
+#: xml-support.c:294
 #, possible-c-format
 msgid "Ignoring unknown attribute %s"
 msgstr ""
 
-#: xml-support.c:348
+#: xml-support.c:347
 #, possible-c-format
 msgid "Leaving element <%s>"
 msgstr ""
 
-#: xml-support.c:355
+#: xml-support.c:354
 #, possible-c-format
 msgid "Required element <%s> is missing"
 msgstr ""
 
-#: xml-support.c:521
+#: xml-support.c:520
 #, possible-c-format
 msgid "could not locate built-in DTD %s"
 msgstr ""
 
-#: xml-support.c:566
+#: xml-support.c:565
 #, possible-c-format
 msgid "XML_UseForeignDTD failed: %s"
 msgstr ""
 
-#: xml-support.c:583
+#: xml-support.c:582
 #, possible-c-format
 msgid ""
 "Starting:\n"
 "%s"
 msgstr ""
 
-#: xml-support.c:609
+#: xml-support.c:608
 #, possible-c-format
 msgid "while parsing %s (at line %d): %s"
 msgstr ""
 
-#: xml-support.c:612
+#: xml-support.c:611
 #, possible-c-format
 msgid "while parsing %s: %s"
 msgstr ""
 
-#: xml-support.c:669
+#: xml-support.c:668
 #, possible-c-format
 msgid "Can't convert \"%s\" to an integer"
 msgstr ""
 
-#: xml-support.c:685
+#: xml-support.c:684
 #, possible-c-format
 msgid "Can't convert %s=\"%s\" to an integer"
 msgstr ""
 
-#: xml-support.c:719
+#: xml-support.c:718
 #, possible-c-format
 msgid "Unknown attribute value %s=\"%s\""
 msgstr ""
 
-#: xml-support.c:781
+#: xml-support.c:780
 #, possible-c-format
 msgid "Processing XInclude of \"%s\""
 msgstr ""
 
-#: xml-support.c:784
+#: xml-support.c:783
 #, possible-c-format
 msgid "Maximum XInclude depth (%d) exceeded"
 msgstr ""
 
-#: xml-support.c:789
+#: xml-support.c:788
 #, possible-c-format
 msgid "Could not load XML document \"%s\""
 msgstr ""
 
-#: xml-support.c:796
+#: xml-support.c:795
 #, possible-c-format
 msgid "Parsing \"%s\" failed"
 msgstr ""
 
-#: xml-support.c:929
+#: xml-support.c:928
 msgid "XInclude processing succeeded."
 msgstr ""
 
-#: xml-support.c:990
+#: xml-support.c:989
 #, possible-c-format
 msgid "XML debugging is %s.\n"
 msgstr ""
 
-#: xml-support.c:1135
+#: xml-support.c:1072
 #, possible-c-format
 msgid "Read error from \"%s\""
 msgstr ""
 
-#: xml-support.c:1162
+#: xml-support.c:1099
 msgid "Set XML parser debugging."
 msgstr ""
 
-#: xml-support.c:1163
+#: xml-support.c:1100
 msgid "Show XML parser debugging."
 msgstr ""
 
-#: xml-support.c:1164
+#: xml-support.c:1101
 msgid "When set, debugging messages for XML parsers are displayed."
 msgstr ""
 
@@ -25025,7 +25980,7 @@
 msgid "Could not open \"%s\""
 msgstr ""
 
-#: xstormy16-tdep.c:117
+#: xstormy16-tdep.c:116
 #, possible-c-format
 msgid "xstormy16_register_name: illegal register number %d"
 msgstr "xstormy16_register_name : numéro de registre non admis %d"
@@ -25038,128 +25993,128 @@
 msgid "Couldn't write extended registers"
 msgstr ""
 
-#: xtensa-tdep.c:255
+#: xtensa-tdep.c:254
 #, possible-c-format
 msgid "invalid register %d"
 msgstr ""
 
-#: xtensa-tdep.c:362
+#: xtensa-tdep.c:360
 #, possible-c-format
 msgid "invalid dwarf/stabs register number %d"
 msgstr ""
 
-#: xtensa-tdep.c:425 xtensa-tdep.c:504
+#: xtensa-tdep.c:423 xtensa-tdep.c:502
 msgid "size of all masks is larger than the register"
 msgstr ""
 
-#: xtensa-tdep.c:610
+#: xtensa-tdep.c:608
 #, possible-c-format
 msgid "cannot read register %s"
 msgstr ""
 
-#: xtensa-tdep.c:622 xtensa-tdep.c:629
+#: xtensa-tdep.c:620 xtensa-tdep.c:627
 msgid "cannot read register"
 msgstr ""
 
-#: xtensa-tdep.c:705
+#: xtensa-tdep.c:703
 #, possible-c-format
 msgid "cannot write register %s"
 msgstr ""
 
-#: xtensa-tdep.c:717 xtensa-tdep.c:725
+#: xtensa-tdep.c:715 xtensa-tdep.c:723
 msgid "cannot write register"
 msgstr ""
 
-#: xtensa-tdep.c:1436
+#: xtensa-tdep.c:1435
 msgid ""
 "\n"
 "Unrecognised function prologue. Stack trace cannot be resolved. This message "
 "will not be repeated in this session.\n"
 msgstr ""
 
-#: xtensa-tdep.c:1603
+#: xtensa-tdep.c:1602
 #, possible-c-format
 msgid "cannot extract return value of %d bytes long"
 msgstr ""
 
-#: xtensa-tdep.c:1658
+#: xtensa-tdep.c:1657
 #, possible-c-format
 msgid "unimplemented for this length: %d"
 msgstr ""
 
-#: xtensa-tdep.c:2463
+#: xtensa-tdep.c:2462
 msgid "Unable to read target memory ..."
 msgstr ""
 
-#: xtensa-tdep.c:2961
+#: xtensa-tdep.c:2960
 msgid "Unable to decode Xtensa Window Interrupt Handler's code."
 msgstr ""
 
-#: xtensa-tdep.c:2992
+#: xtensa-tdep.c:2991
 msgid "Unable to read Xtensa register EPC1"
 msgstr ""
 
-#: xtensa-tdep.c:3095
+#: xtensa-tdep.c:3094
 #, possible-c-format
 msgid ""
 "\n"
 "\tnum_aregs: Number of AR registers (%d) is not a power of two!"
 msgstr ""
 
-#: xtensa-tdep.c:3102
+#: xtensa-tdep.c:3101
 msgid ""
 "\n"
 "\tpc_regnum: No PC register"
 msgstr ""
 
-#: xtensa-tdep.c:3104
+#: xtensa-tdep.c:3103
 msgid ""
 "\n"
 "\tps_regnum: No PS register"
 msgstr ""
 
-#: xtensa-tdep.c:3109
+#: xtensa-tdep.c:3108
 msgid ""
 "\n"
 "\twb_regnum: No WB register"
 msgstr ""
 
-#: xtensa-tdep.c:3111
+#: xtensa-tdep.c:3110
 msgid ""
 "\n"
 "\tws_regnum: No WS register"
 msgstr ""
 
-#: xtensa-tdep.c:3113
+#: xtensa-tdep.c:3112
 msgid ""
 "\n"
 "\tar_base: No AR registers"
 msgstr ""
 
-#: xtensa-tdep.c:3117
+#: xtensa-tdep.c:3116
 msgid ""
 "\n"
 "\ta0_base: No Ax registers"
 msgstr ""
 
-#: xtensa-tdep.c:3123
+#: xtensa-tdep.c:3122
 #, possible-c-format
 msgid "the following are invalid: %s"
 msgstr ""
 
-#: xtensa-tdep.c:3300
+#: xtensa-tdep.c:3299
 msgid "xtensa_dump_tdep(): not implemented"
 msgstr "xtensa_dump_tdep(): n'est pas implementé"
 
-#: xtensa-tdep.c:3317
+#: xtensa-tdep.c:3316
 msgid "Set Xtensa debugging."
 msgstr ""
 
-#: xtensa-tdep.c:3318
+#: xtensa-tdep.c:3317
 msgid "Show Xtensa debugging."
 msgstr ""
 
-#: xtensa-tdep.c:3318
+#: xtensa-tdep.c:3317
 msgid ""
 "When non-zero, Xtensa-specific debugging is enabled. Can be 1, 2, 3, or 4 "
 "indicating the level of debugging."
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gettext-runtime.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gettext-runtime.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gettext-runtime.po	2012-01-02 17:26:48.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gettext-runtime.po	2012-02-23 06:31:15.000000000 +0000
@@ -17,8 +17,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:57+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:59+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: gnulib-lib/closeout.c:66
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gettext-tools.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gettext-tools.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gettext-tools.po	2012-01-02 17:26:48.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gettext-tools.po	2012-02-23 06:31:15.000000000 +0000
@@ -18,8 +18,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:57+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:59+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: gnulib-lib/argmatch.c:133
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ggz-config.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ggz-config.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ggz-config.po	2012-01-02 17:26:58.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ggz-config.po	2012-02-23 06:31:25.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:36+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:16+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../../ggz-config/ggz-config.c:97
 msgid "Query GGZCONFDIR - location of configuration directory"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ggzcore.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ggzcore.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ggzcore.po	2012-01-02 17:26:58.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ggzcore.po	2012-02-23 06:31:25.000000000 +0000
@@ -32,8 +32,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:36+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:16+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../../ggzcore/server.c:872
 msgid "Unknown negotation"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/git-gui.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/git-gui.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/git-gui.po	2012-01-02 17:26:59.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/git-gui.po	2012-02-23 06:31:25.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:36+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:16+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903
 #: git-gui.sh:922
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gnupg2.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gnupg2.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gnupg2.po	2012-01-02 17:26:59.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gnupg2.po	2012-02-23 06:31:26.000000000 +0000
@@ -19,8 +19,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:41+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:19+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: agent/call-pinentry.c:244
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gnupg.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gnupg.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gnupg.po	2012-01-02 17:26:50.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gnupg.po	2012-02-23 06:31:16.000000000 +0000
@@ -18,8 +18,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:21+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:18+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: cipher/primegen.c:119
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gODBCConfig.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gODBCConfig.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gODBCConfig.po	2012-01-02 17:26:51.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gODBCConfig.po	2012-02-23 06:31:17.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:27+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:23+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/main.c:25
 msgid "gODBCConfig - ODBC Data Source Administrator"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gold.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gold.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gold.po	2012-01-02 17:26:43.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gold.po	2012-02-23 06:31:10.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:14+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:31+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: archive.cc:119
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/goocanvas.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/goocanvas.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/goocanvas.po	2012-01-02 17:27:19.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/goocanvas.po	2012-02-23 06:31:43.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:38+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:41+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/goocanvas.c:284
 msgid "Scale"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gprof.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gprof.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gprof.po	2012-01-02 17:26:43.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gprof.po	2012-02-23 06:31:10.000000000 +0000
@@ -11,14 +11,14 @@
 "Project-Id-Version: gprof 2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
 "POT-Creation-Date: 2010-11-05 10:29+0100\n"
-"PO-Revision-Date: 2011-12-13 17:17+0000\n"
+"PO-Revision-Date: 2012-01-27 01:27+0000\n"
 "Last-Translator: taffit <Unknown>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:14+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:31+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: alpha.c:102 mips.c:54
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/grep.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/grep.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/grep.po	2012-01-02 17:26:50.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/grep.po	2012-02-23 06:31:16.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:22+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:19+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: lib/argmatch.c:133
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/grub.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/grub.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/grub.po	2012-01-02 17:26:59.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/grub.po	2012-02-23 06:31:26.000000000 +0000
@@ -14,49 +14,49 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:43+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:21+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
-#: grub-core/commands/acpi.c:40
+#: commands/acpi.c:40
 msgid "Don't load host tables specified by comma-separated list."
 msgstr ""
 "Ne pas charger les tables spécifiées dans la liste (séparateur : virgule)."
 
-#: grub-core/commands/acpi.c:43
+#: commands/acpi.c:43
 msgid "Load only tables specified by comma-separated list."
 msgstr ""
 "Charge seulement les tables spécifiées dans la liste (séparateur : virgule)."
 
-#: grub-core/commands/acpi.c:44
+#: commands/acpi.c:44
 msgid "Expose v1 tables."
 msgstr "Affiche les tables v1."
 
-#: grub-core/commands/acpi.c:45
+#: commands/acpi.c:45
 msgid "Expose v2 and v3 tables."
 msgstr "Affiche les tables v2 et v3."
 
-#: grub-core/commands/acpi.c:46
+#: commands/acpi.c:46
 msgid "Set OEMID of RSDP, XSDT and RSDT."
 msgstr "Spécifie OEMID des RSDP, XSDT et RSDT."
 
-#: grub-core/commands/acpi.c:48
+#: commands/acpi.c:48
 msgid "Set OEMTABLE ID of RSDP, XSDT and RSDT."
 msgstr "Spécifie OEMTABLE ID des RSDP, XSDT et RSDT."
 
-#: grub-core/commands/acpi.c:50
+#: commands/acpi.c:50
 msgid "Set OEMTABLE revision of RSDP, XSDT and RSDT."
 msgstr "Spécifie la révision OEMTABLE des RSDP, XSDT et RSDT."
 
-#: grub-core/commands/acpi.c:52
+#: commands/acpi.c:52
 msgid "Set creator field of RSDP, XSDT and RSDT."
 msgstr "Spécifie le champ 'créateur' de RSDP, XSDT et RSDT."
 
-#: grub-core/commands/acpi.c:54
+#: commands/acpi.c:54
 msgid "Set creator revision of RSDP, XSDT and RSDT."
 msgstr "Spécifie la révision du 'créateur' de RSDP, XSDT et RSDT."
 
-#: grub-core/commands/acpi.c:55
+#: commands/acpi.c:55
 msgid ""
 "Don't update EBDA. May fix failures or hangs on some. BIOSes but makes it "
 "ineffective with OS not receiving RSDP from GRUB."
@@ -65,7 +65,7 @@
 "BIOS, mais est souvent inefficace si le système d'exploitation ne gère pas "
 "les pointeurs RSDP depuis GRUB."
 
-#: grub-core/commands/acpi.c:763
+#: commands/acpi.c:763
 msgid ""
 "[-1|-2] [--exclude=TABLE1,TABLE2|--load-only=table1,table2] FILE1 [FILE2] "
 "[...]"
@@ -73,29 +73,23 @@
 "[-1|-2] [--exclude=TABLE1,TABLE2|--load-only=table1,table2] FICHIER1 "
 "[FICHIER2] [...]"
 
-#: grub-core/commands/acpi.c:766
+#: commands/acpi.c:766
 msgid "Load host ACPI tables and tables specified by arguments."
 msgstr ""
 "Charge les tables ACPI de l'hôte et les tables spécifiées par les arguments."
 
-#: grub-core/commands/blocklist.c:116 grub-core/commands/cat.c:97
-#: grub-core/commands/configfile.c:65 grub-core/commands/configfile.c:68
-#: grub-core/commands/configfile.c:74 grub-core/commands/configfile.c:80
-#: grub-core/commands/configfile.c:86 grub-core/commands/hashsum.c:33
-#: grub-core/commands/legacycfg.c:763 grub-core/commands/legacycfg.c:768
-#: grub-core/commands/legacycfg.c:773 grub-core/commands/legacycfg.c:778
-#: grub-core/commands/minicmd.c:204 grub-core/commands/testload.c:150
-#: grub-core/efiemu/main.c:318 grub-core/loader/i386/bsd.c:1947
-#: grub-core/loader/i386/bsd.c:1950 grub-core/loader/i386/bsd.c:1953
-#: util/grub-setup.c:686 util/grub-setup.c:688 util/grub-setup.c:692
+#: commands/blocklist.c:114 commands/cat.c:82 commands/configfile.c:57
+#: commands/configfile.c:60 commands/configfile.c:65 commands/crc.c:64
+#: commands/minicmd.c:357 loader/i386/bsd.c:1297 loader/i386/bsd.c:1301
+#: loader/i386/bsd.c:1305
 msgid "FILE"
 msgstr "FICHIER"
 
-#: grub-core/commands/blocklist.c:116
+#: commands/blocklist.c:114
 msgid "Print a block list."
 msgstr "Liste les blocs."
 
-#: grub-core/commands/boot.c:192
+#: commands/boot.c:190
 msgid "Boot an operating system."
 msgstr "Démarre un système d'exploitation."
 
@@ -103,23 +97,23 @@
 msgid "Accept DOS-style CR/NL line endings."
 msgstr "Fin de lignes de type DOS CR/LF acceptées."
 
-#: grub-core/commands/cat.c:97 grub-core/commands/minicmd.c:204
+#: commands/cat.c:82 commands/minicmd.c:357
 msgid "Show the contents of a file."
 msgstr "Liste le contenu d'un fichier."
 
-#: grub-core/commands/cmp.c:114
+#: commands/cmp.c:113
 msgid "FILE1 FILE2"
 msgstr "FICHIER1 FICHIER2"
 
-#: grub-core/commands/cmp.c:114
+#: commands/cmp.c:113
 msgid "Compare two files."
 msgstr "Compare 2 fichiers."
 
-#: grub-core/commands/configfile.c:65
+#: commands/configfile.c:57
 msgid "Load another config file."
 msgstr "Charge un autre fichier de configuration."
 
-#: grub-core/commands/configfile.c:69 grub-core/commands/configfile.c:87
+#: commands/configfile.c:61 commands/configfile.c:66
 msgid "Load another config file without changing context."
 msgstr "Charge un autre fichier de configuration sans changer le contexte."
 
@@ -130,43 +124,43 @@
 "Charge un autre fichier de configuration sans changer le contexte mais "
 "seulement les entrées de menu."
 
-#: grub-core/commands/date.c:141
+#: commands/date.c:139
 msgid "[[year-]month-day] [hour:minute[:second]]"
 msgstr "[[année-]mois-jour] [heures:minutes[:secondes]]"
 
-#: grub-core/commands/date.c:142
+#: commands/date.c:140
 msgid "Command to display/set current datetime."
 msgstr "Commande pour afficher/modifier date et heure."
 
-#: grub-core/commands/echo.c:30
+#: commands/echo.c:27
 msgid "Do not output the trailing newline."
 msgstr "Ne pas émettre le saut de ligne final."
 
-#: grub-core/commands/echo.c:31
+#: commands/echo.c:28
 msgid "Enable interpretation of backslash escapes."
 msgstr "Active l'interprétation des séquences d'échappement par anti-slash."
 
-#: grub-core/commands/echo.c:134
+#: commands/echo.c:117
 msgid "[-e|-n] STRING"
 msgstr "[-e|-n] CHAINE"
 
-#: grub-core/commands/echo.c:134
+#: commands/echo.c:117
 msgid "Display a line of text."
 msgstr "Affiche une ligne de texte."
 
-#: grub-core/commands/efi/fixvideo.c:105
+#: commands/efi/fixvideo.c:103
 msgid "Fix video problem."
 msgstr "Corrige un problème vidéo."
 
-#: grub-core/commands/efi/loadbios.c:209
+#: commands/efi/loadbios.c:207
 msgid "Fake BIOS."
 msgstr "Faux BIOS."
 
-#: grub-core/commands/efi/loadbios.c:213
+#: commands/efi/loadbios.c:211
 msgid "Load BIOS dump."
 msgstr "Charge le contenu du BIOS."
 
-#: grub-core/commands/gptsync.c:246
+#: commands/gptsync.c:244
 msgid "DEVICE [PARTITION[+/-[TYPE]]] ..."
 msgstr "PERIPHERIQUE [PARTITION[+/-[TYPE]]] ..."
 
@@ -181,7 +175,7 @@
 "autorisées. TYPE est un type de MBR. + signifie que la partition est active. "
 "Une seule partition peut être active."
 
-#: grub-core/commands/halt.c:41
+#: commands/halt.c:39
 msgid ""
 "Halts the computer.  This command does not work on all firmware "
 "implementations."
@@ -229,7 +223,7 @@
 msgid "[-c FILE [-p PREFIX]] [FILE1 [FILE2 ...]]"
 msgstr "[-c FICHIER [-p PREFIXE]] [FICHIER1 [FICHIER2 ...]]"
 
-#: grub-core/commands/hdparm.c:32
+#: commands/hdparm.c:30
 msgid ""
 "Set Advanced Power Management\n"
 "(1=low, ..., 254=high, 255=off)."
@@ -237,19 +231,19 @@
 "Configure la gestion avancée d'énergie\n"
 "(1=basse, ..., 254=haute, 255=off)."
 
-#: grub-core/commands/hdparm.c:35
+#: commands/hdparm.c:33
 msgid "Check power mode."
 msgstr "Contrôle le mode d'alimentation."
 
-#: grub-core/commands/hdparm.c:36
+#: commands/hdparm.c:34
 msgid "Freeze ATA security settings until reset."
 msgstr "Fige les paramètres de sécurité ATA jusqu'au redémarrage."
 
-#: grub-core/commands/hdparm.c:38
+#: commands/hdparm.c:36
 msgid "Check SMART health status."
 msgstr "Contrôle la température avec SMART."
 
-#: grub-core/commands/hdparm.c:39
+#: commands/hdparm.c:37
 msgid ""
 "Set Automatic Acoustic Management\n"
 "(0=off, 128=quiet, ..., 254=fast)."
@@ -257,7 +251,7 @@
 "Réglage de la gestion acoustique automatique (AAM)\n"
 "(0=off, 128=silencieux, ..., 254=rapide)."
 
-#: grub-core/commands/hdparm.c:42
+#: commands/hdparm.c:40
 msgid ""
 "Set standby timeout\n"
 "(0=off, 1=5s, 2=10s, ..., 240=20m, 241=30m, ...)."
@@ -265,99 +259,99 @@
 "Règle le temps de 'stand by'\n"
 "(0=off, 1=5s, 2=10s, ..., 240=20m, 241=30m, ...)."
 
-#: grub-core/commands/hdparm.c:45
+#: commands/hdparm.c:43
 msgid "Set drive to standby mode."
 msgstr "Met le lecteur en mode veille."
 
-#: grub-core/commands/hdparm.c:46
+#: commands/hdparm.c:44
 msgid "Set drive to sleep mode."
 msgstr "Met le lecteur en mode sommeil."
 
-#: grub-core/commands/hdparm.c:47
+#: commands/hdparm.c:45
 msgid "Print drive identity and settings."
 msgstr "Affiche les paramètres et l'identité du disque."
 
-#: grub-core/commands/hdparm.c:49
+#: commands/hdparm.c:47
 msgid "Dump contents of ATA IDENTIFY sector."
 msgstr "Affiche le contenu du secteur ATA IDENTIFY."
 
-#: grub-core/commands/hdparm.c:51
+#: commands/hdparm.c:49
 msgid "Disable/enable SMART (0/1)."
 msgstr "Désactive/active SMART (0/1)."
 
-#: grub-core/commands/hdparm.c:52
+#: commands/hdparm.c:50
 msgid "Do not print messages."
 msgstr "Ne pas afficher les messages."
 
-#: grub-core/commands/hdparm.c:415
+#: commands/hdparm.c:414
 msgid "[OPTIONS] DISK"
 msgstr "[OPTIONS] DISQUE"
 
-#: grub-core/commands/hdparm.c:416
+#: commands/hdparm.c:415
 msgid "Get/set ATA disk parameters."
 msgstr "Obtient/positionne les paramètres ATA du disque."
 
-#: grub-core/commands/help.c:120 grub-core/lib/arg.c:110
+#: commands/help.c:103 lib/arg.c:110
 msgid "Usage:"
 msgstr "Usage :"
 
-#: grub-core/commands/help.c:136
+#: commands/help.c:136
 msgid "[PATTERN ...]"
 msgstr "[MOTIF ...]"
 
-#: grub-core/commands/help.c:137
+#: commands/help.c:137
 msgid "Show a help message."
 msgstr "Affiche un message d'aide."
 
-#: grub-core/commands/hexdump.c:31
+#: commands/hexdump.c:30
 msgid "Skip offset bytes from the beginning of file."
 msgstr "Saute un nombre d'octets au début du fichier."
 
-#: grub-core/commands/hexdump.c:33
+#: commands/hexdump.c:32
 msgid "Read only LENGTH bytes."
 msgstr "Lit seulement LENGTH octets."
 
-#: grub-core/commands/hexdump.c:125
+#: commands/hexdump.c:125
 msgid "[OPTIONS] FILE_OR_DEVICE"
 msgstr "[OPTIONS] FICHIER_OU_PERIPH"
 
-#: grub-core/commands/hexdump.c:126
+#: commands/hexdump.c:126
 msgid "Dump the contents of a file or memory."
 msgstr "Affiche le contenu d'un fichier ou de la mémoire."
 
-#: grub-core/commands/i386/cpuid.c:39
+#: commands/i386/cpuid.c:37
 msgid "Check for long mode flag (default)."
 msgstr "Contrôle le mode de drapeaux longs (défaut, long mode flag)."
 
-#: grub-core/commands/i386/cpuid.c:94
+#: commands/i386/cpuid.c:92
 msgid "Check for CPU features."
 msgstr "Teste les capacités CPU."
 
-#: grub-core/commands/i386/pc/drivemap.c:39
+#: commands/i386/pc/drivemap.c:37
 msgid "Show the current mappings."
 msgstr "Affiche les correspondances actuelles."
 
-#: grub-core/commands/i386/pc/drivemap.c:40
+#: commands/i386/pc/drivemap.c:38
 msgid "Reset all mappings to the default values."
 msgstr "Réinitialise toutes les correspondances aux valeurs par défaut."
 
-#: grub-core/commands/i386/pc/drivemap.c:41
+#: commands/i386/pc/drivemap.c:39
 msgid "Perform both direct and reverse mappings."
 msgstr "Active les correspondances dans les deux sens (direct/reverse)."
 
-#: grub-core/commands/i386/pc/drivemap.c:407
+#: commands/i386/pc/drivemap.c:407
 msgid "-l | -r | [-s] grubdev osdisk."
 msgstr "-l | -r | [-s] grubdev osdisk."
 
-#: grub-core/commands/i386/pc/drivemap.c:408
+#: commands/i386/pc/drivemap.c:408
 msgid "Manage the BIOS drive mappings."
 msgstr "Gère les correspondances de disques BIOS."
 
-#: grub-core/commands/i386/pc/halt.c:31
+#: commands/i386/pc/halt.c:27
 msgid "Do not use APM to halt the computer."
 msgstr "Ne pas utiliser APM pour arrêter l'ordinateur."
 
-#: grub-core/commands/i386/pc/halt.c:120
+#: commands/i386/pc/halt.c:51
 msgid "Halt the system, if possible using APM."
 msgstr "Arrête le système, si possible avec APM."
 
@@ -365,23 +359,23 @@
 msgid "Show APM information."
 msgstr "Montrer les informations APM."
 
-#: grub-core/commands/i386/pc/play.c:268
+#: commands/i386/pc/play.c:262
 msgid "FILE | TEMPO [PITCH1 DURATION1] [PITCH2 DURATION2] ... "
 msgstr "FICHIER | TEMPO [DEGRE1 DUREE1] [DEGRE2 DUREE2] ... "
 
-#: grub-core/commands/i386/pc/play.c:269
+#: commands/i386/pc/play.c:263
 msgid "Play a tune."
 msgstr "Emet un son."
 
-#: grub-core/commands/i386/pc/pxecmd.c:48
+#: commands/i386/pc/pxecmd.c:46
 msgid "Unload PXE environment."
 msgstr "Décharge l'environnement PXE."
 
-#: grub-core/commands/ieee1275/suspend.c:45
+#: commands/ieee1275/suspend.c:43
 msgid "Return to Open Firmware prompt."
 msgstr "Retourner au prompt Open Firmware."
 
-#: grub-core/commands/iorw.c:34 grub-core/commands/memrw.c:33
+#: commands/memrw.c:31
 msgid "Save read value into variable VARNAME."
 msgstr "Sauve la valeur lue dans la variable NOMVAR."
 
@@ -418,8 +412,7 @@
 msgid "Write word VALUE to PORT."
 msgstr "Ecrit le mot VALEUR sur PORT."
 
-#: grub-core/commands/iorw.c:140 grub-core/commands/memrw.c:134
-#: grub-core/commands/memrw.c:137 grub-core/commands/memrw.c:140
+#: commands/memrw.c:132 commands/memrw.c:135 commands/memrw.c:138
 msgid "ADDR VALUE [MASK]"
 msgstr "ADRESSE VALEUR [MASQUE]"
 
@@ -431,23 +424,23 @@
 msgid "Load a keyboard layout."
 msgstr "Charge une disposition de clavier."
 
-#: grub-core/commands/keystatus.c:30
+#: commands/keystatus.c:28
 msgid "Check Shift key."
 msgstr "Contrôlez l'état des touches Shift."
 
-#: grub-core/commands/keystatus.c:31
+#: commands/keystatus.c:29
 msgid "Check Control key."
 msgstr "Contrôlez l'état des touches Ctrl."
 
-#: grub-core/commands/keystatus.c:32
+#: commands/keystatus.c:30
 msgid "Check Alt key."
 msgstr "Contrôlez l'état des touches Alt."
 
-#: grub-core/commands/keystatus.c:102
+#: commands/keystatus.c:85
 msgid "[--shift] [--ctrl] [--alt]"
 msgstr "[--shift] [--ctrl] [--alt]"
 
-#: grub-core/commands/keystatus.c:103
+#: commands/keystatus.c:86
 msgid "Check key modifier status."
 msgstr "Contrôlez l'état des touches spéciales (alt,...)."
 
@@ -499,42 +492,42 @@
 msgid "Simulate grub-legacy password command in menuentry mode"
 msgstr "Simule la commande password de grub-legacy en mode menuentry"
 
-#: grub-core/commands/loadenv.c:35
+#: commands/loadenv.c:33
 msgid "Specify filename."
 msgstr "Spécifie un nom de fichier."
 
-#: grub-core/commands/loadenv.c:380 grub-core/commands/loadenv.c:384
+#: commands/loadenv.c:383 commands/loadenv.c:389
 msgid "[-f FILE]"
 msgstr "[-f FICHIER]"
 
-#: grub-core/commands/loadenv.c:381
+#: commands/loadenv.c:384
 msgid "Load variables from environment block file."
 msgstr ""
 "Charge les variables depuis un fichier contenant un bloc d'environnement."
 
-#: grub-core/commands/loadenv.c:385
+#: commands/loadenv.c:390
 msgid "List variables from environment block file."
 msgstr ""
 "Liste les variables depuis un fichier contenant un bloc d'environnement."
 
-#: grub-core/commands/loadenv.c:389
+#: commands/loadenv.c:395
 msgid "[-f FILE] variable_name [...]"
 msgstr "[-f FICHIER] nom_de_variable [...]"
 
-#: grub-core/commands/loadenv.c:390
+#: commands/loadenv.c:396
 msgid "Save variables to environment block file."
 msgstr ""
 "Sauve les variables dans un fichier contenant un bloc d'environnement."
 
-#: grub-core/commands/ls.c:39
+#: commands/ls.c:37
 msgid "Show a long list with more detailed information."
 msgstr "Affiche une longue liste d'informations plus détaillées."
 
-#: grub-core/commands/ls.c:40
+#: commands/ls.c:38
 msgid "Print sizes in a human readable format."
 msgstr "Affiche les tailles au format lisible par un humain."
 
-#: grub-core/commands/ls.c:41
+#: commands/ls.c:39
 msgid "List all files."
 msgstr "Liste tous les fichiers."
 
@@ -542,7 +535,7 @@
 msgid "[-l|-h|-a] [FILE ...]"
 msgstr "[-l|-h|-a] [FICHIER ...]"
 
-#: grub-core/commands/ls.c:276
+#: commands/ls.c:270
 msgid "List devices and files."
 msgstr "Liste périphériques et fichiers."
 
@@ -562,40 +555,40 @@
 msgid "Show ACPI information."
 msgstr "Affiche les informations ACPI."
 
-#: grub-core/commands/lsmmap.c:68
+#: commands/lsmmap.c:47
 msgid "List memory map provided by firmware."
 msgstr "Liste le plan mémoire transmis par le firmware."
 
-#: grub-core/commands/lspci.c:230
+#: commands/lspci.c:228
 msgid "List PCI devices."
 msgstr "Liste les périphériques PCI."
 
-#: grub-core/commands/memrw.c:125 grub-core/commands/memrw.c:128
-#: grub-core/commands/memrw.c:131 grub-core/commands/minicmd.c:210
+#: commands/memrw.c:123 commands/memrw.c:126 commands/memrw.c:129
+#: commands/minicmd.c:366
 msgid "ADDR"
 msgstr "ADRESSE"
 
-#: grub-core/commands/memrw.c:125
+#: commands/memrw.c:123
 msgid "Read byte from ADDR."
 msgstr "Lit l'octet à ADRESSE."
 
-#: grub-core/commands/memrw.c:128
+#: commands/memrw.c:126
 msgid "Read word from ADDR."
 msgstr "Lit le mot à ADRESSE."
 
-#: grub-core/commands/memrw.c:131
+#: commands/memrw.c:129
 msgid "Read dword from ADDR."
 msgstr "Lit le double mot à ADRESSE."
 
-#: grub-core/commands/memrw.c:134
+#: commands/memrw.c:132
 msgid "Write byte VALUE to ADDR."
 msgstr "Ecrit l'octet VALEUR à ADRESSE."
 
-#: grub-core/commands/memrw.c:137
+#: commands/memrw.c:135
 msgid "Write word VALUE to ADDR."
 msgstr "Ecrit le mot VALEUR à ADRESSE."
 
-#: grub-core/commands/memrw.c:140
+#: commands/memrw.c:138
 msgid "Write dword VALUE to ADDR."
 msgstr "Ecrit le double mot VALEUR à ADRESSE."
 
@@ -628,39 +621,39 @@
 msgid "Define a submenu."
 msgstr "Définir un sous-menu."
 
-#: grub-core/commands/minicmd.c:207
+#: commands/minicmd.c:360
 msgid "Show this message."
 msgstr "Affiche ce message."
 
-#: grub-core/commands/minicmd.c:210
+#: commands/minicmd.c:366
 msgid "Dump memory."
 msgstr "Liste la mémoire."
 
-#: grub-core/commands/minicmd.c:213 grub-core/kern/corecmd.c:193
+#: commands/minicmd.c:369
 msgid "MODULE"
 msgstr "MODULE"
 
-#: grub-core/commands/minicmd.c:213
+#: commands/minicmd.c:369
 msgid "Remove a module."
 msgstr "Retire un module."
 
-#: grub-core/commands/minicmd.c:216
+#: commands/minicmd.c:372
 msgid "Show loaded modules."
 msgstr "Liste les modules chargés."
 
-#: grub-core/commands/minicmd.c:219
+#: commands/minicmd.c:375
 msgid "Exit from GRUB."
 msgstr "Quitte GRUB."
 
-#: grub-core/commands/parttool.c:326
+#: commands/parttool.c:325
 msgid "PARTITION COMMANDS"
 msgstr "PARTITION COMMANDES"
 
-#: grub-core/commands/password.c:85
+#: commands/password.c:78
 msgid "USER PASSWORD"
 msgstr "MOT DE PASSE utilisateur"
 
-#: grub-core/commands/password.c:86
+#: commands/password.c:79
 msgid "Set user password (plaintext). Unrecommended and insecure."
 msgstr ""
 "Fixe le mot de passe utilisateur (texte en clair). Non recommandé et non sûr."
@@ -673,48 +666,47 @@
 msgid "Set user password (PBKDF2). "
 msgstr "Spécifier un mot de passe utilisateur (PBKDF2). "
 
-#: grub-core/commands/probe.c:40
+#: commands/probe.c:38
 msgid "Set a variable to return value."
 msgstr "Fixe une variable à la valeur retournée."
 
-#: grub-core/commands/probe.c:41
+#: commands/probe.c:39
 msgid "Determine driver."
 msgstr "Choisir le pilote à utiliser."
 
-#: grub-core/commands/probe.c:42
+#: commands/probe.c:40
 msgid "Determine partition map type."
 msgstr "Déterminer le type de plan de partition."
 
-#: grub-core/commands/probe.c:43
+#: commands/probe.c:41
 msgid "Determine filesystem type."
 msgstr "Déterminer le type de système de fichiers."
 
-#: grub-core/commands/probe.c:44
+#: commands/probe.c:42
 msgid "Determine filesystem UUID."
 msgstr "Déterminer l'identifiant UUID du système de fichiers."
 
-#: grub-core/commands/probe.c:45
+#: commands/probe.c:43
 msgid "Determine filesystem label."
 msgstr "Déterminer l'étiquette du système de fichiers."
 
-#: grub-core/commands/probe.c:155 grub-core/loader/i386/bsd.c:159
-#: util/grub-setup.c:840
+#: loader/i386/bsd.c:124
 msgid "DEVICE"
 msgstr "PERIPHERIQUE"
 
-#: grub-core/commands/probe.c:156
+#: commands/probe.c:155
 msgid "Retrieve device info."
 msgstr "Récupère les infos du périphérique."
 
-#: grub-core/commands/read.c:85
+#: commands/read.c:83
 msgid "[ENVVAR]"
 msgstr "[VAR_ENV]"
 
-#: grub-core/commands/read.c:86
+#: commands/read.c:84
 msgid "Set variable with user input."
 msgstr "Remplit la variable avec la saisie de l'utilisateur."
 
-#: grub-core/commands/reboot.c:41
+#: commands/reboot.c:39
 msgid "Reboot the computer."
 msgstr "Redémarre l'ordinateur."
 
@@ -738,7 +730,7 @@
 msgid "NAME [VARIABLE] [HINTS]"
 msgstr ""
 
-#: grub-core/commands/search_file.c:5
+#: commands/search_file.c:5
 msgid ""
 "Search devices by file. If VARIABLE is specified, the first device found is "
 "set to a variable."
@@ -746,7 +738,7 @@
 "Cherche des périphériques par fichiers. Si VARIABLE est spécifiée, elle est "
 "remplie avec le premier périphérique trouvé."
 
-#: grub-core/commands/search_label.c:5
+#: commands/search_label.c:5
 msgid ""
 "Search devices by label. If VARIABLE is specified, the first device found is "
 "set to a variable."
@@ -754,7 +746,7 @@
 "Cherche des périphériques par étiquette. Si VARIABLE est spécifiée, elle est "
 "remplie avec le premier périphérique trouvé."
 
-#: grub-core/commands/search_uuid.c:5
+#: commands/search_uuid.c:5
 msgid ""
 "Search devices by UUID. If VARIABLE is specified, the first device found is "
 "set to a variable."
@@ -815,19 +807,19 @@
 msgid "Manipulate PCI devices."
 msgstr "Manipuler les périphériques PCI."
 
-#: grub-core/commands/sleep.c:32
+#: commands/sleep.c:31
 msgid "Verbose countdown."
 msgstr "Décompte détaillé."
 
-#: grub-core/commands/sleep.c:33
+#: commands/sleep.c:32
 msgid "Interruptible with ESC."
 msgstr "Interrompre avec ESC."
 
-#: grub-core/commands/sleep.c:106
+#: commands/sleep.c:106
 msgid "NUMBER_OF_SECONDS"
 msgstr "NOMBRE_DE_SECONDES"
 
-#: grub-core/commands/sleep.c:107
+#: commands/sleep.c:107
 msgid "Wait for a specified number of seconds."
 msgstr "Attends le nombre de secondes spécifié."
 
@@ -863,15 +855,15 @@
 msgid "List or select an output terminal."
 msgstr "Liste ou sélectionne un terminal de sortie."
 
-#: grub-core/commands/test.c:427
+#: commands/test.c:424
 msgid "EXPRESSION ]"
 msgstr "EXPRESSION ]"
 
-#: grub-core/commands/test.c:427 grub-core/commands/test.c:430
+#: commands/test.c:424 commands/test.c:426
 msgid "Evaluate an expression."
 msgstr "Evalue une expression."
 
-#: grub-core/commands/test.c:430
+#: commands/test.c:426
 msgid "EXPRESSION"
 msgstr "EXPRESSION"
 
@@ -879,15 +871,15 @@
 msgid "Load the same file in multiple ways."
 msgstr "Charge le même fichier de différentes façons."
 
-#: grub-core/commands/true.c:49
+#: commands/true.c:47
 msgid "Do nothing, successfully."
 msgstr "Ne fait rien, avec succès."
 
-#: grub-core/commands/true.c:52
+#: commands/true.c:50
 msgid "Do nothing, unsuccessfully."
 msgstr "Ne fait rien, avec échec."
 
-#: grub-core/commands/usbtest.c:212
+#: commands/usbtest.c:199
 msgid "Test USB support."
 msgstr "Teste le support de l'USB."
 
@@ -903,19 +895,19 @@
 msgid "Test video subsystem in mode WxH."
 msgstr "Teste le sous-système vidéo en mode LARGxHAUT."
 
-#: grub-core/commands/videotest.c:208
+#: commands/videotest.c:180
 msgid "Test video subsystem."
 msgstr "Teste le sous-système vidéo."
 
-#: grub-core/commands/xnu_uuid.c:94
+#: commands/xnu_uuid.c:92
 msgid "GRUBUUID [VARNAME]"
 msgstr "GRUBUUID [NOMVAR]"
 
-#: grub-core/commands/xnu_uuid.c:95
+#: commands/xnu_uuid.c:93
 msgid "Transform 64-bit UUID to format suitable for XNU."
 msgstr "Transforme un UUID 64 bits au format convenable pour XNU."
 
-#: grub-core/disk/loopback.c:41
+#: disk/loopback.c:40
 msgid "Delete the loopback device entry."
 msgstr "Efface l'entrée de périphérique \"boucle\" (loopback)."
 
@@ -923,7 +915,7 @@
 msgid "[-d] DEVICENAME FILE."
 msgstr ""
 
-#: grub-core/disk/loopback.c:224
+#: disk/loopback.c:250
 msgid "Make a device of a file."
 msgstr "Transforme un fichier en périphérique."
 
@@ -959,7 +951,7 @@
 msgid "Translates the string with the current settings."
 msgstr "Traduit la chaîne suivant les réglages courants."
 
-#: grub-core/gfxmenu/gui_progress_bar.c:281 grub-core/normal/menu_text.c:365
+#: normal/menu_text.c:363
 #, c-format
 msgid "The highlighted entry will be executed automatically in %ds."
 msgstr "L'entrée sélectionnée sera exécutée automatiquement dans %d s."
@@ -980,7 +972,7 @@
 msgid "%ds"
 msgstr "%ds"
 
-#: grub-core/hello/hello.c:45
+#: hello/hello.c:43
 msgid "Say \"Hello World\"."
 msgstr "Dit \"Bonjour\"."
 
@@ -1012,7 +1004,7 @@
 msgid "Insert a module."
 msgstr "Installe un module."
 
-#: grub-core/kern/emu/hostdisk.c:1015 util/grub-setup.c:662
+#: util/i386/pc/grub-setup.c:562
 #, c-format
 msgid "cannot open `%s'"
 msgstr "impossible d'ouvrir `%s'"
@@ -1041,85 +1033,79 @@
 msgid "error: %s.\n"
 msgstr "erreur : %s.\n"
 
-#: grub-core/lib/arg.c:34
+#: lib/arg.c:34
 msgid "Display this help and exit."
 msgstr "Affiche cette aide et quitte."
 
-#: grub-core/lib/arg.c:36
+#: lib/arg.c:36
 msgid "Display the usage of this command and exit."
 msgstr "Affiche l'aide de cette commande et quitte."
 
-#: grub-core/loader/efi/appleloader.c:223
+#: loader/efi/appleloader.c:325
 msgid "Boot legacy system."
 msgstr "Démarre le système précédent."
 
-#: grub-core/loader/efi/chainloader.c:348
-#: grub-core/loader/i386/pc/chainloader.c:170
+#: loader/efi/chainloader.c:340 loader/i386/pc/chainloader.c:153
 msgid "Load another boot loader."
 msgstr "Charge un autre gestionnaire de démarrage."
 
-#: grub-core/loader/i386/bsd.c:97
+#: loader/i386/bsd.c:65
 msgid "Display output on all consoles."
 msgstr "Affiche les messages sur toutes les consoles."
 
-#: grub-core/loader/i386/bsd.c:98 grub-core/loader/i386/bsd.c:132
-#: grub-core/loader/i386/bsd.c:161
+#: loader/i386/bsd.c:66
 msgid "Use serial console."
 msgstr "Utiliser la console série."
 
-#: grub-core/loader/i386/bsd.c:99 grub-core/loader/i386/bsd.c:125
-#: grub-core/loader/i386/bsd.c:149
+#: loader/i386/bsd.c:67 loader/i386/bsd.c:93 loader/i386/bsd.c:114
 msgid "Ask for file name to reboot from."
 msgstr "Spécifie le nom de fichier sur lequel redémarrer."
 
-#: grub-core/loader/i386/bsd.c:100
+#: loader/i386/bsd.c:68
 msgid "Use CDROM as root."
 msgstr "Utiliser le lecteur de CD comme racine."
 
-#: grub-core/loader/i386/bsd.c:101
+#: loader/i386/bsd.c:69
 msgid "Invoke user configuration routing."
 msgstr "Demande le changement de la configuration utilisateur."
 
-#: grub-core/loader/i386/bsd.c:102 grub-core/loader/i386/bsd.c:129
-#: grub-core/loader/i386/bsd.c:152
+#: loader/i386/bsd.c:70 loader/i386/bsd.c:97 loader/i386/bsd.c:117
 msgid "Enter in KDB on boot."
 msgstr "Entrer dans KDB au démarrage."
 
-#: grub-core/loader/i386/bsd.c:103
+#: loader/i386/bsd.c:71
 msgid "Use GDB remote debugger instead of DDB."
 msgstr "Utiliser le débogueur distant GDB à la place de DDB."
 
-#: grub-core/loader/i386/bsd.c:104
+#: loader/i386/bsd.c:72
 msgid "Disable all boot output."
 msgstr "Désactive toutes les sorties au démarrage."
 
-#: grub-core/loader/i386/bsd.c:106
+#: loader/i386/bsd.c:74
 msgid "Wait for keypress after every line of output."
 msgstr "Attendre qu'une touche soit pressée après chaque ligne affichée."
 
-#: grub-core/loader/i386/bsd.c:108
+#: loader/i386/bsd.c:76
 msgid "Use compiled-in rootdev."
 msgstr "Utiliser le rootdev intégré."
 
-#: grub-core/loader/i386/bsd.c:109 grub-core/loader/i386/bsd.c:128
-#: grub-core/loader/i386/bsd.c:155
+#: loader/i386/bsd.c:77 loader/i386/bsd.c:96 loader/i386/bsd.c:120
 msgid "Boot into single mode."
 msgstr "Démarre en mode simple (single)."
 
-#: grub-core/loader/i386/bsd.c:110 grub-core/loader/i386/bsd.c:156
+#: loader/i386/bsd.c:78 loader/i386/bsd.c:121
 msgid "Boot with verbose messages."
 msgstr "Démarre en affichant plus de messages."
 
-#: grub-core/loader/i386/bsd.c:126 grub-core/loader/i386/bsd.c:150
+#: loader/i386/bsd.c:94 loader/i386/bsd.c:115
 msgid "Don't reboot, just halt."
 msgstr "Ne pas redémarrer, seulement arrêter."
 
-#: grub-core/loader/i386/bsd.c:127 grub-core/loader/i386/bsd.c:151
+#: loader/i386/bsd.c:95 loader/i386/bsd.c:116
 msgid "Change configured devices."
 msgstr "Modifie les périphériques configurés."
 
-#: grub-core/loader/i386/bsd.c:130 grub-core/loader/i386/bsd.c:159
-#: util/grub-fstest.c:364
+#: loader/i386/bsd.c:98 loader/i386/bsd.c:124
 msgid "Set root device."
 msgstr "Fixe le périphérique racine."
 
@@ -1127,23 +1113,23 @@
 msgid "comUNIT[,SPEED]"
 msgstr ""
 
-#: grub-core/loader/i386/bsd.c:147
+#: loader/i386/bsd.c:112
 msgid "Disable SMP."
 msgstr "Désactive SMP."
 
-#: grub-core/loader/i386/bsd.c:148
+#: loader/i386/bsd.c:113
 msgid "Disable ACPI."
 msgstr "Désactive ACPI."
 
-#: grub-core/loader/i386/bsd.c:154
+#: loader/i386/bsd.c:119
 msgid "Don't display boot diagnostic messages."
 msgstr "Ne pas afficher les messages de diagnostic au démarrage."
 
-#: grub-core/loader/i386/bsd.c:157
+#: loader/i386/bsd.c:122
 msgid "Boot with debug messages."
 msgstr "Démarre avec les messages de débogage."
 
-#: grub-core/loader/i386/bsd.c:158
+#: loader/i386/bsd.c:123
 msgid "Supress normal output (warnings remain)."
 msgstr "Supprimer les sorties standards (les avertissements sont conservés)."
 
@@ -1151,23 +1137,23 @@
 msgid "[ADDR|comUNIT][,SPEED]"
 msgstr "[ADRESSE|comUNITE][,VITESSE]"
 
-#: grub-core/loader/i386/bsd.c:1947
+#: loader/i386/bsd.c:1297
 msgid "Load kernel of FreeBSD."
 msgstr "Charge le noyau FreeBSD."
 
-#: grub-core/loader/i386/bsd.c:1950
+#: loader/i386/bsd.c:1301
 msgid "Load kernel of OpenBSD."
 msgstr "Charge le noyau OpenBSD."
 
-#: grub-core/loader/i386/bsd.c:1953
+#: loader/i386/bsd.c:1305
 msgid "Load kernel of NetBSD."
 msgstr "Charge le noyau NetBSD."
 
-#: grub-core/loader/i386/bsd.c:1957
+#: loader/i386/bsd.c:1309
 msgid "Load FreeBSD env."
 msgstr "Charge l'environnement FreeBSD."
 
-#: grub-core/loader/i386/bsd.c:1960
+#: loader/i386/bsd.c:1312
 msgid "Load FreeBSD kernel module."
 msgstr "Charge le module noyau FreeBSD."
 
@@ -1179,21 +1165,19 @@
 msgid "Load NetBSD kernel module (ELF)."
 msgstr "Charge le module noyau NetBSD (ELF)."
 
-#: grub-core/loader/i386/bsd.c:1969
+#: loader/i386/bsd.c:1315
 msgid "Load FreeBSD kernel module (ELF)."
 msgstr "Charge le module noyau FreeBSD (ELF)."
 
-#: grub-core/loader/i386/linux.c:1006 grub-core/loader/i386/pc/linux.c:439
-#: grub-core/loader/mips/linux.c:433
-#: grub-core/loader/powerpc/ieee1275/linux.c:375
-#: grub-core/loader/sparc64/ieee1275/linux.c:515
+#: loader/i386/efi/linux.c:1011 loader/i386/ieee1275/linux.c:301
+#: loader/i386/linux.c:1012 loader/i386/pc/linux.c:399
+#: loader/powerpc/ieee1275/linux.c:353 loader/sparc64/ieee1275/linux.c:514
 msgid "Load Linux."
 msgstr "Charge Linux."
 
-#: grub-core/loader/i386/linux.c:1008 grub-core/loader/i386/pc/linux.c:442
-#: grub-core/loader/mips/linux.c:435
-#: grub-core/loader/powerpc/ieee1275/linux.c:377
-#: grub-core/loader/sparc64/ieee1275/linux.c:517
+#: loader/i386/efi/linux.c:1013 loader/i386/ieee1275/linux.c:303
+#: loader/i386/linux.c:1014 loader/i386/pc/linux.c:402
+#: loader/powerpc/ieee1275/linux.c:355 loader/sparc64/ieee1275/linux.c:516
 msgid "Load initrd."
 msgstr "Charge initrd."
 
@@ -1201,11 +1185,11 @@
 msgid "Load NTLDR or BootMGR."
 msgstr "Charge NTLDR ou BootMGR."
 
-#: grub-core/loader/i386/xnu.c:1130
+#: loader/i386/xnu.c:1032
 msgid "Load device-properties dump."
 msgstr "Charge le contenu des propriétés du périphérique."
 
-#: grub-core/loader/multiboot.c:339
+#: loader/multiboot_loader.c:133
 msgid "Load a multiboot 2 kernel."
 msgstr "Charge un noyau de type 'multiboot 2'."
 
@@ -1213,43 +1197,43 @@
 msgid "Load a multiboot 2 module."
 msgstr "Charge un module multiboot2."
 
-#: grub-core/loader/multiboot.c:345
+#: loader/multiboot_loader.c:136
 msgid "Load a multiboot kernel."
 msgstr "Charge un noyau de type 'multiboot'."
 
-#: grub-core/loader/multiboot.c:348
+#: loader/multiboot_loader.c:141
 msgid "Load a multiboot module."
 msgstr "Charge un module 'multiboot'."
 
-#: grub-core/loader/xnu.c:1456
+#: loader/xnu.c:1428
 msgid "Load XNU image."
 msgstr "Charge l'image XNU."
 
-#: grub-core/loader/xnu.c:1458
+#: loader/xnu.c:1430
 msgid "Load 64-bit XNU image."
 msgstr "Charge l'image 64 bits XNU."
 
-#: grub-core/loader/xnu.c:1460
+#: loader/xnu.c:1432
 msgid "Load XNU extension package."
 msgstr "Charge le paquet d'extension XNU."
 
-#: grub-core/loader/xnu.c:1462
+#: loader/xnu.c:1434
 msgid "Load XNU extension."
 msgstr "Charge l'extension XNU."
 
-#: grub-core/loader/xnu.c:1464
+#: loader/xnu.c:1436
 msgid "DIRECTORY [OSBundleRequired]"
 msgstr "REPERTOIRE [OSBundleRequired]"
 
-#: grub-core/loader/xnu.c:1465
+#: loader/xnu.c:1437
 msgid "Load XNU extension directory."
 msgstr "Charge un répertoire d'extensions XNU."
 
-#: grub-core/loader/xnu.c:1471
+#: loader/xnu.c:1444
 msgid "Load a splash image for XNU."
 msgstr "Charge l'image de démarrage pour XNU."
 
-#: grub-core/loader/xnu.c:1476
+#: loader/xnu.c:1449
 msgid "Load XNU hibernate image."
 msgstr "Charge l'image d'hibernation XNU."
 
@@ -1269,11 +1253,11 @@
 msgid "Remove any memory regions in specified range."
 msgstr "Retire toutes les régions mémoires dans l'intervalle spécifié."
 
-#: grub-core/normal/auth.c:216
+#: normal/auth.c:233
 msgid "Enter username: "
 msgstr "Entrez le nom d'utilisateur : "
 
-#: grub-core/normal/auth.c:221
+#: normal/auth.c:238
 msgid "Enter password: "
 msgstr "Entrez le mot de passe : "
 
@@ -1285,41 +1269,41 @@
 msgid "Authenticate users"
 msgstr "Utilisateurs authentifiés"
 
-#: grub-core/normal/cmdline.c:174 grub-core/normal/menu_entry.c:1074
+#: normal/menu_entry.c:1060
 msgid "Possible commands are:"
 msgstr "Les commandes possibles sont :"
 
-#: grub-core/normal/cmdline.c:177 grub-core/normal/menu_entry.c:1078
+#: normal/menu_entry.c:1064
 msgid "Possible devices are:"
 msgstr "Les périphériques possibles sont :"
 
-#: grub-core/normal/cmdline.c:180 grub-core/normal/menu_entry.c:1082
+#: normal/menu_entry.c:1068
 msgid "Possible files are:"
 msgstr "Les fichiers utilisables sont :"
 
-#: grub-core/normal/cmdline.c:183 grub-core/normal/menu_entry.c:1086
+#: normal/menu_entry.c:1072
 msgid "Possible partitions are:"
 msgstr "Partitions utilisables :"
 
-#: grub-core/normal/cmdline.c:186 grub-core/normal/menu_entry.c:1090
+#: normal/menu_entry.c:1076
 msgid "Possible arguments are:"
 msgstr "Les arguments utilisables sont :"
 
-#: grub-core/normal/cmdline.c:189 grub-core/normal/menu_entry.c:1094
+#: normal/menu_entry.c:1080
 msgid "Possible things are:"
 msgstr "Les actions possibles sont :"
 
-#: grub-core/normal/color.c:81
+#: normal/color.c:80
 #, c-format
 msgid "Warning: syntax error (missing slash) in `%s'\n"
 msgstr "Attention : erreur de syntaxe (slash manquant) dans `%s'\n"
 
-#: grub-core/normal/color.c:90
+#: normal/color.c:89
 #, c-format
 msgid "Warning: invalid foreground color `%s'\n"
 msgstr "Attention : couleur de premier plan `%s' non valide\n"
 
-#: grub-core/normal/color.c:96
+#: normal/color.c:95
 #, c-format
 msgid "Warning: invalid background color `%s'\n"
 msgstr "Attention : couleur d'arrière-plan `%s' non valide\n"
@@ -1332,16 +1316,16 @@
 msgid "Export variables."
 msgstr "Exporte les variables."
 
-#: grub-core/normal/dyncmd.c:159
+#: normal/dyncmd.c:147
 msgid "not loaded"
 msgstr "non chargé(e)"
 
-#: grub-core/normal/main.c:214
+#: normal/main.c:408
 #, c-format
 msgid "GNU GRUB  version %s"
 msgstr "GNU GRUB  version %s"
 
-#: grub-core/normal/main.c:359
+#: normal/main.c:539
 #, c-format
 msgid ""
 "Minimal BASH-like line editing is supported. For the first word, TAB lists "
@@ -1352,11 +1336,11 @@
 "commandes complétées possibles. Ailleurs, TAB liste les fichiers ou "
 "périphériques possibles en complétant. %s"
 
-#: grub-core/normal/main.c:362
+#: normal/main.c:542
 msgid "ESC at any time exits."
 msgstr "ESC à tout moment pour quitter."
 
-#: grub-core/normal/main.c:496
+#: commands/minicmd.c:378
 msgid "Clear the screen."
 msgstr "Efface l'écran."
 
@@ -1368,7 +1352,7 @@
 msgid "Exit from normal mode."
 msgstr "Sortir du mode normal."
 
-#: grub-core/normal/menu.c:50 grub-core/normal/menu_entry.c:1445
+#: normal/menu_entry.c:1397
 msgid "Press any key to continue..."
 msgstr "Pressez une touche pour continuer..."
 
@@ -1387,7 +1371,7 @@
 msgstr ""
 "Echec de démarrage de l'entrée par défaut et des entrées secondaires.\n"
 
-#: grub-core/normal/menu_entry.c:1199
+#: normal/menu_entry.c:1184
 msgid "Booting a command list"
 msgstr "Démarrage suivant une liste de commandes"
 
@@ -1401,12 +1385,12 @@
 "automatiquement. Pressez Ctrl-x ou F10 pour démarrer, Ctrl-c ou F2 pour une "
 "ligne de commandes ou ESC pour retourner au menu GRUB."
 
-#: grub-core/normal/menu_text.c:159
+#: normal/menu_text.c:186
 #, c-format
 msgid "Use the %C and %C keys to select which entry is highlighted.\n"
 msgstr "Utilisez les touches %C et %C pour sélectionner une entrée.\n"
 
-#: grub-core/normal/menu_text.c:179
+#: normal/menu_text.c:203
 msgid ""
 "Press enter to boot the selected OS, 'e' to edit the commands before booting "
 "or 'c' for a command-line. ESC to return previous menu.\n"
@@ -1415,7 +1399,7 @@
 "commandes avant de démarrer ou 'c' pour une invite de commandes.\n"
 "'ESC' pour retourner au menu précédent.\n"
 
-#: grub-core/normal/menu_text.c:187
+#: normal/menu_text.c:211
 msgid ""
 "Press enter to boot the selected OS, 'e' to edit the commands before booting "
 "or 'c' for a command-line.\n"
@@ -1424,31 +1408,31 @@
 "commandes avant de démarrer,\n"
 "ou 'c' pour une invite de commandes.\n"
 
-#: grub-core/normal/misc.c:42
+#: normal/misc.c:41
 #, c-format
 msgid "Partition %s:"
 msgstr "Partition %s :"
 
-#: grub-core/normal/misc.c:47
+#: normal/misc.c:46
 #, c-format
 msgid "Device %s:"
 msgstr "Périphérique %s :"
 
-#: grub-core/normal/misc.c:53
+#: normal/misc.c:52
 msgid "Filesystem cannot be accessed"
 msgstr "Le système de fichiers est inaccessible"
 
-#: grub-core/normal/misc.c:64
+#: normal/misc.c:63
 #, c-format
 msgid "Filesystem type %s"
 msgstr "Type de système de fichiers : %s"
 
-#: grub-core/normal/misc.c:74
+#: normal/misc.c:73
 #, c-format
 msgid "- Label \"%s\""
 msgstr "- Etiquette \"%s\""
 
-#: grub-core/normal/misc.c:89
+#: normal/misc.c:88
 #, c-format
 msgid "- Last modification time %d-%02d-%02d %02d:%02d:%02d %s"
 msgstr "- Dernière heure de modification %d-%02d-%02d %02d:%02d:%02d %s"
@@ -1504,27 +1488,27 @@
 msgid "Load background image for active terminal."
 msgstr "Charge l'image en fond dans le terminal actif"
 
-#: grub-core/term/serial.c:37
+#: term/serial.c:46
 msgid "Set the serial unit."
 msgstr "Spécifie le port série."
 
-#: grub-core/term/serial.c:38
+#: term/serial.c:47
 msgid "Set the serial port address."
 msgstr "Spécifie l'adresse du port série."
 
-#: grub-core/term/serial.c:39
+#: term/serial.c:48
 msgid "Set the serial port speed."
 msgstr "Spécifie la vitesse du port série."
 
-#: grub-core/term/serial.c:40
+#: term/serial.c:49
 msgid "Set the serial port word length."
 msgstr "Spécifie la taille du message pour le port série."
 
-#: grub-core/term/serial.c:41
+#: term/serial.c:50
 msgid "Set the serial port parity."
 msgstr "Spécifie la parité pour le port série."
 
-#: grub-core/term/serial.c:42
+#: term/serial.c:51
 msgid "Set the serial port stop bits."
 msgstr "Spécifie les bits de stop pour le port série."
 
@@ -1793,33 +1777,33 @@
 msgid "Debug tool for filesystem driver."
 msgstr "Outil de débogage du pilote de système de fichier."
 
-#: util/grub-mkimage.c:494 util/grub-mkimage.c:535
+#: util/grub-mkrawimage.c:69
 msgid "the core image is too small"
 msgstr "l'image noyau est trop petite"
 
-#: util/grub-mkimage.c:505 util/grub-mkimage.c:539 util/grub-mkimage.c:557
+#: util/grub-mkrawimage.c:81
 msgid "cannot compress the kernel image"
 msgstr "impossible de compresser l'image du noyau"
 
-#: util/grub-mkimage.c:672
+#: util/grub-mkrawimage.c:156
 msgid "prefix is too long"
 msgstr "préfixe trop long"
 
-#: util/grub-mkimage.c:836
+#: util/grub-mkrawimage.c:330
 #, c-format
 msgid "core image is too big (%p > %p)"
 msgstr "image noyau trop grande (%p > %p)"
 
-#: util/grub-mkimage.c:842
+#: util/grub-mkrawimage.c:242
 msgid "the core image is too big"
 msgstr "l'image noyau est trop grande"
 
-#: util/grub-mkimage.c:861
+#: util/grub-mkrawimage.c:247
 #, c-format
 msgid "diskboot.img size must be %u bytes"
 msgstr "la taille de diskboot.img doit être %u octets"
 
-#: util/grub-mkimage.c:1402
+#: util/grub-mkrawimage.c:434 util/i386/pc/grub-setup.c:602
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Essayez `%s --help' pour plus d'informations.\n"
@@ -1868,34 +1852,34 @@
 "\n"
 "Reporter les bugs à <%s>.\n"
 
-#: util/grub-mkimage.c:1577
+#: util/grub-mkrawimage.c:580
 #, c-format
 msgid "cannot open %s"
 msgstr "impossible d'ouvrir %s"
 
-#: util/grub-setup.c:215
+#: util/i386/pc/grub-setup.c:160
 msgid "the first sector of the core file is not sector-aligned"
 msgstr "le premier secteur du fichier noyau n'est pas aligné sur un secteur"
 
-#: util/grub-setup.c:229
+#: util/i386/pc/grub-setup.c:174
 msgid "non-sector-aligned data is found in the core file"
 msgstr "données non alignées sur des secteurs trouvées dans le fichier noyau"
 
-#: util/grub-setup.c:245
+#: util/i386/pc/grub-setup.c:188
 msgid "the sectors of the core file are too fragmented"
 msgstr "les secteurs du fichier noyau sont trop dispersés"
 
-#: util/grub-setup.c:258
+#: util/i386/pc/grub-setup.c:199
 #, c-format
 msgid "the size of `%s' is not %u"
 msgstr "la taille de `%s' n'est pas égale à %u"
 
-#: util/grub-setup.c:268
+#: util/i386/pc/grub-setup.c:216
 #, c-format
 msgid "the size of `%s' is too small"
 msgstr "la taille de `%s' est trop petite"
 
-#: util/grub-setup.c:271
+#: util/i386/pc/grub-setup.c:218
 #, c-format
 msgid "the size of `%s' is too large"
 msgstr "la taille de `%s' est trop grande"
@@ -1906,7 +1890,7 @@
 "partition label and filesystem.  This is not supported yet."
 msgstr ""
 
-#: util/grub-setup.c:379
+#: util/i386/pc/grub-setup.c:255
 #, c-format
 msgid ""
 "unable to identify a filesystem in %s; safety check can't be performed"
@@ -1914,7 +1898,7 @@
 "impossible d'identifier le système de fichiers sur %s ; contrôle impossible "
 "à effectuer"
 
-#: util/grub-setup.c:382
+#: util/i386/pc/grub-setup.c:259
 #, c-format
 msgid ""
 "%s appears to contain a %s filesystem which isn't known to reserve space for "
@@ -1943,7 +1927,7 @@
 "is a BAD idea."
 msgstr ""
 
-#: util/grub-setup.c:499
+#: util/i386/pc/grub-setup.c:419
 msgid ""
 "embedding is not possible, but this is required when the root device is on a "
 "RAID array or LVM volume"
@@ -1970,30 +1954,30 @@
 msgid "will not proceed with blocklists"
 msgstr "les listes de blocs ne seront pas traitées"
 
-#: util/grub-setup.c:529
+#: util/i386/pc/grub-setup.c:445
 #, c-format
 msgid "attempting to read the core image `%s' from GRUB"
 msgstr "tentative de lecture de l'image noyau `%s' par GRUB"
 
-#: util/grub-setup.c:530
+#: util/i386/pc/grub-setup.c:446
 #, c-format
 msgid "attempting to read the core image `%s' from GRUB again"
 msgstr "nouvelle tentative de lecture de l'image noyau `%s' par GRUB"
 
-#: util/grub-setup.c:589
+#: util/i386/pc/grub-setup.c:513
 #, c-format
 msgid "cannot read `%s' correctly"
 msgstr "impossible de lire `%s' correctement"
 
-#: util/grub-setup.c:604
+#: util/i386/pc/grub-setup.c:526
 msgid "no terminator in the core image"
 msgstr "pas de terminateur dans l'image noyau"
 
-#: util/grub-setup.c:616
+#: util/i386/pc/grub-setup.c:537
 msgid "failed to read the first sector of the core image"
 msgstr "échec de lecture du premier secteur de l'image noyau"
 
-#: util/grub-setup.c:622
+#: util/i386/pc/grub-setup.c:543
 msgid "failed to read the rest sectors of the core image"
 msgstr "échec de lecture des secteurs restants de l'image noyau"
 
@@ -2045,12 +2029,13 @@
 "Préparer le disque pour être démarrable comme disquette (par défaut pour les "
 "périph. fdX). Peut ne pas fonctionner avec certains BIOS."
 
-#: util/grub-setup.c:822
+#: util/i386/pc/grub-setup.c:740
 #, c-format
 msgid "Unknown extra argument `%s'.\n"
 msgstr "Argument superflu inconnu `%s'.\n"
 
-#: util/grub-setup.c:828
+#: util/i386/pc/grub-setup.c:734
+#, c-format
 msgid "No device is specified.\n"
 msgstr "Aucun périphérique spécifié.\n"
 
@@ -2069,17 +2054,17 @@
 msgid "DEVICE must be an OS device (e.g. /dev/sda)."
 msgstr "PERIPH. doit être un périphérique système (i.e. /dev/sda)."
 
-#: util/grub-setup.c:915
+#: util/i386/pc/grub-setup.c:757
 #, c-format
 msgid "Invalid device `%s'.\n"
 msgstr "Périphérique non valide `%s'.\n"
 
-#: util/grub-setup.c:935
+#: util/i386/pc/grub-setup.c:770
 #, c-format
 msgid "invalid root device `%s'"
 msgstr "périphérique racine non valide `%s'"
 
-#: util/grub-setup.c:949
+#: util/i386/pc/grub-setup.c:783
 msgid "cannot guess the root device. Specify the option `--root-device'"
 msgstr ""
 "impossible de deviner le périphérique racine. Utilisez l'option `--root-"
@@ -2097,27 +2082,27 @@
 msgid "%s, with kFreeBSD %s (recovery mode)"
 msgstr "%s, avec kFreeBSD %s (mode de dépannage)"
 
-#: util/grub.d/10_kfreebsd.in:76
+#: util/grub.d/10_kfreebsd.in:47
 msgid "%s, with kFreeBSD %s"
 msgstr "%s, avec kFreeBSD %s"
 
-#: util/grub.d/10_kfreebsd.in:87
+#: util/grub.d/10_kfreebsd.in:55
 msgid "Loading kernel of FreeBSD %s ..."
 msgstr "Chargement du noyau FreeBSD %s ..."
 
-#: util/grub.d/10_linux.in:69
+#: util/grub.d/10_linux.in:60
 msgid "%s, with Linux %s (recovery mode)"
 msgstr "%s, avec Linux %s (mode de dépannage)"
 
-#: util/grub.d/10_linux.in:71
+#: util/grub.d/10_linux.in:62
 msgid "%s, with Linux %s"
 msgstr "%s, avec Linux %s"
 
-#: util/grub.d/10_linux.in:116 util/grub.d/20_linux_xen.in:85
+#: util/grub.d/10_linux.in:87
 msgid "Loading Linux %s ..."
 msgstr "Chargement de Linux %s ..."
 
-#: util/grub.d/10_linux.in:122 util/grub.d/20_linux_xen.in:93
+#: util/grub.d/10_linux.in:92
 msgid "Loading initial ramdisk ..."
 msgstr "Chargement du disque mémoire initial ..."
 
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gutenprint.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gutenprint.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gutenprint.po	2012-01-02 17:27:19.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gutenprint.po	2012-02-23 06:31:42.000000000 +0000
@@ -10,14 +10,14 @@
 "Project-Id-Version: gimp-print 5.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-05-01 21:33-0400\n"
-"PO-Revision-Date: 2011-10-04 09:49+0000\n"
-"Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
+"PO-Revision-Date: 2012-02-15 08:08+0000\n"
+"Last-Translator: regis rampnoux <Unknown>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:27+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:30+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "X-Poedit-Country: FRANCE\n"
 "X-Poedit-Language: French\n"
 
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gwibber-service-sina.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gwibber-service-sina.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gwibber-service-sina.po	1970-01-01 00:00:00.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gwibber-service-sina.po	2012-02-23 06:32:14.000000000 +0000
@@ -0,0 +1,80 @@
+# French translation for gwibber-service-sina
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the gwibber-service-sina package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gwibber-service-sina\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-01-02 10:26+0000\n"
+"PO-Revision-Date: 2012-01-07 10:27+0000\n"
+"Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-02-22 06:53+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+
+#: ../gtk/sina/__init__.py:45 ../gtk/sina/__init__.py:160
+#, python-format
+msgid "%s has been authorized by Sina"
+msgstr ""
+
+#: ../gtk/sina/__init__.py:62
+msgid "<p>Please wait...</p>"
+msgstr "<p>Veuillez patienter...</p>"
+
+#: ../gtk/sina/__init__.py:101
+msgid "Verifying"
+msgstr "Vérification en cours"
+
+#: ../gtk/sina/__init__.py:148 ../gtk/sina/__init__.py:152
+#: ../gtk/sina/__init__.py:172
+msgid "Authorization failed. Please try again."
+msgstr "Échec de l'authentification. Veuillez réessayer."
+
+#: ../gtk/sina/__init__.py:155
+msgid "Successful"
+msgstr "Opération réussie"
+
+#: ../ui/gwibber-accounts-sina.ui.h:1
+msgid "_Authorize"
+msgstr "_Autoriser"
+
+#: ../ui/gwibber-accounts-sina.ui.h:2
+msgid "Authorize with sina"
+msgstr "Autoriser chez Sina"
+
+#: ../ui/gwibber-accounts-sina.ui.h:3
+msgid "Sina authorized"
+msgstr ""
+
+#: ../ui/gwibber-accounts-sina.ui.h:4
+msgid "Account Settings:"
+msgstr "Paramètres du compte :"
+
+#: ../ui/gwibber-accounts-sina.ui.h:5
+msgid "_Send Messages"
+msgstr "_Envoyer des messages"
+
+#: ../ui/gwibber-accounts-sina.ui.h:6
+msgid "Allow sending posts to this account"
+msgstr "Autoriser l'envoi de messages à ce compte"
+
+#: ../ui/gwibber-accounts-sina.ui.h:7
+msgid "_Receive Messages"
+msgstr "_Recevoir des Messages"
+
+#: ../ui/gwibber-accounts-sina.ui.h:8
+msgid "Include this account when downloading messages"
+msgstr "Inclure ce compte lors du téléchargement des messages"
+
+#: ../ui/gwibber-accounts-sina.ui.h:9
+msgid "Color used to help distinguish accounts"
+msgstr "Couleur utilisée pour distinguer les comptes"
+
+#: ../ui/gwibber-accounts-sina.ui.h:10
+msgid "Account Color:"
+msgstr "Couleur associée au compte :"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gwibber-service-sohu.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gwibber-service-sohu.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/gwibber-service-sohu.po	1970-01-01 00:00:00.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/gwibber-service-sohu.po	2012-02-23 06:32:14.000000000 +0000
@@ -0,0 +1,80 @@
+# French translation for gwibber-service-sohu
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the gwibber-service-sohu package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gwibber-service-sohu\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-01-02 10:21+0000\n"
+"PO-Revision-Date: 2012-01-07 10:28+0000\n"
+"Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-02-22 06:54+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+
+#: ../gtk/sohu/__init__.py:45 ../gtk/sohu/__init__.py:161
+#, python-format
+msgid "%s has been authorized by Sohu"
+msgstr ""
+
+#: ../gtk/sohu/__init__.py:62
+msgid "<p>Please wait...</p>"
+msgstr "<p>Veuillez patienter...</p>"
+
+#: ../gtk/sohu/__init__.py:102
+msgid "Verifying"
+msgstr "Vérification en cours"
+
+#: ../gtk/sohu/__init__.py:149 ../gtk/sohu/__init__.py:153
+#: ../gtk/sohu/__init__.py:173
+msgid "Authorization failed. Please try again."
+msgstr "Échec de l'authentification. Veuillez réessayer."
+
+#: ../gtk/sohu/__init__.py:156
+msgid "Successful"
+msgstr "Opération réussie"
+
+#: ../ui/gwibber-accounts-sohu.ui.h:1
+msgid "_Authorize"
+msgstr "_Autoriser"
+
+#: ../ui/gwibber-accounts-sohu.ui.h:2
+msgid "Authorize with sohu"
+msgstr ""
+
+#: ../ui/gwibber-accounts-sohu.ui.h:3
+msgid "Sohu authorized"
+msgstr ""
+
+#: ../ui/gwibber-accounts-sohu.ui.h:4
+msgid "Account Settings:"
+msgstr "Paramètres du compte :"
+
+#: ../ui/gwibber-accounts-sohu.ui.h:5
+msgid "_Send Messages"
+msgstr "_Envoyer des messages"
+
+#: ../ui/gwibber-accounts-sohu.ui.h:6
+msgid "Allow sending posts to this account"
+msgstr "Autoriser l'envoi de messages à ce compte"
+
+#: ../ui/gwibber-accounts-sohu.ui.h:7
+msgid "_Receive Messages"
+msgstr "_Recevoir des Messages"
+
+#: ../ui/gwibber-accounts-sohu.ui.h:8
+msgid "Include this account when downloading messages"
+msgstr "Inclure ce compte lors du téléchargement des messages"
+
+#: ../ui/gwibber-accounts-sohu.ui.h:9
+msgid "Color used to help distinguish accounts"
+msgstr "Couleur utilisée pour distinguer les comptes"
+
+#: ../ui/gwibber-accounts-sohu.ui.h:10
+msgid "Account Color:"
+msgstr "Couleur associée au compte :"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/hello-debhelper.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/hello-debhelper.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/hello-debhelper.po	2012-01-02 17:26:59.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/hello-debhelper.po	2012-02-23 06:31:26.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:46+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:23+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: src/hello.c:100
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/hello.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/hello.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/hello.po	2012-01-02 17:26:59.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/hello.po	2012-02-23 06:31:26.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:46+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:23+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: src/hello.c:100
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/help2man.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/help2man.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/help2man.po	2012-01-02 17:26:51.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/help2man.po	2012-02-23 06:31:17.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:28+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:24+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: help2man:69
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/human-theme.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/human-theme.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/human-theme.po	2012-01-02 17:27:19.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/human-theme.po	2012-02-23 06:31:43.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:37+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:39+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../index.theme.in.h:1
 msgid "Ubuntu default theme"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/hunspell.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/hunspell.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/hunspell.po	2012-01-02 17:27:16.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/hunspell.po	2012-02-23 06:31:39.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:59+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:59+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/tools/hunspell.cxx:205 src/tools/hunspell.cxx:313
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ibus-anthy.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ibus-anthy.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ibus-anthy.po	2012-01-02 17:27:29.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ibus-anthy.po	2012-02-23 06:31:53.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 18:08+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:58+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: ../engine/engine.py:187
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ibus-chewing.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ibus-chewing.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ibus-chewing.po	2012-01-02 17:27:30.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ibus-chewing.po	2012-02-23 06:31:54.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 18:22+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:08+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../src/IBusChewingEngine.gob:331
 msgid " No default value, skipped."
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ibus-pinyin.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ibus-pinyin.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ibus-pinyin.po	2012-01-02 17:27:29.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ibus-pinyin.po	2012-02-23 06:31:52.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:59+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:52+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: engine/pydict.py:358 setup/pydict.py:358
 msgid "MSPY"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ibus-table.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ibus-table.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ibus-table.po	2012-01-02 17:27:29.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ibus-table.po	2012-02-23 06:31:53.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 18:07+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:57+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: engine/table.py:985
 msgid "CN"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ibus-unikey.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ibus-unikey.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ibus-unikey.po	2012-01-02 17:27:33.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ibus-unikey.po	2012-02-23 06:31:57.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 18:55+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:36+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/engine.cpp:680
 msgid "Enable spell check"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/icoutils.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/icoutils.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/icoutils.po	2012-01-02 17:26:59.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/icoutils.po	2012-02-23 06:31:26.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:46+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:23+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: lib/error.c:127
 msgid "Unknown system error"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/indent.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/indent.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/indent.po	2012-01-02 17:26:51.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/indent.po	2012-02-23 06:31:17.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:28+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:24+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/args.c:611
 msgid ""
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/isoquery.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/isoquery.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/isoquery.po	2012-01-02 17:27:27.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/isoquery.po	2012-02-23 06:31:50.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:16+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:14+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: isoquery/cmdline_parser.py:30
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/JabberBot.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/JabberBot.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/JabberBot.po	2012-01-02 17:26:55.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/JabberBot.po	2012-02-23 06:31:21.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:02+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:50+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #, python-format
 msgid ""
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/jade.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/jade.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/jade.po	2012-01-02 17:26:53.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/jade.po	2012-02-23 06:31:19.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:52+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:43+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 msgid "cannot open output file %1 (%2)"
 msgstr "Impossible d'ouvrir le fichier de sortie %1 (%2)"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/jockey.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/jockey.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/jockey.po	2012-01-02 17:27:26.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/jockey.po	2012-02-23 06:31:50.000000000 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: restricted-manager\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-12-08 12:01+0000\n"
-"PO-Revision-Date: 2011-12-24 12:14+0000\n"
+"PO-Revision-Date: 2012-01-03 12:34+0000\n"
 "Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:14+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:12+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: ../text/jockey-text.py:72
@@ -204,6 +204,9 @@
 "no-dbus option as root to\"+                            \" use jockey "
 "without it."
 msgstr ""
+"Impossible de se connecter à D-BUS,\"+                            \" "
+"veuillez utiliser l'option --no-dbus en tant que root pour\"+                "
+"            \" utiliser jockey sans D-BUS."
 
 #: ../jockey/ui.py:132 ../jockey/ui.py:145
 msgid "Searching for available drivers..."
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/kbd.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/kbd.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/kbd.po	2012-01-02 17:27:00.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/kbd.po	2012-02-23 06:31:27.000000000 +0000
@@ -9,14 +9,14 @@
 "Project-Id-Version: GNU kbd 1.14.1\n"
 "Report-Msgid-Bugs-To: Alexey Gladkov <gladkov.alexey@gmail.com>\n"
 "POT-Creation-Date: 2010-04-11 01:15+0400\n"
-"PO-Revision-Date: 2011-09-25 16:08+0000\n"
-"Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
+"PO-Revision-Date: 2012-02-13 11:34+0000\n"
+"Last-Translator: Jean-Baka Domelevo-Entfellner <Unknown>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:52+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:28+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/chvt.c:28
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/kcm_gtk.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/kcm_gtk.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/kcm_gtk.po	2012-01-02 17:27:31.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/kcm_gtk.po	2012-02-23 06:31:55.000000000 +0000
@@ -9,14 +9,14 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2011-08-18 16:55+0000\n"
-"PO-Revision-Date: 2011-08-18 22:13+0000\n"
+"PO-Revision-Date: 2012-02-14 14:19+0000\n"
 "Last-Translator: Bruno Patri <Unknown>\n"
 "Language-Team: <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 18:31+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:16+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: kcmgtk.cpp:67
 msgid "kcm_gtk"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/kerneloops.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/kerneloops.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/kerneloops.po	2012-01-02 17:27:27.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/kerneloops.po	2012-02-23 06:31:50.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:15+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:13+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: kerneloops-applet.c:170 kerneloops-applet.c:212
 msgid "Always"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/kubuntu-docs-directory.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/kubuntu-docs-directory.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/kubuntu-docs-directory.po	2012-01-02 17:27:16.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/kubuntu-docs-directory.po	2012-02-23 06:31:40.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:02+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:02+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../directory.desktop.in.h:1
 msgid "Kubuntu Documentation"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/kubuntu-docs-kubuntu-docs.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/kubuntu-docs-kubuntu-docs.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/kubuntu-docs-kubuntu-docs.po	2012-01-02 17:27:16.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/kubuntu-docs-kubuntu-docs.po	2012-02-23 06:31:40.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:03+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:02+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../kubuntu-docs.desktop.in.h:1
 msgid "Kubuntu System Documentation Index"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/language-selector.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/language-selector.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/language-selector.po	2012-01-02 17:27:16.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/language-selector.po	2012-02-23 06:31:39.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: language-selector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-19 09:41+0000\n"
+"POT-Creation-Date: 2012-02-15 06:50+0000\n"
 "PO-Revision-Date: 2011-12-24 12:09+0000\n"
 "Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -15,28 +15,28 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:54+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:54+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #. Hack for Chinese langpack split
 #. Translators: please translate 'Chinese (simplified)' and 'Chinese (traditional)' so that they appear next to each other when sorted alphabetically.
-#: ../LanguageSelector/LocaleInfo.py:51
+#: ../LanguageSelector/LocaleInfo.py:50
 msgid "Chinese (simplified)"
 msgstr "Chinois (simplifié)"
 
 #. Translators: please translate 'Chinese (simplified)' and 'Chinese (traditional)' so that they appear next to each other when sorted alphabetically.
-#: ../LanguageSelector/LocaleInfo.py:53
+#: ../LanguageSelector/LocaleInfo.py:52
 msgid "Chinese (traditional)"
 msgstr "Chinois (traditionnel)"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:229
-#: ../LanguageSelector/qt/QtLanguageSelector.py:84
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:225
+#: ../LanguageSelector/qt/QtLanguageSelector.py:85
 msgid "No language information available"
 msgstr "Les informations sur les langues ne sont pas disponibles"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:230
-#: ../LanguageSelector/qt/QtLanguageSelector.py:85
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:226
+#: ../LanguageSelector/qt/QtLanguageSelector.py:86
 msgid ""
 "The system does not have information about the available languages yet. Do "
 "you want to perform a network update to get them now? "
@@ -44,24 +44,24 @@
 "Le système ne dispose pour l'instant d'aucune information sur les langues "
 "disponibles. Voulez-vous effectuer une mise à jour afin de les obtenir ? "
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:234
-#: ../LanguageSelector/qt/QtLanguageSelector.py:79
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:230
+#: ../LanguageSelector/qt/QtLanguageSelector.py:80
 msgid "_Update"
 msgstr "Mettre à jo_ur"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:319
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:357
-#: ../data/LanguageSelector.ui.h:24
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:314
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:351
+#: ../data/LanguageSelector.ui.h:23
 msgid "Language"
 msgstr "Langue"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:326
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:321
 msgid "Installed"
 msgstr "Installé"
 
 #. print "%(INSTALL)d to install, %(REMOVE)d to remove" % (countInstall, countRemove)
 #. Translators: %(INSTALL)d is parsed; either keep it exactly as is or remove it entirely, but don't translate "INSTALL".
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:395
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:389
 #, python-format
 msgid "%(INSTALL)d to install"
 msgid_plural "%(INSTALL)d to install"
@@ -69,7 +69,7 @@
 msgstr[1] "%(INSTALL)d à installer"
 
 #. Translators: %(REMOVE)d is parsed; either keep it exactly as is or remove it entirely, but don't translate "REMOVE".
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:397
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:391
 #, python-format
 msgid "%(REMOVE)d to remove"
 msgid_plural "%(REMOVE)d to remove"
@@ -77,26 +77,24 @@
 msgstr[1] "%(REMOVE)d à supprimer"
 
 #. Translators: this string will concatenate the "%n to install" and "%n to remove" strings, you can replace the comma if you need to.
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:406
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:400
 #, python-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:468
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:462
 msgid "none"
 msgstr "Aucun(e)"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:518
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:714
-#: ../LanguageSelector/qt/QtLanguageSelector.py:68
-#: ../LanguageSelector/qt/QtLanguageSelector.py:337
-#: ../check-language-support:52
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:512
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:716
+#: ../LanguageSelector/qt/QtLanguageSelector.py:69
+#: ../LanguageSelector/qt/QtLanguageSelector.py:328
 msgid "Software database is broken"
 msgstr "La base de données des logiciels est corrompue"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:519
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:715
-#: ../check-language-support:53
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:513
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:717
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -106,11 +104,11 @@
 "utiliser le gestionnaire de paquets « Synaptic » ou exécuter la commande "
 "« sudo apt-get install -f » dans un terminal afin de corriger ce problème."
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:564
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:554
 msgid "Could not install the selected language support"
 msgstr "Impossible d'installer la prise en charge de la langue sélectionnée"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:565
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:555
 msgid ""
 "This is perhaps a bug of this application. Please file a bug report at "
 "https://bugs.launchpad.net/ubuntu/+source/language-selector/+filebug"
@@ -119,11 +117,13 @@
 "de bogue (en anglais) sur https://bugs.launchpad.net/ubuntu/+source/language-"
 "selector/+filebug"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:589
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:579
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:614
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:618
 msgid "Could not install the full language support"
 msgstr "Impossible d'installer la prise en charge complète de la langue"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:590
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:580
 msgid ""
 "Usually this is related to an error in your software archive or software "
 "manager. Check your preferences in Software Sources (click the icon at the "
@@ -135,13 +135,17 @@
 "de Logiciels (cliquez sur l'icône la plus à droite de la barre du haut et "
 "sélectionnez \"Paramètres système ... -> Sources de Logiciels\")."
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:671
-#: ../LanguageSelector/qt/QtLanguageSelector.py:161
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:615
+msgid "Failed to authorize to install packages."
+msgstr ""
+
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:673
+#: ../LanguageSelector/qt/QtLanguageSelector.py:162
 msgid "The language support is not installed completely"
 msgstr "La prise en charge de la langue n'est pas complètement installée"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:672
-#: ../LanguageSelector/qt/QtLanguageSelector.py:162
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:674
+#: ../LanguageSelector/qt/QtLanguageSelector.py:163
 msgid ""
 "Some translations or writing aids available for your chosen languages are "
 "not installed yet. Do you want to install them now?"
@@ -150,29 +154,29 @@
 "que vous avez choisie ne sont pas encore installées. Voulez-vous les "
 "installer maintenant ?"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:675
-#: ../LanguageSelector/qt/QtLanguageSelector.py:80
-#: ../LanguageSelector/qt/QtLanguageSelector.py:157
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:677
+#: ../LanguageSelector/qt/QtLanguageSelector.py:81
+#: ../LanguageSelector/qt/QtLanguageSelector.py:158
 msgid "_Remind Me Later"
 msgstr "Me le _rappeler plus tard"
 
 #. FIXME: add "details"
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:676
-#: ../LanguageSelector/qt/QtLanguageSelector.py:156
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:678
+#: ../LanguageSelector/qt/QtLanguageSelector.py:157
 msgid "_Install"
 msgstr "_Installer"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:679
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:681
 msgid "Details"
 msgstr "Détails"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:937
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:935
 #, python-format
 msgid "Failed to apply the '%s' format choice:"
 msgstr "Impossible d'appliquer le choix du réglage « %s » :"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:69
-#: ../LanguageSelector/qt/QtLanguageSelector.py:338
+#: ../LanguageSelector/qt/QtLanguageSelector.py:70
+#: ../LanguageSelector/qt/QtLanguageSelector.py:329
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Adept\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -182,82 +186,82 @@
 "utiliser le gestionnaire de paquets « Kpackagekit » ou exécuter « sudo apt-"
 "get install -f » dans un terminal afin de corriger ce problème."
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:113
+#: ../LanguageSelector/qt/QtLanguageSelector.py:114
 msgid "Set System Language"
 msgstr "Définir la langue du système"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:114
+#: ../LanguageSelector/qt/QtLanguageSelector.py:115
 msgid "Default system language:"
 msgstr "Langue par défaut du système :"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:115
+#: ../LanguageSelector/qt/QtLanguageSelector.py:116
 msgid "Keyboard input method:"
 msgstr "Méthode de saisie au clavier :"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:116
+#: ../LanguageSelector/qt/QtLanguageSelector.py:117
 msgid "Select language to install:"
 msgstr "Sélectionnez la langue à installer :"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:117
+#: ../LanguageSelector/qt/QtLanguageSelector.py:118
 msgid "Select language to uninstall:"
 msgstr "Sélectionnez la langue à désinstaller :"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:118
+#: ../LanguageSelector/qt/QtLanguageSelector.py:119
 msgid "Translations"
 msgstr "Traductions"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:119
+#: ../LanguageSelector/qt/QtLanguageSelector.py:120
 msgid "Input methods"
 msgstr "Méthodes de saisie"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:120
+#: ../LanguageSelector/qt/QtLanguageSelector.py:121
 msgid "Spellchecking and writing aids"
 msgstr "Vérification orthographique et assistances à la saisie"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:121
+#: ../LanguageSelector/qt/QtLanguageSelector.py:122
 msgid "Extra fonts"
 msgstr "Polices supplémentaires"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:122
+#: ../LanguageSelector/qt/QtLanguageSelector.py:123
 msgid "Components:"
 msgstr "Composants :"
 
 #. not sure how to unset all flags, but this disables the item
-#: ../LanguageSelector/qt/QtLanguageSelector.py:201
+#: ../LanguageSelector/qt/QtLanguageSelector.py:202
 msgid "Already installed"
 msgstr "Déjà installé"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:204
+#: ../LanguageSelector/qt/QtLanguageSelector.py:205
 msgid "Partially Installed"
 msgstr "Partiellement installé"
 
 #. not sure how to unset all flags, but this disables the item
-#: ../LanguageSelector/qt/QtLanguageSelector.py:207
+#: ../LanguageSelector/qt/QtLanguageSelector.py:208
 msgid "Not installed"
 msgstr "Non installé"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:246
+#: ../LanguageSelector/qt/QtLanguageSelector.py:243
 msgid "Component already installed"
 msgstr "Composant déjà installé"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:248
+#: ../LanguageSelector/qt/QtLanguageSelector.py:245
 msgid "Component not available"
 msgstr "Composant non disponible"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:250
+#: ../LanguageSelector/qt/QtLanguageSelector.py:247
 msgid "Component not installed"
 msgstr "Composant non installé"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:292
+#: ../LanguageSelector/qt/QtLanguageSelector.py:288
 #, python-format
 msgid "Default system Language now set to %s."
 msgstr "La langue par défaut du système est désormais : %s."
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:292
+#: ../LanguageSelector/qt/QtLanguageSelector.py:288
 msgid "Language Set"
 msgstr "Langue définie"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:363
+#: ../LanguageSelector/qt/QtLanguageSelector.py:354
 #, python-format
 msgid ""
 "All selected components have now been installed for %s.  Select them from "
@@ -266,32 +270,32 @@
 "Tout les composants sélectionnés sont maintenant installés pour %s. "
 "Sélectionnez-les depuis Pays/Région & langue."
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:363
+#: ../LanguageSelector/qt/QtLanguageSelector.py:354
 msgid "Language Installed"
 msgstr "Langue installée"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:365
+#: ../LanguageSelector/qt/QtLanguageSelector.py:356
 #, python-format
 msgid "Translations and support have now been uninstalled for %s."
 msgstr "Les traductions et l'aide en %s ont maintenant été supprimées."
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:365
+#: ../LanguageSelector/qt/QtLanguageSelector.py:356
 msgid "Language Uninstalled"
 msgstr "Langue désinstallée"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:373
+#: ../LanguageSelector/qt/QtLanguageSelector.py:364
 msgid "Failed to set system language."
 msgstr "La modification de la langue du système a échoué."
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:373
+#: ../LanguageSelector/qt/QtLanguageSelector.py:364
 msgid "Language Not Set"
 msgstr "Langue non définie"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:442
+#: ../LanguageSelector/qt/QtLanguageSelector.py:433
 msgid "Please run this software with administrative rights."
 msgstr "Veuillez exécuter ce logiciel avec des droits d'administrateur."
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:442
+#: ../LanguageSelector/qt/QtLanguageSelector.py:433
 msgid "Not Root User"
 msgstr "L'utilisateur n'est pas le super-utilisateur (root)"
 
@@ -370,22 +374,19 @@
 
 #: ../data/LanguageSelector.ui.h:16
 msgid ""
-"<small>Use the same language choices for startup and the login screen.\n"
-"Changes take effect only after a restart of the system.</small>"
+"<small>Use the same language choices for startup and the login "
+"screen.</small>"
 msgstr ""
-"<small>Utiliser le même choix de langue pour le démarrage et l'écran de "
-"connexion.\n"
-"Les changements prendront effet après le redémarrage du système.</small>"
 
-#: ../data/LanguageSelector.ui.h:18
+#: ../data/LanguageSelector.ui.h:17
 msgid "Install / Remove Languages..."
 msgstr "Installer/supprimer des langues…"
 
-#: ../data/LanguageSelector.ui.h:19
+#: ../data/LanguageSelector.ui.h:18
 msgid "Keyboard input method system:"
 msgstr "Système de saisie au clavier :"
 
-#: ../data/LanguageSelector.ui.h:20
+#: ../data/LanguageSelector.ui.h:19
 msgid ""
 "If you need to type in languages, which require more complex input methods "
 "than just a simple key to letter mapping, you may want to enable this "
@@ -405,12 +406,12 @@
 "Pour pouvoir utiliser des méthodes de saisie alternatives, installez d'abord "
 "les paquets correspondants puis choisissez celle désirée ici."
 
-#: ../data/LanguageSelector.ui.h:25
+#: ../data/LanguageSelector.ui.h:24
 msgid "Display numbers, dates and currency amounts in the usual format for:"
 msgstr ""
 "Afficher les nombres, dates et devises dans le format habituel pour :"
 
-#: ../data/LanguageSelector.ui.h:26
+#: ../data/LanguageSelector.ui.h:25
 msgid ""
 "This will set the system environment like shown below and will also affect "
 "the preferred paper format and other region specific settings.\n"
@@ -426,38 +427,34 @@
 "ci, veuillez utiliser l'onglet langue.\n"
 "Vous devriez définir ceci en adéquation avec le pays où vous vous trouvez."
 
-#: ../data/LanguageSelector.ui.h:29
+#: ../data/LanguageSelector.ui.h:28
 msgid "<small>Changes take effect next time you log in.</small>"
 msgstr ""
 "<small>Les modifications prendront effet à la prochaine ouverture de "
 "session.</small>"
 
-#: ../data/LanguageSelector.ui.h:30
+#: ../data/LanguageSelector.ui.h:29
 msgid ""
-"<small>Use the same format choice for startup and the login screen.\n"
-"Changes take effect only after a restart of the system.</small>"
+"<small>Use the same format choice for startup and the login screen.</small>"
 msgstr ""
-"<small>Utiliser les mêmes réglages pour le démarrage et l'écran de "
-"connexion.\n"
-"Les changements prendront effet après le redémarrage du système.</small>"
 
-#: ../data/LanguageSelector.ui.h:32
+#: ../data/LanguageSelector.ui.h:30
 msgid "Number:"
 msgstr "Nombre :"
 
-#: ../data/LanguageSelector.ui.h:33
+#: ../data/LanguageSelector.ui.h:31
 msgid "Date:"
 msgstr "Date :"
 
-#: ../data/LanguageSelector.ui.h:34
+#: ../data/LanguageSelector.ui.h:32
 msgid "Currency:"
 msgstr "Devise :"
 
-#: ../data/LanguageSelector.ui.h:35
+#: ../data/LanguageSelector.ui.h:33
 msgid "<b>Example</b>"
 msgstr "<b>Exemple</b>"
 
-#: ../data/LanguageSelector.ui.h:36
+#: ../data/LanguageSelector.ui.h:34
 msgid "Regional Formats"
 msgstr "Formats régionaux"
 
@@ -535,27 +532,27 @@
 "La politique de sécurité du système à empêché le réglage de la langue par "
 "défaut"
 
-#: ../gnome-language-selector:20
+#: ../gnome-language-selector:17
 msgid "don't verify installed language support"
 msgstr "ne pas vérifier la prise en charge de la langue installée"
 
-#: ../gnome-language-selector:23 ../check-language-support:22
+#: ../gnome-language-selector:20 ../check-language-support:25
 msgid "alternative datadir"
 msgstr "dossier de données alternatif"
 
-#: ../fontconfig-voodoo:18
+#: ../fontconfig-voodoo:17
 msgid "Aborting"
 msgstr "Abandon"
 
-#: ../fontconfig-voodoo:26
+#: ../fontconfig-voodoo:25
 msgid "Force even when a configuration exists"
 msgstr "Forcer même si une configuration existe déjà"
 
-#: ../fontconfig-voodoo:28
+#: ../fontconfig-voodoo:27
 msgid "Set fontconfig voodoo for the selected language"
 msgstr "Régler fontconfig-voodoo pour la langue sélectionnée"
 
-#: ../fontconfig-voodoo:32
+#: ../fontconfig-voodoo:31
 msgid ""
 "Guess a configuration based on the LANGUAGE environment. Sets the config to "
 "'none' if nothing suitable was found"
@@ -564,52 +561,52 @@
 "LANGUAGE. Règle la configuration sur « aucune » si rien de convenable n'est "
 "trouvé"
 
-#: ../fontconfig-voodoo:37
+#: ../fontconfig-voodoo:36
 msgid "List the available fontconfig-voodoo configs"
 msgstr "Lister les configurations de fontconfig-voodoo disponibles"
 
-#: ../fontconfig-voodoo:40
+#: ../fontconfig-voodoo:39
 msgid "Show the current fontconfig-voodoo config"
 msgstr "Afficher la configuration actuelle de fontconfig-voodoo"
 
-#: ../fontconfig-voodoo:43
+#: ../fontconfig-voodoo:42
 msgid "Remove the current fontconfig-voodoo config"
 msgstr "Supprimer la configuration actuelle de fontconfig-voodoo"
 
-#: ../fontconfig-voodoo:65
+#: ../fontconfig-voodoo:64
 msgid "Unconfigured"
 msgstr "Non configuré"
 
-#: ../fontconfig-voodoo:81
+#: ../fontconfig-voodoo:80
 msgid "A configuration exists already. Use '--force' to overwrite it. "
 msgstr "Une configuration existe déjà. Utilisez « --force » pour l'écraser. "
 
-#: ../fontconfig-voodoo:90
+#: ../fontconfig-voodoo:89
 msgid "No fontconfig-voodoo configuration found for the current LANGUAGE"
 msgstr ""
 "Aucune configuration fontconfig-voodoo n'a été trouvée pour la langue "
 "actuelle"
 
-#: ../fontconfig-voodoo:97
+#: ../fontconfig-voodoo:96
 msgid "No fontconfig-voodoo configuration found for the selected locale"
 msgstr ""
 "Aucune configuration de fontconfig-voodoo trouvée pour la localisation "
 "choisie"
 
-#: ../check-language-support:19
+#: ../check-language-support:22
 msgid "target language code"
 msgstr "code de la langue choisie"
 
-#: ../check-language-support:23
+#: ../check-language-support:26
 msgid "check for the given package(s) only -- separate packagenames by comma"
 msgstr ""
 "vérifier uniquement le(s) paquet(s) suivant(s) -- séparez les noms de "
 "paquets par une virgule"
 
-#: ../check-language-support:25
-msgid "check all available languages"
-msgstr "vérifier toutes les langues disponibles"
-
 #: ../check-language-support:28
+msgid "output all available language support packages for all languages"
+msgstr ""
+
+#: ../check-language-support:31
 msgid "show installed packages as well as missing ones"
 msgstr "afficher à la fois les paquets installés et manquants"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/launchpad-integration.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/launchpad-integration.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/launchpad-integration.po	2012-01-02 17:27:16.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/launchpad-integration.po	2012-02-23 06:31:40.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:03+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:03+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: lib/launchpad-integration.c:71
 msgid "The Launchpad helper application failed"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ldm.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ldm.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ldm.po	2012-01-02 17:27:26.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ldm.po	2012-02-23 06:31:49.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:04+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:04+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: ../src/plugin.c:20
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ld.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ld.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ld.po	2012-01-02 17:26:43.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ld.po	2012-02-23 06:31:10.000000000 +0000
@@ -7,14 +7,14 @@
 "Project-Id-Version: ld 2.17.90\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-06-02 14:30+0100\n"
-"PO-Revision-Date: 2011-12-13 17:18+0000\n"
+"PO-Revision-Date: 2012-01-27 01:23+0000\n"
 "Last-Translator: FX <Unknown>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:16+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:32+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: emultempl/armcoff.em:73
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/lftp.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/lftp.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/lftp.po	2012-01-02 17:26:52.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/lftp.po	2012-02-23 06:31:18.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:34+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:29+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: lib/argmatch.c:133
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libapt-inst1.3.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libapt-inst1.3.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libapt-inst1.3.po	2012-01-02 17:26:42.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libapt-inst1.3.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,305 +0,0 @@
-# translation of apt to French
-# Advanced Package Transfer - APT message translation catalog
-# French messages
-#
-# Pierre Machard <pmachard@tuxfamily.org>, 2002,2003,2004.
-# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006, 2007, 2008, 2009, 2010, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-29 19:46+0000\n"
-"PO-Revision-Date: 2011-12-06 08:13+0000\n"
-"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
-"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:04+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
-"Language: \n"
-
-#: apt-inst/contrib/extracttar.cc:114
-msgid "Failed to create pipes"
-msgstr "Échec de création de tubes"
-
-#: apt-inst/contrib/extracttar.cc:141
-msgid "Failed to exec gzip "
-msgstr "Impossible d'exécuter gzip "
-
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
-msgid "Corrupted archive"
-msgstr "Archive corrompue"
-
-#: apt-inst/contrib/extracttar.cc:193
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Échec dans la somme de contrôle de tar, l'archive est corrompue"
-
-#: apt-inst/contrib/extracttar.cc:300
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Type d'en-tête %u inconnu pour TAR, partie %s"
-
-#: apt-inst/contrib/arfile.cc:70
-msgid "Invalid archive signature"
-msgstr "Signature d'archive invalide"
-
-#: apt-inst/contrib/arfile.cc:78
-msgid "Error reading archive member header"
-msgstr "Erreur de lecture de l'en-tête du membre d'archive"
-
-#: apt-inst/contrib/arfile.cc:90
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "En-tête du membre d'archive %s non valable"
-
-#: apt-inst/contrib/arfile.cc:102
-msgid "Invalid archive member header"
-msgstr "En-tête du membre d'archive non-valable"
-
-#: apt-inst/contrib/arfile.cc:128
-msgid "Archive is too short"
-msgstr "L'archive est trop petite"
-
-#: apt-inst/contrib/arfile.cc:132
-msgid "Failed to read the archive headers"
-msgstr "Échec de la lecture des en-têtes d'archive"
-
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode appelé sur un nœud toujours lié"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Impossible de situer l'élément haché !"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Échec lors de l'allocation de la déviation"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Erreur interne dans AddDiversion"
-
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Essaye d'écraser une déviation, %s -> %s et %s/%s"
-
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Addition double d'une déviation %s -> %s"
-
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Fichier de configuration en double %s/%s"
-
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Erreur d'écriture du fichier %s"
-
-#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Échec de clôture du fichier %s"
-
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
-#, c-format
-msgid "The path %s is too long"
-msgstr "Le chemin %s est trop long"
-
-#: apt-inst/extract.cc:124
-#, c-format
-msgid "Unpacking %s more than once"
-msgstr "Veuillez décompresser %s plus d'une fois"
-
-#: apt-inst/extract.cc:134
-#, c-format
-msgid "The directory %s is diverted"
-msgstr "Le répertoire %s est détourné"
-
-#: apt-inst/extract.cc:144
-#, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr ""
-"Le paquet est en train d'essayer d'écrire sur la cible détournée %s/%s"
-
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
-msgid "The diversion path is too long"
-msgstr "Le chemin de déviation est trop long"
-
-#: apt-inst/extract.cc:178 apt-inst/extract.cc:190 apt-inst/extract.cc:207
-#: apt-inst/deb/dpkgdb.cc:117
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Impossible de statuer %s"
-
-#: apt-inst/extract.cc:185
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Impossible de changer le nom %s en %s"
-
-#: apt-inst/extract.cc:240
-#, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Le répertoire %s va être remplacé par un non-répertoire"
-
-#: apt-inst/extract.cc:280
-msgid "Failed to locate node in its hash bucket"
-msgstr "Échec pour localiser le nœud dans la table de hachage"
-
-#: apt-inst/extract.cc:284
-msgid "The path is too long"
-msgstr "Le chemin est trop long"
-
-#: apt-inst/extract.cc:412
-#, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Écrase la correspondance de paquet sans version pour %s"
-
-#: apt-inst/extract.cc:429
-#, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Le fichier %s/%s écrase celui inclus dans le paquet %s"
-
-#: apt-inst/extract.cc:462
-#, c-format
-msgid "Unable to read %s"
-msgstr "Impossible de lire %s"
-
-#: apt-inst/extract.cc:489
-#, c-format
-msgid "Unable to stat %s"
-msgstr "Impossible de statuer pour %s."
-
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
-#, c-format
-msgid "Failed to remove %s"
-msgstr "Impossible de supprimer %s"
-
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
-#, c-format
-msgid "Unable to create %s"
-msgstr "Impossible de créer %s"
-
-#: apt-inst/deb/dpkgdb.cc:114
-#, c-format
-msgid "Failed to stat %sinfo"
-msgstr "Impossible de statuer pour %sinfo"
-
-#: apt-inst/deb/dpkgdb.cc:119
-msgid "The info and temp directories need to be on the same filesystem"
-msgstr ""
-"Les répertoires info et temp doivent se trouver sur le même système de "
-"fichiers"
-
-#: apt-inst/deb/dpkgdb.cc:135
-msgid "Reading package lists"
-msgstr "Lecture des listes de paquets"
-
-#: apt-inst/deb/dpkgdb.cc:176
-#, c-format
-msgid "Failed to change to the admin dir %sinfo"
-msgstr "Impossible de changer pour le répertoire d'administration %sinfo"
-
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
-msgid "Internal error getting a package name"
-msgstr "Erreur interne lors de l'obtention d'un nom de paquet"
-
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
-msgid "Reading file listing"
-msgstr "Lecture de la liste de fichiers"
-
-#: apt-inst/deb/dpkgdb.cc:212
-#, c-format
-msgid ""
-"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
-"then make it empty and immediately re-install the same version of the "
-"package!"
-msgstr ""
-"Impossible d'ouvrir le fichier de liste « %sinfo/%s ». Si vous ne parvenez "
-"pas à restaurer ce fichier, veuillez le vider et réinstaller immédiatement "
-"la même version du paquet !"
-
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
-#, c-format
-msgid "Failed reading the list file %sinfo/%s"
-msgstr "Échec de la lecture du fichier de liste %sinfo/%s"
-
-#: apt-inst/deb/dpkgdb.cc:262
-msgid "Internal error getting a node"
-msgstr "Erreur interne lors de l'obtention d'un Nœud"
-
-#: apt-inst/deb/dpkgdb.cc:305
-#, c-format
-msgid "Failed to open the diversions file %sdiversions"
-msgstr "Impossible d'ouvrir le fichier des déviations %sdiversions"
-
-#: apt-inst/deb/dpkgdb.cc:320
-msgid "The diversion file is corrupted"
-msgstr "Le fichier des déviations est corrompu"
-
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
-#, c-format
-msgid "Invalid line in the diversion file: %s"
-msgstr "Ligne invalide dans le fichier des déviations : %s"
-
-#: apt-inst/deb/dpkgdb.cc:358
-msgid "Internal error adding a diversion"
-msgstr "Erreur interne en ajoutant une déviation"
-
-#: apt-inst/deb/dpkgdb.cc:379
-msgid "The pkg cache must be initialized first"
-msgstr "Le cache des paquets doit être initialisé en premier"
-
-#: apt-inst/deb/dpkgdb.cc:439
-#, c-format
-msgid "Failed to find a Package: header, offset %lu"
-msgstr "Impossible de trouver un en-tête « Package: », décalage %lu"
-
-#: apt-inst/deb/dpkgdb.cc:461
-#, c-format
-msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr ""
-"Mauvaise section « ConfFile » dans le fichier « status ». Décalage %lu"
-
-#: apt-inst/deb/dpkgdb.cc:466
-#, c-format
-msgid "Error parsing MD5. Offset %lu"
-msgstr "Erreur lors du traitement de la somme MD5. Décalage %lu"
-
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
-#, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Ce n'est pas une archive DEB valide,  partie « %s » manquante"
-
-#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr ""
-"Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s », « %s » "
-"ou « %s »"
-
-#: apt-inst/deb/debfile.cc:113
-#, c-format
-msgid "Couldn't change to %s"
-msgstr "Impossible d'accéder à %s"
-
-#: apt-inst/deb/debfile.cc:154
-#, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Erreur interne, ne peut localiser la partie %s"
-
-#: apt-inst/deb/debfile.cc:189
-msgid "Failed to locate a valid control file"
-msgstr "Impossible de localiser un fichier de contrôle valide"
-
-#: apt-inst/deb/debfile.cc:274
-msgid "Unparsable control file"
-msgstr "Fichier de contrôle non traitable"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libapt-inst1.4.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libapt-inst1.4.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libapt-inst1.4.po	1970-01-01 00:00:00.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libapt-inst1.4.po	2012-02-23 06:31:08.000000000 +0000
@@ -0,0 +1,305 @@
+# translation of apt to French
+# Advanced Package Transfer - APT message translation catalog
+# French messages
+#
+# Pierre Machard <pmachard@tuxfamily.org>, 2002,2003,2004.
+# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006, 2007, 2008, 2009, 2010, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: fr\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-02-14 10:00+0000\n"
+"PO-Revision-Date: 2012-02-14 13:13+0000\n"
+"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:25+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+"Language: \n"
+
+#: apt-inst/contrib/extracttar.cc:117
+msgid "Failed to create pipes"
+msgstr "Échec de création de tubes"
+
+#: apt-inst/contrib/extracttar.cc:144
+msgid "Failed to exec gzip "
+msgstr "Impossible d'exécuter gzip "
+
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+msgid "Corrupted archive"
+msgstr "Archive corrompue"
+
+#: apt-inst/contrib/extracttar.cc:196
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Échec dans la somme de contrôle de tar, l'archive est corrompue"
+
+#: apt-inst/contrib/extracttar.cc:303
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Type d'en-tête %u inconnu pour TAR, partie %s"
+
+#: apt-inst/contrib/arfile.cc:74
+msgid "Invalid archive signature"
+msgstr "Signature d'archive invalide"
+
+#: apt-inst/contrib/arfile.cc:82
+msgid "Error reading archive member header"
+msgstr "Erreur de lecture de l'en-tête du membre d'archive"
+
+#: apt-inst/contrib/arfile.cc:94
+#, c-format
+msgid "Invalid archive member header %s"
+msgstr "En-tête du membre d'archive %s non valable"
+
+#: apt-inst/contrib/arfile.cc:106
+msgid "Invalid archive member header"
+msgstr "En-tête du membre d'archive non-valable"
+
+#: apt-inst/contrib/arfile.cc:132
+msgid "Archive is too short"
+msgstr "L'archive est trop petite"
+
+#: apt-inst/contrib/arfile.cc:136
+msgid "Failed to read the archive headers"
+msgstr "Échec de la lecture des en-têtes d'archive"
+
+#: apt-inst/filelist.cc:382
+msgid "DropNode called on still linked node"
+msgstr "DropNode appelé sur un nœud toujours lié"
+
+#: apt-inst/filelist.cc:414
+msgid "Failed to locate the hash element!"
+msgstr "Impossible de situer l'élément haché !"
+
+#: apt-inst/filelist.cc:461
+msgid "Failed to allocate diversion"
+msgstr "Échec lors de l'allocation de la déviation"
+
+#: apt-inst/filelist.cc:466
+msgid "Internal error in AddDiversion"
+msgstr "Erreur interne dans AddDiversion"
+
+#: apt-inst/filelist.cc:479
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Essaye d'écraser une déviation, %s -> %s et %s/%s"
+
+#: apt-inst/filelist.cc:508
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "Addition double d'une déviation %s -> %s"
+
+#: apt-inst/filelist.cc:551
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Fichier de configuration en double %s/%s"
+
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Erreur d'écriture du fichier %s"
+
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Échec de clôture du fichier %s"
+
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#, c-format
+msgid "The path %s is too long"
+msgstr "Le chemin %s est trop long"
+
+#: apt-inst/extract.cc:127
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "Veuillez décompresser %s plus d'une fois"
+
+#: apt-inst/extract.cc:137
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "Le répertoire %s est détourné"
+
+#: apt-inst/extract.cc:147
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr ""
+"Le paquet est en train d'essayer d'écrire sur la cible détournée %s/%s"
+
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+msgid "The diversion path is too long"
+msgstr "Le chemin de déviation est trop long"
+
+#: apt-inst/extract.cc:181 apt-inst/extract.cc:193 apt-inst/extract.cc:210
+#: apt-inst/deb/dpkgdb.cc:121
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Impossible de statuer %s"
+
+#: apt-inst/extract.cc:188
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Impossible de changer le nom %s en %s"
+
+#: apt-inst/extract.cc:243
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Le répertoire %s va être remplacé par un non-répertoire"
+
+#: apt-inst/extract.cc:283
+msgid "Failed to locate node in its hash bucket"
+msgstr "Échec pour localiser le nœud dans la table de hachage"
+
+#: apt-inst/extract.cc:287
+msgid "The path is too long"
+msgstr "Le chemin est trop long"
+
+#: apt-inst/extract.cc:415
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr "Écrase la correspondance de paquet sans version pour %s"
+
+#: apt-inst/extract.cc:432
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Le fichier %s/%s écrase celui inclus dans le paquet %s"
+
+#: apt-inst/extract.cc:465
+#, c-format
+msgid "Unable to read %s"
+msgstr "Impossible de lire %s"
+
+#: apt-inst/extract.cc:492
+#, c-format
+msgid "Unable to stat %s"
+msgstr "Impossible de statuer pour %s."
+
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
+#, c-format
+msgid "Failed to remove %s"
+msgstr "Impossible de supprimer %s"
+
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
+#, c-format
+msgid "Unable to create %s"
+msgstr "Impossible de créer %s"
+
+#: apt-inst/deb/dpkgdb.cc:118
+#, c-format
+msgid "Failed to stat %sinfo"
+msgstr "Impossible de statuer pour %sinfo"
+
+#: apt-inst/deb/dpkgdb.cc:123
+msgid "The info and temp directories need to be on the same filesystem"
+msgstr ""
+"Les répertoires info et temp doivent se trouver sur le même système de "
+"fichiers"
+
+#: apt-inst/deb/dpkgdb.cc:139
+msgid "Reading package lists"
+msgstr "Lecture des listes de paquets"
+
+#: apt-inst/deb/dpkgdb.cc:180
+#, c-format
+msgid "Failed to change to the admin dir %sinfo"
+msgstr "Impossible de changer pour le répertoire d'administration %sinfo"
+
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
+msgid "Internal error getting a package name"
+msgstr "Erreur interne lors de l'obtention d'un nom de paquet"
+
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
+msgid "Reading file listing"
+msgstr "Lecture de la liste de fichiers"
+
+#: apt-inst/deb/dpkgdb.cc:216
+#, c-format
+msgid ""
+"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
+"then make it empty and immediately re-install the same version of the "
+"package!"
+msgstr ""
+"Impossible d'ouvrir le fichier de liste « %sinfo/%s ». Si vous ne parvenez "
+"pas à restaurer ce fichier, veuillez le vider et réinstaller immédiatement "
+"la même version du paquet !"
+
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
+#, c-format
+msgid "Failed reading the list file %sinfo/%s"
+msgstr "Échec de la lecture du fichier de liste %sinfo/%s"
+
+#: apt-inst/deb/dpkgdb.cc:266
+msgid "Internal error getting a node"
+msgstr "Erreur interne lors de l'obtention d'un Nœud"
+
+#: apt-inst/deb/dpkgdb.cc:309
+#, c-format
+msgid "Failed to open the diversions file %sdiversions"
+msgstr "Impossible d'ouvrir le fichier des déviations %sdiversions"
+
+#: apt-inst/deb/dpkgdb.cc:324
+msgid "The diversion file is corrupted"
+msgstr "Le fichier des déviations est corrompu"
+
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
+#, c-format
+msgid "Invalid line in the diversion file: %s"
+msgstr "Ligne invalide dans le fichier des déviations : %s"
+
+#: apt-inst/deb/dpkgdb.cc:362
+msgid "Internal error adding a diversion"
+msgstr "Erreur interne en ajoutant une déviation"
+
+#: apt-inst/deb/dpkgdb.cc:383
+msgid "The pkg cache must be initialized first"
+msgstr "Le cache des paquets doit être initialisé en premier"
+
+#: apt-inst/deb/dpkgdb.cc:443
+#, c-format
+msgid "Failed to find a Package: header, offset %lu"
+msgstr "Impossible de trouver un en-tête « Package: », décalage %lu"
+
+#: apt-inst/deb/dpkgdb.cc:465
+#, c-format
+msgid "Bad ConfFile section in the status file. Offset %lu"
+msgstr ""
+"Mauvaise section « ConfFile » dans le fichier « status ». Décalage %lu"
+
+#: apt-inst/deb/dpkgdb.cc:470
+#, c-format
+msgid "Error parsing MD5. Offset %lu"
+msgstr "Erreur lors du traitement de la somme MD5. Décalage %lu"
+
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Ce n'est pas une archive DEB valide,  partie « %s » manquante"
+
+#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
+#: apt-inst/deb/debfile.cc:56
+#, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
+msgstr ""
+"Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s », « %s » "
+"ou « %s »"
+
+#: apt-inst/deb/debfile.cc:116
+#, c-format
+msgid "Couldn't change to %s"
+msgstr "Impossible d'accéder à %s"
+
+#: apt-inst/deb/debfile.cc:157
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "Erreur interne, ne peut localiser la partie %s"
+
+#: apt-inst/deb/debfile.cc:192
+msgid "Failed to locate a valid control file"
+msgstr "Impossible de localiser un fichier de contrôle valide"
+
+#: apt-inst/deb/debfile.cc:277
+msgid "Unparsable control file"
+msgstr "Fichier de contrôle non traitable"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libapt-pkg4.11.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libapt-pkg4.11.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libapt-pkg4.11.po	2012-01-02 17:26:42.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libapt-pkg4.11.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,1746 +0,0 @@
-# translation of apt to French
-# Advanced Package Transfer - APT message translation catalog
-# French messages
-#
-# Pierre Machard <pmachard@tuxfamily.org>, 2002,2003,2004.
-# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006, 2007, 2008, 2009, 2010, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-29 19:46+0000\n"
-"PO-Revision-Date: 2011-12-06 07:36+0000\n"
-"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
-"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:04+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
-"Language: \n"
-
-#: methods/bzip2.cc:60 methods/gzip.cc:52
-msgid "Empty files can't be valid archives"
-msgstr "Les fichiers vides ne peuvent être des archives valables"
-
-#: methods/bzip2.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Ne parvient pas à ouvrir le tube pour %s"
-
-#: methods/bzip2.cc:108
-#, c-format
-msgid "Read error from %s process"
-msgstr "Erreur de lecture du processus %s"
-
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:527
-#: methods/rred.cc:536
-msgid "Failed to stat"
-msgstr "Impossible de statuer"
-
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:533
-msgid "Failed to set modification time"
-msgstr "Impossible de modifier l'heure"
-
-#: methods/cdrom.cc:200
-#, c-format
-msgid "Unable to read the cdrom database %s"
-msgstr "Impossible de lire la base de données %s du cédérom"
-
-#: methods/cdrom.cc:209
-msgid ""
-"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
-"cannot be used to add new CD-ROMs"
-msgstr ""
-"Veuillez utiliser apt-cdrom afin de faire reconnaître ce cédérom par votre "
-"APT. apt-get update ne peut être employé pour ajouter de nouveaux cédéroms"
-
-#: methods/cdrom.cc:219
-msgid "Wrong CD-ROM"
-msgstr "Mauvais cédérom"
-
-#: methods/cdrom.cc:246
-#, c-format
-msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr ""
-"Impossible de démonter le cédérom dans %s, il doit toujours être en cours "
-"d'utilisation."
-
-#: methods/cdrom.cc:251
-msgid "Disk not found."
-msgstr "Disque non trouvé."
-
-#: methods/cdrom.cc:259 methods/file.cc:79 methods/rsh.cc:265
-msgid "File not found"
-msgstr "Fichier non trouvé"
-
-#: methods/file.cc:44
-msgid "Invalid URI, local URIS must not start with //"
-msgstr "Liens invalides, les liens locaux ne doivent pas débuter avec //"
-
-#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:169
-msgid "Logging in"
-msgstr "Connexion en cours"
-
-#: methods/ftp.cc:175
-msgid "Unable to determine the peer name"
-msgstr "Impossible de déterminer le nom de la machine distante"
-
-#: methods/ftp.cc:180
-msgid "Unable to determine the local name"
-msgstr "Impossible de déterminer le nom local"
-
-#: methods/ftp.cc:211 methods/ftp.cc:239
-#, c-format
-msgid "The server refused the connection and said: %s"
-msgstr "Le serveur a refusé notre connexion et a répondu : %s"
-
-#: methods/ftp.cc:217
-#, c-format
-msgid "USER failed, server said: %s"
-msgstr "USER incorrect, le serveur a répondu : %s"
-
-#: methods/ftp.cc:224
-#, c-format
-msgid "PASS failed, server said: %s"
-msgstr "PASS incorrect, le serveur a répondu : %s"
-
-#: methods/ftp.cc:244
-msgid ""
-"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
-"is empty."
-msgstr ""
-"Un serveur proxy a été spécifié, mais aucun script de connexion, "
-"Acquire::ftp::ProxyLogin est vide."
-
-#: methods/ftp.cc:272
-#, c-format
-msgid "Login script command '%s' failed, server said: %s"
-msgstr ""
-"La commande « %s » du script de connexion a échoué, le serveur a répondu : %s"
-
-#: methods/ftp.cc:298
-#, c-format
-msgid "TYPE failed, server said: %s"
-msgstr "Échec de TYPE, le serveur a répondu : %s"
-
-#: methods/ftp.cc:336 methods/ftp.cc:447 methods/rsh.cc:184 methods/rsh.cc:227
-msgid "Connection timeout"
-msgstr "Dépassement du délai de connexion"
-
-#: methods/ftp.cc:342
-msgid "Server closed the connection"
-msgstr "Le serveur a fermé la connexion"
-
-#: methods/ftp.cc:345 apt-pkg/contrib/fileutl.cc:831 methods/rsh.cc:191
-msgid "Read error"
-msgstr "Erreur de lecture"
-
-#: methods/ftp.cc:352 methods/rsh.cc:198
-msgid "A response overflowed the buffer."
-msgstr "Une réponse a fait déborder le tampon."
-
-#: methods/ftp.cc:369 methods/ftp.cc:381
-msgid "Protocol corruption"
-msgstr "Corruption du protocole"
-
-#: methods/ftp.cc:453 apt-pkg/contrib/fileutl.cc:873 methods/rsh.cc:233
-msgid "Write error"
-msgstr "Erreur d'écriture"
-
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
-msgid "Could not create a socket"
-msgstr "Impossible de créer un connecteur"
-
-#: methods/ftp.cc:704
-msgid "Could not connect data socket, connection timed out"
-msgstr ""
-"Impossible de se connecter sur le port de données, délai de connexion dépassé"
-
-#: methods/ftp.cc:708 methods/connect.cc:111
-msgid "Failed"
-msgstr "Échec"
-
-#: methods/ftp.cc:710
-msgid "Could not connect passive socket."
-msgstr "Impossible de se connecter au port en mode passif."
-
-#: methods/ftp.cc:728
-msgid "getaddrinfo was unable to get a listening socket"
-msgstr "gettaddrinfo n'a pu obtenir un port d'écoute"
-
-#: methods/ftp.cc:742
-msgid "Could not bind a socket"
-msgstr "Impossible de se connecter à un port"
-
-#: methods/ftp.cc:746
-msgid "Could not listen on the socket"
-msgstr "Impossible d'écouter sur le port"
-
-#: methods/ftp.cc:753
-msgid "Could not determine the socket's name"
-msgstr "Impossible de déterminer le nom du port"
-
-#: methods/ftp.cc:785
-msgid "Unable to send PORT command"
-msgstr "Impossible d'envoyer la commande PORT"
-
-#: methods/ftp.cc:795
-#, c-format
-msgid "Unknown address family %u (AF_*)"
-msgstr "Famille d'adresses %u inconnue (AF_*)"
-
-#: methods/ftp.cc:804
-#, c-format
-msgid "EPRT failed, server said: %s"
-msgstr "EPRT a échoué, le serveur a répondu : %s"
-
-#: methods/ftp.cc:824
-msgid "Data socket connect timed out"
-msgstr "Délai de connexion au port de données dépassé"
-
-#: methods/ftp.cc:831
-msgid "Unable to accept connection"
-msgstr "Impossible d'accepter une connexion"
-
-#: methods/ftp.cc:870 methods/http.cc:1023 methods/rsh.cc:303
-msgid "Problem hashing file"
-msgstr "Problème de hachage du fichier"
-
-#: methods/ftp.cc:883
-#, c-format
-msgid "Unable to fetch file, server said '%s'"
-msgstr "Impossible de récupérer le fichier, le serveur a répondu « %s »"
-
-#: methods/ftp.cc:898 methods/rsh.cc:322
-msgid "Data socket timed out"
-msgstr "Pas de réponse du port données dans les délais"
-
-#: methods/ftp.cc:928
-#, c-format
-msgid "Data transfer failed, server said '%s'"
-msgstr "Le transfert de données a échoué, le serveur a répondu « %s »"
-
-#. Get the files information
-#: methods/ftp.cc:1005
-msgid "Query"
-msgstr "Requête"
-
-#: methods/ftp.cc:1117
-msgid "Unable to invoke "
-msgstr "Impossible d'invoquer "
-
-#: methods/connect.cc:71
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Connexion à %s (%s)"
-
-#: methods/connect.cc:82
-#, c-format
-msgid "[IP: %s %s]"
-msgstr "[IP : %s %s]"
-
-#: methods/connect.cc:89
-#, c-format
-msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "Impossible de créer de connexion pour %s (f=%u t=%u p=%u)"
-
-#: methods/connect.cc:95
-#, c-format
-msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "Impossible d'initialiser la connexion à %s: %s (%s)."
-
-#: methods/connect.cc:103
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Connexion à %s: %s (%s) impossible, délai de connexion dépassé"
-
-#: methods/connect.cc:121
-#, c-format
-msgid "Could not connect to %s:%s (%s)."
-msgstr "Connexion à %s: %s (%s) impossible."
-
-#. We say this mainly because the pause here is for the
-#. ssh connection that is still going
-#: methods/connect.cc:149 methods/rsh.cc:425
-#, c-format
-msgid "Connecting to %s"
-msgstr "Connexion à %s"
-
-#: methods/connect.cc:168 methods/connect.cc:187
-#, c-format
-msgid "Could not resolve '%s'"
-msgstr "Ne parvient pas à résoudre « %s »"
-
-#: methods/connect.cc:193
-#, c-format
-msgid "Temporary failure resolving '%s'"
-msgstr "Erreur temporaire de résolution de « %s »"
-
-#: methods/connect.cc:196
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr ""
-"Quelque chose d'imprévisible est survenu lors de la détermination de "
-"« %s:%s » (%i - %s)"
-
-#: methods/connect.cc:243
-#, c-format
-msgid "Unable to connect to %s:%s:"
-msgstr "Impossible de se connecter à %s:%s :"
-
-#: methods/gpgv.cc:166
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
-"Erreur interne : signature correcte, mais il est impossible de déterminer "
-"l'empreinte de la clé."
-
-#: methods/gpgv.cc:171
-msgid "At least one invalid signature was encountered."
-msgstr "Au moins une signature non valable a été rencontrée."
-
-#: methods/gpgv.cc:175
-msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
-msgstr ""
-"Impossible d'exécuter « gpgv » pour contrôler la signature (veuillez "
-"vérifier si gpgv est installé)."
-
-#: methods/gpgv.cc:180
-msgid "Unknown error executing gpgv"
-msgstr "Erreur inconnue à l'exécution de gpgv"
-
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
-msgid "The following signatures were invalid:\n"
-msgstr "Les signatures suivantes ne sont pas valables :\n"
-
-#: methods/gpgv.cc:228
-msgid ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
-msgstr ""
-"Les signatures suivantes n'ont pas pu être vérifiées car la clé publique "
-"n'est pas disponible :\n"
-
-#: methods/http.cc:385
-msgid "Waiting for headers"
-msgstr "Attente des fichiers d'en-tête"
-
-#: methods/http.cc:531
-#, c-format
-msgid "Got a single header line over %u chars"
-msgstr "J'ai une simple ligne d'en-tête au-dessus du caractère %u"
-
-#: methods/http.cc:539
-msgid "Bad header line"
-msgstr "Mauvaise ligne d'en-tête"
-
-#: methods/http.cc:564 methods/http.cc:571
-msgid "The HTTP server sent an invalid reply header"
-msgstr "Le serveur http a envoyé une réponse dont l'en-tête est invalide"
-
-#: methods/http.cc:600
-msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "Le serveur http a envoyé un en-tête « Content-Length » invalide"
-
-#: methods/http.cc:615
-msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "Le serveur http a envoyé un en-tête « Content-Range » invalide"
-
-#: methods/http.cc:617
-msgid "This HTTP server has broken range support"
-msgstr "Ce serveur http possède un support des limites non-valide"
-
-#: methods/http.cc:641
-msgid "Unknown date format"
-msgstr "Format de date inconnu"
-
-#: methods/http.cc:800
-msgid "Select failed"
-msgstr "Sélection défaillante"
-
-#: methods/http.cc:805
-msgid "Connection timed out"
-msgstr "Délai de connexion dépassé"
-
-#: methods/http.cc:828
-msgid "Error writing to output file"
-msgstr "Erreur d'écriture du fichier de sortie"
-
-#: methods/http.cc:859
-msgid "Error writing to file"
-msgstr "Erreur d'écriture sur un fichier"
-
-#: methods/http.cc:887
-msgid "Error writing to the file"
-msgstr "Erreur d'écriture sur le fichier"
-
-#: methods/http.cc:901
-msgid "Error reading from server. Remote end closed connection"
-msgstr ""
-"Erreur de lecture depuis le serveur distant et clôture de la connexion"
-
-#: methods/http.cc:903
-msgid "Error reading from server"
-msgstr "Erreur de lecture du serveur"
-
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Échec de la troncature du fichier"
-
-#: methods/http.cc:1183
-msgid "Bad header data"
-msgstr "Mauvais en-tête de donnée"
-
-#: methods/http.cc:1200 methods/http.cc:1255
-msgid "Connection failed"
-msgstr "Échec de la connexion"
-
-#: methods/http.cc:1347
-msgid "Internal error"
-msgstr "Erreur interne"
-
-#: apt-pkg/contrib/mmap.cc:77
-msgid "Can't mmap an empty file"
-msgstr "Impossible de mapper un fichier vide en mémoire"
-
-#: apt-pkg/contrib/mmap.cc:89
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Impossible de dupliquer le descripteur de fichier %i"
-
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Impossible de réaliser un mapping de %lu octets en mémoire"
-
-#: apt-pkg/contrib/mmap.cc:124
-msgid "Unable to close mmap"
-msgstr "Impossible de fermer la « mmap »"
-
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
-msgid "Unable to synchronize mmap"
-msgstr "Impossible de synchroniser la « mmap »"
-
-#: apt-pkg/contrib/mmap.cc:310
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"La zone dynamique d'allocation mémoire (« Dynamic MMap ») n'a plus de place. "
-"Vous devriez augmenter la taille de APT::Cache-Limit, dont la valeur "
-"actuelle est de %lu (voir « man 5 apt.conf »)."
-
-#: apt-pkg/contrib/mmap.cc:409
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-"Impossible d'augmenter la taille de la « mmap » car la limite de %lu octets "
-"est déjà atteinte."
-
-#: apt-pkg/contrib/mmap.cc:412
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Impossible d'augmenter la taille de la « mmap » car l'augmentation "
-"automatique a été désactivée par une option utilisateur."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:371
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:390
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1138
-#, c-format
-msgid "Selection %s not found"
-msgstr "La sélection %s n'a pu être trouvée"
-
-#: apt-pkg/contrib/configuration.cc:465
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Type d'abréviation non reconnue : « %c »"
-
-#: apt-pkg/contrib/configuration.cc:523
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Ouverture du fichier de configuration %s"
-
-#: apt-pkg/contrib/configuration.cc:691
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Erreur syntaxique %s:%u : le bloc commence sans aucun nom."
-
-#: apt-pkg/contrib/configuration.cc:710
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Erreur syntaxique %s:%u : balise mal formée"
-
-#: apt-pkg/contrib/configuration.cc:727
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Erreur syntaxique %s:%u : valeur suivie de choses illicites"
-
-#: apt-pkg/contrib/configuration.cc:767
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr ""
-"Erreur syntaxique %s:%u : ces directives ne peuvent être appliquées qu'au "
-"niveau le plus haut"
-
-#: apt-pkg/contrib/configuration.cc:774
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Erreur syntaxique %s:%u: trop de niveaux d'imbrication d'includes"
-
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Erreur syntaxique %s:%u : inclus à partir d'ici"
-
-#: apt-pkg/contrib/configuration.cc:787
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Erreur syntaxique %s:%u : directive « %s » non tolérée"
-
-#: apt-pkg/contrib/configuration.cc:790
-#, c-format
-msgid ""
-"Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
-"Erreur de syntaxe %s:%u : la directive « clear » a besoin d'un arbre "
-"d'options comme paramètre"
-
-#: apt-pkg/contrib/configuration.cc:840
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Erreur syntaxique %s:%u : valeur aberrante à la fin du fichier"
-
-#: apt-pkg/contrib/progress.cc:144
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Erreur !"
-
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Fait"
-
-#: apt-pkg/contrib/cmndline.cc:77
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "L'option « %c » de la ligne de commande [d'origine %s] est inconnue."
-
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "L'option %s de la ligne de commande n'est pas reconnue"
-
-#: apt-pkg/contrib/cmndline.cc:124
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "L'option %s de la ligne de commande n'est pas une valeur booléenne"
-
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "L'option %s nécessite un argument."
-
-#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Option %s : l'item configuration doit être spécifiée avec un =<val>."
-
-#: apt-pkg/contrib/cmndline.cc:236
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "L'option %s prend un nombre entier en argument, et non « %s »"
-
-#: apt-pkg/contrib/cmndline.cc:267
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "L'option « %s » est trop longue"
-
-#: apt-pkg/contrib/cmndline.cc:300
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr ""
-"La signification %s n'est pas comprise, veuillez essayer vrai ou faux."
-
-#: apt-pkg/contrib/cmndline.cc:350
-#, c-format
-msgid "Invalid operation %s"
-msgstr "L'opération %s n'est pas valable"
-
-#: apt-pkg/contrib/cdromutl.cc:52
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Impossible de localiser le point de montage %s"
-
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:98
-#, c-format
-msgid "Unable to change to %s"
-msgstr "Impossible d'accéder à %s"
-
-#. Only warn if there are no sources.list.d.
-#. Only warn if there is no sources.list file.
-#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/fileutl.cc:343
-#: apt-pkg/sourcelist.cc:204 apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450
-#: apt-pkg/init.cc:108 apt-pkg/init.cc:116 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:356 methods/mirror.cc:92
-#, c-format
-msgid "Unable to read %s"
-msgstr "Impossible de lire %s"
-
-#: apt-pkg/contrib/cdromutl.cc:220
-msgid "Failed to stat the cdrom"
-msgstr "Impossible d'accéder au cédérom."
-
-#: apt-pkg/contrib/fileutl.cc:168
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Verrou non utilisé pour le fichier %s en lecture seule"
-
-#: apt-pkg/contrib/fileutl.cc:173
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Impossible d'ouvrir le fichier verrou %s"
-
-#: apt-pkg/contrib/fileutl.cc:191
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
-"Verrou non utilisé pour le fichier %s se situant sur une partition nfs"
-
-#: apt-pkg/contrib/fileutl.cc:195
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Impossible d'obtenir le verrou %s"
-
-#: apt-pkg/contrib/fileutl.cc:335
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
-"La liste des fichiers ne peut pas être créée car « %s » n'est pas un "
-"répertoire"
-
-#: apt-pkg/contrib/fileutl.cc:362
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
-"« %s » dans le répertoire « %s » a été ignoré car ce n'est pas un fichier "
-"ordinaire"
-
-#: apt-pkg/contrib/fileutl.cc:380
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
-"« %s » dans le répertoire « %s » a été ignoré car il n'utilise pas "
-"d'extension"
-
-#: apt-pkg/contrib/fileutl.cc:389
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
-"« %s » dans le répertoire « %s » a été ignoré car il utilise une extension "
-"non valable"
-
-#: apt-pkg/contrib/fileutl.cc:690
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "A attendu %s mais il n'était pas présent"
-
-#: apt-pkg/contrib/fileutl.cc:702
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Le sous-processus %s a commis une violation d'accès mémoire"
-
-#: apt-pkg/contrib/fileutl.cc:704
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Le sous-processus %s a reçu le signal %u"
-
-#: apt-pkg/contrib/fileutl.cc:708
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Le sous-processus %s a renvoyé un code d'erreur (%u)"
-
-#: apt-pkg/contrib/fileutl.cc:710
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Le sous-processus %s s'est arrêté prématurément"
-
-#: apt-pkg/contrib/fileutl.cc:775 apt-pkg/indexcopy.cc:673
-#, c-format
-msgid "Could not open file %s"
-msgstr "Impossible d'ouvrir le fichier %s"
-
-#: apt-pkg/contrib/fileutl.cc:792
-#, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Impossible d'ouvrir le descripteur de fichier %d"
-
-#: apt-pkg/contrib/fileutl.cc:852
-#, c-format
-msgid "read, still have %lu to read but none left"
-msgstr "lu(s), %lu restant à lire, mais rien n'est disponible"
-
-#: apt-pkg/contrib/fileutl.cc:885
-#, c-format
-msgid "write, still have %lu to write but couldn't"
-msgstr "écrit(s), %lu restant à écrire, mais l'écriture est impossible"
-
-#: apt-pkg/contrib/fileutl.cc:1021
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Problème de fermeture du fichier gzip %s"
-
-#: apt-pkg/contrib/fileutl.cc:1024
-#, c-format
-msgid "Problem closing the file %s"
-msgstr "Problème de fermeture du fichier %s"
-
-#: apt-pkg/contrib/fileutl.cc:1029
-#, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Problème de renommage du fichier %s en %s"
-
-#: apt-pkg/contrib/fileutl.cc:1040
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Problème de suppression du lien %s"
-
-#: apt-pkg/contrib/fileutl.cc:1053
-msgid "Problem syncing the file"
-msgstr "Problème de synchronisation du fichier"
-
-#: apt-pkg/pkgcache.cc:147
-msgid "Empty package cache"
-msgstr "Cache des paquets vide"
-
-#: apt-pkg/pkgcache.cc:153
-msgid "The package cache file is corrupted"
-msgstr "Le fichier de cache des paquets est corrompu"
-
-#: apt-pkg/pkgcache.cc:158
-msgid "The package cache file is an incompatible version"
-msgstr "Le fichier de cache des paquets a une version incompatible"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted, it is too small"
-msgstr "Le fichier cache des paquets est corrompu, il est trop petit"
-
-#: apt-pkg/pkgcache.cc:166
-#, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "Cet APT ne supporte pas le système de version « %s »"
-
-#: apt-pkg/pkgcache.cc:171
-msgid "The package cache was built for a different architecture"
-msgstr ""
-"Le cache des paquets a été construit pour une architecture différente"
-
-#: apt-pkg/pkgcache.cc:304
-msgid "Depends"
-msgstr "Dépend"
-
-#: apt-pkg/pkgcache.cc:304
-msgid "PreDepends"
-msgstr "Pré-Dépend"
-
-#: apt-pkg/pkgcache.cc:304
-msgid "Suggests"
-msgstr "Suggère"
-
-#: apt-pkg/pkgcache.cc:305
-msgid "Recommends"
-msgstr "Recommande"
-
-#: apt-pkg/pkgcache.cc:305
-msgid "Conflicts"
-msgstr "Est en conflit avec"
-
-#: apt-pkg/pkgcache.cc:305
-msgid "Replaces"
-msgstr "Remplace"
-
-#: apt-pkg/pkgcache.cc:306
-msgid "Obsoletes"
-msgstr "Rend obsolète"
-
-#: apt-pkg/pkgcache.cc:306
-msgid "Breaks"
-msgstr "Casse"
-
-#: apt-pkg/pkgcache.cc:306
-msgid "Enhances"
-msgstr "Améliore"
-
-#: apt-pkg/pkgcache.cc:317
-msgid "important"
-msgstr "important"
-
-#: apt-pkg/pkgcache.cc:317
-msgid "required"
-msgstr "nécessaire"
-
-#: apt-pkg/pkgcache.cc:317
-msgid "standard"
-msgstr "standard"
-
-#: apt-pkg/pkgcache.cc:318
-msgid "optional"
-msgstr "optionnel"
-
-#: apt-pkg/pkgcache.cc:318
-msgid "extra"
-msgstr "supplémentaire"
-
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
-msgid "Building dependency tree"
-msgstr "Construction de l'arbre des dépendances"
-
-#: apt-pkg/depcache.cc:126
-msgid "Candidate versions"
-msgstr "Versions possibles"
-
-#: apt-pkg/depcache.cc:155
-msgid "Dependency generation"
-msgstr "Génération des dépendances"
-
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
-msgid "Reading state information"
-msgstr "Lecture des informations d'état"
-
-#: apt-pkg/depcache.cc:237
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Impossible d'ouvrir le fichier d'état %s"
-
-#: apt-pkg/depcache.cc:243
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Erreur d'écriture du fichier d'état temporaire %s"
-
-#: apt-pkg/tagfile.cc:123
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Impossible de traiter le fichier %s (1)"
-
-#: apt-pkg/tagfile.cc:210
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Impossible de traiter le fichier %s (2)"
-
-#: apt-pkg/sourcelist.cc:92
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Ligne %lu mal formée dans la liste des sources %s (impossible d'analyser "
-"[option])"
-
-#: apt-pkg/sourcelist.cc:95
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"Ligne %lu mal formée dans la liste de sources %s ([option] trop courte)"
-
-#: apt-pkg/sourcelist.cc:106
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Ligne %lu mal formée dans la liste des sources %s ([%s] n'est pas une "
-"affectation)"
-
-#: apt-pkg/sourcelist.cc:112
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-"Ligne %lu mal formée dans la liste des sources %s ([%s] n'a pas de clé)"
-
-#: apt-pkg/sourcelist.cc:115
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Ligne %lu mal formée dans la liste des sources %s ([%s] la clé %s n'a pas de "
-"valeur)"
-
-#: apt-pkg/sourcelist.cc:128
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)"
-
-#: apt-pkg/sourcelist.cc:130
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)"
-
-#: apt-pkg/sourcelist.cc:133
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)"
-
-#: apt-pkg/sourcelist.cc:139
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
-"Ligne %lu mal formée dans la liste des sources %s (distribution absolue)"
-
-#: apt-pkg/sourcelist.cc:146
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-"Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)"
-
-#: apt-pkg/sourcelist.cc:244
-#, c-format
-msgid "Opening %s"
-msgstr "Ouverture de %s"
-
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "La ligne %u du fichier des listes de sources %s est trop longue."
-
-#: apt-pkg/sourcelist.cc:281
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Ligne %u mal formée dans la liste des sources %s (type)"
-
-#: apt-pkg/sourcelist.cc:285
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr ""
-"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
-
-#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:645
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"Impossible d'effectuer la configuration immédiate de « %s ». Veuillez "
-"consulter la page de manuel apt.conf(5) et notamment la section à propos de "
-"APT::Immediate-Configure, pour plus d'informations. (%d)"
-
-#: apt-pkg/packagemanager.cc:456
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-"Cette installation va temporairement nécessiter l'enlèvement du paquet "
-"essentiel %s en raison d'une boucle entre les champs Conflicts et Pre-"
-"Depends. C'est souvent une mauvaise chose, mais si vous souhaitez réellement "
-"le faire, activez l'option APT::Force-LoopBreak."
-
-#: apt-pkg/packagemanager.cc:501
-#, c-format
-msgid ""
-"Could not perform immediate configuration on already unpacked '%s'. Please "
-"see man 5 apt.conf under APT::Immediate-Configure for details."
-msgstr ""
-"Impossible d'effectuer la configuration immédiate du paquet « %s », déjà "
-"décompressé. Veuillez consulter la page de manuel apt.conf(5) et notamment "
-"la section à propos de APT::Immediate-Configure, pour plus d'informations."
-
-#: apt-pkg/pkgrecords.cc:32
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Le type de fichier d'index « %s » n'est pas accepté"
-
-#: apt-pkg/algorithms.cc:250
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Le paquet %s doit être réinstallé, mais il est impossible de trouver son "
-"archive."
-
-#: apt-pkg/algorithms.cc:1186
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Erreur, pkgProblemResolver::Resolve a généré des ruptures, ce qui a pu être "
-"causé par les paquets devant être gardés en l'état."
-
-#: apt-pkg/algorithms.cc:1188
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-"Impossible de corriger les problèmes, des paquets défectueux sont en mode "
-"« garder en l'état »."
-
-#: apt-pkg/algorithms.cc:1481
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Impossible de récupérer %s  %s\n"
-
-#: apt-pkg/algorithms.cc:1507 apt-pkg/algorithms.cc:1509
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Le téléchargement de quelques fichiers d'index a échoué, ils ont été "
-"ignorés, ou les anciens ont été utilisés à la place."
-
-#: apt-pkg/acquire.cc:79
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Le répertoire %spartial pour les listes n'existe pas."
-
-#: apt-pkg/acquire.cc:83
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Le répertoire d'archive %spartial n'existe pas."
-
-#: apt-pkg/acquire.cc:91
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Impossible de verrouiller le répertoire %s"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:858
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Téléchargement du fichier %li sur %li (%s restant)"
-
-#: apt-pkg/acquire.cc:860
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Téléchargement du fichier %li sur %li"
-
-#: apt-pkg/acquire-worker.cc:110
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Le pilote pour la méthode %s n'a pu être trouvé."
-
-#: apt-pkg/acquire-worker.cc:159
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "La méthode %s n'a pas démarré correctement"
-
-#: apt-pkg/acquire-worker.cc:423
-#, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la "
-"touche Entrée."
-
-#: apt-pkg/init.cc:151
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Le système de paquet « %s » n'est pas supporté"
-
-#: apt-pkg/init.cc:167
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Impossible de déterminer un type du système de paquets adéquat"
-
-#: apt-pkg/clean.cc:56
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Impossible de localiser %s."
-
-#: apt-pkg/srcrecords.cc:44
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-"Vous devez insérer quelques adresses « sources » dans votre sources.list"
-
-#: apt-pkg/cachefile.cc:84
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"Les listes de paquets ou le fichier « status » ne peuvent être analysés ou "
-"lus."
-
-#: apt-pkg/cachefile.cc:88
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "Vous pouvez lancer « apt-get update » pour corriger ces problèmes."
-
-#: apt-pkg/cachefile.cc:106
-msgid "The list of sources could not be read."
-msgstr "La liste des sources ne peut être lue."
-
-#: apt-pkg/policy.cc:71
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:393
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
-"Enregistrement non valable dans le fichier de préférences %s, aucune entrée "
-"« Package »."
-
-#: apt-pkg/policy.cc:415
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Étiquette %s inconnue"
-
-#: apt-pkg/policy.cc:423
-msgid "No priority (or zero) specified for pin"
-msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'étiquette"
-
-#: apt-pkg/pkgcachegen.cc:83
-msgid "Cache has an incompatible versioning system"
-msgstr "Le cache possède un système de version incompatible"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:209 apt-pkg/pkgcachegen.cc:275
-#: apt-pkg/pkgcachegen.cc:311 apt-pkg/pkgcachegen.cc:353
-#: apt-pkg/pkgcachegen.cc:357 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:384 apt-pkg/pkgcachegen.cc:388
-#: apt-pkg/pkgcachegen.cc:392 apt-pkg/pkgcachegen.cc:439
-#: apt-pkg/pkgcachegen.cc:470 apt-pkg/pkgcachegen.cc:484
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:232
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Vous avez dépassé le nombre de noms de paquets que cette version d'APT est "
-"capable de traiter."
-
-#: apt-pkg/pkgcachegen.cc:235
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Vous avez dépassé le nombre de versions que cette version d'APT est capable "
-"de traiter."
-
-#: apt-pkg/pkgcachegen.cc:238
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Vous avez dépassé le nombre de descriptions que cette version d'APT est "
-"capable de traiter."
-
-#: apt-pkg/pkgcachegen.cc:241
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Vous avez dépassé le nombre de dépendances que cette version d'APT est "
-"capable de traiter."
-
-#: apt-pkg/pkgcachegen.cc:491
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
-"Le paquet %s %s n'a pu être trouvé lors du traitement des dépendances des "
-"fichiers"
-
-#: apt-pkg/pkgcachegen.cc:1057
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Impossible de localiser la liste des paquets sources %s"
-
-#: apt-pkg/pkgcachegen.cc:1145 apt-pkg/pkgcachegen.cc:1249
-#: apt-pkg/pkgcachegen.cc:1255 apt-pkg/pkgcachegen.cc:1417
-msgid "Reading package lists"
-msgstr "Lecture des listes de paquets"
-
-#: apt-pkg/pkgcachegen.cc:1162
-msgid "Collecting File Provides"
-msgstr "Assemblage des fichiers listés dans les champs Provides"
-
-#: apt-pkg/pkgcachegen.cc:1246
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Impossible d'écrire sur %s"
-
-#: apt-pkg/pkgcachegen.cc:1356 apt-pkg/pkgcachegen.cc:1363
-msgid "IO Error saving source cache"
-msgstr ""
-"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
-
-#: apt-pkg/acquire-item.cc:135
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "impossible de changer le nom, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:636
-msgid "MD5Sum mismatch"
-msgstr "Somme de contrôle MD5 incohérente"
-
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1851
-#: apt-pkg/acquire-item.cc:1994
-msgid "Hash Sum mismatch"
-msgstr "Somme de contrôle de hachage incohérente"
-
-#: apt-pkg/acquire-item.cc:1387
-#, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-msgstr ""
-"Impossible de trouver l'entrée « %s » attendue dans le fichier « Release » : "
-" ligne non valable dans sources.list ou fichier corrompu"
-
-#: apt-pkg/acquire-item.cc:1403
-#, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
-"Impossible de trouver la comme de contrôle de « %s » dans le fichier Release"
-
-#: apt-pkg/acquire-item.cc:1438
-msgid "There is no public key available for the following key IDs:\n"
-msgstr ""
-"Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n"
-
-#: apt-pkg/acquire-item.cc:1476
-#, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1498
-#, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)"
-
-#: apt-pkg/acquire-item.cc:1531
-#, c-format
-msgid ""
-"A error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used. GPG error: %s: %s\n"
-msgstr ""
-"Une erreur s'est produite lors du contrôle de la signature. Le dépôt n'est "
-"pas mis à jour et les fichiers d'index précédents seront utilisés. Erreur de "
-"GPG : %s : %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1541 apt-pkg/acquire-item.cc:1546
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Erreur de GPG : %s : %s"
-
-#: apt-pkg/acquire-item.cc:1638
-#, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-msgstr ""
-"Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
-"devrez corriger ce paquet vous-même (absence d'architecture)."
-
-#: apt-pkg/acquire-item.cc:1697
-#, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package."
-msgstr ""
-"Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
-"devrez corriger ce paquet vous-même."
-
-#: apt-pkg/acquire-item.cc:1756
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
-"pour le paquet %s."
-
-#: apt-pkg/acquire-item.cc:1843
-msgid "Size mismatch"
-msgstr "Taille incohérente"
-
-#: apt-pkg/indexrecords.cc:53
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Impossible d'analyser le fichier Release %s"
-
-#: apt-pkg/indexrecords.cc:63
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Pas de sections dans le fichier Release %s"
-
-#: apt-pkg/indexrecords.cc:97
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Pas d'entrée de hachage dans le fichier Release %s"
-
-#: apt-pkg/indexrecords.cc:110
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Entrée « Valid-Until » non valable dans le fichier Release %s"
-
-#: apt-pkg/indexrecords.cc:129
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Entrée « Date » non valable dans le fichier Release %s"
-
-#: apt-pkg/vendorlist.cc:71
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Le bloc de fournisseur %s ne comporte pas d'empreinte"
-
-#: apt-pkg/cdrom.cc:525
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Utilisation du point de montage %s pour le cédérom\n"
-"Montage du cédérom\n"
-
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
-msgid "Identifying.. "
-msgstr "Identification... "
-
-#: apt-pkg/cdrom.cc:562
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Étiquette stockée : %s\n"
-
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
-msgid "Unmounting CD-ROM...\n"
-msgstr "Démontage du cédérom...\n"
-
-#: apt-pkg/cdrom.cc:591
-#, c-format
-msgid "Using CD-ROM mount point %s\n"
-msgstr "Utilisation du point de montage %s pour le cédérom\n"
-
-#: apt-pkg/cdrom.cc:609
-msgid "Unmounting CD-ROM\n"
-msgstr "Démontage du cédérom\n"
-
-#: apt-pkg/cdrom.cc:614
-msgid "Waiting for disc...\n"
-msgstr "Attente du disque...\n"
-
-#: apt-pkg/cdrom.cc:623
-msgid "Mounting CD-ROM...\n"
-msgstr "Montage du cédérom...\n"
-
-#: apt-pkg/cdrom.cc:642
-msgid "Scanning disc for index files..\n"
-msgstr "Examen du disque à la recherche de fichiers d'index...\n"
-
-#: apt-pkg/cdrom.cc:684
-#, c-format
-msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
-"%zu signatures\n"
-msgstr ""
-"%zu index de paquets trouvés, %zu index de sources, %zu index de traductions "
-"et %zu signatures\n"
-
-#: apt-pkg/cdrom.cc:695
-msgid ""
-"Unable to locate any package files, perhaps this is not a Debian Disc or the "
-"wrong architecture?"
-msgstr ""
-"Aucun fichier de paquets trouvé. Ceci n'est peut-être pas un disque Debian "
-"ou bien l'architecture est-elle incorrecte."
-
-#: apt-pkg/cdrom.cc:722
-#, c-format
-msgid "Found label '%s'\n"
-msgstr "Étiquette « %s » trouvée\n"
-
-#: apt-pkg/cdrom.cc:751
-msgid "That is not a valid name, try again.\n"
-msgstr "Ce nom n'est pas valable, veuillez recommencer.\n"
-
-#: apt-pkg/cdrom.cc:768
-#, c-format
-msgid ""
-"This disc is called: \n"
-"'%s'\n"
-msgstr ""
-"Ce disque s'appelle :\n"
-"« %s »\n"
-
-#: apt-pkg/cdrom.cc:770
-msgid "Copying package lists..."
-msgstr "Copie des listes de paquets..."
-
-#: apt-pkg/cdrom.cc:797
-msgid "Writing new source list\n"
-msgstr "Écriture de la nouvelle liste de sources\n"
-
-#: apt-pkg/cdrom.cc:805
-msgid "Source list entries for this disc are:\n"
-msgstr "Les entrées de listes de sources pour ce disque sont :\n"
-
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:927
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i enregistrements écrits.\n"
-
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:929
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i enregistrements écrits avec %i fichiers manquants.\n"
-
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr ""
-"%i enregistrements écrits avec %i fichiers qui ne correspondent pas\n"
-
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:935
-#, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"%i enregistrements écrits avec %i fichiers manquants et %i qui ne "
-"correspondent pas\n"
-
-#: apt-pkg/indexcopy.cc:537
-#, c-format
-msgid "Skipping nonexistent file %s"
-msgstr "Fichier %s inexistant ignoré"
-
-#: apt-pkg/indexcopy.cc:543
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Impossible de trouver l'enregistrement d'authentification pour %s"
-
-#: apt-pkg/indexcopy.cc:549
-#, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Somme de contrôle de hachage incohérente pour %s"
-
-#: apt-pkg/indexcopy.cc:677
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:708
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Pas de porte-clés installé dans %s."
-
-#: apt-pkg/cachefilter.cc:29
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Erreur de compilation de l'expression rationnelle - %s"
-
-#: apt-pkg/cacheset.cc:337
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "La version  « %s » de « %s » est introuvable"
-
-#: apt-pkg/cacheset.cc:340
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "La version « %s » de « %s » n'a pu être trouvée"
-
-#: apt-pkg/cacheset.cc:440
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Impossible de trouver le paquet %s"
-
-#: apt-pkg/cacheset.cc:447
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Impossible de trouver la tâche « %s »"
-
-#: apt-pkg/cacheset.cc:454
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr ""
-"Impossible de trouver de paquet correspondant à l'expression rationnelle "
-"« %s »"
-
-#: apt-pkg/cacheset.cc:467
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-"Impossible de choisir les versions du paquet « %s » qui n'est qu'un paquet "
-"virtuel"
-
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Impossible de choisir une version installée ou candidate du paquet « %s » "
-"qui n'en n'a aucune"
-
-#: apt-pkg/cacheset.cc:491
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-"Impossible de choisir une nouvelle version du paquet « %s » qui n'est qu'un "
-"paquet virtuel"
-
-#: apt-pkg/cacheset.cc:499
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-"Impossible de choisir une version candidate du paquet « %s » qui n'en n'a pas"
-
-#: apt-pkg/cacheset.cc:507
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"Impossible de choisir la version installée du paquet « %s » qui n'est pas "
-"installé"
-
-#: apt-pkg/edsp.cc:32 apt-pkg/edsp.cc:52
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:204
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:272
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:279
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:550 apt-pkg/edsp.cc:553 apt-pkg/edsp.cc:558
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:68
-#, c-format
-msgid "Installing %s"
-msgstr "Installation de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:69 apt-pkg/deb/dpkgpm.cc:863
-#, c-format
-msgid "Configuring %s"
-msgstr "Configuration de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:70 apt-pkg/deb/dpkgpm.cc:870
-#, c-format
-msgid "Removing %s"
-msgstr "Suppression de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:71
-#, c-format
-msgid "Completely removing %s"
-msgstr "Suppression complète de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:72
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "Disparition de %s constatée"
-
-#: apt-pkg/deb/dpkgpm.cc:73
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Exécution des actions différées (« trigger ») de %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:669
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Répertoire %s inexistant"
-
-#: apt-pkg/deb/dpkgpm.cc:684 apt-pkg/deb/dpkgpm.cc:704
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Impossible d'ouvrir le fichier « %s »"
-
-#: apt-pkg/deb/dpkgpm.cc:856
-#, c-format
-msgid "Preparing %s"
-msgstr "Préparation de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:857
-#, c-format
-msgid "Unpacking %s"
-msgstr "Décompression de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:862
-#, c-format
-msgid "Preparing to configure %s"
-msgstr "Préparation de la configuration de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:864
-#, c-format
-msgid "Installed %s"
-msgstr "%s installé"
-
-#: apt-pkg/deb/dpkgpm.cc:869
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Préparation de la suppression de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:871
-#, c-format
-msgid "Removed %s"
-msgstr "%s supprimé"
-
-#: apt-pkg/deb/dpkgpm.cc:876
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Préparation de la suppression complète de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:877
-#, c-format
-msgid "Completely removed %s"
-msgstr "%s complètement supprimé"
-
-#: apt-pkg/deb/dpkgpm.cc:1097
-msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-msgstr ""
-"Impossible d'écrire le journal, échec d'openpty()\n"
-"(/dev/pts est-il monté ?)\n"
-
-#: apt-pkg/deb/dpkgpm.cc:1128
-msgid "Running dpkg"
-msgstr "Exécution de dpkg"
-
-#: apt-pkg/deb/dpkgpm.cc:1353
-msgid "No apport report written because MaxReports is reached already"
-msgstr "Aucun rapport « apport » écrit car MaxReports a déjà été atteint"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1358
-msgid "dependency problems - leaving unconfigured"
-msgstr "problème de dépendances : laissé non configuré"
-
-#: apt-pkg/deb/dpkgpm.cc:1360
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Aucun rapport « apport » n'a été créé car le message d'erreur indique une "
-"erreur consécutive à un échec précédent."
-
-#: apt-pkg/deb/dpkgpm.cc:1366
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Aucun rapport « apport » n'a été créé car un disque plein a été signalé"
-
-#: apt-pkg/deb/dpkgpm.cc:1373
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Aucun « apport » n'a été créé car une erreur de dépassement de capacité "
-"mémoire a été signalée"
-
-#: apt-pkg/deb/dpkgpm.cc:1380 apt-pkg/deb/dpkgpm.cc:1386
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1407
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Aucun « apport » n'a été créé car une erreur d'entrée/sortie de dpkg a été "
-"signalée"
-
-#: apt-pkg/deb/debsystem.cc:79
-#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Impossible de verrouiller le répertoire d'administration (%s). Il est "
-"possible qu'un autre processus l'utilise."
-
-#: apt-pkg/deb/debsystem.cc:82
-#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-"Impossible de verrouiller le répertoire d'administration (%s). Avez-vous les "
-"privilèges du superutilisateur ?"
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:98
-#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"dpkg a été interrompu. Il est nécessaire d'utiliser « %s » pour corriger le "
-"problème. "
-
-#: apt-pkg/deb/debsystem.cc:116
-msgid "Not locked"
-msgstr "Non verrouillé"
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc:276
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "Aucun fichier miroir « %s » n'a été trouvé "
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc:283
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Impossible de lire le fichier miroir '%s'"
-
-#: methods/mirror.cc:438
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Miroir : %s]"
-
-#: methods/rred.cc:506
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Impossible de modifier %s avec mmap et l'utilisation des opérations de "
-"fichiers : le correctif semble être corrompu."
-
-#: methods/rred.cc:511
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Impossible de modifier %s avec mmap (sans échec particulier de mmap) : le "
-"correctif semble être corrompu."
-
-#: methods/rsh.cc:91
-msgid "Failed to create IPC pipe to subprocess"
-msgstr "Impossible de créer le tube IPC sur le sous-processus"
-
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Connexion fermée prématurément"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libapt-pkg4.12.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libapt-pkg4.12.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libapt-pkg4.12.po	1970-01-01 00:00:00.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libapt-pkg4.12.po	2012-02-23 06:31:08.000000000 +0000
@@ -0,0 +1,1764 @@
+# translation of apt to French
+# Advanced Package Transfer - APT message translation catalog
+# French messages
+#
+# Pierre Machard <pmachard@tuxfamily.org>, 2002,2003,2004.
+# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006, 2007, 2008, 2009, 2010, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: fr\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-02-14 10:00+0000\n"
+"PO-Revision-Date: 2012-02-14 13:46+0000\n"
+"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:26+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+"Language: \n"
+
+#: methods/bzip2.cc:63 methods/gzip.cc:54
+msgid "Empty files can't be valid archives"
+msgstr "Les fichiers vides ne peuvent être des archives valables"
+
+#: methods/bzip2.cc:67
+#, c-format
+msgid "Couldn't open pipe for %s"
+msgstr "Ne parvient pas à ouvrir le tube pour %s"
+
+#: methods/bzip2.cc:111
+#, c-format
+msgid "Read error from %s process"
+msgstr "Erreur de lecture du processus %s"
+
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:498
+#: methods/rred.cc:507
+msgid "Failed to stat"
+msgstr "Impossible de statuer"
+
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:504
+msgid "Failed to set modification time"
+msgstr "Impossible de modifier l'heure"
+
+#: methods/cdrom.cc:203
+#, c-format
+msgid "Unable to read the cdrom database %s"
+msgstr "Impossible de lire la base de données %s du cédérom"
+
+#: methods/cdrom.cc:212
+msgid ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
+msgstr ""
+"Veuillez utiliser apt-cdrom afin de faire reconnaître ce cédérom par votre "
+"APT. apt-get update ne peut être employé pour ajouter de nouveaux cédéroms"
+
+#: methods/cdrom.cc:222
+msgid "Wrong CD-ROM"
+msgstr "Mauvais cédérom"
+
+#: methods/cdrom.cc:249
+#, c-format
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgstr ""
+"Impossible de démonter le cédérom dans %s, il doit toujours être en cours "
+"d'utilisation."
+
+#: methods/cdrom.cc:254
+msgid "Disk not found."
+msgstr "Disque non trouvé."
+
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
+msgid "File not found"
+msgstr "Fichier non trouvé"
+
+#: methods/file.cc:47
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "Liens invalides, les liens locaux ne doivent pas débuter avec //"
+
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:172
+msgid "Logging in"
+msgstr "Connexion en cours"
+
+#: methods/ftp.cc:178
+msgid "Unable to determine the peer name"
+msgstr "Impossible de déterminer le nom de la machine distante"
+
+#: methods/ftp.cc:183
+msgid "Unable to determine the local name"
+msgstr "Impossible de déterminer le nom local"
+
+#: methods/ftp.cc:214 methods/ftp.cc:242
+#, c-format
+msgid "The server refused the connection and said: %s"
+msgstr "Le serveur a refusé notre connexion et a répondu : %s"
+
+#: methods/ftp.cc:220
+#, c-format
+msgid "USER failed, server said: %s"
+msgstr "USER incorrect, le serveur a répondu : %s"
+
+#: methods/ftp.cc:227
+#, c-format
+msgid "PASS failed, server said: %s"
+msgstr "PASS incorrect, le serveur a répondu : %s"
+
+#: methods/ftp.cc:247
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
+msgstr ""
+"Un serveur proxy a été spécifié, mais aucun script de connexion, "
+"Acquire::ftp::ProxyLogin est vide."
+
+#: methods/ftp.cc:275
+#, c-format
+msgid "Login script command '%s' failed, server said: %s"
+msgstr ""
+"La commande « %s » du script de connexion a échoué, le serveur a répondu : %s"
+
+#: methods/ftp.cc:301
+#, c-format
+msgid "TYPE failed, server said: %s"
+msgstr "Échec de TYPE, le serveur a répondu : %s"
+
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
+msgid "Connection timeout"
+msgstr "Dépassement du délai de connexion"
+
+#: methods/ftp.cc:345
+msgid "Server closed the connection"
+msgstr "Le serveur a fermé la connexion"
+
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1077
+#: apt-pkg/contrib/fileutl.cc:1080 methods/rsh.cc:197
+msgid "Read error"
+msgstr "Erreur de lecture"
+
+#: methods/ftp.cc:355 methods/rsh.cc:204
+msgid "A response overflowed the buffer."
+msgstr "Une réponse a fait déborder le tampon."
+
+#: methods/ftp.cc:372 methods/ftp.cc:384
+msgid "Protocol corruption"
+msgstr "Corruption du protocole"
+
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1154 methods/rsh.cc:239
+msgid "Write error"
+msgstr "Erreur d'écriture"
+
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
+msgid "Could not create a socket"
+msgstr "Impossible de créer un connecteur"
+
+#: methods/ftp.cc:707
+msgid "Could not connect data socket, connection timed out"
+msgstr ""
+"Impossible de se connecter sur le port de données, délai de connexion dépassé"
+
+#: methods/ftp.cc:711 methods/connect.cc:115
+msgid "Failed"
+msgstr "Échec"
+
+#: methods/ftp.cc:713
+msgid "Could not connect passive socket."
+msgstr "Impossible de se connecter au port en mode passif."
+
+#: methods/ftp.cc:731
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "gettaddrinfo n'a pu obtenir un port d'écoute"
+
+#: methods/ftp.cc:745
+msgid "Could not bind a socket"
+msgstr "Impossible de se connecter à un port"
+
+#: methods/ftp.cc:749
+msgid "Could not listen on the socket"
+msgstr "Impossible d'écouter sur le port"
+
+#: methods/ftp.cc:756
+msgid "Could not determine the socket's name"
+msgstr "Impossible de déterminer le nom du port"
+
+#: methods/ftp.cc:788
+msgid "Unable to send PORT command"
+msgstr "Impossible d'envoyer la commande PORT"
+
+#: methods/ftp.cc:798
+#, c-format
+msgid "Unknown address family %u (AF_*)"
+msgstr "Famille d'adresses %u inconnue (AF_*)"
+
+#: methods/ftp.cc:807
+#, c-format
+msgid "EPRT failed, server said: %s"
+msgstr "EPRT a échoué, le serveur a répondu : %s"
+
+#: methods/ftp.cc:827
+msgid "Data socket connect timed out"
+msgstr "Délai de connexion au port de données dépassé"
+
+#: methods/ftp.cc:834
+msgid "Unable to accept connection"
+msgstr "Impossible d'accepter une connexion"
+
+#: methods/ftp.cc:873 methods/http.cc:1034 methods/rsh.cc:309
+msgid "Problem hashing file"
+msgstr "Problème de hachage du fichier"
+
+#: methods/ftp.cc:886
+#, c-format
+msgid "Unable to fetch file, server said '%s'"
+msgstr "Impossible de récupérer le fichier, le serveur a répondu « %s »"
+
+#: methods/ftp.cc:901 methods/rsh.cc:328
+msgid "Data socket timed out"
+msgstr "Pas de réponse du port données dans les délais"
+
+#: methods/ftp.cc:931
+#, c-format
+msgid "Data transfer failed, server said '%s'"
+msgstr "Le transfert de données a échoué, le serveur a répondu « %s »"
+
+#. Get the files information
+#: methods/ftp.cc:1008
+msgid "Query"
+msgstr "Requête"
+
+#: methods/ftp.cc:1120
+msgid "Unable to invoke "
+msgstr "Impossible d'invoquer "
+
+#: methods/connect.cc:75
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Connexion à %s (%s)"
+
+#: methods/connect.cc:86
+#, c-format
+msgid "[IP: %s %s]"
+msgstr "[IP : %s %s]"
+
+#: methods/connect.cc:93
+#, c-format
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr "Impossible de créer de connexion pour %s (f=%u t=%u p=%u)"
+
+#: methods/connect.cc:99
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr "Impossible d'initialiser la connexion à %s: %s (%s)."
+
+#: methods/connect.cc:107
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Connexion à %s: %s (%s) impossible, délai de connexion dépassé"
+
+#: methods/connect.cc:125
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
+msgstr "Connexion à %s: %s (%s) impossible."
+
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc:153 methods/rsh.cc:431
+#, c-format
+msgid "Connecting to %s"
+msgstr "Connexion à %s"
+
+#: methods/connect.cc:172 methods/connect.cc:191
+#, c-format
+msgid "Could not resolve '%s'"
+msgstr "Ne parvient pas à résoudre « %s »"
+
+#: methods/connect.cc:197
+#, c-format
+msgid "Temporary failure resolving '%s'"
+msgstr "Erreur temporaire de résolution de « %s »"
+
+#: methods/connect.cc:200
+#, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
+msgstr ""
+"Quelque chose d'imprévisible est survenu lors de la détermination de "
+"« %s:%s » (%i - %s)"
+
+#: methods/connect.cc:247
+#, c-format
+msgid "Unable to connect to %s:%s:"
+msgstr "Impossible de se connecter à %s:%s :"
+
+#: methods/gpgv.cc:180
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr ""
+"Erreur interne : signature correcte, mais il est impossible de déterminer "
+"l'empreinte de la clé."
+
+#: methods/gpgv.cc:185
+msgid "At least one invalid signature was encountered."
+msgstr "Au moins une signature non valable a été rencontrée."
+
+#: methods/gpgv.cc:189
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
+msgstr ""
+"Impossible d'exécuter « gpgv » pour contrôler la signature (veuillez "
+"vérifier si gpgv est installé)."
+
+#: methods/gpgv.cc:194
+msgid "Unknown error executing gpgv"
+msgstr "Erreur inconnue à l'exécution de gpgv"
+
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
+msgid "The following signatures were invalid:\n"
+msgstr "Les signatures suivantes ne sont pas valables :\n"
+
+#: methods/gpgv.cc:242
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr ""
+"Les signatures suivantes n'ont pas pu être vérifiées car la clé publique "
+"n'est pas disponible :\n"
+
+#: methods/http.cc:393
+msgid "Waiting for headers"
+msgstr "Attente des fichiers d'en-tête"
+
+#: methods/http.cc:539
+#, c-format
+msgid "Got a single header line over %u chars"
+msgstr "J'ai une simple ligne d'en-tête au-dessus du caractère %u"
+
+#: methods/http.cc:547
+msgid "Bad header line"
+msgstr "Mauvaise ligne d'en-tête"
+
+#: methods/http.cc:572 methods/http.cc:579
+msgid "The HTTP server sent an invalid reply header"
+msgstr "Le serveur http a envoyé une réponse dont l'en-tête est invalide"
+
+#: methods/http.cc:608
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr "Le serveur http a envoyé un en-tête « Content-Length » invalide"
+
+#: methods/http.cc:623
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr "Le serveur http a envoyé un en-tête « Content-Range » invalide"
+
+#: methods/http.cc:625
+msgid "This HTTP server has broken range support"
+msgstr "Ce serveur http possède un support des limites non-valide"
+
+#: methods/http.cc:649
+msgid "Unknown date format"
+msgstr "Format de date inconnu"
+
+#: methods/http.cc:820
+msgid "Select failed"
+msgstr "Sélection défaillante"
+
+#: methods/http.cc:825
+msgid "Connection timed out"
+msgstr "Délai de connexion dépassé"
+
+#: methods/http.cc:848
+msgid "Error writing to output file"
+msgstr "Erreur d'écriture du fichier de sortie"
+
+#: methods/http.cc:879
+msgid "Error writing to file"
+msgstr "Erreur d'écriture sur un fichier"
+
+#: methods/http.cc:907
+msgid "Error writing to the file"
+msgstr "Erreur d'écriture sur le fichier"
+
+#: methods/http.cc:921
+msgid "Error reading from server. Remote end closed connection"
+msgstr ""
+"Erreur de lecture depuis le serveur distant et clôture de la connexion"
+
+#: methods/http.cc:923
+msgid "Error reading from server"
+msgstr "Erreur de lecture du serveur"
+
+#: methods/http.cc:1193
+msgid "Bad header data"
+msgstr "Mauvais en-tête de donnée"
+
+#: methods/http.cc:1210 methods/http.cc:1265
+msgid "Connection failed"
+msgstr "Échec de la connexion"
+
+#: methods/http.cc:1357
+msgid "Internal error"
+msgstr "Erreur interne"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Impossible de mapper un fichier vide en mémoire"
+
+#: apt-pkg/contrib/mmap.cc:109
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Impossible de dupliquer le descripteur de fichier %i"
+
+#: apt-pkg/contrib/mmap.cc:117
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:144
+msgid "Unable to close mmap"
+msgstr "Impossible de fermer la « mmap »"
+
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
+msgid "Unable to synchronize mmap"
+msgstr "Impossible de synchroniser la « mmap »"
+
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Impossible de réaliser un mapping de %lu octets en mémoire"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Échec de la troncature du fichier"
+
+#: apt-pkg/contrib/mmap.cc:330
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"La zone dynamique d'allocation mémoire (« Dynamic MMap ») n'a plus de place. "
+"Vous devriez augmenter la taille de APT::Cache-Limit, dont la valeur "
+"actuelle est de %lu (voir « man 5 apt.conf »)."
+
+#: apt-pkg/contrib/mmap.cc:429
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+"Impossible d'augmenter la taille de la « mmap » car la limite de %lu octets "
+"est déjà atteinte."
+
+#: apt-pkg/contrib/mmap.cc:432
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Impossible d'augmenter la taille de la « mmap » car l'augmentation "
+"automatique a été désactivée par une option utilisateur."
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:371
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:378
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:385
+#, c-format
+msgid "%limin %lis"
+msgstr "%limin %lis"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:390
+#, c-format
+msgid "%lis"
+msgstr "%lis"
+
+#: apt-pkg/contrib/strutl.cc:1165
+#, c-format
+msgid "Selection %s not found"
+msgstr "La sélection %s n'a pu être trouvée"
+
+#: apt-pkg/contrib/configuration.cc:474
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Type d'abréviation non reconnue : « %c »"
+
+#: apt-pkg/contrib/configuration.cc:532
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Ouverture du fichier de configuration %s"
+
+#: apt-pkg/contrib/configuration.cc:700
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Erreur syntaxique %s:%u : le bloc commence sans aucun nom."
+
+#: apt-pkg/contrib/configuration.cc:719
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Erreur syntaxique %s:%u : balise mal formée"
+
+#: apt-pkg/contrib/configuration.cc:736
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Erreur syntaxique %s:%u : valeur suivie de choses illicites"
+
+#: apt-pkg/contrib/configuration.cc:776
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr ""
+"Erreur syntaxique %s:%u : ces directives ne peuvent être appliquées qu'au "
+"niveau le plus haut"
+
+#: apt-pkg/contrib/configuration.cc:783
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Erreur syntaxique %s:%u: trop de niveaux d'imbrication d'includes"
+
+#: apt-pkg/contrib/configuration.cc:787 apt-pkg/contrib/configuration.cc:792
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Erreur syntaxique %s:%u : inclus à partir d'ici"
+
+#: apt-pkg/contrib/configuration.cc:796
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Erreur syntaxique %s:%u : directive « %s » non tolérée"
+
+#: apt-pkg/contrib/configuration.cc:799
+#, c-format
+msgid ""
+"Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Erreur de syntaxe %s:%u : la directive « clear » a besoin d'un arbre "
+"d'options comme paramètre"
+
+#: apt-pkg/contrib/configuration.cc:849
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Erreur syntaxique %s:%u : valeur aberrante à la fin du fichier"
+
+#: apt-pkg/contrib/progress.cc:146
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Erreur !"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Fait"
+
+#: apt-pkg/contrib/cmndline.cc:80
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "L'option « %c » de la ligne de commande [d'origine %s] est inconnue."
+
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "L'option %s de la ligne de commande n'est pas reconnue"
+
+#: apt-pkg/contrib/cmndline.cc:125
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "L'option %s de la ligne de commande n'est pas une valeur booléenne"
+
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "L'option %s nécessite un argument."
+
+#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Option %s : l'item configuration doit être spécifiée avec un =<val>."
+
+#: apt-pkg/contrib/cmndline.cc:235
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "L'option %s prend un nombre entier en argument, et non « %s »"
+
+#: apt-pkg/contrib/cmndline.cc:266
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "L'option « %s » est trop longue"
+
+#: apt-pkg/contrib/cmndline.cc:298
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr ""
+"La signification %s n'est pas comprise, veuillez essayer vrai ou faux."
+
+#: apt-pkg/contrib/cmndline.cc:348
+#, c-format
+msgid "Invalid operation %s"
+msgstr "L'opération %s n'est pas valable"
+
+#: apt-pkg/contrib/cdromutl.cc:56
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Impossible de localiser le point de montage %s"
+
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
+#, c-format
+msgid "Unable to change to %s"
+msgstr "Impossible d'accéder à %s"
+
+#. Only warn if there are no sources.list.d.
+#. Only warn if there is no sources.list file.
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:372
+#: apt-pkg/sourcelist.cc:208 apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456
+#: apt-pkg/init.cc:109 apt-pkg/init.cc:117 apt-pkg/clean.cc:36
+#: apt-pkg/policy.cc:359 methods/mirror.cc:95
+#, c-format
+msgid "Unable to read %s"
+msgstr "Impossible de lire %s"
+
+#: apt-pkg/contrib/cdromutl.cc:224
+msgid "Failed to stat the cdrom"
+msgstr "Impossible d'accéder au cédérom."
+
+#: apt-pkg/contrib/fileutl.cc:197
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Verrou non utilisé pour le fichier %s en lecture seule"
+
+#: apt-pkg/contrib/fileutl.cc:202
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Impossible d'ouvrir le fichier verrou %s"
+
+#: apt-pkg/contrib/fileutl.cc:220
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+"Verrou non utilisé pour le fichier %s se situant sur une partition nfs"
+
+#: apt-pkg/contrib/fileutl.cc:224
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Impossible d'obtenir le verrou %s"
+
+#: apt-pkg/contrib/fileutl.cc:364
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+"La liste des fichiers ne peut pas être créée car « %s » n'est pas un "
+"répertoire"
+
+#: apt-pkg/contrib/fileutl.cc:391
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+"« %s » dans le répertoire « %s » a été ignoré car ce n'est pas un fichier "
+"ordinaire"
+
+#: apt-pkg/contrib/fileutl.cc:409
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+"« %s » dans le répertoire « %s » a été ignoré car il n'utilise pas "
+"d'extension"
+
+#: apt-pkg/contrib/fileutl.cc:418
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+"« %s » dans le répertoire « %s » a été ignoré car il utilise une extension "
+"non valable"
+
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:996
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "A attendu %s mais il n'était pas présent"
+
+#: apt-pkg/contrib/fileutl.cc:731
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Le sous-processus %s a commis une violation d'accès mémoire"
+
+#: apt-pkg/contrib/fileutl.cc:733
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Le sous-processus %s a reçu le signal %u"
+
+#: apt-pkg/contrib/fileutl.cc:737
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Le sous-processus %s a renvoyé un code d'erreur (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:739
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Le sous-processus %s s'est arrêté prématurément"
+
+#: apt-pkg/contrib/fileutl.cc:878 apt-pkg/indexcopy.cc:655
+#, c-format
+msgid "Could not open file %s"
+msgstr "Impossible d'ouvrir le fichier %s"
+
+#: apt-pkg/contrib/fileutl.cc:929
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Impossible d'ouvrir le descripteur de fichier %d"
+
+#: apt-pkg/contrib/fileutl.cc:975
+msgid "Failed to create subprocess IPC"
+msgstr "Impossible de créer un sous-processus IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1024
+msgid "Failed to exec compressor "
+msgstr "Impossible d'exécuter la compression "
+
+#: apt-pkg/contrib/fileutl.cc:1102
+#, c-format
+msgid "read, still have %llu to read but none left"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1167
+#, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1427
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problème de fermeture du fichier gzip %s"
+
+#: apt-pkg/contrib/fileutl.cc:1431
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Problème de fermeture du fichier %s"
+
+#: apt-pkg/contrib/fileutl.cc:1436
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problème de renommage du fichier %s en %s"
+
+#: apt-pkg/contrib/fileutl.cc:1447
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Problème de suppression du lien %s"
+
+#: apt-pkg/contrib/fileutl.cc:1467
+msgid "Problem syncing the file"
+msgstr "Problème de synchronisation du fichier"
+
+#: apt-pkg/pkgcache.cc:148
+msgid "Empty package cache"
+msgstr "Cache des paquets vide"
+
+#: apt-pkg/pkgcache.cc:154
+msgid "The package cache file is corrupted"
+msgstr "Le fichier de cache des paquets est corrompu"
+
+#: apt-pkg/pkgcache.cc:159
+msgid "The package cache file is an incompatible version"
+msgstr "Le fichier de cache des paquets a une version incompatible"
+
+#: apt-pkg/pkgcache.cc:162
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Le fichier cache des paquets est corrompu, il est trop petit"
+
+#: apt-pkg/pkgcache.cc:167
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "Cet APT ne supporte pas le système de version « %s »"
+
+#: apt-pkg/pkgcache.cc:172
+msgid "The package cache was built for a different architecture"
+msgstr ""
+"Le cache des paquets a été construit pour une architecture différente"
+
+#: apt-pkg/pkgcache.cc:305
+msgid "Depends"
+msgstr "Dépend"
+
+#: apt-pkg/pkgcache.cc:305
+msgid "PreDepends"
+msgstr "Pré-Dépend"
+
+#: apt-pkg/pkgcache.cc:305
+msgid "Suggests"
+msgstr "Suggère"
+
+#: apt-pkg/pkgcache.cc:306
+msgid "Recommends"
+msgstr "Recommande"
+
+#: apt-pkg/pkgcache.cc:306
+msgid "Conflicts"
+msgstr "Est en conflit avec"
+
+#: apt-pkg/pkgcache.cc:306
+msgid "Replaces"
+msgstr "Remplace"
+
+#: apt-pkg/pkgcache.cc:307
+msgid "Obsoletes"
+msgstr "Rend obsolète"
+
+#: apt-pkg/pkgcache.cc:307
+msgid "Breaks"
+msgstr "Casse"
+
+#: apt-pkg/pkgcache.cc:307
+msgid "Enhances"
+msgstr "Améliore"
+
+#: apt-pkg/pkgcache.cc:318
+msgid "important"
+msgstr "important"
+
+#: apt-pkg/pkgcache.cc:318
+msgid "required"
+msgstr "nécessaire"
+
+#: apt-pkg/pkgcache.cc:318
+msgid "standard"
+msgstr "standard"
+
+#: apt-pkg/pkgcache.cc:319
+msgid "optional"
+msgstr "optionnel"
+
+#: apt-pkg/pkgcache.cc:319
+msgid "extra"
+msgstr "supplémentaire"
+
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
+msgid "Building dependency tree"
+msgstr "Construction de l'arbre des dépendances"
+
+#: apt-pkg/depcache.cc:133
+msgid "Candidate versions"
+msgstr "Versions possibles"
+
+#: apt-pkg/depcache.cc:162
+msgid "Dependency generation"
+msgstr "Génération des dépendances"
+
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
+msgid "Reading state information"
+msgstr "Lecture des informations d'état"
+
+#: apt-pkg/depcache.cc:244
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Impossible d'ouvrir le fichier d'état %s"
+
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Erreur d'écriture du fichier d'état temporaire %s"
+
+#: apt-pkg/tagfile.cc:126
+#, c-format
+msgid "Unable to parse package file %s (1)"
+msgstr "Impossible de traiter le fichier %s (1)"
+
+#: apt-pkg/tagfile.cc:213
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "Impossible de traiter le fichier %s (2)"
+
+#: apt-pkg/sourcelist.cc:96
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+"Ligne %lu mal formée dans la liste des sources %s (impossible d'analyser "
+"[option])"
+
+#: apt-pkg/sourcelist.cc:99
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr ""
+"Ligne %lu mal formée dans la liste de sources %s ([option] trop courte)"
+
+#: apt-pkg/sourcelist.cc:110
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr ""
+"Ligne %lu mal formée dans la liste des sources %s ([%s] n'est pas une "
+"affectation)"
+
+#: apt-pkg/sourcelist.cc:116
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
+"Ligne %lu mal formée dans la liste des sources %s ([%s] n'a pas de clé)"
+
+#: apt-pkg/sourcelist.cc:119
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Ligne %lu mal formée dans la liste des sources %s ([%s] la clé %s n'a pas de "
+"valeur)"
+
+#: apt-pkg/sourcelist.cc:132
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)"
+
+#: apt-pkg/sourcelist.cc:134
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)"
+
+#: apt-pkg/sourcelist.cc:137
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)"
+
+#: apt-pkg/sourcelist.cc:143
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr ""
+"Ligne %lu mal formée dans la liste des sources %s (distribution absolue)"
+
+#: apt-pkg/sourcelist.cc:150
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
+"Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)"
+
+#: apt-pkg/sourcelist.cc:248
+#, c-format
+msgid "Opening %s"
+msgstr "Ouverture de %s"
+
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "La ligne %u du fichier des listes de sources %s est trop longue."
+
+#: apt-pkg/sourcelist.cc:285
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Ligne %u mal formée dans la liste des sources %s (type)"
+
+#: apt-pkg/sourcelist.cc:289
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr ""
+"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
+
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:780
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"Impossible d'effectuer la configuration immédiate de « %s ». Veuillez "
+"consulter la page de manuel apt.conf(5) et notamment la section à propos de "
+"APT::Immediate-Configure, pour plus d'informations. (%d)"
+
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:507
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"Cette installation va temporairement nécessiter l'enlèvement du paquet "
+"essentiel %s en raison d'une boucle entre les champs Conflicts et Pre-"
+"Depends. C'est souvent une mauvaise chose, mais si vous souhaitez réellement "
+"le faire, activez l'option APT::Force-LoopBreak."
+
+#: apt-pkg/pkgrecords.cc:34
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Le type de fichier d'index « %s » n'est pas accepté"
+
+#: apt-pkg/algorithms.cc:255
+#, c-format
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Le paquet %s doit être réinstallé, mais il est impossible de trouver son "
+"archive."
+
+#: apt-pkg/algorithms.cc:1190
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Erreur, pkgProblemResolver::Resolve a généré des ruptures, ce qui a pu être "
+"causé par les paquets devant être gardés en l'état."
+
+#: apt-pkg/algorithms.cc:1192
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
+"Impossible de corriger les problèmes, des paquets défectueux sont en mode "
+"« garder en l'état »."
+
+#: apt-pkg/algorithms.cc:1491
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Impossible de récupérer %s  %s\n"
+
+#: apt-pkg/algorithms.cc:1517 apt-pkg/algorithms.cc:1519
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Le téléchargement de quelques fichiers d'index a échoué, ils ont été "
+"ignorés, ou les anciens ont été utilisés à la place."
+
+#: apt-pkg/acquire.cc:81
+#, c-format
+msgid "List directory %spartial is missing."
+msgstr "Le répertoire %spartial pour les listes n'existe pas."
+
+#: apt-pkg/acquire.cc:85
+#, c-format
+msgid "Archives directory %spartial is missing."
+msgstr "Le répertoire d'archive %spartial n'existe pas."
+
+#: apt-pkg/acquire.cc:93
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "Impossible de verrouiller le répertoire %s"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:864
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Téléchargement du fichier %li sur %li (%s restant)"
+
+#: apt-pkg/acquire.cc:866
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Téléchargement du fichier %li sur %li"
+
+#: apt-pkg/acquire-worker.cc:112
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Le pilote pour la méthode %s n'a pu être trouvé."
+
+#: apt-pkg/acquire-worker.cc:161
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "La méthode %s n'a pas démarré correctement"
+
+#: apt-pkg/acquire-worker.cc:425
+#, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la "
+"touche Entrée."
+
+#: apt-pkg/init.cc:152
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Le système de paquet « %s » n'est pas supporté"
+
+#: apt-pkg/init.cc:168
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Impossible de déterminer un type du système de paquets adéquat"
+
+#: apt-pkg/clean.cc:59
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Impossible de localiser %s."
+
+#: apt-pkg/srcrecords.cc:47
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+"Vous devez insérer quelques adresses « sources » dans votre sources.list"
+
+#: apt-pkg/cachefile.cc:87
+msgid "The package lists or status file could not be parsed or opened."
+msgstr ""
+"Les listes de paquets ou le fichier « status » ne peuvent être analysés ou "
+"lus."
+
+#: apt-pkg/cachefile.cc:91
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Vous pouvez lancer « apt-get update » pour corriger ces problèmes."
+
+#: apt-pkg/cachefile.cc:109
+msgid "The list of sources could not be read."
+msgstr "La liste des sources ne peut être lue."
+
+#: apt-pkg/policy.cc:74
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+"La valeur « %s » n'est pas valable pour APT::Default-Release car cette "
+"version ne fait pas partie des sources disponibles."
+
+#: apt-pkg/policy.cc:396
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr ""
+"Enregistrement non valable dans le fichier de préférences %s, aucune entrée "
+"« Package »."
+
+#: apt-pkg/policy.cc:418
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Étiquette %s inconnue"
+
+#: apt-pkg/policy.cc:426
+msgid "No priority (or zero) specified for pin"
+msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'étiquette"
+
+#: apt-pkg/pkgcachegen.cc:85
+msgid "Cache has an incompatible versioning system"
+msgstr "Le cache possède un système de version incompatible"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:234
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Vous avez dépassé le nombre de noms de paquets que cette version d'APT est "
+"capable de traiter."
+
+#: apt-pkg/pkgcachegen.cc:237
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+"Vous avez dépassé le nombre de versions que cette version d'APT est capable "
+"de traiter."
+
+#: apt-pkg/pkgcachegen.cc:240
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Vous avez dépassé le nombre de descriptions que cette version d'APT est "
+"capable de traiter."
+
+#: apt-pkg/pkgcachegen.cc:243
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Vous avez dépassé le nombre de dépendances que cette version d'APT est "
+"capable de traiter."
+
+#: apt-pkg/pkgcachegen.cc:517
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+"Le paquet %s %s n'a pu être trouvé lors du traitement des dépendances des "
+"fichiers"
+
+#: apt-pkg/pkgcachegen.cc:1082
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Impossible de localiser la liste des paquets sources %s"
+
+#: apt-pkg/pkgcachegen.cc:1170 apt-pkg/pkgcachegen.cc:1274
+#: apt-pkg/pkgcachegen.cc:1280 apt-pkg/pkgcachegen.cc:1436
+msgid "Reading package lists"
+msgstr "Lecture des listes de paquets"
+
+#: apt-pkg/pkgcachegen.cc:1187
+msgid "Collecting File Provides"
+msgstr "Assemblage des fichiers listés dans les champs Provides"
+
+#: apt-pkg/pkgcachegen.cc:1271
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Impossible d'écrire sur %s"
+
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
+msgid "IO Error saving source cache"
+msgstr ""
+"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
+
+#: apt-pkg/acquire-item.cc:139
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "impossible de changer le nom, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:640
+msgid "MD5Sum mismatch"
+msgstr "Somme de contrôle MD5 incohérente"
+
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
+msgid "Hash Sum mismatch"
+msgstr "Somme de contrôle de hachage incohérente"
+
+#: apt-pkg/acquire-item.cc:1399
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+"Impossible de trouver l'entrée « %s » attendue dans le fichier « Release » : "
+" ligne non valable dans sources.list ou fichier corrompu"
+
+#: apt-pkg/acquire-item.cc:1415
+#, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr ""
+"Impossible de trouver la comme de contrôle de « %s » dans le fichier Release"
+
+#: apt-pkg/acquire-item.cc:1450
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""
+"Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n"
+
+#: apt-pkg/acquire-item.cc:1488
+#, c-format
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
+"Le fichier « Release » pour %s a expiré (plus valable depuis %s). Les mises "
+"à jour depuis ce dépôt  ne s'effectueront pas."
+
+#: apt-pkg/acquire-item.cc:1510
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)"
+
+#: apt-pkg/acquire-item.cc:1543
+#, c-format
+msgid ""
+"A error occurred during the signature verification. The repository is not "
+"updated and the previous index files will be used. GPG error: %s: %s\n"
+msgstr ""
+"Une erreur s'est produite lors du contrôle de la signature. Le dépôt n'est "
+"pas mis à jour et les fichiers d'index précédents seront utilisés. Erreur de "
+"GPG : %s : %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1553 apt-pkg/acquire-item.cc:1558
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Erreur de GPG : %s : %s"
+
+#: apt-pkg/acquire-item.cc:1650
+#, c-format
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
+"devrez corriger ce paquet vous-même (absence d'architecture)."
+
+#: apt-pkg/acquire-item.cc:1709
+#, c-format
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package."
+msgstr ""
+"Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
+"devrez corriger ce paquet vous-même."
+
+#: apt-pkg/acquire-item.cc:1768
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
+"pour le paquet %s."
+
+#: apt-pkg/acquire-item.cc:1855
+msgid "Size mismatch"
+msgstr "Taille incohérente"
+
+#: apt-pkg/indexrecords.cc:61
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Impossible d'analyser le fichier Release %s"
+
+#: apt-pkg/indexrecords.cc:71
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Pas de sections dans le fichier Release %s"
+
+#: apt-pkg/indexrecords.cc:105
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Pas d'entrée de hachage dans le fichier Release %s"
+
+#: apt-pkg/indexrecords.cc:118
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Entrée « Valid-Until » non valable dans le fichier Release %s"
+
+#: apt-pkg/indexrecords.cc:137
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Entrée « Date » non valable dans le fichier Release %s"
+
+#: apt-pkg/vendorlist.cc:78
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Le bloc de fournisseur %s ne comporte pas d'empreinte"
+
+#: apt-pkg/cdrom.cc:566
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+"Utilisation du point de montage %s pour le cédérom\n"
+"Montage du cédérom\n"
+
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
+msgid "Identifying.. "
+msgstr "Identification... "
+
+#: apt-pkg/cdrom.cc:603
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Étiquette stockée : %s\n"
+
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
+msgid "Unmounting CD-ROM...\n"
+msgstr "Démontage du cédérom...\n"
+
+#: apt-pkg/cdrom.cc:632
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr "Utilisation du point de montage %s pour le cédérom\n"
+
+#: apt-pkg/cdrom.cc:650
+msgid "Unmounting CD-ROM\n"
+msgstr "Démontage du cédérom\n"
+
+#: apt-pkg/cdrom.cc:655
+msgid "Waiting for disc...\n"
+msgstr "Attente du disque...\n"
+
+#: apt-pkg/cdrom.cc:664
+msgid "Mounting CD-ROM...\n"
+msgstr "Montage du cédérom...\n"
+
+#: apt-pkg/cdrom.cc:683
+msgid "Scanning disc for index files..\n"
+msgstr "Examen du disque à la recherche de fichiers d'index...\n"
+
+#: apt-pkg/cdrom.cc:731
+#, c-format
+msgid ""
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
+msgstr ""
+"%zu index de paquets trouvés, %zu index de sources, %zu index de traductions "
+"et %zu signatures\n"
+
+#: apt-pkg/cdrom.cc:742
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+"Aucun fichier de paquets trouvé. Ceci n'est peut-être pas un disque Debian "
+"ou bien l'architecture est-elle incorrecte."
+
+#: apt-pkg/cdrom.cc:769
+#, c-format
+msgid "Found label '%s'\n"
+msgstr "Étiquette « %s » trouvée\n"
+
+#: apt-pkg/cdrom.cc:798
+msgid "That is not a valid name, try again.\n"
+msgstr "Ce nom n'est pas valable, veuillez recommencer.\n"
+
+#: apt-pkg/cdrom.cc:815
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+"Ce disque s'appelle :\n"
+"« %s »\n"
+
+#: apt-pkg/cdrom.cc:817
+msgid "Copying package lists..."
+msgstr "Copie des listes de paquets..."
+
+#: apt-pkg/cdrom.cc:844
+msgid "Writing new source list\n"
+msgstr "Écriture de la nouvelle liste de sources\n"
+
+#: apt-pkg/cdrom.cc:852
+msgid "Source list entries for this disc are:\n"
+msgstr "Les entrées de listes de sources pour ce disque sont :\n"
+
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr "%i enregistrements écrits.\n"
+
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i enregistrements écrits avec %i fichiers manquants.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr ""
+"%i enregistrements écrits avec %i fichiers qui ne correspondent pas\n"
+
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr ""
+"%i enregistrements écrits avec %i fichiers manquants et %i qui ne "
+"correspondent pas\n"
+
+#: apt-pkg/indexcopy.cc:503
+#, c-format
+msgid "Skipping nonexistent file %s"
+msgstr "Fichier %s inexistant ignoré"
+
+#: apt-pkg/indexcopy.cc:509
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "Impossible de trouver l'enregistrement d'authentification pour %s"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Somme de contrôle de hachage incohérente pour %s"
+
+#: apt-pkg/indexcopy.cc:659
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "Le fichier %s ne commence pas par un message signé en clair."
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:690
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Pas de porte-clés installé dans %s."
+
+#: apt-pkg/cachefilter.cc:31
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Erreur de compilation de l'expression rationnelle - %s"
+
+#: apt-pkg/cacheset.cc:352
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "La version  « %s » de « %s » est introuvable"
+
+#: apt-pkg/cacheset.cc:355
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "La version « %s » de « %s » n'a pu être trouvée"
+
+#: apt-pkg/cacheset.cc:459
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Impossible de trouver le paquet %s"
+
+#: apt-pkg/cacheset.cc:466
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Impossible de trouver la tâche « %s »"
+
+#: apt-pkg/cacheset.cc:472
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr ""
+"Impossible de trouver de paquet correspondant à l'expression rationnelle "
+"« %s »"
+
+#: apt-pkg/cacheset.cc:483
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+"Impossible de choisir les versions du paquet « %s » qui n'est qu'un paquet "
+"virtuel"
+
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"Impossible de choisir une version installée ou candidate du paquet « %s » "
+"qui n'en n'a aucune"
+
+#: apt-pkg/cacheset.cc:504
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+"Impossible de choisir une nouvelle version du paquet « %s » qui n'est qu'un "
+"paquet virtuel"
+
+#: apt-pkg/cacheset.cc:512
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+"Impossible de choisir une version candidate du paquet « %s » qui n'en n'a pas"
+
+#: apt-pkg/cacheset.cc:520
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+"Impossible de choisir la version installée du paquet « %s » qui n'est pas "
+"installé"
+
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:70
+#, c-format
+msgid "Installing %s"
+msgstr "Installation de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:71 apt-pkg/deb/dpkgpm.cc:946
+#, c-format
+msgid "Configuring %s"
+msgstr "Configuration de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:953
+#, c-format
+msgid "Removing %s"
+msgstr "Suppression de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:73
+#, c-format
+msgid "Completely removing %s"
+msgstr "Suppression complète de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:74
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "Disparition de %s constatée"
+
+#: apt-pkg/deb/dpkgpm.cc:75
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Exécution des actions différées (« trigger ») de %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:702
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Répertoire %s inexistant"
+
+#: apt-pkg/deb/dpkgpm.cc:717 apt-pkg/deb/dpkgpm.cc:737
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Impossible d'ouvrir le fichier « %s »"
+
+#: apt-pkg/deb/dpkgpm.cc:939
+#, c-format
+msgid "Preparing %s"
+msgstr "Préparation de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:940
+#, c-format
+msgid "Unpacking %s"
+msgstr "Décompression de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:945
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Préparation de la configuration de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:947
+#, c-format
+msgid "Installed %s"
+msgstr "%s installé"
+
+#: apt-pkg/deb/dpkgpm.cc:952
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Préparation de la suppression de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:954
+#, c-format
+msgid "Removed %s"
+msgstr "%s supprimé"
+
+#: apt-pkg/deb/dpkgpm.cc:959
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Préparation de la suppression complète de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:960
+#, c-format
+msgid "Completely removed %s"
+msgstr "%s complètement supprimé"
+
+#: apt-pkg/deb/dpkgpm.cc:1202
+msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+msgstr ""
+"Impossible d'écrire le journal, échec d'openpty()\n"
+"(/dev/pts est-il monté ?)\n"
+
+#: apt-pkg/deb/dpkgpm.cc:1232
+msgid "Running dpkg"
+msgstr "Exécution de dpkg"
+
+#: apt-pkg/deb/dpkgpm.cc:1404
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1461
+msgid "No apport report written because MaxReports is reached already"
+msgstr "Aucun rapport « apport » écrit car MaxReports a déjà été atteint"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1466
+msgid "dependency problems - leaving unconfigured"
+msgstr "problème de dépendances : laissé non configuré"
+
+#: apt-pkg/deb/dpkgpm.cc:1468
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Aucun rapport « apport » n'a été créé car le message d'erreur indique une "
+"erreur consécutive à un échec précédent."
+
+#: apt-pkg/deb/dpkgpm.cc:1474
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Aucun rapport « apport » n'a été créé car un disque plein a été signalé"
+
+#: apt-pkg/deb/dpkgpm.cc:1481
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Aucun « apport » n'a été créé car une erreur de dépassement de capacité "
+"mémoire a été signalée"
+
+#: apt-pkg/deb/dpkgpm.cc:1488 apt-pkg/deb/dpkgpm.cc:1494
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1515
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"Aucun « apport » n'a été créé car une erreur d'entrée/sortie de dpkg a été "
+"signalée"
+
+#: apt-pkg/deb/debsystem.cc:84
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"Impossible de verrouiller le répertoire d'administration (%s). Il est "
+"possible qu'un autre processus l'utilise."
+
+#: apt-pkg/deb/debsystem.cc:87
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+"Impossible de verrouiller le répertoire d'administration (%s). Avez-vous les "
+"privilèges du superutilisateur ?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:103
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"dpkg a été interrompu. Il est nécessaire d'utiliser « %s » pour corriger le "
+"problème. "
+
+#: apt-pkg/deb/debsystem.cc:121
+msgid "Not locked"
+msgstr "Non verrouillé"
+
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:279
+#, c-format
+msgid "No mirror file '%s' found "
+msgstr "Aucun fichier miroir « %s » n'a été trouvé "
+
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:286
+#, c-format
+msgid "Can not read mirror file '%s'"
+msgstr "Impossible de lire le fichier de miroir « %s »."
+
+#: methods/mirror.cc:441
+#, c-format
+msgid "[Mirror: %s]"
+msgstr "[Miroir : %s]"
+
+#: methods/rred.cc:477
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+"Impossible de modifier %s avec mmap et l'utilisation des opérations de "
+"fichiers : le correctif semble être corrompu."
+
+#: methods/rred.cc:482
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
+"Impossible de modifier %s avec mmap (sans échec particulier de mmap) : le "
+"correctif semble être corrompu."
+
+#: methods/rsh.cc:97
+msgid "Failed to create IPC pipe to subprocess"
+msgstr "Impossible de créer le tube IPC sur le sous-processus"
+
+#: methods/rsh.cc:336
+msgid "Connection closed prematurely"
+msgstr "Connexion fermée prématurément"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libc.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libc.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libc.po	2012-01-02 17:27:31.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libc.po	2012-02-23 06:31:55.000000000 +0000
@@ -7,17 +7,18 @@
 # y.kerb <y.kerb@laposte.net>, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: libc-2.9.90\n"
+"Project-Id-Version: libc-2.14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-06 12:40-0800\n"
-"PO-Revision-Date: 2011-01-17 04:51+0000\n"
+"POT-Creation-Date: 2011-05-31 00:06-0400\n"
+"PO-Revision-Date: 2012-02-08 22:34+0000\n"
 "Last-Translator: kerb <y.kerb@laposte.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 18:27+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:13+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+"Language: fr\n"
 
 #: argp/argp-help.c:228
 #, c-format
@@ -97,15 +98,19 @@
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(ERREUR DU PROGRAMME) L'option aurait dû être reconnue ! ?"
 
-#: assert/assert-perr.c:57
+#: assert/assert-perr.c:37
 #, c-format
 msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
 msgstr "%s%s%s : %u : %s%s Erreur imprévue : %s.\n"
 
-#: assert/assert.c:57
+#: assert/assert.c:105
 #, c-format
-msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n"
-msgstr "%s%s%s :%u : %s%s L'assertion « %s » a échoué.\n"
+msgid ""
+"%s%s%s:%u: %s%sAssertion `%s' failed.\n"
+"%n"
+msgstr ""
+"%s%s%s :%u : %s%s L'assertion « %s » a échoué.\n"
+"%n"
 
 #: catgets/gencat.c:110 catgets/gencat.c:114 nscd/nscd.c:100 nss/makedb.c:61
 msgid "NAME"
@@ -146,14 +151,13 @@
 "[FICHIER_DE_SORTIE [FICHIER_D_ENTRÉE]...]"
 
 #: catgets/gencat.c:232 debug/pcprofiledump.c:208 debug/xtrace.sh:58
-#: elf/ldconfig.c:302 elf/ldd.bash.in:56 elf/sln.c:86 elf/sprof.c:360
-#: iconv/iconv_prog.c:408 iconv/iconvconfig.c:380 locale/programs/locale.c:278
-#: locale/programs/localedef.c:371 login/programs/pt_chown.c:88
-#: malloc/memusage.sh:65 malloc/memusagestat.c:533 nscd/nscd.c:415
-#: nss/getent.c:842 nss/makedb.c:231 posix/getconf.c:1030
-#: sunrpc/rpc_main.c:1494 sunrpc/rpcinfo.c:699
+#: elf/ldconfig.c:302 elf/ldd.bash.in:56 elf/sln.c:86 elf/sotruss.ksh:49
+#: elf/sprof.c:371 iconv/iconv_prog.c:408 iconv/iconvconfig.c:380
+#: locale/programs/locale.c:278 locale/programs/localedef.c:371
+#: login/programs/pt_chown.c:92 malloc/memusage.sh:65
+#: malloc/memusagestat.c:539 nscd/nscd.c:415 nss/getent.c:918 nss/makedb.c:231
+#: posix/getconf.c:1122 sunrpc/rpc_main.c:1492 sunrpc/rpcinfo.c:691
 #: sysdeps/unix/sysv/linux/lddlibc4.c:62
-#, c-format
 msgid ""
 "For bug reporting instructions, please see:\n"
 "<http://www.gnu.org/software/libc/bugs.html>.\n"
@@ -162,11 +166,11 @@
 "<http://www.gnu.org/software/libc/bugs.html>.\n"
 
 #: catgets/gencat.c:246 debug/pcprofiledump.c:222 debug/xtrace.sh:66
-#: elf/ldconfig.c:316 elf/ldd.bash.in:39 elf/sprof.c:375
+#: elf/ldconfig.c:316 elf/ldd.bash.in:39 elf/sotruss.ksh:76 elf/sprof.c:386
 #: iconv/iconv_prog.c:423 iconv/iconvconfig.c:395 locale/programs/locale.c:293
-#: locale/programs/localedef.c:387 login/programs/pt_chown.c:59
-#: malloc/memusage.sh:73 malloc/memusagestat.c:551 nscd/nscd.c:429
-#: nss/getent.c:81 nss/makedb.c:245 posix/getconf.c:1012
+#: locale/programs/localedef.c:387 login/programs/pt_chown.c:63
+#: malloc/memusage.sh:73 malloc/memusagestat.c:557 nscd/nscd.c:429
+#: nss/getent.c:87 nss/makedb.c:245 posix/getconf.c:1104
 #: sysdeps/unix/sysv/linux/lddlibc4.c:69
 #, c-format
 msgid ""
@@ -180,11 +184,11 @@
 "COMMERCIALES que pour RÉPONDRE À UN BESOIN PARTICULIER.\n"
 
 #: catgets/gencat.c:251 debug/pcprofiledump.c:227 debug/xtrace.sh:70
-#: elf/ldconfig.c:321 elf/sprof.c:381 iconv/iconv_prog.c:428
+#: elf/ldconfig.c:321 elf/sprof.c:392 iconv/iconv_prog.c:428
 #: iconv/iconvconfig.c:400 locale/programs/locale.c:298
 #: locale/programs/localedef.c:392 malloc/memusage.sh:77
-#: malloc/memusagestat.c:556 nscd/nscd.c:434 nss/getent.c:86 nss/makedb.c:250
-#: posix/getconf.c:1017
+#: malloc/memusagestat.c:562 nscd/nscd.c:434 nss/getent.c:92 nss/makedb.c:250
+#: posix/getconf.c:1109
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Écrit par %s.\n"
@@ -304,13 +308,13 @@
 msgid "Usage: xtrace [OPTION]... PROGRAM [PROGRAMOPTION]...\\n"
 msgstr "Usage : xtrace [OPTION]... PROGRAM [PROGRAMOPTION]...\\n"
 
-#: debug/xtrace.sh:33
-msgid "Try \\`xtrace --help' for more information.\\n"
-msgstr "Essayer \\`xtrace --help' pour plus d'informations.\\n"
+#: debug/xtrace.sh:33 malloc/memusage.sh:27
+msgid "Try \\`%s --help' or `%s --usage' for more information.\\n"
+msgstr "Pour en savoir davantage, faites : «%s --help » ou «%s --usage».\\n"
 
 #: debug/xtrace.sh:39
-msgid "xtrace: option \\`$1' requires an argument.\\n"
-msgstr "xtrace : option \\`$1' requiert un argument.\\n"
+msgid "%s: option '%s' requires an argument.\\n"
+msgstr "%s : l'option « %s » requiert un argument\\n"
 
 #: debug/xtrace.sh:46
 msgid ""
@@ -393,7 +397,7 @@
 msgid ", OS ABI: %s %d.%d.%d"
 msgstr ", Système d'exploitation ABI : %s %d.%d.%d"
 
-#: elf/cache.c:134 elf/ldconfig.c:1289
+#: elf/cache.c:134 elf/ldconfig.c:1305
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr "Ne peut ouvrir le fichier de cache %s\n"
@@ -433,11 +437,11 @@
 msgid "Renaming of %s to %s failed"
 msgstr "Échec du changement de nom de %s vers %s"
 
-#: elf/dl-close.c:378 elf/dl-open.c:460
+#: elf/dl-close.c:387 elf/dl-open.c:397
 msgid "cannot create scope list"
 msgstr "ne peut créer une liste panorama"
 
-#: elf/dl-close.c:725
+#: elf/dl-close.c:767
 msgid "shared object not open"
 msgstr "objet partagé non ouvert"
 
@@ -445,7 +449,7 @@
 msgid "DST not allowed in SUID/SGID programs"
 msgstr "DST non permis dans un programme SUID/SGID"
 
-#: elf/dl-deps.c:127 elf/dl-open.c:282
+#: elf/dl-deps.c:127
 msgid "empty dynamic string token substitution"
 msgstr "la chaîne dynamique d'un jeton de substitution est vide"
 
@@ -462,11 +466,11 @@
 msgid "cannot allocate dependency list"
 msgstr "ne peut allouer une liste de dépendances"
 
-#: elf/dl-deps.c:510 elf/dl-deps.c:565
+#: elf/dl-deps.c:514 elf/dl-deps.c:574
 msgid "cannot allocate symbol search list"
 msgstr "ne peut allouer la liste des symboles à rechercher"
 
-#: elf/dl-deps.c:550
+#: elf/dl-deps.c:554
 msgid "Filters not supported with LD_TRACE_PRELINKING"
 msgstr "Filtres non supportés avec LD_TRACE_PRELINKING"
 
@@ -490,212 +494,220 @@
 msgid "internal error: symidx out of range of fptr table"
 msgstr "erreur interne : symidx en dehors de la table fptr"
 
-#: elf/dl-load.c:372
+#: elf/dl-load.c:471
 msgid "cannot allocate name record"
 msgstr "ne peut allouer un enregistrement de nom"
 
-#: elf/dl-load.c:474 elf/dl-load.c:582 elf/dl-load.c:667 elf/dl-load.c:780
+#: elf/dl-load.c:548 elf/dl-load.c:664 elf/dl-load.c:749 elf/dl-load.c:862
 msgid "cannot create cache for search path"
 msgstr "ne peut créer le cache pour le chemin de recherche"
 
-#: elf/dl-load.c:565
+#: elf/dl-load.c:639
 msgid "cannot create RUNPATH/RPATH copy"
 msgstr "ne peut créer une copie RUNPATH/RPATH"
 
-#: elf/dl-load.c:653
+#: elf/dl-load.c:735
 msgid "cannot create search path array"
 msgstr "ne peut créer un tableau des chemins de recherche"
 
-#: elf/dl-load.c:864
+#: elf/dl-load.c:931
 msgid "cannot stat shared object"
 msgstr "ne peut évaluer par stat() l'objet partagé"
 
-#: elf/dl-load.c:934
+#: elf/dl-load.c:1009
 msgid "cannot open zero fill device"
 msgstr "ne peut ouvrir le fichier de périphérique rempli de zéros"
 
-#: elf/dl-load.c:979 elf/dl-load.c:2215
+#: elf/dl-load.c:1055 elf/dl-load.c:2313
 msgid "cannot create shared object descriptor"
 msgstr "ne peut créer un descripteur d'objet partagé"
 
-#: elf/dl-load.c:998 elf/dl-load.c:1647 elf/dl-load.c:1739
+#: elf/dl-load.c:1074 elf/dl-load.c:1730 elf/dl-load.c:1833
 msgid "cannot read file data"
 msgstr "ne peut lire les données du fichier"
 
-#: elf/dl-load.c:1042
+#: elf/dl-load.c:1120
 msgid "ELF load command alignment not page-aligned"
 msgstr "Commande de chargement sur une page ELF qui n'est pas alignée"
 
-#: elf/dl-load.c:1049
+#: elf/dl-load.c:1127
 msgid "ELF load command address/offset not properly aligned"
 msgstr "Commande de chargement sur une adresse ELF incorrectement alignée"
 
-#: elf/dl-load.c:1132
+#: elf/dl-load.c:1210
 msgid "cannot allocate TLS data structures for initial thread"
 msgstr "ne peut allouer une structure de données TLS pour un thread initial"
 
-#: elf/dl-load.c:1155
+#: elf/dl-load.c:1233
 msgid "cannot handle TLS data"
 msgstr "ne peut traiter les données TLS"
 
-#: elf/dl-load.c:1174
+#: elf/dl-load.c:1252
 msgid "object file has no loadable segments"
 msgstr "le fichier objet n'a pas de segment chargeable"
 
-#: elf/dl-load.c:1210
+#: elf/dl-load.c:1288
 msgid "failed to map segment from shared object"
 msgstr "échec d'adressage (mapping) du segment de l'objet partagé"
 
-#: elf/dl-load.c:1236
+#: elf/dl-load.c:1314
 msgid "cannot dynamically load executable"
 msgstr "ne peut dynamiquement charger un exécutable"
 
-#: elf/dl-load.c:1298
+#: elf/dl-load.c:1376
 msgid "cannot change memory protections"
 msgstr "ne peut modifier les protections de mémoire"
 
-#: elf/dl-load.c:1317
+#: elf/dl-load.c:1395
 msgid "cannot map zero-fill pages"
 msgstr "ne peut adresser des pages remplies de zéros"
 
-#: elf/dl-load.c:1331
+#: elf/dl-load.c:1409
 msgid "object file has no dynamic section"
 msgstr "le fichier objet n'a pas de section dynamique"
 
-#: elf/dl-load.c:1354
+#: elf/dl-load.c:1432
 msgid "shared object cannot be dlopen()ed"
 msgstr "l'objet partagé ne peut pas être ouvert via dlopen()"
 
-#: elf/dl-load.c:1367
+#: elf/dl-load.c:1445
 msgid "cannot allocate memory for program header"
 msgstr "ne peut allouer de la mémoire pour une en-tête de programme"
 
-#: elf/dl-load.c:1384 elf/dl-open.c:218
+#: elf/dl-load.c:1462 elf/dl-open.c:180
 msgid "invalid caller"
 msgstr "appelant invalide"
 
-#: elf/dl-load.c:1423
+#: elf/dl-load.c:1501
 msgid "cannot enable executable stack as shared object requires"
 msgstr ""
 "ne peut activer une pile exécutable comme l'objet partagé le requiert"
 
-#: elf/dl-load.c:1436
+#: elf/dl-load.c:1514
 msgid "cannot close file descriptor"
 msgstr "ne peut pas fermer le descripteur de fichier"
 
-#: elf/dl-load.c:1647
+#: elf/dl-load.c:1730
 msgid "file too short"
 msgstr "fichier trop court"
 
-#: elf/dl-load.c:1676
+#: elf/dl-load.c:1766
 msgid "invalid ELF header"
 msgstr "en-tête ELF invalide"
 
-#: elf/dl-load.c:1688
+#: elf/dl-load.c:1778
 msgid "ELF file data encoding not big-endian"
 msgstr "l'encodage des données du fichier ELF n'est pas big-endian"
 
-#: elf/dl-load.c:1690
+#: elf/dl-load.c:1780
 msgid "ELF file data encoding not little-endian"
 msgstr "l'encodage des données du fichier ELF n'est pas little-endian"
 
-#: elf/dl-load.c:1694
+#: elf/dl-load.c:1784
 msgid "ELF file version ident does not match current one"
 msgstr ""
 "l'identifiant de version du fichier ELF ne concorde pas avec la version "
 "courante"
 
-#: elf/dl-load.c:1698
+#: elf/dl-load.c:1788
 msgid "ELF file OS ABI invalid"
 msgstr "Système d'exploitation du fichier ELF ABI invalide"
 
-#: elf/dl-load.c:1700
+#: elf/dl-load.c:1791
 msgid "ELF file ABI version invalid"
 msgstr "Version du fichier ELF ABI invalide"
 
-#: elf/dl-load.c:1703
+#: elf/dl-load.c:1794
+msgid "nonzero padding in e_ident"
+msgstr "remplissage sans zéro dans e_ident"
+
+#: elf/dl-load.c:1797
 msgid "internal error"
 msgstr "Erreur interne"
 
-#: elf/dl-load.c:1710
+#: elf/dl-load.c:1804
 msgid "ELF file version does not match current one"
 msgstr "Version du fichier ELF ne concorde pas avec la version courante"
 
-#: elf/dl-load.c:1718
+#: elf/dl-load.c:1812
 msgid "only ET_DYN and ET_EXEC can be loaded"
 msgstr "Seuls ET_DYN et ET_EXEC peuvent être chargés"
 
-#: elf/dl-load.c:1724
+#: elf/dl-load.c:1818
 msgid "ELF file's phentsize not the expected size"
 msgstr "« Phentize » du fichier ELF ne concorde pas avec la taille prévue"
 
-#: elf/dl-load.c:2231
+#: elf/dl-load.c:2332
 msgid "wrong ELF class: ELFCLASS64"
 msgstr "mauvaise classe ELF : ELFCLASS64"
 
-#: elf/dl-load.c:2232
+#: elf/dl-load.c:2333
 msgid "wrong ELF class: ELFCLASS32"
 msgstr "mauvaise classe ELF : ELFCLASS32"
 
-#: elf/dl-load.c:2235
+#: elf/dl-load.c:2336
 msgid "cannot open shared object file"
 msgstr "Ne peut ouvrir le fichier d'objet partagé"
 
-#: elf/dl-lookup.c:356
+#: elf/dl-lookup.c:757
 msgid "relocation error"
 msgstr "erreur de réaffectation"
 
-#: elf/dl-lookup.c:384
+#: elf/dl-lookup.c:785
 msgid "symbol lookup error"
 msgstr "erreur de recherche de symbole"
 
-#: elf/dl-open.c:114
+#: elf/dl-open.c:115
 msgid "cannot extend global scope"
 msgstr "ne peut augmenter l'étendue de la plage globale"
 
-#: elf/dl-open.c:512
+#: elf/dl-open.c:440
 msgid "TLS generation counter wrapped!  Please report this."
 msgstr ""
 "Le compteur de génération TLS a bouclé ! SVP expédier un rapport avec le "
 "script 'glibcbug'."
 
-#: elf/dl-open.c:549
+#: elf/dl-open.c:462
+msgid "cannot load any more object with static TLS"
+msgstr "ne peut pas charger plus d'objets avec TLS statique"
+
+#: elf/dl-open.c:511
 msgid "invalid mode for dlopen()"
 msgstr "mode invalide pour dlopen()"
 
-#: elf/dl-open.c:566
+#: elf/dl-open.c:528
 msgid "no more namespaces available for dlmopen()"
 msgstr "plus d'espace de nommage disponible pour dlmopen()"
 
-#: elf/dl-open.c:579
+#: elf/dl-open.c:547
 msgid "invalid target namespace in dlmopen()"
 msgstr "espace de nommage cible invalide dans dlmopen()"
 
-#: elf/dl-reloc.c:121
+#: elf/dl-reloc.c:120
 msgid "cannot allocate memory in static TLS block"
 msgstr "ne peut allouer de la mémoire dans un bloc statique TLS"
 
-#: elf/dl-reloc.c:211
+#: elf/dl-reloc.c:212
 msgid "cannot make segment writable for relocation"
 msgstr "ne peut rendre le segment inscritible pour une réaffectation"
 
-#: elf/dl-reloc.c:277
+#: elf/dl-reloc.c:275
 #, c-format
 msgid "%s: no PLTREL found in object %s\n"
 msgstr "%s : aucun PLTREL trouvé dans l'objet %s\n"
 
-#: elf/dl-reloc.c:288
+#: elf/dl-reloc.c:286
 #, c-format
 msgid "%s: out of memory to store relocation results for %s\n"
 msgstr ""
 "%s : manque de mémoire pour stocker les résultats de la réaffectation pour "
 "%s\n"
 
-#: elf/dl-reloc.c:304
+#: elf/dl-reloc.c:302
 msgid "cannot restore segment prot after reloc"
 msgstr "ne peut restaurer le segment prot après reloc"
 
-#: elf/dl-reloc.c:329
+#: elf/dl-reloc.c:331
 msgid "cannot apply additional memory protection after relocation"
 msgstr ""
 "ne peut appliquer les protections additionnelle de mémoire après la "
@@ -706,14 +718,18 @@
 msgstr ""
 "RTLD_NEXT est utilisé dans du code qui n'est pas chargé dynamiquement"
 
-#: elf/dl-sysdep.c:481 elf/dl-sysdep.c:493
+#: elf/dl-sysdep.c:488 elf/dl-sysdep.c:500
 msgid "cannot create capability list"
 msgstr "ne peut créer une liste des possibilités"
 
-#: elf/dl-tls.c:864
+#: elf/dl-tls.c:861
 msgid "cannot create TLS data structures"
 msgstr "ne peut créer les structures de données TLS"
 
+#: elf/dl-version.c:172
+msgid "version lookup error"
+msgstr "erreur de recherche de version"
+
 #: elf/dl-version.c:303
 msgid "cannot allocate version reference table"
 msgstr "ne peut allouer la table de référence des versions"
@@ -795,90 +811,90 @@
 msgid "%s is not a known library type"
 msgstr "%s n'est pas un type de librairie connu"
 
-#: elf/ldconfig.c:404
+#: elf/ldconfig.c:407
 #, c-format
 msgid "Can't stat %s"
 msgstr "Ne peut évaluer par stat %s"
 
-#: elf/ldconfig.c:478
+#: elf/ldconfig.c:481
 #, c-format
 msgid "Can't stat %s\n"
 msgstr "Ne peut évaluer par stat %s\n"
 
-#: elf/ldconfig.c:488
+#: elf/ldconfig.c:491
 #, c-format
 msgid "%s is not a symbolic link\n"
 msgstr "%s n'est pas un lien symbolique\n"
 
-#: elf/ldconfig.c:507
+#: elf/ldconfig.c:510
 #, c-format
 msgid "Can't unlink %s"
 msgstr "Ne peut enlever le lien (unlink) %s"
 
-#: elf/ldconfig.c:513
+#: elf/ldconfig.c:516
 #, c-format
 msgid "Can't link %s to %s"
 msgstr "Ne peut établir un lien entre %s et %s"
 
-#: elf/ldconfig.c:519
+#: elf/ldconfig.c:522
 msgid " (changed)\n"
 msgstr " (a été modifié)\n"
 
-#: elf/ldconfig.c:521
+#: elf/ldconfig.c:524
 msgid " (SKIPPED)\n"
 msgstr " (ESCAMOTÉ)\n"
 
-#: elf/ldconfig.c:576
+#: elf/ldconfig.c:579
 #, c-format
 msgid "Can't find %s"
 msgstr "Ne peut repérer %s"
 
-#: elf/ldconfig.c:592 elf/ldconfig.c:765 elf/ldconfig.c:813 elf/ldconfig.c:847
+#: elf/ldconfig.c:595 elf/ldconfig.c:768 elf/ldconfig.c:827 elf/ldconfig.c:861
 #, c-format
 msgid "Cannot lstat %s"
 msgstr "Ne peut évaluer par lstat %s"
 
-#: elf/ldconfig.c:599
+#: elf/ldconfig.c:602
 #, c-format
 msgid "Ignored file %s since it is not a regular file."
 msgstr "A ignoré le fichier %s parce que ce n'est pas un fichier régulier."
 
-#: elf/ldconfig.c:608
+#: elf/ldconfig.c:611
 #, c-format
 msgid "No link created since soname could not be found for %s"
 msgstr "Aucun lien créé étant donné que n'a pas été repéré %s"
 
-#: elf/ldconfig.c:691
+#: elf/ldconfig.c:694
 #, c-format
 msgid "Can't open directory %s"
 msgstr "Ne peut ouvrir le dossier %s"
 
-#: elf/ldconfig.c:779
-#, c-format
-msgid "Cannot stat %s"
-msgstr "Ne peut évaluer par stat %s"
-
-#: elf/ldconfig.c:834 elf/readlib.c:91
+#: elf/ldconfig.c:786 elf/ldconfig.c:848 elf/readlib.c:91
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr "Fichier d'entrée %s non repéré\n"
 
-#: elf/ldconfig.c:908
+#: elf/ldconfig.c:793
+#, c-format
+msgid "Cannot stat %s"
+msgstr "Ne peut évaluer par stat %s"
+
+#: elf/ldconfig.c:922
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr "librairie libc5 %s est dans le mauvais dossier"
 
-#: elf/ldconfig.c:911
+#: elf/ldconfig.c:925
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr "librairie libc6 %s est dans le mauvais dossier"
 
-#: elf/ldconfig.c:914
+#: elf/ldconfig.c:928
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr "librairie libc4 %s est dans le mauvais dossier"
 
-#: elf/ldconfig.c:942
+#: elf/ldconfig.c:956
 #, c-format
 msgid ""
 "libraries %s and %s in directory %s have same soname but different type."
@@ -886,60 +902,60 @@
 "Les librairies %s et %s du dossier %s ont le même nom mais sont de types "
 "différents."
 
-#: elf/ldconfig.c:1051
+#: elf/ldconfig.c:1065
 #, c-format
 msgid "Can't open configuration file %s"
 msgstr "Ne peut ouvrir le fichier de configuration %s"
 
-#: elf/ldconfig.c:1115
+#: elf/ldconfig.c:1129
 #, c-format
 msgid "%s:%u: bad syntax in hwcap line"
 msgstr "%s:%u : mauvaise syntaxe dans la ligne hwcap"
 
-#: elf/ldconfig.c:1121
+#: elf/ldconfig.c:1135
 #, c-format
 msgid "%s:%u: hwcap index %lu above maximum %u"
 msgstr "%s:%u : l'index hwcap %lu dépasse le maximum %u"
 
-#: elf/ldconfig.c:1128 elf/ldconfig.c:1136
+#: elf/ldconfig.c:1142 elf/ldconfig.c:1150
 #, c-format
 msgid "%s:%u: hwcap index %lu already defined as %s"
 msgstr "%s:%u : l'index hwcap %lu déjà défini comme  %s"
 
-#: elf/ldconfig.c:1139
+#: elf/ldconfig.c:1153
 #, c-format
 msgid "%s:%u: duplicate hwcap %lu %s"
 msgstr "%s:%u : hwcap en doublon %lu %s"
 
-#: elf/ldconfig.c:1161
+#: elf/ldconfig.c:1175
 #, c-format
 msgid "need absolute file name for configuration file when using -r"
 msgstr ""
 "nécessite un nom de fichier absolu pour le fichier de configuration quand on "
 "utilise -r"
 
-#: elf/ldconfig.c:1168 locale/programs/xmalloc.c:70 malloc/obstack.c:434
-#: malloc/obstack.c:436 posix/getconf.c:985 posix/getconf.c:1177
+#: elf/ldconfig.c:1182 locale/programs/xmalloc.c:70 malloc/obstack.c:434
+#: malloc/obstack.c:436 posix/getconf.c:1077 posix/getconf.c:1297
 #, c-format
 msgid "memory exhausted"
 msgstr "mémoire épuisée"
 
-#: elf/ldconfig.c:1198
+#: elf/ldconfig.c:1214
 #, c-format
 msgid "%s:%u: cannot read directory %s"
 msgstr "%s:%u : ne peut lire le dossier %s"
 
-#: elf/ldconfig.c:1242
+#: elf/ldconfig.c:1258
 #, c-format
 msgid "relative path `%s' used to build cache"
 msgstr "chemin relatif `%s' utilisé pour construire le cache"
 
-#: elf/ldconfig.c:1268
+#: elf/ldconfig.c:1284
 #, c-format
 msgid "Can't chdir to /"
 msgstr "Ne peut se positionner (chdir) dans /"
 
-#: elf/ldconfig.c:1310
+#: elf/ldconfig.c:1325
 #, c-format
 msgid "Can't open cache file directory %s\n"
 msgstr "Ne peut ouvrir le dossier des fichiers de cache %s\n"
@@ -990,7 +1006,7 @@
 msgid "No such file or directory"
 msgstr "Aucun fichier ou dossier de ce type"
 
-#: elf/ldd.bash.in:153 inet/rcmd.c:483
+#: elf/ldd.bash.in:153 inet/rcmd.c:488
 msgid "not regular file"
 msgstr "n'est pas un fichier régulier"
 
@@ -1106,6 +1122,71 @@
 msgid "Invalid link from \"%s\" to \"%s\": %s\n"
 msgstr "lien invalide depuis \"%s\" jusqu'à \"%s\": %s\n"
 
+#: elf/sotruss.ksh:33
+#, sh-format
+msgid ""
+"Usage: sotruss [OPTION...] [--] EXECUTABLE [EXECUTABLE-OPTION...]\n"
+"  -F, --from FROMLIST     trace calls from objects on FORMLIST\n"
+"  -T, --to TOLIST         trace calls to objects on TOLIST\n"
+"\n"
+"  -e, --exit              also show exits from the function calls\n"
+"  -f, --follow            trace child processes\n"
+"  -o, --output FILENAME   write output to FILENAME (or FILENAME.$PID in "
+"case\n"
+"\t\t\t  -f is also used) instead of standard error\n"
+"\n"
+"      --help              print this help and exit\n"
+"      --version           print version information and exit"
+msgstr ""
+"Usage: sotruss [OPTION...] [--] EXECUTABLE [EXECUTABLE-OPTION...]\n"
+"  -F, --from FROMLIST     trace les appels depuis les objets dan FORMLIST\n"
+"  -T, --to TOLIST         trace les appels aux objets dans TOLIST\n"
+"\n"
+"  -e, --exit              montre aussi les sorties des appels de fonctions\n"
+"  -f, --follow            trace les processus enfants\n"
+"  -o, --output FILENAME  écrit la sortie sur FILENAME (ou FILENAME.$PID le "
+"cas échéant\n"
+"\t\t\t  -f est aussi employé) au lieu de erreur standard\n"
+"\n"
+"      --help              affiche cette aide et quitte\n"
+"      --version           affiche information de version  et quitte"
+
+#: elf/sotruss.ksh:46
+msgid ""
+"Mandatory arguments to long options are also mandatory for any "
+"corresponding\\nshort options.\\n"
+msgstr ""
+"Les arguments obligatoires pour options de formes longues\n"
+"sont aussi obligatoires pour options de forme courtes correspondantes."
+
+#: elf/sotruss.ksh:56
+msgid "%s: option requires an argument -- '%s'\\n"
+msgstr "%s : l'option requiert un argument -- '%s'\\n"
+
+#: elf/sotruss.ksh:57 elf/sotruss.ksh:68 elf/sotruss.ksh:134
+msgid "Try \\`%s --help' or \\`%s --usage' for more information.\\n"
+msgstr "Pour en savoir davantage, faites : «%s --help » ou «%s --usage».\\n"
+
+#: elf/sotruss.ksh:62
+msgid "%s: option is ambiguous; possibilities:"
+msgstr "%s : l'option est ambiguë; possibilités:"
+
+#: elf/sotruss.ksh:80
+msgid "Written by %s.\\n"
+msgstr "Écrit par %s.\\n"
+
+#: elf/sotruss.ksh:87
+msgid ""
+"Usage: %s [-ef] [-F FROMLIST] [-o FILENAME] [-T TOLIST] [--exit]\n"
+"\t    [--follow] [--from FROMLIST] [--output FILENAME] [--to TOLIST]\\n"
+msgstr ""
+"Usage: %s [-ef] [-F FROMLIST] [-o FILENAME] [-T TOLIST] [--exit]\n"
+"\t    [--follow] [--from FROMLIST] [--output FILENAME] [--to TOLIST]\\n"
+
+#: elf/sotruss.ksh:133
+msgid "%s: unrecognized option '%c%s'\\n"
+msgstr "%s : option non reconnue « %c%s »\\n"
+
 #: elf/sprof.c:77
 msgid "Output selection:"
 msgstr "Sélection de sortie :"
@@ -1132,95 +1213,95 @@
 msgid "SHOBJ [PROFDATA]"
 msgstr "SHOBJ [PROFDATA]"
 
-#: elf/sprof.c:420
+#: elf/sprof.c:431
 #, c-format
 msgid "failed to load shared object `%s'"
 msgstr "échec de chargement de l'objet partagé « %s »"
 
-#: elf/sprof.c:429
+#: elf/sprof.c:440
 #, c-format
 msgid "cannot create internal descriptors"
 msgstr "ne peut créer les descripteurs internes"
 
-#: elf/sprof.c:548
+#: elf/sprof.c:559
 #, c-format
 msgid "Reopening shared object `%s' failed"
 msgstr "Échec de réouverture de l'objet partagé « %s »"
 
-#: elf/sprof.c:555 elf/sprof.c:649
+#: elf/sprof.c:566 elf/sprof.c:660
 #, c-format
 msgid "reading of section headers failed"
 msgstr "Échec de la lecture d'en-têtes de section"
 
-#: elf/sprof.c:563 elf/sprof.c:657
+#: elf/sprof.c:574 elf/sprof.c:668
 #, c-format
 msgid "reading of section header string table failed"
 msgstr "Échec de lecture de la table des chaînes d'en-têtes de section"
 
-#: elf/sprof.c:589
+#: elf/sprof.c:600
 #, c-format
 msgid "*** Cannot read debuginfo file name: %m\n"
 msgstr "*** Ne peut lire le nom de fichier de debuginfo : %m\n"
 
-#: elf/sprof.c:609
+#: elf/sprof.c:620
 #, c-format
 msgid "cannot determine file name"
 msgstr "Ne peut déterminer le nom de fichier"
 
-#: elf/sprof.c:642
+#: elf/sprof.c:653
 #, c-format
 msgid "reading of ELF header failed"
 msgstr "Échec de lecture de l'en-tête ELF"
 
-#: elf/sprof.c:678
+#: elf/sprof.c:689
 #, c-format
 msgid "*** The file `%s' is stripped: no detailed analysis possible\n"
 msgstr ""
 "*** Le fichier « %s » a été élagué : aucune analyse détaillée possible\n"
 
-#: elf/sprof.c:708
+#: elf/sprof.c:719
 #, c-format
 msgid "failed to load symbol data"
 msgstr "échec du chargement de données de symbole"
 
-#: elf/sprof.c:775
+#: elf/sprof.c:784
 #, c-format
 msgid "cannot load profiling data"
 msgstr "ne peut charger les données de profilage"
 
-#: elf/sprof.c:784
+#: elf/sprof.c:793
 #, c-format
 msgid "while stat'ing profiling data file"
 msgstr "lors de l'évaluation par stat() du fichier de données de profilage"
 
-#: elf/sprof.c:792
+#: elf/sprof.c:801
 #, c-format
 msgid "profiling data file `%s' does not match shared object `%s'"
 msgstr ""
 "Le fichier de données de profilage « %s » ne concorde pas avec l'objet "
 "partagé « %s »"
 
-#: elf/sprof.c:803
+#: elf/sprof.c:812
 #, c-format
 msgid "failed to mmap the profiling data file"
 msgstr "Échec de la procédure mmap sur le fichier de données de profilage"
 
-#: elf/sprof.c:811
+#: elf/sprof.c:820
 #, c-format
 msgid "error while closing the profiling data file"
 msgstr "erreur lors de la fermeture du fichier de données de profilage"
 
-#: elf/sprof.c:820 elf/sprof.c:890
+#: elf/sprof.c:829 elf/sprof.c:927
 #, c-format
 msgid "cannot create internal descriptor"
 msgstr "ne peut créer un descripteur interne"
 
-#: elf/sprof.c:866
+#: elf/sprof.c:903
 #, c-format
 msgid "`%s' is no correct profile data file for `%s'"
 msgstr "« %s » est un fichier de profilage incorrect pour « %s »"
 
-#: elf/sprof.c:1047 elf/sprof.c:1105
+#: elf/sprof.c:1084 elf/sprof.c:1142
 #, c-format
 msgid "cannot allocate symbol data"
 msgstr "ne peut allouer les données des symboles"
@@ -1420,68 +1501,68 @@
 msgid "cannot generate output file"
 msgstr "ne peut générer le fichier de sortie"
 
-#: inet/rcmd.c:157
+#: inet/rcmd.c:163
 msgid "rcmd: Cannot allocate memory\n"
 msgstr "rcmd : ne peut allouer de la mémoire\n"
 
-#: inet/rcmd.c:172
+#: inet/rcmd.c:178
 msgid "rcmd: socket: All ports in use\n"
 msgstr "rcmd : socket : tous les ports sont occupés\n"
 
-#: inet/rcmd.c:200
+#: inet/rcmd.c:206
 #, c-format
 msgid "connect to address %s: "
 msgstr "Connecte l'adresse %s : "
 
-#: inet/rcmd.c:213
+#: inet/rcmd.c:219
 #, c-format
 msgid "Trying %s...\n"
 msgstr "On tente %s...\n"
 
-#: inet/rcmd.c:249
+#: inet/rcmd.c:255
 #, c-format
 msgid "rcmd: write (setting up stderr): %m\n"
 msgstr "rcmd : écriture (configuration de stderr) : %m\n"
 
-#: inet/rcmd.c:265
+#: inet/rcmd.c:271
 #, c-format
 msgid "rcmd: poll (setting up stderr): %m\n"
 msgstr "rcmd : poll (configuration de stderr) : %m\n"
 
-#: inet/rcmd.c:268
+#: inet/rcmd.c:274
 msgid "poll: protocol failure in circuit setup\n"
 msgstr "poll : échec du protocole dans la configuration du circuit\n"
 
-#: inet/rcmd.c:301
+#: inet/rcmd.c:306
 msgid "socket: protocol failure in circuit setup\n"
 msgstr "socket : échec de protocole dans la configuration du circuit.\n"
 
-#: inet/rcmd.c:325
+#: inet/rcmd.c:330
 #, c-format
 msgid "rcmd: %s: short read"
 msgstr "rcmd : %s : lecture écourtée"
 
-#: inet/rcmd.c:481
+#: inet/rcmd.c:486
 msgid "lstat failed"
 msgstr "échec de lstat()"
 
-#: inet/rcmd.c:488
+#: inet/rcmd.c:493
 msgid "cannot open"
 msgstr "ne peut ouvrir"
 
-#: inet/rcmd.c:490
+#: inet/rcmd.c:495
 msgid "fstat failed"
 msgstr "échec de fstat()"
 
-#: inet/rcmd.c:492
+#: inet/rcmd.c:497
 msgid "bad owner"
 msgstr "mauvais propriétaire"
 
-#: inet/rcmd.c:494
+#: inet/rcmd.c:499
 msgid "writeable by other than owner"
 msgstr "accessible en écriture par d'autres que le propriétaire"
 
-#: inet/rcmd.c:496
+#: inet/rcmd.c:501
 msgid "hard linked somewhere"
 msgstr "lien direct rencontré"
 
@@ -1606,8 +1687,8 @@
 msgstr "pas de nom symbolique fourni pour la fin de l'intervalle"
 
 #: locale/programs/charmap.c:610 locale/programs/ld-address.c:602
-#: locale/programs/ld-collate.c:2767 locale/programs/ld-collate.c:3924
-#: locale/programs/ld-ctype.c:2232 locale/programs/ld-ctype.c:2984
+#: locale/programs/ld-collate.c:2769 locale/programs/ld-collate.c:3927
+#: locale/programs/ld-ctype.c:2257 locale/programs/ld-ctype.c:3009
 #: locale/programs/ld-identification.c:452
 #: locale/programs/ld-measurement.c:238 locale/programs/ld-messages.c:332
 #: locale/programs/ld-monetary.c:943 locale/programs/ld-name.c:307
@@ -1635,8 +1716,8 @@
 msgstr "%s : erreur de l'automate à états finis"
 
 #: locale/programs/charmap.c:850 locale/programs/ld-address.c:618
-#: locale/programs/ld-collate.c:2764 locale/programs/ld-collate.c:4117
-#: locale/programs/ld-ctype.c:2229 locale/programs/ld-ctype.c:3001
+#: locale/programs/ld-collate.c:2766 locale/programs/ld-collate.c:4120
+#: locale/programs/ld-ctype.c:2254 locale/programs/ld-ctype.c:3026
 #: locale/programs/ld-identification.c:468
 #: locale/programs/ld-measurement.c:254 locale/programs/ld-messages.c:348
 #: locale/programs/ld-monetary.c:959 locale/programs/ld-name.c:323
@@ -1661,7 +1742,7 @@
 "nombre d'octets pour une séquence d'octets de début et de fin de plage n'est "
 "pas le même : %d vs %d"
 
-#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:3044
+#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:3046
 #: locale/programs/repertoire.c:419
 msgid "invalid names for character range"
 msgstr "nom invalide pour un intervalle de caractères"
@@ -1684,8 +1765,8 @@
 msgid "resulting bytes for range not representable."
 msgstr "les octets résultants pour la plage ne sont pas représentables."
 
-#: locale/programs/ld-address.c:135 locale/programs/ld-collate.c:1556
-#: locale/programs/ld-ctype.c:420 locale/programs/ld-identification.c:133
+#: locale/programs/ld-address.c:135 locale/programs/ld-collate.c:1558
+#: locale/programs/ld-ctype.c:421 locale/programs/ld-identification.c:133
 #: locale/programs/ld-measurement.c:94 locale/programs/ld-messages.c:97
 #: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:94
 #: locale/programs/ld-numeric.c:98 locale/programs/ld-paper.c:91
@@ -1749,7 +1830,7 @@
 msgstr "%s : code numérique invalide pour le pays « %d »"
 
 #: locale/programs/ld-address.c:510 locale/programs/ld-address.c:547
-#: locale/programs/ld-address.c:585 locale/programs/ld-ctype.c:2608
+#: locale/programs/ld-address.c:585 locale/programs/ld-ctype.c:2633
 #: locale/programs/ld-identification.c:364
 #: locale/programs/ld-measurement.c:221 locale/programs/ld-messages.c:301
 #: locale/programs/ld-monetary.c:701 locale/programs/ld-monetary.c:736
@@ -1771,8 +1852,8 @@
 msgid "%s: unknown character in field `%s'"
 msgstr "%s : caractère inconnu dans le champ « %s »"
 
-#: locale/programs/ld-address.c:599 locale/programs/ld-collate.c:3922
-#: locale/programs/ld-ctype.c:2981 locale/programs/ld-identification.c:449
+#: locale/programs/ld-address.c:599 locale/programs/ld-collate.c:3925
+#: locale/programs/ld-ctype.c:3006 locale/programs/ld-identification.c:449
 #: locale/programs/ld-measurement.c:235 locale/programs/ld-messages.c:330
 #: locale/programs/ld-monetary.c:941 locale/programs/ld-name.c:305
 #: locale/programs/ld-numeric.c:366 locale/programs/ld-paper.c:239
@@ -1781,12 +1862,12 @@
 msgid "%s: incomplete `END' line"
 msgstr "%s : ligne « END » incomplète"
 
-#: locale/programs/ld-address.c:609 locale/programs/ld-collate.c:542
-#: locale/programs/ld-collate.c:594 locale/programs/ld-collate.c:890
-#: locale/programs/ld-collate.c:903 locale/programs/ld-collate.c:2733
-#: locale/programs/ld-collate.c:2754 locale/programs/ld-collate.c:4107
-#: locale/programs/ld-ctype.c:1960 locale/programs/ld-ctype.c:2219
-#: locale/programs/ld-ctype.c:2806 locale/programs/ld-ctype.c:2992
+#: locale/programs/ld-address.c:609 locale/programs/ld-collate.c:544
+#: locale/programs/ld-collate.c:596 locale/programs/ld-collate.c:892
+#: locale/programs/ld-collate.c:905 locale/programs/ld-collate.c:2735
+#: locale/programs/ld-collate.c:2756 locale/programs/ld-collate.c:4110
+#: locale/programs/ld-ctype.c:1985 locale/programs/ld-ctype.c:2244
+#: locale/programs/ld-ctype.c:2831 locale/programs/ld-ctype.c:3017
 #: locale/programs/ld-identification.c:459
 #: locale/programs/ld-measurement.c:245 locale/programs/ld-messages.c:339
 #: locale/programs/ld-monetary.c:950 locale/programs/ld-name.c:314
@@ -1796,75 +1877,75 @@
 msgid "%s: syntax error"
 msgstr "%s : erreur de syntaxe"
 
-#: locale/programs/ld-collate.c:417
+#: locale/programs/ld-collate.c:419
 #, c-format
 msgid "`%.*s' already defined in charmap"
 msgstr "« %.*s » déjà défini dans la table des caractères"
 
-#: locale/programs/ld-collate.c:426
+#: locale/programs/ld-collate.c:428
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr "« %.*s » déjà défini dans le dossier"
 
-#: locale/programs/ld-collate.c:433
+#: locale/programs/ld-collate.c:435
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr "« %.*s » déjà défini comme symbole de classement (collation)"
 
-#: locale/programs/ld-collate.c:440
+#: locale/programs/ld-collate.c:442
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr "« %.*s » déjà défini comme élément de classement (collation)"
 
-#: locale/programs/ld-collate.c:471 locale/programs/ld-collate.c:497
+#: locale/programs/ld-collate.c:473 locale/programs/ld-collate.c:499
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr "%s : « forward » et « backward » sont mutuellement exclusifs"
 
-#: locale/programs/ld-collate.c:481 locale/programs/ld-collate.c:507
-#: locale/programs/ld-collate.c:523
+#: locale/programs/ld-collate.c:483 locale/programs/ld-collate.c:509
+#: locale/programs/ld-collate.c:525
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr "%s : « %s » mentionné plus d'une fois dans la définition du poids %d"
 
-#: locale/programs/ld-collate.c:579
+#: locale/programs/ld-collate.c:581
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr "%s : trop de règles; la 1ère entrée n'a que %d"
 
-#: locale/programs/ld-collate.c:615
+#: locale/programs/ld-collate.c:617
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr "%s : pas assez de règles de tri"
 
-#: locale/programs/ld-collate.c:780
+#: locale/programs/ld-collate.c:782
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr "%s : chaîne de poids vide non permise"
 
-#: locale/programs/ld-collate.c:875
+#: locale/programs/ld-collate.c:877
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr ""
 "%s : les poids doivent utiliser les mêmes symboles d'ellipse que les noms"
 
-#: locale/programs/ld-collate.c:931
+#: locale/programs/ld-collate.c:933
 #, c-format
 msgid "%s: too many values"
 msgstr "%s : trop de valeurs"
 
-#: locale/programs/ld-collate.c:1051 locale/programs/ld-collate.c:1226
+#: locale/programs/ld-collate.c:1053 locale/programs/ld-collate.c:1228
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr "L'ordre de « %.*s » est déjà défini dans %s :%Zu"
 
-#: locale/programs/ld-collate.c:1101
+#: locale/programs/ld-collate.c:1103
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr ""
 "%s : le symbole de départ et de fin d'une plage doit être en caractères"
 
-#: locale/programs/ld-collate.c:1128
+#: locale/programs/ld-collate.c:1130
 #, c-format
 msgid ""
 "%s: byte sequences of first and last character must have the same length"
@@ -1872,7 +1953,7 @@
 "%s : séquences d'octets du 1er et dernier caractère doivent avoir la même "
 "longueur"
 
-#: locale/programs/ld-collate.c:1170
+#: locale/programs/ld-collate.c:1172
 #, c-format
 msgid ""
 "%s: byte sequence of first character of range is not lower than that of the "
@@ -1881,14 +1962,14 @@
 "%s : séquence d'octet du 1er caractère d'un intervalle n'est pas plus petit "
 "que celle du dernier caractère"
 
-#: locale/programs/ld-collate.c:1295
+#: locale/programs/ld-collate.c:1297
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr ""
 "%s : plage de l'ellipse symbolique ne doit pas être suivie directement de « "
 "order_start »"
 
-#: locale/programs/ld-collate.c:1299
+#: locale/programs/ld-collate.c:1301
 #, c-format
 msgid ""
 "%s: symbolic range ellipsis must not be directly followed by `order_end'"
@@ -1896,23 +1977,23 @@
 "%s : plage de l'ellipse symbolique ne doit pas être suivie directement de « "
 "order_end »"
 
-#: locale/programs/ld-collate.c:1319 locale/programs/ld-ctype.c:1477
+#: locale/programs/ld-collate.c:1321 locale/programs/ld-ctype.c:1502
 #, c-format
 msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr ""
 "« %s » et « %.*s » sont des noms invalides pour un intervalle symbolique"
 
-#: locale/programs/ld-collate.c:1369 locale/programs/ld-collate.c:3858
+#: locale/programs/ld-collate.c:1371 locale/programs/ld-collate.c:3861
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr "%s : ordre de « %.*s » déjà défini comme %s:%Zu"
 
-#: locale/programs/ld-collate.c:1378
+#: locale/programs/ld-collate.c:1380
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr "%s : « %s » doit être un caractère"
 
-#: locale/programs/ld-collate.c:1573
+#: locale/programs/ld-collate.c:1575
 #, c-format
 msgid ""
 "%s: `position' must be used for a specific level in all sections or none"
@@ -1920,379 +2001,379 @@
 "%s : « position » doit être utilisé pour un niveau spécifique dans toutes "
 "les sections ou aucune"
 
-#: locale/programs/ld-collate.c:1598
+#: locale/programs/ld-collate.c:1600
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr "Symbole « %s » n'est pas défini"
 
-#: locale/programs/ld-collate.c:1674 locale/programs/ld-collate.c:1780
+#: locale/programs/ld-collate.c:1676 locale/programs/ld-collate.c:1782
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr "Symbole « %s » a le même encodage que"
 
-#: locale/programs/ld-collate.c:1678 locale/programs/ld-collate.c:1784
+#: locale/programs/ld-collate.c:1680 locale/programs/ld-collate.c:1786
 #, c-format
 msgid "symbol `%s'"
 msgstr "Symbole « %s »"
 
-#: locale/programs/ld-collate.c:1826
+#: locale/programs/ld-collate.c:1828
 #, c-format
 msgid "no definition of `UNDEFINED'"
 msgstr "Pas de définition de type « UNDEFINED »"
 
-#: locale/programs/ld-collate.c:1855
+#: locale/programs/ld-collate.c:1857
 #, c-format
 msgid "too many errors; giving up"
 msgstr "trop d'erreurs; abandon"
 
-#: locale/programs/ld-collate.c:2659 locale/programs/ld-collate.c:4046
+#: locale/programs/ld-collate.c:2661 locale/programs/ld-collate.c:4049
 #, c-format
 msgid "%s: nested conditionals not supported"
 msgstr "%s : conditions imbriquées non supportées"
 
-#: locale/programs/ld-collate.c:2677
+#: locale/programs/ld-collate.c:2679
 #, c-format
 msgid "%s: more then one 'else'"
 msgstr "%s : plus puis 1 'else'"
 
-#: locale/programs/ld-collate.c:2852
+#: locale/programs/ld-collate.c:2854
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr "%s : double définition de « %s »"
 
-#: locale/programs/ld-collate.c:2888
+#: locale/programs/ld-collate.c:2890
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr "%s : double déclaration de section « %s »"
 
-#: locale/programs/ld-collate.c:3024
+#: locale/programs/ld-collate.c:3026
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr "%s : caractère inconnu dans le nom du symbole de collation"
 
-#: locale/programs/ld-collate.c:3153
+#: locale/programs/ld-collate.c:3155
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr "%s : caractère inconnu dans la définition équivalent d'un nom"
 
-#: locale/programs/ld-collate.c:3164
+#: locale/programs/ld-collate.c:3166
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr "%s : caractère inconnu dans la définition équivalente d'une valeur"
 
-#: locale/programs/ld-collate.c:3174
+#: locale/programs/ld-collate.c:3176
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr "%s : symbole inconnu « %s » dans une définition équivalente"
 
-#: locale/programs/ld-collate.c:3183
+#: locale/programs/ld-collate.c:3185
 msgid "error while adding equivalent collating symbol"
 msgstr "Erreur lors de l'ajout d'un symbole de collation équivalent"
 
-#: locale/programs/ld-collate.c:3221
+#: locale/programs/ld-collate.c:3223
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr "Double définitions du script « %s »"
 
-#: locale/programs/ld-collate.c:3269
+#: locale/programs/ld-collate.c:3271
 #, c-format
 msgid "%s: unknown section name `%.*s'"
 msgstr "%s : nom de section inconnu `% *s'"
 
-#: locale/programs/ld-collate.c:3298
+#: locale/programs/ld-collate.c:3300
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr "%s : définitions d'ordre multiple de la section « %s »"
 
-#: locale/programs/ld-collate.c:3326
+#: locale/programs/ld-collate.c:3328
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr "%s : nombre invalide de règles de tri"
 
-#: locale/programs/ld-collate.c:3353
+#: locale/programs/ld-collate.c:3355
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr "%s : définitions d'ordre multiple pour une section sans nom"
 
-#: locale/programs/ld-collate.c:3407 locale/programs/ld-collate.c:3537
-#: locale/programs/ld-collate.c:3900
+#: locale/programs/ld-collate.c:3410 locale/programs/ld-collate.c:3540
+#: locale/programs/ld-collate.c:3903
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr "%s : mot clé « order_end » manquant"
 
-#: locale/programs/ld-collate.c:3470
+#: locale/programs/ld-collate.c:3473
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr "%s : ordre de fusionnement de symboles %.*s n'est pas encore défini"
 
-#: locale/programs/ld-collate.c:3488
+#: locale/programs/ld-collate.c:3491
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr "%s : ordre de fusionnement d'éléments %.*s n'est pas encore défini"
 
-#: locale/programs/ld-collate.c:3499
+#: locale/programs/ld-collate.c:3502
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr "%s : ne peut réordonner après %.*s : symbole inconnu"
 
-#: locale/programs/ld-collate.c:3551 locale/programs/ld-collate.c:3912
+#: locale/programs/ld-collate.c:3554 locale/programs/ld-collate.c:3915
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr "%s : mot clé « reorder-end » manquant"
 
-#: locale/programs/ld-collate.c:3585 locale/programs/ld-collate.c:3783
+#: locale/programs/ld-collate.c:3588 locale/programs/ld-collate.c:3786
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr "%s : section « %.*s » inconnue"
 
-#: locale/programs/ld-collate.c:3650
+#: locale/programs/ld-collate.c:3653
 #, c-format
 msgid "%s: bad symbol <%.*s>"
 msgstr "%s : symbole erroné <%.*s>"
 
-#: locale/programs/ld-collate.c:3846
+#: locale/programs/ld-collate.c:3849
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr "%s : ne peut avoir « %s » à la fin d'une plage d'ellipse"
 
-#: locale/programs/ld-collate.c:3896
+#: locale/programs/ld-collate.c:3899
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr "%s : description de catégorie vide non permise"
 
-#: locale/programs/ld-collate.c:3915
+#: locale/programs/ld-collate.c:3918
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr "%s : mot clé « reorder-sections-end » manquant"
 
-#: locale/programs/ld-collate.c:4079
+#: locale/programs/ld-collate.c:4082
 #, c-format
 msgid "%s: '%s' without matching 'ifdef' or 'ifndef'"
 msgstr "%s : '%s' sans correspondance 'ifdef' ou 'ifndef'"
 
-#: locale/programs/ld-collate.c:4097
+#: locale/programs/ld-collate.c:4100
 #, c-format
 msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'"
 msgstr "%s : 'endif' sans 'ifdef' ou 'ifndef' correspondant"
 
-#: locale/programs/ld-ctype.c:439
+#: locale/programs/ld-ctype.c:440
 #, c-format
 msgid "No character set name specified in charmap"
 msgstr "Pas de nom de jeu caractères spéecifié dans la table des caractères"
 
-#: locale/programs/ld-ctype.c:468
+#: locale/programs/ld-ctype.c:469
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must be in class `%s'"
 msgstr ""
 "Le caractère L'\\u%0*x» de la classe « %s » doit être dans la classe « %s »"
 
-#: locale/programs/ld-ctype.c:483
+#: locale/programs/ld-ctype.c:484
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must not be in class `%s'"
 msgstr ""
 "Le caractère L'\\u%0*x» de la classe « %s » ne doit pas être dans la classe "
 "« %s »"
 
-#: locale/programs/ld-ctype.c:497 locale/programs/ld-ctype.c:555
+#: locale/programs/ld-ctype.c:498 locale/programs/ld-ctype.c:556
 #, c-format
 msgid "internal error in %s, line %u"
 msgstr "Erreur interne dans %s, ligne %u"
 
-#: locale/programs/ld-ctype.c:526
+#: locale/programs/ld-ctype.c:527
 #, c-format
 msgid "character '%s' in class `%s' must be in class `%s'"
 msgstr "Caractère « %s » de la classe « %s » doit être dans la classe « %s »"
 
-#: locale/programs/ld-ctype.c:542
+#: locale/programs/ld-ctype.c:543
 #, c-format
 msgid "character '%s' in class `%s' must not be in class `%s'"
 msgstr ""
 "Caractère « %s » de la classe « %s » ne doit pas être dans la classe « %s »"
 
-#: locale/programs/ld-ctype.c:572 locale/programs/ld-ctype.c:610
+#: locale/programs/ld-ctype.c:573 locale/programs/ld-ctype.c:611
 #, c-format
 msgid "<SP> character not in class `%s'"
 msgstr "Le caractère <SP> n'est pas dans la classe « %s »"
 
-#: locale/programs/ld-ctype.c:584 locale/programs/ld-ctype.c:621
+#: locale/programs/ld-ctype.c:585 locale/programs/ld-ctype.c:622
 #, c-format
 msgid "<SP> character must not be in class `%s'"
 msgstr "Le caractère <SP> ne doit pas être dans la classe « %s »"
 
-#: locale/programs/ld-ctype.c:599
+#: locale/programs/ld-ctype.c:600
 #, c-format
 msgid "character <SP> not defined in character map"
 msgstr "Caractère <SP> non défini dans la table des caractères"
 
-#: locale/programs/ld-ctype.c:714
+#: locale/programs/ld-ctype.c:736
 #, c-format
 msgid "`digit' category has not entries in groups of ten"
 msgstr "catégorie « digit » n'a pas d'entrées dans les groupe des dizaines"
 
-#: locale/programs/ld-ctype.c:763
+#: locale/programs/ld-ctype.c:785
 #, c-format
 msgid "no input digits defined and none of the standard names in the charmap"
 msgstr ""
 "Pas de chiffre défini et aucun des noms standards dans la table des "
 "caractères"
 
-#: locale/programs/ld-ctype.c:828
+#: locale/programs/ld-ctype.c:850
 #, c-format
 msgid "not all characters used in `outdigit' are available in the charmap"
 msgstr ""
 "Pas tous les caractères utilisés dans « outdigit » sont disponibles dans la "
 "table des caractères"
 
-#: locale/programs/ld-ctype.c:845
+#: locale/programs/ld-ctype.c:867
 #, c-format
 msgid "not all characters used in `outdigit' are available in the repertoire"
 msgstr ""
 "Pas tous les caractères utilisés dans « outdigit » sont disponibles dans le "
 "dossier"
 
-#: locale/programs/ld-ctype.c:1245
+#: locale/programs/ld-ctype.c:1270
 #, c-format
 msgid "character class `%s' already defined"
 msgstr "Classe de caractères « %s » déjà définie"
 
-#: locale/programs/ld-ctype.c:1251
+#: locale/programs/ld-ctype.c:1276
 #, c-format
 msgid "implementation limit: no more than %Zd character classes allowed"
 msgstr ""
 "Limite d'implantation : pas plus de %Zd classes de caractères permises"
 
-#: locale/programs/ld-ctype.c:1277
+#: locale/programs/ld-ctype.c:1302
 #, c-format
 msgid "character map `%s' already defined"
 msgstr "Table de caractères « %s » déjà définie"
 
-#: locale/programs/ld-ctype.c:1283
+#: locale/programs/ld-ctype.c:1308
 #, c-format
 msgid "implementation limit: no more than %d character maps allowed"
 msgstr ""
 "Limite d'implantation : pas plus de %d tables de caractères sont permises"
 
-#: locale/programs/ld-ctype.c:1548 locale/programs/ld-ctype.c:1673
-#: locale/programs/ld-ctype.c:1779 locale/programs/ld-ctype.c:2471
-#: locale/programs/ld-ctype.c:3467
+#: locale/programs/ld-ctype.c:1573 locale/programs/ld-ctype.c:1698
+#: locale/programs/ld-ctype.c:1804 locale/programs/ld-ctype.c:2496
+#: locale/programs/ld-ctype.c:3492
 #, c-format
 msgid "%s: field `%s' does not contain exactly ten entries"
 msgstr "%s : champ « %s » ne contient pas exactement 10 entrées"
 
-#: locale/programs/ld-ctype.c:1576 locale/programs/ld-ctype.c:2150
+#: locale/programs/ld-ctype.c:1601 locale/programs/ld-ctype.c:2175
 #, c-format
 msgid "to-value <U%0*X> of range is smaller than from-value <U%0*X>"
 msgstr ""
 "Valeur-finale <U%0*X> de l'intervalle est plus petite que la valeur-départ "
 "<U%0*X>"
 
-#: locale/programs/ld-ctype.c:1703
+#: locale/programs/ld-ctype.c:1728
 msgid "start and end character sequence of range must have the same length"
 msgstr ""
 "Début et fin de l'intervalle de la séquence de caractères doivent avoir la "
 "même longueur"
 
-#: locale/programs/ld-ctype.c:1710
+#: locale/programs/ld-ctype.c:1735
 msgid "to-value character sequence is smaller than from-value sequence"
 msgstr ""
 "Valeur finale de la séquence des caractères est plus petite que la valeur de "
 "départ"
 
-#: locale/programs/ld-ctype.c:2070 locale/programs/ld-ctype.c:2121
+#: locale/programs/ld-ctype.c:2095 locale/programs/ld-ctype.c:2146
 msgid "premature end of `translit_ignore' definition"
 msgstr "Fin prématurée de la définition de « translit_ignore »"
 
-#: locale/programs/ld-ctype.c:2076 locale/programs/ld-ctype.c:2127
-#: locale/programs/ld-ctype.c:2169
+#: locale/programs/ld-ctype.c:2101 locale/programs/ld-ctype.c:2152
+#: locale/programs/ld-ctype.c:2194
 msgid "syntax error"
 msgstr "Erreur de syntaxe"
 
-#: locale/programs/ld-ctype.c:2303
+#: locale/programs/ld-ctype.c:2328
 #, c-format
 msgid "%s: syntax error in definition of new character class"
 msgstr ""
 "%s : erreur de syntaxe dans la définition d'une nouvelle classe de caractères"
 
-#: locale/programs/ld-ctype.c:2318
+#: locale/programs/ld-ctype.c:2343
 #, c-format
 msgid "%s: syntax error in definition of new character map"
 msgstr ""
 "%s : erreur de syntaxe dans la définition d'une nouvelle table de caractères"
 
-#: locale/programs/ld-ctype.c:2493
+#: locale/programs/ld-ctype.c:2518
 msgid "ellipsis range must be marked by two operands of same type"
 msgstr "Plage de l'ellipse doit être marqué par 2 opérandes du même type"
 
-#: locale/programs/ld-ctype.c:2502
+#: locale/programs/ld-ctype.c:2527
 msgid ""
 "with symbolic name range values the absolute ellipsis `...' must not be used"
 msgstr ""
 "Les valeurs d'une plage de noms symboliques d'une ellipse absolue « .... » "
 "ne doivent pas être utilisés"
 
-#: locale/programs/ld-ctype.c:2517
+#: locale/programs/ld-ctype.c:2542
 msgid ""
 "with UCS range values one must use the hexadecimal symbolic ellipsis `..'"
 msgstr ""
 "Les valeurs d'une plage UCS doivent utiliser une ellipse symbolique en "
 "hexadécimal « .. »"
 
-#: locale/programs/ld-ctype.c:2531
+#: locale/programs/ld-ctype.c:2556
 msgid ""
 "with character code range values one must use the absolute ellipsis `...'"
 msgstr ""
 "Les valeurs d'une plage de caractères doivent utiliser une ellipse absolu « "
 "... »"
 
-#: locale/programs/ld-ctype.c:2682
+#: locale/programs/ld-ctype.c:2707
 #, c-format
 msgid "duplicated definition for mapping `%s'"
 msgstr "Double définitions de la table « %s »"
 
-#: locale/programs/ld-ctype.c:2768 locale/programs/ld-ctype.c:2912
+#: locale/programs/ld-ctype.c:2793 locale/programs/ld-ctype.c:2937
 #, c-format
 msgid "%s: `translit_start' section does not end with `translit_end'"
 msgstr ""
 "%s : la section « transit_start » n'est pas terminée par « translit_end »"
 
-#: locale/programs/ld-ctype.c:2863
+#: locale/programs/ld-ctype.c:2888
 #, c-format
 msgid "%s: duplicate `default_missing' definition"
 msgstr "%s : double définition de « default_missing »"
 
-#: locale/programs/ld-ctype.c:2868
+#: locale/programs/ld-ctype.c:2893
 msgid "previous definition was here"
 msgstr "Le définition précédente était ici"
 
-#: locale/programs/ld-ctype.c:2890
+#: locale/programs/ld-ctype.c:2915
 #, c-format
 msgid "%s: no representable `default_missing' definition found"
 msgstr ""
 "%s : aucune définition « default_missing » pour les non représentables"
 
-#: locale/programs/ld-ctype.c:3043 locale/programs/ld-ctype.c:3127
-#: locale/programs/ld-ctype.c:3147 locale/programs/ld-ctype.c:3168
-#: locale/programs/ld-ctype.c:3189 locale/programs/ld-ctype.c:3210
-#: locale/programs/ld-ctype.c:3231 locale/programs/ld-ctype.c:3271
-#: locale/programs/ld-ctype.c:3292 locale/programs/ld-ctype.c:3359
-#: locale/programs/ld-ctype.c:3401 locale/programs/ld-ctype.c:3426
+#: locale/programs/ld-ctype.c:3068 locale/programs/ld-ctype.c:3152
+#: locale/programs/ld-ctype.c:3172 locale/programs/ld-ctype.c:3193
+#: locale/programs/ld-ctype.c:3214 locale/programs/ld-ctype.c:3235
+#: locale/programs/ld-ctype.c:3256 locale/programs/ld-ctype.c:3296
+#: locale/programs/ld-ctype.c:3317 locale/programs/ld-ctype.c:3384
+#: locale/programs/ld-ctype.c:3426 locale/programs/ld-ctype.c:3451
 #, c-format
 msgid "%s: character `%s' not defined while needed as default value"
 msgstr ""
 "%s : caractère « %s » non défini alors qu'attendu comme valeur par défaut"
 
-#: locale/programs/ld-ctype.c:3048 locale/programs/ld-ctype.c:3132
-#: locale/programs/ld-ctype.c:3152 locale/programs/ld-ctype.c:3173
-#: locale/programs/ld-ctype.c:3194 locale/programs/ld-ctype.c:3215
-#: locale/programs/ld-ctype.c:3236 locale/programs/ld-ctype.c:3276
-#: locale/programs/ld-ctype.c:3297 locale/programs/ld-ctype.c:3364
+#: locale/programs/ld-ctype.c:3073 locale/programs/ld-ctype.c:3157
+#: locale/programs/ld-ctype.c:3177 locale/programs/ld-ctype.c:3198
+#: locale/programs/ld-ctype.c:3219 locale/programs/ld-ctype.c:3240
+#: locale/programs/ld-ctype.c:3261 locale/programs/ld-ctype.c:3301
+#: locale/programs/ld-ctype.c:3322 locale/programs/ld-ctype.c:3389
 #, c-format
 msgid "%s: character `%s' in charmap not representable with one byte"
 msgstr ""
 "%s : caractère « %s » dans la table des caractères n'est pas représentable "
 "par un seul octet"
 
-#: locale/programs/ld-ctype.c:3408 locale/programs/ld-ctype.c:3433
+#: locale/programs/ld-ctype.c:3433 locale/programs/ld-ctype.c:3458
 #, c-format
 msgid ""
 "%s: character `%s' needed as default value not representable with one byte"
@@ -2300,7 +2381,7 @@
 "%s : caractère « %s » nécessaire comme valeur par défaut n'est pas "
 "représentable par un seul octet"
 
-#: locale/programs/ld-ctype.c:3489
+#: locale/programs/ld-ctype.c:3514
 #, c-format
 msgid ""
 "no output digits defined and none of the standard names in the charmap"
@@ -2308,24 +2389,24 @@
 "Pas de chiffre défini et aucun des noms standards dans la table des "
 "caractères"
 
-#: locale/programs/ld-ctype.c:3780
+#: locale/programs/ld-ctype.c:3805
 #, c-format
 msgid "%s: transliteration data from locale `%s' not available"
 msgstr ""
 "%s : le particularisme local « %s » ne dispose pas des données de "
 "transposition"
 
-#: locale/programs/ld-ctype.c:3881
+#: locale/programs/ld-ctype.c:3906
 #, c-format
 msgid "%s: table for class \"%s\": %lu bytes\n"
 msgstr "%s : table pour la classe « %s » : %lu octets\n"
 
-#: locale/programs/ld-ctype.c:3950
+#: locale/programs/ld-ctype.c:3975
 #, c-format
 msgid "%s: table for map \"%s\": %lu bytes\n"
 msgstr "%s : table de caractères « %s » : %lu octets\n"
 
-#: locale/programs/ld-ctype.c:4083
+#: locale/programs/ld-ctype.c:4108
 #, c-format
 msgid "%s: table for width: %lu bytes\n"
 msgstr "%s : table de largeur : %lu octets\n"
@@ -2536,6 +2617,11 @@
 msgid "symbol `%.*s' not in repertoire map"
 msgstr "Symbole « %.*s » n'est pas dans la table des répertoires"
 
+#: locale/programs/locale-spec.c:131
+#, c-format
+msgid "unknown name \"%s\""
+msgstr "nom inconnu « %s »"
+
 #: locale/programs/locale.c:74
 msgid "System information:"
 msgstr "Information système :"
@@ -2714,13 +2800,13 @@
 #, c-format
 msgid ""
 "System's directory for character maps : %s\n"
-"                       repertoire maps: %s\n"
-"                       locale path    : %s\n"
+"\t\t       repertoire maps: %s\n"
+"\t\t       locale path    : %s\n"
 "%s"
 msgstr ""
 "Dossier système de la table des caractères : %s\n"
-"                de la table des répertoires : %s\n"
-"                du chemin des particularisations : %s\n"
+"\t\t            de la table des répertoires : %s\n"
+"\t\t            du chemin des particularisations : %s\n"
 "%s"
 
 #: locale/programs/localedef.c:567
@@ -2733,134 +2819,139 @@
 msgid "cannot add already read locale `%s' a second time"
 msgstr "Ne peut ajouter une locale déjà lu « %s » une seconde fois"
 
-#: locale/programs/locarchive.c:88 locale/programs/locarchive.c:261
+#: locale/programs/locarchive.c:92 locale/programs/locarchive.c:338
 #, c-format
 msgid "cannot create temporary file"
 msgstr "ne peut créer un fichier temporaire"
 
-#: locale/programs/locarchive.c:118 locale/programs/locarchive.c:307
+#: locale/programs/locarchive.c:122 locale/programs/locarchive.c:384
 #, c-format
 msgid "cannot initialize archive file"
 msgstr "ne peut initialiser le fichier d'archive"
 
-#: locale/programs/locarchive.c:125 locale/programs/locarchive.c:314
+#: locale/programs/locarchive.c:129 locale/programs/locarchive.c:391
 #, c-format
 msgid "cannot resize archive file"
 msgstr "ne peut modifier la taille du fichier d'archive"
 
-#: locale/programs/locarchive.c:134 locale/programs/locarchive.c:323
-#: locale/programs/locarchive.c:527
+#: locale/programs/locarchive.c:152 locale/programs/locarchive.c:414
+#: locale/programs/locarchive.c:633
 #, c-format
 msgid "cannot map archive header"
 msgstr "ne peut mapper l'en-tête de l'archive"
 
-#: locale/programs/locarchive.c:156
+#: locale/programs/locarchive.c:174
 #, c-format
 msgid "failed to create new locale archive"
 msgstr "échec de création d'une nouvelle archive de particularisation"
 
-#: locale/programs/locarchive.c:168
+#: locale/programs/locarchive.c:186
 #, c-format
 msgid "cannot change mode of new locale archive"
 msgstr ""
 "ne peut changer les protections de la nouvelle archive de particularisation"
 
-#: locale/programs/locarchive.c:255
+#: locale/programs/locarchive.c:285
+#, c-format
+msgid "cannot read data from locale archive"
+msgstr "ne peut lire les données de l'archive locale"
+
+#: locale/programs/locarchive.c:318
 #, c-format
 msgid "cannot map locale archive file"
 msgstr "ne peut mapper l'archive de particularisation"
 
-#: locale/programs/locarchive.c:331
+#: locale/programs/locarchive.c:422
 #, c-format
 msgid "cannot lock new archive"
 msgstr "ne peut verrouiller la nouvelle archive"
 
-#: locale/programs/locarchive.c:396
+#: locale/programs/locarchive.c:488
 #, c-format
 msgid "cannot extend locale archive file"
 msgstr ""
 "ne peut augmenter la taille du fichier de l'archive de particularisation"
 
-#: locale/programs/locarchive.c:405
+#: locale/programs/locarchive.c:497
 #, c-format
 msgid "cannot change mode of resized locale archive"
 msgstr ""
 "ne peut modifier les protections de l'archive des particularisations dont la "
 "taille a changé"
 
-#: locale/programs/locarchive.c:413
+#: locale/programs/locarchive.c:505
 #, c-format
 msgid "cannot rename new archive"
 msgstr "ne peut changer le nom de la nouvelle archive"
 
-#: locale/programs/locarchive.c:466
+#: locale/programs/locarchive.c:558
 #, c-format
 msgid "cannot open locale archive \"%s\""
 msgstr "ne peut ouvrir l'archive des particularisations « %s »"
 
-#: locale/programs/locarchive.c:471
+#: locale/programs/locarchive.c:563
 #, c-format
 msgid "cannot stat locale archive \"%s\""
 msgstr "ne peut évaluer par `stat' l'archive des particularisations « %s »"
 
-#: locale/programs/locarchive.c:490
+#: locale/programs/locarchive.c:582
 #, c-format
 msgid "cannot lock locale archive \"%s\""
 msgstr "ne peut verrouiller l'archive des particularisations « %s »"
 
-#: locale/programs/locarchive.c:513
+#: locale/programs/locarchive.c:605
 #, c-format
 msgid "cannot read archive header"
 msgstr "ne peut lire l'en-tête de l'archive"
 
-#: locale/programs/locarchive.c:573
+#: locale/programs/locarchive.c:680
 #, c-format
 msgid "locale '%s' already exists"
 msgstr "particularisation « %s » existe déjà"
 
-#: locale/programs/locarchive.c:804 locale/programs/locarchive.c:819
-#: locale/programs/locarchive.c:831 locale/programs/locarchive.c:843
+#: locale/programs/locarchive.c:942 locale/programs/locarchive.c:957
+#: locale/programs/locarchive.c:969 locale/programs/locarchive.c:981
 #: locale/programs/locfile.c:344
 #, c-format
 msgid "cannot add to locale archive"
 msgstr "ne peut l'ajouter à l'archive des particularisations"
 
-#: locale/programs/locarchive.c:998
+#: locale/programs/locarchive.c:1139
 #, c-format
 msgid "locale alias file `%s' not found"
 msgstr "alias du fichier des particularisations « %s » non trouvé"
 
-#: locale/programs/locarchive.c:1142
+#: locale/programs/locarchive.c:1289
 #, c-format
 msgid "Adding %s\n"
 msgstr "Ajout de %s\n"
 
-#: locale/programs/locarchive.c:1148
+#: locale/programs/locarchive.c:1295
 #, c-format
 msgid "stat of \"%s\" failed: %s: ignored"
 msgstr "échec d'évaluation par stat() de « %s » :  %s : ignoré"
 
-#: locale/programs/locarchive.c:1154
+#: locale/programs/locarchive.c:1301
 #, c-format
 msgid "\"%s\" is no directory; ignored"
 msgstr "« %s » n'est pas un dossier; ignoré"
 
-#: locale/programs/locarchive.c:1161
+#: locale/programs/locarchive.c:1308
 #, c-format
 msgid "cannot open directory \"%s\": %s: ignored"
 msgstr "ne peut ouvrir le dossier « %s » :  %s : ignoré"
 
-#: locale/programs/locarchive.c:1233
+#: locale/programs/locarchive.c:1380
 #, c-format
 msgid "incomplete set of locale files in \"%s\""
 msgstr "jeu incomplet de fichiers de particularisation dans « %s »"
 
-#: locale/programs/locarchive.c:1297
+#: locale/programs/locarchive.c:1444
 #, c-format
 msgid "cannot read all files in \"%s\": ignored"
 msgstr "ne peut lire tous les fichiers dans « %s » :  ignoré"
 
-#: locale/programs/locarchive.c:1367
+#: locale/programs/locarchive.c:1514
 #, c-format
 msgid "locale \"%s\" not in archive"
 msgstr "particularisation « %s » n'est pas dans l'archive"
@@ -2928,7 +3019,7 @@
 msgid "repertoire map file `%s' not found"
 msgstr "Fichier de la table des caractères « %s » non repérable"
 
-#: login/programs/pt_chown.c:74
+#: login/programs/pt_chown.c:78
 #, c-format
 msgid ""
 "Set the owner, group and access permission of the slave pseudo terminal "
@@ -2941,7 +3032,7 @@
 "descripteur de fichier`%d'.  Ceci est le programme d'aide de la fonction "
 "`grantpt'.  Il n'est pas prévu pour être lancé depuis la ligne de commande.\n"
 
-#: login/programs/pt_chown.c:84
+#: login/programs/pt_chown.c:88
 #, c-format
 msgid ""
 "The owner is set to the current user, the group is set to `%s', and the "
@@ -2954,43 +3045,39 @@
 "\n"
 "%s"
 
-#: login/programs/pt_chown.c:161
+#: login/programs/pt_chown.c:192
 #, c-format
 msgid "too many arguments"
 msgstr "trop d'arguments"
 
-#: login/programs/pt_chown.c:169
+#: login/programs/pt_chown.c:200
 #, c-format
 msgid "needs to be installed setuid `root'"
 msgstr "nécessite d'être installé avec setuid `root'"
 
-#: malloc/mcheck.c:330
+#: malloc/mcheck.c:350
 msgid "memory is consistent, library is buggy\n"
 msgstr "La mémoire est consistente, la librairie est fautive.\n"
 
-#: malloc/mcheck.c:333
+#: malloc/mcheck.c:353
 msgid "memory clobbered before allocated block\n"
 msgstr "Mémoire écrasée avant le bloc alloué\n"
 
-#: malloc/mcheck.c:336
+#: malloc/mcheck.c:356
 msgid "memory clobbered past end of allocated block\n"
 msgstr "Mémoire écrasée après la fin du bloc alloué\n"
 
-#: malloc/mcheck.c:339
+#: malloc/mcheck.c:359
 msgid "block freed twice\n"
 msgstr "Bloc libéré deux fois\n"
 
-#: malloc/mcheck.c:342
+#: malloc/mcheck.c:362
 msgid "bogus mcheck_status, library is buggy\n"
 msgstr "Statut de « mcheck_status » erroné, la librarie est erronée.\n"
 
-#: malloc/memusage.sh:27
-msgid "Try \\`memusage --help' for more information."
-msgstr "Pour en savoir davantage, faites \\`memusage --help'."
-
 #: malloc/memusage.sh:33
-msgid "memusage: option \\`$1' requires an argument"
-msgstr "memusage : option \\`$1' requiert un argument"
+msgid "%s: option '%s' requires an argument\\n"
+msgstr "%s : l'option « %s » requiert un argument\\n"
 
 #: malloc/memusage.sh:39
 msgid ""
@@ -3057,15 +3144,15 @@
 msgid ""
 "Syntax: memusage [--data=FILE] [--progname=NAME] [--png=FILE] [--"
 "unbuffered]\n"
-"            [--buffer=SIZE] [--no-timer] [--time-based] [--total]\n"
-"            [--title=STRING] [--x-size=SIZE] [--y-size=SIZE]\n"
-"            PROGRAM [PROGRAMOPTION]..."
+"\t    [--buffer=SIZE] [--no-timer] [--time-based] [--total]\n"
+"\t    [--title=STRING] [--x-size=SIZE] [--y-size=SIZE]\n"
+"\t    PROGRAM [PROGRAMOPTION]..."
 msgstr ""
-"Syntax : memusage [--data=FILE] [--progname=NAME] [--png=FILE] [--"
+"Syntax: memusage [--data=FILE] [--progname=NAME] [--png=FILE] [--"
 "unbuffered]\n"
-"            [--buffer=SIZE] [--no-timer] [--time-based] [--total]\n"
-"            [--title=STRING] [--x-size=SIZE] [--y-size=SIZE]\n"
-"            PROGRAM [PROGRAMOPTION]..."
+"\t    [--buffer=SIZE] [--no-timer] [--time-based] [--total]\n"
+"\t    [--title=STRING] [--x-size=SIZE] [--y-size=SIZE]\n"
+"\t    PROGRAM [PROGRAMOPTION]..."
 
 #: malloc/memusage.sh:193
 msgid "memusage: option \\`${1##*=}' is ambiguous"
@@ -3123,7 +3210,7 @@
 msgid "unable to free arguments"
 msgstr "incapable de libérer des arguments"
 
-#: nis/nis_error.h:1 nis/ypclnt.c:833 nis/ypclnt.c:921 posix/regcomp.c:133
+#: nis/nis_error.h:1 nis/ypclnt.c:833 nis/ypclnt.c:921 posix/regcomp.c:132
 #: sysdeps/gnu/errlist.c:20
 msgid "Success"
 msgstr "Succès"
@@ -3762,12 +3849,12 @@
 msgid "yp_update: cannot get server address\n"
 msgstr "yp_update : ne peut obtenir l'adresse du serveur\n"
 
-#: nscd/aicache.c:82 nscd/hstcache.c:481
+#: nscd/aicache.c:83 nscd/hstcache.c:492
 #, c-format
 msgid "Haven't found \"%s\" in hosts cache!"
 msgstr "N'a pas trouvé « %s » dans la cache de la liste des hôtes!"
 
-#: nscd/aicache.c:84 nscd/hstcache.c:483
+#: nscd/aicache.c:85 nscd/hstcache.c:494
 #, c-format
 msgid "Reloading \"%s\" in hosts cache!"
 msgstr "Recharge \"%s\" dans le cache hôte!"
@@ -3781,43 +3868,43 @@
 msgid " (first)"
 msgstr " (first)"
 
-#: nscd/cache.c:286 nscd/connections.c:866
+#: nscd/cache.c:276 nscd/connections.c:861
 #, c-format
 msgid "cannot stat() file `%s': %s"
 msgstr "Ne peut évaluer par stat() le fichier « %s » : %s"
 
-#: nscd/cache.c:328
+#: nscd/cache.c:318
 #, c-format
 msgid "pruning %s cache; time %ld"
 msgstr "écourte %s cache; time %ld"
 
-#: nscd/cache.c:357
+#: nscd/cache.c:347
 #, c-format
 msgid "considering %s entry \"%s\", timeout %<PRIu64>"
 msgstr "considering %s entry \"%s\", timeout %<PRIu64>"
 
-#: nscd/connections.c:570
+#: nscd/connections.c:565
 #, c-format
 msgid "invalid persistent database file \"%s\": %s"
 msgstr "fichier de base de données reste invalide \"%s\" : %s"
 
-#: nscd/connections.c:578
+#: nscd/connections.c:573
 msgid "uninitialized header"
 msgstr "en-tête non initialisée"
 
-#: nscd/connections.c:583
+#: nscd/connections.c:578
 msgid "header size does not match"
 msgstr "la taille de l'entête n'est pas adéquate"
 
-#: nscd/connections.c:593
+#: nscd/connections.c:588
 msgid "file size does not match"
 msgstr "la taille du fichier n'est pas adéquate"
 
-#: nscd/connections.c:610
+#: nscd/connections.c:605
 msgid "verification failed"
 msgstr "échec de la vérification"
 
-#: nscd/connections.c:624
+#: nscd/connections.c:619
 #, c-format
 msgid ""
 "suggested size of table for database %s larger than the persistent "
@@ -3826,17 +3913,17 @@
 "la taille suggérée de la table pour la base de donnée %s est plus grande que "
 "la table persistante de la base de donnée"
 
-#: nscd/connections.c:635 nscd/connections.c:720
+#: nscd/connections.c:630 nscd/connections.c:715
 #, c-format
 msgid "cannot create read-only descriptor for \"%s\"; no mmap"
 msgstr "ne peut créer le descripteur read-only pour \"%s\" ; pas de mmap"
 
-#: nscd/connections.c:651
+#: nscd/connections.c:646
 #, c-format
 msgid "cannot access '%s'"
 msgstr "ne peut accéder '%s'"
 
-#: nscd/connections.c:699
+#: nscd/connections.c:694
 #, c-format
 msgid ""
 "database for %s corrupted or simultaneously used; remove %s manually if "
@@ -3845,216 +3932,216 @@
 "la base de données %s est endommagée ou utilisée concurremment; supprimer %s "
 "manuellement au besoin et relancer"
 
-#: nscd/connections.c:706
+#: nscd/connections.c:701
 #, c-format
 msgid "cannot create %s; no persistent database used"
 msgstr "ne peut créer %s; aucune base de données persistante utilisée"
 
-#: nscd/connections.c:709
+#: nscd/connections.c:704
 #, c-format
 msgid "cannot create %s; no sharing possible"
 msgstr "ne peut créer %s; pas de partage possible"
 
-#: nscd/connections.c:780
+#: nscd/connections.c:775
 #, c-format
 msgid "cannot write to database file %s: %s"
 msgstr "ne peut écrire dans le fichier de base de données %s : %s"
 
-#: nscd/connections.c:819
+#: nscd/connections.c:814
 #, c-format
 msgid "cannot set socket to close on exec: %s; disabling paranoia mode"
 msgstr ""
 "ne peut établir le socket comme étant fermé dans exec : %s; désactive le "
 "mode paranoïa"
 
-#: nscd/connections.c:902
+#: nscd/connections.c:897
 #, c-format
 msgid "cannot open socket: %s"
 msgstr "Ne peut ouvrir le socket : « %s »"
 
-#: nscd/connections.c:922
+#: nscd/connections.c:917
 #, c-format
 msgid "cannot change socket to nonblocking mode: %s"
 msgstr "ne peut établir le socket en mode nonblocking : %s"
 
-#: nscd/connections.c:930
+#: nscd/connections.c:925
 #, c-format
 msgid "cannot set socket to close on exec: %s"
 msgstr "ne peut établir le socket à l'état fermé dans exec : %s"
 
-#: nscd/connections.c:943
+#: nscd/connections.c:938
 #, c-format
 msgid "cannot enable socket to accept connections: %s"
 msgstr "Ne peut activer le socket pour accepter des connexions : %s"
 
-#: nscd/connections.c:1043
+#: nscd/connections.c:1039
 #, c-format
 msgid "provide access to FD %d, for %s"
 msgstr "fournit l'accès à FD %d, pour %s"
 
-#: nscd/connections.c:1055
+#: nscd/connections.c:1051
 #, c-format
 msgid "cannot handle old request version %d; current version is %d"
 msgstr ""
 "Ne peut traiter une requête d'une vieille version %d; la version courante "
 "est %d"
 
-#: nscd/connections.c:1077
+#: nscd/connections.c:1073
 #, c-format
 msgid "request from %ld not handled due to missing permission"
 msgstr ""
 "la requête de %ld non prise en compte du fait du manque de permission"
 
-#: nscd/connections.c:1082
+#: nscd/connections.c:1078
 #, c-format
 msgid "request from '%s' [%ld] not handled due to missing permission"
 msgstr ""
 "la requête de '%s' [%ld] non prise en compte du fait du manque de permission"
 
-#: nscd/connections.c:1087
+#: nscd/connections.c:1083
 msgid "request not handled due to missing permission"
 msgstr "la requête de %ld"
 
-#: nscd/connections.c:1125 nscd/connections.c:1178
+#: nscd/connections.c:1121 nscd/connections.c:1174
 #, c-format
 msgid "cannot write result: %s"
 msgstr "Ne peut écrire les résultats : « %s »"
 
-#: nscd/connections.c:1261
+#: nscd/connections.c:1257
 #, c-format
 msgid "error getting caller's id: %s"
 msgstr "erreur lors de la récupération de l'identifiant de l'appelant : %s"
 
-#: nscd/connections.c:1320
+#: nscd/connections.c:1316
 #, c-format
 msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr "ne peut ouvrir /proc/self/cmdline : %s; désactive le mode paranoïa"
 
-#: nscd/connections.c:1334
+#: nscd/connections.c:1330
 #, c-format
 msgid "cannot read /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr "ne peut lire /proc/self/cmdline : %s; désactive le mode paranoïa"
 
-#: nscd/connections.c:1374
+#: nscd/connections.c:1370
 #, c-format
 msgid "cannot change to old UID: %s; disabling paranoia mode"
 msgstr "ne peut réétablir l'ancien UID : %s; désactive le mode paranoïa"
 
-#: nscd/connections.c:1384
+#: nscd/connections.c:1380
 #, c-format
 msgid "cannot change to old GID: %s; disabling paranoia mode"
 msgstr "ne peut réétablir l'ancien GID : %s; désactive le mode paranoïa"
 
-#: nscd/connections.c:1397
+#: nscd/connections.c:1393
 #, c-format
 msgid "cannot change to old working directory: %s; disabling paranoia mode"
 msgstr ""
 "ne peut réétablir l'ancien dossier de travail : %s; désactive le mode "
 "paranoïa"
 
-#: nscd/connections.c:1429
+#: nscd/connections.c:1439
 #, c-format
 msgid "re-exec failed: %s; disabling paranoia mode"
 msgstr "re-exec a échoué : %s; désactive le mode paranoïa"
 
-#: nscd/connections.c:1438
+#: nscd/connections.c:1448
 #, c-format
 msgid "cannot change current working directory to \"/\": %s"
 msgstr "ne peut établir le dossier de travail courant à \"/\" : %s"
 
-#: nscd/connections.c:1644
+#: nscd/connections.c:1641
 #, c-format
 msgid "short read while reading request: %s"
 msgstr "Lecture écourtée lors de la lecture de la requête : « %s »"
 
-#: nscd/connections.c:1677
+#: nscd/connections.c:1674
 #, c-format
 msgid "key length in request too long: %d"
 msgstr "La longueur de la clé de la requête est trop longue : %d"
 
-#: nscd/connections.c:1690
+#: nscd/connections.c:1687
 #, c-format
 msgid "short read while reading request key: %s"
 msgstr "Lecture écourtée lors de la lecture de la clé de requête : %s"
 
-#: nscd/connections.c:1699
+#: nscd/connections.c:1696
 #, c-format
 msgid "handle_request: request received (Version = %d) from PID %ld"
 msgstr "handle_request : requête reçue (Version = %d) à partir du PID %ld"
 
-#: nscd/connections.c:1704
+#: nscd/connections.c:1701
 #, c-format
 msgid "handle_request: request received (Version = %d)"
 msgstr "handle_request : requête reçue (Version = %d)"
 
-#: nscd/connections.c:1903 nscd/connections.c:2101
+#: nscd/connections.c:1901 nscd/connections.c:2099
 #, c-format
 msgid "disabled inotify after read error %d"
 msgstr "désactive inotify après erreur de lecture %d"
 
-#: nscd/connections.c:2230
+#: nscd/connections.c:2228
 msgid "could not initialize conditional variable"
 msgstr "n'a pu initialiser une variable conditionnelle"
 
-#: nscd/connections.c:2238
+#: nscd/connections.c:2236
 msgid "could not start clean-up thread; terminating"
 msgstr ""
 "n'a pu démarrer le process(thread) de nettoyage ; en train de s'achever"
 
-#: nscd/connections.c:2252
+#: nscd/connections.c:2250
 msgid "could not start any worker thread; terminating"
 msgstr ""
 "n'a pas pu démarrer de process de travail (threads) ; en train de s'achever"
 
-#: nscd/connections.c:2303 nscd/connections.c:2304 nscd/connections.c:2321
-#: nscd/connections.c:2330 nscd/connections.c:2348 nscd/connections.c:2359
-#: nscd/connections.c:2370
+#: nscd/connections.c:2301 nscd/connections.c:2302 nscd/connections.c:2319
+#: nscd/connections.c:2328 nscd/connections.c:2346 nscd/connections.c:2357
+#: nscd/connections.c:2368
 #, c-format
 msgid "Failed to run nscd as user '%s'"
 msgstr "Échec d'exécution de nscd en tant qu'usager « %s »"
 
-#: nscd/connections.c:2322
+#: nscd/connections.c:2320
 #, c-format
 msgid "initial getgrouplist failed"
 msgstr "échec du getgrouplist initial"
 
-#: nscd/connections.c:2331
+#: nscd/connections.c:2329
 #, c-format
 msgid "getgrouplist failed"
 msgstr "échec de getgrouplist"
 
-#: nscd/connections.c:2349
+#: nscd/connections.c:2347
 #, c-format
 msgid "setgroups failed"
 msgstr "échec de setgroups"
 
-#: nscd/grpcache.c:395 nscd/hstcache.c:430 nscd/initgrcache.c:416
-#: nscd/pwdcache.c:400 nscd/servicescache.c:343
+#: nscd/grpcache.c:383 nscd/hstcache.c:439 nscd/initgrcache.c:406
+#: nscd/pwdcache.c:378 nscd/servicescache.c:332
 #, c-format
 msgid "short write in %s: %s"
 msgstr "Écriture écourtée dans %s : %s"
 
-#: nscd/grpcache.c:438 nscd/initgrcache.c:78
+#: nscd/grpcache.c:428 nscd/initgrcache.c:78
 #, c-format
 msgid "Haven't found \"%s\" in group cache!"
 msgstr "N'a pas trouvé « %s » dans la cache du groupe!"
 
-#: nscd/grpcache.c:440 nscd/initgrcache.c:80
+#: nscd/grpcache.c:430 nscd/initgrcache.c:80
 #, c-format
 msgid "Reloading \"%s\" in group cache!"
 msgstr "Recharge \"%s\" dans le cache groupe!"
 
-#: nscd/grpcache.c:517
+#: nscd/grpcache.c:509
 #, c-format
 msgid "Invalid numeric gid \"%s\"!"
 msgstr "gid numérique invalide  « %s » !"
 
-#: nscd/mem.c:457
+#: nscd/mem.c:431
 #, c-format
 msgid "freed %zu bytes in %s cache"
 msgstr "libéré %zu octets dans le cache %s"
 
-#: nscd/mem.c:594
+#: nscd/mem.c:574
 #, c-format
 msgid "no more memory for database '%s'"
 msgstr "plus de mémoire disponible pour la base de données '%s'"
@@ -4105,7 +4192,7 @@
 msgid "Name Service Cache Daemon."
 msgstr "« Daemon » de la cache du service de noms."
 
-#: nscd/nscd.c:147 nss/getent.c:876 nss/makedb.c:123
+#: nscd/nscd.c:147 nss/getent.c:952 nss/makedb.c:123
 #, c-format
 msgid "wrong number of arguments"
 msgstr "Mauvais nombre d'arguments"
@@ -4134,7 +4221,7 @@
 msgid "Could not create log file"
 msgstr "N'a pu créé le fichier journal"
 
-#: nscd/nscd.c:305 nscd/nscd.c:330 nscd/nscd_stat.c:172
+#: nscd/nscd.c:305 nscd/nscd.c:330 nscd/nscd_stat.c:174
 #, c-format
 msgid "Only root is allowed to use this option!"
 msgstr "Seul ROOT est autorisé à utiliser cette option!"
@@ -4144,7 +4231,7 @@
 msgid "'%s' is not a known database"
 msgstr "'%s' n'est pas une base de donnée connue"
 
-#: nscd/nscd.c:370 nscd/nscd_stat.c:191
+#: nscd/nscd.c:370 nscd/nscd_stat.c:193
 #, c-format
 msgid "write incomplete"
 msgstr "écriture incomplète"
@@ -4215,35 +4302,35 @@
 msgstr ""
 "la taille maximale de fichier pour la base de données %s est trop petite"
 
-#: nscd/nscd_stat.c:141
+#: nscd/nscd_stat.c:143
 #, c-format
 msgid "cannot write statistics: %s"
 msgstr "Ne peut écrire les statistiques : « %s »"
 
-#: nscd/nscd_stat.c:156
+#: nscd/nscd_stat.c:158
 msgid "yes"
 msgstr "oui"
 
-#: nscd/nscd_stat.c:157
+#: nscd/nscd_stat.c:159
 msgid "no"
 msgstr "non"
 
-#: nscd/nscd_stat.c:168
+#: nscd/nscd_stat.c:170
 #, c-format
 msgid "Only root or %s is allowed to use this option!"
 msgstr "Seul ROOT ou %s est autorisé à utiliser cette option!"
 
-#: nscd/nscd_stat.c:179
+#: nscd/nscd_stat.c:181
 #, c-format
 msgid "nscd not running!\n"
 msgstr "nscd n'est pas en exécution!\n"
 
-#: nscd/nscd_stat.c:203
+#: nscd/nscd_stat.c:205
 #, c-format
 msgid "cannot read statistics data"
 msgstr "Ne peut lire les données de statistiques"
 
-#: nscd/nscd_stat.c:206
+#: nscd/nscd_stat.c:208
 #, c-format
 msgid ""
 "nscd configuration:\n"
@@ -4254,27 +4341,27 @@
 "\n"
 "%15d  niveau serveur de déboggage\n"
 
-#: nscd/nscd_stat.c:230
+#: nscd/nscd_stat.c:232
 #, c-format
 msgid "%3ud %2uh %2um %2lus  server runtime\n"
 msgstr "%3ud %2uh %2um %2lus  temps d'exécution du serveur\n"
 
-#: nscd/nscd_stat.c:233
+#: nscd/nscd_stat.c:235
 #, c-format
 msgid "    %2uh %2um %2lus  server runtime\n"
 msgstr "    %2uh %2um %2lus  temps d'exécution du serveur\n"
 
-#: nscd/nscd_stat.c:235
+#: nscd/nscd_stat.c:237
 #, c-format
 msgid "        %2um %2lus  server runtime\n"
 msgstr "        %2um %2lus  temps d'exécution du serveur\n"
 
-#: nscd/nscd_stat.c:237
+#: nscd/nscd_stat.c:239
 #, c-format
 msgid "            %2lus  server runtime\n"
 msgstr "            %2lus  temps d'exécution du serveur\n"
 
-#: nscd/nscd_stat.c:239
+#: nscd/nscd_stat.c:241
 #, c-format
 msgid ""
 "%15d  current number of threads\n"
@@ -4282,14 +4369,16 @@
 "%15lu  number of times clients had to wait\n"
 "%15s  paranoia mode enabled\n"
 "%15lu  restart internal\n"
+"%15u  reload count\n"
 msgstr ""
 "%15d  nombre actuel de fils (threads)\n"
 "%15d  nombre maximum de fils (threads)\n"
 "%15lu  nombre de fois les clients ont eu à attendre\n"
 "%15s  mode paranoïa activé\n"
 "%15lu  redémarrage interne\n"
+"%15u  compte de rechargement\n"
 
-#: nscd/nscd_stat.c:273
+#: nscd/nscd_stat.c:276
 #, c-format
 msgid ""
 "\n"
@@ -4341,17 +4430,17 @@
 "%15<PRIuMAX>  allocation de mémoire à échouée\n"
 "%15s  vérifier /etc/%s pour les changements\n"
 
-#: nscd/pwdcache.c:443
+#: nscd/pwdcache.c:423
 #, c-format
 msgid "Haven't found \"%s\" in password cache!"
 msgstr "N'a pas trouvé \"%s\" dans le cache des mots de passe!"
 
-#: nscd/pwdcache.c:445
+#: nscd/pwdcache.c:425
 #, c-format
 msgid "Reloading \"%s\" in password cache!"
 msgstr "Recharge \"%s\" dans le cache des mots de passe!"
 
-#: nscd/pwdcache.c:523
+#: nscd/pwdcache.c:506
 #, c-format
 msgid "Invalid numeric uid \"%s\"!"
 msgstr "uid numérique invalide  « %s » !"
@@ -4460,43 +4549,47 @@
 "%15u  CAV tentés\n"
 "%15u  CAV loupés\n"
 
-#: nscd/servicescache.c:390
+#: nscd/servicescache.c:381
 #, c-format
 msgid "Haven't found \"%s\" in services cache!"
 msgstr "N'a pas trouvé \"%s\" dans le cache des services!"
 
-#: nscd/servicescache.c:392
+#: nscd/servicescache.c:383
 #, c-format
 msgid "Reloading \"%s\" in services cache!"
 msgstr "Recharge \"%s\" dans le cache des services!"
 
-#: nss/getent.c:52
+#: nss/getent.c:54
 msgid "database [key ...]"
 msgstr "base de données [clé ...]"
 
-#: nss/getent.c:57
+#: nss/getent.c:59
 msgid "Service configuration to be used"
 msgstr "Configuration de service à utiliser"
 
-#: nss/getent.c:62
+#: nss/getent.c:60
+msgid "disable IDN encoding"
+msgstr "désactive l'encodage IDN"
+
+#: nss/getent.c:65
 msgid "Get entries from administrative database."
 msgstr "Obtient des entrées de la base de données administrative"
 
-#: nss/getent.c:143 nss/getent.c:408
+#: nss/getent.c:149 nss/getent.c:479
 #, c-format
 msgid "Enumeration not supported on %s\n"
 msgstr "Énumération non supportée sur %s\n"
 
-#: nss/getent.c:794
+#: nss/getent.c:866
 #, c-format
 msgid "Unknown database name"
 msgstr "Base de données inconnue"
 
-#: nss/getent.c:820
+#: nss/getent.c:896
 msgid "Supported databases:\n"
 msgstr "Base de données supportées :\n"
 
-#: nss/getent.c:886
+#: nss/getent.c:962
 #, c-format
 msgid "Unknown database: %s\n"
 msgstr "Base de données inconnue : « %s »\n"
@@ -4562,17 +4655,17 @@
 msgid "while reading database"
 msgstr "lors de la lecture de la base de données"
 
-#: posix/getconf.c:945
+#: posix/getconf.c:1036
 #, c-format
 msgid "Usage: %s [-v specification] variable_name [pathname]\n"
 msgstr "Usage : %s [-v spécification] nom_de_variable [chemin_d_accès]\n"
 
-#: posix/getconf.c:948
+#: posix/getconf.c:1039
 #, c-format
 msgid "       %s -a [pathname]\n"
 msgstr "       %s -a [pathname]\n"
 
-#: posix/getconf.c:1023
+#: posix/getconf.c:1115
 #, c-format
 msgid ""
 "Usage: getconf [-v SPEC] VAR\n"
@@ -4593,142 +4686,146 @@
 "de compilation SPEC.\n"
 "\n"
 
-#: posix/getconf.c:1081
+#: posix/getconf.c:1173
 #, c-format
 msgid "unknown specification \"%s\""
 msgstr "spécification inconnu « %s »"
 
-#: posix/getconf.c:1109
+#: posix/getconf.c:1225
 #, c-format
 msgid "Couldn't execute %s"
 msgstr "N'a pas pu exécuter %s"
 
-#: posix/getconf.c:1149 posix/getconf.c:1165
+#: posix/getconf.c:1269 posix/getconf.c:1285
 msgid "undefined"
 msgstr "indéfini"
 
-#: posix/getconf.c:1187
+#: posix/getconf.c:1307
 #, c-format
 msgid "Unrecognized variable `%s'"
 msgstr "Variable non reconnue « %s »"
 
-#: posix/getopt.c:570 posix/getopt.c:586
+#: posix/getopt.c:594 posix/getopt.c:623
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s : l'option « %s » est ambiguë\n"
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s : l'option « %s » est ambiguë; possibilités:"
 
-#: posix/getopt.c:619 posix/getopt.c:623
+#: posix/getopt.c:664 posix/getopt.c:668
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s : l'option « --%s » ne permet pas d'argument\n"
 
-#: posix/getopt.c:632 posix/getopt.c:637
+#: posix/getopt.c:677 posix/getopt.c:682
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s : l'option « %c%s » ne permet pas d'argument\n"
 
-#: posix/getopt.c:680 posix/getopt.c:699 posix/getopt.c:1002
-#: posix/getopt.c:1021
+#: posix/getopt.c:725 posix/getopt.c:744
 #, c-format
-msgid "%s: option '%s' requires an argument\n"
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s : l'option « %s » requiert un argument\n"
 
-#: posix/getopt.c:737 posix/getopt.c:740
+#: posix/getopt.c:782 posix/getopt.c:785
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s : option non reconnue « --%s »\n"
 
-#: posix/getopt.c:748 posix/getopt.c:751
+#: posix/getopt.c:793 posix/getopt.c:796
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s : option non reconnue « %c%s »\n"
 
-#: posix/getopt.c:800 posix/getopt.c:803
+#: posix/getopt.c:845 posix/getopt.c:848
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s : option invalide -- '%c'\n"
 
-#: posix/getopt.c:853 posix/getopt.c:870 posix/getopt.c:1073
-#: posix/getopt.c:1091
+#: posix/getopt.c:898 posix/getopt.c:915 posix/getopt.c:1123
+#: posix/getopt.c:1141
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s : l'option requiert un argument -- %c\n"
 
-#: posix/getopt.c:923 posix/getopt.c:939
+#: posix/getopt.c:971 posix/getopt.c:987
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s : l'option « -W %s » est ambiguë\n"
 
-#: posix/getopt.c:963 posix/getopt.c:981
+#: posix/getopt.c:1011 posix/getopt.c:1029
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s : l'option « -W %s » ne permet pas d'argument\n"
 
-#: posix/regcomp.c:136
+#: posix/getopt.c:1050 posix/getopt.c:1068
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s : l'option «-W %s » requiert un argument\n"
+
+#: posix/regcomp.c:135
 msgid "No match"
 msgstr "Pas de concordance"
 
-#: posix/regcomp.c:139
+#: posix/regcomp.c:138
 msgid "Invalid regular expression"
 msgstr "Expression régulière invalide"
 
-#: posix/regcomp.c:142
+#: posix/regcomp.c:141
 msgid "Invalid collation character"
 msgstr "Caractère de fusionnement invalide"
 
-#: posix/regcomp.c:145
+#: posix/regcomp.c:144
 msgid "Invalid character class name"
 msgstr "Nom de classe de caractères invalide"
 
-#: posix/regcomp.c:148
+#: posix/regcomp.c:147
 msgid "Trailing backslash"
 msgstr "Barre oblique inverse en suffixe"
 
-#: posix/regcomp.c:151
+#: posix/regcomp.c:150
 msgid "Invalid back reference"
 msgstr "Référence arrière invalide"
 
-#: posix/regcomp.c:154
+#: posix/regcomp.c:153
 msgid "Unmatched [ or [^"
 msgstr "Échec du pairage de [ ou de [^"
 
-#: posix/regcomp.c:157
+#: posix/regcomp.c:156
 msgid "Unmatched ( or \\("
 msgstr "Échec du pairage de ( ou de \\("
 
-#: posix/regcomp.c:160
+#: posix/regcomp.c:159
 msgid "Unmatched \\{"
 msgstr "Échec du pairage de \\{"
 
-#: posix/regcomp.c:163
+#: posix/regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr "Contenu invalide de \\{\\}"
 
-#: posix/regcomp.c:166
+#: posix/regcomp.c:165
 msgid "Invalid range end"
 msgstr "Fin d'intervalle invalide"
 
-#: posix/regcomp.c:169
+#: posix/regcomp.c:168
 msgid "Memory exhausted"
 msgstr "Mémoire épuisée"
 
-#: posix/regcomp.c:172
+#: posix/regcomp.c:171
 msgid "Invalid preceding regular expression"
 msgstr "Expression régulière précédente invalide"
 
-#: posix/regcomp.c:175
+#: posix/regcomp.c:174
 msgid "Premature end of regular expression"
 msgstr "Fin prématurée de l'expression régulière"
 
-#: posix/regcomp.c:178
+#: posix/regcomp.c:177
 msgid "Regular expression too big"
 msgstr "Expression régulière trop grosse"
 
-#: posix/regcomp.c:181
+#: posix/regcomp.c:180
 msgid "Unmatched ) or \\)"
 msgstr "Échec du pairage de ) ou de \\)"
 
-#: posix/regcomp.c:681
+#: posix/regcomp.c:680
 msgid "No previous regular expression"
 msgstr "Aucune expression régulière précédente"
 
@@ -4789,6 +4886,192 @@
 msgid "%s: line %d: ignoring trailing garbage `%s'\n"
 msgstr "%s : ligne %d : rebut en suffixe ignoré « %s »\n"
 
+#: stdio-common/psiginfo-data.h:2
+msgid "Illegal opcode"
+msgstr "opcode illégal"
+
+#: stdio-common/psiginfo-data.h:3
+msgid "Illegal operand"
+msgstr "opérande illégal"
+
+#: stdio-common/psiginfo-data.h:4
+msgid "Illegal addressing mode"
+msgstr "Mode d'adressage illégal"
+
+#: stdio-common/psiginfo-data.h:5
+msgid "Illegal trap"
+msgstr "Repérage non permis"
+
+#: stdio-common/psiginfo-data.h:6
+msgid "Privileged opcode"
+msgstr "opcode privilégié"
+
+#: stdio-common/psiginfo-data.h:7
+msgid "Privileged register"
+msgstr "Register privilégié"
+
+#: stdio-common/psiginfo-data.h:8
+msgid "Coprocessor error"
+msgstr "Erreur du préprocesseur"
+
+#: stdio-common/psiginfo-data.h:9
+msgid "Internal stack error"
+msgstr "Erreur interne de pile"
+
+#: stdio-common/psiginfo-data.h:12
+msgid "Integer divide by zero"
+msgstr "Division d'entier par zéro"
+
+#: stdio-common/psiginfo-data.h:13
+msgid "Integer overflow"
+msgstr "Débordement d'entier"
+
+#: stdio-common/psiginfo-data.h:14
+msgid "Floating-point divide by zero"
+msgstr "Virgule flottante divisé par zéro"
+
+#: stdio-common/psiginfo-data.h:15
+msgid "Floating-point overflow"
+msgstr "débordement de virgule flottante"
+
+#: stdio-common/psiginfo-data.h:16
+msgid "Floating-point underflow"
+msgstr "Exception en virgule flottante"
+
+#: stdio-common/psiginfo-data.h:17
+msgid "Floating-poing inexact result"
+msgstr "Résultat inéxact en virgule flottante"
+
+#: stdio-common/psiginfo-data.h:18
+msgid "Invalid floating-point operation"
+msgstr "opération invalide pour virgule flottante"
+
+#: stdio-common/psiginfo-data.h:19
+msgid "Subscript out of range"
+msgstr "indice hors intervalle"
+
+#: stdio-common/psiginfo-data.h:22
+msgid "Address not mapped to object"
+msgstr "Adresse non associée à un objet"
+
+#: stdio-common/psiginfo-data.h:23
+msgid "Invalid permissions for mapped object"
+msgstr "Permissions invalides pour un object 'mappé'"
+
+#: stdio-common/psiginfo-data.h:26
+msgid "Invalid address alignment"
+msgstr "Alignement d'adresse invalide"
+
+#: stdio-common/psiginfo-data.h:27
+msgid "Nonexisting physical address"
+msgstr "Adresse physique inexistante"
+
+#: stdio-common/psiginfo-data.h:28
+msgid "Object-specific hardware error"
+msgstr "Erreur matériel spécifique à l'objet"
+
+#: stdio-common/psiginfo-data.h:31
+msgid "Process breakpoint"
+msgstr "Point d'arrêt du process"
+
+#: stdio-common/psiginfo-data.h:32
+msgid "Process trace trap"
+msgstr "Repérage de trace de process"
+
+#: stdio-common/psiginfo-data.h:35
+msgid "Child has exited"
+msgstr "Le processus fils a terminé"
+
+#: stdio-common/psiginfo-data.h:36
+msgid "Child has terminated abnormally and did not create a core file"
+msgstr ""
+"Enfant ayant terminé anormalement et n'ayant pas créé un fichier coeur"
+
+#: stdio-common/psiginfo-data.h:37
+msgid "Child hat terminated abnormally and created a core file"
+msgstr "Enfant ayant terminé anormalement et ayant créé un fichier coeur"
+
+#: stdio-common/psiginfo-data.h:38
+msgid "Traced child has trapped"
+msgstr "Enfant tracé a piégé"
+
+#: stdio-common/psiginfo-data.h:39
+msgid "Child has stopped"
+msgstr "Le processus fils s'est arrêté"
+
+#: stdio-common/psiginfo-data.h:40
+msgid "Stopped child has continued"
+msgstr "Enfant stoppé a continué"
+
+#: stdio-common/psiginfo-data.h:43
+msgid "Data input available"
+msgstr "Donnée disponible en entrée"
+
+#: stdio-common/psiginfo-data.h:44
+msgid "Output buffers available"
+msgstr "Le tampon de sortie est disponible"
+
+#: stdio-common/psiginfo-data.h:45
+msgid "Input message available"
+msgstr "Message disponible en entrée"
+
+#: stdio-common/psiginfo-data.h:46
+msgid "I/O error"
+msgstr "Erreur d'entrée/sortie"
+
+#: stdio-common/psiginfo-data.h:47
+msgid "High priority input available"
+msgstr "Entrée à haute priorité disponible"
+
+#: stdio-common/psiginfo-data.h:48
+msgid "Device disconnected"
+msgstr "Périphérique déconnecté"
+
+#: stdio-common/psiginfo.c:145
+msgid "Signal sent by kill()"
+msgstr "Signal envoyé par kill()"
+
+#: stdio-common/psiginfo.c:148
+msgid "Signal sent by sigqueue()"
+msgstr "Signal envoyé par sigqueue()"
+
+#: stdio-common/psiginfo.c:151
+msgid "Signal generated by the expiration of a timer"
+msgstr "Signal généré par l'expiration d'un timer"
+
+#: stdio-common/psiginfo.c:154
+msgid "Signal generated by the completion of an asynchronous I/O request"
+msgstr "Signal généré par la fin d'une requête d'I/O asynchrone"
+
+#: stdio-common/psiginfo.c:158
+msgid ""
+"Signal generated by the arrival of a message on an empty message queue"
+msgstr ""
+"Signal généré par l'arrivée d'un message sur une file de message vide"
+
+#: stdio-common/psiginfo.c:163
+msgid "Signal sent by tkill()"
+msgstr "signal envoyé par tkill()"
+
+#: stdio-common/psiginfo.c:168
+msgid ""
+"Signal generated by the completion of an asynchronous name lookup request"
+msgstr ""
+"Signal généré par la fin d'une requête asynchrone de recherche de nom"
+
+#: stdio-common/psiginfo.c:174
+msgid "Signal generated by the completion of an I/O request"
+msgstr "Signal généré par la fin d'une requête d'I/O"
+
+#: stdio-common/psiginfo.c:180
+msgid "Signal sent by the kernel"
+msgstr "Signal envoyé par le noyau"
+
+#: stdio-common/psiginfo.c:204
+#, c-format
+msgid "Unknown signal %d\n"
+msgstr "Signal inconnu %d\n"
+
 #: stdio-common/psignal.c:51
 #, c-format
 msgid "%s%sUnknown signal %d\n"
@@ -4798,7 +5081,7 @@
 msgid "Unknown signal"
 msgstr "Signal inconnu"
 
-#: string/_strerror.c:45 sysdeps/mach/_strerror.c:87
+#: string/_strerror.c:47 sysdeps/mach/_strerror.c:87
 msgid "Unknown error "
 msgstr "Erreur inconnue "
 
@@ -4816,273 +5099,273 @@
 msgid "Unknown signal %d"
 msgstr "Signal inconnu %d"
 
-#: sunrpc/auth_unix.c:114 sunrpc/clnt_tcp.c:131 sunrpc/clnt_udp.c:143
-#: sunrpc/clnt_unix.c:128 sunrpc/svc_tcp.c:179 sunrpc/svc_tcp.c:218
-#: sunrpc/svc_udp.c:153 sunrpc/svc_unix.c:176 sunrpc/svc_unix.c:215
-#: sunrpc/xdr.c:566 sunrpc/xdr.c:718 sunrpc/xdr_array.c:106
-#: sunrpc/xdr_rec.c:156 sunrpc/xdr_ref.c:85
+#: sunrpc/auth_unix.c:113 sunrpc/clnt_tcp.c:125 sunrpc/clnt_udp.c:136
+#: sunrpc/clnt_unix.c:126 sunrpc/svc_tcp.c:173 sunrpc/svc_tcp.c:218
+#: sunrpc/svc_udp.c:147 sunrpc/svc_unix.c:174 sunrpc/svc_unix.c:215
+#: sunrpc/xdr.c:632 sunrpc/xdr.c:792 sunrpc/xdr_array.c:100
+#: sunrpc/xdr_rec.c:154 sunrpc/xdr_ref.c:79
 msgid "out of memory\n"
 msgstr "mémoire épuisée\n"
 
-#: sunrpc/auth_unix.c:350
+#: sunrpc/auth_unix.c:351
 msgid "auth_unix.c: Fatal marshalling problem"
 msgstr "auth_unix.c : Problème fatal de mise en ordre"
 
-#: sunrpc/clnt_perr.c:105 sunrpc/clnt_perr.c:121
+#: sunrpc/clnt_perr.c:98 sunrpc/clnt_perr.c:114
 #, c-format
 msgid "%s: %s; low version = %lu, high version = %lu"
 msgstr "%s : %s; version basse = %lu, version haute = %lu"
 
-#: sunrpc/clnt_perr.c:112
+#: sunrpc/clnt_perr.c:105
 #, c-format
 msgid "%s: %s; why = %s\n"
 msgstr "%s : %s; pourquoi = %s\n"
 
-#: sunrpc/clnt_perr.c:114
+#: sunrpc/clnt_perr.c:107
 #, c-format
 msgid "%s: %s; why = (unknown authentication error - %d)\n"
 msgstr "%s : %s; pourquoi = (erreur inconnue d'authentification - %d)\n"
 
-#: sunrpc/clnt_perr.c:159
+#: sunrpc/clnt_perr.c:156
 msgid "RPC: Success"
 msgstr "RPC : succès"
 
-#: sunrpc/clnt_perr.c:162
+#: sunrpc/clnt_perr.c:159
 msgid "RPC: Can't encode arguments"
 msgstr "RPC : ne peut encoder les arguments"
 
-#: sunrpc/clnt_perr.c:166
+#: sunrpc/clnt_perr.c:163
 msgid "RPC: Can't decode result"
 msgstr "RPC : ne peut décoder le résultat"
 
-#: sunrpc/clnt_perr.c:170
+#: sunrpc/clnt_perr.c:167
 msgid "RPC: Unable to send"
 msgstr "RPC : incapable d'effectuer la transmission"
 
-#: sunrpc/clnt_perr.c:174
+#: sunrpc/clnt_perr.c:171
 msgid "RPC: Unable to receive"
 msgstr "RPC : incapable d'effectuer la réception"
 
-#: sunrpc/clnt_perr.c:178
+#: sunrpc/clnt_perr.c:175
 msgid "RPC: Timed out"
 msgstr "RPC : expiration du délai de la minuterie"
 
-#: sunrpc/clnt_perr.c:182
+#: sunrpc/clnt_perr.c:179
 msgid "RPC: Incompatible versions of RPC"
 msgstr "RPC : versions incompatibles de RPC"
 
-#: sunrpc/clnt_perr.c:186
+#: sunrpc/clnt_perr.c:183
 msgid "RPC: Authentication error"
 msgstr "RPC : erreur d'authentification"
 
-#: sunrpc/clnt_perr.c:190
+#: sunrpc/clnt_perr.c:187
 msgid "RPC: Program unavailable"
 msgstr "RPC : le programme n'est pas disponible"
 
-#: sunrpc/clnt_perr.c:194
+#: sunrpc/clnt_perr.c:191
 msgid "RPC: Program/version mismatch"
 msgstr "RPC : non concordance de programme ou de version"
 
-#: sunrpc/clnt_perr.c:198
+#: sunrpc/clnt_perr.c:195
 msgid "RPC: Procedure unavailable"
 msgstr "RPC : la procédure n'est pas disponible"
 
-#: sunrpc/clnt_perr.c:202
+#: sunrpc/clnt_perr.c:199
 msgid "RPC: Server can't decode arguments"
 msgstr "RPC : le serveur ne peut décoder les arguments"
 
-#: sunrpc/clnt_perr.c:206
+#: sunrpc/clnt_perr.c:203
 msgid "RPC: Remote system error"
 msgstr "RPC : erreur système sur l'hôte cible"
 
-#: sunrpc/clnt_perr.c:210
+#: sunrpc/clnt_perr.c:207
 msgid "RPC: Unknown host"
 msgstr "RPC : hôte inconnu"
 
-#: sunrpc/clnt_perr.c:214
+#: sunrpc/clnt_perr.c:211
 msgid "RPC: Unknown protocol"
 msgstr "RPC : protocole inconnu"
 
-#: sunrpc/clnt_perr.c:218
+#: sunrpc/clnt_perr.c:215
 msgid "RPC: Port mapper failure"
 msgstr "RPC : échec de conversion de ports"
 
-#: sunrpc/clnt_perr.c:222
+#: sunrpc/clnt_perr.c:219
 msgid "RPC: Program not registered"
 msgstr "RPC : le programme n'est pas enregistré"
 
-#: sunrpc/clnt_perr.c:226
+#: sunrpc/clnt_perr.c:223
 msgid "RPC: Failed (unspecified error)"
 msgstr "RPC : échec (erreur non spécifiée)"
 
-#: sunrpc/clnt_perr.c:267
+#: sunrpc/clnt_perr.c:264
 msgid "RPC: (unknown error code)"
 msgstr "RPC : (code d'erreur inconnu)"
 
-#: sunrpc/clnt_perr.c:330
+#: sunrpc/clnt_perr.c:336
 msgid "Authentication OK"
 msgstr "Succès d'authentification"
 
-#: sunrpc/clnt_perr.c:333
+#: sunrpc/clnt_perr.c:339
 msgid "Invalid client credential"
 msgstr "Identité du client invalide"
 
-#: sunrpc/clnt_perr.c:337
+#: sunrpc/clnt_perr.c:343
 msgid "Server rejected credential"
 msgstr "Le serveur a rejeté l'identité"
 
-#: sunrpc/clnt_perr.c:341
+#: sunrpc/clnt_perr.c:347
 msgid "Invalid client verifier"
 msgstr "Vérificateur du client invalide"
 
-#: sunrpc/clnt_perr.c:345
+#: sunrpc/clnt_perr.c:351
 msgid "Server rejected verifier"
 msgstr "Le server a rejeté la vérification"
 
-#: sunrpc/clnt_perr.c:349
+#: sunrpc/clnt_perr.c:355
 msgid "Client credential too weak"
 msgstr "Identité du client peu fiable"
 
-#: sunrpc/clnt_perr.c:353
+#: sunrpc/clnt_perr.c:359
 msgid "Invalid server verifier"
 msgstr "Vérificateur du serveur invalide"
 
-#: sunrpc/clnt_perr.c:357
+#: sunrpc/clnt_perr.c:363
 msgid "Failed (unspecified error)"
 msgstr "Échec (erreur non spécifiée)"
 
-#: sunrpc/clnt_raw.c:117
+#: sunrpc/clnt_raw.c:115
 msgid "clnt_raw.c: fatal header serialization error"
 msgstr "clnt_raw.c : Erreur fatale de sérialisation d'en-tête"
 
-#: sunrpc/pm_getmaps.c:83
+#: sunrpc/pm_getmaps.c:77
 msgid "pmap_getmaps.c: rpc problem"
 msgstr "pmap_getmaps.c : problème RPC"
 
-#: sunrpc/pmap_clnt.c:129
+#: sunrpc/pmap_clnt.c:127
 msgid "Cannot register service"
 msgstr "Ne peut enregistrer le service"
 
-#: sunrpc/pmap_rmt.c:248
+#: sunrpc/pmap_rmt.c:243
 msgid "Cannot create socket for broadcast rpc"
 msgstr "Ne peut créer un socket pour une diffusion de type RPC"
 
-#: sunrpc/pmap_rmt.c:255
+#: sunrpc/pmap_rmt.c:250
 msgid "Cannot set socket option SO_BROADCAST"
 msgstr "Ne peut initialiser l'option « SO_BROADCAST » du socket"
 
-#: sunrpc/pmap_rmt.c:307
+#: sunrpc/pmap_rmt.c:302
 msgid "Cannot send broadcast packet"
 msgstr "Ne peut transmettre le paquet par diffusion"
 
-#: sunrpc/pmap_rmt.c:332
+#: sunrpc/pmap_rmt.c:327
 msgid "Broadcast poll problem"
 msgstr "Problème de scrutation lors de la diffusion"
 
-#: sunrpc/pmap_rmt.c:345
+#: sunrpc/pmap_rmt.c:340
 msgid "Cannot receive reply to broadcast"
 msgstr "Ne peut recevoir l'accusé réception à la requête faite par diffusion"
 
-#: sunrpc/rpc_main.c:290
+#: sunrpc/rpc_main.c:288
 #, c-format
 msgid "%s: output would overwrite %s\n"
 msgstr "%s : la sortie écraserait %s\n"
 
-#: sunrpc/rpc_main.c:297
+#: sunrpc/rpc_main.c:295
 #, c-format
 msgid "%s: unable to open %s: %m\n"
 msgstr "%s : incapable d'ouvrir %s : %m\n"
 
-#: sunrpc/rpc_main.c:309
+#: sunrpc/rpc_main.c:307
 #, c-format
 msgid "%s: while writing output %s: %m"
 msgstr "%s : lors de l'écriture sur la sortie %s : %m"
 
-#: sunrpc/rpc_main.c:344
+#: sunrpc/rpc_main.c:342
 #, c-format
 msgid "cannot find C preprocessor: %s \n"
 msgstr "Ne peut trouver le préprocesseur C : %s \n"
 
-#: sunrpc/rpc_main.c:352
+#: sunrpc/rpc_main.c:350
 msgid "cannot find any C preprocessor (cpp)\n"
 msgstr "Ne peut trouver un préprocesseur C (cpp)\n"
 
-#: sunrpc/rpc_main.c:421
+#: sunrpc/rpc_main.c:419
 #, c-format
 msgid "%s: C preprocessor failed with signal %d\n"
 msgstr "%s : échec du préprocesseur C -- code de terminaison : %d\n"
 
-#: sunrpc/rpc_main.c:424
+#: sunrpc/rpc_main.c:422
 #, c-format
 msgid "%s: C preprocessor failed with exit code %d\n"
 msgstr "%s : échec du préprocesseur C -- code de terminaison : %d\n"
 
-#: sunrpc/rpc_main.c:464
+#: sunrpc/rpc_main.c:462
 #, c-format
 msgid "illegal nettype: `%s'\n"
 msgstr "« nettype » non permis :« %s »\n"
 
-#: sunrpc/rpc_main.c:1130
+#: sunrpc/rpc_main.c:1128
 #, c-format
 msgid "rpcgen: too many defines\n"
 msgstr "rpcgen : trop de définitions\n"
 
-#: sunrpc/rpc_main.c:1142
+#: sunrpc/rpc_main.c:1140
 #, c-format
 msgid "rpcgen: arglist coding error\n"
 msgstr "rpcgen : erreur dans la liste d'arguments de codage\n"
 
 #. TRANS: the file will not be removed; this is an
 #. TRANS: informative message.
-#: sunrpc/rpc_main.c:1175
+#: sunrpc/rpc_main.c:1173
 #, c-format
 msgid "file `%s' already exists and may be overwritten\n"
 msgstr "Le fichier « %s » existe déjà et peut avoir été écrasé.\n"
 
-#: sunrpc/rpc_main.c:1220
+#: sunrpc/rpc_main.c:1218
 #, c-format
 msgid "Cannot specify more than one input file!\n"
 msgstr "Ne peut spécifier plus d'un fichier d'entrée!\n"
 
-#: sunrpc/rpc_main.c:1394
+#: sunrpc/rpc_main.c:1392
 #, c-format
 msgid "This implementation doesn't support newstyle or MT-safe code!\n"
 msgstr ""
 "Cette implantation ne supporte pas le nouveau style ou le code MT-safe!\n"
 
-#: sunrpc/rpc_main.c:1403
+#: sunrpc/rpc_main.c:1401
 #, c-format
 msgid "Cannot use netid flag with inetd flag!\n"
 msgstr "Ne utiliser le sémaphore « netid » avec le sémaphore « inetd » !\n"
 
-#: sunrpc/rpc_main.c:1415
+#: sunrpc/rpc_main.c:1413
 #, c-format
 msgid "Cannot use netid flag without TIRPC!\n"
 msgstr "Ne peut utiliser le sémaphore « netid » sans « TIRPC » !\n"
 
-#: sunrpc/rpc_main.c:1422
+#: sunrpc/rpc_main.c:1420
 #, c-format
 msgid "Cannot use table flags with newstyle!\n"
 msgstr "Ne peut utiliser la table des sémaphores avec « newstyle » !\n"
 
-#: sunrpc/rpc_main.c:1441
+#: sunrpc/rpc_main.c:1439
 #, c-format
 msgid "\"infile\" is required for template generation flags.\n"
 msgstr ""
 "\"fichier_d_entrée\" est requis pour la génération du gabarit des "
 "indicateurs.\n"
 
-#: sunrpc/rpc_main.c:1446
+#: sunrpc/rpc_main.c:1444
 #, c-format
 msgid "Cannot have more than one file generation flag!\n"
 msgstr "Ne peut avoir plus d'un fichier de génération de sémaphores!\n"
 
-#: sunrpc/rpc_main.c:1455
+#: sunrpc/rpc_main.c:1453
 #, c-format
 msgid "usage: %s infile\n"
 msgstr "usage : %s fichier_d_entrée\n"
 
-#: sunrpc/rpc_main.c:1456
+#: sunrpc/rpc_main.c:1454
 #, c-format
 msgid ""
 "\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] "
@@ -5091,7 +5374,7 @@
 "\t%s [-abkCLNTM][-Dname[=valeur]] [-i taille] [-I [-K secondes]] [-Y chemin] "
 "fichier\n"
 
-#: sunrpc/rpc_main.c:1458
+#: sunrpc/rpc_main.c:1456
 #, c-format
 msgid ""
 "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o outfile] [infile]\n"
@@ -5099,330 +5382,330 @@
 "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o fichier_de_sortie] "
 "[fichier_d_entrée]\n"
 
-#: sunrpc/rpc_main.c:1460
+#: sunrpc/rpc_main.c:1458
 #, c-format
 msgid "\t%s [-s nettype]* [-o outfile] [infile]\n"
 msgstr "\t%s [-s type_réseau]* [-o fichier_de_sortie] [fichier_d_entrée]\n"
 
-#: sunrpc/rpc_main.c:1461
+#: sunrpc/rpc_main.c:1459
 #, c-format
 msgid "\t%s [-n netid]* [-o outfile] [infile]\n"
 msgstr "\t%s [-n id_réseau]* [-o fichier_de_sortie] [fichier_d_entrée]\n"
 
-#: sunrpc/rpc_main.c:1469
+#: sunrpc/rpc_main.c:1467
 #, c-format
 msgid "options:\n"
 msgstr "options :\n"
 
-#: sunrpc/rpc_main.c:1470
+#: sunrpc/rpc_main.c:1468
 #, c-format
 msgid "-a\t\tgenerate all files, including samples\n"
 msgstr "-a\t\tgénère tout fichiers, y compris exemples\n"
 
-#: sunrpc/rpc_main.c:1471
+#: sunrpc/rpc_main.c:1469
 #, c-format
 msgid "-b\t\tbackward compatibility mode (generates code for SunOS 4.1)\n"
 msgstr ""
 "-b\t\tmode de compatibilité descendante (génère du code pour Sun0S 4.1)\n"
 
-#: sunrpc/rpc_main.c:1472
+#: sunrpc/rpc_main.c:1470
 #, c-format
 msgid "-c\t\tgenerate XDR routines\n"
 msgstr "-c\t\tgénère des routines XDR\n"
 
-#: sunrpc/rpc_main.c:1473
+#: sunrpc/rpc_main.c:1471
 #, c-format
 msgid "-C\t\tANSI C mode\n"
 msgstr "-C\t\tmode ANSI C\n"
 
-#: sunrpc/rpc_main.c:1474
+#: sunrpc/rpc_main.c:1472
 #, c-format
 msgid "-Dname[=value]\tdefine a symbol (same as #define)\n"
 msgstr "-Dname[=valeur]\tdéfinit un symbole (pareil que #define)\n"
 
-#: sunrpc/rpc_main.c:1475
+#: sunrpc/rpc_main.c:1473
 #, c-format
 msgid "-h\t\tgenerate header file\n"
 msgstr "-h\t\tgénère le fichier d'entête\n"
 
-#: sunrpc/rpc_main.c:1476
+#: sunrpc/rpc_main.c:1474
 #, c-format
 msgid "-i size\t\tsize at which to start generating inline code\n"
 msgstr "-i size\t\ttaille à laquelle débute la génération du code en ligne\n"
 
-#: sunrpc/rpc_main.c:1477
+#: sunrpc/rpc_main.c:1475
 #, c-format
 msgid "-I\t\tgenerate code for inetd support in server (for SunOS 4.1)\n"
 msgstr ""
 "-I\t\tgénère du code pour le support de inetd sur serveur (pour SunOS 4.1)\n"
 
-#: sunrpc/rpc_main.c:1478
+#: sunrpc/rpc_main.c:1476
 #, c-format
 msgid "-K seconds\tserver exits after K seconds of inactivity\n"
 msgstr "-K secondes\tserveur quitte après K secondes d'inactivité\n"
 
-#: sunrpc/rpc_main.c:1479
+#: sunrpc/rpc_main.c:1477
 #, c-format
 msgid "-l\t\tgenerate client side stubs\n"
 msgstr "-l\t\tgénère des squelettes de code du côté client\n"
 
-#: sunrpc/rpc_main.c:1480
+#: sunrpc/rpc_main.c:1478
 #, c-format
 msgid "-L\t\tserver errors will be printed to syslog\n"
 msgstr "-L\t\tles erreurs du serveur seront dirigées vers syslog\n"
 
-#: sunrpc/rpc_main.c:1481
+#: sunrpc/rpc_main.c:1479
 #, c-format
 msgid "-m\t\tgenerate server side stubs\n"
 msgstr "-m\t\tgénère des squelettes de code du côté serveur\n"
 
-#: sunrpc/rpc_main.c:1482
+#: sunrpc/rpc_main.c:1480
 #, c-format
 msgid "-M\t\tgenerate MT-safe code\n"
 msgstr "-M\t\tgénère le code MT-safe\n"
 
-#: sunrpc/rpc_main.c:1483
+#: sunrpc/rpc_main.c:1481
 #, c-format
 msgid "-n netid\tgenerate server code that supports named netid\n"
 msgstr "-n netid\tgénère le code serveur qui supporte netid nommé\n"
 
-#: sunrpc/rpc_main.c:1484
+#: sunrpc/rpc_main.c:1482
 #, c-format
 msgid "-N\t\tsupports multiple arguments and call-by-value\n"
 msgstr "-N\t\tsupporte des arguments multiples et call-by-value\n"
 
-#: sunrpc/rpc_main.c:1485
+#: sunrpc/rpc_main.c:1483
 #, c-format
 msgid "-o outfile\tname of the output file\n"
 msgstr "-o outfile\tnom du fichier de sortie\n"
 
-#: sunrpc/rpc_main.c:1486
+#: sunrpc/rpc_main.c:1484
 #, c-format
 msgid "-s nettype\tgenerate server code that supports named nettype\n"
 msgstr "-s nettype\tgénère le code serveur qui supporte nettype nommé\n"
 
-#: sunrpc/rpc_main.c:1487
+#: sunrpc/rpc_main.c:1485
 #, c-format
 msgid "-Sc\t\tgenerate sample client code that uses remote procedures\n"
 msgstr ""
 "-Sc\t\tgénère du code échantillon client qui utilise des procédures "
 "éloignées\n"
 
-#: sunrpc/rpc_main.c:1488
+#: sunrpc/rpc_main.c:1486
 #, c-format
 msgid "-Ss\t\tgenerate sample server code that defines remote procedures\n"
 msgstr ""
 "-Ss\t\tgénère du code échantillon serveur qui définit des procédures "
 "éloignées\n"
 
-#: sunrpc/rpc_main.c:1489
+#: sunrpc/rpc_main.c:1487
 #, c-format
 msgid "-Sm \t\tgenerate makefile template \n"
 msgstr "-Sm \t\tgénère un patron de makefile \n"
 
-#: sunrpc/rpc_main.c:1490
+#: sunrpc/rpc_main.c:1488
 #, c-format
 msgid "-t\t\tgenerate RPC dispatch table\n"
 msgstr "-t\t\tgénère la table de distribution RPC\n"
 
-#: sunrpc/rpc_main.c:1491
+#: sunrpc/rpc_main.c:1489
 #, c-format
 msgid "-T\t\tgenerate code to support RPC dispatch tables\n"
 msgstr "-T\t\tgénère le code qui supporte les tables de distribution RPC\n"
 
-#: sunrpc/rpc_main.c:1492
+#: sunrpc/rpc_main.c:1490
 #, c-format
 msgid "-Y path\t\tdirectory name to find C preprocessor (cpp)\n"
 msgstr "-Y path\t\tnom de répertoire pour trouver un préprocesseur C (cpp)\n"
 
-#: sunrpc/rpc_scan.c:114
+#: sunrpc/rpc_scan.c:112
 msgid "constant or identifier expected"
 msgstr "Constante ou identificateur attendu"
 
-#: sunrpc/rpc_scan.c:310
+#: sunrpc/rpc_scan.c:308
 msgid "illegal character in file: "
 msgstr "Caractère non permis dans le fichier "
 
-#: sunrpc/rpc_scan.c:349 sunrpc/rpc_scan.c:375
+#: sunrpc/rpc_scan.c:347 sunrpc/rpc_scan.c:373
 msgid "unterminated string constant"
 msgstr "Chaîne d'une constante incomplète"
 
-#: sunrpc/rpc_scan.c:381
+#: sunrpc/rpc_scan.c:379
 msgid "empty char string"
 msgstr "Chaîne vide de caractères"
 
-#: sunrpc/rpc_scan.c:523 sunrpc/rpc_scan.c:533
+#: sunrpc/rpc_scan.c:521 sunrpc/rpc_scan.c:531
 msgid "preprocessor error"
 msgstr "Erreur du préprocesseur"
 
-#: sunrpc/rpcinfo.c:254 sunrpc/rpcinfo.c:400
+#: sunrpc/rpcinfo.c:246 sunrpc/rpcinfo.c:392
 #, c-format
 msgid "program %lu is not available\n"
 msgstr "Le programme %lu n'est pas disponible.\n"
 
-#: sunrpc/rpcinfo.c:281 sunrpc/rpcinfo.c:327 sunrpc/rpcinfo.c:350
-#: sunrpc/rpcinfo.c:424 sunrpc/rpcinfo.c:470 sunrpc/rpcinfo.c:493
-#: sunrpc/rpcinfo.c:527
+#: sunrpc/rpcinfo.c:273 sunrpc/rpcinfo.c:319 sunrpc/rpcinfo.c:342
+#: sunrpc/rpcinfo.c:416 sunrpc/rpcinfo.c:462 sunrpc/rpcinfo.c:485
+#: sunrpc/rpcinfo.c:519
 #, c-format
 msgid "program %lu version %lu is not available\n"
 msgstr "Le programme %lu de version %lu n'est pas disponible.\n"
 
-#: sunrpc/rpcinfo.c:532
+#: sunrpc/rpcinfo.c:524
 #, c-format
 msgid "program %lu version %lu ready and waiting\n"
 msgstr "Le programme %lu de version %lu est prêt et en attente.\n"
 
-#: sunrpc/rpcinfo.c:573 sunrpc/rpcinfo.c:580
+#: sunrpc/rpcinfo.c:565 sunrpc/rpcinfo.c:572
 msgid "rpcinfo: can't contact portmapper"
 msgstr "rpcinfo : ne peut contacter l'aiguilleur de ports"
 
-#: sunrpc/rpcinfo.c:587
+#: sunrpc/rpcinfo.c:579
 msgid "No remote programs registered.\n"
 msgstr "Aucun programme enregistré sur l'hôte cible\n"
 
-#: sunrpc/rpcinfo.c:591
+#: sunrpc/rpcinfo.c:583
 msgid "   program vers proto   port\n"
 msgstr "   program no_version protocole  no_port\n"
 
-#: sunrpc/rpcinfo.c:630
+#: sunrpc/rpcinfo.c:622
 msgid "(unknown)"
 msgstr "(inconnu)"
 
-#: sunrpc/rpcinfo.c:654
+#: sunrpc/rpcinfo.c:646
 #, c-format
 msgid "rpcinfo: broadcast failed: %s\n"
 msgstr "rpcinfo : échec de diffusion : %s\n"
 
-#: sunrpc/rpcinfo.c:675
+#: sunrpc/rpcinfo.c:667
 msgid "Sorry. You are not root\n"
 msgstr "Désolé. Vous n'êtes pas ROOT\n"
 
-#: sunrpc/rpcinfo.c:682
+#: sunrpc/rpcinfo.c:674
 #, c-format
 msgid "rpcinfo: Could not delete registration for prog %s version %s\n"
 msgstr ""
 "rpcinfo : ne peut éliminer l'enregistrement du programme %s de version %s\n"
 
-#: sunrpc/rpcinfo.c:691
+#: sunrpc/rpcinfo.c:683
 msgid "Usage: rpcinfo [ -n portnum ] -u host prognum [ versnum ]\n"
 msgstr "Usage : rpcinfo [ -n no_port ] -u hôte no_prog [ no_version ]\n"
 
-#: sunrpc/rpcinfo.c:693
+#: sunrpc/rpcinfo.c:685
 msgid "       rpcinfo [ -n portnum ] -t host prognum [ versnum ]\n"
 msgstr "       rpcinfo [ -n no_de_port ] -t hôte no_program [ no_version ]\n"
 
-#: sunrpc/rpcinfo.c:695
+#: sunrpc/rpcinfo.c:687
 msgid "       rpcinfo -p [ host ]\n"
 msgstr "       rpcinfo -p [ hôte ]\n"
 
-#: sunrpc/rpcinfo.c:696
+#: sunrpc/rpcinfo.c:688
 msgid "       rpcinfo -b prognum versnum\n"
 msgstr "       rpcinfo -b no_program no_version\n"
 
-#: sunrpc/rpcinfo.c:697
+#: sunrpc/rpcinfo.c:689
 msgid "       rpcinfo -d prognum versnum\n"
 msgstr "       rpcinfo -d no_program no_version\n"
 
-#: sunrpc/rpcinfo.c:722
+#: sunrpc/rpcinfo.c:714
 #, c-format
 msgid "rpcinfo: %s is unknown service\n"
 msgstr "rpcinfo : %s est un service inconnu\n"
 
-#: sunrpc/rpcinfo.c:759
+#: sunrpc/rpcinfo.c:751
 #, c-format
 msgid "rpcinfo: %s is unknown host\n"
 msgstr "rpcinfo : %s est un hôte inconnu\n"
 
-#: sunrpc/svc_run.c:70
+#: sunrpc/svc_run.c:71
 msgid "svc_run: - out of memory"
 msgstr "svc_run : - mémoire épuisée"
 
-#: sunrpc/svc_run.c:90
+#: sunrpc/svc_run.c:91
 msgid "svc_run: - poll failed"
 msgstr "svc_run : - ÉCHEC de scrutation"
 
-#: sunrpc/svc_simple.c:87
+#: sunrpc/svc_simple.c:81
 #, c-format
 msgid "can't reassign procedure number %ld\n"
 msgstr "Ne peut réassigner le numéro de procédure %ld\n"
 
-#: sunrpc/svc_simple.c:97
+#: sunrpc/svc_simple.c:91
 msgid "couldn't create an rpc server\n"
 msgstr "Ne peut créer un serveur RPC\n"
 
-#: sunrpc/svc_simple.c:105
+#: sunrpc/svc_simple.c:99
 #, c-format
 msgid "couldn't register prog %ld vers %ld\n"
 msgstr "Ne peut enregistrer le programme %ld de version %ld\n"
 
-#: sunrpc/svc_simple.c:113
+#: sunrpc/svc_simple.c:107
 msgid "registerrpc: out of memory\n"
 msgstr "registerrpc : mémoire épuisée\n"
 
-#: sunrpc/svc_simple.c:173
+#: sunrpc/svc_simple.c:168
 #, c-format
 msgid "trouble replying to prog %d\n"
 msgstr "problème à répondre au programme %d.\n"
 
-#: sunrpc/svc_simple.c:182
+#: sunrpc/svc_simple.c:177
 #, c-format
 msgid "never registered prog %d\n"
 msgstr "Le programme %d n'a jamais été enregistré.\n"
 
-#: sunrpc/svc_tcp.c:155
+#: sunrpc/svc_tcp.c:149
 msgid "svc_tcp.c - tcp socket creation problem"
 msgstr "svc_tcp.c - problème de création d'un socket TCP"
 
-#: sunrpc/svc_tcp.c:170
+#: sunrpc/svc_tcp.c:164
 msgid "svc_tcp.c - cannot getsockname or listen"
 msgstr ""
 "svc_tcp.c - ne peut repérer le nom du socket par getsockname() ou listen()"
 
-#: sunrpc/svc_udp.c:128
+#: sunrpc/svc_udp.c:122
 msgid "svcudp_create: socket creation problem"
 msgstr "svcudp_create : problème de création du socket"
 
-#: sunrpc/svc_udp.c:142
+#: sunrpc/svc_udp.c:136
 msgid "svcudp_create - cannot getsockname"
 msgstr "svcudp_create - ne peut repérer le nom du socket par getsockname()"
 
-#: sunrpc/svc_udp.c:175
+#: sunrpc/svc_udp.c:168
 msgid "svcudp_create: xp_pad is too small for IP_PKTINFO\n"
 msgstr "svcudp_create : xp_pad est trop petit pour IP_PKTINFO\n"
 
-#: sunrpc/svc_udp.c:475
+#: sunrpc/svc_udp.c:476
 msgid "enablecache: cache already enabled"
 msgstr "enablecache : cache déjà activée"
 
-#: sunrpc/svc_udp.c:481
+#: sunrpc/svc_udp.c:482
 msgid "enablecache: could not allocate cache"
 msgstr "enablecache : ne peut allouer une cache"
 
-#: sunrpc/svc_udp.c:490
+#: sunrpc/svc_udp.c:491
 msgid "enablecache: could not allocate cache data"
 msgstr "enablecache : ne peut allouer une cache de données"
 
-#: sunrpc/svc_udp.c:498
+#: sunrpc/svc_udp.c:499
 msgid "enablecache: could not allocate cache fifo"
 msgstr "enablecache : ne peut allouer une cache de type fifo"
 
-#: sunrpc/svc_udp.c:533
+#: sunrpc/svc_udp.c:535
 msgid "cache_set: victim not found"
 msgstr "cache_set : « victim » non repéré"
 
-#: sunrpc/svc_udp.c:544
+#: sunrpc/svc_udp.c:546
 msgid "cache_set: victim alloc failed"
 msgstr "cache_set : échec d'allocation de « victim »"
 
-#: sunrpc/svc_udp.c:551
+#: sunrpc/svc_udp.c:553
 msgid "cache_set: could not allocate new rpc_buffer"
 msgstr "cache_set : ne peut allouer une nouveau tampon rpc_buffer"
 
-#: sunrpc/svc_unix.c:150
+#: sunrpc/svc_unix.c:148
 msgid "svc_unix.c - AF_UNIX socket creation problem"
 msgstr "svc_unix.c - problème de création d'un socket « AF_UNIX »"
 
-#: sunrpc/svc_unix.c:166
+#: sunrpc/svc_unix.c:164
 msgid "svc_unix.c - cannot getsockname or listen"
 msgstr ""
 "svc_unix.c - ne peut repérer le nom du socket par getsockname() ou listen()"
@@ -6399,6 +6682,10 @@
 msgid "State not recoverable"
 msgstr "Etat non récupérable"
 
+#: sysdeps/gnu/errlist.c:1461
+msgid "Operation not possible due to RF-kill"
+msgstr "Opération impossible du fait de RF-kill"
+
 #: sysdeps/mach/_strerror.c:57
 msgid "Error in unknown error system: "
 msgstr "Erreur provenant d'une erreur système inconnue : "
@@ -6508,45 +6795,50 @@
 msgid "cannot read header from `%s'"
 msgstr "Ne peut lire l'en-tête de « %s »"
 
-#: timezone/zdump.c:210
+#: timezone/zdump.c:215
 msgid "lacks alphabetic at start"
 msgstr "Il manque un lettre de l'alphabet au début"
 
-#: timezone/zdump.c:212
+#: timezone/zdump.c:217
 msgid "has fewer than 3 alphabetics"
 msgstr "a moins de 3 lettres alphabétiques"
 
-#: timezone/zdump.c:214
+#: timezone/zdump.c:219
 msgid "has more than 6 alphabetics"
 msgstr "a plus de 6 lettres alphabétiques"
 
-#: timezone/zdump.c:222
+#: timezone/zdump.c:227
 msgid "differs from POSIX standard"
 msgstr "diffère du standard POSIX"
 
-#: timezone/zdump.c:228
+#: timezone/zdump.c:233
 #, c-format
 msgid "%s: warning: zone \"%s\" abbreviation \"%s\" %s\n"
 msgstr "%s : attention : zone \"%s\" abréviation \"%s\" %s\n"
 
-#: timezone/zdump.c:279
+#: timezone/zdump.c:242
 #, c-format
 msgid ""
-"%s: usage is %s [ --version ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"
+"%s: usage is %s [ --version ] [ --help ] [ -v ] [ -c [loyear,]hiyear ] "
+"zonename ...\n"
+"\n"
+"Report bugs to tz@elsie.nci.nih.gov.\n"
 msgstr ""
-"%s : usage est %s [ --version ] [ -v ] [ -c [AnnéeBasse,]AnnéeHaute ] "
-"nom_du_fuseau_horaire ...\n"
+"%s : usage est %s [ --version ] [ --help ] [ -v ] [ -c "
+"[AnnéeBasse,]AnnéeHaute ] nom_fuseau_horaire ...\n"
+"\n"
+"Envoyer bugs à tz@elsie.nci.nih.gov.\n"
 
-#: timezone/zdump.c:296
+#: timezone/zdump.c:311
 #, c-format
 msgid "%s: wild -c argument %s\n"
 msgstr "%s : argument -c intempestif %s\n"
 
-#: timezone/zdump.c:387
+#: timezone/zdump.c:398
 msgid "Error writing to standard output"
 msgstr "Erreur d'écriture sur la sortie standard"
 
-#: timezone/zdump.c:410
+#: timezone/zdump.c:421
 #, c-format
 msgid ""
 "%s: use of -v on system with floating time_t other than float or double\n"
@@ -6576,328 +6868,333 @@
 #: timezone/zic.c:459
 #, c-format
 msgid ""
-"%s: usage is %s [ --version ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
+"%s: usage is %s [ --version ] [ --help ] [ -v ] [ -l localtime ] [ -p "
+"posixrules ] \\\n"
 "\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
+"\n"
+"Report bugs to tz@elsie.nci.nih.gov.\n"
 msgstr ""
-"%s : l'usage is %s [ --version ] [ -v ] [ -l temps_local ] [ -p règles_posix "
-"] \\\n"
+"%s : l'usage is %s [ --version ] [ --help ] [ -v ] [ -l temps_local ] [ -p "
+"règles_posix ] \\\n"
 "\t[ -d dossier ] [ -L secondes_écoulées ] [ -y type_année ] [ fichier ... ]\n"
+"\n"
+"Envoyer bugs à tz@elsie.nci.nih.gov.\n"
 
-#: timezone/zic.c:494
+#: timezone/zic.c:496
 msgid "wild compilation-time specification of zic_t"
 msgstr "compilation sauvage-specification du temps de zic_t"
 
-#: timezone/zic.c:511
+#: timezone/zic.c:515
 #, c-format
 msgid "%s: More than one -d option specified\n"
 msgstr "%s : option -d spécifiée plus d'une fois\n"
 
-#: timezone/zic.c:521
+#: timezone/zic.c:525
 #, c-format
 msgid "%s: More than one -l option specified\n"
 msgstr "%s : option -l spécifiée plus d'une fois\n"
 
-#: timezone/zic.c:531
+#: timezone/zic.c:535
 #, c-format
 msgid "%s: More than one -p option specified\n"
 msgstr "%s : option -p spécifiée plus d'une fois\n"
 
-#: timezone/zic.c:541
+#: timezone/zic.c:545
 #, c-format
 msgid "%s: More than one -y option specified\n"
 msgstr "%s : option -y spécifiée plus d'une fois\n"
 
-#: timezone/zic.c:551
+#: timezone/zic.c:555
 #, c-format
 msgid "%s: More than one -L option specified\n"
 msgstr "%s : option -L spécifiée plus d'une fois\n"
 
-#: timezone/zic.c:600
+#: timezone/zic.c:604
 msgid "link to link"
 msgstr "lien à lien"
 
-#: timezone/zic.c:665
+#: timezone/zic.c:669
 msgid "hard link failed, symbolic link used"
 msgstr "Échec de création du lien direct, création d'un lien symbolique"
 
-#: timezone/zic.c:673
+#: timezone/zic.c:677
 #, c-format
 msgid "%s: Can't link from %s to %s: %s\n"
 msgstr "%s : ne peut établir un lien entre %s et %s : %s\n"
 
-#: timezone/zic.c:745 timezone/zic.c:747
+#: timezone/zic.c:749 timezone/zic.c:751
 msgid "same rule name in multiple files"
 msgstr "Même nom de règle dans plusieurs fichiers"
 
-#: timezone/zic.c:788
+#: timezone/zic.c:792
 msgid "unruly zone"
 msgstr "Zone sans règle"
 
-#: timezone/zic.c:795
+#: timezone/zic.c:799
 #, c-format
 msgid "%s in ruleless zone"
 msgstr "%s est dans une zone sans règle"
 
-#: timezone/zic.c:816
+#: timezone/zic.c:820
 msgid "standard input"
 msgstr "entrée standard"
 
-#: timezone/zic.c:821
+#: timezone/zic.c:825
 #, c-format
 msgid "%s: Can't open %s: %s\n"
 msgstr "%s : ne peut ouvrir %s : %s\n"
 
-#: timezone/zic.c:832
+#: timezone/zic.c:836
 msgid "line too long"
 msgstr "Ligne trop longue"
 
-#: timezone/zic.c:852
+#: timezone/zic.c:856
 msgid "input line of unknown type"
 msgstr "Ligne d'entrée de type inconnu"
 
-#: timezone/zic.c:868
+#: timezone/zic.c:872
 #, c-format
 msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr ""
 "%s : ligne de type « Leap » dans un fichier qui n'a pas\n"
 "de délai en secondes %s\n"
 
-#: timezone/zic.c:875 timezone/zic.c:1312 timezone/zic.c:1334
+#: timezone/zic.c:879 timezone/zic.c:1316 timezone/zic.c:1338
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr "%s : panique : valeur %d de type « l_value » invalide\n"
 
-#: timezone/zic.c:883
+#: timezone/zic.c:887
 #, c-format
 msgid "%s: Error reading %s\n"
 msgstr "%s : erreur de lecture de %s\n"
 
-#: timezone/zic.c:890
+#: timezone/zic.c:894
 #, c-format
 msgid "%s: Error closing %s: %s\n"
 msgstr "%s : erreur lors de la fermeture de %s : %s\n"
 
-#: timezone/zic.c:895
+#: timezone/zic.c:899
 msgid "expected continuation line not found"
 msgstr "ligne de continuation attendue, non repérée"
 
-#: timezone/zic.c:939 timezone/zic.c:2476 timezone/zic.c:2495
+#: timezone/zic.c:943 timezone/zic.c:2480 timezone/zic.c:2499
 msgid "time overflow"
 msgstr "Débordement du temps alloué"
 
-#: timezone/zic.c:943
+#: timezone/zic.c:947
 msgid "24:00 not handled by pre-1998 versions of zic"
 msgstr "24 : 00 non pris en charge par les versions de zic antérieures à1998"
 
-#: timezone/zic.c:946
+#: timezone/zic.c:950
 msgid "values over 24 hours not handled by pre-2007 versions of zic"
 msgstr ""
 "valeurs au-delà de 24 heures non prises en charge par les versions de zic "
 "antérieures à 2007"
 
-#: timezone/zic.c:959
+#: timezone/zic.c:963
 msgid "wrong number of fields on Rule line"
 msgstr "Mauvais nombre de champs sur la ligne de type « Rule »"
 
-#: timezone/zic.c:963
+#: timezone/zic.c:967
 msgid "nameless rule"
 msgstr "Règle sans nom"
 
-#: timezone/zic.c:968
+#: timezone/zic.c:972
 msgid "invalid saved time"
 msgstr "Temps sauvegardé invalide"
 
-#: timezone/zic.c:989
+#: timezone/zic.c:993
 msgid "wrong number of fields on Zone line"
 msgstr "Mauvais nombre de champs sur la ligne de type « Zone »"
 
-#: timezone/zic.c:995
+#: timezone/zic.c:999
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr "La ligne \"Zone %s\" et l'option -l sont mutuellement exclusifs"
 
-#: timezone/zic.c:1003
+#: timezone/zic.c:1007
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr "La ligne \"Zone %s\" et l'option -p sont mutuellement exclusifs"
 
-#: timezone/zic.c:1015
+#: timezone/zic.c:1019
 #, c-format
 msgid "duplicate zone name %s (file \"%s\", line %d)"
 msgstr "Double noms de zone  %s (fichier « %s », ligne %d)"
 
-#: timezone/zic.c:1031
+#: timezone/zic.c:1035
 msgid "wrong number of fields on Zone continuation line"
 msgstr ""
 "Mauvais nombre de champs sur la ligne de type continuation de « Zone »"
 
-#: timezone/zic.c:1071
+#: timezone/zic.c:1075
 msgid "invalid UTC offset"
 msgstr "Adressage relatif GMT invalide"
 
-#: timezone/zic.c:1074
+#: timezone/zic.c:1078
 msgid "invalid abbreviation format"
 msgstr "Format d'abréviation invalide"
 
-#: timezone/zic.c:1103
+#: timezone/zic.c:1107
 msgid ""
 "Zone continuation line end time is not after end time of previous line"
 msgstr ""
 "Temps final de la ligne de continuation du fuseau horaire est antérieur\n"
 "au temps final de la ligne précédente"
 
-#: timezone/zic.c:1131
+#: timezone/zic.c:1135
 msgid "wrong number of fields on Leap line"
 msgstr "Mauvais nombre de champs sur la ligne de type « Leap »"
 
-#: timezone/zic.c:1140
+#: timezone/zic.c:1144
 msgid "invalid leaping year"
 msgstr "Année bissextile invalide"
 
-#: timezone/zic.c:1160 timezone/zic.c:1266
+#: timezone/zic.c:1164 timezone/zic.c:1270
 msgid "invalid month name"
 msgstr "Nom de mois invalide"
 
-#: timezone/zic.c:1173 timezone/zic.c:1379 timezone/zic.c:1393
+#: timezone/zic.c:1177 timezone/zic.c:1383 timezone/zic.c:1397
 msgid "invalid day of month"
 msgstr "Jour du mois invalide"
 
 # time/zic.c:1120A
-#: timezone/zic.c:1178
+#: timezone/zic.c:1182
 msgid "time before zero"
 msgstr "Temps défini avant le zéro"
 
-#: timezone/zic.c:1182
+#: timezone/zic.c:1186
 msgid "time too small"
 msgstr "valeur de temps trop petite"
 
-#: timezone/zic.c:1186
+#: timezone/zic.c:1190
 msgid "time too large"
 msgstr "valeur de temps trop grande"
 
-#: timezone/zic.c:1190 timezone/zic.c:1295
+#: timezone/zic.c:1194 timezone/zic.c:1299
 msgid "invalid time of day"
 msgstr "Heure du jour invalide"
 
-#: timezone/zic.c:1209
+#: timezone/zic.c:1213
 msgid "illegal CORRECTION field on Leap line"
 msgstr "champ CORRECTION non permis dans la ligne de type « Leap »"
 
-#: timezone/zic.c:1214
+#: timezone/zic.c:1218
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr ""
 "Champ « Rolling/Stationary » non permis sur la ligne de type « Leap »"
 
-#: timezone/zic.c:1230
+#: timezone/zic.c:1234
 msgid "wrong number of fields on Link line"
 msgstr "Mauvais nombre de champs sur la ligne de type « Link »"
 
-#: timezone/zic.c:1234
+#: timezone/zic.c:1238
 msgid "blank FROM field on Link line"
 msgstr "Champ « FROM » vide dans la ligne de type « Link »"
 
-#: timezone/zic.c:1238
+#: timezone/zic.c:1242
 msgid "blank TO field on Link line"
 msgstr "Champ « TO » vide dans la ligne de type « Link »"
 
-#: timezone/zic.c:1316
+#: timezone/zic.c:1320
 msgid "invalid starting year"
 msgstr "Année initiale invalide"
 
-#: timezone/zic.c:1338
+#: timezone/zic.c:1342
 msgid "invalid ending year"
 msgstr "Année finale invalide"
 
-#: timezone/zic.c:1342
+#: timezone/zic.c:1346
 msgid "starting year greater than ending year"
 msgstr "année initiale plus grande que l'année finale"
 
-#: timezone/zic.c:1349
+#: timezone/zic.c:1353
 msgid "typed single year"
 msgstr "une seule année fournie"
 
-#: timezone/zic.c:1384
+#: timezone/zic.c:1388
 msgid "invalid weekday name"
 msgstr "Nom du jour de semaine invalide"
 
-#: timezone/zic.c:1562
+#: timezone/zic.c:1566
 #, c-format
 msgid "%s: Can't remove %s: %s\n"
 msgstr "%s : ne peut enlever %s : %s\n"
 
-#: timezone/zic.c:1572
+#: timezone/zic.c:1576
 #, c-format
 msgid "%s: Can't create %s: %s\n"
 msgstr "%s : ne peut créer %s : %s\n"
 
-#: timezone/zic.c:1722
+#: timezone/zic.c:1726
 #, c-format
 msgid "%s: Error writing %s\n"
 msgstr "%s : erreur d'écriture de %s\n"
 
-#: timezone/zic.c:2015
+#: timezone/zic.c:2019
 msgid "no POSIX environment variable for zone"
 msgstr "pas de variable d'environnement POSIX pour zone"
 
-#: timezone/zic.c:2172
+#: timezone/zic.c:2176
 msgid "can't determine time zone abbreviation to use just after until time"
 msgstr ""
 "Ne peut déterminer l'abréviation du fuseau horaire à utiliser\n"
 "juste après telle date"
 
-#: timezone/zic.c:2218
+#: timezone/zic.c:2222
 msgid "too many transitions?!"
 msgstr "trop de transitions définies ? !"
 
-#: timezone/zic.c:2237
+#: timezone/zic.c:2241
 msgid "internal error - addtype called with bad isdst"
 msgstr ""
 "Erreur interne - addtype() appellé avec un mauvais bloc de type « isdst »"
 
-#: timezone/zic.c:2241
+#: timezone/zic.c:2245
 msgid "internal error - addtype called with bad ttisstd"
 msgstr ""
 "Erreur interne - addtype() appellé avec un mauvais bloc de type « ttisstd »"
 
-#: timezone/zic.c:2245
+#: timezone/zic.c:2249
 msgid "internal error - addtype called with bad ttisgmt"
 msgstr ""
 "Erreur interne - addtype() appellé avec un mauvais bloc de type « ttisgmt »"
 
-#: timezone/zic.c:2264
+#: timezone/zic.c:2268
 msgid "too many local time types"
 msgstr "trop de types localisés pour la représentation du temps"
 
-#: timezone/zic.c:2268
+#: timezone/zic.c:2272
 msgid "UTC offset out of range"
 msgstr "UTC décalage en dehors de la plage"
 
-#: timezone/zic.c:2296
+#: timezone/zic.c:2300
 msgid "too many leap seconds"
 msgstr "trop de délai en secondes"
 
-#: timezone/zic.c:2302
+#: timezone/zic.c:2306
 msgid "repeated leap second moment"
 msgstr "Répétition du délai une seconde fois"
 
-#: timezone/zic.c:2354
+#: timezone/zic.c:2358
 msgid "Wild result from command execution"
 msgstr "Résultat anarchique résultant de l'exécution de la commande"
 
-#: timezone/zic.c:2355
+#: timezone/zic.c:2359
 #, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr "%s : la commande était « %s », le résultat était %d\n"
 
-#: timezone/zic.c:2453
+#: timezone/zic.c:2457
 msgid "Odd number of quotation marks"
 msgstr "Nombre impair de caractères apostrophe"
 
-#: timezone/zic.c:2542
+#: timezone/zic.c:2546
 msgid "use of 2/29 in non leap-year"
 msgstr "Utiliser 2/29 pour les années non-bissextiles"
 
-#: timezone/zic.c:2577
+#: timezone/zic.c:2581
 msgid ""
 "rule goes past start/end of month--will not work with pre-2004 versions of "
 "zic"
@@ -6905,36 +7202,36 @@
 "la règle en dehors de début/fin du mois--ne fonctionnera pas avec les "
 "versions de zic antérieures à 2004"
 
-#: timezone/zic.c:2609
+#: timezone/zic.c:2613
 msgid "time zone abbreviation lacks alphabetic at start"
 msgstr ""
 "l'abréviation du nom de fuseau horaire n'a pas de caractère alphabétique au "
 "début"
 
-#: timezone/zic.c:2611
+#: timezone/zic.c:2615
 msgid "time zone abbreviation has more than 3 alphabetics"
 msgstr ""
 "l'abréviation du nom de fuseau horaire a plus de 3 caractères alphabétiques"
 
-#: timezone/zic.c:2613
+#: timezone/zic.c:2617
 msgid "time zone abbreviation has too many alphabetics"
 msgstr ""
 "l'abréviation du nom de fuseau horaire a trop de caractères alphabétiques"
 
-#: timezone/zic.c:2623
+#: timezone/zic.c:2627
 msgid "time zone abbreviation differs from POSIX standard"
 msgstr "l'abréviation du nom de fuseau horaire diffère du standard POSIX"
 
-#: timezone/zic.c:2635
+#: timezone/zic.c:2639
 msgid "too many, or too long, time zone abbreviations"
 msgstr "trop ou de trop longues abréviations de fuseaux horaires"
 
-#: timezone/zic.c:2676
+#: timezone/zic.c:2680
 #, c-format
 msgid "%s: Can't create directory %s: %s\n"
 msgstr "%s : ne peut créer le dossier %s : %s\n"
 
-#: timezone/zic.c:2698
+#: timezone/zic.c:2702
 #, c-format
 msgid "%s: %d did not sign extend correctly\n"
 msgstr "%s : %d n'a pas fait correctement l'expansion de la valeur signée\n"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libelf.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libelf.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libelf.po	2012-01-02 17:26:52.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libelf.po	2012-02-23 06:31:18.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:38+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:31+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../lib/errors.h:25
 msgid "no error"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libexif-12.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libexif-12.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libexif-12.po	2012-01-02 17:26:52.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libexif-12.po	2012-02-23 06:31:18.000000000 +0000
@@ -9,14 +9,14 @@
 "Project-Id-Version: libexif\n"
 "Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-12-15 22:14-0800\n"
-"PO-Revision-Date: 2011-12-08 20:57+0000\n"
-"Last-Translator: Arnaud Launay <asl@launay.org>\n"
+"PO-Revision-Date: 2012-01-08 19:50+0000\n"
+"Last-Translator: Grégoire Richard <Unknown>\n"
 "Language-Team: Français <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:38+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:32+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: libexif/canon/mnote-canon-entry.c:40 libexif/fuji/mnote-fuji-entry.c:35
 #: libexif/olympus/mnote-olympus-entry.c:37
@@ -142,7 +142,7 @@
 
 #: libexif/canon/mnote-canon-entry.c:87
 msgid "Slow synchro"
-msgstr ""
+msgstr "Synchro lente"
 
 #: libexif/canon/mnote-canon-entry.c:88
 msgid "Auto, red-eye reduction"
@@ -293,16 +293,16 @@
 
 #: libexif/canon/mnote-canon-entry.c:123
 msgid "Fast shutter"
-msgstr ""
+msgstr "Obturation rapide"
 
 #: libexif/canon/mnote-canon-entry.c:124
 msgid "Slow shutter"
-msgstr ""
+msgstr "Obturation lente"
 
 #: libexif/canon/mnote-canon-entry.c:125 libexif/fuji/mnote-fuji-entry.c:123
 #: libexif/olympus/mnote-olympus-entry.c:254
 msgid "Night"
-msgstr ""
+msgstr "Nuit"
 
 #: libexif/canon/mnote-canon-entry.c:126
 msgid "Grayscale"
@@ -339,7 +339,7 @@
 #: libexif/canon/mnote-canon-entry.c:134 libexif/canon/mnote-canon-entry.c:306
 #: libexif/canon/mnote-canon-entry.c:431
 msgid "Neutral"
-msgstr ""
+msgstr "Neutre"
 
 #: libexif/canon/mnote-canon-entry.c:135
 #: libexif/pentax/mnote-pentax-entry.c:93
@@ -348,7 +348,7 @@
 
 #: libexif/canon/mnote-canon-entry.c:136
 msgid "Long shutter"
-msgstr ""
+msgstr "Obturation longue"
 
 #: libexif/canon/mnote-canon-entry.c:137 libexif/canon/mnote-canon-entry.c:188
 #: libexif/olympus/mnote-olympus-entry.c:171
@@ -378,7 +378,7 @@
 #: libexif/pentax/mnote-pentax-entry.c:292
 #: libexif/pentax/mnote-pentax-entry.c:298
 msgid "Underwater"
-msgstr ""
+msgstr "Sous-marin"
 
 #: libexif/canon/mnote-canon-entry.c:143 libexif/fuji/mnote-fuji-entry.c:134
 msgid "Snow"
@@ -414,7 +414,7 @@
 
 #: libexif/canon/mnote-canon-entry.c:151
 msgid "Aquarium"
-msgstr ""
+msgstr "Aquarium"
 
 #: libexif/canon/mnote-canon-entry.c:152
 msgid "ISO 3200"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libgnutls.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libgnutls.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libgnutls.po	2012-01-02 17:27:27.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libgnutls.po	2012-02-23 06:31:50.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: libgnutls 2.8.5\n"
 "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n"
-"POT-Creation-Date: 2011-11-08 08:17+0100\n"
+"POT-Creation-Date: 2012-01-25 03:35+0000\n"
 "PO-Revision-Date: 2010-11-19 09:06+0000\n"
 "Last-Translator: Nicolas Provost <nprovost@quadriv.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:17+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:14+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: gnutls_errors.c:54
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libgpg-error.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libgpg-error.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libgpg-error.po	2012-01-02 17:26:52.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libgpg-error.po	2012-02-23 06:31:19.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:43+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:36+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/err-sources.h:28
 msgid "Unspecified source"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libgphoto2-2.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libgphoto2-2.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libgphoto2-2.po	2012-01-02 17:26:53.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libgphoto2-2.po	2012-02-23 06:31:19.000000000 +0000
@@ -9,15 +9,15 @@
 "Project-Id-Version: libgphoto2-2.4.6\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-04-17 18:12+0200\n"
-"PO-Revision-Date: 2011-12-06 00:53+0000\n"
+"PO-Revision-Date: 2012-02-13 20:29+0000\n"
 "Last-Translator: Dimitri Duc <Unknown>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:44+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:37+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: camlibs/adc65/adc65.c:243
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libgphoto2_port-0.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libgphoto2_port-0.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libgphoto2_port-0.po	2012-01-02 17:26:53.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libgphoto2_port-0.po	2012-02-23 06:31:19.000000000 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: libgphoto2_port-2.4.9\n"
 "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-03-13 23:34+0100\n"
-"PO-Revision-Date: 2011-12-06 01:38+0000\n"
+"PO-Revision-Date: 2012-02-13 20:34+0000\n"
 "Last-Translator: Dimitri Duc <Unknown>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:44+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:37+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: libgphoto2_port/gphoto2-port-info-list.c:213
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libhdate.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libhdate.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libhdate.po	2012-01-02 17:27:18.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libhdate.po	2012-02-23 06:31:42.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:24+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:27+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: \n"
 
 #: src/hdate_strings.c:147
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libiconv.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libiconv.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libiconv.po	2012-01-02 17:27:26.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libiconv.po	2012-02-23 06:31:50.000000000 +0000
@@ -7,15 +7,15 @@
 "Project-Id-Version: GNU libiconv 1.8\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
 "POT-Creation-Date: 2007-10-25 00:19+0200\n"
-"PO-Revision-Date: 2011-10-05 10:34+0000\n"
+"PO-Revision-Date: 2012-01-03 14:43+0000\n"
 "Last-Translator: Michel Robitaille <Unknown>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:14+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:13+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #. TRANSLATORS: The first line of the short usage message.
 #: src/iconv.c:105
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libidn.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libidn.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libidn.po	2012-01-02 17:26:53.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libidn.po	2012-02-23 06:31:19.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:46+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:38+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: lib/strerror-idna.c:75 lib/strerror-pr29.c:59 lib/strerror-punycode.c:59
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libnih.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libnih.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libnih.po	2012-01-02 17:27:34.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libnih.po	2012-02-23 06:31:58.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:09+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:49+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: nih/command.c:61
 msgid "display list of commands"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libvirt.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libvirt.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libvirt.po	2012-01-02 17:27:22.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libvirt.po	2012-02-23 06:31:46.000000000 +0000
@@ -14,19 +14,19 @@
 msgstr ""
 "Project-Id-Version: libvirt\n"
 "Report-Msgid-Bugs-To: libvir-list@redhat.com\n"
-"POT-Creation-Date: 2011-11-08 14:40+0800\n"
-"PO-Revision-Date: 2011-12-05 15:48+0000\n"
+"POT-Creation-Date: 2011-12-08 14:59+0800\n"
+"PO-Revision-Date: 2012-01-04 22:14+0000\n"
 "Last-Translator: Myriam Malga <Unknown>\n"
 "Language-Team: French "
 "(http://www.transifex.net/projects/p/libvirt/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:18+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:18+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
-#: daemon/libvirtd.c:252
+#: daemon/libvirtd.c:256
 #, c-format
 msgid ""
 "%s: error: %s. Check /var/log/messages or run without --daemon for more "
@@ -35,55 +35,55 @@
 "%s : erreur : %s. Vérifiez dans /var/log/messages ou exécutez le programme "
 "sans --daemon pour obtenir plus d'informations.\n"
 
-#: daemon/libvirtd.c:2758 daemon/libvirtd.c:2767
+#: daemon/libvirtd.c:446 daemon/libvirtd.c:451
 #, c-format
 msgid "Failed to parse mode '%s'"
-msgstr "Impossible d'analyser le mode '%s'"
+msgstr "Impossible d'analyser le mode « %s »"
 
-#: daemon/libvirtd.c:2429 daemon/libvirtd.c:2448
+#: daemon/libvirtd.c:590 daemon/libvirtd.c:609
 #, c-format
 msgid "failed to allocate memory for %s config list"
-msgstr "impossible d'allouer de la mémoire pour la liste de configuration %s"
+msgstr "Impossible d'allouer de la mémoire pour la liste de configuration %s"
 
-#: daemon/libvirtd.c:2435 daemon/libvirtd.c:2465
+#: daemon/libvirtd.c:596 daemon/libvirtd.c:626
 #, c-format
 msgid "failed to allocate memory for %s config list value"
 msgstr ""
 "impossible d'allouer de la mémoire pour la valeur de la liste de "
 "configuration %s"
 
-#: daemon/libvirtd.c:610 daemon/libvirtd.c:633
+#: daemon/libvirtd.c:614 daemon/libvirtd.c:637
 #, c-format
 msgid "remoteReadConfigFile: %s: %s: must be a string or list of strings"
 msgstr ""
 "remoteReadConfigFile : %s : %s : doit être une chaîne de caractères ou une "
 "liste de chaînes de caractères"
 
-#: daemon/libvirtd.c:649
+#: daemon/libvirtd.c:653
 #, c-format
 msgid "remoteReadConfigFile: %s: %s: invalid type: got %s; expected %s"
 msgstr ""
 "remoteReadConfigFile : %s : %s : type invalide : reçu %s ; attendu %s"
 
-#: daemon/libvirtd.c:710
+#: daemon/libvirtd.c:714
 #, c-format
 msgid "remoteReadConfigFile: %s: %s: unsupported auth %s"
 msgstr ""
 "remoteReadConfigFile : %s : %s : authentification non prise en charge %s"
 
-#: daemon/libvirtd.c:1088
+#: daemon/libvirtd.c:1100
 msgid "additional privileges are required"
 msgstr "des privilèges supplémentaires sont requis"
 
-#: daemon/libvirtd.c:1094
+#: daemon/libvirtd.c:1106
 msgid "failed to set reduced privileges"
 msgstr "Impossible de définir les privilèges restreints"
 
-#: daemon/libvirtd.c:1145
+#: daemon/libvirtd.c:1157
 msgid "Driver state initialization failed"
 msgstr "L'initialisation de l'état du pilote a échouée"
 
-#: daemon/libvirtd.c:1173
+#: daemon/libvirtd.c:1185
 #, c-format
 msgid ""
 "\n"
@@ -102,7 +102,7 @@
 "libvirt management daemon:\n"
 msgstr ""
 
-#: daemon/libvirtd.c:1190
+#: daemon/libvirtd.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -125,7 +125,7 @@
 "\n"
 msgstr ""
 
-#: daemon/libvirtd.c:1217
+#: daemon/libvirtd.c:1229
 msgid ""
 "\n"
 "  Default paths:\n"
@@ -146,289 +146,410 @@
 "\n"
 msgstr ""
 
-#: daemon/libvirtd.c:1278 src/lxc/lxc_controller.c:1306
+#: daemon/libvirtd.c:1290 src/lxc/lxc_controller.c:1541
 #: src/security/virt-aa-helper.c:1164 src/storage/parthelper.c:75
 #: src/util/iohelper.c:227 src/util/iohelper.c:234
 #, c-format
 msgid "%s: initialization failed\n"
 msgstr "%s : l'initialisation a échouée\n"
 
-#: daemon/libvirtd.c:1315
+#: daemon/libvirtd.c:1327
 msgid "Invalid value for timeout"
 msgstr ""
 
-#: daemon/libvirtd.c:1323 daemon/libvirtd.c:1331
+#: daemon/libvirtd.c:1335 daemon/libvirtd.c:1343
 msgid "Can't allocate memory"
 msgstr ""
 
-#: daemon/libvirtd.c:1345
+#: daemon/libvirtd.c:1357
 #, c-format
 msgid "%s: internal error: unknown flag: %c"
 msgstr ""
 
-#: daemon/libvirtd.c:1352
+#: daemon/libvirtd.c:1364
 msgid "Can't create initial configuration"
 msgstr ""
 
-#: daemon/libvirtd.c:1361
+#: daemon/libvirtd.c:1373
 msgid "Can't determine config path"
 msgstr ""
 
-#: daemon/libvirtd.c:1369
+#: daemon/libvirtd.c:1381
 #, c-format
 msgid "Can't load config file '%s'"
 msgstr ""
 
-#: daemon/libvirtd.c:1375
+#: daemon/libvirtd.c:1387
 #, c-format
 msgid "invalid host UUID: %s"
 msgstr "hôte invalide. UUID : %s"
 
-#: daemon/libvirtd.c:1380
+#: daemon/libvirtd.c:1392
 msgid "Can't initialize logging"
 msgstr ""
 
-#: daemon/libvirtd.c:1387
+#: daemon/libvirtd.c:1399
 msgid "Can't determine pid file path."
 msgstr ""
 
-#: daemon/libvirtd.c:1395
+#: daemon/libvirtd.c:1407
 msgid "Can't determine socket paths"
 msgstr ""
 
-#: src/util/util.c:526
+#: daemon/libvirtd.c:1415
 #, c-format
 msgid "cannot change to root directory: %s"
 msgstr ""
 
-#: daemon/libvirtd.c:3059
+#: daemon/libvirtd.c:1421
 #, c-format
 msgid "Failed to fork as daemon: %s"
 msgstr "Impossible de cloner en tant que démon : %s"
 
-#: daemon/libvirtd.c:1422
+#: daemon/libvirtd.c:1434
 msgid "Can't determine user directory"
 msgstr ""
 
-#: daemon/libvirtd.c:3086
+#: daemon/libvirtd.c:1448
 #, c-format
 msgid "unable to create rundir %s: %s"
 msgstr "Impossible de créer le répertoire d'exécution %s : %s"
 
-#: daemon/remote.c:173
+#: daemon/qemu_dispatch.h:36 daemon/remote.c:663 daemon/remote.c:873
+#: daemon/remote.c:927 daemon/remote.c:982 daemon/remote.c:1046
+#: daemon/remote.c:1104 daemon/remote.c:1174 daemon/remote.c:1227
+#: daemon/remote.c:1274 daemon/remote.c:1320 daemon/remote.c:1391
+#: daemon/remote.c:1477 daemon/remote.c:1534 daemon/remote.c:1585
+#: daemon/remote.c:1649 daemon/remote.c:1715 daemon/remote.c:1793
+#: daemon/remote.c:1868 daemon/remote.c:1910 daemon/remote.c:2670
+#: daemon/remote.c:2723 daemon/remote.c:2764 daemon/remote.c:2842
+#: daemon/remote.c:2879 daemon/remote.c:2912 daemon/remote.c:2961
+#: daemon/remote.c:3007 daemon/remote.c:3048 daemon/remote.c:3099
+#: daemon/remote.c:3159 daemon/remote.c:3213 daemon/remote.c:3262
+#: daemon/remote.c:3310 daemon/remote.c:3350 daemon/remote_dispatch.h:163
+#: daemon/remote_dispatch.h:213 daemon/remote_dispatch.h:261
+#: daemon/remote_dispatch.h:313 daemon/remote_dispatch.h:365
+#: daemon/remote_dispatch.h:417 daemon/remote_dispatch.h:470
+#: daemon/remote_dispatch.h:547 daemon/remote_dispatch.h:601
+#: daemon/remote_dispatch.h:656 daemon/remote_dispatch.h:735
+#: daemon/remote_dispatch.h:787 daemon/remote_dispatch.h:841
+#: daemon/remote_dispatch.h:896 daemon/remote_dispatch.h:948
+#: daemon/remote_dispatch.h:998 daemon/remote_dispatch.h:1050
+#: daemon/remote_dispatch.h:1102 daemon/remote_dispatch.h:1154
+#: daemon/remote_dispatch.h:1293 daemon/remote_dispatch.h:1371
+#: daemon/remote_dispatch.h:1473 daemon/remote_dispatch.h:1531
+#: daemon/remote_dispatch.h:1591 daemon/remote_dispatch.h:1658
+#: daemon/remote_dispatch.h:1714 daemon/remote_dispatch.h:1792
+#: daemon/remote_dispatch.h:2002 daemon/remote_dispatch.h:2058
+#: daemon/remote_dispatch.h:2114 daemon/remote_dispatch.h:2170
+#: daemon/remote_dispatch.h:2223 daemon/remote_dispatch.h:2278
+#: daemon/remote_dispatch.h:2341 daemon/remote_dispatch.h:2397
+#: daemon/remote_dispatch.h:2453 daemon/remote_dispatch.h:2508
+#: daemon/remote_dispatch.h:2560 daemon/remote_dispatch.h:2612
+#: daemon/remote_dispatch.h:2662 daemon/remote_dispatch.h:2714
+#: daemon/remote_dispatch.h:2856 daemon/remote_dispatch.h:2911
+#: daemon/remote_dispatch.h:2988 daemon/remote_dispatch.h:3044
+#: daemon/remote_dispatch.h:3194 daemon/remote_dispatch.h:3271
+#: daemon/remote_dispatch.h:3343 daemon/remote_dispatch.h:3396
+#: daemon/remote_dispatch.h:3453 daemon/remote_dispatch.h:3544
+#: daemon/remote_dispatch.h:3596 daemon/remote_dispatch.h:3648
+#: daemon/remote_dispatch.h:3700 daemon/remote_dispatch.h:3751
+#: daemon/remote_dispatch.h:3798 daemon/remote_dispatch.h:3847
+#: daemon/remote_dispatch.h:3900 daemon/remote_dispatch.h:3957
+#: daemon/remote_dispatch.h:4010 daemon/remote_dispatch.h:4063
+#: daemon/remote_dispatch.h:4112 daemon/remote_dispatch.h:4166
+#: daemon/remote_dispatch.h:4248 daemon/remote_dispatch.h:4300
+#: daemon/remote_dispatch.h:4354 daemon/remote_dispatch.h:4416
+#: daemon/remote_dispatch.h:4477 daemon/remote_dispatch.h:4532
+#: daemon/remote_dispatch.h:4587 daemon/remote_dispatch.h:4643
+#: daemon/remote_dispatch.h:4705 daemon/remote_dispatch.h:4767
+#: daemon/remote_dispatch.h:4827 daemon/remote_dispatch.h:4879
+#: daemon/remote_dispatch.h:4931 daemon/remote_dispatch.h:4986
+#: daemon/remote_dispatch.h:5044 daemon/remote_dispatch.h:5100
+#: daemon/remote_dispatch.h:5161 daemon/remote_dispatch.h:5225
+#: daemon/remote_dispatch.h:5287 daemon/remote_dispatch.h:5362
+#: daemon/remote_dispatch.h:5432 daemon/remote_dispatch.h:5490
+#: daemon/remote_dispatch.h:5547 daemon/remote_dispatch.h:5605
+#: daemon/remote_dispatch.h:5657 daemon/remote_dispatch.h:5709
+#: daemon/remote_dispatch.h:5761 daemon/remote_dispatch.h:5815
+#: daemon/remote_dispatch.h:5865 daemon/remote_dispatch.h:5916
+#: daemon/remote_dispatch.h:5966 daemon/remote_dispatch.h:6014
+#: daemon/remote_dispatch.h:6062 daemon/remote_dispatch.h:6113
+#: daemon/remote_dispatch.h:6165 daemon/remote_dispatch.h:6213
+#: daemon/remote_dispatch.h:6266 daemon/remote_dispatch.h:6314
+#: daemon/remote_dispatch.h:6361 daemon/remote_dispatch.h:6407
+#: daemon/remote_dispatch.h:6453 daemon/remote_dispatch.h:6500
+#: daemon/remote_dispatch.h:6554 daemon/remote_dispatch.h:6604
+#: daemon/remote_dispatch.h:6659 daemon/remote_dispatch.h:6715
+#: daemon/remote_dispatch.h:6770 daemon/remote_dispatch.h:6822
+#: daemon/remote_dispatch.h:6872 daemon/remote_dispatch.h:6924
+#: daemon/remote_dispatch.h:6974 daemon/remote_dispatch.h:7038
+#: daemon/remote_dispatch.h:7102 daemon/remote_dispatch.h:7166
+#: daemon/remote_dispatch.h:7230 daemon/remote_dispatch.h:7294
+#: daemon/remote_dispatch.h:7358 daemon/remote_dispatch.h:7422
+#: daemon/remote_dispatch.h:7486 daemon/remote_dispatch.h:7550
+#: daemon/remote_dispatch.h:7612 daemon/remote_dispatch.h:7666
+#: daemon/remote_dispatch.h:7718 daemon/remote_dispatch.h:7768
+#: daemon/remote_dispatch.h:7823 daemon/remote_dispatch.h:7879
+#: daemon/remote_dispatch.h:7935 daemon/remote_dispatch.h:7991
+#: daemon/remote_dispatch.h:8047 daemon/remote_dispatch.h:8102
+#: daemon/remote_dispatch.h:8154 daemon/remote_dispatch.h:8204
+#: daemon/remote_dispatch.h:8256 daemon/remote_dispatch.h:8310
+#: daemon/remote_dispatch.h:8360 daemon/remote_dispatch.h:8412
+#: daemon/remote_dispatch.h:8489 daemon/remote_dispatch.h:8545
+#: daemon/remote_dispatch.h:8614 daemon/remote_dispatch.h:8667
+#: daemon/remote_dispatch.h:8720 daemon/remote_dispatch.h:8772
+#: daemon/remote_dispatch.h:8826 daemon/remote_dispatch.h:8910
+#: daemon/remote_dispatch.h:8958 daemon/remote_dispatch.h:9059
+#: daemon/remote_dispatch.h:9126 daemon/remote_dispatch.h:9175
+#: daemon/remote_dispatch.h:9222 daemon/remote_dispatch.h:9270
+#: daemon/remote_dispatch.h:9318 daemon/remote_dispatch.h:9366
+#: daemon/remote_dispatch.h:9414 daemon/remote_dispatch.h:9462
+#: daemon/remote_dispatch.h:9510 daemon/remote_dispatch.h:9558
+#: daemon/remote_dispatch.h:9606 daemon/remote_dispatch.h:9654
+#: daemon/remote_dispatch.h:9704 daemon/remote_dispatch.h:9757
+#: daemon/remote_dispatch.h:9812 daemon/remote_dispatch.h:9864
+#: daemon/remote_dispatch.h:9914 daemon/remote_dispatch.h:9989
+#: daemon/remote_dispatch.h:10064 daemon/remote_dispatch.h:10119
+#: daemon/remote_dispatch.h:10171 daemon/remote_dispatch.h:10221
+#: daemon/remote_dispatch.h:10273 daemon/remote_dispatch.h:10325
+#: daemon/remote_dispatch.h:10377 daemon/remote_dispatch.h:10431
+#: daemon/remote_dispatch.h:10483 daemon/remote_dispatch.h:10533
+#: daemon/remote_dispatch.h:10585 daemon/remote_dispatch.h:10640
+#: daemon/remote_dispatch.h:10696 daemon/remote_dispatch.h:10755
+#: daemon/remote_dispatch.h:10811 daemon/remote_dispatch.h:10867
+#: daemon/remote_dispatch.h:10923 daemon/remote_dispatch.h:10992
+#: daemon/remote_dispatch.h:11044 daemon/remote_dispatch.h:11097
+#: daemon/remote_dispatch.h:11155 daemon/remote_dispatch.h:11208
+#: daemon/remote_dispatch.h:11260 daemon/remote_dispatch.h:11312
+#: daemon/remote_dispatch.h:11367 daemon/remote_dispatch.h:11426
+#: daemon/remote_dispatch.h:11486 daemon/remote_dispatch.h:11540
+#: daemon/remote_dispatch.h:11611 daemon/remote_dispatch.h:11669
+#: daemon/remote_dispatch.h:11725 daemon/remote_dispatch.h:11780
+#: daemon/remote_dispatch.h:11833 daemon/remote_dispatch.h:11890
+#: daemon/remote_dispatch.h:11942 daemon/remote_dispatch.h:12010
 msgid "connection not open"
 msgstr "la connexion n'est pas ouverte"
 
-#: daemon/remote.c:64 src/remote/remote_driver.c:57
+#: daemon/remote.c:63 src/remote/remote_driver.c:57
 #, c-format
 msgid "conversion from hyper to %s overflowed"
 msgstr ""
 
-#: daemon/remote.c:142
+#: daemon/remote.c:599
 msgid "connection already open"
 msgstr "connexion déjà ouverte"
 
-#: daemon/remote.c:730 daemon/remote.c:808 src/remote/remote_driver.c:1298
-#: src/remote/remote_driver.c:1369
+#: daemon/remote.c:605
+msgid "keepalive support is required to connect"
+msgstr ""
+
+#: daemon/remote.c:747 daemon/remote.c:837 src/remote/remote_driver.c:1336
+#: src/remote/remote_driver.c:1415
 #, c-format
 msgid "unknown parameter type: %d"
 msgstr ""
 
-#: daemon/remote.c:501 daemon/remote.c:585
+#: daemon/remote.c:783 daemon/remote.c:878 daemon/remote.c:932
+#: daemon/remote.c:1113 daemon/remote.c:1592 daemon/remote.c:1656
+#: daemon/remote.c:1722 daemon/remote.c:1800 daemon/remote.c:1915
 msgid "nparams too large"
 msgstr "nombre de paramètres trop grand"
 
-#: src/remote/remote_driver.c:3196
+#: daemon/remote.c:798 src/remote/remote_driver.c:1376
 #, c-format
 msgid "Parameter %s too big for destination"
 msgstr ""
 
-#: daemon/remote.c:725
+#: daemon/remote.c:988
 msgid "maxStats > REMOTE_DOMAIN_MEMORY_STATS_MAX"
 msgstr "maxStats > REMOTE_DOMAIN_MEMORY_STATS_MAX"
 
-#: daemon/remote.c:794 daemon/remote.c:843
+#: daemon/remote.c:1059 daemon/remote.c:1186
 msgid "size > maximum buffer size"
 msgstr "taille > taille maximale du tampon"
 
-#: daemon/remote.c:1290
+#: daemon/remote.c:1328
 msgid "ncpumaps > REMOTE_VCPUINFO_MAX"
 msgstr ""
 
-#: daemon/remote.c:1331
+#: daemon/remote.c:1334 daemon/remote.c:1405
 msgid "maxinfo * maplen > REMOTE_CPUMAPS_MAX"
 msgstr "maxinfo * maplen > REMOTE_CPUMAPS_MAX"
 
-#: daemon/remote.c:1325
+#: daemon/remote.c:1399
 msgid "maxinfo > REMOTE_VCPUINFO_MAX"
 msgstr "maxinfo > REMOTE_VCPUINFO_MAX"
 
-#: daemon/remote.c:2864
+#: daemon/remote.c:2047
 msgid "client tried invalid SASL init request"
-msgstr "le client a lancé une requête d'initialisation de SASL invalide"
+msgstr "le client a lancé une requête d'initialisation SASL invalide"
 
-#: src/util/virterror.c:989
+#: daemon/remote.c:2093 daemon/remote.c:2245 daemon/remote.c:2343
+#: daemon/remote.c:2359 daemon/remote.c:2373 daemon/remote.c:2387
+#: daemon/remote.c:2478 daemon/remote.c:2615 daemon/remote.c:2644
+#: src/util/virterror.c:1020
 msgid "authentication failed"
 msgstr "l'authentification a échoué"
 
-#: daemon/remote.c:3022
+#: daemon/remote.c:2120
 #, c-format
 msgid "negotiated SSF %d was not strong enough"
 msgstr "le SSF %d negocié n'était pas assez robuste"
 
-#: daemon/remote.c:3119 daemon/remote.c:3207
+#: daemon/remote.c:2176 daemon/remote.c:2274
 msgid "client tried invalid SASL start request"
 msgstr "le client a envoyé une requête de démarrage SASL non prise en charge"
 
-#: daemon/remote.c:3141
+#: daemon/remote.c:2194
 #, c-format
 msgid "sasl start reply data too long %d"
 msgstr "données de réponse SASL de démarrage trop longues %d"
 
-#: daemon/remote.c:3229
+#: daemon/remote.c:2291
 #, c-format
 msgid "sasl step reply data too long %d"
 msgstr "données réponse SASL d'étape trop longues %d"
 
-#: daemon/remote.c:3356 daemon/remote.c:3425
+#: daemon/remote.c:2430 daemon/remote.c:2527
 msgid "client tried invalid PolicyKit init request"
 msgstr ""
 "le client a envoyé une requête d'initialisation PolicyKit non prise en charge"
 
-#: daemon/remote.c:3369
+#: daemon/remote.c:2442
 #, c-format
 msgid "Caller PID was too large %d"
 msgstr "Le PID appelant est trop grand %d"
 
-#: daemon/remote.c:2343 daemon/remote.c:2433
+#: daemon/remote.c:2448 daemon/remote.c:2538
 #, c-format
 msgid "Caller identity was too large %d:%d"
 msgstr ""
 
-#: daemon/remote.c:3374
+#: daemon/remote.c:2453
 #, c-format
 msgid "Cannot invoke %s"
 msgstr "Impossible d'appeler %s"
 
-#: daemon/remote.c:2353
+#: daemon/remote.c:2458
 #, c-format
 msgid "Policy kit denied action %s from pid %d, uid %d: %s"
 msgstr ""
 
-#: daemon/remote.c:3361 daemon/remote.c:3430
+#: daemon/remote.c:2532
 msgid "cannot get peer socket identity"
-msgstr "impossible d'obtenir l'identité du connecteur réseau du pair"
+msgstr "Impossible d'obtenir l'identité du connecteur réseau du client"
 
-#: daemon/remote.c:3438
+#: daemon/remote.c:2546
 #, c-format
 msgid "Failed to lookup policy kit caller: %s"
-msgstr "La recherche de l'appelant de PolicyKit a échoué : %s"
+msgstr "La recherche de l'appelant de PolicyKit a échouée : %s"
 
-#: daemon/remote.c:2448
+#: daemon/remote.c:2553
 #, c-format
 msgid "Failed to create polkit action %s"
 msgstr "Impossible de créer l'action polkit %s"
 
-#: daemon/remote.c:2458
+#: daemon/remote.c:2563
 #, c-format
 msgid "Failed to create polkit context %s"
 msgstr "Impossible de créer le contexte polkit %s"
 
-#: daemon/remote.c:3473
+#: daemon/remote.c:2581
 #, c-format
 msgid "Policy kit failed to check authorization %d %s"
 msgstr "PolicyKit n'est pas parvenu à vérifier l'autorisation %d %s"
 
-#: daemon/remote.c:2490
+#: daemon/remote.c:2595
 #, c-format
 msgid "Policy kit denied action %s from pid %d, uid %d, result: %s"
 msgstr "Policy kit a empêché l'action %s du pid %d, uid %d, résultat : %s"
 
-#: daemon/remote.c:3518
+#: daemon/remote.c:2642
 msgid "client tried unsupported PolicyKit init request"
 msgstr ""
 "le client a envoyé une requête d'initialisation PolicyKit non prise en charge"
 
-#: daemon/remote.c:2625 daemon/remote.c:2820
+#: daemon/remote.c:2730 daemon/remote.c:2925
 #, c-format
 msgid "domain event %d already registered"
 msgstr "l'événement du domaine %d est déjà enregistré"
 
-#: daemon/remote.c:2666 daemon/remote.c:2870
+#: daemon/remote.c:2771 daemon/remote.c:2975
 #, c-format
 msgid "domain event %d not registered"
 msgstr "l'événement du domaine %d n'est pas enregistré"
 
-#: daemon/remote.c:2815 daemon/remote.c:2864
+#: daemon/remote.c:2920 daemon/remote.c:2969
 #, c-format
 msgid "unsupported event ID %d"
 msgstr "l'ID d'événement %d n'est pas supporté"
 
-#: daemon/remote_dispatch.h:5153 daemon/remote_dispatch.h:5228
+#: daemon/remote_dispatch.h:5293 daemon/remote_dispatch.h:5368
 msgid "maxnames > REMOTE_DOMAIN_SNAPSHOT_LIST_NAMES_MAX"
 msgstr ""
 
-#: daemon/remote.c:1621
+#: daemon/remote_dispatch.h:6980
 msgid "maxnames > REMOTE_DOMAIN_NAME_LIST_MAX"
 msgstr "maxnames > REMOTE_DOMAIN_NAME_LIST_MAX"
 
-#: daemon/remote.c:2586
+#: daemon/remote_dispatch.h:7044
 msgid "maxnames > REMOTE_DEFINED_INTERFACE_NAME_LIST_MAX"
 msgstr "maxnames > REMOTE_DEFINED_INTERFACE_NAME_LIST_MAX"
 
-#: daemon/remote.c:2080 daemon/remote.c:2147 daemon/remote.c:3542
+#: daemon/remote_dispatch.h:7108 daemon/remote_dispatch.h:7364
 msgid "maxnames > REMOTE_NETWORK_NAME_LIST_MAX"
 msgstr "maxnames > REMOTE_NETWORK_NAME_LIST_MAX"
 
-#: daemon/remote.c:3576
+#: daemon/remote_dispatch.h:7172 daemon/remote_dispatch.h:7556
 msgid "maxnames > REMOTE_STORAGE_POOL_NAME_LIST_MAX"
 msgstr "maxnames > REMOTE_STORAGE_POOL_NAME_LIST_MAX"
 
-#: daemon/remote.c:2114
+#: daemon/remote_dispatch.h:7236
 msgid "maxids > REMOTE_DOMAIN_ID_LIST_MAX"
 msgstr "maxids > REMOTE_DOMAIN_ID_LIST_MAX"
 
-#: daemon/remote.c:2533
+#: daemon/remote_dispatch.h:7300
 msgid "maxnames > REMOTE_INTERFACE_NAME_LIST_MAX"
 msgstr "maxnames > REMOTE_INTERFACE_NAME_LIST_MAX"
 
-#: daemon/remote_dispatch.h:7288
+#: daemon/remote_dispatch.h:7428
 msgid "maxnames > REMOTE_NWFILTER_NAME_LIST_MAX"
 msgstr "maxnames > REMOTE_NWFILTER_NAME_LIST_MAX"
 
-#: daemon/remote.c:4885
+#: daemon/remote_dispatch.h:7492
 msgid "maxuuids > REMOTE_SECRET_UUID_LIST_MAX"
 msgstr "maxuuids > REMOTE_SECRET_UUID_LIST_MAX"
 
-#: daemon/remote_dispatch.h:8411
+#: daemon/remote_dispatch.h:8551
 msgid "maxnames > REMOTE_NODE_DEVICE_CAPS_LIST_MAX"
 msgstr ""
 
-#: daemon/remote_dispatch.h:8692
+#: daemon/remote_dispatch.h:8832
 msgid "maxcells > REMOTE_NODE_MAX_CELLS"
 msgstr ""
 
-#: daemon/remote.c:4429 daemon/remote.c:4600
+#: daemon/remote_dispatch.h:9065
 msgid "maxnames > REMOTE_NODE_DEVICE_NAME_LIST_MAX"
 msgstr "maxnames > REMOTE_NODE_DEVICE_NAME_LIST_MAX"
 
-#: daemon/remote.c:4062
+#: daemon/remote_dispatch.h:10929
 msgid "maxnames > REMOTE_STORAGE_VOL_NAME_LIST_MAX"
 msgstr "maxnames > REMOTE_STORAGE_VOL_NAME_LIST_MAX"
 
-#: daemon/stream.c:113
+#: daemon/stream.c:237
 msgid "stream had unexpected termination"
 msgstr "le flux a eu une fin inattendue"
 
-#: daemon/stream.c:115
+#: daemon/stream.c:240
 msgid "stream had I/O failure"
 msgstr "le flux a eu des erreurs d'E/S"
 
-#: daemon/stream.c:468
+#: daemon/stream.c:622
 msgid "stream aborted at client request"
 msgstr "flux interrompu à la demande du client"
 
-#: daemon/stream.c:471
+#: daemon/stream.c:626
 #, c-format
 msgid "stream aborted with unexpected status %d"
 msgstr "flux interrompu avec un statut %d inattendu"
@@ -511,1972 +632,2034 @@
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: src/conf/cpu_conf.c:126
+#: src/conf/cpu_conf.c:132
 msgid "XML does not contain expected 'cpu' element"
 msgstr "Le XML ne contient pas l'élément « cpu » attendu"
 
-#: src/conf/cpu_conf.c:139
+#: src/conf/cpu_conf.c:145
 msgid ""
 "'arch' element element cannot be used inside 'cpu' element with 'match' "
 "attribute'"
 msgstr ""
 
-#: src/conf/cpu_conf.c:98
+#: src/conf/cpu_conf.c:169
 msgid "Invalid match attribute for CPU specification"
 msgstr "Attribut « match » invalide pour la spécification CPU"
 
-#: src/conf/cpu_conf.c:107
+#: src/conf/cpu_conf.c:179
 msgid "Missing CPU architecture"
 msgstr "Architecture CPU manquante"
 
-#: src/conf/cpu_conf.c:114 src/cpu/cpu_x86.c:602
+#: src/conf/cpu_conf.c:187 src/cpu/cpu_x86.c:949
 msgid "Missing CPU model name"
 msgstr "Nom du modèle de CPU manquant"
 
-#: src/conf/cpu_conf.c:188
+#: src/conf/cpu_conf.c:194
 msgid "CPU vendor specified without CPU model"
 msgstr ""
 
-#: src/conf/cpu_conf.c:126
+#: src/conf/cpu_conf.c:206
 msgid "Missing 'sockets' attribute in CPU topology"
 msgstr "L'attribut « sockets » est manquant dans la topologie CPU"
 
-#: src/conf/cpu_conf.c:135
+#: src/conf/cpu_conf.c:215
 msgid "Missing 'cores' attribute in CPU topology"
 msgstr "L'attribut « core » est manquant dans la topologie CPU"
 
-#: src/conf/cpu_conf.c:144
+#: src/conf/cpu_conf.c:224
 msgid "Missing 'threads' attribute in CPU topology"
 msgstr "L'attribut « threads » est manquant dans la topologie CPU"
 
-#: src/conf/cpu_conf.c:151
+#: src/conf/cpu_conf.c:231
 msgid "Invalid CPU topology"
 msgstr "Élément « CPU topology » invalide"
 
-#: src/conf/cpu_conf.c:237 src/conf/cpu_conf.c:372
+#: src/conf/cpu_conf.c:243 src/conf/cpu_conf.c:433
 msgid "Non-empty feature list specified without CPU model"
 msgstr "Liste de fonctions non-vide spécifiée sans le modèle de CPU"
 
-#: src/conf/cpu_conf.c:180
+#: src/conf/cpu_conf.c:270
 msgid "Invalid CPU feature policy"
 msgstr "Élément « CPU feature policy » invalide"
 
-#: src/conf/cpu_conf.c:190
+#: src/conf/cpu_conf.c:280
 msgid "Invalid CPU feature name"
 msgstr "Élément « CPU feature name » invalide"
 
-#: src/conf/cpu_conf.c:197 src/conf/cpu_conf.c:345
+#: src/conf/cpu_conf.c:287 src/conf/cpu_conf.c:502
 #, c-format
 msgid "CPU feature `%s' specified more than once"
 msgstr "Fonction CPU « %s » spécifiée plus d'une fois"
 
-#: src/conf/cpu_conf.c:277
+#: src/conf/cpu_conf.c:303
+msgid "NUMA topology defined without NUMA cells"
+msgstr ""
+
+#: src/conf/cpu_conf.c:322
+msgid "Missing 'cpus' attribute in NUMA cell"
+msgstr ""
+
+#: src/conf/cpu_conf.c:339
+msgid "Missing 'memory' attribute in NUMA cell"
+msgstr ""
+
+#: src/conf/cpu_conf.c:346
+msgid "Invalid 'memory' attribute in NUMA cell"
+msgstr ""
+
+#: src/conf/cpu_conf.c:400
 #, c-format
 msgid "Unexpected CPU match policy %d"
 msgstr "Élément « CPU match policy » %d inattendu"
 
-#: src/conf/cpu_conf.c:305 src/cpu/cpu_x86.c:289
+#: src/conf/cpu_conf.c:457 src/cpu/cpu_x86.c:669
 msgid "Missing CPU feature name"
 msgstr "Élément « CPU feature name » manquant"
 
-#: src/conf/cpu_conf.c:315
+#: src/conf/cpu_conf.c:467
 #, c-format
 msgid "Unexpected CPU feature policy %d"
 msgstr "Élément « CPU feature policy » %d inattendu"
 
-#: src/conf/cpu_conf.c:468
+#: src/conf/cpu_conf.c:539
 msgid "Target CPU does not match source"
 msgstr ""
 
-#: src/conf/cpu_conf.c:474
+#: src/conf/cpu_conf.c:545
 #, c-format
 msgid "Target CPU type %s does not match source %s"
 msgstr ""
 
-#: src/conf/cpu_conf.c:482
+#: src/conf/cpu_conf.c:553
 #, c-format
 msgid "Target CPU arch %s does not match source %s"
 msgstr ""
 
-#: src/conf/cpu_conf.c:489
+#: src/conf/cpu_conf.c:560
 #, c-format
 msgid "Target CPU model %s does not match source %s"
 msgstr ""
 
-#: src/conf/cpu_conf.c:496
+#: src/conf/cpu_conf.c:567
 #, c-format
 msgid "Target CPU vendor %s does not match source %s"
 msgstr ""
 
-#: src/conf/cpu_conf.c:503
+#: src/conf/cpu_conf.c:574
 #, c-format
 msgid "Target CPU sockets %d does not match source %d"
 msgstr ""
 
-#: src/conf/cpu_conf.c:510
+#: src/conf/cpu_conf.c:581
 #, c-format
 msgid "Target CPU cores %d does not match source %d"
 msgstr ""
 
-#: src/conf/cpu_conf.c:517
+#: src/conf/cpu_conf.c:588
 #, c-format
 msgid "Target CPU threads %d does not match source %d"
 msgstr ""
 
-#: src/conf/cpu_conf.c:524
+#: src/conf/cpu_conf.c:595
 #, c-format
 msgid "Target CPU feature count %zu does not match source %zu"
 msgstr ""
 
-#: src/conf/cpu_conf.c:532
+#: src/conf/cpu_conf.c:603
 #, c-format
 msgid "Target CPU feature %s does not match source %s"
 msgstr ""
 
-#: src/conf/cpu_conf.c:539
+#: src/conf/cpu_conf.c:610
 #, c-format
 msgid "Target CPU feature policy %s does not match source %s"
 msgstr ""
 
-#: daemon/libvirtd.c:831 daemon/libvirtd.c:1329 src/conf/domain_conf.c:667
-#: src/conf/interface_conf.c:1373 src/conf/network_conf.c:175
-#: src/conf/node_device_conf.c:196 src/conf/storage_conf.c:1460
-#: src/openvz/openvz_conf.c:465 src/qemu/qemu_driver.c:961
-#: src/remote/remote_driver.c:978 src/remote/remote_driver.c:7171
-#: src/remote/remote_driver.c:7350 src/remote/remote_driver.c:7562
-#: src/test/test_driver.c:509 src/test/test_driver.c:754
+#: src/conf/domain_conf.c:643
+#, c-format
+msgid "could not parse weight %s"
+msgstr ""
+
+#: src/conf/domain_conf.c:656
+msgid "missing per-device path"
+msgstr ""
+
+#: src/conf/domain_conf.c:1543 src/conf/interface_conf.c:1288
+#: src/conf/network_conf.c:227 src/conf/node_device_conf.c:195
+#: src/conf/nwfilter_conf.c:2844 src/conf/storage_conf.c:1409
+#: src/libxl/libxl_driver.c:880 src/openvz/openvz_conf.c:474
+#: src/qemu/qemu_driver.c:420 src/remote/remote_driver.c:778
+#: src/rpc/virnetclientstream.c:151 src/rpc/virnetserver.c:377
+#: src/test/test_driver.c:526 src/test/test_driver.c:766
+#: src/xen/xen_driver.c:321
 msgid "cannot initialize mutex"
 msgstr "Impossible d'initialiser le mutex"
 
-#: src/conf/domain_conf.c:1724
+#: src/conf/domain_conf.c:1914
 #, c-format
 msgid "unknown address type '%d'"
 msgstr "type d'adresse « %d » inconnu"
 
-#: src/conf/domain_conf.c:1752
+#: src/conf/domain_conf.c:1942
 msgid "Cannot parse <address> 'domain' attribute"
 msgstr "Impossible de parcourir l'attribut de <address> « domain »"
 
-#: src/conf/domain_conf.c:1759 src/conf/domain_conf.c:1826
-#: src/conf/domain_conf.c:1878 src/conf/domain_conf.c:1968
+#: src/conf/domain_conf.c:1949 src/conf/domain_conf.c:2016
+#: src/conf/domain_conf.c:2068 src/conf/domain_conf.c:2158
 msgid "Cannot parse <address> 'bus' attribute"
 msgstr "Impossible de parcourir l'attribut de <address> « bus »"
 
-#: src/conf/domain_conf.c:1766 src/conf/domain_conf.c:1927
+#: src/conf/domain_conf.c:1956 src/conf/domain_conf.c:2117
 msgid "Cannot parse <address> 'slot' attribute"
 msgstr "Impossible de parcourir l'attribut de <address> « slot »"
 
-#: src/conf/domain_conf.c:1773
+#: src/conf/domain_conf.c:1963
 msgid "Cannot parse <address> 'function' attribute"
 msgstr "Impossible de parcourir l'attribut de <address> « function »"
 
-#: src/conf/domain_conf.c:1780
+#: src/conf/domain_conf.c:1970
 #, c-format
 msgid "Unknown value '%s' for <address> 'multifunction' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:1787
+#: src/conf/domain_conf.c:1977
 msgid "Insufficient specification for PCI address"
 msgstr "Spécification insufisante pour l'adresse PCI"
 
-#: src/conf/domain_conf.c:1819 src/conf/domain_conf.c:1871
-#: src/conf/domain_conf.c:1920
+#: src/conf/domain_conf.c:2009 src/conf/domain_conf.c:2061
+#: src/conf/domain_conf.c:2110
 msgid "Cannot parse <address> 'controller' attribute"
 msgstr "Impossible de parcourir l'attribut de <address> « controller »"
 
-#: src/conf/domain_conf.c:1833
+#: src/conf/domain_conf.c:2023
 msgid "Cannot parse <address> 'unit' attribute"
 msgstr "Impossible de parcourir l'attribut de <address> « unit »"
 
-#: src/conf/domain_conf.c:1839
+#: src/conf/domain_conf.c:2029
 msgid "Insufficient specification for drive address"
 msgstr "Spécification insufisante pour l'adresse du périphérique"
 
-#: src/conf/domain_conf.c:1885 src/conf/domain_conf.c:1958
+#: src/conf/domain_conf.c:2075 src/conf/domain_conf.c:2148
 msgid "Cannot parse <address> 'port' attribute"
 msgstr "Impossible de parcourir l'attribut <address> « port »"
 
-#: src/conf/domain_conf.c:1891
+#: src/conf/domain_conf.c:2081
 msgid "Insufficient specification for virtio serial address"
 msgstr ""
 
-#: src/conf/domain_conf.c:1994
+#: src/conf/domain_conf.c:2184
 msgid "Cannot parse <master> 'startport' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:2057
+#: src/conf/domain_conf.c:2247
 #, c-format
 msgid "unknown address type '%s'"
 msgstr "type d'adresse inconnu « %s »"
 
-#: src/conf/domain_conf.c:2062
+#: src/conf/domain_conf.c:2252
 msgid "No type specified for device address"
 msgstr ""
 
-#: src/conf/domain_conf.c:2096
+#: src/conf/domain_conf.c:2286
 msgid "Unknown device address type"
 msgstr ""
 
-#: src/conf/domain_conf.c:2121
+#: src/conf/domain_conf.c:2311
 msgid "missing boot order attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:2126
+#: src/conf/domain_conf.c:2316
 #, c-format
 msgid "incorrect boot order '%s', expecting positive integer"
 msgstr ""
 
-#: src/conf/domain_conf.c:2135
+#: src/conf/domain_conf.c:2325
 msgid "boot orders have to be contiguous and starting from 1"
 msgstr ""
 
-#: src/conf/domain_conf.c:2139
+#: src/conf/domain_conf.c:2329
 #, c-format
 msgid "boot order %d used for more than one device"
 msgstr ""
 
-#: src/conf/domain_conf.c:2278
+#: src/conf/domain_conf.c:2468
 msgid "Missing 'key' element for lease"
 msgstr ""
 
-#: src/conf/domain_conf.c:2283
+#: src/conf/domain_conf.c:2473
 msgid "Missing 'target' element for lease"
 msgstr ""
 
-#: src/conf/domain_conf.c:2290
+#: src/conf/domain_conf.c:2480
 #, c-format
 msgid "Malformed lease target offset %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:764
+#: src/conf/domain_conf.c:2554
 #, c-format
 msgid "unknown disk type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2390
+#: src/conf/domain_conf.c:2584
 msgid "missing protocol type"
 msgstr ""
 
-#: src/conf/domain_conf.c:2396
+#: src/conf/domain_conf.c:2590
 #, c-format
 msgid "unknown protocol type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2403
+#: src/conf/domain_conf.c:2597
 msgid "missing name for disk source"
 msgstr ""
 
-#: src/conf/domain_conf.c:2421
+#: src/conf/domain_conf.c:2615
 msgid "missing name for host"
 msgstr ""
 
-#: src/conf/domain_conf.c:2427
+#: src/conf/domain_conf.c:2621
 msgid "missing port for host"
 msgstr ""
 
-#: src/conf/domain_conf.c:789 src/conf/domain_conf.c:3930
+#: src/conf/domain_conf.c:2630 src/conf/domain_conf.c:9800
 #, c-format
 msgid "unexpected disk type %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2472
+#: src/conf/domain_conf.c:2666
 msgid "missing username for auth"
 msgstr ""
 
-#: src/conf/domain_conf.c:2484
+#: src/conf/domain_conf.c:2678
 msgid "missing type for secret"
 msgstr ""
 
-#: src/conf/domain_conf.c:2490
+#: src/conf/domain_conf.c:2684
 #, c-format
 msgid "invalid secret type %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2500
+#: src/conf/domain_conf.c:2694
 msgid "only one of uuid and usage can be specfied"
 msgstr ""
 
-#: src/conf/domain_conf.c:2508
+#: src/conf/domain_conf.c:2702
 #, c-format
 msgid "malformed uuid %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:841
+#: src/conf/domain_conf.c:2756
+msgid "total and read/write bytes_sec cannot be set at the same time"
+msgstr ""
+
+#: src/conf/domain_conf.c:2766
+msgid "total and read/write iops_sec cannot be set at the same time"
+msgstr ""
+
+#: src/conf/domain_conf.c:2802
 #, c-format
 msgid "unknown disk device '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:867
+#: src/conf/domain_conf.c:2828
 #, c-format
 msgid "Invalid floppy device name: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:882
+#: src/conf/domain_conf.c:2843
 #, c-format
 msgid "Invalid harddisk device name: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2601 src/conf/domain_conf.c:11889
+#: src/conf/domain_conf.c:2851 src/conf/domain_conf.c:12255
 #, c-format
 msgid "unknown disk snapshot setting '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:889
+#: src/conf/domain_conf.c:2862
 #, c-format
 msgid "unknown disk bus type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:914
+#: src/conf/domain_conf.c:2887
 #, c-format
 msgid "Invalid bus type '%s' for floppy disk"
 msgstr ""
 
-#: src/conf/domain_conf.c:920
+#: src/conf/domain_conf.c:2893
 #, c-format
 msgid "Invalid bus type '%s' for disk"
 msgstr ""
 
-#: src/conf/domain_conf.c:927
+#: src/conf/domain_conf.c:2900
 #, c-format
 msgid "unknown disk cache mode '%s'"
 msgstr "mode de mise en cache du disque « %s » inconnu"
 
-#: src/conf/domain_conf.c:2657
+#: src/conf/domain_conf.c:2907
 #, c-format
 msgid "unknown disk error policy '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2666
+#: src/conf/domain_conf.c:2916
 #, c-format
 msgid "unknown disk read error policy '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2675
+#: src/conf/domain_conf.c:2925
 #, c-format
 msgid "unknown disk io mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2683
+#: src/conf/domain_conf.c:2933
 msgid "disk ioeventfd mode supported only for virtio bus"
 msgstr ""
 
-#: src/conf/domain_conf.c:2691
+#: src/conf/domain_conf.c:2941
 #, c-format
 msgid "unknown disk ioeventfd mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2701
+#: src/conf/domain_conf.c:2951
 msgid "disk event_idx mode supported only for virtio bus"
 msgstr ""
 
-#: src/conf/domain_conf.c:2709
+#: src/conf/domain_conf.c:2959
 #, c-format
 msgid "unknown disk event_idx mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:937 src/conf/domain_conf.c:1182
-#: src/conf/domain_conf.c:2396
+#: src/conf/domain_conf.c:2970 src/conf/domain_conf.c:3553
+#: src/conf/domain_conf.c:5876
 #, c-format
 msgid "Unable to parse devaddr parameter '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2735
+#: src/conf/domain_conf.c:2985
 #, c-format
 msgid "unknown startupPolicy value '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2743
+#: src/conf/domain_conf.c:2993
 #, c-format
 msgid "Setting disk %s is allowed only for cdrom or floppy"
 msgstr ""
 
-#: src/conf/domain_conf.c:2859
+#: src/conf/domain_conf.c:3110
 #, c-format
 msgid "Unknown controller type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2868
+#: src/conf/domain_conf.c:3119
 #, c-format
 msgid "Cannot parse controller index %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2877
+#: src/conf/domain_conf.c:3128
 #, c-format
 msgid "Unknown model type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2895
+#: src/conf/domain_conf.c:3146
 #, c-format
 msgid "Invalid ports: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2910
+#: src/conf/domain_conf.c:3161
 #, c-format
 msgid "Invalid vectors: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2928
+#: src/conf/domain_conf.c:3179
 msgid "Controllers must use the 'pci' address type"
 msgstr ""
 
-#: src/conf/domain_conf.c:999
+#: src/conf/domain_conf.c:3219
 #, c-format
 msgid "unknown filesystem type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2979
+#: src/conf/domain_conf.c:3230
 #, c-format
 msgid "unknown accessmode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3015
+#: src/conf/domain_conf.c:3266
 #, c-format
 msgid "unknown fs driver type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3077
+#: src/conf/domain_conf.c:3328
 msgid "missing type attribute in interface's <actual> element"
 msgstr ""
 
-#: src/conf/domain_conf.c:3082
+#: src/conf/domain_conf.c:3333
 #, c-format
 msgid "unknown type '%s' in interface's <actual> element"
 msgstr ""
 
-#: src/conf/domain_conf.c:3089
+#: src/conf/domain_conf.c:3340
 #, c-format
 msgid "unsupported type '%s' in interface's <actual> element"
 msgstr ""
 
-#: src/conf/domain_conf.c:3106
+#: src/conf/domain_conf.c:3357
 #, c-format
 msgid "Unkown mode '%s' in interface <actual> element"
 msgstr ""
 
-#: src/conf/domain_conf.c:1098
+#: src/conf/domain_conf.c:3438
 #, c-format
 msgid "unknown interface type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1168 src/qemu/qemu_conf.c:3426
+#: src/conf/domain_conf.c:3541 src/qemu/qemu_command.c:6158
 #, c-format
 msgid "unable to parse mac address '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3318
+#: src/conf/domain_conf.c:3568
 msgid "Network interfaces must use 'pci' address type"
 msgstr ""
 
-#: src/conf/domain_conf.c:1202
+#: src/conf/domain_conf.c:3576
 msgid ""
 "No <source> 'network' attribute specified with <interface type='network'/>"
 msgstr ""
 
-#: src/conf/domain_conf.c:1228
+#: src/conf/domain_conf.c:3608
 msgid ""
 "No <source> 'bridge' attribute specified with <interface type='bridge'/>"
 msgstr ""
 
-#: src/conf/domain_conf.c:1248
+#: src/conf/domain_conf.c:3628
 msgid "No <source> 'port' attribute specified with socket interface"
 msgstr ""
 
-#: src/conf/domain_conf.c:1253
+#: src/conf/domain_conf.c:3633
 msgid "Cannot parse <source> 'port' attribute with socket interface"
 msgstr ""
 
-#: src/conf/domain_conf.c:1261
+#: src/conf/domain_conf.c:3641
 msgid "No <source> 'address' attribute specified with socket interface"
 msgstr ""
 
-#: src/conf/domain_conf.c:1273
+#: src/conf/domain_conf.c:3653
 msgid ""
 "No <source> 'name' attribute specified with <interface type='internal'/>"
 msgstr ""
 
-#: src/conf/domain_conf.c:3413
+#: src/conf/domain_conf.c:3663
 msgid "No <source> 'dev' attribute specified with <interface type='direct'/>"
 msgstr ""
 
-#: src/conf/domain_conf.c:3421
+#: src/conf/domain_conf.c:3671
 msgid "Unkown mode has been specified"
 msgstr ""
 
-#: src/conf/domain_conf.c:1297
+#: src/conf/domain_conf.c:3709
 msgid "Model name contains invalid characters"
 msgstr ""
 
-#: src/conf/domain_conf.c:3473
+#: src/conf/domain_conf.c:3723
 #, c-format
 msgid "Unknown interface <driver name='%s'> has been specified"
 msgstr ""
 
-#: src/conf/domain_conf.c:3485
+#: src/conf/domain_conf.c:3735
 #, c-format
 msgid "Unknown interface <driver txmode='%s'> has been specified"
 msgstr ""
 
-#: src/conf/domain_conf.c:3496
+#: src/conf/domain_conf.c:3746
 #, c-format
 msgid "unknown interface ioeventfd mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3506
+#: src/conf/domain_conf.c:3756
 #, c-format
 msgid "unknown interface event_idx mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3518
+#: src/conf/domain_conf.c:3768
 #, c-format
 msgid "unknown interface link state '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3544
+#: src/conf/domain_conf.c:3794
 msgid "sndbuf must be a positive integer"
 msgstr ""
 
-#: src/conf/domain_conf.c:3592
+#: src/conf/domain_conf.c:3842
 #, c-format
 msgid "target type must be specified for %s device"
 msgstr ""
 
-#: src/conf/domain_conf.c:3599
+#: src/conf/domain_conf.c:3849
 msgid "Driver does not have a default console type set"
 msgstr ""
 
-#: src/conf/domain_conf.c:1503
+#: src/conf/domain_conf.c:3928
 msgid "guestfwd channel does not define a target address"
 msgstr ""
 
-#: src/conf/domain_conf.c:1521
+#: src/conf/domain_conf.c:3943
 msgid "guestfwd channel only supports IPv4 addresses"
 msgstr ""
 
-#: src/conf/domain_conf.c:1528
+#: src/conf/domain_conf.c:3950
 msgid "guestfwd channel does not define a target port"
 msgstr ""
 
-#: src/conf/domain_conf.c:1491 src/conf/domain_conf.c:1534
+#: src/conf/domain_conf.c:3957 src/conf/domain_conf.c:3981
+#: src/conf/storage_conf.c:439
 #, c-format
 msgid "Invalid port number: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:1445
+#: src/conf/domain_conf.c:4053
 #, c-format
 msgid "Unknown source mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1567 src/conf/domain_conf.c:1651
+#: src/conf/domain_conf.c:4086 src/conf/domain_conf.c:4169
 msgid "Missing source path attribute for char device"
 msgstr ""
 
-#: src/conf/domain_conf.c:1584 src/conf/domain_conf.c:1601
+#: src/conf/domain_conf.c:4104 src/conf/domain_conf.c:4121
 msgid "Missing source host attribute for char device"
 msgstr ""
 
-#: src/conf/domain_conf.c:1589 src/conf/domain_conf.c:1606
-#: src/conf/domain_conf.c:1633
+#: src/conf/domain_conf.c:4109 src/conf/domain_conf.c:4126
+#: src/conf/domain_conf.c:4151
 msgid "Missing source service attribute for char device"
 msgstr ""
 
-#: src/conf/domain_conf.c:1624
+#: src/conf/domain_conf.c:4142
 #, c-format
 msgid "Unknown protocol '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4022 src/conf/domain_conf.c:4166
+#: src/conf/domain_conf.c:4272 src/conf/domain_conf.c:4416
 #, c-format
 msgid "unknown type presented to host for character device: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4030
+#: src/conf/domain_conf.c:4280
 #, c-format
 msgid "unknown character device type: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4059
+#: src/conf/domain_conf.c:4309
 msgid "spicevmc device type only supports virtio"
 msgstr ""
 
-#: src/conf/domain_conf.c:4099
+#: src/conf/domain_conf.c:4349
 msgid "missing smartcard device mode"
 msgstr ""
 
-#: src/conf/domain_conf.c:4104
+#: src/conf/domain_conf.c:4354
 #, c-format
 msgid "unknown smartcard device mode: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4121 src/conf/domain_conf.c:4150
+#: src/conf/domain_conf.c:4371 src/conf/domain_conf.c:4400
 msgid "host-certificates mode needs exactly three certificates"
 msgstr ""
 
-#: src/conf/domain_conf.c:4141
+#: src/conf/domain_conf.c:4391
 #, c-format
 msgid "expecting absolute path: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4160
+#: src/conf/domain_conf.c:4410
 msgid "passthrough mode requires a character device type attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:4184
+#: src/conf/domain_conf.c:4434
 msgid "unknown smartcard mode"
 msgstr ""
 
-#: src/conf/domain_conf.c:4193
+#: src/conf/domain_conf.c:4443
 msgid "Controllers must use the 'ccid' address type"
 msgstr ""
 
-#: src/conf/domain_conf.c:1707
+#: src/conf/domain_conf.c:4479
 msgid "missing input device type"
 msgstr ""
 
-#: src/conf/domain_conf.c:1713
+#: src/conf/domain_conf.c:4485
 #, c-format
 msgid "unknown input device type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1720
+#: src/conf/domain_conf.c:4492
 #, c-format
 msgid "unknown input bus type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1728
+#: src/conf/domain_conf.c:4500
 #, c-format
 msgid "ps2 bus does not support %s input device"
 msgstr ""
 
-#: src/conf/domain_conf.c:1734 src/conf/domain_conf.c:1741
+#: src/conf/domain_conf.c:4506 src/conf/domain_conf.c:4513
 #, c-format
 msgid "unsupported input bus %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:1746
+#: src/conf/domain_conf.c:4518
 #, c-format
 msgid "xen bus does not support %s input device"
 msgstr ""
 
-#: src/conf/domain_conf.c:4291 src/conf/domain_conf.c:5834
+#: src/conf/domain_conf.c:4541 src/conf/domain_conf.c:6084
 msgid "Invalid address for a USB device"
 msgstr ""
 
-#: src/conf/domain_conf.c:4324
+#: src/conf/domain_conf.c:4574
 msgid "missing hub device type"
 msgstr ""
 
-#: src/conf/domain_conf.c:4330
+#: src/conf/domain_conf.c:4580
 #, c-format
 msgid "unknown hub device type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4375
+#: src/conf/domain_conf.c:4625
 msgid "missing timer name"
 msgstr ""
 
-#: src/conf/domain_conf.c:4380
+#: src/conf/domain_conf.c:4630
 #, c-format
 msgid "unknown timer name '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4392
+#: src/conf/domain_conf.c:4642
 #, c-format
 msgid "unknown timer present value '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4402
+#: src/conf/domain_conf.c:4652
 #, c-format
 msgid "unknown timer tickpolicy '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4412
+#: src/conf/domain_conf.c:4662
 #, c-format
 msgid "unknown timer track '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4422
+#: src/conf/domain_conf.c:4672
 msgid "invalid timer frequency"
 msgstr ""
 
-#: src/conf/domain_conf.c:4431
+#: src/conf/domain_conf.c:4681
 #, c-format
 msgid "unknown timer mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4444
+#: src/conf/domain_conf.c:4694
 msgid "invalid catchup threshold"
 msgstr ""
 
-#: src/conf/domain_conf.c:4453
+#: src/conf/domain_conf.c:4703
 msgid "invalid catchup slew"
 msgstr ""
 
-#: src/conf/domain_conf.c:4462
+#: src/conf/domain_conf.c:4712
 msgid "invalid catchup limit"
 msgstr ""
 
-#: src/conf/domain_conf.c:4515
+#: src/conf/domain_conf.c:4765
 #, c-format
 msgid "cannot parse password validity time '%s', expect YYYY-MM-DDTHH:MM:SS"
 msgstr ""
 
-#: src/conf/domain_conf.c:4534
+#: src/conf/domain_conf.c:4784
 #, c-format
 msgid "unknown connected value %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4545
+#: src/conf/domain_conf.c:4795
 msgid "VNC supports connected='keep' only"
 msgstr ""
 
-#: src/conf/domain_conf.c:4567
+#: src/conf/domain_conf.c:4817
 msgid "graphics listen type must be specified"
 msgstr ""
 
-#: src/conf/domain_conf.c:4573
+#: src/conf/domain_conf.c:4823
 #, c-format
 msgid "unknown graphics listen type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4593
+#: src/conf/domain_conf.c:4843
 msgid "network attribute not allowed when listen type is not network"
 msgstr ""
 
-#: src/conf/domain_conf.c:1791
+#: src/conf/domain_conf.c:4885
 msgid "missing graphics device type"
 msgstr ""
 
-#: src/conf/domain_conf.c:1797
+#: src/conf/domain_conf.c:4891
 #, c-format
 msgid "unknown graphics device type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4708
+#: src/conf/domain_conf.c:4958
 #, c-format
 msgid ""
 "graphics listen attribute %s must match address attribute of first listen "
 "element (found %s)"
 msgstr ""
 
-#: src/conf/domain_conf.c:1808
+#: src/conf/domain_conf.c:4974
 #, c-format
 msgid "cannot parse vnc port %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:1846 src/conf/domain_conf.c:1908
+#: src/conf/domain_conf.c:5015 src/conf/domain_conf.c:5076
 #, c-format
 msgid "unknown fullscreen value '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1864
+#: src/conf/domain_conf.c:5033
 #, c-format
 msgid "cannot parse rdp port %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4844
+#: src/conf/domain_conf.c:5094
 #, c-format
 msgid "cannot parse spice port %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4857
+#: src/conf/domain_conf.c:5107
 #, c-format
 msgid "cannot parse spice tlsPort %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4894
+#: src/conf/domain_conf.c:5144
 msgid "spice channel missing name/mode"
 msgstr ""
 
-#: src/conf/domain_conf.c:4902
+#: src/conf/domain_conf.c:5152
 #, c-format
 msgid "unknown spice channel name %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4910
+#: src/conf/domain_conf.c:5160
 #, c-format
 msgid "unknown spice channel mode %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4926
+#: src/conf/domain_conf.c:5176
 msgid "spice image missing compression"
 msgstr ""
 
-#: src/conf/domain_conf.c:4933
+#: src/conf/domain_conf.c:5183
 #, c-format
 msgid "unknown spice image compression %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4947
+#: src/conf/domain_conf.c:5197
 msgid "spice jpeg missing compression"
 msgstr ""
 
-#: src/conf/domain_conf.c:4954
+#: src/conf/domain_conf.c:5204
 #, c-format
 msgid "unknown spice jpeg compression %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4968
+#: src/conf/domain_conf.c:5218
 msgid "spice zlib missing compression"
 msgstr ""
 
-#: src/conf/domain_conf.c:4975
+#: src/conf/domain_conf.c:5225
 #, c-format
 msgid "unknown spice zlib compression %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4989
+#: src/conf/domain_conf.c:5239
 msgid "spice playback missing compression"
 msgstr ""
 
-#: src/conf/domain_conf.c:4996
+#: src/conf/domain_conf.c:5246
 msgid "unknown spice playback compression"
 msgstr ""
 
-#: src/conf/domain_conf.c:5010
+#: src/conf/domain_conf.c:5260
 msgid "spice streaming missing mode"
 msgstr ""
 
-#: src/conf/domain_conf.c:5016
+#: src/conf/domain_conf.c:5266
 msgid "unknown spice streaming mode"
 msgstr ""
 
-#: src/conf/domain_conf.c:5030
+#: src/conf/domain_conf.c:5280
 msgid "spice clipboard missing copypaste"
 msgstr ""
 
-#: src/conf/domain_conf.c:5037
+#: src/conf/domain_conf.c:5287
 #, c-format
 msgid "unknown copypaste value '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1947
+#: src/conf/domain_conf.c:5330
 #, c-format
 msgid "unknown sound model '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1980
+#: src/conf/domain_conf.c:5366
 msgid "watchdog must contain model name"
 msgstr ""
 
-#: src/conf/domain_conf.c:1986
+#: src/conf/domain_conf.c:5372
 #, c-format
 msgid "unknown watchdog model '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1997
+#: src/conf/domain_conf.c:5383
 #, c-format
 msgid "unknown watchdog action '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5169
+#: src/conf/domain_conf.c:5419
 msgid "balloon memory must contain model name"
 msgstr ""
 
-#: src/conf/domain_conf.c:5174
+#: src/conf/domain_conf.c:5424
 #, c-format
 msgid "unknown memory balloon model '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5201
+#: src/conf/domain_conf.c:5451
 msgid "XML does not contain expected 'sysinfo' element"
 msgstr ""
 
-#: src/conf/domain_conf.c:5213
+#: src/conf/domain_conf.c:5463
 msgid "sysinfo must contain a type attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:5218
+#: src/conf/domain_conf.c:5468
 #, c-format
 msgid "unknown sysinfo type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2143
+#: src/conf/domain_conf.c:5646
 #, c-format
 msgid "unknown video model '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2149
+#: src/conf/domain_conf.c:5652
 msgid "missing video model and cannot determine default"
 msgstr ""
 
-#: src/conf/domain_conf.c:2157
+#: src/conf/domain_conf.c:5660
 #, c-format
 msgid "cannot parse video ram '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2167
+#: src/conf/domain_conf.c:5670
 #, c-format
 msgid "cannot parse video heads '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2214
+#: src/conf/domain_conf.c:5719
 #, c-format
 msgid "cannot parse vendor id %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2221
+#: src/conf/domain_conf.c:5726
 msgid "usb vendor needs id"
 msgstr ""
 
-#: src/conf/domain_conf.c:2232
+#: src/conf/domain_conf.c:5737
 #, c-format
 msgid "cannot parse product %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2240
+#: src/conf/domain_conf.c:5745
 msgid "usb product needs id"
 msgstr ""
 
-#: src/conf/domain_conf.c:2251 src/conf/domain_conf.c:2343
+#: src/conf/domain_conf.c:5756
 #, c-format
 msgid "cannot parse bus %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2258
+#: src/conf/domain_conf.c:5763
 msgid "usb address needs bus id"
 msgstr ""
 
-#: src/conf/domain_conf.c:2267
+#: src/conf/domain_conf.c:5772
 #, c-format
 msgid "cannot parse device %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2275
+#: src/conf/domain_conf.c:5780
 msgid "usb address needs device id"
 msgstr ""
 
-#: src/conf/domain_conf.c:2280
+#: src/conf/domain_conf.c:5785
 #, c-format
 msgid "unknown usb source type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2290
+#: src/conf/domain_conf.c:5795
 msgid "vendor cannot be 0."
 msgstr ""
 
-#: src/conf/domain_conf.c:2296
+#: src/conf/domain_conf.c:5801
 msgid "missing vendor"
 msgstr ""
 
-#: src/conf/domain_conf.c:2301
+#: src/conf/domain_conf.c:5806
 msgid "missing product"
 msgstr ""
 
-#: src/conf/domain_conf.c:5590
+#: src/conf/domain_conf.c:5840
 #, c-format
 msgid "unsupported element '%s' of 'origstates'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2403
+#: src/conf/domain_conf.c:5889
 #, c-format
 msgid "unknown pci source type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2436
+#: src/conf/domain_conf.c:5921
 #, c-format
 msgid "unknown hostdev mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2447
+#: src/conf/domain_conf.c:5932
 #, c-format
 msgid "unknown host device type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2452
+#: src/conf/domain_conf.c:5937
 msgid "missing type in hostdev"
 msgstr ""
 
-#: src/conf/domain_conf.c:5724
+#: src/conf/domain_conf.c:5974
 msgid "missing rom bar attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:5729
+#: src/conf/domain_conf.c:5979
 #, c-format
 msgid "unknown rom bar value '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2480
+#: src/conf/domain_conf.c:5986
 #, c-format
 msgid "unknown node %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:5753
+#: src/conf/domain_conf.c:6003
 msgid "PCI host devices must use 'pci' address type"
 msgstr ""
 
-#: src/conf/domain_conf.c:5789
+#: src/conf/domain_conf.c:6039
 #, c-format
 msgid "unknown redirdev bus '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5800
+#: src/conf/domain_conf.c:6050
 #, c-format
 msgid "unknown redirdev character device type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5805
+#: src/conf/domain_conf.c:6055
 msgid "missing type in redirdev"
 msgstr ""
 
-#: src/conf/domain_conf.c:2511
+#: src/conf/domain_conf.c:6113
 #, c-format
 msgid "unknown lifecycle action %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2535
+#: src/conf/domain_conf.c:6136
 msgid "missing security type"
 msgstr ""
 
-#: src/conf/domain_conf.c:2542
+#: src/conf/domain_conf.c:6143
 msgid "invalid security type"
 msgstr ""
 
-#: src/conf/domain_conf.c:5905
+#: src/conf/domain_conf.c:6155
 #, c-format
 msgid "invalid security relabel value %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:5913
+#: src/conf/domain_conf.c:6163
 msgid "dynamic label type must use resource relabeling"
 msgstr ""
 
-#: src/conf/domain_conf.c:2564
+#: src/conf/domain_conf.c:6182
 msgid "security label is missing"
 msgstr ""
 
-#: src/conf/domain_conf.c:2578
+#: src/conf/domain_conf.c:6196
 msgid "security imagelabel is missing"
 msgstr ""
 
-#: src/conf/domain_conf.c:2555
+#: src/conf/domain_conf.c:6220
 msgid "missing security model"
 msgstr ""
 
-#: src/conf/domain_conf.c:5993
+#: src/conf/domain_conf.c:6243 tools/virsh.c:12067
 msgid "(device_definition)"
 msgstr ""
 
-#: src/conf/domain_conf.c:2656
+#: src/conf/domain_conf.c:6311
 msgid "unknown device type"
 msgstr ""
 
-#: src/conf/domain_conf.c:2737
+#: src/conf/domain_conf.c:6653
 msgid "unknown virt type"
 msgstr ""
 
-#: src/conf/domain_conf.c:2748
+#: src/conf/domain_conf.c:6664
 #, c-format
 msgid "no emulator for domain %s os type %s on architecture %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:6442
+#: src/conf/domain_conf.c:6692
 msgid "cannot count boot devices"
 msgstr ""
 
-#: src/conf/domain_conf.c:6453
+#: src/conf/domain_conf.c:6703
 msgid ""
 "per-device boot elements cannot be used together with os/boot elements"
 msgstr ""
 
-#: src/conf/domain_conf.c:2995
+#: src/conf/domain_conf.c:6713
 msgid "missing boot device"
 msgstr ""
 
-#: src/conf/domain_conf.c:3000
+#: src/conf/domain_conf.c:6718
 #, c-format
 msgid "unknown boot device '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:6496
+#: src/conf/domain_conf.c:6746
 msgid "need at least one serial port for useserial"
 msgstr ""
 
-#: src/conf/domain_conf.c:6537
+#: src/conf/domain_conf.c:6787
 msgid "vcpu id must be an unsigned integer"
 msgstr ""
 
-#: src/conf/domain_conf.c:6541
+#: src/conf/domain_conf.c:6791
 msgid "can't parse vcpupin node"
 msgstr ""
 
-#: src/conf/domain_conf.c:6547
+#: src/conf/domain_conf.c:6797
 msgid "vcpu id must be less than maxvcpus"
 msgstr ""
 
-#: src/conf/domain_conf.c:6570
+#: src/conf/domain_conf.c:6819
 msgid "missing cpuset for vcpupin"
 msgstr ""
 
-#: src/conf/domain_conf.c:2783
+#: src/conf/domain_conf.c:6863
 msgid "missing domain type attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:2789
+#: src/conf/domain_conf.c:6869
 #, c-format
 msgid "invalid domain type %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:6628
+#: src/conf/domain_conf.c:6877
 #, c-format
 msgid "unexpected domain type %s, expecting %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:6653
+#: src/conf/domain_conf.c:6902
 #, c-format
 msgid "unexpected domain type %s, expecting one of these: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2805 src/conf/network_conf.c:415
-#: src/conf/secret_conf.c:165
+#: src/conf/domain_conf.c:6926 src/conf/network_conf.c:848
+#: src/conf/secret_conf.c:180 src/openvz/openvz_conf.c:971
 msgid "Failed to generate UUID"
 msgstr ""
 
-#: src/conf/domain_conf.c:2811 src/conf/network_conf.c:422
-#: src/conf/secret_conf.c:171 src/conf/storage_conf.c:655
+#: src/conf/domain_conf.c:6933 src/conf/domain_conf.c:7882
+#: src/conf/network_conf.c:855 src/conf/nwfilter_conf.c:2448
+#: src/conf/secret_conf.c:186 src/conf/storage_conf.c:670
 msgid "malformed uuid element"
 msgstr "UUID de l'élément non conforme"
 
-#: src/conf/domain_conf.c:2823
+#: src/conf/domain_conf.c:6946
 msgid "missing memory element"
 msgstr ""
 
-#: src/conf/domain_conf.c:6734
+#: src/conf/domain_conf.c:6965
+msgid "cannot extract blkiotune nodes"
+msgstr ""
+
+#: src/conf/domain_conf.c:6981
+#, c-format
+msgid "duplicate device weight path '%s'"
+msgstr ""
+
+#: src/conf/domain_conf.c:7009
 msgid "maximum vcpus must be an integer"
 msgstr ""
 
-#: src/conf/domain_conf.c:6742
+#: src/conf/domain_conf.c:7017
 #, c-format
 msgid "invalid maxvcpus %lu"
 msgstr ""
 
-#: src/conf/domain_conf.c:6750
+#: src/conf/domain_conf.c:7025
 msgid "current vcpus must be an integer"
 msgstr ""
 
-#: src/conf/domain_conf.c:6758
+#: src/conf/domain_conf.c:7033
 #, c-format
 msgid "invalid current vcpus %lu"
 msgstr ""
 
-#: src/conf/domain_conf.c:6764
+#: src/conf/domain_conf.c:7039
 #, c-format
 msgid "maxvcpus must not be less than current vcpus (%d < %lu)"
 msgstr ""
 
-#: src/conf/domain_conf.c:6806
+#: src/conf/domain_conf.c:7080
 msgid "vcpupin nodes must be less than maxvcpus"
 msgstr ""
 
-#: src/conf/domain_conf.c:6821
+#: src/conf/domain_conf.c:7095
 msgid "duplicate vcpupin for same vcpu"
 msgstr ""
 
-#: src/conf/domain_conf.c:6833
+#: src/conf/domain_conf.c:7107
 msgid "cannot extract numatune nodes"
 msgstr ""
 
-#: src/conf/domain_conf.c:6855
+#: src/conf/domain_conf.c:7128
 msgid "nodeset for NUMA memory tuning must be set"
 msgstr ""
 
-#: src/conf/domain_conf.c:6864
+#: src/conf/domain_conf.c:7137
 #, c-format
 msgid "Unsupported NUMA memory tuning mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2860
+#: src/conf/domain_conf.c:7155
 #, c-format
 msgid "unexpected feature %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:6911
+#: src/conf/domain_conf.c:7184
 #, c-format
 msgid "unknown clock offset '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:6929
+#: src/conf/domain_conf.c:7202
 msgid "missing 'timezone' attribute for clock with offset='timezone'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2900
+#: src/conf/domain_conf.c:7235
 msgid "no OS type"
 msgstr ""
 
-#: src/conf/domain_conf.c:2928
+#: src/conf/domain_conf.c:7262
 #, c-format
 msgid "os type '%s' & arch '%s' combination is not supported"
 msgstr ""
 
-#: src/conf/domain_conf.c:2936 src/xen/xm_internal.c:709
+#: src/conf/domain_conf.c:7270 src/xenxs/xen_xm.c:259
 #, c-format
 msgid "no supported architecture for os type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:7038
+#: src/conf/domain_conf.c:7311
 msgid "init binary must be specified"
 msgstr ""
 
-#: src/conf/domain_conf.c:7106
+#: src/conf/domain_conf.c:7380
 msgid "cannot extract device leases"
 msgstr ""
 
-#: src/conf/domain_conf.c:7231
+#: src/conf/domain_conf.c:7505
 msgid "cannot extract console devices"
 msgstr ""
 
-#: src/conf/domain_conf.c:7265
+#: src/conf/domain_conf.c:7542
 msgid "Only the first console can be a serial port"
 msgstr ""
 
-#: src/conf/domain_conf.c:3307
+#: src/conf/domain_conf.c:7735
 msgid "cannot determine default video type"
 msgstr ""
 
-#: src/conf/domain_conf.c:3348
+#: src/conf/domain_conf.c:7772
 msgid "only a single watchdog device is supported"
 msgstr ""
 
-#: src/conf/domain_conf.c:7506
+#: src/conf/domain_conf.c:7792
 msgid "only a single memory balloon device is supported"
 msgstr ""
 
-#: src/conf/domain_conf.c:7596
+#: src/conf/domain_conf.c:7864
+msgid "Number of CPUs in <numa> exceeds the <vcpu> count"
+msgstr ""
+
+#: src/conf/domain_conf.c:7889
 msgid "UUID mismatch between <uuid> and <sysinfo>"
 msgstr ""
 
-#: src/conf/domain_conf.c:7608
+#: src/conf/domain_conf.c:7901
 #, c-format
 msgid "unknown smbios mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3404
+#: src/conf/domain_conf.c:7963
 msgid "no domain config"
 msgstr ""
 
-#: src/conf/domain_conf.c:3418
+#: src/conf/domain_conf.c:7977
 msgid "missing domain state"
 msgstr ""
 
-#: src/conf/domain_conf.c:3423
+#: src/conf/domain_conf.c:7982
 #, c-format
 msgid "invalid domain state '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:7698
+#: src/conf/domain_conf.c:7991
 #, c-format
 msgid "invalid domain state reason '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3431
+#: src/conf/domain_conf.c:8002
 msgid "invalid pid"
 msgstr ""
 
-#: src/conf/domain_conf.c:7723
+#: src/conf/domain_conf.c:8016
 #, c-format
 msgid "Unknown taint flag %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:7757 src/security/virt-aa-helper.c:641
-#: tools/virsh.c:1357 tools/virsh.c:1504 tools/virsh.c:1713
-#: tools/virsh.c:10938 tools/virsh.c:11006 tools/virsh.c:11478
-#: tools/virsh.c:11945
+#: src/conf/domain_conf.c:8050 src/security/virt-aa-helper.c:641
+#: tools/virsh.c:1369 tools/virsh.c:1516 tools/virsh.c:1725
+#: tools/virsh.c:11753 tools/virsh.c:11821 tools/virsh.c:12061
+#: tools/virsh.c:12551 tools/virsh.c:13024
 msgid "(domain_definition)"
 msgstr ""
 
-#: src/conf/domain_conf.c:3563 src/conf/domain_conf.c:3634
-#: src/conf/interface_conf.c:870 src/conf/network_conf.c:622
-#: src/conf/node_device_conf.c:1223 src/conf/secret_conf.c:117
-msgid "incorrect root element"
+#: src/conf/domain_conf.c:8087
+#, c-format
+msgid "unexpected root element <%s>, expecting <domain>"
+msgstr ""
+
+#: src/conf/domain_conf.c:8120
+#, c-format
+msgid "unexpected root element <%s>, expecting <domstatus>"
 msgstr ""
 
-#: src/conf/domain_conf.c:7871
+#: src/conf/domain_conf.c:8168
 #, c-format
 msgid "Target timer %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:7879
+#: src/conf/domain_conf.c:8176
 #, c-format
 msgid "Target timer presence %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:7887
+#: src/conf/domain_conf.c:8184
 #, c-format
 msgid "Target TSC frequency %lu does not match source %lu"
 msgstr ""
 
-#: src/conf/domain_conf.c:7894
+#: src/conf/domain_conf.c:8191
 #, c-format
 msgid "Target TSC mode %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:7915
+#: src/conf/domain_conf.c:8212
 #, c-format
 msgid "Target device address type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:7928
+#: src/conf/domain_conf.c:8225
 #, c-format
 msgid ""
 "Target device PCI address %04x:%02x:%02x.%02x does not match source "
 "%04x:%02x:%02x.%02x"
 msgstr ""
 
-#: src/conf/domain_conf.c:7942
+#: src/conf/domain_conf.c:8239
 #, c-format
 msgid "Target device drive address %d:%d:%d does not match source %d:%d:%d"
 msgstr ""
 
-#: src/conf/domain_conf.c:7956
+#: src/conf/domain_conf.c:8253
 #, c-format
 msgid ""
 "Target device virtio serial address %d:%d:%d does not match source %d:%d:%d"
 msgstr ""
 
-#: src/conf/domain_conf.c:7969
+#: src/conf/domain_conf.c:8266
 #, c-format
 msgid "Target device ccid address %d:%d does not match source %d:%d"
 msgstr ""
 
-#: src/conf/domain_conf.c:7993
+#: src/conf/domain_conf.c:8290
 #, c-format
 msgid "Target disk device %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8001
+#: src/conf/domain_conf.c:8298
 #, c-format
 msgid "Target disk bus %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8009
+#: src/conf/domain_conf.c:8306
 #, c-format
 msgid "Target disk %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8016
+#: src/conf/domain_conf.c:8313
 #, c-format
 msgid "Target disk serial %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8023
+#: src/conf/domain_conf.c:8320
 msgid "Target disk access mode does not match source"
 msgstr ""
 
-#: src/conf/domain_conf.c:8044
+#: src/conf/domain_conf.c:8341
 #, c-format
 msgid "Target controller type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8052
+#: src/conf/domain_conf.c:8349
 #, c-format
 msgid "Target controller index %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8059
+#: src/conf/domain_conf.c:8356
 #, c-format
 msgid "Target controller model %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8067
+#: src/conf/domain_conf.c:8364
 #, c-format
 msgid "Target controller ports %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8074
+#: src/conf/domain_conf.c:8371
 #, c-format
 msgid "Target controller vectors %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8097
+#: src/conf/domain_conf.c:8394
 #, c-format
 msgid "Target filesystem guest target %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8104
+#: src/conf/domain_conf.c:8401
 msgid "Target filesystem access mode does not match source"
 msgstr ""
 
-#: src/conf/domain_conf.c:8125
+#: src/conf/domain_conf.c:8422
 #, c-format
 msgid ""
 "Target network card mac %02x:%02x:%02x:%02x:%02x:%02xdoes not match source "
 "%02x:%02x:%02x:%02x:%02x:%02x"
 msgstr ""
 
-#: src/conf/domain_conf.c:8136
+#: src/conf/domain_conf.c:8433
 #, c-format
 msgid "Target network card model %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8158
+#: src/conf/domain_conf.c:8455
 #, c-format
 msgid "Target input device type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8166
+#: src/conf/domain_conf.c:8463
 #, c-format
 msgid "Target input device bus %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8189
+#: src/conf/domain_conf.c:8486
 #, c-format
 msgid "Target sound card model %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8212
+#: src/conf/domain_conf.c:8509
 #, c-format
 msgid "Target video card model %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8220
+#: src/conf/domain_conf.c:8517
 #, c-format
 msgid "Target video card vram %u does not match source %u"
 msgstr ""
 
-#: src/conf/domain_conf.c:8227
+#: src/conf/domain_conf.c:8524
 #, c-format
 msgid "Target video card heads %u does not match source %u"
 msgstr ""
 
-#: src/conf/domain_conf.c:8235
+#: src/conf/domain_conf.c:8532
 msgid "Target video card acceleration does not match source"
 msgstr ""
 
-#: src/conf/domain_conf.c:8242
+#: src/conf/domain_conf.c:8539
 #, c-format
 msgid "Target video card 2d accel %u does not match source %u"
 msgstr ""
 
-#: src/conf/domain_conf.c:8249
+#: src/conf/domain_conf.c:8546
 #, c-format
 msgid "Target video card 3d accel %u does not match source %u"
 msgstr ""
 
-#: src/conf/domain_conf.c:8272
+#: src/conf/domain_conf.c:8569
 #, c-format
 msgid "Target host device mode %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8281
+#: src/conf/domain_conf.c:8578
 #, c-format
 msgid "Target host device subsystem %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8320 src/conf/domain_conf.c:8342
+#: src/conf/domain_conf.c:8617 src/conf/domain_conf.c:8639
 #, c-format
 msgid "Target serial port %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8364
+#: src/conf/domain_conf.c:8661
 #, c-format
 msgid "Target channel type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8374
+#: src/conf/domain_conf.c:8671
 #, c-format
 msgid "Target channel name %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8385
+#: src/conf/domain_conf.c:8682
 #, c-format
 msgid "Target channel addr %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8411
+#: src/conf/domain_conf.c:8708
 #, c-format
 msgid "Target console type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8434
+#: src/conf/domain_conf.c:8731
 #, c-format
 msgid "Target watchdog model %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8457
+#: src/conf/domain_conf.c:8754
 #, c-format
 msgid "Target balloon model %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8480
+#: src/conf/domain_conf.c:8777
 #, c-format
 msgid "Target hub device type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8508
+#: src/conf/domain_conf.c:8805
 #, c-format
 msgid "Target domain virt type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8520
+#: src/conf/domain_conf.c:8817
 #, c-format
 msgid "Target domain uuid %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8527
+#: src/conf/domain_conf.c:8824
 #, c-format
 msgid "Target domain max memory %ld does not match source %ld"
 msgstr ""
 
-#: src/conf/domain_conf.c:8533
+#: src/conf/domain_conf.c:8830
 #, c-format
 msgid "Target domain current memory %ld does not match source %ld"
 msgstr ""
 
-#: src/conf/domain_conf.c:8539
+#: src/conf/domain_conf.c:8836
 #, c-format
 msgid "Target domain huge page backing %ld does not match source %ld"
 msgstr ""
 
-#: src/conf/domain_conf.c:8547
+#: src/conf/domain_conf.c:8844
 #, c-format
 msgid "Target domain vpu count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8553
+#: src/conf/domain_conf.c:8850
 #, c-format
 msgid "Target domain vpu max %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8560 src/conf/domain_conf.c:8572
+#: src/conf/domain_conf.c:8857 src/conf/domain_conf.c:8869
 #, c-format
 msgid "Target domain OS type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8566
+#: src/conf/domain_conf.c:8863
 #, c-format
 msgid "Target domain architecture %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8579
+#: src/conf/domain_conf.c:8876
 #, c-format
 msgid "Target domain SMBIOS mode %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8587
+#: src/conf/domain_conf.c:8884
 #, c-format
 msgid "Target domain features %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8594
+#: src/conf/domain_conf.c:8891
 msgid "Target domain timers do not match source"
 msgstr ""
 
-#: src/conf/domain_conf.c:8611
+#: src/conf/domain_conf.c:8908
 #, c-format
 msgid "Target domain disk count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8622
+#: src/conf/domain_conf.c:8919
 #, c-format
 msgid "Target domain disk controller count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8633
+#: src/conf/domain_conf.c:8930
 #, c-format
 msgid "Target domain filesystem count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8644
+#: src/conf/domain_conf.c:8941
 #, c-format
 msgid "Target domain net card count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8655
+#: src/conf/domain_conf.c:8952
 #, c-format
 msgid "Target domain input device count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8666
+#: src/conf/domain_conf.c:8963
 #, c-format
 msgid "Target domain sound card count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8677
+#: src/conf/domain_conf.c:8974
 #, c-format
 msgid "Target domain video card count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8688
+#: src/conf/domain_conf.c:8985
 #, c-format
 msgid "Target domain host device count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8699
+#: src/conf/domain_conf.c:8996
 #, c-format
 msgid "Target domain smartcard count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8710
+#: src/conf/domain_conf.c:9007
 #, c-format
 msgid "Target domain serial port count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8721
+#: src/conf/domain_conf.c:9018
 #, c-format
 msgid "Target domain parallel port count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8732
+#: src/conf/domain_conf.c:9029
 #, c-format
 msgid "Target domain channel count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8743
+#: src/conf/domain_conf.c:9040
 #, c-format
 msgid "Target domain console count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8754
+#: src/conf/domain_conf.c:9051
 #, c-format
 msgid "Target domain hub device count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8767
+#: src/conf/domain_conf.c:9064
 #, c-format
 msgid "Target domain watchdog count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8779
+#: src/conf/domain_conf.c:9076
 #, c-format
 msgid "Target domain memory balloon count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:3845
+#: src/conf/domain_conf.c:9466
 msgid "topology cpuset syntax error"
 msgstr "erreur de syntaxe dans la topologie des CPU"
 
-#: src/conf/domain_conf.c:3859
+#: src/conf/domain_conf.c:9639
 #, c-format
 msgid "unexpected lifecycle type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:3882
+#: src/conf/domain_conf.c:9685
 #, c-format
 msgid "unexpected disk type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:3887
+#: src/conf/domain_conf.c:9690
 #, c-format
 msgid "unexpected disk device %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:3892
+#: src/conf/domain_conf.c:9695
 #, c-format
 msgid "unexpected disk bus %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:3897
+#: src/conf/domain_conf.c:9700
 #, c-format
 msgid "unexpected disk cache mode %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:9410
+#: src/conf/domain_conf.c:9705
 #, c-format
 msgid "unexpected disk io mode %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:9560
+#: src/conf/domain_conf.c:9897
 #, c-format
 msgid "unexpected controller type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:9569
+#: src/conf/domain_conf.c:9906
 #, c-format
 msgid "unexpected model type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:3974
+#: src/conf/domain_conf.c:9958
 #, c-format
 msgid "unexpected filesystem type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:9627
+#: src/conf/domain_conf.c:9964
 #, c-format
 msgid "unexpected accessmode %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4026 src/conf/domain_conf.c:4392
+#: src/conf/domain_conf.c:10028 src/conf/domain_conf.c:10091
+#: src/conf/domain_conf.c:10822
 #, c-format
 msgid "unexpected net type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:9699
+#: src/conf/domain_conf.c:10036
 #, c-format
 msgid "unexpected net type %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:9719
+#: src/conf/domain_conf.c:10056
 #, c-format
 msgid "unexpected source mode %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4138
+#: src/conf/domain_conf.c:10251
 #, c-format
 msgid "unexpected char type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10012
+#: src/conf/domain_conf.c:10352
 #, c-format
 msgid "unexpected char device type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10031
+#: src/conf/domain_conf.c:10371
 msgid "Could not format channel target type"
 msgstr ""
 
-#: src/conf/domain_conf.c:4233
+#: src/conf/domain_conf.c:10381
 msgid "Unable to format guestfwd port"
 msgstr ""
 
-#: src/conf/domain_conf.c:10101 src/conf/domain_conf.c:10132
-#: src/qemu/qemu_command.c:4369
+#: src/conf/domain_conf.c:10441 src/conf/domain_conf.c:10472
+#: src/qemu/qemu_command.c:4553
 #, c-format
 msgid "unexpected smartcard type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4273 src/xen/xend_internal.c:5672
+#: src/conf/domain_conf.c:10490 src/xenxs/xen_sxpr.c:1978
 #, c-format
 msgid "unexpected sound model %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10178
+#: src/conf/domain_conf.c:10518
 #, c-format
 msgid "unexpected memballoon model %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4294
+#: src/conf/domain_conf.c:10558
 #, c-format
 msgid "unexpected watchdog model %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4300
+#: src/conf/domain_conf.c:10564
 #, c-format
 msgid "unexpected watchdog action %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4332
+#: src/conf/domain_conf.c:10605
 #, c-format
 msgid "unexpected video model %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4366 src/xen/xend_internal.c:5699
+#: src/conf/domain_conf.c:10642 src/xenxs/xen_sxpr.c:2006
 #, c-format
 msgid "unexpected input type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4371
+#: src/conf/domain_conf.c:10647
 #, c-format
 msgid "unexpected input bus type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10335
+#: src/conf/domain_conf.c:10675
 #, c-format
 msgid "unexpected timer name %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10351
+#: src/conf/domain_conf.c:10691
 #, c-format
 msgid "unexpected timer tickpolicy %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10365
+#: src/conf/domain_conf.c:10705
 #, c-format
 msgid "unexpected timer track %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10383
+#: src/conf/domain_conf.c:10723
 #, c-format
 msgid "unexpected timer mode %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4488
+#: src/conf/domain_conf.c:11007
 #, c-format
 msgid "unexpected hostdev mode %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4495
+#: src/conf/domain_conf.c:11016
 #, c-format
 msgid "unexpected hostdev type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10733
+#: src/conf/domain_conf.c:11073
 #, c-format
 msgid "unexpected rom bar value %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10773
+#: src/conf/domain_conf.c:11113
 #, c-format
 msgid "unexpected hub type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4552
+#: src/conf/domain_conf.c:11165
 #, c-format
 msgid "unexpected domain type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10932
+#: src/conf/domain_conf.c:11298
 msgid "failed to format cpuset for vcpupin"
 msgstr ""
 
-#: src/conf/domain_conf.c:10954
+#: src/conf/domain_conf.c:11320
 msgid "failed to format nodeset for NUMA memory tuning"
 msgstr ""
 
-#: src/conf/domain_conf.c:4648
+#: src/conf/domain_conf.c:11378
 #, c-format
 msgid "unexpected boot device type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:11040
+#: src/conf/domain_conf.c:11406
 #, c-format
 msgid "unexpected smbios mode %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4666
+#: src/conf/domain_conf.c:11422
 #, c-format
 msgid "unexpected feature %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4864 src/conf/network_conf.c:752
+#: src/conf/domain_conf.c:11705 src/conf/network_conf.c:1408
+#: src/conf/nwfilter_conf.c:2601 src/util/dnsmasq.c:529
 #, c-format
 msgid "cannot create config directory '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5018
+#: src/conf/domain_conf.c:11850
 #, c-format
 msgid "unexpected domain %s already exists"
 msgstr ""
 
-#: src/conf/domain_conf.c:5059 src/conf/network_conf.c:878
-#: src/conf/storage_conf.c:1537
+#: src/conf/domain_conf.c:11890 src/conf/network_conf.c:1508
+#: src/conf/nwfilter_conf.c:2915 src/conf/storage_conf.c:1486
 #, c-format
 msgid "Failed to open dir '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5124
+#: src/conf/domain_conf.c:11954
 #, c-format
 msgid "cannot remove config %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:5231 src/xen/xm_internal.c:2671
+#: src/conf/domain_conf.c:12060 src/xen/xm_internal.c:1116
 #, c-format
 msgid "domain '%s' is already defined with uuid %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:5240
+#: src/conf/domain_conf.c:12069
 #, c-format
 msgid "domain is already active as '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5254
+#: src/conf/domain_conf.c:12083
 #, c-format
 msgid "domain '%s' already exists with uuid %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:11880
+#: src/conf/domain_conf.c:12246
 msgid "missing name from disk snapshot element"
 msgstr ""
 
-#: src/conf/domain_conf.c:11941 tools/virsh.c:13246 tools/virsh.c:13573
+#: src/conf/domain_conf.c:12307 tools/virsh.c:14325 tools/virsh.c:14652
 msgid "(domain_snapshot)"
 msgstr ""
 
-#: src/conf/domain_conf.c:11952
+#: src/conf/domain_conf.c:12318
 msgid "domainsnapshot"
 msgstr ""
 
-#: src/conf/domain_conf.c:11962
+#: src/conf/domain_conf.c:12328
 msgid "a redefined snapshot must have a name"
 msgstr ""
 
-#: src/conf/domain_conf.c:11981
+#: src/conf/domain_conf.c:12347
 msgid "missing creationTime from existing snapshot"
 msgstr ""
 
-#: src/conf/domain_conf.c:11993
+#: src/conf/domain_conf.c:12359
 msgid "missing state from existing snapshot"
 msgstr ""
 
-#: src/conf/domain_conf.c:11999
+#: src/conf/domain_conf.c:12365
 #, c-format
 msgid "Invalid state '%s' in domain snapshot XML"
 msgstr ""
 
-#: src/conf/domain_conf.c:12014 src/conf/domain_conf.c:12105
+#: src/conf/domain_conf.c:12380 src/conf/domain_conf.c:12471
 msgid "missing domain in snapshot"
 msgstr ""
 
-#: src/conf/domain_conf.c:12047
+#: src/conf/domain_conf.c:12413
 msgid "unable to handle disk requests in snapshot"
 msgstr ""
 
-#: src/conf/domain_conf.c:12054
+#: src/conf/domain_conf.c:12420
 msgid "Could not find 'active' element"
 msgstr ""
 
-#: src/conf/domain_conf.c:12111
+#: src/conf/domain_conf.c:12477
 msgid "too many disk snapshot requests for domain"
 msgstr ""
 
-#: src/conf/domain_conf.c:12134
+#: src/conf/domain_conf.c:12500
 #, c-format
 msgid "no disk named '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:12141
+#: src/conf/domain_conf.c:12507
 #, c-format
 msgid "disk '%s' specified twice"
 msgstr ""
 
-#: src/conf/domain_conf.c:12155
+#: src/conf/domain_conf.c:12521
 #, c-format
 msgid "disk '%s' must use snapshot mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:12162
+#: src/conf/domain_conf.c:12528
 #, c-format
 msgid "file '%s' for disk '%s' requires use of external snapshot mode"
 msgstr ""
 
-#: src/conf/domain_conf.c:12214
+#: src/conf/domain_conf.c:12582
+#, c-format
+msgid "cannot generate external snapshot name for disk '%s' without source"
+msgstr ""
+
+#: src/conf/domain_conf.c:12589
 #, c-format
-msgid "cannot generate external backup name for disk '%s' without source"
+msgid ""
+"source for disk '%s' is not a regular file; refusing to generate external "
+"snapshot name"
 msgstr ""
 
-#: src/conf/domain_conf.c:12226
+#: src/conf/domain_conf.c:12603
 msgid "integer overflow"
 msgstr ""
 
-#: src/conf/domain_conf.c:12359
+#: src/conf/domain_conf.c:12736
 #, c-format
 msgid "unexpected domain snapshot %s already exists"
 msgstr ""
 
-#: src/conf/domain_conf.c:12832
+#: src/conf/domain_conf.c:13209
 #, c-format
 msgid "unknown disk format '%s' for %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:12841 src/qemu/qemu_driver.c:7695
+#: src/conf/domain_conf.c:13218 src/qemu/qemu_driver.c:8042
 #, c-format
 msgid "no disk format for %s and probing is disabled"
 msgstr ""
 
-#: src/conf/domain_conf.c:12858
+#: src/conf/domain_conf.c:13235
 #, c-format
 msgid "backing store for %s is self-referential"
 msgstr ""
 
-#: src/conf/domain_conf.c:12871
+#: src/conf/domain_conf.c:13248
 #, c-format
 msgid "unable to open disk path %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:12884
+#: src/conf/domain_conf.c:13261
 #, c-format
 msgid "could not close file %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:12970
+#: src/conf/domain_conf.c:13347
 #, c-format
 msgid "invalid domain state: %d"
 msgstr ""
@@ -2505,728 +2688,875 @@
 msgid "event queue is empty, nothing to pop"
 msgstr ""
 
-#: src/conf/interface_conf.c:133 src/conf/interface_conf.c:515
+#: src/conf/interface_conf.c:126
 msgid "interface has no name"
 msgstr ""
 
-#: src/conf/interface_conf.c:141
+#: src/conf/interface_conf.c:142
 msgid "interface mtu value is improper"
 msgstr ""
 
-#: src/conf/interface_conf.c:165
+#: src/conf/interface_conf.c:166
 #, c-format
 msgid "unknown interface startmode %s"
 msgstr ""
 
-#: src/conf/interface_conf.c:197
+#: src/conf/interface_conf.c:198
 #, c-format
 msgid "unknown bonding mode %s"
 msgstr ""
 
-#: src/conf/interface_conf.c:218
+#: src/conf/interface_conf.c:219
 #, c-format
 msgid "unknown mii bonding carrier %s"
 msgstr ""
 
-#: src/conf/interface_conf.c:241
+#: src/conf/interface_conf.c:242
 #, c-format
 msgid "unknown arp bonding validate %s"
 msgstr ""
 
-#: src/conf/interface_conf.c:267
+#: src/conf/interface_conf.c:268
 #, c-format
 msgid "unknown dhcp peerdns value %s"
 msgstr ""
 
-#: src/conf/interface_conf.c:293
+#: src/conf/interface_conf.c:294
 msgid "Invalid ip address prefix value"
 msgstr ""
 
-#: src/conf/interface_conf.c:446
+#: src/conf/interface_conf.c:454
 msgid "protocol misses the family attribute"
 msgstr ""
 
-#: src/conf/interface_conf.c:465
+#: src/conf/interface_conf.c:473
 #, c-format
 msgid "unsupported protocol family '%s'"
 msgstr ""
 
-#: src/conf/interface_conf.c:602
+#: src/conf/interface_conf.c:547
 msgid "bond has no interfaces"
 msgstr ""
 
-#: src/conf/interface_conf.c:652
+#: src/conf/interface_conf.c:596
 msgid "bond interface miimon freq missing or invalid"
 msgstr ""
 
-#: src/conf/interface_conf.c:660
+#: src/conf/interface_conf.c:604
 msgid "bond interface miimon downdelay invalid"
 msgstr ""
 
-#: src/conf/interface_conf.c:669
+#: src/conf/interface_conf.c:613
 msgid "bond interface miimon updelay invalid"
 msgstr ""
 
-#: src/conf/interface_conf.c:688
+#: src/conf/interface_conf.c:632
 msgid "bond interface arpmon interval missing or invalid"
 msgstr ""
 
-#: src/conf/interface_conf.c:697
+#: src/conf/interface_conf.c:641
 msgid "bond interface arpmon target missing"
 msgstr ""
 
-#: src/conf/interface_conf.c:718
+#: src/conf/interface_conf.c:662
 msgid "vlan interface misses the tag attribute"
 msgstr ""
 
-#: src/conf/interface_conf.c:726
+#: src/conf/interface_conf.c:670
 msgid "vlan interface misses name attribute"
 msgstr ""
 
-#: src/conf/interface_conf.c:743
+#: src/conf/interface_conf.c:687
 msgid "interface misses the type attribute"
 msgstr ""
 
-#: src/conf/interface_conf.c:749
+#: src/conf/interface_conf.c:693
 #, c-format
 msgid "unknown interface type %s"
 msgstr ""
 
-#: src/conf/interface_conf.c:508
+#: src/conf/interface_conf.c:714
 #, c-format
 msgid "interface has unsupported type '%s'"
 msgstr ""
 
-#: src/conf/interface_conf.c:785
+#: src/conf/interface_conf.c:751
 msgid "bridge interface misses the bridge element"
 msgstr ""
 
-#: src/conf/interface_conf.c:797
+#: src/conf/interface_conf.c:763
 #, c-format
 msgid "bridge interface stp should be on or off got %s"
 msgstr ""
 
-#: src/conf/interface_conf.c:820
+#: src/conf/interface_conf.c:793
 msgid "bond interface misses the bond element"
 msgstr ""
 
-#: src/conf/interface_conf.c:841
+#: src/conf/interface_conf.c:814
 msgid "vlan interface misses the vlan element"
 msgstr ""
 
-#: src/conf/interface_conf.c:867
+#: src/conf/interface_conf.c:842
+#, c-format
+msgid "unexpected root element <%s>, expecting <interface>"
+msgstr ""
+
+#: src/conf/interface_conf.c:869
 msgid "(interface_definition)"
 msgstr ""
 
-#: src/conf/interface_conf.c:1096
+#: src/conf/interface_conf.c:950
 msgid "bond arp monitoring has no target"
 msgstr ""
 
-#: src/conf/interface_conf.c:1123
+#: src/conf/interface_conf.c:978
 msgid "vlan misses the tag name"
 msgstr ""
 
-#: src/conf/interface_conf.c:1200
+#: src/conf/interface_conf.c:1060
 msgid "virInterfaceDefFormat unknown startmode"
 msgstr ""
 
-#: src/conf/interface_conf.c:1072
+#: src/conf/interface_conf.c:1074
 msgid "virInterfaceDefFormat NULL def"
 msgstr ""
 
-#: src/conf/interface_conf.c:1078
+#: src/conf/interface_conf.c:1080
 msgid "virInterfaceDefFormat missing interface name"
 msgstr ""
 
-#: src/conf/interface_conf.c:1222
+#: src/conf/interface_conf.c:1086
 #, c-format
 msgid "unexpected interface type %d"
 msgstr ""
 
-#: src/conf/network_conf.c:389
+#: src/conf/netdev_bandwidth_conf.c:46 src/conf/netdev_bandwidth_conf.c:113
+msgid "invalid argument supplied"
+msgstr ""
+
+#: src/conf/netdev_bandwidth_conf.c:57 src/conf/netdev_bandwidth_conf.c:69
+#: src/conf/netdev_bandwidth_conf.c:76
+#, c-format
+msgid "could not convert %s"
+msgstr ""
+
+#: src/conf/netdev_bandwidth_conf.c:63
+msgid "Missing mandatory average attribute"
+msgstr ""
+
+#: src/conf/netdev_bandwidth_conf.c:122
+msgid "Only one child <inbound> element allowed"
+msgstr ""
+
+#: src/conf/netdev_bandwidth_conf.c:130
+msgid "Only one child <outbound> element allowed"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:61
+msgid "missing virtualportprofile type"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:67
+#, c-format
+msgid "unknown virtualportprofile type %s"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:94
+msgid "cannot parse value of managerid parameter"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:100
+msgid "value of managerid out of range"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:108
+msgid "cannot parse value of typeid parameter"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:114
+msgid "value for typeid out of range"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:122
+msgid "cannot parse value of typeidversion parameter"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:128
+msgid "value of typeidversion out of range"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:138
+msgid "cannot parse instanceid parameter as a uuid"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:144
+msgid "cannot generate a random uuid for instanceid"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:153
+msgid "a parameter is missing for 802.1Qbg description"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:165
+msgid "profileid parameter too long"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:170
+msgid "profileid parameter is missing for 802.1Qbh description"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:177
+#: src/conf/netdev_vport_profile_conf.c:230
+#, c-format
+msgid "unexpected virtualport type %d"
+msgstr ""
+
+#: src/conf/network_conf.c:390
 #, c-format
 msgid "Invalid dhcp range '%s' to '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:415
+#: src/conf/network_conf.c:416
 #, c-format
 msgid "Cannot parse MAC address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:422
+#: src/conf/network_conf.c:423
 #, c-format
 msgid "Cannot use name address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:431
+#: src/conf/network_conf.c:432
 #, c-format
 msgid ""
 "Static host definition in network '%s' must have mac or name attribute"
 msgstr ""
 
-#: src/conf/network_conf.c:439
+#: src/conf/network_conf.c:440
 #, c-format
 msgid "Missing IP address in static host definition for network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:509
+#: src/conf/network_conf.c:510
 msgid "Missing IP address in DNS host definition"
 msgstr ""
 
-#: src/conf/network_conf.c:575
+#: src/conf/network_conf.c:576
 msgid "Missing required name attribute in dns txt record"
 msgstr ""
 
-#: src/conf/network_conf.c:580
+#: src/conf/network_conf.c:581
 #, c-format
 msgid "Missing required value attribute in dns txt record '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:586
+#: src/conf/network_conf.c:587
 #, c-format
 msgid "spaces are not allowed in DNS TXT record names (name is '%s')"
 msgstr ""
 
-#: src/conf/network_conf.c:654
+#: src/conf/network_conf.c:655
 #, c-format
 msgid "Bad address '%s' in definition of network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:666
+#: src/conf/network_conf.c:667
 #, c-format
 msgid "no family specified for non-IPv4 address address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:673
+#: src/conf/network_conf.c:674
 #, c-format
 msgid "family 'ipv4' specified for non-IPv4 address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:680
+#: src/conf/network_conf.c:681
 #, c-format
 msgid "family 'ipv6' specified for non-IPv6 address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:686
+#: src/conf/network_conf.c:687
 #, c-format
 msgid "Unrecognized family '%s' in definition of network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:696
+#: src/conf/network_conf.c:697
 #, c-format
 msgid "netmask specified without address in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:703
+#: src/conf/network_conf.c:704
 #, c-format
 msgid "netmask not supported for address '%s' in network '%s' (IPv4 only)"
 msgstr ""
 
-#: src/conf/network_conf.c:711
+#: src/conf/network_conf.c:712
 #, c-format
 msgid "network '%s' cannot have both prefix='%u' and a netmask"
 msgstr ""
 
-#: src/conf/network_conf.c:721
+#: src/conf/network_conf.c:722
 #, c-format
 msgid ""
 "network '%s' has invalid netmask '%s' for address '%s' (both must be IPv4)"
 msgstr ""
 
-#: src/conf/network_conf.c:880
+#: src/conf/network_conf.c:879
 #, c-format
 msgid "Invalid bridge mac address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:489
+#: src/conf/network_conf.c:955
 #, c-format
 msgid "unknown forwarding type '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:995
+#: src/conf/network_conf.c:992
 #, c-format
 msgid ""
 "Missing required dev attribute in network '%s' forward interface element"
 msgstr ""
 
-#: src/conf/network_conf.c:1005
+#: src/conf/network_conf.c:1002
 #, c-format
 msgid ""
 "forward dev '%s' must match first interface element dev '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1030
+#: src/conf/network_conf.c:1027
 #, c-format
 msgid "%s forwarding requested, but no IP address provided for network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1037
+#: src/conf/network_conf.c:1034
 #, c-format
 msgid ""
 "multiple forwarding interfaces specified for network '%s', only one is "
 "supported"
 msgstr ""
 
-#: src/conf/network_conf.c:1048
+#: src/conf/network_conf.c:1045
 #, c-format
 msgid "bridge name not allowed in %s mode (network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1057
+#: src/conf/network_conf.c:1054
 #, c-format
 msgid ""
 "bridge delay/stp options only allowed in route, nat, and isolated mode, not "
 "in %s (network '%s')"
 msgstr ""
 
-#: src/conf/network_conf.c:1087
+#: src/conf/network_conf.c:1084
 msgid "(network_definition)"
 msgstr ""
 
-#: src/conf/network_conf.c:1297
+#: src/conf/network_conf.c:1111
+#, c-format
+msgid "unexpected root element <%s>, expecting <network>"
+msgstr ""
+
+#: src/conf/network_conf.c:1298
 #, c-format
 msgid "Unknown forward type %d in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:836
+#: src/conf/network_conf.c:1462
 #, c-format
 msgid "Network config filename '%s' does not match network name '%s'"
 msgstr ""
-"Le nom du fichier de configuration '%s' ne correspond pas au nom du réseau "
-"'%s'"
+"Le nom du fichier de configuration « %s » ne correspond pas au nom du réseau "
+"« %s »"
 
-#: src/conf/network_conf.c:927
+#: src/conf/network_conf.c:1555 src/util/dnsmasq.c:266
 #, c-format
 msgid "cannot remove config file '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1001
+#: src/conf/network_conf.c:1624
 #, c-format
 msgid "Bridge generation exceeded max id %d"
 msgstr ""
 
-#: src/conf/network_conf.c:1020
+#: src/conf/network_conf.c:1642
 #, c-format
 msgid "bridge name '%s' already in use."
 msgstr ""
 
-#: src/conf/network_conf.c:1694
+#: src/conf/network_conf.c:1697
 #, c-format
 msgid "network '%s' is already defined with uuid %s"
 msgstr ""
 
-#: src/conf/network_conf.c:1703
+#: src/conf/network_conf.c:1706
 #, c-format
 msgid "network is already active as '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1717
+#: src/conf/network_conf.c:1720
 #, c-format
 msgid "network '%s' already exists with uuid %s"
 msgstr ""
 
-#: src/conf/node_device_conf.c:565
+#: src/conf/node_device_conf.c:564
 #, c-format
 msgid "no block device path supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:588
+#: src/conf/node_device_conf.c:584
 #, c-format
 msgid "missing storage capability type for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:610
+#: src/conf/node_device_conf.c:606
 #, c-format
 msgid "no removable media size supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:611
+#: src/conf/node_device_conf.c:607
 #, c-format
 msgid "invalid removable media size supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:621
+#: src/conf/node_device_conf.c:617
 #, c-format
 msgid "unknown storage capability type '%s' for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:633
+#: src/conf/node_device_conf.c:629
 #, c-format
 msgid "no size supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:634
+#: src/conf/node_device_conf.c:630
 #, c-format
 msgid "invalid size supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:661 src/conf/node_device_conf.c:739
+#: src/conf/node_device_conf.c:656 src/conf/node_device_conf.c:732
 #, c-format
 msgid "no SCSI host ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:662 src/conf/node_device_conf.c:740
+#: src/conf/node_device_conf.c:657 src/conf/node_device_conf.c:733
 #, c-format
 msgid "invalid SCSI host ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:667
+#: src/conf/node_device_conf.c:662
 #, c-format
 msgid "no SCSI bus ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:668
+#: src/conf/node_device_conf.c:663
 #, c-format
 msgid "invalid SCSI bus ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:673
+#: src/conf/node_device_conf.c:668
 #, c-format
 msgid "no SCSI target ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:674
+#: src/conf/node_device_conf.c:669
 #, c-format
 msgid "invalid SCSI target ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:679
+#: src/conf/node_device_conf.c:674
 #, c-format
 msgid "no SCSI LUN ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:680
+#: src/conf/node_device_conf.c:675
 #, c-format
 msgid "invalid SCSI LUN ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:708
+#: src/conf/node_device_conf.c:702
 #, c-format
 msgid "no target name supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:756
+#: src/conf/node_device_conf.c:746
 #, c-format
 msgid "missing SCSI host capability type for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:778
+#: src/conf/node_device_conf.c:768
 #, c-format
 msgid "no WWNN supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:786
+#: src/conf/node_device_conf.c:776
 #, c-format
 msgid "no WWPN supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:794
+#: src/conf/node_device_conf.c:784
 #, c-format
 msgid "unknown SCSI host capability type '%s' for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:828
+#: src/conf/node_device_conf.c:818
 #, c-format
 msgid "no network interface supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:843
+#: src/conf/node_device_conf.c:833
 #, c-format
 msgid "invalid network type supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:871
+#: src/conf/node_device_conf.c:860
 #, c-format
 msgid "no USB interface number supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:872
+#: src/conf/node_device_conf.c:861
 #, c-format
 msgid "invalid USB interface number supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:877
+#: src/conf/node_device_conf.c:866
 #, c-format
 msgid "no USB interface class supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:878
+#: src/conf/node_device_conf.c:867
 #, c-format
 msgid "invalid USB interface class supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:883
+#: src/conf/node_device_conf.c:872
 #, c-format
 msgid "no USB interface subclass supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:884
+#: src/conf/node_device_conf.c:873
 #, c-format
 msgid "invalid USB interface subclass supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:889
+#: src/conf/node_device_conf.c:878
 #, c-format
 msgid "no USB interface protocol supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:890
+#: src/conf/node_device_conf.c:879
 #, c-format
 msgid "invalid USB interface protocol supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:940
+#: src/conf/node_device_conf.c:927
 #, c-format
 msgid "no USB bus number supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:941
+#: src/conf/node_device_conf.c:928
 #, c-format
 msgid "invalid USB bus number supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:946
+#: src/conf/node_device_conf.c:933
 #, c-format
 msgid "no USB device number supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:947
+#: src/conf/node_device_conf.c:934
 #, c-format
 msgid "invalid USB device number supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:952
+#: src/conf/node_device_conf.c:939
 #, c-format
 msgid "no USB vendor ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:953
+#: src/conf/node_device_conf.c:940
 #, c-format
 msgid "invalid USB vendor ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:958
+#: src/conf/node_device_conf.c:945
 #, c-format
 msgid "no USB product ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:959
+#: src/conf/node_device_conf.c:946
 #, c-format
 msgid "invalid USB product ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:986
+#: src/conf/node_device_conf.c:972
 #, c-format
 msgid "no PCI domain ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:987
+#: src/conf/node_device_conf.c:973
 #, c-format
 msgid "invalid PCI domain ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:992
+#: src/conf/node_device_conf.c:978
 #, c-format
 msgid "no PCI bus ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:993
+#: src/conf/node_device_conf.c:979
 #, c-format
 msgid "invalid PCI bus ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:998
+#: src/conf/node_device_conf.c:984
 #, c-format
 msgid "no PCI slot ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:999
+#: src/conf/node_device_conf.c:985
 #, c-format
 msgid "invalid PCI slot ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1004
+#: src/conf/node_device_conf.c:990
 #, c-format
 msgid "no PCI function ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1005
+#: src/conf/node_device_conf.c:991
 #, c-format
 msgid "invalid PCI function ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1010
+#: src/conf/node_device_conf.c:996
 #, c-format
 msgid "no PCI vendor ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1011
+#: src/conf/node_device_conf.c:997
 #, c-format
 msgid "invalid PCI vendor ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1016
+#: src/conf/node_device_conf.c:1002
 #, c-format
 msgid "no PCI product ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1017
+#: src/conf/node_device_conf.c:1003
 #, c-format
 msgid "invalid PCI product ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1052
+#: src/conf/node_device_conf.c:1037
 #, c-format
 msgid "no system UUID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1058
+#: src/conf/node_device_conf.c:1043
 #, c-format
 msgid "malformed uuid element for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1093
+#: src/conf/node_device_conf.c:1077
 msgid "missing capability type"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1099
+#: src/conf/node_device_conf.c:1083
 #, c-format
 msgid "unknown capability type '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1136
+#: src/conf/node_device_conf.c:1120
 #, c-format
 msgid "unknown capability type '%d' for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1188
+#: src/conf/node_device_conf.c:1176
 #, c-format
 msgid "no device capabilities for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1234
+#: src/conf/node_device_conf.c:1210
+#, c-format
+msgid "unexpected root element <%s> expecting <device>"
+msgstr ""
+
+#: src/conf/node_device_conf.c:1238
 msgid "(node_device_definition)"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1356
+#: src/conf/node_device_conf.c:1285
 msgid "Device is not a fibre channel HBA"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1310
+#: src/conf/node_device_conf.c:1314
 #, c-format
 msgid "Could not find parent device for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1330
+#: src/conf/node_device_conf.c:1334
 #, c-format
 msgid "Parent device %s is not capable of vport operations"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:1663
+#: src/conf/nwfilter_conf.c:1914
 #, c-format
 msgid "%s has illegal value %s"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:1698 src/conf/nwfilter_conf.c:1911
+#: src/conf/nwfilter_conf.c:1949 src/conf/nwfilter_conf.c:2194
 msgid "rule node requires action attribute"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:1918
+#: src/conf/nwfilter_conf.c:2201
 msgid "unknown rule action attribute value"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:1925
+#: src/conf/nwfilter_conf.c:2208
 msgid "rule node requires direction attribute"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:1932
+#: src/conf/nwfilter_conf.c:2215
 msgid "unknown rule direction attribute value"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:2020
+#: src/conf/nwfilter_conf.c:2292
+#, c-format
+msgid "Name of chain is longer than %u characters"
+msgstr ""
+
+#: src/conf/nwfilter_conf.c:2300
+msgid "Chain name contains invalid characters"
+msgstr ""
+
+#: src/conf/nwfilter_conf.c:2337
+#, c-format
+msgid ""
+"Invalid chain name '%s'. Please use a chain name called '%s' or any of the "
+"following prefixes: "
+msgstr ""
+
+#: src/conf/nwfilter_conf.c:2385
 msgid "filter has no name"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:2030
+#: src/conf/nwfilter_conf.c:2393
+#, c-format
+msgid "Could not parse chain priority '%s'"
+msgstr ""
+
+#: src/conf/nwfilter_conf.c:2400
 #, c-format
-msgid "unknown chain suffix '%s'"
+msgid "Priority '%d' is outside valid range of [%d,%d]"
 msgstr ""
 
-#: src/conf/storage_conf.c:649 src/storage/storage_backend.c:353
+#: src/conf/nwfilter_conf.c:2442 src/conf/storage_conf.c:664
+#: src/storage/storage_backend.c:431
 msgid "unable to generate uuid"
 msgstr "impossible de générer l'UUID"
 
-#: src/conf/nwfilter_conf.c:2100
+#: src/conf/nwfilter_conf.c:2505
 msgid "unknown root element for nw filter"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:2126
+#: src/conf/nwfilter_conf.c:2531
 msgid "(nwfilter_definition"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:2396
+#: src/conf/nwfilter_conf.c:2801
 #, c-format
 msgid "filter with same UUID but different name ('%s') already exists"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:2407
+#: src/conf/nwfilter_conf.c:2812
 msgid "filter would introduce a loop"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:2475
+#: src/conf/nwfilter_conf.c:2880
 #, c-format
 msgid "network filter config filename '%s' does not match name '%s'"
 msgstr ""
 
-#: src/conf/storage_conf.c:1595
+#: src/conf/nwfilter_conf.c:2957 src/conf/storage_conf.c:1536
 #, c-format
 msgid "cannot create config directory %s"
 msgstr ""
 
-#: src/conf/storage_conf.c:1628
+#: src/conf/nwfilter_conf.c:2970 src/conf/storage_conf.c:1555
 msgid "failed to generate XML"
 msgstr "impossible de créer XML"
 
-#: src/conf/storage_conf.c:1672
+#: src/conf/nwfilter_conf.c:2986 src/conf/storage_conf.c:1569
 #, c-format
 msgid "no config file for %s"
 msgstr "aucun fichier de configuration pour %s"
 
-#: src/conf/storage_conf.c:1678
+#: src/conf/nwfilter_conf.c:2992 src/conf/storage_conf.c:1575
 #, c-format
 msgid "cannot remove config for %s"
 msgstr "impossible de retirer la configuration pour %s"
 
-#: src/conf/nwfilter_conf.c:2660
+#: src/conf/nwfilter_conf.c:3065
 #, c-format
 msgid "formatter for %s %s reported error"
 msgstr ""
 
-#: src/conf/nwfilter_params.c:177
+#: src/conf/nwfilter_params.c:114
+msgid "Variable value contains invalid character"
+msgstr ""
+
+#: src/conf/nwfilter_params.c:321 src/conf/nwfilter_params.c:462
+#, c-format
+msgid "Could not find value for variable '%s'"
+msgstr ""
+
+#: src/conf/nwfilter_params.c:333
+msgid ""
+"Cardinality of list items must be the same for processing them in parallel"
+msgstr ""
+
+#: src/conf/nwfilter_params.c:394
+#, c-format
+msgid "Could not find iterator with id %u"
+msgstr ""
+
+#: src/conf/nwfilter_params.c:454
+#, c-format
+msgid "Could not find variable '%s' in iterator"
+msgstr ""
+
+#: src/conf/nwfilter_params.c:470
+#, c-format
+msgid "Could not get nth (%u) value of variable '%s'"
+msgstr ""
+
+#: src/conf/nwfilter_params.c:619
 #, c-format
 msgid "Could not put variable '%s' into hashmap"
 msgstr ""
 
-#: src/conf/nwfilter_params.c:281
+#: src/conf/nwfilter_params.c:746
 msgid "missing filter parameter table"
 msgstr ""
 
-#: src/conf/secret_conf.c:56 src/conf/secret_conf.c:100
-#: src/conf/secret_conf.c:274 src/conf/secret_conf.c:291
+#: src/conf/secret_conf.c:61 src/conf/secret_conf.c:113
+#: src/conf/secret_conf.c:243 src/conf/secret_conf.c:267
 #, c-format
 msgid "unexpected secret usage type %d"
 msgstr ""
 
-#: src/conf/secret_conf.c:72
+#: src/conf/secret_conf.c:77
 msgid "unknown secret usage type"
 msgstr ""
 
-#: src/conf/secret_conf.c:78
+#: src/conf/secret_conf.c:83
 #, c-format
 msgid "unknown secret usage type %s"
 msgstr ""
 
-#: src/conf/secret_conf.c:93
+#: src/conf/secret_conf.c:97
 msgid "volume usage specified, but volume path is missing"
 msgstr ""
 
@@ -3234,84 +3564,89 @@
 msgid "Ceph usage specified, but name is missing"
 msgstr ""
 
-#: src/conf/secret_conf.c:141
+#: src/conf/secret_conf.c:130
+#, c-format
+msgid "unexpected root element <%s>, expecting <secret>"
+msgstr ""
+
+#: src/conf/secret_conf.c:156
 msgid "invalid value of 'ephemeral'"
 msgstr ""
 
-#: src/conf/secret_conf.c:155
+#: src/conf/secret_conf.c:170
 msgid "invalid value of 'private'"
 msgstr ""
 
-#: src/conf/secret_conf.c:212
+#: src/conf/secret_conf.c:214
 msgid "(definition_of_secret)"
 msgstr ""
 
-#: src/conf/storage_conf.c:225 src/storage/storage_backend.c:768
+#: src/conf/storage_conf.c:226 src/storage/storage_backend.c:998
 #, c-format
 msgid "missing backend for pool type %d"
 msgstr "arrière-plan pour le type %d de pool manquant"
 
-#: src/conf/storage_conf.c:372
+#: src/conf/storage_conf.c:383
 msgid "missing auth host attribute"
 msgstr "attribut auth host manquant"
 
-#: src/conf/storage_conf.c:379
+#: src/conf/storage_conf.c:390
 msgid "missing auth passwd attribute"
 msgstr "attribut auth passwd manquant"
 
-#: src/conf/storage_conf.c:416
+#: src/conf/storage_conf.c:427
 #, c-format
 msgid "unknown pool format type %s"
 msgstr ""
 
-#: src/conf/storage_conf.c:438
+#: src/conf/storage_conf.c:464
 msgid "missing storage pool source device path"
 msgstr ""
 
-#: src/conf/storage_conf.c:457
+#: src/conf/storage_conf.c:483
 #, c-format
 msgid "unknown auth type '%s'"
-msgstr "type auth '%s' inconnu"
+msgstr "type auth « %s » inconnu"
 
 #: src/conf/storage_conf.c:516
 msgid "(storage_source_specification)"
 msgstr ""
 
-#: src/conf/storage_conf.c:511
+#: src/conf/storage_conf.c:528
 msgid "root element was not source"
 msgstr ""
 
-#: src/conf/storage_conf.c:563
+#: src/conf/storage_conf.c:578
 msgid "malformed octal mode"
 msgstr "mode octal non conforme"
 
-#: src/conf/storage_conf.c:574
+#: src/conf/storage_conf.c:589
 msgid "malformed owner element"
 msgstr "propriétaire de l'élément non conforme"
 
-#: src/conf/storage_conf.c:585
+#: src/conf/storage_conf.c:600
 msgid "malformed group element"
 msgstr "groupe de l'élément non conforme"
 
-#: src/conf/storage_conf.c:617 src/storage/storage_driver.c:446
-#: src/test/test_driver.c:3729
+#: src/conf/storage_conf.c:632 src/storage/storage_driver.c:454
+#: src/test/test_driver.c:4060
 #, c-format
 msgid "unknown storage pool type %s"
 msgstr ""
 
-#: src/conf/storage_conf.c:641
+#: src/conf/storage_conf.c:656
 msgid "missing pool source name element"
 msgstr ""
 
-#: src/conf/storage_conf.c:665
+#: src/conf/storage_conf.c:680
 msgid "missing storage pool source host name"
 msgstr ""
 
-#: src/conf/storage_conf.c:673
+#: src/conf/storage_conf.c:688
 msgid "missing storage pool source path"
 msgstr ""
 
-#: src/conf/storage_conf.c:691
+#: src/conf/storage_conf.c:706
 msgid "missing storage pool source adapter name"
 msgstr ""
 
@@ -3319,11 +3654,11 @@
 msgid "missing storage pool source device name"
 msgstr ""
 
-#: src/conf/storage_conf.c:698
+#: src/conf/storage_conf.c:722
 msgid "missing storage pool target path"
 msgstr ""
 
-#: src/conf/storage_conf.c:745
+#: src/conf/storage_conf.c:752
 msgid "unknown root element for storage pool"
 msgstr ""
 
@@ -3331,42 +3666,42 @@
 msgid "(storage_pool_definition)"
 msgstr ""
 
-#: src/conf/storage_conf.c:876
+#: src/conf/storage_conf.c:850
 #, c-format
 msgid "unknown pool format number %d"
 msgstr ""
 
-#: src/conf/storage_conf.c:909 src/conf/storage_conf.c:1723
+#: src/conf/storage_conf.c:891 src/conf/storage_conf.c:1613
 msgid "unexpected pool type"
 msgstr "type de pool inattendu"
 
-#: src/conf/storage_conf.c:1007
+#: src/conf/storage_conf.c:988
 #, c-format
 msgid "unknown size units '%s'"
-msgstr "taille des unités '%s' inconnu"
+msgstr "taille des unités « %s » inconnu"
 
-#: src/conf/storage_conf.c:1014
+#: src/conf/storage_conf.c:995
 msgid "malformed capacity element"
 msgstr "capacité de l'élément non conforme"
 
-#: src/conf/storage_conf.c:1019
+#: src/conf/storage_conf.c:1000
 msgid "capacity element value too large"
 msgstr "valeur de la capacité de l'élément trop large"
 
-#: src/conf/storage_conf.c:1051
+#: src/conf/storage_conf.c:1031
 msgid "missing volume name element"
 msgstr ""
 
-#: src/conf/storage_conf.c:1062
+#: src/conf/storage_conf.c:1042
 msgid "missing capacity element"
 msgstr "capacité de l'élément manquante"
 
-#: src/conf/storage_conf.c:1091 src/conf/storage_conf.c:1122
+#: src/conf/storage_conf.c:1071 src/conf/storage_conf.c:1102
 #, c-format
 msgid "unknown volume format type %s"
 msgstr ""
 
-#: src/conf/storage_conf.c:1153
+#: src/conf/storage_conf.c:1132
 msgid "unknown root element for storage vol"
 msgstr ""
 
@@ -3374,7 +3709,7 @@
 msgid "(storage_volume_definition)"
 msgstr ""
 
-#: src/conf/storage_conf.c:1258
+#: src/conf/storage_conf.c:1192
 #, c-format
 msgid "unknown volume format number %d"
 msgstr ""
@@ -3404,126 +3739,126 @@
 msgid "Storage source conflict with pool: '%s'"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:93
+#: src/conf/storage_encryption_conf.c:92
 msgid "unknown volume encryption secret type"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:99
+#: src/conf/storage_encryption_conf.c:98
 #, c-format
 msgid "unknown volume encryption secret type %s"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:111
+#: src/conf/storage_encryption_conf.c:110
 #, c-format
 msgid "malformed volume encryption uuid '%s'"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:118
+#: src/conf/storage_encryption_conf.c:117
 msgid "missing volume encryption uuid"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:147
+#: src/conf/storage_encryption_conf.c:146
 msgid "unknown volume encryption format"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:153
+#: src/conf/storage_encryption_conf.c:152
 #, c-format
 msgid "unknown volume encryption format type %s"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:196
+#: src/conf/storage_encryption_conf.c:192
 msgid "unknown root element for volume encryption information"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:228
+#: src/conf/storage_encryption_conf.c:222
 msgid "unexpected volume encryption secret type"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:248
+#: src/conf/storage_encryption_conf.c:242
 msgid "unexpected encryption format"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:275
+#: src/conf/storage_encryption_conf.c:269
 msgid "Cannot open /dev/urandom"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:286
+#: src/conf/storage_encryption_conf.c:280
 msgid "Cannot read from /dev/urandom"
 msgstr ""
 
-#: src/cpu/cpu.c:51 src/cpu/cpu_map.c:82
+#: src/cpu/cpu.c:54 src/cpu/cpu_map.c:90
 msgid "undefined hardware architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:79 src/cpu/cpu.c:307
+#: src/cpu/cpu.c:81 src/cpu/cpu.c:309
 msgid "(CPU_definition)"
 msgstr ""
 
-#: src/cpu/cpu.c:88
+#: src/cpu/cpu.c:90
 msgid "no CPU model specified"
 msgstr ""
 
-#: src/cpu/cpu.c:113
+#: src/cpu/cpu.c:118
 #, c-format
 msgid "cannot compare CPUs of %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:144 src/cpu/cpu.c:377
+#: src/cpu/cpu.c:146 src/cpu/cpu.c:379
 msgid "nonzero nmodels doesn't match with NULL models"
 msgstr ""
 
-#: src/cpu/cpu.c:133
+#: src/cpu/cpu.c:152
 msgid "invalid CPU definition"
 msgstr ""
 
-#: src/cpu/cpu.c:142
+#: src/cpu/cpu.c:161
 #, c-format
 msgid "cannot decode CPU data for %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:168
+#: src/cpu/cpu.c:192
 #, c-format
 msgid "cannot encode CPU data for %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:193
+#: src/cpu/cpu.c:218
 #, c-format
 msgid "cannot free CPU data for %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:213
+#: src/cpu/cpu.c:239
 #, c-format
 msgid "cannot get node CPU data for %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:235
+#: src/cpu/cpu.c:262
 #, c-format
 msgid "cannot compute guest CPU data for %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:294
+#: src/cpu/cpu.c:296
 msgid "nonzero ncpus doesn't match with NULL xmlCPUs"
 msgstr ""
 
-#: src/cpu/cpu.c:299 src/cpu/cpu.c:371
+#: src/cpu/cpu.c:301 src/cpu/cpu.c:373
 msgid "No CPUs given"
 msgstr ""
 
-#: src/cpu/cpu.c:366
+#: src/cpu/cpu.c:368
 msgid "nonzero ncpus doesn't match with NULL cpus"
 msgstr ""
 
-#: src/cpu/cpu.c:386
+#: src/cpu/cpu.c:388
 #, c-format
 msgid "cannot compute baseline CPU of %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:408
+#: src/cpu/cpu.c:410
 #, c-format
 msgid "cannot update guest CPU data for %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:431
+#: src/cpu/cpu.c:433
 #, c-format
 msgid "cannot check guest CPU data for %s architecture"
 msgstr ""
@@ -3547,17 +3882,17 @@
 msgid "no callback provided"
 msgstr ""
 
-#: src/cpu/cpu_map.c:88
+#: src/cpu/cpu_map.c:102
 #, c-format
 msgid "cannot parse CPU map file: %s"
 msgstr ""
 
-#: src/cpu/cpu_map.c:106
+#: src/cpu/cpu_map.c:120
 #, c-format
 msgid "cannot find CPU map for %s architecture"
 msgstr ""
 
-#: src/cpu/cpu_map.c:113
+#: src/cpu/cpu_map.c:127
 #, c-format
 msgid "cannot parse CPU map for %s architecture"
 msgstr ""
@@ -3581,32 +3916,32 @@
 msgid "Invalid CPU vendor string '%s'"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:295
+#: src/cpu/cpu_x86.c:675
 #, c-format
 msgid "CPU feature %s already defined"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:325
+#: src/cpu/cpu_x86.c:699
 #, c-format
 msgid "Invalid cpuid[%d] in %s feature"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:494
+#: src/cpu/cpu_x86.c:812 src/cpu/cpu_x86.c:862
 #, c-format
 msgid "Unknown CPU model %s"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:513
+#: src/cpu/cpu_x86.c:833 src/cpu/cpu_x86.c:874 src/cpu/cpu_x86.c:1693
 #, c-format
 msgid "Unknown CPU feature %s"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:613
+#: src/cpu/cpu_x86.c:960
 #, c-format
 msgid "Missing ancestor's name in CPU model %s"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:620
+#: src/cpu/cpu_x86.c:967
 #, c-format
 msgid "Ancestor model %s not found for CPU model %s"
 msgstr ""
@@ -3621,17 +3956,17 @@
 msgid "Unknown vendor %s referenced by CPU model %s"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:646
+#: src/cpu/cpu_x86.c:1008
 #, c-format
 msgid "Missing feature name for CPU model %s"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:652
+#: src/cpu/cpu_x86.c:1014
 #, c-format
 msgid "Feature %s required by CPU model %s not found"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:933
+#: src/cpu/cpu_x86.c:1346
 msgid "Cannot find suitable CPU model for given data"
 msgstr ""
 
@@ -3774,8 +4109,8 @@
 "value '%s' has unexpected value '%c', expecting '0' or '1'"
 msgstr ""
 
-#: src/esx/esx_driver.c:685 src/esx/esx_driver.c:4422
-#: src/esx/esx_driver.c:4515 src/esx/esx_storage_driver.c:669
+#: src/esx/esx_driver.c:685 src/esx/esx_driver.c:4439
+#: src/esx/esx_driver.c:4532 src/esx/esx_storage_driver.c:669
 #: src/esx/esx_util.c:56 src/esx/esx_util.c:275 src/esx/esx_vi.c:355
 #: src/esx/esx_vi.c:401 src/esx/esx_vi.c:640 src/esx/esx_vi.c:1112
 #: src/esx/esx_vi.c:1317 src/esx/esx_vi.c:1353 src/esx/esx_vi.c:1369
@@ -3948,9 +4283,9 @@
 msgstr ""
 
 #: src/esx/esx_driver.c:2590 src/esx/esx_driver.c:2674
-#: src/phyp/phyp_driver.c:1430 src/phyp/phyp_driver.c:3703
-#: src/vbox/vbox_tmpl.c:2076 src/vbox/vbox_tmpl.c:2134
-#: src/xenapi/xenapi_driver.c:1118 src/xenapi/xenapi_driver.c:1290
+#: src/phyp/phyp_driver.c:1447 src/phyp/phyp_driver.c:3720
+#: src/vbox/vbox_tmpl.c:2081 src/vbox/vbox_tmpl.c:2139
+#: src/xenapi/xenapi_driver.c:1118 src/xenapi/xenapi_driver.c:1288
 #, c-format
 msgid "unsupported flags: (0x%x)"
 msgstr ""
@@ -4045,7 +4380,7 @@
 "(normal) or -3 (high)"
 msgstr ""
 
-#: src/esx/esx_driver.c:3855 src/esx/esx_driver.c:4837
+#: src/esx/esx_driver.c:3855 src/esx/esx_driver.c:4854
 #, c-format
 msgid "Unknown field '%s'"
 msgstr ""
@@ -4093,42 +4428,42 @@
 msgid "Could not retrieve memory usage of resource pool"
 msgstr ""
 
-#: src/esx/esx_driver.c:4261 src/vbox/vbox_tmpl.c:5883
+#: src/esx/esx_driver.c:4278 src/vbox/vbox_tmpl.c:5888
 msgid "disk snapshots not supported yet"
 msgstr ""
 
-#: src/esx/esx_driver.c:4278
+#: src/esx/esx_driver.c:4295
 #, c-format
 msgid "Snapshot '%s' already exists"
 msgstr ""
 
-#: src/esx/esx_driver.c:4294
+#: src/esx/esx_driver.c:4311
 #, c-format
 msgid "Could not create snapshot: %s"
 msgstr ""
 
-#: src/esx/esx_driver.c:4638 src/qemu/qemu_driver.c:9751
-#: src/vbox/vbox_tmpl.c:6328
+#: src/esx/esx_driver.c:4655 src/qemu/qemu_driver.c:10098
+#: src/vbox/vbox_tmpl.c:6333
 #, c-format
 msgid "snapshot '%s' does not have a parent"
 msgstr ""
 
-#: src/esx/esx_driver.c:4717
+#: src/esx/esx_driver.c:4734
 #, c-format
 msgid "Could not revert to snapshot '%s': %s"
 msgstr ""
 
-#: src/esx/esx_driver.c:4783
+#: src/esx/esx_driver.c:4800
 #, c-format
 msgid "Could not delete snapshot '%s': %s"
 msgstr ""
 
-#: src/esx/esx_driver.c:4854
+#: src/esx/esx_driver.c:4871
 #, c-format
 msgid "Could not change memory parameters: %s"
 msgstr ""
 
-#: daemon/remote.c:596
+#: src/esx/esx_driver.c:4923
 #, c-format
 msgid "Field %s too big for destination"
 msgstr "Le champs %s est trop grand pour sa destination"
@@ -4257,7 +4592,7 @@
 
 #: src/esx/esx_util.c:387
 #, c-format
-msgid "Formating IP address for host '%s' failed: %s"
+msgid "Formatting IP address for host '%s' failed: %s"
 msgstr ""
 
 #: src/esx/esx_util.c:407 src/esx/esx_vi.c:2369 src/hyperv/hyperv_driver.c:909
@@ -4681,7 +5016,7 @@
 
 #: src/esx/esx_vi.c:3957
 msgid ""
-"Cancelable task is blocked by an unanswered question but cancelation failed"
+"Cancelable task is blocked by an unanswered question but cancellation failed"
 msgstr ""
 
 #: src/esx/esx_vi.c:3962
@@ -4794,20 +5129,20 @@
 msgid "ManagedObjectReference is missing 'type' property"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6554 src/qemu/qemu_driver.c:6591
-#: src/qemu/qemu_driver.c:6657 src/qemu/qemu_driver.c:6773
+#: src/fdstream.c:75 src/fdstream.c:111 src/fdstream.c:192 src/fdstream.c:302
+#: src/fdstream.c:354
 msgid "stream is not open"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6561 src/qemu/qemu_driver.c:6598
+#: src/fdstream.c:82 src/fdstream.c:118
 msgid "stream does not have a callback registered"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6664
+#: src/fdstream.c:199
 msgid "stream already has a callback registered"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6674
+#: src/fdstream.c:209
 msgid "cannot register file watch on stream"
 msgstr ""
 
@@ -4824,7 +5159,7 @@
 msgid "Too many bytes to write to stream"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6789
+#: src/fdstream.c:311 src/fdstream.c:330
 msgid "cannot write to stream"
 msgstr ""
 
@@ -4836,7 +5171,7 @@
 msgid "cannot read from stream"
 msgstr ""
 
-#: src/fdstream.c:428 src/rpc/virnetsocket.c:138 src/util/event_poll.c:670
+#: src/fdstream.c:428 src/rpc/virnetsocket.c:139 src/util/event_poll.c:671
 msgid "Unable to initialize mutex"
 msgstr ""
 
@@ -4868,7 +5203,7 @@
 msgid "%s: Cannot request read and write flags together"
 msgstr ""
 
-#: src/fdstream.c:568 src/lxc/lxc_driver.c:1739
+#: src/fdstream.c:568 src/lxc/lxc_driver.c:1837
 msgid "Unable to create pipe"
 msgstr ""
 
@@ -4919,7 +5254,7 @@
 msgid "Domain is not paused"
 msgstr ""
 
-#: src/hyperv/hyperv_driver.c:632 src/hyperv/hyperv_driver.c:1176
+#: src/hyperv/hyperv_driver.c:632 src/hyperv/hyperv_driver.c:1193
 msgid "Domain is not active or is in state transition"
 msgstr ""
 
@@ -4934,11 +5269,11 @@
 msgid "Domain is already active or is in state transition"
 msgstr ""
 
-#: src/hyperv/hyperv_driver.c:1231
+#: src/hyperv/hyperv_driver.c:1248
 msgid "Domain has no managed save image"
 msgstr ""
 
-#: src/hyperv/hyperv_driver.c:1290
+#: src/hyperv/hyperv_driver.c:1308
 #, c-format
 msgid "openwsman error: %s"
 msgstr ""
@@ -5060,7 +5395,10 @@
 msgid "System is not available"
 msgstr ""
 
-#: tools/virsh.c:4378
+#: src/hyperv/hyperv_wmi.c:382 tools/virsh.c:3006 tools/virsh.c:9228
+#: tools/virsh.c:9315 tools/virsh.c:10697 tools/virsh.c:13296
+#: tools/virsh.c:13835 tools/virsh.c:13978 tools/virsh.c:16897
+#: tools/virsh.c:17006 tools/virsh.c:17421 tools/virsh.c:17427
 msgid "Out of memory"
 msgstr ""
 
@@ -5134,7 +5472,7 @@
 msgid "couldn't find interface with MAC address '%s'"
 msgstr ""
 
-#: src/interface/netcf_driver.c:316
+#: src/interface/netcf_driver.c:326
 msgid "multiple interfaces with matching MAC address"
 msgstr ""
 
@@ -5183,36 +5521,36 @@
 msgid "%s: unsupported flags (0x%lx)"
 msgstr ""
 
-#: src/libvirt.c:584 src/libvirt.c:617 src/libvirt.c:650 src/libvirt.c:683
-#: src/libvirt.c:716 src/libvirt.c:749 src/libvirt.c:785 src/libvirt.c:825
+#: src/libvirt.c:586 src/libvirt.c:619 src/libvirt.c:652 src/libvirt.c:685
+#: src/libvirt.c:718 src/libvirt.c:751 src/libvirt.c:787 src/libvirt.c:827
 #, c-format
 msgid "Too many drivers, cannot register %s"
 msgstr ""
 
-#: src/libvirt.c:792
+#: src/libvirt.c:794
 msgid "Tried to register an internal Xen driver"
 msgstr ""
 
-#: src/libvirt.c:851
+#: src/libvirt.c:853
 #, c-format
 msgid "Initialization of %s state driver failed"
 msgstr ""
 
-#: src/libvirt.c:997
+#: src/libvirt.c:1002
 msgid "Expected a list for 'uri_aliases' config parameter"
 msgstr ""
 
-#: src/libvirt.c:1009
+#: src/libvirt.c:1014
 msgid "Expected a string for 'uri_aliases' config parameter list entry"
 msgstr ""
 
-#: src/libvirt.c:1015
+#: src/libvirt.c:1020
 #, c-format
 msgid ""
 "Malformed 'uri_aliases' config entry '%s', expected 'alias=uri://host/path'"
 msgstr ""
 
-#: src/libvirt.c:1023
+#: src/libvirt.c:1028
 #, c-format
 msgid ""
 "Malformed 'uri_aliases' config entry '%s', aliases may only container 'a-Z, "
@@ -5239,7 +5577,7 @@
 msgstr ""
 
 #: src/libvirt.c:2565 src/libvirt.c:2709 src/libvirt.c:2863
-#: src/libvirt.c:15778 src/libvirt.c:16607
+#: src/libvirt.c:16017 src/libvirt.c:16846
 msgid "running and paused flags are mutually exclusive"
 msgstr ""
 
@@ -5267,97 +5605,117 @@
 msgid "could not build absolute core file path"
 msgstr ""
 
-#: src/libvirt.c:2886
+#: src/libvirt.c:3603
+#, c-format
+msgid "string parameter name '%.*s' too long"
+msgstr ""
+
+#: src/libvirt.c:3613
+#, c-format
+msgid "NULL string parameter '%s'"
+msgstr ""
+
+#: src/libvirt.c:3620
+#, c-format
+msgid "string parameter '%s' unsupported"
+msgstr ""
+
+#: src/libvirt.c:4092
 msgid "virDomainGetXMLDesc with secure flag"
 msgstr ""
 
-#: src/libvirt.c:3050
+#: src/libvirt.c:4278
 msgid "domainMigratePrepare did not set uri"
 msgstr "domainMigratePrepare n'a pas paramétré URI"
 
-#: src/libvirt.c:3136 src/qemu/qemu_driver.c:7475
+#: src/libvirt.c:4390 src/qemu/qemu_migration.c:1944
 msgid "domainMigratePrepare2 did not set uri"
 msgstr ""
 
-#: src/libvirt.c:4466 src/qemu/qemu_migration.c:2070
+#: src/libvirt.c:4536 src/qemu/qemu_migration.c:2082
 msgid "domainMigratePrepare3 did not set uri"
 msgstr ""
 
-#: src/libvirt.c:4642 src/libvirt.c:4714 src/libvirt.c:5094 src/libvirt.c:5106
+#: src/libvirt.c:4712 src/libvirt.c:4784 src/libvirt.c:5164 src/libvirt.c:5176
 msgid "Unable to change target guest XML during migration"
 msgstr ""
 
-#: src/libvirt.c:4647
+#: src/libvirt.c:4717
 msgid "Unable to override peer2peer migration URI"
 msgstr ""
 
-#: src/libvirt.c:4868 src/libvirt.c:5069
+#: src/libvirt.c:4938 src/libvirt.c:5139
 msgid "cannot enforce change protection"
 msgstr ""
 
-#: src/libvirt.c:3357
+#: src/libvirt.c:4944 src/libvirt.c:5145
 msgid "cannot perform tunnelled migration without using peer2peer flag"
 msgstr ""
 
-#: src/libvirt.c:4306
-msgid "path is NULL"
+#: src/libvirt.c:7090 src/libvirt.c:7166 src/libvirt.c:17055
+#: src/libvirt.c:17111 src/libvirt.c:17179 src/libvirt.c:17250
+msgid "disk is NULL"
 msgstr ""
 
-#: src/libvirt.c:4319
+#: src/libvirt.c:7097
 msgid "buffer is NULL"
 msgstr ""
 
-#: src/libvirt.c:7044
+#: src/libvirt.c:7268
 msgid ""
 "flags parameter must include VIR_MEMORY_VIRTUAL or VIR_MEMORY_PHYSICAL"
 msgstr ""
 
-#: src/libvirt.c:4427
+#: src/libvirt.c:7275
 msgid "buffer is NULL but size is non-zero"
 msgstr ""
 
-#: src/libvirt.c:10151
+#: src/libvirt.c:14269
 msgid "data sources cannot be used for non-blocking streams"
 msgstr ""
 
-#: src/libvirt.c:10248
+#: src/libvirt.c:14371
 msgid "data sinks cannot be used for non-blocking streams"
 msgstr ""
 
-#: src/libvirt.c:16050
+#: src/libvirt.c:16289
 msgid "use of current flag requires redefine flag"
 msgstr ""
 
-#: src/libvirt.c:16056
+#: src/libvirt.c:16295
 msgid "redefine and no metadata flags are mutually exclusive"
 msgstr ""
 
-#: src/libvirt.c:16062
+#: src/libvirt.c:16301
 msgid "redefine and halt flags are mutually exclusive"
 msgstr ""
 
-#: src/libvirt.c:16115
+#: src/libvirt.c:16354
 msgid "virDomainSnapshotGetXMLDesc with secure flag"
 msgstr ""
 
-#: src/libvirt.c:16674
+#: src/libvirt.c:16913
 msgid "children and children_only flags are mutually exclusive"
 msgstr ""
 
-#: src/libvirt.c:16864
+#: src/libvirt.c:17117
 msgid "info is NULL"
 msgstr ""
 
-#: src/libvirt.c:17051
+#: src/libvirt.c:17318
 #, c-format
 msgid "Unable to access file descriptor %d"
 msgstr ""
 
-#: src/libvirt.c:17057
+#: src/libvirt.c:17324
 #, c-format
 msgid "File descriptor %d must be a socket"
 msgstr ""
 
+#: src/libvirt.c:17394
+msgid "negative or zero interval make no sense"
+msgstr ""
+
 #: src/locking/lock_driver_sanlock.c:95
 #, c-format
 msgid "Unable to access config file %s"
@@ -5574,42 +5932,42 @@
 msgid "this platform is missing dlopen"
 msgstr ""
 
-#: src/lxc/lxc_container.c:128
+#: src/lxc/lxc_container.c:147
 msgid "setsid failed"
 msgstr ""
 
-#: src/lxc/lxc_container.c:134
+#: src/lxc/lxc_container.c:153
 msgid "ioctl(TIOCSTTY) failed"
 msgstr ""
 
-#: src/lxc/lxc_container.c:147
+#: src/lxc/lxc_container.c:168
 msgid "dup2(stdin) failed"
 msgstr ""
 
-#: src/lxc/lxc_container.c:153
+#: src/lxc/lxc_container.c:174
 msgid "dup2(stdout) failed"
 msgstr ""
 
-#: src/lxc/lxc_container.c:159
+#: src/lxc/lxc_container.c:180
 msgid "dup2(stderr) failed"
 msgstr ""
 
-#: src/lxc/lxc_container.c:311
+#: src/lxc/lxc_container.c:333
 msgid "Failed to make root private"
 msgstr ""
 
-#: src/lxc/lxc_container.c:322 src/lxc/lxc_container.c:344
-#: src/lxc/lxc_container.c:515
+#: src/lxc/lxc_container.c:344 src/lxc/lxc_container.c:366
+#: src/lxc/lxc_container.c:613 src/lxc/lxc_container.c:874
 #, c-format
 msgid "Failed to create %s"
 msgstr ""
 
-#: src/lxc/lxc_container.c:331
+#: src/lxc/lxc_container.c:353
 #, c-format
 msgid "Failed to mount empty tmpfs at %s"
 msgstr ""
 
-#: src/lxc/lxc_container.c:352
+#: src/lxc/lxc_container.c:374
 #, c-format
 msgid "Failed to bind new root %s into tmpfs"
 msgstr ""
@@ -5619,16 +5977,16 @@
 msgid "Failed to make new root %s readonly"
 msgstr ""
 
-#: src/lxc/lxc_container.c:361
+#: src/lxc/lxc_container.c:392
 #, c-format
 msgid "Failed to chroot into %s"
 msgstr ""
 
-#: src/lxc/lxc_container.c:369
+#: src/lxc/lxc_container.c:400
 msgid "Failed to pivot root"
 msgstr ""
 
-#: src/lxc/lxc_container.c:412
+#: src/lxc/lxc_container.c:459
 #, c-format
 msgid "Failed to mkdir %s"
 msgstr ""
@@ -5638,20 +5996,20 @@
 msgid "Failed to mount %s on %s type %s"
 msgstr ""
 
-#: src/lxc/lxc_container.c:426
+#: src/lxc/lxc_container.c:511
 msgid "Cannot create /dev/pts"
 msgstr ""
 
-#: src/lxc/lxc_container.c:433
+#: src/lxc/lxc_container.c:518
 msgid "Failed to mount /dev/pts in container"
 msgstr ""
 
-#: src/lxc/lxc_container.c:468
+#: src/lxc/lxc_container.c:552
 #, c-format
 msgid "Failed to make device %s"
 msgstr ""
 
-#: src/lxc/lxc_container.c:485
+#: src/lxc/lxc_container.c:562
 msgid "Failed to make device /dev/ptmx"
 msgstr ""
 
@@ -5743,7 +6101,7 @@
 msgid "Cannot mount filesystem type %s"
 msgstr ""
 
-#: src/lxc/lxc_container.c:545
+#: src/lxc/lxc_container.c:984
 msgid "Failed to read /proc/mounts"
 msgstr ""
 
@@ -5757,25 +6115,25 @@
 msgid "Failed to unmount '%s' and could not unmount old root '%s'"
 msgstr ""
 
-#: src/lxc/lxc_container.c:624
+#: src/lxc/lxc_container.c:1098
 msgid "Failed to make / slave"
 msgstr ""
 
-#: src/lxc/lxc_container.c:687
+#: src/lxc/lxc_container.c:1148
 #, c-format
 msgid "Failed to remove capabilities: %d"
 msgstr ""
 
-#: src/lxc/lxc_container.c:693
+#: src/lxc/lxc_container.c:1154
 #, c-format
 msgid "Failed to apply capabilities: %d"
 msgstr ""
 
-#: src/lxc/lxc_container.c:732
+#: src/lxc/lxc_container.c:1195
 msgid "lxcChild() passed invalid vm definition"
 msgstr ""
 
-#: src/lxc/lxc_container.c:753
+#: src/lxc/lxc_container.c:1228
 #, c-format
 msgid "Failed to open tty %s"
 msgstr ""
@@ -5785,7 +6143,7 @@
 msgid "cannot find init path '%s' relative to container root"
 msgstr ""
 
-#: src/lxc/lxc_container.c:216
+#: src/lxc/lxc_container.c:1246
 msgid "Failed to read the container continue message"
 msgstr ""
 
@@ -5793,628 +6151,852 @@
 msgid "failed to send continue signal to controller"
 msgstr ""
 
-#: src/lxc/lxc_container.c:836
+#: src/lxc/lxc_container.c:1372
 msgid "Failed to run clone container"
 msgstr ""
 
-#: src/lxc/lxc_conf.c:76 src/qemu/qemu_driver.c:260 src/uml/uml_conf.c:87
+#: src/lxc/lxc_conf.c:81 src/qemu/qemu_driver.c:263 src/uml/uml_conf.c:91
 msgid "cannot get the host uuid"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:85
+#: src/lxc/lxc_controller.c:93
 msgid "Unable to read /dev"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2819
+#: src/lxc/lxc_controller.c:109 src/lxc/lxc_controller.c:162
+#: src/qemu/qemu_driver.c:960 src/util/iohelper.c:57
 #, c-format
 msgid "Unable to open %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:112
+#: src/lxc/lxc_controller.c:120
 #, c-format
 msgid "Unable to get loop status on %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:123
+#: src/lxc/lxc_controller.c:131
 msgid "Unable to find a free loop device in /dev"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:160
+#: src/lxc/lxc_controller.c:168
 #, c-format
 msgid "Unable to attach %s to loop device"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:167
+#: src/lxc/lxc_controller.c:175
 msgid "Unable to mark loop device as autoclear"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:92
-msgid "Unable to get cgroup for driver"
+#: src/lxc/lxc_controller.c:252 src/qemu/qemu_process.c:1386
+msgid "Host kernel is not aware of NUMA."
 msgstr ""
 
-#: src/lxc/lxc_controller.c:99
+#: src/lxc/lxc_controller.c:264 src/qemu/qemu_process.c:1398
 #, c-format
-msgid "Unable to create cgroup for domain %s"
+msgid "Host cannot support NUMA node %d"
+msgstr ""
+
+#: src/lxc/lxc_controller.c:293 src/qemu/qemu_process.c:1427
+msgid "NUMA memory tuning in 'preferred' mode only supports single node"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:274
+#: src/lxc/lxc_controller.c:304
 #, c-format
-msgid "Unable to set Blkio weight for domain %s"
+msgid "Unable to set NUMA policy %s"
+msgstr ""
+
+#: src/lxc/lxc_controller.c:319
+msgid "NUMA policy is not available on this platform"
+msgstr ""
+
+#: src/lxc/lxc_controller.c:392 src/qemu/qemu_cgroup.c:382
+#, c-format
+msgid "Unable to set io cpu shares for domain %s"
+msgstr ""
+
+#: src/lxc/lxc_controller.c:401
+#, c-format
+msgid "Unable to set io cpu quota for domain %s"
+msgstr ""
+
+#: src/lxc/lxc_controller.c:410
+#, c-format
+msgid "Unable to set io cpu period for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:284
+#: src/lxc/lxc_controller.c:429
 #, c-format
-msgid "Unable to set cpu shares for domain %s"
+msgid "Unable to set Blkio weight for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:107
+#: src/lxc/lxc_controller.c:449
 #, c-format
 msgid "Unable to set memory limit for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:302 src/qemu/qemu_cgroup.c:323
+#: src/lxc/lxc_controller.c:458 src/qemu/qemu_cgroup.c:347
 #, c-format
 msgid "Unable to set memory hard limit for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:312 src/qemu/qemu_cgroup.c:332
+#: src/lxc/lxc_controller.c:468 src/qemu/qemu_cgroup.c:356
 #, c-format
 msgid "Unable to set memory soft limit for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:322 src/qemu/qemu_cgroup.c:342
+#: src/lxc/lxc_controller.c:478 src/qemu/qemu_cgroup.c:366
 #, c-format
 msgid "Unable to set swap hard limit for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:115
+#: src/lxc/lxc_controller.c:508
 #, c-format
 msgid "Unable to deny devices for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:128
+#: src/lxc/lxc_controller.c:522
 #, c-format
 msgid "Unable to allow device %c:%d:%d for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:362
+#: src/lxc/lxc_controller.c:539
 #, c-format
 msgid "Unable to allow device %s for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:372
+#: src/lxc/lxc_controller.c:549
 #, c-format
 msgid "Unable to allow PTY devices for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:145
+#: src/lxc/lxc_controller.c:588
+msgid "Unable to get cgroup for driver"
+msgstr ""
+
+#: src/lxc/lxc_controller.c:595
+#, c-format
+msgid "Unable to create cgroup for domain %s"
+msgstr ""
+
+#: src/lxc/lxc_controller.c:615
 #, c-format
 msgid "Unable to add task %d to cgroup for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:173
+#: src/lxc/lxc_controller.c:643
 #, c-format
 msgid "failed to create server socket '%s'"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:183
+#: src/lxc/lxc_controller.c:653
 #, c-format
 msgid "Socket path %s too long for destination"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:189
+#: src/lxc/lxc_controller.c:659
 #, c-format
 msgid "failed to bind server socket '%s'"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:195
+#: src/lxc/lxc_controller.c:665
 #, c-format
 msgid "failed to listen server socket %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:257
+#: src/lxc/lxc_controller.c:687
 #, c-format
 msgid "failed to apply capabilities: %d"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:543
+#: src/lxc/lxc_controller.c:778
 msgid "Unable to read from monitor client"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:572
+#: src/lxc/lxc_controller.c:807
 msgid "Unable to accept monitor client"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:589 src/lxc/lxc_controller.c:861
+#: src/lxc/lxc_controller.c:824 src/lxc/lxc_controller.c:1096
 msgid "Unable to watch client socket"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:635
+#: src/lxc/lxc_controller.c:870
 msgid "Unable to create epoll fd"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:643
+#: src/lxc/lxc_controller.c:878
 msgid "Unable to add epoll fd"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:653
+#: src/lxc/lxc_controller.c:888
 msgid "Unable to wait on epoll"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:725
+#: src/lxc/lxc_controller.c:960
 msgid "Unable to read container pty"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:753
+#: src/lxc/lxc_controller.c:988
 msgid "Unable to write to container pty"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:820
+#: src/lxc/lxc_controller.c:1055
 msgid "Cannot create signal pipe"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:830
+#: src/lxc/lxc_controller.c:1065
 msgid "Unable to watch signal pipe"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:836
+#: src/lxc/lxc_controller.c:1071
 msgid "Cannot install signal handler"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:850
+#: src/lxc/lxc_controller.c:1085
 msgid "Unable to watch monitor socket"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:880 src/lxc/lxc_controller.c:890
+#: src/lxc/lxc_controller.c:1115 src/lxc/lxc_controller.c:1125
 msgid "Unable to watch host console PTY"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:973
+#: src/lxc/lxc_controller.c:1208
 #, c-format
 msgid "Unable to request personality for %s on %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:513
+#: src/lxc/lxc_controller.c:1302
 msgid "sockpair failed"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1073
+#: src/lxc/lxc_controller.c:1308
 msgid "socketpair failed"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1110
+#: src/lxc/lxc_controller.c:1345
 #, c-format
 msgid "root source %s does not exist"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:543
+#: src/lxc/lxc_controller.c:1352
 msgid "Cannot unshare mount namespace"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:549
+#: src/lxc/lxc_controller.c:1358
 msgid "Failed to switch root mount into slave mode"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:561
+#: src/lxc/lxc_controller.c:1370
 #, c-format
 msgid "Failed to make path %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:569
+#: src/lxc/lxc_controller.c:1381
 #, c-format
 msgid "Failed to mount devpts on %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1158
+#: src/lxc/lxc_controller.c:1393
 msgid "Expected exactly one TTY fd"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:587 src/lxc/lxc_controller.c:596
-#: src/lxc/lxc_driver.c:1212
+#: src/lxc/lxc_controller.c:1405 src/lxc/lxc_controller.c:1414
+#: src/lxc/lxc_driver.c:1806
 msgid "Failed to allocate tty"
 msgstr ""
 
-#: src/lxc/lxc_container.c:187
+#: src/lxc/lxc_controller.c:1439
 msgid "Unable to send container continue message"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1210
+#: src/lxc/lxc_controller.c:1445
 msgid "error receiving signal from container"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1227
+#: src/lxc/lxc_controller.c:1462
 msgid "error sending continue signal to parent"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1235 src/lxc/lxc_controller.c:1242
+#: src/lxc/lxc_controller.c:1470 src/lxc/lxc_controller.c:1477
 msgid "Unable to set file descriptor non blocking"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:773
+#: src/lxc/lxc_controller.c:1664
 #, c-format
 msgid "Unable to write pid file '%s/%s.pid'"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:787
+#: src/lxc/lxc_controller.c:1678
 msgid "Unable to change to root dir"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:793
+#: src/lxc/lxc_controller.c:1684
 msgid "Unable to become session leader"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:804
+#: src/lxc/lxc_controller.c:1695
 msgid "Failed to accept a connection from driver"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:131
+#: src/lxc/lxc_driver.c:159
 #, c-format
 msgid "Unexpected LXC URI path '%s', try lxc:///"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:139
+#: src/lxc/lxc_driver.c:167
 msgid "lxc state driver is not active"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:229
+#: src/lxc/lxc_driver.c:238
 #, c-format
 msgid "No domain with matching id %d"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:561 src/lxc/lxc_driver.c:586 src/lxc/lxc_driver.c:618
-#: src/lxc/lxc_driver.c:2030 src/lxc/lxc_driver.c:2084
-#: src/lxc/lxc_driver.c:2111 src/lxc/lxc_driver.c:2280
-#: src/lxc/lxc_driver.c:2345
+#: src/lxc/lxc_driver.c:267 src/lxc/lxc_driver.c:321 src/lxc/lxc_driver.c:346
+#: src/lxc/lxc_driver.c:370 src/lxc/lxc_driver.c:502 src/lxc/lxc_driver.c:559
+#: src/lxc/lxc_driver.c:625 src/lxc/lxc_driver.c:652 src/lxc/lxc_driver.c:681
+#: src/lxc/lxc_driver.c:706 src/lxc/lxc_driver.c:738 src/lxc/lxc_driver.c:802
+#: src/lxc/lxc_driver.c:903 src/lxc/lxc_driver.c:1008
+#: src/lxc/lxc_driver.c:1993 src/lxc/lxc_driver.c:2251
+#: src/lxc/lxc_driver.c:3409 src/lxc/lxc_driver.c:3464
+#: src/lxc/lxc_driver.c:3491 src/lxc/lxc_driver.c:3659
+#: src/lxc/lxc_driver.c:3724 src/libxl/libxl_driver.c:1342
+#: src/libxl/libxl_driver.c:1400 src/libxl/libxl_driver.c:1456
+#: src/libxl/libxl_driver.c:1502 src/libxl/libxl_driver.c:1545
+#: src/libxl/libxl_driver.c:1600 src/libxl/libxl_driver.c:1939
+#: src/libxl/libxl_driver.c:2037 src/libxl/libxl_driver.c:2127
+#: src/libxl/libxl_driver.c:2173 src/libxl/libxl_driver.c:2207
+#: src/libxl/libxl_driver.c:2705 src/libxl/libxl_driver.c:3447
+#: src/libxl/libxl_driver.c:3475 src/vmware/vmware_driver.c:595
 #, c-format
 msgid "No domain with matching uuid '%s'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:284
+#: src/lxc/lxc_driver.c:293
 #, c-format
 msgid "No domain with matching name '%s'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:378 src/lxc/lxc_driver.c:1315
-#: src/lxc/lxc_driver.c:1365
+#: src/lxc/lxc_driver.c:449 src/lxc/lxc_driver.c:1999
+#: src/lxc/lxc_driver.c:2077
 msgid "System lacks NETNS support"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:439
+#: src/lxc/lxc_driver.c:508
 msgid "Cannot undefine transient domain"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:491
+#: src/lxc/lxc_driver.c:571 src/lxc/lxc_driver.c:762 src/lxc/lxc_driver.c:916
 #, c-format
 msgid "Unable to get cgroup for %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:497
+#: src/lxc/lxc_driver.c:577
 msgid "Cannot read cputime for domain"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:502
+#: src/lxc/lxc_driver.c:582
 msgid "Cannot read memory usage for domain"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:592
+#: src/lxc/lxc_driver.c:712
 msgid "Cannot set max memory lower than current memory"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:624
+#: src/lxc/lxc_driver.c:744
 msgid "Cannot set memory higher than max memory"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2036 src/lxc/lxc_driver.c:2286
-#: src/lxc/lxc_driver.c:2351
+#: src/lxc/lxc_driver.c:750 src/lxc/lxc_driver.c:2257
+#: src/lxc/lxc_driver.c:3415 src/lxc/lxc_driver.c:3665
+#: src/lxc/lxc_driver.c:3730 src/libxl/libxl_driver.c:1346
+#: src/libxl/libxl_driver.c:1405 src/libxl/libxl_driver.c:1462
+#: src/libxl/libxl_driver.c:1508 src/libxl/libxl_driver.c:1551
+#: src/libxl/libxl_driver.c:1944 src/libxl/libxl_driver.c:2042
+#: src/libxl/libxl_driver.c:2132 src/libxl/libxl_driver.c:2404
+#: src/libxl/libxl_driver.c:2501 src/libxl/libxl_driver.c:3253
+#: src/libxl/libxl_driver.c:3548 src/libxl/libxl_driver.c:3615
+#: src/libxl/libxl_driver.c:3706 src/openvz/openvz_driver.c:523
+#: src/openvz/openvz_driver.c:561
 msgid "Domain is not running"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:747
+#: src/lxc/lxc_driver.c:756
 msgid "cgroups must be configured on the host"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:637
+#: src/lxc/lxc_driver.c:768
 msgid "Failed to set memory for domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6009 src/qemu/qemu_driver.c:6080
+#: src/lxc/lxc_driver.c:808 src/lxc/lxc_driver.c:2831
+#: src/lxc/lxc_driver.c:3032 src/lxc/lxc_driver.c:3158
+#: src/lxc/lxc_driver.c:3307 src/qemu/qemu_driver.c:6054
+#: src/qemu/qemu_driver.c:6273 src/qemu/qemu_driver.c:6482
+#: src/qemu/qemu_driver.c:6644 src/qemu/qemu_driver.c:6960
+#: src/qemu/qemu_driver.c:7232
 #, c-format
 msgid "cannot find cgroup for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:811 src/qemu/qemu_driver.c:6240
+#: src/lxc/lxc_driver.c:820 src/qemu/qemu_driver.c:6505
 msgid "invalid type for memory hard_limit tunable, expected a 'ullong'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:819 src/qemu/qemu_driver.c:6249
+#: src/lxc/lxc_driver.c:828 src/qemu/qemu_driver.c:6514
 msgid "unable to set memory hard_limit tunable"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:826 src/qemu/qemu_driver.c:6261
+#: src/lxc/lxc_driver.c:835 src/qemu/qemu_driver.c:6526
 msgid "invalid type for memory soft_limit tunable, expected a 'ullong'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:834 src/qemu/qemu_driver.c:6270
+#: src/lxc/lxc_driver.c:843 src/qemu/qemu_driver.c:6535
 msgid "unable to set memory soft_limit tunable"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:841 src/qemu/qemu_driver.c:6282
+#: src/lxc/lxc_driver.c:850 src/qemu/qemu_driver.c:6547
 msgid "invalid type for swap_hard_limit tunable, expected a 'ullong'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:849 src/qemu/qemu_driver.c:6291
+#: src/lxc/lxc_driver.c:858 src/qemu/qemu_driver.c:6556
 msgid "unable to set swap_hard_limit tunable"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:854 src/qemu/qemu_driver.c:6300
+#: src/lxc/lxc_driver.c:863 src/qemu/qemu_driver.c:6565
 #, c-format
 msgid "Memory tunable `%s' not implemented"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:858 src/qemu/qemu_driver.c:5982
-#: src/qemu/qemu_driver.c:6011 src/qemu/qemu_driver.c:6305
+#: src/lxc/lxc_driver.c:867 src/lxc/lxc_driver.c:3202
+#: src/lxc/lxc_driver.c:3231 src/qemu/qemu_driver.c:6137
+#: src/qemu/qemu_driver.c:6192 src/qemu/qemu_driver.c:6570
 #, c-format
 msgid "Parameter `%s' not supported"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:922 src/qemu/qemu_driver.c:6457
+#: src/lxc/lxc_driver.c:931 src/qemu/qemu_driver.c:6726
 msgid "unable to get memory hard limit"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:927
+#: src/lxc/lxc_driver.c:936
 msgid "Field memory hard limit too long for destination"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:937 src/qemu/qemu_driver.c:6473
+#: src/lxc/lxc_driver.c:946 src/qemu/qemu_driver.c:6742
 msgid "unable to get memory soft limit"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:942
+#: src/lxc/lxc_driver.c:951
 msgid "Field memory soft limit too long for destination"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:952 src/qemu/qemu_driver.c:6489
+#: src/lxc/lxc_driver.c:961 src/qemu/qemu_driver.c:6758
 msgid "unable to get swap hard limit"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:957
+#: src/lxc/lxc_driver.c:966
 msgid "Field swap hard limit too long for destination"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1202
-msgid "Unable to initialize bridging"
+#: src/lxc/lxc_driver.c:1226 src/network/bridge_driver.c:1780
+#: src/qemu/qemu_command.c:270 src/util/virnetdevmacvlan.c:583
+#, c-format
+msgid "cannot set bandwidth limits on %s"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:1262
+msgid "Unable to set network bandwidth on direct interfaces"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:805
-msgid "Failed to get bridge for interface"
+#: src/lxc/lxc_driver.c:1276
+msgid "Unable to set port profile on direct interfaces"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:850
-#, c-format
-msgid "Failed to add %s device to %s"
+#: src/lxc/lxc_driver.c:1366
+msgid "No bridge name specified"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1293 src/network/bridge_driver.c:1815
-#: src/qemu/qemu_command.c:330 src/util/macvtap.c:369
+#: src/lxc/lxc_driver.c:1394
 #, c-format
-msgid "cannot set bandwidth limits on %s"
+msgid "Unsupported network type %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:888
+#: src/lxc/lxc_driver.c:1428
 msgid "Failed to create client socket"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:896
+#: src/lxc/lxc_driver.c:1436
 #, c-format
 msgid "Socket path %s too big for destination"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:902
+#: src/lxc/lxc_driver.c:1442
 msgid "Failed to connect to client socket"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:927
+#: src/lxc/lxc_driver.c:1465
 #, c-format
 msgid "Invalid PID %d for container"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1375
+#: src/lxc/lxc_driver.c:1473
 msgid "Failed to kill container PIDs"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1381
+#: src/lxc/lxc_driver.c:1479
 msgid "Some container PIDs refused to die"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1547
+#: src/lxc/lxc_driver.c:1645
 #, c-format
 msgid "failed to open logfile %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1563 src/qemu/qemu_domain.c:1268
+#: src/lxc/lxc_driver.c:1661 src/qemu/qemu_domain.c:1273
 #, c-format
 msgid "unable to seek to end of log for %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1567 src/qemu/qemu_domain.c:1272
+#: src/lxc/lxc_driver.c:1665 src/qemu/qemu_domain.c:1277
 #, c-format
 msgid "unable to seek to %lld from start for %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1584
+#: src/lxc/lxc_driver.c:1682
 msgid "Failure while reading guest log output"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1642
+#: src/lxc/lxc_driver.c:1740
 msgid ""
 "The 'cpuacct', 'devices' & 'memory' cgroups controllers must be mounted"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1649
+#: src/lxc/lxc_driver.c:1747
 msgid "Unable to find 'cpuacct' cgroups controller mount"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1655
+#: src/lxc/lxc_driver.c:1753
 msgid "Unable to find 'devices' cgroups controller mount"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1661
+#: src/lxc/lxc_driver.c:1759
 msgid "Unable to find 'memory' cgroups controller mount"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1198
+#: src/lxc/lxc_driver.c:1765
 #, c-format
 msgid "Cannot create log directory '%s'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1702
+#: src/lxc/lxc_driver.c:1800
 msgid "Only PTY console types are supported"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1233
+#: src/lxc/lxc_driver.c:1830
 #, c-format
 msgid "Failed to open '%s'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1774
+#: src/lxc/lxc_driver.c:1872
 msgid "could not close handshake fd"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1253
+#: src/lxc/lxc_driver.c:1885
 #, c-format
 msgid "Failed to read pid file %s/%s.pid"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1800
+#: src/lxc/lxc_driver.c:1898
 #, c-format
 msgid "guest failed to start: %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1839
+#: src/lxc/lxc_driver.c:1937
 msgid "could not close logfile"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1906 src/libxl/libxl_driver.c:2711
+#: src/lxc/lxc_driver.c:2005 src/libxl/libxl_driver.c:2711
 #: src/vmware/vmware_driver.c:601
 msgid "Domain is already running"
 msgstr "Le domaine est déjà actif"
 
-#: src/uml/uml_driver.c:163
+#: src/lxc/lxc_driver.c:2329 src/libxl/libxl_driver.c:171
+#: src/qemu/qemu_driver.c:166 src/uml/uml_driver.c:168
 #, c-format
 msgid "Failed to autostart VM '%s': %s"
 msgstr "Impossible de démarrer automatiquement la VM « %s » : %s"
 
-#: src/lxc/lxc_driver.c:1884
+#: src/lxc/lxc_driver.c:2600
 #, c-format
 msgid "Unknown release: %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1946 src/qemu/qemu_driver.c:6032
-#, c-format
-msgid "Invalid parameter `%s'"
+#: src/lxc/lxc_driver.c:2669 src/lxc/lxc_driver.c:2826
+#: src/lxc/lxc_driver.c:3026 src/qemu/qemu_driver.c:5866
+#: src/qemu/qemu_driver.c:6955 src/qemu/qemu_driver.c:7226
+msgid "cgroup CPU controller is not mounted"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1937
-msgid "Invalid type for cpu_shares tunable, expected a 'ullong'"
+#: src/lxc/lxc_driver.c:2702 src/qemu/qemu_driver.c:6828
+#: src/qemu/qemu_driver.c:7080
+msgid "unable to get cpu bandwidth period tunable"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2572
-#, c-format
-msgid "failed to set cpu_shares=%llu"
+#: src/lxc/lxc_driver.c:2709 src/qemu/qemu_driver.c:6821
+#: src/qemu/qemu_driver.c:7087
+msgid "unable to get cpu bandwidth tunable"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1996
-msgid "Field cpu_shares too big for destination"
+#: src/lxc/lxc_driver.c:2731 src/qemu/qemu_cgroup.c:418
+msgid "Unable to get cpu bandwidth period"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2053
-#, c-format
-msgid "Invalid path, '%s' is not a known interface"
+#: src/lxc/lxc_driver.c:2738 src/qemu/qemu_cgroup.c:425
+msgid "Unable to set cpu bandwidth period"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2117
-msgid "Cannot set autostart for transient domain"
+#: src/lxc/lxc_driver.c:2747 src/qemu/qemu_cgroup.c:434
+msgid "Unable to set cpu bandwidth quota"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2142
+#: src/lxc/lxc_driver.c:2759 src/qemu/qemu_cgroup.c:446
+#: src/qemu/qemu_cgroup.c:481 src/qemu/qemu_driver.c:6808
+#: src/xenapi/xenapi_utils.c:391 src/xenapi/xenapi_utils.c:395
 #, c-format
-msgid "Cannot create autostart directory %s"
+msgid "%s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2149 src/qemu/qemu_driver.c:5930
-#: src/uml/uml_driver.c:1752
+#: src/lxc/lxc_driver.c:2791 src/lxc/lxc_driver.c:2974
+#: src/lxc/lxc_driver.c:3131 src/lxc/lxc_driver.c:3273
+#: src/qemu/qemu_driver.c:6027 src/qemu/qemu_driver.c:6239
+#: src/qemu/qemu_driver.c:6454 src/qemu/qemu_driver.c:6616
+#: src/qemu/qemu_driver.c:6920 src/qemu/qemu_driver.c:7174
 #, c-format
-msgid "Failed to create symlink '%s to '%s'"
+msgid "No such domain %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2156 src/network/bridge_driver.c:1538
-#: src/qemu/qemu_driver.c:5937 src/storage/storage_driver.c:1036
-#: src/uml/uml_driver.c:1759
-#, c-format
-msgid "Failed to delete symlink '%s'"
+#: src/lxc/lxc_driver.c:2807 src/lxc/lxc_driver.c:3166
+#: src/lxc/lxc_driver.c:3315 src/libxl/libxl_driver.c:1684
+#: src/libxl/libxl_driver.c:2276 src/qemu/qemu_driver.c:1847
+#: src/qemu/qemu_driver.c:3328 src/qemu/qemu_driver.c:3464
+#: src/qemu/qemu_driver.c:6062 src/qemu/qemu_driver.c:6281
+#: src/qemu/qemu_driver.c:6490 src/qemu/qemu_driver.c:6652
+#: src/qemu/qemu_driver.c:6936 src/qemu/qemu_driver.c:11172
+msgid "cannot change persistent config of a transient domain"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2293
-msgid "Suspend operation failed"
-msgstr ""
+#: src/lxc/lxc_driver.c:2820 src/lxc/lxc_driver.c:3020
+#: src/lxc/lxc_driver.c:3147 src/lxc/lxc_driver.c:3296
+#: src/lxc/lxc_driver.c:3787 src/qemu/qemu_driver.c:1401
+#: src/qemu/qemu_driver.c:1420 src/qemu/qemu_driver.c:1472
+#: src/qemu/qemu_driver.c:1529 src/qemu/qemu_driver.c:1585
+#: src/qemu/qemu_driver.c:1638 src/qemu/qemu_driver.c:1708
+#: src/qemu/qemu_driver.c:1840 src/qemu/qemu_driver.c:1951
+#: src/qemu/qemu_driver.c:1962 src/qemu/qemu_driver.c:2033
+#: src/qemu/qemu_driver.c:2194 src/qemu/qemu_driver.c:2696
+#: src/qemu/qemu_driver.c:2755 src/qemu/qemu_driver.c:2968
+#: src/qemu/qemu_driver.c:3079 src/qemu/qemu_driver.c:3170
+#: src/qemu/qemu_driver.c:3322 src/qemu/qemu_driver.c:3603
+#: src/qemu/qemu_driver.c:4438 src/qemu/qemu_driver.c:6043
+#: src/qemu/qemu_driver.c:6262 src/qemu/qemu_driver.c:6470
+#: src/qemu/qemu_driver.c:6632 src/qemu/qemu_driver.c:6949
+#: src/qemu/qemu_driver.c:7220 src/qemu/qemu_driver.c:7363
+#: src/qemu/qemu_driver.c:7428 src/qemu/qemu_driver.c:7451
+#: src/qemu/qemu_driver.c:7513 src/qemu/qemu_driver.c:7541
+#: src/qemu/qemu_driver.c:7726 src/qemu/qemu_driver.c:7796
+#: src/qemu/qemu_driver.c:7913 src/qemu/qemu_driver.c:8460
+#: src/qemu/qemu_driver.c:8940 src/qemu/qemu_driver.c:8975
+#: src/qemu/qemu_driver.c:9037 src/qemu/qemu_driver.c:9095
+#: src/qemu/qemu_driver.c:9204 src/qemu/qemu_driver.c:9482
+#: src/qemu/qemu_driver.c:10716 src/qemu/qemu_driver.c:10725
+#: src/qemu/qemu_driver.c:10864 src/qemu/qemu_driver.c:10970
+#: src/qemu/qemu_driver.c:10984 src/qemu/qemu_driver.c:11070
+#: src/qemu/qemu_driver.c:11165 src/qemu/qemu_driver.c:11324
+#: src/qemu/qemu_migration.c:2323 src/uml/uml_driver.c:2395
+#: src/xen/xen_driver.c:2132 src/xen/xen_hypervisor.c:1159
+#: src/xen/xen_hypervisor.c:1240 src/xen/xen_hypervisor.c:1359
+#: src/xen/xm_internal.c:715
+msgid "domain is not running"
+msgstr "le domaine n'est pas actif"
 
-#: src/lxc/lxc_driver.c:2358
+#: src/lxc/lxc_driver.c:2843 src/qemu/qemu_driver.c:6972
+msgid "invalid type for cpu_shares tunable, expected a 'ullong'"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:2851 src/qemu/qemu_driver.c:6980
+msgid "unable to set cpu shares tunable"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:2864 src/qemu/qemu_driver.c:6993
+msgid "invalid type for vcpu_period tunable, expected a 'ullong'"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:2884 src/qemu/qemu_driver.c:7013
+msgid "invalid type for vcpu_quota tunable, expected a 'llong'"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:2903 src/qemu/qemu_driver.c:7032
+#, c-format
+msgid "Invalid parameter `%s'"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:2990 src/qemu/qemu_driver.c:7190
+msgid "cannot query persistent config of a transient domain"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3000 src/qemu/qemu_driver.c:7200
+msgid "can't get persistentDef"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3039 src/qemu/qemu_driver.c:7239
+msgid "unable to get cpu shares tunable"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3054 src/lxc/lxc_driver.c:3068
+#: src/lxc/lxc_driver.c:3081 src/lxc/lxc_driver.c:3339
+#: src/lxc/lxc_driver.c:3362 src/libxl/libxl_driver.c:3646
+#: src/libxl/libxl_driver.c:3657 src/qemu/qemu_driver.c:6305
+#: src/qemu/qemu_driver.c:6344 src/qemu/qemu_driver.c:6366
+#: src/qemu/qemu_driver.c:6406 src/qemu/qemu_driver.c:6677
+#: src/qemu/qemu_driver.c:6687 src/qemu/qemu_driver.c:6697
+#: src/qemu/qemu_driver.c:6731 src/qemu/qemu_driver.c:6747
+#: src/qemu/qemu_driver.c:6763 src/qemu/qemu_driver.c:7254
+#: src/qemu/qemu_driver.c:7268 src/qemu/qemu_driver.c:7281
+#: src/qemu/qemu_driver.c:7579 src/qemu/qemu_driver.c:7593
+#: src/qemu/qemu_driver.c:7607 src/qemu/qemu_driver.c:7621
+#: src/qemu/qemu_driver.c:7635 src/qemu/qemu_driver.c:7649
+#: src/qemu/qemu_driver.c:7663 src/qemu/qemu_driver.c:7677
+#: src/qemu/qemu_driver.c:11362 src/qemu/qemu_driver.c:11373
+#: src/qemu/qemu_driver.c:11384 src/qemu/qemu_driver.c:11395
+#: src/qemu/qemu_driver.c:11406 src/qemu/qemu_driver.c:11417
+#: src/test/test_driver.c:2726
+#, c-format
+msgid "Field name '%s' too long"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3152 src/lxc/lxc_driver.c:3301
+#: src/qemu/qemu_driver.c:6048 src/qemu/qemu_driver.c:6267
+msgid "blkio cgroup isn't mounted"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3182 src/lxc/lxc_driver.c:3216
+#: src/qemu/qemu_driver.c:6078 src/qemu/qemu_driver.c:6155
+msgid "invalid type for blkio weight tunable, expected a 'unsigned int'"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3189 src/lxc/lxc_driver.c:3223
+#: src/qemu/qemu_driver.c:6085 src/qemu/qemu_driver.c:6162
+msgid "out of blkio weight range."
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3197 src/qemu/qemu_driver.c:6093
+msgid "unable to set blkio weight tunable"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3334 src/qemu/qemu_driver.c:6300
+msgid "unable to get blkio weight"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3432
+#, c-format
+msgid "Invalid path, '%s' is not a known interface"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3497
+msgid "Cannot set autostart for transient domain"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3520
+#, c-format
+msgid "Cannot create autostart directory %s"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3527 src/libxl/libxl_driver.c:3503
+#: src/qemu/qemu_driver.c:5796 src/uml/uml_driver.c:2275
+#, c-format
+msgid "Failed to create symlink '%s to '%s'"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3534 src/libxl/libxl_driver.c:3510
+#: src/network/bridge_driver.c:2608 src/qemu/qemu_driver.c:5803
+#: src/storage/storage_driver.c:1063 src/uml/uml_driver.c:2282
+#, c-format
+msgid "Failed to delete symlink '%s'"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3672
+msgid "Suspend operation failed"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3737
 msgid "Resume operation failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2986 src/qemu/qemu_driver.c:3180
-#: src/qemu/qemu_driver.c:3236 src/qemu/qemu_driver.c:3295
-#: src/qemu/qemu_driver.c:3336 src/qemu/qemu_driver.c:3388
-#: src/qemu/qemu_driver.c:3415 src/qemu/qemu_driver.c:3440
-#: src/qemu/qemu_driver.c:3472 src/qemu/qemu_driver.c:3529
-#: src/qemu/qemu_driver.c:3661 src/qemu/qemu_driver.c:3826
-#: src/qemu/qemu_driver.c:3956 src/qemu/qemu_driver.c:4023
-#: src/qemu/qemu_driver.c:4088 src/qemu/qemu_driver.c:4172
-#: src/qemu/qemu_driver.c:4207 src/qemu/qemu_driver.c:4466
-#: src/qemu/qemu_driver.c:4701 src/qemu/qemu_driver.c:4907
-#: src/qemu/qemu_driver.c:5414 src/qemu/qemu_driver.c:5808
-#: src/qemu/qemu_driver.c:5873 src/qemu/qemu_driver.c:5900
-#: src/qemu/qemu_driver.c:6131 src/qemu/qemu_driver.c:6202
-#: src/qemu/qemu_driver.c:6260 src/qemu/qemu_driver.c:6299
-#: src/qemu/qemu_driver.c:6372 src/qemu/qemu_driver.c:7569
-#: src/uml/uml_driver.c:1402 src/uml/uml_driver.c:1427
-#: src/uml/uml_driver.c:1460
+#: src/lxc/lxc_driver.c:3781 src/libxl/libxl_driver.c:2801
+#: src/qemu/qemu_driver.c:1144 src/qemu/qemu_driver.c:1196
+#: src/qemu/qemu_driver.c:1220 src/qemu/qemu_driver.c:1244
+#: src/qemu/qemu_driver.c:1396 src/qemu/qemu_driver.c:1463
+#: src/qemu/qemu_driver.c:1520 src/qemu/qemu_driver.c:1567
+#: src/qemu/qemu_driver.c:1629 src/qemu/qemu_driver.c:1690
+#: src/qemu/qemu_driver.c:1757 src/qemu/qemu_driver.c:1784
+#: src/qemu/qemu_driver.c:1816 src/qemu/qemu_driver.c:1945
+#: src/qemu/qemu_driver.c:2022 src/qemu/qemu_driver.c:2068
+#: src/qemu/qemu_driver.c:2155 src/qemu/qemu_driver.c:2188
+#: src/qemu/qemu_driver.c:2690 src/qemu/qemu_driver.c:2749
+#: src/qemu/qemu_driver.c:2800 src/qemu/qemu_driver.c:2834
+#: src/qemu/qemu_driver.c:2958 src/qemu/qemu_driver.c:3295
+#: src/qemu/qemu_driver.c:3433 src/qemu/qemu_driver.c:3588
+#: src/qemu/qemu_driver.c:3686 src/qemu/qemu_driver.c:3777
+#: src/qemu/qemu_driver.c:3841 src/qemu/qemu_driver.c:4421
+#: src/qemu/qemu_driver.c:4748 src/qemu/qemu_driver.c:4966
+#: src/qemu/qemu_driver.c:5574 src/qemu/qemu_driver.c:5741
+#: src/qemu/qemu_driver.c:5768 src/qemu/qemu_driver.c:7422
+#: src/qemu/qemu_driver.c:7507 src/qemu/qemu_driver.c:7720
+#: src/qemu/qemu_driver.c:7782 src/qemu/qemu_driver.c:7830
+#: src/qemu/qemu_driver.c:7898 src/qemu/qemu_driver.c:7995
+#: src/qemu/qemu_driver.c:8357 src/qemu/qemu_driver.c:8446
+#: src/qemu/qemu_driver.c:8627 src/qemu/qemu_driver.c:8698
+#: src/qemu/qemu_driver.c:8916 src/qemu/qemu_driver.c:8966
+#: src/qemu/qemu_driver.c:9028 src/qemu/qemu_driver.c:9084
+#: src/qemu/qemu_driver.c:9141 src/qemu/qemu_driver.c:9618
+#: src/qemu/qemu_driver.c:9868 src/qemu/qemu_driver.c:9899
+#: src/qemu/qemu_driver.c:9937 src/qemu/qemu_driver.c:9977
+#: src/qemu/qemu_driver.c:10019 src/qemu/qemu_driver.c:10054
+#: src/qemu/qemu_driver.c:10084 src/qemu/qemu_driver.c:10127
+#: src/qemu/qemu_driver.c:10162 src/qemu/qemu_driver.c:10232
+#: src/qemu/qemu_driver.c:10593 src/qemu/qemu_driver.c:10710
+#: src/qemu/qemu_driver.c:10858 src/qemu/qemu_driver.c:10964
+#: src/qemu/qemu_driver.c:11064 src/qemu/qemu_driver.c:11142
+#: src/qemu/qemu_driver.c:11293 src/test/test_driver.c:2119
+#: src/uml/uml_driver.c:1637 src/uml/uml_driver.c:1662
+#: src/uml/uml_driver.c:1695 src/uml/uml_driver.c:2038
+#: src/uml/uml_driver.c:2156 src/uml/uml_driver.c:2389
+#: src/vmware/vmware_driver.c:638
 #, c-format
 msgid "no domain with matching uuid '%s'"
 msgstr ""
 
-#: src/opennebula/one_driver.c:577 src/qemu/qemu_driver.c:3188
-#: src/qemu/qemu_driver.c:3245 src/qemu/qemu_driver.c:3304
-#: src/qemu/qemu_driver.c:3345 src/qemu/qemu_driver.c:3670
-#: src/qemu/qemu_driver.c:3835 src/qemu/qemu_driver.c:6140
-#: src/qemu/qemu_driver.c:6208 src/qemu/qemu_driver.c:6271
-#: src/qemu/qemu_driver.c:6387 src/qemu/qemu_driver.c:7578
-#: src/xen/xen_hypervisor.c:1097 src/xen/xen_hypervisor.c:1181
-#: src/xen/xen_hypervisor.c:1290
-msgid "domain is not running"
-msgstr "le domaine n'est pas actif"
-
-#: src/lxc/lxc_driver.c:3076 src/uml/uml_driver.c:2430
+#: src/lxc/lxc_driver.c:3808 src/uml/uml_driver.c:2416
 #, c-format
 msgid "cannot find console device '%s'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:3077 src/uml/uml_driver.c:2431
+#: src/lxc/lxc_driver.c:3809 src/uml/uml_driver.c:2417
 msgid "default"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:3083 src/qemu/qemu_driver.c:10551
-#: src/uml/uml_driver.c:2437 src/xen/xen_driver.c:2152
+#: src/lxc/lxc_driver.c:3815 src/qemu/qemu_driver.c:10898
+#: src/uml/uml_driver.c:2423 src/xen/xen_driver.c:2160
 #, c-format
 msgid "character device %s is not using a PTY"
 msgstr ""
 
-#: src/lxc/veth.c:231
-#, c-format
-msgid "Failed to enable '%s'"
-msgstr ""
-
-#: tools/virsh.c:354
+#: src/libxl/libxl_driver.c:173 src/qemu/qemu_driver.c:160
+#: src/qemu/qemu_driver.c:168 src/qemu/qemu_hostdev.c:382
+#: src/qemu/qemu_hostdev.c:401 src/qemu/qemu_hostdev.c:429
+#: src/secret/secret_driver.c:505 src/uml/uml_driver.c:169
+#: src/xenapi/xenapi_utils.c:282 tools/virsh.c:530
 msgid "unknown error"
 msgstr ""
 
@@ -6431,7 +7013,7 @@
 msgid "machine type %s too big for destination"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4308
+#: src/libxl/libxl_driver.c:245
 msgid "cannot read domain image"
 msgstr ""
 
@@ -6439,21 +7021,21 @@
 msgid "failed to read libxl header"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4320
+#: src/libxl/libxl_driver.c:256 src/qemu/qemu_driver.c:3965
 msgid "image magic is incorrect"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4326
+#: src/libxl/libxl_driver.c:262 src/qemu/qemu_driver.c:3991
 #, c-format
 msgid "image version is not supported (%d > %d)"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:269 src/qemu/qemu_driver.c:3999
+#: src/libxl/libxl_driver.c:269 src/qemu/qemu_driver.c:3998
 #, c-format
 msgid "invalid XML length: %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4338
+#: src/libxl/libxl_driver.c:279 src/qemu/qemu_driver.c:4009
 msgid "failed to read XML"
 msgstr ""
 
@@ -6467,7 +7049,7 @@
 msgid "Failed to pin vcpu '%d' with libxenlight"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:660 src/qemu/qemu_driver.c:4381
+#: src/libxl/libxl_driver.c:660 src/qemu/qemu_driver.c:4380
 #, c-format
 msgid ""
 "cannot restore domain '%s' uuid %s from a file which belongs to domain '%s' "
@@ -6498,24 +7080,24 @@
 msgid "Failed to create log dir '%s': %s"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:926 src/qemu/qemu_driver.c:509
+#: src/libxl/libxl_driver.c:926 src/qemu/qemu_driver.c:512
 #, c-format
 msgid "Failed to create state dir '%s': %s"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:932 src/qemu/qemu_driver.c:515
+#: src/libxl/libxl_driver.c:932 src/qemu/qemu_driver.c:518
 #, c-format
 msgid "Failed to create lib dir '%s': %s"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:938 src/qemu/qemu_driver.c:527
-#: src/qemu/qemu_driver.c:533
+#: src/libxl/libxl_driver.c:938 src/qemu/qemu_driver.c:530
+#: src/qemu/qemu_driver.c:536
 #, c-format
 msgid "Failed to create save dir '%s': %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:511 src/qemu/qemu_driver.c:543
-#: src/uml/uml_driver.c:859
+#: src/libxl/libxl_driver.c:949 src/qemu/qemu_domain.c:1218
+#: src/uml/uml_driver.c:1019
 #, c-format
 msgid "failed to create logfile %s"
 msgstr ""
@@ -6528,7 +7110,7 @@
 msgid "libxenlight state driver is not active"
 msgstr ""
 
-#: src/xen/xen_driver.c:265
+#: src/libxl/libxl_driver.c:1101 src/xen/xen_driver.c:289
 #, c-format
 msgid "unexpected Xen URI path '%s', try xen:///"
 msgstr ""
@@ -6559,16 +7141,30 @@
 msgid "Failed to destroy domain '%d'"
 msgstr ""
 
-#: src/opennebula/one_driver.c:283 src/opennebula/one_driver.c:314
-#: src/opennebula/one_driver.c:389 src/openvz/openvz_driver.c:395
-#: src/openvz/openvz_driver.c:478 src/openvz/openvz_driver.c:522
-#: src/openvz/openvz_driver.c:559 src/openvz/openvz_driver.c:1015
-#: src/openvz/openvz_driver.c:1057 src/openvz/openvz_driver.c:1088
-#: src/openvz/openvz_driver.c:1161 src/uml/uml_driver.c:1374
-#: src/uml/uml_driver.c:1497 src/uml/uml_driver.c:1537
-#: src/uml/uml_driver.c:1587 src/uml/uml_driver.c:1652
-#: src/uml/uml_driver.c:1696 src/uml/uml_driver.c:1722
-#: src/uml/uml_driver.c:1796
+#: src/libxl/libxl_driver.c:1625 src/libxl/libxl_driver.c:1656
+#: src/libxl/libxl_driver.c:1776 src/libxl/libxl_driver.c:1823
+#: src/libxl/libxl_driver.c:2264 src/libxl/libxl_driver.c:2383
+#: src/libxl/libxl_driver.c:2440 src/libxl/libxl_driver.c:2496
+#: src/libxl/libxl_driver.c:2560 src/libxl/libxl_driver.c:3240
+#: src/libxl/libxl_driver.c:3543 src/libxl/libxl_driver.c:3610
+#: src/libxl/libxl_driver.c:3701 src/openvz/openvz_driver.c:351
+#: src/openvz/openvz_driver.c:399 src/openvz/openvz_driver.c:473
+#: src/openvz/openvz_driver.c:517 src/openvz/openvz_driver.c:555
+#: src/openvz/openvz_driver.c:598 src/openvz/openvz_driver.c:649
+#: src/openvz/openvz_driver.c:1126 src/openvz/openvz_driver.c:1175
+#: src/openvz/openvz_driver.c:1205 src/openvz/openvz_driver.c:1298
+#: src/uml/uml_driver.c:1609 src/uml/uml_driver.c:1732
+#: src/uml/uml_driver.c:1778 src/uml/uml_driver.c:1807
+#: src/uml/uml_driver.c:1859 src/uml/uml_driver.c:1938
+#: src/uml/uml_driver.c:2221 src/uml/uml_driver.c:2247
+#: src/uml/uml_driver.c:2322 src/vbox/vbox_tmpl.c:2031
+#: src/vbox/vbox_tmpl.c:2091 src/vbox/vbox_tmpl.c:5261
+#: src/vbox/vbox_tmpl.c:5355 src/vbox/vbox_tmpl.c:5592
+#: src/vbox/vbox_tmpl.c:8657 src/vbox/vbox_tmpl.c:9022
+#: src/vmware/vmware_driver.c:330 src/vmware/vmware_driver.c:387
+#: src/vmware/vmware_driver.c:436 src/vmware/vmware_driver.c:480
+#: src/vmware/vmware_driver.c:835 src/vmware/vmware_driver.c:913
+#: src/vmware/vmware_driver.c:948
 msgid "no domain with matching uuid"
 msgstr ""
 
@@ -6576,20 +7172,13 @@
 msgid "cannot set memory on an inactive domain"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:1684 src/libxl/libxl_driver.c:2276
-#: src/qemu/qemu_driver.c:1841 src/qemu/qemu_driver.c:3322
-#: src/qemu/qemu_driver.c:3458 src/qemu/qemu_driver.c:5946
-#: src/qemu/qemu_driver.c:6093 src/qemu/qemu_driver.c:6225
-#: src/qemu/qemu_driver.c:6383 src/qemu/qemu_driver.c:6667
-msgid "cannot change persistent config of a transient domain"
-msgstr ""
-
 #: src/libxl/libxl_driver.c:1698
 #, c-format
 msgid "Failed to set maximum memory for domain '%d' with libxenlight"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3478 src/uml/uml_driver.c:1472
+#: src/libxl/libxl_driver.c:1719 src/qemu/qemu_driver.c:1879
+#: src/uml/uml_driver.c:1707
 msgid "cannot set memory higher than max memory"
 msgstr ""
 
@@ -6631,8 +7220,8 @@
 msgstr ""
 
 #: src/libxl/libxl_driver.c:1928 src/libxl/libxl_driver.c:1977
-#: src/test/test_driver.c:1742 src/test/test_driver.c:1855
-#: src/xen/xen_driver.c:1043 src/xen/xen_driver.c:1067
+#: src/test/test_driver.c:1747 src/test/test_driver.c:1860
+#: src/xen/xen_driver.c:1051 src/xen/xen_driver.c:1075
 msgid "xml modification unsupported"
 msgstr ""
 
@@ -6651,13 +7240,13 @@
 msgid "After dumping core, failed to resume domain '%d' with libxenlight"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:2137 src/qemu/qemu_driver.c:2754
+#: src/libxl/libxl_driver.c:2137 src/qemu/qemu_driver.c:2760
 msgid "cannot do managed save for transient domain"
 msgstr ""
 
 #: src/libxl/libxl_driver.c:2250 src/libxl/libxl_driver.c:2397
-#: src/qemu/qemu_driver.c:3792 src/test/test_driver.c:2128
-#: src/test/test_driver.c:2184 src/xen/xen_driver.c:1109
+#: src/qemu/qemu_driver.c:3791 src/test/test_driver.c:2133
+#: src/test/test_driver.c:2189 src/xen/xen_driver.c:1117
 #, c-format
 msgid "invalid flag combination: (0x%x)"
 msgstr ""
@@ -6670,11 +7259,13 @@
 msgid "cannot set vcpus on an inactive domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3978
+#: src/libxl/libxl_driver.c:2282 src/qemu/qemu_driver.c:3341
+#: src/xen/xend_internal.c:2220 src/xen/xm_internal.c:731
 msgid "could not determine max vcpus for the domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3984
+#: src/libxl/libxl_driver.c:2292 src/qemu/qemu_driver.c:3351
+#: src/xen/xend_internal.c:2225 src/xen/xm_internal.c:740
 #, c-format
 msgid ""
 "requested vcpus is greater than max allowable vcpus for the domain: %d > %d"
@@ -6685,12 +7276,12 @@
 msgid "Failed to set vcpus for domain '%d' with libxenlight"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:2411 src/qemu/qemu_driver.c:3806
-#: src/test/test_driver.c:2144
+#: src/libxl/libxl_driver.c:2411 src/qemu/qemu_driver.c:3805
+#: src/qemu/qemu_driver.c:11340 src/test/test_driver.c:2149
 msgid "domain is transient"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4029 src/test/test_driver.c:2191
+#: src/libxl/libxl_driver.c:2446 src/test/test_driver.c:2378
 msgid "cannot pin vcpus on an inactive domain"
 msgstr ""
 
@@ -6703,8 +7294,9 @@
 msgid "Failed to list vcpus for domain '%d' with libxenlight"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4516 src/qemu/qemu_driver.c:4554
-#: src/xen/xen_driver.c:1182 src/xen/xen_driver.c:1221
+#: src/libxl/libxl_driver.c:2587 src/libxl/libxl_driver.c:2630
+#: src/qemu/qemu_driver.c:4482 src/qemu/qemu_driver.c:4526
+#: src/xen/xen_driver.c:1274 src/xen/xen_driver.c:1323
 #, c-format
 msgid "unsupported config type %s"
 msgstr ""
@@ -6717,21 +7309,21 @@
 msgid "parsing xm config failed"
 msgstr ""
 
-#: src/opennebula/one_driver.c:289 src/qemu/qemu_driver.c:4919
-#: src/uml/uml_driver.c:1664
+#: src/libxl/libxl_driver.c:2807 src/qemu/qemu_driver.c:4972
+#: src/uml/uml_driver.c:1944 src/vmware/vmware_driver.c:644
 msgid "cannot undefine transient domain"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:2819 src/qemu/qemu_driver.c:4998
+#: src/libxl/libxl_driver.c:2819 src/qemu/qemu_driver.c:4997
 msgid "Failed to remove domain managed save image"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:2824 src/qemu/qemu_driver.c:5004
-#: tools/virsh.c:2033
+#: src/libxl/libxl_driver.c:2824 src/qemu/qemu_driver.c:5003
+#: tools/virsh.c:2045
 msgid "Refusing to undefine while domain managed save image exists"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5016
+#: src/libxl/libxl_driver.c:2882 src/qemu/qemu_hotplug.c:67
 #, c-format
 msgid "No device with bus '%s' and target '%s'"
 msgstr ""
@@ -6746,12 +7338,15 @@
 msgid "libxenlight failed to change media for disk '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5087 src/qemu/qemu_driver.c:5123
+#: src/libxl/libxl_driver.c:2934 src/qemu/qemu_hotplug.c:203
+#: src/qemu/qemu_hotplug.c:433 src/qemu/qemu_hotplug.c:556
+#: src/uml/uml_driver.c:1984
 #, c-format
 msgid "target %s already exists"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5130
+#: src/libxl/libxl_driver.c:2940 src/qemu/qemu_hotplug.c:574
+#: src/uml/uml_driver.c:1991
 msgid "disk source path is missing"
 msgstr ""
 
@@ -6760,17 +7355,19 @@
 msgid "libxenlight failed to attach disk '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5482
+#: src/libxl/libxl_driver.c:2964 src/qemu/qemu_driver.c:5089
+#: src/uml/uml_driver.c:2061
 #, c-format
 msgid "disk bus '%s' cannot be hotplugged."
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5490
+#: src/libxl/libxl_driver.c:2970 src/qemu/qemu_driver.c:5094
 #, c-format
 msgid "disk device type '%s' cannot be hotplugged"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5549
+#: src/libxl/libxl_driver.c:2997 src/qemu/qemu_hotplug.c:1505
+#: src/qemu/qemu_hotplug.c:1608 src/uml/uml_driver.c:2115
 #, c-format
 msgid "disk %s not found"
 msgstr ""
@@ -6790,74 +7387,75 @@
 msgid "device type '%s' cannot hot unplugged"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5504
+#: src/libxl/libxl_driver.c:3049 src/qemu/qemu_driver.c:5184
+#: src/uml/uml_driver.c:2066
 #, c-format
 msgid "device type '%s' cannot be attached"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3067 src/qemu/qemu_driver.c:5364
+#: src/libxl/libxl_driver.c:3067 src/qemu/qemu_driver.c:5363
 #, c-format
 msgid "target %s already exists."
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3080 src/qemu/qemu_driver.c:5415
+#: src/libxl/libxl_driver.c:3080 src/qemu/qemu_driver.c:5414
 msgid "persistent attach of device is not supported"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3099 src/qemu/qemu_driver.c:5215
-#: src/xen/xm_internal.c:1548
+#: src/libxl/libxl_driver.c:3099 src/xen/xm_internal.c:1547
 #, c-format
 msgid "device type '%s' cannot be detached"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3118 src/qemu/qemu_driver.c:5435
+#: src/libxl/libxl_driver.c:3118 src/qemu/qemu_driver.c:5434
 #, c-format
 msgid "no target device %s"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3125 src/qemu/qemu_driver.c:5464
+#: src/libxl/libxl_driver.c:3125 src/qemu/qemu_driver.c:5463
 msgid "persistent detach of device is not supported"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3150 src/qemu/qemu_driver.c:5306
+#: src/libxl/libxl_driver.c:3150 src/qemu/qemu_driver.c:5305
 #, c-format
 msgid "disk bus '%s' cannot be updated."
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3157 src/qemu/qemu_driver.c:5343
+#: src/libxl/libxl_driver.c:3157 src/qemu/qemu_driver.c:5342
 #, c-format
 msgid "device type '%s' cannot be updated"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3178 src/qemu/qemu_driver.c:5484
+#: src/libxl/libxl_driver.c:3178 src/qemu/qemu_driver.c:5483
 #, c-format
 msgid "target %s doesn't exist."
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3184 src/qemu/qemu_driver.c:5491
+#: src/libxl/libxl_driver.c:3184 src/qemu/qemu_driver.c:5490
 msgid "this disk doesn't support update"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3205 src/qemu/qemu_driver.c:5536
+#: src/libxl/libxl_driver.c:3205 src/qemu/qemu_driver.c:5535
 msgid "persistent update of device is not supported"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3260 src/qemu/qemu_driver.c:5600
+#: src/libxl/libxl_driver.c:3260 src/qemu/qemu_driver.c:5599
 msgid "cannot modify device on transient domain"
 msgstr ""
 
 #: src/libxl/libxl_driver.c:3290 src/libxl/libxl_driver.c:3314
-#: src/qemu/qemu_driver.c:5626 src/qemu/qemu_driver.c:5656
+#: src/qemu/qemu_driver.c:5625 src/qemu/qemu_driver.c:5655
 #, c-format
 msgid "unknown domain modify action %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5906 src/uml/uml_driver.c:1728
+#: src/libxl/libxl_driver.c:3481 src/qemu/qemu_driver.c:5774
+#: src/uml/uml_driver.c:2253
 msgid "cannot set autostart for transient domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5923 src/storage/storage_driver.c:1021
-#: src/uml/uml_driver.c:1745
+#: src/libxl/libxl_driver.c:3496 src/qemu/qemu_driver.c:5789
+#: src/storage/storage_driver.c:1048 src/uml/uml_driver.c:2268
 #, c-format
 msgid "cannot create autostart directory %s"
 msgstr ""
@@ -6877,21 +7475,6 @@
 msgid "Failed to get scheduler parameters for domain '%d' with libxenlight"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3646 src/libxl/libxl_driver.c:3657
-#: src/qemu/qemu_driver.c:6117 src/qemu/qemu_driver.c:6140
-#: src/qemu/qemu_driver.c:6408 src/qemu/qemu_driver.c:6418
-#: src/qemu/qemu_driver.c:6428 src/qemu/qemu_driver.c:6462
-#: src/qemu/qemu_driver.c:6478 src/qemu/qemu_driver.c:6494
-#: src/qemu/qemu_driver.c:6988 src/qemu/qemu_driver.c:7002
-#: src/qemu/qemu_driver.c:7015 src/qemu/qemu_driver.c:7232
-#: src/qemu/qemu_driver.c:7246 src/qemu/qemu_driver.c:7260
-#: src/qemu/qemu_driver.c:7274 src/qemu/qemu_driver.c:7288
-#: src/qemu/qemu_driver.c:7302 src/qemu/qemu_driver.c:7316
-#: src/qemu/qemu_driver.c:7330 src/test/test_driver.c:2721
-#, c-format
-msgid "Field name '%s' too long"
-msgstr ""
-
 #: src/libxl/libxl_driver.c:3738
 msgid "invalid type for weight tunable, expected a 'uint'"
 msgstr ""
@@ -6928,11 +7511,11 @@
 msgid "libxenlight does not support transient disks"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2395
+#: src/libxl/libxl_conf.c:693 src/qemu/qemu_process.c:2974
 msgid "Unable to find an unused VNC port"
 msgstr ""
 
-#: src/xen/xend_internal.c:5287
+#: src/libxl/libxl_conf.c:775 src/xenxs/xen_sxpr.c:1564
 msgid "unexpected chr device type"
 msgstr ""
 
@@ -6944,302 +7527,266 @@
 msgid "Failed to get version info from libxenlight"
 msgstr ""
 
-#: src/network/bridge_driver.c:246 src/qemu/qemu_conf.c:1404
-#: src/uml/uml_conf.c:114
-msgid "cannot initialize bridge support"
-msgstr ""
-
-#: src/network/bridge_driver.c:544 src/network/bridge_driver.c:550
+#: src/network/bridge_driver.c:688 src/network/bridge_driver.c:694
+#: src/network/bridge_driver.c:706 src/network/bridge_driver.c:773
+#: src/network/bridge_driver.c:779
 #, c-format
 msgid "cannot create directory %s"
 msgstr ""
 
-#: src/network/bridge_driver.c:775
+#: src/network/bridge_driver.c:765
 #, c-format
 msgid "Cannot find %s - Possibly the package isn't installed"
 msgstr ""
 
-#: src/network/bridge_driver.c:821
+#: src/network/bridge_driver.c:811
 #, c-format
 msgid "bridge  '%s' has an invalid prefix"
 msgstr ""
 
-#: src/network/bridge_driver.c:857
+#: src/network/bridge_driver.c:847
 #, c-format
 msgid "couldn't write radvd config file '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:907 src/network/bridge_driver.c:1081
+#: src/network/bridge_driver.c:897 src/network/bridge_driver.c:1071
 #, c-format
 msgid "Invalid prefix or netmask for '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:603
+#: src/network/bridge_driver.c:909
 #, c-format
 msgid "failed to add iptables rule to allow forwarding from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:614
+#: src/network/bridge_driver.c:923
 #, c-format
 msgid "failed to add iptables rule to allow forwarding to '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:969
+#: src/network/bridge_driver.c:959
 #, c-format
 msgid "failed to add iptables rule to enable masquerading to %s"
 msgstr ""
 
-#: src/network/bridge_driver.c:970
+#: src/network/bridge_driver.c:960
 msgid "failed to add iptables rule to enable masquerading"
 msgstr ""
 
-#: src/network/bridge_driver.c:983
+#: src/network/bridge_driver.c:973
 #, c-format
 msgid "failed to add iptables rule to enable UDP masquerading to %s"
 msgstr ""
 
-#: src/network/bridge_driver.c:984
+#: src/network/bridge_driver.c:974
 msgid "failed to add iptables rule to enable UDP masquerading"
 msgstr ""
 
-#: src/network/bridge_driver.c:997
+#: src/network/bridge_driver.c:987
 #, c-format
 msgid "failed to add iptables rule to enable TCP masquerading to %s"
 msgstr ""
 
-#: src/network/bridge_driver.c:998
+#: src/network/bridge_driver.c:988
 msgid "failed to add iptables rule to enable TCP masquerading"
 msgstr ""
 
-#: src/network/bridge_driver.c:656
+#: src/network/bridge_driver.c:1083
 #, c-format
 msgid "failed to add iptables rule to allow routing from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:667
+#: src/network/bridge_driver.c:1095
 #, c-format
 msgid "failed to add iptables rule to allow routing to '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:1159
+#: src/network/bridge_driver.c:1149
 #, c-format
 msgid "failed to add ip6tables rule to block outbound traffic from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:1167
+#: src/network/bridge_driver.c:1157
 #, c-format
 msgid "failed to add ip6tables rule to block inbound traffic to '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:1176
+#: src/network/bridge_driver.c:1166
 #, c-format
 msgid "failed to add ip6tables rule to allow cross bridge traffic on '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:1185 src/network/bridge_driver.c:1193
+#: src/network/bridge_driver.c:1175 src/network/bridge_driver.c:1183
 #, c-format
 msgid "failed to add ip6tables rule to allow DNS requests from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:693 src/network/bridge_driver.c:700
+#: src/network/bridge_driver.c:1236 src/network/bridge_driver.c:1244
 #, c-format
 msgid "failed to add iptables rule to allow DHCP requests from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:708 src/network/bridge_driver.c:715
+#: src/network/bridge_driver.c:1267 src/network/bridge_driver.c:1275
 #, c-format
 msgid "failed to add iptables rule to allow DNS requests from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:1295
+#: src/network/bridge_driver.c:1285
 #, c-format
 msgid "failed to add iptables rule to allow TFTP requests from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:725
+#: src/network/bridge_driver.c:1295
 #, c-format
 msgid "failed to add iptables rule to block outbound traffic from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:732
+#: src/network/bridge_driver.c:1303
 #, c-format
 msgid "failed to add iptables rule to block inbound traffic to '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:740
+#: src/network/bridge_driver.c:1312
 #, c-format
 msgid "failed to add iptables rule to allow cross bridge traffic on '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:1533
+#: src/network/bridge_driver.c:1523
 #, c-format
 msgid "cannot write to %s to disable IPv6 on bridge %s"
 msgstr ""
 
-#: src/network/bridge_driver.c:871
+#: src/network/bridge_driver.c:1545 src/network/bridge_driver.c:1561
 #, c-format
 msgid "cannot disable %s"
 msgstr ""
 
-#: src/network/bridge_driver.c:1664
+#: src/network/bridge_driver.c:1654
 #, c-format
 msgid "Network is already in use by interface %s"
 msgstr ""
 
-#: src/network/bridge_driver.c:1686
+#: src/network/bridge_driver.c:1675
 #, c-format
 msgid "bridge '%s' has an invalid netmask or IP address"
 msgstr ""
 
-#: src/network/bridge_driver.c:1694
-#, c-format
-msgid "cannot set IP address on bridge '%s'"
-msgstr ""
-
-#: src/network/bridge_driver.c:906
-#, c-format
-msgid "cannot create bridge '%s'"
-msgstr ""
-
-#: src/network/bridge_driver.c:1739
-#, c-format
-msgid "cannot create dummy tap device '%s' to set mac address on bridge '%s'"
-msgstr ""
-
-#: src/network/bridge_driver.c:1751
-#, c-format
-msgid "cannot set forward delay on bridge '%s'"
-msgstr ""
-
-#: src/network/bridge_driver.c:1759
-#, c-format
-msgid "cannot set STP '%s' on bridge '%s'"
-msgstr ""
-
-#: src/network/bridge_driver.c:938
-#, c-format
-msgid "failed to bring the bridge '%s' up"
-msgstr ""
-
-#: src/network/bridge_driver.c:949
+#: src/network/bridge_driver.c:1765
 msgid "failed to enable IP forwarding"
 msgstr ""
 
-#: src/network/bridge_driver.c:900
+#: src/network/bridge_driver.c:1914
 msgid "network is already active"
 msgstr ""
 
-#: src/network/bridge_driver.c:1058 src/network/bridge_driver.c:1327
-#: src/network/bridge_driver.c:1365 src/network/bridge_driver.c:1388
-#: src/network/bridge_driver.c:1423 src/network/bridge_driver.c:1478
-#: src/network/bridge_driver.c:1503
+#: src/network/bridge_driver.c:2016 src/network/bridge_driver.c:2344
+#: src/network/bridge_driver.c:2431 src/network/bridge_driver.c:2454
+#: src/network/bridge_driver.c:2493 src/network/bridge_driver.c:2548
+#: src/network/bridge_driver.c:2573
 msgid "no network with matching uuid"
 msgstr ""
 
-#: src/network/bridge_driver.c:1081
+#: src/network/bridge_driver.c:2039 src/network/bridge_driver.c:2706
+#: src/network/bridge_driver.c:2920 src/network/bridge_driver.c:3021
+#: src/network/bridge_driver.c:3108
 #, c-format
 msgid "no network with matching name '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:2367
+#: src/network/bridge_driver.c:2289
 msgid ""
 "Multiple dhcp sections found. dhcp is supported only for a single IPv4 "
 "address on each network"
 msgstr ""
 
-#: src/network/bridge_driver.c:1333
+#: src/network/bridge_driver.c:2350
 msgid "network is still active"
 msgstr ""
 
-#: src/network/bridge_driver.c:1394
+#: src/network/bridge_driver.c:2460
 msgid "network is not active"
 msgstr ""
 
-#: src/network/bridge_driver.c:1446
+#: src/network/bridge_driver.c:2516
 msgid "no network with matching id"
 msgstr ""
 
-#: src/network/bridge_driver.c:1452 src/test/test_driver.c:3061
+#: src/network/bridge_driver.c:2522 src/test/test_driver.c:3291
 #, c-format
 msgid "network '%s' does not have a bridge name."
 msgstr ""
 
-#: src/network/bridge_driver.c:1509
+#: src/network/bridge_driver.c:2579
 msgid "cannot set autostart for transient network"
 msgstr ""
 
-#: src/network/bridge_driver.c:1524
+#: src/network/bridge_driver.c:2594
 #, c-format
 msgid "cannot create autostart directory '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:1531 src/storage/storage_driver.c:1028
+#: src/network/bridge_driver.c:2601 src/storage/storage_driver.c:1055
 #, c-format
 msgid "Failed to create symlink '%s' to '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:2887 src/network/bridge_driver.c:3000
-#: src/network/bridge_driver.c:3101
+#: src/network/bridge_driver.c:2822 src/network/bridge_driver.c:2935
+#: src/network/bridge_driver.c:3036
 #, c-format
 msgid ""
 "network '%s' uses a direct mode, but has no forward dev and no interface pool"
 msgstr ""
 
-#: src/network/bridge_driver.c:2925
+#: src/network/bridge_driver.c:2860
 #, c-format
 msgid ""
 "network '%s' requires exclusive access to interfaces, but none are available"
 msgstr ""
 
-#: src/network/bridge_driver.c:2993 src/network/bridge_driver.c:3094
+#: src/network/bridge_driver.c:2928 src/network/bridge_driver.c:3029
 msgid "the interface uses a direct mode, but has no source dev"
 msgstr ""
 
-#: src/network/bridge_driver.c:3018 src/network/bridge_driver.c:3117
+#: src/network/bridge_driver.c:2953 src/network/bridge_driver.c:3052
 #, c-format
 msgid "network '%s' doesn't have dev='%s' in use by domain"
 msgstr ""
 
-#: src/network/bridge_driver.c:3034
+#: src/network/bridge_driver.c:2969
 #, c-format
 msgid "network '%s' claims dev='%s' is already in use by a different domain"
 msgstr ""
 
-#: src/network/bridge_driver.c:3187
+#: src/network/bridge_driver.c:3122
 #, c-format
 msgid "network '%s' doesn't have an IPv4 address"
 msgstr ""
 
-#: src/network/bridge_driver.c:3209
+#: src/network/bridge_driver.c:3144
 #, c-format
 msgid "network '%s' has no associated interface or bridge"
 msgstr ""
 
-#: src/network/bridge_driver.c:3218
-#, c-format
-msgid "Failed to get IP address for '%s' (network '%s')"
-msgstr ""
-
-#: src/node_device/node_device_driver.c:101
+#: src/node_device/node_device_driver.c:88
 #, c-format
 msgid "cannot resolve driver link %s"
 msgstr ""
 
-#: src/node_device/node_device_driver.c:280
-#: src/node_device/node_device_driver.c:309
-#: src/node_device/node_device_driver.c:344
-#: src/node_device/node_device_driver.c:375 src/test/test_driver.c:4811
-#: src/test/test_driver.c:4837 src/test/test_driver.c:4873
-#: src/test/test_driver.c:4904
+#: src/node_device/node_device_driver.c:275
+#: src/node_device/node_device_driver.c:305
+#: src/node_device/node_device_driver.c:341
+#: src/node_device/node_device_driver.c:372 src/test/test_driver.c:5181
+#: src/test/test_driver.c:5207 src/test/test_driver.c:5243
+#: src/test/test_driver.c:5274
 #, c-format
 msgid "no node device with matching name '%s'"
 msgstr ""
 
-#: src/node_device/node_device_driver.c:320 src/test/test_driver.c:4848
+#: src/node_device/node_device_driver.c:316 src/test/test_driver.c:5218
 msgid "no parent for this device"
 msgstr ""
 
-#: src/node_device/node_device_driver.c:421
+#: src/node_device/node_device_driver.c:418
 #, c-format
 msgid "Invalid vport operation (%d)"
 msgstr ""
@@ -7249,16 +7796,16 @@
 msgid "No vport operation path found for host%d"
 msgstr ""
 
-#: src/node_device/node_device_driver.c:452
+#: src/node_device/node_device_driver.c:469
 #, c-format
 msgid "Write of '%s' to '%s' during vport create/delete failed"
 msgstr ""
 
-#: src/node_device/node_device_driver.c:461
+#: src/node_device/node_device_driver.c:478
 msgid "Vport operation complete"
 msgstr ""
 
-#: src/node_device/node_device_driver.c:474
+#: src/node_device/node_device_driver.c:491
 msgid "Could not get current time"
 msgstr ""
 
@@ -7290,13 +7837,13 @@
 msgid "libhal_get_all_devices failed"
 msgstr ""
 
-#: src/node_device/node_device_hal.c:801 src/qemu/qemu_migration.c:879
-#: src/qemu/qemu_migration.c:902 src/qemu/qemu_migration.c:908
+#: src/node_device/node_device_hal.c:801 src/qemu/qemu_migration.c:880
+#: src/qemu/qemu_migration.c:903 src/qemu/qemu_migration.c:909
 #, c-format
 msgid "%s: %s"
 msgstr ""
 
-#: src/node_device/node_device_linux_sysfs.c:57
+#: src/node_device/node_device_linux_sysfs.c:59
 #, c-format
 msgid "Failed to open WWN path '%s' for reading"
 msgstr ""
@@ -7311,6 +7858,11 @@
 msgid "Failed to read WWNN for host%d"
 msgstr ""
 
+#: src/node_device/node_device_linux_sysfs.c:155
+#, c-format
+msgid "Failed to read fabric WWN for host%d"
+msgstr ""
+
 #: src/node_device/node_device_udev.c:64
 #, c-format
 msgid "Failed to convert '%s' to unsigned long long"
@@ -7405,8 +7957,9 @@
 msgid "udev_monitor_new_from_netlink returned NULL"
 msgstr ""
 
-#: src/nodeinfo.c:159 src/uml/uml_driver.c:1821 src/util/pci.c:1082
-#: src/util/util.c:353
+#: src/nodeinfo.c:106 src/nodeinfo.c:152 src/nodeinfo.c:617 src/nodeinfo.c:652
+#: src/nodeinfo.c:716 src/uml/uml_driver.c:2344 src/util/command.c:265
+#: src/util/pci.c:1594
 #, c-format
 msgid "cannot open %s"
 msgstr ""
@@ -7421,11 +7974,11 @@
 msgid "could not convert '%s' to an integer"
 msgstr ""
 
-#: src/nodeinfo.c:82
+#: src/nodeinfo.c:230
 msgid "parsing cpuinfo processor"
 msgstr ""
 
-#: src/nodeinfo.c:94
+#: src/nodeinfo.c:245 src/nodeinfo.c:277
 msgid "parsing cpuinfo cpu MHz"
 msgstr ""
 
@@ -7439,7 +7992,7 @@
 msgid "parsing number of processors %c"
 msgstr ""
 
-#: src/nodeinfo.c:121
+#: src/nodeinfo.c:314
 msgid "no cpus found"
 msgstr ""
 
@@ -7461,7 +8014,8 @@
 msgid "no threads found"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1975 src/qemu/qemu_driver.c:6066
+#: src/nodeinfo.c:417 src/xen/xen_hypervisor.c:1270
+#: src/xen/xend_internal.c:3609
 msgid "Invalid parameter count"
 msgstr ""
 
@@ -7489,7 +8043,7 @@
 msgid "no available memory line found"
 msgstr ""
 
-#: src/nodeinfo.c:175
+#: src/nodeinfo.c:633
 msgid "node info not implemented on this platform"
 msgstr ""
 
@@ -7497,7 +8051,7 @@
 msgid "node CPU stats not implemented on this platform"
 msgstr ""
 
-#: src/nodeinfo.c:257 src/nodeinfo.c:294
+#: src/nodeinfo.c:692 src/nodeinfo.c:822 src/nodeinfo.c:860
 msgid "NUMA not supported on this host"
 msgstr ""
 
@@ -7509,7 +8063,7 @@
 msgid "node memory stats not implemented on this platform"
 msgstr ""
 
-#: src/nodeinfo.c:263
+#: src/nodeinfo.c:828
 #, c-format
 msgid "start cell %d out of range (0-%d)"
 msgstr ""
@@ -7519,11 +8073,11 @@
 msgid "Failed to query NUMA free memory for node: %d"
 msgstr ""
 
-#: src/nodeinfo.c:275 src/nodeinfo.c:302
+#: src/nodeinfo.c:868
 msgid "Failed to query NUMA free memory"
 msgstr ""
 
-#: src/nodeinfo.c:323 src/nodeinfo.c:330
+#: src/nodeinfo.c:889 src/nodeinfo.c:896
 msgid "NUMA memory information not available on this platform"
 msgstr ""
 
@@ -7541,137 +8095,129 @@
 msgid "nwfilter is in use"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:163
-#, c-format
-msgid "cannot find value for '%s'"
-msgstr ""
-
-#: src/nwfilter/nwfilter_ebiptables_driver.c:170
+#: src/nwfilter/nwfilter_ebiptables_driver.c:241
 #, c-format
 msgid "Buffer to small to print MAC address '%s' into"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:204
+#: src/nwfilter/nwfilter_ebiptables_driver.c:275
 msgid "buffer too small for IP address"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:218
+#: src/nwfilter/nwfilter_ebiptables_driver.c:289
 msgid "buffer too small for IPv6 address"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:229
+#: src/nwfilter/nwfilter_ebiptables_driver.c:300
 msgid "Buffer too small for MAC address"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:241
-#: src/nwfilter/nwfilter_ebiptables_driver.c:261
+#: src/nwfilter/nwfilter_ebiptables_driver.c:312
+#: src/nwfilter/nwfilter_ebiptables_driver.c:342
 msgid "Buffer too small for uint8 type"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:251
+#: src/nwfilter/nwfilter_ebiptables_driver.c:322
+msgid "Buffer too small for uint32 type"
+msgstr ""
+
+#: src/nwfilter/nwfilter_ebiptables_driver.c:332
 msgid "Buffer too small for uint16 type"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:268
+#: src/nwfilter/nwfilter_ebiptables_driver.c:349
 #, c-format
 msgid "Unhandled datatype %x"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:1172
+#: src/nwfilter/nwfilter_ebiptables_driver.c:1224
 #, c-format
 msgid "cannot create rule since %s tool is missing."
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:1897
+#: src/nwfilter/nwfilter_ebiptables_driver.c:1942
 msgid "cannot create rule since ebtables tool is missing."
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:2448
-msgid "illegal protocol type"
-msgstr ""
-
-#: src/nwfilter/nwfilter_ebiptables_driver.c:2513
-msgid "cannot create temporary file"
-msgstr ""
-
-#: src/nwfilter/nwfilter_ebiptables_driver.c:2520
-msgid "cannot change permissions on temp. file"
+#: src/nwfilter/nwfilter_ebiptables_driver.c:2043
+#, c-format
+msgid ""
+"STP filtering in %s direction with source MAC address set is not supported"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:2529
-#: src/nwfilter/nwfilter_ebiptables_driver.c:2538
-msgid "cannot write string to file"
+#: src/nwfilter/nwfilter_ebiptables_driver.c:2598
+msgid "illegal protocol type"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:2994
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3086
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3197
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3112
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3208
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3323
 msgid "cannot create rules since ebtables tool is missing."
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3052
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3170
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3241
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3171
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3297
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3369
 msgid "Some rules could not be created."
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3310
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3474
 #, c-format
 msgid "To enable ip%stables filtering for the VM do 'echo 1 > %s'"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3514
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3796
 #, c-format
-msgid "Some rules could not be created for interface %s."
+msgid "Some rules could not be created for interface %s%s%s"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3634
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3936
 msgid "error while executing CLI commands"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3769
+#: src/nwfilter/nwfilter_ebiptables_driver.c:4077
 msgid "essential tools to support ip(6)tables firewalls could not be located"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3778
+#: src/nwfilter/nwfilter_ebiptables_driver.c:4086
 msgid "firewall tools were not found or cannot be used"
 msgstr ""
 
-#: src/nwfilter/nwfilter_gentech_driver.c:155
+#: src/nwfilter/nwfilter_gentech_driver.c:160
 msgid "Could not add variable 'MAC' to hashmap"
 msgstr ""
 
-#: src/nwfilter/nwfilter_gentech_driver.c:165
+#: src/nwfilter/nwfilter_gentech_driver.c:174
 msgid "Could not add variable 'IP' to hashmap"
 msgstr ""
 
-#: src/nwfilter/nwfilter_gentech_driver.c:422
-#: src/nwfilter/nwfilter_gentech_driver.c:513
-#: src/nwfilter/nwfilter_gentech_driver.c:805
+#: src/nwfilter/nwfilter_gentech_driver.c:426
+#: src/nwfilter/nwfilter_gentech_driver.c:523
+#: src/nwfilter/nwfilter_gentech_driver.c:810
 #, c-format
 msgid "Filter '%s' is in use."
 msgstr ""
 
-#: src/nwfilter/nwfilter_gentech_driver.c:471
-#: src/nwfilter/nwfilter_gentech_driver.c:557
+#: src/nwfilter/nwfilter_gentech_driver.c:474
+#: src/nwfilter/nwfilter_gentech_driver.c:566
 #, c-format
 msgid "referenced filter '%s' is missing"
 msgstr ""
 
-#: src/nwfilter/nwfilter_gentech_driver.c:744
+#: src/nwfilter/nwfilter_gentech_driver.c:750
 #, c-format
 msgid "Cannot instantiate filter due to unresolvable variables: %s"
 msgstr ""
 
-#: src/nwfilter/nwfilter_gentech_driver.c:787
-#: src/nwfilter/nwfilter_gentech_driver.c:1017
-#: src/nwfilter/nwfilter_gentech_driver.c:1043
-#: src/nwfilter/nwfilter_gentech_driver.c:1067
+#: src/nwfilter/nwfilter_gentech_driver.c:792
+#: src/nwfilter/nwfilter_gentech_driver.c:1012
+#: src/nwfilter/nwfilter_gentech_driver.c:1038
+#: src/nwfilter/nwfilter_gentech_driver.c:1063
 #, c-format
 msgid "Could not get access to ACL tech driver '%s'"
 msgstr ""
 
-#: src/nwfilter/nwfilter_gentech_driver.c:798
+#: src/nwfilter/nwfilter_gentech_driver.c:803
 #, c-format
 msgid "Could not find filter '%s'"
 msgstr ""
@@ -7685,34 +8231,39 @@
 msgid "interface name %s does not fit into buffer "
 msgstr ""
 
-#: src/nwfilter/nwfilter_learnipaddr.c:651
+#: src/nwfilter/nwfilter_learnipaddr.c:706
+#, c-format
+msgid "Failed to add IP address %s to IP address cache for interface %s"
+msgstr ""
+
+#: src/nwfilter/nwfilter_learnipaddr.c:724
 #, c-format
 msgid "encountered an error on interface %s index %d"
 msgstr ""
 
-#: src/nwfilter/nwfilter_learnipaddr.c:715
+#: src/nwfilter/nwfilter_learnipaddr.c:788
 msgid ""
 "IP parameter must be provided since snooping the IP address does not work "
 "possibly due to missing tools"
 msgstr ""
 
-#: src/nwfilter/nwfilter_learnipaddr.c:743
+#: src/nwfilter/nwfilter_learnipaddr.c:816
 #, c-format
 msgid "Destination buffer for ifname ('%s') not large enough"
 msgstr ""
 
-#: src/nwfilter/nwfilter_learnipaddr.c:751
+#: src/nwfilter/nwfilter_learnipaddr.c:824
 #, c-format
 msgid "Destination buffer for linkdev ('%s') not large enough"
 msgstr ""
 
-#: src/nwfilter/nwfilter_learnipaddr.c:803
+#: src/nwfilter/nwfilter_learnipaddr.c:876
 msgid ""
 "IP parameter must be given since libvirt was not compiled with IP address "
 "learning support"
 msgstr ""
 
-#: src/openvz/openvz_conf.c:131
+#: src/openvz/openvz_conf.c:124
 msgid "Could not extract vzctl version"
 msgstr ""
 
@@ -7757,25 +8308,26 @@
 msgid "Wrong MAC address"
 msgstr ""
 
-#: src/openvz/openvz_conf.c:371
+#: src/openvz/openvz_conf.c:373
 #, c-format
 msgid "Could not read 'OSTEMPLATE' from config for container %d"
 msgstr ""
 
-#: src/openvz/openvz_conf.c:385
+#: src/openvz/openvz_conf.c:387
 #, c-format
 msgid "Could not read 'VE_PRIVATE' from config for container %d"
 msgstr ""
 
-#: src/openvz/openvz_conf.c:456 src/openvz/openvz_driver.c:154
+#: src/openvz/openvz_conf.c:464 src/openvz/openvz_conf.c:1054
+#: src/openvz/openvz_driver.c:1651
 msgid "Failed to parse vzlist output"
 msgstr ""
 
-#: src/openvz/openvz_conf.c:494
+#: src/openvz/openvz_conf.c:511
 msgid "UUID in config file malformed"
 msgstr ""
 
-#: src/openvz/openvz_conf.c:506
+#: src/openvz/openvz_conf.c:523
 #, c-format
 msgid "Could not read config for container %d"
 msgstr ""
@@ -7789,143 +8341,145 @@
 msgid "Failed to scan configuration directory"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:119
+#: src/openvz/openvz_driver.c:110
 msgid "Container is not defined"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:192 src/openvz/openvz_driver.c:745
+#: src/openvz/openvz_driver.c:155 src/openvz/openvz_driver.c:849
 #, c-format
 msgid "Could not put argument to %s"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:215
+#: src/openvz/openvz_driver.c:173
 msgid "only one filesystem supported"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:224
+#: src/openvz/openvz_driver.c:182
 msgid "filesystem is not of type 'template' or 'mount'"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:235
+#: src/openvz/openvz_driver.c:193
 msgid "Could not convert domain name to VEID"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:241
+#: src/openvz/openvz_driver.c:199
 msgid "Could not copy default config"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:247
+#: src/openvz/openvz_driver.c:205
 msgid "Could not set the source dir for the filesystem"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:255
+#: src/openvz/openvz_driver.c:212
 msgid "Error creating command for container"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:406
+#: src/openvz/openvz_driver.c:364
 #, c-format
 msgid "cannot read cputime for domain %d"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:529 src/openvz/openvz_driver.c:566
+#: src/openvz/openvz_driver.c:608 src/openvz/openvz_driver.c:659
+#: src/vmware/vmware_driver.c:336 src/vmware/vmware_driver.c:395
+#: src/vmware/vmware_driver.c:491
 msgid "domain is not in running state"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:646
+#: src/openvz/openvz_driver.c:749
 msgid "Container ID is not specified"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:679
+#: src/openvz/openvz_driver.c:785
 msgid "Could not generate eth name for container"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:690
+#: src/openvz/openvz_driver.c:797
 msgid "Could not generate veth name"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:774
+#: src/openvz/openvz_driver.c:878
 msgid "Could not configure network"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:785
+#: src/openvz/openvz_driver.c:889
 msgid "cannot replace NETIF config"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:823
+#: src/openvz/openvz_driver.c:921
 #, c-format
 msgid "Already an OPENVZ VM active with the id '%s'"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:835 src/openvz/openvz_driver.c:917
+#: src/openvz/openvz_driver.c:932 src/openvz/openvz_driver.c:1014
 msgid "Error creating initial configuration"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:843 src/openvz/openvz_driver.c:923
+#: src/openvz/openvz_driver.c:940 src/openvz/openvz_driver.c:1020
 msgid "Could not set UUID"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:951 src/vbox/vbox_tmpl.c:5049
+#: src/openvz/openvz_driver.c:949 src/vbox/vbox_tmpl.c:5054
 msgid "current vcpu count must equal maximum"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:853 src/openvz/openvz_driver.c:945
+#: src/openvz/openvz_driver.c:955 src/openvz/openvz_driver.c:1040
 msgid "Could not set number of virtual cpu"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:861
+#: src/openvz/openvz_driver.c:963
 msgid "Could not set memory size"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:903
+#: src/openvz/openvz_driver.c:1001
 #, c-format
 msgid "Already an OPENVZ VM defined with the id '%s'"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:976
+#: src/openvz/openvz_driver.c:1074
 msgid "no domain with matching id"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:982
+#: src/openvz/openvz_driver.c:1083 src/vmware/vmware_driver.c:217
 msgid "domain is not in shutoff state"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1094
+#: src/openvz/openvz_driver.c:1211
 msgid "Could not read container config"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1115 src/qemu/qemu_driver.c:2846
+#: src/openvz/openvz_driver.c:1235 src/qemu/qemu_driver.c:1010
 #, c-format
 msgid "unknown type '%s'"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1246 src/openvz/openvz_driver.c:1290
+#: src/openvz/openvz_driver.c:1244 src/openvz/openvz_driver.c:1288
 #, c-format
 msgid "unsupported flags (0x%x)"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1167
+#: src/openvz/openvz_driver.c:1304
 msgid "VCPUs should be >= 1"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1212
+#: src/openvz/openvz_driver.c:1357
 #, c-format
 msgid "unexpected OpenVZ URI path '%s', try openvz:///system"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1219
+#: src/openvz/openvz_driver.c:1364
 msgid "OpenVZ control file /proc/vz does not exist"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1225
+#: src/openvz/openvz_driver.c:1370
 msgid "OpenVZ control file /proc/vz is not accessible"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1317 src/openvz/openvz_driver.c:1363
+#: src/openvz/openvz_driver.c:1465 src/openvz/openvz_driver.c:1520
 #, c-format
 msgid "Could not parse VPS ID %s"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1472 src/openvz/openvz_driver.c:1531
+#: src/openvz/openvz_driver.c:1476 src/openvz/openvz_driver.c:1535
 msgid "failed to close file"
 msgstr ""
 
@@ -7952,179 +8506,179 @@
 msgid "Unable to determine number of domains."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:347
+#: src/phyp/phyp_driver.c:1005 src/phyp/phyp_driver.c:1086
 msgid "No authentication callback provided."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:280
+#: src/phyp/phyp_driver.c:1026
 #, c-format
 msgid "Error while getting %s address info"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:297
+#: src/phyp/phyp_driver.c:1043
 #, c-format
 msgid "Failed to connect to %s"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:317
+#: src/phyp/phyp_driver.c:1063
 msgid "Failure establishing SSH session."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:386
+#: src/phyp/phyp_driver.c:1105
 msgid "Authentication failed"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:94
+#: src/phyp/phyp_driver.c:1160
 msgid "Missing server name in phyp:// URI"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:153
+#: src/phyp/phyp_driver.c:1202
 msgid "Error parsing 'path'. Invalid characters."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:159
+#: src/phyp/phyp_driver.c:1209
 msgid "Error while opening SSH session."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:1573 src/phyp/phyp_driver.c:1618
-#: src/phyp/phyp_driver.c:1796
+#: src/phyp/phyp_driver.c:1590 src/phyp/phyp_driver.c:1635
+#: src/phyp/phyp_driver.c:1813
 msgid "Unable to get VIOS profile name."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:1613 src/phyp/phyp_driver.c:1761
+#: src/phyp/phyp_driver.c:1630 src/phyp/phyp_driver.c:1778
 msgid "Unable to get VIOS name"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:1623
+#: src/phyp/phyp_driver.c:1640
 msgid "Unable to get free slot number"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:1771 src/phyp/phyp_driver.c:1775
+#: src/phyp/phyp_driver.c:1788 src/phyp/phyp_driver.c:1792
 msgid "Unable to create new virtual adapter"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:1855
+#: src/phyp/phyp_driver.c:1872
 msgid ""
 "Possibly you don't have IBM Tools installed in your LPAR.Contact your "
 "support to enable this feature."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:1986
+#: src/phyp/phyp_driver.c:2003
 #, c-format
 msgid "Unable to create Volume: %s"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2037 src/phyp/phyp_driver.c:2290
-#: src/phyp/phyp_driver.c:2739
+#: src/phyp/phyp_driver.c:2054 src/phyp/phyp_driver.c:2307
+#: src/phyp/phyp_driver.c:2756
 msgid "Unable to determine storage pool's name."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2042 src/phyp/phyp_driver.c:2744
+#: src/phyp/phyp_driver.c:2059 src/phyp/phyp_driver.c:2761
 msgid "Unable to determine storage pool's uuid."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2048 src/phyp/phyp_driver.c:2750
+#: src/phyp/phyp_driver.c:2065 src/phyp/phyp_driver.c:2767
 msgid "Unable to determine storage pools's size."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2061 src/phyp/phyp_driver.c:2763
+#: src/phyp/phyp_driver.c:2078 src/phyp/phyp_driver.c:2780
 msgid "Unable to determine storage pools's source adapter."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2066
+#: src/phyp/phyp_driver.c:2083
 msgid "Error parsing volume XML."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2072
+#: src/phyp/phyp_driver.c:2089
 msgid "StoragePool name already exists."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2080
+#: src/phyp/phyp_driver.c:2097
 msgid "Key must be empty, Power Hypervisor will create one for you."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2085
+#: src/phyp/phyp_driver.c:2102
 msgid "Capacity cannot be empty."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2261
+#: src/phyp/phyp_driver.c:2278
 msgid "Unable to determine storage sp's name."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2266
+#: src/phyp/phyp_driver.c:2283
 msgid "Unable to determine storage sp's uuid."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2271
+#: src/phyp/phyp_driver.c:2288
 msgid "Unable to determine storage sps's size."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2283
+#: src/phyp/phyp_driver.c:2300
 msgid "Unable to determine storage sps's source adapter."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2490
+#: src/phyp/phyp_driver.c:2507
 #, c-format
 msgid "Unable to destroy Storage Pool: %s"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2529
+#: src/phyp/phyp_driver.c:2546
 #, c-format
 msgid "Unable to create Storage Pool: %s"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3340
+#: src/phyp/phyp_driver.c:3357
 msgid "Unable to determine domain's name."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3345
+#: src/phyp/phyp_driver.c:3362
 msgid "Unable to generate random uuid."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3351
+#: src/phyp/phyp_driver.c:3368
 msgid "Unable to determine domain's max memory."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3357
+#: src/phyp/phyp_driver.c:3374
 msgid "Unable to determine domain's memory."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3363
+#: src/phyp/phyp_driver.c:3380
 msgid "Unable to determine domain's CPU."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3566
+#: src/phyp/phyp_driver.c:3583
 msgid ""
 "Field <memory> on the domain XML file is missing or has invalid value."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3573
+#: src/phyp/phyp_driver.c:3590
 msgid ""
 "Field <currentMemory> on the domain XML file is missing or has invalid value."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3580
+#: src/phyp/phyp_driver.c:3597
 msgid "Domain XML must contain at least one <disk> element."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3586
+#: src/phyp/phyp_driver.c:3603
 msgid "Field <src> under <disk> on the domain XML file is missing."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3602
+#: src/phyp/phyp_driver.c:3619
 #, c-format
 msgid "Unable to create LPAR. Reason: '%s'"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3607
+#: src/phyp/phyp_driver.c:3624
 msgid "Unable to add LPAR to the table"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3711
+#: src/phyp/phyp_driver.c:3728
 msgid "You are trying to set a number of CPUs bigger than the max possible."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3735
+#: src/phyp/phyp_driver.c:3752
 msgid ""
 "Possibly you don't have IBM Tools installed in your LPAR. Contact your "
 "support to enable this feature."
@@ -8140,23 +8694,23 @@
 msgid "cannot filter mac addresses on bridge '%s'"
 msgstr ""
 
-#: src/qemu/qemu_bridge_filter.c:80 src/qemu/qemu_bridge_filter.c:102
+#: src/qemu/qemu_bridge_filter.c:79 src/qemu/qemu_bridge_filter.c:100
 #, c-format
 msgid "failed to add ebtables rule to allow routing to '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1355 src/qemu/qemu_driver.c:2419
-#: src/qemu/qemu_driver.c:4604
+#: src/qemu/qemu_capabilities.c:285 src/qemu/qemu_capabilities.c:1330
+#: src/qemu/qemu_capabilities.c:1413
 #, c-format
 msgid "Cannot find QEMU binary %s"
 msgstr ""
 
-#: src/qemu/qemu_capabilities.c:1193
+#: src/qemu/qemu_capabilities.c:1202
 #, c-format
 msgid "cannot parse %s version number in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_capabilities.c:1398
+#: src/qemu/qemu_capabilities.c:1407
 #, c-format
 msgid "Cannot find suitable emulator for %s"
 msgstr ""
@@ -8171,7 +8725,7 @@
 msgid "Unable to deny access for disk path %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1956
+#: src/qemu/qemu_cgroup.c:164 src/qemu/qemu_migration.c:2873
 #, c-format
 msgid "Unable to allow device %s for %s"
 msgstr ""
@@ -8181,25 +8735,25 @@
 msgid "Unable to allow device %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1929
+#: src/qemu/qemu_cgroup.c:211
 #, c-format
 msgid "Unable to create cgroup for %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1943
+#: src/qemu/qemu_cgroup.c:227
 #, c-format
 msgid "Unable to deny all devices for %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1965
+#: src/qemu/qemu_cgroup.c:242
 msgid "unable to allow /dev/pts/ devices"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1973
+#: src/qemu/qemu_cgroup.c:257
 msgid "unable to allow /dev/snd/ devices"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1984 src/qemu/qemu_driver.c:5450
+#: src/qemu/qemu_cgroup.c:269
 #, c-format
 msgid "unable to allow device %s"
 msgstr ""
@@ -8209,860 +8763,827 @@
 msgid "Unable to set io weight for domain %s"
 msgstr ""
 
-#: src/qemu/qemu_cgroup.c:311
+#: src/qemu/qemu_cgroup.c:311 src/qemu/qemu_cgroup.c:334
 msgid "Block I/O tuning is not available on this host"
 msgstr ""
 
-#: src/qemu/qemu_cgroup.c:349
-msgid "Memory cgroup is not available on this host"
-msgstr ""
-
-#: src/qemu/qemu_cgroup.c:358
+#: src/qemu/qemu_cgroup.c:326
 #, c-format
-msgid "Unable to set io cpu shares for domain %s"
-msgstr ""
-
-#: src/qemu/qemu_cgroup.c:364
-msgid "CPU tuning is not available on this host"
-msgstr ""
-
-#: src/qemu/qemu_cgroup.c:394
-msgid "Unable to get cpu bandwidth period"
-msgstr ""
-
-#: src/qemu/qemu_cgroup.c:401
-msgid "Unable to set cpu bandwidth period"
+msgid "Unable to set io device weight for domain %s"
 msgstr ""
 
-#: src/qemu/qemu_cgroup.c:410
-msgid "Unable to set cpu bandwidth quota"
+#: src/qemu/qemu_cgroup.c:373
+msgid "Memory cgroup is not available on this host"
 msgstr ""
 
-#: src/qemu/qemu_cgroup.c:422 src/qemu/qemu_cgroup.c:457
-#: src/qemu/qemu_driver.c:6539 src/xenapi/xenapi_utils.c:391
-#: src/xenapi/xenapi_utils.c:395
-#, c-format
-msgid "%s"
+#: src/qemu/qemu_cgroup.c:388
+msgid "CPU tuning is not available on this host"
 msgstr ""
 
-#: src/qemu/qemu_cgroup.c:446 src/qemu/qemu_cgroup.c:537
-#: src/qemu/qemu_driver.c:5068 src/qemu/qemu_driver.c:5289
+#: src/qemu/qemu_cgroup.c:470 src/qemu/qemu_cgroup.c:561
+#: src/qemu/qemu_driver.c:5067 src/qemu/qemu_driver.c:5288
 #: src/qemu/qemu_hotplug.c:1047 src/qemu/qemu_hotplug.c:1521
-#: src/qemu/qemu_hotplug.c:1624 src/qemu/qemu_migration.c:2860
+#: src/qemu/qemu_hotplug.c:1624 src/qemu/qemu_migration.c:2861
 #, c-format
 msgid "Unable to find cgroup for %s"
 msgstr ""
 
-#: src/qemu/qemu_cgroup.c:483
+#: src/qemu/qemu_cgroup.c:507
 #, c-format
 msgid "Unable to create vcpu cgroup for %s(vcpu: %d)"
 msgstr ""
 
-#: src/qemu/qemu_cgroup.c:493
+#: src/qemu/qemu_cgroup.c:517
 #, c-format
 msgid "unable to add vcpu %d task %d to cgroup"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2042
+#: src/qemu/qemu_cgroup.c:584
 #, c-format
 msgid "unable to find cgroup for domain %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2050
+#: src/qemu/qemu_cgroup.c:592
 #, c-format
 msgid "unable to add domain %s task %d to cgroup"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1448
-#, c-format
-msgid "failed to add ebtables rule to allow MAC address on  '%s'"
-msgstr ""
-
-#: src/qemu/qemu_command.c:197
-msgid "No support for macvtap device"
-msgstr ""
-
-#: src/qemu/qemu_command.c:233
+#: src/qemu/qemu_command.c:200
 #, c-format
 msgid "Network '%s' is not active."
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1398
+#: src/qemu/qemu_command.c:226
 #, c-format
 msgid "Network type %d is not supported"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1429 src/uml/uml_conf.c:133
-#, c-format
-msgid "Failed to add tap interface to bridge. %s is not a bridge device"
-msgstr ""
-
-#: src/qemu/qemu_command.c:300 src/uml/uml_conf.c:161
-msgid ""
-"Failed to add tap interface to bridge. Your kernel is missing the 'tun' "
-"module or CONFIG_TUN, or you need to add the /dev/net/tun device node."
-msgstr ""
-
-#: src/qemu/qemu_conf.c:1433 src/uml/uml_conf.c:137
-#, c-format
-msgid "Failed to add tap interface to bridge '%s'"
-msgstr ""
-
-#: src/qemu/qemu_conf.c:1437 src/uml/uml_conf.c:141
+#: src/qemu/qemu_command.c:261
 #, c-format
-msgid "Failed to add tap interface '%s' to bridge '%s'"
+msgid "failed to add ebtables rule to allow MAC address on  '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:372
+#: src/qemu/qemu_command.c:312
 msgid "vhost-net is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:383
+#: src/qemu/qemu_command.c:323
 msgid "vhost-net is only supported for virtio network interfaces"
 msgstr ""
 
-#: src/qemu/qemu_command.c:399
+#: src/qemu/qemu_command.c:339
 msgid "vhost-net was requested for an interface, but is unavailable"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4954
+#: src/qemu/qemu_command.c:420
 #, c-format
 msgid "cannot convert disk '%s' to bus/device index"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4980
+#: src/qemu/qemu_command.c:449
 #, c-format
 msgid "Unsupported disk name mapping for bus '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:573
+#: src/qemu/qemu_command.c:513
 msgid "Unable to determine device index for network device"
 msgstr ""
 
-#: src/qemu/qemu_command.c:600
+#: src/qemu/qemu_command.c:540
 msgid "Unable to determine device index for hostdev device"
 msgstr ""
 
-#: src/qemu/qemu_command.c:627
+#: src/qemu/qemu_command.c:567
 msgid "Unable to determine device index for redirected device"
 msgstr ""
 
-#: src/qemu/qemu_command.c:763
+#: src/qemu/qemu_command.c:703
 msgid "Only PCI domain 0 and bus 0 are available"
 msgstr ""
 
-#: src/qemu/qemu_command.c:797
+#: src/qemu/qemu_command.c:737
 #, c-format
 msgid ""
 "Attempted double use of PCI Address '%s' (may need \"multifunction='on'\" "
 "for device on function 0"
 msgstr ""
 
-#: src/qemu/qemu_command.c:802
+#: src/qemu/qemu_command.c:742
 #, c-format
 msgid "Attempted double use of PCI Address '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:826
+#: src/qemu/qemu_command.c:766
 #, c-format
 msgid ""
 "Attempted double use of PCI Address '%s'(need \"multifunction='off'\" for "
 "device on function 0)"
 msgstr ""
 
-#: src/qemu/qemu_command.c:946
+#: src/qemu/qemu_command.c:886
 #, c-format
 msgid "unable to reserve PCI address %s"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1007
+#: src/qemu/qemu_command.c:947
 msgid "Only PCI device addresses with function=0 are supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1135
+#: src/qemu/qemu_command.c:1075
 msgid "No more available PCI addresses"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1195
+#: src/qemu/qemu_command.c:1135
 msgid "Primary IDE controller must have PCI address 0:0:1.1"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1218
+#: src/qemu/qemu_command.c:1158
 msgid "PIIX3 USB controller must have PCI address 0:0:1.2"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1253
+#: src/qemu/qemu_command.c:1193
 msgid "Primary video card must have PCI address 0:0:2.0"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1333
+#: src/qemu/qemu_command.c:1273
 msgid "virtio only support device address type 'PCI'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1415
+#: src/qemu/qemu_command.c:1355
 msgid "Only PCI device addresses with domain=0 are supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1420
+#: src/qemu/qemu_command.c:1360
 msgid "Only PCI device addresses with bus=0 are supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1426
+#: src/qemu/qemu_command.c:1366
 msgid "The function of PCI device addresses must less than 8"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1433
+#: src/qemu/qemu_command.c:1373
 msgid ""
 "Only PCI device addresses with function=0 are supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1439
+#: src/qemu/qemu_command.c:1379
 msgid "'multifunction=on' is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1876
+#: src/qemu/qemu_command.c:1430
 #, c-format
 msgid "driver serial '%s' contains unsafe characters"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2296 src/qemu/qemu_conf.c:2410 src/uml/uml_conf.c:475
+#: src/qemu/qemu_command.c:1471
+#, c-format
+msgid "could not get the value of the secret for username %s"
+msgstr ""
+
+#: src/qemu/qemu_command.c:1486
+#, c-format
+msgid "rbd username '%s' specified but secret not found"
+msgstr ""
+
+#: src/qemu/qemu_command.c:1635 src/qemu/qemu_command.c:1924
+#: src/qemu/qemu_command.c:4222 src/uml/uml_conf.c:429
 #, c-format
 msgid "unsupported disk type '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1520
+#: src/qemu/qemu_command.c:1643
 msgid "unexpected address type for scsi disk"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1529
+#: src/qemu/qemu_command.c:1652
 msgid "SCSI controller only supports 1 bus"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1539
+#: src/qemu/qemu_command.c:1662
 msgid "unexpected address type for ide disk"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1545 src/qemu/qemu_command.c:1561
+#: src/qemu/qemu_command.c:1668 src/qemu/qemu_command.c:1684
 #, c-format
 msgid "Only 1 %s controller is supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1555
+#: src/qemu/qemu_command.c:1678
 msgid "unexpected address type for fdc disk"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1567
+#: src/qemu/qemu_command.c:1690
 #, c-format
 msgid "Only 1 %s bus is supported"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2321 src/qemu/qemu_conf.c:2420
+#: src/qemu/qemu_command.c:1715 src/qemu/qemu_command.c:4232
 #, c-format
 msgid "unsupported disk driver type for '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2327 src/qemu/qemu_conf.c:2426
+#: src/qemu/qemu_command.c:1721 src/qemu/qemu_command.c:4238
 msgid "cannot create virtual FAT disks in read-write mode"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1610 src/qemu/qemu_command.c:4058
+#: src/qemu/qemu_command.c:1733 src/qemu/qemu_command.c:4254
 msgid "NBD accepts only one host"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1665 src/xenxs/xen_sxpr.c:1748
+#: src/qemu/qemu_command.c:1790 src/xenxs/xen_sxpr.c:1747
 #: src/xenxs/xen_xm.c:1189
 msgid "transient disks not supported yet"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1688
+#: src/qemu/qemu_command.c:1813
 msgid "disk cache mode 'directsync' is not supported by this QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1694
+#: src/qemu/qemu_command.c:1819
 msgid "disk cache mode 'unsafe' is not supported by this QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1738
+#: src/qemu/qemu_command.c:1863
 msgid "disk aio mode not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1808
+#: src/qemu/qemu_command.c:1964
 #, c-format
 msgid "unsupported disk bus '%s' with device setup"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1837
+#: src/qemu/qemu_command.c:1993
 msgid "only supports mount filesystem type"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1843
+#: src/qemu/qemu_command.c:1999
 msgid "Filesystem driver type not supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1879
+#: src/qemu/qemu_command.c:2035
 msgid "can only passthrough directories"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1946
+#: src/qemu/qemu_command.c:2102
 #, c-format
 msgid "%s not supported in this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2016
+#: src/qemu/qemu_command.c:2172
 #, c-format
 msgid "Unknown controller type: %s"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2098
+#: src/qemu/qemu_command.c:2254
 msgid "unrecognized virtio-net-pci 'tx' option"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2103
+#: src/qemu/qemu_command.c:2259
 msgid "virtio-net-pci 'tx' option not supported in this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2253 src/qemu/qemu_command.c:5047
+#: src/qemu/qemu_command.c:2409 src/qemu/qemu_command.c:5231
 msgid "missing watchdog model"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2802
+#: src/qemu/qemu_command.c:2489 src/qemu/qemu_command.c:5193
 msgid "invalid sound model"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2392
+#: src/qemu/qemu_command.c:2548
 msgid "invalid video model"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2401 src/qemu/qemu_command.c:4883
+#: src/qemu/qemu_command.c:2557 src/qemu/qemu_command.c:5067
 #, c-format
 msgid "value for 'vram' must be less than '%u'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2444
+#: src/qemu/qemu_command.c:2600
 #, c-format
 msgid "Failed opening %s"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2473
+#: src/qemu/qemu_command.c:2629
 msgid "rombar not supported in this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2525
+#: src/qemu/qemu_command.c:2681
 #, c-format
 msgid "Redirection bus %s is not supported by QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2532
+#: src/qemu/qemu_command.c:2688
 msgid "USB redirection is not supported by this version of QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2565 src/qemu/qemu_command.c:2635
+#: src/qemu/qemu_command.c:2721 src/qemu/qemu_command.c:2791
 msgid "USB host device is missing bus/device information"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2598
+#: src/qemu/qemu_command.c:2754
 #, c-format
 msgid "hub type %s not supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2605
+#: src/qemu/qemu_command.c:2761
 msgid "usb-hub not supported by QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2733
+#: src/qemu/qemu_command.c:2889
 msgid "spicevmc not supported in this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2742
+#: src/qemu/qemu_command.c:2898
 #, c-format
 msgid "unsupported chardev '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2870
+#: src/qemu/qemu_command.c:3026
 msgid "Cannot use virtio serial for parallel/serial devices"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2880
+#: src/qemu/qemu_command.c:3036
 msgid "virtio serial device has invalid address type"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2898
+#: src/qemu/qemu_command.c:3054
 #, c-format
 msgid "Unsupported spicevmc target name '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3042 src/qemu/qemu_command.c:3597
-#: src/xenxs/xen_sxpr.c:2114 src/xenxs/xen_xm.c:1577
+#: src/qemu/qemu_command.c:3198 src/qemu/qemu_command.c:3815
+#: src/xenxs/xen_sxpr.c:2113 src/xenxs/xen_xm.c:1577
 #, c-format
 msgid "unsupported clock offset '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3056
+#: src/qemu/qemu_command.c:3212
 #, c-format
 msgid "unsupported rtc timer track '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3080
+#: src/qemu/qemu_command.c:3236
 #, c-format
 msgid "unsupported rtc timer tickpolicy '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3129
+#: src/qemu/qemu_command.c:3285
 msgid "CPU specification not supported by hypervisor"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1803
+#: src/qemu/qemu_command.c:3299
 msgid "guest CPU is not compatible with host CPU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3255
+#: src/qemu/qemu_command.c:3411
 msgid ""
 "setting current vcpu count less than maximum is not supported with this QEMU "
 "binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3337
+#: src/qemu/qemu_command.c:3551
 #, c-format
 msgid "the QEMU binary %s does not support kqemu"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3350
+#: src/qemu/qemu_command.c:3564
 #, c-format
 msgid "the QEMU binary %s does not support kvm"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3361
+#: src/qemu/qemu_command.c:3575
 #, c-format
 msgid "the QEMU binary %s does not support %s"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2095
+#: src/qemu/qemu_command.c:3622
 msgid "hugetlbfs filesystem is not mounted"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2100
+#: src/qemu/qemu_command.c:3627
 msgid "hugepages are disabled by administrator config"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2105
+#: src/qemu/qemu_command.c:3632
 #, c-format
 msgid "hugepage backing not supported by '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2135
+#: src/qemu/qemu_command.c:3674
 #, c-format
 msgid "qemu emulator '%s' does not support xen"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3469
+#: src/qemu/qemu_command.c:3687
 #, c-format
 msgid "the QEMU binary %s does not support smbios settings"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3478 src/qemu/qemu_driver.c:977
+#: src/qemu/qemu_command.c:3696 src/qemu/qemu_driver.c:983
 msgid "Host SMBIOS information is not available"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3487
+#: src/qemu/qemu_command.c:3705
 #, c-format
 msgid "Domain '%s' sysinfo are not available"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3532
+#: src/qemu/qemu_command.c:3750
 msgid "qemu does not support -device"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3537
+#: src/qemu/qemu_command.c:3755
 msgid "qemu does not support SGA"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3542
+#: src/qemu/qemu_command.c:3760
 msgid "need at least one serial port to use SGA"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3613
+#: src/qemu/qemu_command.c:3831
 #, c-format
 msgid "unsupported timer type (name) '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3633 src/qemu/qemu_command.c:3644
+#: src/qemu/qemu_command.c:3851 src/qemu/qemu_command.c:3862
 #, c-format
 msgid "unsupported rtc tickpolicy '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3668 src/qemu/qemu_command.c:3677
+#: src/qemu/qemu_command.c:3886 src/qemu/qemu_command.c:3895
 #, c-format
 msgid "unsupported pit tickpolicy '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3699
+#: src/qemu/qemu_command.c:3917
 msgid "pit timer is not supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3732
+#: src/qemu/qemu_command.c:3950
 msgid "hypervisor lacks deviceboot feature"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2246
+#: src/qemu/qemu_command.c:4016 src/qemu/qemu_driver.c:5059
 #, c-format
 msgid "unsupported driver name '%s' for disk '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3819
+#: src/qemu/qemu_command.c:4037
 msgid "SATA is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3836
+#: src/qemu/qemu_command.c:4054
 msgid "Multiple legacy USB controller not supported"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2286 src/qemu/qemu_conf.c:2391
+#: src/qemu/qemu_command.c:4111 src/qemu/qemu_command.c:4202
 #, c-format
 msgid "unsupported usb disk type for '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4136
+#: src/qemu/qemu_command.c:4320
 msgid "filesystem passthrough not supported by this QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4289
+#: src/qemu/qemu_command.c:4473
 msgid "this QEMU binary lacks multiple smartcard support"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4300 src/qemu/qemu_command.c:4312
+#: src/qemu/qemu_command.c:4484 src/qemu/qemu_command.c:4496
 msgid "this QEMU binary lacks smartcard host mode support"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4322
+#: src/qemu/qemu_command.c:4506
 #, c-format
 msgid "invalid certificate name: %s"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4333
+#: src/qemu/qemu_command.c:4517
 #, c-format
 msgid "invalid database name: %s"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4348
+#: src/qemu/qemu_command.c:4532
 msgid "this QEMU binary lacks smartcard passthrough mode support"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4457
+#: src/qemu/qemu_command.c:4641
 msgid "guestfwd requires QEMU to support -chardev & -device"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4485 src/qemu/qemu_command.c:4524
+#: src/qemu/qemu_command.c:4669 src/qemu/qemu_command.c:4708
 msgid "virtio channel requires QEMU to support -device"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4549
+#: src/qemu/qemu_command.c:4733
 #, c-format
 msgid "unsupported console target type %s"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4590
+#: src/qemu/qemu_command.c:4774
 msgid "only 1 graphics device is supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4629 src/qemu/qemu_command.c:4771
+#: src/qemu/qemu_command.c:4813 src/qemu/qemu_command.c:4955
 msgid "network-based listen not possible, network driver not present"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4635 src/qemu/qemu_command.c:4777
+#: src/qemu/qemu_command.c:4819 src/qemu/qemu_command.c:4961
 #, c-format
 msgid "listen network '%s' had no usable address"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4713
+#: src/qemu/qemu_command.c:4897
 #, c-format
 msgid "sdl not supported by '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4750
+#: src/qemu/qemu_command.c:4934
 msgid "spice graphics are not supported with this QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4851
+#: src/qemu/qemu_command.c:5035
 #, c-format
 msgid "unsupported graphics type '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4864
+#: src/qemu/qemu_command.c:5048
 msgid "This QEMU does not support QXL graphics adapters"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2756 src/qemu/qemu_conf.c:2782
+#: src/qemu/qemu_command.c:5055
 #, c-format
 msgid "video type %s is not supported with QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4917
+#: src/qemu/qemu_command.c:5101
 #, c-format
 msgid "video type %s is not supported with this QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4929
+#: src/qemu/qemu_command.c:5113
 #, c-format
 msgid "video type %s is only valid as primary video card"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2745
+#: src/qemu/qemu_command.c:5128
 msgid "only one video card is currently supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4980 src/qemu/qemu_command.c:5016
+#: src/qemu/qemu_command.c:5164 src/qemu/qemu_command.c:5200
 msgid "this QEMU binary lacks hda support"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2829
+#: src/qemu/qemu_command.c:5247
 msgid "invalid watchdog action"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5104
+#: src/qemu/qemu_command.c:5288
 msgid "booting from assigned devices is only supported for PCI devices"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5109
+#: src/qemu/qemu_command.c:5293
 msgid ""
 "booting from assigned PCI devices is not supported with this version of qemu"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2869 src/qemu/qemu_monitor_text.c:1377
+#: src/qemu/qemu_command.c:5350 src/qemu/qemu_monitor_text.c:1961
 msgid "PCI device assignment is not supported by this version of qemu"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1927
+#: src/qemu/qemu_command.c:5364
 msgid "TCP migration is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1935 src/qemu/qemu_conf.c:1941
+#: src/qemu/qemu_command.c:5381
 msgid "STDIO migration is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5204
+#: src/qemu/qemu_command.c:5388
 msgid "EXEC migration is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5212
+#: src/qemu/qemu_command.c:5396
 msgid "FD migration is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5221
+#: src/qemu/qemu_command.c:5405
 msgid "UNIX migration is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5228
+#: src/qemu/qemu_command.c:5412
 msgid "unknown migration protocol"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5243
+#: src/qemu/qemu_command.c:5427
 #, c-format
 msgid ""
 "Memory balloon device type '%s' is not supported by this version of qemu"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3084
+#: src/qemu/qemu_command.c:5645
 #, c-format
 msgid "malformed keyword arguments in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5566 src/qemu/qemu_command.c:6704
+#: src/qemu/qemu_command.c:5748 src/qemu/qemu_command.c:6890
 #, c-format
 msgid "cannot parse nbd filename '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5622 src/qemu/qemu_command.c:6731
+#: src/qemu/qemu_command.c:5807 src/qemu/qemu_command.c:6919
 #, c-format
 msgid "cannot parse sheepdog filename '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3218
+#: src/qemu/qemu_command.c:5894
 #, c-format
 msgid "cannot parse drive index '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5717
+#: src/qemu/qemu_command.c:5902
 #, c-format
 msgid "cannot parse drive bus '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5725
+#: src/qemu/qemu_command.c:5910
 #, c-format
 msgid "cannot parse drive unit '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5734
+#: src/qemu/qemu_command.c:5919
 #, c-format
 msgid "cannot parse io mode '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3227
+#: src/qemu/qemu_command.c:5931
 #, c-format
 msgid "missing file parameter in drive '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5759
+#: src/qemu/qemu_command.c:5944
 #, c-format
 msgid "missing index/unit/bus parameter in drive '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5808
+#: src/qemu/qemu_command.c:5993
 #, c-format
 msgid "invalid device name '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3294
+#: src/qemu/qemu_command.c:6029
 #, c-format
 msgid "cannot parse NIC vlan in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3306
+#: src/qemu/qemu_command.c:6041
 #, c-format
 msgid "cannot find NIC definition for vlan %d"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3365
+#: src/qemu/qemu_command.c:6098
 #, c-format
 msgid "cannot parse vlan in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3395
+#: src/qemu/qemu_command.c:6128
 #, c-format
 msgid "cannot parse NIC definition '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5991
+#: src/qemu/qemu_command.c:6176
 #, c-format
 msgid "cannot parse sndbuf size in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3466 src/qemu/qemu_conf.c:3524
+#: src/qemu/qemu_command.c:6212
 #, c-format
 msgid "unknown PCI device syntax '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3474 src/qemu/qemu_conf.c:3547
+#: src/qemu/qemu_command.c:6220
 #, c-format
 msgid "cannot extract PCI device bus '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3481
+#: src/qemu/qemu_command.c:6227
 #, c-format
 msgid "cannot extract PCI device slot '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3488
+#: src/qemu/qemu_command.c:6234
 #, c-format
 msgid "cannot extract PCI device function '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6084
+#: src/qemu/qemu_command.c:6269
 #, c-format
 msgid "unknown USB device syntax '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3533
+#: src/qemu/qemu_command.c:6278
 #, c-format
 msgid "cannot extract USB device vendor '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6100
+#: src/qemu/qemu_command.c:6285
 #, c-format
 msgid "cannot extract USB device product '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6107
+#: src/qemu/qemu_command.c:6292
 #, c-format
 msgid "cannot extract USB device bus '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6114
+#: src/qemu/qemu_command.c:6299
 #, c-format
 msgid "cannot extract USB device address '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3667
+#: src/qemu/qemu_command.c:6408
 #, c-format
 msgid "cannot find port number in character device %s"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3707
+#: src/qemu/qemu_command.c:6448
 #, c-format
 msgid "unknown character device syntax %s"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3782
+#: src/qemu/qemu_command.c:6541
 #, c-format
 msgid "unknown CPU syntax '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6435
+#: src/qemu/qemu_command.c:6620
 #, c-format
 msgid "cannot parse CPU topology '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3814
+#: src/qemu/qemu_command.c:6661
 msgid "no emulator path found"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6488
+#: src/qemu/qemu_command.c:6674
 msgid "failed to generate uuid"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3866
+#: src/qemu/qemu_command.c:6723
 #, c-format
 msgid "missing value for %s argument"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6597
+#: src/qemu/qemu_command.c:6783
 #, c-format
 msgid "missing VNC port number in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3911
+#: src/qemu/qemu_command.c:6790
 #, c-format
 msgid "cannot parse VNC port '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3935
+#: src/qemu/qemu_command.c:6817
 #, c-format
 msgid "cannot parse memory level '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3952
+#: src/qemu/qemu_command.c:6829
 #, c-format
 msgid "cannot parse UUID '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:4217
+#: src/qemu/qemu_command.c:7193
 #, c-format
 msgid "unknown video adapter type '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:7073
+#: src/qemu/qemu_command.c:7260
 msgid "CEPH_ARGS was set without an rbd disk"
 msgstr ""
 
-#: src/qemu/qemu_command.c:7080
+#: src/qemu/qemu_command.c:7267
 #, c-format
 msgid "could not parse CEPH_ARGS '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:7115
+#: src/qemu/qemu_command.c:7302
 #, c-format
 msgid "found no rbd hosts in CEPH_ARGS '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:7325
+#: src/qemu/qemu_command.c:7511
 #, c-format
 msgid "Unable to resolve %s for pid %u"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:123
+#: src/qemu/qemu_conf.c:108
 msgid "unable to find hugetlbfs mountpoint"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:250
+#: src/qemu/qemu_conf.c:292
 msgid "cgroup_controllers must be a list of strings"
 msgstr ""
 
@@ -9071,965 +9592,949 @@
 msgid "Unknown cgroup controller '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:288
+#: src/qemu/qemu_conf.c:333
 msgid "cgroup_device_acl must be a list of strings"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:406
+#: src/qemu/qemu_conf.c:407
 #, c-format
 msgid "failed to enable mac filter in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:338
+#: src/qemu/qemu_conf.c:415
 #, c-format
 msgid "failed to add rule to drop all frames in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:457
+#: src/qemu/qemu_conf.c:458
 #, c-format
 msgid "Failed to load lock manager %s"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:239
+#: src/qemu/qemu_domain.c:244
 msgid "Unexpected QEMU monitor still active during domain deletion"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:213
+#: src/qemu/qemu_domain.c:335
 msgid "no monitor path"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:240
+#: src/qemu/qemu_domain.c:362
 #, c-format
 msgid "unsupported monitor type '%s'"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:388
+#: src/qemu/qemu_domain.c:393
 msgid "failed to parse qemu capabilities flags"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:401
+#: src/qemu/qemu_domain.c:406
 #, c-format
 msgid "Unknown qemu capabilities flag %s"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:421
+#: src/qemu/qemu_domain.c:426
 #, c-format
 msgid "Unknown job type %s"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:434
+#: src/qemu/qemu_domain.c:439
 #, c-format
 msgid "Unknown async job type %s"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:445
+#: src/qemu/qemu_domain.c:450
 #, c-format
 msgid "Unknown job phase %s"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:500
+#: src/qemu/qemu_domain.c:505
 #, c-format
 msgid "Failed to register xml namespace '%s'"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:523
+#: src/qemu/qemu_domain.c:528
 msgid "No qemu command-line argument specified"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:549
+#: src/qemu/qemu_domain.c:554
 msgid "No qemu environment name specified"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:554
+#: src/qemu/qemu_domain.c:559
 msgid "Empty qemu environment name specified"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:559
+#: src/qemu/qemu_domain.c:564
 msgid "Invalid environment name, it must begin with a letter or underscore"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:564
+#: src/qemu/qemu_domain.c:569
 msgid ""
 "Invalid environment name, it must contain only alphanumerics and underscore"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:313 src/qemu/qemu_driver.c:356
+#: src/qemu/qemu_domain.c:789
 msgid "cannot acquire state change lock"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:788
+#: src/qemu/qemu_domain.c:793
 msgid "cannot acquire state change lock due to max_queued limit"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:316 src/qemu/qemu_driver.c:359
+#: src/qemu/qemu_domain.c:797
 msgid "cannot acquire job mutex"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:845
+#: src/qemu/qemu_domain.c:850
 msgid "Attempt to start invalid job"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:915
+#: src/qemu/qemu_domain.c:920
 #, c-format
 msgid "unepxected async job %d"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:924
+#: src/qemu/qemu_domain.c:929
 msgid "domain is no longer running"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7907
+#: src/qemu/qemu_domain.c:1086 src/qemu/qemu_driver.c:8875
 msgid "cannot get host CPU capabilities"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:1218
+#: src/qemu/qemu_domain.c:1223
 #, c-format
 msgid "failed to set close-on-exec flag on %s"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:1302
+#: src/qemu/qemu_domain.c:1307
 #, c-format
 msgid "Unable to write to domain logfile %s"
 msgstr ""
 
-#: src/storage/storage_backend.c:589
+#: src/qemu/qemu_domain.c:1334 src/storage/storage_backend.c:783
 msgid "unable to find kvm-img or qemu-img"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:1360
+#: src/qemu/qemu_domain.c:1365
 #, c-format
 msgid "cannot create snapshot directory '%s'"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:1433
+#: src/qemu/qemu_domain.c:1438
 #, c-format
 msgid "Disk device '%s' does not support snapshotting"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:1630 src/qemu/qemu_domain.c:1638
+#: src/qemu/qemu_domain.c:1635 src/qemu/qemu_domain.c:1643
 #, c-format
 msgid "cannot access file '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:155
+#: src/qemu/qemu_driver.c:158
 #, c-format
 msgid "Failed to start job on VM '%s': %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:229
+#: src/qemu/qemu_driver.c:232
 msgid "Failed to initialize security drivers"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:310
+#: src/qemu/qemu_driver.c:313
 #, c-format
 msgid "Failed to allocate memory for snapshot directory for domain %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:320
+#: src/qemu/qemu_driver.c:323
 #, c-format
 msgid "Failed to open snapshot directory %s for domain %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:335
+#: src/qemu/qemu_driver.c:338
 msgid "Failed to allocate memory for path"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:342
+#: src/qemu/qemu_driver.c:345
 #, c-format
 msgid "Failed to read snapshot file %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:353
+#: src/qemu/qemu_driver.c:356
 #, c-format
 msgid "Failed to parse snapshot XML from file '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:374
+#: src/qemu/qemu_driver.c:377
 #, c-format
 msgid "Too many snapshots claiming to be current for domain %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:380
+#: src/qemu/qemu_driver.c:383
 #, c-format
 msgid "Snapshots have inconsistent relations for domain %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:521
+#: src/qemu/qemu_driver.c:524
 #, c-format
 msgid "Failed to create cache dir '%s': %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:539
+#: src/qemu/qemu_driver.c:542
 #, c-format
 msgid "Failed to create dump dir '%s': %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:570
+#: src/qemu/qemu_driver.c:573
 msgid "Missing lock manager implementation"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1088 src/qemu/qemu_driver.c:3726
-#: src/qemu/qemu_driver.c:3761 src/qemu/qemu_driver.c:3856
-#: src/qemu/qemu_driver.c:3891
+#: src/qemu/qemu_driver.c:590
 #, c-format
 msgid "unable to set ownership of '%s' to user %d:%d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1094
+#: src/qemu/qemu_driver.c:596 src/qemu/qemu_driver.c:602
+#: src/qemu/qemu_driver.c:608
 #, c-format
 msgid "unable to set ownership of '%s' to %d:%d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1119
+#: src/qemu/qemu_driver.c:629
 #, c-format
 msgid "unable to create hugepage path %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1126
+#: src/qemu/qemu_driver.c:636
 #, c-format
 msgid "unable to set ownership on %s to %d:%d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2733
+#: src/qemu/qemu_driver.c:863
 msgid "qemu state driver is not active"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2739
+#: src/qemu/qemu_driver.c:869
 #, c-format
 msgid "no QEMU URI path given, try %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2750
+#: src/qemu/qemu_driver.c:880
 #, c-format
 msgid "unexpected QEMU URI path '%s', try qemu:///system"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2757
+#: src/qemu/qemu_driver.c:887
 #, c-format
 msgid "unexpected QEMU URI path '%s', try qemu:///session"
 msgstr ""
 
-#: src/opennebula/one_driver.c:580 src/opennebula/one_driver.c:613
-#: src/qemu/qemu_driver.c:2959 src/uml/uml_driver.c:1314
-#: src/uml/uml_driver.c:1344 src/vbox/vbox_tmpl.c:1032
+#: src/qemu/qemu_driver.c:1117 src/uml/uml_driver.c:1531
+#: src/uml/uml_driver.c:1567 src/vbox/vbox_tmpl.c:1233
+#: src/vbox/vbox_tmpl.c:1520 src/vbox/vbox_tmpl.c:1572
+#: src/vbox/vbox_tmpl.c:1623 src/vbox/vbox_tmpl.c:1676
+#: src/vbox/vbox_tmpl.c:1727 src/vbox/vbox_tmpl.c:1803
+#: src/vbox/vbox_tmpl.c:2113
 #, c-format
 msgid "no domain with matching id %d"
 msgstr "aucun domaine ayant un id %d correspondant"
 
-#: src/qemu/qemu_driver.c:3011 src/qemu/qemu_driver.c:7679
+#: src/qemu/qemu_driver.c:1169 src/qemu/qemu_driver.c:8403
+#: src/qemu/qemu_driver.c:8664
 #, c-format
 msgid "no domain with matching name '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2569 src/qemu/qemu_driver.c:3255
-#: src/qemu/qemu_driver.c:7731
+#: src/qemu/qemu_driver.c:1481 src/qemu/qemu_migration.c:2674
+#: src/qemu/qemu_migration.c:2801 src/qemu/qemu_process.c:406
+#: src/qemu/qemu_process.c:3287
 msgid "resume operation failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1570
+#: src/qemu/qemu_driver.c:1576
 msgid "Reboot is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1595
+#: src/qemu/qemu_driver.c:1601
 msgid "Reboot is not supported without the JSON monitor"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1853
+#: src/qemu/qemu_driver.c:1859
 msgid "cannot resize the maximum memory on an active domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3496 src/uml/uml_driver.c:1466
+#: src/qemu/qemu_driver.c:1896 src/uml/uml_driver.c:1701
 msgid "cannot set memory of an active domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2001
+#: src/qemu/qemu_driver.c:2007
 #, c-format
 msgid "cannot translate keycode %u of %s codeset to rfb keycode"
 msgstr ""
 
-#: src/uml/uml_driver.c:1508
+#: src/qemu/qemu_driver.c:2079 src/uml/uml_driver.c:1743
 msgid "cannot read cputime for domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2282
+#: src/qemu/qemu_driver.c:2288
 #, c-format
 msgid "failed to write header to domain save file '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2290 src/qemu/qemu_driver.c:4335
+#: src/qemu/qemu_driver.c:2296 src/qemu/qemu_driver.c:4334
 #, c-format
 msgid "failed to write xml to '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2341
+#: src/qemu/qemu_driver.c:2347
 #, c-format
 msgid "unable to open %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2356 src/qemu/qemu_driver.c:2380
+#: src/qemu/qemu_driver.c:2362 src/qemu/qemu_driver.c:2386
 #, c-format
 msgid "Failed to create file '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2371
+#: src/qemu/qemu_driver.c:2377
 #, c-format
 msgid "Failed to create file '%s': couldn't determine fs type"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2392
+#: src/qemu/qemu_driver.c:2398
 #, c-format
 msgid "Error from child process creating '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2442 src/qemu/qemu_driver.c:9277
-#: src/qemu/qemu_migration.c:798
+#: src/qemu/qemu_driver.c:2448 src/qemu/qemu_driver.c:9624
+#: src/qemu/qemu_migration.c:799
 msgid "domain is marked for auto destroy"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2470 src/qemu/qemu_driver.c:2980
-#: src/qemu/qemu_driver.c:8873 src/qemu/qemu_driver.c:9155
-#: src/qemu/qemu_driver.c:10019 src/qemu/qemu_driver.c:10070
+#: src/qemu/qemu_driver.c:2476 src/qemu/qemu_driver.c:2986
+#: src/qemu/qemu_driver.c:9220 src/qemu/qemu_driver.c:9502
+#: src/qemu/qemu_driver.c:10366 src/qemu/qemu_driver.c:10417
 #: src/qemu/qemu_hotplug.c:408 src/qemu/qemu_hotplug.c:761
-#: src/qemu/qemu_migration.c:1613 src/qemu/qemu_migration.c:1925
-#: src/qemu/qemu_migration.c:2245 src/qemu/qemu_migration.c:2601
-#: src/qemu/qemu_process.c:383 src/qemu/qemu_process.c:396
+#: src/qemu/qemu_migration.c:1622 src/qemu/qemu_migration.c:1937
+#: src/qemu/qemu_migration.c:2261 src/qemu/qemu_migration.c:2612
+#: src/qemu/qemu_process.c:384 src/qemu/qemu_process.c:397
 msgid "guest unexpectedly quit"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3691 src/qemu/qemu_driver.c:7529
+#: src/qemu/qemu_driver.c:2510
 msgid "failed to get domain xml"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2533 src/qemu/qemu_driver.c:2863
-#: src/qemu/qemu_driver.c:3948
+#: src/qemu/qemu_driver.c:2539 src/qemu/qemu_driver.c:2869
+#: src/qemu/qemu_driver.c:3947
 msgid "bypass cache unsupported by this system"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2564 src/qemu/qemu_driver.c:2584
-#: src/qemu/qemu_driver.c:3107 src/vbox/vbox_tmpl.c:9091
+#: src/qemu/qemu_driver.c:2570 src/qemu/qemu_driver.c:2590
+#: src/qemu/qemu_driver.c:3113 src/vbox/vbox_tmpl.c:9096
 #, c-format
 msgid "unable to close %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2574
+#: src/qemu/qemu_driver.c:2580
 #, c-format
 msgid "unable to seek %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2580
+#: src/qemu/qemu_driver.c:2586
 #, c-format
 msgid "unable to write %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3649
+#: src/qemu/qemu_driver.c:2673
 msgid "Invalid save image format specified in configuration file"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2673
+#: src/qemu/qemu_driver.c:2679
 msgid ""
 "Compression program for image format in configuration file isn't available"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3717 src/qemu/qemu_driver.c:3848
+#: src/qemu/qemu_driver.c:2891
 #, c-format
 msgid "unable to save file %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2917
+#: src/qemu/qemu_driver.c:2923
 msgid "Invalid dump image format specified in configuration file, using raw"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2922
+#: src/qemu/qemu_driver.c:2928
 msgid ""
 "Compression program for dump image format in configuration file isn't "
 "available, using raw"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3917
+#: src/qemu/qemu_driver.c:3024
 msgid "resuming after dump failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3062
+#: src/qemu/qemu_driver.c:3068 src/qemu/qemu_driver.c:7352
 #, c-format
 msgid "no domain matching uuid '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3081
+#: src/qemu/qemu_driver.c:3087
 msgid "currently is supported only taking screenshots of screen ID 0"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6399
+#: src/qemu/qemu_driver.c:3098 src/qemu/qemu_driver.c:7925
+#: src/vbox/vbox_tmpl.c:9048
 #, c-format
 msgid "mkstemp(\"%s\") failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3113 src/vbox/vbox_tmpl.c:9097
+#: src/qemu/qemu_driver.c:3119 src/vbox/vbox_tmpl.c:9102
 msgid "unable to open stream"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3174
+#: src/qemu/qemu_driver.c:3180
 msgid "Dump failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3182
+#: src/qemu/qemu_driver.c:3188
 msgid "Resuming after dump failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3253
+#: src/qemu/qemu_driver.c:3259
 msgid "cannot change vcpu count of this domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3277 src/test/test_driver.c:2189
-#: src/xen/xen_driver.c:1114
+#: src/qemu/qemu_driver.c:3283 src/test/test_driver.c:2194
+#: src/xen/xen_driver.c:1122
 #, c-format
 msgid "argument out of range: %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3310
+#: src/qemu/qemu_driver.c:3316
 msgid "cannot adjust maximum on running domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3971 src/qemu/qemu_driver.c:4178
-#: src/qemu/qemu_driver.c:4213
+#: src/qemu/qemu_driver.c:3334 src/qemu/qemu_driver.c:3847
 #, c-format
 msgid "unknown virt type in domain definition '%d'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3441
+#: src/qemu/qemu_driver.c:3447
 msgid "a domain is inactive; can change only persistent config"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4037
+#: src/qemu/qemu_driver.c:3456
 #, c-format
 msgid "vcpu number out of range %d > %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4056
+#: src/qemu/qemu_driver.c:3495 src/qemu/qemu_process.c:1578
 msgid "cpu affinity is not supported"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3496
+#: src/qemu/qemu_driver.c:3502
 msgid "failed to delete vcpupin xml of a running domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3503
+#: src/qemu/qemu_driver.c:3509
 msgid "failed to update or add vcpupin xml of a running domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3518
+#: src/qemu/qemu_driver.c:3524
 msgid "failed to delete vcpupin xml of a persistent domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3525
+#: src/qemu/qemu_driver.c:3531
 msgid "failed to update or add vcpupin xml of a persistent domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3577
-msgid "cannot get live and persistent info concurrently"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:3613
+#: src/qemu/qemu_driver.c:3612
 msgid "cannot get persistent config of a transient domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4095
+#: src/qemu/qemu_driver.c:3693
 msgid "cannot list vcpu pinning for an inactive domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4126
+#: src/qemu/qemu_driver.c:3724
 msgid "cannot get vCPU placement & pCPU time"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4144
+#: src/qemu/qemu_driver.c:3742
 msgid "cpu affinity is not available"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3799 src/test/test_driver.c:2137
+#: src/qemu/qemu_driver.c:3798 src/test/test_driver.c:2142
 #: src/xen/xend_internal.c:2347 src/xen/xm_internal.c:795
 msgid "domain not active"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4236
+#: src/qemu/qemu_driver.c:3870
 msgid "Failed to get security label"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4267
+#: src/qemu/qemu_driver.c:3902
 #, c-format
 msgid "security model string exceeds max %d bytes"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4277
+#: src/qemu/qemu_driver.c:3912
 #, c-format
 msgid "security DOI string exceeds max %d bytes"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4314
+#: src/qemu/qemu_driver.c:3960
 msgid "failed to read qemu header"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3970
+#: src/qemu/qemu_driver.c:3969
 msgid "save image is incomplete"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3974
+#: src/qemu/qemu_driver.c:3973
 #, c-format
 msgid "cannot remove corrupt file: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4018 src/qemu/qemu_driver.c:4122
+#: src/qemu/qemu_driver.c:4017 src/qemu/qemu_driver.c:4121
 #, c-format
 msgid "cannot close file: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4371
+#: src/qemu/qemu_driver.c:4078
 #, c-format
 msgid "Invalid compressed save format %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4383
+#: src/qemu/qemu_driver.c:4093
 #, c-format
 msgid "Failed to start decompression binary %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4421
+#: src/qemu/qemu_driver.c:4145
 msgid "failed to resume domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4320
+#: src/qemu/qemu_driver.c:4319
 msgid "new xml too large to fit in file"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4329
+#: src/qemu/qemu_driver.c:4328
 #, c-format
 msgid "cannot seek in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4688
+#: src/qemu/qemu_driver.c:4687
 #, c-format
 msgid "cannot remove managed save file %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4710
+#: src/qemu/qemu_driver.c:4757
 msgid "domain is already running"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4981
+#: src/qemu/qemu_driver.c:4980
 #, c-format
 msgid "cannot delete inactive domain with %d snapshots"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5125
+#: src/qemu/qemu_driver.c:5124
 #, c-format
 msgid "disk controller bus '%s' cannot be hotplugged."
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5211 src/uml/uml_driver.c:2191
+#: src/qemu/qemu_driver.c:5210 src/uml/uml_driver.c:2177
 msgid "This type of disk cannot be hot unplugged"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5236
+#: src/qemu/qemu_driver.c:5214
+#, c-format
+msgid "disk device type '%s' cannot be detached"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:5235
 #, c-format
 msgid "disk controller bus '%s' cannot be hotunplugged."
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5268 src/uml/uml_driver.c:2195
+#: src/qemu/qemu_driver.c:5267 src/uml/uml_driver.c:2181
 msgid "This type of device cannot be hot unplugged"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5386
+#: src/qemu/qemu_driver.c:5385
 #, c-format
 msgid "mac %s already exists"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5402
+#: src/qemu/qemu_driver.c:5401
 #, c-format
 msgid "Lease %s in lockspace %s already exists"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5447
+#: src/qemu/qemu_driver.c:5446
 #, c-format
 msgid "no nic of mac %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5456 src/qemu/qemu_hotplug.c:2263
+#: src/qemu/qemu_driver.c:5455 src/qemu/qemu_hotplug.c:2262
 #, c-format
 msgid "Lease %s in lockspace %s does not exist"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5521
+#: src/qemu/qemu_driver.c:5520
 #, c-format
 msgid "mac %s doesn't exist"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5592
+#: src/qemu/qemu_driver.c:5591
 msgid "cannot do live update a device on inactive domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5867 src/qemu/qemu_driver.c:6686
-#: src/qemu/qemu_driver.c:6960
-msgid "cgroup CPU controller is not mounted"
-msgstr ""
-
-#: src/lxc/lxc_driver.c:1926 src/lxc/lxc_driver.c:1984
-#: src/qemu/qemu_driver.c:6003 src/qemu/qemu_driver.c:6074
+#: src/qemu/qemu_driver.c:5964
 #, c-format
-msgid "No such domain %s"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:5932 src/qemu/qemu_driver.c:6079
-msgid "blkio cgroup isn't mounted"
+msgid "unable to parse %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5962 src/qemu/qemu_driver.c:5996
-msgid "invalid type for blkio weight tunable, expected a 'unsigned int'"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:5969 src/qemu/qemu_driver.c:6003
-msgid "out of blkio weight range."
+#: src/qemu/qemu_driver.c:6101 src/qemu/qemu_driver.c:6173
+msgid "invalid type for device_weight tunable, expected a 'char *'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5977
-msgid "unable to set blkio weight tunable"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6112
-msgid "unable to get blkio weight"
+#: src/qemu/qemu_driver.c:6119
+#, c-format
+msgid "Unable to set io device weight for path %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6211 src/qemu/qemu_driver.c:6369
+#: src/qemu/qemu_driver.c:6476 src/qemu/qemu_driver.c:6638
 msgid "cgroup memory controller is not mounted"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6552 src/qemu/qemu_driver.c:6818
-msgid "unable to get cpu bandwidth tunable"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6559 src/qemu/qemu_driver.c:6811
-msgid "unable to get cpu bandwidth period tunable"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6602
+#: src/qemu/qemu_driver.c:6871
 #, c-format
 msgid "Unable to find vcpu cgroup for %s(vcpu: %d)"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6020
-msgid "invalid type for cpu_shares tunable, expected a 'ullong'"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6027
-msgid "unable to set cpu shares tunable"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6724
-msgid "invalid type for vcpu_period tunable, expected a 'ullong'"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6744
-msgid "invalid type for vcpu_quota tunable, expected a 'llong'"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6850
+#: src/qemu/qemu_driver.c:7119
 #, c-format
 msgid "Unable to find vcpu cgroup for %s(vcpu: 0)"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6893
-msgid "cannot query live and config together"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6924
-msgid "cannot query persistent config of a transient domain"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6934
-msgid "can't get persistentDef"
+#: src/qemu/qemu_driver.c:7333
+msgid "empty path"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6087
-msgid "unable to get cpu shares tunable"
+#: src/qemu/qemu_driver.c:7339
+#, c-format
+msgid "size must be less than %llu"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6153 src/test/test_driver.c:2602
+#: src/qemu/qemu_driver.c:7369 src/qemu/qemu_driver.c:7434
+#: src/qemu/qemu_driver.c:7520 src/test/test_driver.c:2825
 #, c-format
 msgid "invalid path: %s"
 msgstr "chemin invalide : %s"
 
-#: src/qemu/qemu_driver.c:7091 src/qemu/qemu_driver.c:7180
+#: src/qemu/qemu_driver.c:7441 src/qemu/qemu_driver.c:7527
 #: src/qemu/qemu_hotplug.c:75
 #, c-format
 msgid "missing disk device alias name for %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6225 src/test/test_driver.c:2657
+#: src/qemu/qemu_driver.c:7743 src/test/test_driver.c:2880
 #, c-format
 msgid "invalid path, '%s' is not a known interface"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7410
+#: src/qemu/qemu_driver.c:7757
 msgid "interface stats not implemented on this platform"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6305 src/uml/uml_driver.c:1802
+#: src/qemu/qemu_driver.c:7836 src/qemu/qemu_driver.c:8001
+#: src/uml/uml_driver.c:2328
 msgid "NULL or empty path"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7496 src/uml/uml_driver.c:2349
+#: src/qemu/qemu_driver.c:7843 src/uml/uml_driver.c:2335
 #, c-format
 msgid "invalid path '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6324
+#: src/qemu/qemu_driver.c:7852
 #, c-format
 msgid "%s: failed to open"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6335
+#: src/qemu/qemu_driver.c:7863
 #, c-format
 msgid "%s: failed to seek or read"
 msgstr ""
 
-#: src/libvirt.c:4420 src/qemu/qemu_driver.c:6378
+#: src/qemu/qemu_driver.c:7904
 msgid "flags parameter must be VIR_MEMORY_VIRTUAL or VIR_MEMORY_PHYSICAL"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6421
+#: src/qemu/qemu_driver.c:7949
 #, c-format
 msgid "failed to read temporary file created with template %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7661
+#: src/qemu/qemu_driver.c:8008
 #, c-format
 msgid "invalid path %s not assigned to domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7667
+#: src/qemu/qemu_driver.c:8014
 #, c-format
 msgid "disk %s does not currently have a source assigned"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7677
+#: src/qemu/qemu_driver.c:8024
 #, c-format
 msgid "failed to open path '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7685
+#: src/qemu/qemu_driver.c:8032
 #, c-format
 msgid "unknown disk format %s for %s"
 msgstr ""
 
-#: src/storage/storage_backend.c:846
+#: src/qemu/qemu_driver.c:8061 src/storage/storage_backend.c:1018
+#: src/storage/storage_backend.c:1046 src/storage/storage_backend.c:1166
+#: src/util/storage_file.c:744 src/util/storage_file.c:840
 #, c-format
 msgid "cannot stat file '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7736
+#: src/qemu/qemu_driver.c:8083
 #, c-format
 msgid "failed to seek to end of %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6833 src/qemu/qemu_driver.c:7001
+#: src/qemu/qemu_driver.c:8236 src/qemu/qemu_driver.c:8308
+#: src/qemu/qemu_driver.c:8541 src/qemu/qemu_driver.c:8576
 msgid "no domain XML passed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6838
+#: src/qemu/qemu_driver.c:8241 src/qemu/qemu_driver.c:8581
 msgid "PrepareTunnel called but no TUNNELLED flag set"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6843
+#: src/qemu/qemu_driver.c:8246 src/qemu/qemu_driver.c:8586
 msgid "tunnelled migration requested but NULL stream passed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7905 src/qemu/qemu_driver.c:7945
-#: src/qemu/qemu_driver.c:8000
+#: src/qemu/qemu_driver.c:8252 src/qemu/qemu_driver.c:8292
+#: src/qemu/qemu_driver.c:8347
 #, c-format
 msgid "Cannot use migrate v2 protocol with lock manager %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6995
+#: src/qemu/qemu_driver.c:8302 src/qemu/qemu_driver.c:8535
 msgid "Tunnelled migration requested but invalid RPC method called"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8136 src/qemu/qemu_migration.c:1199
+#: src/qemu/qemu_driver.c:8483 src/qemu/qemu_migration.c:1207
 msgid "domain disappeared"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7811 src/xen/xen_driver.c:1705
+#: src/qemu/qemu_driver.c:8769 src/xen/xen_driver.c:1970
 #, c-format
 msgid "device %s is not a PCI device"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8636
+#: src/qemu/qemu_driver.c:8983
 msgid "no job is active on the domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8640
+#: src/qemu/qemu_driver.c:8987
 msgid "cannot abort incoming migration; use virDomainDestroy instead"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8698
+#: src/qemu/qemu_driver.c:9045
 msgid "domain is not being migrated"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8821
+#: src/qemu/qemu_driver.c:9168
 #, c-format
 msgid "Disk '%s' does not support snapshotting"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8907 src/qemu/qemu_driver.c:9214
+#: src/qemu/qemu_driver.c:9254 src/qemu/qemu_driver.c:9561
 msgid "resuming after snapshot failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8937
+#: src/qemu/qemu_driver.c:9284
 #, c-format
 msgid ""
 "active qemu domains require external disk snapshots; disk %s requested "
 "internal"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8945
+#: src/qemu/qemu_driver.c:9292
 #, c-format
 msgid "internal snapshot for disk %s unsupported for storage type %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8963
+#: src/qemu/qemu_driver.c:9310
 #, c-format
 msgid "external snapshot format for disk %s is unsupported: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8971
+#: src/qemu/qemu_driver.c:9318
 #, c-format
 msgid "unable to stat for disk %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8977
+#: src/qemu/qemu_driver.c:9324
 #, c-format
 msgid ""
 "external snapshot file for disk %s already exists and is not a block device: "
 "%s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8991 src/qemu/qemu_driver.c:9031
+#: src/qemu/qemu_driver.c:9338 src/qemu/qemu_driver.c:9378
 msgid "unexpected code path"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8998
+#: src/qemu/qemu_driver.c:9345
 msgid "disk snapshots require at least one disk to be selected for snapshot"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9282
+#: src/qemu/qemu_driver.c:9629
 msgid "cannot halt after transient domain snapshot"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9296
+#: src/qemu/qemu_driver.c:9643
 #, c-format
 msgid "cannot set snapshot %s as its own parent"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9303
+#: src/qemu/qemu_driver.c:9650
 #, c-format
 msgid "parent %s for snapshot %s not found"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9310
+#: src/qemu/qemu_driver.c:9657
 #, c-format
 msgid "parent %s would create cycle to %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9328
+#: src/qemu/qemu_driver.c:9675
 #, c-format
 msgid "definition for snapshot %s must use uuid %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9339
+#: src/qemu/qemu_driver.c:9686
 #, c-format
 msgid ""
 "cannot change between online and offline snapshot state in snapshot %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9347
+#: src/qemu/qemu_driver.c:9694
 #, c-format
 msgid ""
 "cannot change between disk snapshot and system checkpoint in snapshot %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9447
+#: src/qemu/qemu_driver.c:9794
 msgid "disk snapshots of inactive domains not implemented yet"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9597 src/qemu/qemu_driver.c:9637
-#: src/qemu/qemu_driver.c:9744 src/qemu/qemu_driver.c:9822
-#: src/qemu/qemu_driver.c:9892 src/qemu/qemu_driver.c:10253
+#: src/qemu/qemu_driver.c:9944 src/qemu/qemu_driver.c:9984
+#: src/qemu/qemu_driver.c:10091 src/qemu/qemu_driver.c:10169
+#: src/qemu/qemu_driver.c:10239 src/qemu/qemu_driver.c:10600
 #, c-format
 msgid "no domain snapshot with matching name '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9679
+#: src/qemu/qemu_driver.c:10026
 #, c-format
 msgid "no snapshot with matching name '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9786
+#: src/qemu/qemu_driver.c:10133
 msgid "the domain does not have a current snapshot"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9903
+#: src/qemu/qemu_driver.c:10250
 msgid ""
 "transient domain needs to request run or pause to revert to inactive snapshot"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9909
+#: src/qemu/qemu_driver.c:10256
 msgid "revert to external disk snapshot not supported yet"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9916
+#: src/qemu/qemu_driver.c:10263
 #, c-format
 msgid "snapshot '%s' lacks domain '%s' rollback info"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9926
+#: src/qemu/qemu_driver.c:10273
 msgid "must respawn qemu to start inactive snapshot"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10268
+#: src/qemu/qemu_driver.c:10615
 #, c-format
 msgid "deletion of %d external disk snapshots not supported yet"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10295
+#: src/qemu/qemu_driver.c:10642
 #, c-format
 msgid "failed to set snapshot '%s' as current"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10427
+#: src/qemu/qemu_driver.c:10774
 #, c-format
 msgid "No monitor connection for pid %u"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10433
+#: src/qemu/qemu_driver.c:10780
 #, c-format
 msgid "Cannot connect to monitor connection of type '%s' for pid %u"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10544
+#: src/qemu/qemu_driver.c:10891
 #, c-format
 msgid "cannot find character device %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10594
+#: src/qemu/qemu_driver.c:10942
 msgid "No device found for specified path"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10730
+#: src/qemu/qemu_driver.c:11078
 #, c-format
 msgid "No graphics backend with index %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10742
+#: src/qemu/qemu_driver.c:11090
 #, c-format
 msgid "Can only open VNC or SPICE graphics backends, not %s"
 msgstr ""
 
+#: src/qemu/qemu_driver.c:11187
+#, c-format
+msgid "expected unsigned long long for parameter %s"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:11211
+#, c-format
+msgid "Unrecognized parameter %s"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:11220
+msgid "total and read/write of bytes_sec cannot be set at the same time"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:11227
+msgid "total and read/write of iops_sec cannot be set at the same time"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:11246
+msgid "Write to config file failed"
+msgstr ""
+
 #: src/qemu/qemu_hostdev.c:189
 #, c-format
 msgid "PCI device %s is not assignable"
@@ -10079,7 +10584,7 @@
 msgid "SCSI controller %d was missing its PCI address"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5165
+#: src/qemu/qemu_hotplug.c:658
 msgid "installed qemu version does not support host_net_add"
 msgstr ""
 
@@ -10099,12 +10604,12 @@
 msgid "guest unexpectedly quit during hotplug"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5375 src/qemu/qemu_driver.c:5769
+#: src/qemu/qemu_hotplug.c:1092 src/qemu/qemu_hotplug.c:2145
 #, c-format
 msgid "hostdev mode '%s' not supported"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5393 src/qemu/qemu_driver.c:5780
+#: src/qemu/qemu_hotplug.c:1133 src/qemu/qemu_hotplug.c:2159
 #, c-format
 msgid "hostdev subsys type '%s' not supported"
 msgstr ""
@@ -10189,13 +10694,13 @@
 msgstr ""
 
 #: src/qemu/qemu_hotplug.c:1513 src/qemu/qemu_hotplug.c:1760
-#: src/qemu/qemu_hotplug.c:1996
+#: src/qemu/qemu_hotplug.c:1995
 #, c-format
 msgid "cannot hot unplug multifunction PCI device: %s"
 msgstr ""
 
 #: src/qemu/qemu_hotplug.c:1530 src/qemu/qemu_hotplug.c:1754
-#: src/qemu/qemu_hotplug.c:1849 src/qemu/qemu_hotplug.c:2004
+#: src/qemu/qemu_hotplug.c:1849 src/qemu/qemu_hotplug.c:2003
 msgid "device cannot be detached without a PCI address"
 msgstr ""
 
@@ -10213,7 +10718,7 @@
 msgid "device cannot be detached: device is busy"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5612
+#: src/qemu/qemu_hotplug.c:1839
 #, c-format
 msgid "network device %02x:%02x:%02x:%02x:%02x:%02x not found"
 msgstr ""
@@ -10227,316 +10732,320 @@
 msgid "unable to determine original VLAN"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5646
+#: src/qemu/qemu_hotplug.c:1927
 #, c-format
 msgid "failed to remove ebtables rule on  '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5699
+#: src/qemu/qemu_hotplug.c:1985
 #, c-format
 msgid "host pci device %.4x:%.2x:%.2x.%.1x not found"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:2094
+#: src/qemu/qemu_hotplug.c:2093
 #, c-format
 msgid "host usb device %03d.%03d not found"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:2102
+#: src/qemu/qemu_hotplug.c:2101
 msgid "device cannot be detached without a device alias"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:2108
+#: src/qemu/qemu_hotplug.c:2107
 msgid "device cannot be detached with this QEMU version"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:2200
+#: src/qemu/qemu_hotplug.c:2199
 msgid "Graphics password only supported for VNC"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:2226
+#: src/qemu/qemu_hotplug.c:2225
 msgid "Expiry of passwords is not supported"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:163
+#: src/qemu/qemu_migration.c:164
 #, c-format
 msgid "unable to read server cert %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:170
+#: src/qemu/qemu_migration.c:171
 #, c-format
 msgid "cannot initialize cert object: %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:181
+#: src/qemu/qemu_migration.c:182
 #, c-format
 msgid "cannot load cert data from %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:276
+#: src/qemu/qemu_migration.c:277
 msgid "Unable to obtain host UUID"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:297
+#: src/qemu/qemu_migration.c:298
 msgid "Migration graphics data already present"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:323
+#: src/qemu/qemu_migration.c:324
 msgid "Migration lockstate data already present"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:354
+#: src/qemu/qemu_migration.c:355
 msgid "Migration persistent data already present"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:469
+#: src/qemu/qemu_migration.c:470
 msgid "missing type attribute in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:474
+#: src/qemu/qemu_migration.c:475
 #, c-format
 msgid "unknown graphics type %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:481
+#: src/qemu/qemu_migration.c:482
 msgid "missing port attribute in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:487
+#: src/qemu/qemu_migration.c:488
 msgid "missing tlsPort attribute in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:493
+#: src/qemu/qemu_migration.c:494
 msgid "missing listen attribute in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:530
+#: src/qemu/qemu_migration.c:531
 msgid "missing name element in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:535
+#: src/qemu/qemu_migration.c:536
 #, c-format
 msgid "Incoming cookie data had unexpected name %s vs %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:545
+#: src/qemu/qemu_migration.c:546
 msgid "missing uuid element in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:551
+#: src/qemu/qemu_migration.c:552
 #, c-format
 msgid "Incoming cookie data had unexpected UUID %s vs %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:559
+#: src/qemu/qemu_migration.c:560
 msgid "missing hostname element in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:564 src/qemu/qemu_migration.c:581
+#: src/qemu/qemu_migration.c:565 src/qemu/qemu_migration.c:582
 #, c-format
 msgid "Attempt to migrate guest to the same host %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:571
+#: src/qemu/qemu_migration.c:572
 msgid "missing hostuuid element in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:576
+#: src/qemu/qemu_migration.c:577
 msgid "malformed hostuuid element in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:597
+#: src/qemu/qemu_migration.c:598
 msgid "missing feature name"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:603
+#: src/qemu/qemu_migration.c:604
 #, c-format
 msgid "Unknown migration cookie feature %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:611
+#: src/qemu/qemu_migration.c:612
 #, c-format
 msgid "Unsupported migration cookie feature %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:629
+#: src/qemu/qemu_migration.c:630
 msgid "Missing lock driver name in migration cookie"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:641
+#: src/qemu/qemu_migration.c:642
 #, c-format
 msgid "Too many domain elements in migration cookie: %d"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:677
+#: src/qemu/qemu_migration.c:678
 msgid "(qemu_migration_cookie)"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:739
+#: src/qemu/qemu_migration.c:740
 msgid "Migration cookie was not NULL terminated"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:759
+#: src/qemu/qemu_migration.c:760
 #, c-format
 msgid "Missing %s lock state for migration cookie"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:766
+#: src/qemu/qemu_migration.c:767
 #, c-format
 msgid "Source host lock driver %s different from target %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:803
+#: src/qemu/qemu_migration.c:804
 #, c-format
 msgid "cannot migrate domain with %d snapshots"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:812
+#: src/qemu/qemu_migration.c:813
 msgid "Domain with assigned host devices cannot be migrated"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:879
+#: src/qemu/qemu_migration.c:880
 msgid "is not active"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:902
+#: src/qemu/qemu_migration.c:903
 msgid "unexpectedly failed"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:908
+#: src/qemu/qemu_migration.c:909
 msgid "canceled by client"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:925 src/qemu/qemu_migration.c:1625
+#: src/qemu/qemu_migration.c:927 src/qemu/qemu_migration.c:1634
 msgid "migration job"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:928
+#: src/qemu/qemu_migration.c:930
 msgid "domain save job"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:931
+#: src/qemu/qemu_migration.c:933
 msgid "domain core dump job"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:934
+#: src/qemu/qemu_migration.c:936
 msgid "job"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1044
+#: src/qemu/qemu_migration.c:950
+msgid "Lost connection to destination host"
+msgstr ""
+
+#: src/qemu/qemu_migration.c:1052
 msgid "target domain name doesn't match source name nor destination name"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1141 src/qemu/qemu_migration.c:1817
+#: src/qemu/qemu_migration.c:1149 src/qemu/qemu_migration.c:1829
 msgid "cannot create pipe for tunnelled migration"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1161
+#: src/qemu/qemu_migration.c:1169
 msgid "cannot pass pipe for tunnelled migration"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1307
+#: src/qemu/qemu_migration.c:1315
 msgid ""
 "hostname on destination resolved to localhost, but migration requires an FQDN"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7042
+#: src/qemu/qemu_migration.c:1337
 msgid "only tcp URIs are supported for KVM/QEMU migrations"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7065
+#: src/qemu/qemu_migration.c:1361
 msgid "URI ended with incorrect ':port'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7233
+#: src/qemu/qemu_migration.c:1449
 msgid "tunnelled migration failed to read from qemu"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1487
+#: src/qemu/qemu_migration.c:1495
 msgid "Unable to create migration thread"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1544
+#: src/qemu/qemu_migration.c:1553
 #, c-format
 msgid "Migration with lock driver %s requires cookie support"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1633
+#: src/qemu/qemu_migration.c:1642
 msgid "failed to accept connection from qemu"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7177
+#: src/qemu/qemu_migration.c:1737
 #, c-format
 msgid "cannot parse URI %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7337
+#: src/qemu/qemu_migration.c:1807
 msgid "Source qemu is too old to support tunnelled migration"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7516
+#: src/qemu/qemu_migration.c:2233
 #, c-format
 msgid "Failed to connect to remote libvirt URI %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7522
+#: src/qemu/qemu_migration.c:2254
 msgid "Destination libvirt does not support peer-to-peer migration protocol"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:2352 src/qemu/qemu_migration.c:2425
+#: src/qemu/qemu_migration.c:2368 src/qemu/qemu_migration.c:2441
 #, c-format
 msgid "Failed to resume guest %s after failure"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:2486
+#: src/qemu/qemu_migration.c:2502
 msgid "received unexpected cookie with P2P migration"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:2497
+#: src/qemu/qemu_migration.c:2513
 msgid "Unexpected dconnuri parameter with non-peer2peer migration"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:2639
+#: src/qemu/qemu_migration.c:2650
 msgid "can't get vmdef"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:2913
+#: src/qemu/qemu_migration.c:2914
 msgid "Unable to set cloexec flag"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:3007
+#: src/qemu/qemu_migration.c:3001
 #, c-format
 msgid "migration protocol going backwards %s => %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:3041
+#: src/qemu/qemu_migration.c:3035
 #, c-format
 msgid "domain '%s' is not processing incoming migration"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:3043
+#: src/qemu/qemu_migration.c:3037
 #, c-format
 msgid "domain '%s' is not being migrated"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:236
+#: src/qemu/qemu_monitor.c:226
 msgid "failed to create socket"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:244
+#: src/qemu/qemu_monitor.c:234
 #, c-format
 msgid "Monitor path %s too big for destination"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:261
+#: src/qemu/qemu_monitor.c:252
 msgid "failed to connect to monitor socket"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:268
+#: src/qemu/qemu_monitor.c:259
 msgid "monitor socket did not show up."
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:286
+#: src/qemu/qemu_monitor.c:277
 #, c-format
 msgid "Unable to open monitor path %s"
 msgstr ""
@@ -10580,32 +11089,32 @@
 msgid "Error while processing monitor IO"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:573
+#: src/qemu/qemu_monitor.c:646
 msgid "EOF notify callback must be supplied"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:584
+#: src/qemu/qemu_monitor.c:657
 msgid "cannot initialize monitor mutex"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:590
+#: src/qemu/qemu_monitor.c:663
 msgid "cannot initialize monitor condition"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:614
+#: src/qemu/qemu_monitor.c:687
 #, c-format
 msgid "unable to handle monitor type: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:623
+#: src/qemu/qemu_monitor.c:696
 msgid "Unable to set monitor close-on-exec flag"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:628
+#: src/qemu/qemu_monitor.c:701
 msgid "Unable to put monitor into non-blocking mode"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:640
+#: src/qemu/qemu_monitor.c:713
 msgid "unable to register monitor events"
 msgstr ""
 
@@ -10619,29 +11128,29 @@
 #: src/qemu/qemu_monitor.c:1157 src/qemu/qemu_monitor.c:1177
 #: src/qemu/qemu_monitor.c:1198 src/qemu/qemu_monitor.c:1218
 #: src/qemu/qemu_monitor.c:1246 src/qemu/qemu_monitor.c:1282
-#: src/qemu/qemu_monitor.c:1320 src/qemu/qemu_monitor.c:1366
-#: src/qemu/qemu_monitor.c:1398 src/qemu/qemu_monitor.c:1420
-#: src/qemu/qemu_monitor.c:1439 src/qemu/qemu_monitor.c:1460
-#: src/qemu/qemu_monitor.c:1483 src/qemu/qemu_monitor.c:1506
-#: src/qemu/qemu_monitor.c:1528 src/qemu/qemu_monitor.c:1548
-#: src/qemu/qemu_monitor.c:1568 src/qemu/qemu_monitor.c:1591
-#: src/qemu/qemu_monitor.c:1619 src/qemu/qemu_monitor.c:1652
-#: src/qemu/qemu_monitor.c:1684 src/qemu/qemu_monitor.c:1726
-#: src/qemu/qemu_monitor.c:1791 src/qemu/qemu_monitor.c:1816
-#: src/qemu/qemu_monitor.c:1866 src/qemu/qemu_monitor.c:1887
-#: src/qemu/qemu_monitor.c:1908 src/qemu/qemu_monitor.c:1931
-#: src/qemu/qemu_monitor.c:1954 src/qemu/qemu_monitor.c:1975
-#: src/qemu/qemu_monitor.c:1997 src/qemu/qemu_monitor.c:2019
-#: src/qemu/qemu_monitor.c:2057 src/qemu/qemu_monitor.c:2088
-#: src/qemu/qemu_monitor.c:2127 src/qemu/qemu_monitor.c:2152
-#: src/qemu/qemu_monitor.c:2189 src/qemu/qemu_monitor.c:2210
-#: src/qemu/qemu_monitor.c:2231 src/qemu/qemu_monitor.c:2257
-#: src/qemu/qemu_monitor.c:2277 src/qemu/qemu_monitor.c:2296
-#: src/qemu/qemu_monitor.c:2315 src/qemu/qemu_monitor.c:2338
-#: src/qemu/qemu_monitor.c:2372 src/qemu/qemu_monitor.c:2393
-#: src/qemu/qemu_monitor.c:2412 src/qemu/qemu_monitor.c:2431
-#: src/qemu/qemu_monitor.c:2450 src/qemu/qemu_monitor.c:2474
-#: src/qemu/qemu_monitor.c:2541 src/qemu/qemu_monitor.c:2633
+#: src/qemu/qemu_monitor.c:1335 src/qemu/qemu_monitor.c:1381
+#: src/qemu/qemu_monitor.c:1413 src/qemu/qemu_monitor.c:1435
+#: src/qemu/qemu_monitor.c:1454 src/qemu/qemu_monitor.c:1475
+#: src/qemu/qemu_monitor.c:1498 src/qemu/qemu_monitor.c:1521
+#: src/qemu/qemu_monitor.c:1543 src/qemu/qemu_monitor.c:1563
+#: src/qemu/qemu_monitor.c:1583 src/qemu/qemu_monitor.c:1606
+#: src/qemu/qemu_monitor.c:1634 src/qemu/qemu_monitor.c:1667
+#: src/qemu/qemu_monitor.c:1699 src/qemu/qemu_monitor.c:1741
+#: src/qemu/qemu_monitor.c:1806 src/qemu/qemu_monitor.c:1831
+#: src/qemu/qemu_monitor.c:1881 src/qemu/qemu_monitor.c:1902
+#: src/qemu/qemu_monitor.c:1923 src/qemu/qemu_monitor.c:1946
+#: src/qemu/qemu_monitor.c:1969 src/qemu/qemu_monitor.c:1990
+#: src/qemu/qemu_monitor.c:2012 src/qemu/qemu_monitor.c:2034
+#: src/qemu/qemu_monitor.c:2072 src/qemu/qemu_monitor.c:2103
+#: src/qemu/qemu_monitor.c:2142 src/qemu/qemu_monitor.c:2167
+#: src/qemu/qemu_monitor.c:2204 src/qemu/qemu_monitor.c:2225
+#: src/qemu/qemu_monitor.c:2246 src/qemu/qemu_monitor.c:2272
+#: src/qemu/qemu_monitor.c:2292 src/qemu/qemu_monitor.c:2311
+#: src/qemu/qemu_monitor.c:2330 src/qemu/qemu_monitor.c:2353
+#: src/qemu/qemu_monitor.c:2387 src/qemu/qemu_monitor.c:2408
+#: src/qemu/qemu_monitor.c:2427 src/qemu/qemu_monitor.c:2446
+#: src/qemu/qemu_monitor.c:2465 src/qemu/qemu_monitor.c:2489
+#: src/qemu/qemu_monitor.c:2556 src/qemu/qemu_monitor.c:2681
 msgid "monitor must not be NULL"
 msgstr ""
 
@@ -10653,21 +11162,21 @@
 msgid "monitor || name must not be NULL"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:1343
+#: src/qemu/qemu_monitor.c:1358
 #, c-format
 msgid "unsupported protocol type %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:1732
+#: src/qemu/qemu_monitor.c:1747
 #, c-format
 msgid "file offset must be a multiple of %llu"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:2025
+#: src/qemu/qemu_monitor.c:2040
 msgid "fd must be valid"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:2031
+#: src/qemu/qemu_monitor.c:2046
 #, c-format
 msgid "qemu is not using a unix socket monitor, cannot send fd %s"
 msgstr ""
@@ -10705,12 +11214,12 @@
 msgid "unable to execute QEMU command '%s': %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:384
+#: src/qemu/qemu_monitor_json.c:388
 #, c-format
 msgid "argument key '%s' is too short, missing type prefix"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:433
+#: src/qemu/qemu_monitor_json.c:442
 #, c-format
 msgid "unsupported data type '%c' for arg '%s'"
 msgstr ""
@@ -10744,7 +11253,7 @@
 msgid "cpu information was empty"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:1062 src/qemu/qemu_monitor_json.c:2557
+#: src/qemu/qemu_monitor_json.c:1062 src/qemu/qemu_monitor_json.c:2589
 msgid "character device information was missing array element"
 msgstr ""
 
@@ -10819,25 +11328,32 @@
 msgid "cannot find info for device '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:649
+#: src/qemu/qemu_monitor_json.c:1497 src/qemu/qemu_monitor_json.c:1636
+#: src/qemu/qemu_monitor_json.c:1711
 msgid "blockstats reply was missing device list"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:659 src/qemu/qemu_monitor_json.c:665
+#: src/qemu/qemu_monitor_json.c:1507 src/qemu/qemu_monitor_json.c:1513
+#: src/qemu/qemu_monitor_json.c:1644 src/qemu/qemu_monitor_json.c:1722
+#: src/qemu/qemu_monitor_json.c:1728
 msgid "blockstats device entry was not in expected format"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:676
+#: src/qemu/qemu_monitor_json.c:1531 src/qemu/qemu_monitor_json.c:1651
+#: src/qemu/qemu_monitor_json.c:1753
 msgid "blockstats stats entry was not in expected format"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:682 src/qemu/qemu_monitor_json.c:688
-#: src/qemu/qemu_monitor_json.c:694 src/qemu/qemu_monitor_json.c:700
+#: src/qemu/qemu_monitor_json.c:1537 src/qemu/qemu_monitor_json.c:1543
+#: src/qemu/qemu_monitor_json.c:1552 src/qemu/qemu_monitor_json.c:1558
+#: src/qemu/qemu_monitor_json.c:1564 src/qemu/qemu_monitor_json.c:1573
+#: src/qemu/qemu_monitor_json.c:1582 src/qemu/qemu_monitor_json.c:1591
+#: src/qemu/qemu_monitor_json.c:1759
 #, c-format
 msgid "cannot read %s statistic"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:708
+#: src/qemu/qemu_monitor_json.c:1599 src/qemu/qemu_monitor_json.c:1767
 #, c-format
 msgid "cannot find statistics for device '%s'"
 msgstr ""
@@ -10846,166 +11362,212 @@
 msgid "blockstats parent entry was not in expected format"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:923
+#: src/qemu/qemu_monitor_json.c:2147
 msgid "info migration reply was missing return data"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:929
+#: src/qemu/qemu_monitor_json.c:2153
 msgid "info migration reply was missing return status"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:935 src/qemu/qemu_monitor_text.c:969
+#: src/qemu/qemu_monitor_json.c:2159 src/qemu/qemu_monitor_text.c:1541
+#: src/qemu/qemu_monitor_text.c:1548
 #, c-format
 msgid "unexpected migration status in %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:943
+#: src/qemu/qemu_monitor_json.c:2167
 msgid "migration was active, but no RAM info was set"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:949
+#: src/qemu/qemu_monitor_json.c:2174
 msgid "migration was active, but RAM 'transferred' data was missing"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:954
+#: src/qemu/qemu_monitor_json.c:2180
 msgid "migration was active, but RAM 'remaining' data was missing"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:959
+#: src/qemu/qemu_monitor_json.c:2186
 msgid "migration was active, but RAM 'total' data was missing"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2166
+#: src/qemu/qemu_monitor_json.c:2198
 msgid "disk migration was active, but 'transferred' data was missing"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2173
+#: src/qemu/qemu_monitor_json.c:2205
 msgid "disk migration was active, but 'remaining' data was missing"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2180
+#: src/qemu/qemu_monitor_json.c:2212
 msgid "disk migration was active, but 'total' data was missing"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2309 src/qemu/qemu_monitor_json.c:2319
-#: src/qemu/qemu_monitor_json.c:2329
+#: src/qemu/qemu_monitor_json.c:2341 src/qemu/qemu_monitor_json.c:2351
+#: src/qemu/qemu_monitor_json.c:2361
 msgid "usb_add not suppported in JSON mode"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2339 src/qemu/qemu_monitor_json.c:2350
-#: src/qemu/qemu_monitor_json.c:2360 src/qemu/qemu_monitor_json.c:2626
+#: src/qemu/qemu_monitor_json.c:2371 src/qemu/qemu_monitor_json.c:2382
+#: src/qemu/qemu_monitor_json.c:2392 src/qemu/qemu_monitor_json.c:2658
 msgid "pci_add not suppported in JSON mode"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2369
+#: src/qemu/qemu_monitor_json.c:2401
 msgid "pci_del not suppported in JSON mode"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2541
+#: src/qemu/qemu_monitor_json.c:2573
 msgid "character device reply was missing return data"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2547
+#: src/qemu/qemu_monitor_json.c:2579
 msgid "character device information was not an array"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2563 src/qemu/qemu_monitor_json.c:2569
+#: src/qemu/qemu_monitor_json.c:2595 src/qemu/qemu_monitor_json.c:2601
 msgid "character device information was missing filename"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1744
+#: src/qemu/qemu_monitor_json.c:2614 src/qemu/qemu_monitor_text.c:2398
 #, c-format
 msgid "failed to save chardev path '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2640
+#: src/qemu/qemu_monitor_json.c:2672
 msgid "drive_add reply was missing device address"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2646
+#: src/qemu/qemu_monitor_json.c:2678
 msgid "drive_add reply was missing device bus number"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2652
+#: src/qemu/qemu_monitor_json.c:2684
 msgid "drive_add reply was missing device unit number"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2703
+#: src/qemu/qemu_monitor_json.c:2735
 msgid "query-pci not suppported in JSON mode"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2822
+#: src/qemu/qemu_monitor_json.c:2854
 msgid ""
 "deleting disk is not supported.  This may leak data if disk is reassigned"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3007
+#: src/qemu/qemu_monitor_json.c:3039
 msgid ""
 "HMP passthrough is not supported by qemu process; only QMP commands can be "
 "used"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3107
+#: src/qemu/qemu_monitor_json.c:3139
 msgid "entry was missing 'device'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3116
+#: src/qemu/qemu_monitor_json.c:3148
 msgid "entry was missing 'type'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3126
+#: src/qemu/qemu_monitor_json.c:3158
 msgid "entry was missing 'speed'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3133
+#: src/qemu/qemu_monitor_json.c:3165
 msgid "entry was missing 'offset'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3139
+#: src/qemu/qemu_monitor_json.c:3171
 msgid "entry was missing 'len'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3161
+#: src/qemu/qemu_monitor_json.c:3193
 msgid "reply was missing return data"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3167
+#: src/qemu/qemu_monitor_json.c:3199
 msgid "urecognized format of block job information"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3173
+#: src/qemu/qemu_monitor_json.c:3205
 msgid "unable to determine array size"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3181
+#: src/qemu/qemu_monitor_json.c:3213
 msgid "missing array element"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3229 src/qemu/qemu_monitor_text.c:3316
+#: src/qemu/qemu_monitor_json.c:3261 src/qemu/qemu_monitor_json.c:3437
+#: src/qemu/qemu_monitor_json.c:3470 src/qemu/qemu_monitor_text.c:3349
 #, c-format
 msgid "No active operation on device: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3232 src/qemu/qemu_monitor_text.c:3308
+#: src/qemu/qemu_monitor_json.c:3264 src/qemu/qemu_monitor_text.c:3341
 #, c-format
 msgid "Device %s in use"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3235 src/qemu/qemu_monitor_text.c:3328
+#: src/qemu/qemu_monitor_json.c:3267 src/qemu/qemu_monitor_json.c:3440
+#: src/qemu/qemu_monitor_json.c:3473 src/qemu/qemu_monitor_text.c:3361
 #, c-format
 msgid "Operation is not supported for device: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3238 src/qemu/qemu_monitor_text.c:3388
+#: src/qemu/qemu_monitor_json.c:3270 src/qemu/qemu_monitor_text.c:3421
+#: src/qemu/qemu_monitor_text.c:3497 src/qemu/qemu_monitor_text.c:3603
 #, c-format
 msgid "Command '%s' is not found"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3241
+#: src/qemu/qemu_monitor_json.c:3273 src/qemu/qemu_monitor_json.c:3443
+#: src/qemu/qemu_monitor_json.c:3476
 msgid "Unexpected error"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:173
+#: src/qemu/qemu_monitor_json.c:3327
+msgid " block_io_throttle reply was missing device list"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3338 src/qemu/qemu_monitor_json.c:3344
+msgid "block io throttle device entry was not in expected format"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3358
+msgid "block io throttle inserted entry was not in expected format"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3364
+msgid "cannot read total_bytes_sec"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3370
+msgid "cannot read read_bytes_sec"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3376
+msgid "cannot read write_bytes_sec"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3382
+msgid "cannot read total_iops_sec"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3388
+msgid "cannot read read_iops_sec"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3394
+msgid "cannot read write_iops_sec"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3402
+#, c-format
+msgid "cannot find throttling info for device '%s'"
+msgstr ""
+
+#: src/qemu/qemu_monitor_text.c:173
 msgid "Password request seen, but no handler available"
 msgstr ""
 
@@ -11014,7 +11576,7 @@
 msgid "Unable to extract disk path from %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:354
+#: src/qemu/qemu_monitor_text.c:389
 msgid "cannot stop CPU execution"
 msgstr ""
 
@@ -11027,7 +11589,7 @@
 msgid "unexpected reply from info status: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:367
+#: src/qemu/qemu_monitor_text.c:450
 msgid "system shutdown operation failed"
 msgstr ""
 
@@ -11047,7 +11609,7 @@
 msgid "system reset operation failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:386
+#: src/qemu/qemu_monitor_text.c:528
 msgid "cannot run monitor command to fetch CPU thread info"
 msgstr ""
 
@@ -11055,7 +11617,7 @@
 msgid "could not query kvm status"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:534
+#: src/qemu/qemu_monitor_text.c:716
 msgid "could not query memory balloon allocation"
 msgstr ""
 
@@ -11064,7 +11626,7 @@
 msgid "unexpected balloon information '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:571
+#: src/qemu/qemu_monitor_text.c:760
 msgid "could not query memory balloon statistics"
 msgstr ""
 
@@ -11081,15 +11643,15 @@
 msgid "no info for device '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:602
+#: src/qemu/qemu_monitor_text.c:884 src/qemu/qemu_monitor_text.c:1011
 msgid "'info blockstats' command failed"
-msgstr "la commande 'info blockstats' a échoué"
+msgstr "la commande « info blockstats » a échoué"
 
-#: src/qemu/qemu_monitor_text.c:614
+#: src/qemu/qemu_monitor_text.c:896 src/qemu/qemu_monitor_text.c:1023
 msgid "'info blockstats' not supported by this qemu"
-msgstr "'info blockstats' n'est pas pris en charge par ce qemu"
+msgstr "« info blockstats » n'est pas pris en charge par cette qemu"
 
-#: src/qemu/qemu_monitor_text.c:678
+#: src/qemu/qemu_monitor_text.c:994
 #, c-format
 msgid "no stats found for device %s"
 msgstr ""
@@ -11098,859 +11660,880 @@
 msgid "unable to query block extent with this QEMU"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:725
+#: src/qemu/qemu_monitor_text.c:1095
+msgid "failed to resize block"
+msgstr ""
+
+#: src/qemu/qemu_monitor_text.c:1151
 msgid "setting VNC password failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1143
+#: src/qemu/qemu_monitor_text.c:1176
 msgid "setting password failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1177
+#: src/qemu/qemu_monitor_text.c:1210
 msgid "expiring password failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:754
+#: src/qemu/qemu_monitor_text.c:1249
 msgid "could not balloon memory allocation"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1253
+#: src/qemu/qemu_monitor_text.c:1286
 msgid "could not change CPU online status"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:787 src/qemu/qemu_monitor_text.c:831
+#: src/qemu/qemu_monitor_text.c:1321
 #, c-format
 msgid "could not eject media on %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:796 src/qemu/qemu_monitor_text.c:840
+#: src/qemu/qemu_monitor_text.c:1330
 #, c-format
 msgid "could not eject media on %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1332
+#: src/qemu/qemu_monitor_text.c:1365
 #, c-format
 msgid "could not change media on %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1341 src/qemu/qemu_monitor_text.c:1348
+#: src/qemu/qemu_monitor_text.c:1374 src/qemu/qemu_monitor_text.c:1381
 #, c-format
 msgid "could not change media on %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1384
+#: src/qemu/qemu_monitor_text.c:1417
 #, c-format
 msgid "could not save memory region to '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1431
+#: src/qemu/qemu_monitor_text.c:1464
 msgid "could not restrict migration speed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1458
+#: src/qemu/qemu_monitor_text.c:1491
 msgid "could not set maximum migration downtime"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:958
+#: src/qemu/qemu_monitor_text.c:1532
 msgid "cannot query migration status"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:982
+#: src/qemu/qemu_monitor_text.c:1561
 #, c-format
 msgid "cannot parse migration data transferred statistic %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:993
+#: src/qemu/qemu_monitor_text.c:1574
 #, c-format
 msgid "cannot parse migration data remaining statistic %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1004
+#: src/qemu/qemu_monitor_text.c:1587
 #, c-format
 msgid "cannot parse migration data total statistic %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1570
+#: src/qemu/qemu_monitor_text.c:1603
 #, c-format
 msgid "cannot parse disk migration data transferred statistic %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1583
+#: src/qemu/qemu_monitor_text.c:1616
 #, c-format
 msgid "cannot parse disk migration data remaining statistic %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1596
+#: src/qemu/qemu_monitor_text.c:1629
 #, c-format
 msgid "cannot parse disk migration data total statistic %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1048
+#: src/qemu/qemu_monitor_text.c:1683
 #, c-format
 msgid "unable to start migration to %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1055
+#: src/qemu/qemu_monitor_text.c:1690
 #, c-format
 msgid "migration to '%s' failed: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1062
+#: src/qemu/qemu_monitor_text.c:1697
 #, c-format
 msgid "migration to '%s' not supported by this qemu: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1159
+#: src/qemu/qemu_monitor_text.c:1718
 msgid "cannot run monitor command to cancel migration"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1714
+#: src/qemu/qemu_monitor_text.c:1747
 msgid "cannot run monitor command to relocate graphics client"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1188
+#: src/qemu/qemu_monitor_text.c:1778
 msgid "cannot run monitor command to add usb disk"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1196
+#: src/qemu/qemu_monitor_text.c:1786
 #, c-format
 msgid "unable to add USB disk %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1223
+#: src/qemu/qemu_monitor_text.c:1814
 msgid "cannot attach usb device"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1231
+#: src/qemu/qemu_monitor_text.c:1822
 msgid "adding usb device failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1371
+#: src/qemu/qemu_monitor_text.c:1955
 msgid "cannot attach host pci device"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1386 src/qemu/qemu_monitor_text.c:1478
+#: src/qemu/qemu_monitor_text.c:1967 src/qemu/qemu_monitor_text.c:2054
 #, c-format
 msgid "parsing pci_add reply failed: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1426
+#: src/qemu/qemu_monitor_text.c:2006
 #, c-format
 msgid "cannot attach %s disk %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1440
+#: src/qemu/qemu_monitor_text.c:2019
 #, c-format
 msgid "adding %s disk failed %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1471
+#: src/qemu/qemu_monitor_text.c:2048
 #, c-format
 msgid "failed to add NIC with '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1517
+#: src/qemu/qemu_monitor_text.c:2092
 msgid "failed to remove PCI device"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1536
+#: src/qemu/qemu_monitor_text.c:2111
 #, c-format
 msgid "failed to detach PCI device, invalid address %.4x:%.2x:%.2x: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1565
+#: src/qemu/qemu_monitor_text.c:2140
 #, c-format
 msgid "failed to pass fd to qemu with '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1573
+#: src/qemu/qemu_monitor_text.c:2148
 #, c-format
 msgid "qemu does not support sending of file handles: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2122
+#: src/qemu/qemu_monitor_text.c:2155
 #, c-format
 msgid "unable to send file handle '%s': %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1601 src/qemu/qemu_monitor_text.c:1637
+#: src/qemu/qemu_monitor_text.c:2183
 #, c-format
 msgid "failed to close fd in qemu with '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1609
+#: src/qemu/qemu_monitor_text.c:2191
 #, c-format
 msgid "qemu does not support closing of file handles: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2186
+#: src/qemu/qemu_monitor_text.c:2219
 #, c-format
 msgid "failed to add host net with '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2192
+#: src/qemu/qemu_monitor_text.c:2225
 #, c-format
 msgid "unable to add host net: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1667
+#: src/qemu/qemu_monitor_text.c:2254
 #, c-format
 msgid "failed to remove host network in qemu with '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2250
+#: src/qemu/qemu_monitor_text.c:2283
 #, c-format
 msgid "failed to add netdev with '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2279
+#: src/qemu/qemu_monitor_text.c:2312
 #, c-format
 msgid "failed to remove netdev in qemu with '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2314
+#: src/qemu/qemu_monitor_text.c:2347
 msgid "failed to retrieve chardev info in qemu with 'info chardev'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2399
+#: src/qemu/qemu_monitor_text.c:2432
 #, c-format
 msgid "cannot attach %s disk controller"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2412
+#: src/qemu/qemu_monitor_text.c:2445
 #, c-format
 msgid "adding %s disk controller failed: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2498
+#: src/qemu/qemu_monitor_text.c:2531
 #, c-format
 msgid "failed to attach drive '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2504 src/qemu/qemu_monitor_text.c:2781
+#: src/qemu/qemu_monitor_text.c:2537 src/qemu/qemu_monitor_text.c:2814
 msgid "drive hotplug is not supported"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2516
+#: src/qemu/qemu_monitor_text.c:2549
 #, c-format
 msgid "adding %s disk failed: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2571
+#: src/qemu/qemu_monitor_text.c:2604
 #, c-format
 msgid "cannot parse value for %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2589
+#: src/qemu/qemu_monitor_text.c:2622
 msgid "cannot query PCI addresses"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2682
+#: src/qemu/qemu_monitor_text.c:2715
 #, c-format
 msgid "cannot detach %s device"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2688
+#: src/qemu/qemu_monitor_text.c:2721
 #, c-format
 msgid "detaching %s device failed: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2722
+#: src/qemu/qemu_monitor_text.c:2755
 #, c-format
 msgid "cannot attach %s device"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2738
+#: src/qemu/qemu_monitor_text.c:2771
 #, c-format
 msgid "adding %s device failed: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2775
+#: src/qemu/qemu_monitor_text.c:2808
 #, c-format
 msgid "failed to add drive '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2787
+#: src/qemu/qemu_monitor_text.c:2820
 msgid "open disk image file failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2823
+#: src/qemu/qemu_monitor_text.c:2856
 #, c-format
 msgid "cannot delete %s drive"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2828
+#: src/qemu/qemu_monitor_text.c:2861
 msgid ""
 "deleting drive is not supported.  This may leak data if disk is reassigned"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2840
+#: src/qemu/qemu_monitor_text.c:2873
 #, c-format
 msgid "deleting %s drive failed: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2876
+#: src/qemu/qemu_monitor_text.c:2909
 msgid "failed to set disk password"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2882
+#: src/qemu/qemu_monitor_text.c:2915
 msgid "setting disk password is not supported"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2886
+#: src/qemu/qemu_monitor_text.c:2919
 msgid "the disk password is incorrect"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2914 src/qemu/qemu_monitor_text.c:3066
+#: src/qemu/qemu_monitor_text.c:2947 src/qemu/qemu_monitor_text.c:3099
 #, c-format
 msgid "failed to take snapshot using command '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2920 src/qemu/qemu_monitor_text.c:3073
+#: src/qemu/qemu_monitor_text.c:2953 src/qemu/qemu_monitor_text.c:3106
 #, c-format
 msgid "Failed to take snapshot: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2925
+#: src/qemu/qemu_monitor_text.c:2958
 msgid "this domain does not have a device to take snapshots"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2962
+#: src/qemu/qemu_monitor_text.c:2995
 #, c-format
 msgid "failed to restore snapshot using command '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2969
+#: src/qemu/qemu_monitor_text.c:3002
 msgid "this domain does not have a device to load snapshots"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2974
+#: src/qemu/qemu_monitor_text.c:3007
 #, c-format
 msgid "the snapshot '%s' does not exist, and was not loaded"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3020
+#: src/qemu/qemu_monitor_text.c:3053
 #, c-format
 msgid "failed to delete snapshot using command '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3027
+#: src/qemu/qemu_monitor_text.c:3060
 msgid "this domain does not have a device to delete snapshots"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3104
+#: src/qemu/qemu_monitor_text.c:3137
 #, c-format
 msgid "failed to run cmd '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3134
+#: src/qemu/qemu_monitor_text.c:3167
 #, c-format
 msgid "failed to inject NMI using command '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3156
+#: src/qemu/qemu_monitor_text.c:3189
 #, c-format
 msgid "keycode %d is invalid: 0x%X"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3178
+#: src/qemu/qemu_monitor_text.c:3211
 #, c-format
 msgid "failed to send key using command '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3185
+#: src/qemu/qemu_monitor_text.c:3218
 #, c-format
 msgid "failed to send key '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3211
+#: src/qemu/qemu_monitor_text.c:3244
 msgid "taking screenshot failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3302
+#: src/qemu/qemu_monitor_text.c:3335
 msgid "Device not found"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3381
+#: src/qemu/qemu_monitor_text.c:3414 src/qemu/qemu_monitor_text.c:3490
+#: src/qemu/qemu_monitor_text.c:3596
 msgid "cannot run monitor command"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3418
+#: src/qemu/qemu_monitor_text.c:3451
 msgid "adding graphics client failed"
 msgstr ""
 
-#: src/qemu/qemu_process.c:201
+#: src/qemu/qemu_monitor_text.c:3580
+#, c-format
+msgid "No info for device '%s'"
+msgstr ""
+
+#: src/qemu/qemu_process.c:202
 #, c-format
 msgid "no disk found with path %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:224
+#: src/qemu/qemu_process.c:225
 #, c-format
 msgid "no disk found with alias %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:244
+#: src/qemu/qemu_process.c:245
 #, c-format
 msgid "disk %s does not have any encryption information"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:737
+#: src/qemu/qemu_process.c:253
 msgid "cannot find secrets without a connection"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:745 src/storage/storage_backend.c:387
+#: src/qemu/qemu_process.c:261 src/storage/storage_backend.c:465
 msgid "secret storage not supported"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:758
+#: src/qemu/qemu_process.c:270
 #, c-format
 msgid "invalid <encryption> for volume %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:776
+#: src/qemu/qemu_process.c:288
 #, c-format
 msgid "format='qcow' passphrase for %s must not contain a '\\0'"
 msgstr ""
 
-#: src/qemu/qemu_process.c:452
+#: src/qemu/qemu_process.c:447
 msgid "Failed to create reboot thread, killing domain"
 msgstr ""
 
-#: src/qemu/qemu_process.c:843
+#: src/qemu/qemu_process.c:877
 #, c-format
 msgid "Failed to set security context for monitor for %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:876
+#: src/qemu/qemu_process.c:910
 #, c-format
 msgid "Failed to clear security context for monitor for %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1326
+#: src/qemu/qemu_process.c:976
 #, c-format
 msgid "Failure while reading %s log output"
 msgstr ""
 
-#: src/qemu/qemu_process.c:964
+#: src/qemu/qemu_process.c:998
 #, c-format
 msgid "Out of space while reading %s log output: %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:971
+#: src/qemu/qemu_process.c:1005
 #, c-format
 msgid "Process exited while reading %s log output: %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:986
+#: src/qemu/qemu_process.c:1020
 #, c-format
 msgid "Timed out while reading %s log output: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1432
+#: src/qemu/qemu_process.c:1107
 #, c-format
 msgid "no assigned pty for device %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1255
+#: src/qemu/qemu_process.c:1300
 #, c-format
 msgid "process exited while connecting to monitor: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1593
+#: src/qemu/qemu_process.c:1350
 #, c-format
 msgid "got wrong number of vCPU pids from QEMU monitor. got %d, wanted %d"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1341
-msgid "Host kernel is not aware of NUMA."
-msgstr ""
-
-#: src/qemu/qemu_process.c:1353
-#, c-format
-msgid "Host cannot support NUMA node %d"
-msgstr ""
-
-#: src/qemu/qemu_process.c:1382
-msgid "NUMA memory tuning in 'preferred' mode only supports single node"
-msgstr ""
-
-#: src/qemu/qemu_process.c:1396
+#: src/qemu/qemu_process.c:1441
 msgid "Invalid mode for memory NUMA tuning."
 msgstr ""
 
-#: src/qemu/qemu_process.c:1411
+#: src/qemu/qemu_process.c:1456
 msgid "libvirt is compiled without NUMA tuning support"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1492
+#: src/qemu/qemu_process.c:1537
 msgid "Setting of link state is not supported by this qemu"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1501
+#: src/qemu/qemu_process.c:1546
 #, c-format
 msgid "Couldn't set link state on interface: %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1902
+#: src/qemu/qemu_process.c:1947
 #, c-format
 msgid "cannot find PCI address for VirtIO disk %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1916
+#: src/qemu/qemu_process.c:1961
 #, c-format
 msgid "cannot find PCI address for %s NIC"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1930
+#: src/qemu/qemu_process.c:1975
 #, c-format
 msgid "cannot find PCI address for controller %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1944
+#: src/qemu/qemu_process.c:1989
 #, c-format
 msgid "cannot find PCI address for video adapter %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1958
+#: src/qemu/qemu_process.c:2003
 #, c-format
 msgid "cannot find PCI address for sound adapter %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1971
+#: src/qemu/qemu_process.c:2016
 #, c-format
 msgid "cannot find PCI address for watchdog %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1983
+#: src/qemu/qemu_process.c:2028
 #, c-format
 msgid "cannot find PCI address for balloon %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:2102
+#: src/qemu/qemu_process.c:2147
 #, c-format
 msgid "Unable to pre-create chardev file '%s'"
 msgstr ""
 
-#: src/qemu/qemu_process.c:2122
+#: src/qemu/qemu_process.c:2167
 #, c-format
 msgid "cannot limit number of processes to %d"
 msgstr ""
 
-#: src/qemu/qemu_process.c:2773
+#: src/qemu/qemu_process.c:2843
 msgid "Could not create thread. QEMU initialization might be incomplete"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2374 src/uml/uml_driver.c:823
+#: src/qemu/qemu_process.c:2909 src/qemu/qemu_process.c:3579
+#: src/uml/uml_driver.c:983
 msgid "VM is already active"
 msgstr ""
 
-#: src/qemu/qemu_process.c:2914
+#: src/qemu/qemu_process.c:2984
 msgid "Unable to find an unused SPICE port"
 msgstr ""
 
-#: src/qemu/qemu_process.c:2922
+#: src/qemu/qemu_process.c:2992
 msgid "Unable to find an unused SPICE TLS port"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2403 src/uml/uml_driver.c:845
+#: src/qemu/qemu_process.c:3005 src/qemu/qemu_process.c:3595
+#: src/uml/uml_driver.c:1005
 #, c-format
 msgid "cannot create log directory %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2459
+#: src/qemu/qemu_process.c:3054
 msgid "Failed to build pidfile path."
 msgstr ""
 
-#: src/qemu/qemu_process.c:2991
+#: src/qemu/qemu_process.c:3061
 #, c-format
 msgid "Cannot remove stale PID file %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:3086
+#: src/qemu/qemu_process.c:3156
 #, c-format
 msgid "Domain %s didn't show up"
 msgstr ""
 
-#: src/qemu/qemu_process.c:3133
+#: src/qemu/qemu_process.c:3203
 #, c-format
 msgid "cannot stat fd %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2635
+#: src/qemu/qemu_process.c:3426
 #, c-format
 msgid "failed to remove ebtables rule to allow MAC address on  '%s'"
 msgstr ""
 
-#: src/remote/remote_client_bodies.h:17 src/remote/remote_client_bodies.h:1192
-#: src/remote/remote_client_bodies.h:1231
-#: src/remote/remote_client_bodies.h:1299
-#: src/remote/remote_client_bodies.h:1471
-#: src/remote/remote_client_bodies.h:1505
-#: src/remote/remote_client_bodies.h:1841
-#: src/remote/remote_client_bodies.h:4882
+#: src/remote/remote_client_bodies.h:17 src/remote/remote_client_bodies.h:1219
+#: src/remote/remote_client_bodies.h:1258
+#: src/remote/remote_client_bodies.h:1326
+#: src/remote/remote_client_bodies.h:1498
+#: src/remote/remote_client_bodies.h:1532
+#: src/remote/remote_client_bodies.h:1868
+#: src/remote/remote_client_bodies.h:4967
 #, c-format
 msgid "%s length greater than maximum: %d > %d"
 msgstr ""
 
-#: src/remote/remote_client_bodies.h:2319
-#: src/remote/remote_client_bodies.h:2338
-#: src/remote/remote_client_bodies.h:2382
-#: src/remote/remote_client_bodies.h:2401
-#: src/remote/remote_client_bodies.h:3126
-#: src/remote/remote_client_bodies.h:3143
-#: src/remote/remote_client_bodies.h:3187
-#: src/remote/remote_client_bodies.h:3204
-#: src/remote/remote_client_bodies.h:3248
-#: src/remote/remote_client_bodies.h:3265
-#: src/remote/remote_client_bodies.h:3309
-#: src/remote/remote_client_bodies.h:3326
-#: src/remote/remote_client_bodies.h:3370
-#: src/remote/remote_client_bodies.h:3387
-#: src/remote/remote_client_bodies.h:3431
-#: src/remote/remote_client_bodies.h:3448
-#: src/remote/remote_client_bodies.h:3492
-#: src/remote/remote_client_bodies.h:3509
-#: src/remote/remote_client_bodies.h:3553
-#: src/remote/remote_client_bodies.h:3570
-#: src/remote/remote_client_bodies.h:3614
-#: src/remote/remote_client_bodies.h:3631
-#: src/remote/remote_client_bodies.h:4130
-#: src/remote/remote_client_bodies.h:4148
-#: src/remote/remote_client_bodies.h:4303
-#: src/remote/remote_client_bodies.h:4322
-#: src/remote/remote_client_bodies.h:5240
-#: src/remote/remote_client_bodies.h:5258
+#: src/remote/remote_client_bodies.h:2378
+#: src/remote/remote_client_bodies.h:2397
+#: src/remote/remote_client_bodies.h:2441
+#: src/remote/remote_client_bodies.h:2460
+#: src/remote/remote_client_bodies.h:3185
+#: src/remote/remote_client_bodies.h:3202
+#: src/remote/remote_client_bodies.h:3246
+#: src/remote/remote_client_bodies.h:3263
+#: src/remote/remote_client_bodies.h:3307
+#: src/remote/remote_client_bodies.h:3324
+#: src/remote/remote_client_bodies.h:3368
+#: src/remote/remote_client_bodies.h:3385
+#: src/remote/remote_client_bodies.h:3429
+#: src/remote/remote_client_bodies.h:3446
+#: src/remote/remote_client_bodies.h:3490
+#: src/remote/remote_client_bodies.h:3507
+#: src/remote/remote_client_bodies.h:3551
+#: src/remote/remote_client_bodies.h:3568
+#: src/remote/remote_client_bodies.h:3612
+#: src/remote/remote_client_bodies.h:3629
+#: src/remote/remote_client_bodies.h:3673
+#: src/remote/remote_client_bodies.h:3690
+#: src/remote/remote_client_bodies.h:4189
+#: src/remote/remote_client_bodies.h:4207
+#: src/remote/remote_client_bodies.h:4362
+#: src/remote/remote_client_bodies.h:4381
+#: src/remote/remote_client_bodies.h:5325
+#: src/remote/remote_client_bodies.h:5343
 #, c-format
 msgid "too many remote undefineds: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:349
+#: src/remote/remote_driver.c:354
 #, c-format
 msgid "using unix socket and remote server '%s' is not supported."
 msgstr ""
 
-#: src/remote/remote_driver.c:411
+#: src/remote/remote_driver.c:369
 msgid ""
 "remote_open: transport in URL not recognised (should be tls|unix|ssh|ext|tcp)"
 msgstr ""
 "remote_open : le transport par URL n'est pas reconnu (devrait être "
 "tls|unix|ssh|ext|tcp)"
 
-#: src/remote/remote_driver.c:569
+#: src/remote/remote_driver.c:539
 msgid "remote_open: for 'ext' transport, command is required"
 msgstr "remote_open : pour le transport « ext », une commande est requise"
 
-#: src/remote/remote_driver.c:816
+#: src/remote/remote_driver.c:596
+msgid "Unable to locate libvirtd daemon in $PATH"
+msgstr ""
+
+#: src/remote/remote_driver.c:651
 msgid "transport methods unix, ssh and ext are not supported under Windows"
 msgstr ""
 "les méthodes de transport uni, xxh et ext, ne sont pas prises en charge sous "
 "Windows"
 
-#: src/remote/remote_driver.c:1050
+#: src/remote/remote_driver.c:1078
 msgid "remoteNodeGetCPUStats: returned number of stats exceeds limit"
 msgstr ""
 
-#: src/remote/remote_driver.c:1069 src/remote/remote_driver.c:1133
+#: src/remote/remote_driver.c:1097 src/remote/remote_driver.c:1161
 #, c-format
 msgid "Stats %s too big for destination"
 msgstr ""
 
-#: src/remote/remote_driver.c:1114
+#: src/remote/remote_driver.c:1142
 msgid "remoteNodeGetMemoryStats: returned number of stats exceeds limit"
 msgstr ""
 
-#: src/remote/remote_driver.c:1760
+#: src/remote/remote_driver.c:1194
 #, c-format
 msgid "too many NUMA cells: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:1823 src/remote/remote_driver.c:1837
+#: src/remote/remote_driver.c:1233 src/remote/remote_driver.c:1247
 #, c-format
 msgid "too many remote domain IDs: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:1327
+#: src/remote/remote_driver.c:1365
 msgid "returned number of parameters exceeds limit"
 msgstr ""
 
-#: src/remote/remote_driver.c:1410
+#: src/remote/remote_driver.c:1462
 msgid "remoteDomainBlockStatsFlags: returned number of stats exceeds limit"
 msgstr ""
 
-#: src/remote/remote_driver.c:2428
+#: src/remote/remote_driver.c:1609 src/remote/remote_driver.c:1682
 #, c-format
 msgid "vCPU count exceeds maximum: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:2434
+#: src/remote/remote_driver.c:1617 src/remote/remote_driver.c:1689
 #, c-format
 msgid "vCPU map buffer length exceeds maximum: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:2451
+#: src/remote/remote_driver.c:1638 src/remote/remote_driver.c:1706
 #, c-format
 msgid "host reports too many vCPUs: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:2457
+#: src/remote/remote_driver.c:1645 src/remote/remote_driver.c:1712
 #, c-format
 msgid "host reports map buffer length exceeds maximum: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:2532
+#: src/remote/remote_driver.c:1762
 #, c-format
 msgid "security label exceeds maximum: %zd"
 msgstr ""
 
-#: src/remote/remote_driver.c:2567
+#: src/remote/remote_driver.c:1833
 #, c-format
 msgid "security model exceeds maximum: %zd"
 msgstr ""
 
-#: src/remote/remote_driver.c:2576
+#: src/remote/remote_driver.c:1842
 #, c-format
 msgid "security doi exceeds maximum: %zd"
 msgstr ""
 
-#: src/remote/remote_driver.c:1876
+#: src/remote/remote_driver.c:1928
 msgid "caller ignores cookie or cookielen"
 msgstr ""
 
-#: src/remote/remote_driver.c:1885 src/remote/remote_driver.c:3881
+#: src/remote/remote_driver.c:1937 src/remote/remote_driver.c:3988
 msgid "caller ignores uri_out"
 msgstr ""
 
-#: src/remote/remote_driver.c:3384
+#: src/remote/remote_driver.c:2040
 #, c-format
 msgid "too many memory stats requested: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:3428
+#: src/remote/remote_driver.c:2084
 #, c-format
 msgid "block peek request too large for remote protocol, %zi > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:3449 src/remote/remote_driver.c:3500
+#: src/remote/remote_driver.c:2105 src/remote/remote_driver.c:2156
 msgid "returned buffer is not same size as requested"
 msgstr ""
 
-#: src/remote/remote_driver.c:3480
+#: src/remote/remote_driver.c:2136
 #, c-format
 msgid "memory peek request too large for remote protocol, %zi > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:6027
+#: src/remote/remote_driver.c:2556
 #, c-format
 msgid "unknown authentication type %s"
 msgstr ""
 
-#: src/remote/remote_driver.c:6037
+#: src/remote/remote_driver.c:2565
 #, c-format
 msgid "requested authentication type %s rejected"
 msgstr ""
 
-#: src/remote/remote_driver.c:6078
+#: src/remote/remote_driver.c:2604
 #, c-format
 msgid "unsupported authentication type %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:6425
+#: src/remote/remote_driver.c:2859
 #, c-format
 msgid "SASL mechanism %s not supported by server"
 msgstr ""
 
-#: src/remote/remote_driver.c:6462 src/remote/remote_driver.c:6540
+#: src/remote/remote_driver.c:2886 src/remote/remote_driver.c:2956
 msgid "Failed to make auth credentials"
 msgstr ""
 
-#: src/remote/remote_driver.c:2800
+#: src/remote/remote_driver.c:2907
 #, c-format
 msgid "SASL negotiation data too long: %zu bytes"
 msgstr ""
 
-#: src/remote/remote_driver.c:6686
+#: src/remote/remote_driver.c:2965 src/remote/remote_driver.c:3092
 msgid "Failed to collect auth credentials"
 msgstr ""
 
-#: src/remote/remote_driver.c:2860
+#: src/remote/remote_driver.c:2967
 msgid "No authentication callback available"
 msgstr ""
 
-#: src/remote/remote_driver.c:6610
+#: src/remote/remote_driver.c:3019
 #, c-format
 msgid "negotiation SSF %d was not strong enough"
 msgstr ""
 
-#: src/remote/remote_driver.c:6721
+#: src/remote/remote_driver.c:3127 src/remote/remote_driver.c:3767
 msgid "no event support"
 msgstr ""
 
-#: src/remote/remote_driver.c:6726
+#: src/remote/remote_driver.c:3133 src/remote/remote_driver.c:3775
 msgid "adding cb to list"
 msgstr ""
 
-#: src/remote/remote_driver.c:3396
+#: src/remote/remote_driver.c:3503
 msgid "no internalFlags support"
 msgstr ""
 
-#: src/remote/remote_driver.c:3710
+#: src/remote/remote_driver.c:3817
 #, c-format
 msgid "unable to find callback ID %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:3813 src/remote/remote_driver.c:3872
-#: src/remote/remote_driver.c:3954 src/remote/remote_driver.c:4015
-#: src/remote/remote_driver.c:4074
+#: src/remote/remote_driver.c:3920 src/remote/remote_driver.c:3979
+#: src/remote/remote_driver.c:4061 src/remote/remote_driver.c:4122
+#: src/remote/remote_driver.c:4181
 msgid "caller ignores cookieout or cookieoutlen"
 msgstr ""
 
-#: src/remote/remote_driver.c:831
+#: src/remote/remote_driver.c:4275
+msgid ""
+"the caller doesn't support keepalive protocol; perhaps it's missing event "
+"loop implementation"
+msgstr ""
+
+#: src/rpc/virkeepalive.c:337
+msgid "keepalive interval already set"
+msgstr ""
+
+#: src/rpc/virnetclient.c:280
 msgid "unable to make pipe"
 msgstr ""
 
-#: src/rpc/virnetclient.c:426
+#: src/rpc/virnetclient.c:540 src/rpc/virnetclient.c:1556
+msgid "failed to wake up polling thread"
+msgstr ""
+
+#: src/rpc/virnetclient.c:645
 msgid "Unable to read TLS confirmation"
 msgstr ""
 
-#: src/rpc/virnetclient.c:431
+#: src/rpc/virnetclient.c:650
 msgid "server verification (of our certificate or IP address) failed"
 msgstr ""
 
-#: src/rpc/virnetclient.c:568
+#: src/rpc/virnetclient.c:801
 #, c-format
 msgid "no call waiting for reply with prog %d vers %d serial %d"
 msgstr ""
 
-#: src/rpc/virnetclient.c:716
+#: src/rpc/virnetclient.c:954
 #, c-format
 msgid "got unexpected RPC call prog %d vers %d proc %d type %d"
 msgstr ""
 
-#: src/rpc/virnetclient.c:985
+#: src/rpc/virnetclient.c:1382
 msgid "read on wakeup fd failed"
 msgstr ""
 
-#: src/remote/remote_driver.c:8307
+#: src/rpc/virnetclient.c:1402
 msgid "poll on socket failed"
 msgstr ""
 
-#: src/remote/remote_driver.c:8368
+#: src/rpc/virnetclient.c:1450
 msgid "received hangup / error event on socket"
 msgstr ""
 
-#: src/rpc/virnetclient.c:1139
-msgid "failed to wake up polling thread"
-msgstr ""
-
-#: src/remote/remote_driver.c:8462
+#: src/rpc/virnetclient.c:1565
 msgid "failed to wait on condition"
 msgstr ""
 
-#: src/rpc/virnetclient.c:1269
+#: src/rpc/virnetclient.c:1691
 msgid "Attempt to send an asynchronous message with a synchronous reply"
 msgstr ""
 
-#: daemon/libvirtd.c:836
+#: src/rpc/virnetclient.c:1697
+msgid "Attempt to send a non-blocking message with a synchronous reply"
+msgstr ""
+
+#: src/rpc/virnetclient.c:1710
+msgid "client socket is closed"
+msgstr ""
+
+#: src/rpc/virnetclient.c:1716
 msgid "cannot initialize condition variable"
 msgstr "Impossible d'initialiser la variable condition"
 
@@ -12010,11 +12593,11 @@
 msgid "Unexpected message status %d"
 msgstr ""
 
-#: src/rpc/virnetclientstream.c:455
+#: src/rpc/virnetclientstream.c:456
 msgid "multiple stream callbacks not supported"
 msgstr ""
 
-#: src/rpc/virnetclientstream.c:491 src/rpc/virnetclientstream.c:513
+#: src/rpc/virnetclientstream.c:492 src/rpc/virnetclientstream.c:514
 msgid "no stream callback registered"
 msgstr ""
 
@@ -12094,7 +12677,7 @@
 msgid "Unable to duplicate FD %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:6320
+#: src/rpc/virnetsaslcontext.c:61 src/rpc/virnetsaslcontext.c:91
 #, c-format
 msgid "failed to initialize SASL library: %d (%s)"
 msgstr ""
@@ -12110,7 +12693,7 @@
 msgid "Malformed TLS whitelist regular expression '%s'"
 msgstr ""
 
-#: daemon/remote.c:3088
+#: src/rpc/virnetsaslcontext.c:146
 #, c-format
 msgid "SASL client %s not allowed in whitelist"
 msgstr "le client SASL %s n'est pas autorisé dans la liste blanche"
@@ -12119,34 +12702,34 @@
 msgid "Client's username is not on the list of allowed clients"
 msgstr ""
 
-#: src/remote/remote_driver.c:6364
+#: src/rpc/virnetsaslcontext.c:218 src/rpc/virnetsaslcontext.c:264
 #, c-format
 msgid "Failed to create SASL client context: %d (%s)"
 msgstr ""
 
-#: src/remote/remote_driver.c:6387
+#: src/rpc/virnetsaslcontext.c:293
 #, c-format
 msgid "cannot set external SSF %d (%s)"
 msgstr ""
 
-#: daemon/remote.c:3051
+#: src/rpc/virnetsaslcontext.c:314
 #, c-format
 msgid "cannot query SASL username on connection %d (%s)"
 msgstr ""
-"impossible d'envoyer une requête nom d'utilisateur SASL lors de la connexion "
+"Impossible d'envoyer une requête nom d'utilisateur SASL lors de la connexion "
 "%d (%s)"
 
-#: daemon/remote.c:3059
+#: src/rpc/virnetsaslcontext.c:321
 msgid "no client username was found"
 msgstr "aucun nom d'utilisateur client n'a été trouvé"
 
-#: daemon/remote.c:3012 src/remote/remote_driver.c:6601
+#: src/rpc/virnetsaslcontext.c:342
 #, c-format
 msgid "cannot query SASL ssf on connection %d (%s)"
 msgstr ""
-"impossible d'envoyer une requête SSF SASL lors de la connexion %d (%s)"
+"Impossible d'envoyer une requête SSF SASL lors de la connexion %d (%s)"
 
-#: src/remote/remote_driver.c:6406
+#: src/rpc/virnetsaslcontext.c:378
 #, c-format
 msgid "cannot set security props %d (%s)"
 msgstr ""
@@ -12156,12 +12739,13 @@
 msgid "cannot get security props %d (%s)"
 msgstr ""
 
-#: daemon/remote.c:2972
+#: src/rpc/virnetsaslcontext.c:430
 #, c-format
 msgid "cannot list SASL mechanisms %d (%s)"
-msgstr "impossible de lister les mécanismes SASL %d (%s)"
+msgstr "Impossible de lister les mécanismes SASL %d (%s)"
 
-#: src/remote/remote_driver.c:6444
+#: src/rpc/virnetsaslcontext.c:483 src/rpc/virnetsaslcontext.c:578
+#: src/rpc/virnetsaslcontext.c:623
 #, c-format
 msgid "Failed to start SASL negotiation: %d (%s)"
 msgstr ""
@@ -12186,184 +12770,188 @@
 msgid "failed to decode SASL data: %d (%s)"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:122
+#: src/rpc/virnetsocket.c:123
 msgid "Unable to set close-on-exec flag"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:127
+#: src/rpc/virnetsocket.c:128
 msgid "Unable to enable non-blocking flag"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:159
+#: src/rpc/virnetsocket.c:160
 msgid "Unable to disable nagle algorithm"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:212 src/rpc/virnetsocket.c:409
+#: src/rpc/virnetsocket.c:213 src/rpc/virnetsocket.c:410
 #, c-format
 msgid "Unable to resolve address '%s' service '%s': %s"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:225 src/rpc/virnetsocket.c:420
+#: src/rpc/virnetsocket.c:226 src/rpc/virnetsocket.c:421
 msgid "Unable to create socket"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:231
+#: src/rpc/virnetsocket.c:232
 msgid "Unable to enable port reuse"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:248
+#: src/rpc/virnetsocket.c:249
 msgid "Unable to force bind to IPv6 only"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:256 src/rpc/virnetsocket.c:286
+#: src/rpc/virnetsocket.c:257 src/rpc/virnetsocket.c:287
 msgid "Unable to bind to port"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:267 src/rpc/virnetsocket.c:443
-#: src/rpc/virnetsocket.c:516 src/rpc/virnetsocket.c:1251
+#: src/rpc/virnetsocket.c:268 src/rpc/virnetsocket.c:444
+#: src/rpc/virnetsocket.c:523 src/rpc/virnetsocket.c:1272
 msgid "Unable to get local socket name"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:324 src/rpc/virnetsocket.c:484
+#: src/rpc/virnetsocket.c:325 src/rpc/virnetsocket.c:491
 msgid "Failed to create socket"
 msgstr ""
 
-#: daemon/libvirtd.c:552
+#: src/rpc/virnetsocket.c:332 src/rpc/virnetsocket.c:497
 #, c-format
 msgid "Path %s too long for unix socket"
 msgstr "Le chemin %s est trop long pour une socket Unix"
 
-#: src/rpc/virnetsocket.c:344
+#: src/rpc/virnetsocket.c:345
 #, c-format
 msgid "Failed to bind socket to '%s'"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:355
+#: src/rpc/virnetsocket.c:356
 #, c-format
 msgid "Failed to change ownership of '%s' to %d:%d"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:379 src/rpc/virnetsocket.c:536
+#: src/rpc/virnetsocket.c:380 src/rpc/virnetsocket.c:543
 msgid "UNIX sockets are not supported on this platform"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:436
+#: src/rpc/virnetsocket.c:437
 #, c-format
 msgid "unable to connect to server at '%s:%s'"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:449
+#: src/rpc/virnetsocket.c:450
 msgid "Unable to get remote socket name"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:509
+#: src/rpc/virnetsocket.c:486
+msgid "Auto-spawn of daemon requested, but no binary specified"
+msgstr ""
+
+#: src/rpc/virnetsocket.c:516
 #, c-format
 msgid "Failed to connect socket to '%s'"
 msgstr ""
 
-#: src/remote/remote_driver.c:792
+#: src/rpc/virnetsocket.c:565 src/rpc/virnetsocket.c:571
 msgid "unable to create socket pair"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:602
+#: src/rpc/virnetsocket.c:609
 msgid "Tunnelling sockets not supported on this platform"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:779
+#: src/rpc/virnetsocket.c:787
 msgid "Unable to copy socket file handle"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:829
+#: src/rpc/virnetsocket.c:837
 msgid "Failed to get client socket identity"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:847
+#: src/rpc/virnetsocket.c:855
 msgid "Client socket identity not available"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:964
+#: src/rpc/virnetsocket.c:985
 #, c-format
 msgid "Cannot recv data: %s"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:967
+#: src/rpc/virnetsocket.c:988
 msgid "Cannot recv data"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:972
+#: src/rpc/virnetsocket.c:993
 #, c-format
 msgid "End of file while reading data: %s"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:975
+#: src/rpc/virnetsocket.c:996
 msgid "End of file while reading data"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1002
+#: src/rpc/virnetsocket.c:1023
 msgid "Cannot write data"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1007
+#: src/rpc/virnetsocket.c:1028
 msgid "End of file while writing data"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1153
+#: src/rpc/virnetsocket.c:1174
 msgid "Sending file descriptors is not supported on this socket"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1164
+#: src/rpc/virnetsocket.c:1185
 #, c-format
 msgid "Failed to send file descriptor %d"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1187
+#: src/rpc/virnetsocket.c:1208
 msgid "Receiving file descriptors is not supported on this socket"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1197
+#: src/rpc/virnetsocket.c:1218
 msgid "Failed to recv file descriptor"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1214
+#: src/rpc/virnetsocket.c:1235
 msgid "Unable to listen on socket"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1245
+#: src/rpc/virnetsocket.c:1266
 msgid "Unable to accept client"
 msgstr ""
 
-#: src/rpc/virnetserver.c:241
+#: src/rpc/virnetserver.c:245
 #, c-format
 msgid "Too many active clients (%zu), dropping connection from %s"
 msgstr ""
 
-#: daemon/libvirtd.c:954
+#: src/rpc/virnetserver.c:366
 #, c-format
 msgid "Failed to connect to system bus for PolicyKit auth: %s"
 msgstr "Impossible de se connecter au bus système pour PolicyKit auth : %s"
 
-#: src/rpc/virnetserver.c:476
+#: src/rpc/virnetserver.c:489
 msgid "Failed to read from signal pipe"
 msgstr ""
 
-#: src/rpc/virnetserver.c:493
+#: src/rpc/virnetserver.c:506
 #, c-format
 msgid "Unexpected signal received: %d"
 msgstr ""
 
-#: src/rpc/virnetserver.c:508
+#: src/rpc/virnetserver.c:521
 msgid "Unable to create signal pipe"
 msgstr ""
 
-#: src/rpc/virnetserver.c:517
+#: src/rpc/virnetserver.c:530
 msgid "Failed to add signal handle watch"
 msgstr ""
 
-#: daemon/libvirtd.c:2236
+#: src/rpc/virnetserver.c:708
 msgid "Failed to register shutdown timeout"
 msgstr "Impossible d'enregistrer le temps d'arrêt limite"
 
-#: src/rpc/virnetserverclient.c:750 src/rpc/virnetserverclient.c:909
+#: src/rpc/virnetserverclient.c:788 src/rpc/virnetserverclient.c:947
 #, c-format
 msgid "unexpected zero/negative length request %lld"
 msgstr ""
@@ -12373,7 +12961,7 @@
 msgid "Failed to add watch for fd %d events %d"
 msgstr ""
 
-#: src/rpc/virnetservermdns.c:344
+#: src/rpc/virnetservermdns.c:344 src/util/virtime.c:247
 msgid "Unable to get current time"
 msgstr ""
 
@@ -12392,12 +12980,12 @@
 msgid "Cannot find program %d version %d"
 msgstr ""
 
-#: daemon/dispatch.c:375
+#: src/rpc/virnetserverprogram.c:274
 #, c-format
 msgid "program mismatch (actual %x, expected %x)"
 msgstr ""
 
-#: daemon/dispatch.c:381
+#: src/rpc/virnetserverprogram.c:281
 #, c-format
 msgid "version mismatch (actual %x, expected %x)"
 msgstr "la version ne correspond pas (actuelle %x, attendue %x)"
@@ -12412,12 +13000,12 @@
 msgid "Unexpected message status %u"
 msgstr ""
 
-#: daemon/dispatch.c:475
+#: src/rpc/virnetserverprogram.c:376
 #, c-format
 msgid "unknown procedure: %d"
 msgstr "procédure inconnue : %d"
 
-#: daemon/dispatch.c:467
+#: src/rpc/virnetserverprogram.c:390
 msgid "authentication required"
 msgstr "authentification requise"
 
@@ -12426,7 +13014,7 @@
 msgid "Cannot read %s '%s'"
 msgstr ""
 
-#: src/remote/remote_driver.c:1296
+#: src/rpc/virnettlscontext.c:114
 msgid "cannot get current time"
 msgstr ""
 
@@ -12545,23 +13133,23 @@
 msgid "Unable to verify client certificate %s against CA certificate %s"
 msgstr ""
 
-#: src/remote/remote_driver.c:1301
+#: src/rpc/virnettlscontext.c:453 src/rpc/virnettlscontext.c:964
 msgid "Invalid certificate"
 msgstr ""
 
-#: src/remote/remote_driver.c:1304
+#: src/rpc/virnettlscontext.c:456 src/rpc/virnettlscontext.c:967
 msgid "The certificate is not trusted."
 msgstr ""
 
-#: src/remote/remote_driver.c:1307
+#: src/rpc/virnettlscontext.c:459 src/rpc/virnettlscontext.c:970
 msgid "The certificate hasn't got a known issuer."
 msgstr ""
 
-#: src/remote/remote_driver.c:1310
+#: src/rpc/virnettlscontext.c:462 src/rpc/virnettlscontext.c:973
 msgid "The certificate has been revoked."
 msgstr ""
 
-#: src/remote/remote_driver.c:1314
+#: src/rpc/virnettlscontext.c:466 src/rpc/virnettlscontext.c:977
 msgid "The certificate uses an insecure algorithm"
 msgstr ""
 
@@ -12665,66 +13253,66 @@
 msgid "TLS handshake failed %s"
 msgstr ""
 
-#: src/remote/remote_driver.c:6377
+#: src/rpc/virnettlscontext.c:1388
 msgid "invalid cipher size for TLS session"
 msgstr ""
 
-#: src/secret/secret_driver.c:170
+#: src/secret/secret_driver.c:176
 #, c-format
 msgid "mkstemp('%s') failed"
 msgstr ""
 
-#: src/secret/secret_driver.c:174
+#: src/secret/secret_driver.c:180
 #, c-format
 msgid "fchmod('%s') failed"
 msgstr ""
 
-#: src/secret/secret_driver.c:180
+#: src/secret/secret_driver.c:186
 #, c-format
 msgid "error writing to '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:185
+#: src/secret/secret_driver.c:191
 #, c-format
 msgid "error closing '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:191
+#: src/secret/secret_driver.c:197
 #, c-format
 msgid "rename(%s, %s) failed"
 msgstr ""
 
-#: src/secret/secret_driver.c:242
+#: src/secret/secret_driver.c:247
 #, c-format
 msgid "cannot create '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:349
+#: src/secret/secret_driver.c:354
 #, c-format
 msgid "<uuid> does not match secret file name '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:376 src/secret/secret_driver.c:485
+#: src/secret/secret_driver.c:381 src/secret/secret_driver.c:488
 #, c-format
 msgid "cannot open '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:380
+#: src/secret/secret_driver.c:385
 #, c-format
 msgid "cannot stat '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:385
+#: src/secret/secret_driver.c:390
 #, c-format
 msgid "'%s' file does not fit in memory"
 msgstr ""
 
-#: src/secret/secret_driver.c:394
+#: src/secret/secret_driver.c:399
 #, c-format
 msgid "cannot read '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:402
+#: src/secret/secret_driver.c:406
 #, c-format
 msgid "invalid base64 in '%s'"
 msgstr ""
@@ -12734,130 +13322,129 @@
 msgid "Error reading secret: %s"
 msgstr ""
 
-#: src/secret/secret_driver.c:634 src/secret/secret_driver.c:802
-#: src/secret/secret_driver.c:836 src/secret/secret_driver.c:888
-#: src/secret/secret_driver.c:934
+#: src/secret/secret_driver.c:637 src/secret/secret_driver.c:809
+#: src/secret/secret_driver.c:845 src/secret/secret_driver.c:900
+#: src/secret/secret_driver.c:946
 #, c-format
 msgid "no secret with matching uuid '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:661
+#: src/secret/secret_driver.c:664
 #, c-format
 msgid "no secret with matching usage '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:701
+#: src/secret/secret_driver.c:706
 #, c-format
 msgid "a secret with UUID %s already defined for use with %s"
 msgstr ""
 
-#: src/secret/secret_driver.c:721
+#: src/secret/secret_driver.c:726
 #, c-format
 msgid "a secret with UUID %s is already defined for use with %s"
 msgstr ""
 
-#: src/secret/secret_driver.c:728
+#: src/secret/secret_driver.c:733
 msgid "cannot change private flag on existing secret"
 msgstr ""
 
-#: src/secret/secret_driver.c:776
+#: src/secret/secret_driver.c:781
 msgid "list of secrets is inconsistent"
 msgstr ""
 
-#: src/secret/secret_driver.c:896
+#: src/secret/secret_driver.c:908
 #, c-format
 msgid "secret '%s' does not have a value"
 msgstr ""
 
-#: src/secret/secret_driver.c:903
+#: src/secret/secret_driver.c:915
 msgid "secret is private"
 msgstr ""
 
-#: src/secret/secret_driver.c:1026
+#: src/secret/secret_driver.c:1038
 msgid "Out of memory initializing secrets"
 msgstr ""
 
-#: src/security/security_apparmor.c:75
+#: src/security/security_apparmor.c:85
 #, c-format
 msgid "Failed to read AppArmor profiles list '%s'"
 msgstr ""
 
-#: src/security/security_apparmor.c:124
+#: src/security/security_apparmor.c:134
 #, c-format
 msgid "Failed to read '%s'"
 msgstr ""
 
-#: src/security/security_apparmor.c:268
+#: src/security/security_apparmor.c:242
 msgid "could not find libvirtd"
 msgstr ""
 
-#: src/security/security_apparmor.c:497 src/security/security_apparmor.c:538
+#: src/security/security_apparmor.c:279 src/security/security_apparmor.c:303
+#: src/security/security_apparmor.c:321 src/security/security_apparmor.c:643
 #, c-format
 msgid "cannot update AppArmor profile '%s'"
 msgstr ""
 
-#: src/security/security_apparmor.c:298
+#: src/security/security_apparmor.c:348
 #, c-format
 msgid "template '%s' does not exist"
 msgstr ""
 
-#: src/security/security_apparmor.c:403
+#: src/security/security_apparmor.c:404
 msgid "Cannot set a base label with AppArmour"
 msgstr ""
 
-#: src/security/security_apparmor.c:334 src/security/security_selinux.c:172
+#: src/security/security_apparmor.c:412 src/security/security_selinux.c:185
 msgid "security label already defined for VM"
 msgstr ""
 
-#: src/security/security_apparmor.c:441
+#: src/security/security_apparmor.c:442
 #, c-format
 msgid "cannot load AppArmor profile '%s'"
 msgstr ""
 
-#: src/security/security_apparmor.c:402
+#: src/security/security_apparmor.c:493
 msgid "error copying profile name"
 msgstr ""
 
-#: src/security/security_apparmor.c:408
+#: src/security/security_apparmor.c:499
 msgid "error calling profile_status()"
 msgstr ""
 
-#: src/security/security_apparmor.c:431
+#: src/security/security_apparmor.c:538
 #, c-format
 msgid "could not remove profile for '%s'"
 msgstr ""
 
-#: src/security/security_apparmor.c:457 src/security/security_selinux.c:672
+#: src/security/security_apparmor.c:560 src/security/security_selinux.c:1042
+#: src/security/security_selinux.c:1071 src/security/security_selinux.c:1106
+#: src/security/security_selinux.c:1173 src/security/security_selinux.c:1210
 #, c-format
 msgid ""
 "security label driver mismatch: '%s' model configured for domain, but "
 "hypervisor driver is '%s'."
 msgstr ""
 
-#: src/security/security_apparmor.c:467
+#: src/security/security_apparmor.c:570
 msgid "error calling aa_change_profile()"
 msgstr ""
 
-#: src/security/security_apparmor.c:527
+#: src/security/security_apparmor.c:631
 #, c-format
 msgid "'%s' does not exist"
 msgstr ""
 
-#: src/security/security_apparmor.c:561
+#: src/security/security_apparmor.c:667
 #, c-format
 msgid "Invalid security label '%s'"
 msgstr ""
 
-#: src/security/security_apparmor.c:795
-msgid "could not find path for descriptor"
-msgstr ""
-
 #: src/security/security_dac.c:124
 #, c-format
 msgid "unable to set user and group to '%d:%d' on '%s'"
 msgstr ""
 
-#: src/security/security_selinux.c:361
+#: src/security/security_dac.c:143
 #, c-format
 msgid "cannot resolve symlink %s"
 msgstr ""
@@ -12867,22 +13454,22 @@
 msgid "Security driver %s not found"
 msgstr ""
 
-#: src/security/security_selinux.c:114
+#: src/security/security_selinux.c:119
 #, c-format
 msgid "cannot open SELinux virtual domain context file '%s'"
 msgstr ""
 
-#: src/security/security_selinux.c:121
+#: src/security/security_selinux.c:126
 #, c-format
 msgid "cannot read SELinux virtual domain context file %s"
 msgstr ""
 
-#: src/security/security_selinux.c:133
+#: src/security/security_selinux.c:138
 #, c-format
 msgid "cannot open SELinux virtual image context file %s"
 msgstr ""
 
-#: src/security/security_selinux.c:140
+#: src/security/security_selinux.c:145
 #, c-format
 msgid "cannot read SELinux virtual image context file %s"
 msgstr ""
@@ -12905,26 +13492,26 @@
 msgid "unable to allocate socket security context '%s'"
 msgstr ""
 
-#: src/security/security_selinux.c:193 src/security/security_selinux.c:199
+#: src/security/security_selinux.c:246 src/security/security_selinux.c:253
 #, c-format
 msgid "cannot generate selinux context for %s"
 msgstr ""
 
-#: src/security/security_selinux.c:230 src/security/security_selinux.c:282
+#: src/security/security_selinux.c:302 src/security/security_selinux.c:370
 #, c-format
 msgid "unable to get PID %d security context"
 msgstr ""
 
-#: src/security/security_selinux.c:289
+#: src/security/security_selinux.c:377
 #, c-format
 msgid "security label exceeds maximum length: %d"
 msgstr ""
 
-#: src/security/security_selinux.c:301
+#: src/security/security_selinux.c:390
 msgid "error calling security_getenforce()"
 msgstr ""
 
-#: src/security/security_selinux.c:335
+#: src/security/security_selinux.c:424
 #, c-format
 msgid "unable to set security context '%s' on '%s'"
 msgstr ""
@@ -12946,12 +13533,12 @@
 msgid "unknown smartcard type %d"
 msgstr ""
 
-#: src/security/security_selinux.c:654
+#: src/security/security_selinux.c:1052
 #, c-format
 msgid "Invalid security label %s"
 msgstr ""
 
-#: src/security/security_selinux.c:682
+#: src/security/security_selinux.c:1081
 #, c-format
 msgid "unable to set security context '%s'"
 msgstr ""
@@ -13131,6 +13718,10 @@
 msgid "Could not find <uuid>"
 msgstr ""
 
+#: src/security/virt-aa-helper.c:647
+msgid "unexpected root element, expecting <domain>"
+msgstr ""
+
 #: src/security/virt-aa-helper.c:657
 msgid "os.type is not 'hvm'"
 msgstr ""
@@ -13139,7 +13730,7 @@
 #: src/security/virt-aa-helper.c:721 src/security/virt-aa-helper.c:815
 #: src/security/virt-aa-helper.c:824 src/security/virt-aa-helper.c:899
 #: src/security/virt-aa-helper.c:1190 src/security/virt-aa-helper.c:1194
-#: src/security/virt-aa-helper.c:1250
+#: src/security/virt-aa-helper.c:1254
 msgid "could not allocate memory"
 msgstr ""
 
@@ -13219,11 +13810,11 @@
 msgid "could not parse arguments"
 msgstr ""
 
-#: src/security/virt-aa-helper.c:1229
+#: src/security/virt-aa-helper.c:1233
 msgid "failed to allocate buffer"
 msgstr "impossible d'allouer un tampon"
 
-#: src/security/virt-aa-helper.c:1260
+#: src/security/virt-aa-helper.c:1264
 msgid "could not create profile"
 msgstr ""
 
@@ -13242,22 +13833,22 @@
 msgid "unable to access disk %s\n"
 msgstr ""
 
-#: src/storage/storage_backend.c:134
+#: src/storage/storage_backend.c:141
 #, c-format
 msgid "could not open input path '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:156
+#: src/storage/storage_backend.c:179
 #, c-format
 msgid "failed reading from file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:172 src/storage/storage_backend.c:278
+#: src/storage/storage_backend.c:196 src/storage/storage_backend.c:318
 #, c-format
 msgid "cannot extend file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:178
+#: src/storage/storage_backend.c:203
 #, c-format
 msgid "failed writing to file '%s'"
 msgstr ""
@@ -13267,51 +13858,51 @@
 msgid "cannot sync data to file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:188 src/storage/storage_backend.c:234
-#: src/storage/storage_backend.c:328 src/storage/storage_backend_fs.c:835
-#: src/storage/storage_backend_logical.c:638
+#: src/storage/storage_backend.c:222 src/storage/storage_backend.c:293
+#: src/storage/storage_backend_logical.c:734
 #, c-format
 msgid "cannot close file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:218 src/storage/storage_backend.c:269
-#: src/storage/storage_backend_fs.c:511 src/storage/storage_backend_fs.c:752
+#: src/storage/storage_backend.c:257 src/storage/storage_backend.c:407
+#: src/storage/storage_backend_fs.c:761 src/storage/storage_backend_fs.c:788
+#: src/storage/storage_backend_fs.c:1042
 #, c-format
 msgid "cannot create path '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:272 src/util/util.c:759 src/util/util.c:803
-#: src/util/util.c:1036
+#: src/storage/storage_backend.c:272 src/util/util.c:757 src/util/util.c:801
+#: src/util/util.c:1034
 #, c-format
 msgid "stat of '%s' failed"
 msgstr ""
 
-#: src/storage/storage_backend.c:281 src/util/util.c:766 src/util/util.c:809
+#: src/storage/storage_backend.c:281 src/util/util.c:764 src/util/util.c:807
 #, c-format
 msgid "cannot chown '%s' to (%u, %u)"
 msgstr ""
 
 #: src/storage/storage_backend.c:287 src/storage/storage_backend.c:601
-#: src/util/util.c:776 src/util/util.c:817 src/util/util.c:1049
+#: src/util/util.c:774 src/util/util.c:815 src/util/util.c:1047
 #, c-format
 msgid "cannot set mode of '%s' to %04o"
 msgstr ""
 
-#: src/storage/storage_backend.c:308 src/storage/storage_backend.c:319
+#: src/storage/storage_backend.c:346 src/storage/storage_backend.c:355
 #, c-format
 msgid "cannot fill file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:261 src/storage/storage_backend_disk.c:560
-#: src/storage/storage_backend_logical.c:584
+#: src/storage/storage_backend.c:391 src/storage/storage_backend_disk.c:648
+#: src/storage/storage_backend_logical.c:683
 msgid "storage pool does not support encrypted volumes"
 msgstr ""
 
-#: src/storage/storage_backend.c:364
+#: src/storage/storage_backend.c:442
 msgid "too many conflicts when generating an uuid"
 msgstr ""
 
-#: src/storage/storage_backend.c:394
+#: src/storage/storage_backend.c:472
 msgid "secrets already defined"
 msgstr ""
 
@@ -13330,7 +13921,7 @@
 msgid "unable to parse qemu-img output '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:513 src/storage/storage_backend.c:519
+#: src/storage/storage_backend.c:688 src/storage/storage_backend.c:694
 #, c-format
 msgid "unknown storage vol type %d"
 msgstr "type de volume de stockage %d inconnu"
@@ -13339,121 +13930,120 @@
 msgid "a different backing store cannot be specified."
 msgstr ""
 
-#: src/storage/storage_backend.c:541
+#: src/storage/storage_backend.c:718
 #, c-format
 msgid "unknown storage vol backing store type %d"
 msgstr ""
 
-#: src/storage/storage_backend.c:547
+#: src/storage/storage_backend.c:737
 #, c-format
 msgid "inaccessible backing store volume %s"
 msgstr ""
 
-#: src/storage/storage_backend.c:559
+#: src/storage/storage_backend.c:749
 #, c-format
 msgid "qcow volume encryption unsupported with volume format %s"
 msgstr ""
 
-#: src/storage/storage_backend.c:567
+#: src/storage/storage_backend.c:757
 #, c-format
 msgid "unsupported volume encryption format %d"
 msgstr ""
 
-#: src/storage/storage_backend.c:573
+#: src/storage/storage_backend.c:763
 msgid "too many secrets for qcow encryption"
 msgstr ""
 
-#: src/storage/storage_backend.c:644
+#: src/storage/storage_backend.c:877
 msgid "cannot copy from volume with qcow-create"
 msgstr ""
 
-#: src/storage/storage_backend.c:650
+#: src/storage/storage_backend.c:883
 #, c-format
 msgid "unsupported storage vol type %d"
 msgstr "type de volume de stockage %d non pris en charge"
 
-#: src/storage/storage_backend.c:656
+#: src/storage/storage_backend.c:889
 msgid "copy-on-write image not supported with qcow-create"
 msgstr ""
 
-#: src/storage/storage_backend.c:662
+#: src/storage/storage_backend.c:895
 msgid "encrypted volumes not supported with qcow-create"
 msgstr ""
 
-#: src/storage/storage_backend.c:696
+#: src/storage/storage_backend.c:927
 #, c-format
 msgid "Unknown file create tool type '%d'."
 msgstr ""
 
-#: src/storage/storage_backend.c:745
+#: src/storage/storage_backend.c:975
 msgid "creation of non-raw file images is not supported without qemu-img."
 msgstr ""
 
-#: src/storage/storage_backend.c:783 src/storage/storage_backend_fs.c:67
-#: src/storage/storage_backend_mpath.c:52
-#: src/storage/storage_backend_scsi.c:147
+#: src/storage/storage_backend.c:1039
 #, c-format
 msgid "cannot open volume '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:1060
+#: src/storage/storage_backend.c:1075
 #, c-format
 msgid "unexpected storage mode for '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:879
+#: src/storage/storage_backend.c:1199
 #, c-format
 msgid "cannot seek to end of file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:900
+#: src/storage/storage_backend.c:1220
 #, c-format
 msgid "cannot get file context of '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:971 src/storage/storage_backend_scsi.c:165
+#: src/storage/storage_backend.c:1290
 #, c-format
 msgid "cannot seek to beginning of file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:978 src/storage/storage_backend_scsi.c:172
+#: src/storage/storage_backend.c:1297
 #, c-format
 msgid "cannot read beginning of file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:1044
+#: src/storage/storage_backend.c:1362
 #, c-format
 msgid "cannot read dir '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:1131
+#: src/storage/storage_backend.c:1447
+#: src/storage/storage_backend_logical.c:209
 #, c-format
 msgid "Failed to compile regex %s"
 msgstr "impossible de compiler le regex %s"
 
-#: src/storage/storage_backend.c:1163 src/storage/storage_backend.c:1297
+#: src/storage/storage_backend.c:1478
 msgid "cannot read fd"
 msgstr "impossible de lire fd"
 
-#: src/storage/storage_backend.c:1578
+#: src/storage/storage_backend.c:1593
 msgid "cannot open file using fd"
 msgstr ""
 
-#: src/storage/storage_backend.c:1330
+#: src/storage/storage_backend.c:1624
 #, c-format
 msgid "read error on pipe to '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:1385 src/storage/storage_backend.c:1397
+#: src/storage/storage_backend.c:1654 src/storage/storage_backend.c:1666
 #, c-format
 msgid "%s not implemented on Win32"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:109
+#: src/storage/storage_backend_disk.c:110
 msgid "cannot parse device start location"
 msgstr "impossible d'analyser la zone d'amorçage du périphérique"
 
-#: src/storage/storage_backend_disk.c:116
+#: src/storage/storage_backend_disk.c:117
 msgid "cannot parse device end location"
 msgstr "impossible d'analyser le périphérique et l'emplacement"
 
@@ -13462,37 +14052,49 @@
 msgid "device path '%s' doesn't exist"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:398
+#: src/storage/storage_backend_disk.c:398 src/storage/storage_backend_fs.c:740
+msgid "Overwrite and no overwrite flags are mutually exclusive"
+msgstr ""
+
+#: src/storage/storage_backend_disk.c:414
+msgid "Error checking for disk label"
+msgstr ""
+
+#: src/storage/storage_backend_disk.c:417
+msgid "Disk label already present"
+msgstr ""
+
+#: src/storage/storage_backend_disk.c:466
 msgid "Invalid partition type"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:406
+#: src/storage/storage_backend_disk.c:475
 msgid "extended partition already exists"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:430
+#: src/storage/storage_backend_disk.c:510
 msgid "no extended partition found and no primary partition available"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:452
+#: src/storage/storage_backend_disk.c:516
 msgid "unknown partition type"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:515
+#: src/storage/storage_backend_disk.c:600
 msgid "no large enough free extent"
 msgstr "pas d'extent libre suffisamment grand"
 
-#: src/storage/storage_backend_disk.c:629
+#: src/storage/storage_backend_disk.c:731
 #, c-format
 msgid "Couldn't read volume target path '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:640
+#: src/storage/storage_backend_disk.c:744
 #, c-format
 msgid "Volume path '%s' did not start with parent pool source device name."
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:649
+#: src/storage/storage_backend_disk.c:754
 #, c-format
 msgid "cannot parse partition number from target '%s'"
 msgstr ""
@@ -13502,36 +14104,38 @@
 msgid "cannot probe backing volume format: %s"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:154
+#: src/storage/storage_backend_fs.c:196
 #, c-format
 msgid "invalid netfs path (no /): %s"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:160
+#: src/storage/storage_backend_fs.c:202
 #, c-format
 msgid "invalid netfs path (ends in /): %s"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:265
+#: src/storage/storage_backend_fs.c:304
 #, c-format
 msgid "cannot read mount list '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:357 src/storage/storage_backend_fs.c:433
-#: src/storage/storage_backend_iscsi.c:276
+#: src/storage/storage_backend_fs.c:392 src/storage/storage_backend_fs.c:457
+#: src/storage/storage_backend_iscsi.c:628
+#: src/storage/storage_backend_iscsi.c:660
 msgid "missing source host"
 msgstr "hôte source non spécifié"
 
-#: src/storage/storage_backend_fs.c:362
+#: src/storage/storage_backend_fs.c:397
 msgid "missing source path"
 msgstr "chemin source non spécifié"
 
-#: src/storage/storage_backend_fs.c:368 src/storage/storage_backend_fs.c:444
-#: src/storage/storage_backend_iscsi.c:283
+#: src/storage/storage_backend_fs.c:403 src/storage/storage_backend_fs.c:468
+#: src/storage/storage_backend_iscsi.c:635
+#: src/storage/storage_backend_iscsi.c:667
 msgid "missing source device"
 msgstr "périphérique source non spécifié"
 
-#: src/storage/storage_backend_fs.c:438
+#: src/storage/storage_backend_fs.c:462
 msgid "missing source dir"
 msgstr "répertoire source non spécifié"
 
@@ -13580,16 +14184,12 @@
 msgid "Source device does not exist when formatting pool '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:740
-msgid "Overwrite and no overwrite flags are mutually exclusive"
-msgstr ""
-
 #: src/storage/storage_backend_fs.c:751
 #, c-format
 msgid "path '%s' is not absolute"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:535
+#: src/storage/storage_backend_fs.c:821
 #, c-format
 msgid "cannot open path '%s'"
 msgstr ""
@@ -13599,214 +14199,211 @@
 msgid "cannot probe backing volume info: %s"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:631
+#: src/storage/storage_backend_fs.c:905
 #, c-format
 msgid "cannot statvfs path '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:698
+#: src/storage/storage_backend_fs.c:974
 #, c-format
 msgid "failed to remove pool '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:746
+#: src/storage/storage_backend_fs.c:1028
 msgid "cannot copy from volume to a directory volume"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:772
+#: src/storage/storage_backend_fs.c:1062
 msgid ""
 "storage pool does not support building encrypted volumes from other volumes"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:792
+#: src/storage/storage_backend_fs.c:1082
 msgid "creation of non-raw images is not supported without qemu-img"
 msgstr ""
 "la création d'images non brutes n'est pas prise en charge sans qemu-img"
 
-#: src/storage/storage_backend_fs.c:878
+#: src/storage/storage_backend_fs.c:1134
 #, c-format
 msgid "cannot unlink file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:65
+#: src/storage/storage_backend_iscsi.c:66
 #, c-format
 msgid "host lookup failed %s"
 msgstr "impossible de rechercher l'hôte %s"
 
-#: src/storage/storage_backend_iscsi.c:72
+#: src/storage/storage_backend_iscsi.c:73
 #, c-format
 msgid "no IP address for target %s"
 msgstr "aucune adresse IP pour la cible %s"
 
-#: src/storage/storage_backend_iscsi.c:81
+#: src/storage/storage_backend_iscsi.c:82
 #, c-format
 msgid "cannot format ip addr for %s"
 msgstr "impossible de changer le format de l'adresse IP pour %s"
 
-#: src/storage/storage_backend_iscsi.c:149
+#: src/storage/storage_backend_iscsi.c:168
 msgid "cannot find session"
 msgstr "impossible de trouver la session"
 
-#: src/storage/storage_backend_iscsi.c:193
+#: src/storage/storage_backend_iscsi.c:192
 #, c-format
 msgid "Could not allocate memory for output of '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:208
+#: src/storage/storage_backend_iscsi.c:207
 #, c-format
 msgid ""
 "Failed to open stream for file descriptor when reading output from '%s': '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:220
+#: src/storage/storage_backend_iscsi.c:219
 #, c-format
 msgid "Unexpected line > %d characters when parsing output of '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:238
+#: src/storage/storage_backend_iscsi.c:237
 #, c-format
 msgid "Missing space when parsing output of '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:289
+#: src/storage/storage_backend_iscsi.c:288
 msgid "Failed to initialize random generator when creating iscsi interface"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:306
+#: src/storage/storage_backend_iscsi.c:305
 #, c-format
 msgid "Failed to run command '%s' to create new iscsi interface"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:316
+#: src/storage/storage_backend_iscsi.c:315
 #, c-format
 msgid "Failed to run command '%s' to update iscsi interface with IQN '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:188
+#: src/storage/storage_backend_iscsi.c:408
 #, c-format
 msgid "Failed to get host number for iSCSI session with path '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:196
+#: src/storage/storage_backend_iscsi.c:416
 #, c-format
 msgid "Failed to find LUs on host %u"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:147
+#: src/storage/storage_backend_logical.c:154
 msgid "malformed volume extent stripes value"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:159
+#: src/storage/storage_backend_logical.c:168
 msgid "malformed volume extent length value"
 msgstr "valeur de la longueur de l'extent du volume non conforme"
 
-#: src/storage/storage_backend_logical.c:164
+#: src/storage/storage_backend_logical.c:173
 msgid "malformed volume extent size value"
 msgstr "valeur de la taille de l'extent du volume non conforme"
 
-#: src/storage/storage_backend_logical.c:209
+#: src/storage/storage_backend_logical.c:216
 msgid "malformed volume extent devices value"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:154
+#: src/storage/storage_backend_logical.c:245
 msgid "malformed volume extent offset value"
 msgstr "valeur de décalage de l'extent du volume non conforme"
 
-#: src/storage/storage_backend_logical.c:355
+#: src/storage/storage_backend_logical.c:434
 msgid "failed to get source from sourceList"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:410
+#: src/storage/storage_backend_logical.c:511
 #, c-format
 msgid "cannot open device '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:416
+#: src/storage/storage_backend_logical.c:517
 #, c-format
 msgid "cannot clear device header of '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:517
+#: src/storage/storage_backend_logical.c:524
 #, c-format
 msgid "cannot flush header of device'%s'"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:423
+#: src/storage/storage_backend_logical.c:531
 #, c-format
 msgid "cannot close device '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:811
-#: src/storage/storage_backend_logical.c:624
+#: src/storage/storage_backend_logical.c:720
 #, c-format
 msgid "cannot set file owner '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:819
-#: src/storage/storage_backend_logical.c:631
+#: src/storage/storage_backend_logical.c:727
 #, c-format
 msgid "cannot set file mode '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:647
+#: src/storage/storage_backend_logical.c:743
 #, c-format
 msgid "cannot find newly created volume '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_mpath.c:233
+#: src/storage/storage_backend_mpath.c:232
 #, c-format
 msgid "Failed to get %s minor number"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:65
+#: src/storage/storage_backend_scsi.c:66
 #, c-format
 msgid "Could not find typefile '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:77
+#: src/storage/storage_backend_scsi.c:78
 #, c-format
 msgid "Could not read typefile '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:89
+#: src/storage/storage_backend_scsi.c:90
 #, c-format
 msgid "Device type '%s' is not an integer"
 msgstr ""
 
-#: src/storage/storage_backend_mpath.c:123
-#: src/storage/storage_backend_scsi.c:260
+#: src/storage/storage_backend_scsi.c:270
 #, c-format
 msgid "Failed to update volume for '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:316
-#: src/storage/storage_backend_scsi.c:407
+#: src/storage/storage_backend_scsi.c:322
+#: src/storage/storage_backend_scsi.c:411
 #, c-format
 msgid "Failed to opendir sysfs path '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:364
+#: src/storage/storage_backend_scsi.c:369
 #, c-format
 msgid "Failed to parse block name %s"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:456
+#: src/storage/storage_backend_scsi.c:457
 #, c-format
 msgid "Failed to determine if %u:%u:%u:%u is a Direct-Access LUN"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:523
+#: src/storage/storage_backend_scsi.c:524
 #: src/storage/storage_backend_scsi.c:566
 #, c-format
 msgid "Failed to opendir path '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:610
+#: src/storage/storage_backend_scsi.c:609
 #, c-format
 msgid "Could not open '%s' to trigger host scan"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:621
+#: src/storage/storage_backend_scsi.c:620
 #, c-format
 msgid "Write to '%s' to trigger host scan failed"
 msgstr ""
@@ -13831,39 +14428,40 @@
 msgid "Failed to autostart storage pool '%s': %s"
 msgstr ""
 
-#: src/storage/storage_driver.c:275 src/storage/storage_driver.c:974
-#: src/storage/storage_driver.c:1003
+#: src/storage/storage_driver.c:280 src/storage/storage_driver.c:1003
+#: src/storage/storage_driver.c:1032
 msgid "no pool with matching uuid"
 msgstr "aucun pool avec un UUID correspondant"
 
-#: src/storage/storage_driver.c:300
+#: src/storage/storage_driver.c:305
 #, c-format
 msgid "no pool with matching name '%s'"
 msgstr ""
 
-#: src/storage/storage_driver.c:456 src/test/test_driver.c:3761
+#: src/storage/storage_driver.c:464 src/test/test_driver.c:4092
 #, c-format
 msgid "pool type '%s' does not support source discovery"
 msgstr ""
 
-#: src/storage/storage_driver.c:616 src/storage/storage_driver.c:670
-#: src/storage/storage_driver.c:715 src/storage/storage_driver.c:752
-#: src/storage/storage_driver.c:808 src/storage/storage_driver.c:857
-#: src/storage/storage_driver.c:913 src/storage/storage_driver.c:949
-#: src/storage/storage_driver.c:1065 src/storage/storage_driver.c:1098
-#: src/storage/storage_driver.c:1143 src/storage/storage_driver.c:1269
-#: src/storage/storage_driver.c:1390 src/storage/storage_driver.c:1543
-#: src/storage/storage_driver.c:1622 src/storage/storage_driver.c:1675
-#: src/storage/storage_driver.c:1722
+#: src/storage/storage_driver.c:632 src/storage/storage_driver.c:690
+#: src/storage/storage_driver.c:736 src/storage/storage_driver.c:773
+#: src/storage/storage_driver.c:830 src/storage/storage_driver.c:883
+#: src/storage/storage_driver.c:939 src/storage/storage_driver.c:978
+#: src/storage/storage_driver.c:1092 src/storage/storage_driver.c:1125
+#: src/storage/storage_driver.c:1170 src/storage/storage_driver.c:1303
+#: src/storage/storage_driver.c:1433 src/storage/storage_driver.c:1593
+#: src/storage/storage_driver.c:1655 src/storage/storage_driver.c:1872
+#: src/storage/storage_driver.c:1929 src/storage/storage_driver.c:2010
+#: src/storage/storage_driver.c:2066 src/storage/storage_driver.c:2113
 msgid "no storage pool with matching uuid"
 msgstr "aucun pool de stockage avec un UUID correspondant"
 
-#: src/storage/storage_driver.c:622
+#: src/storage/storage_driver.c:638
 msgid "pool is still active"
 msgstr "le pool est encore actif"
 
-#: src/storage/storage_driver.c:628 src/storage/storage_driver.c:767
-#: src/storage/storage_driver.c:823 src/storage/storage_driver.c:872
+#: src/storage/storage_driver.c:644 src/storage/storage_driver.c:788
+#: src/storage/storage_driver.c:845 src/storage/storage_driver.c:898
 #, c-format
 msgid "pool '%s' has asynchronous jobs running."
 msgstr ""
@@ -13873,24 +14471,26 @@
 msgid "Failed to delete autostart link '%s': %s"
 msgstr "Impossible de supprimer le lien de démarrage automatique « %s » : %s"
 
-#: src/storage/storage_driver.c:679
+#: src/storage/storage_driver.c:699
 msgid "pool already active"
 msgstr "pool déjà actif"
 
-#: src/storage/storage_driver.c:724
+#: src/storage/storage_driver.c:745
 msgid "storage pool is already active"
 msgstr "le pool de stockage est déjà actif"
 
-#: src/storage/storage_driver.c:761 src/storage/storage_driver.c:866
-#: src/storage/storage_driver.c:1071 src/storage/storage_driver.c:1104
-#: src/storage/storage_driver.c:1149 src/storage/storage_driver.c:1275
-#: src/storage/storage_driver.c:1403 src/storage/storage_driver.c:1409
-#: src/storage/storage_driver.c:1549 src/storage/storage_driver.c:1628
-#: src/storage/storage_driver.c:1681 src/storage/storage_driver.c:1728
+#: src/storage/storage_driver.c:782 src/storage/storage_driver.c:892
+#: src/storage/storage_driver.c:1098 src/storage/storage_driver.c:1131
+#: src/storage/storage_driver.c:1176 src/storage/storage_driver.c:1309
+#: src/storage/storage_driver.c:1446 src/storage/storage_driver.c:1452
+#: src/storage/storage_driver.c:1599 src/storage/storage_driver.c:1661
+#: src/storage/storage_driver.c:1878 src/storage/storage_driver.c:1935
+#: src/storage/storage_driver.c:2016 src/storage/storage_driver.c:2072
+#: src/storage/storage_driver.c:2119
 msgid "storage pool is not active"
 msgstr "le pool de stockage n'est pas actif"
 
-#: src/storage/storage_driver.c:817
+#: src/storage/storage_driver.c:839
 msgid "storage pool is still active"
 msgstr "le pool de stockage est encore actif"
 
@@ -13898,52 +14498,56 @@
 msgid "pool does not support pool deletion"
 msgstr ""
 
-#: src/storage/storage_driver.c:1009 src/test/test_driver.c:4119
+#: src/storage/storage_driver.c:1038 src/test/test_driver.c:4468
 msgid "pool has no config file"
 msgstr "le pool ne possède aucun fichier de configuration"
 
-#: src/storage/storage_driver.c:1157 src/storage/storage_driver.c:1419
-#: src/storage/storage_driver.c:1560 src/storage/storage_driver.c:1636
-#: src/storage/storage_driver.c:1689 src/storage/storage_driver.c:1736
-#: src/test/test_driver.c:4241 src/test/test_driver.c:4442
-#: src/test/test_driver.c:4518 src/test/test_driver.c:4596
-#: src/test/test_driver.c:4641 src/test/test_driver.c:4681
+#: src/storage/storage_driver.c:1184 src/storage/storage_driver.c:1462
+#: src/storage/storage_driver.c:1607 src/storage/storage_driver.c:1669
+#: src/storage/storage_driver.c:1886 src/storage/storage_driver.c:1946
+#: src/storage/storage_driver.c:2024 src/storage/storage_driver.c:2080
+#: src/storage/storage_driver.c:2127 src/test/test_driver.c:4590
+#: src/test/test_driver.c:4797 src/test/test_driver.c:4876
+#: src/test/test_driver.c:4954 src/test/test_driver.c:5002
+#: src/test/test_driver.c:5042
 #, c-format
 msgid "no storage vol with matching name '%s'"
 msgstr ""
 
-#: src/storage/storage_driver.c:1197
+#: src/storage/storage_driver.c:1224
 msgid "no storage vol with matching key"
 msgstr "aucun volume de stockage avec une clé correspondante"
 
-#: src/storage/storage_driver.c:1244
+#: src/storage/storage_driver.c:1275
 msgid "no storage vol with matching path"
 msgstr "aucun volume de stockage avec un chemin correspondant"
 
-#: src/storage/storage_driver.c:1288 src/test/test_driver.c:4354
-#: src/test/test_driver.c:4435
+#: src/storage/storage_driver.c:1322 src/test/test_driver.c:4706
+#: src/test/test_driver.c:4790
 msgid "storage vol already exists"
 msgstr "le volume de stockage existe déjà"
 
-#: src/storage/storage_driver.c:1300
+#: src/storage/storage_driver.c:1334
 msgid "storage pool does not support volume creation"
 msgstr "le pool de stockage ne prend pas en charge la création de volume"
 
-#: src/storage/storage_driver.c:1396
+#: src/storage/storage_driver.c:1439
 #, c-format
 msgid "no storage pool with matching name '%s'"
 msgstr ""
 
-#: src/storage/storage_driver.c:1430
+#: src/storage/storage_driver.c:1473
 #, c-format
 msgid "storage volume name '%s' already in use."
 msgstr ""
 
-#: src/storage/storage_driver.c:1446
+#: src/storage/storage_driver.c:1489
 msgid "storage pool does not support volume creation from an existing volume"
 msgstr ""
 
-#: src/storage/storage_driver.c:1452 src/storage/storage_driver.c:1567
+#: src/storage/storage_driver.c:1495 src/storage/storage_driver.c:1614
+#: src/storage/storage_driver.c:1676 src/storage/storage_driver.c:1893
+#: src/storage/storage_driver.c:1953
 #, c-format
 msgid "volume '%s' is still being allocated."
 msgstr ""
@@ -13983,20 +14587,20 @@
 msgid "Failed to stat storage volume with path '%s'"
 msgstr ""
 
-#: src/storage/storage_driver.c:1574
+#: src/storage/storage_driver.c:1960
 msgid "storage pool does not support vol deletion"
 msgstr "le pool de stockage ne prend pas en charge la suppression de volume"
 
-#: src/test/test_driver.c:337
+#: src/test/test_driver.c:347
 #, c-format
 msgid "Exceeded max iface limit %d"
 msgstr ""
 
-#: src/test/test_driver.c:684
+#: src/test/test_driver.c:693
 msgid "resolving volume filename"
 msgstr ""
 
-#: src/test/test_driver.c:788
+#: src/test/test_driver.c:786
 msgid "Root element is not 'node'"
 msgstr ""
 
@@ -14024,7 +14628,7 @@
 msgid "invalid node cpu mhz value"
 msgstr ""
 
-#: src/test/test_driver.c:863 src/xen/xm_internal.c:1072
+#: src/test/test_driver.c:859 src/xenxs/xen_xm.c:655
 #, c-format
 msgid "Model %s too big for destination"
 msgstr ""
@@ -14033,356 +14637,336 @@
 msgid "invalid node memory value"
 msgstr ""
 
-#: src/test/test_driver.c:891
+#: src/test/test_driver.c:887
 msgid "resolving domain filename"
 msgstr "résolution du nom de fichier du domaine"
 
-#: src/test/test_driver.c:934
+#: src/test/test_driver.c:931
 msgid "resolving network filename"
 msgstr "résolution du nom de fichier du réseau"
 
-#: src/test/test_driver.c:970
+#: src/test/test_driver.c:966
 msgid "resolving interface filename"
 msgstr ""
 
-#: src/test/test_driver.c:1008
+#: src/test/test_driver.c:1003
 msgid "resolving pool filename"
 msgstr ""
 
-#: src/test/test_driver.c:1061
+#: src/test/test_driver.c:1055
 msgid "resolving device filename"
 msgstr ""
 
-#: src/test/test_driver.c:1129
+#: src/test/test_driver.c:1125
 msgid "testOpen: supply a path or use test:///default"
 msgstr "testOpen : donnez un chemin d'accès ou utilisez test:///default"
 
-#: src/test/test_driver.c:1480
+#: src/test/test_driver.c:1482
 #, c-format
 msgid "domain '%s' not paused"
 msgstr ""
 
-#: src/test/test_driver.c:1522 src/test/test_driver.c:1563
+#: src/test/test_driver.c:1525 src/test/test_driver.c:1566
 #, c-format
 msgid "domain '%s' not running"
 msgstr ""
 
-#: src/opennebula/one_driver.c:320 src/test/test_driver.c:519
-#: src/test/test_driver.c:1672 src/test/test_driver.c:2113
-#: src/test/test_driver.c:2608 src/test/test_driver.c:2663
+#: src/test/test_driver.c:1682 src/test/test_driver.c:2300
+#: src/test/test_driver.c:2831 src/test/test_driver.c:2886
 msgid "getting time of day"
 msgstr "récupération de l'heure du jour"
 
-#: src/test/test_driver.c:1717
+#: src/test/test_driver.c:1765
 #, c-format
 msgid "saving domain '%s' failed to allocate space for metadata"
 msgstr ""
 
-#: src/test/test_driver.c:1724
+#: src/test/test_driver.c:1772
 #, c-format
 msgid "saving domain '%s' to '%s': open failed"
 msgstr ""
 
-#: src/test/test_driver.c:1731 src/test/test_driver.c:1737
-#: src/test/test_driver.c:1743 src/test/test_driver.c:1750
+#: src/test/test_driver.c:1779 src/test/test_driver.c:1785
+#: src/test/test_driver.c:1791 src/test/test_driver.c:1798
 #, c-format
 msgid "saving domain '%s' to '%s': write failed"
 msgstr ""
 
-#: src/test/test_driver.c:1802
+#: src/test/test_driver.c:1866
 #, c-format
 msgid "cannot read domain image '%s'"
 msgstr ""
 
-#: src/test/test_driver.c:1808
+#: src/test/test_driver.c:1872
 #, c-format
 msgid "incomplete save header in '%s'"
 msgstr ""
 
-#: src/test/test_driver.c:1814
+#: src/test/test_driver.c:1878
 msgid "mismatched header magic"
 msgstr ""
 
-#: src/test/test_driver.c:1819
+#: src/test/test_driver.c:1883
 #, c-format
 msgid "failed to read metadata length in '%s'"
 msgstr ""
 
-#: src/test/test_driver.c:1825
+#: src/test/test_driver.c:1889
 msgid "length of metadata out of range"
 msgstr ""
 
-#: src/test/test_driver.c:1834
+#: src/test/test_driver.c:1898
 #, c-format
 msgid "incomplete metdata in '%s'"
 msgstr ""
 
-#: src/test/test_driver.c:1897
+#: src/test/test_driver.c:1970
 #, c-format
 msgid "domain '%s' coredump: failed to open %s"
 msgstr ""
 
-#: src/test/test_driver.c:1903
+#: src/test/test_driver.c:1976
 #, c-format
 msgid "domain '%s' coredump: failed to write header to %s"
 msgstr ""
 
-#: src/test/test_driver.c:1909
+#: src/test/test_driver.c:1982
 #, c-format
 msgid "domain '%s' coredump: write failed: %s"
 msgstr ""
 
-#: src/test/test_driver.c:2055
+#: src/test/test_driver.c:2209
 msgid "cannot hotplug vcpus for an inactive domain"
 msgstr ""
 
-#: src/test/test_driver.c:2105
+#: src/test/test_driver.c:2292
 msgid "cannot list vcpus for an inactive domain"
 msgstr ""
 
-#: src/test/test_driver.c:2197
+#: src/test/test_driver.c:2384
 msgid "requested vcpu is higher than allocated vcpus"
 msgstr ""
 
-#: src/test/test_driver.c:2336
+#: src/test/test_driver.c:2525
 msgid "Range exceeds available cells"
 msgstr ""
 
-#: src/test/test_driver.c:2370
+#: src/test/test_driver.c:2561
 #, c-format
 msgid "Domain '%s' is already running"
 msgstr ""
 
-#: src/test/test_driver.c:2946
+#: src/test/test_driver.c:3172
 #, c-format
 msgid "Network '%s' is still running"
 msgstr ""
 
-#: src/test/test_driver.c:2979
+#: src/test/test_driver.c:3205
 #, c-format
 msgid "Network '%s' is already running"
 msgstr ""
 
-#: src/test/test_driver.c:3562
+#: src/test/test_driver.c:3560
 msgid "there is another transaction running."
 msgstr ""
 
-#: src/test/test_driver.c:3589
+#: src/test/test_driver.c:3587
 msgid "no transaction running, nothing to be commited."
 msgstr ""
 
-#: src/test/test_driver.c:3616
+#: src/test/test_driver.c:3614
 msgid "no transaction running, nothing to rollback."
 msgstr ""
 
-#: src/test/test_driver.c:3703 src/test/test_driver.c:3867
-#: src/test/test_driver.c:3900 src/test/test_driver.c:3968
+#: src/test/test_driver.c:4032 src/test/test_driver.c:4204
+#: src/test/test_driver.c:4240 src/test/test_driver.c:4311
 #, c-format
 msgid "storage pool '%s' is already active"
 msgstr ""
 
-#: src/storage/storage_driver.c:531 src/test/test_driver.c:3788
+#: src/test/test_driver.c:4122
 msgid "storage pool already exists"
 msgstr "le pool de stockage existe déjà"
 
-#: src/test/test_driver.c:3929 src/test/test_driver.c:4000
-#: src/test/test_driver.c:4152 src/test/test_driver.c:4187
-#: src/test/test_driver.c:4233 src/test/test_driver.c:4344
-#: src/test/test_driver.c:4425 src/test/test_driver.c:4525
-#: src/test/test_driver.c:4603 src/test/test_driver.c:4648
-#: src/test/test_driver.c:4688
+#: src/test/test_driver.c:4269 src/test/test_driver.c:4346
+#: src/test/test_driver.c:4501 src/test/test_driver.c:4536
+#: src/test/test_driver.c:4582 src/test/test_driver.c:4696
+#: src/test/test_driver.c:4780 src/test/test_driver.c:4883
+#: src/test/test_driver.c:4961 src/test/test_driver.c:5009
+#: src/test/test_driver.c:5049
 #, c-format
 msgid "storage pool '%s' is not active"
 msgstr ""
 
-#: src/test/test_driver.c:4284
+#: src/test/test_driver.c:4633
 #, c-format
 msgid "no storage vol with matching key '%s'"
 msgstr ""
 
-#: src/test/test_driver.c:4318
+#: src/test/test_driver.c:4667
 #, c-format
 msgid "no storage vol with matching path '%s'"
 msgstr ""
 
-#: src/test/test_driver.c:4362 src/test/test_driver.c:4451
+#: src/test/test_driver.c:4714 src/test/test_driver.c:4806
 #, c-format
 msgid "Not enough free space in pool for volume '%s'"
 msgstr ""
 
-#: src/uml/uml_conf.c:183
-msgid "IP address not supported for ethernet inteface"
+#: src/uml/uml_conf.c:191
+msgid "IP address not supported for ethernet interface"
 msgstr ""
 
-#: src/uml/uml_conf.c:188
-msgid "script execution not supported for ethernet inteface"
+#: src/uml/uml_conf.c:196
+msgid "script execution not supported for ethernet interface"
 msgstr ""
 
-#: src/uml/uml_conf.c:195
+#: src/uml/uml_conf.c:203
 msgid "TCP server networking type not supported"
 msgstr ""
 
-#: src/uml/uml_conf.c:200
+#: src/uml/uml_conf.c:208
 msgid "TCP client networking type not supported"
 msgstr ""
 
-#: src/uml/uml_conf.c:215
+#: src/uml/uml_conf.c:223
 #, c-format
 msgid "Network '%s' not found"
 msgstr ""
 
-#: src/uml/uml_conf.c:245
+#: src/uml/uml_conf.c:253
 msgid "internal networking type not supported"
 msgstr ""
 
-#: src/uml/uml_conf.c:289
+#: src/uml/uml_conf.c:258
 msgid "direct networking type not supported"
 msgstr ""
 
-#: src/uml/uml_conf.c:311
+#: src/uml/uml_conf.c:327
 msgid "only TCP listen is supported for chr device"
 msgstr ""
 
-#: src/uml/uml_conf.c:376
+#: src/uml/uml_conf.c:345
 #, c-format
 msgid "failed to open chardev file: %s"
 msgstr ""
 
-#: src/uml/uml_conf.c:331
+#: src/uml/uml_conf.c:366
 #, c-format
 msgid "unsupported chr device type %d"
 msgstr ""
 
-#: src/uml/uml_driver.c:418
+#: src/uml/uml_driver.c:471
 msgid "cannot initialize inotify"
 msgstr ""
 
-#: src/uml/uml_driver.c:424
+#: src/uml/uml_driver.c:477
 #, c-format
 msgid "Failed to create monitor directory %s: %s"
 msgstr ""
 
-#: src/uml/uml_driver.c:457
+#: src/uml/uml_driver.c:514
 msgid "umlStartup: out of memory"
 msgstr ""
 
-#: src/uml/uml_driver.c:604
+#: src/uml/uml_driver.c:776
 #, c-format
 msgid "failed to read pid: %s"
 msgstr ""
 
-#: src/uml/uml_driver.c:627
+#: src/uml/uml_driver.c:798
 #, c-format
 msgid "Unix path %s too long for destination"
 msgstr ""
 
-#: src/uml/uml_driver.c:658
+#: src/uml/uml_driver.c:828
 msgid "cannot open socket"
 msgstr ""
 
-#: src/uml/uml_driver.c:667
+#: src/uml/uml_driver.c:838
 msgid "cannot bind socket"
 msgstr ""
 
-#: src/uml/uml_driver.c:723
+#: src/uml/uml_driver.c:892
 #, c-format
 msgid "cannot send too long command %s (%d bytes)"
 msgstr ""
 
-#: src/uml/uml_driver.c:729
+#: src/uml/uml_driver.c:898
 #, c-format
 msgid "Command %s too long for destination"
 msgstr ""
 
-#: src/uml/uml_driver.c:736
+#: src/uml/uml_driver.c:905
 #, c-format
 msgid "cannot send command %s"
 msgstr ""
 
-#: src/uml/uml_driver.c:746
+#: src/uml/uml_driver.c:918
 #, c-format
 msgid "cannot read reply %s"
 msgstr ""
 
-#: src/uml/uml_driver.c:926
+#: src/uml/uml_driver.c:924
 #, c-format
 msgid "incomplete reply %s"
 msgstr ""
 
-#: src/uml/uml_driver.c:963
-msgid "Cleanup tap"
-msgstr ""
-
-#: src/uml/uml_driver.c:974
-#, c-format
-msgid "Cleanup '%s'"
-msgstr ""
-
-#: src/uml/uml_driver.c:977
-#, c-format
-msgid "Cleanup failed %d"
-msgstr ""
-
-#: src/uml/uml_driver.c:981
-msgid "Cleanup tap done"
-msgstr ""
-
-#: src/uml/uml_driver.c:829
+#: src/uml/uml_driver.c:989
 msgid "no kernel specified"
 msgstr ""
 
-#: src/uml/uml_driver.c:838
+#: src/uml/uml_driver.c:998
 #, c-format
 msgid "Cannot find UML kernel %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:517 src/qemu/qemu_driver.c:549
-#: src/uml/uml_driver.c:868
+#: src/uml/uml_driver.c:1028
 msgid "Unable to set VM logfile close-on-exec flag"
 msgstr ""
 
-#: src/uml/uml_driver.c:997
+#: src/uml/uml_driver.c:1167
 #, c-format
 msgid "unexpected UML URI path '%s', try uml:///system"
 msgstr ""
 
-#: src/uml/uml_driver.c:1004
+#: src/uml/uml_driver.c:1174
 #, c-format
 msgid "unexpected UML URI path '%s', try uml:///session"
 msgstr ""
 
-#: src/uml/uml_driver.c:1013
+#: src/uml/uml_driver.c:1183
 msgid "uml state driver is not active"
 msgstr ""
 
-#: src/uml/uml_driver.c:1230
+#: src/uml/uml_driver.c:1435
 #, c-format
 msgid "cannot parse version %s"
 msgstr ""
 
-#: src/uml/uml_driver.c:1321
+#: src/uml/uml_driver.c:1538
 msgid "shutdown operation failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3446 src/uml/uml_driver.c:1433
+#: src/uml/uml_driver.c:1668
 msgid "cannot set max memory lower than current memory"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5423
+#: src/uml/uml_driver.c:2044
 msgid "cannot attach device on inactive domain"
 msgstr ""
 
-#: src/uml/uml_driver.c:2104 src/uml/uml_driver.c:2216
-#: src/vbox/vbox_tmpl.c:5533 src/vbox/vbox_tmpl.c:5548
-#: src/vbox/vbox_tmpl.c:5704
+#: src/uml/uml_driver.c:2090 src/uml/uml_driver.c:2202
+#: src/vbox/vbox_tmpl.c:5538 src/vbox/vbox_tmpl.c:5553
+#: src/vbox/vbox_tmpl.c:5709
 msgid "cannot modify the persistent configuration of a domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5817
+#: src/uml/uml_driver.c:2162
 msgid "cannot detach device on inactive domain"
 msgstr ""
 
-#: src/uml/uml_driver.c:1832
+#: src/uml/uml_driver.c:2355 tools/virsh.c:10107
 #, c-format
 msgid "cannot read %s"
 msgstr ""
@@ -14465,15 +15049,15 @@
 msgid "cannot clear process capabilities %d"
 msgstr ""
 
-#: src/util/util.c:347
+#: src/util/command.c:167
 msgid "cannot block signals"
 msgstr ""
 
-#: src/util/util.c:418 src/util/util.c:533
+#: src/util/command.c:186 src/util/command.c:492
 msgid "cannot fork child process"
 msgstr ""
 
-#: src/util/util.c:437 src/util/util.c:474
+#: src/util/command.c:198 src/util/command.c:243
 msgid "cannot unblock signals"
 msgstr ""
 
@@ -14482,16 +15066,16 @@
 msgid "Cannot find '%s' in path"
 msgstr ""
 
-#: src/util/util.c:362
+#: src/util/command.c:345
 msgid "cannot create pipe"
 msgstr ""
 
-#: src/util/util.c:369 src/util/util.c:398
+#: src/util/command.c:352 src/util/command.c:377
 msgid "Failed to set non-blocking file descriptor flag"
 msgstr ""
 "Impossible de définir le drapeau descripteur de fichiers « non-blocking »"
 
-#: src/util/util.c:391
+#: src/util/command.c:370
 msgid "Failed to create pipe"
 msgstr ""
 
@@ -14500,19 +15084,19 @@
 msgid "failed to preserve fd %d"
 msgstr ""
 
-#: src/util/util.c:490
+#: src/util/command.c:444
 msgid "failed to setup stdin file handle"
 msgstr ""
 
-#: src/util/util.c:496
+#: src/util/command.c:449
 msgid "failed to setup stdout file handle"
 msgstr ""
 
-#: src/util/util.c:502
+#: src/util/command.c:454
 msgid "failed to setup stderr file handle"
 msgstr ""
 
-#: src/util/util.c:520
+#: src/util/command.c:479
 msgid "cannot become session leader"
 msgstr ""
 
@@ -14520,7 +15104,7 @@
 msgid "cannot change to root directory"
 msgstr ""
 
-#: src/util/util.c:543
+#: src/util/command.c:502
 #, c-format
 msgid "could not write pidfile %s for %d"
 msgstr ""
@@ -14533,7 +15117,7 @@
 msgid "Could not re-enable SIGPIPE"
 msgstr ""
 
-#: src/util/util.c:567
+#: src/util/command.c:554
 #, c-format
 msgid "cannot execute binary %s"
 msgstr ""
@@ -14546,199 +15130,199 @@
 msgid "virExec is not implemented for WIN32"
 msgstr ""
 
-#: src/util/command.c:1515 src/util/command.c:1734 src/util/command.c:1782
-#: src/util/command.c:2010 src/util/command.c:2156 src/util/command.c:2345
-#: src/util/command.c:2404
+#: src/util/command.c:1526 src/util/command.c:1745 src/util/command.c:1793
+#: src/util/command.c:2021 src/util/command.c:2167 src/util/command.c:2356
+#: src/util/command.c:2415
 msgid "invalid use of command API"
 msgstr ""
 
-#: src/util/command.c:1552
+#: src/util/command.c:1563
 #, c-format
 msgid "exit status %d"
 msgstr ""
 
-#: src/util/command.c:1555
+#: src/util/command.c:1566
 #, c-format
 msgid "fatal signal %d"
 msgstr ""
 
-#: src/util/command.c:1558
+#: src/util/command.c:1569
 #, c-format
 msgid "invalid value %d"
 msgstr ""
 
-#: src/util/command.c:1632
+#: src/util/command.c:1643
 msgid "unable to poll on child"
 msgstr ""
 
-#: src/util/command.c:1659
+#: src/util/command.c:1670
 msgid "unable to read child stdout"
 msgstr ""
 
-#: src/util/command.c:1660
+#: src/util/command.c:1671
 msgid "unable to read child stderr"
 msgstr ""
 
-#: src/util/command.c:1688
+#: src/util/command.c:1699
 msgid "unable to write to child input"
 msgstr ""
 
-#: src/util/command.c:1748
+#: src/util/command.c:1759
 msgid "Executing new processes is not supported on Win32 platform"
 msgstr ""
 
-#: src/util/command.c:1804
+#: src/util/command.c:1815
 msgid "cannot mix caller fds with blocking execution"
 msgstr ""
 
-#: src/util/command.c:1810
+#: src/util/command.c:1821
 msgid "cannot mix string I/O with daemon"
 msgstr ""
 
-#: src/util/command.c:1820
+#: src/util/command.c:1831
 msgid "unable to open pipe"
 msgstr ""
 
-#: src/util/command.c:1927
+#: src/util/command.c:1938
 #, c-format
 msgid "Unable to change to %s"
 msgstr ""
 
-#: src/util/command.c:1935
+#: src/util/command.c:1946
 msgid "Unable to notify parent process"
 msgstr ""
 
-#: src/util/command.c:1945
+#: src/util/command.c:1956
 msgid "Unknown failure during hook execution"
 msgstr ""
 
-#: src/util/command.c:1948
+#: src/util/command.c:1959
 msgid "Unable to send error to parent process"
 msgstr ""
 
-#: src/util/command.c:1957
+#: src/util/command.c:1968
 msgid "Unable to wait on parent process"
 msgstr ""
 
-#: src/util/command.c:1959
+#: src/util/command.c:1970
 msgid "libvirtd quit during handshake"
 msgstr ""
 
-#: src/util/command.c:1963
+#: src/util/command.c:1974
 #, c-format
 msgid "Unexpected confirm code '%c' from parent process"
 msgstr ""
 
-#: src/util/command.c:2022
+#: src/util/command.c:2033
 msgid "cannot mix string I/O with asynchronous command"
 msgstr ""
 
-#: src/util/command.c:2028
+#: src/util/command.c:2039
 #, c-format
 msgid "command is already running as pid %d"
 msgstr ""
 
-#: src/util/command.c:2035
+#: src/util/command.c:2046
 msgid "daemonized command cannot use virCommandRunAsync"
 msgstr ""
 
-#: src/util/command.c:2040
+#: src/util/command.c:2051
 #, c-format
 msgid "daemonized command cannot set working directory %s"
 msgstr ""
 
-#: src/util/command.c:2046
+#: src/util/command.c:2057
 msgid "creation of pid file requires daemonized command"
 msgstr ""
 
-#: src/util/command.c:2104 src/util/command.c:2113
+#: src/util/command.c:2115 src/util/command.c:2124
 #, c-format
 msgid "unable to wait for process %d"
 msgstr ""
 
-#: src/util/command.c:2121
+#: src/util/command.c:2132
 #, c-format
 msgid "Child process (%d) status unexpected: %s"
 msgstr ""
 
-#: src/util/command.c:2162
+#: src/util/command.c:2173
 msgid "command is not yet running"
 msgstr ""
 
-#: src/util/command.c:2180
+#: src/util/command.c:2191
 #, c-format
 msgid "Child process (%s) status unexpected: %s"
 msgstr ""
 
-#: src/util/command.c:2351 src/util/command.c:2410
+#: src/util/command.c:2362 src/util/command.c:2421
 msgid "Handshake is already complete"
 msgstr ""
 
-#: src/util/command.c:2358
+#: src/util/command.c:2369
 msgid "Unable to wait for child process"
 msgstr ""
 
-#: src/util/command.c:2360
+#: src/util/command.c:2371
 msgid "Child process quit during startup handshake"
 msgstr ""
 
-#: src/util/command.c:2375
+#: src/util/command.c:2386
 msgid "No error message from child failure"
 msgstr ""
 
-#: src/util/command.c:2416
+#: src/util/command.c:2427
 msgid "Unable to notify child process"
 msgstr ""
 
-#: src/util/conf.c:354
+#: src/util/conf.c:355
 msgid "unterminated number"
 msgstr "nombre sans fin"
 
-#: src/util/conf.c:387 src/util/conf.c:407 src/util/conf.c:422
+#: src/util/conf.c:388 src/util/conf.c:412 src/util/conf.c:427
 msgid "unterminated string"
 msgstr "chaîne sans fin"
 
-#: src/util/conf.c:453 src/util/conf.c:516
+#: src/util/conf.c:458 src/util/conf.c:528
 msgid "expecting a value"
 msgstr "valeur attendue"
 
-#: src/util/conf.c:464
+#: src/util/conf.c:469
 msgid "lists not allowed in VMX format"
 msgstr ""
 
-#: src/util/conf.c:478
+#: src/util/conf.c:490
 msgid "expecting a separator in list"
 msgstr "séparateur attendu dans la liste"
 
-#: src/util/conf.c:501
+#: src/util/conf.c:513
 msgid "list is not closed with ]"
 msgstr "la liste n'est pas terminée avec « ] »"
 
-#: src/util/conf.c:508
+#: src/util/conf.c:520
 msgid "numbers not allowed in VMX format"
 msgstr ""
 
-#: src/util/conf.c:551
+#: src/util/conf.c:563
 msgid "expecting a name"
 msgstr "nom attendu"
 
-#: src/util/conf.c:615
+#: src/util/conf.c:627
 msgid "expecting a separator"
 msgstr "séparateur attendu"
 
-#: src/util/conf.c:646
+#: src/util/conf.c:658
 msgid "expecting an assignment"
 msgstr "affectation attendue"
 
-#: src/util/conf.c:941
+#: src/util/conf.c:953
 msgid "failed to open file"
 msgstr "impossible d'ouvrir le fichier"
 
-#: src/util/conf.c:951
+#: src/util/conf.c:963
 msgid "failed to save content"
 msgstr "impossible d'enregistrer le contenu"
 
-#: src/conf/domain_conf.c:4881 src/conf/network_conf.c:769
+#: src/util/dnsmasq.c:251 src/util/dnsmasq.c:417
 #, c-format
 msgid "cannot write config file '%s'"
 msgstr ""
@@ -14748,15 +15332,15 @@
 msgid "Failed to make dnsmasq (PID: %d) reload config files."
 msgstr ""
 
-#: src/util/event_poll.c:626
+#: src/util/event_poll.c:627
 msgid "Unable to poll on file handles"
 msgstr ""
 
-#: src/util/event_poll.c:676
+#: src/util/event_poll.c:677
 msgid "Unable to setup wakeup pipe"
 msgstr ""
 
-#: src/util/event_poll.c:684
+#: src/util/event_poll.c:685
 #, c-format
 msgid "Unable to add handle %d to event loop"
 msgstr ""
@@ -14899,842 +15483,889 @@
 msgid "%s: unknown failure with %s\n"
 msgstr ""
 
-#: src/util/interface.c:122
-msgid "ifaceGetFlags is not supported on non-linux platforms"
+#: src/util/iptables.c:297
+msgid "Only IPv4 or IPv6 addresses can be used with iptables"
 msgstr ""
 
-#: src/util/interface.c:131
-msgid "ifaceIsUp is not supported on non-linux platforms"
+#: src/util/iptables.c:303
+msgid "Failure to mask address"
 msgstr ""
 
-#: src/util/interface.c:245 src/util/interface.c:322
+#: src/util/iptables.c:767
 #, c-format
-msgid "invalid interface name %s"
+msgid "Attempted to NAT '%s'. NAT is only supported for IPv4."
 msgstr ""
 
-#: src/util/interface.c:254
-#, c-format
-msgid "coud not get MAC address of interface %s"
+#: src/util/json.c:927
+msgid "Unable to create JSON parser"
 msgstr ""
 
-#: src/util/interface.c:333
+#: src/util/json.c:939
 #, c-format
-msgid "interface %s does not exist"
+msgid "cannot parse json %s: %s"
 msgstr ""
 
-#: src/util/interface.c:353
-msgid "ifaceGetIndex is not supported on non-linux platforms"
+#: src/util/json.c:1051
+msgid "Unable to create JSON formatter"
 msgstr ""
 
-#: src/util/interface.c:398
-msgid "ifaceGetVlanID is not supported on non-linux platforms"
+#: src/util/json.c:1081 src/util/json.c:1087
+msgid "No JSON parser implementation is available"
 msgstr ""
 
-#: src/util/interface.c:684
-#, c-format
-msgid "error creating %s type of interface"
+#: src/util/netlink.c:81
+msgid "cannot allocate nlhandle for netlink"
 msgstr ""
 
-#: src/util/interface.c:708 src/util/interface.c:822 src/util/interface.c:966
-#: src/util/macvtap.c:741
-msgid "malformed netlink response message"
+#: src/util/netlink.c:87
+msgid "cannot connect to netlink socket"
 msgstr ""
 
-#: src/util/interface.c:716 src/util/interface.c:830 src/util/interface.c:974
-#: src/util/macvtap.c:749
-msgid "allocated netlink buffer is too small"
+#: src/util/netlink.c:99
+msgid "cannot send to netlink socket"
 msgstr ""
 
-#: src/util/interface.c:733
-msgid ""
-"ifaceMacvtapLinkAdd is not supported since the include files were too old"
+#: src/util/netlink.c:113
+msgid "error in select call"
 msgstr ""
 
-#: src/util/interface.c:736
-msgid "ifaceMacvtapLinkAdd is not supported on non-linux platforms"
+#: src/util/netlink.c:116
+msgid "no valid netlink response was received"
 msgstr ""
 
-#: src/util/interface.c:798
-#, c-format
-msgid "error destroying %s interface"
+#: src/util/netlink.c:124
+msgid "nl_recv failed"
 msgstr ""
 
-#: src/util/interface.c:841
-msgid "ifaceLinkDel is not supported since the include files were too old"
+#: src/util/netlink.c:147
+msgid "nlComm is not supported since libnl was not available"
 msgstr ""
 
-#: src/util/interface.c:844
-msgid "ifaceLinkDel is not supported on non-linux platforms"
+#: src/util/netlink.c:149
+msgid "nlComm is not supported on non-linux platforms"
 msgstr ""
 
-#: src/util/interface.c:936
+#: src/util/pci.c:624
 #, c-format
-msgid "error dumping %s (%d) interface"
-msgstr ""
-
-#: src/util/interface.c:990
-msgid ""
-"ifaceMacvtapLinkDump is not supported since the include files were too old"
-msgstr ""
-
-#: src/util/interface.c:993
-msgid "ifaceMacvtapLinkDump is not supported on non-linux platforms"
-msgstr ""
-
-#: src/util/interface.c:1047
-msgid "buffer for root interface name is too small"
+msgid "Active %s devices on bus with %s, not doing bus reset"
 msgstr ""
 
-#: src/util/interface.c:1082
-msgid ""
-"ifaceGetNthParent is not supported since the include files were too old"
+#: src/util/pci.c:634 src/util/pci.c:1678
+#, c-format
+msgid "Failed to find parent device for %s"
 msgstr ""
 
-#: src/util/interface.c:1085
-msgid "ifaceGetNthParent is not supported on non-linux platforms"
+#: src/util/pci.c:647 src/util/pci.c:693
+#, c-format
+msgid "Failed to read PCI config space for %s"
 msgstr ""
 
-#: src/util/interface.c:1113
+#: src/util/pci.c:667 src/util/pci.c:713
 #, c-format
-msgid ""
-"Getting MAC address from '%s' to '%02x:%02x:%02x:%02x:%02x:%02x' failed."
+msgid "Failed to restore PCI config space for %s"
 msgstr ""
 
-#: src/util/interface.c:1130
+#: src/util/pci.c:728
 #, c-format
-msgid "Unable to preserve mac for %s"
+msgid "Failed to open config space file '%s'"
 msgstr ""
 
-#: src/util/interface.c:1139 src/util/interface.c:1190
+#: src/util/pci.c:753
 #, c-format
-msgid ""
-"Setting MAC address on  '%s' to '%02x:%02x:%02x:%02x:%02x:%02x' failed."
+msgid "Not resetting active device %s"
 msgstr ""
 
-#: src/util/interface.c:1180
+#: src/util/pci.c:780
 #, c-format
-msgid "Cannot parse MAC address from '%s'"
+msgid "Unable to reset PCI device %s: %s"
 msgstr ""
 
-#: src/util/interface.c:1323
-msgid "ifaceIsVirtualFunction is not supported on non-linux platforms"
+#: src/util/pci.c:782
+msgid "no FLR, PM reset or bus reset available"
 msgstr ""
 
-#: src/util/interface.c:1334
-msgid "ifaceGetVirtualFunctionIndex is not supported on non-linux platforms"
+#: src/util/pci.c:906
+#, c-format
+msgid "Failed to unbind PCI device '%s' from %s"
 msgstr ""
 
-#: src/util/interface.c:1344
-msgid "ifaceGetPhysicalFunction is not supported on non-linux platforms"
+#: src/util/pci.c:924
+#, c-format
+msgid "Failed to remove slot for PCI device '%s' from %s"
 msgstr ""
 
-#: src/util/iptables.c:297
-msgid "Only IPv4 or IPv6 addresses can be used with iptables"
+#: src/util/pci.c:948
+#, c-format
+msgid "Failed to trigger a re-probe for PCI device '%s'"
 msgstr ""
 
-#: src/util/iptables.c:303
-msgid "Failure to mask address"
+#: src/util/pci.c:1006
+#, c-format
+msgid "Failed to add PCI device ID '%s' to %s"
 msgstr ""
 
-#: src/util/iptables.c:767
+#: src/util/pci.c:1037
 #, c-format
-msgid "Attempted to NAT '%s'. NAT is only supported for IPv4."
+msgid "Failed to unbind PCI device '%s'"
 msgstr ""
 
-#: src/util/json.c:927
-msgid "Unable to create JSON parser"
+#: src/util/pci.c:1059
+#, c-format
+msgid "Failed to add slot for PCI device '%s' to %s"
 msgstr ""
 
-#: src/util/json.c:912
+#: src/util/pci.c:1071
 #, c-format
-msgid "cannot parse json %s: %s"
+msgid "Failed to bind PCI device '%s' to %s"
 msgstr ""
 
-#: src/util/json.c:1051
-msgid "Unable to create JSON formatter"
+#: src/util/pci.c:1094
+#, c-format
+msgid "Failed to remove PCI ID '%s' from %s"
 msgstr ""
 
-#: src/util/json.c:1037 src/util/json.c:1043
-msgid "No JSON parser implementation is available"
+#: src/util/pci.c:1125 src/util/pci.c:1144
+msgid "cannot find any PCI stub module"
 msgstr ""
 
-#: src/util/macvtap.c:124
-msgid "buffer for ifindex path is too small"
+#: src/util/pci.c:1131
+#, c-format
+msgid "Not detaching active device %s"
 msgstr ""
 
-#: src/util/macvtap.c:132
+#: src/util/pci.c:1150
 #, c-format
-msgid "cannot open macvtap file %s to determine interface index"
+msgid "Not reattaching active device %s"
 msgstr ""
 
-#: src/util/macvtap.c:139
-msgid "cannot determine macvtap's tap device interface index"
+#: src/util/pci.c:1321
+#, c-format
+msgid "dev->name buffer overflow: %.4x:%.2x:%.2x.%.1x"
 msgstr ""
 
-#: src/util/macvtap.c:151
-msgid "internal buffer for tap device is too small"
+#: src/util/pci.c:1333
+#, c-format
+msgid "Device %s not found: could not access %s"
 msgstr ""
 
-#: src/util/macvtap.c:168
+#: src/util/pci.c:1343
 #, c-format
-msgid "cannot open macvtap tap device %s"
+msgid "Failed to read product/vendor ID for %s"
 msgstr ""
 
-#: src/util/macvtap.c:202
-msgid "cannot get interface flags on macvtap tap"
+#: src/util/pci.c:1352
+#, c-format
+msgid "dev->id buffer overflow: %s %s"
 msgstr ""
 
-#: src/util/macvtap.c:211
-msgid "cannot clean IFF_VNET_HDR flag on macvtap tap"
+#: src/util/pci.c:1490
+#, c-format
+msgid "Device %s is already in use"
 msgstr ""
 
-#: src/util/macvtap.c:215
-msgid "cannot get feature flags on macvtap tap"
+#: src/util/pci.c:1733
+#, c-format
+msgid "Device %s is behind a switch lacking ACS and cannot be assigned"
 msgstr ""
 
-#: src/util/macvtap.c:220
-msgid "cannot set IFF_VNET_HDR flag on macvtap tap"
+#: src/util/pci.c:1830
+#, c-format
+msgid "Failed to resolve device link '%s': '%s'"
 msgstr ""
 
-#: src/util/macvtap.c:310
+#: src/util/pci.c:1844
 #, c-format
-msgid "Interface %s already exists"
+msgid "Failed to parse PCI config address '%s'"
 msgstr ""
 
-#: src/util/macvtap.c:349
+#: src/util/pci.c:1911
 #, c-format
-msgid ""
-"cannot 'up' interface %s -- another macvtap device may be 'up' and have the "
-"same MAC address"
+msgid "Failed to open dir '%s': '%s'"
 msgstr ""
 
-#: src/util/macvtap.c:452
-msgid "error parsing pid of lldpad"
+#: src/util/pci.c:1942
+#, c-format
+msgid "Failed to get SR IOV function from device link '%s'"
 msgstr ""
 
-#: src/util/macvtap.c:457
+#: src/util/pci.c:2004
 #, c-format
-msgid "Error opening file %s"
+msgid "Error getting physical function's '%s' virtual_functions"
 msgstr ""
 
-#: src/util/macvtap.c:493
-msgid "error parsing IFLA_PORT_SELF part"
+#: src/util/pci.c:2076
+msgid "pciGetPhysicalFunction is not supported on non-linux platforms"
 msgstr ""
 
-#: src/util/macvtap.c:497
-msgid "IFLA_PORT_SELF is missing"
+#: src/util/pci.c:2086
+msgid "pciGetVirtualFunctions is not supported on non-linux platforms"
 msgstr ""
 
-#: src/util/macvtap.c:509
-msgid "error while iterating over IFLA_VF_PORTS part"
+#: src/util/pci.c:2094
+msgid "pciDeviceIsVirtualFunction is not supported on non-linux platforms"
 msgstr ""
 
-#: src/util/macvtap.c:515
-msgid "error parsing IFLA_VF_PORT part"
+#: src/util/pci.c:2104
+msgid "pciGetVirtualFunctionIndex is not supported on non-linux platforms"
 msgstr ""
 
-#: src/util/macvtap.c:533
-msgid "Could not find netlink response with expected parameters"
+#: src/util/pci.c:2114
+msgid "pciDeviceNetName is not supported on non-linux platforms"
 msgstr ""
 
-#: src/util/macvtap.c:538
-msgid "IFLA_VF_PORTS is missing"
+#: src/util/processinfo.c:75 src/util/processinfo.c:91
+#, c-format
+msgid "cannot set CPU affinity on process %d"
 msgstr ""
 
-#: src/util/macvtap.c:552
-msgid "no IFLA_PORT_RESPONSE found in netlink message"
-msgstr ""
-
-#: src/util/macvtap.c:715
+#: src/util/processinfo.c:136 src/util/processinfo.c:150
 #, c-format
-msgid "error during virtual port configuration of ifindex %d"
+msgid "cannot get CPU affinity of process %d"
 msgstr ""
 
-#: src/util/macvtap.c:786
-msgid "sending of PortProfileRequest failed."
+#: src/util/processinfo.c:170 src/util/processinfo.c:180
+msgid "Process CPU affinity is not supported on this platform"
 msgstr ""
 
-#: src/util/macvtap.c:807
+#: src/util/sexpr.c:245
 #, c-format
-msgid "error %d during port-profile setlink on interface %s (%d)"
+msgid "unknown s-expression kind %d"
 msgstr ""
 
-#: src/util/macvtap.c:821
-msgid "port-profile setlink timed out"
+#: src/util/stats_linux.c:54
+msgid "Could not open /proc/net/dev"
 msgstr ""
 
-#: src/util/macvtap.c:881 src/util/macvtap.c:1000
-msgid "Kernel VF Port support was missing at compile time."
+#: src/util/stats_linux.c:110
+msgid "/proc/net/dev: Interface not found"
 msgstr ""
 
-#: src/util/macvtap.c:922 src/util/macvtap.c:1067
+#: src/util/storage_file.c:760
 #, c-format
-msgid "operation type %d not supported"
+msgid "cannot set to start of '%s'"
 msgstr ""
 
-#: src/util/netlink.c:81
-msgid "cannot allocate nlhandle for netlink"
+#: src/util/storage_file.c:765 src/util/storage_file.c:861
+#, c-format
+msgid "cannot read header '%s'"
 msgstr ""
 
-#: src/util/netlink.c:87
-msgid "cannot connect to netlink socket"
+#: src/util/storage_file.c:796 src/util/storage_file.c:908
+#, c-format
+msgid "cannot open file '%s'"
 msgstr ""
 
-#: src/util/netlink.c:99
-msgid "cannot send to netlink socket"
+#: src/util/storage_file.c:851
+#, c-format
+msgid "cannot seek to start of '%s'"
 msgstr ""
 
-#: src/util/netlink.c:113
-msgid "error in select call"
+#: src/util/storage_file.c:870
+#, c-format
+msgid "unknown storage file format %d"
 msgstr ""
 
-#: src/util/netlink.c:116
-msgid "no valid netlink response was received"
+#: src/util/storage_file.c:974
+#, c-format
+msgid "Invalid relative path '%s'"
 msgstr ""
 
-#: src/util/netlink.c:124
-msgid "nl_recv failed"
+#: src/util/storage_file.c:992
+#, c-format
+msgid "cannot determine filesystem for '%s'"
 msgstr ""
 
-#: src/util/netlink.c:147
-msgid "nlComm is not supported since libnl was not available"
+#: src/util/sysinfo.c:127
+msgid "Host sysinfo extraction not supported on this platform"
 msgstr ""
 
-#: src/util/netlink.c:149
-msgid "nlComm is not supported on non-linux platforms"
+#: src/util/sysinfo.c:464
+#, c-format
+msgid "Failed to find path for %s binary"
 msgstr ""
 
-#: src/util/network.c:85 src/util/network.c:178
-msgid "Missing address"
+#: src/util/sysinfo.c:474
+#, c-format
+msgid "Failed to execute command %s"
 msgstr ""
 
-#: src/util/network.c:94
+#: src/util/sysinfo.c:680
 #, c-format
-msgid "Cannot parse socket address '%s': %s"
+msgid "unexpected sysinfo type model %d"
+msgstr ""
+
+#: src/util/sysinfo.c:713
+msgid "Target sysinfo does not match source"
 msgstr ""
 
-#: src/util/network.c:101
+#: src/util/sysinfo.c:719
 #, c-format
-msgid "No socket addresses found for '%s'"
+msgid "Target sysinfo %s does not match source %s"
 msgstr ""
 
-#: src/util/network.c:202
+#: src/util/sysinfo.c:729
 #, c-format
-msgid "Cannot convert socket address to string: %s"
+msgid "Target sysinfo %s %s does not match source %s"
 msgstr ""
 
-#: src/util/network.c:709
-msgid "missing virtualportprofile type"
+#: src/util/util.c:328
+msgid "Unknown poll response."
 msgstr ""
 
-#: src/util/network.c:739
-msgid "cannot parse value of managerid parameter"
+#: src/util/util.c:362
+msgid "poll error"
 msgstr ""
 
-#: src/util/network.c:745
-msgid "value of managerid out of range"
+#: src/util/util.c:451
+#, c-format
+msgid "Failed to open file '%s'"
 msgstr ""
 
-#: src/util/network.c:753
-msgid "cannot parse value of typeid parameter"
+#: src/util/util.c:458
+#, c-format
+msgid "Failed to read file '%s'"
 msgstr ""
 
-#: src/util/network.c:759
-msgid "value for typeid out of range"
+#: src/util/util.c:745
+#, c-format
+msgid "failed to create file '%s'"
 msgstr ""
 
-#: src/util/network.c:767
-msgid "cannot parse value of typeidversion parameter"
+#: src/util/util.c:794
+#, c-format
+msgid "failed to create directory '%s'"
 msgstr ""
 
-#: src/util/network.c:773
-msgid "value of typeidversion out of range"
+#: src/util/util.c:866
+#, c-format
+msgid "failed to create socket needed for '%s'"
 msgstr ""
 
-#: src/util/network.c:783
-msgid "cannot parse instanceid parameter as a uuid"
+#: src/util/util.c:901 src/util/util.c:994
+#, c-format
+msgid "failed to wait for child creating '%s'"
 msgstr ""
 
-#: src/util/network.c:789
-msgid "cannot generate a random uuid for instanceid"
+#: src/util/util.c:1024
+#, c-format
+msgid "child failed to create directory '%s'"
 msgstr ""
 
-#: src/util/network.c:798
-msgid "a parameter is missing for 802.1Qbg description"
+#: src/util/util.c:1040
+#, c-format
+msgid "cannot chown '%s' to group %u"
 msgstr ""
 
-#: src/util/network.c:810
-msgid "profileid parameter too long"
+#: src/util/util.c:1078
+msgid "virFileOpenAs is not implemented for WIN32"
 msgstr ""
 
-#: src/util/network.c:815
-msgid "profileid parameter is missing for 802.1Qbh descripion"
+#: src/util/util.c:1090
+msgid "virDirCreate is not implemented for WIN32"
 msgstr ""
 
-#: src/util/network.c:825
-msgid "unknown virtualport type"
+#: src/util/util.c:1913
+#, c-format
+msgid "Disk index %d is negative"
 msgstr ""
 
-#: src/util/network.c:931 src/util/network.c:998 src/util/network.c:1305
-msgid "invalid argument supplied"
+#: src/util/util.c:1969
+msgid "failed to determine host name"
 msgstr ""
 
-#: src/util/network.c:942 src/util/network.c:954 src/util/network.c:961
+#: src/util/util.c:2151
 #, c-format
-msgid "could not convert %s"
+msgid "Failed to find user record for uid '%u'"
 msgstr ""
 
-#: src/util/network.c:948
-msgid "Missing mandatory average attribute"
+#: src/util/util.c:2215
+#, c-format
+msgid "Failed to find user record for name '%s'"
 msgstr ""
 
-#: src/util/network.c:1007
-msgid "Only one child <inbound> element allowed"
+#: src/util/util.c:2264
+#, c-format
+msgid "Failed to find group record for name '%s'"
 msgstr ""
 
-#: src/util/network.c:1015
-msgid "Only one child <outbound> element allowed"
+#: src/util/util.c:2291
+#, c-format
+msgid "cannot change to '%d' group"
 msgstr ""
 
-#: src/util/pci.c:477
+#: src/util/util.c:2323
 #, c-format
-msgid "Active %s devices on bus with %s, not doing bus reset"
+msgid "cannot getpwuid_r(%d)"
 msgstr ""
 
-#: src/util/pci.c:486
+#: src/util/util.c:2330
 #, c-format
-msgid "Failed to find parent device for %s"
+msgid "cannot initgroups(\"%s\", %d)"
 msgstr ""
 
-#: src/util/pci.c:647 src/util/pci.c:693
+#: src/util/util.c:2339
 #, c-format
-msgid "Failed to read PCI config space for %s"
+msgid "cannot change to uid to '%d'"
 msgstr ""
 
-#: src/util/pci.c:519 src/util/pci.c:565
-#, c-format
-msgid "Failed to restore PCI config space for %s"
+#: src/util/util.c:2357
+msgid "virGetUserDirectory is not available"
+msgstr ""
+
+#: src/util/util.c:2366
+msgid "virGetUserName is not available"
+msgstr ""
+
+#: src/util/util.c:2375
+msgid "virGetUserID is not available"
 msgstr ""
 
-#: src/util/pci.c:578
+#: src/util/util.c:2385
+msgid "virGetGroupID is not available"
+msgstr ""
+
+#: src/util/util.c:2395
+msgid "virSetUIDGID is not available"
+msgstr ""
+
+#: src/util/viraudit.c:60
+msgid "Unable to initialize audit layer"
+msgstr ""
+
+#: src/util/virfile.c:150
+msgid "O_DIRECT unsupported on this platform"
+msgstr ""
+
+#: src/util/virfile.c:167
 #, c-format
-msgid "Failed to open config space file '%s'"
+msgid "invalid fd %d for %s"
 msgstr ""
 
-#: src/util/pci.c:600
+#: src/util/virfile.c:173
 #, c-format
-msgid "Not resetting active device %s"
+msgid "unexpected mode %x for %s"
 msgstr ""
 
-#: src/util/pci.c:627
+#: src/util/virfile.c:180
 #, c-format
-msgid "Unable to reset PCI device %s: %s"
+msgid "unable to create pipe for %s"
 msgstr ""
 
-#: src/util/pci.c:629
-msgid "no FLR, PM reset or bus reset available"
+#: src/util/virfile.c:200
+msgid "unable to close pipe"
 msgstr ""
 
-#: src/util/pci.c:906
+#: src/util/virfile.c:354
 #, c-format
-msgid "Failed to unbind PCI device '%s' from %s"
+msgid "cannot create file '%s'"
 msgstr ""
 
-#: src/util/pci.c:924
+#: src/util/virfile.c:360
 #, c-format
-msgid "Failed to remove slot for PCI device '%s' from %s"
+msgid "cannot write data to file '%s'"
 msgstr ""
 
-#: src/util/pci.c:818
+#: src/util/virfile.c:366
 #, c-format
-msgid "Failed to trigger a re-probe for PCI device '%s'"
+msgid "cannot sync file '%s'"
 msgstr ""
 
-#: src/util/pci.c:712
+#: src/util/virfile.c:372
 #, c-format
-msgid "Failed to add PCI device ID '%s' to %s"
+msgid "cannot save file '%s'"
 msgstr ""
 
-#: src/util/pci.c:725
+#: src/util/virfile.c:378
 #, c-format
-msgid "Failed to unbind PCI device '%s'"
+msgid "cannot rename file '%s' as '%s'"
 msgstr ""
 
-#: src/util/pci.c:738
+#: src/util/virnetdev.c:62 src/util/virnetdev.c:486
+#: src/util/virnetdevbridge.c:61 src/util/virnetdevtap.c:146
+#: src/util/virnetdevtap.c:204
 #, c-format
-msgid "Failed to add slot for PCI device '%s' to %s"
+msgid "Network interface name '%s' is too long"
 msgstr ""
 
-#: src/util/pci.c:746 src/util/pci.c:793
-#, c-format
-msgid "Failed to bind PCI device '%s' to %s"
+#: src/util/virnetdev.c:69 src/util/virnetdevbridge.c:69
+msgid "Cannot open network interface control socket"
 msgstr ""
 
-#: src/util/pci.c:758
-#, c-format
-msgid "Failed to remove PCI ID '%s' from %s"
+#: src/util/virnetdev.c:75 src/util/virnetdevbridge.c:75
+msgid "Cannot set close-on-exec flag for socket"
 msgstr ""
 
-#: src/util/pci.c:772 src/util/pci.c:833
-msgid "cannot find any PCI stub module"
+#: src/util/virnetdev.c:115
+#, c-format
+msgid "Unable to check interface flags for %s"
 msgstr ""
 
-#: src/util/pci.c:1131
+#: src/util/virnetdev.c:129
 #, c-format
-msgid "Not detaching active device %s"
+msgid "Unable to check interface %s"
 msgstr ""
 
-#: src/util/pci.c:1150
+#: src/util/virnetdev.c:159 src/util/virnetdev.c:213 src/util/virnetdev.c:231
 #, c-format
-msgid "Not reattaching active device %s"
+msgid "Cannot get interface MAC on '%s'"
 msgstr ""
 
-#: src/util/pci.c:1321
+#: src/util/virnetdev.c:168 src/util/virnetdev.c:184
 #, c-format
-msgid "dev->name buffer overflow: %.4x:%.2x:%.2x.%.1x"
+msgid "Cannot set interface MAC on '%s'"
 msgstr ""
 
-#: src/util/pci.c:1333
+#: src/util/virnetdev.c:269
 #, c-format
-msgid "Device %s not found: could not access %s"
+msgid "Unable to preserve mac for %s"
 msgstr ""
 
-#: src/util/pci.c:896
+#: src/util/virnetdev.c:310
 #, c-format
-msgid "Failed to read product/vendor ID for %s"
+msgid "Cannot parse MAC address from '%s'"
 msgstr ""
 
-#: src/util/pci.c:1352
+#: src/util/virnetdev.c:345 src/util/virnetdev.c:360
 #, c-format
-msgid "dev->id buffer overflow: %s %s"
+msgid "Cannot get interface MTU on '%s'"
 msgstr ""
 
-#: src/util/pci.c:975
+#: src/util/virnetdev.c:391 src/util/virnetdev.c:406
 #, c-format
-msgid "Device %s is already in use"
+msgid "Cannot set interface MTU on '%s'"
 msgstr ""
 
-#: src/util/pci.c:1733
+#: src/util/virnetdev.c:493
 #, c-format
-msgid "Device %s is behind a switch lacking ACS and cannot be assigned"
+msgid "Unable to rename '%s' to '%s'"
 msgstr ""
 
-#: src/util/pci.c:1830
+#: src/util/virnetdev.c:508
 #, c-format
-msgid "Failed to resolve device link '%s': '%s'"
+msgid "Cannot rename interface '%s' to '%s' on this platform"
 msgstr ""
 
-#: src/util/pci.c:1844
+#: src/util/virnetdev.c:538 src/util/virnetdev.c:598 src/util/virnetdev.c:615
 #, c-format
-msgid "Failed to parse PCI config address '%s'"
+msgid "Cannot get interface flags on '%s'"
 msgstr ""
 
-#: src/util/pci.c:1911
+#: src/util/virnetdev.c:552 src/util/virnetdev.c:569
 #, c-format
-msgid "Failed to open dir '%s': '%s'"
+msgid "Cannot set interface flags on '%s'"
 msgstr ""
 
-#: src/util/pci.c:1942
+#: src/util/virnetdev.c:640 src/util/virnetdev.c:689
+msgid "Unable to open control socket"
+msgstr ""
+
+#: src/util/virnetdev.c:649 src/util/virnetdev.c:695
 #, c-format
-msgid "Failed to get SR IOV function from device link '%s'"
+msgid "invalid interface name %s"
 msgstr ""
 
-#: src/util/pci.c:2004
+#: src/util/virnetdev.c:656
 #, c-format
-msgid "Error getting physical function's '%s' virtual_functions"
+msgid "Unable to get index for interface %s"
 msgstr ""
 
-#: src/util/pci.c:2076
-msgid "pciGetPhysicalFunction is not supported on non-linux platforms"
+#: src/util/virnetdev.c:672
+msgid "Unable to get interface index on this platform"
 msgstr ""
 
-#: src/util/pci.c:2086
-msgid "pciGetVirtualFunctions is not supported on non-linux platforms"
+#: src/util/virnetdev.c:702
+#, c-format
+msgid "Unable to get VLAN for interface %s"
 msgstr ""
 
-#: src/util/pci.c:2094
-msgid "pciDeviceIsVirtualFunction is not supported on non-linux platforms"
+#: src/util/virnetdev.c:719
+msgid "Unable to get VLAN on this platform"
 msgstr ""
 
-#: src/util/pci.c:2104
-msgid "pciGetVirtualFunctionIndex is not supported on non-linux platforms"
+#: src/util/virnetdev.c:837
+#, c-format
+msgid "Unable to get IPv4 address for interface %s"
 msgstr ""
 
-#: src/util/pci.c:2114
-msgid "pciDeviceNetName is not supported on non-linux platforms"
+#: src/util/virnetdev.c:857
+msgid "Unable to get IPv4 address on this platform"
 msgstr ""
 
-#: src/util/processinfo.c:77 src/util/processinfo.c:93
-#: src/util/processinfo.c:138 src/util/processinfo.c:152
+#: src/util/virnetdev.c:903
 #, c-format
-msgid "cannot set CPU affinity on process %d"
+msgid "coud not get MAC address of interface %s"
 msgstr ""
 
-#: src/util/processinfo.c:136 src/util/processinfo.c:150
-#, c-format
-msgid "cannot get CPU affinity of process %d"
+#: src/util/virnetdev.c:935
+msgid "Unable to check interface config on this platform"
 msgstr ""
 
-#: src/util/processinfo.c:172 src/util/processinfo.c:182
-msgid "Process CPU affinity is not supported on this platform"
+#: src/util/virnetdev.c:1063
+msgid "Unable to check virtual function status on this platfornm"
 msgstr ""
 
-#: src/util/sexpr.c:245
-#, c-format
-msgid "unknown s-expression kind %d"
+#: src/util/virnetdev.c:1073
+msgid "Unable to get virtual function index on this platfornm"
 msgstr ""
 
-#: src/util/stats_linux.c:54
-msgid "Could not open /proc/net/dev"
+#: src/util/virnetdev.c:1082
+msgid "Unable to get physical function status on this platfornm"
 msgstr ""
 
-#: src/util/stats_linux.c:110
-msgid "/proc/net/dev: Interface not found"
+#: src/util/virnetdevbridge.c:118 src/util/virnetdevbridge.c:129
+#: src/util/virnetdevbridge.c:136
+#, c-format
+msgid "Unable to set bridge %s %s"
 msgstr ""
 
-#: src/util/storage_file.c:760
+#: src/util/virnetdevbridge.c:170 src/util/virnetdevbridge.c:182
+#: src/util/virnetdevbridge.c:192
 #, c-format
-msgid "cannot set to start of '%s'"
+msgid "Unable to get bridge %s %s"
 msgstr ""
 
-#: src/util/storage_file.c:289
+#: src/util/virnetdevbridge.c:224 src/util/virnetdevbridge.c:238
 #, c-format
-msgid "cannot read header '%s'"
+msgid "Unable to create bridge %s"
 msgstr ""
 
-#: src/util/storage_file.c:415
+#: src/util/virnetdevbridge.c:262 src/util/virnetdevbridge.c:276
 #, c-format
-msgid "cannot open file '%s'"
+msgid "Unable to delete bridge %s"
 msgstr ""
 
-#: src/util/storage_file.c:851
+#: src/util/virnetdevbridge.c:303 src/util/virnetdevbridge.c:350
 #, c-format
-msgid "cannot seek to start of '%s'"
+msgid "Unable to get interface index for %s"
 msgstr ""
 
-#: src/util/storage_file.c:870
+#: src/util/virnetdevbridge.c:309 src/util/virnetdevbridge.c:323
 #, c-format
-msgid "unknown storage file format %d"
+msgid "Unable to add bridge %s port %s"
 msgstr ""
 
-#: src/util/storage_file.c:974
+#: src/util/virnetdevbridge.c:357 src/util/virnetdevbridge.c:371
 #, c-format
-msgid "Invalid relative path '%s'"
+msgid "Unable to remove bridge %s port %s"
 msgstr ""
 
-#: src/util/storage_file.c:992
+#: src/util/virnetdevbridge.c:502
 #, c-format
-msgid "cannot determine filesystem for '%s'"
+msgid "Unable to set STP delay on %s on this platform"
 msgstr ""
 
-#: src/util/sysinfo.c:127
-msgid "Host sysinfo extraction not supported on this platform"
+#: src/util/virnetdevbridge.c:510
+#, c-format
+msgid "Unable to get STP delay on %s on this platform"
 msgstr ""
 
-#: src/util/sysinfo.c:464
+#: src/util/virnetdevbridge.c:520
 #, c-format
-msgid "Failed to find path for %s binary"
+msgid "Unable to set STP on %s on this platform"
 msgstr ""
 
-#: src/util/sysinfo.c:474
+#: src/util/virnetdevbridge.c:528
 #, c-format
-msgid "Failed to execute command %s"
+msgid "Unable to get STP on %s on this platform"
+msgstr ""
+
+#: src/util/virnetdevmacvlan.c:184
+#, c-format
+msgid "error creating %s type of interface"
+msgstr ""
+
+#: src/util/virnetdevmacvlan.c:208 src/util/virnetdevmacvlan.c:294
+#: src/util/virnetdevvportprofile.c:275 src/util/virnetdevvportprofile.c:562
+msgid "malformed netlink response message"
+msgstr ""
+
+#: src/util/virnetdevmacvlan.c:216 src/util/virnetdevmacvlan.c:302
+#: src/util/virnetdevvportprofile.c:283 src/util/virnetdevvportprofile.c:570
+msgid "allocated netlink buffer is too small"
 msgstr ""
 
-#: src/util/sysinfo.c:680
+#: src/util/virnetdevmacvlan.c:270
 #, c-format
-msgid "unexpected sysinfo type model %d"
+msgid "error destroying %s interface"
 msgstr ""
 
-#: src/util/sysinfo.c:713
-msgid "Target sysinfo does not match source"
+#: src/util/virnetdevmacvlan.c:329
+msgid "buffer for ifindex path is too small"
 msgstr ""
 
-#: src/util/sysinfo.c:719
+#: src/util/virnetdevmacvlan.c:337
 #, c-format
-msgid "Target sysinfo %s does not match source %s"
+msgid "cannot open macvtap file %s to determine interface index"
 msgstr ""
 
-#: src/util/sysinfo.c:729
-#, c-format
-msgid "Target sysinfo %s %s does not match source %s"
+#: src/util/virnetdevmacvlan.c:344
+msgid "cannot determine macvtap's tap device interface index"
 msgstr ""
 
-#: src/util/util.c:736
-msgid "Unknown poll response."
+#: src/util/virnetdevmacvlan.c:356
+msgid "internal buffer for tap device is too small"
 msgstr ""
 
-#: src/util/util.c:767
-msgid "poll error"
+#: src/util/virnetdevmacvlan.c:373
+#, c-format
+msgid "cannot open macvtap tap device %s"
 msgstr ""
 
-#: src/util/util.c:968
-#, c-format
-msgid "Failed to open file '%s'"
+#: src/util/virnetdevmacvlan.c:407
+msgid "cannot get interface flags on macvtap tap"
 msgstr ""
 
-#: src/util/util.c:975
-#, c-format
-msgid "Failed to read file '%s'"
+#: src/util/virnetdevmacvlan.c:416
+msgid "cannot clean IFF_VNET_HDR flag on macvtap tap"
 msgstr ""
 
-#: src/util/util.c:747
-#, c-format
-msgid "failed to create file '%s'"
+#: src/util/virnetdevmacvlan.c:420
+msgid "cannot get feature flags on macvtap tap"
 msgstr ""
 
-#: src/util/util.c:796
-#, c-format
-msgid "failed to create directory '%s'"
+#: src/util/virnetdevmacvlan.c:425
+msgid "cannot set IFF_VNET_HDR flag on macvtap tap"
 msgstr ""
 
-#: src/util/util.c:868
+#: src/util/virnetdevmacvlan.c:517
 #, c-format
-msgid "failed to create socket needed for '%s'"
+msgid "Unable to create macvlan device %s"
 msgstr ""
 
-#: src/util/util.c:903 src/util/util.c:996
-#, c-format
-msgid "failed to wait for child creating '%s'"
+#: src/util/virnetdevmacvlan.c:653 src/util/virnetdevmacvlan.c:660
+#: src/util/virnetdevmacvlan.c:678 src/util/virnetdevmacvlan.c:690
+msgid "Cannot create macvlan devices on this platform"
+msgstr ""
+
+#: src/util/virnetdevtap.c:131 src/util/virnetdevtap.c:195
+msgid "Unable to open /dev/net/tun, is tun module loaded?"
 msgstr ""
 
-#: src/util/util.c:1026
+#: src/util/virnetdevtap.c:154
 #, c-format
-msgid "child failed to create directory '%s'"
+msgid "Unable to create tap device %s"
 msgstr ""
 
-#: src/util/util.c:1042
+#: src/util/virnetdevtap.c:162
 #, c-format
-msgid "cannot chown '%s' to group %u"
+msgid "Unable to set tap device %s to persistent"
 msgstr ""
 
-#: src/util/util.c:1080
-msgid "virFileOpenAs is not implemented for WIN32"
+#: src/util/virnetdevtap.c:211
+msgid "Unable to associate TAP device"
 msgstr ""
 
-#: src/util/util.c:1092
-msgid "virDirCreate is not implemented for WIN32"
+#: src/util/virnetdevtap.c:217
+msgid "Unable to make TAP device non-persistent"
 msgstr ""
 
-#: src/util/util.c:1790
-#, c-format
-msgid "Disk index %d is negative"
+#: src/util/virnetdevtap.c:233
+msgid "Unable to create TAP devices on this platform"
 msgstr ""
 
-#: src/util/util.c:1826
-msgid "failed to determine host name"
+#: src/util/virnetdevtap.c:239
+msgid "Unable to delete TAP devices on this platform"
 msgstr ""
 
-#: src/util/util.c:2153
-#, c-format
-msgid "Failed to find user record for uid '%u'"
+#: src/util/virnetdevvportprofile.c:154
+msgid "error parsing pid of lldpad"
 msgstr ""
 
-#: src/util/util.c:2028
+#: src/util/virnetdevvportprofile.c:159
 #, c-format
-msgid "Failed to find user record for name '%s'"
+msgid "Error opening file %s"
 msgstr ""
 
-#: src/util/util.c:2065
+#: src/util/virnetdevvportprofile.c:245
 #, c-format
-msgid "Failed to find group record for name '%s'"
+msgid "error dumping %s (%d) interface"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2306
-#, c-format
-msgid "cannot change to '%d' group"
+#: src/util/virnetdevvportprofile.c:314
+msgid "error parsing IFLA_PORT_SELF part"
 msgstr ""
 
-#: src/util/util.c:2325
-#, c-format
-msgid "cannot getpwuid_r(%d)"
+#: src/util/virnetdevvportprofile.c:318
+msgid "IFLA_PORT_SELF is missing"
 msgstr ""
 
-#: src/util/util.c:2332
-#, c-format
-msgid "cannot initgroups(\"%s\", %d)"
+#: src/util/virnetdevvportprofile.c:330
+msgid "error while iterating over IFLA_VF_PORTS part"
 msgstr ""
 
-#: src/util/util.c:2341
-#, c-format
-msgid "cannot change to uid to '%d'"
+#: src/util/virnetdevvportprofile.c:336
+msgid "error parsing IFLA_VF_PORT part"
 msgstr ""
 
-#: src/util/util.c:2359
-msgid "virGetUserDirectory is not available"
+#: src/util/virnetdevvportprofile.c:354
+msgid "Could not find netlink response with expected parameters"
 msgstr ""
 
-#: src/util/util.c:2368
-msgid "virGetUserName is not available"
+#: src/util/virnetdevvportprofile.c:359
+msgid "IFLA_VF_PORTS is missing"
 msgstr ""
 
-#: src/util/util.c:2377
-msgid "virGetUserID is not available"
+#: src/util/virnetdevvportprofile.c:373
+msgid "no IFLA_PORT_RESPONSE found in netlink message"
 msgstr ""
 
-#: src/util/util.c:2387
-msgid "virGetGroupID is not available"
+#: src/util/virnetdevvportprofile.c:536
+#, c-format
+msgid "error during virtual port configuration of ifindex %d"
 msgstr ""
 
-#: src/util/util.c:2397
-msgid "virSetUIDGID is not available"
+#: src/util/virnetdevvportprofile.c:618
+msgid "buffer for root interface name is too small"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:300 src/qemu/qemu_driver.c:342
-#: src/xen/xm_internal.c:496
-msgid "cannot get time of day"
+#: src/util/virnetdevvportprofile.c:674
+msgid "sending of PortProfileRequest failed."
 msgstr ""
 
-#: src/util/viraudit.c:60
-msgid "Unable to initialize audit layer"
+#: src/util/virnetdevvportprofile.c:695
+#, c-format
+msgid "error %d during port-profile setlink on interface %s (%d)"
 msgstr ""
 
-#: src/util/virfile.c:150
-msgid "O_DIRECT unsupported on this platform"
+#: src/util/virnetdevvportprofile.c:709
+msgid "port-profile setlink timed out"
 msgstr ""
 
-#: src/util/virfile.c:167
+#: src/util/virnetdevvportprofile.c:793 src/util/virnetdevvportprofile.c:925
 #, c-format
-msgid "invalid fd %d for %s"
+msgid "operation type %d not supported"
 msgstr ""
 
-#: src/util/virfile.c:173
-#, c-format
-msgid "unexpected mode %x for %s"
+#: src/util/virnetdevvportprofile.c:1062 src/util/virnetdevvportprofile.c:1073
+msgid "Virtual port profile association not supported on this platform"
 msgstr ""
 
-#: src/util/virfile.c:180
-#, c-format
-msgid "unable to create pipe for %s"
+#: src/util/virnodesuspend.c:99
+msgid "Suspend duration is too short"
 msgstr ""
 
-#: src/util/virfile.c:200
-msgid "unable to close pipe"
+#: src/util/virnodesuspend.c:202
+msgid "Suspend operation already in progress"
 msgstr ""
 
-#: src/util/virfile.c:354
-#, c-format
-msgid "cannot create file '%s'"
+#: src/util/virnodesuspend.c:210
+msgid "Suspend-to-RAM"
 msgstr ""
 
-#: src/util/virfile.c:360
-#, c-format
-msgid "cannot write data to file '%s'"
+#: src/util/virnodesuspend.c:218
+msgid "Suspend-to-Disk"
 msgstr ""
 
-#: src/util/virfile.c:366
-#, c-format
-msgid "cannot sync file '%s'"
+#: src/util/virnodesuspend.c:226
+msgid "Hybrid-Suspend"
 msgstr ""
 
-#: src/util/virfile.c:372
-#, c-format
-msgid "cannot save file '%s'"
+#: src/util/virnodesuspend.c:233
+msgid "Invalid suspend target"
 msgstr ""
 
-#: src/util/virfile.c:378
-#, c-format
-msgid "cannot rename file '%s' as '%s'"
+#: src/util/virnodesuspend.c:243
+msgid "Failed to create thread to suspend the host\n"
 msgstr ""
 
 #: src/util/virpidfile.c:321
@@ -15762,675 +16393,702 @@
 msgid "Failed to write to pid file '%s'"
 msgstr ""
 
-#: src/util/virterror.c:223
+#: src/util/virsocketaddr.c:95 src/util/virsocketaddr.c:188
+msgid "Missing address"
+msgstr ""
+
+#: src/util/virsocketaddr.c:104
+#, c-format
+msgid "Cannot parse socket address '%s': %s"
+msgstr ""
+
+#: src/util/virsocketaddr.c:111
+#, c-format
+msgid "No socket addresses found for '%s'"
+msgstr ""
+
+#: src/util/virsocketaddr.c:212
+#, c-format
+msgid "Cannot convert socket address to string: %s"
+msgstr ""
+
+#: src/util/virterror.c:226
 msgid "An error occurred, but the cause is unknown"
 msgstr ""
 
-#: src/util/virterror.c:537
+#: src/util/virterror.c:572
 msgid "warning"
 msgstr "attention"
 
-#: src/util/virterror.c:540
+#: src/util/virterror.c:575 tools/virsh.c:16932
 msgid "error"
 msgstr "erreur"
 
-#: src/util/virterror.c:674
+#: src/util/virterror.c:705
 msgid "No error message provided"
 msgstr "Pas de message d'erreur fourni"
 
-#: src/util/virterror.c:737
+#: src/util/virterror.c:768
 #, c-format
 msgid "internal error %s"
 msgstr "erreur interne %s"
 
-#: src/util/virterror.c:739
+#: src/util/virterror.c:770
 msgid "internal error"
 msgstr "erreur interne"
 
-#: src/util/virterror.c:742
+#: src/util/virterror.c:773 tools/virsh.c:12077
 msgid "out of memory"
 msgstr "plus de mémoire disponible"
 
-#: src/util/virterror.c:774
+#: src/util/virterror.c:777
 msgid "this function is not supported by the connection driver"
 msgstr ""
 
-#: src/util/virterror.c:776
+#: src/util/virterror.c:779
 #, c-format
 msgid "this function is not supported by the connection driver: %s"
 msgstr ""
 
-#: src/util/virterror.c:780
+#: src/util/virterror.c:783
 msgid "no connection driver available"
 msgstr ""
 
-#: src/util/virterror.c:782
+#: src/util/virterror.c:785
 #, c-format
 msgid "no connection driver available for %s"
 msgstr ""
 
-#: src/util/virterror.c:758
+#: src/util/virterror.c:789
 msgid "invalid connection pointer in"
 msgstr "pointeur de connexion invalide dans"
 
-#: src/util/virterror.c:760
+#: src/util/virterror.c:791
 #, c-format
 msgid "invalid connection pointer in %s"
 msgstr "pointeur de connexion invalide dans %s"
 
-#: src/util/virterror.c:764
+#: src/util/virterror.c:795
 msgid "invalid domain pointer in"
 msgstr "pointeur de domaine invalide dans"
 
-#: src/util/virterror.c:766
+#: src/util/virterror.c:797
 #, c-format
 msgid "invalid domain pointer in %s"
 msgstr "pointeur de domaine invalide dans %s"
 
-#: src/util/virterror.c:798
+#: src/util/virterror.c:801
 msgid "invalid argument"
 msgstr ""
 
-#: src/util/virterror.c:800
+#: src/util/virterror.c:803
 #, c-format
 msgid "invalid argument: %s"
 msgstr ""
 
-#: src/util/virterror.c:776
+#: src/util/virterror.c:807
 #, c-format
 msgid "operation failed: %s"
 msgstr "opération échouée : %s"
 
-#: src/util/virterror.c:778
+#: src/util/virterror.c:809
 msgid "operation failed"
 msgstr "opération échouée"
 
-#: src/util/virterror.c:782
+#: src/util/virterror.c:813
 #, c-format
 msgid "GET operation failed: %s"
 msgstr "opération GET échouée : %s"
 
-#: src/util/virterror.c:784
+#: src/util/virterror.c:815
 msgid "GET operation failed"
 msgstr "opération GET échouée"
 
-#: src/util/virterror.c:788
+#: src/util/virterror.c:819
 #, c-format
 msgid "POST operation failed: %s"
 msgstr "opération POST échouée : %s"
 
-#: src/util/virterror.c:790
+#: src/util/virterror.c:821
 msgid "POST operation failed"
 msgstr "opération POST échouée"
 
-#: src/util/virterror.c:793
+#: src/util/virterror.c:824
 #, c-format
 msgid "got unknown HTTP error code %d"
 msgstr "réception d'un code d'erreur HTTP %d inconnu"
 
-#: src/util/virterror.c:797
+#: src/util/virterror.c:828
 #, c-format
 msgid "unknown host %s"
 msgstr "hôte %s inconnu"
 
-#: src/util/virterror.c:799
+#: src/util/virterror.c:830
 msgid "unknown host"
 msgstr "hôte inconnu"
 
-#: src/util/virterror.c:803
+#: src/util/virterror.c:834
 #, c-format
 msgid "failed to serialize S-Expr: %s"
 msgstr "impossible de sérialiser S-Expr : %s"
 
-#: src/util/virterror.c:805
+#: src/util/virterror.c:836
 msgid "failed to serialize S-Expr"
 msgstr "impossible de sérialiser S-Expr"
 
-#: src/util/virterror.c:809
+#: src/util/virterror.c:840
 msgid "could not use Xen hypervisor entry"
 msgstr "impossible d'utiliser l'entrée de l'hyperviseur Xen"
 
-#: src/util/virterror.c:811
+#: src/util/virterror.c:842
 #, c-format
 msgid "could not use Xen hypervisor entry %s"
 msgstr "impossible d'utiliser l'entrée de l'hyperviseur Xen %s"
 
-#: src/util/virterror.c:815
+#: src/util/virterror.c:846
 msgid "could not connect to Xen Store"
 msgstr "impossible de se connecter au magasin Xen"
 
-#: src/util/virterror.c:817
+#: src/util/virterror.c:848
 #, c-format
 msgid "could not connect to Xen Store %s"
 msgstr "impossible de se connecter au magasin Xen %s"
 
-#: src/util/virterror.c:820
+#: src/util/virterror.c:851
 #, c-format
 msgid "failed Xen syscall %s"
 msgstr ""
 
-#: src/util/virterror.c:824
+#: src/util/virterror.c:855
 msgid "unknown OS type"
 msgstr "type de SE inconnu"
 
-#: src/util/virterror.c:826
+#: src/util/virterror.c:857
 #, c-format
 msgid "unknown OS type %s"
 msgstr "type de SE inconnu %s"
 
-#: src/util/virterror.c:829
+#: src/util/virterror.c:860
 msgid "missing kernel information"
 msgstr "noyau non spécifié"
 
-#: src/util/virterror.c:833
+#: src/util/virterror.c:864
 msgid "missing root device information"
 msgstr "périphérique racine non spécifié"
 
-#: src/util/virterror.c:835
+#: src/util/virterror.c:866
 #, c-format
 msgid "missing root device information in %s"
 msgstr "périphérique racine non spécifié dans %s"
 
-#: src/util/virterror.c:839
+#: src/util/virterror.c:870
 msgid "missing source information for device"
 msgstr "source non spécifiée pour le périphérique"
 
-#: src/util/virterror.c:841
+#: src/util/virterror.c:872
 #, c-format
 msgid "missing source information for device %s"
 msgstr "source non spécifiée pour le périphérique %s"
 
-#: src/util/virterror.c:845
+#: src/util/virterror.c:876
 msgid "missing target information for device"
 msgstr "cible non spécifiée pour le périphérique"
 
-#: src/util/virterror.c:847
+#: src/util/virterror.c:878
 #, c-format
 msgid "missing target information for device %s"
 msgstr "cible non spécifiée pour le périphérique %s"
 
-#: src/util/virterror.c:851
+#: src/util/virterror.c:882
 msgid "missing domain name information"
 msgstr "nom de domaine non spécifié"
 
-#: src/util/virterror.c:853
+#: src/util/virterror.c:884
 #, c-format
 msgid "missing domain name information in %s"
 msgstr "nom de domaine non spécifié dans %s"
 
-#: src/util/virterror.c:857
+#: src/util/virterror.c:888
 msgid "missing operating system information"
 msgstr "système d'exploitation non spécifié"
 
-#: src/util/virterror.c:859
+#: src/util/virterror.c:890
 #, c-format
 msgid "missing operating system information for %s"
 msgstr "système d'exploitation non spécifié pour %s"
 
-#: src/util/virterror.c:863
+#: src/util/virterror.c:894
 msgid "missing devices information"
 msgstr "périphériques non spécifiés"
 
-#: src/util/virterror.c:865
+#: src/util/virterror.c:896
 #, c-format
 msgid "missing devices information for %s"
 msgstr "périphériques non spécifiés pour %s"
 
-#: src/util/virterror.c:869
+#: src/util/virterror.c:900
 msgid "too many drivers registered"
 msgstr "trop de pilotes enregistrés"
 
-#: src/util/virterror.c:871
+#: src/util/virterror.c:902
 #, c-format
 msgid "too many drivers registered in %s"
 msgstr "trop de pilotes enregistrés dans %s"
 
-#: src/util/virterror.c:875
+#: src/util/virterror.c:906
 msgid "library call failed, possibly not supported"
 msgstr "échec de l'appel de la bibliothèque, elle n'est peut être pas gérée"
 
-#: src/util/virterror.c:877
+#: src/util/virterror.c:908
 #, c-format
 msgid "library call %s failed, possibly not supported"
 msgstr ""
 "échec de l'appel de la bibliothèque %s, elle n'est peut être pas gérée"
 
-#: src/util/virterror.c:909
+#: src/util/virterror.c:912
 msgid "XML description is invalid or not well formed"
 msgstr ""
 
-#: src/util/virterror.c:911
+#: src/util/virterror.c:914
 #, c-format
 msgid "XML error: %s"
 msgstr ""
 
-#: src/util/virterror.c:887
+#: src/util/virterror.c:918
 msgid "this domain exists already"
 msgstr "ce domaine existe déjà"
 
-#: src/util/virterror.c:889
+#: src/util/virterror.c:920
 #, c-format
 msgid "domain %s exists already"
 msgstr "le domaine %s existe déjà"
 
-#: src/util/virterror.c:893
+#: src/util/virterror.c:924
 msgid "operation forbidden for read only access"
 msgstr "opération interdite pour l'accès en lecture seule"
 
-#: src/util/virterror.c:895
+#: src/util/virterror.c:926
 #, c-format
 msgid "operation %s forbidden for read only access"
 msgstr "opération %s interdite pour l'accès en lecture seule"
 
-#: src/util/virterror.c:899
+#: src/util/virterror.c:930
 msgid "failed to open configuration file for reading"
 msgstr "impossible d'ouvrir le fichier pour la lecture de la configuration"
 
-#: src/util/virterror.c:901
+#: src/util/virterror.c:932
 #, c-format
 msgid "failed to open %s for reading"
 msgstr "impossible d'ouvrir %s en lecture"
 
-#: src/util/virterror.c:905
+#: src/util/virterror.c:936
 msgid "failed to read configuration file"
 msgstr "impossible de lire le fichier de configuration"
 
-#: src/util/virterror.c:907
+#: src/util/virterror.c:938
 #, c-format
 msgid "failed to read configuration file %s"
 msgstr "impossible de lire le fichier de configuration %s"
 
-#: src/util/virterror.c:911
+#: src/util/virterror.c:942
 msgid "failed to parse configuration file"
 msgstr "impossible d'analyser le fichier de configuration"
 
-#: src/util/virterror.c:913
+#: src/util/virterror.c:944
 #, c-format
 msgid "failed to parse configuration file %s"
 msgstr "impossible d'analyser le fichier de configuration %s"
 
-#: src/util/virterror.c:917
+#: src/util/virterror.c:948
 msgid "configuration file syntax error"
 msgstr "erreur de syntaxe dans le fichier de configuration"
 
-#: src/util/virterror.c:919
+#: src/util/virterror.c:950
 #, c-format
 msgid "configuration file syntax error: %s"
 msgstr "erreur de syntaxe dans le fichier de configuration : %s"
 
-#: src/util/virterror.c:923
+#: src/util/virterror.c:954
 msgid "failed to write configuration file"
 msgstr "impossible d'écrire le fichier de configuration"
 
-#: src/util/virterror.c:925
+#: src/util/virterror.c:956
 #, c-format
 msgid "failed to write configuration file: %s"
 msgstr "impossible d'écrire le fichier de configuration : %s"
 
-#: src/util/virterror.c:929
+#: src/util/virterror.c:960
 msgid "parser error"
 msgstr "erreur de l'analyseur"
 
-#: src/util/virterror.c:935
+#: src/util/virterror.c:966
 msgid "invalid network pointer in"
 msgstr "pointeur de réseau invalide dans"
 
-#: src/util/virterror.c:937
+#: src/util/virterror.c:968
 #, c-format
 msgid "invalid network pointer in %s"
 msgstr "pointeur de réseau invalide dans %s"
 
-#: src/util/virterror.c:941
+#: src/util/virterror.c:972
 msgid "this network exists already"
 msgstr "ce domaine existe déjà"
 
-#: src/util/virterror.c:943
+#: src/util/virterror.c:974
 #, c-format
 msgid "network %s exists already"
 msgstr "le domaine %s existe déjà"
 
-#: src/util/virterror.c:947
+#: src/util/virterror.c:978
 msgid "system call error"
 msgstr "erreur lors de l'appel système"
 
-#: src/util/virterror.c:953
+#: src/util/virterror.c:984
 msgid "RPC error"
 msgstr "erreur RPC"
 
-#: src/util/virterror.c:959
+#: src/util/virterror.c:990
 msgid "GNUTLS call error"
 msgstr "erreur lors de l'appel système GNUTLS"
 
-#: src/util/virterror.c:965
+#: src/util/virterror.c:996
 msgid "Failed to find the network"
 msgstr "Impossible d'accéder au réseau"
 
-#: src/util/virterror.c:967
+#: src/util/virterror.c:998
 #, c-format
 msgid "Failed to find the network: %s"
 msgstr "Impossible d'accéder au réseau : %s"
 
-#: src/util/virterror.c:971
+#: src/util/virterror.c:1002
 msgid "Domain not found"
 msgstr "Domaine non trouvé"
 
-#: src/util/virterror.c:973
+#: src/util/virterror.c:1004
 #, c-format
 msgid "Domain not found: %s"
 msgstr "Domaine non trouvé : %s"
 
-#: src/util/virterror.c:977
+#: src/util/virterror.c:1008
 msgid "Network not found"
 msgstr "Réseau non trouvé"
 
-#: src/util/virterror.c:979
+#: src/util/virterror.c:1010
 #, c-format
 msgid "Network not found: %s"
 msgstr "Réseau non trouvé : %s"
 
-#: src/util/virterror.c:983
+#: src/util/virterror.c:1014
 msgid "invalid MAC address"
 msgstr "adresse MAC invalide"
 
-#: src/util/virterror.c:985
+#: src/util/virterror.c:1016
 #, c-format
 msgid "invalid MAC address: %s"
 msgstr "adresse MAC invalide : %s"
 
-#: src/util/virterror.c:991
+#: src/util/virterror.c:1022
 #, c-format
 msgid "authentication failed: %s"
 msgstr "l'authentification a échoué : %s"
 
-#: src/util/virterror.c:995
+#: src/util/virterror.c:1026
 msgid "Storage pool not found"
 msgstr "Pool de stockage introuvable"
 
-#: src/util/virterror.c:997
+#: src/util/virterror.c:1028
 #, c-format
 msgid "Storage pool not found: %s"
 msgstr "Pool de stockage introuvable : %s"
 
-#: src/util/virterror.c:1001
+#: src/util/virterror.c:1032
 msgid "Storage volume not found"
 msgstr "Volume de stockage introuvable"
 
-#: src/util/virterror.c:1003
+#: src/util/virterror.c:1034
 #, c-format
 msgid "Storage volume not found: %s"
 msgstr "Volume de stockage introuvable : %s"
 
-#: src/util/virterror.c:1035
+#: src/util/virterror.c:1038
 msgid "Storage pool probe failed"
 msgstr ""
 
-#: src/util/virterror.c:1037
+#: src/util/virterror.c:1040
 #, c-format
 msgid "Storage pool probe failed: %s"
 msgstr ""
 
-#: src/util/virterror.c:1041
+#: src/util/virterror.c:1044
 msgid "Storage pool already built"
 msgstr ""
 
-#: src/util/virterror.c:1043
+#: src/util/virterror.c:1046
 #, c-format
 msgid "Storage pool already built: %s"
 msgstr ""
 
-#: src/util/virterror.c:1007
+#: src/util/virterror.c:1050
 msgid "invalid storage pool pointer in"
 msgstr "pointeur de pool de stockage invalide dans"
 
-#: src/util/virterror.c:1009
+#: src/util/virterror.c:1052
 #, c-format
 msgid "invalid storage pool pointer in %s"
 msgstr "pointeur de pool de stockage invalide dans %s"
 
-#: src/util/virterror.c:1013
+#: src/util/virterror.c:1056
 msgid "invalid storage volume pointer in"
 msgstr "pointeur de volume de stockage invalide dans"
 
-#: src/util/virterror.c:1015
+#: src/util/virterror.c:1058
 #, c-format
 msgid "invalid storage volume pointer in %s"
 msgstr "pointeur de volume de stockage invalide dans %s"
 
-#: src/util/virterror.c:1019
+#: src/util/virterror.c:1062
 msgid "Failed to find a storage driver"
 msgstr "Impossible de trouver un lecteur de stockage"
 
-#: src/util/virterror.c:1021
+#: src/util/virterror.c:1064
 #, c-format
 msgid "Failed to find a storage driver: %s"
 msgstr "Impossible de trouver un lecteur de stockage : %s"
 
-#: src/util/virterror.c:1025
+#: src/util/virterror.c:1068
 msgid "Failed to find a node driver"
 msgstr ""
 
-#: src/util/virterror.c:1027
+#: src/util/virterror.c:1070
 #, c-format
 msgid "Failed to find a node driver: %s"
 msgstr ""
 
-#: src/util/virterror.c:1031
+#: src/util/virterror.c:1074
 msgid "invalid node device pointer"
 msgstr ""
 
-#: src/util/virterror.c:1033
+#: src/util/virterror.c:1076
 #, c-format
 msgid "invalid node device pointer in %s"
 msgstr ""
 
-#: src/util/virterror.c:1037
+#: src/util/virterror.c:1080
 msgid "Node device not found"
 msgstr ""
 
-#: src/util/virterror.c:1039
+#: src/util/virterror.c:1082
 #, c-format
 msgid "Node device not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1043
+#: src/util/virterror.c:1086
 msgid "Security model not found"
 msgstr ""
 
-#: src/util/virterror.c:1045
+#: src/util/virterror.c:1088
 #, c-format
 msgid "Security model not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1049
+#: src/util/virterror.c:1092
 msgid "Requested operation is not valid"
 msgstr ""
 
-#: src/util/virterror.c:1051
+#: src/util/virterror.c:1094
 #, c-format
 msgid "Requested operation is not valid: %s"
 msgstr ""
 
-#: src/util/virterror.c:1055
+#: src/util/virterror.c:1098
 msgid "Failed to find the interface"
 msgstr ""
 
-#: src/util/virterror.c:1057
+#: src/util/virterror.c:1100
 #, c-format
 msgid "Failed to find the interface: %s"
 msgstr ""
 
-#: src/util/virterror.c:1061
+#: src/util/virterror.c:1104
 msgid "Interface not found"
 msgstr ""
 
-#: src/util/virterror.c:1063
+#: src/util/virterror.c:1106
 #, c-format
 msgid "Interface not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1067
+#: src/util/virterror.c:1110
 msgid "invalid interface pointer in"
 msgstr ""
 
-#: src/util/virterror.c:1069
+#: src/util/virterror.c:1112
 #, c-format
 msgid "invalid interface pointer in %s"
 msgstr ""
 
-#: src/util/virterror.c:1073
+#: src/util/virterror.c:1116
 msgid "multiple matching interfaces found"
 msgstr ""
 
-#: src/util/virterror.c:1075
+#: src/util/virterror.c:1118
 #, c-format
 msgid "multiple matching interfaces found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1079
+#: src/util/virterror.c:1122
 msgid "Failed to find a secret storage driver"
 msgstr ""
 
-#: src/util/virterror.c:1081
+#: src/util/virterror.c:1124
 #, c-format
 msgid "Failed to find a secret storage driver: %s"
 msgstr ""
 
-#: src/util/virterror.c:1085
+#: src/util/virterror.c:1128
 msgid "Invalid secret"
 msgstr ""
 
-#: src/util/virterror.c:1087
+#: src/util/virterror.c:1130
 #, c-format
 msgid "Invalid secret: %s"
 msgstr ""
 
-#: src/util/virterror.c:1091
+#: src/util/virterror.c:1134
 msgid "Secret not found"
 msgstr ""
 
-#: src/util/virterror.c:1093
+#: src/util/virterror.c:1136
 #, c-format
 msgid "Secret not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1137
+#: src/util/virterror.c:1140
 msgid "Failed to start the nwfilter driver"
 msgstr ""
 
-#: src/util/virterror.c:1139
+#: src/util/virterror.c:1142
 #, c-format
 msgid "Failed to start the nwfilter driver: %s"
 msgstr ""
 
-#: src/util/virterror.c:1143
+#: src/util/virterror.c:1146
 msgid "Invalid network filter"
 msgstr ""
 
-#: src/util/virterror.c:1145
+#: src/util/virterror.c:1148
 #, c-format
 msgid "Invalid network filter: %s"
 msgstr ""
 
-#: src/util/virterror.c:1149
+#: src/util/virterror.c:1152
 msgid "Network filter not found"
 msgstr ""
 
-#: src/util/virterror.c:1151
+#: src/util/virterror.c:1154
 #, c-format
 msgid "Network filter not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1155
+#: src/util/virterror.c:1158
 msgid "Error while building firewall"
 msgstr ""
 
-#: src/util/virterror.c:1157
+#: src/util/virterror.c:1160
 #, c-format
 msgid "Error while building firewall: %s"
 msgstr ""
 
-#: src/util/virterror.c:1097
+#: src/util/virterror.c:1164
 msgid "unsupported configuration"
 msgstr ""
 
-#: src/util/virterror.c:1099
+#: src/util/virterror.c:1166
 #, c-format
 msgid "unsupported configuration: %s"
 msgstr ""
 
-#: src/util/virterror.c:1103
+#: src/util/virterror.c:1170
 msgid "Timed out during operation"
 msgstr ""
 
-#: src/util/virterror.c:1105
+#: src/util/virterror.c:1172
 #, c-format
 msgid "Timed out during operation: %s"
 msgstr ""
 
-#: src/util/virterror.c:1109
+#: src/util/virterror.c:1176
 msgid "Failed to make domain persistent after migration"
 msgstr ""
 
-#: src/util/virterror.c:1111
+#: src/util/virterror.c:1178
 #, c-format
 msgid "Failed to make domain persistent after migration: %s"
 msgstr ""
 
-#: src/util/virterror.c:1179
+#: src/util/virterror.c:1182
 msgid "Hook script execution failed"
 msgstr ""
 
-#: src/util/virterror.c:1181
+#: src/util/virterror.c:1184
 #, c-format
 msgid "Hook script execution failed: %s"
 msgstr ""
 
-#: src/util/virterror.c:1185
+#: src/util/virterror.c:1188
 msgid "Invalid snapshot"
 msgstr ""
 
-#: src/util/virterror.c:1187
+#: src/util/virterror.c:1190
 #, c-format
 msgid "Invalid snapshot: %s"
 msgstr ""
 
-#: src/util/virterror.c:1191
+#: src/util/virterror.c:1194
 msgid "Domain snapshot not found"
 msgstr ""
 
-#: src/util/virterror.c:1193
+#: src/util/virterror.c:1196
 #, c-format
 msgid "Domain snapshot not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1197
+#: src/util/virterror.c:1200
 msgid "invalid stream pointer"
 msgstr ""
 
-#: src/util/virterror.c:1199
+#: src/util/virterror.c:1202
 #, c-format
 msgid "invalid stream pointer in %s"
 msgstr ""
 
-#: src/util/virterror.c:1203
+#: src/util/virterror.c:1206
 msgid "argument unsupported"
 msgstr ""
 
-#: src/util/virterror.c:1205
+#: src/util/virterror.c:1208
 #, c-format
 msgid "argument unsupported: %s"
 msgstr ""
 
-#: src/util/virterror.c:1209
+#: src/util/virterror.c:1212
 msgid "revert requires force"
 msgstr ""
 
-#: src/util/virterror.c:1211
+#: src/util/virterror.c:1214
 #, c-format
 msgid "revert requires force: %s"
 msgstr ""
 
-#: src/util/xml.c:60
+#: src/util/virtime.c:288
+msgid "Unable to break out time format"
+msgstr ""
+
+#: src/util/virtime.c:316 src/util/virtime.c:347
+msgid "Unable to format time"
+msgstr ""
+
+#: src/util/xml.c:70
 msgid "Invalid parameter to virXPathString()"
 msgstr "Paramètre pour virXPathString() invalide"
 
@@ -16439,15 +17097,15 @@
 msgid "'%s' value longer than %zd bytes"
 msgstr ""
 
-#: src/util/xml.c:131
+#: src/util/xml.c:140
 msgid "Invalid parameter to virXPathNumber()"
 msgstr "Paramètre pour virXPathNumber() invalide"
 
-#: src/util/xml.c:161
+#: src/util/xml.c:169
 msgid "Invalid parameter to virXPathLong()"
 msgstr ""
 
-#: src/util/xml.c:248 src/util/xml.c:346
+#: src/util/xml.c:282 src/util/xml.c:406
 msgid "Invalid parameter to virXPathULong()"
 msgstr ""
 
@@ -16455,15 +17113,15 @@
 msgid "Invalid parameter to virXPathLongLong()"
 msgstr ""
 
-#: src/util/xml.c:404
+#: src/util/xml.c:517
 msgid "Invalid parameter to virXPathBoolean()"
 msgstr "Paramètre pour virXPathBoolean() invalide"
 
-#: src/util/xml.c:442
+#: src/util/xml.c:554
 msgid "Invalid parameter to virXPathNode()"
 msgstr "Paramètre pour virXPathNode() invalide"
 
-#: src/util/xml.c:483
+#: src/util/xml.c:594
 msgid "Invalid parameter to virXPathNodeSet()"
 msgstr "Paramètre pour virXPathNodeSet() invalide"
 
@@ -16486,21 +17144,11 @@
 "%s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2611 src/conf/domain_conf.c:3498
-#: src/conf/domain_conf.c:3539 src/conf/domain_conf.c:3611
-#: src/conf/interface_conf.c:937 src/conf/interface_conf.c:977
-#: src/conf/network_conf.c:560 src/conf/network_conf.c:600
-#: src/conf/node_device_conf.c:1302 src/conf/secret_conf.c:241
-#: src/conf/storage_conf.c:800 src/conf/storage_conf.c:1210
+#: src/util/xml.c:774
 msgid "missing root element"
 msgstr "élément root manquant"
 
-#: src/conf/domain_conf.c:3492 src/conf/domain_conf.c:3533
-#: src/conf/domain_conf.c:3605 src/conf/interface_conf.c:931
-#: src/conf/interface_conf.c:971 src/conf/network_conf.c:554
-#: src/conf/network_conf.c:594 src/conf/node_device_conf.c:1296
-#: src/conf/secret_conf.c:234 src/conf/storage_conf.c:793
-#: src/conf/storage_conf.c:1203
+#: src/util/xml.c:798
 msgid "failed to parse xml document"
 msgstr ""
 
@@ -16549,21 +17197,21 @@
 msgid "Calling %s from '%s' failed"
 msgstr ""
 
-#: src/vbox/vbox_driver.c:135 src/vbox/vbox_tmpl.c:788
+#: src/vbox/vbox_driver.c:166 src/vbox/vbox_tmpl.c:1001
 msgid "no VirtualBox driver path specified (try vbox:///session)"
 msgstr ""
 
-#: src/vbox/vbox_driver.c:142 src/vbox/vbox_tmpl.c:795
+#: src/vbox/vbox_driver.c:173 src/vbox/vbox_tmpl.c:1008
 #, c-format
 msgid "unknown driver path '%s' specified (try vbox:///session)"
 msgstr ""
 
-#: src/vbox/vbox_driver.c:149 src/vbox/vbox_tmpl.c:802
+#: src/vbox/vbox_driver.c:180 src/vbox/vbox_tmpl.c:1015
 #, c-format
 msgid "unknown driver path '%s' specified (try vbox:///system)"
 msgstr ""
 
-#: src/vbox/vbox_driver.c:155
+#: src/vbox/vbox_driver.c:186
 msgid "unable to initialize VirtualBox driver API"
 msgstr ""
 
@@ -16583,390 +17231,390 @@
 msgid "Cound not extract VirtualBox version"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1127
+#: src/vbox/vbox_tmpl.c:1132
 #, c-format
 msgid "Could not get list of Domains, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1164
+#: src/vbox/vbox_tmpl.c:1169
 #, c-format
 msgid "Could not get number of Domains, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1236 src/vbox/vbox_tmpl.c:1296
-#: src/vbox/vbox_tmpl.c:1366 src/vbox/vbox_tmpl.c:1440
-#: src/vbox/vbox_tmpl.c:1853 src/vbox/vbox_tmpl.c:3679
+#: src/vbox/vbox_tmpl.c:1241 src/vbox/vbox_tmpl.c:1301
+#: src/vbox/vbox_tmpl.c:1371 src/vbox/vbox_tmpl.c:1445
+#: src/vbox/vbox_tmpl.c:1858 src/vbox/vbox_tmpl.c:3684
 #, c-format
 msgid "Could not get list of machines, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1536
+#: src/vbox/vbox_tmpl.c:1541
 msgid "error while suspending the domain"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1542
+#: src/vbox/vbox_tmpl.c:1547
 msgid "machine not in running state to suspend it"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1588
+#: src/vbox/vbox_tmpl.c:1593
 msgid "error while resuming the domain"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1594
+#: src/vbox/vbox_tmpl.c:1599
 msgid "machine not paused, so can't resume it"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1631
+#: src/vbox/vbox_tmpl.c:1636
 msgid "machine paused, so can't power it down"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1635 src/vbox/vbox_tmpl.c:1735
+#: src/vbox/vbox_tmpl.c:1640 src/vbox/vbox_tmpl.c:1740
 msgid "machine already powered down"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1693
+#: src/vbox/vbox_tmpl.c:1698
 msgid "machine not running, so can't reboot it"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1811
+#: src/vbox/vbox_tmpl.c:1816
 msgid "memory size can't be changed unless domain is powered down"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1827 src/vbox/vbox_tmpl.c:5042
+#: src/vbox/vbox_tmpl.c:1832 src/vbox/vbox_tmpl.c:5047
 #, c-format
 msgid "could not set the memory size of the domain to: %lu Kb, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1964 src/vbox/vbox_tmpl.c:5891
-#: src/vbox/vbox_tmpl.c:5993 src/vbox/vbox_tmpl.c:6098
-#: src/vbox/vbox_tmpl.c:6149 src/vbox/vbox_tmpl.c:6238
-#: src/vbox/vbox_tmpl.c:6270 src/vbox/vbox_tmpl.c:6312
-#: src/vbox/vbox_tmpl.c:6376 src/vbox/vbox_tmpl.c:6544
-#: src/vbox/vbox_tmpl.c:6702
+#: src/vbox/vbox_tmpl.c:1969 src/vbox/vbox_tmpl.c:5896
+#: src/vbox/vbox_tmpl.c:5998 src/vbox/vbox_tmpl.c:6103
+#: src/vbox/vbox_tmpl.c:6154 src/vbox/vbox_tmpl.c:6243
+#: src/vbox/vbox_tmpl.c:6275 src/vbox/vbox_tmpl.c:6317
+#: src/vbox/vbox_tmpl.c:6381 src/vbox/vbox_tmpl.c:6549
+#: src/vbox/vbox_tmpl.c:6707
 msgid "no domain with matching UUID"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:2101
+#: src/vbox/vbox_tmpl.c:2106
 #, c-format
 msgid "could not set the number of cpus of the domain to: %u, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:2112
+#: src/vbox/vbox_tmpl.c:2117
 #, c-format
 msgid "can't open session to the domain with id %d"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:2765
+#: src/vbox/vbox_tmpl.c:2770
 #, c-format
 msgid ""
 "Could not generate medium name for the disk at: controller instance:%u, "
 "port:%d, slot:%d"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3405
+#: src/vbox/vbox_tmpl.c:3410
 #, c-format
 msgid "Could not get list of Defined Domains, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3455
+#: src/vbox/vbox_tmpl.c:3460
 #, c-format
 msgid "Could not get number of Defined Domains, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3625
+#: src/vbox/vbox_tmpl.c:3630
 msgid "OpenRemoteSession/LaunchVMProcess failed, domain can't be started"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3672
+#: src/vbox/vbox_tmpl.c:3677
 msgid "Error while reading the domain name"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3709
+#: src/vbox/vbox_tmpl.c:3714
 msgid "machine is not in poweroff|saved|aborted state, so couldn't start it"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3842 src/vbox/vbox_tmpl.c:5393
+#: src/vbox/vbox_tmpl.c:3847 src/vbox/vbox_tmpl.c:5398
 #, c-format
 msgid "can't get the uuid of the file to be attached to cdrom: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3849 src/vbox/vbox_tmpl.c:5402
+#: src/vbox/vbox_tmpl.c:3854 src/vbox/vbox_tmpl.c:5407
 #, c-format
 msgid "could not attach the file to cdrom: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3906
+#: src/vbox/vbox_tmpl.c:3911
 #, c-format
 msgid ""
 "can't get the uuid of the file to be attached as harddisk: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3952
+#: src/vbox/vbox_tmpl.c:3957
 #, c-format
 msgid "could not attach the file as harddisk: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3998 src/vbox/vbox_tmpl.c:5446
+#: src/vbox/vbox_tmpl.c:4003 src/vbox/vbox_tmpl.c:5451
 #, c-format
 msgid ""
 "can't get the uuid of the file to be attached to floppy drive: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:4006 src/vbox/vbox_tmpl.c:5453
+#: src/vbox/vbox_tmpl.c:4011 src/vbox/vbox_tmpl.c:5458
 #, c-format
 msgid "could not attach the file to floppy drive: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:4186
+#: src/vbox/vbox_tmpl.c:4191
 #, c-format
 msgid ""
 "Failed to attach the following disk/dvd/floppy to the machine: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:4196
+#: src/vbox/vbox_tmpl.c:4201
 #, c-format
 msgid ""
 "can't get the uuid of the file to be attached as harddisk/dvd/floppy: %s, "
 "rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:4237
+#: src/vbox/vbox_tmpl.c:4242
 #, c-format
 msgid ""
 "can't get the port/slot number of harddisk/dvd/floppy to be attached: %s, "
 "rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:4260
+#: src/vbox/vbox_tmpl.c:4265
 #, c-format
 msgid "could not attach the file as harddisk/dvd/floppy: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5034 src/vbox/vbox_tmpl.c:5102
+#: src/vbox/vbox_tmpl.c:5039 src/vbox/vbox_tmpl.c:5107
 #, c-format
 msgid "could not define a domain, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5054
+#: src/vbox/vbox_tmpl.c:5059
 #, c-format
 msgid "could not set the number of virtual CPUs to: %u, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5072
+#: src/vbox/vbox_tmpl.c:5077
 #, c-format
 msgid "could not change PAE status to: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5074 src/vbox/vbox_tmpl.c:5085
-#: src/vbox/vbox_tmpl.c:5093
+#: src/vbox/vbox_tmpl.c:5079 src/vbox/vbox_tmpl.c:5090
+#: src/vbox/vbox_tmpl.c:5098
 msgid "Enabled"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5074 src/vbox/vbox_tmpl.c:5085
-#: src/vbox/vbox_tmpl.c:5093
+#: src/vbox/vbox_tmpl.c:5079 src/vbox/vbox_tmpl.c:5090
+#: src/vbox/vbox_tmpl.c:5098
 msgid "Disabled"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5083
+#: src/vbox/vbox_tmpl.c:5088
 #, c-format
 msgid "could not change ACPI status to: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5091
+#: src/vbox/vbox_tmpl.c:5096
 #, c-format
 msgid "could not change APIC status to: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5298
+#: src/vbox/vbox_tmpl.c:5303
 #, c-format
 msgid "could not delete the domain, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5498
+#: src/vbox/vbox_tmpl.c:5503
 #, c-format
 msgid "could not attach shared folder '%s', rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5618
+#: src/vbox/vbox_tmpl.c:5623
 #, c-format
 msgid "could not de-attach the mounted ISO, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5639
+#: src/vbox/vbox_tmpl.c:5644
 #, c-format
 msgid "could not attach the file to floppy drive, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5674
+#: src/vbox/vbox_tmpl.c:5679
 #, c-format
 msgid "could not detach shared folder '%s', rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5726 src/vbox/vbox_tmpl.c:6111
+#: src/vbox/vbox_tmpl.c:5731 src/vbox/vbox_tmpl.c:6116
 #, c-format
 msgid "could not get snapshot count for domain %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5746 src/vbox/vbox_tmpl.c:6172
+#: src/vbox/vbox_tmpl.c:5751 src/vbox/vbox_tmpl.c:6177
 #, c-format
 msgid "could not get root snapshot for domain %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5759
+#: src/vbox/vbox_tmpl.c:5764
 #, c-format
 msgid "unexpected number of snapshots < %u"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5767 src/vbox/vbox_tmpl.c:6666
+#: src/vbox/vbox_tmpl.c:5772 src/vbox/vbox_tmpl.c:6671
 msgid "could not get children snapshots"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5776
+#: src/vbox/vbox_tmpl.c:5781
 #, c-format
 msgid "unexpected number of snapshots > %u"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5822 src/vbox/vbox_tmpl.c:6192
+#: src/vbox/vbox_tmpl.c:5827 src/vbox/vbox_tmpl.c:6197
 msgid "could not get snapshot name"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5837
+#: src/vbox/vbox_tmpl.c:5842
 #, c-format
 msgid "domain %s has no snapshots with name %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5898 src/vbox/vbox_tmpl.c:6471
-#: src/vbox/vbox_tmpl.c:6571 src/vbox/vbox_tmpl.c:6713
+#: src/vbox/vbox_tmpl.c:5903 src/vbox/vbox_tmpl.c:6476
+#: src/vbox/vbox_tmpl.c:6576 src/vbox/vbox_tmpl.c:6718
 msgid "could not get domain state"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5913 src/vbox/vbox_tmpl.c:6487
-#: src/vbox/vbox_tmpl.c:6736
+#: src/vbox/vbox_tmpl.c:5918 src/vbox/vbox_tmpl.c:6492
+#: src/vbox/vbox_tmpl.c:6741
 #, c-format
 msgid "could not open VirtualBox session with domain %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5935 src/vbox/vbox_tmpl.c:5943
+#: src/vbox/vbox_tmpl.c:5940 src/vbox/vbox_tmpl.c:5948
 #, c-format
 msgid "could not take snapshot of domain %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5950 src/vbox/vbox_tmpl.c:6563
+#: src/vbox/vbox_tmpl.c:5955 src/vbox/vbox_tmpl.c:6568
 #, c-format
 msgid "could not get current snapshot of domain %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6007
+#: src/vbox/vbox_tmpl.c:6012
 #, c-format
 msgid "could not get description of snapshot %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6023
+#: src/vbox/vbox_tmpl.c:6028
 #, c-format
 msgid "could not get creation time of snapshot %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6033 src/vbox/vbox_tmpl.c:6322
+#: src/vbox/vbox_tmpl.c:6038 src/vbox/vbox_tmpl.c:6327
 #, c-format
 msgid "could not get parent of snapshot %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6041 src/vbox/vbox_tmpl.c:6336
+#: src/vbox/vbox_tmpl.c:6046 src/vbox/vbox_tmpl.c:6341
 #, c-format
 msgid "could not get name of parent of snapshot %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6056 src/vbox/vbox_tmpl.c:6555
+#: src/vbox/vbox_tmpl.c:6061 src/vbox/vbox_tmpl.c:6560
 #, c-format
 msgid "could not get online state of snapshot %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6277 src/vbox/vbox_tmpl.c:6383
+#: src/vbox/vbox_tmpl.c:6282 src/vbox/vbox_tmpl.c:6388
 msgid "could not get current snapshot"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6389
+#: src/vbox/vbox_tmpl.c:6394
 msgid "domain has no snapshots"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6396
+#: src/vbox/vbox_tmpl.c:6401
 msgid "could not get current snapshot name"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6430 src/vbox/vbox_tmpl.c:6617
+#: src/vbox/vbox_tmpl.c:6435 src/vbox/vbox_tmpl.c:6622
 msgid "could not get snapshot UUID"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6437 src/vbox/vbox_tmpl.c:6499
-#: src/vbox/vbox_tmpl.c:6509
+#: src/vbox/vbox_tmpl.c:6442 src/vbox/vbox_tmpl.c:6504
+#: src/vbox/vbox_tmpl.c:6514
 #, c-format
 msgid "could not restore snapshot for domain %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6464
+#: src/vbox/vbox_tmpl.c:6469
 msgid "could not get domain UUID"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6478
+#: src/vbox/vbox_tmpl.c:6483
 #, c-format
 msgid "domain %s is already running"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6496
+#: src/vbox/vbox_tmpl.c:6501
 msgid "cannot restore domain snapshot for running domain"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6578
+#: src/vbox/vbox_tmpl.c:6583
 msgid "cannot revert snapshot of running domain"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6629
+#: src/vbox/vbox_tmpl.c:6634
 msgid "cannot delete domain snapshot for running domain"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6632 src/vbox/vbox_tmpl.c:6641
+#: src/vbox/vbox_tmpl.c:6637 src/vbox/vbox_tmpl.c:6646
 msgid "could not delete snapshot"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6727
+#: src/vbox/vbox_tmpl.c:6732
 msgid "cannot delete snapshots of running domain"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:8238
+#: src/vbox/vbox_tmpl.c:8243
 #, c-format
 msgid "could not get number of volumes in the pool: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:8290
+#: src/vbox/vbox_tmpl.c:8295
 #, c-format
 msgid "could not get the volume list in the pool: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:8372 src/vbox/vbox_tmpl.c:8603
-#: src/vbox/vbox_tmpl.c:8772 src/vbox/vbox_tmpl.c:8842
-#: src/vbox/vbox_tmpl.c:8949
+#: src/vbox/vbox_tmpl.c:8377 src/vbox/vbox_tmpl.c:8608
+#: src/vbox/vbox_tmpl.c:8777 src/vbox/vbox_tmpl.c:8847
+#: src/vbox/vbox_tmpl.c:8954
 #, c-format
 msgid "Could not parse UUID from '%s'"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:9024
+#: src/vbox/vbox_tmpl.c:9029
 msgid "unable to get monitor count"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:9030
+#: src/vbox/vbox_tmpl.c:9035
 #, c-format
 msgid "screen ID higher than monitor count (%d)"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:9069
+#: src/vbox/vbox_tmpl.c:9074
 msgid "unable to get screen resolution"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:9079
+#: src/vbox/vbox_tmpl.c:9084
 msgid "failed to take screenshot"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:9085
+#: src/vbox/vbox_tmpl.c:9090
 #, c-format
 msgid "unable to write data to '%s'"
 msgstr ""
@@ -17493,7 +18141,7 @@
 #: src/vmx/vmx.c:3516
 #, c-format
 msgid ""
-"Expecting domain XML entry 'devices/interfase/model' to be 'vlance' or "
+"Expecting domain XML entry 'devices/interface/model' to be 'vlance' or "
 "'vmxnet' or 'vmxnet2' or 'vmxnet3' or 'e1000' but found '%s'"
 msgstr ""
 
@@ -17567,118 +18215,118 @@
 msgid "unsupported path, use xvdN, hdN, or sdN for domain %d"
 msgstr ""
 
-#: src/xen/xen_driver.c:1319
+#: src/xen/xen_driver.c:1425
 msgid "failed to get XML representation of migrated domain"
 msgstr ""
 
-#: src/xen/xen_driver.c:1326
+#: src/xen/xen_driver.c:1432
 msgid "failed to define domain on destination host"
 msgstr ""
 
-#: src/xen/xen_driver.c:2072
+#: src/xen/xen_driver.c:2080
 #, c-format
 msgid "Device %s has been assigned to guest %d"
 msgstr ""
 
-#: src/xen/xen_driver.c:2131
+#: src/xen/xen_driver.c:2139
 msgid "Named device aliases are not supported"
 msgstr ""
 
-#: src/xen/xen_driver.c:2146
+#: src/xen/xen_driver.c:2154
 msgid "cannot find default console device"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:1340
+#: src/xen/xen_hypervisor.c:1409
 #, c-format
 msgid "Credit scheduler weight parameter (%d) is out of range (1-65535)"
 msgstr ""
 "Le paramètre « poids » (%d) du planificateur à répartition de charge est "
 "hors limites (1-65535)"
 
-#: src/xen/xen_hypervisor.c:1417
+#: src/xen/xen_hypervisor.c:1418
 #, c-format
 msgid "Credit scheduler cap parameter (%d) is out of range (0-65534)"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:2313
+#: src/xen/xen_hypervisor.c:2444
 msgid "could not read CPU flags"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:2595 src/xen/xen_hypervisor.c:2606
+#: src/xen/xen_hypervisor.c:2725 src/xen/xen_hypervisor.c:2736
 #, c-format
 msgid "cannot read file %s"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:2775 src/xen/xen_hypervisor.c:3433
+#: src/xen/xen_hypervisor.c:2905 src/xen/xen_hypervisor.c:3598
 msgid "domain shut off or invalid"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:2783
+#: src/xen/xen_hypervisor.c:2913
 msgid "unsupported in dom interface < 4"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:2791 src/xen/xen_hypervisor.c:2797
-#: src/xen/xen_hypervisor.c:3448
+#: src/xen/xen_hypervisor.c:2921 src/xen/xen_hypervisor.c:2927
+#: src/xen/xen_hypervisor.c:3613
 msgid "cannot get domain details"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:3465 src/xen/xen_hypervisor.c:3473
+#: src/xen/xen_hypervisor.c:3630 src/xen/xen_hypervisor.c:3638
 msgid "cannot get VCPUs info"
 msgstr ""
 
-#: src/xen/xen_inotify.c:131 src/xen/xen_inotify.c:207
+#: src/xen/xen_inotify.c:95 src/xen/xen_inotify.c:171
 #, c-format
 msgid "parsing uuid %s"
 msgstr ""
 
-#: src/xen/xen_inotify.c:156
+#: src/xen/xen_inotify.c:120
 msgid "finding dom on config list"
 msgstr ""
 
-#: src/xen/xen_inotify.c:243
+#: src/xen/xen_inotify.c:207
 msgid "Error looking up domain"
 msgstr ""
 
-#: src/xen/xen_inotify.c:250 src/xen/xen_inotify.c:343
-#: src/xen/xen_inotify.c:350
+#: src/xen/xen_inotify.c:214 src/xen/xen_inotify.c:307
+#: src/xen/xen_inotify.c:314
 msgid "Error adding file to config cache"
 msgstr ""
 
-#: src/xen/xen_inotify.c:296
+#: src/xen/xen_inotify.c:260
 msgid "conn, or private data is NULL"
 msgstr ""
 
-#: src/xen/xen_inotify.c:339 src/xen/xen_inotify.c:362
+#: src/xen/xen_inotify.c:303 src/xen/xen_inotify.c:326
 msgid "looking up dom"
 msgstr ""
 
-#: src/xen/xen_inotify.c:407
+#: src/xen/xen_inotify.c:373
 #, c-format
 msgid "cannot open directory: %s"
 msgstr ""
 
-#: src/xen/xen_inotify.c:425
+#: src/xen/xen_inotify.c:389
 msgid "Error adding file to config list"
 msgstr ""
 
-#: src/xen/xen_inotify.c:435
+#: src/xen/xen_inotify.c:402
 msgid "initializing inotify"
 msgstr ""
 
-#: src/xen/xen_inotify.c:446
+#: src/xen/xen_inotify.c:413
 #, c-format
 msgid "adding watch on %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:128
+#: src/xen/xend_internal.c:93
 msgid "failed to create a socket"
 msgstr "impossible de créer un socket"
 
-#: src/xen/xend_internal.c:151
+#: src/xen/xend_internal.c:113
 msgid "failed to connect to xend"
 msgstr "impossible de se connecter à Xen"
 
-#: src/xen/xend_internal.c:198 src/xen/xend_internal.c:201
+#: src/xen/xend_internal.c:160
 msgid "failed to read from Xen Daemon"
 msgstr "impossible de lire depuis le démon Xen"
 
@@ -17691,56 +18339,56 @@
 msgid "Xend returned HTTP Content-Length of %d, which exceeds maximum of %d"
 msgstr ""
 
-#: src/xen/xend_internal.c:389
+#: src/xen/xend_internal.c:367
 #, c-format
 msgid "%d status from xen daemon: %s:%s"
 msgstr ""
 
-#: src/xen/xend_internal.c:440 src/xen/xend_internal.c:443
-#: src/xen/xend_internal.c:451
+#: src/xen/xend_internal.c:415 src/xen/xend_internal.c:418
+#: src/xen/xend_internal.c:427
 #, c-format
 msgid "xend_post: error from xen daemon: %s"
 msgstr ""
 
-#: src/remote/remote_driver.c:592 src/xen/xend_internal.c:811
+#: src/xen/xend_internal.c:681
 #, c-format
 msgid "unable to resolve hostname '%s': %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:848
+#: src/xen/xend_internal.c:718
 #, c-format
 msgid "unable to connect to '%s:%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:1007
+#: src/xen/xend_internal.c:855
 msgid "domain information incomplete, missing domid"
 msgstr "informations de domaine incomplètes, domid manquant"
 
-#: src/xen/xend_internal.c:1013
+#: src/xen/xend_internal.c:861
 msgid "domain information incorrect domid not numeric"
 msgstr "informations de domaine incorrectes, domid non numérique"
 
-#: src/xen/xend_internal.c:1018 src/xen/xend_internal.c:1070
+#: src/xen/xend_internal.c:866 src/xen/xend_internal.c:918
 msgid "domain information incomplete, missing uuid"
 msgstr "informations de domaine incomplètes, UUID manquant"
 
-#: src/xen/xend_internal.c:1057 src/xen/xend_internal.c:2359
-#: src/xen/xend_internal.c:2366
+#: src/xen/xend_internal.c:905 src/xenxs/xen_sxpr.c:1086
+#: src/xenxs/xen_sxpr.c:1093
 msgid "domain information incomplete, missing name"
 msgstr "informations de domaine incomplètes, nom manquant"
 
-#: src/xen/xend_internal.c:2833
+#: src/xen/xend_internal.c:1176
 msgid "topology syntax error"
 msgstr "erreur de syntaxe dans la topologie"
 
-#: src/xen/xend_internal.c:2897
+#: src/xen/xend_internal.c:1239
 msgid "failed to parse Xend domain information"
 msgstr "impossible d'analyser les informations du domaine Xen"
 
-#: src/xen/xend_internal.c:3023 src/xen/xend_internal.c:3050
-#: src/xen/xend_internal.c:3078 src/xen/xend_internal.c:3107
-#: src/xen/xend_internal.c:3138 src/xen/xend_internal.c:3216
-#: src/xen/xend_internal.c:3253
+#: src/xen/xend_internal.c:1365 src/xen/xend_internal.c:1391
+#: src/xen/xend_internal.c:1418 src/xen/xend_internal.c:1448
+#: src/xen/xend_internal.c:1485 src/xen/xend_internal.c:1561
+#: src/xen/xend_internal.c:1599
 #, c-format
 msgid "Domain %s isn't running."
 msgstr ""
@@ -17761,10 +18409,6 @@
 msgid "Xend only supports modifying both live and persistent config"
 msgstr ""
 
-#: src/xen/xend_internal.c:2220 src/xen/xm_internal.c:731
-msgid "could not determin max vcpus for the domain"
-msgstr ""
-
 #: src/xen/xend_internal.c:2299
 msgid "failed to add vcpupin xml entry"
 msgstr ""
@@ -17774,8 +18418,8 @@
 msgid "Cannot modify live config if domain is inactive"
 msgstr ""
 
-#: src/xen/xend_internal.c:4173 src/xen/xend_internal.c:4180
-#: src/xen/xend_internal.c:4262
+#: src/xen/xend_internal.c:2739 src/xen/xend_internal.c:2746
+#: src/xen/xend_internal.c:2867 src/xen/xend_internal.c:2978
 msgid "unsupported device type"
 msgstr ""
 
@@ -17788,31 +18432,31 @@
 msgid "requested device does not exist"
 msgstr ""
 
-#: src/xen/xend_internal.c:4307
+#: src/xen/xend_internal.c:3022
 msgid "xenDaemonGetAutostart failed to find this domain"
 msgstr ""
 
-#: src/xen/xend_internal.c:4348
+#: src/xen/xend_internal.c:3062
 msgid "xenDaemonSetAutostart failed to find this domain"
 msgstr ""
 
-#: src/xen/xend_internal.c:4356
+#: src/xen/xend_internal.c:3072
 msgid "unexpected value from on_xend_start"
 msgstr ""
 
-#: src/xen/xend_internal.c:4372
+#: src/xen/xend_internal.c:3087
 msgid "sexpr2string failed"
 msgstr ""
 
-#: src/xen/xend_internal.c:4377
+#: src/xen/xend_internal.c:3100
 msgid "Failed to redefine sexpr"
 msgstr ""
 
-#: src/xen/xend_internal.c:4382
+#: src/xen/xend_internal.c:3105
 msgid "on_xend_start not present in sexpr"
 msgstr ""
 
-#: src/xen/xend_internal.c:4440
+#: src/xen/xend_internal.c:3168
 msgid ""
 "xenDaemonDomainMigrate: Xen does not support renaming domains during "
 "migration"
@@ -17820,7 +18464,7 @@
 "xenDaemonDomainMigrate : Xen ne prend pas en charge que les domaines soient "
 "renommés durant la migration"
 
-#: src/xen/xend_internal.c:4450
+#: src/xen/xend_internal.c:3178
 msgid ""
 "xenDaemonDomainMigrate: Xen does not support bandwidth limits during "
 "migration"
@@ -17828,38 +18472,38 @@
 "xenDaemonDomainMigrate : Xen ne prend pas en charge la limitation de bande "
 "passante durant la migration"
 
-#: src/xen/xend_internal.c:4478
+#: src/xen/xend_internal.c:3206
 msgid "xenDaemonDomainMigrate: xend cannot migrate paused domains"
 msgstr ""
 
-#: src/xen/xend_internal.c:4486
+#: src/xen/xend_internal.c:3214
 msgid "xenDaemonDomainMigrate: unsupported flag"
 msgstr "xenDaemonDomainMigrate : indicateur non supporté"
 
-#: src/xen/xend_internal.c:4499
+#: src/xen/xend_internal.c:3227
 msgid "xenDaemonDomainMigrate: invalid URI"
 msgstr "xenDaemonDomainMigrate : URI invalide"
 
-#: src/xen/xend_internal.c:4504
+#: src/xen/xend_internal.c:3232
 msgid ""
 "xenDaemonDomainMigrate: only xenmigr:// migrations are supported by Xen"
 msgstr ""
 "xenDaemonDomainMigrate : seules les migrations de xenmigr:// sont supportées "
 "par Xen"
 
-#: src/xen/xend_internal.c:4511
+#: src/xen/xend_internal.c:3239
 msgid "xenDaemonDomainMigrate: a hostname must be specified in the URI"
 msgstr "xenDaemonDomainMigrate : un nom d'hôte doit être spécifié dans l'URI"
 
-#: src/xen/xend_internal.c:4531
+#: src/xen/xend_internal.c:3259
 msgid "xenDaemonDomainMigrate: invalid port number"
 msgstr "xenDaemonDomainMigrate : numéro de port invalide"
 
-#: src/xen/xend_internal.c:4590
+#: src/xen/xend_internal.c:3325
 msgid "failed to parse domain description"
 msgstr "impossible d'analyser la description du domaine"
 
-#: src/xen/xend_internal.c:4596
+#: src/xen/xend_internal.c:3331
 msgid "failed to build sexpr"
 msgstr ""
 
@@ -17868,155 +18512,159 @@
 msgid "Failed to create inactive domain %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:4786 src/xen/xend_internal.c:4862
-#: src/xen/xend_internal.c:4959
+#: src/xen/xend_internal.c:3515 src/xen/xend_internal.c:3588
+#: src/xen/xend_internal.c:3696
 msgid "unsupported in xendConfigVersion < 4"
 msgstr ""
 
-#: src/xen/xend_internal.c:4798
+#: src/xen/xend_internal.c:3527
 msgid "node information incomplete, missing scheduler name"
 msgstr ""
 
-#: src/xen/xend_internal.c:4816 src/xen/xend_internal.c:4917
-#: src/xen/xend_internal.c:5029
+#: src/xen/xend_internal.c:3547 src/xen/xend_internal.c:3656
+#: src/xen/xend_internal.c:3766
 msgid "Unknown scheduler"
 msgstr ""
 
-#: src/xen/xend_internal.c:4875 src/xen/xend_internal.c:4972
+#: src/xen/xend_internal.c:3601 src/xen/xend_internal.c:3709
 msgid "Failed to get a scheduler name"
 msgstr ""
 
-#: src/xen/xend_internal.c:4888 src/xen/xend_internal.c:5008
+#: src/xen/xend_internal.c:3620 src/xen/xend_internal.c:3745
 msgid "domain information incomplete, missing cpu_weight"
 msgstr ""
 
-#: src/xen/xend_internal.c:4893 src/xen/xend_internal.c:5017
+#: src/xen/xend_internal.c:3625 src/xen/xend_internal.c:3754
 msgid "domain information incomplete, missing cpu_cap"
 msgstr ""
 
-#: src/xen/xend_internal.c:4899
+#: src/xen/xend_internal.c:3632
 #, c-format
 msgid "Weight %s too big for destination"
 msgstr ""
 
-#: src/xen/xend_internal.c:4908
+#: src/xen/xend_internal.c:3643
 #, c-format
 msgid "Cap %s too big for destination"
 msgstr ""
 
-#: src/xen/xend_internal.c:5075
+#: src/xen/xend_internal.c:3815
 msgid "domainBlockPeek is not supported for dom0"
 msgstr ""
 
-#: src/xen/xend_internal.c:5096
+#: src/xen/xend_internal.c:3836
 #, c-format
 msgid "%s: invalid path"
 msgstr ""
 
-#: src/xen/xend_internal.c:5104
+#: src/xen/xend_internal.c:3845
 #, c-format
 msgid "failed to open for reading: %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:5116
+#: src/xen/xend_internal.c:3857
 #, c-format
 msgid "failed to lseek or read from file: %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:6065
+#: src/xen/xend_internal.c:3998
 msgid "hotplug of device type not supported"
 msgstr ""
 
-#: src/xen/xm_internal.c:399
+#: src/xen/xm_internal.c:221
 #, c-format
 msgid "cannot stat: %s"
 msgstr ""
 
-#: src/xen/xm_internal.c:457
+#: src/xen/xm_internal.c:285
 msgid "xenXMConfigCacheRefresh: virHashAddEntry"
 msgstr ""
 
-#: src/xen/xm_internal.c:509
+#: src/xen/xm_internal.c:326
+msgid "cannot get time of day"
+msgstr ""
+
+#: src/xen/xm_internal.c:339
 #, c-format
 msgid "cannot read directory %s"
 msgstr ""
 
-#: src/xen/xm_internal.c:1711
+#: src/xen/xm_internal.c:848
 msgid "read only connection"
 msgstr ""
 
-#: src/xen/xm_internal.c:1716
+#: src/xen/xm_internal.c:853
 msgid "not inactive domain"
 msgstr ""
 
-#: src/xen/xm_internal.c:1724
+#: src/xen/xm_internal.c:861
 msgid "virHashLookup"
 msgstr ""
 
-#: src/xen/xm_internal.c:1729
+#: src/xen/xm_internal.c:866
 msgid "can't retrieve config file for domain"
 msgstr ""
 
-#: src/xen/xm_internal.c:2684
+#: src/xen/xm_internal.c:1129
 msgid "can't retrieve config filename for domain to overwrite"
 msgstr ""
 
-#: src/xen/xm_internal.c:2690
+#: src/xen/xm_internal.c:1135
 msgid "can't retrieve config entry for domain to overwrite"
 msgstr ""
 
-#: src/xen/xm_internal.c:2701 src/xen/xm_internal.c:2708
+#: src/xen/xm_internal.c:1142 src/xen/xm_internal.c:1149
 msgid "failed to remove old domain from config map"
 msgstr ""
 
-#: src/xen/xm_internal.c:2735
+#: src/xen/xm_internal.c:1169
 msgid "unable to get current time"
 msgstr ""
 
-#: src/xen/xm_internal.c:2744 src/xen/xm_internal.c:2751
+#: src/xen/xm_internal.c:1181 src/xen/xm_internal.c:1188
 msgid "unable to store config file handle"
 msgstr ""
 
-#: src/xen/xm_internal.c:1393 src/xen/xm_internal.c:1490
+#: src/xen/xm_internal.c:1392 src/xen/xm_internal.c:1489
 msgid "Xm driver only supports modifying persistent config"
 msgstr ""
 
-#: src/xen/xm_internal.c:1435
+#: src/xen/xm_internal.c:1434
 msgid "Xm driver only supports adding disk or network devices"
 msgstr ""
 
-#: src/xen/xm_internal.c:1575
+#: src/xen/xm_internal.c:1574
 msgid "block peeking not implemented"
 msgstr ""
 
-#: src/xen/xm_internal.c:3148
+#: src/xen/xm_internal.c:1609
 #, c-format
 msgid "cannot check link %s points to config %s"
 msgstr ""
 
-#: src/xen/xm_internal.c:3177
+#: src/xen/xm_internal.c:1638
 #, c-format
 msgid "failed to create link %s to %s"
 msgstr ""
 
-#: src/xen/xm_internal.c:3185
+#: src/xen/xm_internal.c:1646
 #, c-format
 msgid "failed to remove link %s"
 msgstr ""
 
-#: src/xen/xs_internal.c:300
+#: src/xen/xs_internal.c:258
 msgid "failed to connect to Xen Store"
 msgstr "Impossible de se connecter au magasin Xen"
 
-#: src/xen/xs_internal.c:325
+#: src/xen/xs_internal.c:282
 msgid "adding watch @releaseDomain"
 msgstr ""
 
-#: src/xen/xs_internal.c:334
+#: src/xen/xs_internal.c:291
 msgid "adding watch @introduceDomain"
 msgstr ""
 
-#: src/xen/xs_internal.c:1203
+#: src/xen/xs_internal.c:1141
 msgid "watch already tracked"
 msgstr ""
 
@@ -18074,10 +18722,10 @@
 #: src/xenapi/xenapi_driver.c:924 src/xenapi/xenapi_driver.c:959
 #: src/xenapi/xenapi_driver.c:990 src/xenapi/xenapi_driver.c:1027
 #: src/xenapi/xenapi_driver.c:1082 src/xenapi/xenapi_driver.c:1126
-#: src/xenapi/xenapi_driver.c:1170 src/xenapi/xenapi_driver.c:1239
-#: src/xenapi/xenapi_driver.c:1298 src/xenapi/xenapi_driver.c:1356
-#: src/xenapi/xenapi_driver.c:1629 src/xenapi/xenapi_driver.c:1725
-#: src/xenapi/xenapi_driver.c:1767 src/xenapi/xenapi_driver.c:1813
+#: src/xenapi/xenapi_driver.c:1170 src/xenapi/xenapi_driver.c:1237
+#: src/xenapi/xenapi_driver.c:1296 src/xenapi/xenapi_driver.c:1354
+#: src/xenapi/xenapi_driver.c:1627 src/xenapi/xenapi_driver.c:1723
+#: src/xenapi/xenapi_driver.c:1765 src/xenapi/xenapi_driver.c:1811
 msgid "Domain name is not unique"
 msgstr ""
 
@@ -18089,27 +18737,27 @@
 msgid "Couldn't fetch Domain Information"
 msgstr ""
 
-#: src/xenapi/xenapi_driver.c:1228
+#: src/xenapi/xenapi_driver.c:1226
 msgid "Couldn't fetch Node Information"
 msgstr ""
 
-#: src/xenapi/xenapi_driver.c:1511
+#: src/xenapi/xenapi_driver.c:1509
 msgid "Unable to parse given mac address"
 msgstr ""
 
-#: src/xenapi/xenapi_driver.c:1563
+#: src/xenapi/xenapi_driver.c:1561
 msgid "Couldn't get VM record"
 msgstr ""
 
-#: src/xenapi/xenapi_driver.c:1690
+#: src/xenapi/xenapi_driver.c:1688
 msgid "Couldn't get VM information from XML"
 msgstr ""
 
-#: src/xenapi/xenapi_driver.c:1864
+#: src/xenapi/xenapi_driver.c:1862
 msgid "Couldn't get host metrics - memory information"
 msgstr ""
 
-#: src/xenapi/xenapi_driver.c:1870
+#: src/xenapi/xenapi_driver.c:1868
 msgid "Couldn't get host metrics"
 msgstr ""
 
@@ -18117,185 +18765,183 @@
 msgid "Query parameter 'no_verify' has unexpected value (should be 0 or 1)"
 msgstr ""
 
-#: src/xen/xend_internal.c:2346
+#: src/xenxs/xen_sxpr.c:60 src/xenxs/xen_sxpr.c:1073
 msgid "domain information incomplete, missing id"
 msgstr "informations de domaine incomplètes, ID manquant"
 
-#: src/xen/xend_internal.c:1151
+#: src/xenxs/xen_sxpr.c:98
 msgid "domain information incomplete, missing HVM loader"
 msgstr "informations de domaine incomplètes, chargeur HVM manquant"
 
-#: src/xen/xend_internal.c:1205
+#: src/xenxs/xen_sxpr.c:158
 msgid "domain information incomplete, missing kernel & bootloader"
 msgstr ""
 "informations de domaine incomplètes, noyau et chargeur de démarrage manquants"
 
-#: src/xen/xend_internal.c:1467
+#: src/xenxs/xen_sxpr.c:199
 #, c-format
 msgid "unknown chr device type '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:1303 src/xen/xend_internal.c:1343
-#: src/xen/xend_internal.c:1359 src/xen/xend_internal.c:1494
-#: src/xen/xend_internal.c:1522 src/xen/xend_internal.c:1538
+#: src/xenxs/xen_sxpr.c:225 src/xenxs/xen_sxpr.c:255 src/xenxs/xen_sxpr.c:273
 msgid "malformed char device string"
 msgstr ""
 
-#: src/xen/xend_internal.c:1629
+#: src/xenxs/xen_sxpr.c:375
 msgid "domain information incomplete, vbd has no dev"
 msgstr "informations de domaine incomplètes, vbd n'a pas de dev"
 
-#: src/xen/xend_internal.c:1640
+#: src/xenxs/xen_sxpr.c:386
 msgid "domain information incomplete, vbd has no src"
 msgstr "informations de domaine incomplètes, vbd n'a pas de src"
 
-#: src/xen/xend_internal.c:1649
+#: src/xenxs/xen_sxpr.c:395
 msgid "cannot parse vbd filename, missing driver name"
 msgstr ""
 "impossible d'analyser le nom de fichier de vdb, nom de pilote manquant"
 
-#: src/xen/xend_internal.c:1658 src/xen/xm_internal.c:909
+#: src/xenxs/xen_sxpr.c:409 src/xenxs/xen_xm.c:496
 #, c-format
 msgid "Driver name %s too big for destination"
 msgstr ""
 
-#: src/xen/xend_internal.c:1669
+#: src/xenxs/xen_sxpr.c:422
 msgid "cannot parse vbd filename, missing driver type"
 msgstr ""
 "impossible d'analyser le nom de fichier de vdb, type du pilote manquant"
 
-#: src/xen/xend_internal.c:1678 src/xen/xm_internal.c:930
+#: src/xenxs/xen_sxpr.c:431 src/xenxs/xen_xm.c:517
 #, c-format
 msgid "Driver type %s too big for destination"
 msgstr ""
 
-#: src/xen/xend_internal.c:1831
+#: src/xenxs/xen_sxpr.c:585 src/xenxs/xen_xm.c:695
 #, c-format
 msgid "malformed mac address '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:1917
+#: src/xenxs/xen_sxpr.c:663
 #, c-format
 msgid "Sound model %s too big for destination"
 msgstr ""
 
-#: src/xen/xend_internal.c:2117
+#: src/xenxs/xen_sxpr.c:853
 #, c-format
 msgid "unknown graphics type '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:2244
+#: src/xenxs/xen_sxpr.c:976
 msgid "missing PCI domain"
 msgstr ""
 
-#: src/xen/xend_internal.c:2249
+#: src/xenxs/xen_sxpr.c:981
 msgid "missing PCI bus"
 msgstr ""
 
-#: src/xen/xend_internal.c:2254
+#: src/xenxs/xen_sxpr.c:986
 msgid "missing PCI slot"
 msgstr ""
 
-#: src/xen/xend_internal.c:2259
+#: src/xenxs/xen_sxpr.c:991
 msgid "missing PCI func"
 msgstr ""
 
-#: src/xen/xend_internal.c:2265
+#: src/xenxs/xen_sxpr.c:997
 #, c-format
 msgid "cannot parse PCI domain '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:2270
+#: src/xenxs/xen_sxpr.c:1002
 #, c-format
 msgid "cannot parse PCI bus '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:2275
+#: src/xenxs/xen_sxpr.c:1007
 #, c-format
 msgid "cannot parse PCI slot '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:2280
+#: src/xenxs/xen_sxpr.c:1012
 #, c-format
 msgid "cannot parse PCI func '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:2417
+#: src/xenxs/xen_sxpr.c:1146
 #, c-format
 msgid "invalid CPU mask %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:2428 src/xen/xend_internal.c:2438
-#: src/xen/xend_internal.c:2448
+#: src/xenxs/xen_sxpr.c:1160 src/xenxs/xen_sxpr.c:1170
+#: src/xenxs/xen_sxpr.c:1180
 #, c-format
 msgid "unknown lifecycle type %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:5198 src/xen/xend_internal.c:5244
+#: src/xenxs/xen_sxpr.c:1473 src/xenxs/xen_sxpr.c:1521
 #, c-format
 msgid "unexpected graphics type %d"
 msgstr ""
 
-#: src/xenxs/xen_sxpr.c:1621
+#: src/xenxs/xen_sxpr.c:1620
 #, c-format
 msgid "unsupported chr device type '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:5370
+#: src/xenxs/xen_sxpr.c:1660
 #, c-format
 msgid "Cannot directly attach floppy %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:5382
+#: src/xenxs/xen_sxpr.c:1672
 #, c-format
 msgid "Cannot directly attach CDROM %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:5437 src/xen/xm_internal.c:1994
+#: src/xenxs/xen_sxpr.c:1732 src/xenxs/xen_xm.c:1166
 #, c-format
 msgid "unsupported disk type %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:5487 src/xen/xm_internal.c:2097
+#: src/xenxs/xen_sxpr.c:1786 src/xenxs/xen_xm.c:1316
 #, c-format
 msgid "unsupported network type %d"
 msgstr ""
 
-#: src/xen/xend_internal.c:5528 src/xen/xm_internal.c:2085
+#: src/xenxs/xen_sxpr.c:1827 src/xenxs/xen_xm.c:1304
 #, c-format
 msgid "network %s is not active"
 msgstr ""
 
-#: src/xen/xend_internal.c:5598 src/xen/xend_internal.c:5649
+#: src/xenxs/xen_sxpr.c:1906 src/xenxs/xen_sxpr.c:1956
 msgid "managed PCI devices not supported with XenD"
 msgstr ""
 
-#: src/xen/xend_internal.c:5764 src/xen/xend_internal.c:5771
-#: src/xen/xend_internal.c:5778
+#: src/xenxs/xen_sxpr.c:2083 src/xenxs/xen_sxpr.c:2090
+#: src/xenxs/xen_sxpr.c:2097
 #, c-format
 msgid "unexpected lifecycle value %d"
 msgstr ""
 
-#: src/xenxs/xen_sxpr.c:2107 src/xenxs/xen_xm.c:1565
+#: src/xenxs/xen_sxpr.c:2106 src/xenxs/xen_xm.c:1565
 msgid "configurable timezones are not supported"
 msgstr ""
 
-#: src/xen/xend_internal.c:5799
+#: src/xenxs/xen_sxpr.c:2130
 msgid "no HVM domain loader"
 msgstr "aucun chargeur de domaine HVM"
 
-#: src/xen/xm_internal.c:158 src/xen/xm_internal.c:186
-#: src/xen/xm_internal.c:191 src/xen/xm_internal.c:214
+#: src/xenxs/xen_xm.c:60 src/xenxs/xen_xm.c:87 src/xenxs/xen_xm.c:92
+#: src/xenxs/xen_xm.c:114
 #, c-format
 msgid "config value %s was malformed"
 msgstr ""
 
-#: src/xen/xm_internal.c:236 src/xen/xm_internal.c:249
+#: src/xenxs/xen_xm.c:135 src/xenxs/xen_xm.c:148 src/xenxs/xen_xm.c:186
 #, c-format
 msgid "config value %s was missing"
 msgstr ""
 
-#: src/xen/xm_internal.c:242
+#: src/xenxs/xen_xm.c:141
 #, c-format
 msgid "config value %s was not a string"
 msgstr ""
@@ -18319,97 +18965,100 @@
 msgid "%s not parseable"
 msgstr ""
 
-#: src/xen/xm_internal.c:795
+#: src/xenxs/xen_xm.c:351
 #, c-format
 msgid "unexpected value %s for on_poweroff"
 msgstr ""
 
-#: src/xen/xm_internal.c:803
+#: src/xenxs/xen_xm.c:359
 #, c-format
 msgid "unexpected value %s for on_reboot"
 msgstr ""
 
-#: src/xen/xm_internal.c:811
+#: src/xenxs/xen_xm.c:367
 #, c-format
 msgid "unexpected value %s for on_crash"
 msgstr ""
 
-#: src/xen/xm_internal.c:874
+#: src/xenxs/xen_xm.c:461
 #, c-format
 msgid "Source file %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:893
+#: src/xenxs/xen_xm.c:480
 #, c-format
 msgid "Dest file %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1048
+#: src/xenxs/xen_xm.c:633
 #, c-format
 msgid "MAC address %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1056
+#: src/xenxs/xen_xm.c:641
 #, c-format
 msgid "Bridge %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1079
+#: src/xenxs/xen_xm.c:662
 #, c-format
 msgid "Type %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1086
+#: src/xenxs/xen_xm.c:669
 #, c-format
 msgid "Vifname %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1094
+#: src/xenxs/xen_xm.c:677
 #, c-format
 msgid "IP %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1203
+#: src/xenxs/xen_xm.c:777
 #, c-format
 msgid "Domain %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1213
+#: src/xenxs/xen_xm.c:787
 #, c-format
 msgid "Bus %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1223
+#: src/xenxs/xen_xm.c:797
 #, c-format
 msgid "Slot %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1233
+#: src/xenxs/xen_xm.c:807
 #, c-format
 msgid "Function %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1349
+#: src/xenxs/xen_xm.c:931
 #, c-format
 msgid "VFB %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:2365 src/xen/xm_internal.c:2374
-#: src/xen/xm_internal.c:2383
+#: src/xenxs/xen_xm.c:1625 src/xenxs/xen_xm.c:1634 src/xenxs/xen_xm.c:1643
 #, c-format
 msgid "unexpected lifecycle action %d"
 msgstr ""
 
-#: tools/console.c:298
+#: tools/console.c:317
 #, c-format
 msgid "unable to get tty attributes: %s"
 msgstr ""
 
-#: tools/console.c:307
+#: tools/console.c:326
 #, c-format
 msgid "unable to set tty attributes: %s"
 msgstr ""
 
+#: tools/console.c:379
+msgid "unable to wait on console condition"
+msgstr ""
+
 #: tools/libvirt-guests.init.sh:139
 msgid "libvirt-guests is configured not to start any guests on boot"
 msgstr ""
@@ -18498,708 +19147,725 @@
 "restart|reload|force-reload|gueststatus|shutdown}"
 msgstr ""
 
-#: tools/virsh.c:8374 tools/virsh.c:8386 tools/virsh.c:8399
+#: tools/virsh.c:412 tools/virsh.c:424
 #, c-format
 msgid "%s: %d: failed to allocate %d bytes"
 msgstr "%s : %d : impossible d'allouer %d octets"
 
-#: tools/virsh.c:8413
+#: tools/virsh.c:438
 #, c-format
 msgid "%s: %d: failed to allocate %lu bytes"
 msgstr "%s : %d : impossible d'allouer %lu octets"
 
-#: tools/virsh.c:598
+#: tools/virsh.c:610
 msgid "Failed to reconnect to the hypervisor"
 msgstr ""
 
-#: tools/virsh.c:600
+#: tools/virsh.c:612
 msgid "Reconnected to the hypervisor"
 msgstr ""
 
-#: tools/virsh.c:375
+#: tools/virsh.c:627
 msgid "print help"
 msgstr "imprimer l'aide"
 
-#: tools/virsh.c:616
+#: tools/virsh.c:628
 msgid ""
 "Prints global help, command specific help, or help for a\n"
 "    group of related commands"
 msgstr ""
 
-#: tools/virsh.c:623
+#: tools/virsh.c:635
 msgid ""
 "Prints global help, command specific help, or help for a group of related "
 "commands"
 msgstr ""
 
-#: tools/virsh.c:636
+#: tools/virsh.c:648
 msgid ""
 "Grouped commands:\n"
 "\n"
 msgstr ""
 
-#: tools/virsh.c:639 tools/virsh.c:14488
+#: tools/virsh.c:651 tools/virsh.c:15574
 #, c-format
 msgid " %s (help keyword '%s'):\n"
 msgstr ""
 
-#: tools/virsh.c:657
+#: tools/virsh.c:669
 #, c-format
 msgid "command or command group '%s' doesn't exist"
 msgstr ""
 
-#: tools/virsh.c:407
+#: tools/virsh.c:678
 msgid "autostart a domain"
 msgstr "démarrer automatiquement un domaine"
 
-#: tools/virsh.c:409
+#: tools/virsh.c:680
 msgid "Configure a domain to be automatically started at boot."
 msgstr "Configurer un domaine pour être lancé automatiquement au démarrage."
 
-#: tools/virsh.c:414 tools/virsh.c:512 tools/virsh.c:737 tools/virsh.c:773
-#: tools/virsh.c:830 tools/virsh.c:897 tools/virsh.c:951 tools/virsh.c:1202
-#: tools/virsh.c:1245 tools/virsh.c:1490 tools/virsh.c:1539 tools/virsh.c:1577
-#: tools/virsh.c:1615 tools/virsh.c:1653 tools/virsh.c:1691 tools/virsh.c:1842
-#: tools/virsh.c:1928 tools/virsh.c:2065 tools/virsh.c:2121 tools/virsh.c:2177
-#: tools/virsh.c:2296 tools/virsh.c:2544 tools/virsh.c:6146 tools/virsh.c:6221
-#: tools/virsh.c:6282 tools/virsh.c:6340 tools/virsh.c:6398 tools/virsh.c:6514
-#: tools/virsh.c:6634 tools/virsh.c:6791 tools/virsh.c:7168
+#: tools/virsh.c:685 tools/virsh.c:788 tools/virsh.c:973 tools/virsh.c:1021
+#: tools/virsh.c:1068 tools/virsh.c:1243 tools/virsh.c:1309 tools/virsh.c:1474
+#: tools/virsh.c:1590 tools/virsh.c:1646 tools/virsh.c:1693 tools/virsh.c:1773
+#: tools/virsh.c:2199 tools/virsh.c:2473 tools/virsh.c:2523 tools/virsh.c:2577
+#: tools/virsh.c:2905 tools/virsh.c:2958 tools/virsh.c:3108 tools/virsh.c:3146
+#: tools/virsh.c:3184 tools/virsh.c:3222 tools/virsh.c:3261 tools/virsh.c:3299
+#: tools/virsh.c:3437 tools/virsh.c:3520 tools/virsh.c:3717 tools/virsh.c:3925
+#: tools/virsh.c:4031 tools/virsh.c:4275 tools/virsh.c:4369 tools/virsh.c:4403
+#: tools/virsh.c:4490 tools/virsh.c:4580 tools/virsh.c:4660 tools/virsh.c:4837
+#: tools/virsh.c:5338 tools/virsh.c:5595 tools/virsh.c:5886 tools/virsh.c:5931
+#: tools/virsh.c:5974 tools/virsh.c:6058 tools/virsh.c:6082 tools/virsh.c:6138
+#: tools/virsh.c:6245 tools/virsh.c:11728 tools/virsh.c:11797
+#: tools/virsh.c:11852 tools/virsh.c:12161 tools/virsh.c:12240
+#: tools/virsh.c:12310 tools/virsh.c:12509 tools/virsh.c:12644
+#: tools/virsh.c:12989 tools/virsh.c:13566 tools/virsh.c:13785
+#: tools/virsh.c:13915 tools/virsh.c:14047 tools/virsh.c:14185
+#: tools/virsh.c:14358 tools/virsh.c:14722 tools/virsh.c:14784
+#: tools/virsh.c:14841 tools/virsh.c:14915 tools/virsh.c:14986
 msgid "domain name, id or uuid"
 msgstr "nom du domaine, ID ou UUID"
 
-#: tools/virsh.c:415 tools/virsh.c:2636 tools/virsh.c:3613
+#: tools/virsh.c:686 tools/virsh.c:6198 tools/virsh.c:8255
 msgid "disable autostarting"
 msgstr "désactiver le démarrage automatique"
 
-#: tools/virsh.c:436
+#: tools/virsh.c:707
 #, c-format
 msgid "Failed to mark domain %s as autostarted"
 msgstr "Impossible de marquer le domaine %s en démarrage automatique"
 
-#: tools/virsh.c:438
+#: tools/virsh.c:709
 #, c-format
 msgid "Failed to unmark domain %s as autostarted"
 msgstr "Impossible de démarquer le domaine %s en démarrage automatique"
 
-#: tools/virsh.c:444
+#: tools/virsh.c:715
 #, c-format
 msgid "Domain %s marked as autostarted\n"
 msgstr "Domaine %s marqué pour le démarrage automatique\n"
 
-#: tools/virsh.c:446
+#: tools/virsh.c:717
 #, c-format
 msgid "Domain %s unmarked as autostarted\n"
 msgstr "Domaine %s démarqué pour le démarrage automatique\n"
 
-#: tools/virsh.c:456
+#: tools/virsh.c:727
 msgid "(re)connect to hypervisor"
 msgstr "(re)connecter à l'hyperviseur"
 
-#: tools/virsh.c:458
+#: tools/virsh.c:729
 msgid ""
 "Connect to local hypervisor. This is built-in command after shell start up."
 msgstr ""
 "Se connecte à l'hyperviseur local. Ceci est une commande interne après le "
 "démarrage du shell."
 
-#: tools/virsh.c:463
+#: tools/virsh.c:735
 msgid "hypervisor connection URI"
 msgstr "URI de connexion à l'hyperviseur"
 
-#: tools/virsh.c:464
+#: tools/virsh.c:736
 msgid "read-only connection"
 msgstr "connexion en lecture seule"
 
-#: tools/virsh.c:737 tools/virsh.c:16396
+#: tools/virsh.c:749 tools/virsh.c:17515
 #, c-format
 msgid "Failed to disconnect from the hypervisor, %d leaked reference(s)"
 msgstr ""
 
-#: tools/virsh.c:745
+#: tools/virsh.c:757
 msgid "Please specify valid connection URI"
 msgstr ""
 
-#: tools/virsh.c:494
+#: tools/virsh.c:770
 msgid "Failed to connect to the hypervisor"
 msgstr "Impossible de se connecter à l'hyperviseur"
 
-#: tools/virsh.c:505
+#: tools/virsh.c:781
 msgid "connect to the guest console"
 msgstr "se connecter à la console invitée"
 
-#: tools/virsh.c:507
+#: tools/virsh.c:783
 msgid "Connect the virtual serial console for the guest"
 msgstr "Connecter la console série virtuelle pour l'invité"
 
-#: tools/virsh.c:777
+#: tools/virsh.c:789
 msgid "character device name"
 msgstr ""
 
-#: tools/virsh.c:544
+#: tools/virsh.c:800
 msgid "Unable to get domain status"
 msgstr ""
 
-#: tools/virsh.c:549
+#: tools/virsh.c:805
 msgid "The domain is not running"
 msgstr ""
 
-#: tools/virsh.c:570
+#: tools/virsh.c:809
 #, c-format
 msgid "Connected to domain %s\n"
 msgstr ""
 
-#: tools/virsh.c:571
-msgid "Escape character is ^]\n"
+#: tools/virsh.c:810
+#, c-format
+msgid "Escape character is %s\n"
 msgstr ""
 
-#: tools/virsh.c:821
+#: tools/virsh.c:833
 msgid "Invalid devname"
 msgstr ""
 
-#: tools/virsh.c:614
+#: tools/virsh.c:851
 msgid "list domains"
 msgstr "lister les domaines"
 
-#: tools/virsh.c:615
+#: tools/virsh.c:852
 msgid "Returns list of domains."
 msgstr "Renvoyer la liste des domaines"
 
-#: tools/virsh.c:620
+#: tools/virsh.c:857
 msgid "list inactive domains"
 msgstr "lister les domaines inactifs"
 
-#: tools/virsh.c:621
+#: tools/virsh.c:858
 msgid "list inactive & active domains"
 msgstr "lister les domaines actifs et inactifs"
 
-#: tools/virsh.c:848
+#: tools/virsh.c:860
 msgid "mark domains with managed save state"
 msgstr ""
 
-#: tools/virsh.c:643 tools/virsh.c:650
+#: tools/virsh.c:885 tools/virsh.c:892
 msgid "Failed to list active domains"
 msgstr "Impossible de lister les domaines actifs"
 
-#: tools/virsh.c:661 tools/virsh.c:669
+#: tools/virsh.c:903 tools/virsh.c:911
 msgid "Failed to list inactive domains"
 msgstr "Impossible de lister les domaines inactifs"
 
-#: tools/virsh.c:678
+#: tools/virsh.c:920
 msgid "Id"
 msgstr "ID"
 
-#: tools/virsh.c:678 tools/virsh.c:3017 tools/virsh.c:3290 tools/virsh.c:4265
-#: tools/virsh.c:5226
+#: tools/virsh.c:920 tools/virsh.c:6679 tools/virsh.c:6874 tools/virsh.c:7147
+#: tools/virsh.c:8118 tools/virsh.c:9108 tools/virsh.c:9128 tools/virsh.c:9197
+#: tools/virsh.c:10604 tools/virsh.c:10619 tools/virsh.c:10669
+#: tools/virsh.c:14496 tools/virsh.c:14500
 msgid "Name"
 msgstr "Nom"
 
-#: tools/virsh.c:678 tools/virsh.c:3017 tools/virsh.c:3290 tools/virsh.c:4265
+#: tools/virsh.c:920 tools/virsh.c:6874 tools/virsh.c:7147 tools/virsh.c:9108
+#: tools/virsh.c:9133 tools/virsh.c:9197 tools/virsh.c:14496
+#: tools/virsh.c:14500
 msgid "State"
 msgstr "État"
 
-#: tools/virsh.c:941 tools/virsh.c:15745
+#: tools/virsh.c:953 tools/virsh.c:16834
 msgid "saved"
 msgstr ""
 
-#: tools/virsh.c:731
+#: tools/virsh.c:967
 msgid "domain state"
 msgstr "état du domaine"
 
-#: tools/virsh.c:732
+#: tools/virsh.c:968
 msgid "Returns state about a domain."
 msgstr "Retourne l'état d'un domaine."
 
-#: tools/virsh.c:962
+#: tools/virsh.c:974
 msgid "also print reason for the state"
 msgstr ""
 
-#: tools/virsh.c:1003
+#: tools/virsh.c:1015
 msgid "domain control interface state"
 msgstr ""
 
-#: tools/virsh.c:1004
+#: tools/virsh.c:1016
 msgid "Returns state of a control interface to the domain."
 msgstr ""
 
-#: tools/virsh.c:767
+#: tools/virsh.c:1061
 msgid "get device block stats for a domain"
 msgstr ""
 "retourner les statistiques d'un périphérique en mode bloc pour un domaine"
 
-#: tools/virsh.c:1050
+#: tools/virsh.c:1062
 msgid ""
 "Get device block stats for a running domain. See man page or use --human for "
 "explanation of fields"
 msgstr ""
 
-#: tools/virsh.c:774
+#: tools/virsh.c:1069 tools/virsh.c:1647 tools/virsh.c:6246
 msgid "block device"
 msgstr "périphérique en mode bloc"
 
-#: tools/virsh.c:1058
+#: tools/virsh.c:1070
 msgid "print a more human readable output"
 msgstr ""
 
-#: tools/virsh.c:1072
+#: tools/virsh.c:1084
 msgid "number of read operations:"
 msgstr ""
 
-#: tools/virsh.c:1074
+#: tools/virsh.c:1086
 msgid "number of bytes read:"
 msgstr ""
 
-#: tools/virsh.c:1076
+#: tools/virsh.c:1088
 msgid "number of write operations:"
 msgstr ""
 
-#: tools/virsh.c:1078
+#: tools/virsh.c:1090
 msgid "number of bytes written:"
 msgstr ""
 
-#: tools/virsh.c:1080
+#: tools/virsh.c:1092
 msgid "error count:"
 msgstr ""
 
-#: tools/virsh.c:1082
+#: tools/virsh.c:1094
 msgid "number of flush operations:"
 msgstr ""
 
-#: tools/virsh.c:1084
+#: tools/virsh.c:1096
 msgid "total duration of reads (ns):"
 msgstr ""
 
-#: tools/virsh.c:1086
+#: tools/virsh.c:1098
 msgid "total duration of writes (ns):"
 msgstr ""
 
-#: tools/virsh.c:1088
+#: tools/virsh.c:1100
 msgid "total duration of flushes (ns):"
 msgstr ""
 
-#: tools/virsh.c:797
+#: tools/virsh.c:1152 tools/virsh.c:1172
 #, c-format
 msgid "Failed to get block stats %s %s"
 msgstr "Impossible d'obtenir les statistiques du bloc %s %s"
 
-#: tools/virsh.c:1147 tools/virsh.c:1166
+#: tools/virsh.c:1159 tools/virsh.c:1178
 #, c-format
 msgid "Device: %s\n"
 msgstr ""
 
-#: tools/virsh.c:824
+#: tools/virsh.c:1237
 msgid "get network interface stats for a domain"
 msgstr "obtenir les statistiques d'une interface réseau pour un domaine"
 
-#: tools/virsh.c:825
+#: tools/virsh.c:1238
 msgid "Get network interface stats for a running domain."
 msgstr ""
 "Obtenir les statistiques d'une interface réseau pour un domaine en cours "
 "d'exécution."
 
-#: tools/virsh.c:831
+#: tools/virsh.c:1244
 msgid "interface device"
 msgstr "périphérique d'interface"
 
-#: tools/virsh.c:854
+#: tools/virsh.c:1267
 #, c-format
 msgid "Failed to get interface stats %s %s"
 msgstr ""
 "Impossible de récupérer les statistiques relatives à l'interface %s %s"
 
-#: tools/virsh.c:1291
+#: tools/virsh.c:1303
 msgid "set link state of a virtual interface"
 msgstr ""
 
-#: tools/virsh.c:1292
+#: tools/virsh.c:1304
 msgid ""
 "Set link state of a domain's virtual interface. This command wraps usage of "
 "update-device command."
 msgstr ""
 
-#: tools/virsh.c:1298 tools/virsh.c:1463
+#: tools/virsh.c:1310 tools/virsh.c:1475
 msgid "interface device (MAC Address)"
 msgstr ""
 
-#: tools/virsh.c:1299
+#: tools/virsh.c:1311
 msgid "new state of the device"
 msgstr ""
 
-#: tools/virsh.c:1300
+#: tools/virsh.c:1312
 msgid "persist interface state"
 msgstr ""
 
-#: tools/virsh.c:1337
+#: tools/virsh.c:1349
 #, c-format
 msgid "invalid link state '%s'"
 msgstr ""
 
-#: tools/virsh.c:1344 tools/virsh.c:1500
+#: tools/virsh.c:1356 tools/virsh.c:1512
 msgid "Failed to get domain description xml"
 msgstr ""
 
-#: tools/virsh.c:1360 tools/virsh.c:1507
+#: tools/virsh.c:1372 tools/virsh.c:1519
 msgid "Failed to parse domain description xml"
 msgstr ""
 
-#: tools/virsh.c:1367 tools/virsh.c:1514
+#: tools/virsh.c:1379 tools/virsh.c:1526
 msgid "Failed to extract interface information or no interfaces found"
 msgstr ""
 
-#: tools/virsh.c:1390
+#: tools/virsh.c:1402
 #, c-format
 msgid "interface with address '%s' not found"
 msgstr ""
 
-#: tools/virsh.c:5485 tools/virsh.c:5544 tools/virsh.c:6595 tools/virsh.c:6864
+#: tools/virsh.c:1436 tools/virsh.c:11018 tools/virsh.c:11077
+#: tools/virsh.c:12597 tools/virsh.c:13060
 msgid "Failed to allocate memory"
 msgstr "Impossible d'allouer de la mémoire"
 
-#: tools/virsh.c:6600 tools/virsh.c:6869
+#: tools/virsh.c:1441 tools/virsh.c:12602 tools/virsh.c:13065
 msgid "Failed to create XML"
 msgstr "Impossible de créer XML"
 
-#: tools/virsh.c:1434
+#: tools/virsh.c:1446
 msgid "Failed to update interface link state"
 msgstr ""
 
-#: tools/virsh.c:1437 tools/virsh.c:11219
+#: tools/virsh.c:1449 tools/virsh.c:12292
 msgid "Device updated successfully\n"
 msgstr ""
 
-#: tools/virsh.c:1456
+#: tools/virsh.c:1468
 msgid "get link state of a virtual interface"
 msgstr ""
 
-#: tools/virsh.c:1457
+#: tools/virsh.c:1469
 msgid "Get link state of a domain's virtual interface."
 msgstr ""
 
-#: tools/virsh.c:1464
+#: tools/virsh.c:1476
 msgid "Get persistent interface state"
 msgstr ""
 
-#: tools/virsh.c:1537
+#: tools/virsh.c:1549
 #, c-format
 msgid "Interface with address '%s' not found."
 msgstr ""
 
-#: tools/virsh.c:891
+#: tools/virsh.c:1584
 msgid "get memory statistics for a domain"
 msgstr ""
 
-#: tools/virsh.c:892
+#: tools/virsh.c:1585
 msgid "Get memory statistics for a runnng domain."
 msgstr ""
 
-#: tools/virsh.c:917
+#: tools/virsh.c:1610
 #, c-format
 msgid "Failed to get memory statistics for domain %s"
 msgstr ""
 
-#: tools/virsh.c:1628
+#: tools/virsh.c:1640
 msgid "domain block device size information"
 msgstr ""
 
-#: tools/virsh.c:1629
+#: tools/virsh.c:1641
 msgid "Get block device size info for a domain."
 msgstr ""
 
-#: tools/virsh.c:4530 tools/virsh.c:5126
+#: tools/virsh.c:1675 tools/virsh.c:9466 tools/virsh.c:10376
 msgid "Capacity:"
 msgstr "Capacité :"
 
-#: tools/virsh.c:4533 tools/virsh.c:5129
+#: tools/virsh.c:1676 tools/virsh.c:9469 tools/virsh.c:10379
 msgid "Allocation:"
 msgstr "Allocation :"
 
-#: tools/virsh.c:1665
+#: tools/virsh.c:1677
 msgid "Physical:"
 msgstr ""
 
-#: tools/virsh.c:1675
+#: tools/virsh.c:1687
 msgid "list all domain blocks"
 msgstr ""
 
-#: tools/virsh.c:1676
+#: tools/virsh.c:1688
 msgid "Get the names of block devices for a domain."
 msgstr ""
 
-#: tools/virsh.c:1683
+#: tools/virsh.c:1695
 msgid "get inactive rather than running configuration"
 msgstr ""
 
-#: tools/virsh.c:1721
+#: tools/virsh.c:1733
 msgid "Target"
 msgstr ""
 
-#: tools/virsh.c:1721
+#: tools/virsh.c:1733
 msgid "Source"
 msgstr ""
 
-#: tools/virsh.c:945
+#: tools/virsh.c:1767
 msgid "suspend a domain"
 msgstr "suspendre un domaine"
 
-#: tools/virsh.c:946
+#: tools/virsh.c:1768
 msgid "Suspend a running domain."
 msgstr "Suspendre un domaine en cours d'exécution"
 
-#: tools/virsh.c:969
+#: tools/virsh.c:1791
 #, c-format
 msgid "Domain %s suspended\n"
 msgstr "Domaine %s suspendu\n"
 
-#: tools/virsh.c:971
+#: tools/virsh.c:1793
 #, c-format
 msgid "Failed to suspend domain %s"
 msgstr "Impossible de suspendre le domaine %s"
 
-#: tools/virsh.c:983
+#: tools/virsh.c:1805
 msgid "create a domain from an XML file"
 msgstr "créer un domaine depuis un fichier XML"
 
-#: tools/virsh.c:984
+#: tools/virsh.c:1806
 msgid "Create a domain."
 msgstr "Créer un domaine"
 
-#: tools/virsh.c:989 tools/virsh.c:1046
+#: tools/virsh.c:1811 tools/virsh.c:1874
 msgid "file containing an XML domain description"
 msgstr "fichier contenant la description XML d'un domaine"
 
-#: tools/virsh.c:991 tools/virsh.c:1151
+#: tools/virsh.c:1813 tools/virsh.c:2096
 msgid "attach to console after creation"
 msgstr ""
 
-#: tools/virsh.c:1803 tools/virsh.c:2086
+#: tools/virsh.c:1815 tools/virsh.c:2098
 msgid "leave the guest paused after creation"
 msgstr ""
 
-#: tools/virsh.c:1804 tools/virsh.c:2088
+#: tools/virsh.c:1816 tools/virsh.c:2100
 msgid "automatically destroy the guest when virsh disconnects"
 msgstr ""
 
-#: tools/virsh.c:1022
+#: tools/virsh.c:1850
 #, c-format
 msgid "Domain %s created from %s\n"
 msgstr "Domaine %s créé depuis %s\n"
 
-#: tools/virsh.c:1030
+#: tools/virsh.c:1858
 #, c-format
 msgid "Failed to create domain from %s"
 msgstr "Impossible de créer le domaine depuis %s"
 
-#: tools/virsh.c:1040
+#: tools/virsh.c:1868
 msgid "define (but don't start) a domain from an XML file"
 msgstr "définir (mais ne pas démarrer) un domaine depuis un fichier XML"
 
-#: tools/virsh.c:1041
+#: tools/virsh.c:1869
 msgid "Define a domain."
 msgstr "Définir un domaine"
 
-#: tools/virsh.c:1073
+#: tools/virsh.c:1899
 #, c-format
 msgid "Domain %s defined from %s\n"
 msgstr "Domaine %s défini depuis %s\n"
 
-#: tools/virsh.c:1077
+#: tools/virsh.c:1903
 #, c-format
 msgid "Failed to define domain from %s"
 msgstr "Impossible de définir le domaine depuis %s"
 
-#: tools/virsh.c:1901
+#: tools/virsh.c:1913
 msgid "undefine a domain"
 msgstr ""
 
-#: tools/virsh.c:1903
+#: tools/virsh.c:1915
 msgid "Undefine an inactive domain, or convert persistent to transient."
 msgstr ""
 
-#: tools/virsh.c:1093 tools/virsh.c:2467
+#: tools/virsh.c:1920 tools/virsh.c:5513
 msgid "domain name or uuid"
 msgstr "nom du domaine ou UUID"
 
-#: tools/virsh.c:1909
+#: tools/virsh.c:1921
 msgid "remove domain managed state file"
 msgstr ""
 
-#: tools/virsh.c:1911
+#: tools/virsh.c:1923
 msgid "remove all domain snapshot metadata, if inactive"
 msgstr ""
 
-#: tools/virsh.c:2048
+#: tools/virsh.c:2060
 #, c-format
 msgid "Unable to remove metadata of %d snapshots"
 msgstr ""
 
-#: tools/virsh.c:2049
+#: tools/virsh.c:2061
 #, c-format
 msgid "Refusing to undefine while %d snapshots exist"
 msgstr ""
 
-#: tools/virsh.c:1128
+#: tools/virsh.c:2070
 #, c-format
 msgid "Domain %s has been undefined\n"
 msgstr "Le domaine %s a été supprimé\n"
 
-#: tools/virsh.c:1130
+#: tools/virsh.c:2073
 #, c-format
 msgid "Failed to undefine domain %s"
 msgstr "Impossible de supprimer le domaine %s"
 
-#: tools/virsh.c:1143
+#: tools/virsh.c:2086
 msgid "start a (previously defined) inactive domain"
 msgstr "démarrer un domaine (précédemment défini)"
 
-#: tools/virsh.c:2075
+#: tools/virsh.c:2087
 msgid ""
 "Start a domain, either from the last managedsave\n"
 "    state, or via a fresh boot if no managedsave state\n"
 "    is present."
 msgstr ""
 
-#: tools/virsh.c:1149
+#: tools/virsh.c:2094
 msgid "name of the inactive domain"
 msgstr "nom du domaine inactif"
 
-#: tools/virsh.c:2090
+#: tools/virsh.c:2102
 msgid "avoid file system cache when loading"
 msgstr ""
 
-#: tools/virsh.c:2092
+#: tools/virsh.c:2104
 msgid "force fresh boot by discarding any managed save"
 msgstr ""
 
-#: tools/virsh.c:1172
+#: tools/virsh.c:2127
 msgid "Domain is already active"
 msgstr "Le domaine est déjà actif"
 
-#: tools/virsh.c:1185
+#: tools/virsh.c:2169
 #, c-format
 msgid "Failed to start domain %s"
 msgstr "Impossible de démarrer le domaine %s"
 
-#: tools/virsh.c:1178
+#: tools/virsh.c:2174
 #, c-format
 msgid "Domain %s started\n"
 msgstr "Domaine %s démarré\n"
 
-#: tools/virsh.c:1196
+#: tools/virsh.c:2192
 msgid "save a domain state to a file"
 msgstr "enregistrer l'état du domaine dans un fichier"
 
-#: tools/virsh.c:2181
+#: tools/virsh.c:2193
 msgid "Save the RAM state of a running domain."
 msgstr ""
 
-#: tools/virsh.c:2186 tools/virsh.c:2460 tools/virsh.c:2891
+#: tools/virsh.c:2198 tools/virsh.c:2472 tools/virsh.c:2903
 msgid "avoid file system cache when saving"
 msgstr ""
 
-#: tools/virsh.c:1203
+#: tools/virsh.c:2200
 msgid "where to save the data"
 msgstr "où enregistrer les données"
 
-#: tools/virsh.c:2190 tools/virsh.c:2305 tools/virsh.c:2826 tools/virsh.c:5498
+#: tools/virsh.c:2202 tools/virsh.c:2317 tools/virsh.c:2838 tools/virsh.c:5600
 msgid "filename containing updated XML for the target"
 msgstr ""
 
-#: tools/virsh.c:2191 tools/virsh.c:2306 tools/virsh.c:2363
+#: tools/virsh.c:2203 tools/virsh.c:2318 tools/virsh.c:2375
 msgid "set domain to be running on restore"
 msgstr ""
 
-#: tools/virsh.c:2192 tools/virsh.c:2307 tools/virsh.c:2364
+#: tools/virsh.c:2204 tools/virsh.c:2319 tools/virsh.c:2376
 msgid "set domain to be paused on restore"
 msgstr ""
 
-#: tools/virsh.c:2221 tools/virsh.c:2855 tools/virsh.c:5543
+#: tools/virsh.c:2233 tools/virsh.c:2867 tools/virsh.c:5645
 msgid "malformed xml argument"
 msgstr ""
 
-#: tools/virsh.c:1227
+#: tools/virsh.c:2247
 #, c-format
 msgid "Failed to save domain %s to %s"
 msgstr "Impossible d'enregistrer le domaine %s dans %s"
 
-#: tools/virsh.c:1225
+#: tools/virsh.c:2251
 #, c-format
 msgid "Domain %s saved to %s\n"
 msgstr "Domaine %s enregistré dans %s\n"
 
-#: tools/virsh.c:2252
+#: tools/virsh.c:2264
 msgid "saved state domain information in XML"
 msgstr ""
 
-#: tools/virsh.c:2253
+#: tools/virsh.c:2265
 msgid ""
 "Output the domain information for a saved state file,\n"
 "as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:2259
+#: tools/virsh.c:2271
 msgid "saved state file to read"
 msgstr ""
 
-#: tools/virsh.c:2298
+#: tools/virsh.c:2272 tools/virsh.c:5340 tools/virsh.c:14188
+#: tools/virsh.c:14725
 msgid "include security sensitive information in XML dump"
 msgstr ""
 
-#: tools/virsh.c:2297
+#: tools/virsh.c:2309
 msgid "redefine the XML for a domain's saved state file"
 msgstr ""
 
-#: tools/virsh.c:2298
+#: tools/virsh.c:2310
 msgid "Replace the domain XML associated with a saved state file"
 msgstr ""
 
-#: tools/virsh.c:2303
+#: tools/virsh.c:2315
 msgid "saved state file to modify"
 msgstr ""
 
-#: tools/virsh.c:2332
+#: tools/virsh.c:2344
 msgid "malformed or missing xml argument"
 msgstr ""
 
-#: tools/virsh.c:2340 tools/virsh.c:2430 tools/virsh.c:13050
+#: tools/virsh.c:2352 tools/virsh.c:2442 tools/virsh.c:14129
 #, c-format
 msgid "Failed to update %s"
 msgstr ""
 
-#: tools/virsh.c:2344
+#: tools/virsh.c:2356
 #, c-format
 msgid "State file %s updated.\n"
 msgstr ""
 
-#: tools/virsh.c:2356
+#: tools/virsh.c:2368
 msgid "edit XML for a domain's saved state file"
 msgstr ""
 
-#: tools/virsh.c:2357
+#: tools/virsh.c:2369
 msgid "Edit the domain XML associated with a saved state file"
 msgstr ""
 
-#: tools/virsh.c:2362
+#: tools/virsh.c:2374
 msgid "saved state file to edit"
 msgstr ""
 
-#: tools/virsh.c:2389
+#: tools/virsh.c:2401
 msgid "--running and --saved are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:2421
+#: tools/virsh.c:2433
 #, c-format
 msgid "Saved image %s XML configuration not changed.\n"
 msgstr ""
 
-#: tools/virsh.c:2434
+#: tools/virsh.c:2446
 #, c-format
 msgid "State file %s edited.\n"
 msgstr ""
 
-#: tools/virsh.c:2451
+#: tools/virsh.c:2463
 msgid "managed save of a domain state"
 msgstr ""
 
-#: tools/virsh.c:2452
+#: tools/virsh.c:2464
 msgid ""
 "Save and destroy a running domain, so it can be restarted from\n"
 "    the same state at a later time.  When the virsh 'start'\n"
@@ -19207,873 +19873,874 @@
 "    be started from this saved state."
 msgstr ""
 
-#: tools/virsh.c:2462
+#: tools/virsh.c:2474
 msgid "set domain to be running on next start"
 msgstr ""
 
-#: tools/virsh.c:2463
+#: tools/virsh.c:2475
 msgid "set domain to be paused on next start"
 msgstr ""
 
-#: tools/virsh.c:2489
+#: tools/virsh.c:2501
 #, c-format
 msgid "Failed to save domain %s state"
 msgstr ""
 
-#: tools/virsh.c:2493
+#: tools/virsh.c:2505
 #, c-format
 msgid "Domain %s state saved by libvirt\n"
 msgstr ""
 
-#: tools/virsh.c:2505
+#: tools/virsh.c:2517
 msgid "Remove managed save of a domain"
 msgstr ""
 
-#: tools/virsh.c:2506
+#: tools/virsh.c:2518
 msgid "Remove an existing managed save state file from a domain"
 msgstr ""
 
-#: tools/virsh.c:2531
+#: tools/virsh.c:2543
 msgid "Failed to check for domain managed save image"
 msgstr ""
 
-#: tools/virsh.c:2537
+#: tools/virsh.c:2549
 #, c-format
 msgid "Failed to remove managed save image for domain %s"
 msgstr ""
 
-#: tools/virsh.c:2542
+#: tools/virsh.c:2554
 #, c-format
 msgid "Removed managedsave image for domain %s"
 msgstr ""
 
-#: tools/virsh.c:2545
+#: tools/virsh.c:2557
 #, c-format
 msgid "Domain %s has no manage save image; removal skipped"
 msgstr ""
 
-#: tools/virsh.c:1239
+#: tools/virsh.c:2571
 msgid "show/set scheduler parameters"
 msgstr "montrer/définir les paramètres du planificateur"
 
-#: tools/virsh.c:1240
+#: tools/virsh.c:2572
 msgid "Show/Set scheduler parameters."
 msgstr "Montrer/Définir les paramètres du planificateur."
 
-#: tools/virsh.c:1246
+#: tools/virsh.c:2578
 msgid "parameter=value"
 msgstr ""
 
-#: tools/virsh.c:1247
+#: tools/virsh.c:2579
 msgid "weight for XEN_CREDIT"
 msgstr "poids pour XEN_CREDIT"
 
-#: tools/virsh.c:1248
+#: tools/virsh.c:2580
 msgid "cap for XEN_CREDIT"
 msgstr "plafond pour XEN_CREDIT"
 
-#: tools/virsh.c:2569
+#: tools/virsh.c:2581
 msgid "get/set current scheduler info"
 msgstr ""
 
-#: tools/virsh.c:2570
+#: tools/virsh.c:2582
 msgid "get/set value to be used on next boot"
 msgstr ""
 
-#: tools/virsh.c:2571
+#: tools/virsh.c:2583
 msgid "get/set value from running domain"
 msgstr ""
 
-#: tools/virsh.c:1266
+#: tools/virsh.c:2599
 msgid "Invalid value of weight"
 msgstr "Valeur de poids incorrecte"
 
-#: tools/virsh.c:1281
+#: tools/virsh.c:2613
 msgid "Invalid value of cap"
 msgstr "Valeur de plafond incorrecte"
 
-#: tools/virsh.c:1293
+#: tools/virsh.c:2625
 msgid "Invalid syntax for --set, expecting name=value"
 msgstr ""
 
-#: tools/virsh.c:1308
+#: tools/virsh.c:2640
 msgid "Invalid value for parameter, expecting an int"
 msgstr ""
 
-#: tools/virsh.c:1315
+#: tools/virsh.c:2647
 msgid "Invalid value for parameter, expecting an unsigned int"
 msgstr ""
 
-#: tools/virsh.c:2642
+#: tools/virsh.c:2654
 msgid "Invalid value for parameter, expecting a long long"
 msgstr ""
 
-#: tools/virsh.c:1329
+#: tools/virsh.c:2661
 msgid "Invalid value for parameter, expecting an unsigned long long"
 msgstr ""
 
-#: tools/virsh.c:1335
+#: tools/virsh.c:2667
 msgid "Invalid value for parameter, expecting a double"
 msgstr ""
 
-#: tools/virsh.c:2686 tools/virsh.c:4053 tools/virsh.c:4286 tools/virsh.c:4500
-#: tools/virsh.c:4589 tools/virsh.c:4674 tools/virsh.c:4830
+#: tools/virsh.c:2698 tools/virsh.c:4065 tools/virsh.c:4298 tools/virsh.c:4512
+#: tools/virsh.c:4601 tools/virsh.c:4689 tools/virsh.c:4869 tools/virsh.c:6283
 msgid "--current must be specified exclusively"
 msgstr ""
 
-#: tools/virsh.c:1369 tools/virsh.c:1373
+#: tools/virsh.c:2718 tools/virsh.c:2722
 msgid "Scheduler"
 msgstr "Planificateur"
 
-#: tools/virsh.c:1373
+#: tools/virsh.c:2722
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: tools/virsh.c:2767
+#: tools/virsh.c:2779
 #, c-format
 msgid "invalid scheduler option: %s"
 msgstr ""
 
-#: tools/virsh.c:2774
+#: tools/virsh.c:2786
 msgid "cannot query both live and config at once"
 msgstr ""
 
-#: tools/virsh.c:1445
+#: tools/virsh.c:2828
 msgid "restore a domain from a saved state in a file"
 msgstr "restaurer un domaine à partir d'un état sauvé dans un fichier"
 
-#: tools/virsh.c:1446
+#: tools/virsh.c:2829
 msgid "Restore a domain."
 msgstr "Restaurer un domaine."
 
-#: tools/virsh.c:1451
+#: tools/virsh.c:2834
 msgid "the state to restore"
 msgstr "l'état à restaurer"
 
-#: tools/virsh.c:2824
+#: tools/virsh.c:2836
 msgid "avoid file system cache when restoring"
 msgstr ""
 
-#: tools/virsh.c:2827
+#: tools/virsh.c:2839
 msgid "restore domain into running state"
 msgstr ""
 
-#: tools/virsh.c:2828
+#: tools/virsh.c:2840
 msgid "restore domain into paused state"
 msgstr ""
 
-#: tools/virsh.c:1472
+#: tools/virsh.c:2878
 #, c-format
 msgid "Failed to restore domain from %s"
 msgstr "Impossible de restaurer le domaine depuis %s"
 
-#: tools/virsh.c:1470
+#: tools/virsh.c:2882
 #, c-format
 msgid "Domain restored from %s\n"
 msgstr "Domaine restauré depuis %s\n"
 
-#: tools/virsh.c:1482
+#: tools/virsh.c:2894
 msgid "dump the core of a domain to a file for analysis"
 msgstr "vider l'espace mémoire d'un domaine dans un fichier pour analyse"
 
-#: tools/virsh.c:1483
+#: tools/virsh.c:2895
 msgid "Core dump a domain."
 msgstr "Vider l'espace mémoire d'un domaine."
 
-#: tools/virsh.c:1488
+#: tools/virsh.c:2900
 msgid "perform a live core dump if supported"
 msgstr ""
 
-#: tools/virsh.c:1489
+#: tools/virsh.c:2901
 msgid "crash the domain after core dump"
 msgstr ""
 
-#: tools/virsh.c:2892
+#: tools/virsh.c:2904
 msgid "reset the domain after core dump"
 msgstr ""
 
-#: tools/virsh.c:1491
+#: tools/virsh.c:2906
 msgid "where to dump the core"
 msgstr "emplacement où vider l'espace mémoire"
 
-#: tools/virsh.c:1521
+#: tools/virsh.c:2938
 #, c-format
 msgid "Failed to core dump domain %s to %s"
 msgstr "Impossible de vider l'espace mémoire du domaine %s dans %s"
 
-#: tools/virsh.c:1519
+#: tools/virsh.c:2942
 #, c-format
 msgid "Domain %s dumped to %s\n"
 msgstr ""
 
-#: tools/virsh.c:2939
+#: tools/virsh.c:2951
 msgid ""
 "take a screenshot of a current domain console and store it into a file"
 msgstr ""
 
-#: tools/virsh.c:2941
+#: tools/virsh.c:2953
 msgid "screenshot of a current domain console"
 msgstr ""
 
-#: tools/virsh.c:2947
+#: tools/virsh.c:2959
 msgid "where to store the screenshot"
 msgstr ""
 
-#: tools/virsh.c:2948
+#: tools/virsh.c:2960
 msgid "ID of a screen to take screenshot of"
 msgstr ""
 
-#: tools/virsh.c:2978
+#: tools/virsh.c:2990
 msgid "Invalid domain supplied"
 msgstr ""
 
-#: tools/virsh.c:3020 tools/virsh.c:9287 tools/virsh.c:9378
+#: tools/virsh.c:3032 tools/virsh.c:10102 tools/virsh.c:10193
 msgid "file must not be empty"
 msgstr ""
 
-#: tools/virsh.c:3025
+#: tools/virsh.c:3037
 msgid "invalid screen ID"
 msgstr ""
 
-#: tools/virsh.c:3036
+#: tools/virsh.c:3048
 #, c-format
 msgid "could not take a screenshot of %s"
 msgstr ""
 
-#: tools/virsh.c:3049
+#: tools/virsh.c:3061
 #, c-format
 msgid "cannot create file %s"
 msgstr ""
 
-#: tools/virsh.c:3057
+#: tools/virsh.c:3069
 #, c-format
 msgid "could not receive data from domain %s"
 msgstr ""
 
-#: tools/virsh.c:3062 tools/virsh.c:9308 tools/virsh.c:9404
+#: tools/virsh.c:3074 tools/virsh.c:10123 tools/virsh.c:10219
 #, c-format
 msgid "cannot close file %s"
 msgstr ""
 
-#: tools/virsh.c:3067
+#: tools/virsh.c:3079
 #, c-format
 msgid "cannot close stream on domain %s"
 msgstr ""
 
-#: tools/virsh.c:3071
+#: tools/virsh.c:3083
 #, c-format
 msgid "Screenshot saved to %s, with type of %s"
 msgstr ""
 
-#: tools/virsh.c:1533
+#: tools/virsh.c:3102
 msgid "resume a domain"
 msgstr "réactiver un domaine"
 
-#: tools/virsh.c:1534
+#: tools/virsh.c:3103
 msgid "Resume a previously suspended domain."
 msgstr "Réactiver un domaine précédemment suspendu"
 
-#: tools/virsh.c:1557
+#: tools/virsh.c:3126
 #, c-format
 msgid "Domain %s resumed\n"
 msgstr "Domaine %s réactivé\n"
 
-#: tools/virsh.c:1559
+#: tools/virsh.c:3128
 #, c-format
 msgid "Failed to resume domain %s"
 msgstr "Impossible de réactiver le domaine %s"
 
-#: tools/virsh.c:1571
+#: tools/virsh.c:3140
 msgid "gracefully shutdown a domain"
 msgstr "arrêter un domaine proprement"
 
-#: tools/virsh.c:1572
+#: tools/virsh.c:3141
 msgid "Run shutdown in the target domain."
 msgstr "Exécuter la commande shutdown dans le domaine cible"
 
-#: tools/virsh.c:1595
+#: tools/virsh.c:3164
 #, c-format
 msgid "Domain %s is being shutdown\n"
 msgstr "Le domaine %s est en cours d'arrêt\n"
 
-#: tools/virsh.c:1597
+#: tools/virsh.c:3166
 #, c-format
 msgid "Failed to shutdown domain %s"
 msgstr "Impossible d'arrêter le domaine %s"
 
-#: tools/virsh.c:1609
+#: tools/virsh.c:3178
 msgid "reboot a domain"
 msgstr "redémarrer un domaine"
 
-#: tools/virsh.c:1610
+#: tools/virsh.c:3179
 msgid "Run a reboot command in the target domain."
 msgstr "Exécuter une commande de redémarrage dans le domaine cible"
 
-#: tools/virsh.c:1633
+#: tools/virsh.c:3202
 #, c-format
 msgid "Domain %s is being rebooted\n"
 msgstr "Le domaine %s est en cours de redémarrage\n"
 
-#: tools/virsh.c:1635
+#: tools/virsh.c:3204
 #, c-format
 msgid "Failed to reboot domain %s"
 msgstr "Impossible de redémarrer le domaine %s"
 
-#: tools/virsh.c:3204
+#: tools/virsh.c:3216
 msgid "reset a domain"
 msgstr ""
 
-#: tools/virsh.c:3205
+#: tools/virsh.c:3217
 msgid "Reset the target domain as if by power button"
 msgstr ""
 
-#: tools/virsh.c:3228
+#: tools/virsh.c:3240
 #, c-format
 msgid "Domain %s was reset\n"
 msgstr ""
 
-#: tools/virsh.c:3230
+#: tools/virsh.c:3242
 #, c-format
 msgid "Failed to reset domain %s"
 msgstr ""
 
-#: tools/virsh.c:3242
+#: tools/virsh.c:3254
 msgid "destroy (stop) a domain"
 msgstr ""
 
-#: tools/virsh.c:3244
+#: tools/virsh.c:3256
 msgid "Forcefully stop a given domain, but leave its resources intact."
 msgstr ""
 
-#: tools/virsh.c:1671
+#: tools/virsh.c:3279
 #, c-format
 msgid "Domain %s destroyed\n"
 msgstr "Domaine %s détruit\n"
 
-#: tools/virsh.c:1673
+#: tools/virsh.c:3281
 #, c-format
 msgid "Failed to destroy domain %s"
 msgstr "Impossible de détruire le domaine %s"
 
-#: tools/virsh.c:1685
+#: tools/virsh.c:3293
 msgid "domain information"
 msgstr "informations du domaine"
 
-#: tools/virsh.c:1686
+#: tools/virsh.c:3294
 msgid "Returns basic information about the domain."
 msgstr "Renvoyer un résumé des informations sur le domaine."
 
-#: tools/virsh.c:1714 tools/virsh.c:1716
+#: tools/virsh.c:3325 tools/virsh.c:3327
 msgid "Id:"
 msgstr "ID :"
 
-#: tools/virsh.c:1717 tools/virsh.c:4500 tools/virsh.c:5116
+#: tools/virsh.c:3328 tools/virsh.c:9414 tools/virsh.c:10353
 msgid "Name:"
 msgstr "Nom :"
 
-#: tools/virsh.c:1720 tools/virsh.c:4503
+#: tools/virsh.c:3331 tools/virsh.c:9417
 msgid "UUID:"
 msgstr "UUID :"
 
-#: tools/virsh.c:1723
+#: tools/virsh.c:3334
 msgid "OS Type:"
 msgstr "Type de SE :"
 
-#: tools/virsh.c:1728 tools/virsh.c:1886 tools/virsh.c:4510 tools/virsh.c:4514
-#: tools/virsh.c:4518 tools/virsh.c:4522
+#: tools/virsh.c:3339 tools/virsh.c:3969 tools/virsh.c:3998 tools/virsh.c:9424
+#: tools/virsh.c:9428 tools/virsh.c:9432 tools/virsh.c:9436 tools/virsh.c:9440
 msgid "State:"
 msgstr "État :"
 
-#: tools/virsh.c:1731 tools/virsh.c:2248
+#: tools/virsh.c:3342 tools/virsh.c:5037
 msgid "CPU(s):"
 msgstr "CPU :"
 
-#: tools/virsh.c:1738 tools/virsh.c:1893
+#: tools/virsh.c:3349 tools/virsh.c:3976
 msgid "CPU time:"
 msgstr "Temps CPU :"
 
-#: tools/virsh.c:1742 tools/virsh.c:1745
+#: tools/virsh.c:3353 tools/virsh.c:3356
 msgid "Max memory:"
 msgstr "Mémoire Max :"
 
-#: tools/virsh.c:1746
+#: tools/virsh.c:3357
 msgid "no limit"
 msgstr "aucune limite"
 
-#: tools/virsh.c:1748
+#: tools/virsh.c:3359
 msgid "Used memory:"
 msgstr "Mémoire utilisée :"
 
-#: tools/virsh.c:3359 tools/virsh.c:3361 tools/virsh.c:6288 tools/virsh.c:6290
-#: tools/virsh.c:8635 tools/virsh.c:8637
+#: tools/virsh.c:3371 tools/virsh.c:3373 tools/virsh.c:6690 tools/virsh.c:6692
+#: tools/virsh.c:9450 tools/virsh.c:9452
 msgid "Persistent:"
 msgstr ""
 
-#: tools/virsh.c:3359 tools/virsh.c:3371 tools/virsh.c:6288 tools/virsh.c:8159
-#: tools/virsh.c:8174 tools/virsh.c:8176 tools/virsh.c:8177 tools/virsh.c:8178
-#: tools/virsh.c:8635 tools/virsh.c:9557 tools/virsh.c:9699 tools/virsh.c:9706
-#: tools/virsh.c:9707 tools/virsh.c:9708 tools/virsh.c:9724
-#: tools/virsh.c:15766 tools/virsh.c:15846
+#: tools/virsh.c:3371 tools/virsh.c:3383 tools/virsh.c:6690 tools/virsh.c:8974
+#: tools/virsh.c:8989 tools/virsh.c:8991 tools/virsh.c:8992 tools/virsh.c:8993
+#: tools/virsh.c:9450 tools/virsh.c:10372 tools/virsh.c:10514
+#: tools/virsh.c:10521 tools/virsh.c:10522 tools/virsh.c:10523
+#: tools/virsh.c:10539 tools/virsh.c:16855 tools/virsh.c:16935
 msgid "unknown"
 msgstr ""
 
-#: tools/virsh.c:3361 tools/virsh.c:3374 tools/virsh.c:6284 tools/virsh.c:6290
-#: tools/virsh.c:6295 tools/virsh.c:6491 tools/virsh.c:6514 tools/virsh.c:8151
-#: tools/virsh.c:8162 tools/virsh.c:8637 tools/virsh.c:8646
-#: tools/virsh.c:15800
+#: tools/virsh.c:3373 tools/virsh.c:3386 tools/virsh.c:6686 tools/virsh.c:6692
+#: tools/virsh.c:6697 tools/virsh.c:6893 tools/virsh.c:6916 tools/virsh.c:8966
+#: tools/virsh.c:8977 tools/virsh.c:9452 tools/virsh.c:9461
+#: tools/virsh.c:16889
 msgid "yes"
 msgstr ""
 
-#: tools/virsh.c:3361 tools/virsh.c:3374 tools/virsh.c:6284 tools/virsh.c:6290
-#: tools/virsh.c:6295 tools/virsh.c:6491 tools/virsh.c:6514 tools/virsh.c:8151
-#: tools/virsh.c:8162 tools/virsh.c:8637 tools/virsh.c:8646
-#: tools/virsh.c:15800
+#: tools/virsh.c:3373 tools/virsh.c:3386 tools/virsh.c:6686 tools/virsh.c:6692
+#: tools/virsh.c:6697 tools/virsh.c:6893 tools/virsh.c:6916 tools/virsh.c:8966
+#: tools/virsh.c:8977 tools/virsh.c:9452 tools/virsh.c:9461
+#: tools/virsh.c:16889
 msgid "no"
 msgstr ""
 
-#: tools/virsh.c:1756
+#: tools/virsh.c:3377 tools/virsh.c:6695 tools/virsh.c:6697 tools/virsh.c:9459
+#: tools/virsh.c:9461
 msgid "Autostart:"
 msgstr ""
 
-#: tools/virsh.c:1757
+#: tools/virsh.c:3378
 msgid "enable"
 msgstr ""
 
-#: tools/virsh.c:1757
+#: tools/virsh.c:3378
 msgid "disable"
 msgstr ""
 
-#: tools/virsh.c:3371 tools/virsh.c:3373
+#: tools/virsh.c:3383 tools/virsh.c:3385
 msgid "Managed save:"
 msgstr ""
 
-#: tools/virsh.c:1770
+#: tools/virsh.c:3401
 msgid "Security model:"
 msgstr ""
 
-#: tools/virsh.c:1771
+#: tools/virsh.c:3402
 msgid "Security DOI:"
 msgstr ""
 
-#: tools/virsh.c:1780
+#: tools/virsh.c:3416
 msgid "Security label:"
 msgstr ""
 
-#: tools/virsh.c:3419
+#: tools/virsh.c:3431
 msgid "domain job information"
 msgstr ""
 
-#: tools/virsh.c:3420
+#: tools/virsh.c:3432
 msgid "Returns information about jobs running on a domain."
 msgstr ""
 
-#: tools/virsh.c:3447
+#: tools/virsh.c:3459
 msgid "Job type:"
 msgstr ""
 
-#: tools/virsh.c:3450
+#: tools/virsh.c:3462
 msgid "Bounded"
 msgstr ""
 
-#: tools/virsh.c:3454
+#: tools/virsh.c:3466
 msgid "Unbounded"
 msgstr ""
 
-#: tools/virsh.c:3459
+#: tools/virsh.c:3471
 msgid "None"
 msgstr ""
 
-#: tools/virsh.c:3463
+#: tools/virsh.c:3475
 msgid "Time elapsed:"
 msgstr ""
 
-#: tools/virsh.c:3465
+#: tools/virsh.c:3477
 msgid "Time remaining:"
 msgstr ""
 
-#: tools/virsh.c:3468
+#: tools/virsh.c:3480
 msgid "Data processed:"
 msgstr ""
 
-#: tools/virsh.c:3470
+#: tools/virsh.c:3482
 msgid "Data remaining:"
 msgstr ""
 
-#: tools/virsh.c:3472
+#: tools/virsh.c:3484
 msgid "Data total:"
 msgstr ""
 
-#: tools/virsh.c:3476
+#: tools/virsh.c:3488
 msgid "Memory processed:"
 msgstr ""
 
-#: tools/virsh.c:3478
+#: tools/virsh.c:3490
 msgid "Memory remaining:"
 msgstr ""
 
-#: tools/virsh.c:3480
+#: tools/virsh.c:3492
 msgid "Memory total:"
 msgstr ""
 
-#: tools/virsh.c:3484
+#: tools/virsh.c:3496
 msgid "File processed:"
 msgstr ""
 
-#: tools/virsh.c:3486
+#: tools/virsh.c:3498
 msgid "File remaining:"
 msgstr ""
 
-#: tools/virsh.c:3488
+#: tools/virsh.c:3500
 msgid "File total:"
 msgstr ""
 
-#: tools/virsh.c:3502
+#: tools/virsh.c:3514
 msgid "abort active domain job"
 msgstr ""
 
-#: tools/virsh.c:3503
+#: tools/virsh.c:3515
 msgid "Aborts the currently running domain job"
 msgstr ""
 
-#: tools/virsh.c:1793
+#: tools/virsh.c:3547
 msgid "NUMA free memory"
 msgstr "Mémoire NUMA disponible"
 
-#: tools/virsh.c:1794
+#: tools/virsh.c:3548
 msgid "display available free memory for the NUMA cell."
 msgstr "afficher la quantité de mémoire disponible pour les cellules NUMA."
 
-#: tools/virsh.c:1799
+#: tools/virsh.c:3553
 msgid "NUMA cell number"
 msgstr "numéro de cellule NUMA"
 
-#: tools/virsh.c:3542
+#: tools/virsh.c:3554
 msgid "show free memory for all NUMA cells"
 msgstr ""
 
-#: tools/virsh.c:3568
+#: tools/virsh.c:3580
 msgid "cell number has to be a number"
 msgstr ""
 
-#: tools/virsh.c:3574
+#: tools/virsh.c:3586
 msgid "--cellno and --all are mutually exclusive. Please choose only one."
 msgstr ""
 
-#: tools/virsh.c:3582 tools/virsh.c:3588
+#: tools/virsh.c:3594 tools/virsh.c:3600
 msgid "unable to get node capabilities"
 msgstr ""
 
-#: tools/virsh.c:3586
+#: tools/virsh.c:3598
 msgid "(capabilities)"
 msgstr ""
 
-#: tools/virsh.c:3595
+#: tools/virsh.c:3607
 msgid "could not get information about NUMA topology"
 msgstr ""
 
-#: tools/virsh.c:3607
+#: tools/virsh.c:3619
 msgid "conversion from string failed"
 msgstr ""
 
-#: tools/virsh.c:3615
+#: tools/virsh.c:3627
 #, c-format
 msgid "failed to get free memory for NUMA node number: %lu"
 msgstr ""
 
-#: tools/virsh.c:1825
+#: tools/virsh.c:3641 tools/virsh.c:3654
 msgid "Total"
 msgstr "Total"
 
-#: tools/virsh.c:3663
+#: tools/virsh.c:3675
 msgid "connection vcpu maximum"
 msgstr ""
 
-#: tools/virsh.c:3664
+#: tools/virsh.c:3676
 msgid "Show maximum number of virtual CPUs for guests on this connection."
 msgstr ""
 
-#: tools/virsh.c:3669
+#: tools/virsh.c:3681
 msgid "domain type"
 msgstr ""
 
-#: tools/virsh.c:3680
+#: tools/virsh.c:3692
 msgid "Invalid type"
 msgstr ""
 
-#: tools/virsh.c:3699
+#: tools/virsh.c:3711
 msgid "domain vcpu counts"
 msgstr ""
 
-#: tools/virsh.c:3700
+#: tools/virsh.c:3712
 msgid "Returns the number of virtual CPUs used by the domain."
 msgstr ""
 
-#: tools/virsh.c:3706
+#: tools/virsh.c:3718
 msgid "get maximum cap on vcpus"
 msgstr ""
 
-#: tools/virsh.c:3707
+#: tools/virsh.c:3719
 msgid "get number of currently active vcpus"
 msgstr ""
 
-#: tools/virsh.c:3708
+#: tools/virsh.c:3720
 msgid "get value from running domain"
 msgstr ""
 
-#: tools/virsh.c:3709
+#: tools/virsh.c:3721
 msgid "get value to be used on next boot"
 msgstr ""
 
-#: tools/virsh.c:3711
+#: tools/virsh.c:3723
 msgid "get value according to current domain state"
 msgstr ""
 
-#: tools/virsh.c:3734
+#: tools/virsh.c:3746
 #, c-format
 msgid ""
 "when using --%s, one of --config, --live, or --current must be specified"
 msgstr ""
 
-#: tools/virsh.c:3739
+#: tools/virsh.c:3751
 #, c-format
 msgid "when using --%s, either --maximum or --active must be specified"
 msgstr ""
 
-#: tools/virsh.c:3759
+#: tools/virsh.c:3771
 msgid "--maximum and --active cannot both be specified"
 msgstr ""
 
-#: tools/virsh.c:3764
+#: tools/virsh.c:3776
 msgid "--config, --live, and --current are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:3810 tools/virsh.c:3831
+#: tools/virsh.c:3822 tools/virsh.c:3843
 msgid "maximum"
 msgstr ""
 
-#: tools/virsh.c:3810 tools/virsh.c:3868
+#: tools/virsh.c:3822 tools/virsh.c:3880
 msgid "config"
 msgstr ""
 
-#: tools/virsh.c:3831 tools/virsh.c:3890
+#: tools/virsh.c:3843 tools/virsh.c:3902
 msgid "live"
 msgstr ""
 
-#: tools/virsh.c:3868 tools/virsh.c:3890
+#: tools/virsh.c:3880 tools/virsh.c:3902
 msgid "current"
 msgstr ""
 
-#: tools/virsh.c:3907
+#: tools/virsh.c:3919
 msgid "detailed domain vcpu information"
 msgstr ""
 
-#: tools/virsh.c:1837
+#: tools/virsh.c:3920
 msgid "Returns basic information about the domain virtual CPUs."
 msgstr ""
 "Renvoyer un résumé des informations sur les processeurs virtuels du domaine."
 
-#: tools/virsh.c:1884
+#: tools/virsh.c:3967 tools/virsh.c:3996 tools/virsh.c:4131
 msgid "VCPU:"
 msgstr "VCPU :"
 
-#: tools/virsh.c:1885
+#: tools/virsh.c:3968 tools/virsh.c:3997
 msgid "CPU:"
 msgstr "CPU :"
 
-#: tools/virsh.c:1895
+#: tools/virsh.c:3978 tools/virsh.c:4000
 msgid "CPU Affinity:"
 msgstr "Affinité CPU :"
 
-#: tools/virsh.c:3985 tools/virsh.c:3986 tools/virsh.c:3987
+#: tools/virsh.c:3997 tools/virsh.c:3998 tools/virsh.c:3999
 msgid "N/A"
 msgstr ""
 
-#: tools/virsh.c:3987
+#: tools/virsh.c:3999
 msgid "CPU time"
 msgstr ""
 
-#: tools/virsh.c:4013
+#: tools/virsh.c:4025
 msgid "control or query domain vcpu affinity"
 msgstr ""
 
-#: tools/virsh.c:1923
+#: tools/virsh.c:4026
 msgid "Pin domain VCPUs to host physical CPUs."
 msgstr "Épingler les VCPU d'un domaine pour héberger des CPU physiques."
 
-#: tools/virsh.c:1929
+#: tools/virsh.c:4032
 msgid "vcpu number"
 msgstr "numéro de VCPU"
 
-#: tools/virsh.c:4022
+#: tools/virsh.c:4034
 msgid "host cpu number(s) to set, or omit option to query"
 msgstr ""
 
-#: tools/virsh.c:4023 tools/virsh.c:4266 tools/virsh.c:4480 tools/virsh.c:4570
-#: tools/virsh.c:4651 tools/virsh.c:4807
+#: tools/virsh.c:4035 tools/virsh.c:4278 tools/virsh.c:4492 tools/virsh.c:4582
+#: tools/virsh.c:4665 tools/virsh.c:4846 tools/virsh.c:6259
 msgid "affect next boot"
 msgstr ""
 
-#: tools/virsh.c:4024 tools/virsh.c:4267 tools/virsh.c:4481 tools/virsh.c:4571
-#: tools/virsh.c:4652 tools/virsh.c:4808
+#: tools/virsh.c:4036 tools/virsh.c:4279 tools/virsh.c:4493 tools/virsh.c:4583
+#: tools/virsh.c:4666 tools/virsh.c:4847 tools/virsh.c:6260
 msgid "affect running domain"
 msgstr ""
 
-#: tools/virsh.c:4025 tools/virsh.c:4268 tools/virsh.c:4482 tools/virsh.c:4572
-#: tools/virsh.c:4653 tools/virsh.c:4809
+#: tools/virsh.c:4037 tools/virsh.c:4280 tools/virsh.c:4494 tools/virsh.c:4584
+#: tools/virsh.c:4667 tools/virsh.c:4848 tools/virsh.c:6261
 msgid "affect current domain"
 msgstr ""
 
-#: tools/virsh.c:4074
+#: tools/virsh.c:4086
 msgid "vcpupin: Missing cpulist."
 msgstr ""
 
-#: tools/virsh.c:1957
+#: tools/virsh.c:4095
 msgid "vcpupin: Invalid or missing vCPU number."
 msgstr "vcpupin : numéro de vCPU invalide ou manquant."
 
-#: tools/virsh.c:4094
+#: tools/virsh.c:4106
 msgid "vcpupin: failed to get domain information."
 msgstr ""
 
-#: tools/virsh.c:1980
+#: tools/virsh.c:4112
 msgid "vcpupin: Invalid vCPU number."
 msgstr ""
 
-#: tools/virsh.c:4119
+#: tools/virsh.c:4131
 msgid "CPU Affinity"
 msgstr ""
 
-#: tools/virsh.c:2036
+#: tools/virsh.c:4200 tools/virsh.c:4224
 #, c-format
 msgid "Physical CPU %d doesn't exist."
 msgstr "La CPU physique %d n'existe pas."
 
-#: tools/virsh.c:4248
+#: tools/virsh.c:4260
 msgid "cpulist: Invalid format."
 msgstr ""
 
-#: tools/virsh.c:2059
+#: tools/virsh.c:4269
 msgid "change number of virtual CPUs"
 msgstr "changer le nombre de processeurs virtuels"
 
-#: tools/virsh.c:2060
+#: tools/virsh.c:4270
 msgid "Change the number of virtual CPUs in the guest domain."
 msgstr "Changer le nombre de CPU virtuelles dans le domaine invité"
 
-#: tools/virsh.c:2066
+#: tools/virsh.c:4276
 msgid "number of virtual CPUs"
 msgstr "nombre de CPU virtuelles"
 
-#: tools/virsh.c:4265
+#: tools/virsh.c:4277
 msgid "set maximum limit on next boot"
 msgstr ""
 
-#: tools/virsh.c:4307
+#: tools/virsh.c:4319
 msgid "Invalid number of virtual CPUs"
 msgstr ""
 
-#: tools/virsh.c:4330
+#: tools/virsh.c:4342
 msgid "--maximum must be used with --config only"
 msgstr ""
 
-#: tools/virsh.c:4351
+#: tools/virsh.c:4363
 msgid "Inject NMI to the guest"
 msgstr ""
 
-#: tools/virsh.c:4352
+#: tools/virsh.c:4364
 msgid "Inject NMI to the guest domain."
 msgstr ""
 
-#: tools/virsh.c:4385
+#: tools/virsh.c:4397
 msgid "Send keycodes to the guest"
 msgstr ""
 
-#: tools/virsh.c:4386
+#: tools/virsh.c:4398
 msgid "Send keycodes (integers or symbolic names) to the guest"
 msgstr ""
 
-#: tools/virsh.c:4393
+#: tools/virsh.c:4405
 msgid "the codeset of keycodes, default:linux"
 msgstr ""
 
-#: tools/virsh.c:4395
+#: tools/virsh.c:4407
 msgid "the time (in milliseconds) how long the keys will be held"
 msgstr ""
 
-#: tools/virsh.c:4396
+#: tools/virsh.c:4408
 msgid "the key code"
 msgstr ""
 
-#: tools/virsh.c:4439
+#: tools/virsh.c:4451
 #, c-format
 msgid "unknown codeset: '%s'"
 msgstr ""
 
-#: tools/virsh.c:4445
+#: tools/virsh.c:4457
 msgid "too many keycodes"
 msgstr ""
 
-#: tools/virsh.c:4451
+#: tools/virsh.c:4463
 #, c-format
 msgid "invalid keycode: '%s'"
 msgstr ""
 
-#: tools/virsh.c:2115
+#: tools/virsh.c:4484
 msgid "change memory allocation"
 msgstr "changer la mémoire allouée"
 
-#: tools/virsh.c:2116
+#: tools/virsh.c:4485
 msgid "Change the current memory allocation in the guest domain."
 msgstr "Changer la mémoire allouée dans le domaine invité"
 
-#: tools/virsh.c:2122
+#: tools/virsh.c:4491
 msgid "number of kilobytes of memory"
 msgstr "nombre de kilooctets de mémoire"
 
-#: tools/virsh.c:4521 tools/virsh.c:4609
+#: tools/virsh.c:4533 tools/virsh.c:4621
 msgid "memory size has to be a number"
 msgstr ""
 
-#: tools/virsh.c:4527
+#: tools/virsh.c:4539
 #, c-format
 msgid "Invalid value of %lu for memory size"
 msgstr ""
 
-#: tools/virsh.c:2149
+#: tools/virsh.c:4545
 msgid "Unable to verify MaxMemorySize"
 msgstr "Impossible de vérifier MaxMemorySize"
 
-#: tools/virsh.c:4539
+#: tools/virsh.c:4551
 #, c-format
 msgid "Requested memory size %lu kb is larger than maximum of %lu kb"
 msgstr ""
 
-#: tools/virsh.c:2171
+#: tools/virsh.c:4574
 msgid "change maximum memory limit"
 msgstr "changer la limite maximum de mémoire"
 
-#: tools/virsh.c:2172
+#: tools/virsh.c:4575
 msgid "Change the maximum memory allocation limit in the guest domain."
 msgstr "changer la limite maximum de mémoire allouée dans le domaine invité"
 
-#: tools/virsh.c:2178
+#: tools/virsh.c:4581
 msgid "maximum memory limit in kilobytes"
 msgstr "limite mémoire maximum en kilooctets"
 
-#: tools/virsh.c:2143 tools/virsh.c:2155 tools/virsh.c:2199
+#: tools/virsh.c:4627
 #, c-format
 msgid "Invalid value of %d for memory size"
 msgstr "Valeur invalide de %d pour la taille de la mémoire"
 
-#: tools/virsh.c:2218
+#: tools/virsh.c:4633 tools/virsh.c:4638
 msgid "Unable to change MaxMemorySize"
 msgstr "Impossible de modifier MaxMemorySize"
 
-#: tools/virsh.c:4639
+#: tools/virsh.c:4651
 msgid "Get or set blkio parameters"
 msgstr ""
 
-#: tools/virsh.c:4640
+#: tools/virsh.c:4652
 msgid ""
 "Get or set the current blkio parameters for a guest domain.\n"
 "    To get the blkio parameters use following command: \n"
@@ -20081,36 +20748,45 @@
 "    virsh # blkiotune <domain>"
 msgstr ""
 
-#: tools/virsh.c:4650
+#: tools/virsh.c:4662
 msgid "IO Weight in range [100, 1000]"
 msgstr ""
 
-#: tools/virsh.c:4693 tools/virsh.c:4852
+#: tools/virsh.c:4664
+msgid "per-device IO Weights, in the form of /path/to/device,weight,..."
+msgstr ""
+
+#: tools/virsh.c:4708 tools/virsh.c:4891 tools/virsh.c:6305 tools/virsh.c:6313
+#: tools/virsh.c:6321 tools/virsh.c:6329 tools/virsh.c:6337 tools/virsh.c:6345
 msgid "Unable to parse integer parameter"
 msgstr ""
 
-#: tools/virsh.c:4700
+#: tools/virsh.c:4715
 #, c-format
 msgid "Invalid value of %d for I/O weight"
 msgstr ""
 
-#: tools/virsh.c:4709
+#: tools/virsh.c:4723
+msgid "Unable to parse string parameter"
+msgstr ""
+
+#: tools/virsh.c:4734
 msgid "Unable to get number of blkio parameters"
 msgstr ""
 
-#: tools/virsh.c:4722
+#: tools/virsh.c:4747
 msgid "Unable to get blkio parameters"
 msgstr ""
 
-#: tools/virsh.c:4774
+#: tools/virsh.c:4810
 msgid "Unable to change blkio parameters"
 msgstr ""
 
-#: tools/virsh.c:4789
+#: tools/virsh.c:4828
 msgid "Get or set memory parameters"
 msgstr ""
 
-#: tools/virsh.c:4790
+#: tools/virsh.c:4829
 msgid ""
 "Get or set the current memory parameters for a guest domain.\n"
 "    To get the memory parameters use following command: \n"
@@ -20118,2937 +20794,3313 @@
 "    virsh # memtune <domain>"
 msgstr ""
 
-#: tools/virsh.c:4800
+#: tools/virsh.c:4839
 msgid "Max memory in kilobytes"
 msgstr ""
 
-#: tools/virsh.c:4802
+#: tools/virsh.c:4841
 msgid "Memory during contention in kilobytes"
 msgstr ""
 
-#: tools/virsh.c:4804
+#: tools/virsh.c:4843
 msgid "Max memory plus swap in kilobytes"
 msgstr ""
 
-#: tools/virsh.c:4806
+#: tools/virsh.c:4845
 msgid "Min guaranteed memory in kilobytes"
 msgstr ""
 
-#: tools/virsh.c:4872
+#: tools/virsh.c:4911
 msgid "Unable to get number of memory parameters"
 msgstr ""
 
-#: tools/virsh.c:4885
+#: tools/virsh.c:4924
 msgid "Unable to get memory parameters"
 msgstr ""
 
-#: tools/virsh.c:4965
+#: tools/virsh.c:5004
 msgid "Unable to change memory parameters"
 msgstr ""
 
-#: tools/virsh.c:2230
+#: tools/virsh.c:5019
 msgid "node information"
 msgstr "informations du noeud"
 
-#: tools/virsh.c:2231
+#: tools/virsh.c:5020
 msgid "Returns basic information about the node."
 msgstr "Renvoyer un résumé des informations à propos du noeud."
 
-#: tools/virsh.c:2244
+#: tools/virsh.c:5033
 msgid "failed to get node information"
 msgstr "impossible de récupérer les informations relatives au noeud"
 
-#: tools/virsh.c:2247
+#: tools/virsh.c:5036
 msgid "CPU model:"
 msgstr "modèle de CPU :"
 
-#: tools/virsh.c:2249
+#: tools/virsh.c:5038
 msgid "CPU frequency:"
 msgstr "Fréquence de la CPU :"
 
-#: tools/virsh.c:2250
+#: tools/virsh.c:5039
 msgid "CPU socket(s):"
 msgstr "socket(s) CPU :"
 
-#: tools/virsh.c:2251
+#: tools/virsh.c:5040
 msgid "Core(s) per socket:"
 msgstr "Coeur(s) par emplacements :"
 
-#: tools/virsh.c:2252
+#: tools/virsh.c:5041
 msgid "Thread(s) per core:"
 msgstr "Thread(s) par coeur :"
 
-#: tools/virsh.c:2253
+#: tools/virsh.c:5042
 msgid "NUMA cell(s):"
 msgstr "cellule(s) NUMA :"
 
-#: tools/virsh.c:2254
+#: tools/virsh.c:5043
 msgid "Memory size:"
 msgstr "Taille mémoire :"
 
-#: tools/virsh.c:5013
+#: tools/virsh.c:5052
 msgid "Prints cpu stats of the node."
 msgstr ""
 
-#: tools/virsh.c:5014
+#: tools/virsh.c:5053
 msgid "Returns cpu stats of the node, in nanoseconds."
 msgstr ""
 
-#: tools/virsh.c:5019
+#: tools/virsh.c:5058
 msgid "prints specified cpu statistics only."
 msgstr ""
 
-#: tools/virsh.c:5020
+#: tools/virsh.c:5059
 msgid "prints by percentage during 1 second."
 msgstr ""
 
-#: tools/virsh.c:5048
+#: tools/virsh.c:5087
 msgid "Invalid value of cpuNum"
 msgstr ""
 
-#: tools/virsh.c:5054
+#: tools/virsh.c:5093
 msgid "Unable to get number of cpu stats"
 msgstr ""
 
-#: tools/virsh.c:5068
+#: tools/virsh.c:5107
 msgid "Unable to get node cpu stats"
 msgstr ""
 
-#: tools/virsh.c:5098 tools/virsh.c:5121
+#: tools/virsh.c:5137 tools/virsh.c:5160
 msgid "user:"
 msgstr ""
 
-#: tools/virsh.c:5099 tools/virsh.c:5123
+#: tools/virsh.c:5138 tools/virsh.c:5162
 msgid "system:"
 msgstr ""
 
-#: tools/virsh.c:5100 tools/virsh.c:5108 tools/virsh.c:5125
+#: tools/virsh.c:5139 tools/virsh.c:5147 tools/virsh.c:5164
 msgid "idle:"
 msgstr ""
 
-#: tools/virsh.c:5101 tools/virsh.c:5127
+#: tools/virsh.c:5140 tools/virsh.c:5166
 msgid "iowait:"
 msgstr ""
 
-#: tools/virsh.c:5107 tools/virsh.c:5119
+#: tools/virsh.c:5146 tools/virsh.c:5158
 msgid "usage:"
 msgstr ""
 
-#: tools/virsh.c:5142
+#: tools/virsh.c:5181
 msgid "Prints memory stats of the node."
 msgstr ""
 
-#: tools/virsh.c:5143
+#: tools/virsh.c:5182
 msgid "Returns memory stats of the node, in kilobytes."
 msgstr ""
 
-#: tools/virsh.c:5148
+#: tools/virsh.c:5187
 msgid "prints specified cell statistics only."
 msgstr ""
 
-#: tools/virsh.c:5165
+#: tools/virsh.c:5204
 msgid "Invalid value of cellNum"
 msgstr ""
 
-#: tools/virsh.c:5172
+#: tools/virsh.c:5211
 msgid "Unable to get number of memory stats"
 msgstr ""
 
-#: tools/virsh.c:5185
+#: tools/virsh.c:5224
 msgid "Unable to get memory stats"
 msgstr ""
 
-#: tools/virsh.c:2263
+#: tools/virsh.c:5242
+msgid "suspend the host node for a given time duration"
+msgstr ""
+
+#: tools/virsh.c:5243
+msgid ""
+"Suspend the host node for a given time duration and attempt to resume "
+"thereafter."
+msgstr ""
+
+#: tools/virsh.c:5249
+msgid "mem(Suspend-to-RAM), disk(Suspend-to-Disk), hybrid(Hybrid-Suspend)"
+msgstr ""
+
+#: tools/virsh.c:5251
+msgid "Suspend duration in seconds"
+msgstr ""
+
+#: tools/virsh.c:5252
+msgid "Suspend flags, 0 for default"
+msgstr ""
+
+#: tools/virsh.c:5283
+msgid "Invalid target"
+msgstr ""
+
+#: tools/virsh.c:5288
+msgid "Invalid duration"
+msgstr ""
+
+#: tools/virsh.c:5294
+msgid "The host was not suspended"
+msgstr ""
+
+#: tools/virsh.c:5305
 msgid "capabilities"
 msgstr "capacités"
 
-#: tools/virsh.c:2264
+#: tools/virsh.c:5306
 msgid "Returns capabilities of hypervisor/driver."
 msgstr "Retourner les capacités de l'hyperviseur / du pilote."
 
-#: tools/virsh.c:2277
+#: tools/virsh.c:5319
 msgid "failed to get capabilities"
 msgstr "impossible d'obtenir les capacités"
 
-#: tools/virsh.c:2290
+#: tools/virsh.c:5332
 msgid "domain information in XML"
 msgstr "informations du domaine en XML"
 
-#: tools/virsh.c:2291
+#: tools/virsh.c:5333
 msgid "Output the domain information as an XML dump to stdout."
 msgstr "Afficher les informations du domaine comme flux XML vers stdout."
 
-#: tools/virsh.c:2297 tools/virsh.c:3405
+#: tools/virsh.c:5339 tools/virsh.c:7262
 msgid "show inactive defined XML"
 msgstr ""
 
-#: tools/virsh.c:5239
+#: tools/virsh.c:5341
 msgid "update guest CPU according to host CPU"
 msgstr ""
 
-#: tools/virsh.c:2339
+#: tools/virsh.c:5385
 msgid "Convert native config to domain XML"
 msgstr ""
 
-#: tools/virsh.c:2340
+#: tools/virsh.c:5386
 msgid "Convert native guest configuration format to domain XML format."
 msgstr ""
 
-#: tools/virsh.c:2345
+#: tools/virsh.c:5391
 msgid "source config data format"
 msgstr ""
 
-#: tools/virsh.c:2346
+#: tools/virsh.c:5392
 msgid "config data file to import from"
 msgstr ""
 
-#: tools/virsh.c:2385
+#: tools/virsh.c:5431
 msgid "Convert domain XML to native config"
 msgstr ""
 
-#: tools/virsh.c:2386
+#: tools/virsh.c:5432
 msgid "Convert domain XML config to a native guest configuration format."
 msgstr ""
 
-#: tools/virsh.c:2391
+#: tools/virsh.c:5437
 msgid "target config data type format"
 msgstr ""
 
-#: tools/virsh.c:2392
+#: tools/virsh.c:5438
 msgid "xml data file to export from"
 msgstr ""
 
-#: tools/virsh.c:2431
+#: tools/virsh.c:5477
 msgid "convert a domain id or UUID to domain name"
 msgstr "convertir l'ID ou l'UUID du domaine en nom de domaine"
 
-#: tools/virsh.c:2437
+#: tools/virsh.c:5483
 msgid "domain id or uuid"
 msgstr "UUID ou ID de domaine"
 
-#: tools/virsh.c:2461
+#: tools/virsh.c:5507
 msgid "convert a domain name or UUID to domain id"
 msgstr "convertir un nom de domaine ou UUID en ID de domaine"
 
-#: tools/virsh.c:2496
+#: tools/virsh.c:5542
 msgid "convert a domain name or id to domain UUID"
 msgstr "convertir un ID ou un nom de domaine en UUID de domaine"
 
-#: tools/virsh.c:2502
+#: tools/virsh.c:5548
 msgid "domain id or name"
 msgstr "nom ou ID de domaine"
 
-#: tools/virsh.c:2521
+#: tools/virsh.c:5567
 msgid "failed to get domain UUID"
 msgstr "impossible de récupérer l'UUID du domaine"
 
-#: tools/virsh.c:2531
+#: tools/virsh.c:5577
 msgid "migrate domain to another host"
 msgstr "migrer un domaine vers un autre hôte"
 
-#: tools/virsh.c:2532
+#: tools/virsh.c:5578
 msgid "Migrate domain to another host.  Add --live for live migration."
 msgstr ""
 "Migrer un domaine vers un autre hôte. Ajouter « --live » pour une migration "
 "pendant l'exécution."
 
-#: tools/virsh.c:2537
+#: tools/virsh.c:5583
 msgid "live migration"
 msgstr "migration pendant l'exécution"
 
-#: tools/virsh.c:2538
+#: tools/virsh.c:5584
 msgid "peer-2-peer migration"
 msgstr ""
 
-#: tools/virsh.c:2539
+#: tools/virsh.c:5585
 msgid "direct migration"
 msgstr ""
 
-#: tools/virsh.c:2540
+#: tools/virsh.c:5586
 msgid "tunnelled migration"
 msgstr ""
 
-#: tools/virsh.c:2541
+#: tools/virsh.c:5587
 msgid "persist VM on destination"
 msgstr ""
 
-#: tools/virsh.c:2542
+#: tools/virsh.c:5588
 msgid "undefine VM on source"
 msgstr ""
 
-#: tools/virsh.c:2543
+#: tools/virsh.c:5589
 msgid "do not restart the domain on the destination host"
 msgstr ""
 
-#: tools/virsh.c:5488
+#: tools/virsh.c:5590
 msgid "migration with non-shared storage with full disk copy"
 msgstr ""
 
-#: tools/virsh.c:5489
+#: tools/virsh.c:5591
 msgid ""
 "migration with non-shared storage with incremental copy (same base image "
 "shared between source and destination)"
 msgstr ""
 
-#: tools/virsh.c:5491
+#: tools/virsh.c:5593
 msgid "prevent any configuration changes to domain until migration ends)"
 msgstr ""
 
-#: tools/virsh.c:5492
+#: tools/virsh.c:5594
 msgid "display the progress of migration"
 msgstr ""
 
-#: tools/virsh.c:5494
+#: tools/virsh.c:5596
 msgid ""
 "connection URI of the destination host as seen from the client(normal "
 "migration) or source(p2p migration)"
 msgstr ""
 
-#: tools/virsh.c:2546
+#: tools/virsh.c:5597
 msgid "migration URI, usually can be omitted"
 msgstr "URI de migration, peut habituellement être omise"
 
-#: tools/virsh.c:2547
+#: tools/virsh.c:5598
 msgid "rename to new name during migration (if supported)"
 msgstr ""
 
-#: tools/virsh.c:5497
+#: tools/virsh.c:5599
 msgid "force guest to suspend if live migration exceeds timeout (in seconds)"
 msgstr ""
 
-#: tools/virsh.c:5538 tools/virsh.c:7652 tools/virsh.c:8472 tools/virsh.c:8484
-#: tools/virsh.c:8823
+#: tools/virsh.c:5640 tools/virsh.c:8467 tools/virsh.c:9287 tools/virsh.c:9299
+#: tools/virsh.c:9638
 msgid "missing argument"
 msgstr ""
 
-#: tools/virsh.c:2597
+#: tools/virsh.c:5684
 msgid "migrate: Unexpected migrateuri for peer2peer/direct migration"
 msgstr ""
 
-#: tools/virsh.c:5673
+#: tools/virsh.c:5775
 msgid "migrate: Unexpected timeout for offline migration"
 msgstr ""
 
-#: tools/virsh.c:5678
+#: tools/virsh.c:5780
 msgid "migrate: Invalid timeout"
 msgstr ""
 
-#: tools/virsh.c:5684
+#: tools/virsh.c:5786
 msgid "migrate: Timeout is too big"
 msgstr ""
 
-#: tools/virsh.c:5778
+#: tools/virsh.c:5880
 msgid "set maximum tolerable downtime"
 msgstr ""
 
-#: tools/virsh.c:5779
+#: tools/virsh.c:5881
 msgid ""
 "Set maximum tolerable downtime of a domain which is being live-migrated to "
 "another host."
 msgstr ""
 
-#: tools/virsh.c:5785
+#: tools/virsh.c:5887
 msgid "maximum tolerable downtime (in milliseconds) for migration"
 msgstr ""
 
-#: tools/virsh.c:5804
+#: tools/virsh.c:5906
 msgid "migrate: Invalid downtime"
 msgstr ""
 
-#: tools/virsh.c:5822
+#: tools/virsh.c:5924
 msgid "Set the maximum migration bandwidth"
 msgstr ""
 
-#: tools/virsh.c:5823
+#: tools/virsh.c:5925
 msgid ""
 "Set the maximum migration bandwidth (in Mbps) for a domain which is being "
 "migrated to another host."
 msgstr ""
 
-#: tools/virsh.c:5830
+#: tools/virsh.c:5932
 msgid "migration bandwidth limit in Mbps"
 msgstr ""
 
-#: tools/virsh.c:5848
+#: tools/virsh.c:5950
 msgid "migrate: Invalid bandwidth"
 msgstr ""
 
-#: tools/virsh.c:5866
+#: tools/virsh.c:5968
 msgid "Get the maximum migration bandwidth"
 msgstr ""
 
-#: tools/virsh.c:5867
+#: tools/virsh.c:5969
 msgid "Get the maximum migration bandwidth (in Mbps) for a domain."
 msgstr ""
 
-#: tools/virsh.c:5927
+#: tools/virsh.c:6029
 msgid "bandwidth must be a number"
 msgstr ""
 
-#: tools/virsh.c:5950 tools/virsh.c:5951
+#: tools/virsh.c:6052 tools/virsh.c:6053
 msgid "Populate a disk from its backing image."
 msgstr ""
 
-#: tools/virsh.c:5957 tools/virsh.c:5981
+#: tools/virsh.c:6059 tools/virsh.c:6083
 msgid "Fully-qualified path of disk"
 msgstr ""
 
-#: tools/virsh.c:5958
+#: tools/virsh.c:6060
 msgid "Bandwidth limit in MB/s"
 msgstr ""
 
-#: tools/virsh.c:5974 tools/virsh.c:5975
+#: tools/virsh.c:6076 tools/virsh.c:6077
 msgid "Manage active block operations."
 msgstr ""
 
-#: tools/virsh.c:5982
+#: tools/virsh.c:6084
 msgid "Abort the active job on the speficied disk"
 msgstr ""
 
-#: tools/virsh.c:5983
+#: tools/virsh.c:6085
 msgid "Get active job information for the specified disk"
 msgstr ""
 
-#: tools/virsh.c:5984
+#: tools/virsh.c:6086
 msgid "Set the Bandwidth limit in MB/s"
 msgstr ""
 
-#: tools/virsh.c:6004
+#: tools/virsh.c:6106
 msgid "One of --abort, --info, or --bandwidth is required"
 msgstr ""
 
-#: tools/virsh.c:2628
+#: tools/virsh.c:6132 tools/virsh.c:6133
+msgid "Resize block device of domain."
+msgstr ""
+
+#: tools/virsh.c:6139
+msgid "Fully-qualified path of block device"
+msgstr ""
+
+#: tools/virsh.c:6140
+msgid "New size of the block device in kilobytes, the size must be integer"
+msgstr ""
+
+#: tools/virsh.c:6158
+msgid "Path must not be empty"
+msgstr ""
+
+#: tools/virsh.c:6163 tools/virsh.c:10088 tools/virsh.c:10093
+#: tools/virsh.c:10180 tools/virsh.c:10185
+msgid "Unable to parse integer"
+msgstr ""
+
+#: tools/virsh.c:6168
+#, c-format
+msgid "Size must be less than %llu"
+msgstr ""
+
+#: tools/virsh.c:6176
+#, c-format
+msgid "Failed to resize block device '%s'"
+msgstr ""
+
+#: tools/virsh.c:6178
+#, c-format
+msgid "Block device '%s' is resized"
+msgstr ""
+
+#: tools/virsh.c:6190
 msgid "autostart a network"
 msgstr "démarrer automatiquement un réseau"
 
-#: tools/virsh.c:2630
+#: tools/virsh.c:6192
 msgid "Configure a network to be automatically started at boot."
 msgstr "Configurer un réseau pour être automatiquement lancé au démarrage."
 
-#: tools/virsh.c:2635 tools/virsh.c:3155
+#: tools/virsh.c:6197 tools/virsh.c:6580 tools/virsh.c:6619 tools/virsh.c:7012
+#: tools/virsh.c:13667
 msgid "network name or uuid"
 msgstr "nom du domaine ou UUID"
 
-#: tools/virsh.c:2657
+#: tools/virsh.c:6219
 #, c-format
 msgid "failed to mark network %s as autostarted"
 msgstr "impossible de marquer le réseau %s en démarrage automatique"
 
-#: tools/virsh.c:2659
+#: tools/virsh.c:6221
 #, c-format
 msgid "failed to unmark network %s as autostarted"
 msgstr "impossible de démarquer le réseau %s en démarrage automatique"
 
-#: tools/virsh.c:2665
+#: tools/virsh.c:6227
 #, c-format
 msgid "Network %s marked as autostarted\n"
 msgstr "Réseau %s marqué en démarrage automatique\n"
 
-#: tools/virsh.c:2667
+#: tools/virsh.c:6229
 #, c-format
 msgid "Network %s unmarked as autostarted\n"
 msgstr "Réseau %s démarqué en démarrage automatique\n"
 
-#: tools/virsh.c:2677
+#: tools/virsh.c:6239
+msgid "Set or query a block device I/O tuning parameters."
+msgstr ""
+
+#: tools/virsh.c:6240
+msgid "Set or query disk I/O parameters such as block throttling."
+msgstr ""
+
+#: tools/virsh.c:6248
+msgid "total throughput limit in bytes per second"
+msgstr ""
+
+#: tools/virsh.c:6250
+msgid "read throughput limit in bytes per second"
+msgstr ""
+
+#: tools/virsh.c:6252
+msgid "write throughput limit in bytes per second"
+msgstr ""
+
+#: tools/virsh.c:6254
+msgid "total I/O operations limit per second"
+msgstr ""
+
+#: tools/virsh.c:6256
+msgid "read I/O operations limit per second"
+msgstr ""
+
+#: tools/virsh.c:6258
+msgid "write I/O operations limit per second"
+msgstr ""
+
+#: tools/virsh.c:6355
+msgid "Unable to get number of block I/O throttle parameters"
+msgstr ""
+
+#: tools/virsh.c:6368
+msgid "Unable to get block I/O throttle parameters"
+msgstr ""
+
+#: tools/virsh.c:6465
+msgid "Unable to change block I/O throttle"
+msgstr ""
+
+#: tools/virsh.c:6482
 msgid "create a network from an XML file"
 msgstr "créer un réseau depuis un fichier XML"
 
-#: tools/virsh.c:2678
+#: tools/virsh.c:6483
 msgid "Create a network."
 msgstr "Créer un réseau"
 
-#: tools/virsh.c:2683 tools/virsh.c:2731
+#: tools/virsh.c:6488 tools/virsh.c:6534
 msgid "file containing an XML network description"
 msgstr "fichier contenant la description XML d'un réseau"
 
-#: tools/virsh.c:2710
+#: tools/virsh.c:6513
 #, c-format
 msgid "Network %s created from %s\n"
 msgstr "Réseau %s créé depuis %s\n"
 
-#: tools/virsh.c:2714
+#: tools/virsh.c:6517
 #, c-format
 msgid "Failed to create network from %s"
 msgstr "Impossible de créer le réseau depuis %s"
 
-#: tools/virsh.c:2725
+#: tools/virsh.c:6528
 msgid "define (but don't start) a network from an XML file"
 msgstr "définir (mais ne pas démarrer) un réseau depuis un fichier XML"
 
-#: tools/virsh.c:2726
+#: tools/virsh.c:6529
 msgid "Define a network."
 msgstr "Définir un réseau."
 
-#: tools/virsh.c:2758
+#: tools/virsh.c:6559
 #, c-format
 msgid "Network %s defined from %s\n"
 msgstr "Réseau %s défini depuis %s\n"
 
-#: tools/virsh.c:2762
+#: tools/virsh.c:6563
 #, c-format
 msgid "Failed to define network from %s"
 msgstr "Impossible de définir le réseau depuis %s"
 
-#: tools/virsh.c:6172
+#: tools/virsh.c:6574
 msgid "destroy (stop) a network"
 msgstr ""
 
-#: tools/virsh.c:6173
+#: tools/virsh.c:6575
 msgid "Forcefully stop a given network."
 msgstr ""
 
-#: tools/virsh.c:2797
+#: tools/virsh.c:6598
 #, c-format
 msgid "Network %s destroyed\n"
 msgstr "Réseau %s détruit\n"
 
-#: tools/virsh.c:2799
+#: tools/virsh.c:6600
 #, c-format
 msgid "Failed to destroy network %s"
 msgstr "Impossible de détruire le réseau %s"
 
-#: tools/virsh.c:2812
+#: tools/virsh.c:6613
 msgid "network information in XML"
 msgstr "informations du réseau en XML"
 
-#: tools/virsh.c:2813
+#: tools/virsh.c:6614
 msgid "Output the network information as an XML dump to stdout."
 msgstr "Afficher les informations du réseau comme flux XML vers stdout."
 
-#: tools/virsh.c:6250
+#: tools/virsh.c:6652
 msgid "network information"
 msgstr ""
 
-#: tools/virsh.c:3194
+#: tools/virsh.c:6653
+msgid "Returns basic information about the network"
+msgstr ""
+
+#: tools/virsh.c:6658 tools/virsh.c:7051
 msgid "network name"
 msgstr "nom du réseau"
 
-#: tools/virsh.c:5631
+#: tools/virsh.c:6682 tools/virsh.c:8118 tools/virsh.c:11164
 msgid "UUID"
 msgstr ""
 
-#: tools/virsh.c:6284
+#: tools/virsh.c:6686
 msgid "Active:"
 msgstr ""
 
-#: tools/virsh.c:3034 tools/virsh.c:3057 tools/virsh.c:4280 tools/virsh.c:4303
+#: tools/virsh.c:6695 tools/virsh.c:6891 tools/virsh.c:6914 tools/virsh.c:8963
+#: tools/virsh.c:9459
 msgid "no autostart"
 msgstr "pas de démarrage automatique"
 
-#: tools/virsh.c:6299
+#: tools/virsh.c:6701
 msgid "Bridge:"
 msgstr ""
 
-#: tools/virsh.c:2852
+#: tools/virsh.c:6712
 msgid "edit XML configuration for a physical host interface"
 msgstr ""
 
-#: tools/virsh.c:2853
+#: tools/virsh.c:6713
 msgid "Edit the XML configuration for a physical host interface."
 msgstr ""
 
-#: tools/virsh.c:2858 tools/virsh.c:3404 tools/virsh.c:3496 tools/virsh.c:3534
-#: tools/virsh.c:3572
+#: tools/virsh.c:6718 tools/virsh.c:7261 tools/virsh.c:7351 tools/virsh.c:7389
+#: tools/virsh.c:7427
 msgid "interface name or MAC address"
 msgstr ""
 
-#: tools/virsh.c:2901
+#: tools/virsh.c:6758
 #, c-format
 msgid "Interface %s XML configuration not changed.\n"
 msgstr ""
 
-#: tools/virsh.c:2917 tools/virsh.c:7230
+#: tools/virsh.c:6774 tools/virsh.c:8210 tools/virsh.c:13625
 msgid "ERROR: the XML configuration was changed by another user"
 msgstr ""
 
-#: tools/virsh.c:2927
+#: tools/virsh.c:6784
 #, c-format
 msgid "Interface %s XML configuration edited.\n"
 msgstr ""
 
-#: tools/virsh.c:2952
+#: tools/virsh.c:6809
 msgid "list networks"
 msgstr "lister les réseaux"
 
-#: tools/virsh.c:2953
+#: tools/virsh.c:6810
 msgid "Returns list of networks."
 msgstr "Renvoyer la liste des réseaux."
 
-#: tools/virsh.c:2958
+#: tools/virsh.c:6815
 msgid "list inactive networks"
 msgstr "lister les réseaux inactifs"
 
-#: tools/virsh.c:2959
+#: tools/virsh.c:6816
 msgid "list inactive & active networks"
 msgstr "lister les réseaux actifs et inactifs"
 
-#: tools/virsh.c:2979 tools/virsh.c:2987
+#: tools/virsh.c:6836 tools/virsh.c:6844
 msgid "Failed to list active networks"
 msgstr "Impossible de lister les réseaux actifs"
 
-#: tools/virsh.c:2998 tools/virsh.c:3008
+#: tools/virsh.c:6855 tools/virsh.c:6865
 msgid "Failed to list inactive networks"
 msgstr "Impossible de lister les réseaux actifs"
 
-#: tools/virsh.c:3018 tools/virsh.c:4265
+#: tools/virsh.c:6875 tools/virsh.c:9109 tools/virsh.c:9138 tools/virsh.c:9197
 msgid "Autostart"
 msgstr "Démarrage automatique"
 
-#: tools/virsh.c:3040 tools/virsh.c:3306 tools/virsh.c:4286
+#: tools/virsh.c:6897 tools/virsh.c:7163 tools/virsh.c:9077
 msgid "active"
 msgstr "actif"
 
-#: tools/virsh.c:3063 tools/virsh.c:3323 tools/virsh.c:4309 tools/virsh.c:4511
+#: tools/virsh.c:6920 tools/virsh.c:7180 tools/virsh.c:9002 tools/virsh.c:9075
+#: tools/virsh.c:9425
 msgid "inactive"
 msgstr "inactif"
 
-#: tools/virsh.c:3079
+#: tools/virsh.c:6936
 msgid "convert a network UUID to network name"
 msgstr "convertir l'UUID d'un réseau en nom de réseau"
 
-#: tools/virsh.c:3085
+#: tools/virsh.c:6942
 msgid "network uuid"
 msgstr "UUID réseau"
 
-#: tools/virsh.c:3110
+#: tools/virsh.c:6967
 msgid "start a (previously defined) inactive network"
 msgstr "démarrer un réseau inactif (précédemment défini)"
 
-#: tools/virsh.c:3111
+#: tools/virsh.c:6968
 msgid "Start a network."
 msgstr "Démarrer un réseau"
 
-#: tools/virsh.c:3116
+#: tools/virsh.c:6973
 msgid "name of the inactive network"
 msgstr "nom du réseau inactif"
 
-#: tools/virsh.c:3133
+#: tools/virsh.c:6990
 #, c-format
 msgid "Network %s started\n"
 msgstr "Réseau %s démarré\n"
 
-#: tools/virsh.c:3136
+#: tools/virsh.c:6993
 #, c-format
 msgid "Failed to start network %s"
 msgstr "Impossible de démarrer le réseau %s"
 
-#: tools/virsh.c:3149
+#: tools/virsh.c:7006
 msgid "undefine an inactive network"
 msgstr "supprimer la définition d'un réseau inactif"
 
-#: tools/virsh.c:3150
+#: tools/virsh.c:7007
 msgid "Undefine the configuration for an inactive network."
 msgstr "Supprimer la configuration pour un réseau inactif."
 
-#: tools/virsh.c:3173
+#: tools/virsh.c:7030
 #, c-format
 msgid "Network %s has been undefined\n"
 msgstr "Le réseau %s n'est plus défini\n"
 
-#: tools/virsh.c:3175
+#: tools/virsh.c:7032
 #, c-format
 msgid "Failed to undefine network %s"
 msgstr "Impossible de supprimer la définition du réseau %s"
 
-#: tools/virsh.c:3188
+#: tools/virsh.c:7045
 msgid "convert a network name to network UUID"
 msgstr "convertir le nom d'un réseau en UUID de réseau"
 
-#: tools/virsh.c:3214
+#: tools/virsh.c:7071
 msgid "failed to get network UUID"
 msgstr "impossible de récupérer l'UUID du réseau"
 
-#: tools/virsh.c:3226
+#: tools/virsh.c:7083
 msgid "list physical host interfaces"
 msgstr ""
 
-#: tools/virsh.c:3227
+#: tools/virsh.c:7084
 msgid "Returns list of physical host interfaces."
 msgstr ""
 
-#: tools/virsh.c:3232
+#: tools/virsh.c:7089
 msgid "list inactive interfaces"
 msgstr ""
 
-#: tools/virsh.c:3233
+#: tools/virsh.c:7090
 msgid "list inactive & active interfaces"
 msgstr ""
 
-#: tools/virsh.c:3252 tools/virsh.c:3260
+#: tools/virsh.c:7109 tools/virsh.c:7117
 msgid "Failed to list active interfaces"
 msgstr ""
 
-#: tools/virsh.c:3271 tools/virsh.c:3281
+#: tools/virsh.c:7128 tools/virsh.c:7138
 msgid "Failed to list inactive interfaces"
 msgstr ""
 
-#: tools/virsh.c:3291
+#: tools/virsh.c:7148
 msgid "MAC Address"
 msgstr ""
 
-#: tools/virsh.c:3338
+#: tools/virsh.c:7195
 msgid "convert an interface MAC address to interface name"
 msgstr ""
 
-#: tools/virsh.c:3344
+#: tools/virsh.c:7201
 msgid "interface mac"
 msgstr ""
 
-#: tools/virsh.c:3368
+#: tools/virsh.c:7225
 msgid "convert an interface name to interface MAC address"
 msgstr ""
 
-#: tools/virsh.c:3374
+#: tools/virsh.c:7231
 msgid "interface name"
 msgstr ""
 
-#: tools/virsh.c:3398
+#: tools/virsh.c:7255
 msgid "interface information in XML"
 msgstr ""
 
-#: tools/virsh.c:3399
+#: tools/virsh.c:7256
 msgid ""
 "Output the physical host interface information as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:3443
+#: tools/virsh.c:7300
 msgid "define (but don't start) a physical host interface from an XML file"
 msgstr ""
 
-#: tools/virsh.c:3444
+#: tools/virsh.c:7301
 msgid "Define a physical host interface."
 msgstr ""
 
-#: tools/virsh.c:3449
+#: tools/virsh.c:7306
 msgid "file containing an XML interface description"
 msgstr ""
 
-#: tools/virsh.c:3476
+#: tools/virsh.c:7331
 #, c-format
 msgid "Interface %s defined from %s\n"
 msgstr ""
 
-#: tools/virsh.c:3480
+#: tools/virsh.c:7335
 #, c-format
 msgid "Failed to define interface from %s"
 msgstr ""
 
-#: tools/virsh.c:3490
+#: tools/virsh.c:7345
 msgid "undefine a physical host interface (remove it from configuration)"
 msgstr ""
 
-#: tools/virsh.c:3491
+#: tools/virsh.c:7346
 msgid "undefine an interface."
 msgstr ""
 
-#: tools/virsh.c:3514
+#: tools/virsh.c:7369
 #, c-format
 msgid "Interface %s undefined\n"
 msgstr ""
 
-#: tools/virsh.c:3516
+#: tools/virsh.c:7371
 #, c-format
 msgid "Failed to undefine interface %s"
 msgstr ""
 
-#: tools/virsh.c:3528
+#: tools/virsh.c:7383
 msgid "start a physical host interface (enable it / \"if-up\")"
 msgstr ""
 
-#: tools/virsh.c:3529
+#: tools/virsh.c:7384
 msgid "start a physical host interface."
 msgstr ""
 
-#: tools/virsh.c:3552
+#: tools/virsh.c:7407 tools/virsh.c:7936
 #, c-format
 msgid "Interface %s started\n"
 msgstr ""
 
-#: tools/virsh.c:3554
+#: tools/virsh.c:7409 tools/virsh.c:7933
 #, c-format
 msgid "Failed to start interface %s"
 msgstr ""
 
-#: tools/virsh.c:3566
+#: tools/virsh.c:7421
 msgid "destroy a physical host interface (disable it / \"if-down\")"
 msgstr ""
 
-#: tools/virsh.c:7020
+#: tools/virsh.c:7422
 msgid "forcefully stop a physical host interface."
 msgstr ""
 
-#: tools/virsh.c:3590
+#: tools/virsh.c:7445
 #, c-format
 msgid "Interface %s destroyed\n"
 msgstr ""
 
-#: tools/virsh.c:3592
+#: tools/virsh.c:7447
 #, c-format
 msgid "Failed to destroy interface %s"
 msgstr ""
 
-#: tools/virsh.c:7057
+#: tools/virsh.c:7459
 msgid ""
 "create a snapshot of current interfaces settings, which can be later "
 "commited (iface-commit) or restored (iface-rollback)"
 msgstr ""
 
-#: tools/virsh.c:7060
+#: tools/virsh.c:7462
 msgid "Create a restore point for interfaces settings"
 msgstr ""
 
-#: tools/virsh.c:7075
+#: tools/virsh.c:7477
 msgid "Failed to begin network config change transaction"
 msgstr ""
 
-#: tools/virsh.c:7079
+#: tools/virsh.c:7481
 msgid "Network config change transaction started\n"
 msgstr ""
 
-#: tools/virsh.c:7087
+#: tools/virsh.c:7489
 msgid "commit changes made since iface-begin and free restore point"
 msgstr ""
 
-#: tools/virsh.c:7088
+#: tools/virsh.c:7490
 msgid "commit changes and free restore point"
 msgstr ""
 
-#: tools/virsh.c:7103
+#: tools/virsh.c:7505
 msgid "Failed to commit network config change transaction"
 msgstr ""
 
-#: tools/virsh.c:7107
+#: tools/virsh.c:7509
 msgid "Network config change transaction committed\n"
 msgstr ""
 
-#: tools/virsh.c:7115
+#: tools/virsh.c:7517
 msgid "rollback to previous saved configuration created via iface-begin"
 msgstr ""
 
-#: tools/virsh.c:7116
+#: tools/virsh.c:7518
 msgid "rollback to previous restore point"
 msgstr ""
 
-#: tools/virsh.c:7131
+#: tools/virsh.c:7533
 msgid "Failed to rollback network config change transaction"
 msgstr ""
 
-#: tools/virsh.c:7135
+#: tools/virsh.c:7537
 msgid "Network config change transaction rolled back\n"
 msgstr ""
 
-#: tools/virsh.c:7143
+#: tools/virsh.c:7545
+msgid "create a bridge device and attach an existing network device to it"
+msgstr ""
+
+#: tools/virsh.c:7546
+msgid "bridge an existing network device"
+msgstr ""
+
+#: tools/virsh.c:7551
+msgid "existing interface name"
+msgstr ""
+
+#: tools/virsh.c:7552
+msgid "new bridge device name"
+msgstr ""
+
+#: tools/virsh.c:7553
+msgid "do not enable STP for this bridge"
+msgstr ""
+
+#: tools/virsh.c:7555
+msgid "number of seconds to squelch traffic on newly connected ports"
+msgstr ""
+
+#: tools/virsh.c:7556
+msgid "don't start the bridge immediately"
+msgstr ""
+
+#: tools/virsh.c:7587
+msgid "Missing bridge device name in command"
+msgstr ""
+
+#: tools/virsh.c:7593
+#, c-format
+msgid "Network device %s already exists"
+msgstr ""
+
+#: tools/virsh.c:7601
+msgid "Unable to parse delay parameter"
+msgstr ""
+
+#: tools/virsh.c:7611
+msgid "(interface definition)"
+msgstr ""
+
+#: tools/virsh.c:7612 tools/virsh.c:7810
+#, c-format
+msgid "Failed to parse configuration of %s"
+msgstr ""
+
+#: tools/virsh.c:7619 tools/virsh.c:7817
+#, c-format
+msgid "Existing device %s has no type"
+msgstr ""
+
+#: tools/virsh.c:7624
+#, c-format
+msgid "Existing device %s is already a bridge"
+msgstr ""
+
+#: tools/virsh.c:7631 tools/virsh.c:7830
+#, c-format
+msgid "Interface name from config %s doesn't match given supplied name %s"
+msgstr ""
+
+#: tools/virsh.c:7638
+msgid "Failed to create bridge node in xml document"
+msgstr ""
+
+#: tools/virsh.c:7646
+msgid "Failed to set stp attribute in xml document"
+msgstr ""
+
+#: tools/virsh.c:7653
+#, c-format
+msgid "Failed to set bridge delay %d in xml document"
+msgstr ""
+
+#: tools/virsh.c:7661
+msgid "Failed to set bridge interface type to 'bridge' in xml document"
+msgstr ""
+
+#: tools/virsh.c:7666
+#, c-format
+msgid "Failed to set master bridge interface name to '%s' in xml document"
+msgstr ""
+
+#: tools/virsh.c:7675
+msgid "Failed to create interface node under bridge node in xml document"
+msgstr ""
+
+#: tools/virsh.c:7683
+#, c-format
+msgid "Failed to set new slave interface type to '%s' in xml document"
+msgstr ""
+
+#: tools/virsh.c:7689
+#, c-format
+msgid "Failed to set new slave interface name to '%s' in xml document"
+msgstr ""
+
+#: tools/virsh.c:7709 tools/virsh.c:7892
+#, c-format
+msgid "Failed to move '%s' element in xml document"
+msgstr ""
+
+#: tools/virsh.c:7720
+#, c-format
+msgid "Failed to format new xml document for bridge %s"
+msgstr ""
+
+#: tools/virsh.c:7729
+#, c-format
+msgid "Failed to define new bridge interface %s"
+msgstr ""
+
+#: tools/virsh.c:7734
+#, c-format
+msgid "Created bridge %s with attached device %s\n"
+msgstr ""
+
+#: tools/virsh.c:7740
+#, c-format
+msgid "Failed to start bridge interface %s"
+msgstr ""
+
+#: tools/virsh.c:7743
+#, c-format
+msgid "Bridge interface %s started\n"
+msgstr ""
+
+#: tools/virsh.c:7766
+msgid "undefine a bridge device after detaching its slave device"
+msgstr ""
+
+#: tools/virsh.c:7767
+msgid "unbridge a network device"
+msgstr ""
+
+#: tools/virsh.c:7772
+msgid "current bridge device name"
+msgstr ""
+
+#: tools/virsh.c:7774
+msgid "don't start the un-slaved interface immediately (not recommended)"
+msgstr ""
+
+#: tools/virsh.c:7808
+msgid "(bridge interface definition)"
+msgstr ""
+
+#: tools/virsh.c:7822
+#, c-format
+msgid "Device %s is not a bridge"
+msgstr ""
+
+#: tools/virsh.c:7838
+msgid "No bridge node in xml document"
+msgstr ""
+
+#: tools/virsh.c:7843
+msgid "Multiple interfaecs attached to bridge"
+msgstr ""
+
+#: tools/virsh.c:7848
+msgid "No interface attached to bridge"
+msgstr ""
+
+#: tools/virsh.c:7856
+#, c-format
+msgid "Device attached to bridge %s has no name"
+msgstr ""
+
+#: tools/virsh.c:7861
+#, c-format
+msgid "Attached device %s has no type"
+msgstr ""
+
+#: tools/virsh.c:7866
+#, c-format
+msgid "Failed to set interface type to '%s' in xml document"
+msgstr ""
+
+#: tools/virsh.c:7872
+#, c-format
+msgid "Failed to set interface name to '%s' in xml document"
+msgstr ""
+
+#: tools/virsh.c:7903
+#, c-format
+msgid "Failed to format new xml document for un-enslaved interface %s"
+msgstr ""
+
+#: tools/virsh.c:7912
+#, c-format
+msgid "Failed to destroy bridge interface %s"
+msgstr ""
+
+#: tools/virsh.c:7916
+#, c-format
+msgid "Failed to undefine bridge interface %s"
+msgstr ""
+
+#: tools/virsh.c:7923
+#, c-format
+msgid "Failed to define new interface %s"
+msgstr ""
+
+#: tools/virsh.c:7927
+#, c-format
+msgid "Device %s un-attached from bridge %s\n"
+msgstr ""
+
+#: tools/virsh.c:7958
 msgid "define or update a network filter from an XML file"
 msgstr ""
 
-#: tools/virsh.c:7144
+#: tools/virsh.c:7959
 msgid "Define a new network filter or update an existing one."
 msgstr ""
 
-#: tools/virsh.c:7149
+#: tools/virsh.c:7964
 msgid "file containing an XML network filter description"
 msgstr ""
 
-#: tools/virsh.c:7174
+#: tools/virsh.c:7989
 #, c-format
 msgid "Network filter %s defined from %s\n"
 msgstr ""
 
-#: tools/virsh.c:7178
+#: tools/virsh.c:7993
 #, c-format
 msgid "Failed to define network filter from %s"
 msgstr ""
 
-#: tools/virsh.c:7189
+#: tools/virsh.c:8004
 msgid "undefine a network filter"
 msgstr ""
 
-#: tools/virsh.c:7190
+#: tools/virsh.c:8005
 msgid "Undefine a given network filter."
 msgstr ""
 
-#: tools/virsh.c:7195 tools/virsh.c:7234 tools/virsh.c:7340
+#: tools/virsh.c:8010 tools/virsh.c:8049 tools/virsh.c:8155
 msgid "network filter name or uuid"
 msgstr ""
 
-#: tools/virsh.c:7213
+#: tools/virsh.c:8028
 #, c-format
 msgid "Network filter %s undefined\n"
 msgstr ""
 
-#: tools/virsh.c:7215
+#: tools/virsh.c:8030
 #, c-format
 msgid "Failed to undefine network filter %s"
 msgstr ""
 
-#: tools/virsh.c:7228
+#: tools/virsh.c:8043
 msgid "network filter information in XML"
 msgstr ""
 
-#: tools/virsh.c:7229
+#: tools/virsh.c:8044
 msgid "Output the network filter information as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:7267
+#: tools/virsh.c:8082
 msgid "list network filters"
 msgstr ""
 
-#: tools/virsh.c:7268
+#: tools/virsh.c:8083
 msgid "Returns list of network filters."
 msgstr ""
 
-#: tools/virsh.c:7288 tools/virsh.c:7296
+#: tools/virsh.c:8103 tools/virsh.c:8111
 msgid "Failed to list network filters"
 msgstr ""
 
-#: tools/virsh.c:7334
+#: tools/virsh.c:8149
 msgid "edit XML configuration for a network filter"
 msgstr ""
 
-#: tools/virsh.c:7335
+#: tools/virsh.c:8150
 msgid "Edit the XML configuration for a network filter."
 msgstr ""
 
-#: tools/virsh.c:7379
+#: tools/virsh.c:8194
 #, c-format
 msgid "Network filter %s XML configuration not changed.\n"
 msgstr ""
 
-#: tools/virsh.c:7405
+#: tools/virsh.c:8220
 #, c-format
 msgid "Network filter %s XML configuration edited.\n"
 msgstr ""
 
-#: tools/virsh.c:3605
+#: tools/virsh.c:8247
 msgid "autostart a pool"
 msgstr "démarrer automatiquement un pool"
 
-#: tools/virsh.c:3607
+#: tools/virsh.c:8249
 msgid "Configure a pool to be automatically started at boot."
 msgstr "Configurer un pool qui sera lancé automatiquement au démarrage."
 
-#: tools/virsh.c:3612 tools/virsh.c:4012 tools/virsh.c:4051 tools/virsh.c:4090
-#: tools/virsh.c:4129 tools/virsh.c:4168 tools/virsh.c:4482 tools/virsh.c:4747
-#: tools/virsh.c:4980 tools/virsh.c:5057 tools/virsh.c:5098 tools/virsh.c:5149
-#: tools/virsh.c:5190 tools/virsh.c:5334 tools/virsh.c:7288
+#: tools/virsh.c:8254 tools/virsh.c:8650 tools/virsh.c:8701 tools/virsh.c:8740
+#: tools/virsh.c:8779 tools/virsh.c:8818 tools/virsh.c:9394 tools/virsh.c:9751
+#: tools/virsh.c:9981 tools/virsh.c:10058 tools/virsh.c:10158
+#: tools/virsh.c:10254 tools/virsh.c:10295 tools/virsh.c:10336
+#: tools/virsh.c:10400 tools/virsh.c:10440 tools/virsh.c:10828
+#: tools/virsh.c:10861 tools/virsh.c:13684
 msgid "pool name or uuid"
 msgstr "nom du pool ou UUID"
 
-#: tools/virsh.c:3634
+#: tools/virsh.c:8276
 #, c-format
 msgid "failed to mark pool %s as autostarted"
 msgstr "impossible de démarrer automatiquement le pool %s"
 
-#: tools/virsh.c:3636
+#: tools/virsh.c:8278
 #, c-format
 msgid "failed to unmark pool %s as autostarted"
 msgstr "impossible d'annuler le démarrage automatique du pool %s"
 
-#: tools/virsh.c:3642
+#: tools/virsh.c:8284
 #, c-format
 msgid "Pool %s marked as autostarted\n"
 msgstr "Le pool %s démarrera automatiquement\n"
 
-#: tools/virsh.c:3644
+#: tools/virsh.c:8286
 #, c-format
 msgid "Pool %s unmarked as autostarted\n"
 msgstr "Le pool %s ne démarrera plus automatiquement\n"
 
-#: tools/virsh.c:3654
+#: tools/virsh.c:8296
 msgid "create a pool from an XML file"
 msgstr "créer un pool depuis un fichier XML"
 
-#: tools/virsh.c:3655 tools/virsh.c:3877
+#: tools/virsh.c:8297 tools/virsh.c:8515
 msgid "Create a pool."
 msgstr "Créer un pool"
 
-#: tools/virsh.c:3661 tools/virsh.c:3923
+#: tools/virsh.c:8303 tools/virsh.c:8562
 msgid "file containing an XML pool description"
 msgstr "fichier contenant la description XML d'un pool"
 
-#: tools/virsh.c:3688
+#: tools/virsh.c:8328
 #, c-format
 msgid "Pool %s created from %s\n"
 msgstr "Pool %s créé depuis %s\n"
 
-#: tools/virsh.c:3692
+#: tools/virsh.c:8332
 #, c-format
 msgid "Failed to create pool from %s"
 msgstr "Impossible de créer le pool depuis %s"
 
-#: tools/virsh.c:3703
+#: tools/virsh.c:8343
 msgid "create a device defined by an XML file on the node"
 msgstr ""
 
-#: tools/virsh.c:3705
+#: tools/virsh.c:8345
 msgid ""
 "Create a device on the node.  Note that this command creates devices on the "
 "physical host that can then be assigned to a virtual machine."
 msgstr ""
 
-#: tools/virsh.c:3713
+#: tools/virsh.c:8353
 msgid "file containing an XML description of the device"
 msgstr ""
 
-#: tools/virsh.c:3742
+#: tools/virsh.c:8378
 #, c-format
 msgid "Node device %s created from %s\n"
 msgstr ""
 
-#: tools/virsh.c:3746
+#: tools/virsh.c:8382
 #, c-format
 msgid "Failed to create node device from %s"
 msgstr ""
 
-#: tools/virsh.c:7579
+#: tools/virsh.c:8394
 msgid "destroy (stop) a device on the node"
 msgstr ""
 
-#: tools/virsh.c:7580
+#: tools/virsh.c:8395
 msgid ""
 "Destroy a device on the node.  Note that this command destroys devices on "
 "the physical host"
 msgstr ""
 
-#: tools/virsh.c:3766
+#: tools/virsh.c:8402
 msgid "name of the device to be destroyed"
 msgstr ""
 
-#: tools/virsh.c:3790
+#: tools/virsh.c:8423
 #, c-format
 msgid "Destroyed node device '%s'\n"
 msgstr ""
 
-#: tools/virsh.c:3792
+#: tools/virsh.c:8425
 #, c-format
 msgid "Failed to destroy node device '%s'"
 msgstr ""
 
-#: tools/virsh.c:3805
+#: tools/virsh.c:8438
 msgid "name of the pool"
 msgstr "nom du pool"
 
-#: tools/virsh.c:3806
+#: tools/virsh.c:8439
 msgid "print XML document, but don't define/create"
 msgstr ""
 
-#: tools/virsh.c:3807
+#: tools/virsh.c:8440
 msgid "type of the pool"
 msgstr "type du pool"
 
-#: tools/virsh.c:3808
+#: tools/virsh.c:8441
 msgid "source-host for underlying storage"
 msgstr "hôte source pour le stockage sous-jacent"
 
-#: tools/virsh.c:3809
+#: tools/virsh.c:8442
 msgid "source path for underlying storage"
 msgstr "chemin source pour le stockage sous-jacent"
 
-#: tools/virsh.c:3810
+#: tools/virsh.c:8443
 msgid "source device for underlying storage"
 msgstr "périphérique source pour le stockage sous-jacent"
 
-#: tools/virsh.c:3811
+#: tools/virsh.c:8444
 msgid "source name for underlying storage"
 msgstr ""
 
-#: tools/virsh.c:3812
+#: tools/virsh.c:8445
 msgid "target for underlying storage"
 msgstr "cible pour le stockage sous-jacent"
 
-#: tools/virsh.c:7631
+#: tools/virsh.c:8446
 msgid "format for underlying storage"
 msgstr ""
 
-#: tools/virsh.c:3859 tools/virsh.c:4713 tools/virsh.c:5018
+#: tools/virsh.c:8497 tools/virsh.c:9717 tools/virsh.c:10016
+#: tools/virsh.c:12468 tools/virsh.c:12948 tools/virsh.c:13529
+#: tools/virsh.c:13546
 msgid "Failed to allocate XML buffer"
 msgstr ""
 
-#: tools/virsh.c:3876
+#: tools/virsh.c:8514
 msgid "create a pool from a set of args"
 msgstr "créer un pool depuis un ensemble d'arguments"
 
-#: tools/virsh.c:3902
+#: tools/virsh.c:8541
 #, c-format
 msgid "Pool %s created\n"
 msgstr "Pool %s créé\n"
 
-#: tools/virsh.c:3905
+#: tools/virsh.c:8544
 #, c-format
 msgid "Failed to create pool %s"
 msgstr "Impossible de créer le pool %s"
 
-#: tools/virsh.c:3917
+#: tools/virsh.c:8556
 msgid "define (but don't start) a pool from an XML file"
 msgstr "définir (mais ne pas démarrer) un pool depuis un fichier XML"
 
-#: tools/virsh.c:3918 tools/virsh.c:3966
+#: tools/virsh.c:8557 tools/virsh.c:8603
 msgid "Define a pool."
 msgstr "Définir un pool"
 
-#: tools/virsh.c:3950
+#: tools/virsh.c:8587
 #, c-format
 msgid "Pool %s defined from %s\n"
 msgstr "Pool %s défini depuis %s\n"
 
-#: tools/virsh.c:3954
+#: tools/virsh.c:8591
 #, c-format
 msgid "Failed to define pool from %s"
 msgstr "Impossible de définir le pool depuis %s"
 
-#: tools/virsh.c:3965
+#: tools/virsh.c:8602
 msgid "define a pool from a set of args"
 msgstr "définir un pool à partir d'un ensemble d'argument"
 
-#: tools/virsh.c:3991
+#: tools/virsh.c:8629
 #, c-format
 msgid "Pool %s defined\n"
 msgstr "pool %s défini\n"
 
-#: tools/virsh.c:3994
+#: tools/virsh.c:8632
 #, c-format
 msgid "Failed to define pool %s"
 msgstr "Impossible de définir le pool %s"
 
-#: tools/virsh.c:4006
+#: tools/virsh.c:8644
 msgid "build a pool"
 msgstr "construire un pool"
 
-#: tools/virsh.c:4007
+#: tools/virsh.c:8645
 msgid "Build a given pool."
 msgstr "Construire le pool indiqué."
 
-#: tools/virsh.c:7836
+#: tools/virsh.c:8651
 msgid "do not overwrite an existing pool of this type"
 msgstr ""
 
-#: tools/virsh.c:7837
+#: tools/virsh.c:8652
 msgid "overwrite any existing data"
 msgstr ""
 
-#: tools/virsh.c:4030
+#: tools/virsh.c:8679
 #, c-format
 msgid "Pool %s built\n"
 msgstr ""
 
-#: tools/virsh.c:4032
+#: tools/virsh.c:8681
 #, c-format
 msgid "Failed to build pool %s"
 msgstr "Impossible de construire le pool %s"
 
-#: tools/virsh.c:7879
+#: tools/virsh.c:8694
 msgid "destroy (stop) a pool"
 msgstr ""
 
-#: tools/virsh.c:7881
+#: tools/virsh.c:8696
 msgid "Forcefully stop a given pool. Raw data in the pool is untouched"
 msgstr ""
 
-#: tools/virsh.c:4069
+#: tools/virsh.c:8719
 #, c-format
 msgid "Pool %s destroyed\n"
 msgstr "Pool %s détruit\n"
 
-#: tools/virsh.c:4071
+#: tools/virsh.c:8721
 #, c-format
 msgid "Failed to destroy pool %s"
 msgstr "Impossible de détruire le pool %s"
 
-#: tools/virsh.c:4084
+#: tools/virsh.c:8734
 msgid "delete a pool"
 msgstr "effacer un pool"
 
-#: tools/virsh.c:4085
+#: tools/virsh.c:8735
 msgid "Delete a given pool."
 msgstr "Détruire le pool indiqué"
 
-#: tools/virsh.c:4108
+#: tools/virsh.c:8758
 #, c-format
 msgid "Pool %s deleted\n"
 msgstr "Pool %s détruit\n"
 
-#: tools/virsh.c:4110
+#: tools/virsh.c:8760
 #, c-format
 msgid "Failed to delete pool %s"
 msgstr "Impossible de supprimer le pool %s"
 
-#: tools/virsh.c:4123
+#: tools/virsh.c:8773
 msgid "refresh a pool"
 msgstr "rafraichir un pool"
 
-#: tools/virsh.c:4124
+#: tools/virsh.c:8774
 msgid "Refresh a given pool."
 msgstr "Rafraichir le pool indiqué."
 
-#: tools/virsh.c:4147
+#: tools/virsh.c:8797
 #, c-format
 msgid "Pool %s refreshed\n"
 msgstr "Pool %s réactivé\n"
 
-#: tools/virsh.c:4149
+#: tools/virsh.c:8799
 #, c-format
 msgid "Failed to refresh pool %s"
 msgstr "Impossible de réactiver le pool %s"
 
-#: tools/virsh.c:4162
+#: tools/virsh.c:8812
 msgid "pool information in XML"
 msgstr "informations du pool en XML"
 
-#: tools/virsh.c:4163
+#: tools/virsh.c:8813
 msgid "Output the pool information as an XML dump to stdout."
 msgstr "Afficher les informations du pool comme flux XML vers stdout."
 
-#: tools/virsh.c:4202
+#: tools/virsh.c:8852
 msgid "list pools"
 msgstr "lister les pools"
 
-#: tools/virsh.c:4203
+#: tools/virsh.c:8853
 msgid "Returns list of pools."
 msgstr "Renvoyer la liste des pools"
 
-#: tools/virsh.c:4208
+#: tools/virsh.c:8858
 msgid "list inactive pools"
 msgstr "lister les pools inactifs"
 
-#: tools/virsh.c:4209
+#: tools/virsh.c:8859
 msgid "list inactive & active pools"
 msgstr "lister les pools actifs et inactifs"
 
-#: tools/virsh.c:8045
+#: tools/virsh.c:8860
 msgid "display extended details for pools"
 msgstr ""
 
-#: tools/virsh.c:4229 tools/virsh.c:4237
+#: tools/virsh.c:8901 tools/virsh.c:8927
 msgid "Failed to list active pools"
 msgstr "Impossible de lister les pools actifs"
 
-#: tools/virsh.c:4248 tools/virsh.c:4256
+#: tools/virsh.c:8910 tools/virsh.c:8939
 msgid "Failed to list inactive pools"
 msgstr "Impossible de lister les pools inactifs"
 
-#: tools/virsh.c:8173
+#: tools/virsh.c:8988
 msgid "Could not retrieve pool information"
 msgstr ""
 
-#: tools/virsh.c:4515
+#: tools/virsh.c:9005 tools/virsh.c:9429
 msgid "building"
 msgstr "construction"
 
-#: tools/virsh.c:4519 tools/virsh.c:8271 tools/virsh.c:8297
+#: tools/virsh.c:9008 tools/virsh.c:9433 tools/virsh.c:16734
+#: tools/virsh.c:16947
 msgid "running"
 msgstr "en cours d'exécution"
 
-#: tools/virsh.c:4523
+#: tools/virsh.c:9011 tools/virsh.c:9437
 msgid "degraded"
 msgstr "endommagé"
 
-#: tools/virsh.c:8199 tools/virsh.c:8626
+#: tools/virsh.c:9014 tools/virsh.c:9441
 msgid "inaccessible"
 msgstr ""
 
-#: tools/virsh.c:8237 tools/virsh.c:8238 tools/virsh.c:8239
+#: tools/virsh.c:9052 tools/virsh.c:9053 tools/virsh.c:9054
 msgid "-"
 msgstr ""
 
-#: tools/virsh.c:8328 tools/virsh.c:8383
+#: tools/virsh.c:9143 tools/virsh.c:9198
 msgid "Persistent"
 msgstr ""
 
-#: tools/virsh.c:8333 tools/virsh.c:8383 tools/virsh.c:9819
+#: tools/virsh.c:9148 tools/virsh.c:9198 tools/virsh.c:10634
 msgid "Capacity"
 msgstr ""
 
-#: tools/virsh.c:8338 tools/virsh.c:8383 tools/virsh.c:9824 tools/virsh.c:9855
+#: tools/virsh.c:9153 tools/virsh.c:9198 tools/virsh.c:10639
+#: tools/virsh.c:10670
 msgid "Allocation"
 msgstr ""
 
-#: tools/virsh.c:8343 tools/virsh.c:8383
+#: tools/virsh.c:9158 tools/virsh.c:9198
 msgid "Available"
 msgstr ""
 
-#: tools/virsh.c:4381
+#: tools/virsh.c:9232 tools/virsh.c:10701
 #, c-format
 msgid "virAsprintf failed (errno %d)"
 msgstr ""
 
-#: tools/virsh.c:4324
+#: tools/virsh.c:9262
 msgid "find potential storage pool sources"
 msgstr ""
 
-#: tools/virsh.c:4325 tools/virsh.c:4405
+#: tools/virsh.c:9263 tools/virsh.c:9339
 msgid "Returns XML <sources> document."
 msgstr ""
 
-#: tools/virsh.c:4331
+#: tools/virsh.c:9269
 msgid "type of storage pool sources to find"
 msgstr ""
 
-#: tools/virsh.c:4332
+#: tools/virsh.c:9270
 msgid "optional host to query"
 msgstr ""
 
-#: tools/virsh.c:4333
+#: tools/virsh.c:9271
 msgid "optional port to query"
 msgstr ""
 
-#: tools/virsh.c:8457
+#: tools/virsh.c:9272
 msgid "optional initiator IQN to use for query"
 msgstr ""
 
-#: tools/virsh.c:4390 tools/virsh.c:4441
+#: tools/virsh.c:9324 tools/virsh.c:9374
 #, c-format
 msgid "Failed to find any %s pool sources"
 msgstr ""
 
-#: tools/virsh.c:4404
+#: tools/virsh.c:9338
 msgid "discover potential storage pool sources"
 msgstr ""
 
-#: tools/virsh.c:4411
+#: tools/virsh.c:9345
 msgid "type of storage pool sources to discover"
 msgstr ""
 
-#: tools/virsh.c:4413
+#: tools/virsh.c:9347
 msgid "optional file of source xml to query for pools"
 msgstr ""
 
-#: tools/virsh.c:8546 tools/virsh.c:11470 tools/virsh.c:11769
-#: tools/virsh.c:15183
+#: tools/virsh.c:9361 tools/virsh.c:12543 tools/virsh.c:12847
+#: tools/virsh.c:16272
 msgid "missing option"
 msgstr ""
 
-#: tools/virsh.c:4476
+#: tools/virsh.c:9388
 msgid "storage pool information"
 msgstr "informations du pool de stockage"
 
-#: tools/virsh.c:4477
+#: tools/virsh.c:9389
 msgid "Returns basic information about the storage pool."
 msgstr "Renvoyer un résumé des informations à propos du pool de stockage."
 
-#: tools/virsh.c:4536
+#: tools/virsh.c:9472
 msgid "Available:"
 msgstr "Disponible :"
 
-#: tools/virsh.c:4551
+#: tools/virsh.c:9487
 msgid "convert a pool UUID to pool name"
 msgstr "convertir l'UUID d'un pool en nom de pool"
 
-#: tools/virsh.c:4557
+#: tools/virsh.c:9493
 msgid "pool uuid"
 msgstr "UUID du pool"
 
-#: tools/virsh.c:4582
+#: tools/virsh.c:9518
 msgid "start a (previously defined) inactive pool"
 msgstr "démarrer un pool inactif (précédemment défini)"
 
-#: tools/virsh.c:4583
+#: tools/virsh.c:9519
 msgid "Start a pool."
 msgstr "Démarrer un pool."
 
-#: tools/virsh.c:4588
+#: tools/virsh.c:9524
 msgid "name of the inactive pool"
 msgstr "nom du pool inactif"
 
-#: tools/virsh.c:4605
+#: tools/virsh.c:9541
 #, c-format
 msgid "Pool %s started\n"
 msgstr "Pool %s démarré\n"
 
-#: tools/virsh.c:4608
+#: tools/virsh.c:9544
 #, c-format
 msgid "Failed to start pool %s"
 msgstr "Impossible de démarrer le pool %s"
 
-#: tools/virsh.c:4621
+#: tools/virsh.c:9557
 msgid "create a volume from a set of args"
 msgstr "créer un volume depuis un ensemble d'arguments"
 
-#: tools/virsh.c:4622 tools/virsh.c:4818
+#: tools/virsh.c:9558 tools/virsh.c:9822
 msgid "Create a vol."
 msgstr "Créer un volume."
 
-#: tools/virsh.c:4627 tools/virsh.c:4786 tools/virsh.c:4823 tools/virsh.c:4881
+#: tools/virsh.c:9563 tools/virsh.c:9790 tools/virsh.c:9827 tools/virsh.c:9884
 msgid "pool name"
 msgstr "nom du pool"
 
-#: tools/virsh.c:4628
+#: tools/virsh.c:9564
 msgid "name of the volume"
 msgstr "nom du volume inactif"
 
-#: tools/virsh.c:4629
+#: tools/virsh.c:9565
 msgid "size of the vol with optional k,M,G,T suffix"
 msgstr "taille du volume avec le suffixe k,M,G,T optionnel"
 
-#: tools/virsh.c:4630
+#: tools/virsh.c:9566
 msgid "initial allocation size with optional k,M,G,T suffix"
 msgstr "taille d'allocation initiale avec le suffixe k,M,G,T optionnel"
 
-#: tools/virsh.c:4631
+#: tools/virsh.c:9567
 msgid "file format type raw,bochs,qcow,qcow2,vmdk"
 msgstr "type du format de fichier raw,bochs,qcow,qcow2,vmdk"
 
-#: tools/virsh.c:8753
+#: tools/virsh.c:9568
 msgid "the backing volume if taking a snapshot"
 msgstr ""
 
-#: tools/virsh.c:8754
+#: tools/virsh.c:9569
 msgid "format of backing volume if taking a snapshot"
 msgstr ""
 
-#: tools/virsh.c:4689 tools/virsh.c:4694
+#: tools/virsh.c:9628 tools/virsh.c:9632
 #, c-format
 msgid "Malformed size %s"
 msgstr "Taille %s non conforme"
 
-#: tools/virsh.c:7965
+#: tools/virsh.c:9692 tools/virsh.c:16306
 #, c-format
 msgid "failed to get vol '%s'"
-msgstr "impossible de récupérer le volume '%s'"
+msgstr "impossible de récupérer le volume « %s »"
 
-#: tools/virsh.c:4722
+#: tools/virsh.c:9726
 #, c-format
 msgid "Vol %s created\n"
 msgstr "Volume %s créé\n"
 
-#: tools/virsh.c:4726
+#: tools/virsh.c:9730
 #, c-format
 msgid "Failed to create vol %s"
 msgstr "Impossible de créer le volume %s"
 
-#: tools/virsh.c:4741
+#: tools/virsh.c:9745
 msgid "undefine an inactive pool"
 msgstr "supprimer un pool inactif"
 
-#: tools/virsh.c:4742
+#: tools/virsh.c:9746
 msgid "Undefine the configuration for an inactive pool."
 msgstr "Supprimer la configuration d'un pool inactif"
 
-#: tools/virsh.c:4765
+#: tools/virsh.c:9769
 #, c-format
 msgid "Pool %s has been undefined\n"
 msgstr "Le pool %s a été supprimé\n"
 
-#: tools/virsh.c:4767
+#: tools/virsh.c:9771
 #, c-format
 msgid "Failed to undefine pool %s"
 msgstr "Impossible de supprimer le pool %s"
 
-#: tools/virsh.c:4780
+#: tools/virsh.c:9784
 msgid "convert a pool name to pool UUID"
 msgstr "convertir le nom d'un pool en UUID de pool"
 
-#: tools/virsh.c:4806
+#: tools/virsh.c:9810
 msgid "failed to get pool UUID"
 msgstr "impossible de récupérer l'UUID du pool"
 
-#: tools/virsh.c:4817
+#: tools/virsh.c:9821
 msgid "create a vol from an XML file"
 msgstr "créer un volume depuis un fichier XML"
 
-#: tools/virsh.c:4824 tools/virsh.c:4882
+#: tools/virsh.c:9828 tools/virsh.c:9885
 msgid "file containing an XML vol description"
 msgstr "fichier contenant la description XML d'un volume"
 
-#: tools/virsh.c:4861
+#: tools/virsh.c:9864
 #, c-format
 msgid "Vol %s created from %s\n"
 msgstr "Volume %s créé depuis %s\n"
 
-#: tools/virsh.c:4865 tools/virsh.c:4922
+#: tools/virsh.c:9868 tools/virsh.c:9924
 #, c-format
 msgid "Failed to create vol from %s"
 msgstr "Impossible de créer le volume depuis %s"
 
-#: tools/virsh.c:4875
+#: tools/virsh.c:9878
 msgid "create a vol, using another volume as input"
 msgstr ""
 
-#: tools/virsh.c:4876
+#: tools/virsh.c:9879
 msgid "Create a vol from an existing volume."
 msgstr ""
 
-#: tools/virsh.c:4884
+#: tools/virsh.c:9886
 msgid "input vol name or key"
 msgstr ""
 
-#: tools/virsh.c:4883
+#: tools/virsh.c:9887
 msgid "pool name or uuid of the input volume's pool"
 msgstr ""
 
-#: tools/virsh.c:4919
+#: tools/virsh.c:9921
 #, c-format
 msgid "Vol %s created from input vol %s\n"
 msgstr ""
 
-#: tools/virsh.c:9135
+#: tools/virsh.c:9950
 msgid "(volume_definition)"
 msgstr ""
 
-#: tools/virsh.c:4974
+#: tools/virsh.c:9973
 msgid "clone a volume."
 msgstr ""
 
-#: tools/virsh.c:4975
+#: tools/virsh.c:9974
 msgid "Clone an existing volume."
 msgstr ""
 
-#: tools/virsh.c:4981
+#: tools/virsh.c:9979
 msgid "orig vol name or key"
 msgstr ""
 
-#: tools/virsh.c:4982
+#: tools/virsh.c:9980
 msgid "clone name"
 msgstr ""
 
-#: tools/virsh.c:5004
+#: tools/virsh.c:10003 tools/virsh.c:10795
 msgid "failed to get parent pool"
 msgstr ""
 
-#: tools/virsh.c:5025
+#: tools/virsh.c:10023
 #, c-format
 msgid "Vol %s cloned from %s\n"
 msgstr ""
 
-#: tools/virsh.c:5028
+#: tools/virsh.c:10026
 #, c-format
 msgid "Failed to clone vol from %s"
 msgstr ""
 
-#: tools/virsh.c:9235
+#: tools/virsh.c:10050
 msgid "upload a file into a volume"
 msgstr ""
 
-#: tools/virsh.c:9236
+#: tools/virsh.c:10051
 msgid "Upload a file into a volume"
 msgstr ""
 
-#: tools/virsh.c:5058 tools/virsh.c:5099 tools/virsh.c:5150
+#: tools/virsh.c:10056 tools/virsh.c:10156 tools/virsh.c:10253
+#: tools/virsh.c:10294 tools/virsh.c:10335 tools/virsh.c:10399
 msgid "vol name, key or path"
 msgstr "nom, clé ou chemin de volume"
 
-#: tools/virsh.c:5123
+#: tools/virsh.c:10057 tools/virsh.c:10157 tools/virsh.c:10360
+#: tools/virsh.c:10530
 msgid "file"
 msgstr "fichier"
 
-#: tools/virsh.c:9244
+#: tools/virsh.c:10059
 msgid "volume offset to upload to"
 msgstr ""
 
-#: tools/virsh.c:9245
+#: tools/virsh.c:10060
 msgid "amount of data to upload"
 msgstr ""
 
-#: tools/virsh.c:9273 tools/virsh.c:9278 tools/virsh.c:9365 tools/virsh.c:9370
-msgid "Unable to parse integer"
-msgstr ""
-
-#: tools/virsh.c:9298
+#: tools/virsh.c:10113
 #, c-format
 msgid "cannot upload to volume %s"
 msgstr ""
 
-#: tools/virsh.c:9303
+#: tools/virsh.c:10118
 #, c-format
 msgid "cannot send data to volume %s"
 msgstr ""
 
-#: tools/virsh.c:9314 tools/virsh.c:9410
+#: tools/virsh.c:10129 tools/virsh.c:10225
 #, c-format
 msgid "cannot close volume %s"
 msgstr ""
 
-#: tools/virsh.c:9335 tools/virsh.c:9336
+#: tools/virsh.c:10150 tools/virsh.c:10151
 msgid "Download a volume to a file"
 msgstr ""
 
-#: tools/virsh.c:9344
+#: tools/virsh.c:10159
 msgid "volume offset to download from"
 msgstr ""
 
-#: tools/virsh.c:9345
+#: tools/virsh.c:10160
 msgid "amount of data to download"
 msgstr ""
 
-#: tools/virsh.c:9385
+#: tools/virsh.c:10200
 #, c-format
 msgid "cannot create %s"
 msgstr ""
 
-#: tools/virsh.c:9394
+#: tools/virsh.c:10209
 #, c-format
 msgid "cannot download from volume %s"
 msgstr ""
 
-#: tools/virsh.c:9399
+#: tools/virsh.c:10214
 #, c-format
 msgid "cannot receive data from volume %s"
 msgstr ""
 
-#: tools/virsh.c:5051
+#: tools/virsh.c:10247
 msgid "delete a vol"
 msgstr "supprimer un volume"
 
-#: tools/virsh.c:5052
+#: tools/virsh.c:10248
 msgid "Delete a given vol."
 msgstr "Détruire le volume indiqué"
 
-#: tools/virsh.c:5077
+#: tools/virsh.c:10273
 #, c-format
 msgid "Vol %s deleted\n"
 msgstr "Volume %s détruit\n"
 
-#: tools/virsh.c:5079
+#: tools/virsh.c:10275
 #, c-format
 msgid "Failed to delete vol %s"
 msgstr "Impossible de détruire le volume %s"
 
-#: tools/virsh.c:9473
+#: tools/virsh.c:10288
 msgid "wipe a vol"
 msgstr ""
 
-#: tools/virsh.c:9474
+#: tools/virsh.c:10289
 msgid "Ensure data previously on a volume is not accessible to future reads"
 msgstr ""
 
-#: tools/virsh.c:9499
+#: tools/virsh.c:10314
 #, c-format
 msgid "Vol %s wiped\n"
 msgstr ""
 
-#: tools/virsh.c:9501
+#: tools/virsh.c:10316
 #, c-format
 msgid "Failed to wipe vol %s"
 msgstr ""
 
-#: tools/virsh.c:5092
+#: tools/virsh.c:10329
 msgid "storage vol information"
 msgstr "informations du volume de stockage"
 
-#: tools/virsh.c:5093
+#: tools/virsh.c:10330
 msgid "Returns basic information about the storage vol."
 msgstr "Renvoyer un résumé des informations à propos du volume de stockage."
 
-#: tools/virsh.c:5121
+#: tools/virsh.c:10360 tools/virsh.c:10364 tools/virsh.c:10368
+#: tools/virsh.c:10372
 msgid "Type:"
 msgstr "Type :"
 
-#: tools/virsh.c:5123
+#: tools/virsh.c:10364 tools/virsh.c:10533
 msgid "block"
 msgstr "bloc"
 
-#: tools/virsh.c:9553 tools/virsh.c:9721
+#: tools/virsh.c:10368 tools/virsh.c:10536
 msgid "dir"
 msgstr ""
 
-#: tools/virsh.c:5143
+#: tools/virsh.c:10393
 msgid "vol information in XML"
 msgstr "informations du volume en XML"
 
-#: tools/virsh.c:5144
+#: tools/virsh.c:10394
 msgid "Output the vol information as an XML dump to stdout."
 msgstr "Afficher les informations du volume comme flux XML vers stdout."
 
-#: tools/virsh.c:5184
+#: tools/virsh.c:10434
 msgid "list vols"
 msgstr "lister les volumes"
 
-#: tools/virsh.c:5185
+#: tools/virsh.c:10435
 msgid "Returns list of vols by pool."
 msgstr "Renvoyer la liste des volume par pool."
 
-#: tools/virsh.c:9626
+#: tools/virsh.c:10441
 msgid "display extended details for volumes"
 msgstr ""
 
-#: tools/virsh.c:9667
+#: tools/virsh.c:10482
 msgid "Failed to list storage volumes"
 msgstr ""
 
-#: tools/virsh.c:5210 tools/virsh.c:5218
+#: tools/virsh.c:10492
 msgid "Failed to list active vols"
 msgstr "Impossible de lister les volumes actifs"
 
-#: tools/virsh.c:5226
+#: tools/virsh.c:10604 tools/virsh.c:10624 tools/virsh.c:10669
 msgid "Path"
 msgstr "Chemin"
 
-#: tools/virsh.c:9814 tools/virsh.c:9854
+#: tools/virsh.c:10629 tools/virsh.c:10669
 msgid "Type"
 msgstr ""
 
-#: tools/virsh.c:9917
+#: tools/virsh.c:10732
 msgid "returns the volume name for a given volume key or path"
 msgstr ""
 
-#: tools/virsh.c:9923 tools/virsh.c:9956
+#: tools/virsh.c:10738 tools/virsh.c:10771
 msgid "volume key or path"
 msgstr ""
 
-#: tools/virsh.c:9949
+#: tools/virsh.c:10764
 msgid "returns the storage pool for a given volume key or path"
 msgstr ""
 
-#: tools/virsh.c:9955
+#: tools/virsh.c:10770
 msgid "return the pool uuid rather than pool name"
 msgstr ""
 
-#: tools/virsh.c:10006
+#: tools/virsh.c:10821
 msgid "returns the volume key for a given volume name or path"
 msgstr ""
 
-#: tools/virsh.c:10012
+#: tools/virsh.c:10827
 msgid "volume name or path"
 msgstr ""
 
-#: tools/virsh.c:10039
+#: tools/virsh.c:10854
 msgid "returns the volume path for a given volume name or key"
 msgstr ""
 
-#: tools/virsh.c:10045
+#: tools/virsh.c:10860
 msgid "volume name or key"
 msgstr ""
 
-#: tools/virsh.c:5362
+#: tools/virsh.c:10894
 msgid "define or modify a secret from an XML file"
 msgstr ""
 
-#: tools/virsh.c:5363
+#: tools/virsh.c:10895
 msgid "Define or modify a secret."
 msgstr ""
 
-#: tools/virsh.c:5368
+#: tools/virsh.c:10900
 msgid "file containing secret attributes in XML"
 msgstr ""
 
-#: tools/virsh.c:5393
+#: tools/virsh.c:10925
 #, c-format
 msgid "Failed to set attributes from %s"
 msgstr ""
 
-#: tools/virsh.c:5397
+#: tools/virsh.c:10929
 msgid "Failed to get UUID of created secret"
 msgstr ""
 
-#: tools/virsh.c:5401
+#: tools/virsh.c:10933
 #, c-format
 msgid "Secret %s created\n"
 msgstr ""
 
-#: tools/virsh.c:5410
+#: tools/virsh.c:10942
 msgid "secret attributes in XML"
 msgstr ""
 
-#: tools/virsh.c:5411
+#: tools/virsh.c:10943
 msgid "Output attributes of a secret as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:5416 tools/virsh.c:5456 tools/virsh.c:5515 tools/virsh.c:5567
+#: tools/virsh.c:10948 tools/virsh.c:10988 tools/virsh.c:11048
+#: tools/virsh.c:11100
 msgid "secret UUID"
 msgstr ""
 
-#: tools/virsh.c:5450
+#: tools/virsh.c:10982
 msgid "set a secret value"
 msgstr ""
 
-#: tools/virsh.c:5451
+#: tools/virsh.c:10983
 msgid "Set a secret value."
 msgstr ""
 
-#: tools/virsh.c:5457
+#: tools/virsh.c:10989
 msgid "base64-encoded secret value"
 msgstr ""
 
-#: tools/virsh.c:5481
+#: tools/virsh.c:11014
 msgid "Invalid base64 data"
 msgstr ""
 
-#: tools/virsh.c:5494
+#: tools/virsh.c:11027
 msgid "Failed to set secret value"
 msgstr ""
 
-#: tools/virsh.c:5497
+#: tools/virsh.c:11030
 msgid "Secret value set\n"
 msgstr ""
 
-#: tools/virsh.c:5509
+#: tools/virsh.c:11042
 msgid "Output a secret value"
 msgstr ""
 
-#: tools/virsh.c:5510
+#: tools/virsh.c:11043
 msgid "Output a secret value to stdout."
 msgstr ""
 
-#: tools/virsh.c:5561
+#: tools/virsh.c:11094
 msgid "undefine a secret"
 msgstr ""
 
-#: tools/virsh.c:5562
+#: tools/virsh.c:11095
 msgid "Undefine a secret."
 msgstr ""
 
-#: tools/virsh.c:5586
+#: tools/virsh.c:11119
 #, c-format
 msgid "Failed to delete secret %s"
 msgstr ""
 
-#: tools/virsh.c:5589
+#: tools/virsh.c:11122
 #, c-format
 msgid "Secret %s deleted\n"
 msgstr ""
 
-#: tools/virsh.c:5601
+#: tools/virsh.c:11134
 msgid "list secrets"
 msgstr ""
 
-#: tools/virsh.c:5602
+#: tools/virsh.c:11135
 msgid "Returns a list of secrets"
 msgstr ""
 
-#: tools/virsh.c:5617 tools/virsh.c:5624
+#: tools/virsh.c:11150 tools/virsh.c:11157
 msgid "Failed to list secrets"
 msgstr ""
 
-#: tools/virsh.c:5631
+#: tools/virsh.c:11164
 msgid "Usage"
 msgstr ""
 
-#: tools/virsh.c:5645
+#: tools/virsh.c:11178
 msgid "Volume"
 msgstr ""
 
-#: tools/virsh.c:5655
+#: tools/virsh.c:11188
 msgid "Unused"
 msgstr ""
 
-#: tools/virsh.c:5669
+#: tools/virsh.c:11202
 msgid "show version"
 msgstr "afficher la version"
 
-#: tools/virsh.c:5670
+#: tools/virsh.c:11203
 msgid "Display the system version information."
 msgstr "Afficher la version du système."
 
-#: tools/virsh.c:10393
+#: tools/virsh.c:11208
 msgid "report daemon version too"
 msgstr ""
 
-#: tools/virsh.c:5693
+#: tools/virsh.c:11231
 msgid "failed to get hypervisor type"
 msgstr "impossible de récupérer le type d'hyperviseur"
 
-#: tools/virsh.c:5702
+#: tools/virsh.c:11240
 #, c-format
 msgid "Compiled against library: libvir %d.%d.%d\n"
 msgstr "Compilé avec la bibliothèque libvir %d.%d.%d\n"
 
-#: tools/virsh.c:5707
+#: tools/virsh.c:11245
 msgid "failed to get the library version"
 msgstr "impossible de récupérer la version de la bibliothèque"
 
-#: tools/virsh.c:5714
+#: tools/virsh.c:11252
 #, c-format
 msgid "Using library: libvir %d.%d.%d\n"
 msgstr "Utilisation de la bibliothèque : libvir %d.%d.%d\n"
 
-#: tools/virsh.c:5721
+#: tools/virsh.c:11259
 #, c-format
 msgid "Using API: %s %d.%d.%d\n"
 msgstr "Utilisation de l'API : %s %d.%d.%d\n"
 
-#: tools/virsh.c:5726
+#: tools/virsh.c:11264
 msgid "failed to get the hypervisor version"
 msgstr "impossible de récupérer la version de l'hyperviseur"
 
-#: tools/virsh.c:5731
+#: tools/virsh.c:11269
 #, c-format
 msgid "Cannot extract running %s hypervisor version\n"
 msgstr ""
 "Impossible d'extraire la version de l'hyperviseur %s en cours d'exécution\n"
 
-#: tools/virsh.c:5738
+#: tools/virsh.c:11276
 #, c-format
 msgid "Running hypervisor: %s %d.%d.%d\n"
 msgstr "Exécution de l'hyperviseur : %s %d.%d.%d\n"
 
-#: tools/virsh.c:10468
+#: tools/virsh.c:11283
 msgid "failed to get the daemon version"
 msgstr ""
 
-#: tools/virsh.c:10474
+#: tools/virsh.c:11289
 #, c-format
 msgid "Running against daemon: %d.%d.%d\n"
 msgstr ""
 
-#: tools/virsh.c:5748
+#: tools/virsh.c:11301
 msgid "enumerate devices on this host"
 msgstr ""
 
-#: tools/virsh.c:5754
+#: tools/virsh.c:11307
 msgid "list devices in a tree"
 msgstr ""
 
-#: tools/virsh.c:5755
+#: tools/virsh.c:11308
 msgid "capability name"
 msgstr ""
 
-#: tools/virsh.c:5856
+#: tools/virsh.c:11408
 msgid "Failed to count node devices"
 msgstr ""
 
-#: tools/virsh.c:5866
+#: tools/virsh.c:11418
 msgid "Failed to list node devices"
 msgstr ""
 
-#: tools/virsh.c:5916
+#: tools/virsh.c:11468
 msgid "node device details in XML"
 msgstr ""
 
-#: tools/virsh.c:5917
+#: tools/virsh.c:11469
 msgid "Output the node device details as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:5923 tools/virsh.c:5966 tools/virsh.c:6007 tools/virsh.c:6048
+#: tools/virsh.c:11475 tools/virsh.c:11518 tools/virsh.c:11559
+#: tools/virsh.c:11600
 msgid "device key"
 msgstr ""
 
-#: tools/virsh.c:5939 tools/virsh.c:5982 tools/virsh.c:6023 tools/virsh.c:6064
+#: tools/virsh.c:11491 tools/virsh.c:11534 tools/virsh.c:11575
+#: tools/virsh.c:11616
 msgid "Could not find matching device"
 msgstr ""
 
-#: tools/virsh.c:5959
+#: tools/virsh.c:11511
 msgid "dettach node device from its device driver"
 msgstr ""
 
-#: tools/virsh.c:5960
+#: tools/virsh.c:11512
 msgid ""
 "Dettach node device from its device driver before assigning to a domain."
 msgstr ""
 
-#: tools/virsh.c:5987
+#: tools/virsh.c:11539
 #, c-format
 msgid "Device %s dettached\n"
 msgstr ""
 
-#: tools/virsh.c:5989
+#: tools/virsh.c:11541
 #, c-format
 msgid "Failed to dettach device %s"
 msgstr ""
 
-#: tools/virsh.c:6000
+#: tools/virsh.c:11552
 msgid "reattach node device to its device driver"
 msgstr ""
 
-#: tools/virsh.c:6001
+#: tools/virsh.c:11553
 msgid ""
 "Reattach node device to its device driver once released by the domain."
 msgstr ""
 
-#: tools/virsh.c:6028
+#: tools/virsh.c:11580
 #, c-format
 msgid "Device %s re-attached\n"
 msgstr ""
 
-#: tools/virsh.c:6030
+#: tools/virsh.c:11582
 #, c-format
 msgid "Failed to re-attach device %s"
 msgstr ""
 
-#: tools/virsh.c:6041
+#: tools/virsh.c:11593
 msgid "reset node device"
 msgstr ""
 
-#: tools/virsh.c:6042
+#: tools/virsh.c:11594
 msgid "Reset node device before or after assigning to a domain."
 msgstr ""
 
-#: tools/virsh.c:6069
+#: tools/virsh.c:11621
 #, c-format
 msgid "Device %s reset\n"
 msgstr ""
 
-#: tools/virsh.c:6071
+#: tools/virsh.c:11623
 #, c-format
 msgid "Failed to reset device %s"
 msgstr ""
 
-#: tools/virsh.c:6082
+#: tools/virsh.c:11634
 msgid "print the hypervisor hostname"
 msgstr "afficher le nom d'hôte de l'hyperviseur"
 
-#: tools/virsh.c:6097
+#: tools/virsh.c:11649
 msgid "failed to get hostname"
 msgstr "impossible de récupérer le nom de l'hôte"
 
-#: tools/virsh.c:6111
+#: tools/virsh.c:11663
 msgid "print the hypervisor canonical URI"
 msgstr "afficher l'URI canonique de l'hyperviseur"
 
-#: tools/virsh.c:6126
+#: tools/virsh.c:11678
 msgid "failed to get URI"
 msgstr "impossible de récupérer l'URI"
 
-#: tools/virsh.c:10877
+#: tools/virsh.c:11692
 msgid "print the hypervisor sysinfo"
 msgstr ""
 
-#: tools/virsh.c:10879
+#: tools/virsh.c:11694
 msgid "output an XML string for the hypervisor sysinfo, if available"
 msgstr ""
 
-#: tools/virsh.c:10893
+#: tools/virsh.c:11708
 msgid "failed to get sysinfo"
 msgstr ""
 
-#: tools/virsh.c:6140
+#: tools/virsh.c:11722
 msgid "vnc display"
 msgstr "affichage vnc"
 
-#: tools/virsh.c:6141
+#: tools/virsh.c:11723
 msgid "Output the IP address and port number for the VNC display."
 msgstr "Afficher l'adresse IP et le numéro de port pour l'affichage de VNC."
 
-#: tools/virsh.c:6215
+#: tools/virsh.c:11791
 msgid "tty console"
 msgstr "console TTY"
 
-#: tools/virsh.c:6216
+#: tools/virsh.c:11792
 msgid "Output the device for the TTY console."
 msgstr "Afficher le périphérique pour la console TTY"
 
-#: tools/virsh.c:6276
+#: tools/virsh.c:11846
 msgid "attach device from an XML file"
 msgstr "attacher un périphérique depuis un fichier XML"
 
-#: tools/virsh.c:6277
+#: tools/virsh.c:11847
 msgid "Attach device from an XML <file>."
 msgstr "Attacher un périphérique depuis un fichier XML <file>."
 
-#: tools/virsh.c:6283 tools/virsh.c:6341
+#: tools/virsh.c:11853 tools/virsh.c:12162 tools/virsh.c:12241
 msgid "XML file"
 msgstr "fichier XML"
 
-#: tools/virsh.c:11039
+#: tools/virsh.c:11854
 msgid "persist device attachment"
 msgstr ""
 
-#: tools/virsh.c:6318
+#: tools/virsh.c:11895
 #, c-format
 msgid "Failed to attach device from %s"
 msgstr "Impossible d'attacher le périphérique depuis %s"
 
-#: tools/virsh.c:6322
+#: tools/virsh.c:11899
 msgid "Device attached successfully\n"
 msgstr ""
 
-#: tools/virsh.c:6334
+#: tools/virsh.c:11982 tools/virsh.c:11995
+msgid "Bad child elements counting."
+msgstr ""
+
+#: tools/virsh.c:12056
+#, c-format
+msgid "couldn't get XML description of domain %s"
+msgstr ""
+
+#: tools/virsh.c:12063
+msgid "Failed to parse domain definition xml"
+msgstr ""
+
+#: tools/virsh.c:12069
+msgid "Failed to parse device definition xml"
+msgstr ""
+
+#: tools/virsh.c:12091
+msgid "error when selecting nodes"
+msgstr ""
+
+#: tools/virsh.c:12120
+msgid "failed to create document saving context"
+msgstr ""
+
+#: tools/virsh.c:12155
 msgid "detach device from an XML file"
 msgstr "détacher un périphérique depuis un fichier XML"
 
-#: tools/virsh.c:6335
+#: tools/virsh.c:12156
 msgid "Detach device from an XML <file>"
 msgstr "Détacher un périphérique depuis un fichier XML <file>"
 
-#: tools/virsh.c:11104
+#: tools/virsh.c:12163
 msgid "persist device detachment"
 msgstr ""
 
-#: tools/virsh.c:6376
+#: tools/virsh.c:12194
+#, c-format
+msgid "no such device in %s"
+msgstr ""
+
+#: tools/virsh.c:12196
+msgid "given XML selects too many devices. Please, be more specific"
+msgstr ""
+
+#: tools/virsh.c:12215
 #, c-format
 msgid "Failed to detach device from %s"
 msgstr "Impossible de détacher le périphérique depuis %s"
 
-#: tools/virsh.c:6380
+#: tools/virsh.c:12219
 msgid "Device detached successfully\n"
 msgstr ""
 
-#: tools/virsh.c:11161
+#: tools/virsh.c:12234
 msgid "update device from an XML file"
 msgstr ""
 
-#: tools/virsh.c:11162
+#: tools/virsh.c:12235
 msgid "Update device from an XML <file>."
 msgstr ""
 
-#: tools/virsh.c:11169
+#: tools/virsh.c:12242
 msgid "persist device update"
 msgstr ""
 
-#: tools/virsh.c:11170
+#: tools/virsh.c:12243
 msgid "force device update"
 msgstr ""
 
-#: tools/virsh.c:11215
+#: tools/virsh.c:12288
 #, c-format
 msgid "Failed to update device from %s"
 msgstr ""
 
-#: tools/virsh.c:6392
+#: tools/virsh.c:12304
 msgid "attach network interface"
 msgstr "attacher une interface réseau"
 
-#: tools/virsh.c:6393
+#: tools/virsh.c:12305
 msgid "Attach new network interface."
 msgstr "Attacher une nouvelle interface réseau."
 
-#: tools/virsh.c:6399 tools/virsh.c:6515
+#: tools/virsh.c:12311 tools/virsh.c:12510
 msgid "network interface type"
 msgstr "type d'interface réseau"
 
-#: tools/virsh.c:6400
+#: tools/virsh.c:12312
 msgid "source of network interface"
 msgstr "source d'interface réseau"
 
-#: tools/virsh.c:6401
+#: tools/virsh.c:12313
 msgid "target network name"
 msgstr "nom du réseau cible"
 
-#: tools/virsh.c:6402 tools/virsh.c:6516
+#: tools/virsh.c:12314 tools/virsh.c:12511
 msgid "MAC address"
 msgstr "adresse MAC"
 
-#: tools/virsh.c:6403
+#: tools/virsh.c:12315
 msgid "script used to bridge network interface"
 msgstr "script utilisé pour relier une interface réseau"
 
-#: tools/virsh.c:11243
+#: tools/virsh.c:12316
 msgid "model type"
 msgstr ""
 
-#: tools/virsh.c:11244
+#: tools/virsh.c:12317
 msgid "persist interface attachment"
 msgstr ""
 
-#: tools/virsh.c:11245
+#: tools/virsh.c:12318
 msgid "control domain's incoming traffics"
 msgstr ""
 
-#: tools/virsh.c:11246
+#: tools/virsh.c:12319
 msgid "control domain's outgoing traffics"
 msgstr ""
 
-#: tools/virsh.c:11326
+#: tools/virsh.c:12399
 #, c-format
 msgid "No support for %s in command 'attach-interface'"
 msgstr ""
 
-#: tools/virsh.c:11334
+#: tools/virsh.c:12407
 msgid "inbound format is incorrect"
 msgstr ""
 
-#: tools/virsh.c:11338
+#: tools/virsh.c:12411
 msgid "inbound average is mandatory"
 msgstr ""
 
-#: tools/virsh.c:11345
+#: tools/virsh.c:12418
 msgid "outbound format is incorrect"
 msgstr ""
 
-#: tools/virsh.c:11349
+#: tools/virsh.c:12422
 msgid "outbound average is mandatory"
 msgstr ""
 
-#: tools/virsh.c:11413
+#: tools/virsh.c:12486
 msgid "Failed to attach interface"
 msgstr ""
 
-#: tools/virsh.c:6491
+#: tools/virsh.c:12488
 msgid "Interface attached successfully\n"
 msgstr ""
 
-#: tools/virsh.c:6508
+#: tools/virsh.c:12503
 msgid "detach network interface"
 msgstr "détacher une interface réseau"
 
-#: tools/virsh.c:6509
+#: tools/virsh.c:12504
 msgid "Detach network interface."
 msgstr "Détacher une interface réseau."
 
-#: tools/virsh.c:11439
+#: tools/virsh.c:12512
 msgid "persist interface detachment"
 msgstr ""
 
-#: tools/virsh.c:6554 tools/virsh.c:6559
+#: tools/virsh.c:12554
 msgid "Failed to get interface information"
 msgstr "impossible de récupérer les informations relatives à l'interface"
 
-#: tools/virsh.c:6567
+#: tools/virsh.c:12562
 #, c-format
 msgid "No found interface whose type is %s"
 msgstr "Interface de type %s introuvable"
 
-#: tools/virsh.c:11494
+#: tools/virsh.c:12567
 #, c-format
 msgid ""
 "Domain has %d interfaces. Please specify which one to detach using --mac"
 msgstr ""
 
-#: tools/virsh.c:6589
+#: tools/virsh.c:12591
 #, c-format
 msgid "No found interface whose MAC address is %s"
 msgstr "Interface d'adresse MAC %s introuvable"
 
-#: tools/virsh.c:11545
+#: tools/virsh.c:12618
 msgid "Failed to detach interface"
 msgstr ""
 
-#: tools/virsh.c:6608
+#: tools/virsh.c:12620
 msgid "Interface detached successfully\n"
 msgstr ""
 
-#: tools/virsh.c:6628
+#: tools/virsh.c:12638
 msgid "attach disk device"
 msgstr "attacher un périphérique disque"
 
-#: tools/virsh.c:6629
+#: tools/virsh.c:12639
 msgid "Attach new disk device."
 msgstr "Attacher un nouveau périphérique disque."
 
-#: tools/virsh.c:6635
+#: tools/virsh.c:12646
 msgid "source of disk device"
 msgstr "source du périphérique disque"
 
-#: tools/virsh.c:6636 tools/virsh.c:6792
+#: tools/virsh.c:12647 tools/virsh.c:12990
 msgid "target of disk device"
 msgstr "cible du périphérique disque"
 
-#: tools/virsh.c:6637
+#: tools/virsh.c:12648
 msgid "driver of disk device"
 msgstr "pilote du périphérique disque"
 
-#: tools/virsh.c:6638
+#: tools/virsh.c:12649
 msgid "subdriver of disk device"
 msgstr "pilote secondaire du périphérique disque"
 
-#: tools/virsh.c:11576
+#: tools/virsh.c:12650
 msgid "cache mode of disk device"
 msgstr ""
 
-#: tools/virsh.c:6639
+#: tools/virsh.c:12651
 msgid "target device type"
 msgstr "type de périphérique cible"
 
-#: tools/virsh.c:6640
+#: tools/virsh.c:12652
 msgid "mode of device reading and writing"
 msgstr "mode de lecture et d'écriture du périphérique"
 
-#: tools/virsh.c:11579
+#: tools/virsh.c:12653
 msgid "persist disk attachment"
 msgstr ""
 
-#: tools/virsh.c:11580
+#: tools/virsh.c:12654
 msgid "type of source (block|file)"
 msgstr ""
 
-#: tools/virsh.c:11581
+#: tools/virsh.c:12655
 msgid "serial of disk device"
 msgstr ""
 
-#: tools/virsh.c:11582
+#: tools/virsh.c:12656
 msgid "shareable between domains"
 msgstr ""
 
-#: tools/virsh.c:11583
+#: tools/virsh.c:12657
 msgid "address of disk device"
 msgstr ""
 
-#: tools/virsh.c:11779
+#: tools/virsh.c:12857
 #, c-format
 msgid "Unknown source type: '%s'"
 msgstr ""
 
-#: tools/virsh.c:11785
+#: tools/virsh.c:12863
 #, c-format
 msgid "No support for %s in command 'attach-disk'"
 msgstr ""
 
-#: tools/virsh.c:11826
+#: tools/virsh.c:12905
 msgid "Invalid address."
 msgstr ""
 
-#: tools/virsh.c:11838
+#: tools/virsh.c:12917
 msgid "expecting a pci:0000.00.00.00 address."
 msgstr ""
 
-#: tools/virsh.c:11849
+#: tools/virsh.c:12928
 msgid "expecting a scsi:00.00.00 address."
 msgstr ""
 
-#: tools/virsh.c:11860
+#: tools/virsh.c:12939
 msgid "expecting an ide:00.00.00 address."
 msgstr ""
 
-#: tools/virsh.c:11887
+#: tools/virsh.c:12966
 msgid "Failed to attach disk"
 msgstr ""
 
-#: tools/virsh.c:6769
+#: tools/virsh.c:12968
 msgid "Disk attached successfully\n"
 msgstr ""
 
-#: tools/virsh.c:6785
+#: tools/virsh.c:12983
 msgid "detach disk device"
 msgstr "détacher un périphérique disque"
 
-#: tools/virsh.c:6786
+#: tools/virsh.c:12984
 msgid "Detach disk device."
 msgstr "Détacher un périphérique disque."
 
-#: tools/virsh.c:11912
+#: tools/virsh.c:12991
 msgid "persist disk detachment"
 msgstr ""
 
-#: tools/virsh.c:6827 tools/virsh.c:6832 tools/virsh.c:6839
+#: tools/virsh.c:13027 tools/virsh.c:13034
 msgid "Failed to get disk information"
 msgstr "Impossible de récupérer les informations relatives au disque"
 
-#: tools/virsh.c:6858
+#: tools/virsh.c:13054
 #, c-format
 msgid "No found disk whose target is %s"
 msgstr "Disque dont la cible est %s introuvable"
 
-#: tools/virsh.c:12002
+#: tools/virsh.c:13081
 msgid "Failed to detach disk"
 msgstr ""
 
-#: tools/virsh.c:6877
+#: tools/virsh.c:13083
 msgid "Disk detached successfully\n"
 msgstr ""
 
-#: tools/virsh.c:6897
+#: tools/virsh.c:13101
 msgid "compare host CPU with a CPU described by an XML file"
 msgstr ""
 
-#: tools/virsh.c:6898
+#: tools/virsh.c:13102
 msgid "compare CPU with host CPU"
 msgstr ""
 
-#: tools/virsh.c:6903
+#: tools/virsh.c:13107
 msgid "file containing an XML CPU description"
 msgstr ""
 
-#: tools/virsh.c:12053
+#: tools/virsh.c:13132
 #, c-format
 msgid "Failed to read file '%s' to compare"
 msgstr ""
 
-#: tools/virsh.c:12066
+#: tools/virsh.c:13145
 msgid "Can't create XML buffer to extract CPU element."
 msgstr ""
 
-#: tools/virsh.c:12071
+#: tools/virsh.c:13150
 msgid "Failed to extract CPU element snippet from domain XML."
 msgstr ""
 
-#: tools/virsh.c:12077
+#: tools/virsh.c:13156
 #, c-format
 msgid ""
 "File '%s' does not contain a <cpu> element or is not a valid domain or "
 "capabilities XML"
 msgstr ""
 
-#: tools/virsh.c:6931
+#: tools/virsh.c:13165
 #, c-format
 msgid "CPU described in %s is incompatible with host CPU\n"
 msgstr ""
 
-#: tools/virsh.c:6937
+#: tools/virsh.c:13171
 #, c-format
 msgid "CPU described in %s is identical to host CPU\n"
 msgstr ""
 
-#: tools/virsh.c:6943
+#: tools/virsh.c:13176
 #, c-format
 msgid "Host CPU is a superset of CPU described in %s\n"
 msgstr ""
 
-#: tools/virsh.c:6950
+#: tools/virsh.c:13182
 #, c-format
 msgid "Failed to compare host CPU with %s"
 msgstr ""
 
-#: tools/virsh.c:12122
+#: tools/virsh.c:13201
 msgid "compute baseline CPU"
 msgstr ""
 
-#: tools/virsh.c:12123
+#: tools/virsh.c:13202
 msgid "Compute baseline CPU for a set of given CPUs."
 msgstr ""
 
-#: tools/virsh.c:12128
+#: tools/virsh.c:13207
 msgid "file containing XML CPU descriptions"
 msgstr ""
 
-#: tools/virsh.c:12175
+#: tools/virsh.c:13254
 #, c-format
 msgid "No host CPU specified in '%s'"
 msgstr ""
 
-#: tools/virsh.c:12188
+#: tools/virsh.c:13267
 msgid "Failed to extract <cpu> element"
 msgstr ""
 
-#: tools/virsh.c:12237
+#: tools/virsh.c:13316
 #, c-format
 msgid "mkstemps: failed to create temporary file: %s"
 msgstr ""
 
-#: tools/virsh.c:6984
+#: tools/virsh.c:13323
 #, c-format
 msgid "write: %s: failed to write to temporary file: %s"
 msgstr ""
 
-#: tools/virsh.c:6992
+#: tools/virsh.c:13331
 #, c-format
 msgid "close: %s: failed to write or close temporary file: %s"
 msgstr ""
 
-#: tools/virsh.c:7030
+#: tools/virsh.c:13372
 #, c-format
 msgid ""
 "%s: temporary filename contains shell meta or other unacceptable characters "
 "(is $TMPDIR wrong?)"
 msgstr ""
 
-#: tools/virsh.c:7067
+#: tools/virsh.c:13405
 #, c-format
 msgid "%s: failed to read temporary file: %s"
 msgstr ""
 
-#: tools/virsh.c:7080
+#: tools/virsh.c:13417
 msgid "change the current directory"
 msgstr ""
 
-#: tools/virsh.c:7081
+#: tools/virsh.c:13418
 msgid "Change the current directory."
 msgstr ""
 
-#: tools/virsh.c:7086
+#: tools/virsh.c:13423
 msgid "directory to switch to (default: home or else root)"
 msgstr ""
 
-#: tools/virsh.c:7097
+#: tools/virsh.c:13435
 msgid "cd: command valid only in interactive mode"
 msgstr ""
 
-#: tools/virsh.c:7110
+#: tools/virsh.c:13447
 #, c-format
 msgid "cd: %s: %s"
 msgstr ""
 
-#: tools/virsh.c:7124
+#: tools/virsh.c:13459
 msgid "print the current directory"
 msgstr ""
 
-#: tools/virsh.c:7125
+#: tools/virsh.c:13460
 msgid "Print the current directory."
 msgstr ""
 
-#: tools/virsh.c:7148
+#: tools/virsh.c:13472
 #, c-format
 msgid "pwd: cannot get current directory: %s"
 msgstr ""
 
-#: tools/virsh.c:7151
+#: tools/virsh.c:13476
 #, c-format
 msgid "%s\n"
 msgstr ""
 
-#: tools/virsh.c:12408
+#: tools/virsh.c:13487
 msgid "echo arguments"
 msgstr ""
 
-#: tools/virsh.c:12409
+#: tools/virsh.c:13488
 msgid "Echo back arguments, possibly with quoting."
 msgstr ""
 
-#: tools/virsh.c:12414
+#: tools/virsh.c:13493
 msgid "escape for shell use"
 msgstr ""
 
-#: tools/virsh.c:12415
+#: tools/virsh.c:13494
 msgid "escape for XML use"
 msgstr ""
 
-#: tools/virsh.c:12416
+#: tools/virsh.c:13495
 msgid "arguments to echo"
 msgstr ""
 
-#: tools/virsh.c:7162
+#: tools/virsh.c:13560
 msgid "edit XML configuration for a domain"
 msgstr ""
 
-#: tools/virsh.c:7163
+#: tools/virsh.c:13561
 msgid "Edit the XML configuration for a domain."
 msgstr ""
 
-#: tools/virsh.c:7214
+#: tools/virsh.c:13609
 #, c-format
 msgid "Domain %s XML configuration not changed.\n"
 msgstr ""
 
-#: tools/virsh.c:7240
+#: tools/virsh.c:13635
 #, c-format
 msgid "Domain %s XML configuration edited.\n"
 msgstr ""
 
-#: tools/virsh.c:7265
+#: tools/virsh.c:13661
 msgid "edit XML configuration for a network"
 msgstr ""
 
-#: tools/virsh.c:7266
+#: tools/virsh.c:13662
 msgid "Edit the XML configuration for a network."
 msgstr ""
 
-#: tools/virsh.c:7282
+#: tools/virsh.c:13678
 msgid "edit XML configuration for a storage pool"
 msgstr ""
 
-#: tools/virsh.c:7283
+#: tools/virsh.c:13679
 msgid "Edit the XML configuration for a storage pool."
 msgstr ""
 
-#: tools/virsh.c:7299
+#: tools/virsh.c:13695
 msgid "quit this interactive terminal"
 msgstr "quitter ce terminal interactif"
 
-#: tools/virsh.c:12657
+#: tools/virsh.c:13736
 msgid "cannot halt after snapshot of transient domain"
 msgstr ""
 
-#: tools/virsh.c:12676
+#: tools/virsh.c:13755
 msgid "Could not get snapshot name"
 msgstr ""
 
-#: tools/virsh.c:12681
+#: tools/virsh.c:13760
 #, c-format
 msgid "Domain snapshot %s created from '%s'"
 msgstr ""
 
-#: tools/virsh.c:12683
+#: tools/virsh.c:13762
 #, c-format
 msgid "Domain snapshot %s created"
 msgstr ""
 
-#: tools/virsh.c:12700
+#: tools/virsh.c:13779
 msgid "Create a snapshot from XML"
 msgstr ""
 
-#: tools/virsh.c:12701
+#: tools/virsh.c:13780
 msgid "Create a snapshot (disk and RAM) from XML"
 msgstr ""
 
-#: tools/virsh.c:12707
+#: tools/virsh.c:13786
 msgid "domain snapshot XML"
 msgstr ""
 
-#: tools/virsh.c:12708
+#: tools/virsh.c:13787
 msgid "redefine metadata for existing snapshot"
 msgstr ""
 
-#: tools/virsh.c:12709
+#: tools/virsh.c:13788
 msgid "with redefine, set current snapshot"
 msgstr ""
 
-#: tools/virsh.c:12710 tools/virsh.c:12840
+#: tools/virsh.c:13789 tools/virsh.c:13919
 msgid "take snapshot but create no metadata"
 msgstr ""
 
-#: tools/virsh.c:12711 tools/virsh.c:12841
+#: tools/virsh.c:13790 tools/virsh.c:13920
 msgid "halt domain after snapshot is created"
 msgstr ""
 
-#: tools/virsh.c:12712 tools/virsh.c:12842
+#: tools/virsh.c:13791 tools/virsh.c:13921
 msgid "capture disk state but not vm state"
 msgstr ""
 
-#: tools/virsh.c:12824
+#: tools/virsh.c:13903
 #, c-format
 msgid "unable to parse diskspec: %s"
 msgstr ""
 
-#: tools/virsh.c:12830
+#: tools/virsh.c:13909
 msgid "Create a snapshot from a set of args"
 msgstr ""
 
-#: tools/virsh.c:12831
+#: tools/virsh.c:13910
 msgid "Create a snapshot (disk and RAM) from arguments"
 msgstr ""
 
-#: tools/virsh.c:12837
+#: tools/virsh.c:13916
 msgid "name of snapshot"
 msgstr ""
 
-#: tools/virsh.c:12838
+#: tools/virsh.c:13917
 msgid "description of snapshot"
 msgstr ""
 
-#: tools/virsh.c:12839
+#: tools/virsh.c:13918
 msgid "print XML document rather than create"
 msgstr ""
 
-#: tools/virsh.c:12844
+#: tools/virsh.c:13923
 msgid "disk attributes: disk[,snapshot=type][,driver=type][,file=name]"
 msgstr ""
 
-#: tools/virsh.c:12876
+#: tools/virsh.c:13955
 msgid "argument must not be empty"
 msgstr ""
 
-#: tools/virsh.c:12932
+#: tools/virsh.c:14011
 #, c-format
 msgid "invalid argument for --%s"
 msgstr ""
 
-#: tools/virsh.c:12937
+#: tools/virsh.c:14016
 #, c-format
 msgid "--%s and --current are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:12946
+#: tools/virsh.c:14025
 #, c-format
 msgid "--%s or --current is required"
 msgstr ""
 
-#: tools/virsh.c:12962
+#: tools/virsh.c:14041
 msgid "edit XML for a snapshot"
 msgstr ""
 
-#: tools/virsh.c:12963
+#: tools/virsh.c:14042
 msgid "Edit the domain snapshot XML for a named snapshot"
 msgstr ""
 
-#: tools/virsh.c:12969 tools/virsh.c:13644 tools/virsh.c:13763
-#: tools/virsh.c:13837
+#: tools/virsh.c:14048 tools/virsh.c:14723 tools/virsh.c:14842
+#: tools/virsh.c:14916
 msgid "snapshot name"
 msgstr ""
 
-#: tools/virsh.c:12970
+#: tools/virsh.c:14049
 msgid "also set edited snapshot as current"
 msgstr ""
 
-#: tools/virsh.c:12971
+#: tools/virsh.c:14050
 msgid "allow renaming an existing snapshot"
 msgstr ""
 
-#: tools/virsh.c:12972
+#: tools/virsh.c:14051
 msgid "allow cloning to new name"
 msgstr ""
 
-#: tools/virsh.c:12995
+#: tools/virsh.c:14074
 msgid "--rename and --clone are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:13041
+#: tools/virsh.c:14120
 #, c-format
 msgid "Snapshot %s XML configuration not changed.\n"
 msgstr ""
 
-#: tools/virsh.c:13056
+#: tools/virsh.c:14135
 #, c-format
 msgid "Snapshot %s edited.\n"
 msgstr ""
 
-#: tools/virsh.c:13058
+#: tools/virsh.c:14137
 #, c-format
 msgid "Snapshot %s cloned to %s.\n"
 msgstr ""
 
-#: tools/virsh.c:13067
+#: tools/virsh.c:14146
 #, c-format
 msgid "Failed to clean up %s"
 msgstr ""
 
-#: tools/virsh.c:13072
+#: tools/virsh.c:14151
 #, c-format
 msgid "Must use --rename or --clone to change %s to %s"
 msgstr ""
 
-#: tools/virsh.c:13100 tools/virsh.c:13101
+#: tools/virsh.c:14179 tools/virsh.c:14180
 msgid "Get or set the current snapshot"
 msgstr ""
 
-#: tools/virsh.c:13107
+#: tools/virsh.c:14186
 msgid "list the name, rather than the full xml"
 msgstr ""
 
-#: tools/virsh.c:13111
+#: tools/virsh.c:14190
 msgid "name of existing snapshot to make current"
 msgstr ""
 
-#: tools/virsh.c:13138
+#: tools/virsh.c:14217
 #, c-format
 msgid "invalid snapshotname argument '%s'"
 msgstr ""
 
-#: tools/virsh.c:13148
+#: tools/virsh.c:14227
 msgid "--name and snapshotname are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:13164
+#: tools/virsh.c:14243
 #, c-format
 msgid "Snapshot %s set as current"
 msgstr ""
 
-#: tools/virsh.c:13173
+#: tools/virsh.c:14252
 #, c-format
 msgid "domain '%s' has no current snapshot"
 msgstr ""
 
-#: tools/virsh.c:13256
+#: tools/virsh.c:14335
 msgid "unable to determine if snapshot has parent"
 msgstr ""
 
-#: tools/virsh.c:13273
+#: tools/virsh.c:14352
 msgid "List snapshots for a domain"
 msgstr ""
 
-#: tools/virsh.c:13274
+#: tools/virsh.c:14353
 msgid "Snapshot List"
 msgstr ""
 
-#: tools/virsh.c:13280
+#: tools/virsh.c:14359
 msgid "add a column showing parent snapshot"
 msgstr ""
 
-#: tools/virsh.c:13281
+#: tools/virsh.c:14360
 msgid "list only snapshots without parents"
 msgstr ""
 
-#: tools/virsh.c:13282
+#: tools/virsh.c:14361
 msgid "list only snapshots without children"
 msgstr ""
 
-#: tools/virsh.c:13284
+#: tools/virsh.c:14363
 msgid "list only snapshots that have metadata that would prevent undefine"
 msgstr ""
 
-#: tools/virsh.c:13285
+#: tools/virsh.c:14364
 msgid "list snapshots in a tree"
 msgstr ""
 
-#: tools/virsh.c:13286
+#: tools/virsh.c:14365
 msgid "limit list to children of given snapshot"
 msgstr ""
 
-#: tools/virsh.c:13288
+#: tools/virsh.c:14367
 msgid "limit list to children of current snapshot"
 msgstr ""
 
-#: tools/virsh.c:13289
+#: tools/virsh.c:14368
 msgid "with --from, list all descendants"
 msgstr ""
 
-#: tools/virsh.c:13338
+#: tools/virsh.c:14417
 msgid "--parent and --roots are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:13343
+#: tools/virsh.c:14422
 msgid "--parent and --tree are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:13350
+#: tools/virsh.c:14429
 msgid "--roots and --tree are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:13355
+#: tools/virsh.c:14434
 msgid "--roots and --from are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:13362
+#: tools/virsh.c:14441
 msgid "--leaves and --tree are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:13410
+#: tools/virsh.c:14489
 msgid "missing support"
 msgstr ""
 
-#: tools/virsh.c:13417 tools/virsh.c:13421
+#: tools/virsh.c:14496 tools/virsh.c:14500
 msgid "Creation Time"
 msgstr ""
 
-#: tools/virsh.c:13418
+#: tools/virsh.c:14497
 msgid "Parent"
 msgstr ""
 
-#: tools/virsh.c:13507
+#: tools/virsh.c:14586
 #, c-format
 msgid "snapshot %s disappeared from list"
 msgstr ""
 
-#: tools/virsh.c:13592
+#: tools/virsh.c:14671
 msgid "time_t overflow"
 msgstr ""
 
-#: tools/virsh.c:13637
+#: tools/virsh.c:14716
 msgid "Dump XML for a domain snapshot"
 msgstr ""
 
-#: tools/virsh.c:13638
+#: tools/virsh.c:14717
 msgid "Snapshot Dump XML"
 msgstr ""
 
-#: tools/virsh.c:13699
+#: tools/virsh.c:14778
 msgid "Get the name of the parent of a snapshot"
 msgstr ""
 
-#: tools/virsh.c:13700
+#: tools/virsh.c:14779
 msgid "Extract the snapshot's parent, if any"
 msgstr ""
 
-#: tools/virsh.c:13706
+#: tools/virsh.c:14785
 msgid "find parent of snapshot name"
 msgstr ""
 
-#: tools/virsh.c:13707
+#: tools/virsh.c:14786
 msgid "find parent of current snapshot"
 msgstr ""
 
-#: tools/virsh.c:13734
+#: tools/virsh.c:14813
 #, c-format
 msgid "snapshot '%s' has no parent"
 msgstr ""
 
-#: tools/virsh.c:13756
+#: tools/virsh.c:14835
 msgid "Revert a domain to a snapshot"
 msgstr ""
 
-#: tools/virsh.c:13757
+#: tools/virsh.c:14836
 msgid "Revert domain to snapshot"
 msgstr ""
 
-#: tools/virsh.c:13764
+#: tools/virsh.c:14843
 msgid "revert to current snapshot"
 msgstr ""
 
-#: tools/virsh.c:13765
+#: tools/virsh.c:14844
 msgid "after reverting, change state to running"
 msgstr ""
 
-#: tools/virsh.c:13766
+#: tools/virsh.c:14845
 msgid "after reverting, change state to paused"
 msgstr ""
 
-#: tools/virsh.c:13767
+#: tools/virsh.c:14846
 msgid "try harder on risky reverts"
 msgstr ""
 
-#: tools/virsh.c:13830
+#: tools/virsh.c:14909
 msgid "Delete a domain snapshot"
 msgstr ""
 
-#: tools/virsh.c:13831
+#: tools/virsh.c:14910
 msgid "Snapshot Delete"
 msgstr ""
 
-#: tools/virsh.c:13838
+#: tools/virsh.c:14917
 msgid "delete current snapshot"
 msgstr ""
 
-#: tools/virsh.c:13839
+#: tools/virsh.c:14918
 msgid "delete snapshot and all children"
 msgstr ""
 
-#: tools/virsh.c:13840
+#: tools/virsh.c:14919
 msgid "delete children but not snapshot"
 msgstr ""
 
-#: tools/virsh.c:13842
+#: tools/virsh.c:14921
 msgid "delete only libvirt metadata, leaving snapshot contents behind"
 msgstr ""
 
-#: tools/virsh.c:13878
+#: tools/virsh.c:14957
 #, c-format
 msgid "Domain snapshot %s children deleted\n"
 msgstr ""
 
-#: tools/virsh.c:13880
+#: tools/virsh.c:14959
 #, c-format
 msgid "Domain snapshot %s deleted\n"
 msgstr ""
 
-#: tools/virsh.c:13882
+#: tools/virsh.c:14961
 #, c-format
 msgid "Failed to delete snapshot %s"
 msgstr ""
 
-#: tools/virsh.c:13901 tools/virsh.c:13902
+#: tools/virsh.c:14980 tools/virsh.c:14981
 msgid "QEMU Monitor Command"
 msgstr ""
 
-#: tools/virsh.c:13908
+#: tools/virsh.c:14987
 msgid "command is in human monitor protocol"
 msgstr ""
 
-#: tools/virsh.c:13909
+#: tools/virsh.c:14988
 msgid "command"
 msgstr ""
 
-#: tools/virsh.c:13939
+#: tools/virsh.c:15018
 msgid "Failed to collect command"
 msgstr ""
 
-#: tools/virsh.c:13967 tools/virsh.c:13968
+#: tools/virsh.c:15046 tools/virsh.c:15047
 msgid "QEMU Attach"
 msgstr ""
 
-#: tools/virsh.c:13973
+#: tools/virsh.c:15052
 msgid "pid"
 msgstr ""
 
-#: tools/virsh.c:13989
+#: tools/virsh.c:15068
 msgid "missing pid value"
 msgstr ""
 
-#: tools/virsh.c:13997
+#: tools/virsh.c:15076
 #, c-format
 msgid "Domain %s attached to pid %u\n"
 msgstr ""
 
-#: tools/virsh.c:14002
+#: tools/virsh.c:15081
 #, c-format
 msgid "Failed to attach to pid %u"
 msgstr ""
 
-#: tools/virsh.c:14388
+#: tools/virsh.c:15474
 #, c-format
 msgid "option --%s already seen"
 msgstr ""
 
-#: tools/virsh.c:8176
+#: tools/virsh.c:15483
 #, c-format
 msgid "command '%s' doesn't support option --%s"
-msgstr "la commande '%s' ne prend pas en charge l'option --%s"
+msgstr "la commande « %s » ne prend pas en charge l'option --%s"
 
-#: tools/virsh.c:7519
+#: tools/virsh.c:15527
 #, c-format
 msgid "command '%s' requires <%s> option"
-msgstr "la commande '%s' nécessite l'option <%s>"
+msgstr "la commande « %s » nécessite l'option <%s>"
 
-#: tools/virsh.c:7520
+#: tools/virsh.c:15528
 #, c-format
 msgid "command '%s' requires --%s option"
-msgstr "la commande '%s' nécessite l'option --%s"
+msgstr "la commande « %s » nécessite l'option --%s"
 
-#: tools/virsh.c:14485
+#: tools/virsh.c:15571
 #, c-format
 msgid "command group '%s' doesn't exist"
 msgstr ""
 
-#: tools/virsh.c:7547
+#: tools/virsh.c:15592
 #, c-format
 msgid "command '%s' doesn't exist"
-msgstr "la commande '%s' n'existe pas"
+msgstr "la commande « %s » n'existe pas"
 
-#: tools/virsh.c:14518 tools/virsh.c:15374
+#: tools/virsh.c:15604 tools/virsh.c:16463
 #, c-format
 msgid "internal error: bad options in command: '%s'"
 msgstr ""
 
-#: tools/virsh.c:7554
+#: tools/virsh.c:15609
 msgid "  NAME\n"
 msgstr "  NOM\n"
 
-#: tools/virsh.c:7557
+#: tools/virsh.c:15612
 msgid ""
 "\n"
 "  SYNOPSIS\n"
@@ -23056,37 +24108,37 @@
 "\n"
 "  SYNOPSIS\n"
 
-#: tools/virsh.c:7566
+#: tools/virsh.c:15625
 #, c-format
 msgid "[--%s <number>]"
 msgstr ""
 
-#: tools/virsh.c:7568
+#: tools/virsh.c:15631
 #, c-format
 msgid "[--%s <string>]"
 msgstr ""
 
-#: tools/virsh.c:14558
+#: tools/virsh.c:15644
 #, c-format
 msgid "{[--%s] <string>}..."
 msgstr ""
 
-#: tools/virsh.c:14559
+#: tools/virsh.c:15645
 #, c-format
 msgid "[[--%s] <string>]..."
 msgstr ""
 
-#: tools/virsh.c:14561
+#: tools/virsh.c:15647
 #, c-format
 msgid "<%s>..."
 msgstr ""
 
-#: tools/virsh.c:14562
+#: tools/virsh.c:15648
 #, c-format
 msgid "[<%s>]..."
 msgstr ""
 
-#: tools/virsh.c:7581
+#: tools/virsh.c:15662
 msgid ""
 "\n"
 "  DESCRIPTION\n"
@@ -23094,7 +24146,7 @@
 "\n"
 "  DESCRIPTION\n"
 
-#: tools/virsh.c:7587
+#: tools/virsh.c:15668
 msgid ""
 "\n"
 "  OPTIONS\n"
@@ -23102,72 +24154,72 @@
 "\n"
 "  OPTIONS\n"
 
-#: tools/virsh.c:14590
+#: tools/virsh.c:15676
 #, c-format
 msgid "[--%s] <number>"
 msgstr ""
 
-#: tools/virsh.c:7592
+#: tools/virsh.c:15677
 #, c-format
 msgid "--%s <number>"
 msgstr "--%s <nombre>"
 
-#: tools/virsh.c:7594
+#: tools/virsh.c:15681
 #, c-format
 msgid "--%s <string>"
 msgstr "--%s <chaîne>"
 
-#: tools/virsh.c:14598 tools/virsh.c:14603
+#: tools/virsh.c:15684 tools/virsh.c:15689
 #, c-format
 msgid "[--%s] <string>"
 msgstr ""
 
-#: tools/virsh.c:14603
+#: tools/virsh.c:15689
 #, c-format
 msgid "<%s>"
 msgstr ""
 
-#: tools/virsh.c:7746
+#: tools/virsh.c:16052
 #, c-format
 msgid "internal error: virsh %s: no %s VSH_OT_DATA option"
 msgstr ""
 
-#: tools/virsh.c:7795
+#: tools/virsh.c:16100
 #, c-format
 msgid "failed to get domain '%s'"
-msgstr "impossible de récupérer le domaine '%s'"
+msgstr "impossible de récupérer le domaine « %s »"
 
-#: tools/virsh.c:7835
+#: tools/virsh.c:16138
 #, c-format
 msgid "failed to get network '%s'"
-msgstr "impossible de récupérer le réseau '%s'"
+msgstr "impossible de récupérer le réseau « %s »"
 
-#: tools/virsh.c:15091
+#: tools/virsh.c:16177
 #, c-format
 msgid "failed to get nwfilter '%s'"
 msgstr ""
 
-#: tools/virsh.c:7875
+#: tools/virsh.c:16218
 #, c-format
 msgid "failed to get interface '%s'"
 msgstr ""
 
-#: tools/virsh.c:7912
+#: tools/virsh.c:16253
 #, c-format
 msgid "failed to get pool '%s'"
-msgstr "impossible de récupérer le pool '%s'"
+msgstr "impossible de récupérer le pool « %s »"
 
-#: tools/virsh.c:15219
+#: tools/virsh.c:16308
 #, c-format
 msgid "failed to get vol '%s', specifying --%s might help"
 msgstr ""
 
-#: tools/virsh.c:7997
+#: tools/virsh.c:16340
 #, c-format
 msgid "failed to get secret '%s'"
 msgstr ""
 
-#: tools/virsh.c:8028
+#: tools/virsh.c:16387
 #, c-format
 msgid ""
 "\n"
@@ -23178,213 +24230,213 @@
 "(Temps : %.3f ms)\n"
 "\n"
 
-#: tools/virsh.c:8168
+#: tools/virsh.c:16457
 #, c-format
 msgid "unknown command: '%s'"
-msgstr "commande inconnue : '%s'"
+msgstr "commande inconnue : « %s »"
 
-#: tools/virsh.c:8191
+#: tools/virsh.c:16496
 #, c-format
 msgid "expected syntax: --%s <%s>"
 msgstr "syntaxe attendue : --%s <%s>"
 
-#: tools/virsh.c:8194
+#: tools/virsh.c:16499
 msgid "number"
 msgstr "nombre"
 
-#: tools/virsh.c:8194
+#: tools/virsh.c:16499
 msgid "string"
 msgstr "chaîne"
 
-#: tools/virsh.c:15418
+#: tools/virsh.c:16507
 #, c-format
 msgid "invalid '=' after option --%s"
 msgstr ""
 
-#: tools/virsh.c:8200
+#: tools/virsh.c:16521
 #, c-format
 msgid "unexpected data '%s'"
-msgstr "donnée inattendue '%s'"
+msgstr "donnée inattendue « %s »"
 
-#: tools/virsh.c:15454
+#: tools/virsh.c:16543
 msgid "optdata"
 msgstr ""
 
-#: tools/virsh.c:15454
+#: tools/virsh.c:16543
 msgid "bool"
 msgstr ""
 
-#: tools/virsh.c:15455
+#: tools/virsh.c:16544
 msgid "(none)"
 msgstr ""
 
-#: tools/virsh.c:15571
+#: tools/virsh.c:16660
 msgid "dangling \\"
 msgstr ""
 
-#: tools/virsh.c:8102
+#: tools/virsh.c:16673
 msgid "missing \""
 msgstr "manquant \""
 
-#: tools/virsh.c:8273 tools/virsh.c:8295
+#: tools/virsh.c:16736 tools/virsh.c:16945
 msgid "idle"
 msgstr ""
 
-#: tools/virsh.c:8275
+#: tools/virsh.c:16738
 msgid "paused"
 msgstr "mis en pause"
 
-#: tools/virsh.c:8277
+#: tools/virsh.c:16740
 msgid "in shutdown"
 msgstr "en arrêt"
 
-#: tools/virsh.c:8279
+#: tools/virsh.c:16742
 msgid "shut off"
 msgstr "fermé"
 
-#: tools/virsh.c:8281
+#: tools/virsh.c:16744 tools/virsh.c:16830
 msgid "crashed"
 msgstr "a échoué"
 
-#: tools/virsh.c:691 tools/virsh.c:713 tools/virsh.c:8285 tools/virsh.c:8301
+#: tools/virsh.c:16749 tools/virsh.c:16951
 msgid "no state"
 msgstr "sans état"
 
-#: tools/virsh.c:15677
+#: tools/virsh.c:16766
 msgid "booted"
 msgstr ""
 
-#: tools/virsh.c:15679 tools/virsh.c:15743
+#: tools/virsh.c:16768 tools/virsh.c:16832
 msgid "migrated"
 msgstr ""
 
-#: tools/virsh.c:15681
+#: tools/virsh.c:16770
 msgid "restored"
 msgstr ""
 
-#: tools/virsh.c:15683 tools/virsh.c:15717 tools/virsh.c:15749
+#: tools/virsh.c:16772 tools/virsh.c:16806 tools/virsh.c:16838
 msgid "from snapshot"
 msgstr ""
 
-#: tools/virsh.c:15685
+#: tools/virsh.c:16774
 msgid "unpaused"
 msgstr ""
 
-#: tools/virsh.c:15687
+#: tools/virsh.c:16776
 msgid "migration canceled"
 msgstr ""
 
-#: tools/virsh.c:15689
+#: tools/virsh.c:16778
 msgid "save canceled"
 msgstr ""
 
-#: tools/virsh.c:15705 tools/virsh.c:15728
+#: tools/virsh.c:16794 tools/virsh.c:16817
 msgid "user"
 msgstr ""
 
-#: tools/virsh.c:15707
+#: tools/virsh.c:16796
 msgid "migrating"
 msgstr ""
 
-#: tools/virsh.c:15709
+#: tools/virsh.c:16798
 msgid "saving"
 msgstr ""
 
-#: tools/virsh.c:15711
+#: tools/virsh.c:16800
 msgid "dumping"
 msgstr ""
 
-#: tools/virsh.c:15713
+#: tools/virsh.c:16802
 msgid "I/O error"
 msgstr ""
 
-#: tools/virsh.c:15715
+#: tools/virsh.c:16804
 msgid "watchdog"
 msgstr ""
 
-#: tools/virsh.c:15719
+#: tools/virsh.c:16808
 msgid "shutting down"
 msgstr ""
 
-#: tools/virsh.c:15737
+#: tools/virsh.c:16826
 msgid "shutdown"
 msgstr ""
 
-#: tools/virsh.c:15739
+#: tools/virsh.c:16828
 msgid "destroyed"
 msgstr ""
 
-#: tools/virsh.c:15747
+#: tools/virsh.c:16836
 msgid "failed"
 msgstr ""
 
-#: tools/virsh.c:15804
+#: tools/virsh.c:16893
 msgid "unimplemented block statistics parameter type"
 msgstr ""
 
-#: tools/virsh.c:15837
+#: tools/virsh.c:16926
 msgid "ok"
 msgstr ""
 
-#: tools/virsh.c:15839
+#: tools/virsh.c:16928
 msgid "background job"
 msgstr ""
 
-#: tools/virsh.c:15841
+#: tools/virsh.c:16930
 msgid "occupied"
 msgstr ""
 
-#: tools/virsh.c:8293
+#: tools/virsh.c:16943
 msgid "offline"
 msgstr "hors ligne"
 
-#: tools/virsh.c:8312
+#: tools/virsh.c:16961
 msgid "no valid connection"
 msgstr "pas de connexion valide"
 
-#: tools/virsh.c:8358
+#: tools/virsh.c:17032
 msgid "error: "
 msgstr "erreur : "
 
-#: tools/virsh.c:15976
+#: tools/virsh.c:17085
 msgid "VIRSH_DEBUG not set with a valid numeric value"
 msgstr ""
 
-#: tools/virsh.c:8443
+#: tools/virsh.c:17128
 msgid "failed to connect to the hypervisor"
 msgstr "impossible de se connecter à l'hyperviseur"
 
-#: tools/virsh.c:8475
+#: tools/virsh.c:17158
 msgid "failed to get the log file information"
 msgstr "impossible de récupérer les informations du fichier journal"
 
-#: tools/virsh.c:8480
+#: tools/virsh.c:17163
 msgid "the log path is not a file"
 msgstr "le chemin d'accès au journal ne correspond pas à un fichier"
 
-#: tools/virsh.c:8488
+#: tools/virsh.c:17171
 msgid "failed to open the log file. check the log file path"
 msgstr "impossible d'ouvrir le fichier journal. Vérifiez son chemin d'accès"
 
-#: tools/virsh.c:8557
+#: tools/virsh.c:17253
 msgid "failed to write the log file"
 msgstr "impossible d'écrire dans le fichier journal"
 
-#: tools/virsh.c:8572
+#: tools/virsh.c:17268
 #, c-format
 msgid "%s: failed to write log file: %s"
 msgstr "%s : impossible d'écrire dans le fichier journal : %s"
 
-#: tools/virsh.c:16303
+#: tools/virsh.c:17416
 msgid "Could not determine home directory"
 msgstr ""
 
-#: tools/virsh.c:16332
+#: tools/virsh.c:17445
 #, c-format
 msgid "Failed to create '%s': %s"
 msgstr ""
 
-#: tools/virsh.c:16413
+#: tools/virsh.c:17551
 #, c-format
 msgid ""
 "\n"
@@ -23392,32 +24444,34 @@
 "%s [options]... <command> [args...]\n"
 "\n"
 "  options:\n"
-"    -c | --connect <uri>    hypervisor connection URI\n"
+"    -c | --connect=URI      hypervisor connection URI\n"
 "    -r | --readonly         connect readonly\n"
-"    -d | --debug <num>      debug level [0-4]\n"
+"    -d | --debug=NUM        debug level [0-4]\n"
 "    -h | --help             this help\n"
 "    -q | --quiet            quiet mode\n"
 "    -t | --timing           print timing information\n"
-"    -l | --log <file>       output logging to file\n"
-"    -v | --version[=short]  program version\n"
-"    -V | --version=long     version and full options\n"
+"    -l | --log=FILE         output logging to file\n"
+"    -v                      short version\n"
+"    -V                      long version\n"
+"         --version[=TYPE]   version, TYPE is short or long (default short)\n"
+"    -e | --escape <char>    set escape sequence for console\n"
 "\n"
 "  commands (non interactive mode):\n"
 "\n"
 msgstr ""
 
-#: tools/virsh.c:16428
+#: tools/virsh.c:17568
 #, c-format
 msgid " %s (help keyword '%s')\n"
 msgstr ""
 
-#: tools/virsh.c:16438
+#: tools/virsh.c:17578
 msgid ""
 "\n"
 "  (specify help <group> for details about the commands in the group)\n"
 msgstr ""
 
-#: tools/virsh.c:8783
+#: tools/virsh.c:17580
 msgid ""
 "\n"
 "  (specify help <command> for details about the command)\n"
@@ -23427,57 +24481,66 @@
 "  (spécifier help <commande> pour plus de détails sur la commande)\n"
 "\n"
 
-#: tools/virsh.c:16451
+#: tools/virsh.c:17591
 #, c-format
 msgid "Virsh command line tool of libvirt %s\n"
 msgstr ""
 
-#: tools/virsh.c:16452
+#: tools/virsh.c:17592
 #, c-format
 msgid ""
 "See web site at %s\n"
 "\n"
 msgstr ""
 
-#: tools/virsh.c:16454
+#: tools/virsh.c:17594
 msgid "Compiled with support for:\n"
 msgstr ""
 
-#: tools/virsh.c:16455
+#: tools/virsh.c:17595
 msgid " Hypervisors:"
 msgstr ""
 
-#: tools/virsh.c:16491
+#: tools/virsh.c:17631
 msgid " Networking:"
 msgstr ""
 
-#: tools/virsh.c:16518
+#: tools/virsh.c:17658
 msgid " Storage:"
 msgstr ""
 
-#: tools/virsh.c:16542
+#: tools/virsh.c:17682
 msgid " Miscellaneous:"
 msgstr ""
 
-#: tools/virsh.c:16595
+#: tools/virsh.c:17736
 msgid "option -d takes a numeric argument"
 msgstr "L'option -d prend un argument numérique"
 
-#: tools/virsh.c:8875
+#: tools/virsh.c:17774
+#, c-format
+msgid "Invalid string '%s' for escape sequence"
+msgstr ""
+
+#: tools/virsh.c:17780
 #, c-format
 msgid "unsupported option '-%c'. See --help."
 msgstr "option « -%c » non prise en charge. Voir --help."
 
-#: tools/virsh.c:8882
+#: tools/virsh.c:17787
 #, c-format
 msgid "extra argument '%s'. See --help."
 msgstr ""
 
-#: tools/virsh.c:16682
+#: tools/virsh.c:17837
+msgid "Failed to initialize mutex"
+msgstr ""
+
+#: tools/virsh.c:17842
 msgid "Failed to initialize libvirt"
 msgstr ""
 
-#: tools/virsh.c:8966
+#: tools/virsh.c:17871
 #, c-format
 msgid ""
 "Welcome to %s, the virtualization interactive terminal.\n"
@@ -23486,7 +24549,7 @@
 "Bienvenue dans %s, le terminal de virtualisation interactif.\n"
 "\n"
 
-#: tools/virsh.c:8969
+#: tools/virsh.c:17874
 msgid ""
 "Type:  'help' for help with commands\n"
 "       'quit' to quit\n"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libvisual-0.4.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libvisual-0.4.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libvisual-0.4.po	2012-01-02 17:27:18.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libvisual-0.4.po	2012-02-23 06:31:42.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:25+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:27+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: libvisual/lv_libvisual.c:137
 msgid "Show info for"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libvisual-plugins-0.4.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libvisual-plugins-0.4.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/libvisual-plugins-0.4.po	2012-01-02 17:27:18.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/libvisual-plugins-0.4.po	2012-02-23 06:31:42.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:26+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:27+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: plugins/actor/bumpscope/actor_bumpscope.c:62
 msgid ""
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/lightdm.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/lightdm.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/lightdm.po	2012-01-02 17:27:35.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/lightdm.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,243 +0,0 @@
-# French translation for lightdm
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the lightdm package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: lightdm\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-12-02 23:36+0000\n"
-"PO-Revision-Date: 2011-10-30 11:29+0000\n"
-"Last-Translator: mattdu61 <Unknown>\n"
-"Language-Team: French <fr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:25+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
-
-#: ../greeters/gtk/greeter.ui.h:1
-msgid "Cancel"
-msgstr "Annuler"
-
-#: ../greeters/gtk/greeter.ui.h:2
-msgid "Hibernate"
-msgstr "Hiberner"
-
-#: ../greeters/gtk/greeter.ui.h:3
-msgid "High Contrast"
-msgstr "Contraste élevé"
-
-#: ../greeters/gtk/greeter.ui.h:4
-msgid "Large Font"
-msgstr "Grande police"
-
-#: ../greeters/gtk/greeter.ui.h:5
-msgid "Login"
-msgstr "Nom d'utilisateur"
-
-#: ../greeters/gtk/greeter.ui.h:6
-msgid "Restart..."
-msgstr "Redémarrer..."
-
-#: ../greeters/gtk/greeter.ui.h:7
-msgid "Shutdown..."
-msgstr "Éteindre..."
-
-#: ../greeters/gtk/greeter.ui.h:8
-msgid "Suspend"
-msgstr "Mettre en veille"
-
-#: ../greeters/gtk/lightdm-gtk-greeter.c:224
-msgid "Failed to start session"
-msgstr "La session n'a pas pu démarrer"
-
-#: ../greeters/gtk/lightdm-gtk-greeter.c:340
-msgid "Incorrect password, please try again"
-msgstr "Mot de passe incorrect, veuillez réessayer"
-
-#: ../greeters/gtk/lightdm-gtk-greeter.c:344
-msgid "Failed to authenticate"
-msgstr "Échec d'authentification"
-
-#: ../greeters/gtk/lightdm-gtk-greeter.c:409
-msgid "Are you sure you want to close all programs and restart the computer?"
-msgstr "Voulez-vous fermer tous les programmes et redémarrer l'ordinateur ?"
-
-#: ../greeters/gtk/lightdm-gtk-greeter.c:410
-#: ../greeters/gtk/lightdm-gtk-greeter.c:435
-msgid "Return To Login"
-msgstr "Revenir à l'écran d'authentification"
-
-#: ../greeters/gtk/lightdm-gtk-greeter.c:410
-msgid "Restart"
-msgstr "Redémarrer"
-
-#: ../greeters/gtk/lightdm-gtk-greeter.c:434
-msgid ""
-"Are you sure you want to close all programs and shutdown the computer?"
-msgstr "Voulez-vous fermer tous les programmes et éteindre l'ordinateur ?"
-
-#: ../greeters/gtk/lightdm-gtk-greeter.c:435
-msgid "Shutdown"
-msgstr "Éteindre"
-
-#: ../greeters/gtk/lightdm-gtk-greeter.c:612
-msgid "Guest Account"
-msgstr "Compte Invité"
-
-#: ../greeters/gtk/lightdm-gtk-greeter.c:621
-msgid "Other..."
-msgstr "Autres..."
-
-#. Help string for command line --config flag
-#: ../src/lightdm.c:883
-msgid "Use configuration file"
-msgstr "Utiliser le fichier de configuration"
-
-#. Help string for command line --debug flag
-#: ../src/lightdm.c:886
-msgid "Print debugging messages"
-msgstr "Afficher les messages de débogage"
-
-#. Help string for command line --test-mode flag
-#: ../src/lightdm.c:889
-msgid "Run as unprivileged user, skipping things that require root access"
-msgstr ""
-"Exécuter en tant qu'utilisateur non privilégié, en sautant des choses qui "
-"nécessitent un accès root"
-
-#. Help string for command line --use-passwd flag
-#: ../src/lightdm.c:892
-msgid ""
-"Use the given password file for authentication (for testing, requires --no-"
-"root)"
-msgstr ""
-"Utiliser le fichier de mot de passe donné pour l'authentification (pour "
-"tester, nécessite l'option --no-root)"
-
-#. Help string for command line --pid-file flag
-#: ../src/lightdm.c:895
-msgid "File to write PID into"
-msgstr "Fichier dans lequel écrire le PID"
-
-#. Help string for command line --xserver-command flag
-#: ../src/lightdm.c:898
-msgid "Command to run X servers"
-msgstr "Commande pour démarrer les serveurs X"
-
-#. Help string for command line --greeter-session flag
-#: ../src/lightdm.c:901
-msgid "Greeter session"
-msgstr "Session d'accueil"
-
-#. Help string for command line --user-session flag
-#: ../src/lightdm.c:904
-msgid "User session"
-msgstr "Session utilisateur"
-
-#. Help string for command line --session-wrapper flag
-#: ../src/lightdm.c:907
-msgid "Session wrapper"
-msgstr "Conteneur de session"
-
-#. Help string for command line --minimum-vt flag
-#: ../src/lightdm.c:910
-msgid "Minimum VT to use for X servers"
-msgstr "Nombre minimum de terminaux virtuels à utiliser pour les serveurs X"
-
-#. Help string for command line --minimum-display-number flag
-#: ../src/lightdm.c:913
-msgid "Minimum display number to use for X servers"
-msgstr "Nombre minimum d'affichages à utiliser pour les serveurs X"
-
-#. Help string for command line --xsessions-dir flag
-#: ../src/lightdm.c:916
-msgid "Directory to load X sessions from"
-msgstr "Répertoire à partir duquel charger les sessions X"
-
-#. Help string for command line --xgreeters-dir flag
-#: ../src/lightdm.c:919
-msgid "Directory to load X greeters from"
-msgstr "Répertoire à partir duquel charger les écrans d'accueil X"
-
-#. Help string for command line --log-dir flag
-#: ../src/lightdm.c:922
-msgid "Directory to write logs to"
-msgstr "Dossier dans lequel stocker les journaux d'événements"
-
-#. Help string for command line --run-dir flag
-#: ../src/lightdm.c:925
-msgid "Directory to store running state"
-msgstr "Répertoire dans lequel stocker l'état en fonctionnement"
-
-#. Help string for command line --cache-dir flag
-#: ../src/lightdm.c:928
-msgid "Directory to cached information"
-msgstr "Répertoire pour les informations en cache"
-
-#. Help string for command line --version flag
-#: ../src/lightdm.c:931
-msgid "Show release version"
-msgstr "Affiche la version"
-
-#. Arguments and description for --help test
-#: ../src/lightdm.c:943
-msgid "- Display Manager"
-msgstr "- Gestionnaire d'affichage"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/lightdm.c:953
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-"Exécutez la commande '%s --help' pour voir la liste complète des options "
-"disponibles en ligne de commande."
-
-#: ../utils/lightdm-set-defaults.c:37
-msgid "Enable debugging"
-msgstr "Activer le mode de débogage"
-
-#: ../utils/lightdm-set-defaults.c:38
-msgid "Only update if no default already set"
-msgstr "Mettre à jour seulement en l'absence de valeur par défaut"
-
-#: ../utils/lightdm-set-defaults.c:39
-msgid "Remove default value if it's the current one"
-msgstr "Supprimer la valeur par défault si elle est identique à celle-ci"
-
-#: ../utils/lightdm-set-defaults.c:40
-msgid "Set default session"
-msgstr "Définir comme session par défaut"
-
-#: ../utils/lightdm-set-defaults.c:41
-msgid "Set default greeter"
-msgstr "Définir comme écran d'accueil par défaut"
-
-#: ../utils/lightdm-set-defaults.c:115
-msgid "- set lightdm default values"
-msgstr "- définir les valeurs par défaut de lightdm"
-
-#: ../utils/lightdm-set-defaults.c:118
-#, c-format
-msgid "option parsing failed: %s\n"
-msgstr "L'analyse syntaxique de l'option a échoué : %s\n"
-
-#: ../utils/lightdm-set-defaults.c:124
-#, c-format
-msgid ""
-"Wrong usage of the command\n"
-"%s"
-msgstr ""
-"Mauvaise utilisation de la commande\n"
-"%s"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../utils/dm-tool.c:28
-#, c-format
-msgid ""
-"Run 'dm-tool --help' to see a full list of available command line options."
-msgstr ""
-"Exécutez 'dm-tool --help' pour afficher la liste des options disponibles via "
-"la ligne de commande."
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/Linux-PAM.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/Linux-PAM.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/Linux-PAM.po	2012-01-02 17:26:53.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/Linux-PAM.po	2012-02-23 06:31:19.000000000 +0000
@@ -18,8 +18,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:53+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:43+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: libpam_misc/misc_conv.c:33
 msgid "...Time is running out...\n"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/live-build.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/live-build.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/live-build.po	2012-01-02 17:27:35.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/live-build.po	2012-02-23 06:31:59.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:28+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 02:06+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../helpers/lh_source_md5sum:16
 msgid "create source md5sums"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ltsp-live.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ltsp-live.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ltsp-live.po	2012-01-02 17:27:16.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ltsp-live.po	2012-02-23 06:31:40.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:04+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:04+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: \n"
 
 #: ../ltsp-live:40
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ltsp-login.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ltsp-login.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ltsp-login.po	2012-01-02 17:27:16.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ltsp-login.po	2012-02-23 06:31:40.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:04+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:04+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ltsp-login.sh:17
 #, sh-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ltsp.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ltsp.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ltsp.po	2012-01-02 17:27:16.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ltsp.po	2012-02-23 06:31:40.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:04+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:04+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: ../server/configs/ALTLinux/ltsp-login.sh:30
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/lvm2.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/lvm2.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/lvm2.po	2012-01-02 17:26:54.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/lvm2.po	2012-02-23 06:31:21.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:59+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:48+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: activate/activate.c:44
 msgid "LVM1 proc global snprintf failed"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/lynx.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/lynx.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/lynx.po	2012-01-02 17:27:15.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/lynx.po	2012-02-23 06:31:38.000000000 +0000
@@ -30,8 +30,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:47+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:47+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #. ******************************************************************
 #. * The following definitions are for status line prompts, messages, or
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/m17n-contrib.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/m17n-contrib.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/m17n-contrib.po	2012-01-02 17:27:25.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/m17n-contrib.po	2012-02-23 06:31:48.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:58+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:57+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: im/bo-ewts.mim:35
 msgid ""
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/mailman.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/mailman.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/mailman.po	2012-01-02 17:26:55.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/mailman.po	2012-02-23 06:31:21.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:59+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:49+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Generated-By: pygettext.py 1.3\n"
 
 #: Mailman/Archiver/HyperArch.py:123
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/make.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/make.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/make.po	2012-01-02 17:27:19.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/make.po	2012-02-23 06:31:43.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:35+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:37+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ar.c:53
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/man-db-gnulib.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/man-db-gnulib.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/man-db-gnulib.po	2012-01-02 17:26:55.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/man-db-gnulib.po	2012-02-23 06:31:21.000000000 +0000
@@ -17,8 +17,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:01+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:50+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: gnulib/lib/argp-help.c:147
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/man-db.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/man-db.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/man-db.po	2012-01-02 17:26:55.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/man-db.po	2012-02-23 06:31:21.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:01+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:50+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: lib/security.c:74
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/mlocate.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/mlocate.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/mlocate.po	2012-01-02 17:27:26.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/mlocate.po	2012-02-23 06:31:49.000000000 +0000
@@ -19,8 +19,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:06+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:04+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: src/conf.c:241
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/MoinMoin.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/MoinMoin.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/MoinMoin.po	2012-01-02 17:26:55.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/MoinMoin.po	2012-02-23 06:31:21.000000000 +0000
@@ -20,8 +20,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:02+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:51+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "X-Direction: ltr\n"
 "X-Language: Français\n"
 "X-Language-in-English: French\n"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/mono-tools.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/mono-tools.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/mono-tools.po	2012-01-02 17:27:18.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/mono-tools.po	2012-02-23 06:31:42.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:26+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:27+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: docbrowser/browser.glade:8
 msgid "Mono Documentation Library"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/mountall.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/mountall.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/mountall.po	2012-01-02 17:27:33.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/mountall.po	2012-02-23 06:31:57.000000000 +0000
@@ -7,273 +7,288 @@
 msgstr ""
 "Project-Id-Version: mountall\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-07-15 12:36+0000\n"
+"POT-Creation-Date: 2012-02-15 20:54+0000\n"
 "PO-Revision-Date: 2010-04-23 14:40+0000\n"
 "Last-Translator: Nicolas DERIVE <kalon33@ubuntu.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:01+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:41+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/mountall.c:748
 msgid "unable to mount"
 msgstr "impossible à monter"
 
-#: src/mountall.c:1210 src/mountall.c:1214 src/mountall.c:1218
-#: src/mountall.c:1223 src/mountall.c:1227 src/mountall.c:1231
-#: src/mountall.c:1234
+#: src/mountall.c:1244 src/mountall.c:1248 src/mountall.c:1252
+#: src/mountall.c:1257 src/mountall.c:1261 src/mountall.c:1265
+#: src/mountall.c:1268
 #, c-format
 msgid "%s is %s"
 msgstr "%s est %s"
 
-#: src/mountall.c:1461
+#: src/mountall.c:1495
 #, c-format
 msgid ""
 "\n"
 " %s finished! "
 msgstr ""
+"\n"
+" %s terminé ! "
 
-#: src/mountall.c:1561 src/mountall.c:1570 src/mountall.c:1579
-#: src/mountall.c:1597
+#: src/mountall.c:1595 src/mountall.c:1604 src/mountall.c:1613
+#: src/mountall.c:1631
 #, c-format
 msgid "%s finished"
 msgstr "%s finis"
 
-#: src/mountall.c:1589
+#: src/mountall.c:1623
 msgid "All filesystems mounted"
 msgstr "Tous les systèmes de fichiers montés"
 
-#: src/mountall.c:1869
+#: src/mountall.c:1903
 #, c-format
 msgid "setpgid failed: %s"
 msgstr "setpgid a échoué : %s"
 
-#: src/mountall.c:1949
+#: src/mountall.c:1983
 #, c-format
 msgid "%s %s [%d] terminated with status %d"
 msgstr "%s %s [%d] terminé avec le statut %d"
 
-#: src/mountall.c:1953
+#: src/mountall.c:1987
 #, c-format
 msgid "%s %s [%d] exited normally"
 msgstr "%s %s [%d] s'est terminé normalement"
 
-#: src/mountall.c:1984
+#: src/mountall.c:2018
 #, c-format
 msgid "remounting %s"
 msgstr "remontage de %s"
 
-#: src/mountall.c:1995
+#: src/mountall.c:2029
 #, c-format
 msgid "mounting %s"
 msgstr "montage de %s"
 
-#: src/mountall.c:2093 src/mountall.c:2099
+#: src/mountall.c:2127 src/mountall.c:2133
 #, c-format
 msgid "Filesystem could not be mounted: %s"
 msgstr "Le système de fichiers %s n'a pu être monté"
 
-#: src/mountall.c:2142
+#: src/mountall.c:2176
 #, c-format
 msgid "activating %s"
 msgstr "activation de %s"
 
-#: src/mountall.c:2172
+#: src/mountall.c:2206
 #, c-format
 msgid "Problem activating swap: %s"
 msgstr "Problème d'activation du swap : %s"
 
-#: src/mountall.c:2217
+#: src/mountall.c:2251
 #, c-format
 msgid "checking %s"
 msgstr "vérification de %s"
 
-#: src/mountall.c:2290
+#: src/mountall.c:2324
 #, c-format
 msgid "System must be rebooted: %s"
 msgstr "Le système doit être redémarré : %s"
 
-#: src/mountall.c:2295
+#: src/mountall.c:2329
 #, c-format
 msgid "Filesystem has errors: %s"
 msgstr "Le système de fichiers comporte des erreurs : %s"
 
-#: src/mountall.c:2300
+#: src/mountall.c:2334
 #, c-format
 msgid "Unrecoverable fsck error: %s"
 msgstr "Erreur non récupérable de fsck : %s"
 
-#: src/mountall.c:2310
+#: src/mountall.c:2344
 #, c-format
 msgid "Filesytem check cancelled: %s"
 msgstr "Vérification du système de fichiers annulée : %s"
 
-#: src/mountall.c:2315
+#: src/mountall.c:2349
 #, c-format
 msgid "Filesystem errors corrected: %s"
 msgstr "Erreurs du système de fichiers corrigées : %s"
 
-#: src/mountall.c:2417
+#: src/mountall.c:2451
 #, c-format
 msgid "rmdir %s failed: %s"
 msgstr "rmdir %s a échoué : %s"
 
-#: src/mountall.c:2428
+#: src/mountall.c:2462
 msgid "Disconnected from Upstart"
 msgstr "Déconnecté de Upstart"
 
-#: src/mountall.c:2919
+#: src/mountall.c:2953
 #, c-format
 msgid "ioprio_set %d failed: %s"
 msgstr "ioprio_set %d a échoué : %s"
 
-#: src/mountall.c:3052
+#: src/mountall.c:3086
 msgid "Connected to Plymouth"
 msgstr "Connecté à Plymouth"
 
-#: src/mountall.c:3061
+#: src/mountall.c:3095
 msgid "Disconnected from Plymouth"
 msgstr "Déconnecté de Plymouth"
 
-#: src/mountall.c:3102
+#: src/mountall.c:3136
 #, c-format
 msgid "Checking disk %1$d of %2$d (%3$d %% complete)"
 msgstr "Vérification du disque %1$d de %2$d (%3$d %% accompli)"
 
-#: src/mountall.c:3126
+#: src/mountall.c:3160
 #, c-format
 msgid "Skipping mounting %s since Plymouth is not available"
 msgstr "Passage du montage de %s car Plymouth n'est pas disponible"
 
-#: src/mountall.c:3192
+#: src/mountall.c:3226
 #, c-format
 msgid "The disk drive for %s is not ready yet or not present."
 msgstr ""
 
-#: src/mountall.c:3195
+#: src/mountall.c:3229
 msgid ""
 "Continue to wait, or Press S to skip mounting or M for manual recovery"
 msgstr ""
+"Continuer à attendre, ou Appuyez sur S pour ignorer le montage ou M pour la "
+"récupération manuelle"
 
-#: src/mountall.c:3199
+#: src/mountall.c:3233
 #, c-format
 msgid "Errors were found while checking the disk drive for %s."
 msgstr ""
 
-#: src/mountall.c:3202
+#: src/mountall.c:3236
 msgid ""
 "Press F to attempt to fix the errors, I to ignore, S to skip mounting, or M "
 "for manual recovery"
 msgstr ""
+"Appuyer sur F pour tenter de corriger les erreurs, I les ignorer, S pour "
+"ignorer le montage, ou M pour la récupération manuelle"
 
-#: src/mountall.c:3206
+#: src/mountall.c:3240
 #, c-format
 msgid "Serious errors were found while checking the disk drive for %s."
 msgstr ""
 
-#: src/mountall.c:3209
+#: src/mountall.c:3243
 msgid "Press I to ignore, S to skip mounting, or M for manual recovery"
 msgstr ""
+"Appuyer sur I pour ignorer, S pour ignorer le montage, ou M pour la "
+"récupération manuelle"
 
-#: src/mountall.c:3213
+#: src/mountall.c:3247
 #, c-format
 msgid "An error occurred while mounting %s."
-msgstr ""
+msgstr "Une erreur est survenue lors du montage de %s."
 
-#: src/mountall.c:3216
+#: src/mountall.c:3250
 msgid "Press S to skip mounting or M for manual recovery"
 msgstr ""
 "Appuyer sur S pour passer le montage ou M pour la récupération manuelle"
 
-#: src/mountall.c:3220
+#: src/mountall.c:3254
 msgid "Checking disk drives for errors. This may take several minutes."
 msgstr ""
 
-#: src/mountall.c:3222
+#: src/mountall.c:3256
 msgid "Press C to cancel all checks in progress"
-msgstr ""
+msgstr "Appuyez sur C pour annuler toutes les vérifications en cours"
 
-#: src/mountall.c:3260
+#: src/mountall.c:3294
 msgid "Plymouth command failed"
 msgstr "La commande de Plymouth a échoué"
 
-#: src/mountall.c:3288
+#: src/mountall.c:3322
 #, c-format
 msgid "Attempting to fix %s filesystem"
 msgstr "Tentative de réparation du système de fichiers %s"
 
-#: src/mountall.c:3305
+#: src/mountall.c:3339
 #, c-format
 msgid "Ignoring errors with %s at user request"
 msgstr "Ignorance des erreurs relatives à %s à la demande de l'utilisateur"
 
-#: src/mountall.c:3319
+#: src/mountall.c:3353
 #, c-format
 msgid "Skipping %s at user request"
 msgstr "Passage de %s à la demande de l'utilisateur"
 
-#: src/mountall.c:3332
+#: src/mountall.c:3366
 msgid "Spawning maintenance shell"
 msgstr "Démarrage d'une console de maintenance"
 
-#: src/mountall.c:3352
+#: src/mountall.c:3386
 msgid "User cancelled filesystem checks"
 msgstr "Vérifications de systèmes de fichiers annulées par l'utilisateur"
 
-#: src/mountall.c:3388 src/mountall.c:3392 src/mountall.c:3396
+#: src/mountall.c:3422 src/mountall.c:3426 src/mountall.c:3430
 msgid ""
 "\n"
 " Legal values of dev-wait-time lie between 1sec to 2147483647 sec"
 msgstr ""
+"\n"
+" Les valeurs autorisées pour dev-wait-time sont comprises entre 1 seconde et "
+"2147483647 secondes"
 
-#: src/mountall.c:3423 src/mountall.c:3478
+#: src/mountall.c:3457 src/mountall.c:3512
 msgid "Empty mountpoint specified"
-msgstr ""
+msgstr "Point de montage spécifié vide"
 
-#: src/mountall.c:3538
+#: src/mountall.c:3572
 msgid "Empty device name specified"
-msgstr ""
+msgstr "Nom de périphérique spécifié vide"
 
-#: src/mountall.c:3542
+#: src/mountall.c:3576
 msgid "Empty mount point specified"
-msgstr ""
+msgstr "Point de montage spécifié vide"
 
-#: src/mountall.c:3598
+#: src/mountall.c:3632
 msgid "Detach and run in the background"
 msgstr "Détacher et exécuter en arrière plan"
 
-#: src/mountall.c:3600
+#: src/mountall.c:3634
 msgid "Force check of all filesystems"
 msgstr "Forcer la vérification de tous les systémes de fichiers"
 
-#: src/mountall.c:3602
+#: src/mountall.c:3636
 msgid "Attempt to fix all fsck errors"
 msgstr "Tenter de corriger toutes les erreurs fsck"
 
-#: src/mountall.c:3604
+#: src/mountall.c:3638
 msgid "Do not emit events after mounting filesystems"
 msgstr ""
 "Ne pas émettre d'évènements après le montage des systèmes de fichiers"
 
-#: src/mountall.c:3606
+#: src/mountall.c:3640
 msgid ""
 "In case of (bootwait,timeout): specify the time to wait for device to be "
 "detected"
 msgstr ""
+"Dans le cas de (bootwait,timeout): spécifier le délai d'attente pour que le "
+"périphérique soit détecté"
 
-#: src/mountall.c:3607
+#: src/mountall.c:3641
 msgid ""
 "value in seconds (Default is 30 seconds, Legal value between 1second to "
 "2147483647 seconds)"
 msgstr ""
+"valeur en secondes (la valeur par défaut est 30 secondes, les valeurs "
+"autorisées sont comprises entre 1 seconde et 2147483647 secondes)"
 
-#: src/mountall.c:3625
+#: src/mountall.c:3659
 msgid "Mount filesystems on boot"
 msgstr "Monter les systèmes de fichiers au démarrage"
 
-#: src/mountall.c:3627
+#: src/mountall.c:3661
 msgid ""
 "By default, mountall does not detach from the console and remains in the "
 "foreground.  Use the --daemon option to have it detach."
@@ -281,26 +296,26 @@
 "Par défaut, mountall reste attaché à la console et s'exécute en premier "
 "plan. Utilisez l'option --daemon pour l'exécuter en arrière plan."
 
-#: src/mountall.c:3643
+#: src/mountall.c:3677
 msgid "Could not connect to Upstart"
 msgstr "Impossible de se connecter à Upstart"
 
-#: src/mountall.c:3657
+#: src/mountall.c:3691
 msgid "Could not create Upstart proxy"
 msgstr "Impossible de créer le mandataire pour Upstart"
 
-#: src/mountall.c:3711
+#: src/mountall.c:3745
 msgid "root filesystem isn't mounted"
 msgstr "le système de fichiers racine n'est pas monté"
 
-#: src/mountall.c:3728 src/mountall.c:3742
+#: src/mountall.c:3762 src/mountall.c:3776
 msgid "Unable to become daemon"
 msgstr "Impossible de devenir un démon"
 
-#: src/mountall.c:3797
+#: src/mountall.c:3831
 msgid "Unable to listen for privateconnections"
 msgstr ""
 
-#: src/mountall.c:3837
+#: src/mountall.c:3871
 msgid "Received SIGUSR1 (network device up)"
 msgstr "SIGUSR1 reçu (périphérique réseau activé)"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/mutt.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/mutt.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/mutt.po	2012-01-02 17:26:55.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/mutt.po	2012-02-23 06:31:21.000000000 +0000
@@ -22,14 +22,14 @@
 "Project-Id-Version: Mutt 1.5.20-20100804\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-09-15 10:09-0700\n"
-"PO-Revision-Date: 2011-01-17 04:07+0000\n"
+"PO-Revision-Date: 2012-01-10 12:41+0000\n"
 "Last-Translator: Vincent Lefevre <Unknown>\n"
 "Language-Team: Vincent Lefevre <vincent@vinc17.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:03+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:51+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: account.c:163
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/nabi.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/nabi.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/nabi.po	2012-01-02 17:26:55.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/nabi.po	2012-02-23 06:31:21.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:03+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:52+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/candidate.c:367
 msgid "hanja"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/nagios-plugins.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/nagios-plugins.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/nagios-plugins.po	2012-01-02 17:26:55.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/nagios-plugins.po	2012-02-23 06:31:22.000000000 +0000
@@ -19,8 +19,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:03+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:52+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: plugins/check_by_ssh.c:86 plugins/check_cluster.c:76 plugins/check_dig.c:87
 #: plugins/check_disk.c:192 plugins/check_dns.c:102 plugins/check_dummy.c:52
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/nano.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/nano.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/nano.po	2012-01-02 17:26:55.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/nano.po	2012-02-23 06:31:22.000000000 +0000
@@ -20,8 +20,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:04+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:52+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #
 # File: src/browser.c, line: 207
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ndisc6.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ndisc6.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ndisc6.po	2012-01-02 17:27:23.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ndisc6.po	2012-02-23 06:31:46.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:22+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:22+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: rdnssd/rdnssd.c:88 rdnssd/rdnssd.c:109
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/neon.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/neon.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/neon.po	2012-01-02 17:27:26.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/neon.po	2012-02-23 06:31:49.000000000 +0000
@@ -12,8 +12,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:02+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:01+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/ne_207.c:198
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/net-tools.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/net-tools.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/net-tools.po	2012-01-02 17:26:56.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/net-tools.po	2012-02-23 06:31:22.000000000 +0000
@@ -12,8 +12,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:04+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:53+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../arp.c:112 ../arp.c:279
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/NetworkManager.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/NetworkManager.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/NetworkManager.po	2012-01-02 17:27:16.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/NetworkManager.po	2012-02-23 06:31:40.000000000 +0000
@@ -15,101 +15,198 @@
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&keywords=I18N+"
 "L10N&component=general\n"
-"POT-Creation-Date: 2011-12-21 07:43+0000\n"
+"POT-Creation-Date: 2012-02-18 20:54+0000\n"
 "PO-Revision-Date: 2011-12-21 04:55+0000\n"
 "Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:06+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:05+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
-#: ../cli/src/connections.c:55 ../cli/src/connections.c:70
-#: ../cli/src/devices.c:103 ../cli/src/devices.c:116 ../cli/src/devices.c:126
-#: ../cli/src/devices.c:136 ../cli/src/devices.c:150 ../cli/src/devices.c:164
-#: ../cli/src/devices.c:175 ../cli/src/devices.c:186 ../cli/src/devices.c:195
-#: ../cli/src/devices.c:204 ../cli/src/devices.c:226
+#: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
+#: ../cli/src/common.c:63 ../cli/src/connections.c:119
+#: ../cli/src/connections.c:153
+msgid "GROUP"
+msgstr ""
+
+#. 0
+#: ../cli/src/common.c:33 ../cli/src/common.c:53
+msgid "ADDRESS"
+msgstr "ADRESSE"
+
+#. 1
+#: ../cli/src/common.c:34 ../cli/src/common.c:54
+msgid "ROUTE"
+msgstr ""
+
+#. 2
+#: ../cli/src/common.c:35 ../cli/src/common.c:55
+msgid "DNS"
+msgstr "DNS"
+
+#. 3
+#: ../cli/src/common.c:36 ../cli/src/common.c:56
+msgid "DOMAIN"
+msgstr ""
+
+#. 4
+#: ../cli/src/common.c:37
+msgid "WINS"
+msgstr ""
+
+#. 0
+#: ../cli/src/common.c:45 ../cli/src/common.c:64
+msgid "OPTION"
+msgstr ""
+
+#. 0
+#. used only for 'GENERAL' group listing
+#: ../cli/src/connections.c:56 ../cli/src/connections.c:120
+#: ../cli/src/devices.c:100 ../cli/src/devices.c:121 ../cli/src/devices.c:131
+#: ../cli/src/devices.c:141 ../cli/src/devices.c:155 ../cli/src/devices.c:169
+#: ../cli/src/devices.c:191
 msgid "NAME"
 msgstr "NOM"
 
 #. 0
-#: ../cli/src/connections.c:56 ../cli/src/connections.c:71
+#. 1
+#: ../cli/src/connections.c:57 ../cli/src/connections.c:121
 msgid "UUID"
 msgstr "UUID"
 
 #. 1
-#: ../cli/src/connections.c:57
-msgid "DEVICES"
-msgstr "PÉRIPHÉRIQUES"
+#. 0
+#. 1
+#. 2
+#: ../cli/src/connections.c:58 ../cli/src/connections.c:154
+#: ../cli/src/devices.c:66 ../cli/src/devices.c:102 ../cli/src/devices.c:194
+msgid "TYPE"
+msgstr "TYPE"
 
 #. 2
-#: ../cli/src/connections.c:58
-msgid "DEFAULT"
-msgstr "PAR DÉFAUT"
+#: ../cli/src/connections.c:59
+msgid "TIMESTAMP"
+msgstr "TIMESTAMP"
 
 #. 3
-#: ../cli/src/connections.c:59
-msgid "SPEC-OBJECT"
-msgstr "SPEC-OBJECT"
+#: ../cli/src/connections.c:60
+msgid "TIMESTAMP-REAL"
+msgstr "TIMESTAMP-REAL"
 
 #. 4
-#: ../cli/src/connections.c:60
-msgid "VPN"
-msgstr "VPN"
+#: ../cli/src/connections.c:61
+msgid "AUTOCONNECT"
+msgstr "AUTOCONNECT"
 
 #. 5
+#: ../cli/src/connections.c:62
+msgid "READONLY"
+msgstr "LECT. SEULE"
+
 #. 6
+#. 8
 #. 2
 #. 11
 #. 5
-#: ../cli/src/connections.c:61 ../cli/src/connections.c:77
-#: ../cli/src/devices.c:71 ../cli/src/devices.c:216 ../cli/src/devices.c:232
+#: ../cli/src/connections.c:63 ../cli/src/connections.c:128
+#: ../cli/src/devices.c:68 ../cli/src/devices.c:181 ../cli/src/devices.c:197
 msgid "DBUS-PATH"
 msgstr "CHEMIN DBUS"
 
+#. 2
+#: ../cli/src/connections.c:122
+msgid "DEVICES"
+msgstr "PÉRIPHÉRIQUES"
+
+#. 3
+#. 1
 #. 6
-#: ../cli/src/connections.c:62
-msgid "ZONE"
+#. 1
+#: ../cli/src/connections.c:123 ../cli/src/devices.c:67
+#: ../cli/src/devices.c:107 ../cli/src/network-manager.c:39
+msgid "STATE"
+msgstr "ÉTAT"
+
+#. 4
+#: ../cli/src/connections.c:124
+msgid "DEFAULT"
+msgstr "PAR DÉFAUT"
+
+#. 5
+#: ../cli/src/connections.c:125
+msgid "DEFAULT6"
 msgstr ""
 
+#. 6
+#: ../cli/src/connections.c:126
+msgid "SPEC-OBJECT"
+msgstr "SPEC-OBJECT"
+
+#. 7
 #. 1
+#: ../cli/src/connections.c:127 ../cli/src/connections.c:141
+msgid "VPN"
+msgstr "VPN"
+
+#. 9
+#: ../cli/src/connections.c:129
+msgid "CON-PATH"
+msgstr ""
+
+#. 10
+#: ../cli/src/connections.c:130
+msgid "ZONE"
+msgstr ""
+
+#. 11
+#: ../cli/src/connections.c:131
+msgid "MASTER-PATH"
+msgstr ""
+
+#: ../cli/src/connections.c:139 ../cli/src/devices.c:77
+msgid "GENERAL"
+msgstr "GÉNÉRAL"
+
 #. 0
+#: ../cli/src/connections.c:140
+msgid "IP"
+msgstr ""
+
 #. 1
-#. 2
-#: ../cli/src/connections.c:72 ../cli/src/devices.c:69
-#: ../cli/src/devices.c:105 ../cli/src/devices.c:229
-msgid "TYPE"
-msgstr "TYPE"
+#: ../cli/src/connections.c:155
+msgid "USERNAME"
+msgstr ""
 
 #. 2
-#: ../cli/src/connections.c:73
-msgid "TIMESTAMP"
-msgstr "TIMESTAMP"
+#: ../cli/src/connections.c:156
+msgid "GATEWAY"
+msgstr "PASSERELLE"
 
 #. 3
-#: ../cli/src/connections.c:74
-msgid "TIMESTAMP-REAL"
-msgstr "TIMESTAMP-REAL"
+#: ../cli/src/connections.c:157
+msgid "BANNER"
+msgstr ""
 
 #. 4
-#: ../cli/src/connections.c:75
-msgid "AUTOCONNECT"
-msgstr "AUTOCONNECT"
+#: ../cli/src/connections.c:158
+msgid "VPN-STATE"
+msgstr ""
 
 #. 5
-#: ../cli/src/connections.c:76
-msgid "READONLY"
-msgstr "LECT. SEULE"
+#: ../cli/src/connections.c:159
+msgid "CFG"
+msgstr ""
 
-#: ../cli/src/connections.c:147
+#: ../cli/src/connections.c:180
 #, c-format
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
 "  COMMAND := { list | status | up | down | delete }\n"
 "\n"
 "  list [id <id> | uuid <id>]\n"
-"  status\n"
+"  status [id <id> | uuid <id> | path <path>]\n"
 "  up id <id> | uuid <id> [iface <iface>] [ap <BSSID>] [nsp <name>] [--"
 "nowait] [--timeout <timeout>]\n"
 "  up id <id> | uuid <id> [iface <iface>] [ap <BSSID>] [--nowait] [--timeout "
@@ -117,365 +214,377 @@
 "  down id <id> | uuid <id>\n"
 "  delete id <id> | uuid <id>\n"
 msgstr ""
-"Utilisation : nmcli con { COMMANDE | help }\n"
-"  COMMANDE := { list | status | up | down }\n"
-"\n"
-"  list [id <id> | uuid <id>]\n"
-"  status\n"
-"  up id <id> | uuid <id> [iface <iface>] [ap <BSSID>] [nsp <nom>] [--nowait] "
-"[--timeout <délai>]\n"
-"  up id <id> | uuid <id> [iface <iface>] [ap <BSSID>] [--nowait] [--timeout "
-"<délai>]\n"
-"  down id <id> | uuid <id>\n"
-"  delete id <id> | uuid <id>\n"
 
-#: ../cli/src/connections.c:201 ../cli/src/connections.c:534
+#: ../cli/src/connections.c:234 ../cli/src/connections.c:567
 #, c-format
 msgid "Error: 'con list': %s"
 msgstr "Erreur : « con list » : %s"
 
-#: ../cli/src/connections.c:203 ../cli/src/connections.c:536
+#: ../cli/src/connections.c:236 ../cli/src/connections.c:569
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr "Erreur : « con list » : %s ; champs autorisés : %s"
 
-#: ../cli/src/connections.c:211
+#: ../cli/src/connections.c:244
 msgid "Connection details"
 msgstr "Détails de connexion"
 
-#: ../cli/src/connections.c:409
+#: ../cli/src/connections.c:442
 msgid "never"
 msgstr "jamais"
 
 #. "CAPABILITIES"
 #. Print header
 #. "WIFI-PROPERTIES"
-#: ../cli/src/connections.c:410 ../cli/src/connections.c:411
-#: ../cli/src/connections.c:589 ../cli/src/connections.c:591
-#: ../cli/src/devices.c:503 ../cli/src/devices.c:556 ../cli/src/devices.c:683
-#: ../cli/src/devices.c:709 ../cli/src/devices.c:710 ../cli/src/devices.c:711
-#: ../cli/src/devices.c:712 ../cli/src/devices.c:713 ../cli/src/settings.c:572
-#: ../cli/src/settings.c:642 ../cli/src/settings.c:761
-#: ../cli/src/settings.c:1043 ../cli/src/settings.c:1044
-#: ../cli/src/settings.c:1046 ../cli/src/settings.c:1048
-#: ../cli/src/settings.c:1049 ../cli/src/settings.c:1177
-#: ../cli/src/settings.c:1178 ../cli/src/settings.c:1179
-#: ../cli/src/settings.c:1180 ../cli/src/settings.c:1255
-#: ../cli/src/settings.c:1256 ../cli/src/settings.c:1257
-#: ../cli/src/settings.c:1258 ../cli/src/settings.c:1259
+#: ../cli/src/connections.c:443 ../cli/src/connections.c:444
+#: ../cli/src/connections.c:681 ../cli/src/connections.c:682
+#: ../cli/src/connections.c:684 ../cli/src/devices.c:586
+#: ../cli/src/devices.c:639 ../cli/src/devices.c:750 ../cli/src/devices.c:751
+#: ../cli/src/devices.c:783 ../cli/src/devices.c:809 ../cli/src/devices.c:810
+#: ../cli/src/devices.c:811 ../cli/src/devices.c:812 ../cli/src/devices.c:813
+#: ../cli/src/settings.c:576 ../cli/src/settings.c:646
+#: ../cli/src/settings.c:766 ../cli/src/settings.c:1048
+#: ../cli/src/settings.c:1049 ../cli/src/settings.c:1051
+#: ../cli/src/settings.c:1053 ../cli/src/settings.c:1054
+#: ../cli/src/settings.c:1182 ../cli/src/settings.c:1183
+#: ../cli/src/settings.c:1184 ../cli/src/settings.c:1185
 #: ../cli/src/settings.c:1260 ../cli/src/settings.c:1261
 #: ../cli/src/settings.c:1262 ../cli/src/settings.c:1263
 #: ../cli/src/settings.c:1264 ../cli/src/settings.c:1265
 #: ../cli/src/settings.c:1266 ../cli/src/settings.c:1267
-#: ../cli/src/settings.c:1338
+#: ../cli/src/settings.c:1268 ../cli/src/settings.c:1269
+#: ../cli/src/settings.c:1270 ../cli/src/settings.c:1271
+#: ../cli/src/settings.c:1272 ../cli/src/settings.c:1343
 msgid "yes"
 msgstr "oui"
 
-#: ../cli/src/connections.c:410 ../cli/src/connections.c:411
-#: ../cli/src/connections.c:589 ../cli/src/connections.c:591
-#: ../cli/src/devices.c:503 ../cli/src/devices.c:556 ../cli/src/devices.c:683
-#: ../cli/src/devices.c:709 ../cli/src/devices.c:710 ../cli/src/devices.c:711
-#: ../cli/src/devices.c:712 ../cli/src/devices.c:713 ../cli/src/settings.c:572
-#: ../cli/src/settings.c:574 ../cli/src/settings.c:642
-#: ../cli/src/settings.c:761 ../cli/src/settings.c:1043
-#: ../cli/src/settings.c:1044 ../cli/src/settings.c:1046
+#: ../cli/src/connections.c:443 ../cli/src/connections.c:444
+#: ../cli/src/connections.c:681 ../cli/src/connections.c:682
+#: ../cli/src/connections.c:684 ../cli/src/devices.c:586
+#: ../cli/src/devices.c:639 ../cli/src/devices.c:750 ../cli/src/devices.c:751
+#: ../cli/src/devices.c:783 ../cli/src/devices.c:809 ../cli/src/devices.c:810
+#: ../cli/src/devices.c:811 ../cli/src/devices.c:812 ../cli/src/devices.c:813
+#: ../cli/src/settings.c:576 ../cli/src/settings.c:578
+#: ../cli/src/settings.c:646 ../cli/src/settings.c:766
 #: ../cli/src/settings.c:1048 ../cli/src/settings.c:1049
-#: ../cli/src/settings.c:1177 ../cli/src/settings.c:1178
-#: ../cli/src/settings.c:1179 ../cli/src/settings.c:1180
-#: ../cli/src/settings.c:1255 ../cli/src/settings.c:1256
-#: ../cli/src/settings.c:1257 ../cli/src/settings.c:1258
-#: ../cli/src/settings.c:1259 ../cli/src/settings.c:1260
+#: ../cli/src/settings.c:1051 ../cli/src/settings.c:1053
+#: ../cli/src/settings.c:1054 ../cli/src/settings.c:1182
+#: ../cli/src/settings.c:1183 ../cli/src/settings.c:1184
+#: ../cli/src/settings.c:1185 ../cli/src/settings.c:1260
 #: ../cli/src/settings.c:1261 ../cli/src/settings.c:1262
 #: ../cli/src/settings.c:1263 ../cli/src/settings.c:1264
 #: ../cli/src/settings.c:1265 ../cli/src/settings.c:1266
-#: ../cli/src/settings.c:1267 ../cli/src/settings.c:1338
+#: ../cli/src/settings.c:1267 ../cli/src/settings.c:1268
+#: ../cli/src/settings.c:1269 ../cli/src/settings.c:1270
+#: ../cli/src/settings.c:1271 ../cli/src/settings.c:1272
+#: ../cli/src/settings.c:1343
 msgid "no"
 msgstr "non"
 
-#: ../cli/src/connections.c:485
+#: ../cli/src/connections.c:518
 msgid "Connection list"
 msgstr "Liste des connexions"
 
-#: ../cli/src/connections.c:498 ../cli/src/connections.c:1410
-#: ../cli/src/connections.c:1425 ../cli/src/connections.c:1434
-#: ../cli/src/connections.c:1444 ../cli/src/connections.c:1456
-#: ../cli/src/connections.c:1551 ../cli/src/connections.c:1634
-#: ../cli/src/devices.c:1186 ../cli/src/devices.c:1196
-#: ../cli/src/devices.c:1310 ../cli/src/devices.c:1318
-#: ../cli/src/devices.c:1531 ../cli/src/devices.c:1538
+#: ../cli/src/connections.c:531 ../cli/src/connections.c:1064
+#: ../cli/src/connections.c:1808 ../cli/src/connections.c:1823
+#: ../cli/src/connections.c:1832 ../cli/src/connections.c:1842
+#: ../cli/src/connections.c:1854 ../cli/src/connections.c:1949
+#: ../cli/src/connections.c:2051 ../cli/src/devices.c:1190
+#: ../cli/src/devices.c:1200 ../cli/src/devices.c:1314
+#: ../cli/src/devices.c:1322 ../cli/src/devices.c:1535
+#: ../cli/src/devices.c:1542
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Erreur : le paramètre %s est manquant."
 
-#: ../cli/src/connections.c:511
+#: ../cli/src/connections.c:544
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "Erreur : %s - connexion introuvable."
 
-#: ../cli/src/connections.c:517 ../cli/src/connections.c:1469
-#: ../cli/src/connections.c:1568 ../cli/src/connections.c:1641
-#: ../cli/src/devices.c:983 ../cli/src/devices.c:1063
-#: ../cli/src/devices.c:1210 ../cli/src/devices.c:1324
-#: ../cli/src/devices.c:1544
+#: ../cli/src/connections.c:550 ../cli/src/connections.c:1867
+#: ../cli/src/connections.c:1966 ../cli/src/connections.c:2058
+#: ../cli/src/devices.c:987 ../cli/src/devices.c:1067
+#: ../cli/src/devices.c:1214 ../cli/src/devices.c:1328
+#: ../cli/src/devices.c:1548
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Paramètre inconnu : %s\n"
 
-#: ../cli/src/connections.c:526
+#: ../cli/src/connections.c:559
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "Erreur : aucun paramètre valide spécifié."
 
-#: ../cli/src/connections.c:541 ../cli/src/connections.c:1722
-#: ../cli/src/devices.c:1752 ../cli/src/network-manager.c:456
+#: ../cli/src/connections.c:574 ../cli/src/connections.c:2151
+#: ../cli/src/devices.c:1756 ../cli/src/network-manager.c:456
 #, c-format
 msgid "Error: %s."
 msgstr "Erreur : %s."
 
-#: ../cli/src/connections.c:630
-#, c-format
-msgid "Error: 'con status': %s"
-msgstr "Erreur : « con status » : %s"
-
-#: ../cli/src/connections.c:632
-#, c-format
-msgid "Error: 'con status': %s; allowed fields: %s"
-msgstr "Erreur : « con status » : %s ; champs autorisés : %s"
-
-#: ../cli/src/connections.c:640 ../cli/src/connections.c:1484
-#: ../cli/src/connections.c:1583 ../cli/src/connections.c:1655
-#: ../cli/src/devices.c:1010 ../cli/src/devices.c:1072
-#: ../cli/src/devices.c:1225 ../cli/src/devices.c:1354
-#: ../cli/src/devices.c:1573
-#, c-format
-msgid "Error: Can't find out if NetworkManager is running: %s."
-msgstr "Erreur : impossible de savoir si NetworkManager fonctionne : %s."
-
-#: ../cli/src/connections.c:644 ../cli/src/connections.c:1488
-#: ../cli/src/connections.c:1587 ../cli/src/connections.c:1659
-#: ../cli/src/devices.c:1014 ../cli/src/devices.c:1076
-#: ../cli/src/devices.c:1229 ../cli/src/devices.c:1358
-#: ../cli/src/devices.c:1577
-#, c-format
-msgid "Error: NetworkManager is not running."
-msgstr "Erreur : NetworkManager n'est pas lancé."
-
-#: ../cli/src/connections.c:652
-msgid "Active connections"
-msgstr "Connexions actives"
-
-#: ../cli/src/connections.c:1127
-#, c-format
-msgid "no active connection on device '%s'"
-msgstr "aucune connexion active sur le périphérique « %s »"
-
-#: ../cli/src/connections.c:1135
-#, c-format
-msgid "no active connection or device"
-msgstr "aucune connexion ou périphérique actif"
-
-#: ../cli/src/connections.c:1206
-#, c-format
-msgid "device '%s' not compatible with connection '%s'"
-msgstr "périphérique « %s » incompatible avec la connexion « %s »"
-
-#: ../cli/src/connections.c:1208
-#, c-format
-msgid "no device found for connection '%s'"
-msgstr "aucun périphérique trouvé pour la connexion « %s »"
-
-#: ../cli/src/connections.c:1219
+#: ../cli/src/connections.c:587
 msgid "activating"
 msgstr "activation"
 
-#: ../cli/src/connections.c:1221
+#: ../cli/src/connections.c:589
 msgid "activated"
 msgstr "activé"
 
-#: ../cli/src/connections.c:1223 ../cli/src/devices.c:296
+#: ../cli/src/connections.c:591 ../cli/src/devices.c:261
 msgid "deactivating"
 msgstr "désactivation"
 
-#: ../cli/src/connections.c:1226 ../cli/src/connections.c:1249
-#: ../cli/src/connections.c:1282 ../cli/src/devices.c:300
-#: ../cli/src/devices.c:684 ../cli/src/network-manager.c:111
+#: ../cli/src/connections.c:594 ../cli/src/connections.c:617
+#: ../cli/src/connections.c:1680 ../cli/src/devices.c:265
+#: ../cli/src/devices.c:784 ../cli/src/network-manager.c:111
 #: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:176
 #: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:291
 #: ../cli/src/network-manager.c:346 ../cli/src/network-manager.c:384
-#: ../cli/src/network-manager.c:423 ../cli/src/settings.c:527
-#: ../cli/src/utils.c:397
+#: ../cli/src/network-manager.c:423 ../cli/src/settings.c:531
+#: ../cli/src/utils.c:499 ../src/main.c:438 ../src/main.c:457
 msgid "unknown"
 msgstr "inconnu"
 
-#: ../cli/src/connections.c:1235
+#: ../cli/src/connections.c:603
 msgid "VPN connecting (prepare)"
 msgstr "Connexion VPN (préparation)"
 
-#: ../cli/src/connections.c:1237
+#: ../cli/src/connections.c:605
 msgid "VPN connecting (need authentication)"
 msgstr "Connexion VPN (authentification requise)"
 
-#: ../cli/src/connections.c:1239
+#: ../cli/src/connections.c:607
 msgid "VPN connecting"
 msgstr "Connexion VPN"
 
-#: ../cli/src/connections.c:1241
+#: ../cli/src/connections.c:609
 msgid "VPN connecting (getting IP configuration)"
 msgstr "Connexion VPN (obtention de la configuration IP)"
 
-#: ../cli/src/connections.c:1243
+#: ../cli/src/connections.c:611
 msgid "VPN connected"
 msgstr "VPN connecté"
 
-#: ../cli/src/connections.c:1245
+#: ../cli/src/connections.c:613
 msgid "VPN connection failed"
 msgstr "Échec de la connexion VPN"
 
-#: ../cli/src/connections.c:1247
+#: ../cli/src/connections.c:615
 msgid "VPN disconnected"
 msgstr "VPN déconnecté"
 
-#: ../cli/src/connections.c:1258
+#: ../cli/src/connections.c:868 ../cli/src/connections.c:1092
+#, c-format
+msgid "Error: 'con status': %s"
+msgstr "Erreur : « con status » : %s"
+
+#: ../cli/src/connections.c:870 ../cli/src/connections.c:1094
+#, c-format
+msgid "Error: 'con status': %s; allowed fields: %s"
+msgstr "Erreur : « con status » : %s ; champs autorisés : %s"
+
+#: ../cli/src/connections.c:878
+msgid "Active connection details"
+msgstr ""
+
+#: ../cli/src/connections.c:1014 ../cli/src/connections.c:1882
+#: ../cli/src/connections.c:1981 ../cli/src/connections.c:2072
+#: ../cli/src/devices.c:1014 ../cli/src/devices.c:1076
+#: ../cli/src/devices.c:1229 ../cli/src/devices.c:1358
+#: ../cli/src/devices.c:1577
+#, c-format
+msgid "Error: Can't find out if NetworkManager is running: %s."
+msgstr "Erreur : impossible de savoir si NetworkManager fonctionne : %s."
+
+#: ../cli/src/connections.c:1018 ../cli/src/connections.c:1886
+#: ../cli/src/connections.c:1985 ../cli/src/connections.c:2076
+#: ../cli/src/devices.c:1018 ../cli/src/devices.c:1080
+#: ../cli/src/devices.c:1233 ../cli/src/devices.c:1362
+#: ../cli/src/devices.c:1581
+#, c-format
+msgid "Error: NetworkManager is not running."
+msgstr "Erreur : NetworkManager n'est pas lancé."
+
+#: ../cli/src/connections.c:1050
+msgid "Active connections"
+msgstr "Connexions actives"
+
+#: ../cli/src/connections.c:1075
+#, c-format
+msgid "Error: '%s' is not an active connection."
+msgstr ""
+
+#: ../cli/src/connections.c:1080
+#, c-format
+msgid "Error: unknown parameter: %s"
+msgstr ""
+
+#: ../cli/src/connections.c:1564
+#, c-format
+msgid "no active connection on device '%s'"
+msgstr "aucune connexion active sur le périphérique « %s »"
+
+#: ../cli/src/connections.c:1572
+#, c-format
+msgid "no active connection or device"
+msgstr "aucune connexion ou périphérique actif"
+
+#: ../cli/src/connections.c:1643
+#, c-format
+msgid "device '%s' not compatible with connection '%s'"
+msgstr "périphérique « %s » incompatible avec la connexion « %s »"
+
+#: ../cli/src/connections.c:1645
+#, c-format
+msgid "no device found for connection '%s'"
+msgstr "aucun périphérique trouvé pour la connexion « %s »"
+
+#: ../cli/src/connections.c:1656
 msgid "unknown reason"
 msgstr "raison inconnue"
 
-#: ../cli/src/connections.c:1260
+#: ../cli/src/connections.c:1658
 msgid "none"
 msgstr "aucun"
 
-#: ../cli/src/connections.c:1262
+#: ../cli/src/connections.c:1660
 msgid "the user was disconnected"
 msgstr "l'utilisateur a été déconnecté"
 
-#: ../cli/src/connections.c:1264
+#: ../cli/src/connections.c:1662
 msgid "the base network connection was interrupted"
 msgstr "la connexion réseau de base a été interrompue"
 
-#: ../cli/src/connections.c:1266
+#: ../cli/src/connections.c:1664
 msgid "the VPN service stopped unexpectedly"
 msgstr "arrêt inattendu du service VPN"
 
-#: ../cli/src/connections.c:1268
+#: ../cli/src/connections.c:1666
 msgid "the VPN service returned invalid configuration"
 msgstr "le service VPN a retourné une configuration invalide"
 
-#: ../cli/src/connections.c:1270
+#: ../cli/src/connections.c:1668
 msgid "the connection attempt timed out"
 msgstr "le délai d'attente de la tentative de connexion a été dépassé"
 
-#: ../cli/src/connections.c:1272
+#: ../cli/src/connections.c:1670
 msgid "the VPN service did not start in time"
 msgstr "le service VPN n'a pas démarré à temps"
 
-#: ../cli/src/connections.c:1274
+#: ../cli/src/connections.c:1672
 msgid "the VPN service failed to start"
 msgstr "échec du démarrage du service VPN"
 
-#: ../cli/src/connections.c:1276
+#: ../cli/src/connections.c:1674
 msgid "no valid VPN secrets"
 msgstr "aucun secret VPN valide"
 
-#: ../cli/src/connections.c:1278
+#: ../cli/src/connections.c:1676
 msgid "invalid VPN secrets"
 msgstr "secrets VPN invalides"
 
-#: ../cli/src/connections.c:1280
+#: ../cli/src/connections.c:1678
 msgid "the connection was removed"
 msgstr "la connexion a été supprimée"
 
-#: ../cli/src/connections.c:1294
+#: ../cli/src/connections.c:1692
 #, c-format
 msgid "state: %s\n"
 msgstr "état : %s\n"
 
-#: ../cli/src/connections.c:1297 ../cli/src/connections.c:1323
+#: ../cli/src/connections.c:1695 ../cli/src/connections.c:1721
 #, c-format
 msgid "Connection activated\n"
 msgstr "Connexion activée\n"
 
-#: ../cli/src/connections.c:1300
+#: ../cli/src/connections.c:1698
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Erreur : échec de l'activation de la connexion."
 
-#: ../cli/src/connections.c:1319
+#: ../cli/src/connections.c:1717
 #, c-format
 msgid "state: %s (%d)\n"
 msgstr "état : %s (%d)\n"
 
-#: ../cli/src/connections.c:1329
+#: ../cli/src/connections.c:1727
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Erreur : l'activation de la connexion a échoué : %s."
 
-#: ../cli/src/connections.c:1346 ../cli/src/devices.c:1132
+#: ../cli/src/connections.c:1744 ../cli/src/devices.c:1136
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Erreur : le délai d'attente de %d sec a expiré."
 
-#: ../cli/src/connections.c:1359
+#: ../cli/src/connections.c:1757
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Erreur : l'activation de la connexion a échoué : %s"
 
-#: ../cli/src/connections.c:1365
+#: ../cli/src/connections.c:1763
 #, c-format
 msgid "Active connection state: %s\n"
 msgstr "État de la connexion active : %s\n"
 
-#: ../cli/src/connections.c:1366
+#: ../cli/src/connections.c:1764
 #, c-format
 msgid "Active connection path: %s\n"
 msgstr "Chemin de la connection active : %s\n"
 
-#: ../cli/src/connections.c:1418 ../cli/src/connections.c:1559
-#: ../cli/src/connections.c:1668
+#: ../cli/src/connections.c:1816 ../cli/src/connections.c:1957
+#: ../cli/src/connections.c:2085
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr "Erreur : connexion inconnue : %s."
 
-#: ../cli/src/connections.c:1464 ../cli/src/devices.c:1204
+#: ../cli/src/connections.c:1862 ../cli/src/devices.c:1208
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr "Erreur : valeur de délai d'attente « %s » non valide."
 
-#: ../cli/src/connections.c:1477 ../cli/src/connections.c:1576
-#: ../cli/src/connections.c:1648
+#: ../cli/src/connections.c:1875 ../cli/src/connections.c:1974
+#: ../cli/src/connections.c:2065
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "Erreur : ID ou UUID doit être spécifié."
 
-#: ../cli/src/connections.c:1505
+#: ../cli/src/connections.c:1903
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr "Erreur : aucun périphérique convenable trouvé : %s."
 
-#: ../cli/src/connections.c:1507
+#: ../cli/src/connections.c:1905
 #, c-format
 msgid "Error: No suitable device found."
 msgstr "Erreur : aucun périphérique convenable trouvé."
 
-#: ../cli/src/connections.c:1612
+#: ../cli/src/connections.c:2010
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "Avertissement : connexion inactive\n"
 
-#: ../cli/src/connections.c:1713
+#: ../cli/src/connections.c:2024
+#, c-format
+msgid "Error: Connection deletion failed: %s"
+msgstr ""
+
+#: ../cli/src/connections.c:2142
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr "Erreur : commande « con » « %s » non valide."
 
-#: ../cli/src/connections.c:1778
+#: ../cli/src/connections.c:2207
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "Erreur : impossible de se connecter à D-Bus."
 
-#: ../cli/src/connections.c:1786
+#: ../cli/src/connections.c:2215
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "Erreur : impossible d'obtenir les paramètres système."
 
-#: ../cli/src/connections.c:1796
+#: ../cli/src/connections.c:2225
 #, c-format
 msgid "Error: Can't obtain connections: settings service is not running."
 msgstr ""
@@ -485,222 +594,230 @@
 #. 0
 #. 9
 #. 3
-#: ../cli/src/devices.c:68 ../cli/src/devices.c:104 ../cli/src/devices.c:214
-#: ../cli/src/devices.c:230
+#: ../cli/src/devices.c:65 ../cli/src/devices.c:101 ../cli/src/devices.c:179
+#: ../cli/src/devices.c:195
 msgid "DEVICE"
 msgstr "PÉRIPHÉRIQUE"
 
-#. 1
-#. 4
-#. 1
-#: ../cli/src/devices.c:70 ../cli/src/devices.c:108
-#: ../cli/src/network-manager.c:39
-msgid "STATE"
-msgstr "ÉTAT"
-
-#: ../cli/src/devices.c:80
-msgid "GENERAL"
-msgstr "GÉNÉRAL"
-
 #. 0
-#: ../cli/src/devices.c:81
+#: ../cli/src/devices.c:78
 msgid "CAPABILITIES"
 msgstr "CAPACITÉS"
 
 #. 1
-#: ../cli/src/devices.c:82
+#: ../cli/src/devices.c:79
 msgid "WIFI-PROPERTIES"
 msgstr "PROPRIÉTÉS-WIFI"
 
 #. 2
-#: ../cli/src/devices.c:83
+#: ../cli/src/devices.c:80
 msgid "AP"
 msgstr "PA"
 
 #. 3
-#: ../cli/src/devices.c:84
+#: ../cli/src/devices.c:81
 msgid "WIRED-PROPERTIES"
 msgstr "PROPRIÉTÉS-CABLÉES"
 
 #. 4
-#: ../cli/src/devices.c:85
+#: ../cli/src/devices.c:82
 msgid "WIMAX-PROPERTIES"
 msgstr "PROPRIÉTÉS-WIMAX"
 
 #. 5
 #. 0
-#: ../cli/src/devices.c:86 ../cli/src/devices.c:227
+#: ../cli/src/devices.c:83 ../cli/src/devices.c:192
 msgid "NSP"
 msgstr "NSP"
 
 #. 6
-#: ../cli/src/devices.c:87
-msgid "IP4-SETTINGS"
-msgstr "PARAMÈTRES-IP4"
+#: ../cli/src/devices.c:84
+msgid "IP4"
+msgstr ""
 
 #. 7
-#: ../cli/src/devices.c:88
-msgid "IP4-DNS"
-msgstr "DNS-IP4"
+#: ../cli/src/devices.c:85
+msgid "DHCP4"
+msgstr ""
 
 #. 8
-#: ../cli/src/devices.c:89
-msgid "IP6-SETTINGS"
-msgstr "PARAMÈTRES-IP6"
+#: ../cli/src/devices.c:86
+msgid "IP6"
+msgstr ""
 
 #. 9
-#: ../cli/src/devices.c:90
-msgid "IP6-DNS"
-msgstr "DNS-IP6"
+#: ../cli/src/devices.c:87
+msgid "DHCP6"
+msgstr ""
 
 #. 2
-#: ../cli/src/devices.c:106
+#: ../cli/src/devices.c:103
+msgid "VENDOR"
+msgstr ""
+
+#. 3
+#: ../cli/src/devices.c:104
+msgid "PRODUCT"
+msgstr ""
+
+#. 4
+#: ../cli/src/devices.c:105
 msgid "DRIVER"
 msgstr "PILOTE"
 
-#. 3
-#: ../cli/src/devices.c:107
+#. 5
+#: ../cli/src/devices.c:106
 msgid "HWADDR"
 msgstr "ADR.-MAT."
 
+#. 7
+#: ../cli/src/devices.c:108
+msgid "REASON"
+msgstr ""
+
+#. 8
+#: ../cli/src/devices.c:109
+msgid "UDI"
+msgstr ""
+
+#. 9
+#: ../cli/src/devices.c:110
+msgid "IP-IFACE"
+msgstr ""
+
+#. 10
+#: ../cli/src/devices.c:111
+msgid "NM-MANAGED"
+msgstr ""
+
+#. 11
+#: ../cli/src/devices.c:112
+msgid "FIRMWARE-MISSING"
+msgstr ""
+
+#. 12
+#: ../cli/src/devices.c:113
+msgid "CONNECTION"
+msgstr ""
+
 #. 0
-#: ../cli/src/devices.c:117
+#: ../cli/src/devices.c:122
 msgid "CARRIER-DETECT"
 msgstr "DÉTECTION-PORTEUSE"
 
 #. 1
-#: ../cli/src/devices.c:118
+#: ../cli/src/devices.c:123
 msgid "SPEED"
 msgstr "VITESSE"
 
 #. 0
-#: ../cli/src/devices.c:127
+#: ../cli/src/devices.c:132
 msgid "CARRIER"
 msgstr "PORTEUSE"
 
 #. 0
-#: ../cli/src/devices.c:137
+#: ../cli/src/devices.c:142
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:138
+#: ../cli/src/devices.c:143
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:139
+#: ../cli/src/devices.c:144
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:140
+#: ../cli/src/devices.c:145
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:141
+#: ../cli/src/devices.c:146
 msgid "CCMP"
 msgstr "CCMP"
 
 #. 0
-#: ../cli/src/devices.c:151
+#: ../cli/src/devices.c:156
 msgid "CTR-FREQ"
 msgstr "FRÉQ-CTR"
 
 #. 1
-#: ../cli/src/devices.c:152
+#: ../cli/src/devices.c:157
 msgid "RSSI"
 msgstr "RSSI"
 
 #. 2
-#: ../cli/src/devices.c:153
+#: ../cli/src/devices.c:158
 msgid "CINR"
 msgstr "CINR"
 
 #. 3
-#: ../cli/src/devices.c:154
+#: ../cli/src/devices.c:159
 msgid "TX-POW"
 msgstr "TX-POW"
 
 #. 4
-#: ../cli/src/devices.c:155
+#: ../cli/src/devices.c:160
 msgid "BSID"
 msgstr "BSID"
 
 #. 0
-#: ../cli/src/devices.c:165 ../cli/src/devices.c:176
-msgid "ADDRESS"
-msgstr "ADRESSE"
-
-#. 1
-#: ../cli/src/devices.c:166 ../cli/src/devices.c:177
-msgid "PREFIX"
-msgstr "PRÉFIXE"
-
-#. 2
-#: ../cli/src/devices.c:167 ../cli/src/devices.c:178
-msgid "GATEWAY"
-msgstr "PASSERELLE"
-
-#. 0
-#: ../cli/src/devices.c:187 ../cli/src/devices.c:196
-msgid "DNS"
-msgstr "DNS"
-
-#. 0
-#: ../cli/src/devices.c:205
+#: ../cli/src/devices.c:170
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:206
+#: ../cli/src/devices.c:171
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:207
+#: ../cli/src/devices.c:172
 msgid "MODE"
 msgstr "MODE"
 
 #. 3
-#: ../cli/src/devices.c:208
+#: ../cli/src/devices.c:173
 msgid "FREQ"
 msgstr "FRÉQ"
 
 #. 4
-#: ../cli/src/devices.c:209
+#: ../cli/src/devices.c:174
 msgid "RATE"
 msgstr "DÉBIT"
 
 #. 5
 #. 1
-#: ../cli/src/devices.c:210 ../cli/src/devices.c:228
+#: ../cli/src/devices.c:175 ../cli/src/devices.c:193
 msgid "SIGNAL"
 msgstr "SIGNAL"
 
 #. 6
-#: ../cli/src/devices.c:211
+#: ../cli/src/devices.c:176
 msgid "SECURITY"
 msgstr "SÉCURITÉ"
 
 #. 7
-#: ../cli/src/devices.c:212
+#: ../cli/src/devices.c:177
 msgid "WPA-FLAGS"
 msgstr "DRAPEAUX-WPA"
 
 #. 8
-#: ../cli/src/devices.c:213
+#: ../cli/src/devices.c:178
 msgid "RSN-FLAGS"
 msgstr "DRAPEAUX-RSN"
 
 #. 10
 #. 4
-#: ../cli/src/devices.c:215 ../cli/src/devices.c:231
+#: ../cli/src/devices.c:180 ../cli/src/devices.c:196
 msgid "ACTIVE"
 msgstr "ACTIF"
 
-#: ../cli/src/devices.c:248
+#: ../cli/src/devices.c:213
 #, c-format
 msgid ""
 "Usage: nmcli dev { COMMAND | help }\n"
@@ -729,257 +846,457 @@
 "  wimax [list [iface <iface>] [nsp <nom>]]\n"
 "\n"
 
-#: ../cli/src/devices.c:276
+#: ../cli/src/devices.c:241
 msgid "unmanaged"
 msgstr "non-géré"
 
-#: ../cli/src/devices.c:278
+#: ../cli/src/devices.c:243
 msgid "unavailable"
 msgstr "indisponible"
 
-#: ../cli/src/devices.c:280 ../cli/src/network-manager.c:108
+#: ../cli/src/devices.c:245 ../cli/src/network-manager.c:108
 msgid "disconnected"
 msgstr "déconnecté"
 
-#: ../cli/src/devices.c:282
+#: ../cli/src/devices.c:247
 msgid "connecting (prepare)"
 msgstr "connexion (préparation)"
 
-#: ../cli/src/devices.c:284
+#: ../cli/src/devices.c:249
 msgid "connecting (configuring)"
 msgstr "connexion (configuration)"
 
-#: ../cli/src/devices.c:286
+#: ../cli/src/devices.c:251
 msgid "connecting (need authentication)"
 msgstr "connexion (authentification requise)"
 
-#: ../cli/src/devices.c:288
+#: ../cli/src/devices.c:253
 msgid "connecting (getting IP configuration)"
 msgstr "connexion (obtention de la configuration IP)"
 
-#: ../cli/src/devices.c:290
+#: ../cli/src/devices.c:255
 msgid "connecting (checking IP connectivity)"
 msgstr "connexion (contrôle de la connectivité IP)"
 
-#: ../cli/src/devices.c:292
+#: ../cli/src/devices.c:257
 msgid "connecting (starting secondary connections)"
 msgstr "connexion (démarrage des connexions secondaires)"
 
-#: ../cli/src/devices.c:294 ../cli/src/network-manager.c:104
+#: ../cli/src/devices.c:259 ../cli/src/network-manager.c:104
 msgid "connected"
 msgstr "connecté"
 
-#: ../cli/src/devices.c:298
+#: ../cli/src/devices.c:263
 msgid "connection failed"
 msgstr "échec de la connexion"
 
-#: ../cli/src/devices.c:323 ../cli/src/devices.c:335 ../cli/src/devices.c:495
-#: ../cli/src/devices.c:539
+#: ../cli/src/devices.c:274
+msgid "No reason given"
+msgstr ""
+
+#: ../cli/src/devices.c:277
+msgid "Unknown error"
+msgstr ""
+
+#: ../cli/src/devices.c:280
+msgid "Device is now managed"
+msgstr ""
+
+#: ../cli/src/devices.c:283
+msgid "Device is now unmanaged"
+msgstr ""
+
+#: ../cli/src/devices.c:286
+msgid "The device could not be readied for configuration"
+msgstr ""
+
+#: ../cli/src/devices.c:289
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)"
+msgstr ""
+
+#: ../cli/src/devices.c:292
+msgid "The IP configuration is no longer valid"
+msgstr ""
+
+#: ../cli/src/devices.c:295
+msgid "Secrets were required, but not provided"
+msgstr ""
+
+#: ../cli/src/devices.c:298
+msgid "802.1X supplicant disconnected"
+msgstr ""
+
+#: ../cli/src/devices.c:301
+msgid "802.1X supplicant configuration failed"
+msgstr ""
+
+#: ../cli/src/devices.c:304
+msgid "802.1X supplicant failed"
+msgstr ""
+
+#: ../cli/src/devices.c:307
+msgid "802.1X supplicant took too long to authenticate"
+msgstr ""
+
+#: ../cli/src/devices.c:310
+msgid "PPP service failed to start"
+msgstr ""
+
+#: ../cli/src/devices.c:313
+msgid "PPP service disconnected"
+msgstr ""
+
+#: ../cli/src/devices.c:316
+msgid "PPP failed"
+msgstr ""
+
+#: ../cli/src/devices.c:319
+msgid "DHCP client failed to start"
+msgstr ""
+
+#: ../cli/src/devices.c:322
+msgid "DHCP client error"
+msgstr ""
+
+#: ../cli/src/devices.c:325
+msgid "DHCP client failed"
+msgstr ""
+
+#: ../cli/src/devices.c:328
+msgid "Shared connection service failed to start"
+msgstr ""
+
+#: ../cli/src/devices.c:331
+msgid "Shared connection service failed"
+msgstr ""
+
+#: ../cli/src/devices.c:334
+msgid "AutoIP service failed to start"
+msgstr ""
+
+#: ../cli/src/devices.c:337
+msgid "AutoIP service error"
+msgstr ""
+
+#: ../cli/src/devices.c:340
+msgid "AutoIP service failed"
+msgstr ""
+
+#: ../cli/src/devices.c:343
+msgid "The line is busy"
+msgstr ""
+
+#: ../cli/src/devices.c:346
+msgid "No dial tone"
+msgstr ""
+
+#: ../cli/src/devices.c:349
+msgid "No carrier could be established"
+msgstr ""
+
+#: ../cli/src/devices.c:352
+msgid "The dialing request timed out"
+msgstr ""
+
+#: ../cli/src/devices.c:355
+msgid "The dialing attempt failed"
+msgstr ""
+
+#: ../cli/src/devices.c:358
+msgid "Modem initialization failed"
+msgstr ""
+
+#: ../cli/src/devices.c:361
+msgid "Failed to select the specified APN"
+msgstr ""
+
+#: ../cli/src/devices.c:364
+msgid "Not searching for networks"
+msgstr ""
+
+#: ../cli/src/devices.c:367
+msgid "Network registration denied"
+msgstr ""
+
+#: ../cli/src/devices.c:370
+msgid "Network registration timed out"
+msgstr ""
+
+#: ../cli/src/devices.c:373
+msgid "Failed to register with the requested network"
+msgstr ""
+
+#: ../cli/src/devices.c:376
+msgid "PIN check failed"
+msgstr ""
+
+#: ../cli/src/devices.c:379
+msgid "Necessary firmware for the device may be missing"
+msgstr ""
+
+#: ../cli/src/devices.c:382
+msgid "The device was removed"
+msgstr ""
+
+#: ../cli/src/devices.c:385
+msgid "NetworkManager went to sleep"
+msgstr ""
+
+#: ../cli/src/devices.c:388
+msgid "The device's active connection disappeared"
+msgstr ""
+
+#: ../cli/src/devices.c:391
+msgid "Device disconnected by user or client"
+msgstr ""
+
+#: ../cli/src/devices.c:394
+msgid "Carrier/link changed"
+msgstr ""
+
+#: ../cli/src/devices.c:397
+msgid "The device's existing connection was assumed"
+msgstr ""
+
+#: ../cli/src/devices.c:400
+msgid "The supplicant is now available"
+msgstr ""
+
+#: ../cli/src/devices.c:403
+msgid "The modem could not be found"
+msgstr ""
+
+#: ../cli/src/devices.c:406
+msgid "The Bluetooth connection failed or timed out"
+msgstr ""
+
+#: ../cli/src/devices.c:409
+msgid "GSM Modem's SIM card not inserted"
+msgstr ""
+
+#: ../cli/src/devices.c:412
+msgid "GSM Modem's SIM PIN required"
+msgstr ""
+
+#: ../cli/src/devices.c:415
+msgid "GSM Modem's SIM PUK required"
+msgstr ""
+
+#: ../cli/src/devices.c:418
+msgid "GSM Modem's SIM wrong"
+msgstr ""
+
+#: ../cli/src/devices.c:421
+msgid "Infiniband device does not support connected mode"
+msgstr ""
+
+#: ../cli/src/devices.c:423 ../cli/src/devices.c:446 ../cli/src/devices.c:458
+#: ../cli/src/devices.c:578 ../cli/src/devices.c:622
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../cli/src/devices.c:368
+#: ../cli/src/devices.c:491
 msgid "(none)"
 msgstr "(aucun)"
 
-#: ../cli/src/devices.c:393
-#, c-format
-msgid "%s: error converting IP4 address 0x%X"
-msgstr "%s : erreur lors de la conversion de l'adresse IP4 0x%X"
-
-#: ../cli/src/devices.c:464
+#: ../cli/src/devices.c:547
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:465
+#: ../cli/src/devices.c:548
 #, c-format
 msgid "%u MB/s"
 msgstr "%u Mo/s"
 
-#: ../cli/src/devices.c:474
+#: ../cli/src/devices.c:557
 msgid "Encrypted: "
 msgstr "Chiffré : "
 
-#: ../cli/src/devices.c:479
+#: ../cli/src/devices.c:562
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:481
+#: ../cli/src/devices.c:564
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:483
+#: ../cli/src/devices.c:566
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:486
+#: ../cli/src/devices.c:569
 msgid "Enterprise "
 msgstr "Enterprise "
 
-#: ../cli/src/devices.c:495
+#: ../cli/src/devices.c:578
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../cli/src/devices.c:495
+#: ../cli/src/devices.c:578
 msgid "Infrastructure"
 msgstr "Infrastructure"
 
-#: ../cli/src/devices.c:530
+#: ../cli/src/devices.c:613
 msgid "Home"
 msgstr "Domicile"
 
-#: ../cli/src/devices.c:533
+#: ../cli/src/devices.c:616
 msgid "Partner"
 msgstr "Partenaire"
 
-#: ../cli/src/devices.c:536
+#: ../cli/src/devices.c:619
 msgid "Roaming"
 msgstr "Itinérance"
 
-#: ../cli/src/devices.c:606
+#: ../cli/src/devices.c:691
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr "Erreur : « dev list » : %s"
 
-#: ../cli/src/devices.c:608
+#: ../cli/src/devices.c:693
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr "Erreur : « dev list » : %s ; champs autorisés : %s"
 
-#: ../cli/src/devices.c:617
+#: ../cli/src/devices.c:702
 msgid "Device details"
 msgstr "Détails de périphérique"
 
-#: ../cli/src/devices.c:653 ../cli/src/devices.c:654 ../cli/src/devices.c:1148
-#: ../cli/src/utils.c:343
+#: ../cli/src/devices.c:744 ../cli/src/devices.c:745 ../cli/src/devices.c:1152
+#: ../cli/src/utils.c:445
 msgid "(unknown)"
 msgstr "(inconnu)"
 
-#: ../cli/src/devices.c:680
+#: ../cli/src/devices.c:753
+msgid "not connected"
+msgstr ""
+
+#: ../cli/src/devices.c:780
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:753
+#: ../cli/src/devices.c:853
 msgid "on"
 msgstr "marche"
 
-#: ../cli/src/devices.c:753
+#: ../cli/src/devices.c:853
 msgid "off"
 msgstr "arrêt"
 
-#: ../cli/src/devices.c:1000
+#: ../cli/src/devices.c:1004
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr "Erreur : « dev status » : %s"
 
-#: ../cli/src/devices.c:1002
+#: ../cli/src/devices.c:1006
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr "Erreur : « dev status » : %s ; champs autorisés : %s"
 
-#: ../cli/src/devices.c:1025
+#: ../cli/src/devices.c:1029
 msgid "Status of devices"
 msgstr "État des périphériques"
 
-#: ../cli/src/devices.c:1056
+#: ../cli/src/devices.c:1060
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "Erreur : le paramètre « %s » est manquant."
 
-#: ../cli/src/devices.c:1097 ../cli/src/devices.c:1249
-#: ../cli/src/devices.c:1386 ../cli/src/devices.c:1605
+#: ../cli/src/devices.c:1101 ../cli/src/devices.c:1253
+#: ../cli/src/devices.c:1390 ../cli/src/devices.c:1609
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Erreur : périphérique « %s » introuvable."
 
-#: ../cli/src/devices.c:1120
+#: ../cli/src/devices.c:1124
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "Opération réussie : périphérique « %s » correctement déconnecté."
 
-#: ../cli/src/devices.c:1145
+#: ../cli/src/devices.c:1149
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "Erreur : échec de la déconnexion du périphérique « %s » (%s) : %s"
 
-#: ../cli/src/devices.c:1153
+#: ../cli/src/devices.c:1157
 #, c-format
 msgid "Device state: %d (%s)\n"
 msgstr "État du périphérique : %d (%s)\n"
 
-#: ../cli/src/devices.c:1218
+#: ../cli/src/devices.c:1222
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr "Erreur : iface doit être spécifié."
 
-#: ../cli/src/devices.c:1344
+#: ../cli/src/devices.c:1348
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr "Erreur : « dev wifi » : %s"
 
-#: ../cli/src/devices.c:1346
+#: ../cli/src/devices.c:1350
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr "Erreur : « dev wifi » : %s ; champs autorisés : %s"
 
-#: ../cli/src/devices.c:1369
+#: ../cli/src/devices.c:1373
 msgid "WiFi scan list"
 msgstr "Liste du balayage WiFi"
 
-#: ../cli/src/devices.c:1406 ../cli/src/devices.c:1460
+#: ../cli/src/devices.c:1410 ../cli/src/devices.c:1464
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "Erreur : point d'accès avec bssid « %s » introuvable."
 
-#: ../cli/src/devices.c:1423
+#: ../cli/src/devices.c:1427
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr "Erreur : le périphérique « %s » n'est pas un périphérique WiFi."
 
-#: ../cli/src/devices.c:1487
+#: ../cli/src/devices.c:1491
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr "Erreur : commande « dev wifi » « %s » non valide."
 
-#: ../cli/src/devices.c:1563
+#: ../cli/src/devices.c:1567
 #, c-format
 msgid "Error: 'dev wimax': %s"
 msgstr "Erreur : « dev wimax » : %s"
 
-#: ../cli/src/devices.c:1565
+#: ../cli/src/devices.c:1569
 #, c-format
 msgid "Error: 'dev wimax': %s; allowed fields: %s"
 msgstr "Erreur : « dev wimax » : %s ; champs autorisés : %s"
 
-#: ../cli/src/devices.c:1588
+#: ../cli/src/devices.c:1592
 msgid "WiMAX NSP list"
 msgstr "Liste NSP WiMax"
 
-#: ../cli/src/devices.c:1625
+#: ../cli/src/devices.c:1629
 #, c-format
 msgid "Error: NSP with name '%s' not found."
 msgstr "Erreur : NSP nommé « %s » introuvable."
 
-#: ../cli/src/devices.c:1636
+#: ../cli/src/devices.c:1640
 #, c-format
 msgid "Error: Device '%s' is not a WiMAX device."
 msgstr "Erreur : le périphérique « %s » n'est pas un périphérique WiMax."
 
-#: ../cli/src/devices.c:1667
+#: ../cli/src/devices.c:1671
 #, c-format
 msgid "Error: Access point with nsp '%s' not found."
 msgstr "Erreur : point d'accès avec nsp « %s » introuvable."
 
-#: ../cli/src/devices.c:1694
+#: ../cli/src/devices.c:1698
 #, c-format
 msgid "Error: 'dev wimax' command '%s' is not valid."
 msgstr "Erreur : commande « dev wifi » « %s » non valide."
 
-#: ../cli/src/devices.c:1744
+#: ../cli/src/devices.c:1748
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Erreur : commande « dev » « %s » non valide."
@@ -1122,7 +1439,7 @@
 msgid "not running"
 msgstr "inactif"
 
-#: ../cli/src/network-manager.c:215 ../cli/src/utils.c:323
+#: ../cli/src/network-manager.c:215 ../cli/src/utils.c:425
 #, c-format
 msgid "Error: Couldn't connect to system bus: %s"
 msgstr "Erreur : impossible de se connecter au bus système : %s"
@@ -1310,107 +1627,117 @@
 msgid "Success"
 msgstr "Succès"
 
-#: ../cli/src/settings.c:461
+#: ../cli/src/settings.c:465
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:463
+#: ../cli/src/settings.c:467
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (phrase de passe 104/128-bit)"
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:470
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (inconnu)"
 
-#: ../cli/src/settings.c:492
+#: ../cli/src/settings.c:496
 msgid "0 (unknown)"
 msgstr "0 (inconnu)"
 
-#: ../cli/src/settings.c:498
+#: ../cli/src/settings.c:502
 msgid "any, "
 msgstr "tous, "
 
-#: ../cli/src/settings.c:500
+#: ../cli/src/settings.c:504
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:502
+#: ../cli/src/settings.c:506
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:504
+#: ../cli/src/settings.c:508
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:506
+#: ../cli/src/settings.c:510
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:508
+#: ../cli/src/settings.c:512
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:510
+#: ../cli/src/settings.c:514
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:512
+#: ../cli/src/settings.c:516
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:514
+#: ../cli/src/settings.c:518
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:516
+#: ../cli/src/settings.c:520
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:518
+#: ../cli/src/settings.c:522
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:520
+#: ../cli/src/settings.c:524
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../cli/src/settings.c:522
+#: ../cli/src/settings.c:526
 msgid "WCDMA 3GPP UMTS 1900 MHz, "
 msgstr "WCDMA 3GPP UMTS 1900 MHz, "
 
-#: ../cli/src/settings.c:524
+#: ../cli/src/settings.c:528
 msgid "WCDMA 3GPP UMTS 2600 MHz, "
 msgstr "WCDMA 3GPP UMTS 2600 MHz, "
 
-#: ../cli/src/settings.c:646 ../cli/src/settings.c:841
-#: ../cli/src/settings.c:1545
+#: ../cli/src/settings.c:650 ../cli/src/settings.c:846
+#: ../cli/src/settings.c:1550
 msgid "auto"
 msgstr "auto"
 
-#: ../cli/src/settings.c:835 ../cli/src/settings.c:838
-#: ../cli/src/settings.c:839 ../cli/src/utils.c:176
+#: ../cli/src/settings.c:840 ../cli/src/settings.c:843
+#: ../cli/src/settings.c:844 ../cli/src/utils.c:247
 msgid "not set"
 msgstr "non défini"
 
-#: ../cli/src/utils.c:128
+#: ../cli/src/utils.c:103
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr ""
+
+#: ../cli/src/utils.c:131
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr ""
+
+#: ../cli/src/utils.c:200
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "champ « %s » doit être seul"
 
-#: ../cli/src/utils.c:131
+#: ../cli/src/utils.c:203
 #, c-format
 msgid "invalid field '%s'"
 msgstr "champ « %s » non valide"
 
-#: ../cli/src/utils.c:150
+#: ../cli/src/utils.c:222
 #, c-format
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "L'option « --terse » requiert la spécification de « --fields »"
 
-#: ../cli/src/utils.c:154
+#: ../cli/src/utils.c:226
 #, c-format
 msgid ""
 "Option '--terse' requires specific '--fields' option values , not '%s'"
@@ -1418,18 +1745,18 @@
 "L'option « --terse » requiert des valeurs d'options « --fields » "
 "spécifiques, pas « %s »"
 
-#: ../cli/src/utils.c:334
+#: ../cli/src/utils.c:436
 #, c-format
 msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
 msgstr ""
 "Erreur : impossible de créer le proxy d'objet D-Bus pour org.freedesktop.DBus"
 
-#: ../cli/src/utils.c:342
+#: ../cli/src/utils.c:444
 #, c-format
 msgid "Error: NameHasOwner request failed: %s"
 msgstr "Erreur : la requête NameHasOwner a échoué : %s"
 
-#: ../cli/src/utils.c:387
+#: ../cli/src/utils.c:489
 #, c-format
 msgid ""
 "Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
@@ -1438,7 +1765,7 @@
 "Avertissement : les versions de nmcli (%s) et de NetworkManager (%s) ne "
 "correspondent pas. Utilisez --nocheck pour supprimer cet avertissement.\n"
 
-#: ../cli/src/utils.c:396
+#: ../cli/src/utils.c:498
 #, c-format
 msgid ""
 "Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
@@ -1800,29 +2127,29 @@
 msgid "Could not generate random data."
 msgstr "Impossible de générer des données aléatoires."
 
-#: ../libnm-util/nm-utils.c:2003
+#: ../libnm-util/nm-utils.c:2034
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "Mémoire insuffisante pour créer une clé de chiffrement."
 
-#: ../libnm-util/nm-utils.c:2113
+#: ../libnm-util/nm-utils.c:2144
 msgid "Could not allocate memory for PEM file creation."
 msgstr "Allocation de mémoire impossible pour la création du fichier PEM."
 
-#: ../libnm-util/nm-utils.c:2125
+#: ../libnm-util/nm-utils.c:2156
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr ""
 "Allocation de mémoire impossible pour l'écriture de IV dans le fichier PEM."
 
-#: ../libnm-util/nm-utils.c:2137
+#: ../libnm-util/nm-utils.c:2168
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr ""
 "Allocation de mémoire impossible pour l'écriture de la clé chiffrée dans le "
 "fichier PEM."
 
-#: ../libnm-util/nm-utils.c:2156
+#: ../libnm-util/nm-utils.c:2187
 #, c-format
 msgid "Could not allocate memory for PEM file data."
 msgstr "Allocation de mémoire impossible pour les données du fichier PEM."
@@ -1950,18 +2277,138 @@
 msgid "System policy prevents use of user-specific connections"
 msgstr ""
 
+#: ../src/main.c:143
+#, c-format
+msgid "Failed to initialize SIGTERM pipe: %d"
+msgstr ""
+
+#: ../src/main.c:169
+#, c-format
+msgid "Opening %s failed: %s\n"
+msgstr ""
+
+#: ../src/main.c:175
+#, c-format
+msgid "Writing to %s failed: %s\n"
+msgstr ""
+
+#: ../src/main.c:180
+#, c-format
+msgid "Closing %s failed: %s\n"
+msgstr ""
+
+#: ../src/main.c:223
+#, c-format
+msgid "NetworkManager is already running (pid %ld)\n"
+msgstr ""
+
+#: ../src/main.c:360
+msgid "Print NetworkManager version and exit"
+msgstr ""
+
+#: ../src/main.c:361
+msgid "Don't become a daemon"
+msgstr ""
+
+#: ../src/main.c:362
+msgid "Make all warnings fatal"
+msgstr ""
+
+#: ../src/main.c:363
+msgid "Specify the location of a PID file"
+msgstr ""
+
+#: ../src/main.c:363
+msgid "filename"
+msgstr ""
+
+#: ../src/main.c:364
+msgid "State file location"
+msgstr ""
+
+#: ../src/main.c:364
+msgid "/path/to/state.file"
+msgstr ""
+
+#: ../src/main.c:365
+msgid "Config file location"
+msgstr ""
+
+#: ../src/main.c:365
+msgid "/path/to/config.file"
+msgstr ""
+
+#: ../src/main.c:366
+msgid "List of plugins separated by ','"
+msgstr ""
+
+#: ../src/main.c:366
+msgid "plugin1,plugin2"
+msgstr ""
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:368
+msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
+msgstr ""
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:371
+msgid ""
+"Log domains separated by ',': any combination of\n"
+"                                          "
+"[NONE,HW,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                           "
+"WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                           "
+"AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,WIMAX,\n"
+"                                           INFINIBAND,FIREWALL]"
+msgstr ""
+
+#: ../src/main.c:381
+#, c-format
+msgid "GModules are not supported on your platform!\n"
+msgstr ""
+
 #: ../src/main.c:400
+msgid ""
+"NetworkManager monitors all network connections and automatically\n"
+"chooses the best connection to use.  It also allows the user to\n"
+"specify wireless access points which wireless cards in the computer\n"
+"should associate with."
+msgstr ""
+
+#: ../src/main.c:406
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr ""
 "Option non valide. Utilisez --help pour afficher une liste d'options "
 "valides.\n"
 
-#: ../src/main.c:441
+#: ../src/main.c:416
+#, c-format
+msgid "You must be root to run NetworkManager!\n"
+msgstr ""
+
+#: ../src/main.c:436
+#, c-format
+msgid "Failed to read configuration: (%d) %s\n"
+msgstr ""
+
+#: ../src/main.c:447
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s. Utilisez --help pour afficher une liste d'options valides.\n"
 
+#: ../src/main.c:454
+#, c-format
+msgid "State file %s parsing failed: (%d) %s\n"
+msgstr ""
+
+#: ../src/main.c:471
+#, c-format
+msgid "Could not daemonize: %s [error %u]\n"
+msgstr ""
+
 #: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62
 msgid "# Created by NetworkManager\n"
 msgstr "# Créé par NetworkManager\n"
@@ -1975,19 +2422,19 @@
 "# Fusionné depuis %s\n"
 "\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:284
+#: ../src/dhcp-manager/nm-dhcp-manager.c:266
 msgid "no usable DHCP client could be found."
 msgstr "aucun client DHCP utilisable n'a pu être trouvé."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:293
+#: ../src/dhcp-manager/nm-dhcp-manager.c:275
 msgid "'dhclient' could be found."
 msgstr "« dhclient » a été trouvé."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:303
+#: ../src/dhcp-manager/nm-dhcp-manager.c:285
 msgid "'dhcpcd' could be found."
 msgstr "« dhcpcd » a été trouvé."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:311
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 #, c-format
 msgid "unsupported DHCP client '%s'"
 msgstr "client DHCP « %s » non pris en charge"
@@ -2002,57 +2449,57 @@
 msgid "The nameservers listed below may not be recognized."
 msgstr "Les serveurs de noms listés ci-dessous peuvent ne pas être reconnus."
 
-#: ../src/logging/nm-logging.c:154
+#: ../src/logging/nm-logging.c:130
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr "Niveau de journalisation « %s » inconnu"
 
-#: ../src/logging/nm-logging.c:179
+#: ../src/logging/nm-logging.c:155
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "Domaine de journalisation « %s » inconnu"
 
-#: ../src/modem-manager/nm-modem-cdma.c:296 ../src/nm-device-bt.c:354
+#: ../src/modem-manager/nm-modem-cdma.c:279 ../src/nm-device-bt.c:324
 #, c-format
 msgid "CDMA connection %d"
 msgstr "Connexion CDMA %d"
 
-#: ../src/modem-manager/nm-modem-gsm.c:521 ../src/nm-device-bt.c:350
+#: ../src/modem-manager/nm-modem-gsm.c:512 ../src/nm-device-bt.c:320
 #, c-format
 msgid "GSM connection %d"
 msgstr "Connexion GSM %d"
 
-#: ../src/nm-device-bt.c:325
+#: ../src/nm-device-bt.c:295
 #, c-format
 msgid "PAN connection %d"
 msgstr "Connexion PAN %d"
 
-#: ../src/nm-device-bt.c:358
+#: ../src/nm-device-bt.c:328
 #, c-format
 msgid "DUN connection %d"
 msgstr "Connexion DUN %d"
 
-#: ../src/nm-device-ethernet.c:1425
+#: ../src/nm-device-ethernet.c:1354
 #, c-format
 msgid "PPPoE connection %d"
 msgstr "Connexion PPPoE %d"
 
-#: ../src/nm-device-ethernet.c:1425 ../src/settings/nm-settings-utils.c:50
+#: ../src/nm-device-ethernet.c:1354 ../src/settings/nm-settings-utils.c:50
 #, c-format
 msgid "Wired connection %d"
 msgstr "Connexion filaire %d"
 
-#: ../src/nm-device-infiniband.c:292
+#: ../src/nm-device-infiniband.c:302
 #, c-format
 msgid "Infiniband connection %d"
 msgstr ""
 
-#: ../src/nm-device-olpc-mesh.c:323
+#: ../src/nm-device-olpc-mesh.c:293
 #, c-format
 msgid "Mesh %d"
 msgstr "Réseau maillé %d"
 
-#: ../src/nm-manager.c:689
+#: ../src/nm-manager.c:642
 #, c-format
 msgid "VPN connection %d"
 msgstr "Connexion VPN %d"
@@ -2105,11 +2552,11 @@
 msgid "error updating link cache: %s"
 msgstr "erreur lors de la mise à jour du cache de connexion : %s"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:97
+#: ../src/settings/plugins/ifcfg-rh/reader.c:91
 #: ../src/settings/plugins/ifnet/connection_parser.c:51
 msgid "System"
 msgstr "Système"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:3557
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3648
 msgid "Bond"
 msgstr ""
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/newt.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/newt.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/newt.po	2012-01-02 17:26:53.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/newt.po	2012-02-23 06:31:19.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:51+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:42+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../dialogboxes.c:43 ../dialogboxes.c:48 ../dialogboxes.c:493
 msgid "Ok"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/notify-osd-icons.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/notify-osd-icons.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/notify-osd-icons.po	2012-01-02 17:27:33.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/notify-osd-icons.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-# French translation for notify-osd-icons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the notify-osd-icons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: notify-osd-icons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-09-24 10:57+0000\n"
-"PO-Revision-Date: 2009-10-07 10:03+0000\n"
-"Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
-"Language-Team: French <fr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:01+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
-
-#: ../index.theme.in.h:1
-msgid "Ubuntu default theme for Notify-OSD"
-msgstr "Thème Ubuntu par défaut pour Notify-OSD"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/nova.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/nova.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/nova.po	2012-01-02 17:27:49.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/nova.po	2012-02-23 06:32:14.000000000 +0000
@@ -7,135 +7,128 @@
 msgstr ""
 "Project-Id-Version: nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-12-16 21:34+0000\n"
+"POT-Creation-Date: 2012-02-17 16:29+0000\n"
 "PO-Revision-Date: 2011-12-07 13:06+0000\n"
 "Last-Translator: Capashen <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-30 01:42+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 06:52+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
-#: ../nova/api/ec2/ec2utils.py:80 ../nova/api/openstack/common.py:311
-#, python-format
-msgid "Instance %(name)s has stale IP address: %(ip)s (no network or vif)"
+#: nova/api/openstack/compute/contrib/flavorextraspecs.py:49
+#: nova/api/openstack/compute/contrib/volumetypes.py:158
+msgid "No Request Body"
+msgstr ""
+
+#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/server_metadata.py:82
+#: nova/api/openstack/compute/contrib/flavorextraspecs.py:79
+#: nova/api/openstack/compute/contrib/volumetypes.py:188
+msgid "Request body and URI mismatch"
+msgstr ""
+
+#: nova/api/openstack/compute/image_metadata.py:86
+#: nova/api/openstack/compute/server_metadata.py:86
+#: nova/api/openstack/compute/contrib/flavorextraspecs.py:82
+#: nova/api/openstack/compute/contrib/volumetypes.py:191
+msgid "Request body contains too many items"
 msgstr ""
 
-#: ../nova/network/quantum/quantum_connection.py:94
+#: nova/network/quantum/quantum_connection.py:100
 #, python-format
 msgid ""
 "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: ../nova/network/quantum/quantum_connection.py:108
+#: nova/network/quantum/quantum_connection.py:114
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: ../nova/manager.py:145
+#: nova/manager.py:146
 #, python-format
 msgid ""
 "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks left until next run"
 msgstr ""
 
-#: ../nova/manager.py:151
+#: nova/manager.py:152
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: ../nova/manager.py:158
+#: nova/manager.py:159
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: ../nova/manager.py:193
+#: nova/manager.py:203
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: ../nova/api/openstack/v2/zones.py:59
-msgid "--build_plan_encryption_key not set"
-msgstr ""
-
-#: ../nova/tests/api/openstack/v2/contrib/test_snapshots.py:58
-#, python-format
-msgid "_create: %s"
-msgstr ""
-
-#: ../nova/tests/api/openstack/v2/contrib/test_snapshots.py:67
-#: ../nova/tests/api/openstack/v2/contrib/test_vsa.py:70
-#, python-format
-msgid "_delete: %s"
-msgstr ""
-
-#: ../nova/tests/api/openstack/v2/contrib/test_snapshots.py:76
-#: ../nova/tests/api/openstack/v2/contrib/test_vsa.py:79
-#, python-format
-msgid "_get: %s"
-msgstr ""
-
-#: ../nova/tests/api/openstack/v2/contrib/test_snapshots.py:86
-#: ../nova/tests/api/openstack/v2/contrib/test_vsa.py:89
-#, python-format
-msgid "_get_all: %s"
-msgstr ""
-
-#: ../nova/tests/api/openstack/v2/contrib/test_snapshots.py:130
-#, python-format
-msgid "test_snapshot_create: param=%s"
-msgstr ""
-
-#: ../nova/tests/api/openstack/v2/contrib/test_snapshots.py:139
-#, python-format
-msgid "test_snapshot_create: resp_dict=%s"
+#: nova/api/openstack/compute/contrib/admin_actions.py:244
+#: nova/api/openstack/compute/contrib/console_output.py:46
+#: nova/api/openstack/compute/contrib/console_output.py:58
+#: nova/api/openstack/compute/contrib/consoles.py:49
+#: nova/api/openstack/compute/contrib/consoles.py:60
+#: nova/api/openstack/compute/contrib/server_action_list.py:49
+#: nova/api/openstack/compute/contrib/server_diagnostics.py:47
+#: nova/api/openstack/compute/contrib/server_start_stop.py:38
+msgid "Instance not found"
 msgstr ""
 
-#: ../nova/tests/api/openstack/v2/contrib/test_snapshots.py:161
-#, python-format
-msgid "test_snapshot_create_force: param=%s"
+#: nova/virt/disk/mount.py:76
+msgid "no partitions found"
 msgstr ""
 
-#: ../nova/tests/api/openstack/v2/contrib/test_snapshots.py:170
+#: nova/virt/disk/mount.py:77
 #, python-format
-msgid "test_snapshot_create_force: resp_dict=%s"
+msgid "Failed to map partitions: %s"
 msgstr ""
 
-#: ../nova/tests/api/openstack/v2/contrib/test_snapshots.py:210
+#: nova/virt/disk/api.py:259 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
 #, python-format
-msgid "test_snapshot_show: resp=%s"
-msgstr ""
+msgid "Failed to mount filesystem: %s"
+msgstr "Impossible de monter le système de fichier : %s"
 
-#: ../nova/tests/api/openstack/v2/contrib/test_snapshots.py:236
-#, python-format
-msgid "test_snapshot_detail: resp_dict=%s"
+#: nova/api/openstack/wsgi.py:813 nova/api/openstack/wsgi.py:826
+#: nova/api/openstack/compute/server_metadata.py:58
+#: nova/api/openstack/compute/server_metadata.py:76
+#: nova/api/openstack/compute/server_metadata.py:103
+#: nova/api/openstack/compute/server_metadata.py:128
+#: nova/api/openstack/compute/contrib/admin_actions.py:211
+#: nova/api/openstack/compute/contrib/console_output.py:51
+msgid "Malformed request body"
 msgstr ""
 
-#: ../nova/virt/xenapi/fake.py:77 ../nova/virt/vmwareapi/fake.py:45
+#: nova/virt/vmwareapi/fake.py:44 nova/virt/xenapi/fake.py:77
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: ../nova/virt/xenapi/fake.py:495 ../nova/virt/xenapi/fake.py:594
-#: ../nova/virt/xenapi/fake.py:612 ../nova/virt/xenapi/fake.py:675
+#: nova/virt/xenapi/fake.py:524 nova/virt/xenapi/fake.py:623
+#: nova/virt/xenapi/fake.py:641 nova/virt/xenapi/fake.py:704
 msgid "Raising NotImplemented"
 msgstr "Fonction non implémentée"
 
-#: ../nova/virt/xenapi/fake.py:497
+#: nova/virt/xenapi/fake.py:526
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake n'a pas d'implémentation pour %s"
 
-#: ../nova/virt/xenapi/fake.py:531
+#: nova/virt/xenapi/fake.py:560
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Appel %(localname)s %(impl)s"
 
-#: ../nova/virt/xenapi/fake.py:536
+#: nova/virt/xenapi/fake.py:565
 #, python-format
 msgid "Calling getter %s"
 msgstr "Appel du getter %s"
 
-#: ../nova/virt/xenapi/fake.py:596
+#: nova/virt/xenapi/fake.py:625
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -144,3273 +137,3076 @@
 "xenapi.fake n'a pas d'implementation pour %s ou il a été appelé avec le "
 "mauvais nombre d'arguments"
 
-#: ../nova/virt/connection.py:78
+#: nova/virt/connection.py:85
 msgid "Failed to open connection to the hypervisor"
 msgstr "Échec lors de l'ouverture d'une connexion à l'hyperviseur"
 
-#: ../nova/utils.py:66
+#: nova/api/openstack/compute/limits.py:140
+#, python-format
+msgid ""
+"Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
+"%(unit_string)s."
+msgstr ""
+
+#: nova/api/openstack/compute/limits.py:265
+msgid "This request was rate-limited."
+msgstr ""
+
+#: nova/utils.py:72
 #, python-format
 msgid "Inner Exception: %s"
 msgstr "Exception interne : %s"
 
-#: ../nova/utils.py:150
+#: nova/utils.py:156
 #, python-format
 msgid "Fetching %s"
 msgstr "Récupèration de %s"
 
-#: ../nova/utils.py:188
+#: nova/utils.py:197
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: ../nova/utils.py:198
+#: nova/utils.py:207
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Execution de la commande (sous-processus) : %s"
 
-#: ../nova/utils.py:214 ../nova/utils.py:264
+#: nova/utils.py:223 nova/utils.py:302
 #, python-format
 msgid "Result was %s"
 msgstr "Le résultat était %s"
 
-#: ../nova/utils.py:228
+#: nova/utils.py:236
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: ../nova/utils.py:240
+#: nova/utils.py:278
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Execution de la cmd (SSH): %s"
 
-#: ../nova/utils.py:242
+#: nova/utils.py:280
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#. This is (probably) fixable if we need it...
-#: ../nova/utils.py:246
+#: nova/utils.py:284
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: ../nova/utils.py:304
+#: nova/utils.py:343
 #, python-format
 msgid "debug in callback: %s"
 msgstr "Debug dans le rappel : %s"
 
-#: ../nova/utils.py:309
-#, python-format
-msgid "Running %s"
-msgstr "Exécution de %s"
-
-#: ../nova/utils.py:414
+#: nova/utils.py:476
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "L'adresse du lien local n'a pas été trouvé :%s"
 
-#: ../nova/utils.py:417
+#: nova/utils.py:479
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Impossible de trouver l'IP du lien local de %(interface)s :%(ex)s"
 
-#: ../nova/utils.py:514
+#: nova/utils.py:576
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Backend invalide : %s"
 
-#: ../nova/utils.py:525
+#: nova/utils.py:587
 #, python-format
 msgid "backend %s"
 msgstr "backend %s"
 
-#: ../nova/utils.py:748
+#: nova/utils.py:636
+msgid "in looping call"
+msgstr ""
+
+#: ../nova/utils.py:810
 #, python-format
 msgid ""
 "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: ../nova/utils.py:752
+#: ../nova/utils.py:814
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: ../nova/utils.py:756
+#: ../nova/utils.py:818
 #, python-format
 msgid ""
 "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: ../nova/utils.py:767
+#: ../nova/utils.py:825
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: ../nova/utils.py:875
+#: nova/utils.py:935
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: ../nova/utils.py:906
+#: nova/utils.py:966
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: ../nova/utils.py:1029
+#: nova/utils.py:1091
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: ../nova/utils.py:1059
+#: nova/utils.py:1123
 msgid "Original exception being dropped"
 msgstr ""
 
-#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost.py:84
-msgid "Missing 'enabled' argument to set_host_enabled"
+#: nova/utils.py:1242
+#, python-format
+msgid "Class %(fullname)s is deprecated: %(msg)s"
+msgstr ""
+
+#: nova/utils.py:1244
+#, python-format
+msgid "Class %(fullname)s is deprecated"
+msgstr ""
+
+#: nova/utils.py:1276
+#, python-format
+msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
+msgstr ""
+
+#: nova/utils.py:1278
+#, python-format
+msgid "Function %(name)s in %(location)s is deprecated"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:481
+#: nova/api/openstack/volume/snapshots.py:109
+#, python-format
+msgid "Delete snapshot with id: %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:523
+#: nova/api/openstack/volume/snapshots.py:149
+#, python-format
+msgid "Create snapshot from volume %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:73
+#: nova/api/openstack/volume/volumes.py:99
+#, python-format
+msgid "vol=%s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:146
+#: nova/api/openstack/volume/volumes.py:177
+#, python-format
+msgid "Delete volume with id: %s"
 msgstr ""
 
-#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost.py:90
+#: nova/api/ec2/cloud.py:858 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/openstack/volume/volumes.py:215
+#, python-format
+msgid "Create volume of %s GB"
+msgstr "Création d'un volume de %s Go"
+
+#: nova/api/openstack/compute/contrib/volumes.py:329
 #, python-format
-msgid "Illegal enabled status: %s"
+msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: ../nova/virt/libvirt/firewall.py:38
+#: nova/api/ec2/cloud.py:897 nova/api/openstack/compute/contrib/volumes.py:366
+#, python-format
+msgid "Detach volume %s"
+msgstr "Dé-montage du volume %s"
+
+#: nova/virt/libvirt/firewall.py:42
 msgid ""
 "Libvirt module could not be loaded. NWFilterFirewall will not work correctly."
 msgstr ""
 
-#: ../nova/virt/libvirt/firewall.py:309
+#: nova/virt/libvirt/firewall.py:140
+msgid "Called setup_basic_filtering in nwfilter"
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:148
+msgid "Ensuring static filters"
+msgstr ""
+
+#: nova/virt/libvirt/firewall.py:262
 #, python-format
-msgid ""
-"The nwfilter(%(instance_filter_name)s) for %(instance_name)s is not found."
+msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: ../nova/virt/libvirt/firewall.py:319
+#: nova/virt/libvirt/firewall.py:274
 #, python-format
-msgid ""
-"The nwfilter(%(instance_secgroup_filter_name)s) for %(instance_name)s is not "
-"found."
+msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 msgstr ""
 
-#: ../nova/virt/libvirt/firewall.py:500
+#: nova/virt/libvirt/firewall.py:457
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: ../nova/virt/libvirt/firewall.py:524
+#: nova/virt/libvirt/firewall.py:473
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: ../nova/virt/libvirt/firewall.py:540
-#, python-format
-msgid "Attempted to unfilter instance %s which is not filtered"
+#: nova/virt/libvirt/firewall.py:492
+msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
-"Tentative de suppression de filtre pour l'intance %s qui n'est pas filtrée"
 
-#: ../nova/virt/libvirt/firewall.py:650
+#: nova/api/openstack/compute/contrib/floating_ips.py:159
 #, python-format
-msgid "Adding security group rule: %r"
+msgid "No more floating ips in pool %s."
 msgstr ""
 
-#: ../nova/virt/libvirt/firewall.py:772
-#, python-format
-msgid "Adding provider rule: %s"
+#: nova/api/openstack/compute/contrib/floating_ips.py:161
+msgid "No more floating ips available."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:201
+#: nova/api/openstack/compute/contrib/floating_ips.py:230
+#: nova/api/openstack/compute/contrib/security_groups.py:559
+#: nova/api/openstack/compute/contrib/security_groups.py:592
+msgid "Missing parameter dict"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:204
+#: nova/api/openstack/compute/contrib/floating_ips.py:233
+msgid "Address not specified"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:213
+msgid "No fixed ips associated to instance"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/floating_ips.py:216
+msgid "Associate floating ip failed"
 msgstr ""
 
-#: ../nova/api/metadata/handler.py:250 ../nova/api/metadata/handler.py:257
+#: nova/api/metadata/handler.py:251 nova/api/metadata/handler.py:258
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
 
-#: ../nova/api/metadata/handler.py:252 ../nova/api/ec2/__init__.py:414
+#: nova/api/ec2/__init__.py:638 nova/api/metadata/handler.py:253
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 "Une erreur inopinée à eu lieu. Merci d'essayer votre requête à nouveau."
 
-#: ../nova/console/manager.py:71 ../nova/console/vmrc_manager.py:64
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:58
+#, python-format
+msgid "_create: %s"
+msgstr ""
+
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:67
+#: nova/tests/api/openstack/compute/contrib/test_vsa.py:70
+#, python-format
+msgid "_delete: %s"
+msgstr ""
+
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:76
+#: nova/tests/api/openstack/compute/contrib/test_vsa.py:79
+#, python-format
+msgid "_get: %s"
+msgstr ""
+
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:86
+#: nova/tests/api/openstack/compute/contrib/test_vsa.py:89
+#, python-format
+msgid "_get_all: %s"
+msgstr ""
+
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:131
+#, python-format
+msgid "test_snapshot_create: param=%s"
+msgstr ""
+
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:140
+#, python-format
+msgid "test_snapshot_create: resp_dict=%s"
+msgstr ""
+
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:162
+#, python-format
+msgid "test_snapshot_create_force: param=%s"
+msgstr ""
+
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:171
+#, python-format
+msgid "test_snapshot_create_force: resp_dict=%s"
+msgstr ""
+
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:211
+#, python-format
+msgid "test_snapshot_show: resp=%s"
+msgstr ""
+
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:237
+#, python-format
+msgid "test_snapshot_detail: resp_dict=%s"
+msgstr ""
+
+#: nova/console/manager.py:77 nova/console/vmrc_manager.py:70
 msgid "Adding console"
 msgstr "Ajout de console"
 
-#: ../nova/console/manager.py:91
+#: nova/console/manager.py:97
 #, python-format
 msgid "Tried to remove non-existant console %(console_id)s."
 msgstr "Tentative de suppression d'une console non existante %(console_id)s."
 
-#: ../nova/api/openstack/v2/contrib/flavorextraspecs.py:41
-#: ../nova/api/openstack/v2/contrib/volumetypes.py:136
-msgid "No Request Body"
+#: nova/api/openstack/compute/ips.py:74
+msgid "Instance does not exist"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/flavorextraspecs.py:65
-#: ../nova/api/openstack/v2/image_metadata.py:78
-#: ../nova/api/openstack/v2/contrib/volumetypes.py:160
-#: ../nova/api/openstack/v2/server_metadata.py:77
-msgid "Request body and URI mismatch"
+#: nova/api/openstack/compute/ips.py:97
+msgid "Instance is not a member of specified network"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/flavorextraspecs.py:68
-#: ../nova/api/openstack/v2/image_metadata.py:81
-#: ../nova/api/openstack/v2/contrib/volumetypes.py:163
-#: ../nova/api/openstack/v2/server_metadata.py:81
-msgid "Request body contains too many items"
+#: nova/api/openstack/compute/extensions.py:29
+#: nova/api/openstack/volume/extensions.py:29
+msgid "Initializing extension manager."
 msgstr ""
 
-#: ../nova/tests/scheduler/test_vsa_scheduler.py:127
-#, python-format
-msgid "Host %s"
+#: nova/virt/disk/api.py:150
+msgid "no capable image handler configured"
 msgstr ""
 
-#: ../nova/tests/scheduler/test_vsa_scheduler.py:174
+#: nova/virt/disk/api.py:163
 #, python-format
-msgid "Test: provision vol %(name)s on host %(host)s"
+msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: ../nova/tests/scheduler/test_vsa_scheduler.py:176
-#, python-format
-msgid "\t vol=%(vol)s"
+#: nova/virt/disk/api.py:174
+msgid "image already mounted"
 msgstr ""
 
-#: ../nova/tests/scheduler/test_vsa_scheduler.py:179
+#: nova/virt/disk/api.py:274
 #, python-format
-msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
+msgid "Failed to remove container: %s"
 msgstr ""
 
-#: ../nova/tests/scheduler/test_vsa_scheduler.py:183
+#: nova/scheduler/host_manager.py:265
 #, python-format
-msgid "Test: Volume create: %s"
+msgid "Received %(service_name)s service update from %(host)s."
 msgstr ""
 
-#: ../nova/tests/scheduler/test_vsa_scheduler.py:190
+#: nova/scheduler/host_manager.py:306
+msgid "host_manager only implemented for 'compute'"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:316
 #, python-format
-msgid "Test: Volume get request: id=%(volume_id)s"
+msgid "No service for compute ID %s"
 msgstr ""
 
-#: ../nova/tests/scheduler/test_vsa_scheduler.py:197
+#: nova/tests/scheduler/test_vsa_scheduler.py:147
 #, python-format
-msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
+msgid "Host %s"
 msgstr ""
 
-#: ../nova/tests/scheduler/test_vsa_scheduler.py:462
+#: nova/tests/scheduler/test_vsa_scheduler.py:194
 #, python-format
-msgid "Test: Volume get: id=%(volume_id)s"
+msgid "Test: provision vol %(name)s on host %(host)s"
 msgstr ""
 
-#: ../nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:37
-msgid "progress column not added to instances table"
+#: nova/tests/scheduler/test_vsa_scheduler.py:196
+#, python-format
+msgid "\t vol=%(vol)s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/image_metadata.py:41
-#: ../nova/api/openstack/v2/images.py:89
-#: ../nova/api/openstack/v2/images.py:104
-msgid "Image not found."
+#: nova/tests/scheduler/test_vsa_scheduler.py:199
+#, python-format
+msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/image_metadata.py:74
-msgid "Incorrect request body format"
+#: nova/tests/scheduler/test_vsa_scheduler.py:203
+#, python-format
+msgid "Test: Volume create: %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/image_metadata.py:103
-msgid "Invalid metadata key"
+#: nova/tests/scheduler/test_vsa_scheduler.py:210
+#, python-format
+msgid "Test: Volume get request: id=%(volume_id)s"
 msgstr ""
 
-#: ../nova/notifier/list_notifier.py:61
+#: nova/tests/scheduler/test_vsa_scheduler.py:217
 #, python-format
-msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
+msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/error_util.py:94
+#: nova/tests/scheduler/test_vsa_scheduler.py:453
 #, python-format
-msgid "Error(s) %s "
+msgid "Test: Volume get: id=%(volume_id)s"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:38
+msgid "progress column not added to instances table"
 msgstr ""
 
-#: ../nova/virt/fake.py:271 ../nova/virt/xenapi_conn.py:400
-#: ../nova/virt/libvirt/connection.py:1539
+#: nova/consoleauth/manager.py:63
 #, python-format
-msgid "Compute_service record created for %s "
+msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: ../nova/virt/fake.py:275 ../nova/virt/xenapi_conn.py:404
-#: ../nova/virt/libvirt/connection.py:1543
+#: nova/consoleauth/manager.py:75
 #, python-format
-msgid "Compute_service record updated for %s "
+msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: ../nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:41
-#: ../nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:59
-#: ../nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:59
-msgid "foreign key constraint couldn't be added"
+#: nova/consoleauth/manager.py:79
+#, python-format
+msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: ../nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:55
-msgid "foreign key constraint couldn't be dropped"
+#: nova/network/minidns.py:65
+msgid "This driver only supports type 'a'"
 msgstr ""
 
-#: ../nova/notifier/api.py:109
+#: nova/notifier/api.py:115
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: ../nova/notifier/api.py:124
+#: nova/notifier/api.py:132
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: ../nova/network/manager.py:217
+#: nova/network/manager.py:274 nova/network/manager.py:466
+#, python-format
+msgid "Interface %(interface)s not found"
+msgstr ""
+
+#: nova/network/manager.py:289
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: ../nova/network/manager.py:251
+#: nova/network/manager.py:324
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: ../nova/network/manager.py:278
+#: nova/network/manager.py:356
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: ../nova/network/manager.py:282
+#: nova/network/manager.py:360
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: ../nova/network/manager.py:293
+#: nova/network/manager.py:372
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: ../nova/network/manager.py:296
-msgid "Address quota exceeded. You cannot allocate any more addresses"
-msgstr "Quota d'adresse dépassé. Vous ne pouvez pas allouer d'autre adresse"
+#: nova/network/manager.py:584
+#, python-format
+msgid ""
+"Database inconsistency: DNS domain |%s| is registered in the Nova db but not "
+"visible to either the floating or instance DNS driver. It will be ignored."
+msgstr ""
+
+#: nova/network/manager.py:630
+#, python-format
+msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
+msgstr ""
+
+#: nova/network/manager.py:640
+#, python-format
+msgid ""
+"Domain |%(domain)s| already exists, changing project to |%(project)s|."
+msgstr ""
 
-#: ../nova/network/manager.py:521
+#: nova/network/manager.py:748
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: ../nova/network/manager.py:525
+#: nova/network/manager.py:752
 msgid "setting network host"
 msgstr "réglage de l'hôte réseau"
 
-#: ../nova/network/manager.py:630 ../nova/network/quantum/manager.py:220
+#: nova/network/manager.py:864
 #, python-format
-msgid "network allocations for instance %s"
+msgid "network allocations for instance |%s|"
+msgstr ""
+
+#: nova/network/manager.py:869
+#, python-format
+msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: ../nova/network/manager.py:653
+#: nova/network/manager.py:893
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: ../nova/network/manager.py:676
+#: nova/network/manager.py:1112
 #, python-format
-msgid "No fixed IPs for instance %s"
+msgid ""
+"instance-dns-zone is |%(domain)s|, which is in availability zone |%(zone)s|. "
+"Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record will be "
+"created."
 msgstr ""
 
-#: ../nova/network/manager.py:857
+#: nova/network/manager.py:1187
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: ../nova/network/manager.py:861
+#: nova/network/manager.py:1191
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: ../nova/network/manager.py:869
+#: nova/network/manager.py:1199
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: ../nova/network/manager.py:874
+#: nova/network/manager.py:1204
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: ../nova/network/manager.py:878
+#: nova/network/manager.py:1208
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: ../nova/network/manager.py:881
+#: nova/network/manager.py:1211
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "IP %s libérée qui n'était pas allouée"
 
-#: ../nova/network/manager.py:941
+#: nova/network/manager.py:1279
 msgid "cidr already in use"
 msgstr ""
 
-#: ../nova/network/manager.py:944
+#: nova/network/manager.py:1282
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: ../nova/network/manager.py:955
+#: nova/network/manager.py:1293
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr (%(smaller)s)"
 msgstr ""
 
-#: ../nova/network/manager.py:1012
+#: nova/network/manager.py:1352
 msgid "Network already exists!"
 msgstr ""
 
-#: ../nova/network/manager.py:1030
+#: nova/network/manager.py:1371
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: ../nova/network/manager.py:1289
+#: nova/network/manager.py:1682
 msgid ""
 "The sum between the number of networks and the vlan start cannot be greater "
 "than 4094"
 msgstr ""
 "La somme du nombre de réseau et le début de vlan ne peut excéder 4094"
 
-#: ../nova/network/manager.py:1296
+#: nova/network/manager.py:1689
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size is "
 "%(network_size)s"
 msgstr ""
 
-#: ../nova/virt/xenapi/volume_utils.py:52
+#: nova/network/ldapdns.py:321
+msgid "This driver only supports type 'a' entries."
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:52
 msgid "creating sr within volume_utils"
 msgstr ""
 
-#: ../nova/virt/xenapi/volume_utils.py:55
-#: ../nova/virt/xenapi/volume_utils.py:83
+#: nova/virt/xenapi/volume_utils.py:55 nova/virt/xenapi/volume_utils.py:83
 #, python-format
 msgid "type is = %s"
 msgstr ""
 
-#: ../nova/virt/xenapi/volume_utils.py:58
-#: ../nova/virt/xenapi/volume_utils.py:86
+#: nova/virt/xenapi/volume_utils.py:58 nova/virt/xenapi/volume_utils.py:86
 #, python-format
 msgid "name = %s"
 msgstr ""
 
-#: ../nova/virt/xenapi/volume_utils.py:71
+#: nova/virt/xenapi/volume_utils.py:71
 #, python-format
 msgid "Created %(label)s as %(sr_ref)s."
 msgstr ""
 
-#: ../nova/virt/xenapi/volume_utils.py:76
-#: ../nova/virt/xenapi/volume_utils.py:174
+#: nova/virt/xenapi/volume_utils.py:76 nova/virt/xenapi/volume_utils.py:174
 msgid "Unable to create Storage Repository"
 msgstr "Impossible de créer le dépot de stockage"
 
-#: ../nova/virt/xenapi/volume_utils.py:80
+#: nova/virt/xenapi/volume_utils.py:80
 msgid "introducing sr within volume_utils"
 msgstr ""
 
-#: ../nova/virt/xenapi/volume_utils.py:103
-#: ../nova/virt/xenapi/volume_utils.py:170
-#: ../nova/virt/xenapi/volumeops.py:157
+#: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
+#: nova/virt/xenapi/volumeops.py:157
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr "%(label)s introduit comme %(sr_ref)s."
 
-#. Create pbd
-#: ../nova/virt/xenapi/volume_utils.py:106
+#: nova/virt/xenapi/volume_utils.py:106
 msgid "Creating pbd for SR"
 msgstr ""
 
-#: ../nova/virt/xenapi/volume_utils.py:108
+#: nova/virt/xenapi/volume_utils.py:108
 msgid "Plugging SR"
 msgstr ""
 
-#: ../nova/virt/xenapi/volume_utils.py:116
-#: ../nova/virt/xenapi/volumeops.py:160
+#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: ../nova/virt/xenapi/volume_utils.py:127 ../nova/virt/xenapi/volumeops.py:51
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:51
 msgid "Unable to get SR using uuid"
 msgstr ""
 
-#: ../nova/virt/xenapi/volume_utils.py:129
+#: nova/virt/xenapi/volume_utils.py:129
 #, python-format
 msgid "Forgetting SR %s..."
 msgstr ""
 
-#: ../nova/virt/xenapi/volume_utils.py:137
+#: nova/virt/xenapi/volume_utils.py:137
 msgid "Unable to forget Storage Repository"
 msgstr ""
 
-#: ../nova/virt/xenapi/volume_utils.py:157
+#: nova/virt/xenapi/volume_utils.py:157
 #, python-format
 msgid "Introducing %s..."
 msgstr "Introduction de %s"
 
-#: ../nova/virt/xenapi/volume_utils.py:186
+#: nova/virt/xenapi/volume_utils.py:186
 #, python-format
 msgid "Unable to find SR from VBD %s"
 msgstr "Impossible de trouver SR du VDB %s"
 
-#: ../nova/virt/xenapi/volume_utils.py:206
+#: nova/virt/xenapi/volume_utils.py:206
 #, python-format
 msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Création de VBD pour VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 
-#: ../nova/virt/xenapi/volume_utils.py:209
+#: nova/virt/xenapi/volume_utils.py:209
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "VBD créé %(vbd_ref)s pour VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: ../nova/virt/xenapi/volume_utils.py:228
+#: nova/virt/xenapi/volume_utils.py:228
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
 msgstr ""
 "Exception %(exc)s ignorée pendant l'obtention de PBDs pour %(sr_ref)s"
 
-#: ../nova/virt/xenapi/volume_utils.py:234
+#: nova/virt/xenapi/volume_utils.py:234
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
 msgstr "Exception %(exc)s ignorée pendant la deconnexion du PBD %(pbd)s"
 
-#: ../nova/virt/xenapi/volume_utils.py:249
+#: nova/virt/xenapi/volume_utils.py:249
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
 msgstr "Impossible d'introduire VDI sur SR %s"
 
-#: ../nova/virt/xenapi/volume_utils.py:257
+#: nova/virt/xenapi/volume_utils.py:257
 #, python-format
 msgid "Unable to get record of VDI %s on"
 msgstr "Impossible de récuppérer l'enregistrement du VDI %s sur"
 
-#: ../nova/virt/xenapi/volume_utils.py:279
+#: nova/virt/xenapi/volume_utils.py:279
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
 msgstr "Impossible d'introduire le VDI pour SR %s"
 
-#: ../nova/virt/xenapi/volume_utils.py:289
+#: nova/virt/xenapi/volume_utils.py:289
 #, python-format
 msgid "Error finding vdis in SR %s"
 msgstr ""
 
-#: ../nova/virt/xenapi/volume_utils.py:296
+#: nova/virt/xenapi/volume_utils.py:296
 #, python-format
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: ../nova/virt/xenapi/volume_utils.py:330
+#: nova/virt/xenapi/volume_utils.py:330
 #, python-format
 msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
 msgstr ""
 
-#: ../nova/virt/xenapi/volume_utils.py:356
+#: nova/virt/xenapi/volume_utils.py:356
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr "Le point de montage ne peut pas être traduit : %s"
 
-#: ../nova/rpc/impl_kombu.py:346
+#: nova/rpc/impl_kombu.py:357
 #, python-format
-msgid ""
-"Unable to connect to AMQP server after %(max_retries)d tries: %(err_str)s"
+msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: ../nova/rpc/impl_kombu.py:349
+#: nova/rpc/impl_kombu.py:380
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: ../nova/rpc/impl_kombu.py:358
-msgid "Re-established AMQP queues"
-msgstr ""
-
-#: ../nova/rpc/impl_kombu.py:369
+#: nova/rpc/impl_kombu.py:416
 #, python-format
 msgid ""
-"AMQP server on %(hostname)s:%(port)d is unreachable: %(e)s. Trying again in "
-"%(intv)d seconds."
+"Unable to connect to AMQP server on %(hostname)s:%(port)d after "
+"%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: ../nova/rpc/impl_kombu.py:413
+#: nova/rpc/impl_kombu.py:432
 #, python-format
-msgid "Failed to consume message from queue: %s"
+msgid ""
+"AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
+"again in %(sleep_time)d seconds."
 msgstr ""
 
-#: ../nova/rpc/impl_kombu.py:436
+#: nova/rpc/impl_kombu.py:483 nova/rpc/impl_qpid.py:379
 #, python-format
-msgid "Failed to publish message %s"
+msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: ../nova/rpc/impl_kombu.py:600 ../nova/rpc/impl_carrot.py:255
+#: nova/rpc/impl_kombu.py:501 nova/rpc/impl_qpid.py:394
 #, python-format
-msgid "received %s"
-msgstr "%s reçu"
+msgid "Timed out waiting for RPC response: %s"
+msgstr ""
 
-#. NOTE(vish): we may not want to ack here, but that means that bad
-#. messages stay in the queue indefinitely, so for now
-#. we just log the message and send an error string
-#. back to the caller
-#: ../nova/rpc/impl_kombu.py:605 ../nova/rpc/impl_carrot.py:268
+#: nova/rpc/impl_kombu.py:505 nova/rpc/impl_qpid.py:398
 #, python-format
-msgid "no method for message: %s"
-msgstr "Pas de méthode pour le message : %s"
+msgid "Failed to consume message from queue: %s"
+msgstr ""
 
-#: ../nova/rpc/impl_kombu.py:606 ../nova/rpc/impl_carrot.py:270
+#: nova/rpc/impl_kombu.py:539 nova/rpc/impl_qpid.py:425
 #, python-format
-msgid "No method for message: %s"
-msgstr "Pas de méthode pour le message : %s"
+msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
+msgstr ""
 
-#: ../nova/rpc/impl_kombu.py:646 ../nova/rpc/impl_carrot.py:486
+#: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103
 #, python-format
-msgid "unpacked context: %s"
-msgstr "Contexte décompacté : %s"
+msgid "Error in handshake: %s"
+msgstr ""
 
-#. Can't use 'with' for multicall, as it returns an iterator
-#. that will continue to use the connection.  When it's done,
-#. connection.close() will get called which will put it back into
-#. the pool
-#: ../nova/rpc/impl_kombu.py:730 ../nova/rpc/impl_carrot.py:519
+#: nova/vnc/xvp_proxy.py:119
 #, python-format
-msgid "Making asynchronous call on %s ..."
+msgid "Invalid request: %s"
 msgstr ""
 
-#: ../nova/rpc/impl_kombu.py:733 ../nova/rpc/impl_carrot.py:522
+#: nova/vnc/xvp_proxy.py:139
 #, python-format
-msgid "MSG_ID is %s"
-msgstr "MSG_ID est %s"
+msgid "Request: %s"
+msgstr ""
 
-#: ../nova/rpc/impl_kombu.py:755 ../nova/rpc/impl_carrot.py:601
+#: nova/vnc/xvp_proxy.py:142
 #, python-format
-msgid "Making asynchronous cast on %s..."
+msgid "Request made with missing token: %s"
 msgstr ""
 
-#: ../nova/rpc/impl_kombu.py:763 ../nova/rpc/impl_carrot.py:611
-msgid "Making asynchronous fanout cast..."
+#: nova/vnc/xvp_proxy.py:153
+#, python-format
+msgid "Request made with invalid token: %s"
 msgstr ""
 
-#: ../nova/rpc/impl_kombu.py:779 ../nova/rpc/impl_carrot.py:453
+#: nova/vnc/xvp_proxy.py:160
 #, python-format
-msgid "Returning exception %s to caller"
-msgstr "Renvoi de l'exception %s à l'appelant"
-
-#: ../nova/api/openstack/v2/ips.py:47
-msgid "Instance does not exist"
+msgid "Unexpected error: %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/ips.py:69
-msgid "Instance is not a member of specified network"
+#: nova/vnc/xvp_proxy.py:180
+#, python-format
+msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/fake.py:132
+#: nova/virt/vmwareapi/fake.py:131
 #, python-format
-msgid "Property %(attr)s not set for the managed "
+msgid "Property %(attr)s not set for the managed object %(objName)s"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/fake.py:438
+#: nova/virt/vmwareapi/fake.py:437
 msgid "There is no VM registered"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/fake.py:440 ../nova/virt/vmwareapi/fake.py:612
+#: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609
 #, python-format
-msgid "Virtual Machine with ref %s is not "
+msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/fake.py:503
-msgid "Logging out a session that is invalid or already logged "
+#: nova/virt/vmwareapi/fake.py:502
+#, python-format
+msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/fake.py:518
+#: nova/virt/vmwareapi/fake.py:517
 msgid "Session is faulty"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/fake.py:521
+#: nova/virt/vmwareapi/fake.py:520
 msgid "Session Invalid"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/fake.py:609
-msgid " No Virtual Machine has been "
+#: nova/virt/vmwareapi/fake.py:606
+msgid " No Virtual Machine has been registered yet"
 msgstr ""
 
-#: ../nova/service.py:141
+#: nova/service.py:159
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr "Démarrage du noeud %(topic)s (version %(vcs_string)s)"
 
-#: ../nova/service.py:232
-msgid "Service killed that has no database entry"
-msgstr "Service détruit sans entrée dans la base de données"
+#: nova/service.py:176
+#, python-format
+msgid "Creating Consumer connection for Service %s"
+msgstr ""
+
+#: nova/service.py:250
+msgid "Service killed that has no database entry"
+msgstr "Service détruit sans entrée dans la base de données"
 
-#: ../nova/service.py:269
+#: nova/service.py:287
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 "L'objet du service de base de données à disparru, re-création en cours."
 
-#: ../nova/service.py:284
+#: nova/service.py:302
 msgid "Recovered model server connection!"
 msgstr "Récupération du modelle de connexion serveur terminée!"
 
-#: ../nova/service.py:290
+#: nova/service.py:308
 msgid "model server went away"
 msgstr "Le modèle de serveur à disparu"
 
-#: ../nova/service.py:388
+#: nova/service.py:400
 msgid "Full set of FLAGS:"
 msgstr "Ensemble de propriétés complet :"
 
-#: ../nova/api/ec2/admin.py:145
-#, python-format
-msgid "Creating new user: %s"
-msgstr "Création d'un nouvel utilisateur : %s"
-
-#: ../nova/api/ec2/admin.py:153
-#, python-format
-msgid "Deleting user: %s"
-msgstr "Suppression de l'utilisateur : %s"
-
-#: ../nova/api/ec2/admin.py:175
+#: nova/service.py:407
 #, python-format
-msgid "Adding role %(role)s to user %(user)s for project %(project)s"
+msgid "%(flag)s : FLAG SET "
 msgstr ""
-"Ajout du rôle %(role)s à l'utilisateur %(user)s pour le projet %(project)s"
 
-#: ../nova/api/ec2/admin.py:179
+#: nova/virt/disk/loop.py:30
 #, python-format
-msgid "Adding sitewide role %(role)s to user %(user)s"
-msgstr "Ajout du rôle global %(role)s à l'utilisateur %(user)s"
+msgid "Could not attach image to loopback: %s"
+msgstr "Impossible de lier l'image au loopback : %s"
 
-#: ../nova/api/ec2/admin.py:185
+#: nova/rpc/common.py:54
 #, python-format
-msgid "Removing role %(role)s from user %(user)s for project %(project)s"
+msgid ""
+"Remote error: %(exc_type)s %(value)s\n"
+"%(traceback)s."
 msgstr ""
-"Suppresion du rôle %(role)s de l'utilisateur %(user)s pour le projet "
-"%(project)s"
-
-#: ../nova/api/ec2/admin.py:189
-#, python-format
-msgid "Removing sitewide role %(role)s from user %(user)s"
-msgstr "Suppression du rôle global %(role)s pour l'utilisateur %(user)s"
 
-#: ../nova/api/ec2/admin.py:194 ../nova/api/ec2/admin.py:271
-msgid "operation must be add or remove"
-msgstr "L'opération doit être ajout ou suppression"
+#: nova/rpc/common.py:71
+msgid "Timeout while waiting on RPC response."
+msgstr ""
 
-#: ../nova/api/ec2/admin.py:207
+#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:82
+#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:53
+#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:58
 #, python-format
-msgid "Getting x509 for user: %(name)s on project: %(project)s"
+msgid "Table |%s| not created!"
 msgstr ""
-"Récupération de x509 pour l'utilisateur : %(name)s sur le projet : "
-"%(project)s"
 
-#: ../nova/api/ec2/admin.py:225
-#, python-format
-msgid "Create project %(name)s managed by %(manager_user)s"
-msgstr "Création du projet %(name)s géré par %(manager_user)s"
+#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:66
+msgid "dns_domains table not dropped"
+msgstr ""
 
-#: ../nova/api/ec2/admin.py:238
-#, python-format
-msgid "Modify project: %(name)s managed by %(manager_user)s"
-msgstr "Modification du projet: %(name)s géré par %(manager_user)s"
+#: nova/scheduler/chance.py:47 nova/scheduler/simple.py:91
+#: nova/scheduler/simple.py:142
+msgid "Is the appropriate service running?"
+msgstr ""
 
-#: ../nova/api/ec2/admin.py:248
-#, python-format
-msgid "Delete project: %s"
-msgstr "Supprimer le projet : %s"
+#: nova/scheduler/chance.py:52
+msgid "Could not find another compute"
+msgstr ""
 
-#: ../nova/api/ec2/admin.py:262
-#, python-format
-msgid "Adding user %(user)s to project %(project)s"
-msgstr "Ajout de l'utilisateur %(user)s au projet %(project)s"
+#: nova/db/sqlalchemy/migration.py:36
+msgid "python-migrate is not installed. Exiting."
+msgstr "python-migrate n'est pas installé. Fin d'éxécution."
 
-#: ../nova/api/ec2/admin.py:266
-#, python-format
-msgid "Removing user %(user)s from project %(project)s"
-msgstr "Suppression de l'utilisateur %(user)s du projet %(project)s"
+#: nova/db/sqlalchemy/migration.py:46
+msgid "version should be an integer"
+msgstr ""
 
-#: ../nova/api/ec2/admin.py:348
+#: nova/api/openstack/compute/contrib/server_start_stop.py:45
 #, python-format
-msgid "Blocking traffic to all projects incoming from %s"
+msgid "start instance %r"
 msgstr ""
 
-#: ../nova/api/ec2/admin.py:372
-msgid "Duplicate rule"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:54
+#, python-format
+msgid "stop instance %r"
 msgstr ""
 
-#: ../nova/api/ec2/admin.py:385
+#: nova/scheduler/manager.py:85
 #, python-format
-msgid "Removing ip block from %s"
+msgid ""
+"Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/floating_ips.py:88
-msgid "No more floating ips available."
+#: nova/scheduler/manager.py:101
+#, python-format
+msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/floating_ips.py:164
-#: ../nova/api/openstack/v2/contrib/floating_ips.py:188
-#: ../nova/api/openstack/v2/contrib/security_groups.py:457
-#: ../nova/api/openstack/v2/contrib/security_groups.py:486
-msgid "Missing parameter dict"
+#: nova/scheduler/manager.py:116
+#, python-format
+msgid "Setting instance %(instance_uuid)s to ERROR state."
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/floating_ips.py:167
-#: ../nova/api/openstack/v2/contrib/floating_ips.py:191
-msgid "Address not specified"
-msgstr ""
+#: nova/compute/manager.py:136
+#, python-format
+msgid "check_instance_lock: decorating: |%s|"
+msgstr "check_instance_lock: décoration : |%s|"
 
-#: ../nova/rpc/common.py:22
+#: nova/compute/manager.py:138
 #, python-format
 msgid ""
-"Remote error: %(exc_type)s %(value)s\n"
-"%(traceback)s."
-msgstr ""
-
-#: ../nova/scheduler/chance.py:50 ../nova/scheduler/simple.py:71
-#: ../nova/scheduler/simple.py:125 ../nova/scheduler/simple.py:142
-msgid "Is the appropriate service running?"
+"check_instance_lock: arguments: |%(self)s| |%(context)s| |%(instance_uuid)s|"
 msgstr ""
 
-#: ../nova/scheduler/chance.py:55
-msgid "Could not find another compute"
-msgstr ""
+#: nova/compute/manager.py:142
+#, python-format
+msgid "check_instance_lock: locked: |%s|"
+msgstr "check_instance_lock: vérouillé : |%s|"
 
-#: ../nova/auth/manager.py:277
+#: nova/compute/manager.py:144
 #, python-format
-msgid "Looking up user: %r"
-msgstr "Recherche de l'utilisateur : %r"
+msgid "check_instance_lock: admin: |%s|"
+msgstr "check_instance_lock: admin : |%s|"
 
-#: ../nova/auth/manager.py:281
+#: nova/compute/manager.py:149
 #, python-format
-msgid "Failed authorization for access key %s"
-msgstr "Autorisation refusée pour la clef d'accès %s"
+msgid "check_instance_lock: executing: |%s|"
+msgstr "check_instance_lock: exécution : |%s|"
 
-#: ../nova/auth/manager.py:287
+#: nova/compute/manager.py:153
 #, python-format
-msgid "Using project name = user name (%s)"
-msgstr "Nom de projet utilisé = nom d'utilisateur (%s)"
+msgid "check_instance_lock: not executing |%s|"
+msgstr "check_instance_lock: ne s'éxécute pas |%s|"
 
-#: ../nova/auth/manager.py:294
+#: nova/compute/manager.py:199
 #, python-format
-msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
+msgid "Unable to load the virtualization driver: %s"
 msgstr ""
-"Autorisation refusée : pas de projet nommé %(pjid)s (utilisateur=%(uname)s)"
 
-#: ../nova/auth/manager.py:303
+#: ../nova/compute/manager.py:231
 #, python-format
 msgid ""
-"Failed authorization: user %(uname)s not admin and not member of project "
-"%(pjname)s"
+"Current state of %(instance_uuid)s is %(drv_state)s, state in DB is "
+"%(db_state)s."
 msgstr ""
-"Autorisation refusée : utilisateur %(uname)s n'est ni admin ni membre du "
-"projet %(pjname)s"
 
-#: ../nova/auth/manager.py:310 ../nova/auth/manager.py:322
+#: ../nova/compute/manager.py:236
 #, python-format
-msgid "user.secret: %s"
+msgid "Rebooting instance %(instance_uuid)s after nova-compute restart."
 msgstr ""
 
-#: ../nova/auth/manager.py:311 ../nova/auth/manager.py:323
-#, python-format
-msgid "expected_signature: %s"
+#: nova/compute/manager.py:248
+msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: ../nova/auth/manager.py:312 ../nova/auth/manager.py:324
+#: ../nova/compute/manager.py:251
 #, python-format
-msgid "signature: %s"
-msgstr ""
+msgid "Checking state of %s"
+msgstr "Vérification de l'état de %s"
 
-#: ../nova/auth/manager.py:314 ../nova/auth/manager.py:336
+#: ../nova/compute/manager.py:320
 #, python-format
-msgid "Invalid signature for user %s"
-msgstr "Signature non valide pour l'utilisateur %s"
+msgid "setting up bdm %s"
+msgstr ""
 
-#: ../nova/auth/manager.py:332
+#: nova/compute/manager.py:389
 #, python-format
-msgid "host_only_signature: %s"
+msgid ""
+"Going to force the deletion of the vm %(instance_uuid)s, even if it is "
+"deleted"
 msgstr ""
 
-#: ../nova/auth/manager.py:428
-msgid "Must specify project"
-msgstr "Le projet doit être spécifié"
-
-#: ../nova/auth/manager.py:469
+#: nova/compute/manager.py:395
 #, python-format
-msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
+msgid ""
+"Instance %(instance_uuid)s did not exist in the DB, but I will shut it down "
+"anyway using a special context"
 msgstr ""
-"Ajout du rôle %(role)s à l'utilisateur %(uid)s pour le projet %(pid)s"
 
-#: ../nova/auth/manager.py:472
+#: nova/compute/manager.py:401
 #, python-format
-msgid "Adding sitewide role %(role)s to user %(uid)s"
-msgstr "Ajout du rôle global %(role)s pour l'utilisateur %(uid)s"
+msgid "exception terminating the instance %(instance_uuid)s"
+msgstr ""
 
-#: ../nova/auth/manager.py:498
+#: nova/compute/manager.py:434
 #, python-format
-msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
+msgid "Instance %s not found."
 msgstr ""
-"Suppression du rôle %(role)s pour l'utilisateur %(uid)s dans le projet "
-"%(pid)s"
 
-#: ../nova/auth/manager.py:501
-#, python-format
-msgid "Removing sitewide role %(role)s from user %(uid)s"
-msgstr "Suppression du role global %(role)s pour l'utilisateur %(uid)s"
+#: nova/compute/manager.py:446
+msgid "Instance has already been created"
+msgstr "L'instance a déjà été crée"
 
-#: ../nova/auth/manager.py:574
+#: nova/compute/manager.py:489
 #, python-format
-msgid "Created project %(name)s with manager %(manager_user)s"
-msgstr "Création du projet %(name)s ayant pour manager %(manager_user)s"
+msgid ""
+"image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
+"allowed_size_bytes=%(allowed_size_bytes)d"
+msgstr ""
 
-#: ../nova/auth/manager.py:592
+#: nova/compute/manager.py:494
 #, python-format
-msgid "modifying project %s"
-msgstr "modification du projet %s"
+msgid ""
+"Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed size "
+"%(allowed_size_bytes)d"
+msgstr ""
 
-#: ../nova/auth/manager.py:604
+#: ../nova/compute/manager.py:501
 #, python-format
-msgid "Adding user %(uid)s to project %(pid)s"
-msgstr "Ajout de l'utilisateur %(uid)s au projet %(pid)s"
+msgid "instance %s: starting..."
+msgstr "L'instance %s: est en train d'être démarée..."
 
-#: ../nova/auth/manager.py:625
+#: ../nova/compute/manager.py:511
 #, python-format
-msgid "Remove user %(uid)s from project %(pid)s"
-msgstr "Suppression de l'utilisateur %(uid)s du projet %(pid)s"
+msgid "Skipping network allocation for instance %s"
+msgstr ""
 
-#: ../nova/auth/manager.py:655
+#: ../nova/compute/manager.py:524
 #, python-format
-msgid "Deleting project %s"
-msgstr "Suppression du projet %s"
+msgid "Instance %s failed network setup"
+msgstr ""
 
-#: ../nova/auth/manager.py:713
+#: ../nova/compute/manager.py:528
 #, python-format
-msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
-msgstr "Utilisateur créé %(rvname)s (admin: %(rvadmin)r)"
+msgid "instance network_info: |%s|"
+msgstr ""
 
-#: ../nova/auth/manager.py:722
+#: ../nova/compute/manager.py:540
 #, python-format
-msgid "Deleting user %s"
-msgstr "Suppression de l'utilisateur %s"
+msgid "Instance %s failed block device setup"
+msgstr ""
 
-#: ../nova/auth/manager.py:732
+#: ../nova/compute/manager.py:556
 #, python-format
-msgid "Access Key change for user %s"
-msgstr "Clef d'accès changée pour l'utilisateur %s"
+msgid "Instance %s failed to spawn"
+msgstr ""
 
-#: ../nova/auth/manager.py:734
+#: ../nova/compute/manager.py:578
 #, python-format
-msgid "Secret Key change for user %s"
-msgstr "Clef secrète changée pour l'utilisateur %s"
+msgid "deallocating network for instance: %s"
+msgstr ""
 
-#: ../nova/auth/manager.py:736
+#: ../nova/compute/manager.py:629
 #, python-format
-msgid "Admin status set to %(admin)r for user %(uid)s"
-msgstr "Statut admin changé en %(admin)r pour l'utilisateur %(uid)s"
+msgid "%(action_str)s instance %(instance_uuid)s"
+msgstr ""
 
-#: ../nova/auth/manager.py:781
+#: nova/compute/manager.py:644
 #, python-format
-msgid "No vpn data for project %s"
-msgstr "Pas de données VPN pour le projet %s"
+msgid "trying to destroy already destroyed instance: %s"
+msgstr "Tentative de destruction d'une instance déjà détruite: %s"
 
-#: ../nova/virt/xenapi/vmops.py:164
+#: nova/compute/manager.py:664
 #, python-format
-msgid "Attempted to power on non-existent instance bad instance id %s"
+msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:166
+#: nova/compute/manager.py:671
 #, python-format
-msgid "Starting instance %s"
+msgid "terminating bdm %s"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:216
+#: nova/compute/manager.py:760
 #, python-format
-msgid "instance %s: Failed to spawn"
-msgstr "instance %s: n'a pas pu être crée"
+msgid ""
+"Cannot rebuild instance [%(instance_uuid)s], because the given image does "
+"not exist."
+msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:218
+#: nova/compute/manager.py:765
 #, python-format
-msgid "Instance %s failed to spawn - performing clean-up"
+msgid "Cannot rebuild instance [%(instance_uuid)s]: %(exc)s"
 msgstr ""
 
-#. Collect VDI/file resources to clean up;
-#. These resources will be removed by _handle_spawn_error.
-#: ../nova/virt/xenapi/vmops.py:284
+#: nova/compute/manager.py:772
 #, python-format
-msgid "instance %s: Failed to spawn - "
+msgid "Rebuilding instance %s"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:349
+#: nova/compute/manager.py:825
+#, python-format
+msgid "Rebooting instance %s"
+msgstr "Redémarrage de l'instance %s"
+
+#: nova/compute/manager.py:840
 #, python-format
 msgid ""
-"Auto configuring disk for instance %(instance_uuid)s, attempting to resize "
-"partition..."
+"trying to reboot a non-running instance: %(instance_uuid)s (state: %(state)s "
+"expected: %(running)s)"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:388
+#: nova/compute/manager.py:878
 #, python-format
-msgid "Starting VM %s..."
-msgstr "Démarrage de la VM %s..."
+msgid "Image type not recognized %s"
+msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:391
+#: nova/compute/manager.py:890
 #, python-format
-msgid "Spawning VM %(instance_name)s created %(vm_ref)s."
-msgstr "La VM %(instance_name)s a créé %(vm_ref)s."
+msgid "instance %s: snapshotting"
+msgstr "instance %s: création d'un instantané (snapshot)"
 
-#: ../nova/virt/xenapi/vmops.py:398
+#: nova/compute/manager.py:896
 #, python-format
-msgid "Latest agent build for %(hypervisor)s/%(os)s"
+msgid ""
+"trying to snapshot a non-running instance: %(instance_uuid)s (state: "
+"%(state)s expected: %(running)s)"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:401
+#: nova/compute/manager.py:949
 #, python-format
-msgid "No agent build found for %(hypervisor)s/%(os)s"
-msgstr ""
-
-#: ../nova/virt/xenapi/vmops.py:408
-msgid "Querying agent version"
+msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:414
+#: nova/compute/manager.py:954
 #, python-format
-msgid "Instance agent version: %s"
+msgid "Rotating out %d backups"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:419
+#: nova/compute/manager.py:958
 #, python-format
-msgid "Updating Agent to %s"
+msgid "Deleting image %s"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:432
+#: nova/compute/manager.py:988
 #, python-format
-msgid "Invalid value for injected_files: '%s'"
+msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:437
+#: nova/compute/manager.py:994
 #, python-format
-msgid "Injecting file path: '%s'"
-msgstr "Injection du chemin d'accès : '%s'"
-
-#: ../nova/virt/xenapi/vmops.py:443
-msgid "Setting admin password"
+msgid "Instance %s: Root password set"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:447
-msgid "Resetting network"
+#: nova/compute/manager.py:1003
+msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:454
-msgid "Setting VCPU weight"
+#: nova/compute/manager.py:1017
+msgid "Error setting admin password"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:467
-#, python-format
-msgid "Instance %s: booted"
-msgstr "Instance %s : démarée"
-
-#: ../nova/virt/xenapi/vmops.py:477
+#: nova/compute/manager.py:1032
 #, python-format
-msgid "Instance %s: failed to boot"
+msgid ""
+"trying to inject a file into a non-running instance: %(instance_uuid)s "
+"(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:498
+#: nova/compute/manager.py:1037
 #, python-format
-msgid "Resources to remove:%s"
+msgid "instance %(instance_uuid)s: injecting file to %(path)s"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:509
+#: nova/compute/manager.py:1051
 #, python-format
-msgid "Removing VDI %(vdi_ref)s"
+msgid ""
+"trying to update agent on a non-running instance: %(instance_uuid)s (state: "
+"%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#. Vdi has already been deleted
-#: ../nova/virt/xenapi/vmops.py:514
+#: nova/compute/manager.py:1056
 #, python-format
-msgid "Skipping VDI destroy for %s"
-msgstr ""
-
-#: ../nova/virt/xenapi/vmops.py:523
-msgid "Removing kernel/ramdisk files from dom0"
+msgid "instance %(instance_uuid)s: updating agent to %(url)s"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:552
+#: nova/compute/manager.py:1069
 #, python-format
-msgid "No opaque_ref could be determined for '%s'."
-msgstr ""
+msgid "instance %s: rescuing"
+msgstr "instance %s: récupération"
 
-#: ../nova/virt/xenapi/vmops.py:606
+#: nova/compute/manager.py:1094
 #, python-format
-msgid "Finished snapshot and upload for VM %s"
-msgstr "Fin de l'instantané et du chargement de VM %s"
+msgid "instance %s: unrescuing"
+msgstr "instance %s: dé-récupération"
 
-#. TODO(sirp): Add quiesce and VSS locking support when Windows support
-#. is added
-#: ../nova/virt/xenapi/vmops.py:612
-#, python-format
-msgid "Starting snapshot for VM %s"
-msgstr "Début de création d'instantané (snapshot) pour la VM %s"
+#: nova/compute/manager.py:1213
+msgid "destination same as source!"
+msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:621
+#: nova/compute/manager.py:1230
 #, python-format
-msgid "Unable to Snapshot %(vm_ref)s: %(exc)s"
-msgstr "Impossible de faire un instantané de %(vm_ref)s: %(exc)s"
-
-#: ../nova/virt/xenapi/vmops.py:640
-msgid "Failed to transfer vhd to new host"
+msgid "instance %s: migrating"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:660
+#: nova/compute/manager.py:1267 nova/compute/manager.py:1342
+#: nova/compute/manager.py:2290
 #, python-format
-msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
+msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:708
+#: nova/compute/manager.py:1395
 #, python-format
-msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
-msgstr ""
+msgid "instance %s: pausing"
+msgstr "instance %s: mise en pause"
 
-#. Resize up. Simple VDI resize will do the trick
-#: ../nova/virt/xenapi/vmops.py:832
+#: nova/compute/manager.py:1413
 #, python-format
-msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
-msgstr ""
+msgid "instance %s: unpausing"
+msgstr "instance %s: reprise après pause"
 
-#: ../nova/virt/xenapi/vmops.py:840
+#: nova/compute/manager.py:1443
 #, python-format
-msgid "Resize instance %s complete"
-msgstr ""
+msgid "instance %s: retrieving diagnostics"
+msgstr "instance %s: récupération des diagnostiques"
 
-#: ../nova/virt/xenapi/vmops.py:868
+#: nova/compute/manager.py:1452
 #, python-format
-msgid "Failed to query agent version: %(resp)r"
-msgstr ""
+msgid "instance %s: suspending"
+msgstr "instance %s: suspension"
 
-#: ../nova/virt/xenapi/vmops.py:888
+#: nova/compute/manager.py:1474
 #, python-format
-msgid "domid changed from %(olddomid)s to %(newdomid)s"
-msgstr ""
+msgid "instance %s: resuming"
+msgstr "instance %s: reprise après suspension"
 
-#: ../nova/virt/xenapi/vmops.py:904
+#: nova/compute/manager.py:1497
 #, python-format
-msgid "Failed to update agent: %(resp)r"
-msgstr ""
+msgid "instance %s: locking"
+msgstr "instance %s: vérrouillage"
 
-#: ../nova/virt/xenapi/vmops.py:927
+#: nova/compute/manager.py:1506
 #, python-format
-msgid "Failed to exchange keys: %(resp)r"
-msgstr ""
+msgid "instance %s: unlocking"
+msgstr "instance %s: déverrouillage"
 
-#: ../nova/virt/xenapi/vmops.py:942
+#: nova/compute/manager.py:1514
 #, python-format
-msgid "Failed to update password: %(resp)r"
-msgstr ""
+msgid "instance %s: getting locked state"
+msgstr "instance %s: récupération de l'état de vérouillage"
 
-#: ../nova/virt/xenapi/vmops.py:968
+#: nova/compute/manager.py:1524
 #, python-format
-msgid "Failed to inject file: %(resp)r"
-msgstr ""
+msgid "instance %s: reset network"
+msgstr "instance %s: redémarrage du réseau"
 
-#: ../nova/virt/xenapi/vmops.py:977
+#: nova/compute/manager.py:1532
 #, python-format
-msgid "VM %(instance_name)s already halted,skipping shutdown..."
+msgid "instance %s: inject network info"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:982
+#: nova/compute/manager.py:1536
 #, python-format
-msgid "Shutting down VM for Instance %(instance_uuid)s"
+msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:1014
+#: nova/api/ec2/cloud.py:785 nova/compute/manager.py:1548
 #, python-format
-msgid "Destroying VDIs for Instance %(instance_uuid)s"
-msgstr ""
+msgid "Get console output for instance %s"
+msgstr "Récupération de la sortie de la console de l'instance %s"
 
-#. 1. No kernel or ramdisk
-#: ../nova/virt/xenapi/vmops.py:1072
+#: nova/compute/manager.py:1573
 #, python-format
-msgid ""
-"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
-"deletion"
+msgid "instance %s: getting vnc console"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:1079
-msgid "instance has a kernel or ramdisk but not both"
+#: ../nova/compute/manager.py:1596
+#, python-format
+msgid ""
+"instance %(instance_uuid)s: booting with volume %(volume_id)s at "
+"%(mountpoint)s"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:1086
-msgid "kernel/ramdisk files removed"
-msgstr "Fichiers noyau/ramdisk supprimés"
-
-#: ../nova/virt/xenapi/vmops.py:1098
+#: ../nova/compute/manager.py:1615
 #, python-format
-msgid "Instance %(instance_uuid)s VM destroyed"
+msgid ""
+"instance %(instance_uuid)s: attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:1116
+#: ../nova/compute/manager.py:1628
 #, python-format
-msgid "Destroying VM for Instance %(instance_uuid)s"
+msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:1131
-msgid "VM is not present, skipping destroy..."
+#: ../nova/compute/manager.py:1656
+#, python-format
+msgid ""
+"Detach volume %(volume_id)s from mountpoint %(mp)s on instance "
+"%(instance_uuid)s"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:1181
+#: nova/compute/manager.py:1665
 #, python-format
-msgid "Instance is already in Rescue Mode: %s"
-msgstr ""
+msgid "Detaching volume from unknown instance %s"
+msgstr "Démontage de volume d'une instance inconnue %s"
 
-#: ../nova/virt/xenapi/vmops.py:1252
+#: nova/compute/manager.py:1731
 #, python-format
-msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
+msgid ""
+"Creating tmpfile %s to notify to other compute nodes that they should mount "
+"the same storage."
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:1256
+#: ../nova/compute/manager.py:1788
 #, python-format
-msgid "Automatically hard rebooting %d"
+msgid "%s has no volume."
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:1312
+#: nova/compute/manager.py:1821
 #, python-format
 msgid ""
-"Found %(migration_count)d unconfirmed migrations older than "
-"%(confirm_window)d seconds"
+"plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:1316
+#: ../nova/compute/manager.py:1873
 #, python-format
-msgid "Automatically confirming migration %d"
+msgid "Pre live migration for %(instance_uuid)s failed at %(dest)s"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:1339
-msgid "Could not get bandwidth info."
+#: nova/compute/manager.py:1905
+msgid "post_live_migration() is started.."
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:1406
+#: ../nova/compute/manager.py:1931 ../nova/compute/manager.py:1939
 #, python-format
-msgid "The call to %(method)s returned an error: %(e)s."
+msgid "No floating_ip is found for %s."
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:1422
+#: ../nova/compute/manager.py:1941
 #, python-format
-msgid "injecting network info to xs for vm: |%s|"
+msgid ""
+"Live migration: Unexpected error: %(instance_uuid)s cannot inherit floating "
+"ip.\n"
+"%(e)s"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:1440
+#: ../nova/compute/manager.py:1979
 #, python-format
-msgid "creating vif(s) for vm: |%s|"
+msgid "Migrating %(instance_uuid)s to %(dest)s finished successfully."
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:1449
-#, python-format
-msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
-msgstr "Création du VIF pour la VM %(vm_ref)s, réseau %(network_ref)s."
+#: nova/compute/manager.py:1985
+msgid ""
+"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
+"with matching name.\" This error can be safely ignored."
+msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:1452
+#: ../nova/compute/manager.py:1995
 #, python-format
-msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
-msgstr "VIF créé %(vif_ref)s pour la VM %(vm_ref)s, network %(network_ref)s."
+msgid "Post operation of migraton started for %s ."
+msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:1481
-#, python-format
-msgid "injecting hostname to xs for vm: |%s|"
+#: nova/compute/manager.py:2083
+msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:1543
-#, python-format
-msgid ""
-"The agent call to %(method)s returned an invalid response: %(ret)r. VM "
-"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
+#: nova/compute/manager.py:2110
+msgid "Updating host status"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:1568
+#: nova/compute/manager.py:2138
 #, python-format
 msgid ""
-"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
-"args=%(args)r"
+"Found %(num_db_instances)s in the database and %(num_vm_instances)s on the "
+"hypervisor."
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:1572
+#: nova/compute/manager.py:2150
 #, python-format
 msgid ""
-"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM "
-"id=%(instance_uuid)s; args=%(args)r"
+"Instance %(name)s found in database but not known by hypervisor. Setting "
+"power state to NOSTATE"
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:1577
-#, python-format
-msgid ""
-"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s; "
-"args=%(args)r"
+#: nova/compute/manager.py:2174
+msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: ../nova/virt/xenapi/vmops.py:1764
+#: ../nova/compute/manager.py:2181
 #, python-format
-msgid "OpenSSL error: %s"
-msgstr "Erreur OpenSSL : %s"
+msgid "Reclaiming deleted instance %(instance_uuid)s"
+msgstr ""
 
-#: ../nova/compute/manager.py:101
+#: ../nova/compute/manager.py:2255
 #, python-format
-msgid "check_instance_lock: decorating: |%s|"
-msgstr "check_instance_lock: décoration : |%s|"
+msgid ""
+"Detected instance %(instance_uuid)s with name label '%(name_label)s' which "
+"is marked as DELETED but still present on host."
+msgstr ""
 
-#: ../nova/compute/manager.py:103
+#: ../nova/compute/manager.py:2261
 #, python-format
 msgid ""
-"check_instance_lock: arguments: |%(self)s| |%(context)s| |%(instance_uuid)s|"
+"Destroying instance %(instance_uuid)s with name label '%(name_label)s' which "
+"is marked as DELETED but still present on host."
 msgstr ""
 
-#: ../nova/compute/manager.py:107
+#: nova/compute/manager.py:2279
 #, python-format
-msgid "check_instance_lock: locked: |%s|"
-msgstr "check_instance_lock: vérouillé : |%s|"
+msgid ""
+"Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
+msgstr ""
 
-#: ../nova/compute/manager.py:109
-#, python-format
-msgid "check_instance_lock: admin: |%s|"
-msgstr "check_instance_lock: admin : |%s|"
+#: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:45
+msgid "progress column not added to compute_nodes table"
+msgstr ""
 
-#: ../nova/compute/manager.py:114
-#, python-format
-msgid "check_instance_lock: executing: |%s|"
-msgstr "check_instance_lock: exécution : |%s|"
+#: nova/scheduler/simple.py:87
+msgid "Not enough allocatable CPU cores remaining"
+msgstr ""
+
+#: nova/scheduler/simple.py:136
+msgid "Not enough allocatable volume gigabytes remaining"
+msgstr ""
 
-#: ../nova/compute/manager.py:118
+#: nova/ipv6/account_identifier.py:38 nova/ipv6/rfc2462.py:34
 #, python-format
-msgid "check_instance_lock: not executing |%s|"
-msgstr "check_instance_lock: ne s'éxécute pas |%s|"
+msgid "Bad mac for to_global_ipv6: %s"
+msgstr ""
 
-#: ../nova/compute/manager.py:145
+#: nova/ipv6/account_identifier.py:40 nova/ipv6/rfc2462.py:36
 #, python-format
-msgid "Unable to load the virtualization driver: %s"
+msgid "Bad prefix for to_global_ipv6: %s"
 msgstr ""
 
-#: ../nova/compute/manager.py:172
+#: nova/api/openstack/compute/contrib/aggregates.py:137
 #, python-format
+msgid "Aggregates does not have %s action"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1006
+#: nova/api/openstack/compute/contrib/aggregates.py:140
+#: nova/api/openstack/compute/contrib/networks.py:65
+msgid "Invalid request body"
+msgstr ""
+
+#: nova/virt/vmwareapi_conn.py:105
 msgid ""
-"Current state of %(inst_name)s is %(drv_state)s, state in DB is %(db_state)s."
+"Must specify vmwareapi_host_ip,vmwareapi_host_username and "
+"vmwareapi_host_password to useconnection_type=vmwareapi"
 msgstr ""
 
-#: ../nova/compute/manager.py:177
+#: nova/virt/vmwareapi_conn.py:271
 #, python-format
-msgid "Rebooting instance %(inst_name)s after nova-compute restart."
+msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: ../nova/compute/manager.py:187
-msgid "Hypervisor driver does not support firewall rules"
+#: nova/virt/vmwareapi_conn.py:354
+#, python-format
+msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: ../nova/compute/manager.py:192
+#: nova/virt/vmwareapi_conn.py:393
 #, python-format
-msgid "Checking state of %s"
-msgstr "Vérification de l'état de %s"
+msgid "Task [%(task_name)s] %(task_ref)s status: success"
+msgstr ""
 
-#: ../nova/compute/manager.py:254
+#: nova/virt/vmwareapi_conn.py:399
 #, python-format
-msgid "setting up bdm %s"
+msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: ../nova/compute/manager.py:313
+#: nova/virt/vmwareapi_conn.py:404
 #, python-format
-msgid ""
-"Going to force the deletion of the vm %(instance_uuid)s, even if it is "
-"deleted"
+msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
 
-#: ../nova/compute/manager.py:319
+#: nova/vsa/manager.py:73
 #, python-format
-msgid ""
-"Instance %(instance_uuid)s did not exist in the DB, but I will shut it down "
-"anyway using a special context"
+msgid "Create call received for VSA %s"
 msgstr ""
 
-#: ../nova/compute/manager.py:325
+#: nova/vsa/manager.py:80 nova/vsa/manager.py:107
 #, python-format
-msgid "exception terminating the instance %(instance_id)s"
+msgid "Failed to find VSA %(vsa_id)d"
 msgstr ""
 
-#: ../nova/compute/manager.py:354
+#: nova/vsa/manager.py:89
 #, python-format
-msgid "Instance %s not found."
+msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
 msgstr ""
 
-#: ../nova/compute/manager.py:368
-msgid "Instance has already been created"
-msgstr "L'instance a déjà été crée"
-
-#: ../nova/compute/manager.py:410
+#: nova/vsa/manager.py:100
 #, python-format
-msgid ""
-"image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
-"allowed_size_bytes=%(allowed_size_bytes)d"
+msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
 msgstr ""
 
-#: ../nova/compute/manager.py:415
+#: nova/vsa/manager.py:114
 #, python-format
 msgid ""
-"Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed size "
-"%(allowed_size_bytes)d"
+"VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of "
+"%(cvol_exp)d)"
 msgstr ""
 
-#: ../nova/compute/manager.py:425
+#: nova/vsa/manager.py:137
 #, python-format
-msgid "instance %s: starting..."
-msgstr "L'instance %s: est en train d'être démarée..."
+msgid ""
+"VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in %(status)s "
+"state"
+msgstr ""
 
-#: ../nova/compute/manager.py:435
+#: nova/vsa/manager.py:146
 #, python-format
-msgid "Skipping network allocation for instance %s"
+msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
 msgstr ""
 
-#: ../nova/compute/manager.py:447
+#: nova/vsa/manager.py:153
 #, python-format
-msgid "Instance %s failed network setup"
+msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
 msgstr ""
 
-#: ../nova/compute/manager.py:450
+#: nova/vsa/manager.py:168
 #, python-format
-msgid "instance network_info: |%s|"
+msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
 msgstr ""
 
-#: ../nova/compute/manager.py:462
-#, python-format
-msgid "Instance %s failed block device setup"
+#: nova/auth/fakeldap.py:33
+msgid "Attempted to instantiate singleton"
+msgstr "Tentative d'instanciation d'un singleton"
+
+#: nova/network/quantum/client.py:154
+msgid "Tenant ID not set"
 msgstr ""
 
-#: ../nova/compute/manager.py:482
+#: nova/network/quantum/client.py:181
 #, python-format
-msgid "Instance %s failed to spawn"
+msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
 
-#: ../nova/compute/manager.py:501
+#: nova/network/quantum/client.py:196
 #, python-format
-msgid "deallocating network for instance: %s"
+msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: ../nova/compute/manager.py:541
+#: nova/network/quantum/client.py:207
 #, python-format
-msgid "%(action_str)s instance %(instance_uuid)s"
+msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
 
-#: ../nova/compute/manager.py:554
+#: nova/network/quantum/client.py:210
 #, python-format
-msgid "Ignoring DiskNotFound: %s"
+msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: ../nova/compute/manager.py:558
+#: nova/network/quantum/client.py:229
 #, python-format
-msgid "trying to destroy already destroyed instance: %s"
-msgstr "Tentative de destruction d'une instance déjà détruite: %s"
+msgid "unable to deserialize object of type = '%s'"
+msgstr ""
 
-#: ../nova/compute/manager.py:569
-#, python-format
-msgid "terminating bdm %s"
+#: nova/virt/vmwareapi/vim.py:84
+msgid "Unable to import suds."
 msgstr ""
 
-#: ../nova/compute/manager.py:655
-#, python-format
-msgid "Rebuilding instance %s"
+#: nova/virt/vmwareapi/vim.py:90
+msgid "Must specify vmwareapi_wsdl_loc"
 msgstr ""
 
-#: ../nova/compute/manager.py:709
+#: nova/virt/vmwareapi/vim.py:145
 #, python-format
-msgid "Rebooting instance %s"
-msgstr "Redémarrage de l'instance %s"
+msgid "No such SOAP method '%s' provided by VI SDK"
+msgstr ""
 
-#: ../nova/compute/manager.py:722
+#: nova/virt/vmwareapi/vim.py:150
 #, python-format
-msgid ""
-"trying to reboot a non-running instance: %(instance_uuid)s (state: %(state)s "
-"expected: %(running)s)"
+msgid "httplib error in %s: "
 msgstr ""
 
-#: ../nova/compute/manager.py:756
+#: nova/virt/vmwareapi/vim.py:157
 #, python-format
-msgid "Image type not recognized %s"
+msgid "Socket error in %s: "
 msgstr ""
 
-#: ../nova/compute/manager.py:768
+#: nova/virt/vmwareapi/vim.py:162
 #, python-format
-msgid "instance %s: snapshotting"
-msgstr "instance %s: création d'un instantané (snapshot)"
+msgid "Type error in  %s: "
+msgstr ""
 
-#: ../nova/compute/manager.py:774
+#: nova/virt/vmwareapi/vim.py:166
 #, python-format
-msgid ""
-"trying to snapshot a non-running instance: %(instance_uuid)s (state: "
-"%(state)s expected: %(running)s)"
+msgid "Exception in %s "
 msgstr ""
 
-#: ../nova/compute/manager.py:825
+#: nova/api/direct.py:218
+msgid "not available"
+msgstr "non disponible"
+
+#: nova/api/direct.py:299
 #, python-format
-msgid "Found %(num_images)d images (rotation: %(rotation)d)"
+msgid "Returned non-serializeable type: %s"
 msgstr ""
 
-#: ../nova/compute/manager.py:831
-#, python-format
-msgid "Rotating out %d backups"
+#: nova/virt/vmwareapi/vmops.py:66
+msgid "Getting list of instances"
 msgstr ""
 
-#: ../nova/compute/manager.py:835
+#: nova/virt/vmwareapi/vmops.py:82
 #, python-format
-msgid "Deleting image %s"
+msgid "Got total of %s instances"
 msgstr ""
 
-#: ../nova/compute/manager.py:863
-msgid "Instance is not running"
+#: nova/virt/vmwareapi/vmops.py:125
+msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
-#: ../nova/compute/manager.py:867
+#: nova/virt/vmwareapi/vmops.py:195
 #, python-format
-msgid "Instance %s: Root password set"
+msgid "Creating VM with the name %s on the ESX  host"
 msgstr ""
 
-#. NOTE(dprince): if the driver doesn't implement
-#. set_admin_password we break to avoid a loop
-#: ../nova/compute/manager.py:876
-msgid "set_admin_password is not implemented by this driver."
+#: nova/virt/vmwareapi/vmops.py:204
+#, python-format
+msgid "Created VM with the name %s on the ESX  host"
 msgstr ""
 
-#: ../nova/compute/manager.py:892
-msgid "Internal error"
+#: nova/virt/vmwareapi/vmops.py:233
+#, python-format
+msgid ""
+"Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter type  "
+"%(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: ../nova/compute/manager.py:905
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
-"trying to inject a file into a non-running instance: %(instance_uuid)s "
-"(state: %(instance_state)s expected: %(expected_state)s)"
+"Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
+"local store %(data_store_name)s"
 msgstr ""
 
-#: ../nova/compute/manager.py:909
+#: nova/virt/vmwareapi/vmops.py:259
 #, python-format
-msgid "instance %(nm)s: injecting file to %(path)s"
+msgid ""
+"Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore "
+"%(data_store_name)s"
 msgstr ""
 
-#: ../nova/compute/manager.py:922
+#: nova/virt/vmwareapi/vmops.py:271
 #, python-format
 msgid ""
-"trying to update agent on a non-running instance: %(instance_uuid)s (state: "
-"%(instance_state)s expected: %(expected_state)s)"
+"Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
+"%(data_store_name)s"
 msgstr ""
 
-#: ../nova/compute/manager.py:926
+#: nova/virt/vmwareapi/vmops.py:282
 #, python-format
-msgid "instance %(nm)s: updating agent to %(url)s"
+msgid ""
+"Downloading image file data %(image_ref)s to the ESX data store "
+"%(data_store_name)s"
 msgstr ""
 
-#: ../nova/compute/manager.py:938
+#: nova/virt/vmwareapi/vmops.py:297
 #, python-format
-msgid "instance %s: rescuing"
-msgstr "instance %s: récupération"
+msgid ""
+"Downloaded image file data %(image_ref)s to the ESX data store "
+"%(data_store_name)s"
+msgstr ""
 
-#: ../nova/compute/manager.py:960
+#: nova/virt/vmwareapi/vmops.py:314
 #, python-format
-msgid "instance %s: unrescuing"
-msgstr "instance %s: dé-récupération"
+msgid "Reconfiguring VM instance %s to attach the image disk"
+msgstr ""
 
-#: ../nova/compute/manager.py:1068
-msgid "Migration error: destination same as source!"
+#: nova/virt/vmwareapi/vmops.py:321
+#, python-format
+msgid "Reconfigured VM instance %s to attach the image disk"
 msgstr ""
 
-#: ../nova/compute/manager.py:1085
+#: nova/virt/vmwareapi/vmops.py:328
 #, python-format
-msgid "instance %s: migrating"
+msgid "Powering on the VM instance %s"
 msgstr ""
 
-#: ../nova/compute/manager.py:1122 ../nova/compute/manager.py:1183
+#: nova/virt/vmwareapi/vmops.py:334
 #, python-format
-msgid "%s. Setting instance vm_state to ERROR"
+msgid "Powered on the VM instance %s"
 msgstr ""
 
-#: ../nova/compute/manager.py:1240
+#: nova/virt/vmwareapi/vmops.py:379
 #, python-format
-msgid "instance %s: pausing"
-msgstr "instance %s: mise en pause"
+msgid "Creating Snapshot of the VM instance %s "
+msgstr ""
 
-#: ../nova/compute/manager.py:1257
+#: nova/virt/vmwareapi/vmops.py:389
 #, python-format
-msgid "instance %s: unpausing"
-msgstr "instance %s: reprise après pause"
+msgid "Created Snapshot of the VM instance %s "
+msgstr ""
 
-#: ../nova/compute/manager.py:1285
+#: nova/virt/vmwareapi/vmops.py:432
 #, python-format
-msgid "instance %s: retrieving diagnostics"
-msgstr "instance %s: récupération des diagnostiques"
+msgid "Copying disk data before snapshot of the VM  instance %s"
+msgstr ""
 
-#: ../nova/compute/manager.py:1293
+#: nova/virt/vmwareapi/vmops.py:445
 #, python-format
-msgid "instance %s: suspending"
-msgstr "instance %s: suspension"
+msgid "Copied disk data before snapshot of the VM instance %s"
+msgstr ""
 
-#: ../nova/compute/manager.py:1310
+#: nova/virt/vmwareapi/vmops.py:454
 #, python-format
-msgid "instance %s: resuming"
-msgstr "instance %s: reprise après suspension"
+msgid "Uploading image %s"
+msgstr ""
 
-#: ../nova/compute/manager.py:1328
+#: nova/virt/vmwareapi/vmops.py:467
 #, python-format
-msgid "instance %s: locking"
-msgstr "instance %s: vérrouillage"
+msgid "Uploaded image %s"
+msgstr ""
 
-#: ../nova/compute/manager.py:1336
+#: nova/virt/vmwareapi/vmops.py:477
 #, python-format
-msgid "instance %s: unlocking"
-msgstr "instance %s: déverrouillage"
+msgid "Deleting temporary vmdk file %s"
+msgstr ""
 
-#: ../nova/compute/manager.py:1343
+#: nova/virt/vmwareapi/vmops.py:486
 #, python-format
-msgid "instance %s: getting locked state"
-msgstr "instance %s: récupération de l'état de vérouillage"
+msgid "Deleted temporary vmdk file %s"
+msgstr ""
 
-#: ../nova/compute/manager.py:1352
-#, python-format
-msgid "instance %s: reset network"
-msgstr "instance %s: redémarrage du réseau"
+#: nova/virt/vmwareapi/vmops.py:518
+msgid "instance is not powered on"
+msgstr ""
 
-#: ../nova/compute/manager.py:1359
+#: nova/virt/vmwareapi/vmops.py:525
 #, python-format
-msgid "instance %s: inject network info"
+msgid "Rebooting guest OS of VM %s"
 msgstr ""
 
-#: ../nova/compute/manager.py:1363
+#: nova/virt/vmwareapi/vmops.py:528
 #, python-format
-msgid "network_info to inject: |%s|"
+msgid "Rebooted guest OS of VM %s"
 msgstr ""
 
-#: ../nova/compute/manager.py:1372 ../nova/api/ec2/cloud.py:800
+#: nova/virt/vmwareapi/vmops.py:530
 #, python-format
-msgid "Get console output for instance %s"
-msgstr "Récupération de la sortie de la console de l'instance %s"
+msgid "Doing hard reboot of VM %s"
+msgstr ""
 
-#: ../nova/compute/manager.py:1381
+#: nova/virt/vmwareapi/vmops.py:534
 #, python-format
-msgid "instance %s: getting ajax console"
-msgstr "instance %s: préparation d'une console ajax"
+msgid "Did hard reboot of VM %s"
+msgstr ""
 
-#: ../nova/compute/manager.py:1389
+#: nova/virt/vmwareapi/vmops.py:546
 #, python-format
-msgid "instance %s: getting vnc console"
+msgid "instance - %s not present"
 msgstr ""
 
-#: ../nova/compute/manager.py:1399
+#: nova/virt/vmwareapi/vmops.py:565
 #, python-format
-msgid ""
-"instance %(instance_id)s: booting with volume %(volume_id)s at %(mountpoint)s"
+msgid "Powering off the VM %s"
 msgstr ""
 
-#: ../nova/compute/manager.py:1417
+#: nova/virt/vmwareapi/vmops.py:570
 #, python-format
-msgid ""
-"instance %(instance_uuid)s: attaching volume %(volume_id)s to %(mountpoint)s"
+msgid "Powered off the VM %s"
 msgstr ""
 
-#. NOTE(vish): The inline callback eats the exception info so we
-#. log the traceback here and reraise the same
-#. ecxception below.
-#: ../nova/compute/manager.py:1433
+#: nova/virt/vmwareapi/vmops.py:574
 #, python-format
-msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
+msgid "Unregistering the VM %s"
 msgstr ""
 
-#: ../nova/compute/manager.py:1472
+#: nova/virt/vmwareapi/vmops.py:577
 #, python-format
-msgid ""
-"Detach volume %(volume_id)s from mountpoint %(mp)s on instance "
-"%(instance_id)s"
+msgid "Unregistered the VM %s"
 msgstr ""
-"Démontage du volume %(volume_id)s du point de montage %(mp)s sur l'instance "
-"%(instance_id)s"
 
-#: ../nova/compute/manager.py:1477
+#: nova/virt/vmwareapi/vmops.py:579
 #, python-format
-msgid "Detaching volume from unknown instance %s"
-msgstr "Démontage de volume d'une instance inconnue %s"
+msgid ""
+"In vmwareapi:vmops:destroy, got this exception while un-registering the VM: "
+"%s"
+msgstr ""
 
-#: ../nova/compute/manager.py:1534
+#: nova/virt/vmwareapi/vmops.py:590
 #, python-format
 msgid ""
-"Creating tmpfile %s to notify to other compute nodes that they should mount "
-"the same storage."
+"Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: ../nova/compute/manager.py:1595
+#: nova/virt/vmwareapi/vmops.py:600
 #, python-format
-msgid "%s has no volume."
+msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: ../nova/compute/manager.py:1621
+#: nova/virt/vmwareapi/vmops.py:605
 #, python-format
 msgid ""
-"plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
+"In vmwareapi:vmops:destroy, got this exception while deleting the VM "
+"contents from the disk: %s"
 msgstr ""
 
-#: ../nova/compute/manager.py:1679
-#, python-format
-msgid "Pre live migration for %(i_name)s failed at %(dest)s"
+#: nova/virt/vmwareapi/vmops.py:613
+msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: ../nova/compute/manager.py:1707
-msgid "post_live_migration() is started.."
+#: nova/virt/vmwareapi/vmops.py:617
+msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: ../nova/compute/manager.py:1733 ../nova/compute/manager.py:1741
+#: nova/virt/vmwareapi/vmops.py:631
 #, python-format
-msgid "No floating_ip is found for %s."
+msgid "Suspending the VM %s "
 msgstr ""
 
-#: ../nova/compute/manager.py:1743
+#: nova/virt/vmwareapi/vmops.py:635
 #, python-format
-msgid ""
-"Live migration: Unexpected error: %(i_name)s cannot inherit floating ip.\n"
-"%(e)s"
+msgid "Suspended the VM %s "
 msgstr ""
 
-#: ../nova/compute/manager.py:1780
-#, python-format
-msgid "Migrating %(i_name)s to %(dest)s finished successfully."
+#: nova/virt/vmwareapi/vmops.py:638
+msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: ../nova/compute/manager.py:1782
+#: nova/virt/vmwareapi/vmops.py:641
+#, python-format
 msgid ""
-"You may see the error \"libvirt: QEMU error: Domain not found: no domain "
-"with matching name.\" This error can be safely ignored."
+"VM %s was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: ../nova/compute/manager.py:1796
+#: nova/virt/vmwareapi/vmops.py:654
 #, python-format
-msgid "Post operation of migraton started for %s ."
+msgid "Resuming the VM %s"
 msgstr ""
 
-#: ../nova/compute/manager.py:1875
-msgid "Updating bandwidth usage cache"
+#: nova/virt/vmwareapi/vmops.py:659
+#, python-format
+msgid "Resumed the VM %s "
 msgstr ""
 
-#: ../nova/compute/manager.py:1898
-msgid "Updating host status"
+#: nova/virt/vmwareapi/vmops.py:661
+msgid "instance is not in a suspended state"
 msgstr ""
 
-#: ../nova/compute/manager.py:1923
+#: nova/virt/vmwareapi/vmops.py:697
+msgid "get_diagnostics not implemented for vmwareapi"
+msgstr ""
+
+#: nova/virt/vmwareapi/vmops.py:755
 #, python-format
 msgid ""
-"Found %(num_db_instances)s in the database and %(num_vm_instances)s on the "
-"hypervisor."
+"Reconfiguring VM instance %(name)s to set the machine id with ip - "
+"%(ip_addr)s"
 msgstr ""
 
-#: ../nova/compute/manager.py:1947
-msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
+#: nova/virt/vmwareapi/vmops.py:763
+#, python-format
+msgid ""
+"Reconfigured VM instance %(name)s to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: ../nova/compute/manager.py:1959
+#: nova/virt/vmwareapi/vmops.py:800
 #, python-format
-msgid "Reclaiming deleted instance %(instance_id)s"
+msgid "Creating directory with path %s"
 msgstr ""
 
-#: ../nova/scheduler/simple.py:67
-msgid "All hosts have too many cores"
-msgstr "Tous les hôtes ont trop de coeurs"
-
-#: ../nova/scheduler/simple.py:119
-msgid "All hosts have too many gigabytes"
-msgstr "Tous les hôtes ont trop de mémoire"
-
-#: ../nova/scheduler/simple.py:136
-msgid "All hosts have too many networks"
-msgstr "Tous les hôtes ont trop de réseaux"
-
-#: ../nova/api/openstack/v2/contrib/extended_status.py:50
-#: ../nova/api/openstack/v2/contrib/extended_status.py:69
-msgid "Server not found."
+#: nova/virt/vmwareapi/vmops.py:804
+#, python-format
+msgid "Created directory with path %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/disk_config.py:76
-msgid "RAX-DCF:diskConfig must be either 'MANUAL' or 'AUTO'."
+#: nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:102
+#, python-format
+msgid ""
+"Could not cast flavorid to integer: %s. Set flavorid to an integer-like "
+"string to downgrade."
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/volumes.py:74
+#: nova/tests/test_compute.py:352 nova/tests/test_compute.py:1460
 #, python-format
-msgid "vol=%s"
+msgid "Running instances: %s"
+msgstr "Instance actives : %s"
+
+#: nova/tests/test_compute.py:358
+#, python-format
+msgid "After terminating instances: %s"
+msgstr "Après l'arrêt d'instances : %s"
+
+#: nova/tests/test_compute.py:582
+msgid "Internal error"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/volumes.py:109
+#: nova/tests/test_compute.py:1471
 #, python-format
-msgid "Delete volume with id: %s"
+msgid "After force-killing instances: %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/volumes.py:143
-#: ../nova/api/ec2/cloud.py:887
+#: nova/api/openstack/compute/contrib/admin_actions.py:60
 #, python-format
-msgid "Create volume of %s GB"
-msgstr "Création d'un volume de %s Go"
+msgid "Compute.api::pause %s"
+msgstr "Compute.api::pause %s"
 
-#: ../nova/api/openstack/v2/contrib/volumes.py:291
+#: nova/api/openstack/compute/contrib/admin_actions.py:77
 #, python-format
-msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
-msgstr ""
+msgid "Compute.api::unpause %s"
+msgstr "Compute.api::unpause %s"
 
-#: ../nova/api/openstack/v2/contrib/volumes.py:327
-#: ../nova/api/ec2/cloud.py:936
+#: nova/api/openstack/compute/contrib/admin_actions.py:94
 #, python-format
-msgid "Detach volume %s"
-msgstr "Dé-montage du volume %s"
+msgid "compute.api::suspend %s"
+msgstr "compute.api::suspend %s"
 
-#: ../nova/api/openstack/v2/contrib/volumes.py:444
+#: nova/api/openstack/compute/contrib/admin_actions.py:111
 #, python-format
-msgid "Delete snapshot with id: %s"
-msgstr ""
+msgid "compute.api::resume %s"
+msgstr "compute.api::resume %s"
 
-#: ../nova/api/openstack/v2/contrib/volumes.py:479
+#: nova/api/openstack/compute/contrib/admin_actions.py:127
 #, python-format
-msgid "Create snapshot from volume %s"
+msgid "Error in migrate %s"
 msgstr ""
 
-#: ../nova/vnc/auth.py:58
+#: nova/api/openstack/compute/contrib/admin_actions.py:141
 #, python-format
-msgid "Unauthorized Access: (%s)"
+msgid "Compute.api::reset_network %s"
+msgstr "Compute.api::reset_network %s"
+
+#: nova/api/openstack/compute/contrib/admin_actions.py:154
+#: nova/api/openstack/compute/contrib/admin_actions.py:170
+#: nova/api/openstack/compute/contrib/admin_actions.py:186
+#: nova/api/openstack/compute/contrib/multinic.py:41
+#: nova/api/openstack/compute/contrib/rescue.py:43
+msgid "Server not found"
 msgstr ""
 
-#: ../nova/vnc/auth.py:98
+#: nova/api/openstack/compute/contrib/admin_actions.py:157
 #, python-format
-msgid "Received Websocket Request: %s"
+msgid "Compute.api::inject_network_info %s"
 msgstr ""
 
-#: ../nova/vnc/auth.py:100
+#: nova/api/openstack/compute/contrib/admin_actions.py:173
 #, python-format
-msgid "Received Request: %s"
-msgstr ""
+msgid "Compute.api::lock %s"
+msgstr "Compute.api::lock %s"
 
-#: ../nova/vnc/auth.py:118
+#: nova/api/openstack/compute/contrib/admin_actions.py:189
 #, python-format
-msgid "Received Token: %(token)s, %(token_dict)s)"
-msgstr ""
+msgid "Compute.api::unlock %s"
+msgstr "Compute.api::unlock %s"
 
-#: ../nova/vnc/auth.py:122
+#: nova/api/openstack/compute/contrib/admin_actions.py:219
 #, python-format
-msgid "Checking Token: %(token)s, %(token_valid)s)"
+msgid "createBackup entity requires %s attribute"
 msgstr ""
 
-#: ../nova/vnc/auth.py:134
-#, python-format
-msgid "Deleting Expired Token: %s)"
+#: nova/api/openstack/compute/contrib/admin_actions.py:223
+msgid "Malformed createBackup entity"
 msgstr ""
 
-#: ../nova/virt/vmwareapi_conn.py:100
-msgid ""
-"Must specify vmwareapi_host_ip,vmwareapi_host_username and "
-"vmwareapi_host_password to useconnection_type=vmwareapi"
+#: nova/api/openstack/compute/contrib/admin_actions.py:229
+msgid "createBackup attribute 'rotation' must be an integer"
 msgstr ""
 
-#: ../nova/virt/vmwareapi_conn.py:262
-#, python-format
-msgid "In vmwareapi:_create_session, got this exception: %s"
+#: nova/api/openstack/compute/servers.py:1102
+#: nova/api/openstack/compute/contrib/admin_actions.py:238
+msgid "Invalid metadata"
 msgstr ""
 
-#: ../nova/virt/vmwareapi_conn.py:345
-#, python-format
-msgid "In vmwareapi:_call_method, got this exception: %s"
+#: nova/api/openstack/compute/contrib/admin_actions.py:272
+msgid "host and block_migration must be specified."
 msgstr ""
 
-#: ../nova/virt/vmwareapi_conn.py:384
+#: nova/api/openstack/compute/contrib/admin_actions.py:284
 #, python-format
-msgid "Task [%(task_name)s] %(task_ref)s status: success"
+msgid "Live migration of instance %(id)s to host %(host)s failed"
 msgstr ""
 
-#: ../nova/virt/vmwareapi_conn.py:390
+#: nova/rpc/amqp.py:144 nova/rpc/impl_carrot.py:460
 #, python-format
-msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
-msgstr ""
+msgid "Returning exception %s to caller"
+msgstr "Renvoi de l'exception %s à l'appelant"
 
-#: ../nova/virt/vmwareapi_conn.py:395
+#: nova/rpc/amqp.py:187 nova/rpc/impl_carrot.py:494
 #, python-format
-msgid "In vmwareapi:_poll_task, Got this error %s"
-msgstr ""
+msgid "unpacked context: %s"
+msgstr "Contexte décompacté : %s"
 
-#: ../nova/vsa/manager.py:70
+#: nova/rpc/amqp.py:230 nova/rpc/impl_carrot.py:261
 #, python-format
-msgid "Create call received for VSA %s"
-msgstr ""
+msgid "received %s"
+msgstr "%s reçu"
 
-#: ../nova/vsa/manager.py:77 ../nova/vsa/manager.py:104
+#: nova/rpc/amqp.py:235 nova/rpc/impl_carrot.py:274
 #, python-format
-msgid "Failed to find VSA %(vsa_id)d"
-msgstr ""
+msgid "no method for message: %s"
+msgstr "Pas de méthode pour le message : %s"
 
-#: ../nova/vsa/manager.py:86
+#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:276
 #, python-format
-msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
-msgstr ""
+msgid "No method for message: %s"
+msgstr "Pas de méthode pour le message : %s"
 
-#: ../nova/vsa/manager.py:97
+#: nova/rpc/amqp.py:318 nova/rpc/impl_carrot.py:528
 #, python-format
-msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
+msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: ../nova/vsa/manager.py:111
+#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:531
 #, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of "
-"%(cvol_exp)d)"
-msgstr ""
+msgid "MSG_ID is %s"
+msgstr "MSG_ID est %s"
 
-#: ../nova/vsa/manager.py:134
+#: nova/rpc/amqp.py:343 nova/rpc/impl_carrot.py:610
 #, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in %(status)s "
-"state"
+msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: ../nova/vsa/manager.py:143
-#, python-format
-msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
+#: nova/rpc/amqp.py:351 nova/rpc/impl_carrot.py:620
+msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: ../nova/vsa/manager.py:150
+#: nova/rpc/amqp.py:376 nova/rpc/impl_carrot.py:630
 #, python-format
-msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
+msgid "Sending notification on %s..."
 msgstr ""
 
-#: ../nova/vsa/manager.py:165
+#: nova/tests/integrated/api/client.py:38
 #, python-format
-msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
+msgid ""
+"%(message)s\n"
+"Status Code: %(_status)s\n"
+"Body: %(_body)s"
 msgstr ""
 
-#: ../nova/auth/fakeldap.py:33
-msgid "Attempted to instantiate singleton"
-msgstr "Tentative d'instanciation d'un singleton"
-
-#: ../nova/network/quantum/client.py:151
-msgid "Tenant ID not set"
+#: nova/tests/integrated/api/client.py:47
+msgid "Authentication error"
 msgstr ""
 
-#: ../nova/network/quantum/client.py:177
-#, python-format
-msgid ""
-"Quantum Client Request:\n"
-"%(method)s %(action)s\n"
+#: nova/tests/integrated/api/client.py:55
+msgid "Authorization error"
 msgstr ""
 
-#: ../nova/network/quantum/client.py:193
-#, python-format
-msgid "Quantum entity not found: %s"
+#: nova/tests/integrated/api/client.py:63
+msgid "Item not found"
 msgstr ""
 
-#: ../nova/network/quantum/client.py:203
+#: nova/tests/integrated/api/client.py:105
 #, python-format
-msgid "Server %(status_code)s error: %(data)s"
+msgid "Doing %(method)s on %(relative_url)s"
 msgstr ""
 
-#: ../nova/network/quantum/client.py:207
-#: ../nova/network/quantum/melange_connection.py:86
+#: nova/tests/integrated/api/client.py:107
 #, python-format
-msgid "Unable to connect to server. Got error: %s"
+msgid "Body: %s"
 msgstr ""
 
-#: ../nova/network/quantum/client.py:225
+#: nova/tests/integrated/api/client.py:125
 #, python-format
-msgid "unable to deserialize object of type = '%s'"
+msgid "%(auth_uri)s => code %(http_status)s"
 msgstr ""
 
-#: ../nova/tests/fake_utils.py:73
+#: nova/tests/integrated/api/client.py:151
 #, python-format
-msgid "Faking execution of cmd (subprocess): %s"
+msgid "%(relative_uri)s => code %(http_status)s"
 msgstr ""
 
-#: ../nova/tests/fake_utils.py:81
-#, python-format
-msgid "Faked command matched %s"
+#: nova/tests/integrated/api/client.py:161
+msgid "Unexpected status code"
 msgstr ""
 
-#: ../nova/tests/fake_utils.py:97
+#: nova/tests/integrated/api/client.py:168
 #, python-format
-msgid "Faked command raised an exception %s"
+msgid "Decoding JSON: %s"
 msgstr ""
 
-#: ../nova/tests/fake_utils.py:102
-#, python-format
-msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
+#: nova/api/openstack/compute/image_metadata.py:40
+#: nova/api/openstack/compute/images.py:142
+#: nova/api/openstack/compute/images.py:157
+msgid "Image not found."
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vim.py:81
-msgid "Unable to import suds."
+#: nova/api/openstack/compute/image_metadata.py:79
+msgid "Incorrect request body format"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vim.py:87
-msgid "Must specify vmwareapi_wsdl_loc"
+#: nova/api/openstack/compute/image_metadata.py:111
+msgid "Invalid metadata key"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vim.py:143
-msgid "No such SOAP method "
+#: nova/console/vmrc_manager.py:122
+#, python-format
+msgid "Tried to remove non-existent console %(console_id)s."
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vim.py:148
-msgid "httplib "
+#: nova/console/vmrc_manager.py:125
+#, python-format
+msgid "Removing console %(console_id)s."
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vim.py:155
-msgid "Socket "
+#: nova/image/glance.py:147
+msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vim.py:160
-msgid "Type "
+#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:103
+msgid "Maximum attempts reached"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vim.py:164
+#: nova/image/glance.py:275
 #, python-format
-msgid "Exception in %s "
+msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: ../nova/api/direct.py:219
-msgid "not available"
-msgstr "non disponible"
-
-#: ../nova/api/direct.py:300
+#: nova/image/glance.py:278
 #, python-format
-msgid "Returned non-serializeable type: %s"
-msgstr ""
-
-#: ../nova/virt/vmwareapi/vmops.py:63
-msgid "Getting list of instances"
+msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:79
+#: nova/image/glance.py:286
 #, python-format
-msgid "Got total of %s instances"
+msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:122
-msgid "Couldn't get a local Datastore reference"
+#: nova/image/glance.py:328 nova/image/glance.py:332
+msgid "Not the image owner"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:192
+#: nova/image/glance.py:407
 #, python-format
-msgid "Creating VM with the name %s on the ESX  host"
+msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:201
-#, python-format
-msgid "Created VM with the name %s on the ESX  host"
+#: nova/virt/xenapi_conn.py:165
+msgid ""
+"Must specify xenapi_connection_url, xenapi_connection_username (optionally), "
+"and xenapi_connection_password to use connection_type=xenapi"
 msgstr ""
+"Doit spécifier xenapi_connection_url, xenapi_connection_username (optionel), "
+"et xenapi_connection_password pour utiliser connection_type=xenapi"
 
-#. Create a Virtual Disk of the size of the flat vmdk file. This is
-#. done just to generate the meta-data file whose specifics
-#. depend on the size of the disk, thin/thick provisioning and the
-#. storage adapter type.
-#. Here we assume thick provisioning and lsiLogic for the adapter
-#. type
-#: ../nova/virt/vmwareapi/vmops.py:230
-msgid "Creating Virtual Disk of size  "
+#: nova/virt/xenapi_conn.py:353 nova/virt/libvirt/connection.py:441
+msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:247
+#: nova/virt/xenapi_conn.py:420 nova/virt/baremetal/proxy.py:716
+#: nova/virt/libvirt/connection.py:1703
 #, python-format
-msgid "Created Virtual Disk of size %(vmdk_file_size_in_kb)s"
+msgid "Compute_service record created for %s "
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:256
+#: nova/virt/xenapi_conn.py:423 nova/virt/baremetal/proxy.py:720
+#: nova/virt/libvirt/connection.py:1706
 #, python-format
-msgid "Deleting the file %(flat_uploaded_vmdk_path)s "
+msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:268
-#, python-format
-msgid "Deleted the file %(flat_uploaded_vmdk_path)s on the "
+#: nova/virt/xenapi_conn.py:484
+msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:279
-#, python-format
-msgid "Downloading image file data %(image_ref)s to the ESX "
+#: nova/virt/xenapi_conn.py:498
+msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:294
+#: nova/virt/xenapi_conn.py:587
 #, python-format
-msgid "Downloaded image file data %(image_ref)s to the ESX "
-msgstr ""
-
-#: ../nova/virt/vmwareapi/vmops.py:311
+msgid "Task [%(name)s] %(task)s status: success    %(result)s"
+msgstr "Tâche [%(name)s] %(task)s état : succès   %(result)s"
+
+#: nova/virt/xenapi_conn.py:596
+#, python-format
+msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
+msgstr "Tâche [%(name)s] %(task)s état : %(status)s    %(error_info)s"
+
+#: nova/virt/xenapi_conn.py:616 nova/virt/xenapi_conn.py:629
 #, python-format
-msgid "Reconfiguring VM instance %s to attach the image "
+msgid "Got exception: %s"
+msgstr "Reçu exception : %s"
+
+#: nova/virt/xenapi_conn.py:655 nova/virt/baremetal/proxy.py:773
+#: nova/virt/libvirt/connection.py:2250
+msgid "Updating host stats"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:318
+#: nova/virt/xenapi_conn.py:666
 #, python-format
-msgid "Reconfigured VM instance %s to attach the image "
+msgid "Unable to get updated status: %s"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:325
+#: nova/virt/xenapi_conn.py:673
 #, python-format
-msgid "Powering on the VM instance %s"
+msgid "Unable to get SR for this host: %s"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:331
+#: nova/scheduler/vsa.py:112
 #, python-format
-msgid "Powered on the VM instance %s"
+msgid "_filter_hosts: %(request_spec)s"
 msgstr ""
 
-#. Create a snapshot of the VM
-#: ../nova/virt/vmwareapi/vmops.py:376
+#: nova/scheduler/vsa.py:115
 #, python-format
-msgid "Creating Snapshot of the VM instance %s "
+msgid "Filter hosts for drive type %s"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:386
+#: nova/scheduler/vsa.py:132
 #, python-format
-msgid "Created Snapshot of the VM instance %s "
+msgid "Host %s has no free capacity. Skip"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:429
-msgid "Copying disk data before snapshot of the VM "
+#: nova/scheduler/vsa.py:137
+#, python-format
+msgid "Filter hosts: %s"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:442
-msgid "Copied disk data before snapshot of the VM "
+#: nova/scheduler/vsa.py:153
+msgid "Must implement host selection mechanism"
 msgstr ""
 
-#. Upload the contents of -flat.vmdk file which has the disk data.
-#: ../nova/virt/vmwareapi/vmops.py:451
+#: nova/scheduler/vsa.py:163
 #, python-format
-msgid "Uploading image %s"
+msgid "Maximum number of hosts selected (%d)"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:464
+#: nova/scheduler/vsa.py:171
 #, python-format
-msgid "Uploaded image %s"
+msgid "Selected excessive host %(host)s"
 msgstr ""
 
-#. Delete the temporary vmdk created above.
-#: ../nova/virt/vmwareapi/vmops.py:474
+#: nova/scheduler/vsa.py:211
 #, python-format
-msgid "Deleting temporary vmdk file %s"
+msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:483
+#: nova/scheduler/vsa.py:239
 #, python-format
-msgid "Deleted temporary vmdk file %s"
+msgid "volume_params %(volume_params)s"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:515
-msgid "instance is not powered on"
+#: nova/scheduler/vsa.py:244
+#, python-format
+msgid "%(i)d: Volume %(name)s"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:522
+#: nova/scheduler/vsa.py:282
 #, python-format
-msgid "Rebooting guest OS of VM %s"
+msgid "Attempting to spawn %(num_volumes)d volume(s)"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:525
-#, python-format
-msgid "Rebooted guest OS of VM %s"
+#: nova/scheduler/vsa.py:298
+msgid "Error creating volumes"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:527
+#: nova/scheduler/vsa.py:328
 #, python-format
-msgid "Doing hard reboot of VM %s"
+msgid "Non-VSA volume %d"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:531
+#: nova/scheduler/vsa.py:341
 #, python-format
-msgid "Did hard reboot of VM %s"
+msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:543
-#, python-format
-msgid "instance - %s not present"
+#: nova/scheduler/vsa.py:351
+msgid "Error creating volume"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:562
+#: nova/scheduler/vsa.py:391
 #, python-format
-msgid "Powering off the VM %s"
+msgid "No capability selected for volume of size %(size)s"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:567
+#: nova/scheduler/vsa.py:411
 #, python-format
-msgid "Powered off the VM %s"
+msgid "Host %s:"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:571
+#: nova/scheduler/vsa.py:420
 #, python-format
-msgid "Unregistering the VM %s"
+msgid ""
+"\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. "
+"Available capacity %(avail)-5s"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:574
+#: nova/scheduler/vsa.py:483
 #, python-format
-msgid "Unregistered the VM %s"
+msgid ""
+"\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:576
-msgid "In vmwareapi:vmops:destroy, got this exception"
+#: nova/scheduler/vsa.py:528
+#, python-format
+msgid ""
+"\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s "
+"%(type_str)s)"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:587
+#: nova/console/xvp.py:98
+msgid "Rebuilding xvp conf"
+msgstr "Reconstruction de la configuration xvp"
+
+#: nova/console/xvp.py:116
 #, python-format
-msgid "Deleting contents of the VM %(name)s from "
-msgstr ""
+msgid "Re-wrote %s"
+msgstr "Ré-écriture de %s"
+
+#: nova/console/xvp.py:121
+msgid "Stopping xvp"
+msgstr "Arrêt xvp"
+
+#: nova/console/xvp.py:134
+msgid "Starting xvp"
+msgstr "Démarrage xvp"
 
-#: ../nova/virt/vmwareapi/vmops.py:597
+#: nova/console/xvp.py:141
 #, python-format
-msgid "Deleted contents of the VM %(name)s from "
-msgstr ""
+msgid "Error starting xvp: %s"
+msgstr "Erreur au démarrage xvp : %s"
 
-#: ../nova/virt/vmwareapi/vmops.py:602
-msgid "In vmwareapi:vmops:destroy, "
-msgstr ""
+#: nova/console/xvp.py:144
+msgid "Restarting xvp"
+msgstr "Re-démarrage xvp"
+
+#: nova/console/xvp.py:146
+msgid "xvp not running..."
+msgstr "xvp non actif..."
 
-#: ../nova/virt/vmwareapi/vmops.py:628
+#: nova/virt/baremetal/proxy.py:148
 #, python-format
-msgid "Suspending the VM %s "
+msgid "Error encountered when destroying instance '%(name)s': %(ex)s"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:632
+#: nova/virt/baremetal/proxy.py:162
 #, python-format
-msgid "Suspended the VM %s "
+msgid "instance %(instance_name)s: deleting instance files %(target)s"
 msgstr ""
+"instance %(instance_name)s: suppression des fichiers d'instance %(target)s"
 
-#: ../nova/virt/vmwareapi/vmops.py:635
-msgid "instance is powered off and can not be suspended."
+#: nova/virt/baremetal/proxy.py:189
+#, python-format
+msgid "instance %s: rebooted"
+msgstr "instance %s: re-démarrée"
+
+#: nova/virt/baremetal/proxy.py:192
+msgid "_wait_for_reboot failed"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:638
+#: nova/virt/baremetal/proxy.py:222
 #, python-format
-msgid "VM %s was already in suspended state. So returning "
+msgid "instance %s: rescued"
+msgstr "instance %s: récupérée"
+
+#: nova/virt/baremetal/proxy.py:225
+msgid "_wait_for_rescue failed"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:651
-#, python-format
-msgid "Resuming the VM %s"
+#: nova/virt/baremetal/proxy.py:242
+msgid "<============= spawn of baremetal =============>"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:656
+#: nova/virt/baremetal/proxy.py:255
 #, python-format
-msgid "Resumed the VM %s "
+msgid "instance %s: is building"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:658
-msgid "instance is not in a suspended state"
+#: nova/virt/baremetal/proxy.py:260
+msgid "Key is injected but instance is not running yet"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:757
+#: nova/virt/baremetal/proxy.py:265
 #, python-format
-msgid "Reconfiguring VM instance %(name)s to set the machine id "
-msgstr ""
+msgid "instance %s: booted"
+msgstr "instance %s: a démarrée"
 
-#: ../nova/virt/vmwareapi/vmops.py:765
+#: nova/virt/baremetal/proxy.py:268
 #, python-format
-msgid "Reconfigured VM instance %(name)s to set the machine id "
+msgid "~~~~~~ current state = %s ~~~~~~"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:802
+#: nova/virt/baremetal/proxy.py:269
 #, python-format
-msgid "Creating directory with path %s"
+msgid "instance %s spawned successfully"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmops.py:806
+#: nova/virt/baremetal/proxy.py:272
 #, python-format
-msgid "Created directory with path %s"
+msgid "instance %s:not booted"
+msgstr ""
+
+#: nova/virt/baremetal/proxy.py:274
+msgid "Bremetal assignment is overcommitted."
 msgstr ""
 
-#: ../nova/tests/integrated/test_volumes.py:185
+#: nova/virt/baremetal/proxy.py:354
+#, python-format
+msgid "instance %s: Creating image"
+msgstr "instance %s : Création de l'image"
+
+#: nova/virt/baremetal/proxy.py:475
 #, python-format
-msgid "Attachment = %s"
+msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: ../nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:102
+#: nova/virt/baremetal/proxy.py:484
 #, python-format
 msgid ""
-"Could not cast flavorid to integer: %s. Set flavorid to an integer-like "
-"string to downgrade."
+"instance %(inst_name)s: ignoring error injecting data into image %(img_id)s "
+"(%(e)s)"
 msgstr ""
+"instance %(inst_name)s : l'erreur d'injection de donné dans l'image "
+"%(img_id)s (%(e)s) a été ignorée"
 
-#: ../nova/tests/test_compute.py:288 ../nova/tests/test_compute.py:1165
+#: nova/virt/baremetal/proxy.py:529
 #, python-format
-msgid "Running instances: %s"
-msgstr "Instance actives : %s"
+msgid "instance %s: starting toXML method"
+msgstr "instance %s: démarrage de la méthode toXML"
 
-#: ../nova/tests/test_compute.py:294
+#: nova/virt/baremetal/proxy.py:531
 #, python-format
-msgid "After terminating instances: %s"
-msgstr "Après l'arrêt d'instances : %s"
+msgid "instance %s: finished toXML method"
+msgstr "instance %s: fin d'éxécution de la méthode toXML"
 
-#: ../nova/tests/test_compute.py:1176
-#, python-format
-msgid "After force-killing instances: %s"
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1473
+msgid ""
+"Cannot get the number of cpu, because this function is not implemented for "
+"this platform. This error can be safely ignored for now."
 msgstr ""
 
-#: ../nova/tests/integrated/api/client.py:38
+#: nova/virt/baremetal/proxy.py:714
 #, python-format
-msgid ""
-"%(message)s\n"
-"Status Code: %(_status)s\n"
-"Body: %(_body)s"
+msgid "#### RLK: cpu_arch = %s "
 msgstr ""
 
-#: ../nova/tests/integrated/api/client.py:47
-msgid "Authentication error"
+#: nova/virt/baremetal/proxy.py:746
+msgid "Updating!"
 msgstr ""
 
-#: ../nova/tests/integrated/api/client.py:55
-msgid "Authorization error"
+#: nova/volume/san.py:114 nova/volume/san.py:152
+msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: ../nova/tests/integrated/api/client.py:63
-msgid "Item not found"
+#: nova/volume/san.py:157
+msgid "san_ip must be set"
 msgstr ""
 
-#: ../nova/tests/integrated/api/client.py:105
+#: nova/volume/san.py:321
 #, python-format
-msgid "Doing %(method)s on %(relative_url)s"
+msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: ../nova/tests/integrated/api/client.py:107
+#: nova/volume/san.py:453
 #, python-format
-msgid "Body: %s"
+msgid "CLIQ command returned %s"
 msgstr ""
 
-#: ../nova/tests/integrated/api/client.py:125
+#: nova/volume/san.py:459
 #, python-format
-msgid "%(auth_uri)s => code %(http_status)s"
+msgid ""
+"Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: ../nova/tests/integrated/api/client.py:151
+#: nova/volume/san.py:467
 #, python-format
-msgid "%(relative_uri)s => code %(http_status)s"
+msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: ../nova/tests/integrated/api/client.py:161
-msgid "Unexpected status code"
+#: nova/volume/san.py:497
+#, python-format
+msgid ""
+"Unexpected number of virtual ips for cluster  %(cluster_name)s. "
+"Result=%(_xml)s"
 msgstr ""
 
-#: ../nova/tests/integrated/api/client.py:168
+#: nova/volume/san.py:550
 #, python-format
-msgid "Decoding JSON: %s"
+msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: ../nova/console/vmrc_manager.py:116
-#, python-format
-msgid "Tried to remove non-existent console %(console_id)s."
+#: nova/volume/driver.py:844 nova/volume/san.py:595
+msgid "local_path not supported"
 msgstr ""
 
-#: ../nova/console/vmrc_manager.py:119
+#: nova/volume/san.py:627
 #, python-format
-msgid "Removing console %(console_id)s."
+msgid "Could not determine project for volume %s, can't export"
 msgstr ""
 
-#. Translate Base -> Service
-#: ../nova/image/glance.py:266
+#: nova/volume/san.py:697
 #, python-format
-msgid "Creating image in Glance. Metadata passed in %s"
+msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: ../nova/image/glance.py:269
+#: nova/volume/san.py:714
 #, python-format
-msgid "Metadata after formatting for Glance %s"
+msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: ../nova/image/glance.py:277
+#: nova/volume/san.py:719
 #, python-format
-msgid "Metadata returned from Glance formatted for Base %s"
+msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: ../nova/image/glance.py:319 ../nova/image/glance.py:323
-msgid "Not the image owner"
+#: nova/volume/san.py:733
+#, python-format
+msgid "Found solidfire account: %s"
 msgstr ""
 
-#: ../nova/image/glance.py:398
+#: nova/volume/san.py:747
 #, python-format
-msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
+msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: ../nova/virt/xenapi_conn.py:159
-msgid ""
-"Must specify xenapi_connection_url, xenapi_connection_username (optionally), "
-"and xenapi_connection_password to use connection_type=xenapi"
+#: nova/volume/san.py:805
+msgid "Enter SolidFire create_volume..."
 msgstr ""
-"Doit spécifier xenapi_connection_url, xenapi_connection_username (optionel), "
-"et xenapi_connection_password pour utiliser connection_type=xenapi"
 
-#: ../nova/virt/xenapi_conn.py:444
-msgid "Host startup on XenServer is not supported."
+#: nova/volume/san.py:844
+msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: ../nova/virt/xenapi_conn.py:458
-msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
+#: nova/volume/san.py:859
+msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: ../nova/virt/xenapi_conn.py:542
+#: nova/volume/san.py:878
 #, python-format
-msgid "Task [%(name)s] %(task)s status: success    %(result)s"
-msgstr "Tâche [%(name)s] %(task)s état : succès   %(result)s"
+msgid "Deleting volumeID: %s "
+msgstr ""
+
+#: nova/volume/san.py:886
+msgid "Leaving SolidFire delete_volume"
+msgstr ""
+
+#: nova/volume/san.py:889
+msgid "Executing SolidFire ensure_export..."
+msgstr ""
+
+#: nova/volume/san.py:893
+msgid "Executing SolidFire create_export..."
+msgstr ""
 
-#: ../nova/virt/xenapi_conn.py:551
+#: nova/volume/driver.py:92
 #, python-format
-msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
-msgstr "Tâche [%(name)s] %(task)s état : %(status)s    %(error_info)s"
+msgid "Recovering from a failed execute.  Try number %s"
+msgstr "Récupération après une exécution erronée. Tentative numéro %s"
 
-#: ../nova/virt/xenapi_conn.py:577 ../nova/virt/xenapi_conn.py:590
+#: nova/volume/driver.py:102
 #, python-format
-msgid "Got exception: %s"
-msgstr "Reçu exception : %s"
+msgid "volume group %s doesn't exist"
+msgstr "Le groupe de volume %s n'existe pas"
 
-#: ../nova/virt/xenapi_conn.py:616 ../nova/virt/libvirt/connection.py:1918
-msgid "Updating host stats"
+#: ../nova/volume/driver.py:264 ../nova/volume/driver.py:860
+msgid "Skipping ensure_export. No iscsi_target "
+msgstr "ensure_export sauté. Pas d'iscsi_target "
+
+#: ../nova/volume/driver.py:308 ../nova/volume/driver.py:317
+#: ../nova/volume/driver.py:904
+msgid "Skipping remove_export. No iscsi_target "
+msgstr "remove_export sauté. Pas d'iscsi_target "
+
+#: nova/volume/driver.py:327
+msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#. Invalid JSON object
-#: ../nova/virt/xenapi_conn.py:627
+#: nova/volume/driver.py:372
 #, python-format
-msgid "Unable to get updated status: %s"
-msgstr ""
+msgid "Could not find iSCSI export  for volume %s"
+msgstr "Imposible de trouver une exportation iSCSI pour le volume %s"
 
-#. No SR configured
-#: ../nova/virt/xenapi_conn.py:634
+#: nova/volume/driver.py:376
 #, python-format
-msgid "Unable to get SR for this host: %s"
+msgid "ISCSI Discovery: Found %s"
 msgstr ""
 
-#: ../nova/scheduler/vsa.py:104
+#: nova/volume/driver.py:449
 #, python-format
-msgid "_filter_hosts: %(request_spec)s"
+msgid "Cannot confirm exported volume id:%(volume_id)s."
 msgstr ""
 
-#: ../nova/scheduler/vsa.py:107
+#: nova/volume/driver.py:476
 #, python-format
-msgid "Filter hosts for drive type %s"
-msgstr ""
+msgid "FAKE ISCSI: %s"
+msgstr "FAUX ISCSI: %s"
 
-#: ../nova/scheduler/vsa.py:124
+#: nova/volume/driver.py:488
 #, python-format
-msgid "Host %s has no free capacity. Skip"
-msgstr ""
+msgid "rbd has no pool %s"
+msgstr "rbd n'as pas de file %s"
 
-#: ../nova/scheduler/vsa.py:129
+#: nova/volume/driver.py:558
 #, python-format
-msgid "Filter hosts: %s"
-msgstr ""
+msgid "Sheepdog is not working: %s"
+msgstr "Sheepdog n'est pas actif : %s"
 
-#: ../nova/scheduler/vsa.py:146
-msgid "Must implement host selection mechanism"
-msgstr ""
+#: nova/volume/driver.py:560
+msgid "Sheepdog is not working"
+msgstr "Sheepdog n'est pas actif"
 
-#. try to select from already selected hosts only
-#: ../nova/scheduler/vsa.py:156
+#: nova/volume/driver.py:659 nova/volume/driver.py:664
 #, python-format
-msgid "Maximum number of hosts selected (%d)"
+msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: ../nova/scheduler/vsa.py:164
+#: nova/volume/driver.py:699
 #, python-format
-msgid "Selected excessive host %(host)s"
+msgid "\tVolume %s is NOT VSA volume"
 msgstr ""
 
-#: ../nova/scheduler/vsa.py:204
+#: nova/volume/driver.py:715
 #, python-format
-msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+msgid "\tFE VSA Volume %s creation - do nothing"
 msgstr ""
 
-#: ../nova/scheduler/vsa.py:232
+#: nova/volume/driver.py:748
 #, python-format
-msgid "volume_params %(volume_params)s"
+msgid "VSA BE create_volume for %s failed"
 msgstr ""
 
-#: ../nova/scheduler/vsa.py:237
+#: nova/volume/driver.py:751
 #, python-format
-msgid "%(i)d: Volume %(name)s"
+msgid "VSA BE create_volume for %s succeeded"
 msgstr ""
 
-#: ../nova/scheduler/vsa.py:275
+#: nova/volume/driver.py:759
 #, python-format
-msgid "Attempting to spawn %(num_volumes)d volume(s)"
+msgid "\tFE VSA Volume %s deletion - do nothing"
 msgstr ""
 
-#: ../nova/scheduler/vsa.py:291
-msgid "Error creating volumes"
+#: nova/volume/driver.py:770
+#, python-format
+msgid "VSA BE delete_volume for %s failed"
 msgstr ""
 
-#: ../nova/scheduler/vsa.py:321
+#: nova/volume/driver.py:773
 #, python-format
-msgid "Non-VSA volume %d"
+msgid "VSA BE delete_volume for %s suceeded"
 msgstr ""
 
-#: ../nova/scheduler/vsa.py:334
+#: nova/virt/libvirt/volume.py:152 nova/volume/driver.py:811
 #, python-format
-msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
+msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: ../nova/scheduler/vsa.py:344
-msgid "Error creating volume"
+#: nova/virt/libvirt/volume.py:155 nova/volume/driver.py:814
+#, python-format
+msgid ""
+"ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  Try "
+"number: %(tries)s"
 msgstr ""
 
-#: ../nova/scheduler/vsa.py:386
+#: nova/virt/libvirt/volume.py:167 nova/volume/driver.py:826
 #, python-format
-msgid "No capability selected for volume of size %(size)s"
+msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
 
-#: ../nova/scheduler/vsa.py:406
+#: nova/volume/driver.py:837
 #, python-format
-msgid "Host %s:"
+msgid "\tFE VSA Volume %s local path call - call discover"
 msgstr ""
 
-#: ../nova/scheduler/vsa.py:415
+#: nova/volume/driver.py:852
 #, python-format
-msgid ""
-"\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. "
-"Available capacity %(avail)-5s"
+msgid "\tFE VSA Volume %s ensure export - do nothing"
 msgstr ""
 
-#: ../nova/scheduler/vsa.py:480
+#: nova/volume/driver.py:876
 #, python-format
-msgid ""
-"\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)"
+msgid "\tFE VSA Volume %s create export - do nothing"
 msgstr ""
 
-#: ../nova/scheduler/vsa.py:526
+#: nova/volume/driver.py:896
 #, python-format
-msgid ""
-"\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s "
-"%(type_str)s)"
+msgid "\tFE VSA Volume %s remove export - do nothing"
 msgstr ""
 
-#: ../nova/console/xvp.py:93
-msgid "Rebuilding xvp conf"
-msgstr "Reconstruction de la configuration xvp"
-
-#: ../nova/console/xvp.py:111
-#, python-format
-msgid "Re-wrote %s"
-msgstr "Ré-écriture de %s"
-
-#: ../nova/console/xvp.py:116
-msgid "Stopping xvp"
-msgstr "Arrêt xvp"
-
-#: ../nova/console/xvp.py:129
-msgid "Starting xvp"
-msgstr "Démarrage xvp"
-
-#: ../nova/console/xvp.py:136
-#, python-format
-msgid "Error starting xvp: %s"
-msgstr "Erreur au démarrage xvp : %s"
-
-#: ../nova/console/xvp.py:139
-msgid "Restarting xvp"
-msgstr "Re-démarrage xvp"
-
-#: ../nova/console/xvp.py:141
-msgid "xvp not running..."
-msgstr "xvp non actif..."
-
-#: ../nova/volume/san.py:82 ../nova/volume/san.py:111
-msgid "Specify san_password or san_privatekey"
-msgstr ""
-
-#: ../nova/volume/san.py:114
-msgid "san_ip must be set"
-msgstr ""
-
-#: ../nova/volume/san.py:381
-#, python-format
-msgid "CLIQ command returned %s"
-msgstr ""
-
-#: ../nova/volume/san.py:387
-#, python-format
-msgid ""
-"Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
-msgstr ""
-
-#: ../nova/volume/san.py:395
-#, python-format
-msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
-msgstr ""
-
-#: ../nova/volume/san.py:425
-#, python-format
-msgid ""
-"Unexpected number of virtual ips for cluster  %(cluster_name)s. "
-"Result=%(_xml)s"
-msgstr ""
-
-#: ../nova/volume/san.py:478
-#, python-format
-msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
-msgstr ""
-
-#. TODO(justinsb): Is this needed here?
-#: ../nova/volume/san.py:523 ../nova/volume/driver.py:831
-msgid "local_path not supported"
-msgstr ""
-
-#: ../nova/volume/san.py:555
-#, python-format
-msgid "Could not determine project for volume %s, can't export"
-msgstr ""
-
-#: ../nova/volume/driver.py:79
-#, python-format
-msgid "Recovering from a failed execute.  Try number %s"
-msgstr "Récupération après une exécution erronée. Tentative numéro %s"
-
-#: ../nova/volume/driver.py:89
-#, python-format
-msgid "volume group %s doesn't exist"
-msgstr "Le groupe de volume %s n'existe pas"
-
-#: ../nova/volume/driver.py:251 ../nova/volume/driver.py:847
-msgid "Skipping ensure_export. No iscsi_target "
-msgstr "ensure_export sauté. Pas d'iscsi_target "
-
-#: ../nova/volume/driver.py:295 ../nova/volume/driver.py:304
-#: ../nova/volume/driver.py:891
-msgid "Skipping remove_export. No iscsi_target "
-msgstr "remove_export sauté. Pas d'iscsi_target "
-
-#. TODO(justinsb): Deprecate discovery and use stored info
-#. NOTE(justinsb): Discovery won't work with CHAP-secured targets (?)
-#: ../nova/volume/driver.py:314
-msgid "ISCSI provider_location not stored, using discovery"
-msgstr ""
-
-#: ../nova/volume/driver.py:359
-#, python-format
-msgid "Could not find iSCSI export  for volume %s"
-msgstr "Imposible de trouver une exportation iSCSI pour le volume %s"
-
-#: ../nova/volume/driver.py:363
-#, python-format
-msgid "ISCSI Discovery: Found %s"
-msgstr ""
-
-#. Instances remount read-only in this case.
-#. /etc/init.d/iscsitarget restart and rebooting nova-volume
-#. is better since ensure_export() works at boot time.
-#: ../nova/volume/driver.py:436
-#, python-format
-msgid "Cannot confirm exported volume id:%(volume_id)s."
-msgstr ""
-
-#: ../nova/volume/driver.py:463
-#, python-format
-msgid "FAKE ISCSI: %s"
-msgstr "FAUX ISCSI: %s"
-
-#: ../nova/volume/driver.py:475
-#, python-format
-msgid "rbd has no pool %s"
-msgstr "rbd n'as pas de file %s"
-
-#: ../nova/volume/driver.py:545
-#, python-format
-msgid "Sheepdog is not working: %s"
-msgstr "Sheepdog n'est pas actif : %s"
-
-#: ../nova/volume/driver.py:547
-msgid "Sheepdog is not working"
-msgstr "Sheepdog n'est pas actif"
-
-#: ../nova/volume/driver.py:646 ../nova/volume/driver.py:651
-#, python-format
-msgid "LoggingVolumeDriver: %s"
-msgstr ""
-
-#: ../nova/volume/driver.py:686
-#, python-format
-msgid "\tVolume %s is NOT VSA volume"
-msgstr ""
-
-#: ../nova/volume/driver.py:702
-#, python-format
-msgid "\tFE VSA Volume %s creation - do nothing"
-msgstr ""
-
-#: ../nova/volume/driver.py:735
-#, python-format
-msgid "VSA BE create_volume for %s failed"
-msgstr ""
-
-#: ../nova/volume/driver.py:738
-#, python-format
-msgid "VSA BE create_volume for %s succeeded"
-msgstr ""
-
-#: ../nova/volume/driver.py:746
-#, python-format
-msgid "\tFE VSA Volume %s deletion - do nothing"
-msgstr ""
-
-#: ../nova/volume/driver.py:757
-#, python-format
-msgid "VSA BE delete_volume for %s failed"
-msgstr ""
-
-#: ../nova/volume/driver.py:760
-#, python-format
-msgid "VSA BE delete_volume for %s suceeded"
-msgstr ""
-
-#: ../nova/volume/driver.py:798 ../nova/virt/libvirt/volume.py:146
-#, python-format
-msgid "iSCSI device not found at %s"
-msgstr ""
-
-#: ../nova/volume/driver.py:801 ../nova/virt/libvirt/volume.py:149
-#, python-format
-msgid ""
-"ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  Try "
-"number: %(tries)s"
-msgstr ""
-
-#: ../nova/volume/driver.py:813 ../nova/virt/libvirt/volume.py:161
-#, python-format
-msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
-msgstr ""
-
-#: ../nova/volume/driver.py:824
-#, python-format
-msgid "\tFE VSA Volume %s local path call - call discover"
-msgstr ""
-
-#: ../nova/volume/driver.py:839
-#, python-format
-msgid "\tFE VSA Volume %s ensure export - do nothing"
-msgstr ""
-
-#: ../nova/volume/driver.py:863
-#, python-format
-msgid "\tFE VSA Volume %s create export - do nothing"
-msgstr ""
-
-#: ../nova/volume/driver.py:883
-#, python-format
-msgid "\tFE VSA Volume %s remove export - do nothing"
-msgstr ""
-
-#: ../nova/volume/driver.py:903
+#: nova/volume/driver.py:916
 #, python-format
 msgid "VSA BE remove_export for %s failed"
 msgstr ""
 
-#: ../nova/volume/driver.py:955
+#: nova/volume/driver.py:968
 msgid "Failed to retrieve QoS info"
 msgstr ""
 
-#: ../nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:53
-#: ../nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:83
+#: nova/api/openstack/auth.py:91
 #, python-format
-msgid "Table |%s| not created!"
-msgstr ""
-
-#: ../nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:61
-msgid "instance_info_caches tables not dropped"
+msgid "%(user_id)s could not be found with token '%(token)s'"
 msgstr ""
 
-#: ../nova/scheduler/zone_manager.py:86
+#: nova/api/openstack/auth.py:135
 #, python-format
-msgid "'%(exception)s' error talking to zone %(api_url)s"
+msgid "%(user_id)s must be an admin or a member of %(project_id)s"
 msgstr ""
 
-#: ../nova/scheduler/zone_manager.py:93
-#, python-format
+#: nova/api/openstack/auth.py:153
 msgid ""
-"No answer from zone %(api_url)s after %(max_errors)d attempts. Marking "
-"inactive."
+"Authentication requests must be made against a version root (e.g. /v2)."
 msgstr ""
 
-#: ../nova/scheduler/zone_manager.py:111
+#: nova/api/openstack/auth.py:168
 #, python-format
-msgid "Polling zone: %(name)s @ %(url)s"
+msgid "Could not find %s in request."
 msgstr ""
 
-#: ../nova/scheduler/zone_manager.py:236
+#: nova/api/openstack/auth.py:188
 #, python-format
-msgid "No service for compute ID %s"
+msgid "Successfully authenticated '%s'"
 msgstr ""
 
-#: ../nova/scheduler/zone_manager.py:325
-msgid "Updating zone cache from db."
+#: nova/api/openstack/auth.py:238
+msgid "User not found with provided API key."
 msgstr ""
 
-#: ../nova/scheduler/zone_manager.py:332
+#: nova/api/openstack/auth.py:255
 #, python-format
-msgid "Received %(service_name)s service update from %(host)s."
+msgid "Provided API key is valid, but not for user '%(username)s'"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/rescue.py:48
-#: ../nova/api/openstack/v2/contrib/multinic.py:71
-#: ../nova/api/openstack/v2/contrib/admin_actions.py:145
-#: ../nova/api/openstack/v2/contrib/admin_actions.py:162
-#: ../nova/api/openstack/v2/contrib/admin_actions.py:179
-msgid "Server not found"
+#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:61
+msgid "instance_info_caches tables not dropped"
 msgstr ""
 
-#: ../nova/ipv6/account_identifier.py:38 ../nova/ipv6/rfc2462.py:34
-#, python-format
-msgid "Bad mac for to_global_ipv6: %s"
+#: nova/api/openstack/compute/contrib/scheduler_hints.py:41
+msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
-#: ../nova/ipv6/account_identifier.py:40 ../nova/ipv6/rfc2462.py:36
+#: nova/tests/api/openstack/compute/contrib/test_vsa.py:58
 #, python-format
-msgid "Bad prefix for to_global_ipv6: %s"
+msgid "_create: param=%s"
 msgstr ""
 
-#: ../nova/ipv6/account_identifier.py:42
+#: nova/ipv6/account_identifier.py:42
 #, python-format
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: ../nova/cloudpipe/pipelib.py:45
-msgid "Template for script to run on cloudpipe instance boot"
-msgstr "Patron du script à exécuter au boot d'instance cloudpipe"
-
-#: ../nova/cloudpipe/pipelib.py:48
-msgid "Network to push into openvpn config"
-msgstr "Réseau à passer à la configuration d'openvpn"
-
-#: ../nova/cloudpipe/pipelib.py:51
-msgid "Netmask to push into openvpn config"
-msgstr "Masque réseau à passer à la configuration d'openvpn"
-
-#: ../nova/cloudpipe/pipelib.py:96
-#, python-format
-msgid "Launching VPN for %s"
-msgstr "Démarrage du VPN pour %s"
-
-#: ../nova/virt/xenapi/network_utils.py:37
+#: nova/virt/xenapi/network_utils.py:37
 #, python-format
 msgid "Found non-unique network for name_label %s"
 msgstr ""
 
-#: ../nova/virt/xenapi/network_utils.py:55
+#: nova/virt/xenapi/network_utils.py:55
 #, python-format
 msgid "Found non-unique network for bridge %s"
 msgstr "Réseau non unique trouvé pour le bridge %s"
 
-#: ../nova/virt/xenapi/network_utils.py:58
+#: nova/virt/xenapi/network_utils.py:58
 #, python-format
 msgid "Found no network for bridge %s"
 msgstr "Aucun réseau trouvé pour le bridge %s"
 
-#: ../nova/scheduler/api.py:130
-#, python-format
-msgid "Authentication failed to zone '%(name)s' URL=%(url)s: %(e)s"
-msgstr ""
-
-#: ../nova/scheduler/api.py:169
-#, python-format
-msgid "Failed request to zone; URL=%(url)s: %(e)s"
+#: nova/api/openstack/compute/contrib/cloudpipe.py:117
+msgid ""
+"Unable to claim IP for VPN instances, ensure it isn't running, and try again "
+"in a few minutes"
 msgstr ""
 
-#: ../nova/scheduler/api.py:208
+#: nova/virt/firewall.py:130
 #, python-format
-msgid ""
-"%(collection)s.%(method_name)s didn't find anything matching '%(kwargs)s' on "
-"'%(url)s'"
+msgid "Attempted to unfilter instance %s which is not filtered"
 msgstr ""
+"Tentative de suppression de filtre pour l'intance %s qui n'est pas filtrée"
 
-#: ../nova/scheduler/api.py:220
+#: nova/virt/firewall.py:137
 #, python-format
-msgid "%(collection)s '%(item)s' not found on '%(url)s'"
+msgid "Filters added to instance %s"
 msgstr ""
 
-#: ../nova/scheduler/api.py:245
-msgid "Uncaught Zone redirection exception"
+#: nova/virt/firewall.py:139
+msgid "Provider Firewall Rules refreshed"
 msgstr ""
 
-#. Ask the children to provide an answer ...
-#: ../nova/scheduler/api.py:284
-msgid "Asking child zones ..."
+#: nova/virt/firewall.py:291
+#, python-format
+msgid "Adding security group rule: %r"
 msgstr ""
 
-#: ../nova/scheduler/api.py:306
+#: nova/virt/firewall.py:402 nova/virt/xenapi/firewall.py:88
 #, python-format
-msgid "Instance %(item_uuid)s not found locally: '%(e)s'"
+msgid "Adding provider rule: %s"
 msgstr ""
 
-#: ../nova/virt/libvirt/vif.py:80
+#: nova/virt/libvirt/vif.py:85
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: ../nova/virt/libvirt/vif.py:88
+#: nova/virt/libvirt/vif.py:93
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: ../nova/virt/libvirt/vif.py:147
+#: nova/virt/libvirt/vif.py:152
 #, python-format
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: ../nova/api/openstack/wsgi.py:123
+#: nova/api/openstack/wsgi.py:134 nova/api/openstack/wsgi.py:537
 msgid "cannot understand JSON"
 msgstr ""
 
-#: ../nova/api/openstack/wsgi.py:147
-#: ../nova/api/openstack/v2/contrib/hosts.py:171
+#: nova/api/openstack/wsgi.py:158
+#: nova/api/openstack/compute/contrib/hosts.py:86
 msgid "cannot understand XML"
 msgstr ""
 
-#: ../nova/api/openstack/wsgi.py:257
-msgid "Unrecognized Content-Type provided in request"
+#: nova/api/openstack/wsgi.py:542
+msgid "too many body keys"
 msgstr ""
 
-#: ../nova/api/openstack/wsgi.py:261
-msgid "No Content-Type provided in request"
+#: nova/api/openstack/wsgi.py:580
+#, python-format
+msgid "Fault thrown: %s"
 msgstr ""
 
-#: ../nova/api/openstack/wsgi.py:265
-msgid "Empty body provided in request"
+#: nova/api/openstack/wsgi.py:583
+#, python-format
+msgid "HTTP exception thrown: %s"
 msgstr ""
 
-#: ../nova/api/openstack/wsgi.py:271
-msgid "Unable to deserialize body as provided Content-Type"
+#: nova/api/openstack/wsgi.py:691
+msgid "Unrecognized Content-Type provided in request"
 msgstr ""
 
-#: ../nova/api/openstack/wsgi.py:556
-msgid "Unsupported Content-Type"
+#: nova/api/openstack/wsgi.py:695
+msgid "No Content-Type provided in request"
 msgstr ""
 
-#: ../nova/api/openstack/wsgi.py:559
-#: ../nova/api/openstack/v2/server_metadata.py:55
-#: ../nova/api/openstack/v2/server_metadata.py:71
-#: ../nova/api/openstack/v2/server_metadata.py:96
-#: ../nova/api/openstack/v2/server_metadata.py:121
-msgid "Malformed request body"
+#: nova/api/openstack/wsgi.py:699
+msgid "Empty body provided in request"
 msgstr ""
 
-#: ../nova/api/openstack/wsgi.py:569
+#: nova/api/openstack/wsgi.py:810
 #, python-format
-msgid "Fault thrown: %s"
+msgid "There is no such action: %s"
 msgstr ""
 
-#: ../nova/api/openstack/wsgi.py:572
-#, python-format
-msgid "HTTP exception thrown: %s"
+#: nova/api/openstack/wsgi.py:823
+msgid "Unsupported Content-Type"
 msgstr ""
 
-#: ../nova/api/openstack/wsgi.py:585
-#, python-format
-msgid "%(url)s returned with HTTP %(status)d"
+#: nova/api/openstack/wsgi.py:835
+msgid "Malformed request url"
 msgstr ""
 
-#: ../nova/api/openstack/wsgi.py:588
+#: nova/api/openstack/__init__.py:45 nova/api/openstack/wsgi.py:881
 #, python-format
-msgid "%(url)s returned a fault: %(e)s"
-msgstr ""
-
-#: ../nova/api/openstack/v2/contrib/multinic.py:79
-msgid "Missing 'networkId' argument for addFixedIp"
-msgstr ""
-
-#: ../nova/api/openstack/v2/contrib/multinic.py:93
-msgid "Missing 'address' argument for removeFixedIp"
+msgid "%(url)s returned with HTTP %(status)d"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/multinic.py:103
+#: nova/api/openstack/wsgi.py:884
 #, python-format
-msgid "Unable to find address %r"
+msgid "%(url)s returned a fault: %(e)s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/auth.py:93
+#: nova/tests/fake_utils.py:72
 #, python-format
-msgid "%(user_id)s could not be found with token '%(token)s'"
+msgid "Faking execution of cmd (subprocess): %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/auth.py:137 ../bin/nova-manage.py:1385
+#: nova/tests/fake_utils.py:80
 #, python-format
-msgid "%(user_id)s must be an admin or a member of %(project_id)s"
-msgstr ""
-
-#: ../nova/api/openstack/v2/auth.py:155
-msgid ""
-"Authentication requests must be made against a version root (e.g. /v2)."
+msgid "Faked command matched %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/auth.py:170
+#: nova/tests/fake_utils.py:96
 #, python-format
-msgid "Could not find %s in request."
+msgid "Faked command raised an exception %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/auth.py:184
+#: nova/tests/fake_utils.py:101
 #, python-format
-msgid "Successfully authenticated '%s'"
+msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: ../nova/api/openstack/v2/auth.py:234
-msgid "User not found with provided API key."
+#: nova/policy.py:30
+msgid "JSON file representing policy"
 msgstr ""
 
-#: ../nova/api/openstack/v2/auth.py:253
-#, python-format
-msgid "Provided API key is valid, but not for user '%(username)s'"
+#: nova/policy.py:33
+msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: ../nova/crypto.py:50
+#: nova/crypto.py:50
 msgid "Filename of root CA"
 msgstr "Nom du fichier contenant la racine de l'autorité de certification"
 
-#: ../nova/crypto.py:53
+#: nova/crypto.py:53
 msgid "Filename of private key"
 msgstr "Nom de fichier de la clé privée"
 
-#: ../nova/crypto.py:55
+#: nova/crypto.py:56
 msgid "Filename of root Certificate Revocation List"
 msgstr ""
 
-#: ../nova/crypto.py:57
+#: nova/crypto.py:59
 msgid "Where we keep our keys"
 msgstr "Emplacement de sauvegarde des clefs"
 
-#: ../nova/crypto.py:59
+#: nova/crypto.py:62
 msgid "Where we keep our root CA"
 msgstr "Emplacement de sauvegarde des racines d'autorité de certification"
 
-#: ../nova/crypto.py:61
+#: nova/crypto.py:65
 msgid "Should we use a CA for each project?"
 msgstr "Doit-on utiliser une autorité de certification pour chaque projet ?"
 
-#: ../nova/crypto.py:65
+#: nova/crypto.py:69
 #, python-format
 msgid "Subject for certificate for users, %s for project, user, timestamp"
 msgstr ""
 "Sujet pour les certificats utilisateurs, %s pour le projet, utilisateur, "
 "timestamp"
 
-#: ../nova/crypto.py:70
+#: nova/crypto.py:74
 #, python-format
 msgid "Subject for certificate for projects, %s for project, timestamp"
 msgstr "Sujet de certificat pour projets, %s pour le projet, timestamp"
 
-#: ../nova/crypto.py:75
-#, python-format
-msgid "Subject for certificate for vpns, %s for project, timestamp"
-msgstr "Suject de certificat pour les vpns, %s pour le projet, timestamp"
-
-#: ../nova/crypto.py:277
+#: nova/crypto.py:296
 #, python-format
 msgid "Flags path: %s"
 msgstr "Chemin des propriétés: %s"
 
-#: ../nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:41
-#: ../nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:41
+#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:43
+#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:42
+#: nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:68
 msgid "foreign key constraint couldn't be removed"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/io_util.py:102
+#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:39
+#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:61
+#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:98
+msgid "foreign key constraint couldn't be added"
+msgstr ""
+
+#: nova/virt/vmwareapi/io_util.py:99
 #, python-format
 msgid "Glance image %s is in killed state"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/io_util.py:110
-msgid "Glance image "
+#: nova/virt/vmwareapi/io_util.py:107
+#, python-format
+msgid "Glance image %(image_id)s is in unknown state - %(state)s"
 msgstr ""
 
-#: ../nova/compute/api.py:133
+#: nova/network/linux_net.py:167
 #, python-format
-msgid ""
-"Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata properties"
+msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: ../nova/compute/api.py:144
+#: nova/network/linux_net.py:193
 #, python-format
-msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+msgid "Unknown chain: %r"
 msgstr ""
 
-#: ../nova/compute/api.py:196
-#, python-format
-msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
-msgstr ""
-
-#: ../nova/compute/api.py:199
-msgid ""
-"Instance quota exceeded. You cannot run any more instances of this type."
-msgstr ""
-
-#: ../nova/compute/api.py:202
-#, python-format
-msgid ""
-"Instance quota exceeded. You can only run %s more instances of this type."
-msgstr ""
-"Quota d'instances dépassé. Vous ne pouvez éxécuter que %s instances de ce "
-"type de plus."
-
-#: ../nova/compute/api.py:251
-msgid "Creating a raw instance"
-msgstr "Création d'une instance raw"
-
-#: ../nova/compute/api.py:306
-#, python-format
-msgid "Going to run %s instances..."
-msgstr "Démarrage de %s instances..."
-
-#: ../nova/compute/api.py:369
-#, python-format
-msgid "bdm %s"
-msgstr ""
-
-#: ../nova/compute/api.py:396
-#, python-format
-msgid "block_device_mapping %s"
-msgstr ""
-
-#: ../nova/compute/api.py:505
-#, python-format
-msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
-msgstr ""
-
-#: ../nova/compute/api.py:777
-#, python-format
-msgid "Going to try to soft delete %s"
-msgstr ""
-
-#: ../nova/compute/api.py:793
-#, python-format
-msgid "No host for instance %s, deleting immediately"
-msgstr ""
-
-#: ../nova/compute/api.py:818
-#, python-format
-msgid "Going to try to terminate %s"
-msgstr "Va essayer d'arrêter %s"
-
-#: ../nova/compute/api.py:852
-#, python-format
-msgid "Going to try to stop %s"
-msgstr ""
-
-#: ../nova/compute/api.py:871
-#, python-format
-msgid "Going to try to start %s"
-msgstr ""
-
-#: ../nova/compute/api.py:874
-#, python-format
-msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s)"
-msgstr ""
-
-#: ../nova/compute/api.py:937 ../nova/volume/api.py:127
-#: ../nova/volume/volume_types.py:80
-#, python-format
-msgid "Searching by: %s"
-msgstr ""
-
-#: ../nova/compute/api.py:1075
-#, python-format
-msgid "Unable to find host for Instance %s"
-msgstr ""
-
-#: ../nova/compute/api.py:1265
-msgid "flavor_id is None. Assuming migration."
-msgstr ""
-
-#: ../nova/compute/api.py:1273
+#: nova/network/linux_net.py:216
 #, python-format
 msgid ""
-"Old instance type %(current_instance_type_name)s,  new instance type "
-"%(new_instance_type_name)s"
-msgstr ""
-
-#: ../nova/compute/api.py:1521
-#, python-format
-msgid "Invalid device specified: %s. Example device: /dev/vdb"
-msgstr "Device spécifié invalide : %s. Exemple de device: /dev/vdb"
-
-#: ../nova/compute/api.py:1536
-msgid "Volume isn't attached to anything!"
-msgstr "Le volume n'est pas attaché à quoi que ce soit!"
-
-#: ../nova/compute/api.py:1567
-#, python-format
-msgid "instance |%s| has no fixed_ips. unable to associate floating ip"
-msgstr ""
-
-#: ../nova/compute/api.py:1571
-#, python-format
-msgid "multiple fixed_ips exist, using the first: %s"
-msgstr ""
-
-#: ../nova/network/linux_net.py:147
-#, python-format
-msgid "Attempted to remove chain %s which does not exist"
+"Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r %(top)r"
 msgstr ""
 
-#: ../nova/network/linux_net.py:173
-#, python-format
-msgid "Unknown chain: %r"
+#: nova/network/linux_net.py:336
+msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: ../nova/network/linux_net.py:196
+#: nova/network/linux_net.py:587 nova/network/linux_net.py:609
+#: nova/network/linux_net.py:651
 #, python-format
-msgid ""
-"Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r %(top)r"
+msgid "Instance %(instance_id)s not found"
 msgstr ""
 
-#. pylint: disable=W0703
-#: ../nova/network/linux_net.py:660
+#: nova/network/linux_net.py:718
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "Hupping dnsmasq à renvoyé %s"
 
-#: ../nova/network/linux_net.py:662
+#: nova/network/linux_net.py:720
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d est dépassé, re-démarrage de dnsmasq"
 
-#. pylint: disable=W0703
-#: ../nova/network/linux_net.py:722
+#: nova/network/linux_net.py:780
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "La destruction de radvd à renvoyé %s"
 
-#: ../nova/network/linux_net.py:724
+#: nova/network/linux_net.py:782
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d est dépassé, re-démarrage radvd"
 
-#: ../nova/network/linux_net.py:931
+#: nova/network/linux_net.py:984
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr "Démarrage de l'interface VLAN %s"
 
-#: ../nova/network/linux_net.py:960
+#: nova/network/linux_net.py:1016
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr "Démarrage de l'interface de Bridge %s"
 
-#: ../nova/virt/xenapi/vm_utils.py:192 ../nova/virt/hyperv.py:189
+#: nova/virt/disk/nbd.py:63
+msgid "No free nbd devices"
+msgstr "Pas de device nbd libre"
+
+#: nova/virt/disk/nbd.py:81
+#, python-format
+msgid "qemu-nbd error: %s"
+msgstr ""
+
+#: nova/virt/disk/nbd.py:93
+#, python-format
+msgid "nbd device %s did not show up"
+msgstr "Device nbd %s n'est pas apparu"
+
+#: nova/virt/xenapi/vm_utils.py:209
 #, python-format
 msgid "Created VM %s..."
 msgstr "VM %s crée..."
 
-#: ../nova/virt/xenapi/vm_utils.py:195
+#: nova/virt/xenapi/vm_utils.py:212
 #, python-format
 msgid "Created VM %(instance_name)s as %(vm_ref)s."
 msgstr "VM %(instance_name)s crée en tant que %(vm_ref)s."
 
-#: ../nova/virt/xenapi/vm_utils.py:226
+#: nova/virt/xenapi/vm_utils.py:243
 #, python-format
 msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:229
+#: nova/virt/xenapi/vm_utils.py:246
 #, python-format
 msgid ""
 "Created a CDROM-specific VBD %(vbd_ref)s  for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:246
+#: nova/virt/xenapi/vm_utils.py:263
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD non trouvé dans l'instance %s"
 
-#: ../nova/virt/xenapi/vm_utils.py:257
+#: nova/virt/xenapi/vm_utils.py:274
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Impossible de deconnecter le VBD %s"
 
-#: ../nova/virt/xenapi/vm_utils.py:268
+#: nova/virt/xenapi/vm_utils.py:285
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Impossible de supprimer le VBD %s"
 
-#: ../nova/virt/xenapi/vm_utils.py:278
+#: nova/virt/xenapi/vm_utils.py:295
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:295
+#: nova/virt/xenapi/vm_utils.py:312
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) on "
@@ -3419,200 +3215,229 @@
 "VDI créé %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) on "
 "%(sr_ref)s."
 
-#: ../nova/virt/xenapi/vm_utils.py:315
+#: nova/virt/xenapi/vm_utils.py:321
+#, python-format
+msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:329
+#, python-format
+msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "No primary VDI found for%(vm_ref)s"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:322
+#: nova/virt/xenapi/vm_utils.py:355
 #, python-format
 msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 msgstr ""
 "Création de l'instantané (snapshot) pour la VM %(vm_ref)s avec le label "
 "'%(label)s'..."
 
-#: ../nova/virt/xenapi/vm_utils.py:336
+#: nova/virt/xenapi/vm_utils.py:369
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 msgstr ""
 "Instantané (snapshot) créé %(template_vm_ref)s pour la  VM %(vm_ref)s."
 
-#. NOTE(sirp): Currently we only support uploading images as VHD, there
-#. is no RAW equivalent (yet)
-#: ../nova/virt/xenapi/vm_utils.py:366
+#: nova/virt/xenapi/vm_utils.py:408
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 "Demande de chargement à xapi de %(vdi_uuids)s en tant qu'ID %(image_id)s"
 
-#: ../nova/virt/xenapi/vm_utils.py:532
+#: nova/virt/xenapi/vm_utils.py:618
+#, python-format
+msgid ""
+"Fast cloning is only supported on default local SR of type ext. SR on this "
+"system was found to be of type %(sr_type)s. Ignoring the cow flag."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:697
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:560
+#: nova/virt/xenapi/vm_utils.py:725
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:588
+#: nova/virt/xenapi/vm_utils.py:754
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:604
+#: nova/virt/xenapi/vm_utils.py:769
 #, python-format
 msgid ""
 "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:608
+#: nova/virt/xenapi/vm_utils.py:773
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#. FIXME(sirp): Since the Glance plugin seems to be required for the
-#. VHD disk, it may be worth using the plugin for both VHD and RAW and
-#. DISK restores
-#: ../nova/virt/xenapi/vm_utils.py:631
+#: nova/virt/xenapi/vm_utils.py:796
 #, python-format
 msgid "Fetching image %(image)s"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:632
+#: nova/virt/xenapi/vm_utils.py:797
 #, python-format
 msgid "Image Type: %s"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:636
+#: nova/virt/xenapi/vm_utils.py:801
 msgid "ISO: Found sr possibly containing the ISO image"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:645
+#: ../nova/virt/xenapi/vm_utils.py:810
 #, python-format
 msgid "Size for image %(image)s:"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:654
+#: nova/virt/xenapi/vm_utils.py:819
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d bytes"
 msgstr ""
 
-#. We need to invoke a plugin for copying the
-#. content of the VDI into the proper path.
-#: ../nova/virt/xenapi/vm_utils.py:671
+#: nova/virt/xenapi/vm_utils.py:836
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copie de VDI %s vers /boot/guest sur dom0"
 
-#: ../nova/virt/xenapi/vm_utils.py:681
+#: nova/virt/xenapi/vm_utils.py:848
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Noyau/Ramdisk VDI %s détruit"
 
-#. We look for XenAPI and OS failures.
-#: ../nova/virt/xenapi/vm_utils.py:691
+#: nova/virt/xenapi/vm_utils.py:858
 #, python-format
 msgid "instance %s: Failed to fetch glance image"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:720
+#: nova/virt/xenapi/vm_utils.py:897
 #, python-format
-msgid "Detected %(disk_format)s format for image %(image_ref)s"
+msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:919
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Recherche du VDI %s pour le PV kernel"
 
-#: ../nova/virt/xenapi/vm_utils.py:777
+#: nova/virt/xenapi/vm_utils.py:937
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:819
+#: nova/virt/xenapi/vm_utils.py:979
 #, python-format
 msgid "VDI %s is still available"
 msgstr "Le VDI %s est toujours disponible"
 
-#: ../nova/virt/xenapi/vm_utils.py:857
+#: nova/virt/xenapi/vm_utils.py:1025
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr "(VM_UTILS) état xenserver vm -> |%s|"
 
-#: ../nova/virt/xenapi/vm_utils.py:859
+#: nova/virt/xenapi/vm_utils.py:1027
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr "(VM_UTILS) xenapi power_state -> |%s|"
 
-#: ../nova/virt/xenapi/vm_utils.py:915
+#: nova/virt/xenapi/vm_utils.py:1072
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-parcours de SR %s"
 
-#: ../nova/virt/xenapi/vm_utils.py:958
+#: nova/virt/xenapi/vm_utils.py:1103
+#, python-format
+msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1121
+msgid ""
+"XenAPI is unable to find a Storage Repository to install guest instances on. "
+"Please check your configuration and/or configure the flag "
+"'sr_matching_filter'"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1134
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:966
+#: nova/virt/xenapi/vm_utils.py:1142
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:968
+#: nova/virt/xenapi/vm_utils.py:1144
 msgid "ISO: not iso content"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:971
+#: nova/virt/xenapi/vm_utils.py:1147
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:974
+#: nova/virt/xenapi/vm_utils.py:1150
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:978
+#: nova/virt/xenapi/vm_utils.py:1154
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:980
+#: nova/virt/xenapi/vm_utils.py:1156
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:983
+#: nova/virt/xenapi/vm_utils.py:1159
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:986
+#: ../nova/virt/xenapi/vm_utils.py:1162
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, "
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:989
+#: nova/virt/xenapi/vm_utils.py:1165
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:1101
+#: nova/virt/xenapi/vm_utils.py:1187
 #, python-format
-msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
-msgstr "VHD %(vdi_uuid)s à pour parent %(parent_ref)s"
+msgid ""
+"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: %(server)s."
+msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:1152
+#: nova/virt/xenapi/vm_utils.py:1203
 #, python-format
-msgid ""
-"VHD coalesce attempts exceeded (%(counter)d > %(max_attempts)d), giving up..."
+msgid "Unable to obtain RRD XML updates with server details: %(server)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1257
+#, python-format
+msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
-"VHD tentatives de coalesence dépassé (%(counter)d > %(max_attempts)d), "
-"abandon..."
 
-#: ../nova/virt/xenapi/vm_utils.py:1159
+#: nova/virt/xenapi/vm_utils.py:1310
+#, python-format
+msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
+msgstr "VHD %(vdi_uuid)s à pour parent %(parent_ref)s"
+
+#: nova/virt/xenapi/vm_utils.py:1384
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -3621,659 +3446,832 @@
 "L'UUID parent %(parent_uuid)s ne correspond pas au parent originel "
 "%(original_parent_uuid)s, attente de coalesence..."
 
-#: ../nova/virt/xenapi/vm_utils.py:1202
+#: nova/virt/xenapi/vm_utils.py:1394
+#, python-format
+msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1429
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:1221
-#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:188
+#: nova/virt/xenapi/vm_utils.py:1448
 #, python-format
 msgid "Creating VBD for VDI %s ... "
 msgstr "Création de VBD pour la VDI %s ... "
 
-#: ../nova/virt/xenapi/vm_utils.py:1223
-#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:190
+#: nova/virt/xenapi/vm_utils.py:1450
 #, python-format
 msgid "Creating VBD for VDI %s done."
 msgstr "La création de VBD pour la VDI %s est terminée."
 
-#: ../nova/virt/xenapi/vm_utils.py:1225
-#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:192
+#: nova/virt/xenapi/vm_utils.py:1452
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Connexion de VBD %s ... "
 
-#: ../nova/virt/xenapi/vm_utils.py:1228
-#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:194
+#: nova/virt/xenapi/vm_utils.py:1455
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Connexion de VBD %s terminée."
 
-#: ../nova/virt/xenapi/vm_utils.py:1230
+#: nova/virt/xenapi/vm_utils.py:1457
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:1233
+#: nova/virt/xenapi/vm_utils.py:1460
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:1242
-#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:197
+#: nova/virt/xenapi/vm_utils.py:1469
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destruction de VBD pour la VDI %s ... "
 
-#: ../nova/virt/xenapi/vm_utils.py:1246
-#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:200
+#: nova/virt/xenapi/vm_utils.py:1473
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destruction de VBD pour la VDI %s terminée."
 
-#: ../nova/virt/xenapi/vm_utils.py:1258
-#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:211
+#: nova/virt/xenapi/vm_utils.py:1484
 msgid "VBD.unplug successful first time."
 msgstr "VBD.unplug terminé dés la première tentative."
 
-#: ../nova/virt/xenapi/vm_utils.py:1263
-#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:216
+#: nova/virt/xenapi/vm_utils.py:1489
 msgid "VBD.unplug rejected: retrying..."
 msgstr "VBD.unplug refusé : nouvel essai..."
 
-#: ../nova/virt/xenapi/vm_utils.py:1265
+#: nova/virt/xenapi/vm_utils.py:1491
 msgid "Not sleeping anymore!"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:1268
-#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:220
+#: nova/virt/xenapi/vm_utils.py:1494
 msgid "VBD.unplug successful eventually."
 msgstr "VBD.unplug à enfin été achevée."
 
-#: ../nova/virt/xenapi/vm_utils.py:1271
-#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:223
+#: nova/virt/xenapi/vm_utils.py:1497
 #, python-format
 msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
 msgstr "XenAPI.Failure ignorée dans VBD.unplug: %s"
 
-#: ../nova/virt/xenapi/vm_utils.py:1280
-#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:66
+#: nova/virt/xenapi/vm_utils.py:1506
 #, python-format
 msgid "Ignoring XenAPI.Failure %s"
 msgstr "XenAPI.Failure %s ignorée"
 
-#: ../nova/virt/xenapi/vm_utils.py:1294
+#: nova/virt/xenapi/vm_utils.py:1520
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Exécution de pygrub sur %s"
 
-#: ../nova/virt/xenapi/vm_utils.py:1301
+#: nova/virt/xenapi/vm_utils.py:1527
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Kernel Xen %s trouvé"
 
-#: ../nova/virt/xenapi/vm_utils.py:1303
+#: nova/virt/xenapi/vm_utils.py:1529
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Pas de kernel Xen trouvé.  Démarrage en HVM."
 
-#: ../nova/virt/xenapi/vm_utils.py:1316
+#: nova/virt/xenapi/vm_utils.py:1542
 msgid "Partitions:"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:1322
+#: nova/virt/xenapi/vm_utils.py:1548
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:1348
+#: nova/virt/xenapi/vm_utils.py:1574
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to %(dev_path)s..."
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:1361
+#: nova/virt/xenapi/vm_utils.py:1587
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Ecriture de la table de partitionnement %s terminée."
 
-#. The presence of the guest agent
-#. file indicates that this instance can
-#. reconfigure the network from xenstore data,
-#. so manipulation of files in /etc is not
-#. required
-#: ../nova/virt/xenapi/vm_utils.py:1449
+#: nova/virt/xenapi/vm_utils.py:1676
 msgid ""
 "XenServer tools installed in this image are capable of network injection.  "
 "Networking files will not bemanipulated"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:1457
+#: nova/virt/xenapi/vm_utils.py:1684
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:1461
+#: nova/virt/xenapi/vm_utils.py:1688
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:1478
+#: nova/virt/xenapi/vm_utils.py:1705
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: ../nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1712
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: ../nova/db/sqlalchemy/session.py:87
+#: nova/db/sqlalchemy/session.py:87
 #, python-format
 msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
 msgstr ""
 
-#: ../nova/virt/images.py:76
+#: nova/virt/images.py:95
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: ../nova/virt/images.py:84
+#: nova/virt/images.py:101
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: ../nova/virt/images.py:95
+#: nova/virt/images.py:114
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#. TODO(vish): Do this with M2Crypto instead
-#: ../nova/api/ec2/cloud.py:227
-#, python-format
-msgid "Generating root CA: %s"
-msgstr "Génération de la racine d'autorité de certification : %s"
-
-#: ../nova/api/ec2/cloud.py:351
+#: nova/api/ec2/cloud.py:326
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: ../nova/api/ec2/cloud.py:385
+#: nova/api/ec2/cloud.py:361
 #, python-format
 msgid "Create key pair %s"
 msgstr "Création du bi-clef %s"
 
-#: ../nova/api/ec2/cloud.py:394
+#: nova/api/ec2/cloud.py:370
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: ../nova/api/ec2/cloud.py:414
+#: nova/api/ec2/cloud.py:388
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Suppression du bi-clef %s"
 
-#: ../nova/api/ec2/cloud.py:673 ../nova/api/ec2/cloud.py:729
+#: nova/api/ec2/cloud.py:648 nova/api/ec2/cloud.py:708
 msgid "No rule for the specified parameters."
 msgstr "Pas de règle pour les paramètres spécifiés."
 
-#. Some validation to ensure that values match API spec.
-#. - Alphanumeric characters, spaces, dashes, and underscores.
-#. TODO(Daviey): LP: #813685 extend beyond group_name checking, and
-#. probably create a param validator that can be used elsewhere.
-#: ../nova/api/ec2/cloud.py:754
+#: nova/api/ec2/cloud.py:733
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: ../nova/api/ec2/cloud.py:761
+#: nova/api/ec2/cloud.py:740
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of 255."
 msgstr ""
 
-#: ../nova/api/ec2/cloud.py:765
-#: ../nova/api/openstack/v2/contrib/security_groups.py:138
+#: nova/api/ec2/cloud.py:744
+#: nova/api/openstack/compute/contrib/security_groups.py:286
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Création du groupe de sécurité %s"
 
-#: ../nova/api/ec2/cloud.py:768
+#: nova/api/ec2/cloud.py:747
 #, python-format
 msgid "group %s already exists"
 msgstr "le groupe %s existe déjà"
 
-#: ../nova/api/ec2/cloud.py:795
-#: ../nova/api/openstack/v2/contrib/security_groups.py:98
+#: nova/api/ec2/cloud.py:777
+#: nova/api/openstack/compute/contrib/security_groups.py:239
 #, python-format
 msgid "Delete security group %s"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: ../nova/api/ec2/cloud.py:883
+#: nova/api/ec2/cloud.py:854
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: ../nova/api/ec2/cloud.py:922
+#: nova/api/ec2/cloud.py:883
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 "Montage du volume %(volume_id)s sur l'instance %(instance_id)s en tant que "
 "%(device)s"
 
-#: ../nova/api/ec2/cloud.py:963 ../nova/api/ec2/cloud.py:1024
-#: ../nova/api/ec2/cloud.py:1500 ../nova/api/ec2/cloud.py:1515
+#: nova/api/ec2/cloud.py:924 nova/api/ec2/cloud.py:981
+#: nova/api/ec2/cloud.py:1443 nova/api/ec2/cloud.py:1458
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "attribut non reconnu : %s"
 
-#: ../nova/api/ec2/cloud.py:1070
+#: nova/api/ec2/cloud.py:1046
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: ../nova/api/ec2/cloud.py:1221
+#: nova/api/ec2/cloud.py:1191
 msgid "Allocate address"
 msgstr "Allocation d'adresse"
 
-#: ../nova/api/ec2/cloud.py:1233
+#: nova/api/ec2/cloud.py:1203
 #, python-format
 msgid "Release address %s"
 msgstr "Désallocation de l'adresse %s"
 
-#: ../nova/api/ec2/cloud.py:1238
+#: nova/api/ec2/cloud.py:1208
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 "Association de l'adresse %(public_ip)s avec l'instance %(instance_id)s"
 
-#: ../nova/api/ec2/cloud.py:1248
+#: nova/api/ec2/cloud.py:1218
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Désassociation de l'adresse %s"
 
-#: ../nova/api/ec2/cloud.py:1273
+#: nova/api/ec2/cloud.py:1243
 msgid "Image must be available"
 msgstr ""
 
-#: ../nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1264
 msgid "Going to start terminating instances"
 msgstr "Début de la destruction d'instance"
 
-#: ../nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1277
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Re-démarrage de l'instance %r"
 
-#: ../nova/api/ec2/cloud.py:1315
+#: nova/api/ec2/cloud.py:1287
 msgid "Going to stop instances"
 msgstr ""
 
-#: ../nova/api/ec2/cloud.py:1325
+#: nova/api/ec2/cloud.py:1297
 msgid "Going to start instances"
 msgstr ""
 
-#: ../nova/api/ec2/cloud.py:1334
-#, python-format
-msgid "Going to rescue instance %s"
-msgstr ""
-
-#: ../nova/api/ec2/cloud.py:1342
-#, python-format
-msgid "Going to unrescue instance %s"
-msgstr ""
-
-#: ../nova/api/ec2/cloud.py:1445
+#: nova/api/ec2/cloud.py:1388
 #, python-format
 msgid "De-registering image %s"
 msgstr "Dé-enregitrement de l'image %s"
 
-#: ../nova/api/ec2/cloud.py:1472
+#: nova/api/ec2/cloud.py:1415
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "Image %(image_location)s enregistré avec l'id %(image_id)s"
 
-#: ../nova/api/ec2/cloud.py:1518
+#: nova/api/ec2/cloud.py:1461
 msgid "user or group not specified"
 msgstr "Utilisateur ou groupe non spécifié"
 
-#: ../nova/api/ec2/cloud.py:1520
+#: nova/api/ec2/cloud.py:1463
 msgid "only group \"all\" is supported"
 msgstr "Seul le group \"tous\" est supporté"
 
-#: ../nova/api/ec2/cloud.py:1522
+#: nova/api/ec2/cloud.py:1465
 msgid "operation_type must be add or remove"
 msgstr ""
 "le type d'opération (operation_type) doit être ajout (add) ou suppression "
 "(remove)"
 
-#: ../nova/api/ec2/cloud.py:1523
+#: nova/api/ec2/cloud.py:1467
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Mis à jour de la publication de l'image %s"
 
-#: ../nova/api/ec2/cloud.py:1579
+#: nova/api/ec2/cloud.py:1524
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: ../nova/tests/test_xenapi.py:567
-#, python-format
-msgid "Creating files in %s to simulate guest agent"
-msgstr ""
-
-#. Umount would normall make files in the m,ounted filesystem
-#. disappear, so do that here
-#: ../nova/tests/test_xenapi.py:578
-#, python-format
-msgid "Removing simulated guest agent files in %s"
-msgstr ""
-
-#: ../nova/tests/fakelibvirt.py:774
-msgid "Please extend mock libvirt module to support flags"
-msgstr ""
-
-#: ../nova/tests/fakelibvirt.py:780
-msgid "Please extend fake libvirt module to support this auth method"
-msgstr ""
-
-#: ../nova/api/openstack/v2/extensions.py:300
-#, python-format
-msgid "Extended resource: %s"
-msgstr ""
-
-#: ../nova/api/openstack/v2/extensions.py:321
-#, python-format
-msgid "Extended action: %s"
-msgstr ""
-
-#: ../nova/api/openstack/v2/extensions.py:329
-#, python-format
-msgid "Extended request: %s"
-msgstr ""
-
-#: ../nova/api/openstack/v2/extensions.py:372
-msgid "Initializing extension manager."
-msgstr ""
-
-#: ../nova/api/openstack/v2/extensions.py:383
+#: nova/api/openstack/extensions.py:191
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/extensions.py:433
+#: nova/api/openstack/extensions.py:228
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/extensions.py:434
+#: nova/api/openstack/extensions.py:229
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/extensions.py:435
+#: nova/api/openstack/extensions.py:230
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/extensions.py:437
+#: nova/api/openstack/extensions.py:232
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/extensions.py:438
+#: nova/api/openstack/extensions.py:233
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/extensions.py:440
+#: nova/api/openstack/extensions.py:235
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/extensions.py:453
+#: nova/api/openstack/extensions.py:249
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#. Call it
-#: ../nova/api/openstack/v2/extensions.py:459
+#: nova/api/openstack/extensions.py:255
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/extensions.py:469
+#: nova/api/openstack/extensions.py:267
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: ../nova/scheduler/scheduler_options.py:62
+#: nova/api/openstack/extensions.py:345
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: ../nova/scheduler/scheduler_options.py:71
+#: nova/api/openstack/extensions.py:369
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Failed to load extension %(ext_name)s: %(exc)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_groups.py:219
+msgid "Security group id should be integer"
 msgstr ""
 
-#: ../nova/image/s3.py:290
+#: nova/api/openstack/compute/contrib/security_groups.py:289
 #, python-format
-msgid "Failed to download %(image_location)s to %(image_path)s"
+msgid "Security group %s already exists"
 msgstr ""
 
-#: ../nova/image/s3.py:314
+#: nova/api/openstack/compute/contrib/security_groups.py:309
 #, python-format
-msgid "Failed to decrypt %(image_location)s to %(image_path)s"
+msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: ../nova/image/s3.py:326
+#: nova/api/openstack/compute/contrib/security_groups.py:312
 #, python-format
-msgid "Failed to untar %(image_location)s to %(image_path)s"
+msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: ../nova/image/s3.py:339
+#: nova/api/openstack/compute/contrib/security_groups.py:315
 #, python-format
-msgid "Failed to upload %(image_location)s to %(image_path)s"
+msgid "Security group %s should not be greater than 255 characters."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/security_groups.py:342
+msgid "Parent group id is not integer"
 msgstr ""
 
-#: ../nova/image/s3.py:365
+#: nova/api/openstack/compute/contrib/security_groups.py:345
 #, python-format
-msgid "Failed to decrypt private key: %s"
-msgstr "Impossible de déchiffrer la clef privée : %s"
+msgid "Security group (%s) not found"
+msgstr ""
 
-#: ../nova/image/s3.py:374
+#: nova/api/openstack/compute/contrib/security_groups.py:348
 #, python-format
-msgid "Failed to decrypt initialization vector: %s"
-msgstr "Impossible de déchiffrer le vecteur d'initialisation : %s"
+msgid "Authorize security group ingress %s"
+msgstr "Authorisation du groupe de sécurité %s"
+
+#: nova/api/openstack/compute/contrib/security_groups.py:363
+msgid "Not enough parameters to build a valid rule."
+msgstr "Pas assez de parametres pour contruire un règle valide."
 
-#: ../nova/image/s3.py:385
+#: nova/api/openstack/compute/contrib/security_groups.py:370
 #, python-format
-msgid "Failed to decrypt image file %(image_file)s: %(err)s"
-msgstr "Impossible de déchiffrer le fichier image %(image_file)s: %(err)s"
+msgid "This rule already exists in group %s"
+msgstr "Cette règle existe déjà dans le groupe %s"
 
-#: ../nova/image/s3.py:397
-msgid "Unsafe filenames in image"
+#: nova/api/openstack/compute/contrib/security_groups.py:408
+msgid "Parent or group id is not integer"
 msgstr ""
 
-#: ../nova/scheduler/manager.py:97
-#, python-format
-msgid ""
-"Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
+#: nova/api/openstack/compute/contrib/security_groups.py:412
+msgid "Parent group id and group id cannot be same"
 msgstr ""
 
-#: ../nova/scheduler/manager.py:115
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
+#: nova/api/openstack/compute/contrib/security_groups.py:490
+msgid "Rule id is not integer"
 msgstr ""
 
-#: ../nova/scheduler/manager.py:119
+#: nova/api/openstack/compute/contrib/security_groups.py:493
 #, python-format
-msgid "Setting instance %(instance_id)s to ERROR state."
+msgid "Rule (%s) not found"
 msgstr ""
 
-#: ../nova/api/ec2/apirequest.py:73
+#: nova/api/openstack/compute/contrib/security_groups.py:500
 #, python-format
-msgid ""
-"Unsupported API request: controller = %(controller)s, action = %(action)s"
+msgid "Revoke security group ingress %s"
+msgstr "Révocation de groupe de sécurité %s"
+
+#: nova/api/openstack/compute/contrib/security_groups.py:562
+#: nova/api/openstack/compute/contrib/security_groups.py:595
+msgid "Security group not specified"
 msgstr ""
-"Requête API non supportée : controleur = %(controller)s, action = %(action)s"
 
-#: ../nova/vsa/api.py:76
-#, python-format
-msgid "Invalid drive type %s"
+#: nova/api/openstack/compute/contrib/security_groups.py:566
+#: nova/api/openstack/compute/contrib/security_groups.py:599
+msgid "Security group name cannot be empty"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/consoles.py:44
+msgid "Missing type specification"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/consoles.py:56
+msgid "Invalid type specification"
 msgstr ""
 
-#: ../nova/vsa/api.py:99
+#: nova/tests/test_xenapi.py:602
 #, python-format
-msgid "No drive_name param found in %s"
+msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: ../nova/vsa/api.py:104
+#: nova/tests/test_xenapi.py:613
 #, python-format
-msgid "Invalid drive type name %s"
+msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: ../nova/vsa/api.py:149
-msgid "*** Experimental VSA code ***"
+#: nova/tests/fakelibvirt.py:774
+msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: ../nova/vsa/api.py:152 ../nova/vsa/api.py:303
-#, python-format
-msgid "Requested number of VCs (%d) is too high. Setting to default"
+#: nova/tests/fakelibvirt.py:780
+msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: ../nova/vsa/api.py:178
-#, python-format
-msgid "Failed to find configured image %s"
+#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:170
+msgid "No body provided"
 msgstr ""
 
-#: ../nova/vsa/api.py:191
+#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:182
 #, python-format
-msgid "Creating VSA: %s"
+msgid "Create VSA %(display_name)s of type %(vc_type)s"
 msgstr ""
 
-#: ../nova/vsa/api.py:207
+#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:203
 #, python-format
-msgid "Error in storage parameters: %s"
+msgid "Delete VSA with id: %s"
 msgstr ""
 
-#: ../nova/vsa/api.py:241
+#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:222
 #, python-format
-msgid ""
-"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d GB, "
-"type %(vol_type_id)s"
+msgid "Associate address %(ip)s to VSA %(id)s"
 msgstr ""
 
-#: ../nova/vsa/api.py:272
+#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:251
 #, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
+msgid "Disassociate address from VSA %(id)s"
 msgstr ""
 
-#: ../nova/vsa/api.py:287
+#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:291
 #, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA call"
+msgid "%(obj)s with ID %(id)s not found"
 msgstr ""
 
-#: ../nova/vsa/api.py:318
+#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:297
 #, python-format
-msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
+msgid ""
+"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA "
+"%(vsa_id)s."
 msgstr ""
 
-#: ../nova/vsa/api.py:324
+#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:317
 #, python-format
-msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
+msgid "Index. vsa_id=%(vsa_id)s"
 msgstr ""
 
-#: ../nova/vsa/api.py:351
+#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:322
 #, python-format
-msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
+msgid "Detail. vsa_id=%(vsa_id)s"
 msgstr ""
 
-#: ../nova/vsa/api.py:355
+#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:327
 #, python-format
-msgid "Unable to delete volume %s"
+msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
 msgstr ""
 
-#: ../nova/vsa/api.py:357
+#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:336
 #, python-format
-msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
+msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
 msgstr ""
 
-#: ../nova/vsa/api.py:363
+#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:381
 #, python-format
-msgid "Going to try to terminate VSA ID %s"
+msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
 msgstr ""
 
-#: ../nova/vsa/api.py:374
+#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:396
 #, python-format
-msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
+msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
 msgstr ""
 
-#: ../nova/api/openstack/common.py:129 ../nova/api/openstack/common.py:164
-msgid "limit param must be an integer"
+#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:412
+#, python-format
+msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:623
+#, python-format
+msgid "Index instances for VSA %s"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:46
+msgid "Template for cloudpipe instance boot script"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:49
+msgid "Network to push into openvpn config"
+msgstr "Réseau à passer à la configuration d'openvpn"
+
+#: nova/cloudpipe/pipelib.py:52
+msgid "Netmask to push into openvpn config"
+msgstr "Masque réseau à passer à la configuration d'openvpn"
+
+#: nova/cloudpipe/pipelib.py:101
+#, python-format
+msgid "Launching VPN for %s"
+msgstr "Démarrage du VPN pour %s"
+
+#: nova/scheduler/scheduler_options.py:67
+#, python-format
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgstr ""
+
+#: nova/scheduler/scheduler_options.py:75
+#, python-format
+msgid "Could not decode scheduler options: '%(e)s'"
+msgstr ""
+
+#: nova/image/s3.py:296
+#, python-format
+msgid "Failed to download %(image_location)s to %(image_path)s"
+msgstr ""
+
+#: nova/image/s3.py:315
+#, python-format
+msgid "Failed to decrypt %(image_location)s to %(image_path)s"
+msgstr ""
+
+#: nova/image/s3.py:327
+#, python-format
+msgid "Failed to untar %(image_location)s to %(image_path)s"
+msgstr ""
+
+#: nova/image/s3.py:340
+#, python-format
+msgid "Failed to upload %(image_location)s to %(image_path)s"
+msgstr ""
+
+#: nova/image/s3.py:366
+#, python-format
+msgid "Failed to decrypt private key: %s"
+msgstr "Impossible de déchiffrer la clef privée : %s"
+
+#: nova/image/s3.py:374
+#, python-format
+msgid "Failed to decrypt initialization vector: %s"
+msgstr "Impossible de déchiffrer le vecteur d'initialisation : %s"
+
+#: nova/image/s3.py:385
+#, python-format
+msgid "Failed to decrypt image file %(image_file)s: %(err)s"
+msgstr "Impossible de déchiffrer le fichier image %(image_file)s: %(err)s"
+
+#: nova/image/s3.py:397
+msgid "Unsafe filenames in image"
 msgstr ""
 
-#: ../nova/api/openstack/common.py:132 ../nova/api/openstack/common.py:168
+#: nova/api/ec2/apirequest.py:64
+#, python-format
+msgid ""
+"Unsupported API request: controller = %(controller)s, action = %(action)s"
+msgstr ""
+"Requête API non supportée : controleur = %(controller)s, action = %(action)s"
+
+#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:53
+msgid "foreign key constraint couldn't be dropped"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:43
+#, python-format
+msgid "Caught error: %s"
+msgstr "Erreur interceptée : %s"
+
+#: nova/api/openstack/__init__.py:94
+msgid "Must specify an ExtensionManager class"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:105
+#, python-format
+msgid "Extended resource: %s"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:130
+#, python-format
+msgid ""
+"Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
+"resource"
+msgstr ""
+
+#: nova/api/openstack/__init__.py:135
+#, python-format
+msgid "Extension %(ext_name)s extending resource: %(collection)s"
+msgstr ""
+
+#: nova/api/openstack/common.py:135 nova/api/openstack/common.py:170
+msgid "limit param must be an integer"
+msgstr ""
+
+#: nova/api/openstack/common.py:138 nova/api/openstack/common.py:174
 msgid "limit param must be positive"
 msgstr ""
 
-#: ../nova/api/openstack/common.py:158
+#: nova/api/openstack/common.py:164
 msgid "offset param must be an integer"
 msgstr ""
 
-#: ../nova/api/openstack/common.py:172
+#: nova/api/openstack/common.py:178
 msgid "offset param must be positive"
 msgstr ""
 
-#: ../nova/api/openstack/common.py:196
+#: nova/api/openstack/common.py:202
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: ../nova/api/openstack/common.py:236
+#: nova/api/openstack/common.py:242
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: ../nova/api/openstack/common.py:271
+#: nova/api/openstack/common.py:277
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: ../nova/api/openstack/common.py:424
+#: nova/api/openstack/common.py:358
+#, python-format
+msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
+msgstr ""
+
+#: nova/api/openstack/common.py:361
+#, python-format
+msgid "Instance is in an invalid state for '%(action)s'"
+msgstr ""
+
+#: nova/api/openstack/common.py:441
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: ../nova/api/openstack/common.py:426
+#: nova/api/openstack/common.py:443
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: ../nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:76
+#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:75
 msgid "interface column not added to networks table"
 msgstr ""
 
-#: ../nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:90
+#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:89
 msgid "VIF column not added to fixed_ips table"
 msgstr ""
 
-#: ../nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:100
+#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:99
 #, python-format
 msgid "join list for moving mac_addresses |%s|"
 msgstr ""
 
-#: ../nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:124
+#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:123
 msgid "Can't downgrade without losing data"
 msgstr ""
 
-#: ../bin/nova-manage.py:373
+#: nova/virt/baremetal/dom.py:93
+msgid "No domains exist."
+msgstr ""
+
+#: nova/virt/baremetal/dom.py:95
+#, python-format
+msgid "============= initial domains =========== : %s"
+msgstr ""
+
+#: nova/virt/baremetal/dom.py:99
+msgid "Building domain: to be removed"
+msgstr ""
+
+#: nova/virt/baremetal/dom.py:103
+msgid "Not running domain: remove"
+msgstr ""
+
+#: nova/virt/baremetal/dom.py:111
+msgid "domain running on an unknown node: discarded"
+msgstr ""
+
+#: nova/virt/baremetal/dom.py:127
+#, python-format
+msgid "No such domain (%s)"
+msgstr ""
+
+#: nova/virt/baremetal/dom.py:134
+#, python-format
+msgid "Failed power down Bare-metal node %s"
+msgstr ""
+
+#: nova/virt/baremetal/dom.py:143
+msgid "deactivate -> activate fails"
+msgstr ""
+
+#: nova/virt/baremetal/dom.py:153
+msgid "destroy_domain: no such domain"
+msgstr ""
+
+#: nova/virt/baremetal/dom.py:154
+#, python-format
+msgid "No such domain %s"
+msgstr ""
+
+#: nova/virt/baremetal/dom.py:161
+#, python-format
+msgid "Domains: %s"
+msgstr ""
+
+#: nova/virt/baremetal/dom.py:163
+#, python-format
+msgid "Nodes: %s"
+msgstr ""
+
+#: nova/virt/baremetal/dom.py:166
+#, python-format
+msgid "After storing domains: %s"
+msgstr ""
+
+#: nova/virt/baremetal/dom.py:169
+msgid "deactivation/removing domain failed"
+msgstr ""
+
+#: nova/virt/baremetal/dom.py:176
+msgid "===== Domain is being created ====="
+msgstr ""
+
+#: nova/virt/baremetal/dom.py:179
+msgid "Same domain name already exists"
+msgstr ""
+
+#: nova/virt/baremetal/dom.py:181
+msgid "create_domain: before get_idle_node"
+msgstr ""
+
+#: nova/virt/baremetal/dom.py:198
+#, python-format
+msgid "Created new domain: %s"
+msgstr ""
+
+#: nova/virt/baremetal/dom.py:213
+#, python-format
+msgid "Failed to boot Bare-metal node %s"
+msgstr ""
+
+#: nova/virt/baremetal/dom.py:222
+msgid "No such domain exists"
+msgstr ""
+
+#: nova/virt/baremetal/dom.py:226
+#, python-format
+msgid "change_domain_state: to new state %s"
+msgstr ""
+
+#: nova/virt/baremetal/dom.py:233
+#, python-format
+msgid "Stored fake domains to the file: %s"
+msgstr ""
+
+#: nova/virt/baremetal/dom.py:244
+msgid "domain does not exist"
+msgstr ""
+
+#: ../bin/nova-manage.py:381
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'nova-manage db sync' before running this "
 "command."
 msgstr ""
 
-#: ../bin/nova-manage.py:604
+#: ../bin/nova-manage.py:612
 msgid ""
 "No more networks available. If this is a new installation, you need\n"
 "to call something like this:\n"
@@ -4282,635 +4280,986 @@
 "\n"
 msgstr ""
 
-#: ../bin/nova-manage.py:609
+#: ../bin/nova-manage.py:617
 msgid ""
 "The above error may show that the certificate db has not been created.\n"
-"Please create a database by running a nova-api server on this host."
+"Please create a database by running a nova-cert server on this host."
 msgstr ""
-"L'erreur çi dessus peut indiquer que la base de données de certificats n'a "
-"pas été créée.\n"
-"Veuillez créer une base de données en exécutant nova-api server sur cet hôte."
 
-#: ../bin/nova-manage.py:633
+#: ../bin/nova-manage.py:646
 msgid "network"
 msgstr "réseau"
 
-#: ../bin/nova-manage.py:634
+#: ../bin/nova-manage.py:647
 msgid "IP address"
 msgstr "adresse IP"
 
-#: ../bin/nova-manage.py:635
-msgid "MAC address"
-msgstr "adresse MAC"
-
-#: ../bin/nova-manage.py:636
+#: ../bin/nova-manage.py:648
 msgid "hostname"
 msgstr "nom du serveur"
 
-#: ../bin/nova-manage.py:637 ../bin/nova-manage.py:1136
-#: ../bin/nova-manage.py:1252 ../bin/nova-manage.py:1284
+#: ../bin/nova-manage.py:649 ../bin/nova-manage.py:1167
+#: ../bin/nova-manage.py:1283 ../bin/nova-manage.py:1315
 msgid "host"
 msgstr "hôte"
 
-#: ../bin/nova-manage.py:786
+#: ../bin/nova-manage.py:812
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify network_size "
 "flag."
 msgstr ""
 
-#: ../bin/nova-manage.py:829 ../bin/nova-manage.py:1978
-#: ../bin/nova-manage.py:2021 ../nova/tests/test_nova_manage.py:180
+#: nova/tests/test_nova_manage.py:178
 msgid "id"
 msgstr ""
 
-#: ../bin/nova-manage.py:830 ../nova/tests/test_nova_manage.py:181
+#: nova/tests/test_nova_manage.py:179
 msgid "IPv4"
 msgstr ""
 
-#: ../bin/nova-manage.py:831 ../nova/tests/test_nova_manage.py:182
+#: nova/tests/test_nova_manage.py:180
 msgid "IPv6"
 msgstr ""
 
-#: ../bin/nova-manage.py:832 ../nova/tests/test_nova_manage.py:183
+#: nova/tests/test_nova_manage.py:181
 msgid "start address"
 msgstr "adresse de départ"
 
-#: ../bin/nova-manage.py:833 ../nova/tests/test_nova_manage.py:184
+#: nova/tests/test_nova_manage.py:182
 msgid "DNS1"
 msgstr ""
 
-#: ../bin/nova-manage.py:834 ../nova/tests/test_nova_manage.py:185
+#: nova/tests/test_nova_manage.py:183
 msgid "DNS2"
 msgstr ""
 
-#: ../bin/nova-manage.py:835 ../nova/tests/test_nova_manage.py:186
+#: nova/tests/test_nova_manage.py:184
 msgid "VlanID"
 msgstr ""
 
-#: ../bin/nova-manage.py:836 ../bin/nova-manage.py:853
-#: ../bin/nova-manage.py:936 ../nova/tests/test_nova_manage.py:187
+#: nova/tests/test_nova_manage.py:185
 msgid "project"
 msgstr ""
 
-#: ../bin/nova-manage.py:837 ../bin/nova-manage.py:852
-#: ../nova/tests/test_nova_manage.py:188
+#: nova/tests/test_nova_manage.py:186
 msgid "uuid"
 msgstr ""
 
-#: ../bin/nova-manage.py:854
+#: ../bin/nova-manage.py:880
 msgid "priority"
 msgstr ""
 
-#: ../bin/nova-manage.py:855
+#: ../bin/nova-manage.py:881
 msgid "cidr_v4"
 msgstr ""
 
-#: ../bin/nova-manage.py:856
+#: ../bin/nova-manage.py:882
 msgid "cidr_v6"
 msgstr ""
 
-#: ../bin/nova-manage.py:928
+#: ../bin/nova-manage.py:954
 msgid "instance"
 msgstr ""
 
-#: ../bin/nova-manage.py:929
+#: ../bin/nova-manage.py:955
 msgid "node"
 msgstr ""
 
-#: ../bin/nova-manage.py:930 ../bin/nova-manage.py:1253
-#: ../bin/nova-manage.py:1280 ../bin/nova-manage.py:1512
+#: ../bin/nova-manage.py:956 ../bin/nova-manage.py:1284
+#: ../bin/nova-manage.py:1311 ../bin/nova-manage.py:1543
 msgid "type"
 msgstr ""
 
-#: ../bin/nova-manage.py:931
+#: ../bin/nova-manage.py:957
 msgid "state"
 msgstr ""
 
-#: ../bin/nova-manage.py:932
+#: ../bin/nova-manage.py:958
 msgid "launched"
 msgstr ""
 
-#: ../bin/nova-manage.py:933 ../bin/nova-manage.py:1279
+#: ../bin/nova-manage.py:959 ../bin/nova-manage.py:1310
 msgid "image"
 msgstr ""
 
-#: ../bin/nova-manage.py:934
+#: ../bin/nova-manage.py:960
 msgid "kernel"
 msgstr ""
 
-#: ../bin/nova-manage.py:935
+#: ../bin/nova-manage.py:961
 msgid "ramdisk"
 msgstr ""
 
-#: ../bin/nova-manage.py:937
+#: ../bin/nova-manage.py:963
 msgid "user"
 msgstr ""
 
-#: ../bin/nova-manage.py:938 ../bin/nova-manage.py:1137
+#: ../bin/nova-manage.py:964 ../bin/nova-manage.py:1168
 msgid "zone"
 msgstr ""
 
-#: ../bin/nova-manage.py:939
+#: ../bin/nova-manage.py:965
 msgid "index"
 msgstr ""
 
-#: ../bin/nova-manage.py:977
+#: ../bin/nova-manage.py:1004
 msgid "Only KVM and QEmu are supported for now. Sorry!"
 msgstr ""
 
-#: ../bin/nova-manage.py:981
+#: ../bin/nova-manage.py:1008
 msgid "Support only ISCSIDriver. Sorry!"
 msgstr ""
 
-#: ../bin/nova-manage.py:992
+#: ../bin/nova-manage.py:1020
 #, python-format
 msgid ""
 "Migration of %s initiated.Check its progress using euca-describe-instances."
 msgstr ""
 
-#: ../bin/nova-manage.py:1031
+#: ../bin/nova-manage.py:1062
 msgid "Binary"
 msgstr ""
 
-#: ../bin/nova-manage.py:1032
+#: ../bin/nova-manage.py:1063
 msgid "Host"
 msgstr ""
 
-#: ../bin/nova-manage.py:1033
+#: ../bin/nova-manage.py:1064
 msgid "Zone"
 msgstr ""
 
-#: ../bin/nova-manage.py:1034
+#: ../bin/nova-manage.py:1065
 msgid "Status"
 msgstr ""
 
-#: ../bin/nova-manage.py:1035
+#: ../bin/nova-manage.py:1066
 msgid "State"
 msgstr ""
 
-#: ../bin/nova-manage.py:1036
+#: ../bin/nova-manage.py:1067
 msgid "Updated_At"
 msgstr ""
 
-#: ../bin/nova-manage.py:1082
+#: ../bin/nova-manage.py:1116
 msgid "An unexpected error has occurred."
 msgstr ""
 
-#: ../bin/nova-manage.py:1083
+#: ../bin/nova-manage.py:1117
 msgid "[Result]"
 msgstr ""
 
-#: ../bin/nova-manage.py:1119
-#, python-format
-msgid "%s does not exist."
+#. Printing a total and used_now
+#. (NOTE)The host name width 16 characters
+#: ../bin/nova-manage.py:1121
+msgid "HOST"
+msgstr ""
+
+#: ../bin/nova-manage.py:1122
+msgid "PROJECT"
 msgstr ""
 
 #: ../bin/nova-manage.py:1123
-#, python-format
-msgid "%s is not compute node."
+msgid "cpu"
+msgstr ""
+
+#: ../bin/nova-manage.py:1124
+msgid "mem(mb)"
+msgstr ""
+
+#: ../bin/nova-manage.py:1125
+msgid "hdd"
 msgstr ""
 
-#: ../bin/nova-manage.py:1176
+#: ../bin/nova-manage.py:1207
 #, python-format
 msgid "%s (%s)"
 msgstr ""
 
-#: ../bin/nova-manage.py:1204 ../bin/nova-manage.py:1229
-#: ../bin/nova-manage.py:1248 ../bin/nova-manage.py:1276
-#: ../bin/nova-manage.py:1510
+#: ../bin/nova-manage.py:1235 ../bin/nova-manage.py:1260
+#: ../bin/nova-manage.py:1279 ../bin/nova-manage.py:1307
+#: ../bin/nova-manage.py:1541
 msgid "ID"
 msgstr ""
 
-#: ../bin/nova-manage.py:1205
+#: ../bin/nova-manage.py:1236
 msgid "vsa_id"
 msgstr ""
 
-#: ../bin/nova-manage.py:1206
+#: ../bin/nova-manage.py:1237
 msgid "displayName"
 msgstr ""
 
-#: ../bin/nova-manage.py:1207
+#: ../bin/nova-manage.py:1238
 msgid "vc_type"
 msgstr ""
 
-#: ../bin/nova-manage.py:1208
+#: ../bin/nova-manage.py:1239
 msgid "vc_cnt"
 msgstr ""
 
-#: ../bin/nova-manage.py:1209
+#: ../bin/nova-manage.py:1240
 msgid "drive_cnt"
 msgstr ""
 
-#: ../bin/nova-manage.py:1210 ../bin/nova-manage.py:1232
-#: ../bin/nova-manage.py:1251 ../bin/nova-manage.py:1283
+#: ../bin/nova-manage.py:1241 ../bin/nova-manage.py:1263
+#: ../bin/nova-manage.py:1282 ../bin/nova-manage.py:1314
 msgid "status"
 msgstr ""
 
-#: ../bin/nova-manage.py:1211
+#: ../bin/nova-manage.py:1242
 msgid "AZ"
 msgstr ""
 
-#: ../bin/nova-manage.py:1212 ../bin/nova-manage.py:1234
-#: ../bin/nova-manage.py:1255 ../bin/nova-manage.py:1285
-#: ../bin/nova-manage.py:1517
+#: ../bin/nova-manage.py:1243 ../bin/nova-manage.py:1265
+#: ../bin/nova-manage.py:1286 ../bin/nova-manage.py:1316
+#: ../bin/nova-manage.py:1548
 msgid "createTime"
 msgstr ""
 
-#: ../bin/nova-manage.py:1227
+#: ../bin/nova-manage.py:1258
 msgid "      === Volumes ==="
 msgstr ""
 
-#: ../bin/nova-manage.py:1230 ../bin/nova-manage.py:1249
-#: ../bin/nova-manage.py:1277 ../bin/nova-manage.py:1511
+#: ../bin/nova-manage.py:1261 ../bin/nova-manage.py:1280
+#: ../bin/nova-manage.py:1308 ../bin/nova-manage.py:1542
 msgid "name"
 msgstr ""
 
-#: ../bin/nova-manage.py:1231 ../bin/nova-manage.py:1250
+#: ../bin/nova-manage.py:1262 ../bin/nova-manage.py:1281
 msgid "size"
 msgstr ""
 
-#: ../bin/nova-manage.py:1233
+#: ../bin/nova-manage.py:1264
 msgid "attachment"
 msgstr ""
 
-#: ../bin/nova-manage.py:1246
+#: ../bin/nova-manage.py:1277
 msgid "      === Drives ==="
 msgstr ""
 
-#: ../bin/nova-manage.py:1254
+#: ../bin/nova-manage.py:1285
 msgid "typeName"
 msgstr ""
 
-#: ../bin/nova-manage.py:1274
+#: ../bin/nova-manage.py:1305
 msgid "      === Instances ==="
 msgstr ""
 
-#: ../bin/nova-manage.py:1278
+#: ../bin/nova-manage.py:1309
 msgid "disp_name"
 msgstr ""
 
-#: ../bin/nova-manage.py:1281
+#: ../bin/nova-manage.py:1312
 msgid "floating_IP"
 msgstr ""
 
-#: ../bin/nova-manage.py:1282
+#: ../bin/nova-manage.py:1313
 msgid "fixed_IP"
 msgstr ""
 
-#: ../bin/nova-manage.py:1370
+#: ../bin/nova-manage.py:1401
 #, python-format
 msgid "Failed to retrieve project id: %(exc)s"
 msgstr ""
 
-#: ../bin/nova-manage.py:1378
+#: ../bin/nova-manage.py:1409
 #, python-format
 msgid "Failed to retrieve user info: %(exc)s"
 msgstr ""
 
-#: ../bin/nova-manage.py:1396
+#: ../bin/nova-manage.py:1427
 #, python-format
 msgid "Invalid string format %s"
 msgstr ""
 
-#: ../bin/nova-manage.py:1401
+#: ../bin/nova-manage.py:1432
 #, python-format
 msgid ""
 "Invalid string format for element %s. Expecting keys 'drive_name' & "
 "'num_drives'"
 msgstr ""
 
-#: ../bin/nova-manage.py:1419
+#: ../bin/nova-manage.py:1450
 msgid ""
 "Shared parameter should be set either to \"                \"--shared or --"
 "full_drives"
 msgstr ""
 
-#: ../bin/nova-manage.py:1513
+#: ../bin/nova-manage.py:1544
 msgid "size_gb"
 msgstr ""
 
-#: ../bin/nova-manage.py:1514
+#: ../bin/nova-manage.py:1545
 msgid "rpm"
 msgstr ""
 
-#: ../bin/nova-manage.py:1515
+#: ../bin/nova-manage.py:1546
 msgid "capabilities"
 msgstr ""
 
-#: ../bin/nova-manage.py:1516
+#: ../bin/nova-manage.py:1547
 msgid "visible"
 msgstr ""
 
-#: ../bin/nova-manage.py:1644
+#: ../bin/nova-manage.py:1676
 msgid "visible parameter should be set to show or hide"
 msgstr ""
 
-#: ../bin/nova-manage.py:1820
+#: ../bin/nova-manage.py:1844
 #, python-format
 msgid "Image registered to %(new)s (%(path)s)."
 msgstr ""
 
-#: ../bin/nova-manage.py:1823
+#: ../bin/nova-manage.py:1847
 #, python-format
 msgid "Failed to register %(path)s: %(exc)s"
 msgstr ""
 
-#: ../bin/nova-manage.py:1935
-msgid "Image %(old)s converted to %(new)s (%(new)08x)."
+#: ../bin/nova-manage.py:1959
+#, python-format
+msgid "Image %(old)s converted to %(new)s."
 msgstr ""
 
-#: ../bin/nova-manage.py:1938
+#: ../bin/nova-manage.py:1961
 #, python-format
 msgid "Failed to convert %(old)s: %(exc)s"
 msgstr ""
 
-#: ../bin/nova-manage.py:1957
+#: ../bin/nova-manage.py:1980
 #, python-format
 msgid "Failed to load %(fn)s."
 msgstr ""
 
-#: ../bin/nova-manage.py:1979
+#: ../bin/nova-manage.py:2002
 msgid "Label"
 msgstr ""
 
-#: ../bin/nova-manage.py:1980
+#: ../bin/nova-manage.py:2003
 msgid "Description"
 msgstr ""
 
-#: ../bin/nova-manage.py:2022
+#: ../bin/nova-manage.py:2045
 msgid "Flavor id"
 msgstr ""
 
-#: ../bin/nova-manage.py:2023
+#: ../bin/nova-manage.py:2046
 msgid "SR UUID"
 msgstr ""
 
-#: ../bin/nova-manage.py:2024
+#: ../bin/nova-manage.py:2047
 msgid "SR Type"
 msgstr ""
 
-#: ../bin/nova-manage.py:2025
+#: ../bin/nova-manage.py:2048
 msgid "Config Parameters"
 msgstr ""
 
-#: ../bin/nova-manage.py:2281
+#: ../bin/nova-manage.py:2315
 #, python-format
 msgid ""
 "\n"
 "OpenStack Nova version: %s (%s)\n"
 msgstr ""
 
-#: ../bin/nova-manage.py:2284
+#: ../bin/nova-manage.py:2318
 msgid "Available categories:"
 msgstr ""
 
-#: ../bin/nova-manage.py:2300
+#: ../bin/nova-manage.py:2334
 #, python-format
 msgid "Available actions for %s category:"
 msgstr ""
 
-#: ../bin/nova-manage.py:2328
+#: ../bin/nova-manage.py:2363
 msgid "Possible wrong number of arguments supplied"
 msgstr ""
 
-#: ../bin/nova-manage.py:2333
+#: ../bin/nova-manage.py:2368
 msgid "Command failed, please check log for more info"
 msgstr ""
 
-#: ../nova/tests/integrated/test_login.py:31
+#: nova/tests/integrated/test_login.py:31
 #, python-format
 msgid "flavor: %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/__init__.py:63
+#: nova/api/openstack/compute/contrib/certificates.py:75
+msgid "Only root certificate can be retrieved."
+msgstr ""
+
+#: nova/virt/disk/guestfs.py:39
 #, python-format
-msgid "Caught error: %s"
-msgstr "Erreur interceptée : %s"
+msgid "unsupported partition: %s"
+msgstr ""
+
+#: nova/virt/disk/guestfs.py:77
+msgid "unknown guestmount error"
+msgstr ""
 
-#: ../nova/api/openstack/v2/__init__.py:113
-msgid "Including admin operations in API."
-msgstr "Inclusion des opérations d'admin dans l'API."
+#: nova/network/quantum/manager.py:152
+msgid "QuantumManager does not use 'multi_host' parameter."
+msgstr ""
 
-#: ../nova/network/quantum/manager.py:127
+#: nova/network/quantum/manager.py:156
 msgid "QuantumManager requires that only one network is created per call"
 msgstr ""
 
-#: ../nova/network/quantum/manager.py:135
-#, python-format
-msgid ""
-"Unable to find existing quantum  network for tenant '%(q_tenant_id)s' with "
-"net-id '%(quantum_net_id)s'"
+#: nova/network/quantum/manager.py:166
+msgid "QuantumManager does not use 'vlan_start' parameter."
 msgstr ""
 
-#: ../nova/network/quantum/manager.py:176
-#, python-format
-msgid "Network %s in use, cannot delete"
+#: nova/network/quantum/manager.py:172
+msgid "QuantumManager does not use 'vpn_start' parameter."
+msgstr ""
+
+#: nova/network/quantum/manager.py:176
+msgid "QuantumManager does not use 'bridge' parameter."
+msgstr ""
+
+#: nova/network/quantum/manager.py:180
+msgid "QuantumManager does not use 'bridge_interface' parameter."
+msgstr ""
+
+#: nova/network/quantum/manager.py:185
+msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#. TODO(bgh): We need to figure out a way to tell if we
-#. should actually be raising this exception or not.
-#. In the case that a VM spawn failed it may not have
-#. attached the vif and raising the exception here
-#. prevents deletion of the VM.  In that case we should
-#. probably just log, continue, and move on.
-#: ../nova/network/quantum/manager.py:414
+#: nova/network/quantum/manager.py:197
 #, python-format
-msgid "No network for for virtual interface %s"
+msgid ""
+"Unable to find existing quantum network for tenant '%(q_tenant_id)s' with "
+"net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: ../nova/network/quantum/manager.py:518
+#: nova/network/quantum/manager.py:243
 #, python-format
-msgid "Attempted to deallocate non-existent instance: %s"
+msgid "Network %s has active ports, cannot delete"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/hosts.py:82
+#: nova/network/quantum/manager.py:289
 #, python-format
-msgid "Invalid status: '%s'"
+msgid "network allocations for instance %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/hosts.py:85
+#: nova/network/quantum/manager.py:537
 #, python-format
-msgid "Invalid update setting: '%s'"
+msgid ""
+"port deallocation failed for instance: |%(instance_id)s|, port_id: "
+"|%(port_id)s|"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/hosts.py:92
+#: nova/network/quantum/manager.py:556
 #, python-format
-msgid "Setting host %(host)s to %(state)s."
+msgid ""
+"ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
+"|%(vif_uuid)s|"
 msgstr ""
 
-#: ../nova/wsgi.py:94
+#: nova/wsgi.py:93
 #, python-format
 msgid "Started %(name)s on %(host)s:%(port)s"
 msgstr ""
 
-#: ../nova/wsgi.py:105
+#: nova/wsgi.py:104
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: ../nova/wsgi.py:108
+#: nova/wsgi.py:107
 msgid "Stopping raw TCP server."
 msgstr ""
 
-#: ../nova/wsgi.py:114
+#: nova/wsgi.py:113
 #, python-format
 msgid "Starting TCP server %(arg0)s on %(host)s:%(port)s"
 msgstr ""
 
-#: ../nova/wsgi.py:130
+#: nova/wsgi.py:129
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: ../nova/wsgi.py:208
+#: nova/wsgi.py:207
 msgid "You must implement __call__"
 msgstr "Vous devez implémenter __call__"
 
-#: ../bin/nova-dhcpbridge.py:58
+#: nova/notifier/list_notifier.py:65
+#, python-format
+msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
+msgstr ""
+
+#: ../bin/nova-dhcpbridge.py:54
 msgid "leasing ip"
 msgstr "Allocation IP"
 
-#: ../bin/nova-dhcpbridge.py:71
+#: ../bin/nova-dhcpbridge.py:67
 msgid "Adopted old lease or got a change of mac"
 msgstr ""
 
-#: ../bin/nova-dhcpbridge.py:78
+#: ../bin/nova-dhcpbridge.py:74
 msgid "releasing ip"
 msgstr "Libération IP"
 
-#: ../bin/nova-dhcpbridge.py:117
+#: ../bin/nova-dhcpbridge.py:113
 #, python-format
 msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'"
 msgstr ""
 
-#: ../bin/nova-dhcpbridge.py:127
+#: ../bin/nova-dhcpbridge.py:123
 msgid "Environment variable 'NETWORK_ID' must be set."
 msgstr ""
 
-#: ../nova/rpc/impl_carrot.py:196
+#: nova/rpc/impl_carrot.py:198
 #, python-format
 msgid ""
 "AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying again "
 "in %(fl_intv)d seconds."
 msgstr ""
 
-#: ../nova/rpc/impl_carrot.py:200
+#: nova/rpc/impl_carrot.py:202
 #, python-format
 msgid ""
 "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
 msgstr ""
 
-#: ../nova/rpc/impl_carrot.py:220
+#: nova/rpc/impl_carrot.py:222
 msgid "Reconnected to queue"
 msgstr "Reconnection à la queue"
 
-#: ../nova/rpc/impl_carrot.py:227
+#: nova/rpc/impl_carrot.py:229
 #, python-format
 msgid "Failed to fetch message from queue: %s"
 msgstr ""
 
-#: ../nova/rpc/impl_carrot.py:235
+#: nova/rpc/impl_carrot.py:237
 #, python-format
 msgid "Initing the Adapter Consumer for %s"
 msgstr "Initialisation du Consomateur d'Adapteur pour %s"
 
-#: ../nova/rpc/impl_carrot.py:330
+#: nova/rpc/impl_carrot.py:336
 #, python-format
 msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
 msgstr ""
 
-#: ../nova/rpc/impl_carrot.py:375
+#: nova/rpc/impl_carrot.py:381
 msgid "Exception while processing consumer"
 msgstr ""
 
-#: ../nova/rpc/impl_carrot.py:411
+#: nova/rpc/impl_carrot.py:418
 #, python-format
 msgid "Creating \"%(exchange)s\" fanout exchange"
 msgstr ""
 
-#: ../nova/rpc/impl_carrot.py:621
+#: nova/rpc/impl_carrot.py:645
 #, python-format
 msgid "response %s"
 msgstr "réponse %s"
 
-#: ../nova/rpc/impl_carrot.py:630
+#: nova/rpc/impl_carrot.py:654
 #, python-format
 msgid "topic is %s"
 msgstr "le sujet est %s"
 
-#: ../nova/rpc/impl_carrot.py:631
+#: nova/rpc/impl_carrot.py:655
+#, python-format
+msgid "message %s"
+msgstr "message %s"
+
+#: nova/auth/manager.py:297
+#, python-format
+msgid "Looking up user: %r"
+msgstr "Recherche de l'utilisateur : %r"
+
+#: nova/auth/manager.py:301
+#, python-format
+msgid "Failed authorization for access key %s"
+msgstr "Autorisation refusée pour la clef d'accès %s"
+
+#: nova/auth/manager.py:307
+#, python-format
+msgid "Using project name = user name (%s)"
+msgstr "Nom de projet utilisé = nom d'utilisateur (%s)"
+
+#: nova/auth/manager.py:314
+#, python-format
+msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
+msgstr ""
+"Autorisation refusée : pas de projet nommé %(pjid)s (utilisateur=%(uname)s)"
+
+#: nova/auth/manager.py:323
+#, python-format
+msgid ""
+"Failed authorization: user %(uname)s not admin and not member of project "
+"%(pjname)s"
+msgstr ""
+"Autorisation refusée : utilisateur %(uname)s n'est ni admin ni membre du "
+"projet %(pjname)s"
+
+#: nova/auth/manager.py:330 nova/auth/manager.py:342
+#, python-format
+msgid "user.secret: %s"
+msgstr ""
+
+#: nova/auth/manager.py:331 nova/auth/manager.py:343
+#, python-format
+msgid "expected_signature: %s"
+msgstr ""
+
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
+#, python-format
+msgid "signature: %s"
+msgstr ""
+
+#: nova/auth/manager.py:334 nova/auth/manager.py:356
+#, python-format
+msgid "Invalid signature for user %s"
+msgstr "Signature non valide pour l'utilisateur %s"
+
+#: nova/auth/manager.py:352
+#, python-format
+msgid "host_only_signature: %s"
+msgstr ""
+
+#: nova/auth/manager.py:448
+msgid "Must specify project"
+msgstr "Le projet doit être spécifié"
+
+#: nova/auth/manager.py:489
+#, python-format
+msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
+msgstr ""
+"Ajout du rôle %(role)s à l'utilisateur %(uid)s pour le projet %(pid)s"
+
+#: nova/auth/manager.py:492
+#, python-format
+msgid "Adding sitewide role %(role)s to user %(uid)s"
+msgstr "Ajout du rôle global %(role)s pour l'utilisateur %(uid)s"
+
+#: nova/auth/manager.py:518
+#, python-format
+msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
+msgstr ""
+"Suppression du rôle %(role)s pour l'utilisateur %(uid)s dans le projet "
+"%(pid)s"
+
+#: nova/auth/manager.py:521
+#, python-format
+msgid "Removing sitewide role %(role)s from user %(uid)s"
+msgstr "Suppression du role global %(role)s pour l'utilisateur %(uid)s"
+
+#: nova/auth/manager.py:594
+#, python-format
+msgid "Created project %(name)s with manager %(manager_user)s"
+msgstr "Création du projet %(name)s ayant pour manager %(manager_user)s"
+
+#: nova/auth/manager.py:612
+#, python-format
+msgid "modifying project %s"
+msgstr "modification du projet %s"
+
+#: nova/auth/manager.py:624
+#, python-format
+msgid "Adding user %(uid)s to project %(pid)s"
+msgstr "Ajout de l'utilisateur %(uid)s au projet %(pid)s"
+
+#: nova/auth/manager.py:645
+#, python-format
+msgid "Remove user %(uid)s from project %(pid)s"
+msgstr "Suppression de l'utilisateur %(uid)s du projet %(pid)s"
+
+#: nova/auth/manager.py:675
+#, python-format
+msgid "Deleting project %s"
+msgstr "Suppression du projet %s"
+
+#: nova/auth/manager.py:733
+#, python-format
+msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
+msgstr "Utilisateur créé %(rvname)s (admin: %(rvadmin)r)"
+
+#: nova/auth/manager.py:742
+#, python-format
+msgid "Deleting user %s"
+msgstr "Suppression de l'utilisateur %s"
+
+#: nova/auth/manager.py:752
+#, python-format
+msgid "Access Key change for user %s"
+msgstr "Clef d'accès changée pour l'utilisateur %s"
+
+#: nova/auth/manager.py:754
+#, python-format
+msgid "Secret Key change for user %s"
+msgstr "Clef secrète changée pour l'utilisateur %s"
+
+#: nova/auth/manager.py:756
+#, python-format
+msgid "Admin status set to %(admin)r for user %(uid)s"
+msgstr "Statut admin changé en %(admin)r pour l'utilisateur %(uid)s"
+
+#: nova/auth/manager.py:801
+#, python-format
+msgid "No vpn data for project %s"
+msgstr "Pas de données VPN pour le projet %s"
+
+#: nova/rpc/impl_qpid.py:335
+#, python-format
+msgid "Unable to connect to AMQP server: %s "
+msgstr ""
+
+#: nova/rpc/impl_qpid.py:340
+#, python-format
+msgid "Connected to AMQP server on %s"
+msgstr ""
+
+#: nova/rpc/impl_qpid.py:348
+msgid "Re-established AMQP queues"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:425
+#, python-format
+msgid "Invalid server status: %(status)s"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:433
+msgid "Invalid changes-since value"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:483
+msgid "Personality file limit exceeded"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:485
+msgid "Personality file path too long"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:487
+msgid "Personality file content too long"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:500
+msgid "Server name is not a string or unicode"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:504
+msgid "Server name is an empty string"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:522
+#, python-format
+msgid "Bad personality format: missing %s"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:525
+msgid "Bad personality format"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:530
+#, python-format
+msgid "Personality content for %s cannot be decoded"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:545
+#, python-format
+msgid "Bad networks format: network uuid is not in proper format (%s)"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:554
+#, python-format
+msgid "Invalid fixed IP address (%s)"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:561
+#, python-format
+msgid "Duplicate networks (%s) are not allowed"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:567
+#, python-format
+msgid "Bad network format: missing %s"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:570
+msgid "Bad networks format"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:582
+msgid "Userdata content cannot be decoded"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:589
+#: nova/api/openstack/compute/servers.py:596
+msgid "accessIPv4 is not proper IPv4 format"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:628
+msgid "Server name is not defined"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:642
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:677
+#: nova/api/openstack/compute/servers.py:742
+msgid "Invalid flavorRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:739
+msgid "Can not find requested image"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:745
+msgid "Invalid key_name provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:832
+#: nova/api/openstack/compute/servers.py:852
+msgid "Instance has not been resized."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:838
+#, python-format
+msgid "Error in confirm-resize %s"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:858
+#, python-format
+msgid "Error in revert-resize %s"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:871
+msgid "Argument 'type' for reboot is not HARD or SOFT"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:875
+msgid "Missing argument 'type' for reboot"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:888
+#, python-format
+msgid "Error in reboot %s"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:900
+msgid "Unable to locate requested flavor."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:903
+msgid "Resize requires a change in size."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:927
+msgid "Malformed server entity"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:934
+msgid "Missing imageRef attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:941
+msgid "Missing flavorRef attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:954
+msgid "No adminPass was specified"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:958
+#: nova/api/openstack/compute/servers.py:1134
+msgid "Invalid adminPass"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:972
+msgid "Unable to parse metadata key/value pairs."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:985
+msgid "Resize request has invalid 'flavorRef' attribute."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:988
+msgid "Resize requests require 'flavorRef' attribute."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1011
+msgid "Could not parse imageRef from request."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1061
+msgid "Instance could not be found"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1064
+msgid "Cannot find image for rebuild"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1093
+msgid "createImage entity requires name attribute"
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:1157
 #, python-format
-msgid "message %s"
-msgstr "message %s"
+msgid "Removing options '%(unk_opt_str)s' from query"
+msgstr ""
 
-#: ../nova/testing/fake/rabbit.py:50
+#: nova/testing/fake/rabbit.py:50
 #, python-format
 msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
 msgstr "(%(nm)s) publication (key: %(routing_key)s) %(message)s"
 
-#: ../nova/testing/fake/rabbit.py:54
+#: nova/testing/fake/rabbit.py:54
 #, python-format
 msgid "Publishing to route %s"
 msgstr "Publication vers la route %s"
 
-#: ../nova/testing/fake/rabbit.py:84
+#: nova/testing/fake/rabbit.py:84
 #, python-format
 msgid "Declaring queue %s"
 msgstr "Déclaration de la queue %s"
 
-#: ../nova/testing/fake/rabbit.py:90
+#: nova/testing/fake/rabbit.py:90
 #, python-format
 msgid "Declaring exchange %s"
 msgstr "Déclaration de l'échange %s"
 
-#: ../nova/testing/fake/rabbit.py:96
+#: nova/testing/fake/rabbit.py:96
 #, python-format
 msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
 msgstr ""
 "Rattachement de %(queue)s vers %(exchange)s avec la clef %(routing_key)s"
 
-#: ../nova/testing/fake/rabbit.py:133
+#: nova/testing/fake/rabbit.py:133
 #, python-format
 msgid "Getting from %(queue)s: %(message)s"
 msgstr "Récupération depuis %(queue)s: %(message)s"
 
-#: ../nova/tests/test_vsa.py:62
+#: nova/tests/test_vsa.py:57
 msgid "Test: Emulate wrong VSA name. Raise"
 msgstr ""
 
-#: ../nova/tests/test_vsa.py:104
+#: nova/tests/test_vsa.py:99
 msgid "Test: Emulate DB error. Raise"
 msgstr ""
 
-#: ../nova/tests/test_vsa.py:172
+#: nova/tests/test_vsa.py:167
 #, python-format
 msgid "Test: user_data = %s"
 msgstr ""
 
-#: ../nova/db/sqlalchemy/migrate_repo/versions/059_split_rxtx_quota_into_network.py:37
-msgid ""
-"select min(rxtx_cap) as min_rxtx from instance_types where rxtx_cap > 0"
-msgstr ""
-
-#: ../nova/db/sqlalchemy/migrate_repo/versions/059_split_rxtx_quota_into_network.py:41
+#: nova/virt/baremetal/nodes.py:42
 #, python-format
-msgid ""
-"update instance_types set rxtx_factor = rxtx_cap/%s where rxtx_cap > 0"
-msgstr ""
-
-#: ../nova/db/sqlalchemy/migrate_repo/versions/059_split_rxtx_quota_into_network.py:58
-msgid "select min(rxtx_base) from networks where rxtx_base > 0"
+msgid "Unknown baremetal driver %(d)s"
 msgstr ""
 
-#: ../nova/db/sqlalchemy/migrate_repo/versions/059_split_rxtx_quota_into_network.py:62
-#, python-format
-msgid "update instance_types set rxtx_cap = rxtx_factor * %s"
+#: nova/api/openstack/compute/contrib/extended_status.py:61
+msgid "Server not found."
 msgstr ""
 
-#: ../nova/exception.py:54
+#: nova/exception.py:56
 msgid "Unexpected error while running command."
 msgstr "Erreur imprévue lors de l'éxecution de la commande"
 
-#: ../nova/exception.py:57
+#: nova/exception.py:59
 #, python-format
 msgid ""
 "%(description)s\n"
@@ -4925,195 +5274,232 @@
 "Sortie standard : %(stdout)r\n"
 "Sortie d'erreur : %(stderr)r"
 
-#: ../nova/exception.py:95
+#: nova/exception.py:92
 msgid "DB exception wrapped."
 msgstr ""
 
-#: ../nova/exception.py:156
+#: nova/exception.py:153
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: ../nova/exception.py:172
+#: nova/exception.py:176
+msgid "Failed to decrypt text"
+msgstr ""
+
+#: nova/exception.py:180
 msgid "Failed to paginate through images from image service"
 msgstr ""
 
-#: ../nova/exception.py:176
+#: nova/exception.py:184
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: ../nova/exception.py:180
+#: nova/exception.py:188
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: ../nova/exception.py:185
+#: nova/exception.py:193
+msgid "Connection to glance failed"
+msgstr ""
+
+#: nova/exception.py:197
+msgid "Connection to melange failed"
+msgstr ""
+
+#: nova/exception.py:201
 msgid "Not authorized."
 msgstr ""
 
-#: ../nova/exception.py:192
+#: nova/exception.py:206
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: ../nova/exception.py:196
+#: nova/exception.py:210
 #, python-format
-msgid "Instance %(instance_id)s is busy. (%(task_state)s)"
+msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: ../nova/exception.py:200
-#, python-format
-msgid "Instance %(instance_uuid)s is currently snapshotting."
+#: nova/exception.py:214
+msgid "Unacceptable parameters."
+msgstr ""
+
+#: nova/exception.py:219
+msgid "Invalid snapshot"
 msgstr ""
 
-#: ../nova/exception.py:204
+#: nova/exception.py:223
 #, python-format
-msgid "Instance %(instance_uuid)s is currently being backed up."
+msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: ../nova/exception.py:208
-msgid "Unacceptable parameters."
+#: nova/exception.py:227 nova/api/openstack/compute/contrib/keypairs.py:103
+msgid "Keypair data is invalid"
+msgstr ""
+
+#: nova/exception.py:231
+msgid "Failed to load data into json format"
 msgstr ""
 
-#: ../nova/exception.py:212
+#: nova/exception.py:235
 msgid "The request is invalid."
 msgstr ""
 
-#: ../nova/exception.py:216
+#: nova/exception.py:239
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: ../nova/exception.py:220
+#: nova/exception.py:243
 msgid "Invalid input received"
 msgstr ""
 
-#: ../nova/exception.py:224
+#: nova/exception.py:247
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: ../nova/exception.py:228
-#, python-format
-msgid "Invalid volume type %(volume_type)s."
+#: nova/exception.py:251
+msgid "Invalid volume type"
 msgstr ""
 
-#: ../nova/exception.py:232
+#: nova/exception.py:255
+msgid "Invalid volume"
+msgstr ""
+
+#: nova/exception.py:259
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: ../nova/exception.py:236
+#: nova/exception.py:263
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: ../nova/exception.py:240
+#: nova/exception.py:267
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: ../nova/exception.py:244
+#: nova/exception.py:271
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: ../nova/exception.py:250
+#: nova/exception.py:275
+msgid "Invalid reuse of an RPC connection."
+msgstr ""
+
+#: nova/exception.py:281
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: ../nova/exception.py:254
+#: nova/exception.py:285
+#, python-format
+msgid ""
+"Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason: "
+"%(reason)s."
+msgstr ""
+
+#: nova/exception.py:290
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while "
 "the instance is in this state."
 msgstr ""
 
-#: ../nova/exception.py:259
+#: nova/exception.py:295
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: ../nova/exception.py:263
+#: nova/exception.py:299
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: ../nova/exception.py:267
+#: nova/exception.py:303
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: ../nova/exception.py:271
+#: nova/exception.py:307
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: ../nova/exception.py:275
+#: nova/exception.py:311
 msgid "Failed to resume server"
 msgstr ""
 
-#: ../nova/exception.py:279
+#: nova/exception.py:315
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: ../nova/exception.py:283
+#: nova/exception.py:319
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: ../nova/exception.py:287
+#: nova/exception.py:323
 msgid "Volume service is unavailable at this time."
 msgstr ""
 
-#: ../nova/exception.py:291
+#: nova/exception.py:327
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: ../nova/exception.py:295
+#: nova/exception.py:331
 #, python-format
 msgid ""
 "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: ../nova/exception.py:300
+#: nova/exception.py:336
+msgid "Destination compute host is unavailable at this time."
+msgstr ""
+
+#: nova/exception.py:340
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: ../nova/exception.py:304
+#: nova/exception.py:344
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: ../nova/exception.py:308
+#: nova/exception.py:348
 msgid ""
 "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: ../nova/exception.py:313
+#: nova/exception.py:353
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: ../nova/exception.py:318
+#: nova/exception.py:358
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: ../nova/exception.py:322
+#: nova/exception.py:362
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: ../nova/exception.py:326
+#: nova/exception.py:366
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: ../nova/exception.py:330
+#: nova/exception.py:370
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN tag "
 "is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: ../nova/exception.py:336
+#: nova/exception.py:376
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with the "
@@ -5121,1012 +5507,1171 @@
 "associated is %(actual)s."
 msgstr ""
 
-#: ../nova/exception.py:343
+#: nova/exception.py:383
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: ../nova/exception.py:347
+#: ../nova/exception.py:378
 #, python-format
 msgid "Image %(image_id)s is unacceptable"
 msgstr ""
 
-#: ../nova/exception.py:351
+#: ../nova/exception.py:382
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable"
 msgstr ""
 
-#: ../nova/exception.py:355
+#: nova/exception.py:395
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: ../nova/exception.py:359
+#: nova/exception.py:399
 msgid "Resource could not be found."
 msgstr ""
 
-#: ../nova/exception.py:366
+#: nova/exception.py:404
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: ../nova/exception.py:370
+#: nova/exception.py:408
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:374
+#: nova/exception.py:412
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:378
+#: nova/exception.py:416
+#, python-format
+msgid "Unable to locate account %(account_name) on Solidfire device"
+msgstr ""
+
+#: nova/exception.py:420
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: ../nova/exception.py:382
+#: nova/exception.py:424
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: ../nova/exception.py:387
+#: nova/exception.py:429
 msgid "Zero volume types found."
 msgstr ""
 
-#: ../nova/exception.py:391
+#: nova/exception.py:433
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:395
+#: nova/exception.py:437
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:400
+#: nova/exception.py:442
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: ../nova/exception.py:405
+#: nova/exception.py:447
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:409
+#: nova/exception.py:451
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: ../nova/exception.py:413
+#: nova/exception.py:455
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: ../nova/exception.py:417
+#: nova/exception.py:459
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: ../nova/exception.py:421
+#: nova/exception.py:463
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: ../nova/exception.py:425
+#: nova/exception.py:467
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: ../nova/exception.py:429
+#: ../nova/exception.py:461
 msgid "Some images have been stored via hrefs."
 msgstr ""
 
-#: ../nova/exception.py:434
+#: nova/exception.py:476
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:438
+#: nova/exception.py:480
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: ../nova/exception.py:442
+#: nova/exception.py:484
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:446
+#: nova/exception.py:488
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:450
+#: nova/exception.py:492
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: ../nova/exception.py:454
+#: nova/exception.py:496
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:458
+#: nova/exception.py:500
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: ../nova/exception.py:462
+#: nova/exception.py:504
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: ../nova/exception.py:466
+#: nova/exception.py:508
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:470
+#: nova/exception.py:512
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: ../nova/exception.py:474
+#: nova/exception.py:516
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: ../nova/exception.py:478
+#: nova/exception.py:520
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: ../nova/exception.py:482
+#: nova/exception.py:524
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: ../nova/exception.py:486
+#: nova/exception.py:528
 msgid "No networks defined."
 msgstr ""
 
-#: ../nova/exception.py:490
+#: nova/exception.py:532
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to "
 "the project %(project_id)s."
 msgstr ""
 
-#: ../nova/exception.py:495
+#: nova/exception.py:537
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: ../nova/exception.py:499
+#: nova/exception.py:541
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: ../nova/exception.py:503
+#: nova/exception.py:545
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: ../nova/exception.py:507
+#: nova/exception.py:549
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: ../nova/exception.py:511
+#: nova/exception.py:553
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: ../nova/exception.py:515
+#: nova/exception.py:557
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: ../nova/exception.py:520
+#: nova/exception.py:562
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: ../nova/exception.py:524
+#: nova/exception.py:566
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: ../nova/exception.py:528
+#: nova/exception.py:570
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network (%(network_uuid)s)."
 msgstr ""
 
-#: ../nova/exception.py:533
+#: nova/exception.py:575
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: ../nova/exception.py:537
+#: nova/exception.py:579
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: ../nova/exception.py:541
+#: nova/exception.py:583
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: ../nova/exception.py:545
+#: nova/exception.py:587
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: ../nova/exception.py:549
+#: nova/exception.py:591
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: ../nova/exception.py:553
+#: nova/exception.py:595
+#, python-format
+msgid "The DNS entry %(name)s already exists in domain %(domain)s."
+msgstr ""
+
+#: nova/exception.py:599
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: ../nova/exception.py:557
+#: nova/exception.py:603
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: ../nova/exception.py:561
+#: nova/exception.py:607
 msgid "Zero floating ips available."
 msgstr ""
 
-#: ../nova/exception.py:565
+#: nova/exception.py:611
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: ../nova/exception.py:569
+#: nova/exception.py:615
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: ../nova/exception.py:573
+#: nova/exception.py:619
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: ../nova/exception.py:577
+#: nova/exception.py:623
+#, python-format
+msgid "Interface %(interface)s not found."
+msgstr ""
+
+#: nova/exception.py:627
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: ../nova/exception.py:581
+#: nova/exception.py:631
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: ../nova/exception.py:585
+#: nova/exception.py:635
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:589
+#: nova/exception.py:639
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:593
+#: nova/exception.py:643
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:597
+#: nova/exception.py:647
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: ../nova/exception.py:601
+#: nova/exception.py:651
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:605
+#: nova/exception.py:655
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:609
+#: nova/exception.py:659
 msgid "Quota could not be found"
 msgstr ""
 
-#: ../nova/exception.py:613
+#: nova/exception.py:663
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:617
+#: nova/exception.py:667
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: ../nova/exception.py:621
+#: nova/exception.py:671
 #, python-format
 msgid ""
 "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: ../nova/exception.py:626
+#: nova/exception.py:676
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: ../nova/exception.py:630
+#: nova/exception.py:680
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: ../nova/exception.py:635
+#: nova/exception.py:685
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: ../nova/exception.py:640
+#: nova/exception.py:690
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:644
+#: nova/exception.py:694
 #, python-format
 msgid ""
 "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: ../nova/exception.py:649
+#: nova/exception.py:699
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:653
+#: nova/exception.py:703
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s on "
 "proxy host %(host)s not found."
 msgstr ""
 
-#: ../nova/exception.py:659
+#: nova/exception.py:709
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:663
+#: nova/exception.py:713
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:667
+#: nova/exception.py:717
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:672
+#: nova/exception.py:722
+#, python-format
+msgid "Invalid console type %(console_type)s "
+msgstr ""
+
+#: nova/exception.py:726
 msgid "Zero instance types found."
 msgstr ""
 
-#: ../nova/exception.py:676
+#: nova/exception.py:730
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:680
+#: nova/exception.py:734
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:685
+#: nova/exception.py:739
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:689
+#: nova/exception.py:743
 #, python-format
 msgid "Zone %(zone_id)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:693
+#: nova/exception.py:747
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:697
+#: nova/exception.py:751
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:702
+#: nova/exception.py:756
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: ../nova/exception.py:706
+#: nova/exception.py:760
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: ../nova/exception.py:711
+#: nova/exception.py:765
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: ../nova/exception.py:716
+#: nova/exception.py:770
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: ../nova/exception.py:720
+#: nova/exception.py:774
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:724
+#: nova/exception.py:778
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:728
+#: nova/exception.py:782
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: ../nova/exception.py:732
+#: nova/exception.py:786
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:736
+#: nova/exception.py:790
 msgid "Zero files could be found."
 msgstr ""
 
-#: ../nova/exception.py:740
+#: nova/exception.py:794
 #, python-format
 msgid ""
 "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: ../nova/exception.py:745
+#: nova/exception.py:799
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:749
+#: nova/exception.py:803
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: ../nova/exception.py:753
+#: nova/exception.py:807
 msgid "Action not allowed."
 msgstr ""
 
-#: ../nova/exception.py:757
+#: nova/exception.py:811
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: ../nova/exception.py:761
+#: nova/exception.py:815
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: ../nova/exception.py:765
+#: nova/exception.py:819
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: ../nova/exception.py:774
+#: nova/exception.py:828
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: ../nova/exception.py:778
+#: nova/exception.py:832
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: ../nova/exception.py:782
+#: nova/exception.py:836
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: ../nova/exception.py:786
+#: nova/exception.py:840
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: ../nova/exception.py:790
+#: nova/exception.py:844
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr "L'utilisateur %(uid)s est déjà membre du groupe %(group_dn)s"
 
-#: ../nova/exception.py:795
+#: nova/exception.py:849
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: ../nova/exception.py:799
+#: nova/exception.py:853
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: ../nova/exception.py:803
+#: nova/exception.py:857
+#, python-format
+msgid "Instance Type %(name)s already exists."
+msgstr ""
+
+#: nova/exception.py:861
+#, python-format
+msgid "Volume Type %(name)s already exists."
+msgstr ""
+
+#: nova/exception.py:865
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: ../nova/exception.py:807
+#: nova/exception.py:869
 msgid "Migration error"
 msgstr ""
 
-#: ../nova/exception.py:811
+#: nova/exception.py:873
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: ../nova/exception.py:815
+#: nova/exception.py:877
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: ../nova/exception.py:819
+#: nova/exception.py:881
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: ../nova/exception.py:823
+#: nova/exception.py:885
 msgid "Nova access parameters were not specified."
 msgstr ""
 
-#: ../nova/exception.py:827
+#: nova/exception.py:889
 #, python-format
 msgid "Virtual Storage Array %(id)d could not be found."
 msgstr ""
 
-#: ../nova/exception.py:831
+#: nova/exception.py:893
 #, python-format
 msgid "Virtual Storage Array %(name)s could not be found."
 msgstr ""
 
-#: ../nova/exception.py:835
+#: nova/exception.py:897
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: ../nova/exception.py:839
+#: nova/exception.py:901
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: ../nova/exception.py:845
+#: nova/exception.py:905
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: ../nova/exception.py:850
+#: nova/exception.py:909
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: ../nova/exception.py:854
+#: nova/exception.py:913
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: ../nova/exception.py:858
+#: nova/exception.py:917
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: ../nova/exception.py:862
+#: nova/exception.py:921
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: ../nova/exception.py:866
+#: nova/exception.py:925
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: ../nova/exception.py:870
+#: nova/exception.py:929
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
+#: nova/exception.py:933
+msgid "Quota exceeded"
+msgstr ""
+
+#: nova/exception.py:937
+#, python-format
+msgid "Aggregate %(aggregate_id)s could not be found."
+msgstr ""
+
+#: nova/exception.py:941
+#, python-format
+msgid "Aggregate %(aggregate_name)s already exists."
+msgstr ""
+
+#: nova/exception.py:945
+#, python-format
+msgid "Aggregate %(aggregate_id)s has no host %(host)s."
+msgstr ""
+
+#: nova/exception.py:949
+#, python-format
+msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:954
+#, python-format
+msgid "Host %(host)s already member of another aggregate."
+msgstr ""
+
+#: nova/exception.py:958
+#, python-format
+msgid "Aggregate %(aggregate_id)s already has host %(host)s."
+msgstr ""
+
+#: nova/exception.py:962
+msgid "Detected more than one volume with name %(vol_name)"
+msgstr ""
+
+#: nova/exception.py:966
+#, python-format
+msgid ""
+"Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
+msgstr ""
+
+#: nova/exception.py:971
+msgid "Unable to create instance type"
+msgstr ""
+
+#: nova/exception.py:975
+msgid "Bad response from SolidFire API"
+msgstr ""
+
+#: nova/exception.py:979
+#, python-format
+msgid "Error in SolidFire API response: status=%(status)s"
+msgstr ""
+
+#: nova/exception.py:983
+#, python-format
+msgid "Error in SolidFire API response: data=%(data)s"
+msgstr ""
+
+#: nova/exception.py:987
+msgid "Detected existing vlan with id %(vlan)"
+msgstr ""
+
 #: ../nova/network/quantum/melange_ipam_lib.py:100
 #, python-format
 msgid "No network found for cidr %s"
 msgstr ""
 
-#: ../nova/network/quantum/melange_ipam_lib.py:145
+#: nova/network/quantum/melange_ipam_lib.py:132
 msgid ""
 "get_project_and_global_net_ids must be called with a non-null project_id"
 msgstr ""
 
-#: ../nova/compute/instance_types.py:50 ../nova/compute/instance_types.py:58
+#: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
 
-#: ../nova/compute/instance_types.py:67 ../nova/volume/volume_types.py:41
+#: nova/compute/instance_types.py:74 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: ../nova/compute/instance_types.py:68
+#: nova/compute/instance_types.py:84
+#, python-format
+msgid "Instance type %s not found for deletion"
+msgstr ""
+
+#: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:39
+msgid "priority column not added to networks table"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:149
+#, python-format
+msgid "Instance %(instance)s is backed by %(backing)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:160
 #, python-format
 msgid ""
-"Cannot create instance_type with name %(name)s and flavorid %(flavorid)s"
+"Instance %(instance)s is using a backing file %(backing)s which does not "
+"appear in the image service"
 msgstr ""
 
-#: ../nova/compute/instance_types.py:79
+#: nova/virt/libvirt/imagecache.py:211
 #, python-format
-msgid "Instance type %s not found for deletion"
+msgid ""
+"%(container_format)s-%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: ../nova/compute/instance_types.py:89
+#: nova/virt/libvirt/imagecache.py:223
 #, python-format
-msgid "Instance type %s not found for purge"
+msgid ""
+"%(container_format)s-%(id)s (%(base_file)s): image verification skipped, no "
+"hash stored"
 msgstr ""
 
-#: ../nova/compute/instance_types.py:115 ../nova/compute/instance_types.py:127
-#: ../nova/compute/instance_types.py:141 ../nova/compute/instance_types.py:152
+#: nova/virt/libvirt/imagecache.py:243
 #, python-format
-msgid "Unknown instance type: %s"
-msgstr "Type d'instance inconnu: %s"
+msgid "Base file too young to remove: %s"
+msgstr ""
 
-#: ../nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:38
-msgid "priority column not added to networks table"
+#: nova/virt/libvirt/imagecache.py:246
+#, python-format
+msgid "Removing base file: %s"
 msgstr ""
 
-#: ../nova/scheduler/distributed_scheduler.py:54
-msgid ""
-"Ill-formed or incorrectly routed 'blob' data sent to instance create request."
+#: nova/virt/libvirt/imagecache.py:253
+#, python-format
+msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: ../nova/scheduler/distributed_scheduler.py:73
+#: nova/virt/libvirt/imagecache.py:265
 #, python-format
-msgid "No host selection for %s defined."
+msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: ../nova/scheduler/distributed_scheduler.py:90
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
+msgid ""
+"%(container_format)s-%(id)s (%(base_file)s): in use: on this node %(local)d "
+"local, %(remote)d on other nodes"
 msgstr ""
 
-#: ../nova/scheduler/distributed_scheduler.py:138
+#: nova/virt/libvirt/imagecache.py:291
 #, python-format
 msgid ""
-"Attempting to determine target host for resize to instance type "
-"%(instance_type_id)s"
+"%(container_format)s-%(id)s (%(base_file)s): warning -- an absent base file "
+"is in use! instances: %(instance_list)s"
 msgstr ""
 
-#: ../nova/scheduler/distributed_scheduler.py:220
+#: nova/virt/libvirt/imagecache.py:302
 #, python-format
 msgid ""
-"Forwarding instance create call to zone '%(zone_name)s'. "
-"ReservationID=%(reservation_id)s"
+"%(container_format)s-%(id)s (%(base_file)s): in: on other nodes (%(remote)d "
+"on other nodes)"
 msgstr ""
 
-#: ../nova/scheduler/distributed_scheduler.py:230
+#: nova/virt/libvirt/imagecache.py:314
 #, python-format
-msgid "Bad credentials attempting to talk to zone at %(url)s."
+msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: ../nova/scheduler/distributed_scheduler.py:270
+#: nova/virt/libvirt/imagecache.py:322
 #, python-format
-msgid "Bad child zone scaling values for Zone: %(zone_id)s"
+msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: ../nova/scheduler/distributed_scheduler.py:287
-msgid "Scheduler only understands Compute nodes (for now)"
+#: nova/virt/libvirt/imagecache.py:351
+#, python-format
+msgid "Skipping verification, no base directory at %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:355
+msgid "Verify base images"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:383
+#, python-format
+msgid "Unknown base file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:388
+#, python-format
+msgid "Active base files: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:391
+#, python-format
+msgid "Corrupt base files: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:395
+#, python-format
+msgid "Removable base files: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:403
+msgid "Verification complete"
+msgstr ""
+
+#: nova/scheduler/distributed_scheduler.py:50
+#, python-format
+msgid "No host selection for %s defined."
+msgstr ""
+
+#: nova/scheduler/distributed_scheduler.py:63
+#, python-format
+msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: ../nova/scheduler/distributed_scheduler.py:292
-msgid "Scheduler only understands InstanceType-basedprovisioning."
+#: nova/scheduler/distributed_scheduler.py:140
+msgid "Scheduler only understands Compute nodes (for now)"
 msgstr ""
 
-#: ../nova/scheduler/distributed_scheduler.py:323
+#: nova/scheduler/distributed_scheduler.py:178
 #, python-format
-msgid "Filtered %(filtered_hosts)s"
+msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: ../nova/scheduler/distributed_scheduler.py:329
+#: nova/scheduler/distributed_scheduler.py:188
 #, python-format
 msgid "Weighted %(weighted_host)s"
 msgstr ""
 
-#: ../nova/volume/manager.py:89
+#: nova/volume/manager.py:96
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr "Ré-exportation de %s volumes"
 
-#: ../nova/volume/manager.py:94
+#: nova/volume/manager.py:101
 #, python-format
 msgid "volume %s: skipping export"
 msgstr "volume %s : exportation évitée"
 
-#: ../nova/volume/manager.py:100
+#: nova/volume/manager.py:107
 #, python-format
 msgid "volume %s: creating"
 msgstr "volume %s: création"
 
-#: ../nova/volume/manager.py:112
+#: nova/volume/manager.py:119
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr "volume %(vol_name)s: cŕeation d'un volume logique de %(vol_size)sG"
 
-#: ../nova/volume/manager.py:124
+#: nova/volume/manager.py:131
 #, python-format
 msgid "volume %s: creating export"
 msgstr "volume %s: exportation en cours"
 
-#: ../nova/volume/manager.py:138
+#: nova/volume/manager.py:145
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: crée avec succès"
 
-#: ../nova/volume/manager.py:167
+#: nova/volume/manager.py:174
 msgid "Volume is still attached"
 msgstr "Le volume est encore attaché"
 
-#: ../nova/volume/manager.py:169
+#: nova/volume/manager.py:176
 msgid "Volume is not local to this node"
 msgstr "Le volume n'est pas local à ce noeud"
 
-#: ../nova/volume/manager.py:173
+#: nova/volume/manager.py:180
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: suppression de l'exportation"
 
-#: ../nova/volume/manager.py:175
+#: nova/volume/manager.py:182
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: suppression"
 
-#: ../nova/volume/manager.py:178
+#: nova/volume/manager.py:185
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: ../nova/volume/manager.py:190
+#: nova/volume/manager.py:197
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: supprimé avec succès"
 
-#: ../nova/volume/manager.py:197
+#: nova/volume/manager.py:204
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: ../nova/volume/manager.py:201
+#: nova/volume/manager.py:208
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: ../nova/volume/manager.py:216
+#: nova/volume/manager.py:223
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: ../nova/volume/manager.py:225
+#: nova/volume/manager.py:232
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: ../nova/volume/manager.py:234
+#: nova/volume/manager.py:241
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: ../nova/volume/manager.py:296
+#: nova/volume/manager.py:323
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: ../nova/volume/manager.py:300
+#: nova/volume/manager.py:327
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: ../nova/volume/manager.py:311
+#: nova/volume/manager.py:338
 msgid "Clear capabilities"
 msgstr ""
 
-#: ../nova/volume/manager.py:315
+#: nova/volume/manager.py:342
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
 
-#: ../nova/volume/api.py:49 ../nova/volume/api.py:262
-msgid "Snapshot status must be available"
+#: nova/volume/api.py:74 nova/volume/api.py:210
+msgid "status must be available"
 msgstr ""
 
-#: ../nova/volume/api.py:55
+#: nova/volume/api.py:85
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume"
 msgstr ""
 
-#: ../nova/volume/api.py:57
-#, python-format
-msgid "Volume quota exceeded. You cannot create a volume of size %sG"
-msgstr "Quota de volume dépassé. Vous ne pouvez pas créer un volume de %sG"
-
-#: ../nova/volume/api.py:102 ../nova/volume/api.py:172
-#: ../nova/volume/api.py:230
+#: nova/volume/api.py:133
 msgid "Volume status must be available"
 msgstr "Le status du volume doit être disponible"
 
-#: ../nova/volume/api.py:174
-msgid "Volume is already attached"
-msgstr "Volume déjà attaché"
-
-#: ../nova/volume/api.py:180
-msgid "Volume is already detached"
-msgstr "Volume déjà déttaché"
+#: nova/compute/api.py:1012 nova/volume/api.py:163
+#: nova/volume/volume_types.py:64
+#, python-format
+msgid "Searching by: %s"
+msgstr ""
+
+#: nova/volume/api.py:213
+msgid "already attached"
+msgstr ""
+
+#: nova/volume/api.py:220
+msgid "already detached"
+msgstr ""
+
+#: nova/volume/api.py:272 nova/volume/api.py:305
+msgid "must be available"
+msgstr ""
+
+#: nova/tests/test_misc.py:114
+#, python-format
+msgid ""
+"The following migrations are missing a downgrade:\n"
+"\t%s"
+msgstr ""
 
-#: ../nova/virt/libvirt/connection.py:226
+#: nova/virt/libvirt/connection.py:244
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Connexion à libvirt: %s"
 
-#: ../nova/virt/libvirt/connection.py:240
+#: nova/virt/libvirt/connection.py:258
 msgid "Connection to libvirt broke"
 msgstr "Connexion à libvirt interrompue"
 
-#: ../nova/virt/libvirt/connection.py:328
+#: nova/virt/libvirt/connection.py:362
 #, python-format
-msgid ""
-"Error from libvirt during destroy of %(instance_name)s. Code=%(errcode)s "
-"Error=%(e)s"
+msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: ../nova/virt/libvirt/connection.py:341
+#: nova/virt/libvirt/connection.py:374
 #, python-format
 msgid ""
-"Error from libvirt during saved instance removal %(instance_name)s. "
-"Code=%(errcode)s Error=%(e)s"
+"Error from libvirt during saved instance removal. Code=%(errcode)s "
+"Error=%(e)s"
 msgstr ""
 
-#: ../nova/virt/libvirt/connection.py:352
+#: nova/virt/libvirt/connection.py:385
 #, python-format
-msgid ""
-"Error from libvirt during undefine of %(instance_name)s. Code=%(errcode)s "
-"Error=%(e)s"
+msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: ../nova/virt/libvirt/connection.py:367
-#, python-format
-msgid "Instance %s destroyed successfully."
+#: nova/virt/libvirt/connection.py:399
+msgid "Instance destroyed successfully."
 msgstr ""
 
-#: ../nova/virt/libvirt/connection.py:394
+#: nova/virt/libvirt/connection.py:430
 #, python-format
-msgid "instance %(instance_name)s: deleting instance files %(target)s"
+msgid "Deleting instance files %(target)s"
 msgstr ""
-"instance %(instance_name)s: suppression des fichiers d'instance %(target)s"
 
-#: ../nova/virt/libvirt/connection.py:566
-#: ../nova/virt/libvirt/connection.py:680
-#, python-format
-msgid "During reboot, %s disappeared."
+#: nova/virt/libvirt/connection.py:512
+msgid "attaching LXC block device"
 msgstr ""
 
-#: ../nova/virt/libvirt/connection.py:571
-#, python-format
-msgid "Instance %s rebooted successfully."
+#: nova/virt/libvirt/connection.py:525
+msgid "detaching LXC block device"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:676 nova/virt/libvirt/connection.py:820
+msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: ../nova/virt/libvirt/connection.py:670
+#: nova/virt/libvirt/connection.py:681
+msgid "Instance rebooted successfully."
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:778 nova/virt/xenapi/vmops.py:1371
 #, python-format
-msgid "instance %s: is running"
-msgstr "instance %s: est active"
+msgid ""
+"Found %(migration_count)d unconfirmed migrations older than "
+"%(confirm_window)d seconds"
+msgstr ""
 
-#: ../nova/virt/libvirt/connection.py:685
+#: nova/virt/libvirt/connection.py:782 nova/virt/xenapi/vmops.py:1375
 #, python-format
-msgid "Instance %s spawned successfully."
+msgid "Automatically confirming migration %d"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:809
+msgid "Instance is running"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:825
+msgid "Instance spawned successfully."
 msgstr ""
 
-#: ../nova/virt/libvirt/connection.py:693
+#: nova/virt/libvirt/connection.py:833
 #, python-format
 msgid "virsh said: %r"
 msgstr "virsh a retourné : %r"
 
-#: ../nova/virt/libvirt/connection.py:697
+#: nova/virt/libvirt/connection.py:837
 msgid "cool, it's a device"
 msgstr "super, c'est un device"
 
-#: ../nova/virt/libvirt/connection.py:708
+#: nova/virt/libvirt/connection.py:848
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#. LXC is also special
-#: ../nova/virt/libvirt/connection.py:728
+#: nova/virt/libvirt/connection.py:875
 msgid "Unable to read LXC console"
 msgstr ""
 
-#: ../nova/virt/libvirt/connection.py:854
-#, python-format
-msgid "instance %s: Creating image"
-msgstr "instance %s : Création de l'image"
+#: nova/virt/libvirt/connection.py:992
+msgid "Creating image"
+msgstr ""
 
-#: ../nova/virt/libvirt/connection.py:1033
+#: nova/virt/libvirt/connection.py:1171
 #, python-format
-msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
+msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#. This could be a windows image, or a vmdk format disk
-#: ../nova/virt/libvirt/connection.py:1044
+#: nova/virt/libvirt/connection.py:1179
 #, python-format
-msgid ""
-"instance %(inst_name)s: ignoring error injecting data into image %(img_id)s "
-"(%(e)s)"
+msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
-"instance %(inst_name)s : l'erreur d'injection de donné dans l'image "
-"%(img_id)s (%(e)s) a été ignorée"
 
-#: ../nova/virt/libvirt/connection.py:1069
+#: nova/virt/libvirt/connection.py:1211
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#. TODO(termie): cache?
-#: ../nova/virt/libvirt/connection.py:1183
-#, python-format
-msgid "instance %s: starting toXML method"
-msgstr "instance %s: démarrage de la méthode toXML"
+#: nova/virt/libvirt/connection.py:1336
+msgid "Starting toXML method"
+msgstr ""
 
-#: ../nova/virt/libvirt/connection.py:1187
-#, python-format
-msgid "instance %s: finished toXML method"
-msgstr "instance %s: fin d'éxécution de la méthode toXML"
+#: nova/virt/libvirt/connection.py:1340
+msgid "Finished toXML method"
+msgstr ""
 
-#: ../nova/virt/libvirt/connection.py:1204
+#: nova/virt/libvirt/connection.py:1357
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: ../nova/virt/libvirt/connection.py:1319
-msgid ""
-"Cannot get the number of cpu, because this function is not implemented for "
-"this platform. This error can be safely ignored for now."
-msgstr ""
-
-#: ../nova/virt/libvirt/connection.py:1416
+#: nova/virt/libvirt/connection.py:1578
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: ../nova/virt/libvirt/connection.py:1438
+#: nova/virt/libvirt/connection.py:1600
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: ../nova/virt/libvirt/connection.py:1465
+#: nova/virt/libvirt/connection.py:1627
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: ../nova/virt/libvirt/connection.py:1561
+#: nova/virt/libvirt/connection.py:1724
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: ../nova/virt/libvirt/connection.py:1564
+#: nova/virt/libvirt/connection.py:1727
 #, python-format
 msgid ""
 "to xml...\n"
 ":%s "
 msgstr ""
 
-#: ../nova/virt/libvirt/connection.py:1567
+#: nova/virt/libvirt/connection.py:1730
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6136,168 +6681,123 @@
 "Refer to %(u)s"
 msgstr ""
 
-#: ../nova/virt/libvirt/connection.py:1624
+#: nova/virt/libvirt/connection.py:1787
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: ../nova/virt/libvirt/connection.py:1841
+#: nova/virt/libvirt/connection.py:2007
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/network_utils.py:155
-#, python-format
-msgid "Creating Port Group with name %s on "
-msgstr ""
-
-#: ../nova/virt/vmwareapi/network_utils.py:169
-#, python-format
-msgid "Created Port Group with name %s on "
-msgstr ""
-
-#: ../nova/db/sqlalchemy/api.py:50
-msgid "Use of empty request context is deprecated"
-msgstr "L'utilisation d'une requête de contexte vide est dévalué"
-
-#: ../nova/db/sqlalchemy/api.py:168
-#, python-format
-msgid "Unrecognized read_deleted value '%s'"
-msgstr ""
-
-#: ../nova/db/sqlalchemy/api.py:3883 ../nova/db/sqlalchemy/api.py:3909
-#, python-format
-msgid "No backend config with id %(sm_backend_id)s"
-msgstr ""
-
-#: ../nova/db/sqlalchemy/api.py:3967
-#, python-format
-msgid "No sm_flavor called %(sm_flavor)s"
-msgstr ""
-
-#: ../nova/db/sqlalchemy/api.py:4011
-#, python-format
-msgid "No sm_volume with id %(volume_id)s"
-msgstr ""
-
-#: ../nova/volume/volume_types.py:42
-#, python-format
-msgid ""
-"Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
-msgstr ""
-
-#: ../nova/volume/volume_types.py:55
+#: nova/virt/libvirt/connection.py:2098
 #, python-format
-msgid "Volume type %s not found for deletion"
+msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: ../nova/volume/volume_types.py:56 ../nova/volume/volume_types.py:68
-#: ../nova/volume/volume_types.py:120 ../nova/volume/volume_types.py:131
+#: nova/virt/libvirt/connection.py:2153
 #, python-format
-msgid "Unknown volume type: %s"
+msgid "During wait running, %s disappeared."
 msgstr ""
 
-#: ../nova/volume/volume_types.py:67
+#: nova/virt/libvirt/connection.py:2158
 #, python-format
-msgid "Volume type %s not found for purge"
+msgid "Instance %s running successfully."
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:135
-msgid "No body provided"
-msgstr ""
-
-#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:147
-#, python-format
-msgid "Create VSA %(display_name)s of type %(vc_type)s"
-msgstr ""
-
-#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:167
+#: nova/virt/libvirt/connection.py:2165
 #, python-format
-msgid "Delete VSA with id: %s"
+msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:185
+#: nova/virt/libvirt/connection.py:2206
 #, python-format
-msgid "Associate address %(ip)s to VSA %(id)s"
+msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:213
-#, python-format
-msgid "Disassociate address from VSA %(id)s"
+#: nova/api/openstack/compute/contrib/keypairs.py:85
+msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:286
+#: nova/api/openstack/compute/contrib/keypairs.py:90
 #, python-format
-msgid "%(obj)s with ID %(id)s not found"
+msgid "Key pair '%s' already exists."
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:292
-#, python-format
-msgid ""
-"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA "
-"%(vsa_id)s."
+#: nova/virt/vmwareapi/network_utils.py:128
+msgid ""
+"ESX SOAP server returned an empty port group for the host system in its "
+"response"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:311
+#: nova/virt/vmwareapi/network_utils.py:155
 #, python-format
-msgid "Index. vsa_id=%(vsa_id)s"
+msgid "Creating Port Group with name %s on the ESX host"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:316
+#: nova/virt/vmwareapi/network_utils.py:169
 #, python-format
-msgid "Detail. vsa_id=%(vsa_id)s"
+msgid "Created Port Group with name %s on the ESX host"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:321
+#: nova/db/sqlalchemy/api.py:56
+msgid "Use of empty request context is deprecated"
+msgstr "L'utilisation d'une requête de contexte vide est dévalué"
+
+#: nova/db/sqlalchemy/api.py:188
 #, python-format
-msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
+msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:329
+#: nova/db/sqlalchemy/api.py:565 nova/db/sqlalchemy/api.py:600
 #, python-format
-msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
+msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:373
+#: nova/db/sqlalchemy/api.py:4124 nova/db/sqlalchemy/api.py:4150
 #, python-format
-msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
+msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:386
+#: nova/db/sqlalchemy/api.py:4208
 #, python-format
-msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
+msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:401
+#: nova/db/sqlalchemy/api.py:4252
 #, python-format
-msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
+msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:614
-#, python-format
-msgid "Index instances for VSA %s"
+#: nova/volume/volume_types.py:49 nova/volume/volume_types.py:108
+msgid "name cannot be None"
+msgstr ""
+
+#: nova/volume/volume_types.py:96
+msgid "id cannot be None"
 msgstr ""
 
-#: ../nova/network/quantum/nova_ipam_lib.py:70
+#: nova/network/quantum/nova_ipam_lib.py:75
 msgid "Error creating network entry"
 msgstr ""
 
-#: ../nova/network/quantum/nova_ipam_lib.py:83
+#: ../nova/network/quantum/nova_ipam_lib.py:88
 #, python-format
 msgid "No network with fixed_range = %s"
 msgstr ""
 
-#: ../nova/network/quantum/nova_ipam_lib.py:94
+#: nova/network/quantum/nova_ipam_lib.py:90
 #, python-format
 msgid "No network with net_id = %s"
 msgstr ""
 
-#: ../nova/network/quantum/nova_ipam_lib.py:214
+#: ../nova/network/quantum/nova_ipam_lib.py:230
 #, python-format
 msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: ../nova/auth/ldapdriver.py:621
+#: nova/auth/ldapdriver.py:650
 #, python-format
 msgid ""
 "Attempted to remove the last member of a group. Deleting the group at %s "
@@ -6306,139 +6806,135 @@
 "Tentative de suppression du dernier membre d'un groupe.  Essayez plutôt de "
 "supprimer le group sur %s."
 
-#: ../nova/virt/vmwareapi/read_write_util.py:153
-msgid "Exception during HTTP connection close in "
+#: nova/api/openstack/compute/server_metadata.py:38
+#: nova/api/openstack/compute/server_metadata.py:124
+#: nova/api/openstack/compute/server_metadata.py:163
+msgid "Server does not exist"
+msgstr ""
+
+#: nova/api/openstack/compute/server_metadata.py:143
+#: nova/api/openstack/compute/server_metadata.py:156
+msgid "Metadata item was not found"
+msgstr ""
+
+#: nova/scheduler/filters/core_filter.py:45
+msgid "VCPUs not set; assuming CPU collection broken"
+msgstr ""
+
+#: nova/virt/vmwareapi/read_write_util.py:150
+#, python-format
+msgid ""
+"Exception during HTTP connection close in VMWareHTTpWrite. Exception is %s"
 msgstr ""
 
-#: ../nova/tests/test_volume.py:190
+#: nova/tests/test_volume.py:195
 #, python-format
 msgid "Target %s allocated"
 msgstr "Destination %s allouée"
 
-#: ../nova/tests/test_volume.py:392
+#: nova/tests/test_volume.py:383
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
 
-#: ../nova/scheduler/driver.py:55
+#: nova/scheduler/driver.py:63
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: ../nova/scheduler/driver.py:72
+#: nova/scheduler/driver.py:80
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: ../nova/scheduler/driver.py:81
+#: nova/scheduler/driver.py:89
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: ../nova/scheduler/driver.py:99
+#: nova/scheduler/driver.py:107
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: ../nova/scheduler/driver.py:165
+#: nova/scheduler/driver.py:181
 msgid "Must implement a fallback schedule"
 msgstr "Doit mettre en oeuvre un calendrier de retrait"
 
-#: ../nova/scheduler/driver.py:287
+#: nova/scheduler/driver.py:314
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: ../nova/scheduler/driver.py:294
+#: nova/scheduler/driver.py:322
 #, python-format
 msgid ""
 "Cannot confirm tmpfile at %(ipath)s is on same shared storage between "
 "%(src)s and %(dest)s."
 msgstr ""
 
-#: ../nova/scheduler/driver.py:332
+#: nova/scheduler/driver.py:360 nova/scheduler/driver.py:450
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: ../nova/scheduler/driver.py:379
+#: nova/scheduler/driver.py:409
 #, python-format
 msgid ""
 "Unable to migrate %(instance_id)s to %(dest)s: Lack of memory(host:%(avail)s "
 "<= instance:%(mem_inst)s)"
 msgstr ""
 
-#: ../nova/scheduler/driver.py:410
+#: nova/scheduler/driver.py:465
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of disk(host:%(avail)s "
-"<= instance:%(disk_inst)s)"
-msgstr ""
-
-#: ../nova/tests/scheduler/test_scheduler.py:235
-msgid "Test NoValidHost exception"
+"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"disk(host:%(available)s <= instance:%(necessary)s)"
 msgstr ""
 
-#: ../nova/tests/scheduler/test_scheduler.py:782
-msgid "Shouldn't try to create DB entry when at max cores"
+#: nova/api/openstack/compute/contrib/hosts.py:145
+#, python-format
+msgid "Invalid status: '%s'"
 msgstr ""
 
-#: ../nova/tests/scheduler/test_scheduler.py:1253
-msgid "Successful database hit should succeed"
+#: nova/api/openstack/compute/contrib/hosts.py:150
+#, python-format
+msgid "Invalid update setting: '%s'"
 msgstr ""
 
-#: ../nova/tests/scheduler/test_scheduler.py:1270
-msgid "Should have rerouted."
+#: nova/api/openstack/compute/contrib/hosts.py:159
+#, python-format
+msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: ../nova/tests/scheduler/test_scheduler.py:1369
-#, python-format
-msgid "RedirectResult should have been raised: %s"
+#: nova/api/openstack/compute/contrib/hosts.py:206
+msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: ../nova/tests/scheduler/test_scheduler.py:1371
-msgid "RedirectResult should have been raised"
+#: nova/api/openstack/compute/contrib/hosts.py:214
+msgid "Host not found"
 msgstr ""
 
-#: ../nova/api/openstack/xmlutil.py:265
+#: nova/api/openstack/xmlutil.py:265
 msgid "element is not a child"
 msgstr ""
 
-#: ../nova/api/openstack/xmlutil.py:414
+#: nova/api/openstack/xmlutil.py:414
 msgid "root element selecting a list"
 msgstr ""
 
-#: ../nova/api/openstack/xmlutil.py:735
+#: nova/api/openstack/xmlutil.py:739
 #, python-format
 msgid ""
 "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: ../nova/api/openstack/xmlutil.py:854
+#: nova/api/openstack/xmlutil.py:858
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: ../nova/tests/test_quantum.py:77
-#, python-format
-msgid "interface '%s' is already attached"
-msgstr ""
-
-#: ../nova/tests/test_quantum.py:84
-msgid "network %(net_id)s does not exist for tenant %(tenant_id)"
-msgstr ""
-
-#: ../nova/tests/test_quantum.py:96
-#, python-format
-msgid "network %(net_id)s does not exist for tenant %(tenant_id)s"
-msgstr ""
-
-#: ../nova/api/openstack/v2/contrib/__init__.py:62
-#, python-format
-msgid "Failed to load extension %(classname)s: %(exc)s"
-msgstr ""
-
-#: ../nova/api/openstack/v2/contrib/__init__.py:86
+#: nova/virt/vmwareapi/error_util.py:93
 #, python-format
-msgid "Failed to load extension %(ext_name)s: %(exc)s"
+msgid "Error(s) %s occurred in the call to RetrieveProperties"
 msgstr ""
 
 #: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:84
@@ -6482,983 +6978,1017 @@
 "La VDI %(vdi_ref)s (%(label)s, %(size)s, %(read_only)s) a été créée sur "
 "%(sr_ref)s."
 
-#: ../nova/api/openstack/v2/contrib/admin_actions.py:59
+#: nova/virt/xenapi/vmops.py:181
 #, python-format
-msgid "Compute.api::pause %s"
-msgstr "Compute.api::pause %s"
+msgid "Attempted to power on non-existent instance bad instance id %s"
+msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/admin_actions.py:74
+#: nova/virt/xenapi/vmops.py:183
 #, python-format
-msgid "Compute.api::unpause %s"
-msgstr "Compute.api::unpause %s"
+msgid "Starting instance %s"
+msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/admin_actions.py:89
+#: nova/virt/xenapi/vmops.py:246
 #, python-format
-msgid "compute.api::suspend %s"
-msgstr "compute.api::suspend %s"
+msgid "instance %s: Failed to spawn"
+msgstr "instance %s: n'a pas pu être crée"
 
-#: ../nova/api/openstack/v2/contrib/admin_actions.py:104
+#: nova/virt/xenapi/vmops.py:248
 #, python-format
-msgid "compute.api::resume %s"
-msgstr "compute.api::resume %s"
+msgid "Instance %s failed to spawn - performing clean-up"
+msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/admin_actions.py:116
+#. Collect VDI/file resources to clean up;
+#. These resources will be removed by _handle_spawn_error.
+#: ../nova/virt/xenapi/vmops.py:323
 #, python-format
-msgid "Error in migrate %s"
+msgid "instance %s: Failed to spawn - "
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/admin_actions.py:131
+#: nova/virt/xenapi/vmops.py:389
 #, python-format
-msgid "Compute.api::reset_network %s"
-msgstr "Compute.api::reset_network %s"
+msgid ""
+"Auto configuring disk for instance %(instance_uuid)s, attempting to resize "
+"partition..."
+msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/admin_actions.py:148
+#: nova/virt/xenapi/vmops.py:448
 #, python-format
-msgid "Compute.api::inject_network_info %s"
+msgid "Invalid value for injected_files: '%s'"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/admin_actions.py:165
+#: nova/virt/xenapi/vmops.py:453
 #, python-format
-msgid "Compute.api::lock %s"
-msgstr "Compute.api::lock %s"
+msgid "Injecting file path: '%s'"
+msgstr "Injection du chemin d'accès : '%s'"
 
-#: ../nova/api/openstack/v2/contrib/admin_actions.py:182
-#, python-format
-msgid "Compute.api::unlock %s"
-msgstr "Compute.api::unlock %s"
+#: nova/virt/xenapi/vmops.py:459
+msgid "Setting admin password"
+msgstr ""
 
-#: ../nova/tests/test_volume_types.py:62
-#, python-format
-msgid "Given data: %s"
+#: nova/virt/xenapi/vmops.py:463
+msgid "Resetting network"
 msgstr ""
 
-#: ../nova/tests/test_volume_types.py:63
-#, python-format
-msgid "Result data: %s"
+#: nova/virt/xenapi/vmops.py:470
+msgid "Setting VCPU weight"
 msgstr ""
 
-#: ../nova/db/sqlalchemy/migration.py:36
-msgid "python-migrate is not installed. Exiting."
-msgstr "python-migrate n'est pas installé. Fin d'éxécution."
+#: nova/virt/xenapi/vmops.py:476
+#, python-format
+msgid "Starting VM %s..."
+msgstr "Démarrage de la VM %s..."
 
-#: ../nova/db/sqlalchemy/migration.py:46
-msgid "version should be an integer"
+#: nova/virt/xenapi/vmops.py:480
+#, python-format
+msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
 msgstr ""
 
-#: ../nova/api/ec2/__init__.py:59
+#: nova/virt/xenapi/vmops.py:487
 #, python-format
-msgid "FaultWrapper: %s"
+msgid ""
+"Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is %(version)s"
 msgstr ""
 
-#: ../nova/api/ec2/__init__.py:134
-msgid "Too many failed authentications."
-msgstr "Trop d'erreur d'authentification"
-
-#: ../nova/api/ec2/__init__.py:144
+#: nova/virt/xenapi/vmops.py:490
 #, python-format
-msgid ""
-"Access key %(access_key)s has had %(failures)d failed authentications and "
-"will be locked out for %(lock_mins)d minutes."
+msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
-"La clef d'accès %(access_key)s a rencontrée %(failures)d echecs "
-"d'authentification et sera par conséquent vérouillée pour %(lock_mins)d "
-"minutes."
 
-#: ../nova/api/ec2/__init__.py:204
+#: nova/virt/xenapi/vmops.py:497
 #, python-format
-msgid "Authentication Failure: %s"
-msgstr "Echec d'authentification : %s"
+msgid "Instance %s: waiting for running"
+msgstr ""
 
-#: ../nova/api/ec2/__init__.py:220
+#: nova/virt/xenapi/vmops.py:506
 #, python-format
-msgid "Authenticated Request For %(uname)s:%(pname)s)"
-msgstr "Requête authentifiée pour : %(uname)s:%(pname)s)"
+msgid "Instance %s: running"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:510
+msgid "Querying agent version"
+msgstr ""
 
-#: ../nova/api/ec2/__init__.py:251
+#: nova/virt/xenapi/vmops.py:513
 #, python-format
-msgid "action: %s"
-msgstr "action: %s"
+msgid "Instance agent version: %s"
+msgstr ""
 
-#: ../nova/api/ec2/__init__.py:253
+#: nova/virt/xenapi/vmops.py:517
 #, python-format
-msgid "arg: %(key)s\t\tval: %(value)s"
-msgstr "arg: %(key)s\t\tval: %(value)s"
+msgid "Updating Agent to %s"
+msgstr ""
 
-#: ../nova/api/ec2/__init__.py:328
+#: nova/virt/xenapi/vmops.py:539
 #, python-format
-msgid ""
-"Unauthorized request for controller=%(controller)s and action=%(action)s"
+msgid "Resources to remove:%s"
 msgstr ""
-"Requête non authorisé pour le controlleur=%(controller)s et "
-"l'action=%(action)s"
 
-#: ../nova/api/ec2/__init__.py:359
+#: nova/virt/xenapi/vmops.py:550
 #, python-format
-msgid "InstanceNotFound raised: %s"
-msgstr "\"Instance non trouvée\" remontée : %s"
+msgid "Removing VDI %(vdi_ref)s(uuid:%(vdi_to_remove)s)"
+msgstr ""
 
-#: ../nova/api/ec2/__init__.py:365
+#: nova/virt/xenapi/vmops.py:555
 #, python-format
-msgid "VolumeNotFound raised: %s"
-msgstr "\"Volume non trouvé\" remonté : %s"
+msgid "Skipping VDI destroy for %s"
+msgstr ""
 
-#: ../nova/api/ec2/__init__.py:371
+#: nova/virt/xenapi/vmops.py:564
+msgid "Removing kernel/ramdisk files from dom0"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:593
 #, python-format
-msgid "SnapshotNotFound raised: %s"
+msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: ../nova/api/ec2/__init__.py:377
+#: nova/virt/xenapi/vmops.py:647
 #, python-format
-msgid "NotFound raised: %s"
-msgstr "\"Non trouvé\" remonté : %s"
+msgid "Finished snapshot and upload for VM %s"
+msgstr "Fin de l'instantané et du chargement de VM %s"
 
-#: ../nova/api/ec2/__init__.py:380
+#: nova/virt/xenapi/vmops.py:655
 #, python-format
-msgid "ApiError raised: %s"
-msgstr "\"Erreur API\" remontée : %s"
+msgid "Starting snapshot for VM %s"
+msgstr "Début de création d'instantané (snapshot) pour la VM %s"
 
-#: ../nova/api/ec2/__init__.py:388
+#: nova/virt/xenapi/vmops.py:664
 #, python-format
-msgid "KeyPairExists raised: %s"
+msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
 msgstr ""
 
-#: ../nova/api/ec2/__init__.py:392
-#, python-format
-msgid "InvalidParameterValue raised: %s"
+#: nova/virt/xenapi/vmops.py:683
+msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: ../nova/api/ec2/__init__.py:396
+#: nova/virt/xenapi/vmops.py:703
 #, python-format
-msgid "InvalidPortRange raised: %s"
+msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: ../nova/api/ec2/__init__.py:400
+#: nova/virt/xenapi/vmops.py:751
 #, python-format
-msgid "NotAuthorized raised: %s"
+msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: ../nova/api/ec2/__init__.py:404
+#: nova/virt/xenapi/vmops.py:874
 #, python-format
-msgid "InvalidRequest raised: %s"
+msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: ../nova/api/ec2/__init__.py:409
+#: nova/virt/xenapi/vmops.py:882
 #, python-format
-msgid "Unexpected error raised: %s"
-msgstr "\"Erreur inopinée\" remontée : %s"
+msgid "Resize instance %s complete"
+msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:117
+#: nova/virt/xenapi/vmops.py:913
 #, python-format
-msgid "Invalid server status: %(status)s"
+msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:125
-msgid "Invalid changes-since value"
+#: nova/virt/xenapi/vmops.py:933
+#, python-format
+msgid "domid changed from %(olddomid)s to %(newdomid)s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:163
-msgid "Personality file limit exceeded"
+#: nova/virt/xenapi/vmops.py:949
+#, python-format
+msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:165
-msgid "Personality file path too long"
+#: nova/virt/xenapi/vmops.py:972
+#, python-format
+msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:167
-msgid "Personality file content too long"
+#: nova/virt/xenapi/vmops.py:988
+#, python-format
+msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:195
-msgid "Server name is not a string or unicode"
+#: nova/virt/xenapi/vmops.py:1015
+#, python-format
+msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:199
-msgid "Server name is an empty string"
+#: nova/virt/xenapi/vmops.py:1024
+#, python-format
+msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:217
+#: nova/virt/xenapi/vmops.py:1028
 #, python-format
-msgid "Bad personality format: missing %s"
+msgid "Shutting down VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:220
-msgid "Bad personality format"
+#: nova/virt/xenapi/vmops.py:1047
+msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:225
+#: nova/virt/xenapi/vmops.py:1068
 #, python-format
-msgid "Personality content for %s cannot be decoded"
-msgstr ""
-
-#: ../nova/api/openstack/v2/servers.py:241
-#: ../nova/api/openstack/v2/servers.py:729
-msgid "Invalid adminPass"
+msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:255
+#: nova/virt/xenapi/vmops.py:1126
 #, python-format
-msgid "Bad networks format: network uuid is not in proper format (%s)"
+msgid ""
+"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
+"deletion"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:264
-#, python-format
-msgid "Invalid fixed IP address (%s)"
+#: nova/virt/xenapi/vmops.py:1133
+msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:271
+#: nova/virt/xenapi/vmops.py:1140
+msgid "kernel/ramdisk files removed"
+msgstr "Fichiers noyau/ramdisk supprimés"
+
+#: nova/virt/xenapi/vmops.py:1152
 #, python-format
-msgid "Duplicate networks (%s) are not allowed"
+msgid "Instance %(instance_uuid)s VM destroyed"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:277
+#: nova/virt/xenapi/vmops.py:1170
 #, python-format
-msgid "Bad network format: missing %s"
+msgid "Destroying VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:280
-msgid "Bad networks format"
+#: nova/virt/xenapi/vmops.py:1185
+msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:292
-msgid "Userdata content cannot be decoded"
+#: nova/virt/xenapi/vmops.py:1239
+#, python-format
+msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:321
-msgid "Server name is not defined"
+#: nova/virt/xenapi/vmops.py:1311
+#, python-format
+msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:359
-#: ../nova/api/openstack/v2/servers.py:434
-msgid "Invalid flavorRef provided."
+#: nova/virt/xenapi/vmops.py:1315
+#, python-format
+msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:431
-msgid "Can not find requested image"
+#: nova/virt/xenapi/vmops.py:1380
+#, python-format
+msgid "Instance for migration %d not found, skipping"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:437
-msgid "Invalid key_name provided."
+#: nova/virt/xenapi/vmops.py:1412
+msgid "Could not get bandwidth info."
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:532
+#: nova/virt/xenapi/vmops.py:1484
 #, python-format
-msgid "There is no such server action: %s"
-msgstr ""
-
-#: ../nova/api/openstack/v2/servers.py:535
-msgid "Invalid request body"
+msgid "The call to %(method)s returned an error: %(e)s."
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:558
+#: nova/virt/xenapi/vmops.py:1500
 #, python-format
-msgid "createBackup entity requires %s attribute"
+msgid "injecting network info to xs for vm: |%s|"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:562
-msgid "Malformed createBackup entity"
+#: nova/virt/xenapi/vmops.py:1518
+#, python-format
+msgid "creating vif(s) for vm: |%s|"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:568
-msgid "createBackup attribute 'rotation' must be an integer"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:1527
+#, python-format
+msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
+msgstr "Création du VIF pour la VM %(vm_ref)s, réseau %(network_ref)s."
 
-#: ../nova/api/openstack/v2/servers.py:580
-#: ../nova/api/openstack/v2/servers.py:830
-msgid "Invalid metadata"
-msgstr ""
+#: nova/virt/xenapi/vmops.py:1530
+#, python-format
+msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
+msgstr "VIF créé %(vif_ref)s pour la VM %(vm_ref)s, network %(network_ref)s."
 
-#: ../nova/api/openstack/v2/servers.py:606
-#: ../nova/api/openstack/v2/servers.py:619
-msgid "Instance has not been resized."
+#: nova/virt/xenapi/vmops.py:1559
+#, python-format
+msgid "injecting hostname to xs for vm: |%s|"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:609
+#: nova/virt/xenapi/vmops.py:1621
 #, python-format
-msgid "Error in confirm-resize %s"
+msgid ""
+"The agent call to %(method)s returned an invalid response: %(ret)r. VM "
+"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:622
+#: nova/virt/xenapi/vmops.py:1646
 #, python-format
-msgid "Error in revert-resize %s"
+msgid ""
+"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
+"args=%(args)r"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:631
-msgid "Argument 'type' for reboot is not HARD or SOFT"
+#: nova/virt/xenapi/vmops.py:1650
+#, python-format
+msgid ""
+"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM "
+"id=%(instance_uuid)s; args=%(args)r"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:635
-msgid "Missing argument 'type' for reboot"
+#: nova/virt/xenapi/vmops.py:1655
+#, python-format
+msgid ""
+"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s; "
+"args=%(args)r"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:645
+#: nova/virt/xenapi/vmops.py:1841
 #, python-format
-msgid "Error in reboot %s"
-msgstr ""
+msgid "OpenSSL error: %s"
+msgstr "Erreur OpenSSL : %s"
 
-#: ../nova/api/openstack/v2/servers.py:680
-msgid "Unable to locate requested flavor."
+#: nova/tests/test_volume_types.py:60
+#, python-format
+msgid "Given data: %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:683
-msgid "Resize requires a change in size."
+#: nova/tests/test_volume_types.py:61
+#, python-format
+msgid "Result data: %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:702
-msgid "Malformed server entity"
+#: nova/api/ec2/__init__.py:69
+#, python-format
+msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:709
-msgid "Missing imageRef attribute"
+#: nova/api/ec2/__init__.py:91
+#, python-format
+msgid "FaultWrapper: %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:716
-msgid "Missing flavorRef attribute"
-msgstr ""
+#: nova/api/ec2/__init__.py:166
+msgid "Too many failed authentications."
+msgstr "Trop d'erreur d'authentification"
 
-#: ../nova/api/openstack/v2/servers.py:725
-msgid "No adminPass was specified"
+#: nova/api/ec2/__init__.py:176
+#, python-format
+msgid ""
+"Access key %(access_key)s has had %(failures)d failed authentications and "
+"will be locked out for %(lock_mins)d minutes."
 msgstr ""
+"La clef d'accès %(access_key)s a rencontrée %(failures)d echecs "
+"d'authentification et sera par conséquent vérouillée pour %(lock_mins)d "
+"minutes."
 
-#: ../nova/api/openstack/v2/servers.py:743
-msgid "Unable to parse metadata key/value pairs."
+#: nova/api/ec2/__init__.py:263
+msgid "Signature not provided"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:752
-msgid "Resize request has invalid 'flavorRef' attribute."
+#: nova/api/ec2/__init__.py:267
+msgid "Access key not provided"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:755
-msgid "Resize requests require 'flavorRef' attribute."
+#: nova/api/ec2/__init__.py:302 nova/api/ec2/__init__.py:315
+msgid "Failure communicating with keystone"
 msgstr ""
 
-#: ../nova/api/openstack/v2/servers.py:767
-msgid "Could not parse imageRef from request."
-msgstr ""
+#: nova/api/ec2/__init__.py:385
+#, python-format
+msgid "Authentication Failure: %s"
+msgstr "Echec d'authentification : %s"
 
-#: ../nova/api/openstack/v2/servers.py:792
+#: nova/api/ec2/__init__.py:401
 #, python-format
-msgid "Instance %s must be active to rebuild."
-msgstr ""
+msgid "Authenticated Request For %(uname)s:%(pname)s)"
+msgstr "Requête authentifiée pour : %(uname)s:%(pname)s)"
 
-#: ../nova/api/openstack/v2/servers.py:795
+#: nova/api/ec2/__init__.py:432
 #, python-format
-msgid "Instance %s could not be found"
-msgstr ""
+msgid "action: %s"
+msgstr "action: %s"
 
-#: ../nova/api/openstack/v2/servers.py:814
-msgid "createImage entity requires name attribute"
-msgstr ""
+#: nova/api/ec2/__init__.py:434
+#, python-format
+msgid "arg: %(key)s\t\tval: %(value)s"
+msgstr "arg: %(key)s\t\tval: %(value)s"
 
-#: ../nova/api/openstack/v2/servers.py:818
-msgid "Malformed createImage entity"
+#: nova/api/ec2/__init__.py:509
+#, python-format
+msgid ""
+"Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
+"Requête non authorisé pour le controlleur=%(controller)s et "
+"l'action=%(action)s"
 
-#: ../nova/api/openstack/v2/servers.py:841
-msgid "Server is currently creating an image. Please wait."
-msgstr ""
+#: nova/api/ec2/__init__.py:581
+#, python-format
+msgid "InstanceNotFound raised: %s"
+msgstr "\"Instance non trouvée\" remontée : %s"
 
-#: ../nova/api/openstack/v2/servers.py:1177
+#: nova/api/ec2/__init__.py:587
 #, python-format
-msgid "Removing options '%(unk_opt_str)s' from query"
-msgstr ""
+msgid "VolumeNotFound raised: %s"
+msgstr "\"Volume non trouvé\" remonté : %s"
 
-#: ../nova/api/openstack/v2/contrib/security_groups.py:81
-msgid "Security group id should be integer"
+#: nova/api/ec2/__init__.py:593
+#, python-format
+msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/security_groups.py:141
+#: nova/api/ec2/__init__.py:599
 #, python-format
-msgid "Security group %s already exists"
-msgstr ""
+msgid "NotFound raised: %s"
+msgstr "\"Non trouvé\" remonté : %s"
 
-#: ../nova/api/openstack/v2/contrib/security_groups.py:160
+#: nova/api/ec2/__init__.py:602
 #, python-format
-msgid "Security group %s is not a string or unicode"
+msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/security_groups.py:163
+#: nova/api/ec2/__init__.py:610
 #, python-format
-msgid "Security group %s cannot be empty."
+msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/security_groups.py:166
+#: nova/api/ec2/__init__.py:614
 #, python-format
-msgid "Security group %s should not be greater than 255 characters."
+msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/security_groups.py:190
-msgid "Parent group id is not integer"
+#: nova/api/ec2/__init__.py:618
+#, python-format
+msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/security_groups.py:193
+#: nova/api/ec2/__init__.py:622
 #, python-format
-msgid "Security group (%s) not found"
+msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/security_groups.py:196
+#: nova/api/ec2/__init__.py:626
 #, python-format
-msgid "Authorize security group ingress %s"
-msgstr "Authorisation du groupe de sécurité %s"
-
-#: ../nova/api/openstack/v2/contrib/security_groups.py:211
-msgid "Not enough parameters to build a valid rule."
-msgstr "Pas assez de parametres pour contruire un règle valide."
+msgid "InvalidRequest raised: %s"
+msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/security_groups.py:218
+#: nova/api/ec2/__init__.py:635
 #, python-format
-msgid "This rule already exists in group %s"
-msgstr "Cette règle existe déjà dans le groupe %s"
+msgid "Unexpected error raised: %s"
+msgstr "\"Erreur inopinée\" remontée : %s"
 
-#: ../nova/api/openstack/v2/contrib/security_groups.py:258
-msgid "Parent or group id is not integer"
+#: nova/api/openstack/compute/contrib/disk_config.py:44
+#, python-format
+msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/security_groups.py:262
-msgid "Parent group id and group id cannot be same"
+#: nova/api/openstack/compute/contrib/networks.py:62
+#, python-format
+msgid "Network does not have %s action"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/security_groups.py:339
-msgid "Rule id is not integer"
+#: nova/api/openstack/compute/contrib/networks.py:70
+#, python-format
+msgid "Disassociating network with id %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/security_groups.py:342
-#, python-format
-msgid "Rule (%s) not found"
+#: nova/api/openstack/compute/contrib/networks.py:74
+#: nova/api/openstack/compute/contrib/networks.py:91
+#: nova/api/openstack/compute/contrib/networks.py:101
+msgid "Network not found"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/security_groups.py:349
+#: nova/api/openstack/compute/contrib/networks.py:87
 #, python-format
-msgid "Revoke security group ingress %s"
-msgstr "Révocation de groupe de sécurité %s"
-
-#: ../nova/api/openstack/v2/contrib/security_groups.py:460
-#: ../nova/api/openstack/v2/contrib/security_groups.py:489
-msgid "Security group not specified"
+msgid "Showing network with id %s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/contrib/security_groups.py:464
-#: ../nova/api/openstack/v2/contrib/security_groups.py:493
-msgid "Security group name cannot be empty"
+#: nova/api/openstack/compute/contrib/networks.py:97
+#, python-format
+msgid "Deleting network with id %s"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmware_images.py:90
+#: nova/virt/vmwareapi/vmware_images.py:89
 #, python-format
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmware_images.py:104
+#: nova/virt/vmwareapi/vmware_images.py:103
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmware_images.py:109
+#: nova/virt/vmwareapi/vmware_images.py:108
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmware_images.py:130
+#: nova/virt/vmwareapi/vmware_images.py:129
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmware_images.py:140
+#: nova/virt/vmwareapi/vmware_images.py:139
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: ../nova/virt/vmwareapi/vmware_images.py:144
+#: nova/virt/vmwareapi/vmware_images.py:143
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/limits.py:149
-#, python-format
-msgid ""
-"Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
-"%(unit_string)s."
+#: nova/vsa/api.py:82
+msgid "invalid drive data"
 msgstr ""
 
-#: ../nova/api/openstack/v2/limits.py:274
-msgid "This request was rate-limited."
+#: nova/vsa/api.py:105
+msgid "drive_name not defined"
 msgstr ""
 
-#: ../nova/virt/disk.py:124
+#: nova/vsa/api.py:111
 #, python-format
-msgid "Failed to load partition: %s"
-msgstr "Impossible de charger la partition: %s"
+msgid "invalid drive type name %s"
+msgstr ""
 
-#: ../nova/virt/disk.py:148 ../nova/virt/disk.py:180
-#, python-format
-msgid "Failed to mount filesystem: %s"
-msgstr "Impossible de monter le système de fichier : %s"
+#: nova/vsa/api.py:155
+msgid "*** Experimental VSA code ***"
+msgstr ""
 
-#: ../nova/virt/disk.py:202
+#: nova/vsa/api.py:158 nova/vsa/api.py:303
 #, python-format
-msgid "Failed to remove container: %s"
+msgid "Requested number of VCs (%d) is too high. Setting to default"
 msgstr ""
 
-#: ../nova/virt/disk.py:217
+#: nova/vsa/api.py:194
 #, python-format
-msgid "nbd device %s did not show up"
-msgstr "Device nbd %s n'est pas apparu"
+msgid "Creating VSA: %s"
+msgstr ""
 
-#: ../nova/virt/disk.py:222
+#: nova/vsa/api.py:241
 #, python-format
-msgid "Could not attach image to loopback: %s"
-msgstr "Impossible de lier l'image au loopback : %s"
-
-#: ../nova/virt/disk.py:246
-msgid "No free nbd devices"
-msgstr "Pas de device nbd libre"
+msgid ""
+"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d GB, "
+"type %(vol_type_id)s"
+msgstr ""
 
-#: ../doc/ext/nova_todo.py:46
+#: nova/vsa/api.py:272
 #, python-format
-msgid "%(filename)s, line %(line_info)d"
-msgstr "%(filename)s, ligne %(line_info)d"
-
-#: ../nova/api/openstack/v2/server_metadata.py:38
-#: ../nova/api/openstack/v2/server_metadata.py:117
-#: ../nova/api/openstack/v2/server_metadata.py:154
-msgid "Server does not exist"
+msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
 msgstr ""
 
-#: ../nova/api/openstack/v2/server_metadata.py:135
-#: ../nova/api/openstack/v2/server_metadata.py:147
-msgid "Metadata item was not found"
+#: nova/vsa/api.py:287
+#, python-format
+msgid "VSA ID %(vsa_id)d: Update VSA call"
 msgstr ""
 
-#. FIXME(chiradeep): implement this
-#: ../nova/virt/hyperv.py:119
-msgid "In init host"
-msgstr "Dans init host"
-
-#: ../nova/virt/hyperv.py:166
+#: nova/vsa/api.py:318
 #, python-format
-msgid "Starting VM %s "
-msgstr "Démarrage VM %s "
+msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
+msgstr ""
 
-#: ../nova/virt/hyperv.py:168
+#: nova/vsa/api.py:324
 #, python-format
-msgid "Started VM %s "
-msgstr "VM %s démarrée "
+msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
+msgstr ""
 
-#: ../nova/virt/hyperv.py:170
+#: nova/vsa/api.py:351
 #, python-format
-msgid "spawn vm failed: %s"
-msgstr "Erreur à l'activation VM : %s"
+msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
+msgstr ""
 
-#: ../nova/virt/hyperv.py:187
+#: nova/vsa/api.py:355
 #, python-format
-msgid "Failed to create VM %s"
-msgstr "Erreur de création VM %s"
+msgid "Unable to delete volume %s"
+msgstr ""
 
-#: ../nova/virt/hyperv.py:206
+#: nova/vsa/api.py:357
 #, python-format
-msgid "Set memory for vm %s..."
-msgstr "Réglage de la mémoire sur VM %s..."
+msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
+msgstr ""
 
-#: ../nova/virt/hyperv.py:216
+#: nova/vsa/api.py:363
 #, python-format
-msgid "Set vcpus for vm %s..."
-msgstr "Réglage vcpus sur vm %s..."
+msgid "Going to try to terminate VSA ID %s"
+msgstr ""
 
-#: ../nova/virt/hyperv.py:220
+#: nova/vsa/api.py:374
 #, python-format
-msgid "Creating disk for %(vm_name)s by attaching disk file %(vhdfile)s"
+msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/multinic.py:52
+msgid "Missing 'networkId' argument for addFixedIp"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/multinic.py:68
+msgid "Missing 'address' argument for removeFixedIp"
 msgstr ""
-"Création du disque pour %(vm_name)s par liaison avec le fichier disque "
-"%(vhdfile)s"
 
-#: ../nova/virt/hyperv.py:245
+#: nova/api/openstack/compute/contrib/multinic.py:77
 #, python-format
-msgid "Failed to add diskdrive to VM %s"
-msgstr "Impossible d'ajouter le disque à la VM %s"
+msgid "Unable to find address %r"
+msgstr ""
 
-#: ../nova/virt/hyperv.py:248
+#: ../doc/ext/nova_todo.py:45
 #, python-format
-msgid "New disk drive path is %s"
-msgstr "Nouveau chemin d'accès pour le disque : %s"
+msgid "%(filename)s, line %(line_info)d"
+msgstr "%(filename)s, ligne %(line_info)d"
 
-#: ../nova/virt/hyperv.py:265
+#: nova/compute/api.py:149
 #, python-format
-msgid "Failed to add vhd file to VM %s"
-msgstr "Impossible d'ajouter le fichier vhd à la VM %s"
+msgid ""
+"Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata properties"
+msgstr ""
 
-#: ../nova/virt/hyperv.py:267
+#: nova/compute/api.py:160
 #, python-format
-msgid "Created disk for %s"
-msgstr "Disque créé pour %s"
+msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+msgstr ""
 
-#: ../nova/virt/hyperv.py:271
+#: nova/compute/api.py:213
 #, python-format
-msgid "Creating nic for %s "
-msgstr "Création de l'interface réseau pour %s "
+msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
+msgstr ""
 
-#: ../nova/virt/hyperv.py:290
-msgid "Failed creating a port on the external vswitch"
-msgstr "Erreur de création de port sur le vswitch externe"
+#: nova/compute/api.py:216
+msgid ""
+"Instance quota exceeded. You cannot run any more instances of this type."
+msgstr ""
 
-#: ../nova/virt/hyperv.py:291
+#: nova/compute/api.py:219
 #, python-format
-msgid "Failed creating port for %s"
-msgstr "Erreur de création de port pour %s"
+msgid ""
+"Instance quota exceeded. You can only run %s more instances of this type."
+msgstr ""
+"Quota d'instances dépassé. Vous ne pouvez éxécuter que %s instances de ce "
+"type de plus."
+
+#: nova/compute/api.py:268
+msgid "Creating a raw instance"
+msgstr "Création d'une instance raw"
 
-#: ../nova/virt/hyperv.py:294
+#: nova/compute/api.py:270
 #, python-format
-msgid "Created switch port %(vm_name)s on switch %(ext_path)s"
-msgstr "Le port switch %(vm_name)s a été créé sur le switch %(ext_path)s"
+msgid "Using Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s"
+msgstr ""
 
-#: ../nova/virt/hyperv.py:304
+#: nova/compute/api.py:340
 #, python-format
-msgid "Failed to add nic to VM %s"
-msgstr "Impossible d'ajouter une interface réseau à la VM %s"
+msgid "Going to run %s instances..."
+msgstr "Démarrage de %s instances..."
 
-#: ../nova/virt/hyperv.py:306
+#: nova/compute/api.py:404
 #, python-format
-msgid "Created nic for %s "
-msgstr "Interface réseau créée pour %s "
+msgid "bdm %s"
+msgstr ""
 
-#: ../nova/virt/hyperv.py:339
+#: nova/compute/api.py:431
 #, python-format
-msgid "WMI job failed: %s"
-msgstr "Tâche WMI echouée : %s"
+msgid "block_device_mapping %s"
+msgstr ""
 
-#: ../nova/virt/hyperv.py:343
+#: nova/compute/api.py:548
 #, python-format
-msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s "
-msgstr "Tâche WMI réussie : %(desc)s, Elapsed=%(elap)s "
+msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
+msgstr ""
 
-#: ../nova/virt/hyperv.py:380
+#: nova/compute/api.py:832
 #, python-format
-msgid "Got request to destroy vm %s"
-msgstr "Requête de suppression de la VM %s reçue"
+msgid "Going to try to soft delete %s"
+msgstr ""
 
-#: ../nova/virt/hyperv.py:405
+#: nova/compute/api.py:851
 #, python-format
-msgid "Failed to destroy vm %s"
-msgstr "Impossible de supprimer la VM %s"
+msgid "No host for instance %s, deleting immediately"
+msgstr ""
 
-#: ../nova/virt/hyperv.py:412
+#: nova/compute/api.py:885
 #, python-format
-msgid "Del: disk %(vhdfile)s vm %(instance_name)s"
-msgstr "Suppression: disque %(vhdfile)s vm %(instance_name)s"
+msgid "Going to try to terminate %s"
+msgstr "Va essayer d'arrêter %s"
 
-#: ../nova/virt/hyperv.py:434
+#: nova/compute/api.py:923
 #, python-format
-msgid ""
-"Got Info for vm %(instance_name)s: state=%(state)s, mem=%(memusage)s, "
-"num_cpu=%(numprocs)s, cpu_time=%(uptime)s"
+msgid "Going to try to stop %s"
 msgstr ""
 
-#: ../nova/virt/hyperv.py:450
+#: nova/compute/api.py:942
 #, python-format
-msgid "duplicate name found: %s"
-msgstr "Doublon de nom trouvé : %s"
+msgid "Going to try to start %s"
+msgstr ""
 
-#: ../nova/virt/hyperv.py:470
+#: nova/compute/api.py:946
 #, python-format
-msgid "Successfully changed vm state of %(vm_name)s to %(req_state)s"
-msgstr "Changement d'état de la VM %(vm_name)s en %(req_state)s réussi"
+msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
+msgstr ""
+
+#: nova/compute/api.py:1107
+msgid "No compute host specified"
+msgstr ""
 
-#: ../nova/virt/hyperv.py:473
+#: nova/compute/api.py:1110
 #, python-format
-msgid "Failed to change vm state of %(vm_name)s to %(req_state)s"
-msgstr "Impossible de changer l'état de la vm %(vm_name)s en %(req_state)s"
+msgid "Unable to find host for Instance %s"
+msgstr ""
+
+#: nova/compute/api.py:1352
+msgid "flavor_id is None. Assuming migration."
+msgstr ""
 
-#: ../nova/vnc/server.py:53
+#: nova/compute/api.py:1360
 #, python-format
-msgid "Starting nova-vncproxy node (version %s)"
+msgid ""
+"Old instance type %(current_instance_type_name)s,  new instance type "
+"%(new_instance_type_name)s"
 msgstr ""
 
-#: ../nova/vnc/server.py:58
+#: nova/compute/api.py:1651
 #, python-format
-msgid "Missing vncproxy_wwwroot (version %s)"
+msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
-#: ../nova/vnc/server.py:60
+#: ../smoketests/run_tests.py:294
 msgid ""
-"You need a slightly modified version of noVNC to work with the nova-vnc-proxy"
+"Missing EC2 environment variables. Please source the appropriate novarc file "
+"before running this test."
 msgstr ""
 
-#: ../nova/vnc/server.py:62
+#: nova/network/quantum/melange_connection.py:95
 #, python-format
-msgid "Check out the most recent nova noVNC code: %s"
+msgid "Server returned error: %s"
 msgstr ""
 
-#: ../nova/vnc/server.py:64
-#, python-format
-msgid "And drop it in %s"
+#: nova/network/quantum/melange_connection.py:97
+msgid "Connection error contacting melange service, retrying"
 msgstr ""
 
-#: ../nova/vnc/server.py:69
+#: nova/network/quantum/melange_connection.py:107
 #, python-format
-msgid "Allowing access to the following files: %s"
+msgid ""
+"allocate IP on network |%(network_id)s| belonging to |%(network_tenant_id)s| "
+"to this vif |%(vif_id)s| with mac |%(mac_address)s| belonging to "
+"|%(project_id)s| "
 msgstr ""
 
-#: ../nova/vnc/server.py:90
-msgid "Received connection on flash socket policy port"
+#: ../bin/nova-all.py:62 ../bin/nova-all.py:68 ../bin/nova-all.py:75
+#, python-format
+msgid "Failed to load %s"
 msgstr ""
 
-#: ../nova/vnc/server.py:95
-msgid "Received valid flash socket policy request"
+#: nova/virt/baremetal/tilera.py:185
+msgid "free_node...."
 msgstr ""
 
-#: ../smoketests/run_tests.py:294
+#: nova/virt/baremetal/tilera.py:216
+#, python-format
 msgid ""
-"Missing EC2 environment variables. Please source the appropriate novarc file "
-"before running this test."
+"deactivate_node is called for                node_id = %(id)s node_ip = "
+"%(ip)s"
 msgstr ""
 
-#: ../nova/network/quantum/melange_connection.py:84
-#, python-format
-msgid "Server returned error: %s"
+#: nova/virt/baremetal/tilera.py:221
+msgid "status of node is set to 0"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:232
+msgid "rootfs is already removed"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:264
+msgid "Before ping to the bare-metal node"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:317
+msgid "activate_node"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:331
+msgid "Node is unknown error state."
 msgstr ""
 
-#: ../nova/virt/xenapi/volumeops.py:65
+#: nova/virt/xenapi/volumeops.py:65
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: ../nova/virt/xenapi/volumeops.py:71
+#: nova/virt/xenapi/volumeops.py:71
 msgid "Error destroying VDI"
 msgstr ""
 
-#: ../nova/virt/xenapi/volumeops.py:74
+#: nova/virt/xenapi/volumeops.py:74
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: ../nova/virt/xenapi/volumeops.py:77
+#: nova/virt/xenapi/volumeops.py:77
 msgid "Could not create SR"
 msgstr ""
 
-#: ../nova/virt/xenapi/volumeops.py:80
+#: nova/virt/xenapi/volumeops.py:80
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: ../nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:85
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: ../nova/virt/xenapi/volumeops.py:88
+#: nova/virt/xenapi/volumeops.py:88
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: ../nova/virt/xenapi/volumeops.py:93
+#: nova/virt/xenapi/volumeops.py:93
 msgid "Could not introduce SR"
 msgstr ""
 
-#: ../nova/virt/xenapi/volumeops.py:97
+#: nova/virt/xenapi/volumeops.py:97
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: ../nova/virt/xenapi/volumeops.py:107
+#: nova/virt/xenapi/volumeops.py:107
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: ../nova/virt/xenapi/volumeops.py:113
+#: nova/virt/xenapi/volumeops.py:113
 msgid "Could not forget SR"
 msgstr ""
 
-#. NOTE: No Resource Pool concept so far
-#: ../nova/virt/xenapi/volumeops.py:122
+#: nova/virt/xenapi/volumeops.py:122
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: ../nova/virt/xenapi/volumeops.py:174
+#: nova/virt/xenapi/volumeops.py:174
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 "Impossible de créer VDI sur SR %(sr_ref)s pour l'instance %(instance_name)s"
 
-#: ../nova/virt/xenapi/volumeops.py:187
+#: nova/virt/xenapi/volumeops.py:187
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 "Impossible d'utiliser SR %(sr_ref)s pour l'instance %(instance_name)s"
 
-#: ../nova/virt/xenapi/volumeops.py:195
+#: nova/virt/xenapi/volumeops.py:195
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Impossible d'attacher le volume à l'instance %s"
 
-#: ../nova/virt/xenapi/volumeops.py:198
+#: nova/virt/xenapi/volumeops.py:198
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 "Le point de montage %(mountpoint)s a été attaché à l'instance "
 "%(instance_name)s"
 
-#. Detach VBD from VM
-#: ../nova/virt/xenapi/volumeops.py:208
+#: nova/virt/xenapi/volumeops.py:208
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: ../nova/virt/xenapi/volumeops.py:216
+#: nova/virt/xenapi/volumeops.py:216
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Impossible de trouver le volume %s"
 
-#: ../nova/virt/xenapi/volumeops.py:224
+#: nova/virt/xenapi/volumeops.py:224
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Impossible de détacher le volume %s"
 
-#: ../nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:229
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: ../nova/virt/xenapi/volumeops.py:236
+#: nova/virt/xenapi/volumeops.py:236
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: ../nova/virt/xenapi/volumeops.py:238
+#: nova/virt/xenapi/volumeops.py:238
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 "Le point de montage %(mountpoint)s à été détaché de l'instance "
 "%(instance_name)s"
 
-#: ../nova/virt/libvirt/utils.py:218
+#: nova/virt/libvirt/utils.py:235
 msgid "Unable to find an open port"
 msgstr "Impossible de trouver un port ouvert"
 
-#: ../nova/tests/rpc/common.py:142
+#: nova/tests/rpc/common.py:147
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr "Reception par Nested %(queue)s, %(value)s"
 
-#: ../nova/tests/rpc/common.py:150
+#: nova/tests/rpc/common.py:155
 #, python-format
 msgid "Nested return %s"
 msgstr "Nested renvoi %s"
 
-#: ../nova/tests/rpc/common.py:176 ../nova/tests/rpc/common.py:182
+#: nova/tests/rpc/common.py:173
+msgid "RPC backend does not support timeouts"
+msgstr ""
+
+#: nova/tests/rpc/common.py:203 nova/tests/rpc/common.py:209
 #, python-format
 msgid "Received %s"
 msgstr "%s Reçu"
 
-#: ../nova/tests/test_misc.py:113
-#, python-format
-msgid ""
-"The following migrations are missing a downgrade:\n"
-"\t%s"
-msgstr ""
-
-#: ../nova/virt/xenapi/vif.py:86
+#: nova/virt/xenapi/vif.py:103
 #, python-format
 msgid "Found no PIF for device %s"
 msgstr ""
 
-#: ../nova/virt/xenapi/vif.py:106
+#: nova/virt/xenapi/vif.py:122
 #, python-format
 msgid ""
 "PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: ../nova/volume/xensm.py:59
+#: nova/compute/utils.py:141
+msgid "v4 subnets are required for legacy nw_info"
+msgstr ""
+
+#: nova/volume/xensm.py:55
 #, python-format
 msgid "SR name = %s"
 msgstr ""
 
-#: ../nova/volume/xensm.py:60
+#: nova/volume/xensm.py:56
 #, python-format
 msgid "Params: %s"
 msgstr ""
 
-#: ../nova/volume/xensm.py:64
+#: nova/volume/xensm.py:60
 #, python-format
 msgid "Failed to create sr %s...continuing"
 msgstr ""
 
-#: ../nova/volume/xensm.py:66
+#: nova/volume/xensm.py:62
 msgid "Create failed"
 msgstr ""
 
-#: ../nova/volume/xensm.py:68
+#: nova/volume/xensm.py:64
 #, python-format
 msgid "SR UUID of new SR is: %s"
 msgstr ""
 
-#: ../nova/volume/xensm.py:75
+#: nova/volume/xensm.py:71
 msgid "Failed to update db"
 msgstr ""
 
-#: ../nova/volume/xensm.py:84
+#: nova/volume/xensm.py:80
 #, python-format
 msgid "Failed to introduce sr %s...continuing"
 msgstr ""
 
-#: ../nova/volume/xensm.py:95
+#: nova/volume/xensm.py:91
 #, python-format
 msgid "Failed to reach backend %d"
 msgstr ""
 
-#: ../nova/volume/xensm.py:104
+#: nova/volume/xensm.py:100
 msgid "XenSMDriver requires xenapi connection"
 msgstr ""
 
-#: ../nova/volume/xensm.py:114
+#: nova/volume/xensm.py:110
 msgid "Failed to initiate session"
 msgstr ""
 
-#: ../nova/volume/xensm.py:147
+#: nova/volume/xensm.py:142
 #, python-format
 msgid "Volume will be created in backend - %d"
 msgstr ""
 
-#: ../nova/volume/xensm.py:159
+#: nova/volume/xensm.py:154
 msgid "Failed to update volume in db"
 msgstr ""
 
-#: ../nova/volume/xensm.py:162
+#: nova/volume/xensm.py:157
 msgid "Unable to create volume"
 msgstr ""
 
-#: ../nova/volume/xensm.py:176
+#: nova/volume/xensm.py:171
 msgid "Failed to delete vdi"
 msgstr ""
 
-#: ../nova/volume/xensm.py:182
+#: nova/volume/xensm.py:177
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: ../nova/volume/xensm.py:216
+#: nova/volume/xensm.py:211
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: ../nova/volume/xensm.py:228
+#: nova/volume/xensm.py:222
 msgid "Failed to find backend in db"
 msgstr ""
 
-#: ../nova/tests/api/openstack/v2/contrib/test_vsa.py:58
-#: ../nova/tests/api/openstack/v2/contrib/test_vsa.py:255
-#, python-format
-msgid "_create: param=%s"
-msgstr ""
-
-#: ../nova/tests/api/openstack/v2/contrib/test_vsa.py:265
-#, python-format
-msgid "_volume_update: param=%s"
-msgstr ""
-
-#: ../nova/tests/api/openstack/v2/contrib/test_vsa.py:270
-#, python-format
-msgid "_volume_delete: param=%s"
-msgstr ""
-
-#: ../nova/tests/api/openstack/v2/contrib/test_vsa.py:275
-#, python-format
-msgid "_volume_get: volume_id=%s"
-msgstr ""
-
 #. Either the methods don't exist in the agent, or they
 #. have been disabled.
 #: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/agent.py:151
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/nss_db.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/nss_db.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/nss_db.po	2012-01-02 17:26:53.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/nss_db.po	2012-02-23 06:31:19.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:52+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:43+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/makedb.c:68
 msgid "Convert key to lower case"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/oneconf.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/oneconf.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/oneconf.po	2012-01-02 17:27:35.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/oneconf.po	2012-02-23 06:31:59.000000000 +0000
@@ -7,44 +7,44 @@
 msgstr ""
 "Project-Id-Version: oneconf\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-23 16:42+0000\n"
+"POT-Creation-Date: 2012-02-20 07:46+0000\n"
 "PO-Revision-Date: 2011-10-04 08:00+0000\n"
 "Last-Translator: Emmanuel Sunyer <emmanuel.sunyer@gmail.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:28+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 02:07+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
-#: .././oneconf-service:66 .././oneconf-query:88
+#: .././oneconf-service:67 .././oneconf-query:89
 #, c-format
 msgid "usage: %prog [options]"
 msgstr "utilisation : %prog [options]"
 
-#: .././oneconf-service:69
+#: .././oneconf-service:70
 msgid "enable debug mode"
 msgstr "Active le mode de débogage"
 
-#: .././oneconf-service:71
+#: .././oneconf-service:72
 msgid "use the mock infrastructure"
 msgstr "Utilise l'infrastructure factice"
 
-#: .././oneconf-service:92
+#: .././oneconf-service:99
 msgid ""
 "An OneConf service is already running, shut it down with oneconf-query --stop"
 msgstr ""
 "Un service Oneconf est déjà en cours, arrêtez-le avec la commande « oneconf-"
 "query --stop »"
 
-#: .././oneconf-query:74
+#: .././oneconf-query:75
 msgid ""
 "you can't define --all-packages, --manual-packages or --hosts together."
 msgstr ""
 "Vous ne pouvez pas utiliser --all-packages, --manual-packages et --hosts "
 "simultanément."
 
-#: .././oneconf-query:78
+#: .././oneconf-query:79
 msgid ""
 "you can't define --list, --diff, --update, --async-update, --share-"
 "inventory, --stop, --get-last-sync together."
@@ -52,103 +52,103 @@
 "Vous ne pouvez pas utiliser --list, --diff, --update, --async-update, --"
 "share-inventory, --stop, --get-last-sync simultanément."
 
-#: .././oneconf-query:82
+#: .././oneconf-query:83
 #, c-format
 msgid "%s isn't compatible with %s"
 msgstr "%s n'est pas compatible avec %s"
 
-#: .././oneconf-query:92
+#: .././oneconf-query:93
 msgid ""
 "Current diff between this machine and another provided by hostname/hostid"
 msgstr ""
 "Affiches les différences actuelles entre cet ordinateur et un autre, défini "
 "par son nom ou identifiant d'hôte"
 
-#: .././oneconf-query:96
+#: .././oneconf-query:97
 msgid "List stored package (default for local hostid) or host lists"
 msgstr ""
 "Affiche liste les paquets installés (par défaut, sur l'hôte local) ou sur "
 "une liste d'hôtes"
 
-#: .././oneconf-query:99
+#: .././oneconf-query:100
 msgid "Get last sync date"
 msgstr "Récupère la date de dernière synchronisation"
 
-#: .././oneconf-query:101
+#: .././oneconf-query:102
 msgid "Update the package list in store"
 msgstr "Met à jour la liste des paquets installés"
 
-#: .././oneconf-query:104
+#: .././oneconf-query:105
 msgid "Perform async update of the package list in store"
 msgstr ""
 "Effectue une mise à jour asynchrone de la liste des paquets installés"
 
-#: .././oneconf-query:106
+#: .././oneconf-query:107
 msgid "Stop oneconf service"
 msgstr "Arrête le service oneconf"
 
-#: .././oneconf-query:108
+#: .././oneconf-query:109
 msgid "enable debug mode (use --direct)"
 msgstr "Active le mode de débogage (ajouter l'option  --direct)"
 
-#: .././oneconf-query:110
+#: .././oneconf-query:111
 msgid "don't use dbus for the request"
 msgstr "Ne pas utiliser dbus pour la requête"
 
-#: .././oneconf-query:115
+#: .././oneconf-query:116
 msgid "get all installed packages from storage"
 msgstr "Récupère tous les paquets installés depuis le stockage"
 
-#: .././oneconf-query:118
+#: .././oneconf-query:119
 msgid "get only manual installed packages from storage"
 msgstr ""
 "Récupère seulement les paquets installés manuellement depuis le stockage"
 
-#: .././oneconf-query:121
+#: .././oneconf-query:122
 msgid "all available hosts from storage (only with list)"
 msgstr ""
 "Tous les hôtes disponibles depuis le stockage (seulement pour l'option --"
 "list)"
 
-#: .././oneconf-query:124
+#: .././oneconf-query:125
 msgid "This host (only with list)"
 msgstr "Cet hôte (seulement pour l'option --list)"
 
-#: .././oneconf-query:130 .././oneconf-query:132
+#: .././oneconf-query:131 .././oneconf-query:133
 msgid "specify target host"
 msgstr "Indique l'hôte cible"
 
-#: .././oneconf-query:138
+#: .././oneconf-query:139
 msgid "share this inventory on the web"
 msgstr "Partage cet inventaire sur le Web"
 
-#: .././oneconf-query:142
+#: .././oneconf-query:143
 msgid "hide this inventory on the web"
 msgstr "Masque cet inventaire sur le Web"
 
-#: .././oneconf-query:219
+#: .././oneconf-query:225
 msgid "hostid and hostname can't be provided together"
 msgstr ""
 "L'identifiant et le nom d'hôte ne peuvent pas être fournis simultanément"
 
-#: .././oneconf-query:224 .././oneconf-query:234
+#: .././oneconf-query:230 .././oneconf-query:240
 msgid "You can't use hostid or hostname when updating"
 msgstr ""
 "Vous ne pouvez utiliser ni l'identifiant ni le nom d'hôte lors d'une mise à "
 "jour"
 
-#: .././oneconf-query:227 .././oneconf-query:237
+#: .././oneconf-query:233 .././oneconf-query:243
 msgid "You can't define --package, --host or --hosts when updating"
 msgstr ""
 "Vous ne pouvez pas utiliser les options --package, --host or --hosts lors "
 "d'une mise à jour"
 
-#: .././oneconf-query:258
+#: .././oneconf-query:264
 msgid "You have to provide either hostid or hostname for getting a diff"
 msgstr ""
 "Vous devez fournir l'identifiant ou le nom d'hôte pour obtenir une différence"
 
-#: .././oneconf-query:276 .././oneconf-query:285
+#: .././oneconf-query:282 .././oneconf-query:291
 msgid ""
 "You can't define --package, --host or --hosts when changing show inventory "
 "status"
@@ -156,12 +156,17 @@
 "Vous ne pouvez pas utiliser les options --package, --host ou --hosts lors du "
 "changement de visibilité de l'inventaire"
 
-#: .././oneconf-query:282
+#: .././oneconf-query:288
 msgid "You can't use hostid or hostname when changing show inventory status"
 msgstr ""
 "Vous ne pouvez utiliser ni l'identifiant ni le nom d'hôte lors du changement "
 "de visibilité de l'inventaire"
 
+#: .././oneconf/dbusconnect.py:200
+#, python-format
+msgid "Wasn't able to request stopping the service: %s"
+msgstr "Impossible de demander l'arrêt du service : %s"
+
 #: .././oneconf/directconnect.py:88
 msgid ""
 "Nothing done: in direct mode, there is no communication with the service"
@@ -169,16 +174,11 @@
 "Action avortée : en mode direct, il n'y a pas de communication avec le "
 "service"
 
-#: .././oneconf/dbusconnect.py:200
-#, python-format
-msgid "Wasn't able to request stopping the service: %s"
-msgstr "Impossible de demander l'arrêt du service : %s"
-
-#: .././oneconf/hosts.py:198
+#: .././oneconf/hosts.py:206 .././oneconf/networksync/hosts.py:206
 msgid "No hostname registered for this id"
 msgstr "Aucun nom d'hôte enregistré pour cet identifiant"
 
-#: .././oneconf/hosts.py:220
+#: .././oneconf/hosts.py:228 .././oneconf/networksync/hosts.py:228
 msgid ""
 "Multiple hostid registered for this hostname. Use --list --host to get the "
 "hostid and use the --hostid option."
@@ -187,10 +187,10 @@
 "d'abord les options --list --host pour obtenir l'identifiant puis l'option --"
 "hostid."
 
-#: .././oneconf/hosts.py:224
+#: .././oneconf/hosts.py:232 .././oneconf/networksync/hosts.py:232
 msgid "No hostid registered for this hostname"
 msgstr "Aucun identifiant enregistré pour ce nom d'hôte"
 
-#: .././oneconf/hosts.py:295
+#: .././oneconf/hosts.py:304 .././oneconf/networksync/hosts.py:304
 msgid "Was never synced"
 msgstr "N'a jamais été synchronisé"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/opcodes.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/opcodes.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/opcodes.po	2012-01-02 17:26:43.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/opcodes.po	2012-02-23 06:31:10.000000000 +0000
@@ -9,14 +9,14 @@
 "Project-Id-Version: opcodes 2.20.90\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
 "POT-Creation-Date: 2011-06-02 14:30+0100\n"
-"PO-Revision-Date: 2011-12-13 17:21+0000\n"
+"PO-Revision-Date: 2012-01-27 01:23+0000\n"
 "Last-Translator: Nicolas Provost <nprovost@quadriv.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:16+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:32+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: alpha-opc.c:155
 msgid "branch operand unaligned"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/Parse-DebianChangelog.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/Parse-DebianChangelog.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/Parse-DebianChangelog.po	2012-01-02 17:27:18.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/Parse-DebianChangelog.po	2012-02-23 06:31:42.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:24+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:27+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../bin/parsechangelog:146
 #, perl-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/Parse-DebianChangelog-Pod.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/Parse-DebianChangelog-Pod.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/Parse-DebianChangelog-Pod.po	2012-01-02 17:27:18.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/Parse-DebianChangelog-Pod.po	2012-02-23 06:31:42.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:25+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:27+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../bin/parsechangelog:20 ../lib/Parse/DebianChangelog.pm:22
 #: ../lib/Parse/DebianChangelog/ChangesFilters.pm:21
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/parted.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/parted.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/parted.po	2012-01-02 17:26:53.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/parted.po	2012-02-23 06:31:20.000000000 +0000
@@ -10,14 +10,14 @@
 "Project-Id-Version: parted 2.2\n"
 "Report-Msgid-Bugs-To: bug-parted@gnu.org\n"
 "POT-Creation-Date: 2010-05-28 20:30+0200\n"
-"PO-Revision-Date: 2011-12-05 21:14+0000\n"
+"PO-Revision-Date: 2012-01-28 01:06+0000\n"
 "Last-Translator: Nicolas Provost <nprovost@quadriv.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:53+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:44+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: lib/argmatch.c:133
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/pbbuttonsd.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/pbbuttonsd.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/pbbuttonsd.po	2012-01-02 17:27:15.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/pbbuttonsd.po	2012-02-23 06:31:39.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:49+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:48+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/init.c:240
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/pidgin-libnotify.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/pidgin-libnotify.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/pidgin-libnotify.po	2012-01-02 17:27:25.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/pidgin-libnotify.po	2012-02-23 06:31:48.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: gaim-libnotify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-26 14:09+0000\n"
-"PO-Revision-Date: 2011-08-26 14:41+0000\n"
+"POT-Creation-Date: 2012-02-13 06:57+0000\n"
+"PO-Revision-Date: 2012-02-13 09:12+0000\n"
 "Last-Translator: Ersplus <ersplus@free.fr>\n"
 "Language-Team: French <ef@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:52+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:52+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../src/pidgin-libnotify.c:95
 msgid "New messages"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/pidgin.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/pidgin.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/pidgin.po	2012-01-02 17:27:24.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/pidgin.po	2012-02-23 06:31:48.000000000 +0000
@@ -21,16 +21,16 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-03 13:48+0000\n"
-"PO-Revision-Date: 2011-12-07 03:04+0000\n"
+"POT-Creation-Date: 2012-01-05 16:39+0000\n"
+"PO-Revision-Date: 2012-01-05 18:08+0000\n"
 "Last-Translator: Éric <Unknown>\n"
 "Language-Team: fr <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:45+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:45+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: \n"
 
 #. Translators may want to transliterate the name.
@@ -91,7 +91,7 @@
 #: ../libpurple/protocols/jabber/jutil.c:665
 #: ../libpurple/protocols/mxit/login.c:523
 #: ../libpurple/protocols/mxit/protocol.c:2442
-#: ../libpurple/protocols/silc/ops.c:77 ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:77 ../libpurple/protocols/silc/ops.c:1476
 #: ../libpurple/protocols/silc10/ops.c:1451
 #: ../pidgin/plugins/disco/xmppdisco.c:514
 #: ../pidgin/plugins/disco/xmppdisco.c:519
@@ -211,18 +211,17 @@
 #: ../libpurple/protocols/myspace/user.c:885
 #: ../libpurple/protocols/oscar/oscar.c:5251
 #: ../libpurple/protocols/oscar/peer.c:1066
-#: ../libpurple/protocols/sametime/sametime.c:3467
-#: ../libpurple/protocols/sametime/sametime.c:3553
-#: ../libpurple/protocols/sametime/sametime.c:3727
-#: ../libpurple/protocols/sametime/sametime.c:5480
-#: ../libpurple/protocols/sametime/sametime.c:5570
-#: ../libpurple/protocols/sametime/sametime.c:5695
+#: ../libpurple/protocols/sametime/sametime.c:3472
+#: ../libpurple/protocols/sametime/sametime.c:3558
+#: ../libpurple/protocols/sametime/sametime.c:5457
+#: ../libpurple/protocols/sametime/sametime.c:5547
+#: ../libpurple/protocols/sametime/sametime.c:5672
 #: ../libpurple/protocols/silc/buddy.c:459
 #: ../libpurple/protocols/silc/buddy.c:1084
 #: ../libpurple/protocols/silc/buddy.c:1199
 #: ../libpurple/protocols/silc/chat.c:622
 #: ../libpurple/protocols/silc/chat.c:756
-#: ../libpurple/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1836
 #: ../libpurple/protocols/silc/silc.c:1063
 #: ../libpurple/protocols/silc/silc.c:1271
 #: ../libpurple/protocols/silc10/buddy.c:468
@@ -303,7 +302,7 @@
 #: ../finch/gntblist.c:3069 ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:452
 #: ../finch/gntpounce.c:727 ../finch/gntroomlist.c:276
 #: ../finch/gntstatus.c:201 ../libpurple/protocols/gg/gg.c:871
-#: ../libpurple/protocols/sametime/sametime.c:5569
+#: ../libpurple/protocols/sametime/sametime.c:5546
 #: ../libpurple/protocols/silc/chat.c:621
 #: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2479
 #: ../pidgin/gtkblist.c:7333 ../pidgin/gtkconv.c:1696
@@ -401,10 +400,10 @@
 #: ../libpurple/protocols/jabber/jabber.c:1403
 #: ../libpurple/protocols/oscar/oscar.c:3032
 #: ../libpurple/protocols/silc/buddy.c:1554
-#: ../libpurple/protocols/silc/ops.c:1199
-#: ../libpurple/protocols/silc/ops.c:1202
-#: ../libpurple/protocols/silc/ops.c:1338
-#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1216
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc/ops.c:1355
 #: ../libpurple/protocols/silc/silc.c:1245
 #: ../libpurple/protocols/silc10/buddy.c:1559
 #: ../libpurple/protocols/silc10/ops.c:1191
@@ -513,8 +512,8 @@
 msgstr "Vous devez fournir un nom pour le groupe à ajouter."
 
 #: ../finch/gntblist.c:852 ../finch/gntblist.c:1263
-#: ../libpurple/protocols/sametime/sametime.c:5479
-#: ../libpurple/protocols/sametime/sametime.c:5567 ../pidgin/gtkblist.c:7330
+#: ../libpurple/protocols/sametime/sametime.c:5456
+#: ../libpurple/protocols/sametime/sametime.c:5544 ../pidgin/gtkblist.c:7330
 msgid "Add Group"
 msgstr "Ajouter le groupe"
 
@@ -648,9 +647,9 @@
 #: ../libpurple/protocols/jabber/jabber.c:2445
 #: ../libpurple/protocols/msn/msn.c:2265 ../libpurple/protocols/msn/msn.c:2435
 #: ../libpurple/protocols/silc/buddy.c:1550
-#: ../libpurple/protocols/silc/ops.c:1005
-#: ../libpurple/protocols/silc/ops.c:1188
-#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc/ops.c:1019
+#: ../libpurple/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/ops.c:1340
 #: ../libpurple/protocols/silc10/buddy.c:1555
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
@@ -736,8 +735,8 @@
 #: ../libpurple/protocols/silc/chat.c:451
 #: ../libpurple/protocols/silc/chat.c:488
 #: ../libpurple/protocols/silc/chat.c:755
-#: ../libpurple/protocols/silc/ops.c:1295
-#: ../libpurple/protocols/silc/ops.c:1821
+#: ../libpurple/protocols/silc/ops.c:1309
+#: ../libpurple/protocols/silc/ops.c:1835
 #: ../libpurple/protocols/silc/silc.c:1062
 #: ../libpurple/protocols/silc10/buddy.c:467
 #: ../libpurple/protocols/silc10/buddy.c:1191
@@ -1308,8 +1307,8 @@
 #: ../libpurple/protocols/oscar/oscar.c:2296
 #: ../libpurple/protocols/oscar/oscar.c:2319
 #: ../libpurple/protocols/oscar/userinfo.c:303
-#: ../libpurple/protocols/sametime/sametime.c:3342
-#: ../libpurple/protocols/sametime/sametime.c:4234
+#: ../libpurple/protocols/sametime/sametime.c:3347
+#: ../libpurple/protocols/sametime/sametime.c:4198
 #: ../libpurple/protocols/yahoo/libymsg.c:4030 ../pidgin/gtkblist.c:3877
 #: ../pidgin/gtkblist.c:3891 ../pidgin/gtkblist.c:3893
 #: ../pidgin/gtksavedstatuses.c:970 ../pidgin/gtksavedstatuses.c:1120
@@ -1529,7 +1528,7 @@
 msgstr "Message"
 
 #: ../finch/gntnotify.c:464 ../libpurple/conversation.c:2138
-#: ../libpurple/protocols/sametime/sametime.c:3552
+#: ../libpurple/protocols/sametime/sametime.c:3557
 msgid "Invite"
 msgstr "Inviter"
 
@@ -2133,10 +2132,10 @@
 #: ../libpurple/protocols/oscar/oscar.c:4871
 #: ../libpurple/protocols/oscar/oscar.c:4878
 #: ../libpurple/protocols/oscar/oscar.c:4885
-#: ../libpurple/protocols/sametime/sametime.c:3365
-#: ../libpurple/protocols/sametime/sametime.c:3371
-#: ../libpurple/protocols/sametime/sametime.c:3377
-#: ../libpurple/protocols/sametime/sametime.c:3456
+#: ../libpurple/protocols/sametime/sametime.c:3370
+#: ../libpurple/protocols/sametime/sametime.c:3376
+#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3461
 #: ../libpurple/protocols/silc/buddy.c:1566
 #: ../libpurple/protocols/silc10/buddy.c:1571
 #: ../libpurple/protocols/simple/simple.c:247
@@ -3032,176 +3031,176 @@
 msgstr "Échec du transfert depuis %s."
 
 #: ../libpurple/gconf/purple.schemas.in.h:1
-msgid "Run the command in a terminal"
-msgstr "Lancer la commande dans un terminal."
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr "La commande décrite doit gérer les URL en « aim »"
 
 #: ../libpurple/gconf/purple.schemas.in.h:2
-msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr "Si activé, la commande utilisée pour gérer les URL en « aim »"
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+"Indique si la commande décrite dans la clé « command » doit gérer les URL en "
+"« aim »."
 
 #: ../libpurple/gconf/purple.schemas.in.h:3
-msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr "Si activé, la commande utilisée pour gérer les URL en « gg »"
+msgid "The handler for \"aim\" URLs"
+msgstr "Le gestionnaire des URL en « aim »"
 
 #: ../libpurple/gconf/purple.schemas.in.h:4
-msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr "Si activé, la commande utilisée pour gérer les URL en « icq »"
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr "Si activé, la commande utilisée pour gérer les URL en « aim »"
 
 #: ../libpurple/gconf/purple.schemas.in.h:5
-msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr "Si activé, la commande utilisée pour gérer les URL en « irc »"
+msgid "Run the command in a terminal"
+msgstr "Lancer la commande dans un terminal."
 
 #: ../libpurple/gconf/purple.schemas.in.h:6
-msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr "Si activé, la commande utilisée pour gérer les URL en « msnim »"
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr ""
+"Indique si la commande utilisée pour gérer ce type d'URL doit être lancée "
+"dans un terminal."
 
 #: ../libpurple/gconf/purple.schemas.in.h:7
-msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr "Si activé, la commande utilisée pour gérer les URL en « sip »"
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr "La commande décrite doit gérer les URL en « gg »"
 
 #: ../libpurple/gconf/purple.schemas.in.h:8
-msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr "Si activé, la commande utilisée pour gérer les URL en « xmpp »"
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+"Indique si la commande décrite dans la clé « command » doit gérer les URL en "
+"« gg »."
 
 #: ../libpurple/gconf/purple.schemas.in.h:9
-msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr "Si activé, la commande utilisée pour gérer les URL en « ymsgr »"
+msgid "The handler for \"gg\" URLs"
+msgstr "Le gestionnaire des URL en « gg »"
 
 #: ../libpurple/gconf/purple.schemas.in.h:10
-msgid "The handler for \"aim\" URLs"
-msgstr "Le gestionnaire des URL en « aim »"
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr "Si activé, la commande utilisée pour gérer les URL en « gg »"
 
 #: ../libpurple/gconf/purple.schemas.in.h:11
-msgid "The handler for \"gg\" URLs"
-msgstr "Le gestionnaire des URL en « gg »"
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr "La commande décrite doit gérer les URL en « icq »"
 
 #: ../libpurple/gconf/purple.schemas.in.h:12
-msgid "The handler for \"icq\" URLs"
-msgstr "Le gestionnaire des URL en « icq »"
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+"Indique si la commande décrite dans la clé « command » doit gérer les URL en "
+"« icq »."
 
 #: ../libpurple/gconf/purple.schemas.in.h:13
-msgid "The handler for \"irc\" URLs"
-msgstr "Le gestionnaire des URL en « irc »"
+msgid "The handler for \"icq\" URLs"
+msgstr "Le gestionnaire des URL en « icq »"
 
 #: ../libpurple/gconf/purple.schemas.in.h:14
-msgid "The handler for \"msnim\" URLs"
-msgstr "Le gestionnaire des URL en « msnim »"
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr "Si activé, la commande utilisée pour gérer les URL en « icq »"
 
 #: ../libpurple/gconf/purple.schemas.in.h:15
-msgid "The handler for \"sip\" URLs"
-msgstr "Le gestionnaire des URL en « sip »"
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr "La commande décrite doit gérer les URL en « irc »"
 
 #: ../libpurple/gconf/purple.schemas.in.h:16
-msgid "The handler for \"xmpp\" URLs"
-msgstr "Le gestionnaire des URL en « xmpp »"
-
-#: ../libpurple/gconf/purple.schemas.in.h:17
-msgid "The handler for \"ymsgr\" URLs"
-msgstr "Le gestionnaire des URL en « ymsgr »"
-
-#: ../libpurple/gconf/purple.schemas.in.h:18
 msgid ""
-"True if the command specified in the \"command\" key should handle \"aim\" "
+"True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
 "Indique si la commande décrite dans la clé « command » doit gérer les URL en "
-"« aim »."
+"« irc »."
+
+#: ../libpurple/gconf/purple.schemas.in.h:17
+msgid "The handler for \"irc\" URLs"
+msgstr "Le gestionnaire des URL en « irc »"
+
+#: ../libpurple/gconf/purple.schemas.in.h:18
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr "Si activé, la commande utilisée pour gérer les URL en « irc »"
 
 #: ../libpurple/gconf/purple.schemas.in.h:19
-msgid ""
-"True if the command specified in the \"command\" key should handle \"gg\" "
-"URLs."
-msgstr ""
-"Indique si la commande décrite dans la clé « command » doit gérer les URL en "
-"« gg »."
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr "La commande décrite doit gérer les URL en « msnim »"
 
 #: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
-"True if the command specified in the \"command\" key should handle \"icq\" "
+"True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
 "Indique si la commande décrite dans la clé « command » doit gérer les URL en "
-"« icq »."
+"« msnim »."
 
 #: ../libpurple/gconf/purple.schemas.in.h:21
-msgid ""
-"True if the command specified in the \"command\" key should handle \"irc\" "
-"URLs."
-msgstr ""
-"Indique si la commande décrite dans la clé « command » doit gérer les URL en "
-"« irc »."
+msgid "The handler for \"msnim\" URLs"
+msgstr "Le gestionnaire des URL en « msnim »"
 
 #: ../libpurple/gconf/purple.schemas.in.h:22
-msgid ""
-"True if the command specified in the \"command\" key should handle \"msnim\" "
-"URLs."
-msgstr ""
-"Indique si la commande décrite dans la clé « command » doit gérer les URL en "
-"« msnim »."
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr "Si activé, la commande utilisée pour gérer les URL en « msnim »"
 
 #: ../libpurple/gconf/purple.schemas.in.h:23
-msgid ""
-"True if the command specified in the \"command\" key should handle \"sip\" "
-"URLs."
-msgstr ""
-"Indique si la commande décrite dans la clé « command » doit gérer les URL en "
-"« sip »."
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr "La commande décrite doit gérer les URL en « sip »"
 
 #: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
-"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
 "Indique si la commande décrite dans la clé « command » doit gérer les URL en "
-"« xmpp »."
+"« sip »."
 
 #: ../libpurple/gconf/purple.schemas.in.h:25
-msgid ""
-"True if the command specified in the \"command\" key should handle \"ymsgr\" "
-"URLs."
-msgstr ""
-"Indique si la commande décrite dans la clé « command » doit gérer les URL en "
-"« imsgr »."
+msgid "The handler for \"sip\" URLs"
+msgstr "Le gestionnaire des URL en « sip »"
 
 #: ../libpurple/gconf/purple.schemas.in.h:26
-msgid ""
-"True if the command used to handle this type of URL should be run in a "
-"terminal."
-msgstr ""
-"Indique si la commande utilisée pour gérer ce type d'URL doit être lancée "
-"dans un terminal."
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr "Si activé, la commande utilisée pour gérer les URL en « sip »"
 
 #: ../libpurple/gconf/purple.schemas.in.h:27
-msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr "La commande décrite doit gérer les URL en « aim »"
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr "La commande décrite doit gérer les URL en « xmpp »"
 
 #: ../libpurple/gconf/purple.schemas.in.h:28
-msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr "La commande décrite doit gérer les URL en « gg »"
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+"Indique si la commande décrite dans la clé « command » doit gérer les URL en "
+"« xmpp »."
 
 #: ../libpurple/gconf/purple.schemas.in.h:29
-msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr "La commande décrite doit gérer les URL en « icq »"
+msgid "The handler for \"xmpp\" URLs"
+msgstr "Le gestionnaire des URL en « xmpp »"
 
 #: ../libpurple/gconf/purple.schemas.in.h:30
-msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr "La commande décrite doit gérer les URL en « irc »"
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr "Si activé, la commande utilisée pour gérer les URL en « xmpp »"
 
 #: ../libpurple/gconf/purple.schemas.in.h:31
-msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr "La commande décrite doit gérer les URL en « msnim »"
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr "La commande décrite doit gérer les URL en « ymsgr »"
 
 #: ../libpurple/gconf/purple.schemas.in.h:32
-msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr "La commande décrite doit gérer les URL en « sip »"
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+"Indique si la commande décrite dans la clé « command » doit gérer les URL en "
+"« imsgr »."
 
 #: ../libpurple/gconf/purple.schemas.in.h:33
-msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr "La commande décrite doit gérer les URL en « xmpp »"
+msgid "The handler for \"ymsgr\" URLs"
+msgstr "Le gestionnaire des URL en « ymsgr »"
 
 #: ../libpurple/gconf/purple.schemas.in.h:34
-msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr "La commande décrite doit gérer les URL en « ymsgr »"
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr "Si activé, la commande utilisée pour gérer les URL en « ymsgr »"
 
 #: ../libpurple/log.c:198
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
@@ -4260,7 +4259,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:2006
 #: ../libpurple/protocols/jabber/jabber.c:1320
 #: ../libpurple/protocols/mxit/actions.c:275
-#: ../libpurple/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/silc/ops.c:1058
 #: ../libpurple/protocols/silc/silc.c:1010
 #: ../libpurple/protocols/silc/silc.c:1251
 #: ../libpurple/protocols/silc/util.c:562
@@ -4318,8 +4317,8 @@
 #: ../libpurple/protocols/bonjour/jabber.c:493
 #: ../libpurple/protocols/bonjour/jabber.c:558
 #: ../libpurple/protocols/bonjour/jabber.c:603
-#: ../libpurple/protocols/bonjour/jabber.c:876
-#: ../libpurple/protocols/bonjour/jabber.c:897
+#: ../libpurple/protocols/bonjour/jabber.c:880
+#: ../libpurple/protocols/bonjour/jabber.c:901
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 "Impossible d'envoyer le message, la conversation n'a pas pu être commencée."
@@ -4598,7 +4597,7 @@
 #: ../libpurple/protocols/mxit/roster.c:57
 #: ../libpurple/protocols/oscar/oscar.c:159
 #: ../libpurple/protocols/oscar/oscar.c:4877
-#: ../libpurple/protocols/sametime/sametime.c:3376
+#: ../libpurple/protocols/sametime/sametime.c:3381
 msgid "Do Not Disturb"
 msgstr "Ne pas déranger"
 
@@ -4637,7 +4636,7 @@
 #: ../libpurple/protocols/mxit/profile.c:187
 #: ../libpurple/protocols/mxit/profile.c:290
 #: ../libpurple/protocols/oscar/userinfo.c:416
-#: ../libpurple/protocols/silc/ops.c:993
+#: ../libpurple/protocols/silc/ops.c:1007
 #: ../libpurple/protocols/silc10/ops.c:1024
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:544
 msgid "First Name"
@@ -4693,7 +4692,7 @@
 #. * we're ready for it (session key, userid, username all setup).
 #: ../libpurple/protocols/gg/gg.c:1915
 #: ../libpurple/protocols/myspace/myspace.c:1159
-#: ../libpurple/protocols/sametime/sametime.c:1574
+#: ../libpurple/protocols/sametime/sametime.c:1579
 msgid "Connected"
 msgstr "Connecté"
 
@@ -4725,7 +4724,7 @@
 #: ../libpurple/protocols/myspace/myspace.c:2206
 #: ../libpurple/protocols/novell/novell.c:2203
 #: ../libpurple/protocols/oscar/oscar.c:834
-#: ../libpurple/protocols/sametime/sametime.c:3806
+#: ../libpurple/protocols/sametime/sametime.c:3770
 #: ../libpurple/protocols/simple/simple.c:1960
 #: ../libpurple/protocols/yahoo/libymsg.c:3682
 #: ../libpurple/protocols/zephyr/zephyr.c:1583 ../pidgin/gtkstatusbox.c:716
@@ -4892,7 +4891,7 @@
 #: ../libpurple/protocols/myspace/myspace.c:2070
 #: ../libpurple/protocols/oscar/flap_connection.c:474
 #: ../libpurple/protocols/sametime/sametime.c:412
-#: ../libpurple/protocols/sametime/sametime.c:1775
+#: ../libpurple/protocols/sametime/sametime.c:1780
 #: ../libpurple/protocols/simple/simple.c:433
 #: ../libpurple/protocols/yahoo/libymsg.c:3148
 #: ../libpurple/protocols/yahoo/libymsg.c:3302
@@ -4940,7 +4939,7 @@
 #: ../libpurple/protocols/oscar/oscar.c:829
 #: ../libpurple/protocols/oscar/oscar.c:1051
 #: ../libpurple/protocols/oscar/oscar.c:1172
-#: ../libpurple/protocols/sametime/sametime.c:3810
+#: ../libpurple/protocols/sametime/sametime.c:3774
 #: ../libpurple/protocols/silc/silc.c:451
 #: ../libpurple/protocols/simple/simple.c:482
 #: ../libpurple/protocols/simple/simple.c:1860
@@ -4961,7 +4960,7 @@
 #: ../libpurple/protocols/irc/irc.c:491
 #: ../libpurple/protocols/myspace/myspace.c:2163
 #: ../libpurple/protocols/oscar/flap_connection.c:479
-#: ../libpurple/protocols/sametime/sametime.c:1800
+#: ../libpurple/protocols/sametime/sametime.c:1805
 #: ../libpurple/protocols/simple/simple.c:452
 #: ../libpurple/protocols/simple/simple.c:1740
 #: ../libpurple/protocols/yahoo/libymsg.c:3237
@@ -4975,7 +4974,7 @@
 #: ../libpurple/protocols/jabber/jabber.c:727
 #: ../libpurple/protocols/myspace/myspace.c:2079
 #: ../libpurple/protocols/oscar/flap_connection.c:472
-#: ../libpurple/protocols/sametime/sametime.c:1767
+#: ../libpurple/protocols/sametime/sametime.c:1772
 #: ../libpurple/protocols/yahoo/libymsg.c:3155
 #: ../libpurple/protocols/yahoo/libymsg.c:3309
 #: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:884
@@ -4993,9 +4992,9 @@
 msgstr "Utilisateurs"
 
 #: ../libpurple/protocols/irc/irc.c:879
-#: ../libpurple/protocols/sametime/sametime.c:3453
+#: ../libpurple/protocols/sametime/sametime.c:3458
 #: ../libpurple/protocols/silc/chat.c:1408
-#: ../libpurple/protocols/silc/ops.c:1395
+#: ../libpurple/protocols/silc/ops.c:1409
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1546
@@ -5019,13 +5018,13 @@
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Plugin qui pue moins pour le protocole IRC"
 
-#. host to connect to
+#. set up account ID as user:server
 #: ../libpurple/protocols/irc/irc.c:1049 ../libpurple/protocols/irc/msgs.c:377
 #: ../libpurple/protocols/msn/msn.c:3046
 #: ../libpurple/protocols/oscar/oscar.c:5785
-#: ../libpurple/protocols/sametime/sametime.c:5810
-#: ../libpurple/protocols/silc/ops.c:1251
-#: ../libpurple/protocols/silc/ops.c:1345
+#: ../libpurple/protocols/sametime/sametime.c:5784
+#: ../libpurple/protocols/silc/ops.c:1265
+#: ../libpurple/protocols/silc/ops.c:1359
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
 #: ../libpurple/protocols/simple/simple.c:2164
@@ -5035,7 +5034,7 @@
 #. port to connect to
 #: ../libpurple/protocols/irc/irc.c:1052 ../libpurple/protocols/msn/msn.c:3051
 #: ../libpurple/protocols/oscar/oscar.c:5788
-#: ../libpurple/protocols/sametime/sametime.c:5815
+#: ../libpurple/protocols/sametime/sametime.c:5793
 #: ../libpurple/protocols/silc/silc.c:2197
 #: ../libpurple/protocols/silc10/silc.c:1910
 msgid "Port"
@@ -5105,13 +5104,13 @@
 
 #: ../libpurple/protocols/irc/msgs.c:357
 #: ../libpurple/protocols/oscar/userinfo.c:406
-#: ../libpurple/protocols/silc/ops.c:1424
+#: ../libpurple/protocols/silc/ops.c:1438
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Pseudonyme"
 
 #: ../libpurple/protocols/irc/msgs.c:383
-#: ../libpurple/protocols/silc/ops.c:1270
+#: ../libpurple/protocols/silc/ops.c:1284
 #: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Actuellement dans"
@@ -5212,7 +5211,7 @@
 #. Remove user from channel
 #: ../libpurple/protocols/irc/msgs.c:962
 #: ../libpurple/protocols/jabber/presence.c:747
-#: ../libpurple/protocols/silc/ops.c:716
+#: ../libpurple/protocols/silc/ops.c:730
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
@@ -5286,7 +5285,7 @@
 msgstr "Impossible de rejoindre %s : une inscription est nécessaire."
 
 #: ../libpurple/protocols/irc/msgs.c:1308
-#: ../libpurple/protocols/silc/ops.c:1095
+#: ../libpurple/protocols/silc/ops.c:1109
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Impossible de rejoindre le salon"
@@ -5753,15 +5752,15 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:350
 #: ../libpurple/protocols/jabber/buddy.c:1024
-#: ../libpurple/protocols/sametime/sametime.c:4212
-#: ../libpurple/protocols/silc/ops.c:989
+#: ../libpurple/protocols/sametime/sametime.c:4176
+#: ../libpurple/protocols/silc/ops.c:1003
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Nom complet"
 
 #: ../libpurple/protocols/jabber/buddy.c:351
 #: ../libpurple/protocols/jabber/buddy.c:1035
-#: ../libpurple/protocols/silc/ops.c:1001
+#: ../libpurple/protocols/silc/ops.c:1015
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Nom de famille"
@@ -5836,7 +5835,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:1163
 #: ../libpurple/protocols/msn/msn.c:2525
 #: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/silc/ops.c:1013
+#: ../libpurple/protocols/silc/ops.c:1027
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Position"
@@ -5920,7 +5919,7 @@
 msgstr "il y a %s"
 
 #: ../libpurple/protocols/jabber/buddy.c:1039
-#: ../libpurple/protocols/silc/ops.c:997
+#: ../libpurple/protocols/silc/ops.c:1011
 #: ../libpurple/protocols/silc10/ops.c:1028
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:547
 msgid "Middle Name"
@@ -5930,7 +5929,7 @@
 #: ../libpurple/protocols/jabber/jabber.c:1324
 #: ../libpurple/protocols/oscar/userinfo.c:466
 #: ../libpurple/protocols/oscar/userinfo.c:474
-#: ../libpurple/protocols/silc/ops.c:1033
+#: ../libpurple/protocols/silc/ops.c:1047
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Adresse"
@@ -6054,7 +6053,7 @@
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:2213
-#: ../libpurple/protocols/sametime/sametime.c:5694
+#: ../libpurple/protocols/sametime/sametime.c:5671
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:476
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
@@ -6149,7 +6148,7 @@
 
 #: ../libpurple/protocols/jabber/chat.c:813
 #: ../libpurple/protocols/jabber/chat.c:824
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1476
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Erreur à la récupération de la liste des salons de discussions"
@@ -6264,7 +6263,7 @@
 msgstr "Code postal"
 
 #: ../libpurple/protocols/jabber/jabber.c:1328
-#: ../libpurple/protocols/silc/ops.c:1038
+#: ../libpurple/protocols/silc/ops.c:1052
 #: ../libpurple/protocols/silc/silc.c:1012
 #: ../libpurple/protocols/silc/util.c:564
 #: ../libpurple/protocols/silc10/ops.c:1069
@@ -6378,7 +6377,7 @@
 #: ../libpurple/protocols/mxit/profile.c:210
 #: ../libpurple/protocols/oscar/userinfo.c:298
 #: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1214
+#: ../libpurple/protocols/silc/ops.c:1228
 #: ../libpurple/protocols/silc10/buddy.c:1577
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
@@ -8395,7 +8394,7 @@
 msgstr "Dernière mise à jour"
 
 #: ../libpurple/protocols/msn/msn.c:2683
-#: ../libpurple/protocols/silc/ops.c:1029
+#: ../libpurple/protocols/silc/ops.c:1043
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Page web"
@@ -8486,7 +8485,7 @@
 
 #: ../libpurple/protocols/msn/notification.c:831
 #: ../libpurple/protocols/msn/notification.c:855
-#: ../libpurple/protocols/sametime/sametime.c:4509
+#: ../libpurple/protocols/sametime/sametime.c:4473
 msgid "Unable to add user"
 msgstr "Impossible d'ajouter un utilisateur"
 
@@ -9987,7 +9986,7 @@
 msgstr "Boîte à lettres"
 
 #: ../libpurple/protocols/novell/novell.c:1515
-#: ../libpurple/protocols/sametime/sametime.c:4206
+#: ../libpurple/protocols/sametime/sametime.c:4170
 msgid "User ID"
 msgstr "ID Utilisateur"
 
@@ -11583,129 +11582,129 @@
 msgid "These buddies will always see you as offline"
 msgstr "Ces contacts ne vous verront jamais connectés"
 
-#: ../libpurple/protocols/sametime/sametime.c:1316
+#: ../libpurple/protocols/sametime/sametime.c:1321
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Titre du groupe :</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1317
+#: ../libpurple/protocols/sametime/sametime.c:1322
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Id Notes du groupe :</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1319
+#: ../libpurple/protocols/sametime/sametime.c:1324
 #, c-format
 msgid "Info for Group %s"
 msgstr "Informations pour le groupe %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1321
+#: ../libpurple/protocols/sametime/sametime.c:1326
 msgid "Notes Address Book Information"
 msgstr "Informations du carnet d'adresses Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:1353
+#: ../libpurple/protocols/sametime/sametime.c:1358
 msgid "Invite Group to Conference..."
 msgstr "Inviter le groupe à une conférence..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1363
+#: ../libpurple/protocols/sametime/sametime.c:1368
 msgid "Get Notes Address Book Info"
 msgstr "Récupérer les informations du carnet d'adresses Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
+#: ../libpurple/protocols/sametime/sametime.c:1539
 msgid "Sending Handshake"
 msgstr "Envoi de la poignée de main"
 
-#: ../libpurple/protocols/sametime/sametime.c:1539
+#: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "En attente de réception de la poignée de main"
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
+#: ../libpurple/protocols/sametime/sametime.c:1549
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Poignée de main acceptée. Envoi du nom d'utilisateur."
 
-#: ../libpurple/protocols/sametime/sametime.c:1549
+#: ../libpurple/protocols/sametime/sametime.c:1554
 msgid "Waiting for Login Acknowledgement"
 msgstr "En attente de réception des informations utilisateurs."
 
-#: ../libpurple/protocols/sametime/sametime.c:1554
+#: ../libpurple/protocols/sametime/sametime.c:1559
 msgid "Login Redirected"
 msgstr "Connexion redirigée"
 
-#: ../libpurple/protocols/sametime/sametime.c:1560
+#: ../libpurple/protocols/sametime/sametime.c:1565
 msgid "Forcing Login"
 msgstr "Connexion"
 
-#: ../libpurple/protocols/sametime/sametime.c:1564
+#: ../libpurple/protocols/sametime/sametime.c:1569
 msgid "Login Acknowledged"
 msgstr "Connexion reçue"
 
-#: ../libpurple/protocols/sametime/sametime.c:1569
+#: ../libpurple/protocols/sametime/sametime.c:1574
 msgid "Starting Services"
 msgstr "Démarrage des services"
 
-#: ../libpurple/protocols/sametime/sametime.c:1706
+#: ../libpurple/protocols/sametime/sametime.c:1711
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 "Un administrateur Sametime a lancé l'annonce suivante sur le serveur %s."
 
-#: ../libpurple/protocols/sametime/sametime.c:1711
+#: ../libpurple/protocols/sametime/sametime.c:1716
 msgid "Sametime Administrator Announcement"
 msgstr "Annonce d'un administrateur Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:1843
+#: ../libpurple/protocols/sametime/sametime.c:1848
 #, c-format
 msgid "Announcement from %s"
 msgstr "Annonce de %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:2017
+#: ../libpurple/protocols/sametime/sametime.c:2022
 msgid "Conference Closed"
 msgstr "Conférence fermée"
 
-#: ../libpurple/protocols/sametime/sametime.c:2482
+#: ../libpurple/protocols/sametime/sametime.c:2487
 msgid "Unable to send message: "
 msgstr "Impossible d'envoyer le message : "
 
-#: ../libpurple/protocols/sametime/sametime.c:2488
+#: ../libpurple/protocols/sametime/sametime.c:2493
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Impossible d'envoyer le message vers %s :"
 
-#: ../libpurple/protocols/sametime/sametime.c:3038
+#: ../libpurple/protocols/sametime/sametime.c:3043
 msgid "Place Closed"
 msgstr "Endroit fermé"
 
-#: ../libpurple/protocols/sametime/sametime.c:3308
+#: ../libpurple/protocols/sametime/sametime.c:3313
 msgid "Microphone"
 msgstr "Microphone"
 
-#: ../libpurple/protocols/sametime/sametime.c:3309
+#: ../libpurple/protocols/sametime/sametime.c:3314
 msgid "Speakers"
 msgstr "Haut-parleurs"
 
-#: ../libpurple/protocols/sametime/sametime.c:3310
+#: ../libpurple/protocols/sametime/sametime.c:3315
 msgid "Video Camera"
 msgstr "Caméra vidéo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3314
+#: ../libpurple/protocols/sametime/sametime.c:3319
 msgid "File Transfer"
 msgstr "Transfert de fichier"
 
-#: ../libpurple/protocols/sametime/sametime.c:3348
-#: ../libpurple/protocols/sametime/sametime.c:4229
+#: ../libpurple/protocols/sametime/sametime.c:3353
+#: ../libpurple/protocols/sametime/sametime.c:4193
 msgid "Supports"
 msgstr "Fonctionnalités"
 
-#: ../libpurple/protocols/sametime/sametime.c:3353
-#: ../libpurple/protocols/sametime/sametime.c:4203
+#: ../libpurple/protocols/sametime/sametime.c:3358
+#: ../libpurple/protocols/sametime/sametime.c:4167
 msgid "External User"
 msgstr "Utilisateur extérieur"
 
-#: ../libpurple/protocols/sametime/sametime.c:3459
+#: ../libpurple/protocols/sametime/sametime.c:3464
 msgid "Create conference with user"
 msgstr "Créer une conférence avec l'utilisateur"
 
-#: ../libpurple/protocols/sametime/sametime.c:3460
+#: ../libpurple/protocols/sametime/sametime.c:3465
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -11714,27 +11713,27 @@
 "Saisissez un sujet pour la nouvelle conférence, ainsi qu'un message "
 "d'invitation à envoyer à %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3464
+#: ../libpurple/protocols/sametime/sametime.c:3469
 msgid "New Conference"
 msgstr "Nouvelle conférence"
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Create"
 msgstr "Créer"
 
-#: ../libpurple/protocols/sametime/sametime.c:3531
+#: ../libpurple/protocols/sametime/sametime.c:3536
 msgid "Available Conferences"
 msgstr "Conférences disponibles"
 
-#: ../libpurple/protocols/sametime/sametime.c:3537
+#: ../libpurple/protocols/sametime/sametime.c:3542
 msgid "Create New Conference..."
 msgstr "Créer une nouvelle conférence..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3544
+#: ../libpurple/protocols/sametime/sametime.c:3549
 msgid "Invite user to a conference"
 msgstr "Inviter l'utilisateur à une conférence"
 
-#: ../libpurple/protocols/sametime/sametime.c:3545
+#: ../libpurple/protocols/sametime/sametime.c:3550
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -11745,71 +11744,50 @@
 "l'utilisateur %s. Choisissez « Créer une nouvelle conférence » si vous "
 "désirer créer une nouvelle conférence afin d'y inviter cet utilisateur."
 
-#: ../libpurple/protocols/sametime/sametime.c:3550
+#: ../libpurple/protocols/sametime/sametime.c:3555
 msgid "Invite to Conference"
 msgstr "Inviter à une conférence"
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3646
 msgid "Invite to Conference..."
 msgstr "Inviter à une conférence..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3646
+#: ../libpurple/protocols/sametime/sametime.c:3651
 msgid "Send TEST Announcement"
 msgstr "Envoyer une proclamation TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3665 ../pidgin/gtkconv.c:4685
+#: ../libpurple/protocols/sametime/sametime.c:3670 ../pidgin/gtkconv.c:4685
 msgid "Topic:"
 msgstr "Sujet :"
 
-#: ../libpurple/protocols/sametime/sametime.c:3693
-msgid "No Sametime Community Server specified"
-msgstr "Aucun serveur communautaire Sametime n'a été spécifié."
-
-#: ../libpurple/protocols/sametime/sametime.c:3718
-#, c-format
-msgid ""
-"No host or IP address has been configured for the Meanwhile account %s. "
-"Please enter one below to continue logging in."
+#: ../libpurple/protocols/sametime/sametime.c:3730
+msgid "A server is required to connect this account"
 msgstr ""
-"Aucun hôte ou adresse IP n'a été configurée pour le compte Meanwhile %s. "
-"Veuillez en saisir un ci-dessous pour continuer la connexion."
-
-#: ../libpurple/protocols/sametime/sametime.c:3723
-msgid "Meanwhile Connection Setup"
-msgstr "Configuration de la connexion Meanwhile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3724
-msgid "No Sametime Community Server Specified"
-msgstr "Aucun serveur communautaire Sametime n'a été spécifié."
-
-#: ../libpurple/protocols/sametime/sametime.c:3726
-msgid "Connect"
-msgstr "Connecter"
-
-#: ../libpurple/protocols/sametime/sametime.c:4219
+#: ../libpurple/protocols/sametime/sametime.c:4183
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Inconnu (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4221
+#: ../libpurple/protocols/sametime/sametime.c:4185
 msgid "Last Known Client"
 msgstr "Dernier client connu"
 
-#: ../libpurple/protocols/sametime/sametime.c:4385
-#: ../libpurple/protocols/sametime/sametime.c:5589
+#: ../libpurple/protocols/sametime/sametime.c:4349
+#: ../libpurple/protocols/sametime/sametime.c:5566
 msgid "User Name"
 msgstr "Nom d'utilisateur"
 
-#: ../libpurple/protocols/sametime/sametime.c:4388
-#: ../libpurple/protocols/sametime/sametime.c:5592
+#: ../libpurple/protocols/sametime/sametime.c:4352
+#: ../libpurple/protocols/sametime/sametime.c:5569
 msgid "Sametime ID"
 msgstr "Identifiant Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4412
+#: ../libpurple/protocols/sametime/sametime.c:4376
 msgid "An ambiguous user ID was entered"
 msgstr "Un identifiant d'utilisateur ambigu a été saisi."
 
-#: ../libpurple/protocols/sametime/sametime.c:4413
+#: ../libpurple/protocols/sametime/sametime.c:4377
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -11819,15 +11797,15 @@
 "Veuillez choisir dans cette liste l'utilisateur que vous voulez ajouter à "
 "votre liste de contacts."
 
-#: ../libpurple/protocols/sametime/sametime.c:4418
+#: ../libpurple/protocols/sametime/sametime.c:4382
 msgid "Select User"
 msgstr "Choisir l'utilisateur"
 
-#: ../libpurple/protocols/sametime/sametime.c:4502
+#: ../libpurple/protocols/sametime/sametime.c:4466
 msgid "Unable to add user: user not found"
 msgstr "Impossible d'ajouter cet utilisateur parce qu'il est introuvable."
 
-#: ../libpurple/protocols/sametime/sametime.c:4504
+#: ../libpurple/protocols/sametime/sametime.c:4468
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -11836,7 +11814,7 @@
 "L'identifiant « %s » ne correspond à aucun utilisateur dans la communauté "
 "Sametime. Cette entrée a été retirée de votre liste de contacts."
 
-#: ../libpurple/protocols/sametime/sametime.c:5093
+#: ../libpurple/protocols/sametime/sametime.c:5057
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -11845,63 +11823,63 @@
 "Erreur à la lecture du fichier « %s » :\n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5229
+#: ../libpurple/protocols/sametime/sametime.c:5206
 msgid "Remotely Stored Buddy List"
 msgstr "Liste de contacts stockée sur le serveur"
 
-#: ../libpurple/protocols/sametime/sametime.c:5234
+#: ../libpurple/protocols/sametime/sametime.c:5211
 msgid "Buddy List Storage Mode"
 msgstr "Mode de stockage de la liste de contacts"
 
-#: ../libpurple/protocols/sametime/sametime.c:5237
+#: ../libpurple/protocols/sametime/sametime.c:5214
 msgid "Local Buddy List Only"
 msgstr "Liste de contacts en local uniquement"
 
-#: ../libpurple/protocols/sametime/sametime.c:5239
+#: ../libpurple/protocols/sametime/sametime.c:5216
 msgid "Merge List from Server"
 msgstr "Fusionner avec la liste du serveur"
 
-#: ../libpurple/protocols/sametime/sametime.c:5241
+#: ../libpurple/protocols/sametime/sametime.c:5218
 msgid "Merge and Save List to Server"
 msgstr "Fusionner et envoyer la liste sur le serveur"
 
-#: ../libpurple/protocols/sametime/sametime.c:5243
+#: ../libpurple/protocols/sametime/sametime.c:5220
 msgid "Synchronize List with Server"
 msgstr "Synchroniser la liste avec le serveur"
 
-#: ../libpurple/protocols/sametime/sametime.c:5298
+#: ../libpurple/protocols/sametime/sametime.c:5275
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importer la liste Sametime du compte %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5338
+#: ../libpurple/protocols/sametime/sametime.c:5315
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exporter la liste Sametime du compte %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5392
+#: ../libpurple/protocols/sametime/sametime.c:5369
 msgid "Unable to add group: group exists"
 msgstr "Impossible d'ajouter ce groupe parce qu'il existe déjà."
 
-#: ../libpurple/protocols/sametime/sametime.c:5393
+#: ../libpurple/protocols/sametime/sametime.c:5370
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Un groupe nommé « %s » existe déjà dans votre liste de contacts."
 
-#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5526
+#: ../libpurple/protocols/sametime/sametime.c:5373
+#: ../libpurple/protocols/sametime/sametime.c:5503
 msgid "Unable to add group"
 msgstr "Impossible d'ajouter le groupe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5455
+#: ../libpurple/protocols/sametime/sametime.c:5432
 msgid "Possible Matches"
 msgstr "Correspondances possibles"
 
-#: ../libpurple/protocols/sametime/sametime.c:5471
+#: ../libpurple/protocols/sametime/sametime.c:5448
 msgid "Notes Address Book group results"
 msgstr "Correspondances des groupes dans le carnet d'adresses Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5472
+#: ../libpurple/protocols/sametime/sametime.c:5449
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -11912,15 +11890,15 @@
 "d'adresses Notes suivants. Veuillez choisir dans cette liste le groupe que "
 "vous voulez ajouter à votre liste de contacts."
 
-#: ../libpurple/protocols/sametime/sametime.c:5477
+#: ../libpurple/protocols/sametime/sametime.c:5454
 msgid "Select Notes Address Book"
 msgstr "Choisissez le carnet d'adresses Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5520
+#: ../libpurple/protocols/sametime/sametime.c:5497
 msgid "Unable to add group: group not found"
 msgstr "Impossible d'ajouter ce groupe parce qu'il n'existe pas."
 
-#: ../libpurple/protocols/sametime/sametime.c:5522
+#: ../libpurple/protocols/sametime/sametime.c:5499
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -11928,11 +11906,11 @@
 msgstr ""
 "L'identifiant « %s » ne correspond à aucun groupe du carnet d'adresses Notes."
 
-#: ../libpurple/protocols/sametime/sametime.c:5563
+#: ../libpurple/protocols/sametime/sametime.c:5540
 msgid "Notes Address Book Group"
 msgstr "Groupe du carnet d'adresses Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5541
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -11940,12 +11918,12 @@
 "Saisissez le nom d'un groupe de carnet d'adresses Notes dans la rubrique ci-"
 "dessous pour ajouter le groupe et ses membres dans votre liste de contacts."
 
-#: ../libpurple/protocols/sametime/sametime.c:5613
+#: ../libpurple/protocols/sametime/sametime.c:5590
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Résultats de la recherche sur « %s »"
 
-#: ../libpurple/protocols/sametime/sametime.c:5614
+#: ../libpurple/protocols/sametime/sametime.c:5591
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -11956,15 +11934,15 @@
 "Vous pouvez ajouter ces utilisateurs à votre liste de contacts ou leur "
 "envoyer un message avec les boutons ci-dessous."
 
-#: ../libpurple/protocols/sametime/sametime.c:5621 ../pidgin/gtknotify.c:972
+#: ../libpurple/protocols/sametime/sametime.c:5598 ../pidgin/gtknotify.c:972
 msgid "Search Results"
 msgstr "Résultats de la recherche"
 
-#: ../libpurple/protocols/sametime/sametime.c:5646
+#: ../libpurple/protocols/sametime/sametime.c:5623
 msgid "No matches"
 msgstr "Aucun résultat"
 
-#: ../libpurple/protocols/sametime/sametime.c:5647
+#: ../libpurple/protocols/sametime/sametime.c:5624
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community."
@@ -11972,15 +11950,15 @@
 "L'identifiant « %s » ne correspond à aucun utilisateur de la communauté "
 "Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5651
+#: ../libpurple/protocols/sametime/sametime.c:5628
 msgid "No Matches"
 msgstr "Aucun résultat"
 
-#: ../libpurple/protocols/sametime/sametime.c:5688
+#: ../libpurple/protocols/sametime/sametime.c:5665
 msgid "Search for a user"
 msgstr "Rechercher un utilisateur"
 
-#: ../libpurple/protocols/sametime/sametime.c:5689
+#: ../libpurple/protocols/sametime/sametime.c:5666
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -11988,32 +11966,32 @@
 "Saisissez un nom ou un identifiant partiel ci-dessous pour rechercher des "
 "utilisateurs correspondants dans la communauté Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5692
+#: ../libpurple/protocols/sametime/sametime.c:5669
 msgid "User Search"
 msgstr "Recherche d'utilisateurs"
 
-#: ../libpurple/protocols/sametime/sametime.c:5705
+#: ../libpurple/protocols/sametime/sametime.c:5682
 msgid "Import Sametime List..."
 msgstr "Importer une liste Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5709
+#: ../libpurple/protocols/sametime/sametime.c:5686
 msgid "Export Sametime List..."
 msgstr "Exporter une liste Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5713
+#: ../libpurple/protocols/sametime/sametime.c:5690
 msgid "Add Notes Address Book Group..."
 msgstr "Ajouter un groupe de carnet d'adresses Notes..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5717
+#: ../libpurple/protocols/sametime/sametime.c:5694
 msgid "User Search..."
 msgstr "Recherche d'utilisateurs..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5823
+#: ../libpurple/protocols/sametime/sametime.c:5801
 msgid "Force login (ignore server redirects)"
 msgstr "Forcer la connexion (ignorer les redirections du serveur)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5833
+#: ../libpurple/protocols/sametime/sametime.c:5811
 msgid "Hide client identity"
 msgstr "Cacher l'identité du client"
 
@@ -12142,8 +12120,8 @@
 #: ../libpurple/protocols/silc/buddy.c:500
 #: ../libpurple/protocols/silc/buddy.c:511
 #: ../libpurple/protocols/silc/buddy.c:544
-#: ../libpurple/protocols/silc/ops.c:1505
-#: ../libpurple/protocols/silc/ops.c:1516
+#: ../libpurple/protocols/silc/ops.c:1519
+#: ../libpurple/protocols/silc/ops.c:1530
 #: ../libpurple/protocols/silc10/buddy.c:513
 #: ../libpurple/protocols/silc10/buddy.c:548
 #: ../libpurple/protocols/silc10/ops.c:1494
@@ -12152,8 +12130,8 @@
 msgstr "Récupérer la clé publique"
 
 #: ../libpurple/protocols/silc/buddy.c:545
-#: ../libpurple/protocols/silc/ops.c:1506
-#: ../libpurple/protocols/silc/ops.c:1517
+#: ../libpurple/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1531
 #: ../libpurple/protocols/silc10/buddy.c:549
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
@@ -12177,11 +12155,11 @@
 msgstr "Impossible de charger la clé publique"
 
 #: ../libpurple/protocols/silc/buddy.c:706
-#: ../libpurple/protocols/silc/ops.c:1055
-#: ../libpurple/protocols/silc/ops.c:1170
-#: ../libpurple/protocols/silc/ops.c:1292
-#: ../libpurple/protocols/silc/ops.c:1293
-#: ../libpurple/protocols/silc/ops.c:1311
+#: ../libpurple/protocols/silc/ops.c:1069
+#: ../libpurple/protocols/silc/ops.c:1184
+#: ../libpurple/protocols/silc/ops.c:1306
+#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc/ops.c:1325
 #: ../libpurple/protocols/silc10/buddy.c:713
 #: ../libpurple/protocols/silc10/ops.c:1087
 #: ../libpurple/protocols/silc10/ops.c:1159
@@ -12192,8 +12170,8 @@
 msgstr "Informations"
 
 #: ../libpurple/protocols/silc/buddy.c:707
-#: ../libpurple/protocols/silc/ops.c:1171
-#: ../libpurple/protocols/silc/ops.c:1312
+#: ../libpurple/protocols/silc/ops.c:1185
+#: ../libpurple/protocols/silc/ops.c:1326
 #: ../libpurple/protocols/silc10/buddy.c:714
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
@@ -12296,35 +12274,35 @@
 msgstr "Robot"
 
 #: ../libpurple/protocols/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1209
+#: ../libpurple/protocols/silc/ops.c:1223
 #: ../libpurple/protocols/silc10/buddy.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Modes utilisateur"
 
 #: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1226
+#: ../libpurple/protocols/silc/ops.c:1240
 #: ../libpurple/protocols/silc10/buddy.c:1582
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Méthodes de contact préférées"
 
 #: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1231
+#: ../libpurple/protocols/silc/ops.c:1245
 #: ../libpurple/protocols/silc10/buddy.c:1587
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Langue préférée"
 
 #: ../libpurple/protocols/silc/buddy.c:1587
-#: ../libpurple/protocols/silc/ops.c:1236
+#: ../libpurple/protocols/silc/ops.c:1250
 #: ../libpurple/protocols/silc10/buddy.c:1592
 #: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Appareil"
 
 #: ../libpurple/protocols/silc/buddy.c:1592
-#: ../libpurple/protocols/silc/ops.c:1241
+#: ../libpurple/protocols/silc/ops.c:1255
 #: ../libpurple/protocols/silc10/buddy.c:1597
 #: ../libpurple/protocols/silc10/ops.c:1234
 #: ../libpurple/protocols/silc10/silc.c:747
@@ -12333,7 +12311,7 @@
 msgstr "Fuseau horaire"
 
 #: ../libpurple/protocols/silc/buddy.c:1597
-#: ../libpurple/protocols/silc/ops.c:1246
+#: ../libpurple/protocols/silc/ops.c:1260
 #: ../libpurple/protocols/silc10/buddy.c:1602
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
@@ -12360,7 +12338,7 @@
 msgstr "Récupérer la clé publique..."
 
 #: ../libpurple/protocols/silc/buddy.c:1684
-#: ../libpurple/protocols/silc/ops.c:1614
+#: ../libpurple/protocols/silc/ops.c:1628
 #: ../libpurple/protocols/silc10/buddy.c:1687
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
@@ -12514,7 +12492,7 @@
 msgstr "Nom du groupe"
 
 #: ../libpurple/protocols/silc/chat.c:607
-#: ../libpurple/protocols/silc/ops.c:1819
+#: ../libpurple/protocols/silc/ops.c:1833
 #: ../libpurple/protocols/silc/silc.c:1260
 #: ../libpurple/protocols/silc10/chat.c:585
 #: ../libpurple/protocols/silc10/ops.c:1907
@@ -12721,8 +12699,8 @@
 msgstr "Une erreur s'est produite"
 
 # c-format
-#: ../libpurple/protocols/silc/ops.c:550 ../libpurple/protocols/silc/ops.c:559
-#: ../libpurple/protocols/silc/ops.c:568
+#: ../libpurple/protocols/silc/ops.c:564 ../libpurple/protocols/silc/ops.c:573
+#: ../libpurple/protocols/silc/ops.c:582
 #: ../libpurple/protocols/silc10/ops.c:554
 #: ../libpurple/protocols/silc10/ops.c:563
 #: ../libpurple/protocols/silc10/ops.c:572
@@ -12730,38 +12708,38 @@
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s a changé le sujet de <I>%s</I> en : %s"
 
-#: ../libpurple/protocols/silc/ops.c:634
+#: ../libpurple/protocols/silc/ops.c:648
 #: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> change le mode de <I>%s</I> en : %s"
 
-#: ../libpurple/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:652
 #: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> a supprimé tous les modes de <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:671
+#: ../libpurple/protocols/silc/ops.c:685
 #: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> change le mode de <I>%s</I> en : %s"
 
-#: ../libpurple/protocols/silc/ops.c:679
+#: ../libpurple/protocols/silc/ops.c:693
 #: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> a supprimé tous les modes de <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:708
+#: ../libpurple/protocols/silc/ops.c:722
 #: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Vous avez été expulsé de <I>%s</I> par <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:735 ../libpurple/protocols/silc/ops.c:740
-#: ../libpurple/protocols/silc/ops.c:745
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:759
 #: ../libpurple/protocols/silc10/ops.c:742
 #: ../libpurple/protocols/silc10/ops.c:747
 #: ../libpurple/protocols/silc10/ops.c:752
@@ -12769,8 +12747,8 @@
 msgid "You have been killed by %s (%s)"
 msgstr "Vous avez été tué par %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:766 ../libpurple/protocols/silc/ops.c:771
-#: ../libpurple/protocols/silc/ops.c:776
+#: ../libpurple/protocols/silc/ops.c:780 ../libpurple/protocols/silc/ops.c:785
+#: ../libpurple/protocols/silc/ops.c:790
 #: ../libpurple/protocols/silc10/ops.c:773
 #: ../libpurple/protocols/silc10/ops.c:778
 #: ../libpurple/protocols/silc10/ops.c:783
@@ -12778,157 +12756,157 @@
 msgid "Killed by %s (%s)"
 msgstr "Tué par %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:813
+#: ../libpurple/protocols/silc/ops.c:827
 #: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Déconnexion du serveur"
 
-#: ../libpurple/protocols/silc/ops.c:986
+#: ../libpurple/protocols/silc/ops.c:1000
 #: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Informations personnelles"
 
-#: ../libpurple/protocols/silc/ops.c:1009
+#: ../libpurple/protocols/silc/ops.c:1023
 #: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Date de naissance"
 
-#: ../libpurple/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:1031
 #: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Rôle"
 
-#: ../libpurple/protocols/silc/ops.c:1021
+#: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:1253
 #: ../libpurple/protocols/silc10/ops.c:1052
 #: ../libpurple/protocols/silc10/silc.c:949
 msgid "Organization"
 msgstr "Organisation"
 
-#: ../libpurple/protocols/silc/ops.c:1025
+#: ../libpurple/protocols/silc/ops.c:1039
 #: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Groupe"
 
-#: ../libpurple/protocols/silc/ops.c:1049
+#: ../libpurple/protocols/silc/ops.c:1063
 #: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Commentaire"
 
-#: ../libpurple/protocols/silc/ops.c:1095
+#: ../libpurple/protocols/silc/ops.c:1109
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Rejoindre une discussion"
 
-#: ../libpurple/protocols/silc/ops.c:1129
+#: ../libpurple/protocols/silc/ops.c:1143
 #: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Vous avez fondé le salon sur <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1133
+#: ../libpurple/protocols/silc/ops.c:1147
 #: ../libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "<I>%2$s</I> a fondé le salon sur <I>%1$s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1192
-#: ../libpurple/protocols/silc/ops.c:1330
+#: ../libpurple/protocols/silc/ops.c:1206
+#: ../libpurple/protocols/silc/ops.c:1344
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1070
 msgid "Real Name"
 msgstr "Nom réel"
 
-#: ../libpurple/protocols/silc/ops.c:1220
+#: ../libpurple/protocols/silc/ops.c:1234
 #: ../libpurple/protocols/silc10/ops.c:1213 ../pidgin/gtkblist-theme.c:467
 msgid "Status Text"
 msgstr "Texte d'état"
 
-#: ../libpurple/protocols/silc/ops.c:1282
-#: ../libpurple/protocols/silc/ops.c:1356
+#: ../libpurple/protocols/silc/ops.c:1296
+#: ../libpurple/protocols/silc/ops.c:1370
 #: ../libpurple/protocols/silc10/ops.c:1285
 #: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Empreinte de clé publique"
 
-#: ../libpurple/protocols/silc/ops.c:1283
-#: ../libpurple/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1297
+#: ../libpurple/protocols/silc/ops.c:1371
 #: ../libpurple/protocols/silc10/ops.c:1286
 #: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Babillage de clé publique"
 
-#: ../libpurple/protocols/silc/ops.c:1296
+#: ../libpurple/protocols/silc/ops.c:1310
 #: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Plus..."
 
-#: ../libpurple/protocols/silc/ops.c:1375
+#: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc/silc.c:1317
 #: ../libpurple/protocols/silc10/ops.c:1371
 #: ../libpurple/protocols/silc10/silc.c:1013
 msgid "Detach From Server"
 msgstr "Se détacher du serveur"
 
-#: ../libpurple/protocols/silc/ops.c:1375
+#: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Impossible de se détacher"
 
-#: ../libpurple/protocols/silc/ops.c:1395
+#: ../libpurple/protocols/silc/ops.c:1409
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Impossible de changer le sujet"
 
-#: ../libpurple/protocols/silc/ops.c:1424
+#: ../libpurple/protocols/silc/ops.c:1438
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Impossible de changer de pseudo"
 
-#: ../libpurple/protocols/silc/ops.c:1473
+#: ../libpurple/protocols/silc/ops.c:1487
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Liste des salons"
 
-#: ../libpurple/protocols/silc/ops.c:1473
+#: ../libpurple/protocols/silc/ops.c:1487
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Impossible de récupérer la liste des salons"
 
-#: ../libpurple/protocols/silc/ops.c:1474
+#: ../libpurple/protocols/silc/ops.c:1488
 msgid "Network is empty"
 msgstr "Le réseau est vide"
 
-#: ../libpurple/protocols/silc/ops.c:1518
+#: ../libpurple/protocols/silc/ops.c:1532
 #: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Aucune clé publique reçue"
 
-#: ../libpurple/protocols/silc/ops.c:1530
-#: ../libpurple/protocols/silc/ops.c:1543
+#: ../libpurple/protocols/silc/ops.c:1544
+#: ../libpurple/protocols/silc/ops.c:1557
 #: ../libpurple/protocols/silc10/ops.c:1519
 #: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Informations du serveur"
 
-#: ../libpurple/protocols/silc/ops.c:1531
+#: ../libpurple/protocols/silc/ops.c:1545
 #: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Impossible de récupérer les informations du serveur"
 
-#: ../libpurple/protocols/silc/ops.c:1554
+#: ../libpurple/protocols/silc/ops.c:1568
 #: ../libpurple/protocols/silc10/ops.c:1549
 #: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Statistiques du serveur"
 
-#: ../libpurple/protocols/silc/ops.c:1555
+#: ../libpurple/protocols/silc/ops.c:1569
 #: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Impossible de récupérer les statistiques du serveur"
 
-#: ../libpurple/protocols/silc/ops.c:1562
+#: ../libpurple/protocols/silc/ops.c:1576
 #: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
@@ -12964,43 +12942,43 @@
 "Nombre total d'opérateurs de serveurs: %d\n"
 "Nombre total d'opérateurs de routeurs: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1594
+#: ../libpurple/protocols/silc/ops.c:1608
 #: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Statistiques du réseau"
 
-#: ../libpurple/protocols/silc/ops.c:1602
-#: ../libpurple/protocols/silc/ops.c:1607
+#: ../libpurple/protocols/silc/ops.c:1616
+#: ../libpurple/protocols/silc/ops.c:1621
 #: ../libpurple/protocols/silc10/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/silc/ops.c:1602
+#: ../libpurple/protocols/silc/ops.c:1616
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Échec du ping"
 
-#: ../libpurple/protocols/silc/ops.c:1607
+#: ../libpurple/protocols/silc/ops.c:1621
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Réponse du ping par le serveur"
 
-#: ../libpurple/protocols/silc/ops.c:1615
+#: ../libpurple/protocols/silc/ops.c:1629
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Impossible de tuer l'utilisateur"
 
-#: ../libpurple/protocols/silc/ops.c:1654
+#: ../libpurple/protocols/silc/ops.c:1668
 msgid "WATCH"
 msgstr "VOIR"
 
-#: ../libpurple/protocols/silc/ops.c:1654
+#: ../libpurple/protocols/silc/ops.c:1668
 msgid "Cannot watch user"
 msgstr "Impossible de voir l'utilisateur"
 
-#: ../libpurple/protocols/silc/ops.c:1730
-#: ../libpurple/protocols/silc/ops.c:1781
+#: ../libpurple/protocols/silc/ops.c:1744
+#: ../libpurple/protocols/silc/ops.c:1795
 #: ../libpurple/protocols/silc/silc.c:396
 #: ../libpurple/protocols/silc10/ops.c:1817
 #: ../libpurple/protocols/silc10/ops.c:1864
@@ -13008,17 +12986,17 @@
 msgid "Resuming session"
 msgstr "Reprise de la session"
 
-#: ../libpurple/protocols/silc/ops.c:1732
+#: ../libpurple/protocols/silc/ops.c:1746
 #: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr "Authentification de la connexion"
 
-#: ../libpurple/protocols/silc/ops.c:1783
+#: ../libpurple/protocols/silc/ops.c:1797
 #: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "Vérification de la clé publique du serveur"
 
-#: ../libpurple/protocols/silc/ops.c:1820
+#: ../libpurple/protocols/silc/ops.c:1834
 #: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr "Phrase clé nécessaire"
@@ -14931,19 +14909,19 @@
 "l'ancien fichier a été renommé « %s~ »."
 
 #: ../pidgin.desktop.in.h:1
-msgid ""
-"Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
-msgstr ""
-"Conversation par messages instantanés. Supporte AIM, Google Talk, "
-"Jabber/XMPP, MSN, Yahoo et d'autres"
+msgid "Pidgin Internet Messenger"
+msgstr "Messagerie instantanée Pidgin"
 
 #: ../pidgin.desktop.in.h:2
 msgid "Internet Messenger"
 msgstr "Messagerie internet"
 
 #: ../pidgin.desktop.in.h:3
-msgid "Pidgin Internet Messenger"
-msgstr "Messagerie instantanée Pidgin"
+msgid ""
+"Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
+msgstr ""
+"Conversation par messages instantanés. Supporte AIM, Google Talk, "
+"Jabber/XMPP, MSN, Yahoo et d'autres"
 
 #. Build the login options frame.
 #: ../pidgin/gtkaccount.c:448
@@ -17742,10 +17720,18 @@
 msgid "Incoming Call"
 msgstr "Appel entrant"
 
+#: ../pidgin/gtkmedia.c:792
+msgid "_Hold"
+msgstr ""
+
 #: ../pidgin/gtkmedia.c:863 ../pidgin/pidginstock.c:92
 msgid "_Pause"
 msgstr "_Pause"
 
+#: ../pidgin/gtkmedia.c:881
+msgid "_Mute"
+msgstr ""
+
 #: ../pidgin/gtknotify.c:752
 #, c-format
 msgid "%s has %d new message."
@@ -18025,7 +18011,7 @@
 msgstr "(Personnalisé)"
 
 #: ../pidgin/gtkprefs.c:423 ../pidgin/gtkprefs.c:543 ../pidgin/gtkprefs.c:551
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
 msgid "Penguin Pimps"
 msgstr "Penguin Pimps"
 
@@ -19050,14 +19036,14 @@
 msgid "Pidgin smileys"
 msgstr "Frimousses de Pidgin"
 
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+msgid "none"
+msgstr "aucun"
+
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
 msgstr "Ce choix désactive les frimousses graphiques."
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
-msgid "none"
-msgstr "aucun"
-
 #: ../pidgin/pixmaps/emotes/small/16/small.theme.in.h:1
 msgid "Small"
 msgstr "Petits"
@@ -20549,23 +20535,11 @@
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:2
-msgid ""
-"$(^Name) is released under the GNU General Public License (GPL). The license "
-"is provided here for information purposes only. $_CLICK"
-msgstr ""
-"$(^Name) est disponible sous licence GNU General Public License (GPL). Le "
-"texte de licence suivant est fourni uniquement à titre informatif. $_CLICK"
-
-#. Installer Subsection Detailed Description
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:4
-msgid "A multi-platform GUI toolkit, used by Pidgin"
-msgstr ""
-"Un ensemble d'outils pour interfaces graphiques multi-plateforme, utilisé "
-"par Pidgin"
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:1
+msgid "The installer is already running."
+msgstr "Le programme d'installation est déjà en cours d'exécution."
 
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:5
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:2
 msgid ""
 "An instance of Pidgin is currently running.  Please exit Pidgin and try "
 "again."
@@ -20573,88 +20547,96 @@
 "Une instance de Pidgin est en cours d'exécution. Veuillez quitter Pidgin et "
 "réessayer."
 
-#. Installer Subsection Detailed Description
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:7
-msgid "Core Pidgin files and dlls"
-msgstr "Fichiers et DLLs de base de Pidgin"
+#. "Next >" appears on a button on the License Page of the Installer
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:4
+msgid "Next >"
+msgstr "Suivant >"
 
-#. Installer Subsection Detailed Description
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:9
-msgid "Create a Start Menu entry for Pidgin"
-msgstr "Créer un raccourci pour Pidgin dans le menu Démarrer"
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:6
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) est disponible sous licence GNU General Public License (GPL). Le "
+"texte de licence suivant est fourni uniquement à titre informatif. $_CLICK"
 
-#. Installer Subsection Detailed Description
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:11
-msgid "Create a shortcut to Pidgin on the Desktop"
-msgstr "Créer un raccourci pour Pidgin sur le bureau"
+#. Installer Subsection Text
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:8
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin client de messagerie instantanée (obligatoire)"
 
 #. Installer Subsection Text
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:13
-msgid "Debug Symbols (for reporting crashes)"
-msgstr "Symboles de debug (pour soumettre des plantages)"
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:10
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Bibliothèques GTK+ (obligatoires si pas déjà installées)"
 
 #. Installer Subsection Text
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:15
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:12
+msgid "Shortcuts"
+msgstr "Raccourcis"
+
+#. Installer Subsection Text
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:14
 msgid "Desktop"
 msgstr "Bureau"
 
-#. $R2 will display the URL that the GTK+ Runtime failed to download from
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:17
-msgid ""
-"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
-"function; if retrying fails, you may need to use the 'Offline Installer' "
-"from http://pidgin.im/download/windows/ ."
-msgstr ""
-"Erreur au téléchargement des bibliothèques GTK+ ($R2).$\\rCeci est "
-"nécessaire au bon fonctionnement de Pidgin. Si une nouvelle tentative "
-"échoue, vous devrez peut-être utiliser l'installateur « Offline » disponible "
-"sur http://pidgin.im/download/windows/ ."
+#. Installer Subsection Text
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:16
+msgid "Start Menu"
+msgstr "Menu Démarrer"
 
-#. $R2 will display the URL that the Debug Symbols failed to download from
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:19
-msgid ""
-"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
-"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
-msgstr ""
-"Erreur lors de l'installation des symboles de debug GTK+ ($R2).$\\rSi une "
-"nouvelle tentative échoue, vous devrez peut-être utiliser l'installateur « "
-"Offline » disponible sur http://pidgin.im/download/windows/ ."
+#. Installer Subsection Text
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:18
+msgid "Localizations"
+msgstr "Traductions"
 
-#. $R3 will display the URL that the Dictionary failed to download from
+#. Installer Subsection Detailed Description
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:20
+msgid "Core Pidgin files and dlls"
+msgstr "Fichiers et DLLs de base de Pidgin"
+
+#. Installer Subsection Detailed Description
 #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:22
-#, no-c-format
-msgid ""
-"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
-"installation instructions are at: "
-"http://developer.pidgin.im/wiki/Installing%20Pidgin#manual_win32_spellcheck_i"
-"nstallation"
-msgstr ""
-"Erreur lors de l'installation du correcteur orthographique ($R3).$\\rSi une "
-"nouvelle tentative échoue, veuillez suivre les instructions sur "
-"http://developer.pidgin.im/wiki/Installing%20Pidgin#manual_win32_spellcheck_i"
-"nstallation"
+msgid "Shortcuts for starting Pidgin"
+msgstr "Raccourcis pour lancer Pidgin"
 
-#. Installer Subsection Text
+#. Installer Subsection Detailed Description
 #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:24
-msgid "GTK+ Runtime (required if not present)"
-msgstr "Bibliothèques GTK+ (obligatoires si pas déjà installées)"
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Créer un raccourci pour Pidgin sur le bureau"
 
-#. Installer Subsection Text
+#. Installer Subsection Detailed Description
 #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:26
-msgid "Localizations"
-msgstr "Traductions"
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Créer un raccourci pour Pidgin dans le menu Démarrer"
 
-#. "Next >" appears on a button on the License Page of the Installer
+#. Installer Subsection Detailed Description
 #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:28
-msgid "Next >"
-msgstr "Suivant >"
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+"Un ensemble d'outils pour interfaces graphiques multi-plateforme, utilisé "
+"par Pidgin"
 
 #. Installer Subsection Text
 #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:30
-msgid "Pidgin Instant Messaging Client (required)"
-msgstr "Pidgin client de messagerie instantanée (obligatoire)"
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Symboles de debug (pour soumettre des plantages)"
 
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:31
+#. Text displayed on Installer Finish Page
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:32
+msgid "Visit the Pidgin Web Page"
+msgstr "Visitez la page web de Pidgin"
+
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:33
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"Impossible de désinstaller la version de Pidgin en place. La nouvelle "
+"version sera installée sans supprimer la version en place."
+
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:34
 msgid ""
 "Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
 "already present).$\\rAre you sure you want to skip installing the GTK+ "
@@ -20665,38 +20647,60 @@
 "installer ces bibliothèques ?"
 
 #. Installer Subsection Text
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:33
-msgid "Shortcuts"
-msgstr "Raccourcis"
-
-#. Installer Subsection Detailed Description
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:35
-msgid "Shortcuts for starting Pidgin"
-msgstr "Raccourcis pour lancer Pidgin"
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:36
+msgid "URI Handlers"
+msgstr "Gestion des liens (URI)"
 
 #. Installer Subsection Text
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:37
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:38
 msgid "Spellchecking Support"
 msgstr "Correction orthographique"
 
-#. Installer Subsection Text
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:39
-msgid "Start Menu"
-msgstr "Menu Démarrer"
+#. $R3 will display the URL that the Dictionary failed to download from
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:41
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: "
+"http://developer.pidgin.im/wiki/Installing%20Pidgin#manual_win32_spellcheck_i"
+"nstallation"
+msgstr ""
+"Erreur lors de l'installation du correcteur orthographique ($R3).$\\rSi une "
+"nouvelle tentative échoue, veuillez suivre les instructions sur "
+"http://developer.pidgin.im/wiki/Installing%20Pidgin#manual_win32_spellcheck_i"
+"nstallation"
 
 #. Installer Subsection Detailed Description
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:41
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:43
 msgid ""
 "Support for Spellchecking.  (Internet connection required for installation)"
 msgstr ""
 "Correction orthogaphique. (Une connexion internet est nécessaire pour son "
 "installation)"
 
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:42
-msgid "The installer is already running."
-msgstr "Le programme d'installation est déjà en cours d'exécution."
+#. $R2 will display the URL that the Debug Symbols failed to download from
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:45
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Erreur lors de l'installation des symboles de debug GTK+ ($R2).$\\rSi une "
+"nouvelle tentative échoue, vous devrez peut-être utiliser l'installateur « "
+"Offline » disponible sur http://pidgin.im/download/windows/ ."
 
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:43
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:47
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Erreur au téléchargement des bibliothèques GTK+ ($R2).$\\rCeci est "
+"nécessaire au bon fonctionnement de Pidgin. Si une nouvelle tentative "
+"échoue, vous devrez peut-être utiliser l'installateur « Offline » disponible "
+"sur http://pidgin.im/download/windows/ ."
+
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:48
 msgid ""
 "The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
 "that another user installed this application."
@@ -20705,24 +20709,6 @@
 "la base de registres.$\\rL'application a peut-être été installée par un "
 "utilisateur différent."
 
-#. Installer Subsection Text
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:45
-msgid "URI Handlers"
-msgstr "Gestion des liens (URI)"
-
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:46
-msgid ""
-"Unable to uninstall the currently installed version of Pidgin. The new "
-"version will be installed without removing the currently installed version."
-msgstr ""
-"Impossible de désinstaller la version de Pidgin en place. La nouvelle "
-"version sera installée sans supprimer la version en place."
-
-#. Text displayed on Installer Finish Page
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:48
-msgid "Visit the Pidgin Web Page"
-msgstr "Visitez la page web de Pidgin"
-
 #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:49
 msgid "You do not have permission to uninstall this application."
 msgstr "Vous n'avez pas les permissions pour supprimer cette application."
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/po4a.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/po4a.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/po4a.po	2012-01-02 17:27:15.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/po4a.po	2012-02-23 06:31:39.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:49+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:49+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: ../../lib/Locale/Po4a/Chooser.pm:26
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/polkit-1.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/polkit-1.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/polkit-1.po	2012-01-02 17:27:31.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/polkit-1.po	2012-02-23 06:31:55.000000000 +0000
@@ -7,21 +7,19 @@
 msgstr ""
 "Project-Id-Version: policykit-1\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-11-30 04:34+0000\n"
+"POT-Creation-Date: 2012-01-06 12:53+0000\n"
 "PO-Revision-Date: 2011-10-04 18:38+0000\n"
 "Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 18:31+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:17+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../actions/org.freedesktop.policykit.policy.in.h:1
-msgid "Authentication is required to configure lock down policy"
-msgstr ""
-"Il est nécessaire de s'authentifier pour configurer la politique de "
-"verrouillage"
+msgid "Run programs as another user"
+msgstr "Lancer des programmes sous l'identité d'autres utilisateurs"
 
 #: ../actions/org.freedesktop.policykit.policy.in.h:2
 msgid "Authentication is required to run a program as another user"
@@ -34,10 +32,16 @@
 msgstr "Configurer le verrouillage d'une action"
 
 #: ../actions/org.freedesktop.policykit.policy.in.h:4
-msgid "Run programs as another user"
-msgstr "Lancer des programmes sous l'identité d'autres utilisateurs"
+msgid "Authentication is required to configure lock down policy"
+msgstr ""
+"Il est nécessaire de s'authentifier pour configurer la politique de "
+"verrouillage"
 
 #: ../src/examples/org.freedesktop.policykit.examples.pkexec.policy.in.h:1
+msgid "Run the PolicyKit example program Frobnicate"
+msgstr "Lancer le programme d'exemple de PolicyKit Frobnicate"
+
+#: ../src/examples/org.freedesktop.policykit.examples.pkexec.policy.in.h:2
 msgid ""
 "Authentication is required to run the PolicyKit example program Frobnicate "
 "(user=$(user), program=$(program), command_line=$(command_line))"
@@ -46,10 +50,6 @@
 "PolicyKit Frobnicate (utilisateur=$(user), programme=$(program), "
 "ligne_de_commande=$(command_line))"
 
-#: ../src/examples/org.freedesktop.policykit.examples.pkexec.policy.in.h:2
-msgid "Run the PolicyKit example program Frobnicate"
-msgstr "Lancer le programme d'exemple de PolicyKit Frobnicate"
-
 #. Translators: message shown when trying to run a program as root. Do not
 #. * translate the $(program) fragment - it will be expanded to the path
 #. * of the program e.g.  /bin/bash.
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/popt.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/popt.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/popt.po	2012-01-02 17:26:53.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/popt.po	2012-02-23 06:31:20.000000000 +0000
@@ -18,8 +18,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:54+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:44+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: popt.c:47
 msgid "unknown errno"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/powertop.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/powertop.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/powertop.po	2012-01-02 17:27:25.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/powertop.po	2012-02-23 06:31:48.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:49+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:49+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "X-Poedit-Country: FRANCE\n"
 "X-Poedit-Language: French\n"
 
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/pppconfig.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/pppconfig.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/pppconfig.po	2012-01-02 17:26:56.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/pppconfig.po	2012-02-23 06:31:22.000000000 +0000
@@ -17,8 +17,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:06+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:53+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: \n"
 
 #. Arbitrary upper limits on option and chat files.
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/pppoeconf.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/pppoeconf.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/pppoeconf.po	2012-01-02 17:26:56.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/pppoeconf.po	2012-02-23 06:31:22.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:06+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:54+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: ../pppoeconf:46
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/psmisc.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/psmisc.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/psmisc.po	2012-01-02 17:26:56.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/psmisc.po	2012-02-23 06:31:22.000000000 +0000
@@ -17,8 +17,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:07+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:54+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: src/fuser.c:118
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/pulseaudio.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/pulseaudio.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/pulseaudio.po	2012-01-02 17:27:22.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/pulseaudio.po	2012-02-23 06:31:46.000000000 +0000
@@ -12,17 +12,17 @@
 msgstr ""
 "Project-Id-Version: pulseaudio trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 23:49+0000\n"
-"PO-Revision-Date: 2011-12-15 01:26+0000\n"
+"POT-Creation-Date: 2012-02-18 20:17+0000\n"
+"PO-Revision-Date: 2012-02-18 23:27+0000\n"
 "Last-Translator: Thomas Canniot <Unknown>\n"
 "Language-Team: French <fedora-trans-fr@redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:21+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:21+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
-#: ../src/modules/alsa/alsa-util.c:885 ../src/pulsecore/sink.c:3211
+#: ../src/modules/alsa/alsa-util.c:885 ../src/pulsecore/sink.c:3215
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -106,11 +106,11 @@
 msgid "Null Output"
 msgstr "Sortie vide"
 
-#: ../src/pulsecore/sink.c:3195
-msgid "Internal Audio"
-msgstr "Audio interne"
+#: ../src/pulsecore/sink.c:3199
+msgid "Built-in Audio"
+msgstr ""
 
-#: ../src/pulsecore/sink.c:3200
+#: ../src/pulsecore/sink.c:3204
 msgid "Modem"
 msgstr "Modem"
 
@@ -1291,7 +1291,7 @@
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "Échec de pa_stream_connect_record() : %s"
 
-#: ../src/utils/pacat.c:512 ../src/utils/pactl.c:1241
+#: ../src/utils/pacat.c:512 ../src/utils/pactl.c:1271
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Échec lors de la connexion : %s"
@@ -1400,7 +1400,7 @@
 "Compilé avec libpulse %s\n"
 "Lié avec libpulse %s\n"
 
-#: ../src/utils/pacat.c:817 ../src/utils/pactl.c:1387
+#: ../src/utils/pacat.c:817 ../src/utils/pactl.c:1417
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Nom du client invalide « %s »"
@@ -1470,7 +1470,7 @@
 "Avertissement : les spécifications de l'échantillon spécifié seront écrasées "
 "par celles du fichier."
 
-#: ../src/utils/pacat.c:1037 ../src/utils/pactl.c:1454
+#: ../src/utils/pacat.c:1037 ../src/utils/pactl.c:1484
 msgid "Failed to determine sample specification from file."
 msgstr ""
 "Échec lors de l'obtention des informations de l'échantillon du fichier."
@@ -1507,7 +1507,7 @@
 msgid "playback"
 msgstr "lecture"
 
-#: ../src/utils/pacat.c:1110 ../src/utils/pactl.c:1764
+#: ../src/utils/pacat.c:1110 ../src/utils/pactl.c:1794
 msgid "pa_mainloop_new() failed."
 msgstr "Échec de pa_mainloop_new()."
 
@@ -1515,11 +1515,11 @@
 msgid "io_new() failed."
 msgstr "Échec de io_new()."
 
-#: ../src/utils/pacat.c:1136 ../src/utils/pactl.c:1776
+#: ../src/utils/pacat.c:1136 ../src/utils/pactl.c:1806
 msgid "pa_context_new() failed."
 msgstr "Échec de pa_context_new()."
 
-#: ../src/utils/pacat.c:1144 ../src/utils/pactl.c:1782
+#: ../src/utils/pacat.c:1144 ../src/utils/pactl.c:1812
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "Échec de pa_context_connect() : %s"
@@ -1528,7 +1528,7 @@
 msgid "pa_context_rttime_new() failed."
 msgstr "Échec de pa_context_rttime_new()."
 
-#: ../src/utils/pacat.c:1157 ../src/utils/pactl.c:1787
+#: ../src/utils/pacat.c:1157 ../src/utils/pactl.c:1817
 msgid "pa_mainloop_run() failed."
 msgstr "Échec de pa_mainloop_run()."
 
@@ -1671,12 +1671,12 @@
 "Cookie: %04x:%04x\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:235 ../src/utils/pactl.c:819
+#: ../src/utils/pactl.c:244 ../src/utils/pactl.c:849
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Échec lors de l'obtention des informations sur la destination : %s"
 
-#: ../src/utils/pactl.c:261
+#: ../src/utils/pactl.c:270
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -1698,27 +1698,27 @@
 "\t\t%s\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:309 ../src/utils/pactl.c:420
+#: ../src/utils/pactl.c:318 ../src/utils/pactl.c:430 ../src/utils/pactl.c:588
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPorts :\n"
 
-#: ../src/utils/pactl.c:315 ../src/utils/pactl.c:426
+#: ../src/utils/pactl.c:325 ../src/utils/pactl.c:437
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tPort actif : %s\n"
 
-#: ../src/utils/pactl.c:321 ../src/utils/pactl.c:432
+#: ../src/utils/pactl.c:331 ../src/utils/pactl.c:443
 #, c-format
 msgid "\tFormats:\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:347 ../src/utils/pactl.c:838
+#: ../src/utils/pactl.c:357 ../src/utils/pactl.c:868
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Échec lors de l'obtention des informations sur la source : %s"
 
-#: ../src/utils/pactl.c:373
+#: ../src/utils/pactl.c:383
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -1757,20 +1757,20 @@
 "\tPropriétés :\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:405 ../src/utils/pactl.c:474 ../src/utils/pactl.c:517
-#: ../src/utils/pactl.c:559 ../src/utils/pactl.c:629 ../src/utils/pactl.c:630
-#: ../src/utils/pactl.c:641 ../src/utils/pactl.c:700 ../src/utils/pactl.c:701
-#: ../src/utils/pactl.c:712 ../src/utils/pactl.c:764 ../src/utils/pactl.c:765
-#: ../src/utils/pactl.c:772
+#: ../src/utils/pactl.c:415 ../src/utils/pactl.c:485 ../src/utils/pactl.c:528
+#: ../src/utils/pactl.c:570 ../src/utils/pactl.c:659 ../src/utils/pactl.c:660
+#: ../src/utils/pactl.c:671 ../src/utils/pactl.c:730 ../src/utils/pactl.c:731
+#: ../src/utils/pactl.c:742 ../src/utils/pactl.c:794 ../src/utils/pactl.c:795
+#: ../src/utils/pactl.c:802
 msgid "n/a"
 msgstr "n/d"
 
-#: ../src/utils/pactl.c:443
+#: ../src/utils/pactl.c:454
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Échec lors de l'obtention des informations du module : %s"
 
-#: ../src/utils/pactl.c:466
+#: ../src/utils/pactl.c:477
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -1787,12 +1787,12 @@
 "\tPropriétés : \n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:485
+#: ../src/utils/pactl.c:496
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Échec lors de l'obtention des informations du client : %s"
 
-#: ../src/utils/pactl.c:511
+#: ../src/utils/pactl.c:522
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -1807,12 +1807,12 @@
 "\tPropriétés :\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:528
+#: ../src/utils/pactl.c:539
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Impossible d'obtenir des informations sur la carte : %s"
 
-#: ../src/utils/pactl.c:551
+#: ../src/utils/pactl.c:562
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -1829,23 +1829,33 @@
 "\tPropriétés :\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:565
+#: ../src/utils/pactl.c:576
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tProfils :\n"
 
-#: ../src/utils/pactl.c:571
+#: ../src/utils/pactl.c:582
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tProfil actif : %s\n"
 
-#: ../src/utils/pactl.c:582 ../src/utils/pactl.c:857
+#: ../src/utils/pactl.c:591
+#, c-format
+msgid "\t\t%s: %s (priority %u)\n"
+msgstr ""
+
+#: ../src/utils/pactl.c:593
+#, c-format
+msgid "\t\t\tPart of profile(s): %s"
+msgstr ""
+
+#: ../src/utils/pactl.c:612 ../src/utils/pactl.c:887
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr ""
 "Échec lors de l'obtention des informations de l'entrée de la destination : %s"
 
-#: ../src/utils/pactl.c:611
+#: ../src/utils/pactl.c:641
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -1867,13 +1877,13 @@
 "\t\t%s\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:652 ../src/utils/pactl.c:876
+#: ../src/utils/pactl.c:682 ../src/utils/pactl.c:906
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr ""
 "Échec lors de l'obtention des informations de la sortie de la source : %s"
 
-#: ../src/utils/pactl.c:682
+#: ../src/utils/pactl.c:712
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -1895,7 +1905,7 @@
 "\t\t%s\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:723
+#: ../src/utils/pactl.c:753
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Échec lors de l'obtention des informations de l'échantillon : %s"
@@ -1903,7 +1913,7 @@
 # Lazy ?
 # load-sample-lazy = Create a new entry in the sample cache, but don't load
 # the sample immediately. The sample is loaded only when it is first used
-#: ../src/utils/pactl.c:750
+#: ../src/utils/pactl.c:780
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -1934,160 +1944,160 @@
 "\tPropriétés :\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:780 ../src/utils/pactl.c:790
+#: ../src/utils/pactl.c:810 ../src/utils/pactl.c:820
 #, c-format
 msgid "Failure: %s"
 msgstr "Échec : %s"
 
-#: ../src/utils/pactl.c:904
+#: ../src/utils/pactl.c:934
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr ""
 
-#: ../src/utils/pactl.c:943
+#: ../src/utils/pactl.c:973
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Échec lors de l'envoi de l'échantillon : %s"
 
-#: ../src/utils/pactl.c:960
+#: ../src/utils/pactl.c:990
 msgid "Premature end of file"
 msgstr "Fin prématurée du fichier"
 
-#: ../src/utils/pactl.c:980
+#: ../src/utils/pactl.c:1010
 msgid "new"
 msgstr ""
 
-#: ../src/utils/pactl.c:983
+#: ../src/utils/pactl.c:1013
 msgid "change"
 msgstr ""
 
-#: ../src/utils/pactl.c:986
+#: ../src/utils/pactl.c:1016
 msgid "remove"
 msgstr ""
 
-#: ../src/utils/pactl.c:989 ../src/utils/pactl.c:1024
+#: ../src/utils/pactl.c:1019 ../src/utils/pactl.c:1054
 msgid "unknown"
 msgstr ""
 
-#: ../src/utils/pactl.c:997
+#: ../src/utils/pactl.c:1027
 msgid "sink"
 msgstr "destination"
 
-#: ../src/utils/pactl.c:1000
+#: ../src/utils/pactl.c:1030
 msgid "source"
 msgstr "source"
 
-#: ../src/utils/pactl.c:1003
+#: ../src/utils/pactl.c:1033
 msgid "sink-input"
 msgstr ""
 
-#: ../src/utils/pactl.c:1006
+#: ../src/utils/pactl.c:1036
 msgid "source-output"
 msgstr ""
 
-#: ../src/utils/pactl.c:1009
+#: ../src/utils/pactl.c:1039
 msgid "module"
 msgstr ""
 
-#: ../src/utils/pactl.c:1012
+#: ../src/utils/pactl.c:1042
 msgid "client"
 msgstr ""
 
-#: ../src/utils/pactl.c:1015
+#: ../src/utils/pactl.c:1045
 msgid "sample-cache"
 msgstr ""
 
-#: ../src/utils/pactl.c:1018 ../src/utils/pactl.c:1021
+#: ../src/utils/pactl.c:1048 ../src/utils/pactl.c:1051
 msgid "server"
 msgstr ""
 
-#: ../src/utils/pactl.c:1030
+#: ../src/utils/pactl.c:1060
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:1247
+#: ../src/utils/pactl.c:1277
 msgid "Got SIGINT, exiting."
 msgstr "SIGINT reçu, fermeture."
 
-#: ../src/utils/pactl.c:1274
+#: ../src/utils/pactl.c:1304
 msgid "Invalid volume specification"
 msgstr "Spécification de volume invalide"
 
-#: ../src/utils/pactl.c:1297
+#: ../src/utils/pactl.c:1327
 msgid "Volume outside permissible range.\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:1308 ../src/utils/pactl.c:1309
-#: ../src/utils/pactl.c:1310 ../src/utils/pactl.c:1311
-#: ../src/utils/pactl.c:1312 ../src/utils/pactl.c:1313
-#: ../src/utils/pactl.c:1314 ../src/utils/pactl.c:1315
-#: ../src/utils/pactl.c:1316 ../src/utils/pactl.c:1317
-#: ../src/utils/pactl.c:1318 ../src/utils/pactl.c:1319
-#: ../src/utils/pactl.c:1320 ../src/utils/pactl.c:1321
-#: ../src/utils/pactl.c:1322 ../src/utils/pactl.c:1323
-#: ../src/utils/pactl.c:1324 ../src/utils/pactl.c:1325
-#: ../src/utils/pactl.c:1326
+#: ../src/utils/pactl.c:1338 ../src/utils/pactl.c:1339
+#: ../src/utils/pactl.c:1340 ../src/utils/pactl.c:1341
+#: ../src/utils/pactl.c:1342 ../src/utils/pactl.c:1343
+#: ../src/utils/pactl.c:1344 ../src/utils/pactl.c:1345
+#: ../src/utils/pactl.c:1346 ../src/utils/pactl.c:1347
+#: ../src/utils/pactl.c:1348 ../src/utils/pactl.c:1349
+#: ../src/utils/pactl.c:1350 ../src/utils/pactl.c:1351
+#: ../src/utils/pactl.c:1352 ../src/utils/pactl.c:1353
+#: ../src/utils/pactl.c:1354 ../src/utils/pactl.c:1355
+#: ../src/utils/pactl.c:1356
 msgid "[options]"
 msgstr ""
 
-#: ../src/utils/pactl.c:1310
+#: ../src/utils/pactl.c:1340
 msgid "[TYPE]"
 msgstr ""
 
-#: ../src/utils/pactl.c:1312
+#: ../src/utils/pactl.c:1342
 msgid "FILENAME [NAME]"
 msgstr ""
 
-#: ../src/utils/pactl.c:1313
+#: ../src/utils/pactl.c:1343
 msgid "NAME [SINK]"
 msgstr ""
 
-#: ../src/utils/pactl.c:1314
+#: ../src/utils/pactl.c:1344
 msgid "NAME"
 msgstr ""
 
-#: ../src/utils/pactl.c:1315
+#: ../src/utils/pactl.c:1345
 msgid "NAME [ARGS ...]"
 msgstr ""
 
-#: ../src/utils/pactl.c:1316
+#: ../src/utils/pactl.c:1346
 msgid "#N"
 msgstr ""
 
-#: ../src/utils/pactl.c:1317
+#: ../src/utils/pactl.c:1347
 msgid "#N SINK|SOURCE"
 msgstr ""
 
-#: ../src/utils/pactl.c:1318 ../src/utils/pactl.c:1323
+#: ../src/utils/pactl.c:1348 ../src/utils/pactl.c:1353
 msgid "NAME|#N 1|0"
 msgstr ""
 
-#: ../src/utils/pactl.c:1319
+#: ../src/utils/pactl.c:1349
 msgid "CARD PROFILE"
 msgstr ""
 
-#: ../src/utils/pactl.c:1320
+#: ../src/utils/pactl.c:1350
 msgid "NAME|#N PORT"
 msgstr ""
 
-#: ../src/utils/pactl.c:1321
+#: ../src/utils/pactl.c:1351
 msgid "NAME|#N VOLUME"
 msgstr ""
 
-#: ../src/utils/pactl.c:1322
+#: ../src/utils/pactl.c:1352
 msgid "#N VOLUME"
 msgstr ""
 
-#: ../src/utils/pactl.c:1324
+#: ../src/utils/pactl.c:1354
 msgid "#N 1|0"
 msgstr ""
 
-#: ../src/utils/pactl.c:1325
+#: ../src/utils/pactl.c:1355
 msgid "#N FORMATS"
 msgstr ""
 
-#: ../src/utils/pactl.c:1328
+#: ../src/utils/pactl.c:1358
 #, c-format
 msgid ""
 "\n"
@@ -2100,7 +2110,7 @@
 "server\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:1367
+#: ../src/utils/pactl.c:1397
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -2111,58 +2121,58 @@
 "Compilé avec libpulse %s\n"
 "Lié avec libpulse %s\n"
 
-#: ../src/utils/pactl.c:1426
+#: ../src/utils/pactl.c:1456
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
-#: ../src/utils/pactl.c:1436
+#: ../src/utils/pactl.c:1466
 msgid "Please specify a sample file to load"
 msgstr "Veuillez indiquer un fichier d'échantillon à charger"
 
-#: ../src/utils/pactl.c:1449
+#: ../src/utils/pactl.c:1479
 msgid "Failed to open sound file."
 msgstr "Échec lors de l'ouverture du fichier audio."
 
-#: ../src/utils/pactl.c:1461
+#: ../src/utils/pactl.c:1491
 msgid "Warning: Failed to determine sample specification from file."
 msgstr ""
 "Avertissement : Échec lors de l'obtention des spécifications de "
 "l'échantillon du fichier."
 
-#: ../src/utils/pactl.c:1471
+#: ../src/utils/pactl.c:1501
 msgid "You have to specify a sample name to play"
 msgstr "Vous devez indiquer un nom d'échantillon à lire"
 
-#: ../src/utils/pactl.c:1483
+#: ../src/utils/pactl.c:1513
 msgid "You have to specify a sample name to remove"
 msgstr "Vous devez indiquer un nom d'échantillon à supprimer"
 
-#: ../src/utils/pactl.c:1492
+#: ../src/utils/pactl.c:1522
 msgid "You have to specify a sink input index and a sink"
 msgstr ""
 "Vous devez indiquer un index d'entrée de destination et une destination"
 
-#: ../src/utils/pactl.c:1502
+#: ../src/utils/pactl.c:1532
 msgid "You have to specify a source output index and a source"
 msgstr "Vous devez indiquer un index de sortie de source et une source"
 
-#: ../src/utils/pactl.c:1517
+#: ../src/utils/pactl.c:1547
 msgid "You have to specify a module name and arguments."
 msgstr "Vous devez indiquer un nom de module et des paramètres."
 
-#: ../src/utils/pactl.c:1537
+#: ../src/utils/pactl.c:1567
 msgid "You have to specify a module index"
 msgstr "Vous devez indiquer un index de module"
 
-#: ../src/utils/pactl.c:1547
+#: ../src/utils/pactl.c:1577
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "Vous ne pouvez pas indiquer plus d'une destination. Vous devez indiquer une "
 "valeur booléenne."
 
-#: ../src/utils/pactl.c:1560
+#: ../src/utils/pactl.c:1590
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -2170,80 +2180,80 @@
 "Vous ne pouvez pas indiquer plus d'une source. Vous devez indiquer une "
 "valeur booléenne."
 
-#: ../src/utils/pactl.c:1572
+#: ../src/utils/pactl.c:1602
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Vous devez indiquer un nom/un index de carte et un nom de profil"
 
-#: ../src/utils/pactl.c:1583
+#: ../src/utils/pactl.c:1613
 msgid "You have to specify a sink name/index and a port name"
 msgstr "Vous devez indiquer un nom/un index de destination et un nom de port"
 
-#: ../src/utils/pactl.c:1594
+#: ../src/utils/pactl.c:1624
 msgid "You have to specify a source name/index and a port name"
 msgstr "Vous devez indiquer un nom/un index de source et un nom de port"
 
-#: ../src/utils/pactl.c:1605
+#: ../src/utils/pactl.c:1635
 msgid "You have to specify a sink name/index and a volume"
 msgstr "Vous devez indiquer un nom/un index de destination et un volume"
 
-#: ../src/utils/pactl.c:1618
+#: ../src/utils/pactl.c:1648
 msgid "You have to specify a source name/index and a volume"
 msgstr "Vous devez indiquer un nom/un index de source et un volume"
 
-#: ../src/utils/pactl.c:1631
+#: ../src/utils/pactl.c:1661
 msgid "You have to specify a sink input index and a volume"
 msgstr "Vous devez indiquer un index d'entrée de destination et un volume"
 
-#: ../src/utils/pactl.c:1636
+#: ../src/utils/pactl.c:1666
 msgid "Invalid sink input index"
 msgstr "Index invalide d'entrée de la destination"
 
-#: ../src/utils/pactl.c:1647
+#: ../src/utils/pactl.c:1677
 msgid "You have to specify a source output index and a volume"
 msgstr ""
 
-#: ../src/utils/pactl.c:1652
+#: ../src/utils/pactl.c:1682
 msgid "Invalid source output index"
 msgstr ""
 
-#: ../src/utils/pactl.c:1664
+#: ../src/utils/pactl.c:1694
 msgid "You have to specify a sink name/index and a mute boolean"
 msgstr ""
 "Vous devez indiquer un nom/un index de destination et un booléen muet"
 
-#: ../src/utils/pactl.c:1669 ../src/utils/pactl.c:1686
-#: ../src/utils/pactl.c:1708 ../src/utils/pactl.c:1729
+#: ../src/utils/pactl.c:1699 ../src/utils/pactl.c:1716
+#: ../src/utils/pactl.c:1738 ../src/utils/pactl.c:1759
 msgid "Invalid mute specification"
 msgstr ""
 
-#: ../src/utils/pactl.c:1681
+#: ../src/utils/pactl.c:1711
 msgid "You have to specify a source name/index and a mute boolean"
 msgstr "Vous devez indiquer un nom/un index de source et un booléen muet"
 
-#: ../src/utils/pactl.c:1698
+#: ../src/utils/pactl.c:1728
 msgid "You have to specify a sink input index and a mute boolean"
 msgstr ""
 "Vous devez indiquer un index d'entrée de destination et un booléen muet"
 
-#: ../src/utils/pactl.c:1703
+#: ../src/utils/pactl.c:1733
 msgid "Invalid sink input index specification"
 msgstr "Spécification d'index d'entrée de la destination invalide"
 
-#: ../src/utils/pactl.c:1719
+#: ../src/utils/pactl.c:1749
 msgid "You have to specify a source output index and a mute boolean"
 msgstr ""
 
-#: ../src/utils/pactl.c:1724
+#: ../src/utils/pactl.c:1754
 msgid "Invalid source output index specification"
 msgstr ""
 
-#: ../src/utils/pactl.c:1743
+#: ../src/utils/pactl.c:1773
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr ""
 
-#: ../src/utils/pactl.c:1759
+#: ../src/utils/pactl.c:1789
 msgid "No valid command specified."
 msgstr "Aucune commande valide indiquée."
 
@@ -2407,9 +2417,9 @@
 "Nous avons été réveillés avec POLLIN actif, cependant un snd_pcm_avail() "
 "ultérieur a retourné 0 ou une autre valeur < min_avail."
 
-#: ../src/modules/alsa/module-alsa-card.c:163
+#: ../src/modules/alsa/module-alsa-card.c:168
 #: ../src/modules/bluetooth/module-bluetooth-device.c:2707
-#: ../src/modules/alsa/alsa-mixer.c:3902
+#: ../src/modules/alsa/alsa-mixer.c:4007
 msgid "Off"
 msgstr "Éteint"
 
@@ -2449,242 +2459,238 @@
 msgid "Audio on @HOSTNAME@"
 msgstr "Audio sur @HOSTNAME@"
 
-#: ../src/modules/alsa/alsa-mixer.c:2220
+#: ../src/modules/alsa/alsa-mixer.c:2294
 msgid "Input"
 msgstr "Entrée"
 
-#: ../src/modules/alsa/alsa-mixer.c:2221
+#: ../src/modules/alsa/alsa-mixer.c:2295
 msgid "Docking Station Input"
 msgstr "Entrée de la station d'accueil"
 
-#: ../src/modules/alsa/alsa-mixer.c:2222 ../src/modules/alsa/alsa-mixer.c:2306
+#: ../src/modules/alsa/alsa-mixer.c:2296
 msgid "Docking Station Microphone"
 msgstr "Microphone de la station d'accueil"
 
-#: ../src/modules/alsa/alsa-mixer.c:2223
-msgid "Docking Station Line-In"
+#: ../src/modules/alsa/alsa-mixer.c:2297
+msgid "Docking Station Line In"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2224
-msgid "Line-In"
-msgstr "Entrée-ligne"
+#: ../src/modules/alsa/alsa-mixer.c:2298 ../src/modules/alsa/alsa-mixer.c:2382
+msgid "Line In"
+msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2225
+#: ../src/modules/alsa/alsa-mixer.c:2299 ../src/modules/alsa/alsa-mixer.c:2377
 msgid "Microphone"
 msgstr "Microphone"
 
-#: ../src/modules/alsa/alsa-mixer.c:2226 ../src/modules/alsa/alsa-mixer.c:2304
+#: ../src/modules/alsa/alsa-mixer.c:2300 ../src/modules/alsa/alsa-mixer.c:2378
 msgid "Front Microphone"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2227 ../src/modules/alsa/alsa-mixer.c:2305
+#: ../src/modules/alsa/alsa-mixer.c:2301 ../src/modules/alsa/alsa-mixer.c:2379
 msgid "Rear Microphone"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2228
+#: ../src/modules/alsa/alsa-mixer.c:2302
 msgid "External Microphone"
 msgstr "Microphone externe"
 
-#: ../src/modules/alsa/alsa-mixer.c:2229 ../src/modules/alsa/alsa-mixer.c:2307
+#: ../src/modules/alsa/alsa-mixer.c:2303 ../src/modules/alsa/alsa-mixer.c:2381
 msgid "Internal Microphone"
 msgstr "Microphone interne"
 
-#: ../src/modules/alsa/alsa-mixer.c:2230
+#: ../src/modules/alsa/alsa-mixer.c:2304 ../src/modules/alsa/alsa-mixer.c:2383
 msgid "Radio"
 msgstr "Radio"
 
-#: ../src/modules/alsa/alsa-mixer.c:2231
+#: ../src/modules/alsa/alsa-mixer.c:2305 ../src/modules/alsa/alsa-mixer.c:2384
 msgid "Video"
 msgstr "Vidéo"
 
-#: ../src/modules/alsa/alsa-mixer.c:2232
+#: ../src/modules/alsa/alsa-mixer.c:2306
 msgid "Automatic Gain Control"
 msgstr "Contrôle automatique du gain"
 
-#: ../src/modules/alsa/alsa-mixer.c:2233
+#: ../src/modules/alsa/alsa-mixer.c:2307
 msgid "No Automatic Gain Control"
 msgstr "Pas de contrôle automatique du gain"
 
-#: ../src/modules/alsa/alsa-mixer.c:2234
+#: ../src/modules/alsa/alsa-mixer.c:2308
 msgid "Boost"
 msgstr "Boost"
 
-#: ../src/modules/alsa/alsa-mixer.c:2235
+#: ../src/modules/alsa/alsa-mixer.c:2309
 msgid "No Boost"
 msgstr "Pas de boost"
 
-#: ../src/modules/alsa/alsa-mixer.c:2236
+#: ../src/modules/alsa/alsa-mixer.c:2310
 msgid "Amplifier"
 msgstr "Amplificateur"
 
-#: ../src/modules/alsa/alsa-mixer.c:2237
+#: ../src/modules/alsa/alsa-mixer.c:2311
 msgid "No Amplifier"
 msgstr "Pas d'amplificateur"
 
-#: ../src/modules/alsa/alsa-mixer.c:2238
+#: ../src/modules/alsa/alsa-mixer.c:2312
 msgid "Bass Boost"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2239
+#: ../src/modules/alsa/alsa-mixer.c:2313
 msgid "No Bass Boost"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2240
+#: ../src/modules/alsa/alsa-mixer.c:2314
 msgid "Speaker"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2241
+#: ../src/modules/alsa/alsa-mixer.c:2315 ../src/modules/alsa/alsa-mixer.c:2386
 msgid "Headphones"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2302
+#: ../src/modules/alsa/alsa-mixer.c:2376
 msgid "Analog Input"
 msgstr "Entrée analogique"
 
-#: ../src/modules/alsa/alsa-mixer.c:2303
-msgid "Analog Microphone"
-msgstr "Microphone analogique"
-
-#: ../src/modules/alsa/alsa-mixer.c:2308
-msgid "Analog Line-In"
-msgstr "Entrée-ligne analogique"
-
-#: ../src/modules/alsa/alsa-mixer.c:2309
-msgid "Analog Radio"
-msgstr "Radio analogique"
-
-#: ../src/modules/alsa/alsa-mixer.c:2310
-msgid "Analog Video"
-msgstr "Vidéo analogique"
+#: ../src/modules/alsa/alsa-mixer.c:2380
+msgid "Dock Microphone"
+msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2311
+#: ../src/modules/alsa/alsa-mixer.c:2385
 msgid "Analog Output"
 msgstr "Sortie analogique"
 
-#: ../src/modules/alsa/alsa-mixer.c:2312
-msgid "Analog Headphones"
-msgstr "Casques analogiques"
+#: ../src/modules/alsa/alsa-mixer.c:2387
+msgid "LFE on Separate Mono Output"
+msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2313
-msgid "Analog Output (LFE)"
-msgstr "Sortie analogique (LFE)"
+#: ../src/modules/alsa/alsa-mixer.c:2388
+msgid "Line Out"
+msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2314
+#: ../src/modules/alsa/alsa-mixer.c:2389
 msgid "Analog Mono Output"
 msgstr "Sortie mono analogique"
 
-#: ../src/modules/alsa/alsa-mixer.c:2315
-msgid "Analog Speakers"
+#: ../src/modules/alsa/alsa-mixer.c:2390
+msgid "Speakers"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2316
-msgid "Digital Output (IEC958)"
+#: ../src/modules/alsa/alsa-mixer.c:2391
+msgid "HDMI / DisplayPort"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2317
-msgid "Digital Passthrough (IEC958)"
+#: ../src/modules/alsa/alsa-mixer.c:2392
+msgid "Digital Output (S/PDIF)"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2526
+#: ../src/modules/alsa/alsa-mixer.c:2393
+msgid "Digital Passthrough (S/PDIF)"
+msgstr ""
+
+#: ../src/modules/alsa/alsa-mixer.c:2599
 #, c-format
 msgid "%s+%s"
 msgstr "%s+%s"
 
-#: ../src/modules/alsa/alsa-mixer.c:2529 ../src/modules/alsa/alsa-mixer.c:4440
+#: ../src/modules/alsa/alsa-mixer.c:2602 ../src/modules/alsa/alsa-mixer.c:4567
 #, c-format
 msgid "%s / %s"
 msgstr "%s / %s"
 
-#: ../src/modules/alsa/alsa-mixer.c:3761
+#: ../src/modules/alsa/alsa-mixer.c:3865
 msgid "Analog Mono"
 msgstr "Mono analogique"
 
-#: ../src/modules/alsa/alsa-mixer.c:3762
+#: ../src/modules/alsa/alsa-mixer.c:3866
 msgid "Analog Stereo"
 msgstr "Stéréo analogique"
 
-#: ../src/modules/alsa/alsa-mixer.c:3763
+#: ../src/modules/alsa/alsa-mixer.c:3867
 msgid "Analog Surround 2.1"
 msgstr "Surround analogique 2.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3764
+#: ../src/modules/alsa/alsa-mixer.c:3868
 msgid "Analog Surround 3.0"
 msgstr "Surround analogique 3.0"
 
-#: ../src/modules/alsa/alsa-mixer.c:3765
+#: ../src/modules/alsa/alsa-mixer.c:3869
 msgid "Analog Surround 3.1"
 msgstr "Surround analogique 3.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3766
+#: ../src/modules/alsa/alsa-mixer.c:3870
 msgid "Analog Surround 4.0"
 msgstr "Surround analogique 4.0"
 
-#: ../src/modules/alsa/alsa-mixer.c:3767
+#: ../src/modules/alsa/alsa-mixer.c:3871
 msgid "Analog Surround 4.1"
 msgstr "Surround analogique 4.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3768
+#: ../src/modules/alsa/alsa-mixer.c:3872
 msgid "Analog Surround 5.0"
 msgstr "Surround analogique 5.0"
 
-#: ../src/modules/alsa/alsa-mixer.c:3769
+#: ../src/modules/alsa/alsa-mixer.c:3873
 msgid "Analog Surround 5.1"
 msgstr "Surround analogique 5.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3770
+#: ../src/modules/alsa/alsa-mixer.c:3874
 msgid "Analog Surround 6.0"
 msgstr "Surround analogique 6.0"
 
-#: ../src/modules/alsa/alsa-mixer.c:3771
+#: ../src/modules/alsa/alsa-mixer.c:3875
 msgid "Analog Surround 6.1"
 msgstr "Surround analogique 6.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3772
+#: ../src/modules/alsa/alsa-mixer.c:3876
 msgid "Analog Surround 7.0"
 msgstr "Surround analogique 7.0"
 
-#: ../src/modules/alsa/alsa-mixer.c:3773
+#: ../src/modules/alsa/alsa-mixer.c:3877
 msgid "Analog Surround 7.1"
 msgstr "Surround analogique 7.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3774
+#: ../src/modules/alsa/alsa-mixer.c:3878
 msgid "Digital Stereo (IEC958)"
 msgstr "Stéréo numérique (IEC958)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3775
+#: ../src/modules/alsa/alsa-mixer.c:3879
 msgid "Digital Passthrough  (IEC958)"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:3776
+#: ../src/modules/alsa/alsa-mixer.c:3880
 msgid "Digital Surround 4.0 (IEC958/AC3)"
 msgstr "Surround numérique 4.0 (IEC958/AC3)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3777
+#: ../src/modules/alsa/alsa-mixer.c:3881
 msgid "Digital Surround 5.1 (IEC958/AC3)"
 msgstr "Surround numérique 5.1 (IEC958/AC3)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3778
+#: ../src/modules/alsa/alsa-mixer.c:3882
 msgid "Digital Stereo (HDMI)"
 msgstr "Stéréo numérique (HDMI)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3899
+#: ../src/modules/alsa/alsa-mixer.c:3883
+msgid "Digital Surround 5.1 (HDMI)"
+msgstr ""
+
+#: ../src/modules/alsa/alsa-mixer.c:4004
 msgid "Analog Mono Duplex"
 msgstr "Duplex Mono analogique"
 
-#: ../src/modules/alsa/alsa-mixer.c:3900
+#: ../src/modules/alsa/alsa-mixer.c:4005
 msgid "Analog Stereo Duplex"
 msgstr "Duplex stéréo analogique"
 
-#: ../src/modules/alsa/alsa-mixer.c:3901
+#: ../src/modules/alsa/alsa-mixer.c:4006
 msgid "Digital Stereo Duplex (IEC958)"
 msgstr "Duplex stéréo numérique (IEC958)"
 
-#: ../src/modules/alsa/alsa-mixer.c:4001
+#: ../src/modules/alsa/alsa-mixer.c:4106
 #, c-format
 msgid "%s Output"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:4009
+#: ../src/modules/alsa/alsa-mixer.c:4114
 #, c-format
 msgid "%s Input"
 msgstr ""
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/python-apt.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/python-apt.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/python-apt.po	2012-01-02 17:26:56.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/python-apt.po	2012-02-23 06:31:22.000000000 +0000
@@ -8,15 +8,15 @@
 msgstr ""
 "Project-Id-Version: python-apt 0.7.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-09 12:08+0000\n"
+"POT-Creation-Date: 2012-02-15 09:31+0000\n"
 "PO-Revision-Date: 2011-12-15 13:48+0000\n"
 "Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:07+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:54+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #. ChangelogURI
 #: ../data/templates/Ubuntu.info.in.h:4
@@ -414,7 +414,7 @@
 msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:210 ../aptsources/distro.py:438
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:434
 #, python-format
 msgid "Server for %s"
 msgstr "Serveur pour %s"
@@ -422,35 +422,35 @@
 #. More than one server is used. Since we don't handle this case
 #. in the user interface we set "custom servers" to true and
 #. append a list of all used servers
-#: ../aptsources/distro.py:228 ../aptsources/distro.py:234
-#: ../aptsources/distro.py:250
+#: ../aptsources/distro.py:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Serveur principal"
 
-#: ../aptsources/distro.py:254
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Serveurs personnalisés"
 
-#: ../apt/progress/gtk2.py:261 ../apt/progress/gtk2.py:317
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Téléchargement du fichier %(current)li sur %(total)li à %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:267 ../apt/progress/gtk2.py:323
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Téléchargement du fichier %(current)li sur %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:343
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Détails"
 
-#: ../apt/progress/gtk2.py:431
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr "Démarrage..."
 
-#: ../apt/progress/gtk2.py:437
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr "Terminé"
 
@@ -461,11 +461,11 @@
 "Caractère unicode non valide dans la description de « %s » (%s). Veuillez le "
 "signaler."
 
-#: ../apt/package.py:1074 ../apt/package.py:1180
+#: ../apt/package.py:1085 ../apt/package.py:1191
 msgid "The list of changes is not available"
 msgstr "La liste des modifications n'est pas disponible"
 
-#: ../apt/package.py:1186
+#: ../apt/package.py:1197
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -478,7 +478,7 @@
 "Consultez http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "en attendant qu'elle le soit disponible ou réessayez plus tard."
 
-#: ../apt/package.py:1193
+#: ../apt/package.py:1204
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -486,23 +486,28 @@
 "Échec lors du téléchargement de la liste des modifications. \n"
 "Veuillez vérifier votre connexion Internet."
 
-#: ../apt/debfile.py:85
+#: ../apt/debfile.py:82
 #, python-format
 msgid "List of files for '%s' could not be read"
 msgstr "Impossible de lire la liste des fichiers pour « %s »"
 
-#: ../apt/debfile.py:205
+#: ../apt/debfile.py:93
+#, python-format
+msgid "List of control files for '%s' could not be read"
+msgstr ""
+
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr "Dépendance non satisfaite : %s\n"
 
-#: ../apt/debfile.py:226
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr "Entre en conflit avec le paquet « %s » déjà installé"
 
 #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation
-#: ../apt/debfile.py:371
+#: ../apt/debfile.py:373
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' dependency %(depname)s "
@@ -512,7 +517,7 @@
 "%(depversion)s)"
 
 #. TRANSLATORS: the first '%s' is the package that conflicts, the second the packagename that it conflicts with (so the name of the deb the user tries to install), the third is the relation (e.g. >=) and the last is the version for the relation
-#: ../apt/debfile.py:387
+#: ../apt/debfile.py:389
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
@@ -520,7 +525,7 @@
 msgstr ""
 "« %(pkgname)s » : en conflit avec %(targetpkg)s (%(comptype)s %(targetver)s)"
 
-#: ../apt/debfile.py:397
+#: ../apt/debfile.py:399
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
@@ -529,35 +534,31 @@
 "« %(pkgname)s » : en conflit avec « %(targetpkg)s », mais « %(debfile)s » le "
 "fournit via « %(provides)s »"
 
-#: ../apt/debfile.py:445
+#: ../apt/debfile.py:447
 msgid "No Architecture field in the package"
 msgstr "Pas de champ « architecture » dans le paquet"
 
-#: ../apt/debfile.py:455
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr "Architecture « %s » incorrecte"
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:462
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr "Une version plus récente est déjà installée"
 
-#: ../apt/debfile.py:487
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 "Impossible de satisfaire toutes les dépendances (le cache est corrompu)"
 
-#: ../apt/debfile.py:517
+#: ../apt/debfile.py:519
 #, python-format
 msgid "Cannot install '%s'"
 msgstr "Impossible d'installer « %s »"
 
-#: ../apt/debfile.py:561
-msgid "Python-debian module not available"
-msgstr "Module Python-Debian non disponible"
-
-#: ../apt/debfile.py:604
+#: ../apt/debfile.py:593
 msgid ""
 "Automatically decompressed:\n"
 "\n"
@@ -565,18 +566,18 @@
 "Décompressé automatiquement :\n"
 "\n"
 
-#: ../apt/debfile.py:610
+#: ../apt/debfile.py:599
 msgid "Automatically converted to printable ascii:\n"
 msgstr "Converti automatiquement en ASCII imprimable :\n"
 
-#: ../apt/debfile.py:700
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 "Installer les dépendances de construction pour le paquet source « %s » qui "
 "produit %s\n"
 
-#: ../apt/debfile.py:711
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
 msgstr "Un paquet essentiel serait supprimé"
 
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/quilt.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/quilt.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/quilt.po	2012-01-02 17:26:56.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/quilt.po	2012-02-23 06:31:22.000000000 +0000
@@ -1,21 +1,21 @@
 # quilt french translation
 # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 # Martin Quinson <Martin.Quinson@tuxfamily.org>, 2003.
-# Jean Delvare <khali@linux-fr.org>, 2005.
+# Jean Delvare <jdelvare@suse.de>, 2005, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: quilt 0.43\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-29 11:07+0000\n"
-"PO-Revision-Date: 2011-12-05 19:56+0000\n"
+"POT-Creation-Date: 2012-02-21 18:55+0000\n"
+"PO-Revision-Date: 2012-01-19 07:36+0000\n"
 "Last-Translator: Jean Delvare <Unknown>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:07+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:55+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: bin/quilt.in:23
@@ -650,7 +650,7 @@
 
 #: quilt/import.in:92
 msgid "Patch %s is applied\\n"
-msgstr "Le patch %s n'est pas appliqué\\n"
+msgstr "Le patch %s est appliqué\\n"
 
 #: quilt/import.in:100
 msgid "Patch %s exists. Replace with -f.\\n"
@@ -826,7 +826,7 @@
 "-a\tRetire tous les patches de la série.\n"
 "\n"
 "-f\tForce l'action. L'état avant que les patches ne soient retirés\n"
-"\tsera restoré depuis les fichiers de sauvegarde.\n"
+"\tsera restauré depuis les fichiers de sauvegarde.\n"
 "\n"
 "-R\tVérifie que le patch s'enlève proprement ; ne se base pas sur\n"
 "\tles horaires de dernière modification des fichiers.\n"
@@ -1136,7 +1136,7 @@
 
 #: quilt/remove.in:109
 msgid "Failed to remove file %s from patch %s\\n"
-msgstr "Impossible d'enlever le fichier %s du patch %s.\\n"
+msgstr "Impossible d'enlever le fichier %s du patch %s\\n"
 
 #: quilt/remove.in:123
 msgid "File %s removed from patch %s\\n"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/quota.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/quota.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/quota.po	2012-01-02 17:26:56.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/quota.po	2012-02-23 06:31:22.000000000 +0000
@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-09 13:06+0000\n"
-"PO-Revision-Date: 2011-08-09 18:07+0000\n"
+"POT-Creation-Date: 2012-01-03 16:01+0000\n"
+"PO-Revision-Date: 2012-01-03 17:17+0000\n"
 "Last-Translator: Jérôme Schell <jerome@myreseau.org>\n"
 "Language-Team: fr <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:08+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:55+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: bylabel.c:253
 #, c-format
@@ -36,8 +36,8 @@
 msgid "Compiled with:%s\n"
 msgstr "Compilé avec :%s\n"
 
-#: common.c:126 convertquota.c:48 quotacheck.c:318 repquota.c:64
-#: warnquota.c:996
+#: common.c:126 convertquota.c:48 quotacheck.c:318 quotasync.c:26
+#: repquota.c:64 warnquota.c:994
 #, c-format
 msgid "Bugs to %s\n"
 msgstr "Rapports de bugs à %s\n"
@@ -62,8 +62,8 @@
 msgid "You have to specify source and target format of conversion.\n"
 msgstr ""
 
-#: convertquota.c:112 quotacheck.c:404 quotaon.c:134 repquota.c:141
-#: setquota.c:217
+#: convertquota.c:112 quotacheck.c:404 quotaon.c:135 quotasync.c:64
+#: repquota.c:141 setquota.c:221
 msgid "Bad number of arguments.\n"
 msgstr "Mauvais nombre d'arguments.\n"
 
@@ -100,7 +100,7 @@
 msgid "Cannot get name of new quotafile.\n"
 msgstr "Impossible d'obtenir le nom du nouveau fichier de quota.\n"
 
-#: convertquota.c:302 quotacheck.c:754
+#: convertquota.c:302 quotacheck.c:753
 #, c-format
 msgid "Cannot rename new quotafile %s to name %s: %s\n"
 msgstr "Impossible de renommer le nouveau fichier de quotas %s en %s : %s\n"
@@ -133,9 +133,8 @@
 "...\n"
 "\tedquota %1$s-g [-F formatname] [-p groupname] [-f filesystem] groupname "
 "...\n"
-"\tedquota %1$s[-u|g] [-F formatname] [-f filesystem] -t\n"
-"\tedquota %1$s[-u|g] [-F formatname] [-f filesystem] -T username|groupname "
-"...\n"
+"\tedquota [-u|g] [-F formatname] [-f filesystem] -t\n"
+"\tedquota [-u|g] [-F formatname] [-f filesystem] -T username|groupname ...\n"
 msgstr ""
 
 #: edquota.c:85
@@ -179,82 +178,86 @@
 "-V, --version afficher les informations de version et quitter\n"
 "\n"
 
-#: edquota.c:101 quota.c:107 setquota.c:79
+#: edquota.c:101 quota.c:111 setquota.c:79
 #, c-format
 msgid "Bugs to: %s\n"
 msgstr "Rapports de bugs à : %s\n"
 
-#: edquota.c:182
+#: edquota.c:183
 msgid ""
 "Prototype name does not make sense when editing grace period or times.\n"
 msgstr ""
 
-#: edquota.c:200
+#: edquota.c:187
+msgid "Cannot change grace times over RPC protocol.\n"
+msgstr ""
+
+#: edquota.c:205
 #, c-format
 msgid "Cannot get quota information for user %s\n"
 msgstr ""
 "Impossible de récupérer les informations du quota de l'utilisateur %s\n"
 
-#: edquota.c:206
+#: edquota.c:211
 msgid "fsname mismatch\n"
 msgstr "Incohérence de fsname\n"
 
-#: edquota.c:248
+#: edquota.c:253
 msgid "No filesystems with quota detected.\n"
 msgstr "Aucun système de fichier avec quotas détecté.\n"
 
-#: edquota.c:264
+#: edquota.c:269
 #, c-format
 msgid "Cannot create temporary file: %s\n"
 msgstr "Impossible de créer le fichier temporaire : %s\n"
 
-#: edquota.c:269
+#: edquota.c:274
 #, c-format
 msgid "Cannot change owner of temporary file: %s\n"
 msgstr "Impossible de modifier le propriétaire du fichier temporaire : %s\n"
 
-#: edquota.c:276
+#: edquota.c:281
 msgid "Cannot write grace times to file.\n"
 msgstr "Impossible d'écrire le délai de grâce dans un fichier.\n"
 
-#: edquota.c:280
+#: edquota.c:285
 msgid "Error while editing grace times.\n"
 msgstr "Erreur lors de la modification des temps de sursis.\n"
 
-#: edquota.c:284
+#: edquota.c:289
 msgid "Failed to parse grace times file.\n"
 msgstr "Échec lors de l'analyse du fichier des temps de sursis.\n"
 
-#: edquota.c:293 edquota.c:319
+#: edquota.c:298 edquota.c:324
 #, c-format
 msgid "Cannot get quota information for user %s.\n"
 msgstr ""
 
-#: edquota.c:295
+#: edquota.c:300
 msgid "Cannot write individual grace times to file.\n"
 msgstr "Impossible d'écrire le délai de grâce individuel dans un fichier.\n"
 
-#: edquota.c:300
+#: edquota.c:305
 msgid "Error while editing individual grace times.\n"
 msgstr "Erreur lors de la modification des temps de sursis individuels.\n"
 
-#: edquota.c:305
+#: edquota.c:310
 msgid "Cannot read individual grace times from file.\n"
 msgstr "Impossible de lire le délai de grâce individuel depuis un fichier.\n"
 
-#: edquota.c:321
+#: edquota.c:326
 msgid "Cannot write quotas to file.\n"
 msgstr "Impossible d'écrire les quotas en fichier\n"
 
-#: edquota.c:326
+#: edquota.c:331
 msgid "Error while editing quotas.\n"
 msgstr "Erreur lors de la modification des quotas.\n"
 
-#: edquota.c:332
+#: edquota.c:337
 msgid "Cannot reopen!"
 msgstr "Impossible de réouvrir !"
 
-#: edquota.c:334
+#: edquota.c:339
 msgid "Cannot read quotas from file.\n"
 msgstr "Impossible de lire les quotas à partir du fichier.\n"
 
@@ -313,24 +316,24 @@
 msgid "XFS_IOC_FSBULKSTAT ioctl failed: %s\n"
 msgstr "Échec de ioctl XFS_IOC_FSBULKSTAT : %s\n"
 
-#: quota.c:83
+#: quota.c:85
 msgid "Usage: quota [-guqvswim] [-l | [-Q | -A]] [-F quotaformat]\n"
 msgstr ""
 
-#: quota.c:84
+#: quota.c:86
 msgid "\tquota [-qvswim] [-l | [-Q | -A]] [-F quotaformat] -u username ...\n"
 msgstr ""
 
-#: quota.c:85
+#: quota.c:87
 msgid ""
 "\tquota [-qvswim] [-l | [-Q | -A]] [-F quotaformat] -g groupname ...\n"
 msgstr ""
 
-#: quota.c:86
+#: quota.c:88
 msgid "\tquota [-qvswugQm] [-F quotaformat] -f filesystem ...\n"
 msgstr ""
 
-#: quota.c:87
+#: quota.c:89
 msgid ""
 "\n"
 "-u, --user                display quota for user\n"
@@ -352,87 +355,89 @@
 "filesystems\n"
 "-A, --nfs-all             display quota for all NFS mountpoints\n"
 "-m, --no-mixed-pathnames  trim leading slashes from NFSv4 mountpoints\n"
+"    --show-mntpoint       show mount point of the file system in output\n"
+"    --hide-device         do not show file system device in output\n"
 "-h, --help                display this help message and exit\n"
 "-V, --version             display version information and exit\n"
 "\n"
 msgstr ""
 
-#: quota.c:116
+#: quota.c:120
 msgid "space"
 msgstr ""
 
-#: quota.c:118
+#: quota.c:122
 msgid "blocks"
 msgstr "blocs"
 
-#: quota.c:120
+#: quota.c:124
 #, c-format
 msgid "Disk quotas for %s %s (%cid %u): %s\n"
 msgstr "Quotas disque pour %s %s (%cid %u) : %s\n"
 
-#: quota.c:123
+#: quota.c:127
 msgid "Filesystem"
 msgstr "Système fichiers"
 
-#: quota.c:124 quota.c:125
+#: quota.c:128 quota.c:129
 msgid "quota"
 msgstr "quota"
 
-#: quota.c:124 quota.c:125
+#: quota.c:128 quota.c:129
 msgid "limit"
 msgstr "limite"
 
-#: quota.c:124 quota.c:125
+#: quota.c:128 quota.c:129
 msgid "grace"
 msgstr "sursis"
 
-#: quota.c:125
+#: quota.c:129
 msgid "files"
 msgstr "fichiers"
 
-#: quota.c:155
+#: quota.c:201
 msgid "File limit reached on"
 msgstr "Limite de fichiers atteinte"
 
-#: quota.c:161
+#: quota.c:207
 msgid "In file grace period on"
 msgstr "Période de sursis fichiers activée"
 
-#: quota.c:165
+#: quota.c:211
 msgid "Over file quota on"
 msgstr "Quota dépassement fichiers activé"
 
-#: quota.c:171
+#: quota.c:217
 msgid "Block limit reached on"
 msgstr "Limite de blocs atteinte"
 
-#: quota.c:177
+#: quota.c:223
 msgid "In block grace period on"
 msgstr "Période de sursis blocs activée"
 
-#: quota.c:181
+#: quota.c:227
 msgid "Over block quota on"
 msgstr "Quota dépassement blocs activé"
 
-#: quota.c:243 quotasys.c:325
+#: quota.c:290 quotasys.c:288
 msgid "none"
 msgstr "aucun"
 
-#: quota.c:339
+#: quota.c:396
 #, c-format
 msgid "Warning: Ignoring -%c when filesystem list specified.\n"
 msgstr ""
 
-#: quota.c:346
+#: quota.c:403
 msgid "No filesystem specified.\n"
 msgstr "Aucun système de fichiers spécifié.\n"
 
-#: quota.c:354
+#: quota.c:411
 #, c-format
 msgid "Gid set allocation (%d): %s\n"
 msgstr "Allocation à un ensemble de Gid (%d): %s\n"
 
-#: quota.c:360
+#: quota.c:417
 #, c-format
 msgid "getgroups(): %s\n"
 msgstr "getgroups() : %s\n"
@@ -451,7 +456,7 @@
 " -F --foreground   run daemon in foreground\n"
 msgstr ""
 
-#: quota_nld.c:114 rquota_svc.c:162
+#: quota_nld.c:114 rquota_svc.c:160
 #, c-format
 msgid "Unknown option '%c'.\n"
 msgstr "Option non reconnue « %c ».\n"
@@ -658,58 +663,54 @@
 "-V, --version afficher les informations de version et quitter\n"
 "\n"
 
-#: quotacheck.c:408
-msgid "XFS quota format needs no checking.\n"
-msgstr "Le format de quotas XFS n'a pas besoin de vérification.\n"
-
-#: quotacheck.c:434
+#: quotacheck.c:430
 #, c-format
 msgid "error (%d) while opening %s\n"
 msgstr "erreur (%d) lors de l'ouverture de %s\n"
 
-#: quotacheck.c:439
+#: quotacheck.c:435
 #, c-format
 msgid "error (%d) while allocating inode file bitmap\n"
 msgstr "erreur (%d) lors de l'allocation de la bitmap des inodes fichier\n"
 
-#: quotacheck.c:444
+#: quotacheck.c:440
 #, c-format
 msgid "errstr (%d) while allocating inode directory bitmap\n"
 msgstr ""
 "errstr (%d) lors de l'allocation de la bitmap des inodes répertoire\n"
 
-#: quotacheck.c:449
+#: quotacheck.c:445
 #, c-format
 msgid "error (%d) while opening inode scan\n"
 msgstr "erreur (%d) lors de l'ouverture de l'analyse d'inode\n"
 
-#: quotacheck.c:454
+#: quotacheck.c:450
 #, c-format
 msgid "error (%d) while starting inode scan\n"
 msgstr "erreur (%d) lors du démarrage de l'analyse d'inode\n"
 
-#: quotacheck.c:462
+#: quotacheck.c:458
 #, c-format
 msgid "Found i_num %ld, blocks %ld\n"
 msgstr ""
 "i_num %ld trouvé, %ld blocks\n"
 "\n"
 
-#: quotacheck.c:468
+#: quotacheck.c:464
 msgid "High uid detected.\n"
 msgstr "Uid élevé détecté.\n"
 
-#: quotacheck.c:484
+#: quotacheck.c:480
 #, c-format
 msgid "Something weird happened while scanning. Error %d\n"
 msgstr "Événement inattendu lors de l'analyse. Erreur %d\n"
 
-#: quotacheck.c:508
+#: quotacheck.c:504
 #, c-format
 msgid "Cannot stat directory %s: %s\n"
 msgstr "Ne peut avoir de stats sur le répertoire %s : %s\n"
 
-#: quotacheck.c:520
+#: quotacheck.c:516
 #, c-format
 msgid ""
 "\n"
@@ -718,7 +719,7 @@
 "\n"
 "Possibilité ouverture répertoire %s : %s\n"
 
-#: quotacheck.c:532
+#: quotacheck.c:528
 #, c-format
 msgid ""
 "lstat Cannot stat `%s/%s': %s\n"
@@ -729,21 +730,21 @@
 "Il vaudrait mieux lancer fsck d'abord !\n"
 "Abandon...\n"
 
-#: quotacheck.c:543
+#: quotacheck.c:539
 #, c-format
 msgid "pushd %s/%s\n"
 msgstr "pushd %s/%s\n"
 
-#: quotacheck.c:559
+#: quotacheck.c:555
 #, c-format
 msgid "\tAdding %s size %lld ino %d links %d uid %u gid %u\n"
 msgstr ""
 
-#: quotacheck.c:569
+#: quotacheck.c:565
 msgid "Scanning stored directories from directory stack\n"
 msgstr "Parcours des répertoires stockés depuis la pile des répertoires\n"
 
-#: quotacheck.c:573
+#: quotacheck.c:569
 #, c-format
 msgid ""
 "popd %s\n"
@@ -752,17 +753,17 @@
 "popd %s\n"
 "Entrée dans le répertoire %s\n"
 
-#: quotacheck.c:585
+#: quotacheck.c:581
 #, c-format
 msgid "Leaving %s\n"
 msgstr "Quitte %s\n"
 
-#: quotacheck.c:625
+#: quotacheck.c:621
 #, c-format
 msgid "Going to check %s quota file of %s\n"
 msgstr "Sur le point de vérifier %s fichier de quotas de %s\n"
 
-#: quotacheck.c:631
+#: quotacheck.c:627
 #, c-format
 msgid ""
 "Quota for %ss is enabled on mountpoint %s so quotacheck might damage the "
@@ -771,16 +772,16 @@
 "Les quotas pour %ss sont actif sur le point de montage %s si bien que "
 "quotacheck risque d'endommager le fichier.\n"
 
-#: quotacheck.c:632 quotacheck.c:911
+#: quotacheck.c:628 quotacheck.c:939
 msgid "Should I continue"
 msgstr "Dois-je continuer"
 
-#: quotacheck.c:633 quotacheck.c:912
+#: quotacheck.c:629 quotacheck.c:940
 #, c-format
 msgid "As you wish... Canceling check of this file.\n"
 msgstr "Suivant vos désirs... Abandon de la vérification de ce fichier.\n"
 
-#: quotacheck.c:638
+#: quotacheck.c:634
 #, c-format
 msgid ""
 "Quota for %ss is enabled on mountpoint %s so quotacheck might damage the "
@@ -791,93 +792,93 @@
 "quotacheck risque d'endommager le fichier.\n"
 "Veuillez désactiver les quotas ou utiliser -f pour forcer la vérification.\n"
 
-#: quotacheck.c:645
+#: quotacheck.c:641
 #, c-format
 msgid "Error while syncing quotas on %s: %s\n"
 msgstr "Erreur lors de la synchronisation des quotas sur %s : %s\n"
 
-#: quotacheck.c:650
+#: quotacheck.c:646
 #, c-format
 msgid "Cannot get quotafile name for %s\n"
 msgstr "Impossible d'obtenir le nom du fichier de quotas pour %s\n"
 
-#: quotacheck.c:655 quotaio.c:161 quotasys.c:541
+#: quotacheck.c:651 quotaio.c:152 quotasys.c:504
 #, c-format
 msgid "Cannot open quotafile %s: %s\n"
 msgstr "Impossible d'ouvrir le fichier de quotas %s : %s\n"
 
-#: quotacheck.c:692
+#: quotacheck.c:691
 msgid "Renaming new files to proper names.\n"
 msgstr "Renommer les nouveaux fichiers avec des noms appropriés.\n"
 
-#: quotacheck.c:694
+#: quotacheck.c:693
 #, c-format
 msgid "Cannot get name of old quotafile on %s.\n"
 msgstr "Impossible d'obtenir le nom de l'ancien fichier de quotas sur %s.\n"
 
-#: quotacheck.c:697
+#: quotacheck.c:696
 msgid "Old file not found.\n"
 msgstr "Ancien fichier non trouvé.\n"
 
-#: quotacheck.c:700
+#: quotacheck.c:699
 #, c-format
 msgid "Error while searching for old quota file %s: %s\n"
 msgstr "Erreur lors de la recherche de l'ancien fichier de quotas %s : %s\n"
 
-#: quotacheck.c:709
+#: quotacheck.c:708
 msgid "Old file found removed during check!\n"
 msgstr "Ancien fichier supprimé lors du contrôle !\n"
 
-#: quotacheck.c:712
+#: quotacheck.c:711
 #, c-format
 msgid "Error while opening old quota file %s: %s\n"
 msgstr "Erreur lors de l'ouverture de l'ancien fichier de quota %s : %s\n"
 
-#: quotacheck.c:718
+#: quotacheck.c:717
 #, c-format
 msgid "EXT2_IOC_GETFLAGS failed: %s\n"
 msgstr "EXT2_IOC_GETFLAGS a échoué : %s\n"
 
-#: quotacheck.c:722
+#: quotacheck.c:721
 #, c-format
 msgid "Quota file %s has IMMUTABLE flag set. Clearing.\n"
 msgstr ""
 
-#: quotacheck.c:725
+#: quotacheck.c:724
 #, c-format
 msgid "Failed to remove IMMUTABLE flag from quota file %s: %s\n"
 msgstr ""
 
-#: quotacheck.c:734
+#: quotacheck.c:733
 #, c-format
 msgid "Renaming old quotafile to %s~\n"
 msgstr "Renomme l'ancien fichier de quotas en %s~\n"
 
-#: quotacheck.c:740
+#: quotacheck.c:739
 #, c-format
 msgid "Name of quota file too long. Contact %s.\n"
 msgstr "Nom du fichier de quotas trop long. Contactez %s.\n"
 
-#: quotacheck.c:742
+#: quotacheck.c:741
 #, c-format
 msgid "Cannot rename old quotafile %s to %s: %s\n"
 msgstr "Impossible de renommer l'ancien fichier de quotas %s en %s : %s\n"
 
-#: quotacheck.c:748
+#: quotacheck.c:747
 msgid "Renaming new quotafile\n"
 msgstr "Renommage du nouveau fichier de quotas\n"
 
-#: quotacheck.c:760
+#: quotacheck.c:759
 #, c-format
 msgid "Cannot change permission of %s: %s\n"
 msgstr "Impossible de changer les permissions de %s : %s\n"
 
-#: quotacheck.c:767
+#: quotacheck.c:766
 #, c-format
 msgid "Cannot open new quota file %s: %s\n"
 msgstr "Impossible d'ouvrir le nouveau fichier de quota %s : %s\n"
 
-#: quotacheck.c:772
+#: quotacheck.c:771
 #, c-format
 msgid "Warning: Cannot set EXT2 flags on %s: %s\n"
 msgstr "Attention : Ne peut pas placer les flags EXT2 sur %s : %s\n"
@@ -887,27 +888,32 @@
 msgid "Dumping gathered data for %ss.\n"
 msgstr "Déchargement des données récupérées pour %ss.\n"
 
-#: quotacheck.c:793
+#: quotacheck.c:794
+#, c-format
+msgid "Cannot initialize IO on xfs/gfs2 quotafile: %s\n"
+msgstr ""
+
+#: quotacheck.c:800
 #, c-format
 msgid "Cannot initialize IO on new quotafile: %s\n"
 msgstr "Initialisation ES impossible sur le nouveau fichier de quotas : %s\n"
 
-#: quotacheck.c:811
+#: quotacheck.c:827
 #, c-format
 msgid "Cannot finish IO on new quotafile: %s\n"
 msgstr "Impossible de terminer ES sur le nouveau fichier de quotas : %s\n"
 
-#: quotacheck.c:814
+#: quotacheck.c:830
 msgid "Data dumped.\n"
 msgstr "Données déchargées.\n"
 
-#: quotacheck.c:819
+#: quotacheck.c:835
 #, c-format
 msgid "Cannot find checked quota file for %ss on %s!\n"
 msgstr ""
 "Impossible de trouver le fichier de quotas vérifié pour %ss sur %s !\n"
 
-#: quotacheck.c:823
+#: quotacheck.c:839
 #, c-format
 msgid ""
 "Cannot turn %s quotas off on %s: %s\n"
@@ -916,7 +922,7 @@
 "Impossible de désactiver les quotas %s sur %s : %s\n"
 "Le noyau ne sera pas informé des modifications que quotacheck a effectué.\n"
 
-#: quotacheck.c:836
+#: quotacheck.c:852
 #, c-format
 msgid ""
 "Cannot turn %s quotas on on %s: %s\n"
@@ -925,24 +931,24 @@
 "Impossible d'activer les quotas %s sur %s : %s\n"
 "Le noyau ne sera pas informé des modifications que quotacheck a effectué.\n"
 
-#: quotacheck.c:857
+#: quotacheck.c:874
 #, c-format
 msgid "Substracting space used by old %s quota file.\n"
 msgstr "Déduire l'espace utilisé par l'ancien %s fichier de quota.\n"
 
-#: quotacheck.c:859
+#: quotacheck.c:876
 #, c-format
-msgid "Old %s file not found. Usage will not be substracted.\n"
+msgid ""
+"Old %s file name could not been determined. Usage will not be substracted.\n"
 msgstr ""
-"L'ancien fichier %s n'a pas été trouvé. L'usage ne sera pas déduit.\n"
 
-#: quotacheck.c:864
+#: quotacheck.c:881
 #, c-format
-msgid "Cannot stat old %s quota file: %s\n"
+msgid ""
+"Cannot stat old %s quota file %s: %s. Usage will not be substracted.\n"
 msgstr ""
-"Impossible d'obtenir les informations sur l'ancien fichier de quota %s : %s\n"
 
-#: quotacheck.c:876
+#: quotacheck.c:893
 #, c-format
 msgid ""
 "Quota structure for %s owning quota file not present! Something is really "
@@ -951,22 +957,22 @@
 "La structure des quotas pour le fichier de quota %s est manquante ! Quelque "
 "chose ne va pas du tout...\n"
 
-#: quotacheck.c:881
+#: quotacheck.c:898
 #, c-format
 msgid "Substracted %lu bytes.\n"
 msgstr "Soustrait %lu bytes.\n"
 
-#: quotacheck.c:891
+#: quotacheck.c:911
 #, c-format
 msgid "Cannot stat mountpoint %s: %s\n"
 msgstr "Impossible d'exécuter stat() sur le point de montage %s : %s\n"
 
-#: quotacheck.c:893
+#: quotacheck.c:913
 #, c-format
 msgid "Mountpoint %s is not a directory?!\n"
 msgstr "Le point de montage %s n'est pas un répertoire ?!\n"
 
-#: quotacheck.c:910
+#: quotacheck.c:938
 #, c-format
 msgid ""
 "Cannot remount filesystem mounted on %s read-only. Counted values might not "
@@ -975,7 +981,7 @@
 "Impossible de remonter le système de fichier monté sur %s en lecture seule. "
 "Les valeurs comptabilisées riquent d'être fausses.\n"
 
-#: quotacheck.c:917
+#: quotacheck.c:946
 #, c-format
 msgid ""
 "Cannot remount filesystem mounted on %s read-only so counted values might "
@@ -988,25 +994,25 @@
 "Veuillez interrompre tous les programmes qui écrivent sur ce système de "
 "fichiers ou utilisez l'option -m pour forcer la vérification.\n"
 
-#: quotacheck.c:924
+#: quotacheck.c:954
 msgid "Filesystem remounted read-only\n"
 msgstr "Système de fichiers remonté en lecture seule\n"
 
-#: quotacheck.c:926
+#: quotacheck.c:957
 #, c-format
 msgid "Scanning %s [%s] "
 msgstr "Parcours de %s [%s] "
 
-#: quotacheck.c:943
+#: quotacheck.c:974
 msgid "done\n"
 msgstr "terminé\n"
 
-#: quotacheck.c:952
+#: quotacheck.c:983
 #, c-format
 msgid "Checked %d directories and %d files\n"
 msgstr "Vérifié %d répertoires et %d fichiers\n"
 
-#: quotacheck.c:956
+#: quotacheck.c:987
 #, c-format
 msgid ""
 "Cannot remount filesystem %s read-write. cannot write new quota files.\n"
@@ -1014,32 +1020,32 @@
 "Impossible de remonter le système de fichiers %s en lecture-écriture. "
 "Impossible d'écrire les nouveaux fichiers de quotas.\n"
 
-#: quotacheck.c:957
+#: quotacheck.c:988
 msgid "Filesystem remounted RW.\n"
 msgstr "Système de fichiers remonté en lecture-écriture.\n"
 
-#: quotacheck.c:995
+#: quotacheck.c:1031
 #, c-format
 msgid "Cannot find quota option on filesystem %s with quotas!\n"
 msgstr ""
 "Impossible de trouver l'option quota du système de fichiers %s avec quotas "
 "!\n"
 
-#: quotacheck.c:1001
+#: quotacheck.c:1037
 #, c-format
 msgid "Cannot detect quota format for journalled quota on %s\n"
 msgstr "Impossible de détecter le format des quotas journalisés de %s\n"
 
-#: quotacheck.c:1050 quotasys.c:634
+#: quotacheck.c:1104 quotasys.c:597
 msgid "Cannot initialize mountpoint scan.\n"
 msgstr "Impossible de démarrer le scan des points de montage\n"
 
-#: quotacheck.c:1058
+#: quotacheck.c:1109
 #, c-format
 msgid "Skipping %s [%s]\n"
 msgstr "Non traitement de %s [%s]\n"
 
-#: quotacheck.c:1075
+#: quotacheck.c:1126
 #, c-format
 msgid ""
 "Cannot guess format from filename on %s. Please specify format on "
@@ -1048,24 +1054,24 @@
 "Impossible de deviner le format d'après le nom de fichier sur %s. Veuillez "
 "préciser le format sur la ligne de commande.\n"
 
-#: quotacheck.c:1079
+#: quotacheck.c:1131
 #, c-format
 msgid "Detected quota format %s\n"
 msgstr "Format de quotas détecté %s\n"
 
-#: quotacheck.c:1094
+#: quotacheck.c:1147
 #, c-format
 msgid "Cannot get system info: %s\n"
 msgstr ""
 
-#: quotacheck.c:1106
+#: quotacheck.c:1159
 msgid ""
 "Your kernel probably supports journaled quota but you are not using it. "
 "Consider switching to journaled quota to avoid running quotacheck after an "
 "unclean shutdown.\n"
 msgstr ""
 
-#: quotacheck.c:1117
+#: quotacheck.c:1170
 msgid ""
 "Cannot find filesystem to check or filesystem not mounted with quota "
 "option.\n"
@@ -1073,7 +1079,7 @@
 "Impossible de trouver un système de fichier à vérifier, ou le système de "
 "fichier n'est pas monté avec l'option de quota.\n"
 
-#: quotacheck.c:1130
+#: quotacheck.c:1188
 #, c-format
 msgid ""
 "Allocated %d bytes memory\n"
@@ -1300,84 +1306,92 @@
 msgid "Not found any corrupted blocks. Congratulations.\n"
 msgstr "Aucun bloc corrompu n'a été trouvé. Félicitations.\n"
 
-#: quotaio.c:64
+#: quotaio.c:66
 msgid "Only RPC quota format is allowed on NFS filesystem.\n"
 msgstr ""
 "Sur un système de fichiers NFS, seul le format de quotas RPC est autorisé.\n"
 
-#: quotaio.c:73
+#: quotaio.c:75
 msgid "RPC quota format not compiled.\n"
 msgstr "Le format de quotas RPC n'a pas été compilé.\n"
 
-#: quotaio.c:77
+#: quotaio.c:79
 msgid "RPC quota format specified for non-NFS filesystem.\n"
 msgstr ""
 
-#: quotaio.c:84
+#: quotaio.c:86
 msgid "Only XFS quota format is allowed on XFS filesystem.\n"
 msgstr ""
 "Sur un système de fichiers XFS, seul le format de quotas XFS est autorisé.\n"
 
-#: quotaio.c:95
+#: quotaio.c:97
 msgid "XFS quota allowed only on XFS filesystem.\n"
 msgstr "Quotas XFS autorisés uniquement sur un système de fichiers XFS.\n"
 
-#: quotaio.c:109
+#: quotaio.c:111
 msgid "Quota not supported by the filesystem.\n"
 msgstr ""
 
-#: quotaio.c:113
-msgid "Operation not supported for filesystems with hidden quota files!\n"
-msgstr ""
-
-#: quotaio.c:138
+#: quotaio.c:131
 msgid "Cannot find any quota file to work on.\n"
 msgstr ""
 
-#: quotaio.c:145
+#: quotaio.c:136
 msgid "Quota file not found or has wrong format.\n"
 msgstr "Le fichier de quotas est introuvable ou n'a pas le bon format.\n"
 
-#: quotaio.c:155
+#: quotaio.c:146
 #, c-format
 msgid "Cannot sync quotas on device %s: %s\n"
 msgstr "Impossible ded synchroniser les quotas sur le périphérique %s : %s\n"
 
-#: quotaio.c:186
+#: quotaio.c:177
 #, c-format
 msgid "Cannot initialize quota on %s: %s\n"
 msgstr "Impossible d'initialiser quota sur %s: %s\n"
 
-#: quotaio.c:214
+#: quotaio.c:205
 #, c-format
 msgid "Creation of %s quota format is not supported.\n"
 msgstr "La création de quotas au format %s n'est pas supportée.\n"
 
-#: quotaio.c:224
+#: quotaio.c:215
 #, c-format
 msgid "Cannot create new quotafile %s: %s\n"
 msgstr "Impossible de créer le nouveau fichier de quota %s : %s\n"
 
-#: quotaio_generic.c:51
+#: quotaio.c:292
+#, c-format
+msgid ""
+"Trying to set quota limits out of range supported by quota format on %s.\n"
+msgstr ""
+
+#: quotaio.c:298
+#, c-format
+msgid ""
+"Trying to set quota usage out of range supported by quota format on %s.\n"
+msgstr ""
+
+#: quotaio_generic.c:54
 #, c-format
 msgid "Cannot get info for %s quota file from kernel on %s: %s\n"
 msgstr ""
 "Impossible d'obtenir du noyau les informations pour le fichier de quotas %s "
 "sur %s : %s\n"
 
-#: quotaio_generic.c:69
+#: quotaio_generic.c:72
 #, c-format
 msgid "Cannot set info for %s quota file from kernel on %s: %s\n"
 msgstr ""
 "Impossible de fixer dans le noyau les informations pour le fichier de quotas "
 "%s sur %s : %s\n"
 
-#: quotaio_generic.c:81
+#: quotaio_generic.c:84
 #, c-format
 msgid "Cannot get quota for %s %d from kernel on %s: %s\n"
 msgstr "Impossible d'obtenir du noyau les quotas pour %s %d sur %s : %s\n"
 
-#: quotaio_generic.c:96
+#: quotaio_generic.c:99
 #, c-format
 msgid "Cannot set quota for %s %d from kernel on %s: %s\n"
 msgstr ""
@@ -1393,7 +1407,7 @@
 "interface!\n"
 msgstr ""
 
-#: quotaio_rpc.c:58 quotaio_v1.c:300 quotaio_v2.c:447
+#: quotaio_rpc.c:58 quotaio_v1.c:308 quotaio_v2.c:464
 #, c-format
 msgid "Trying to write quota to readonly quotafile on %s\n"
 msgstr ""
@@ -1425,29 +1439,29 @@
 msgid "Cannot write quota (id %u): %s\n"
 msgstr "Impossible d'écrire le quota (id %u) : %s\n"
 
-#: quotaio_tree.c:278
+#: quotaio_tree.c:279
 #, c-format
 msgid "Quota write failed (id %u): %s\n"
 msgstr "Échec de l'écriture des quotas (id %u) : %s\n"
 
-#: quotaio_tree.c:290
+#: quotaio_tree.c:291
 #, c-format
 msgid "Quota structure has offset to other block (%u) than it should (%u).\n"
 msgstr ""
 "La structure du quota comporte un décalage vers un autre bloc (%u) que celui "
 "qu'elle devrait (%u).\n"
 
-#: quotaio_tree.c:366
+#: quotaio_tree.c:367
 #, c-format
 msgid "Quota for id %u referenced but not present.\n"
 msgstr "Quota pour l'id %u référencé mais absent.\n"
 
-#: quotaio_tree.c:424
+#: quotaio_tree.c:426
 #, c-format
 msgid "Cannot read quota structure for id %u: %s\n"
 msgstr "Impossible de lire la structure de quota pour l'id %u : %s\n"
 
-#: quotaio_tree.c:465
+#: quotaio_tree.c:468
 #, c-format
 msgid ""
 "Illegal reference (%u >= %u) in %s quota file on %s. Quota file is probably "
@@ -1455,14 +1469,14 @@
 "Please run quotacheck(8) and try again.\n"
 msgstr ""
 
-#: quotaio_v1.c:206
+#: quotaio_v1.c:214
 #, c-format
 msgid "Trying to write info to readonly quotafile on %s.\n"
 msgstr ""
 "Tentative d'écriture des informations dans un fichier en lecture seule sur "
 "%s.\n"
 
-#: quotaio_v2.c:254
+#: quotaio_v2.c:255
 msgid ""
 "Your quota file is stored in wrong endianity. Please use convertquota(8) to "
 "convert it.\n"
@@ -1470,14 +1484,14 @@
 "Votre fichier de quotas est stocké avec un ordre des octets incorrect. "
 "Veuillez utiliser convertquota(8) pour le convertir.\n"
 
-#: quotaio_v2.c:371
+#: quotaio_v2.c:388
 #, c-format
 msgid "Trying to write info to readonly quotafile on %s\n"
 msgstr ""
 "Tentative d'écriture des informations dans un fichier en lecture seule sur "
 "%s\n"
 
-#: quotaio_v2.c:496
+#: quotaio_v2.c:518
 #, c-format
 msgid ""
 "Statistics:\n"
@@ -1492,35 +1506,35 @@
 "Entrées : %u\n"
 "Moyenne d'utilisation : %f\n"
 
-#: quotaio_xfs.c:243
+#: quotaio_xfs.c:217
 #, c-format
 msgid "*** Status for %s quotas on device %s\n"
 msgstr "*** Statut des quotas %s sur le périphérique %s\n"
 
-#: quotaio_xfs.c:245 quotaio_xfs.c:260
+#: quotaio_xfs.c:219 quotaio_xfs.c:234
 msgid "ON"
 msgstr "ACTIVÉ"
 
-#: quotaio_xfs.c:245 quotaio_xfs.c:260
+#: quotaio_xfs.c:219 quotaio_xfs.c:234
 msgid "OFF"
 msgstr "DESACTIVÉ"
 
-#: quotaio_xfs.c:247 quotaio_xfs.c:251
+#: quotaio_xfs.c:221 quotaio_xfs.c:225
 #, c-format
 msgid "Accounting: %s; Enforcement: %s\n"
 msgstr "Compte : %s ; En vigueur : %s\n"
 
-#: quotaio_xfs.c:263 quotaio_xfs.c:267
+#: quotaio_xfs.c:237 quotaio_xfs.c:241
 #, c-format
 msgid "Accounting [ondisk]: %s; Enforcement [ondisk]: %s\n"
 msgstr "Compte [sur disque] : %s ; En vigueur [sur disque] : %s\n"
 
-#: quotaio_xfs.c:276 quotaio_xfs.c:285
+#: quotaio_xfs.c:250 quotaio_xfs.c:259
 #, c-format
 msgid "Inode: none\n"
 msgstr "Inode : aucun\n"
 
-#: quotaio_xfs.c:278 quotaio_xfs.c:287
+#: quotaio_xfs.c:252 quotaio_xfs.c:261
 #, c-format
 msgid "Inode: #%llu (%llu blocks, %u extents)\n"
 msgstr ""
@@ -1532,7 +1546,7 @@
 "\t%s [-guvp] [-F quotaformat] [-x state] -a\n"
 "\t%s [-guvp] [-F quotaformat] [-x state] filesys ...\n"
 "\n"
-"-a, --all                turn quotas on for all filesystems\n"
+"-a, --all                turn quotas %s for all filesystems\n"
 "-f, --off                turn quotas off\n"
 "-u, --user               operate on user quotas\n"
 "-g, --group              operate on group quotas\n"
@@ -1543,125 +1557,111 @@
 "-h, --help               display this help text and exit\n"
 "-V, --version            display version information and exit\n"
 msgstr ""
-"Utilisation:\n"
-"\t%s [-guvp] [-F quotaformat] [-x state] -a\n"
-"\t%s [-guvp] [-F quotaformat] [-x state] filesys ...\n"
-"\n"
-"-a, --all activer les quotas pour tous les systèmes de fichiers\n"
-"-f, --off désactiver les quotas\n"
-"-u, --user agir sur les quotas de l'utilisateur\n"
-"-g, --group agir sur les quotas du groupe\n"
-"-p, --print-state afficher si les quotas sont activés ou non\n"
-"-x, --xfs-command=cmd réaliser la commande de quota XFS\n"
-"-F, --format=formatname agir sur le format de quota spécifique\n"
-"-v, --verbose afficher plus de messages\n"
-"-h, --help afficher cette aide et quitter\n"
-"-V, --version afficher le numéro de version et quitter\n"
 
-#: quotaon.c:138
+#: quotaon.c:78 quotaon.c:356
+msgid "off"
+msgstr "désactivé"
+
+#: quotaon.c:78 quotaon.c:356
+msgid "on"
+msgstr "activé"
+
+#: quotaon.c:139
 msgid "Cannot turn on/off quotas via RPC.\n"
 msgstr "Impossible d'activer/désactiver les quotas via RPC.\n"
 
-#: quotaon.c:185
+#: quotaon.c:186
 #, c-format
 msgid "set root_squash on %s: %s\n"
 msgstr "Positionnez « root_squash » sur %s : %s\n"
 
-#: quotaon.c:189
+#: quotaon.c:190
 #, c-format
 msgid "%s: %s root_squash turned off\n"
 msgstr "%s : %s « root_squash » désactivé\n"
 
-#: quotaon.c:191
+#: quotaon.c:192
 #, c-format
 msgid "%s: %s root_squash turned on\n"
 msgstr "%s : %s « root_squash » activé\n"
 
-#: quotaon.c:209
+#: quotaon.c:210
 #, c-format
 msgid "quotactl on %s [%s]: %s\n"
 msgstr "quotactl sur %s [%s] : %s\n"
 
-#: quotaon.c:212
+#: quotaon.c:213
 #, c-format
 msgid "%s [%s]: %s quotas turned off\n"
 msgstr "%s [%s] : quotas %s désactivés\n"
 
-#: quotaon.c:225
+#: quotaon.c:226
 #, c-format
 msgid "cannot find %s on %s [%s]\n"
 msgstr "Impossible de trouver %s sur %s [%s]\n"
 
-#: quotaon.c:227
+#: quotaon.c:228
 #, c-format
 msgid "using %s on %s [%s]: %s\n"
 msgstr "utilisation de %s sur %s [%s] : %s\n"
 
-#: quotaon.c:229
+#: quotaon.c:230
 msgid "Maybe create new quota files with quotacheck(8)?\n"
 msgstr ""
 "Essayez peut-être de créer un nouveau fichier de quotas avec quotacheck(8) "
 "?\n"
 
-#: quotaon.c:231
+#: quotaon.c:232
 msgid "Quota format not supported in kernel.\n"
 msgstr "Ce format de quotas n'est pas supporté par le noyau.\n"
 
-#: quotaon.c:234
+#: quotaon.c:235
 #, c-format
 msgid "%s [%s]: %s quotas turned on\n"
 msgstr "%s [%s] : quotas %s activés\n"
 
-#: quotaon.c:287
+#: quotaon.c:288
 msgid "Cannot change state of GFS2 quota.\n"
 msgstr ""
 
-#: quotaon.c:291
+#: quotaon.c:292
 msgid "Cannot change state of XFS quota. It's not compiled in kernel.\n"
 msgstr ""
 "Impossible de changer l'état du quota XFS. Cela n'est pas compilé dans le "
 "Noyau.\n"
 
-#: quotaon.c:318
+#: quotaon.c:319
 #, c-format
 msgid "Cannot find quota file on %s [%s] to turn quotas on/off.\n"
 msgstr ""
 "Impossible de trouver le fichier de quotas sur %s [%s] pour "
 "activer/désactiver les quotas.\n"
 
-#: quotaon.c:323
+#: quotaon.c:324
 #, c-format
 msgid "Quota file on %s [%s] does not exist or has wrong format.\n"
 msgstr ""
 
-#: quotaon.c:354
+#: quotaon.c:355
 #, c-format
 msgid "%s quota on %s (%s) is %s\n"
 msgstr "%s quota sur %s (%s) est %s\n"
 
-#: quotaon.c:355
-msgid "on"
-msgstr "activé"
-
-#: quotaon.c:355
-msgid "off"
-msgstr "désactivé"
-
-#: quotaon.c:371
+#: quotaon.c:372
 #, c-format
 msgid "Name must be quotaon or quotaoff not %s\n"
 msgstr "Le nom doit être « quotaon » ou « quotaoff » et non %s\n"
 
-#: quotaon.c:377
+#: quotaon.c:378
 #, c-format
 msgid "Required format %s not supported by kernel.\n"
 msgstr "Le format requis %s n'est pas supporté par le noyau.\n"
 
-#: quotaon.c:379
+#: quotaon.c:380
 msgid "Warning: No quota format detected in the kernel.\n"
 msgstr "Attention : Aucun format de quota détecté dans le noyau.\n"
 
-#: quotaon.c:386
+#: quotaon.c:387
 #, c-format
 msgid "%s: Quota cannot be turned on on NFS filesystem\n"
 msgstr ""
@@ -1921,8 +1921,8 @@
 "  Système de fichiers                 sursis bloc               sursis "
 "inode\n"
 
-#: quotaops.c:455 quotaops.c:461 quotaops.c:503 quotaops.c:515 setquota.c:241
-#: setquota.c:247
+#: quotaops.c:455 quotaops.c:461 quotaops.c:503 quotaops.c:515 setquota.c:245
+#: setquota.c:251
 msgid "unset"
 msgstr "vide"
 
@@ -1930,7 +1930,7 @@
 msgid "0seconds"
 msgstr "0seconds"
 
-#: quotaops.c:465 quotasys.c:357
+#: quotaops.c:465 quotasys.c:320
 #, c-format
 msgid "%useconds"
 msgstr "%useconds"
@@ -1981,90 +1981,109 @@
 msgid " block grace period: %d %s file grace period: %d %s"
 msgstr " période de sursis bloc : %d %s période de sursis fichier : %d %s"
 
-#: quotastats.c:50
+#: quotastats.c:48
 #, c-format
 msgid "Cannot read stat file %s: %s\n"
 msgstr "Impossible de lire le fichier de statistiques  %s : %s\n"
 
-#: quotastats.c:85
+#: quotastats.c:83
 #, c-format
 msgid "Error while getting quota statistics from kernel: %s\n"
 msgstr ""
 "Erreur lors de la récupération des statistiques des quotas du noyau : %s\n"
 
-#: quotastats.c:89
+#: quotastats.c:87
 #, c-format
 msgid "Error while getting old quota statistics from kernel: %s\n"
 msgstr ""
 "Erreur lors de la récupération des anciennes statistiques des quotas du "
 "noyau : %s\n"
 
-#: quotastats.c:103
+#: quotastats.c:101
 #, c-format
 msgid "Kernel quota version: old\n"
 msgstr "Version quotas du noyau : ancienne\n"
 
-#: quotastats.c:105
+#: quotastats.c:103
 #, c-format
 msgid "Kernel quota version: %u.%u.%u\n"
 msgstr "Version quotas du noyau : %u.%u.%u\n"
 
-#: quotastats.c:106
+#: quotastats.c:104
 #, c-format
 msgid "Number of dquot lookups: %ld\n"
 msgstr "Nombre de requêtes dquot : %ld\n"
 
-#: quotastats.c:107
+#: quotastats.c:105
 #, c-format
 msgid "Number of dquot drops: %ld\n"
 msgstr "Nombre de rejets dquot : %ld\n"
 
-#: quotastats.c:108
+#: quotastats.c:106
 #, c-format
 msgid "Number of dquot reads: %ld\n"
 msgstr "Nombre de lectures dquot : %ld\n"
 
-#: quotastats.c:109
+#: quotastats.c:107
 #, c-format
 msgid "Number of dquot writes: %ld\n"
 msgstr "Nombre d'écritures dquot : %ld\n"
 
-#: quotastats.c:110
+#: quotastats.c:108
 #, c-format
 msgid "Number of quotafile syncs: %ld\n"
 msgstr "Nombre de synchro fichier de quotas : %ld\n"
 
-#: quotastats.c:111
+#: quotastats.c:109
 #, c-format
 msgid "Number of dquot cache hits: %ld\n"
 msgstr "Nombre de succès cache dquot : %ld\n"
 
-#: quotastats.c:112
+#: quotastats.c:110
 #, c-format
 msgid "Number of allocated dquots: %ld\n"
 msgstr "Nombre de dquots alloués : %ld\n"
 
-#: quotastats.c:113
+#: quotastats.c:111
 #, c-format
 msgid "Number of free dquots: %ld\n"
 msgstr "Nombre de dquots libre : %ld\n"
 
-#: quotastats.c:114
+#: quotastats.c:112
 #, c-format
 msgid "Number of in use dquot entries (user/group): %ld\n"
 msgstr "Nombre d'entrées dquot utilisées (utilisateur/groupe) : %ld\n"
 
-#: quotasys.c:131
+#: quotasync.c:25
+#, c-format
+msgid ""
+"Utility for syncing quotas.\n"
+"Usage:\n"
+"%s [-ug] -a | mntpoint...\n"
+"\n"
+msgstr ""
+
+#: quotasync.c:89
+#, c-format
+msgid "%s quota sync failed: %s\n"
+msgstr ""
+
+#: quotasync.c:100
+#, c-format
+msgid "%s quota sync failed for %s: %s\n"
+msgstr ""
+
+#: quotasys.c:94
 #, c-format
 msgid "user %s does not exist.\n"
 msgstr "l'utilisateur %s n'existe pas.\n"
 
-#: quotasys.c:160
+#: quotasys.c:123
 #, c-format
 msgid "group %s does not exist.\n"
 msgstr "le groupe %s n'existe pas.\n"
 
-#: quotasys.c:262
+#: quotasys.c:225
 #, c-format
 msgid ""
 "Unknown quota format: %s\n"
@@ -2076,85 +2095,85 @@
 "  xfs - XFS quota format\n"
 msgstr ""
 
-#: quotasys.c:345
+#: quotasys.c:308
 #, c-format
 msgid "%ddays"
 msgstr "%ddays"
 
-#: quotasys.c:347
+#: quotasys.c:310
 #, c-format
 msgid "%02d:%02d"
 msgstr "%02d:%02d"
 
-#: quotasys.c:359
+#: quotasys.c:322
 #, c-format
 msgid "%uminutes"
 msgstr "%uminutes"
 
-#: quotasys.c:361
+#: quotasys.c:324
 #, c-format
 msgid "%uhours"
 msgstr "%uhours"
 
-#: quotasys.c:363
+#: quotasys.c:326
 #, c-format
 msgid "%udays"
 msgstr "%udays"
 
-#: quotasys.c:524
+#: quotasys.c:487
 #, c-format
 msgid "Cannot stat quota file %s: %s\n"
 msgstr "Impossible de faire les statistiques du fichier de quota %s: %s\n"
 
-#: quotasys.c:673
+#: quotasys.c:636
 msgid "Not all specified mountpoints are using quota.\n"
 msgstr "Les points de montage spécifiés n'utilisent pas tous les quotas.\n"
 
-#: quotasys.c:687
+#: quotasys.c:650
 #, c-format
 msgid "Error while releasing file on %s\n"
 msgstr "Erreur lors de la libération fichier sur %s\n"
 
-#: quotasys.c:746
+#: quotasys.c:709
 #, c-format
 msgid "Cannot create set for sigaction(): %s\n"
 msgstr ""
 
-#: quotasys.c:749
+#: quotasys.c:712
 #, c-format
 msgid "Cannot set signal handler: %s\n"
 msgstr "Impossible de positionner le handler du signal : %s\n"
 
-#: quotasys.c:802
+#: quotasys.c:765
 #, c-format
 msgid "Cannot reset signal handler: %s\n"
 msgstr "Impossible de réinitialiser le handler du signal : %s\n"
 
-#: quotasys.c:937
+#: quotasys.c:900
 msgid "Cannot open any file with mount points.\n"
 msgstr ""
 
-#: quotasys.c:948
+#: quotasys.c:911
 #, c-format
 msgid "Cannot get device name for %s\n"
 msgstr "Impossible d'obtenir le nom du périphérique pour : %s\n"
 
-#: quotasys.c:985
+#: quotasys.c:948
 #, c-format
 msgid "Cannot resolve mountpoint path %s: %s\n"
 msgstr "Impossible de résoudre le chemin du point de montage %s : %s\n"
 
-#: quotasys.c:991
+#: quotasys.c:954
 #, c-format
 msgid "Cannot statfs() %s: %s\n"
 msgstr "Impossible d'utiliser statfs() %s : %s\n"
 
-#: quotasys.c:1003
+#: quotasys.c:966
 #, c-format
 msgid "Cannot stat() mounted device %s: %s\n"
 msgstr "Impossible d'utiliser stat() sur le périphérique monté %s : %s\n"
 
-#: quotasys.c:1009
+#: quotasys.c:972
 #, c-format
 msgid ""
 "Device (%s) filesystem is mounted on unsupported device type. Skipping.\n"
@@ -2163,29 +2182,29 @@
 "périphérique non supporté.\n"
 "Abandon...\n"
 
-#: quotasys.c:1024
+#: quotasys.c:987
 #, c-format
 msgid "Cannot find device of loopback mount in options for %s. Skipping.\n"
 msgstr ""
 "Impossible de trouver le périphérique de montage du bouclage dans les "
 "options pour %s. On passe outre.\n"
 
-#: quotasys.c:1033
+#: quotasys.c:996
 #, c-format
 msgid "Cannot stat() loopback device %s: %s\n"
 msgstr "Impossible de lancer stat() sur le périphérique de bouclage %s: %s\n"
 
-#: quotasys.c:1038
+#: quotasys.c:1001
 #, c-format
 msgid "Loopback device %s is not block device!\n"
 msgstr "Le périphérique de bouclage %s n'est pas de type bloc !\n"
 
-#: quotasys.c:1056
+#: quotasys.c:1019
 #, c-format
 msgid "Cannot stat() mountpoint %s: %s\n"
 msgstr "Impossible de lancer stat() sur le point de montage %s: %s\n"
 
-#: quotasys.c:1120
+#: quotasys.c:1083
 #, c-format
 msgid ""
 "Cannot find a device with %s.\n"
@@ -2194,7 +2213,7 @@
 "Impossible de trouver un périphérique avec %s.\n"
 "On passe outre...\n"
 
-#: quotasys.c:1124
+#: quotasys.c:1087
 #, c-format
 msgid ""
 "Cannot stat() a mountpoint with %s: %s\n"
@@ -2203,7 +2222,7 @@
 "Impossible de lancer stat() sur un point de montage avec %s: %s\n"
 "On passe outre.\n"
 
-#: quotasys.c:1132
+#: quotasys.c:1095
 #, c-format
 msgid ""
 "Cannot stat() given mountpoint %s: %s\n"
@@ -2212,33 +2231,33 @@
 "Impossible de lancer stat() sur le point de montage avec %s: %s\n"
 "On passe outre.\n"
 
-#: quotasys.c:1142
+#: quotasys.c:1105
 #, c-format
 msgid "Cannot find a filesystem mountpoint for directory %s\n"
 msgstr ""
 "Impossible de trouver un point de montage de système de fichier pour le "
 "répertoire %s\n"
 
-#: quotasys.c:1148
+#: quotasys.c:1111
 #, c-format
 msgid "Cannot resolve path %s: %s\n"
 msgstr "Impossible de résoudre le chemin %s: %s\n"
 
-#: quotasys.c:1159
+#: quotasys.c:1122
 #, c-format
 msgid "Cannot find mountpoint for device %s\n"
 msgstr "Impossible de trouver un point de montage  pour le périphérique %s\n"
 
-#: quotasys.c:1165
+#: quotasys.c:1128
 #, c-format
 msgid "Specified path %s is not directory nor device.\n"
 msgstr "Le chemin spécifié %s n'est ni un répertoire ni un périphérique.\n"
 
-#: quotasys.c:1173
+#: quotasys.c:1136
 msgid "No correct mountpoint specified.\n"
 msgstr "Aucun point de montage correct spécifié.\n"
 
-#: quotasys.c:1234
+#: quotasys.c:1197
 #, c-format
 msgid "Mountpoint (or device) %s not found or has no quota enabled.\n"
 msgstr ""
@@ -2255,7 +2274,7 @@
 "-g, --group                 display information about groups\n"
 "-s, --human-readable        show numbers in human friendly units (MB, GB, "
 "...)\n"
-"-t, --truncate-names        truncate names to 8 characters\n"
+"-t, --truncate-names        truncate names to 9 characters\n"
 "-p, --raw-grace             print grace time in seconds since epoch\n"
 "-n, --no-names              do not translate uid/gid to name\n"
 "-i, --no-autofs             avoid autofs mountpoints\n"
@@ -2314,7 +2333,7 @@
 msgid "Group"
 msgstr "Groupe"
 
-#: rquota_svc.c:90
+#: rquota_svc.c:88
 #, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -2329,7 +2348,7 @@
 " -x --xtab <path>      set an alternative file with NFSD export table\n"
 msgstr ""
 
-#: rquota_svc.c:101
+#: rquota_svc.c:99
 #, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -2342,36 +2361,36 @@
 " -x --xtab <path>      set an alternative file with NFSD export table\n"
 msgstr ""
 
-#: rquota_svc.c:148
+#: rquota_svc.c:146
 #, c-format
 msgid "Illegal port number: %s\n"
 msgstr "Numéro de port invalide : %s\n"
 
-#: rquota_svc.c:155
+#: rquota_svc.c:153
 #, c-format
 msgid "Cannot access the specified xtab file %s: %s\n"
 msgstr "Impossible d'accéder au fichier xtab spécifié %s : %s\n"
 
-#: rquota_svc.c:185
+#: rquota_svc.c:183
 #, c-format
 msgid "host %s attempted to call setquota when disabled\n"
 msgstr "La machine %s a tenté d'appeler setquota alors qu'il est désactivé\n"
 
-#: rquota_svc.c:192
+#: rquota_svc.c:190
 #, c-format
 msgid "host %s attempted to call setquota from port >= 1024\n"
 msgstr "La machine %s a tenté d'appeler setquota depuis un port >= 1024\n"
 
-#: rquota_svc.c:207
+#: rquota_svc.c:205
 #, c-format
 msgid "Denied access to host %s\n"
 msgstr "Accès refusé à la machine %s\n"
 
-#: rquota_svc.c:295 rquota_svc.c:381
+#: rquota_svc.c:293 rquota_svc.c:379
 msgid "unable to free arguments\n"
 msgstr "Imposible de libérer les arguments\n"
 
-#: rquota_svc.c:404
+#: rquota_svc.c:402
 #, c-format
 msgid ""
 "Warning: Cannot open export table %s: %s\n"
@@ -2380,31 +2399,31 @@
 "Attention : Impossible d'accéder à la table d'export %s : %s\n"
 "'/' sera utilisé comme pseudo-racine du système de fichiers.\n"
 
-#: rquota_svc.c:456
+#: rquota_svc.c:454
 msgid "cannot create udp service.\n"
 msgstr "Impossible de créer le service udp.\n"
 
-#: rquota_svc.c:460
+#: rquota_svc.c:458
 msgid "unable to register (RQUOTAPROG, RQUOTAVERS, udp).\n"
 msgstr "Impossible d'enregistrer (RQUOTAPROG, RQUOTAVERS, udp).\n"
 
-#: rquota_svc.c:464
+#: rquota_svc.c:462
 msgid "unable to register (RQUOTAPROG, EXT_RQUOTAVERS, udp).\n"
 msgstr "Impossible d'enregistrer (RQUOTAPROG, EXT_RQUOTAVERS, udp).\n"
 
-#: rquota_svc.c:471
+#: rquota_svc.c:469
 msgid "cannot create tcp service.\n"
 msgstr "impossible de créer le service tcp.\n"
 
-#: rquota_svc.c:475
+#: rquota_svc.c:473
 msgid "unable to register (RQUOTAPROG, RQUOTAVERS, tcp).\n"
 msgstr "Imposible d'enregistrer (RQUOTAPROG, RQUOTAVERS, tcp).\n"
 
-#: rquota_svc.c:479
+#: rquota_svc.c:477
 msgid "unable to register (RQUOTAPROG, EXT_RQUOTAVERS, tcp).\n"
 msgstr "Impossible d'enregistrer (RQUOTAPROG, EXT_RQUOTAVERS, tcp).\n"
 
-#: rquota_svc.c:488
+#: rquota_svc.c:486
 msgid "svc_run returned\n"
 msgstr "Retour de svc_run\n"
 
@@ -2514,70 +2533,79 @@
 "Le mode batch et le l'utilisateur protype ne peuvent pas être utilisés "
 "ensemble.\n"
 
-#: setquota.c:225
+#: setquota.c:206
+msgid "Cannot set grace times over RPC protocol.\n"
+msgstr ""
+
+#: setquota.c:229
 msgid "block softlimit"
 msgstr "limite souple bloc"
 
-#: setquota.c:226
+#: setquota.c:230
 msgid "block hardlimit"
 msgstr "limite stricte bloc"
 
-#: setquota.c:227
+#: setquota.c:231
 msgid "inode softlimit"
 msgstr "limite souple inode"
 
-#: setquota.c:228
+#: setquota.c:232
 msgid "inode hardlimit"
 msgstr "limite stricte inode"
 
-#: setquota.c:234 setquota.c:246
+#: setquota.c:238 setquota.c:250
 msgid "block grace time"
 msgstr "temps de sursis bloc"
 
-#: setquota.c:235 setquota.c:252
+#: setquota.c:239 setquota.c:256
 msgid "inode grace time"
 msgstr "temps de sursis inode"
 
-#: setquota.c:258
+#: setquota.c:262
 msgid "Mountpoint not specified.\n"
 msgstr "Point de montage non spécifié.\n"
 
-#: setquota.c:313
+#: setquota.c:317
 #, c-format
 msgid "Line %d too long.\n"
 msgstr ""
 
-#: setquota.c:325
+#: setquota.c:329
 #, c-format
 msgid "Cannot parse input line %d.\n"
 msgstr "Impossible d'analyser la ligne %d en entrée.\n"
 
-#: setquota.c:327 setquota.c:335
+#: setquota.c:331 setquota.c:339
 msgid "Exitting.\n"
 msgstr ""
 
-#: setquota.c:328 setquota.c:336
+#: setquota.c:332 setquota.c:340
 msgid "Skipping line.\n"
 msgstr ""
 
-#: setquota.c:333
+#: setquota.c:337
 #, c-format
 msgid "Unable to resolve name '%s' on line %d.\n"
 msgstr ""
 
-#: setquota.c:396
+#: setquota.c:383
+#, c-format
+msgid "Setting grace period on %s is not supported.\n"
+msgstr ""
+
+#: setquota.c:405
 #, c-format
 msgid ""
 "Not setting block grace time on %s because softlimit is not exceeded.\n"
 msgstr ""
 
-#: setquota.c:400
+#: setquota.c:409
 #, c-format
 msgid ""
 "Not setting inode grace time on %s because softlimit is not exceeded.\n"
 msgstr ""
 
-#: setquota.c:403
+#: setquota.c:412
 #, c-format
 msgid ""
 "cannot write times for %s. Maybe kernel does not support such operation?\n"
@@ -2600,7 +2628,7 @@
 msgid "Cannot bind to given address: %s\n"
 msgstr "Impossible d'exécuter bind() avec l'adresse donnée : %s\n"
 
-#: warnquota.c:56
+#: warnquota.c:54
 msgid ""
 "Hi,\n"
 "\n"
@@ -2614,7 +2642,7 @@
 "quotas utilisé sur ce système. Voici les dépassements relevés :\n"
 "\n"
 
-#: warnquota.c:58
+#: warnquota.c:56
 #, c-format
 msgid ""
 "\n"
@@ -2641,7 +2669,7 @@
 "Pour plus de renseignements, veuillez nous contacter au %s\n"
 "ou par téléphone au %s.\n"
 
-#: warnquota.c:65
+#: warnquota.c:63
 #, c-format
 msgid ""
 "Hi,\n"
@@ -2657,7 +2685,7 @@
 "relevés :\n"
 "\n"
 
-#: warnquota.c:67
+#: warnquota.c:65
 #, c-format
 msgid ""
 "\n"
@@ -2686,74 +2714,74 @@
 "Pour plus de renseignements, veuillez nous contacter au %s\n"
 "ou par téléphone au %s.\n"
 
-#: warnquota.c:184
+#: warnquota.c:182
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s : %s\n"
 
-#: warnquota.c:228
+#: warnquota.c:226
 #, c-format
 msgid "Cannot get name for uid/gid %u.\n"
 msgstr "Impossible d'obtenir le nom pour le uid/gid %u.\n"
 
-#: warnquota.c:312
+#: warnquota.c:310
 #, c-format
 msgid "Cannot create pipe: %s\n"
 msgstr "Impossible de créer un pipe : %s\n"
 
-#: warnquota.c:318
+#: warnquota.c:316
 #, c-format
 msgid "Cannot fork: %s\n"
 msgstr "Impossible de forker: %s\n"
 
-#: warnquota.c:323
+#: warnquota.c:321
 #, c-format
 msgid "Cannot duplicate descriptor: %s\n"
 msgstr "Impossible de dupliquer le descripteur : %s\n"
 
-#: warnquota.c:327
+#: warnquota.c:325
 #, c-format
 msgid "Cannot execute '%s': %s\n"
 msgstr "Impossible d'exécuter '%s' : %s\n"
 
-#: warnquota.c:332
+#: warnquota.c:330
 #, c-format
 msgid "Cannot open pine: %s\n"
 msgstr "Impossible d'ouvrir le pipe : %s\n"
 
-#: warnquota.c:413
+#: warnquota.c:411
 msgid "Could not setup ldap connection, returning.\n"
 msgstr "La connexion ldap n'a pas pu être établie, abandon.\n"
 
-#: warnquota.c:436
+#: warnquota.c:434
 #, c-format
 msgid "Error with %s.\n"
 msgstr "Erreur avec %s.\n"
 
-#: warnquota.c:444
+#: warnquota.c:442
 #, c-format
 msgid "Multiple entries found for client %s, %d not sending mail.\n"
 msgstr ""
 "Entrées multiples trouvées pour le client %s, %d courriel non envoyé.\n"
 
-#: warnquota.c:448
+#: warnquota.c:446
 #, c-format
 msgid "Entry not found for client %s, %d not sending mail.\n"
 msgstr "Entrée non trouvée pour le client %s (%d), courriel non envoyé.\n"
 
-#: warnquota.c:459
+#: warnquota.c:457
 #, c-format
 msgid "Could not get values for %s.\n"
 msgstr "Impossible de trouver les valeurs pour %s.\n"
 
-#: warnquota.c:491
+#: warnquota.c:489
 #, c-format
 msgid "Administrator for a group %s not found. Cancelling mail.\n"
 msgstr ""
 "Administrateur pour le groupe %s non trouvé. Abandon de l'envoi du "
 "courrier.\n"
 
-#: warnquota.c:536
+#: warnquota.c:534
 #, c-format
 msgid ""
 "\n"
@@ -2762,7 +2790,7 @@
 "\n"
 "                        Limites bloc               Limites fichiers\n"
 
-#: warnquota.c:537
+#: warnquota.c:535
 #, c-format
 msgid ""
 "Filesystem           used    soft    hard  grace    used  soft  hard  grace\n"
@@ -2770,17 +2798,17 @@
 "Système fichiers   utilisé souple stricte sursis utilisé souple stricte "
 "sursis\n"
 
-#: warnquota.c:577
+#: warnquota.c:575
 #, c-format
 msgid "Cannot wait for mailer: %s\n"
 msgstr "Impossible d'attendre le gestionnaire de mail : %s\n"
 
-#: warnquota.c:579
+#: warnquota.c:577
 msgid "Warning: Mailer exitted abnormally.\n"
 msgstr ""
 "Attention : le client de messagerie s'est terminé de manière inattendue.\n"
 
-#: warnquota.c:636
+#: warnquota.c:634
 #, c-format
 msgid ""
 "Cannot open %s: %s\n"
@@ -2789,20 +2817,20 @@
 "Impossible d'ouvrir %s : %s\n"
 "utilisation de snom de périphérique.\n"
 
-#: warnquota.c:659
+#: warnquota.c:657
 #, c-format
 msgid "Cannot parse line %d in quotatab (missing ':')\n"
 msgstr ""
 "Impossible d'interprêter la ligne %d dans quotatab (il manque \":\")\n"
 
-#: warnquota.c:673
+#: warnquota.c:671
 #, c-format
 msgid "Cannot stat device %s (maybe typo in quotatab)\n"
 msgstr ""
 "Impossible de lancer les statistiques du périphérique %s (peut-être typo "
 "dans quotatab)\n"
 
-#: warnquota.c:693
+#: warnquota.c:691
 #, c-format
 msgid ""
 "Incorrect format string for variable %s.\n"
@@ -2811,38 +2839,38 @@
 "Chaîne de format incorrecte pour la variable %s.\n"
 "Expression non reconnue %%%c.\n"
 
-#: warnquota.c:732
+#: warnquota.c:730
 #, c-format
 msgid "Cannot open %s: %s\n"
 msgstr "Impossible d'ouvrir %s : %s\n"
 
-#: warnquota.c:752
+#: warnquota.c:750
 #, c-format
 msgid "Line %d too long. Truncating.\n"
 msgstr "Ligne %d trop longue. Tronquée.\n"
 
-#: warnquota.c:824
+#: warnquota.c:822
 #, c-format
 msgid "Cannot parse time at CC_BEFORE variable (line %d).\n"
 msgstr ""
 "Impossible d'analyser l'heure dans la variable CC_BEFORE (ligne %d).\n"
 
-#: warnquota.c:848
+#: warnquota.c:846
 #, c-format
 msgid "Error in config file (line %d), ignoring\n"
 msgstr "Erreur dans le fichier de configuration (ligne %d), ignorée\n"
 
-#: warnquota.c:851
+#: warnquota.c:849
 #, c-format
 msgid "Possible error in config file (line %d), ignoring\n"
 msgstr ""
 "Erreur probable dans le fichier de configuration (ligne %d), ignorée\n"
 
-#: warnquota.c:854
+#: warnquota.c:852
 msgid "Unterminated last line, ignoring\n"
 msgstr "Dernière ligne non terminée, ignorée\n"
 
-#: warnquota.c:861
+#: warnquota.c:859
 #, c-format
 msgid ""
 "LDAP library version >= 2.3 detected. Please use LDAP_URI instead of "
@@ -2850,30 +2878,30 @@
 "Generated URI %s\n"
 msgstr ""
 
-#: warnquota.c:865
+#: warnquota.c:863
 msgid "LDAP library does not support ldap_initialize() but URI is specified."
 msgstr ""
 
-#: warnquota.c:887
+#: warnquota.c:885
 #, c-format
 msgid "Cannot open file with group administrators: %s\n"
 msgstr "Impossible d'ouvrir le fichier avec le groupe administrateurs : %s\n"
 
-#: warnquota.c:902
+#: warnquota.c:900
 #, c-format
 msgid "Parse error at line %d. Cannot find end of group name.\n"
 msgstr ""
 "Erreur d'interprêtation à la ligne %d. Impossible de trouver la fin du nom "
 "du groupe.\n"
 
-#: warnquota.c:911
+#: warnquota.c:909
 #, c-format
 msgid "Parse error at line %d. Cannot find administrators name.\n"
 msgstr ""
 "Erreur d'interprêtation à la ligne %d. Impossible de trouver le nom des "
 "administrateurs\n"
 
-#: warnquota.c:921
+#: warnquota.c:919
 #, c-format
 msgid ""
 "Parse error at line %d. Trailing characters after administrators name.\n"
@@ -2881,7 +2909,7 @@
 "Erreur d'analyse à la ligne %d. Caractères parasites après le nom des "
 "administrateurs.\n"
 
-#: warnquota.c:984
+#: warnquota.c:982
 msgid ""
 "Usage:\n"
 "  warnquota [-ugsid] [-F quotaformat] [-c configfile] [-q quotatabfile] [-a "
@@ -2919,7 +2947,7 @@
 "-v, --version Afficher les informations de version et quitter\n"
 "\n"
 
-#: warnquota.c:1065
+#: warnquota.c:1063
 #, c-format
 msgid "Cannot get host name: %s\n"
 msgstr "Impossible d'obtenir le nom d'hôte : %s\n"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/realpath.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/realpath.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/realpath.po	2012-01-02 17:27:49.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/realpath.po	2012-02-23 06:32:14.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-30 01:43+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 06:52+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: ../../src/realpath.c:59
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/recode.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/recode.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/recode.po	2012-01-02 17:26:54.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/recode.po	2012-02-23 06:31:20.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:54+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:45+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/main.c:142
 msgid "No error"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/rpm.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/rpm.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/rpm.po	2012-01-02 17:26:54.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/rpm.po	2012-02-23 06:31:20.000000000 +0000
@@ -18,8 +18,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:54+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:45+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: \n"
 
 #: cliutils.c:20 lib/poptI.c:29
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/rrdtool.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/rrdtool.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/rrdtool.po	2012-01-02 17:26:54.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/rrdtool.po	2012-02-23 06:31:20.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:55+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:45+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/rrd_getopt.c:618
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/sane-backends.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/sane-backends.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/sane-backends.po	2012-01-02 17:26:54.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/sane-backends.po	2012-02-23 06:31:20.000000000 +0000
@@ -51,8 +51,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:56+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:46+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../include/sane/saneopts.h:154
 #, no-c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/screen-resolution-extra.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/screen-resolution-extra.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/screen-resolution-extra.po	2012-01-02 17:27:27.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/screen-resolution-extra.po	2012-02-23 06:31:50.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: screen-resolution-extra\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-19 17:01+0000\n"
+"POT-Creation-Date: 2012-01-13 09:12+0000\n"
 "PO-Revision-Date: 2009-04-01 12:41+0000\n"
 "Last-Translator: Bruno Patri <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:18+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:17+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../ScreenResolution/ui.py:59
 msgid ""
@@ -58,14 +58,14 @@
 msgstr "Modifier la résolution de l'écran"
 
 #: ../screenresolution-mechanism.policy.in.h:2
-msgid "Change the effect of Ctrl+Alt+Backspace"
-msgstr "Redéfinir l'effet de la séquence de touches Ctrl+Alt+RetArr"
-
-#: ../screenresolution-mechanism.policy.in.h:3
 msgid "Changing the Screen Resolution configuration requires privileges."
 msgstr ""
 "Modifier la résolution d'écran nécessite des droits d'administrateur."
 
+#: ../screenresolution-mechanism.policy.in.h:3
+msgid "Change the effect of Ctrl+Alt+Backspace"
+msgstr "Redéfinir l'effet de la séquence de touches Ctrl+Alt+RetArr"
+
 #: ../screenresolution-mechanism.policy.in.h:4
 msgid "Changing the effect of Ctrl+Alt+Backspace requires privileges."
 msgstr ""
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/sed.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/sed.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/sed.po	2012-01-02 17:26:56.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/sed.po	2012-02-23 06:31:22.000000000 +0000
@@ -18,8 +18,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:11+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:57+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: sed/compile.c:161
 msgid "multiple `!'s"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/shared-mime-info.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/shared-mime-info.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/shared-mime-info.po	2012-01-02 17:26:56.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/shared-mime-info.po	2012-02-23 06:31:23.000000000 +0000
@@ -9,2670 +9,2674 @@
 msgstr ""
 "Project-Id-Version: shared-mime-info\n"
 "Report-Msgid-Bugs-To: http://bugzilla.freedesktop.org/\n"
-"POT-Creation-Date: 2011-11-29 06:49+0000\n"
-"PO-Revision-Date: 2011-12-07 20:49+0000\n"
+"POT-Creation-Date: 2012-02-08 16:48+0000\n"
+"PO-Revision-Date: 2012-02-08 10:49+0000\n"
 "Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:11+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:57+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: ../freedesktop.org.xml.in.h:1
-msgid "3D Studio image"
-msgstr "image 3D Studio"
+msgid "ATK inset"
+msgstr "encart ATK"
 
 #: ../freedesktop.org.xml.in.h:2
-msgid "3GPP multimedia file"
-msgstr "fichier multimédia 3GPP"
+msgid "electronic book document"
+msgstr "document livre électronique"
 
 #: ../freedesktop.org.xml.in.h:3
-msgid "3GPP2 multimedia file"
-msgstr "fichier multimédia 3GPP2"
+msgid "Adobe Illustrator document"
+msgstr "document Adobe Illustrator"
 
 #: ../freedesktop.org.xml.in.h:4
-msgid "7-zip archive"
-msgstr "archive 7-zip"
+msgid "Macintosh BinHex-encoded file"
+msgstr "fichier codé Macintosh BinHex"
 
 #: ../freedesktop.org.xml.in.h:5
-msgid "ACE archive"
-msgstr "archive ACE"
+msgid "Mathematica Notebook"
+msgstr "carnet de notes Mathematica"
 
 #: ../freedesktop.org.xml.in.h:6
-msgid "AIFC audio"
-msgstr "audio AIFC"
+msgid "MathML document"
+msgstr "document MathML"
 
 #: ../freedesktop.org.xml.in.h:7
-msgid "AIFF audio"
-msgstr "audio AIFF"
+msgid "mailbox file"
+msgstr "fichier boîte aux lettres"
 
 #: ../freedesktop.org.xml.in.h:8
-msgid "AIFF/Amiga/Mac audio"
-msgstr "audio AIFF/Amiga/Mac"
+msgid "Metalink file"
+msgstr "fichier metalink"
 
 #: ../freedesktop.org.xml.in.h:9
-msgid "AMR audio"
-msgstr "audio AMR"
+msgid "unknown"
+msgstr "inconnu"
 
 #: ../freedesktop.org.xml.in.h:10
-msgid "AMR-WB audio"
-msgstr "audio AMR-WB"
+msgid "ODA document"
+msgstr "document ODA"
 
 #: ../freedesktop.org.xml.in.h:11
-msgid "ANIM animation"
-msgstr "animation ANIM"
+msgid "WWF document"
+msgstr "document WWF"
 
 #: ../freedesktop.org.xml.in.h:12
-msgid "AR archive"
-msgstr "archive AR"
+msgid "PDF document"
+msgstr "document PDF"
 
 #: ../freedesktop.org.xml.in.h:13
-msgid "ARC archive"
-msgstr "archive ARC"
+msgid "XSPF playlist"
+msgstr "liste de lecture XSPF"
 
 #: ../freedesktop.org.xml.in.h:14
-msgid "ARJ archive"
-msgstr "archive ARJ"
+msgid "Microsoft Windows theme pack"
+msgstr "paquet de thèmes Microsoft Windows"
 
 #: ../freedesktop.org.xml.in.h:15
-msgid "ASF video"
-msgstr "vidéo ASF"
+msgid "GSM 06.10 audio"
+msgstr "audio GSM 06.10"
 
 #: ../freedesktop.org.xml.in.h:16
-msgid "ASP page"
-msgstr "page ASP"
+msgid "iRiver Playlist"
+msgstr "liste de lecture iRiver"
 
 #: ../freedesktop.org.xml.in.h:17
-msgid "ATK inset"
-msgstr "encart ATK"
+msgid "PGP/MIME-encrypted message header"
+msgstr "en-tête de message codé PGP/MIME"
 
 #: ../freedesktop.org.xml.in.h:18
-msgid "AVI video"
-msgstr "vidéo AVI"
+msgid "PGP keys"
+msgstr "clés PGP"
 
 #: ../freedesktop.org.xml.in.h:19
-msgid "AWK script"
-msgstr "script AWK"
+msgid "detached OpenPGP signature"
+msgstr "signature OpenPGP détachée"
 
 #: ../freedesktop.org.xml.in.h:20
-msgid "AbiWord document"
-msgstr "document AbiWord"
+msgid "S/MIME file"
+msgstr "fichier S/MIME"
 
 #: ../freedesktop.org.xml.in.h:21
-msgid "Ada source code"
-msgstr "code source Ada"
+msgid "detached S/MIME signature"
+msgstr "signature S/MIME détachée"
 
 #: ../freedesktop.org.xml.in.h:22
-msgid "Adobe DNG negative"
-msgstr "négatif DNG Adobe"
+msgid "PKCS#8 private key"
+msgstr "clé privée PKCS#8"
 
 #: ../freedesktop.org.xml.in.h:23
-msgid "Adobe FrameMaker MIF document"
-msgstr "document MIF Adobe FrameMaker"
+msgid "PKCS#10 certification request"
+msgstr "requête de certification PKCS#10"
 
 #: ../freedesktop.org.xml.in.h:24
-msgid "Adobe FrameMaker document"
-msgstr "document Adobe FrameMaker"
+msgid "X.509 certificate"
+msgstr "certificat X.509"
 
 #: ../freedesktop.org.xml.in.h:25
-msgid "Adobe FrameMaker font"
-msgstr "police Adobe FrameMaker"
+msgid "Certificate revocation list"
+msgstr "liste de révocation de certificat"
 
 #: ../freedesktop.org.xml.in.h:26
-msgid "Adobe Illustrator document"
-msgstr "document Adobe Illustrator"
+msgid "PkiPath certification path"
+msgstr "chemin de certification PkiPath"
 
 #: ../freedesktop.org.xml.in.h:27
-msgid "Adobe font metrics"
-msgstr "métriques de police Adobe"
+msgid "PS document"
+msgstr "document PS"
 
 #: ../freedesktop.org.xml.in.h:28
-msgid "Alzip archive"
-msgstr "archive alzip"
+msgid "Plucker document"
+msgstr "document Plucker"
 
 #: ../freedesktop.org.xml.in.h:29
-msgid "Amiga SoundTracker audio"
-msgstr "audio SoundTracker Amiga"
+msgid "RELAX NG XML schema"
+msgstr "schéma XML RELAX NG"
 
 #: ../freedesktop.org.xml.in.h:30
-msgid "Android package"
-msgstr "paquet Android"
+msgid "RTF document"
+msgstr "document RTF"
 
 #: ../freedesktop.org.xml.in.h:31
-msgid "Annodex Audio"
-msgstr "audio Annodex"
+msgid "Sieve mail filter script"
+msgstr "script de filtrage de courriel Sieve"
 
 #: ../freedesktop.org.xml.in.h:32
-msgid "Annodex Video"
-msgstr "vidéo Annodex"
+msgid "SMIL document"
+msgstr "document SMIL"
 
 #: ../freedesktop.org.xml.in.h:33
-msgid "Annodex exchange format"
-msgstr "format d'échange Annodex"
+msgid "WPL playlist"
+msgstr "liste de lecture WPL"
 
 #: ../freedesktop.org.xml.in.h:34
-msgid "AportisDoc document"
-msgstr "document AportisDoc"
+msgid "SQLite2 database"
+msgstr "base de données SQLite2"
 
 #: ../freedesktop.org.xml.in.h:35
-msgid "Apple disk image"
-msgstr "image disque Apple"
+msgid "SQLite3 database"
+msgstr "base de données SQLite3"
 
 #: ../freedesktop.org.xml.in.h:36
-msgid "Applix Graphics image"
-msgstr "image Applix Graphics"
+msgid "GEDCOM family history"
+msgstr "généalogie GEDCOM"
 
 #: ../freedesktop.org.xml.in.h:37
-msgid "Applix Spreadsheets spreadsheet"
-msgstr "feuille de calcul Applix"
+msgid "Flash video"
+msgstr "vidéo Flash"
 
 #: ../freedesktop.org.xml.in.h:38
-msgid "Applix Words document"
-msgstr "document Applix Words"
-
-#: ../freedesktop.org.xml.in.h:39
-msgid "Atom syndication feed"
-msgstr "fil de syndication Atom"
-
-#: ../freedesktop.org.xml.in.h:40
-msgid "AutoCAD image"
-msgstr "image AutoCAD"
-
-#: ../freedesktop.org.xml.in.h:41
-msgid "BCPIO document"
-msgstr "document BCPIO"
+msgid "JavaFX video"
+msgstr "vidéo JavaFX"
 
+#. translators: a record is in this context a description of a board game
+#. that has been played, and that can be played back again:
+#. http://www.red-bean.com/sgf/
 #: ../freedesktop.org.xml.in.h:42
-msgid "BDF font"
-msgstr "police BDF"
+msgid "SGF record"
+msgstr "partie SGF"
 
 #: ../freedesktop.org.xml.in.h:43
-msgid "BibTeX document"
-msgstr "document BibTeX"
+msgid "XLIFF translation file"
+msgstr "fichier de traduction XLIFF"
 
 #: ../freedesktop.org.xml.in.h:44
-msgid "BitTorrent seed file"
-msgstr "fichier graine BitTorrent"
+msgid "YAML document"
+msgstr "document YAML"
 
 #: ../freedesktop.org.xml.in.h:45
-msgid "Blender scene"
-msgstr "scène Blender"
+msgid "Corel Draw drawing"
+msgstr "dessin Corel Draw"
+
+#: ../freedesktop.org.xml.in.h:46
+msgid "HPGL file"
+msgstr "fichier HPGL"
+
+#: ../freedesktop.org.xml.in.h:47
+msgid "PCL file"
+msgstr "fichier PCL"
 
-#. http://en.wikipedia.org/wiki/Blu-ray_Disc
-#. http://www.blu-raydisc.com/Section-13470/Section-13890/Index.html
 #: ../freedesktop.org.xml.in.h:48
-msgid "Blu-ray video disc"
-msgstr "disque vidéo Blu-Ray"
+msgid "Lotus 1-2-3 spreadsheet"
+msgstr "feuille de calcul Lotus 1-2-3"
 
 #: ../freedesktop.org.xml.in.h:49
-msgid "Bzip archive"
-msgstr "archive bzip"
+msgid "JET database"
+msgstr "base de données JET"
 
 #: ../freedesktop.org.xml.in.h:50
-msgid "C header"
-msgstr "en-tête C"
+msgid "Microsoft Cabinet archive"
+msgstr "archive Cab Microsoft"
 
 #: ../freedesktop.org.xml.in.h:51
-msgid "C shell script"
-msgstr "script C shell"
+msgid "Excel spreadsheet"
+msgstr "feuille de calcul Excel"
 
 #: ../freedesktop.org.xml.in.h:52
-msgid "C source code"
-msgstr "code source C"
+msgid "Excel add-in"
+msgstr "complément Excel"
 
 #: ../freedesktop.org.xml.in.h:53
-msgid "C# source code"
-msgstr "code source C#"
+msgid "Excel 2007 binary spreadsheet"
+msgstr "feuille de calcul binaire Excel 2007"
 
 #: ../freedesktop.org.xml.in.h:54
-msgid "C++ header"
-msgstr "en-tête C++"
+msgid "Excel macro-enabled spreadsheet"
+msgstr "feuille de calcul Excel avec macros"
 
 #: ../freedesktop.org.xml.in.h:55
-msgid "C++ source code"
-msgstr "code source C++"
+msgid "Excel macro-enabled spreadsheet template"
+msgstr "modèle de feuille de calcul Excel avec macros"
 
 #: ../freedesktop.org.xml.in.h:56
-msgid "CCITT G3 fax"
-msgstr "télécopie G3 CCITT"
+msgid "PowerPoint presentation"
+msgstr "présentation PowerPoint"
 
 #: ../freedesktop.org.xml.in.h:57
-msgid "CD Table Of Contents"
-msgstr "table des matières de CD"
+msgid "PowerPoint add-in"
+msgstr "complément PowerPoint"
 
 #: ../freedesktop.org.xml.in.h:58
-msgid "CD image cuesheet"
-msgstr "index de pistes de CD"
+msgid "PowerPoint macro-enabled presentation"
+msgstr "présentation PowerPoint avec macros"
 
 #: ../freedesktop.org.xml.in.h:59
-msgid "CHM document"
-msgstr "document CHM"
+msgid "PowerPoint macro-enabled slide"
+msgstr "diapositive PowerPoint avec macros"
 
 #: ../freedesktop.org.xml.in.h:60
-msgid "CMU raster image"
-msgstr "image raster CMU"
+msgid "PowerPoint macro-enabled presentation template"
+msgstr "modèle de présentation PowerPoint avec macros"
 
 #: ../freedesktop.org.xml.in.h:61
-msgid "CMake source code"
-msgstr "code source CMake"
+msgid "Word macro-enabled document"
+msgstr "document Word avec macros"
 
 #: ../freedesktop.org.xml.in.h:62
-msgid "COBOL source file"
-msgstr "fichier source COBOL"
+msgid "Word macro-enabled document template"
+msgstr "modèle de document Word avec macros"
 
 #: ../freedesktop.org.xml.in.h:63
-msgid "CPIO archive"
-msgstr "archive CPIO"
+msgid "XPS document"
+msgstr "document XPS"
 
 #: ../freedesktop.org.xml.in.h:64
-msgid "CPIO archive (gzip-compressed)"
-msgstr "archive CPIO (compressé gzip)"
+msgid "Microsoft Works document"
+msgstr "document Microsoft Works"
 
 #: ../freedesktop.org.xml.in.h:65
-msgid "CSS stylesheet"
-msgstr "feuille de style CSS"
+msgid "Microsoft Visio document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:66
-msgid "CSV document"
-msgstr "document CSV"
+msgid "Word document"
+msgstr "document Word"
 
 #: ../freedesktop.org.xml.in.h:67
-msgid "Canon CR2 raw image"
-msgstr "image brute CR2 Canon"
+msgid "Word template"
+msgstr "modèle Word"
 
 #: ../freedesktop.org.xml.in.h:68
-msgid "Canon CRW raw image"
-msgstr "image brute CRW Canon"
+msgid "GNUnet search file"
+msgstr "fichier de recherche GNUnet"
 
 #: ../freedesktop.org.xml.in.h:69
-msgid "Certificate revocation list"
-msgstr "liste de révocation de certificat"
+msgid "TNEF message"
+msgstr "message TNEF"
 
 #: ../freedesktop.org.xml.in.h:70
-msgid "ChangeLog document"
-msgstr "document ChangeLog"
+msgid "StarCalc spreadsheet"
+msgstr "feuille de calcul StarCalc"
 
 #: ../freedesktop.org.xml.in.h:71
-msgid "Cisco VPN Settings"
-msgstr "paramètres VPN Cisco"
+msgid "StarChart chart"
+msgstr "graphique StarChart"
 
 #: ../freedesktop.org.xml.in.h:72
-msgid "Citrix ICA settings file"
-msgstr "fichier de paramètres ICA Citrix"
+msgid "StarDraw drawing"
+msgstr "dessin StarDraw"
 
 #: ../freedesktop.org.xml.in.h:73
-msgid "Commodore 64 audio"
-msgstr "audio Commodore 64"
+msgid "StarImpress presentation"
+msgstr "présentation StarImpress"
 
 #: ../freedesktop.org.xml.in.h:74
-msgid "Computer Graphics Metafile"
-msgstr "métafichier Computer Graphics"
+msgid "StarMail email"
+msgstr "courriel StarMail"
 
 #: ../freedesktop.org.xml.in.h:75
-msgid "Corel Draw drawing"
-msgstr "dessin Corel Draw"
+msgid "StarMath formula"
+msgstr "formule StarMath"
 
 #: ../freedesktop.org.xml.in.h:76
-msgid "D source code"
-msgstr "code source D"
+msgid "StarWriter document"
+msgstr "document StarWriter"
 
 #: ../freedesktop.org.xml.in.h:77
-msgid "DAR archive"
-msgstr "archive DAR"
+msgid "OpenOffice Calc spreadsheet"
+msgstr "feuille de calcul OpenOffice Calc"
 
 #: ../freedesktop.org.xml.in.h:78
-msgid "DCL script"
-msgstr "script DCL"
+msgid "OpenOffice Calc template"
+msgstr "modèle OpenOffice Calc"
 
 #: ../freedesktop.org.xml.in.h:79
-msgid "DER/PEM/Netscape-encoded X.509 certificate"
-msgstr "certificat X.509 codé DER/PEM/Netscape"
+msgid "OpenOffice Draw drawing"
+msgstr "dessin OpenOffice Draw"
 
 #: ../freedesktop.org.xml.in.h:80
-msgid "DIB image"
-msgstr "image DIB"
+msgid "OpenOffice Draw template"
+msgstr "modèle OpenOffice Draw"
 
 #: ../freedesktop.org.xml.in.h:81
-msgid "DICOM image"
-msgstr "image DICOM"
+msgid "OpenOffice Impress presentation"
+msgstr "présentation OpenOffice Impress"
 
 #: ../freedesktop.org.xml.in.h:82
-msgid "DOS font"
-msgstr "police DOS"
+msgid "OpenOffice Impress template"
+msgstr "modèle OpenOffice Impress"
 
 #: ../freedesktop.org.xml.in.h:83
-msgid "DOS/Windows executable"
-msgstr "exécutable DOS/Windows"
+msgid "OpenOffice Math formula"
+msgstr "formule OpenOffice Math"
 
 #: ../freedesktop.org.xml.in.h:84
-msgid "DPX image"
-msgstr "image DPX"
+msgid "OpenOffice Writer document"
+msgstr "document OpenOffice Writer"
 
 #: ../freedesktop.org.xml.in.h:85
-msgid "DSSSL document"
-msgstr "document DSSSL"
+msgid "OpenOffice Writer global document"
+msgstr "document global OpenOffice Writer"
 
 #: ../freedesktop.org.xml.in.h:86
-msgid "DTD file"
-msgstr "fichier DTD"
+msgid "OpenOffice Writer template"
+msgstr "modèle OpenOffice Writer"
 
 #: ../freedesktop.org.xml.in.h:87
-msgid "DV video"
-msgstr "vidéo DV"
+msgid "ODT document"
+msgstr "document ODT"
 
 #: ../freedesktop.org.xml.in.h:88
-msgid "DXF vector image"
-msgstr "image vectorielle DXF"
+msgid "ODT document (Flat XML)"
+msgstr "document ODT (XML plat)"
 
 #: ../freedesktop.org.xml.in.h:89
-msgid "Debian package"
-msgstr "paquet Debian"
+msgid "ODT template"
+msgstr "modèle ODT"
 
 #: ../freedesktop.org.xml.in.h:90
-msgid "Dia diagram"
-msgstr "diagramme Dia"
+msgid "OTH template"
+msgstr "modèle OTH"
 
 #: ../freedesktop.org.xml.in.h:91
-msgid "Dia shape"
-msgstr "forme Dia"
+msgid "ODM document"
+msgstr "document ODM"
 
 #: ../freedesktop.org.xml.in.h:92
-msgid "DirectDraw surface"
-msgstr "surface DirectDraw"
+msgid "ODG drawing"
+msgstr "dessin ODG"
 
 #: ../freedesktop.org.xml.in.h:93
-msgid "DjVu image"
-msgstr "image DjVu"
+msgid "ODG drawing (Flat XML)"
+msgstr "dessin ODG (XML plat)"
 
 #: ../freedesktop.org.xml.in.h:94
-msgid "DocBook document"
-msgstr "document DocBook"
+msgid "ODG template"
+msgstr "modèle ODG"
 
 #: ../freedesktop.org.xml.in.h:95
-msgid "Dolby Digital audio"
-msgstr "audio Dolby Digital"
+msgid "ODP presentation"
+msgstr "présentation ODP"
 
 #: ../freedesktop.org.xml.in.h:96
-msgid "Dreamcast ROM"
-msgstr "ROM Dreamcast"
+msgid "ODP presentation (Flat XML)"
+msgstr "présentation ODP (XML plat)"
 
 #: ../freedesktop.org.xml.in.h:97
-msgid "ECMAScript program"
-msgstr "programme ECMAScript"
+msgid "ODP template"
+msgstr "modèle ODP"
 
 #: ../freedesktop.org.xml.in.h:98
-msgid "EMF image"
-msgstr "image EMF"
+msgid "ODS spreadsheet"
+msgstr "feuille de calcul ODS"
 
 #: ../freedesktop.org.xml.in.h:99
-msgid "EPS image"
-msgstr "image EPS"
+msgid "ODS spreadsheet (Flat XML)"
+msgstr "feuille de calcul ODS (XML plat)"
 
 #: ../freedesktop.org.xml.in.h:100
-msgid "EPS image (bzip-compressed)"
-msgstr "image EPS (compressée bzip)"
+msgid "ODS template"
+msgstr "modèle ODS"
 
 #: ../freedesktop.org.xml.in.h:101
-msgid "EPS image (gzip-compressed)"
-msgstr "image EPS (compressée gzip)"
+msgid "ODC chart"
+msgstr "graphique ODC"
 
 #: ../freedesktop.org.xml.in.h:102
-msgid "EXR image"
-msgstr "image EXR"
+msgid "ODC template"
+msgstr "modèle ODC"
 
 #: ../freedesktop.org.xml.in.h:103
-msgid "Egon Animator animation"
-msgstr "animation Egon Animator"
+msgid "ODF formula"
+msgstr "formule ODF"
 
 #: ../freedesktop.org.xml.in.h:104
-msgid "Eiffel source code"
-msgstr "code source Eiffel"
+msgid "ODF template"
+msgstr "modèle ODF"
 
 #: ../freedesktop.org.xml.in.h:105
-msgid "Emacs Lisp source code"
-msgstr "code source Emacs Lisp"
+msgid "ODB database"
+msgstr "base de données ODB"
 
 #: ../freedesktop.org.xml.in.h:106
-msgid "Enlightenment theme"
-msgstr "thème Enlightenment"
+msgid "ODI image"
+msgstr "image ODI"
 
 #: ../freedesktop.org.xml.in.h:107
-msgid "Erlang source code"
-msgstr "code source Erlang"
+msgid "OpenOffice.org extension"
+msgstr "extension OpenOffice.org"
 
 #: ../freedesktop.org.xml.in.h:108
-msgid "Excel 2007 binary spreadsheet"
-msgstr "feuille de calcul binaire Excel 2007"
+msgid "Android package"
+msgstr "paquet Android"
 
 #: ../freedesktop.org.xml.in.h:109
-msgid "Excel 2007 spreadsheet"
-msgstr "feuille de calcul Excel 2007"
+msgid "SIS package"
+msgstr "paquet SIS"
 
 #: ../freedesktop.org.xml.in.h:110
-msgid "Excel 2007 spreadsheet template"
-msgstr "modèle de feuille de calcul Excel 2007"
+msgid "SISX package"
+msgstr "paquet SISX"
 
 #: ../freedesktop.org.xml.in.h:111
-msgid "Excel add-in"
-msgstr "complément Excel"
+msgid "Network Packet Capture"
+msgstr "capture de paquet réseau"
 
 #: ../freedesktop.org.xml.in.h:112
-msgid "Excel macro-enabled spreadsheet"
-msgstr "feuille de calcul Excel avec macros"
+msgid "WordPerfect document"
+msgstr "document WordPerfect"
 
 #: ../freedesktop.org.xml.in.h:113
-msgid "Excel macro-enabled spreadsheet template"
-msgstr "modèle de feuille de calcul Excel avec macros"
+msgid "SPSS Portable Data File"
+msgstr "fichier portable de données SPSS"
 
 #: ../freedesktop.org.xml.in.h:114
-msgid "Excel spreadsheet"
-msgstr "feuille de calcul Excel"
+msgid "SPSS Data File"
+msgstr "fichier de données SPSS"
 
 #: ../freedesktop.org.xml.in.h:115
-msgid "FITS document"
-msgstr "document FITS"
+msgid "XBEL bookmarks"
+msgstr "marque-pages XBEL"
 
 #: ../freedesktop.org.xml.in.h:116
-msgid "FLAC audio"
-msgstr "audio FLAC"
+msgid "7-zip archive"
+msgstr "archive 7-zip"
 
 #: ../freedesktop.org.xml.in.h:117
-msgid "FLIC animation"
-msgstr "animation FLIC"
+msgid "AbiWord document"
+msgstr "document AbiWord"
 
 #: ../freedesktop.org.xml.in.h:118
-msgid "FLTK Fluid file"
-msgstr "fichier Fluid FLTK"
+msgid "CD image cuesheet"
+msgstr "index de pistes de CD"
 
 #: ../freedesktop.org.xml.in.h:119
-msgid "FPX image"
-msgstr "image FPX"
+msgid "Lotus AmiPro document"
+msgstr "document Lotus AmiPro"
 
 #: ../freedesktop.org.xml.in.h:120
-msgid "FastTracker II audio"
-msgstr "audio FastTracker II"
+msgid "AportisDoc document"
+msgstr "document AportisDoc"
 
 #: ../freedesktop.org.xml.in.h:121
-msgid "FictionBook document"
-msgstr "document FictionBook"
+msgid "Applix Spreadsheets spreadsheet"
+msgstr "feuille de calcul Applix"
 
 #: ../freedesktop.org.xml.in.h:122
-msgid "Flash video"
-msgstr "vidéo Flash"
+msgid "Applix Words document"
+msgstr "document Applix Words"
 
 #: ../freedesktop.org.xml.in.h:123
-msgid "Fortran source code"
-msgstr "code source Fortran"
+msgid "ARC archive"
+msgstr "archive ARC"
 
 #: ../freedesktop.org.xml.in.h:124
-msgid "Fuji RAF raw image"
-msgstr "image brute RAF Fuji"
+msgid "AR archive"
+msgstr "archive AR"
 
 #: ../freedesktop.org.xml.in.h:125
-msgid "G3 fax image"
-msgstr "image de télécopie G3"
+msgid "ARJ archive"
+msgstr "archive ARJ"
 
 #: ../freedesktop.org.xml.in.h:126
-msgid "GDBM database"
-msgstr "base de données GDBM"
+msgid "ASP page"
+msgstr "page ASP"
 
 #: ../freedesktop.org.xml.in.h:127
-msgid "GEDCOM family history"
-msgstr "généalogie GEDCOM"
+msgid "AWK script"
+msgstr "script AWK"
 
 #: ../freedesktop.org.xml.in.h:128
-msgid "GIF image"
-msgstr "image GIF"
+msgid "BCPIO document"
+msgstr "document BCPIO"
 
 #: ../freedesktop.org.xml.in.h:129
-msgid "GIMP image"
-msgstr "image GIMP"
+msgid "BitTorrent seed file"
+msgstr "fichier graine BitTorrent"
 
 #: ../freedesktop.org.xml.in.h:130
-msgid "GMC link"
-msgstr "lien GMC"
+msgid "Blender scene"
+msgstr "scène Blender"
 
 #: ../freedesktop.org.xml.in.h:131
-msgid "GNU Oleo spreadsheet"
-msgstr "feuille de calcul GNU Oleo"
+msgid "TeX DVI document (bzip-compressed)"
+msgstr "document DVI TeX (compressé bzip)"
 
 #: ../freedesktop.org.xml.in.h:132
-msgid "GNU mail message"
-msgstr "message de courriel GNU"
+msgid "Bzip archive"
+msgstr "archive bzip"
 
 #: ../freedesktop.org.xml.in.h:133
-msgid "GNUnet search file"
-msgstr "fichier de recherche GNUnet"
+msgid "Tar archive (bzip-compressed)"
+msgstr "archive tar (compressée bzip)"
 
 #: ../freedesktop.org.xml.in.h:134
-msgid "GSM 06.10 audio"
-msgstr "audio GSM 06.10"
+msgid "PDF document (bzip-compressed)"
+msgstr "document PDF (compressé bzip)"
 
 #: ../freedesktop.org.xml.in.h:135
-msgid "GTKtalog catalog"
-msgstr "catalogue Gtktalog"
+msgid "PostScript document (bzip-compressed)"
+msgstr "document PostScript (compressé bzip)"
 
 #: ../freedesktop.org.xml.in.h:136
-msgid "Game Boy Advance ROM"
-msgstr "ROM Game Boy Advance"
+msgid "comic book archive"
+msgstr "archive Comic Book"
 
 #: ../freedesktop.org.xml.in.h:137
-msgid "Game Boy ROM"
-msgstr "ROM Game Boy"
+msgid "Lrzip archive"
+msgstr "archive lrzip"
+
+#: ../freedesktop.org.xml.in.h:138
+msgid "Tar archive (lrzip-compressed)"
+msgstr "archive tar (compressée lrzip)"
+
+#: ../freedesktop.org.xml.in.h:139
+msgid "Apple disk image"
+msgstr "image disque Apple"
 
-#. Translate this to Megadrive if the console was known as such in your locale
-#. Should be Megadrive in all but en_US: http://en.wikipedia.org/wiki/Megadrive#History
 #: ../freedesktop.org.xml.in.h:140
-msgid "Genesis ROM"
-msgstr "ROM Mega Drive/Genesis"
+msgid "raw CD image"
+msgstr "image CD brute"
 
 #: ../freedesktop.org.xml.in.h:141
-msgid "Glade project"
-msgstr "projet Glade"
+msgid "CD Table Of Contents"
+msgstr "table des matières de CD"
 
 #: ../freedesktop.org.xml.in.h:142
-msgid "GnuCash financial data"
-msgstr "données financières GnuCash"
+msgid "PGN chess game notation"
+msgstr "notation de jeu d'échecs PGN"
 
 #: ../freedesktop.org.xml.in.h:143
-msgid "Gnumeric spreadsheet"
-msgstr "feuille de calcul Gnumeric"
+msgid "CHM document"
+msgstr "document CHM"
 
 #: ../freedesktop.org.xml.in.h:144
-msgid "Gnuplot document"
-msgstr "document Gnuplot"
+msgid "Java byte code"
+msgstr "code Java binaire"
 
 #: ../freedesktop.org.xml.in.h:145
-msgid "Go source code"
-msgstr "code source Go"
+msgid "UNIX-compressed file"
+msgstr "fichier compressé UNIX"
 
 #: ../freedesktop.org.xml.in.h:146
-msgid "Google Video Pointer"
-msgstr "pointeur vidéo Google"
+msgid "Tar archive (gzip-compressed)"
+msgstr "archive tar (compressée gzip)"
 
 #: ../freedesktop.org.xml.in.h:147
-msgid "Graphite scientific graph"
-msgstr "graphe Graphite scientific"
+msgid "program crash data"
+msgstr "données de plantage de programme"
 
 #: ../freedesktop.org.xml.in.h:148
-msgid "Graphviz DOT graph"
-msgstr "graphe Graphviz DOT"
+msgid "CPIO archive"
+msgstr "archive CPIO"
 
 #: ../freedesktop.org.xml.in.h:149
-msgid "Gzip archive"
-msgstr "archive gzip"
+msgid "CPIO archive (gzip-compressed)"
+msgstr "archive CPIO (compressé gzip)"
+
+#: ../freedesktop.org.xml.in.h:150
+msgid "C shell script"
+msgstr "script C shell"
+
+#: ../freedesktop.org.xml.in.h:151
+msgid "Xbase document"
+msgstr "document Xbase"
 
-#. http://en.wikipedia.org/wiki/HD_DVD
-#. http://www.dvdafteredit.com/wiki/The_HVDVD_TS_Folder
 #: ../freedesktop.org.xml.in.h:152
-msgid "HD DVD video disc"
-msgstr "disque vidéo HD DVD"
+msgid "ECMAScript program"
+msgstr "programme ECMAScript"
 
 #: ../freedesktop.org.xml.in.h:153
-msgid "HDF document"
-msgstr "document HDF"
+msgid "Dreamcast ROM"
+msgstr "ROM Dreamcast"
 
 #: ../freedesktop.org.xml.in.h:154
-msgid "HPGL file"
-msgstr "fichier HPGL"
+msgid "Nintendo DS ROM"
+msgstr "ROM Nintendo DS"
 
 #: ../freedesktop.org.xml.in.h:155
-msgid "HTML document"
-msgstr "document HTML"
+msgid "Debian package"
+msgstr "paquet Debian"
 
 #: ../freedesktop.org.xml.in.h:156
-msgid "HTTP Live Streaming playlist"
-msgstr "liste de lecture de flux HTTP Live"
+msgid "Qt Designer file"
+msgstr "fichier Qt Designer"
 
 #: ../freedesktop.org.xml.in.h:157
-msgid "Haansoft Hangul document"
-msgstr "document Haansoft Hangul"
+msgid "Qt Markup Language file"
+msgstr "fichier Qt Markup Language"
 
 #: ../freedesktop.org.xml.in.h:158
-msgid "Haansoft Hangul document template"
-msgstr "modèle de document Haansoft Hangul"
+msgid "desktop configuration file"
+msgstr "fichier de configuration desktop"
 
 #: ../freedesktop.org.xml.in.h:159
-msgid "Haskell source code"
-msgstr "code source Haskell"
+msgid "FictionBook document"
+msgstr "document FictionBook"
 
 #: ../freedesktop.org.xml.in.h:160
-msgid "ICC profile"
-msgstr "profil ICC"
+msgid "Dia diagram"
+msgstr "diagramme Dia"
 
 #: ../freedesktop.org.xml.in.h:161
-msgid "IDL document"
-msgstr "document IDL"
+msgid "Dia shape"
+msgstr "forme Dia"
 
 #: ../freedesktop.org.xml.in.h:162
-msgid "IEF image"
-msgstr "image IEF"
+msgid "TeX DVI document"
+msgstr "document TeX DVI"
 
 #: ../freedesktop.org.xml.in.h:163
-msgid "IFF image"
-msgstr "image IFF"
+msgid "Enlightenment theme"
+msgstr "thème Enlightenment"
 
 #: ../freedesktop.org.xml.in.h:164
-msgid "ILBM image"
-msgstr "image ILBM"
+msgid "Egon Animator animation"
+msgstr "animation Egon Animator"
 
 #: ../freedesktop.org.xml.in.h:165
-msgid "ISI video"
-msgstr "vidéo ISI"
+msgid "executable"
+msgstr "exécutable"
 
 #: ../freedesktop.org.xml.in.h:166
-msgid "IT 8.7 color calibration file"
-msgstr "fichier de calibration couleur IT 8.7"
+msgid "FLTK Fluid file"
+msgstr "fichier Fluid FLTK"
 
 #: ../freedesktop.org.xml.in.h:167
-msgid "Impulse Tracker audio"
-msgstr "audio Impulse Tracker"
+msgid "Postscript type-1 font"
+msgstr "police Postscript Type 1"
 
 #: ../freedesktop.org.xml.in.h:168
-msgid "Internet shortcut"
-msgstr "raccourci Internet"
+msgid "Adobe font metrics"
+msgstr "métriques de police Adobe"
 
 #: ../freedesktop.org.xml.in.h:169
-msgid "JAD document"
-msgstr "document JAD"
+msgid "BDF font"
+msgstr "police BDF"
 
 #: ../freedesktop.org.xml.in.h:170
-msgid "JBuilder project"
-msgstr "projet JBuilder"
+msgid "DOS font"
+msgstr "police DOS"
 
 #: ../freedesktop.org.xml.in.h:171
-msgid "JET database"
-msgstr "base de données JET"
+msgid "Adobe FrameMaker font"
+msgstr "police Adobe FrameMaker"
 
 #: ../freedesktop.org.xml.in.h:172
-msgid "JNG image"
-msgstr "image JNG"
+msgid "LIBGRX font"
+msgstr "police LIBGRX"
 
 #: ../freedesktop.org.xml.in.h:173
-msgid "JNLP file"
-msgstr "fichier JNLP"
+msgid "Linux PSF console font"
+msgstr "police console Linux PSF"
 
 #: ../freedesktop.org.xml.in.h:174
-msgid "JPEG image"
-msgstr "image JPEG"
+msgid "Linux PSF console font (gzip-compressed)"
+msgstr "police console Linux PSF (compressée gzip)"
 
 #: ../freedesktop.org.xml.in.h:175
-msgid "JPEG-2000 image"
-msgstr "image JPEG-2000"
+msgid "PCF font"
+msgstr "police PCF"
 
 #: ../freedesktop.org.xml.in.h:176
-msgid "Java JCE keystore"
-msgstr "stockage de clés Java JCE"
+msgid "OpenType font"
+msgstr "police OpenType"
 
 #: ../freedesktop.org.xml.in.h:177
-msgid "Java archive"
-msgstr "archive Java"
+msgid "Speedo font"
+msgstr "police Speedo"
 
 #: ../freedesktop.org.xml.in.h:178
-msgid "Java byte code"
-msgstr "code Java binaire"
+msgid "SunOS News font"
+msgstr "police SunOS News"
 
 #: ../freedesktop.org.xml.in.h:179
-msgid "Java class"
-msgstr "classe Java"
+msgid "TeX font"
+msgstr "police TeX"
 
 #: ../freedesktop.org.xml.in.h:180
-msgid "Java keystore"
-msgstr "stockage de clés Java"
+msgid "TeX font metrics"
+msgstr "métriques de police TeX"
 
 #: ../freedesktop.org.xml.in.h:181
-msgid "Java source code"
-msgstr "code source Java"
+msgid "TrueType font"
+msgstr "police Truetype"
 
 #: ../freedesktop.org.xml.in.h:182
-msgid "JavaFX video"
-msgstr "vidéo JavaFX"
+msgid "TrueType XML font"
+msgstr "police Truetype XML"
 
 #: ../freedesktop.org.xml.in.h:183
-msgid "JavaScript program"
-msgstr "programme JavaScript"
+msgid "V font"
+msgstr "police V"
 
 #: ../freedesktop.org.xml.in.h:184
-msgid "KChart chart"
-msgstr "graphique KChart"
+msgid "Adobe FrameMaker document"
+msgstr "document Adobe FrameMaker"
 
 #: ../freedesktop.org.xml.in.h:185
-msgid "KFormula formula"
-msgstr "formule KFormula"
+msgid "Game Boy ROM"
+msgstr "ROM Game Boy"
 
 #: ../freedesktop.org.xml.in.h:186
-msgid "KIllustrator drawing"
-msgstr "dessin KIllustrator"
+msgid "Game Boy Advance ROM"
+msgstr "ROM Game Boy Advance"
 
 #: ../freedesktop.org.xml.in.h:187
-msgid "KML geographic compressed data"
-msgstr "données géographiques KML compressées"
-
-#: ../freedesktop.org.xml.in.h:188
-msgid "KML geographic data"
-msgstr "données géographiques KML"
-
-#: ../freedesktop.org.xml.in.h:189
-msgid "KPovModeler scene"
-msgstr "scène KPovModeler"
+msgid "GDBM database"
+msgstr "base de données GDBM"
 
+#. Translate this to Megadrive if the console was known as such in your locale
+#. Should be Megadrive in all but en_US: http://en.wikipedia.org/wiki/Megadrive#History
 #: ../freedesktop.org.xml.in.h:190
-msgid "KPresenter presentation"
-msgstr "présentation KPresenter"
+msgid "Genesis ROM"
+msgstr "ROM Mega Drive/Genesis"
 
 #: ../freedesktop.org.xml.in.h:191
-msgid "KSpread spreadsheet"
-msgstr "feuille de calcul KSpread"
+msgid "translated messages (machine-readable)"
+msgstr "messages traduits (lisibles par machine)"
 
 #: ../freedesktop.org.xml.in.h:192
-msgid "KSpread spreadsheet (encrypted)"
-msgstr "feuille de calcul KSpread (chiffrée)"
+msgid "Glade project"
+msgstr "projet Glade"
 
 #: ../freedesktop.org.xml.in.h:193
-msgid "KSysV init package"
-msgstr "paquet d'initialisation KSysV"
+msgid "GMC link"
+msgstr "lien GMC"
 
 #: ../freedesktop.org.xml.in.h:194
-msgid "KWord document"
-msgstr "document KWord"
+msgid "GnuCash financial data"
+msgstr "données financières GnuCash"
 
 #: ../freedesktop.org.xml.in.h:195
-msgid "KWord document (encrypted)"
-msgstr "document KWord (chiffré)"
+msgid "Gnumeric spreadsheet"
+msgstr "feuille de calcul Gnumeric"
 
 #: ../freedesktop.org.xml.in.h:196
-msgid "Karbon14 drawing"
-msgstr "dessin Karbon14"
+msgid "Gnuplot document"
+msgstr "document Gnuplot"
 
 #: ../freedesktop.org.xml.in.h:197
-msgid "Kexi database file-based project"
-msgstr "projet de base de données Kexi en mode fichier"
+msgid "Graphite scientific graph"
+msgstr "graphe Graphite scientific"
 
 #: ../freedesktop.org.xml.in.h:198
-msgid "Kexi settings for database server connection"
-msgstr "paramètres Kexi pour connexion au serveur de base de données"
+msgid "GTKtalog catalog"
+msgstr "catalogue Gtktalog"
 
 #: ../freedesktop.org.xml.in.h:199
-msgid "Kivio flowchart"
-msgstr "diagramme de flux Kivio"
+msgid "TeX DVI document (gzip-compressed)"
+msgstr "document DVI TeX (compressé gzip)"
 
 #: ../freedesktop.org.xml.in.h:200
-msgid "Kodak DCR raw image"
-msgstr "image brute DCR Kodak"
+msgid "Gzip archive"
+msgstr "archive gzip"
 
 #: ../freedesktop.org.xml.in.h:201
-msgid "Kodak K25 raw image"
-msgstr "image brute K25 Kodak"
+msgid "PDF document (gzip-compressed)"
+msgstr "document PDF (compressé gzip)"
 
 #: ../freedesktop.org.xml.in.h:202
-msgid "Kodak KDC raw image"
-msgstr "image brute KDC Kodak"
+msgid "PostScript document (gzip-compressed)"
+msgstr "document PostScript (compressé gzip)"
 
 #: ../freedesktop.org.xml.in.h:203
-msgid "Kontour drawing"
-msgstr "dessin Kontour"
+msgid "HDF document"
+msgstr "document HDF"
 
 #: ../freedesktop.org.xml.in.h:204
-msgid "Krita document"
-msgstr "document Krita"
+msgid "iPod firmware"
+msgstr "firmware iPod"
 
 #: ../freedesktop.org.xml.in.h:205
-msgid "Kugar document"
-msgstr "document Kugar"
+msgid "Java archive"
+msgstr "archive Java"
 
 #: ../freedesktop.org.xml.in.h:206
-msgid "LDIF address book"
-msgstr "carnet d'adresses LDIF"
+msgid "Java class"
+msgstr "classe Java"
 
 #: ../freedesktop.org.xml.in.h:207
-msgid "LHA archive"
-msgstr "archive LHA"
+msgid "JNLP file"
+msgstr "fichier JNLP"
 
 #: ../freedesktop.org.xml.in.h:208
-msgid "LHS source code"
-msgstr "code source LHS"
+msgid "Java keystore"
+msgstr "stockage de clés Java"
 
 #: ../freedesktop.org.xml.in.h:209
-msgid "LHZ archive"
-msgstr "archive LHZ"
+msgid "Java JCE keystore"
+msgstr "stockage de clés Java JCE"
 
 #: ../freedesktop.org.xml.in.h:210
-msgid "LIBGRX font"
-msgstr "police LIBGRX"
+msgid "Pack200 Java archive"
+msgstr "archive Java Pack200"
 
 #: ../freedesktop.org.xml.in.h:211
-msgid "LZMA archive"
-msgstr "archive LZMA"
+msgid "JavaScript program"
+msgstr "programme JavaScript"
 
 #: ../freedesktop.org.xml.in.h:212
-msgid "LZO archive"
-msgstr "archive LZO"
+msgid "JBuilder project"
+msgstr "projet JBuilder"
 
 #: ../freedesktop.org.xml.in.h:213
-msgid "LightWave object"
-msgstr "objet LightWave"
+msgid "Karbon14 drawing"
+msgstr "dessin Karbon14"
 
 #: ../freedesktop.org.xml.in.h:214
-msgid "LightWave scene"
-msgstr "scène LightWave"
+msgid "KChart chart"
+msgstr "graphique KChart"
 
 #: ../freedesktop.org.xml.in.h:215
-msgid "Lilypond music sheet"
-msgstr "partition musicale Lilypond"
+msgid "Kexi settings for database server connection"
+msgstr "paramètres Kexi pour connexion au serveur de base de données"
 
 #: ../freedesktop.org.xml.in.h:216
-msgid "Linear and integer program expression format"
-msgstr "format d'expression de programmation linéaire et entière"
+msgid "shortcut to Kexi project on database server"
+msgstr "raccourci vers projet Kexi sur serveur de base de données"
 
 #: ../freedesktop.org.xml.in.h:217
-msgid "Linux PSF console font"
-msgstr "police console Linux PSF"
+msgid "Kexi database file-based project"
+msgstr "projet de base de données Kexi en mode fichier"
 
 #: ../freedesktop.org.xml.in.h:218
-msgid "Linux PSF console font (gzip-compressed)"
-msgstr "police console Linux PSF (compressée gzip)"
+msgid "KFormula formula"
+msgstr "formule KFormula"
 
 #: ../freedesktop.org.xml.in.h:219
-msgid "Lotus 1-2-3 spreadsheet"
-msgstr "feuille de calcul Lotus 1-2-3"
+msgid "KIllustrator drawing"
+msgstr "dessin KIllustrator"
 
 #: ../freedesktop.org.xml.in.h:220
-msgid "Lotus AmiPro document"
-msgstr "document Lotus AmiPro"
+msgid "Kivio flowchart"
+msgstr "diagramme de flux Kivio"
 
 #: ../freedesktop.org.xml.in.h:221
-msgid "Lrzip archive"
-msgstr "archive lrzip"
+msgid "Kontour drawing"
+msgstr "dessin Kontour"
 
 #: ../freedesktop.org.xml.in.h:222
-msgid "Lua script"
-msgstr "script Lua"
+msgid "KPovModeler scene"
+msgstr "scène KPovModeler"
 
 #: ../freedesktop.org.xml.in.h:223
-msgid "LyX document"
-msgstr "document LyX"
+msgid "KPresenter presentation"
+msgstr "présentation KPresenter"
 
 #: ../freedesktop.org.xml.in.h:224
-msgid "Lzip archive"
-msgstr "archive lzip"
+msgid "Krita document"
+msgstr "document Krita"
 
 #: ../freedesktop.org.xml.in.h:225
-msgid "M4 macro"
-msgstr "macro M4"
+msgid "KSpread spreadsheet"
+msgstr "feuille de calcul KSpread"
 
 #: ../freedesktop.org.xml.in.h:226
-msgid "MATLAB script/function"
-msgstr "script/fonction MATLAB"
+msgid "KSpread spreadsheet (encrypted)"
+msgstr "feuille de calcul KSpread (chiffrée)"
 
 #: ../freedesktop.org.xml.in.h:227
-msgid "MIDI audio"
-msgstr "audio MIDI"
+msgid "KSysV init package"
+msgstr "paquet d'initialisation KSysV"
 
 #: ../freedesktop.org.xml.in.h:228
-msgid "MNG animation"
-msgstr "animation MNG"
+msgid "Kugar document"
+msgstr "document Kugar"
 
 #: ../freedesktop.org.xml.in.h:229
-msgid "MP2 audio"
-msgstr "audio MP2"
+msgid "KWord document"
+msgstr "document KWord"
 
 #: ../freedesktop.org.xml.in.h:230
-msgid "MP3 ShoutCast playlist"
-msgstr "liste de lecture MP3 ShoutCast"
+msgid "KWord document (encrypted)"
+msgstr "document KWord (chiffré)"
 
 #: ../freedesktop.org.xml.in.h:231
-msgid "MP3 audio"
-msgstr "audio MP3"
+msgid "LHA archive"
+msgstr "archive LHA"
 
 #: ../freedesktop.org.xml.in.h:232
-msgid "MP3 audio (streamed)"
-msgstr "audio MP3 (flux)"
+msgid "LHZ archive"
+msgstr "archive LHZ"
 
 #: ../freedesktop.org.xml.in.h:233
-msgid "MPEG video"
-msgstr "vidéo MPEG"
+msgid "message catalog"
+msgstr "catalogue de messages"
 
 #: ../freedesktop.org.xml.in.h:234
-msgid "MPEG video (streamed)"
-msgstr "vidéo MPEG (flux)"
+msgid "LyX document"
+msgstr "document LyX"
 
 #: ../freedesktop.org.xml.in.h:235
-msgid "MPEG-2 transport stream"
-msgstr "flux de transport MPEG-2"
+msgid "Lzip archive"
+msgstr "archive lzip"
 
 #: ../freedesktop.org.xml.in.h:236
-msgid "MPEG-4 audio"
-msgstr "audio MPEG-4"
+msgid "LZMA archive"
+msgstr "archive LZMA"
 
 #: ../freedesktop.org.xml.in.h:237
-msgid "MPEG-4 audio book"
-msgstr "livre audio MPEG-4"
+msgid "Tar archive (LZMA-compressed)"
+msgstr "archive tar (compression LZMA)"
 
 #: ../freedesktop.org.xml.in.h:238
-msgid "MPEG-4 video"
-msgstr "vidéo MPEG-4"
+msgid "LZO archive"
+msgstr "archive LZO"
 
 #: ../freedesktop.org.xml.in.h:239
-msgid "MPSub subtitles"
-msgstr "sous-titres MPSub"
+msgid "MagicPoint presentation"
+msgstr "présentation MagicPoint"
 
 #: ../freedesktop.org.xml.in.h:240
-msgid "MRML playlist"
-msgstr "liste de lecture MRML"
+msgid "Macintosh MacBinary file"
+msgstr "fichier Macintosh MacBinary"
 
 #: ../freedesktop.org.xml.in.h:241
-msgid "MSX ROM"
-msgstr "ROM MSX"
+msgid "Matroska stream"
+msgstr "flux Matroska"
 
 #: ../freedesktop.org.xml.in.h:242
-msgid "MXF video"
-msgstr "vidéo MXF"
+msgid "Matroska video"
+msgstr "vidéo Matroska"
 
 #: ../freedesktop.org.xml.in.h:243
-msgid "MacOS X icon"
-msgstr "icône MacOS X"
+msgid "Matroska audio"
+msgstr "audio Matroska"
 
 #: ../freedesktop.org.xml.in.h:244
-msgid "MacPaint Bitmap image"
-msgstr "image matricielle MacPaint"
+msgid "WebM video"
+msgstr "vidéo WebM"
 
 #: ../freedesktop.org.xml.in.h:245
-msgid "Macintosh AppleDouble-encoded file"
-msgstr "fichier codé Macintosh AppleDouble"
+msgid "WebM audio"
+msgstr "audio WebM"
 
 #: ../freedesktop.org.xml.in.h:246
-msgid "Macintosh BinHex-encoded file"
-msgstr "fichier codé Macintosh BinHex"
+msgid "MXF video"
+msgstr "vidéo MXF"
 
 #: ../freedesktop.org.xml.in.h:247
-msgid "Macintosh MacBinary file"
-msgstr "fichier Macintosh MacBinary"
+msgid "OCL file"
+msgstr "fichier OCL"
 
 #: ../freedesktop.org.xml.in.h:248
-msgid "Macintosh Quickdraw/PICT drawing"
-msgstr "dessin Macintosh Quickdraw/PICT"
+msgid "COBOL source file"
+msgstr "fichier source COBOL"
 
 #: ../freedesktop.org.xml.in.h:249
-msgid "MagicPoint presentation"
-msgstr "présentation MagicPoint"
+msgid "Mobipocket e-book"
+msgstr "livre numérique Mobipocket"
 
 #: ../freedesktop.org.xml.in.h:250
-msgid "Makefile"
-msgstr "makefile"
+msgid "Adobe FrameMaker MIF document"
+msgstr "document MIF Adobe FrameMaker"
 
 #: ../freedesktop.org.xml.in.h:251
-msgid "Managed Object Format"
-msgstr "format Managed Object"
+msgid "Mozilla bookmarks"
+msgstr "marque-pages Mozilla"
 
 #: ../freedesktop.org.xml.in.h:252
-msgid "Markaby script"
-msgstr "script Markaby"
+msgid "DOS/Windows executable"
+msgstr "exécutable DOS/Windows"
 
 #: ../freedesktop.org.xml.in.h:253
-msgid "Markdown document"
-msgstr ""
+msgid "Internet shortcut"
+msgstr "raccourci Internet"
 
 #: ../freedesktop.org.xml.in.h:254
-msgid "MathML document"
-msgstr "document MathML"
+msgid "WRI document"
+msgstr "document WRI"
 
 #: ../freedesktop.org.xml.in.h:255
-msgid "Mathematica Notebook"
-msgstr "carnet de notes Mathematica"
+msgid "MSX ROM"
+msgstr "ROM MSX"
 
 #: ../freedesktop.org.xml.in.h:256
-msgid "Matroska audio"
-msgstr "audio Matroska"
+msgid "M4 macro"
+msgstr "macro M4"
 
 #: ../freedesktop.org.xml.in.h:257
-msgid "Matroska stream"
-msgstr "flux Matroska"
+msgid "Nintendo64 ROM"
+msgstr "ROM Nintendo64"
 
 #: ../freedesktop.org.xml.in.h:258
-msgid "Matroska video"
-msgstr "vidéo Matroska"
-
-#: ../freedesktop.org.xml.in.h:259
-msgid "Metalink file"
-msgstr "fichier metalink"
+msgid "Nautilus link"
+msgstr "lien Nautilus"
 
+#. Translate this to Famicom if the console was known as such in your locale
 #: ../freedesktop.org.xml.in.h:260
-msgid "MicroDVD subtitles"
-msgstr "sous-titres MicroDVD"
+msgid "NES ROM"
+msgstr "ROM NES"
 
 #: ../freedesktop.org.xml.in.h:261
-msgid "Microsoft ASX playlist"
-msgstr "liste de lecture Microsoft ASX"
+msgid "Unidata NetCDF document"
+msgstr "document Unidata NetCDF"
 
 #: ../freedesktop.org.xml.in.h:262
-msgid "Microsoft Cabinet archive"
-msgstr "archive Cab Microsoft"
+msgid "NewzBin usenet index"
+msgstr "index usenet"
 
 #: ../freedesktop.org.xml.in.h:263
-msgid "Microsoft Document Imaging format"
-msgstr "format Document Imaging Microsoft"
+msgid "object code"
+msgstr "code objet"
 
 #: ../freedesktop.org.xml.in.h:264
-msgid "Microsoft Windows theme pack"
-msgstr "paquet de thèmes Microsoft Windows"
+msgid "Annodex exchange format"
+msgstr "format d'échange Annodex"
 
 #: ../freedesktop.org.xml.in.h:265
-msgid "Microsoft Works document"
-msgstr "document Microsoft Works"
+msgid "Annodex Video"
+msgstr "vidéo Annodex"
 
 #: ../freedesktop.org.xml.in.h:266
-msgid "Microsoft icon"
-msgstr "icône Microsoft"
+msgid "Annodex Audio"
+msgstr "audio Annodex"
 
 #: ../freedesktop.org.xml.in.h:267
-msgid "MiniPSF audio"
-msgstr "audio MiniPSF"
+msgid "Ogg multimedia file"
+msgstr "fichier multimédia Ogg"
 
 #: ../freedesktop.org.xml.in.h:268
-msgid "Minolta MRW raw image"
-msgstr "image brute MRW Minolta"
+msgid "Ogg Audio"
+msgstr "audio Ogg"
 
 #: ../freedesktop.org.xml.in.h:269
-msgid "Mobipocket e-book"
-msgstr "livre numérique Mobipocket"
+msgid "Ogg Video"
+msgstr "vidéo Ogg"
 
 #: ../freedesktop.org.xml.in.h:270
-msgid "Monkey's audio"
-msgstr "audio Monkey"
+msgid "Ogg Vorbis audio"
+msgstr "audio Ogg Vorbis"
 
 #: ../freedesktop.org.xml.in.h:271
-msgid "Mozilla bookmarks"
-msgstr "marque-pages Mozilla"
+msgid "Ogg FLAC audio"
+msgstr "audio Ogg FLAC"
 
 #: ../freedesktop.org.xml.in.h:272
-msgid "Mup publication"
-msgstr "publication Mup"
+msgid "Ogg Speex audio"
+msgstr "audio Ogg Speex"
 
 #: ../freedesktop.org.xml.in.h:273
-msgid "Musepack audio"
-msgstr "audio Musepack"
+msgid "Speex audio"
+msgstr "audio Speex"
+
+#: ../freedesktop.org.xml.in.h:274
+msgid "Ogg Theora video"
+msgstr "vidéo Ogg Theora"
 
-#. Translate this to Famicom if the console was known as such in your locale
 #: ../freedesktop.org.xml.in.h:275
-msgid "NES ROM"
-msgstr "ROM NES"
+msgid "OGM video"
+msgstr "vidéo OGM"
 
 #: ../freedesktop.org.xml.in.h:276
-msgid "NFO document"
-msgstr "document NFO"
+msgid "OLE2 compound document storage"
+msgstr "document de stockage composé OLE2"
 
 #: ../freedesktop.org.xml.in.h:277
-msgid "NIFF image"
-msgstr "image NIFF"
+msgid "Windows Installer package"
+msgstr "paquet d'installation Windows"
 
 #: ../freedesktop.org.xml.in.h:278
-msgid "Nautilus link"
-msgstr "lien Nautilus"
+msgid "GNU Oleo spreadsheet"
+msgstr "feuille de calcul GNU Oleo"
 
 #: ../freedesktop.org.xml.in.h:279
-msgid "Network Packet Capture"
-msgstr "capture de paquet réseau"
+msgid "PAK archive"
+msgstr "archive PAK"
 
 #: ../freedesktop.org.xml.in.h:280
-msgid "NewzBin usenet index"
-msgstr ""
+msgid "Palm OS database"
+msgstr "base de données Palm OS"
 
 #: ../freedesktop.org.xml.in.h:281
-msgid "Nikon NEF raw image"
-msgstr "image brute NEF Nikon"
+msgid "Parchive archive"
+msgstr "archive Parchive"
 
 #: ../freedesktop.org.xml.in.h:282
-msgid "Nintendo DS ROM"
-msgstr "ROM Nintendo DS"
+msgid "PEF executable"
+msgstr "exécutable PEF"
 
 #: ../freedesktop.org.xml.in.h:283
-msgid "Nintendo64 ROM"
-msgstr "ROM Nintendo64"
+msgid "Perl script"
+msgstr "script Perl"
 
 #: ../freedesktop.org.xml.in.h:284
-msgid "NullSoft video"
-msgstr "vidéo NullSoft"
+msgid "PHP script"
+msgstr "script PHP"
 
 #: ../freedesktop.org.xml.in.h:285
-msgid "OCL file"
-msgstr "fichier OCL"
+msgid "PKCS#7 certificate bundle"
+msgstr "lot de certificats PKCS#7"
 
 #: ../freedesktop.org.xml.in.h:286
-msgid "OCaml source code"
-msgstr "code source OCaml"
+msgid "PKCS#12 certificate bundle"
+msgstr "lot de certificats PKCS#12"
 
 #: ../freedesktop.org.xml.in.h:287
-msgid "ODA document"
-msgstr "document ODA"
+msgid "PlanPerfect spreadsheet"
+msgstr "feuille de calcul PlanPerfect"
 
 #: ../freedesktop.org.xml.in.h:288
-msgid "ODB database"
-msgstr "base de données ODB"
+msgid "Pocket Word document"
+msgstr "document Pocket Word"
 
 #: ../freedesktop.org.xml.in.h:289
-msgid "ODC chart"
-msgstr "graphique ODC"
+msgid "Linear and integer program expression format"
+msgstr "format d'expression de programmation linéaire et entière"
 
 #: ../freedesktop.org.xml.in.h:290
-msgid "ODC template"
-msgstr "modèle ODC"
+msgid "profiler results"
+msgstr "résultats de profileur"
 
 #: ../freedesktop.org.xml.in.h:291
-msgid "ODF formula"
-msgstr "formule ODF"
+msgid "Pathetic Writer document"
+msgstr "document Pathetic Writer"
 
 #: ../freedesktop.org.xml.in.h:292
-msgid "ODF template"
-msgstr "modèle ODF"
+msgid "Python bytecode"
+msgstr "bytecode Python"
 
 #: ../freedesktop.org.xml.in.h:293
-msgid "ODG drawing"
-msgstr "dessin ODG"
+msgid "Quattro Pro spreadsheet"
+msgstr "feuille de calcul Quattro Pro"
 
 #: ../freedesktop.org.xml.in.h:294
-msgid "ODG drawing (Flat XML)"
-msgstr "dessin ODG (XML plat)"
+msgid "QuickTime metalink playlist"
+msgstr "liste de lecture metalink QuickTime"
 
 #: ../freedesktop.org.xml.in.h:295
-msgid "ODG template"
-msgstr "modèle ODG"
+msgid "Quicken document"
+msgstr "document Quicken"
 
 #: ../freedesktop.org.xml.in.h:296
-msgid "ODI image"
-msgstr "image ODI"
+msgid "RAR archive"
+msgstr "archive RAR"
 
 #: ../freedesktop.org.xml.in.h:297
-msgid "ODM document"
-msgstr "document ODM"
+msgid "DAR archive"
+msgstr "archive DAR"
 
 #: ../freedesktop.org.xml.in.h:298
-msgid "ODP presentation"
-msgstr "présentation ODP"
+msgid "Alzip archive"
+msgstr "archive alzip"
 
 #: ../freedesktop.org.xml.in.h:299
-msgid "ODP presentation (Flat XML)"
-msgstr "présentation ODP (XML plat)"
+msgid "rejected patch"
+msgstr "correctif rejeté"
 
 #: ../freedesktop.org.xml.in.h:300
-msgid "ODP template"
-msgstr "modèle ODP"
+msgid "RPM package"
+msgstr "paquet RPM"
 
 #: ../freedesktop.org.xml.in.h:301
-msgid "ODS spreadsheet"
-msgstr "feuille de calcul ODS"
+msgid "Ruby script"
+msgstr "script Ruby"
 
 #: ../freedesktop.org.xml.in.h:302
-msgid "ODS spreadsheet (Flat XML)"
-msgstr "feuille de calcul ODS (XML plat)"
+msgid "Markaby script"
+msgstr "script Markaby"
 
 #: ../freedesktop.org.xml.in.h:303
-msgid "ODS template"
-msgstr "modèle ODS"
+msgid "SC/Xspread spreadsheet"
+msgstr "feuille de calcul SC/Xspread"
 
 #: ../freedesktop.org.xml.in.h:304
-msgid "ODT document"
-msgstr "document ODT"
+msgid "shell archive"
+msgstr "archive shell"
 
 #: ../freedesktop.org.xml.in.h:305
-msgid "ODT document (Flat XML)"
-msgstr "document ODT (XML plat)"
+msgid "libtool shared library"
+msgstr "bibliothèque partagée libtool"
 
 #: ../freedesktop.org.xml.in.h:306
-msgid "ODT template"
-msgstr "modèle ODT"
+msgid "shared library"
+msgstr "bibliothèque partagée"
 
 #: ../freedesktop.org.xml.in.h:307
-msgid "OGM video"
-msgstr "vidéo OGM"
+msgid "shell script"
+msgstr "script shell"
 
 #: ../freedesktop.org.xml.in.h:308
-msgid "OLE2 compound document storage"
-msgstr "document de stockage composé OLE2"
-
-#: ../freedesktop.org.xml.in.h:309
-msgid "OOC source code"
-msgstr "source code OOC"
+msgid "Shockwave Flash file"
+msgstr "fichier Shockwave Flash"
 
+#. translators: "Shorten" is the name of an audio codec
 #: ../freedesktop.org.xml.in.h:310
-msgid "OPML syndication feed"
-msgstr "fil de syndication OPML"
+msgid "Shorten audio"
+msgstr "audio Shorten"
 
 #: ../freedesktop.org.xml.in.h:311
-msgid "OTH template"
-msgstr "modèle OTH"
+msgid "Siag spreadsheet"
+msgstr "feuille de calcul Siag"
 
 #: ../freedesktop.org.xml.in.h:312
-msgid "Objective-C source code"
-msgstr "code source Objective-C"
+msgid "Skencil document"
+msgstr "document Skencil"
 
 #: ../freedesktop.org.xml.in.h:313
-msgid "Office drawing"
-msgstr "dessin Office"
+msgid "Stampede package"
+msgstr "paquet Stampede"
 
 #: ../freedesktop.org.xml.in.h:314
-msgid "Ogg Audio"
-msgstr "audio Ogg"
-
-#: ../freedesktop.org.xml.in.h:315
-msgid "Ogg FLAC audio"
-msgstr "audio Ogg FLAC"
+msgid "Sega Master System/Game Gear ROM"
+msgstr "ROM Sega Master System/Game Gear"
 
+#. Translate this as Super Famicom (in Far East Asia) or Super Nintendo (in Europe) if the console was known as such in your locale
 #: ../freedesktop.org.xml.in.h:316
-msgid "Ogg Speex audio"
-msgstr "audio Ogg Speex"
+msgid "Super NES ROM"
+msgstr "ROM Super Nintendo"
 
 #: ../freedesktop.org.xml.in.h:317
-msgid "Ogg Theora video"
-msgstr "vidéo Ogg Theora"
+msgid "StuffIt archive"
+msgstr "archive StuffIt"
 
 #: ../freedesktop.org.xml.in.h:318
-msgid "Ogg Video"
-msgstr "vidéo Ogg"
+msgid "SubRip subtitles"
+msgstr "sous-titres SubRip"
 
 #: ../freedesktop.org.xml.in.h:319
-msgid "Ogg Vorbis audio"
-msgstr "audio Ogg Vorbis"
+msgid "WebVTT subtitles"
+msgstr "sous-titres WebVTT"
 
 #: ../freedesktop.org.xml.in.h:320
-msgid "Ogg multimedia file"
-msgstr "fichier multimédia Ogg"
+msgid "SAMI subtitles"
+msgstr "sous-titres SAMI"
 
 #: ../freedesktop.org.xml.in.h:321
-msgid "Olympus ORF raw image"
-msgstr "image brute ORF Olympus"
-
+msgid "MicroDVD subtitles"
+msgstr "sous-titres MicroDVD"
+
 #: ../freedesktop.org.xml.in.h:322
-msgid "OpenOffice Calc spreadsheet"
-msgstr "feuille de calcul OpenOffice Calc"
+msgid "MPSub subtitles"
+msgstr "sous-titres MPSub"
 
 #: ../freedesktop.org.xml.in.h:323
-msgid "OpenOffice Calc template"
-msgstr "modèle OpenOffice Calc"
+msgid "SSA subtitles"
+msgstr "sous-titres SSA"
 
 #: ../freedesktop.org.xml.in.h:324
-msgid "OpenOffice Draw drawing"
-msgstr "dessin OpenOffice Draw"
+msgid "SubViewer subtitles"
+msgstr "sous-titres SubViewer"
 
 #: ../freedesktop.org.xml.in.h:325
-msgid "OpenOffice Draw template"
-msgstr "modèle OpenOffice Draw"
+msgid "iMelody ringtone"
+msgstr "sonnerie iMelody"
 
 #: ../freedesktop.org.xml.in.h:326
-msgid "OpenOffice Impress presentation"
-msgstr "présentation OpenOffice Impress"
+msgid "SMAF audio"
+msgstr "audio SMAF"
 
 #: ../freedesktop.org.xml.in.h:327
-msgid "OpenOffice Impress template"
-msgstr "modèle OpenOffice Impress"
+msgid "MRML playlist"
+msgstr "liste de lecture MRML"
 
 #: ../freedesktop.org.xml.in.h:328
-msgid "OpenOffice Math formula"
-msgstr "formule OpenOffice Math"
+msgid "XMF audio"
+msgstr "audio XMF"
 
 #: ../freedesktop.org.xml.in.h:329
-msgid "OpenOffice Writer document"
-msgstr "document OpenOffice Writer"
+msgid "SV4 CPIO archive"
+msgstr "archive SV4 CPIO"
 
 #: ../freedesktop.org.xml.in.h:330
-msgid "OpenOffice Writer global document"
-msgstr "document global OpenOffice Writer"
+msgid "SV4 CPIO archive (with CRC)"
+msgstr "archive SV4 CPIO (avec CRC)"
 
 #: ../freedesktop.org.xml.in.h:331
-msgid "OpenOffice Writer template"
-msgstr "modèle OpenOffice Writer"
+msgid "Tar archive"
+msgstr "archive tar"
 
 #: ../freedesktop.org.xml.in.h:332
-msgid "OpenOffice.org extension"
-msgstr "extension OpenOffice.org"
+msgid "Tar archive (compressed)"
+msgstr "archive tar (compressée)"
 
 #: ../freedesktop.org.xml.in.h:333
-msgid "OpenRaster archiving image"
-msgstr "image d'archive OpenRaster"
+msgid "generic font file"
+msgstr "fichier de polices générique"
 
 #: ../freedesktop.org.xml.in.h:334
-msgid "OpenType font"
-msgstr "police OpenType"
+msgid "packed font file"
+msgstr "fichier de polices empaquetées"
 
 #: ../freedesktop.org.xml.in.h:335
-msgid "PAK archive"
-msgstr "archive PAK"
+msgid "TGIF document"
+msgstr "document TGIF"
 
 #: ../freedesktop.org.xml.in.h:336
-msgid "PBM image"
-msgstr "image PBM"
+msgid "theme"
+msgstr "thème"
 
 #: ../freedesktop.org.xml.in.h:337
-msgid "PCD image"
-msgstr "image PCD"
+msgid "ToutDoux document"
+msgstr "document ToutDoux"
 
 #: ../freedesktop.org.xml.in.h:338
-msgid "PCF font"
-msgstr "police PCF"
+msgid "backup file"
+msgstr "fichier de sauvegarde"
 
 #: ../freedesktop.org.xml.in.h:339
-msgid "PCL file"
-msgstr "fichier PCL"
+msgid "Troff document"
+msgstr "document Troff"
 
 #: ../freedesktop.org.xml.in.h:340
-msgid "PCM audio"
-msgstr "audio PCM"
+msgid "Troff document (with manpage macros)"
+msgstr "document Troff (avec macros manpage)"
 
 #: ../freedesktop.org.xml.in.h:341
-msgid "PCX image"
-msgstr "image PCX"
+msgid "manual page (compressed)"
+msgstr "page de manuel (compressée)"
 
 #: ../freedesktop.org.xml.in.h:342
-msgid "PDF document"
-msgstr "document PDF"
+msgid "Tar archive (LZO-compressed)"
+msgstr "archive tar (compression LZO)"
 
 #: ../freedesktop.org.xml.in.h:343
-msgid "PDF document (XZ-compressed)"
-msgstr "document PDF (compressé XZ)"
+msgid "XZ archive"
+msgstr "archive XZ"
 
 #: ../freedesktop.org.xml.in.h:344
-msgid "PDF document (bzip-compressed)"
-msgstr "document PDF (compressé bzip)"
+msgid "Tar archive (XZ-compressed)"
+msgstr "archive tar (compression XZ)"
 
 #: ../freedesktop.org.xml.in.h:345
-msgid "PDF document (gzip-compressed)"
-msgstr "document PDF (compressé gzip)"
+msgid "PDF document (XZ-compressed)"
+msgstr "document PDF (compressé XZ)"
 
 #: ../freedesktop.org.xml.in.h:346
-msgid "PEF executable"
-msgstr "exécutable PEF"
+msgid "Ustar archive"
+msgstr "archive Ustar"
 
 #: ../freedesktop.org.xml.in.h:347
-msgid "PGM image"
-msgstr "image PGM"
+msgid "WAIS source code"
+msgstr "code source WAIS"
 
 #: ../freedesktop.org.xml.in.h:348
-msgid "PGN chess game notation"
-msgstr "notation de jeu d'échecs PGN"
+msgid "WordPerfect/Drawperfect image"
+msgstr "image WordPerfect/DrawPerfect"
 
 #: ../freedesktop.org.xml.in.h:349
-msgid "PGP keys"
-msgstr "clés PGP"
+msgid "DER/PEM/Netscape-encoded X.509 certificate"
+msgstr "certificat X.509 codé DER/PEM/Netscape"
 
 #: ../freedesktop.org.xml.in.h:350
-msgid "PGP/MIME-encrypted message header"
-msgstr "en-tête de message codé PGP/MIME"
+msgid "empty document"
+msgstr "document vide"
 
 #: ../freedesktop.org.xml.in.h:351
-msgid "PHP script"
-msgstr "script PHP"
+msgid "Zoo archive"
+msgstr "archive zoo"
 
 #: ../freedesktop.org.xml.in.h:352
-msgid "PKCS#10 certification request"
-msgstr "requête de certification PKCS#10"
+msgid "XHTML page"
+msgstr "page XHTML"
 
 #: ../freedesktop.org.xml.in.h:353
-msgid "PKCS#12 certificate bundle"
-msgstr "lot de certificats PKCS#12"
+msgid "Zip archive"
+msgstr "archive zip"
 
 #: ../freedesktop.org.xml.in.h:354
-msgid "PKCS#7 certificate bundle"
-msgstr "lot de certificats PKCS#7"
+msgid "Windows Imaging Format Disk Image"
+msgstr "image disque Windows Imaging Format"
 
 #: ../freedesktop.org.xml.in.h:355
-msgid "PKCS#8 private key"
-msgstr "clé privée PKCS#8"
+msgid "Dolby Digital audio"
+msgstr "audio Dolby Digital"
 
 #: ../freedesktop.org.xml.in.h:356
-msgid "PNG image"
-msgstr "image PNG"
+msgid "AMR audio"
+msgstr "audio AMR"
 
 #: ../freedesktop.org.xml.in.h:357
-msgid "PNM image"
-msgstr "image PNM"
+msgid "AMR-WB audio"
+msgstr "audio AMR-WB"
 
 #: ../freedesktop.org.xml.in.h:358
-msgid "PPM image"
-msgstr "image PPM"
+msgid "ULAW (Sun) audio"
+msgstr "audio ULAW (Sun)"
 
 #: ../freedesktop.org.xml.in.h:359
-msgid "PS document"
-msgstr "document PS"
+msgid "Commodore 64 audio"
+msgstr "audio Commodore 64"
 
 #: ../freedesktop.org.xml.in.h:360
-msgid "PSF audio"
-msgstr "audio PSF"
+msgid "PCM audio"
+msgstr "audio PCM"
 
 #: ../freedesktop.org.xml.in.h:361
-msgid "PSFlib audio library"
-msgstr "bibliothèque audio PSFlib"
+msgid "AIFC audio"
+msgstr "audio AIFC"
 
 #: ../freedesktop.org.xml.in.h:362
-msgid "Pack200 Java archive"
-msgstr "archive Java Pack200"
+msgid "AIFF/Amiga/Mac audio"
+msgstr "audio AIFF/Amiga/Mac"
 
 #: ../freedesktop.org.xml.in.h:363
-msgid "Palm OS database"
-msgstr "base de données Palm OS"
+msgid "AIFF audio"
+msgstr "audio AIFF"
 
 #: ../freedesktop.org.xml.in.h:364
-msgid "Panasonic raw image"
-msgstr "image brute Panasonic"
+msgid "Monkey's audio"
+msgstr "audio Monkey"
 
 #: ../freedesktop.org.xml.in.h:365
-msgid "Panasonic raw2 image"
-msgstr "image raw2 Panasonic"
+msgid "Impulse Tracker audio"
+msgstr "audio Impulse Tracker"
 
 #: ../freedesktop.org.xml.in.h:366
-msgid "Parchive archive"
-msgstr "archive Parchive"
+msgid "FLAC audio"
+msgstr "audio FLAC"
 
 #: ../freedesktop.org.xml.in.h:367
-msgid "Pascal source code"
-msgstr "code source Pascal"
+msgid "WavPack audio"
+msgstr "audio WavPack"
 
 #: ../freedesktop.org.xml.in.h:368
-msgid "Pathetic Writer document"
-msgstr "document Pathetic Writer"
+msgid "WavPack audio correction file"
+msgstr "fichier de correction audio WavPack"
 
 #: ../freedesktop.org.xml.in.h:369
-msgid "Pentax PEF raw image"
-msgstr "image brute PEF Pentax"
+msgid "MIDI audio"
+msgstr "audio MIDI"
 
 #: ../freedesktop.org.xml.in.h:370
-msgid "Perl script"
-msgstr "script Perl"
+msgid "compressed Tracker audio"
+msgstr "audio Tracker compressé"
 
 #: ../freedesktop.org.xml.in.h:371
-msgid "Photoshop image"
-msgstr "image Photoshop"
+msgid "MPEG-4 audio"
+msgstr "audio MPEG-4"
+
+#: ../freedesktop.org.xml.in.h:372
+msgid "MPEG-4 video"
+msgstr "vidéo MPEG-4"
+
+#: ../freedesktop.org.xml.in.h:373
+msgid "MPEG-4 audio book"
+msgstr "livre audio MPEG-4"
+
+#: ../freedesktop.org.xml.in.h:374
+msgid "3GPP multimedia file"
+msgstr "fichier multimédia 3GPP"
 
-#. TRANSLATORS: This is a brand-name, not a generic term. Please see
-#. http://en.wikipedia.org/wiki/Picture_CD
-#. http://www.re.org/kristin/picturecd.html
 #: ../freedesktop.org.xml.in.h:375
-msgid "Picture CD"
-msgstr "CD Picture"
+msgid "3GPP2 multimedia file"
+msgstr "fichier multimédia 3GPP2"
 
 #: ../freedesktop.org.xml.in.h:376
-msgid "PkiPath certification path"
-msgstr "chemin de certification PkiPath"
+msgid "Amiga SoundTracker audio"
+msgstr "audio SoundTracker Amiga"
 
 #: ../freedesktop.org.xml.in.h:377
-msgid "PlanPerfect spreadsheet"
-msgstr "feuille de calcul PlanPerfect"
+msgid "MP2 audio"
+msgstr "audio MP2"
 
 #: ../freedesktop.org.xml.in.h:378
-msgid "Plucker document"
-msgstr "document Plucker"
+msgid "MP3 audio"
+msgstr "audio MP3"
 
 #: ../freedesktop.org.xml.in.h:379
-msgid "Pocket Word document"
-msgstr "document Pocket Word"
+msgid "MP3 audio (streamed)"
+msgstr "audio MP3 (flux)"
 
 #: ../freedesktop.org.xml.in.h:380
-msgid "PostScript document (bzip-compressed)"
-msgstr "document PostScript (compressé bzip)"
+msgid "HTTP Live Streaming playlist"
+msgstr "liste de lecture de flux HTTP Live"
 
 #: ../freedesktop.org.xml.in.h:381
-msgid "PostScript document (gzip-compressed)"
-msgstr "document PostScript (compressé gzip)"
+msgid "Microsoft ASX playlist"
+msgstr "liste de lecture Microsoft ASX"
 
 #: ../freedesktop.org.xml.in.h:382
-msgid "Postscript type-1 font"
-msgstr "police Postscript Type 1"
+msgid "PSF audio"
+msgstr "audio PSF"
 
 #: ../freedesktop.org.xml.in.h:383
-msgid "PowerPoint 2007 presentation"
-msgstr "présentation PowerPoint 2007"
+msgid "MiniPSF audio"
+msgstr "audio MiniPSF"
 
 #: ../freedesktop.org.xml.in.h:384
-msgid "PowerPoint 2007 presentation template"
-msgstr "modèle de présentation PowerPoint 2007"
+msgid "PSFlib audio library"
+msgstr "bibliothèque audio PSFlib"
 
 #: ../freedesktop.org.xml.in.h:385
-msgid "PowerPoint 2007 show"
-msgstr "diaporama PowerPoint 2007"
+msgid "Windows Media audio"
+msgstr "audio Windows Media"
 
 #: ../freedesktop.org.xml.in.h:386
-msgid "PowerPoint 2007 slide"
-msgstr "diapositive PowerPoint 2007"
+msgid "Musepack audio"
+msgstr "audio Musepack"
 
 #: ../freedesktop.org.xml.in.h:387
-msgid "PowerPoint add-in"
-msgstr "complément PowerPoint"
+msgid "RealAudio document"
+msgstr "document RealAudio"
 
 #: ../freedesktop.org.xml.in.h:388
-msgid "PowerPoint macro-enabled presentation"
-msgstr "présentation PowerPoint avec macros"
+msgid "RealMedia Metafile"
+msgstr "métafichier RealMedia"
 
 #: ../freedesktop.org.xml.in.h:389
-msgid "PowerPoint macro-enabled presentation template"
-msgstr "modèle de présentation PowerPoint avec macros"
+msgid "RealVideo document"
+msgstr "document RealVideo"
 
 #: ../freedesktop.org.xml.in.h:390
-msgid "PowerPoint macro-enabled slide"
-msgstr "diapositive PowerPoint avec macros"
+msgid "RealMedia document"
+msgstr "document RealMedia"
 
 #: ../freedesktop.org.xml.in.h:391
-msgid "PowerPoint presentation"
-msgstr "présentation PowerPoint"
+msgid "RealPix document"
+msgstr "document RealPix"
 
 #: ../freedesktop.org.xml.in.h:392
-msgid "Python bytecode"
-msgstr "bytecode Python"
+msgid "RealText document"
+msgstr "document RealText"
 
 #: ../freedesktop.org.xml.in.h:393
-msgid "Python script"
-msgstr "script Python"
+msgid "RIFF audio"
+msgstr "audio RIFF"
 
 #: ../freedesktop.org.xml.in.h:394
-msgid "Qt Designer file"
-msgstr "fichier Qt Designer"
+msgid "Scream Tracker 3 audio"
+msgstr "audio Scream Tracker 3"
 
 #: ../freedesktop.org.xml.in.h:395
-msgid "Qt MOC file"
-msgstr "fichier Qt MOC"
+msgid "MP3 ShoutCast playlist"
+msgstr "liste de lecture MP3 ShoutCast"
 
 #: ../freedesktop.org.xml.in.h:396
-msgid "Qt Markup Language file"
-msgstr "fichier Qt Markup Language"
+msgid "Scream Tracker audio"
+msgstr "audio Scream Tracker"
 
 #: ../freedesktop.org.xml.in.h:397
-msgid "Quattro Pro spreadsheet"
-msgstr "feuille de calcul Quattro Pro"
+msgid "VOC audio"
+msgstr "audio VOC"
 
 #: ../freedesktop.org.xml.in.h:398
-msgid "QuickTime image"
-msgstr "image QuickTime"
+msgid "WAV audio"
+msgstr "audio WAV"
 
 #: ../freedesktop.org.xml.in.h:399
-msgid "QuickTime metalink playlist"
-msgstr "liste de lecture metalink QuickTime"
+msgid "Scream Tracker instrument"
+msgstr "instrument Scream Tracker"
 
 #: ../freedesktop.org.xml.in.h:400
-msgid "QuickTime video"
-msgstr "vidéo QuickTime"
+msgid "FastTracker II audio"
+msgstr "audio FastTracker II"
 
 #: ../freedesktop.org.xml.in.h:401
-msgid "Quicken document"
-msgstr "document Quicken"
+msgid "TrueAudio audio"
+msgstr "audio TrueAudio"
 
 #: ../freedesktop.org.xml.in.h:402
-msgid "RAR archive"
-msgstr "archive RAR"
+msgid "Windows BMP image"
+msgstr "image Windows BMP"
 
 #: ../freedesktop.org.xml.in.h:403
-msgid "RDF file"
-msgstr "fichier RDF"
+msgid "WBMP image"
+msgstr "image WBMP"
 
 #: ../freedesktop.org.xml.in.h:404
-msgid "README document"
-msgstr "document LISEZ-MOI"
+msgid "Computer Graphics Metafile"
+msgstr "métafichier Computer Graphics"
 
 #: ../freedesktop.org.xml.in.h:405
-msgid "RELAX NG XML schema"
-msgstr "schéma XML RELAX NG"
+msgid "CCITT G3 fax"
+msgstr "télécopie G3 CCITT"
 
 #: ../freedesktop.org.xml.in.h:406
-msgid "RGB image"
-msgstr "image RGB"
+msgid "G3 fax image"
+msgstr "image de télécopie G3"
 
 #: ../freedesktop.org.xml.in.h:407
-msgid "RIFF audio"
-msgstr "audio RIFF"
+msgid "GIF image"
+msgstr "image GIF"
 
 #: ../freedesktop.org.xml.in.h:408
-msgid "RPM package"
-msgstr "paquet RPM"
+msgid "IEF image"
+msgstr "image IEF"
 
 #: ../freedesktop.org.xml.in.h:409
-msgid "RPM spec file"
-msgstr "fichier de spécification RPM"
+msgid "JPEG image"
+msgstr "image JPEG"
 
 #: ../freedesktop.org.xml.in.h:410
-msgid "RSS summary"
-msgstr "résumé RSS"
+msgid "JPEG-2000 image"
+msgstr "image JPEG-2000"
 
 #: ../freedesktop.org.xml.in.h:411
-msgid "RTF document"
-msgstr "document RTF"
+msgid "OpenRaster archiving image"
+msgstr "image d'archive OpenRaster"
 
 #: ../freedesktop.org.xml.in.h:412
-msgid "RealAudio document"
-msgstr "document RealAudio"
+msgid "DirectDraw surface"
+msgstr "surface DirectDraw"
 
 #: ../freedesktop.org.xml.in.h:413
-msgid "RealMedia Metafile"
-msgstr "métafichier RealMedia"
+msgid "X11 cursor"
+msgstr "curseur X11"
 
 #: ../freedesktop.org.xml.in.h:414
-msgid "RealMedia document"
-msgstr "document RealMedia"
+msgid "EXR image"
+msgstr "image EXR"
 
 #: ../freedesktop.org.xml.in.h:415
-msgid "RealPix document"
-msgstr "document RealPix"
+msgid "Macintosh Quickdraw/PICT drawing"
+msgstr "dessin Macintosh Quickdraw/PICT"
 
 #: ../freedesktop.org.xml.in.h:416
-msgid "RealText document"
-msgstr "document RealText"
+msgid "UFRaw ID image"
+msgstr "image ID UFRaw"
 
 #: ../freedesktop.org.xml.in.h:417
-msgid "RealVideo document"
-msgstr "document RealVideo"
+msgid "digital raw image"
+msgstr "image brute numérique"
 
 #: ../freedesktop.org.xml.in.h:418
-msgid "Ruby script"
-msgstr "script Ruby"
+msgid "Adobe DNG negative"
+msgstr "négatif DNG Adobe"
 
 #: ../freedesktop.org.xml.in.h:419
-msgid "Run Length Encoded bitmap image"
-msgstr "image matricielle Run Length Encoded"
+msgid "Canon CRW raw image"
+msgstr "image brute CRW Canon"
 
 #: ../freedesktop.org.xml.in.h:420
-msgid "S/MIME file"
-msgstr "fichier S/MIME"
+msgid "Canon CR2 raw image"
+msgstr "image brute CR2 Canon"
 
 #: ../freedesktop.org.xml.in.h:421
-msgid "SAMI subtitles"
-msgstr "sous-titres SAMI"
+msgid "Fuji RAF raw image"
+msgstr "image brute RAF Fuji"
 
 #: ../freedesktop.org.xml.in.h:422
-msgid "SC/Xspread spreadsheet"
-msgstr "feuille de calcul SC/Xspread"
+msgid "Kodak DCR raw image"
+msgstr "image brute DCR Kodak"
 
 #: ../freedesktop.org.xml.in.h:423
-msgid "SDP multicast stream file"
-msgstr "fichier de flux multidiffusion SDP"
+msgid "Kodak K25 raw image"
+msgstr "image brute K25 Kodak"
+
+#: ../freedesktop.org.xml.in.h:424
+msgid "Kodak KDC raw image"
+msgstr "image brute KDC Kodak"
+
+#: ../freedesktop.org.xml.in.h:425
+msgid "Minolta MRW raw image"
+msgstr "image brute MRW Minolta"
+
+#: ../freedesktop.org.xml.in.h:426
+msgid "Nikon NEF raw image"
+msgstr "image brute NEF Nikon"
 
-#. translators: a record is in this context a description of a board game
-#. that has been played, and that can be played back again:
-#. http://www.red-bean.com/sgf/
 #: ../freedesktop.org.xml.in.h:427
-msgid "SGF record"
-msgstr "partie SGF"
+msgid "Olympus ORF raw image"
+msgstr "image brute ORF Olympus"
 
 #: ../freedesktop.org.xml.in.h:428
-msgid "SGI image"
-msgstr "image SGI"
+msgid "Panasonic raw image"
+msgstr "image brute Panasonic"
 
 #: ../freedesktop.org.xml.in.h:429
-msgid "SGI video"
-msgstr "vidéo SGI"
+msgid "Panasonic raw2 image"
+msgstr "image raw2 Panasonic"
 
 #: ../freedesktop.org.xml.in.h:430
-msgid "SGML document"
-msgstr "document SGML"
+msgid "Pentax PEF raw image"
+msgstr "image brute PEF Pentax"
 
 #: ../freedesktop.org.xml.in.h:431
-msgid "SIS package"
-msgstr "paquet SIS"
+msgid "Sigma X3F raw image"
+msgstr "image brute X3F Sigma"
 
 #: ../freedesktop.org.xml.in.h:432
-msgid "SISX package"
-msgstr "paquet SISX"
+msgid "Sony SRF raw image"
+msgstr "image brute SRF Sony"
 
 #: ../freedesktop.org.xml.in.h:433
-msgid "SMAF audio"
-msgstr "audio SMAF"
+msgid "Sony SR2 raw image"
+msgstr "image brute SR2 Sony"
 
 #: ../freedesktop.org.xml.in.h:434
-msgid "SMIL document"
-msgstr "document SMIL"
+msgid "Sony ARW raw image"
+msgstr "image brute ARW Sony"
 
 #: ../freedesktop.org.xml.in.h:435
-msgid "SPSS Data File"
-msgstr "fichier de données SPSS"
+msgid "PNG image"
+msgstr "image PNG"
 
 #: ../freedesktop.org.xml.in.h:436
-msgid "SPSS Portable Data File"
-msgstr "fichier portable de données SPSS"
+msgid "Run Length Encoded bitmap image"
+msgstr "image matricielle Run Length Encoded"
 
 #: ../freedesktop.org.xml.in.h:437
-msgid "SQL code"
-msgstr "code SQL"
+msgid "SVG image"
+msgstr "image SVG"
 
 #: ../freedesktop.org.xml.in.h:438
-msgid "SQLite2 database"
-msgstr "base de données SQLite2"
+msgid "compressed SVG image"
+msgstr "image SVG compressée"
 
 #: ../freedesktop.org.xml.in.h:439
-msgid "SQLite3 database"
-msgstr "base de données SQLite3"
+msgid "TIFF image"
+msgstr "image TIFF"
 
 #: ../freedesktop.org.xml.in.h:440
-msgid "SSA subtitles"
-msgstr "sous-titres SSA"
+msgid "AutoCAD image"
+msgstr "image AutoCAD"
 
 #: ../freedesktop.org.xml.in.h:441
-msgid "SV4 CPIO archive"
-msgstr "archive SV4 CPIO"
+msgid "DXF vector image"
+msgstr "image vectorielle DXF"
 
 #: ../freedesktop.org.xml.in.h:442
-msgid "SV4 CPIO archive (with CRC)"
-msgstr "archive SV4 CPIO (avec CRC)"
+msgid "Microsoft Document Imaging format"
+msgstr "format Document Imaging Microsoft"
 
 #: ../freedesktop.org.xml.in.h:443
-msgid "SVG image"
-msgstr "image SVG"
+msgid "3D Studio image"
+msgstr "image 3D Studio"
 
 #: ../freedesktop.org.xml.in.h:444
-msgid "Scala source code"
-msgstr "code source Scala"
+msgid "Applix Graphics image"
+msgstr "image Applix Graphics"
 
 #: ../freedesktop.org.xml.in.h:445
-msgid "Scheme source code"
-msgstr "code source Scheme"
+msgid "EPS image (bzip-compressed)"
+msgstr "image EPS (compressée bzip)"
 
 #: ../freedesktop.org.xml.in.h:446
-msgid "Scream Tracker 3 audio"
-msgstr "audio Scream Tracker 3"
+msgid "CMU raster image"
+msgstr "image raster CMU"
 
 #: ../freedesktop.org.xml.in.h:447
-msgid "Scream Tracker audio"
-msgstr "audio Scream Tracker"
+msgid "compressed GIMP image"
+msgstr "image GIMP compressée"
 
 #: ../freedesktop.org.xml.in.h:448
-msgid "Scream Tracker instrument"
-msgstr "instrument Scream Tracker"
+msgid "DICOM image"
+msgstr "image DICOM"
 
 #: ../freedesktop.org.xml.in.h:449
-msgid "Sega Master System/Game Gear ROM"
-msgstr "ROM Sega Master System/Game Gear"
+msgid "DocBook document"
+msgstr "document DocBook"
 
 #: ../freedesktop.org.xml.in.h:450
-msgid "Setext document"
-msgstr "document Setext"
+msgid "DIB image"
+msgstr "image DIB"
 
 #: ../freedesktop.org.xml.in.h:451
-msgid "Shockwave Flash file"
-msgstr "fichier Shockwave Flash"
+msgid "DjVu image"
+msgstr "image DjVu"
+
+#: ../freedesktop.org.xml.in.h:452
+msgid "DPX image"
+msgstr "image DPX"
 
-#. translators: "Shorten" is the name of an audio codec
 #: ../freedesktop.org.xml.in.h:453
-msgid "Shorten audio"
-msgstr "audio Shorten"
+msgid "EPS image"
+msgstr "image EPS"
 
 #: ../freedesktop.org.xml.in.h:454
-msgid "Siag spreadsheet"
-msgstr "feuille de calcul Siag"
+msgid "FITS document"
+msgstr "document FITS"
 
 #: ../freedesktop.org.xml.in.h:455
-msgid "Sieve mail filter script"
-msgstr "script de filtrage de courriel Sieve"
+msgid "FPX image"
+msgstr "image FPX"
 
 #: ../freedesktop.org.xml.in.h:456
-msgid "Sigma X3F raw image"
-msgstr "image brute X3F Sigma"
+msgid "EPS image (gzip-compressed)"
+msgstr "image EPS (compressée gzip)"
 
 #: ../freedesktop.org.xml.in.h:457
-msgid "Skencil document"
-msgstr "document Skencil"
+msgid "Microsoft icon"
+msgstr "icône Microsoft"
 
 #: ../freedesktop.org.xml.in.h:458
-msgid "Sony ARW raw image"
-msgstr "image brute ARW Sony"
+msgid "MacOS X icon"
+msgstr "icône MacOS X"
 
 #: ../freedesktop.org.xml.in.h:459
-msgid "Sony SR2 raw image"
-msgstr "image brute SR2 Sony"
+msgid "IFF image"
+msgstr "image IFF"
 
 #: ../freedesktop.org.xml.in.h:460
-msgid "Sony SRF raw image"
-msgstr "image brute SRF Sony"
+msgid "ILBM image"
+msgstr "image ILBM"
 
 #: ../freedesktop.org.xml.in.h:461
-msgid "Speedo font"
-msgstr "police Speedo"
+msgid "JNG image"
+msgstr "image JNG"
 
 #: ../freedesktop.org.xml.in.h:462
-msgid "Speex audio"
-msgstr "audio Speex"
+msgid "LightWave object"
+msgstr "objet LightWave"
 
 #: ../freedesktop.org.xml.in.h:463
-msgid "Stampede package"
-msgstr "paquet Stampede"
+msgid "LightWave scene"
+msgstr "scène LightWave"
 
 #: ../freedesktop.org.xml.in.h:464
-msgid "StarCalc spreadsheet"
-msgstr "feuille de calcul StarCalc"
+msgid "MacPaint Bitmap image"
+msgstr "image matricielle MacPaint"
 
 #: ../freedesktop.org.xml.in.h:465
-msgid "StarChart chart"
-msgstr "graphique StarChart"
+msgid "Office drawing"
+msgstr "dessin Office"
 
 #: ../freedesktop.org.xml.in.h:466
-msgid "StarDraw drawing"
-msgstr "dessin StarDraw"
+msgid "NIFF image"
+msgstr "image NIFF"
 
 #: ../freedesktop.org.xml.in.h:467
-msgid "StarImpress presentation"
-msgstr "présentation StarImpress"
+msgid "PCX image"
+msgstr "image PCX"
 
 #: ../freedesktop.org.xml.in.h:468
-msgid "StarMail email"
-msgstr "courriel StarMail"
+msgid "PCD image"
+msgstr "image PCD"
 
 #: ../freedesktop.org.xml.in.h:469
-msgid "StarMath formula"
-msgstr "formule StarMath"
+msgid "PNM image"
+msgstr "image PNM"
 
 #: ../freedesktop.org.xml.in.h:470
-msgid "StarWriter document"
-msgstr "document StarWriter"
+msgid "PBM image"
+msgstr "image PBM"
 
 #: ../freedesktop.org.xml.in.h:471
-msgid "StuffIt archive"
-msgstr "archive StuffIt"
+msgid "PGM image"
+msgstr "image PGM"
 
 #: ../freedesktop.org.xml.in.h:472
-msgid "SubRip subtitles"
-msgstr "sous-titres SubRip"
+msgid "PPM image"
+msgstr "image PPM"
 
 #: ../freedesktop.org.xml.in.h:473
-msgid "SubViewer subtitles"
-msgstr "sous-titres SubViewer"
+msgid "Photoshop image"
+msgstr "image Photoshop"
 
 #: ../freedesktop.org.xml.in.h:474
-msgid "Sun raster image"
-msgstr "image raster Sun"
+msgid "RGB image"
+msgstr "image RGB"
 
 #: ../freedesktop.org.xml.in.h:475
-msgid "SunOS News font"
-msgstr "police SunOS News"
+msgid "SGI image"
+msgstr "image SGI"
+
+#: ../freedesktop.org.xml.in.h:476
+msgid "Sun raster image"
+msgstr "image raster Sun"
 
-#. Translate this as Super Famicom (in Far East Asia) or Super Nintendo (in Europe) if the console was known as such in your locale
 #: ../freedesktop.org.xml.in.h:477
-msgid "Super NES ROM"
-msgstr "ROM Super Nintendo"
+msgid "TGA image"
+msgstr "image TGA"
+
+#: ../freedesktop.org.xml.in.h:478
+msgid "Windows cursor"
+msgstr "curseur Windows"
+
+#: ../freedesktop.org.xml.in.h:479
+msgid "Windows animated cursor"
+msgstr "curseur animé Windows"
+
+#: ../freedesktop.org.xml.in.h:480
+msgid "EMF image"
+msgstr "image EMF"
 
-#. TRANSLATORS: This is a brand-name, not a generic term. Please see
-#. http://en.wikipedia.org/wiki/Super_Video_CD
-#. http://everything2.com/index.pl?node_id=1009222
 #: ../freedesktop.org.xml.in.h:481
-msgid "Super Video CD"
-msgstr "Super VCD"
+msgid "WMF image"
+msgstr "image WMF"
 
 #: ../freedesktop.org.xml.in.h:482
-msgid "SystemVerilog header"
-msgstr "en-tête"
+msgid "XBM image"
+msgstr "image XBM"
 
 #: ../freedesktop.org.xml.in.h:483
-msgid "SystemVerilog source code"
-msgstr "code source"
+msgid "GIMP image"
+msgstr "image GIMP"
 
 #: ../freedesktop.org.xml.in.h:484
-msgid "T602 document"
-msgstr "document T602"
+msgid "XFig image"
+msgstr "image XFig"
 
 #: ../freedesktop.org.xml.in.h:485
-msgid "TGA image"
-msgstr "image TGA"
+msgid "XPM image"
+msgstr "image XPM"
 
 #: ../freedesktop.org.xml.in.h:486
-msgid "TGIF document"
-msgstr "document TGIF"
+msgid "X window image"
+msgstr "image X window"
 
 #: ../freedesktop.org.xml.in.h:487
-msgid "TIFF image"
-msgstr "image TIFF"
+msgid "block device"
+msgstr "périphérique de blocs"
 
 #: ../freedesktop.org.xml.in.h:488
-msgid "TNEF message"
-msgstr "message TNEF"
+msgid "character device"
+msgstr "périphérique de caractères"
 
 #: ../freedesktop.org.xml.in.h:489
-msgid "TSV document"
-msgstr "document TSV"
+msgid "folder"
+msgstr "dossier"
 
 #: ../freedesktop.org.xml.in.h:490
-msgid "Tar archive"
-msgstr "archive tar"
+msgid "pipe"
+msgstr "tube"
 
 #: ../freedesktop.org.xml.in.h:491
-msgid "Tar archive (LZMA-compressed)"
-msgstr "archive tar (compression LZMA)"
+msgid "mount point"
+msgstr "point d'accès"
 
 #: ../freedesktop.org.xml.in.h:492
-msgid "Tar archive (LZO-compressed)"
-msgstr "archive tar (compression LZO)"
+msgid "socket"
+msgstr "connecteur réseau"
 
 #: ../freedesktop.org.xml.in.h:493
-msgid "Tar archive (XZ-compressed)"
-msgstr "archive tar (compression XZ)"
+msgid "symbolic link"
+msgstr "lien symbolique"
 
 #: ../freedesktop.org.xml.in.h:494
-msgid "Tar archive (bzip-compressed)"
-msgstr "archive tar (compressée bzip)"
+msgid "mail delivery report"
+msgstr "rapport de livraison de courriels"
 
 #: ../freedesktop.org.xml.in.h:495
-msgid "Tar archive (compressed)"
-msgstr "archive tar (compressée)"
+msgid "mail disposition report"
+msgstr "rapport de disposition de courriels"
 
 #: ../freedesktop.org.xml.in.h:496
-msgid "Tar archive (gzip-compressed)"
-msgstr "archive tar (compressée gzip)"
+msgid "reference to remote file"
+msgstr "référence au fichier distant"
 
 #: ../freedesktop.org.xml.in.h:497
-msgid "Tar archive (lrzip-compressed)"
-msgstr "archive tar (compressée lrzip)"
+msgid "Usenet news message"
+msgstr "message de groupe d'échange Usenet"
 
 #: ../freedesktop.org.xml.in.h:498
-msgid "Tcl script"
-msgstr "script Tcl"
+msgid "partial email message"
+msgstr "message partiel de courriel"
 
 #: ../freedesktop.org.xml.in.h:499
-msgid "TeX DVI document"
-msgstr "document TeX DVI"
+msgid "email message"
+msgstr "message de courriel"
 
 #: ../freedesktop.org.xml.in.h:500
-msgid "TeX DVI document (bzip-compressed)"
-msgstr "document DVI TeX (compressé bzip)"
+msgid "GNU mail message"
+msgstr "message de courriel GNU"
 
 #: ../freedesktop.org.xml.in.h:501
-msgid "TeX DVI document (gzip-compressed)"
-msgstr "document DVI TeX (compressé gzip)"
+msgid "VRML document"
+msgstr "document VRML"
 
 #: ../freedesktop.org.xml.in.h:502
-msgid "TeX document"
-msgstr "document TeX"
+msgid "message in several formats"
+msgstr "message en formats divers"
 
 #: ../freedesktop.org.xml.in.h:503
-msgid "TeX font"
-msgstr "police TeX"
+msgid "Macintosh AppleDouble-encoded file"
+msgstr "fichier codé Macintosh AppleDouble"
 
 #: ../freedesktop.org.xml.in.h:504
-msgid "TeX font metrics"
-msgstr "métriques de police TeX"
+msgid "message digest"
+msgstr "condensé de message"
 
 #: ../freedesktop.org.xml.in.h:505
-msgid "TeXInfo document"
-msgstr "document TeXInfo"
+msgid "encrypted message"
+msgstr "message chiffré"
 
 #: ../freedesktop.org.xml.in.h:506
-msgid "ToutDoux document"
-msgstr "document ToutDoux"
+msgid "compound documents"
+msgstr "documents composés"
 
 #: ../freedesktop.org.xml.in.h:507
-msgid "Troff ME input document"
-msgstr "document d'entrée Troff ME"
+msgid "compound document"
+msgstr "document composé"
 
 #: ../freedesktop.org.xml.in.h:508
-msgid "Troff MM input document"
-msgstr "document d'entrée Troff MM"
+msgid "mail system report"
+msgstr "rapport système de courriels"
 
 #: ../freedesktop.org.xml.in.h:509
-msgid "Troff MS input document"
-msgstr "document d'entrée Troff MS"
+msgid "signed message"
+msgstr "message signé"
 
 #: ../freedesktop.org.xml.in.h:510
-msgid "Troff document"
-msgstr "document Troff"
+msgid "stream of data (server push)"
+msgstr "flux de données (émis par le serveur)"
 
 #: ../freedesktop.org.xml.in.h:511
-msgid "Troff document (with manpage macros)"
-msgstr "document Troff (avec macros manpage)"
+msgid "VCS/ICS calendar"
+msgstr "calendrier VCS/ICS"
 
 #: ../freedesktop.org.xml.in.h:512
-msgid "TrueAudio audio"
-msgstr "audio TrueAudio"
+msgid "CSS stylesheet"
+msgstr "feuille de style CSS"
 
 #: ../freedesktop.org.xml.in.h:513
-msgid "TrueType XML font"
-msgstr "police Truetype XML"
+msgid "electronic business card"
+msgstr "carte de visite électronique"
 
 #: ../freedesktop.org.xml.in.h:514
-msgid "TrueType font"
-msgstr "police Truetype"
+msgid "txt2tags document"
+msgstr "document txt2tags"
 
 #: ../freedesktop.org.xml.in.h:515
-msgid "UFRaw ID image"
-msgstr "image ID UFRaw"
+msgid "Verilog source code"
+msgstr "code source Verilog"
 
 #: ../freedesktop.org.xml.in.h:516
-msgid "ULAW (Sun) audio"
-msgstr "audio ULAW (Sun)"
+msgid "SystemVerilog header"
+msgstr "en-tête"
+
+#: ../freedesktop.org.xml.in.h:517
+msgid "SystemVerilog source code"
+msgstr "code source"
+
+#: ../freedesktop.org.xml.in.h:518
+msgid "VHDL source code"
+msgstr "code source VHDL"
 
-#. http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
-#. http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3
 #: ../freedesktop.org.xml.in.h:519
-msgid "UNIX software"
-msgstr "logiciel UNIX"
+msgid "enriched text document"
+msgstr "document texte enrichi"
 
 #: ../freedesktop.org.xml.in.h:520
-msgid "UNIX-compressed file"
-msgstr "fichier compressé UNIX"
+msgid "help page"
+msgstr "page d'aide"
 
 #: ../freedesktop.org.xml.in.h:521
-msgid "Unidata NetCDF document"
-msgstr "document Unidata NetCDF"
+msgid "plain text document"
+msgstr "document texte brut"
 
 #: ../freedesktop.org.xml.in.h:522
-msgid "Usenet news message"
-msgstr "message de groupe d'échange Usenet"
+msgid "RDF file"
+msgstr "fichier RDF"
 
 #: ../freedesktop.org.xml.in.h:523
-msgid "Ustar archive"
-msgstr "archive Ustar"
+msgid "email headers"
+msgstr "en-têtes de courriel"
 
 #: ../freedesktop.org.xml.in.h:524
-msgid "V font"
-msgstr "police V"
+msgid "rich text document"
+msgstr "document « rich text »"
 
 #: ../freedesktop.org.xml.in.h:525
-msgid "VCS/ICS calendar"
-msgstr "calendrier VCS/ICS"
+msgid "RSS summary"
+msgstr "résumé RSS"
 
 #: ../freedesktop.org.xml.in.h:526
-msgid "VHDL source code"
-msgstr "code source VHDL"
+msgid "Atom syndication feed"
+msgstr "fil de syndication Atom"
 
 #: ../freedesktop.org.xml.in.h:527
-msgid "VOC audio"
-msgstr "audio VOC"
+msgid "OPML syndication feed"
+msgstr "fil de syndication OPML"
 
 #: ../freedesktop.org.xml.in.h:528
-msgid "VRML document"
-msgstr "document VRML"
+msgid "SGML document"
+msgstr "document SGML"
 
 #: ../freedesktop.org.xml.in.h:529
-msgid "Vala source code"
-msgstr "code source Vala"
+msgid "spreadsheet interchange document"
+msgstr "document d'échange de feuilles de calcul"
 
 #: ../freedesktop.org.xml.in.h:530
-msgid "Verilog source code"
-msgstr "code source Verilog"
+msgid "TSV document"
+msgstr "document TSV"
+
+#: ../freedesktop.org.xml.in.h:531
+msgid "Graphviz DOT graph"
+msgstr "graphe Graphviz DOT"
+
+#: ../freedesktop.org.xml.in.h:532
+msgid "JAD document"
+msgstr "document JAD"
+
+#: ../freedesktop.org.xml.in.h:533
+msgid "WML document"
+msgstr "document WML"
 
-#. TRANSLATORS: This is a brand-name, not a generic term. Please see
-#. http://en.wikipedia.org/wiki/Video_CD
-#. http://www.herongyang.com/CD-DVD/VCD-Movie-File-Directory-Structure.html
 #: ../freedesktop.org.xml.in.h:534
-msgid "Video CD"
-msgstr "CD vidéo"
+msgid "WMLScript program"
+msgstr "programme WMLScript"
 
 #: ../freedesktop.org.xml.in.h:535
-msgid "Vivo video"
-msgstr "vidéo Vivo"
+msgid "ACE archive"
+msgstr "archive ACE"
 
 #: ../freedesktop.org.xml.in.h:536
-msgid "WAIS source code"
-msgstr "code source WAIS"
+msgid "Ada source code"
+msgstr "code source Ada"
 
 #: ../freedesktop.org.xml.in.h:537
-msgid "WAV audio"
-msgstr "audio WAV"
+msgid "author list"
+msgstr "liste d'auteurs"
 
 #: ../freedesktop.org.xml.in.h:538
-msgid "WBMP image"
-msgstr "image WBMP"
+msgid "BibTeX document"
+msgstr "document BibTeX"
 
 #: ../freedesktop.org.xml.in.h:539
-msgid "WMF image"
-msgstr "image WMF"
+msgid "C++ header"
+msgstr "en-tête C++"
 
 #: ../freedesktop.org.xml.in.h:540
-msgid "WML document"
-msgstr "document WML"
+msgid "C++ source code"
+msgstr "code source C++"
 
 #: ../freedesktop.org.xml.in.h:541
-msgid "WMLScript program"
-msgstr "programme WMLScript"
+msgid "ChangeLog document"
+msgstr "document ChangeLog"
 
 #: ../freedesktop.org.xml.in.h:542
-msgid "WPL playlist"
-msgstr "liste de lecture WPL"
+msgid "C header"
+msgstr "en-tête C"
 
 #: ../freedesktop.org.xml.in.h:543
-msgid "WRI document"
-msgstr "document WRI"
+msgid "CMake source code"
+msgstr "code source CMake"
 
 #: ../freedesktop.org.xml.in.h:544
-msgid "WWF document"
-msgstr "document WWF"
+msgid "CSV document"
+msgstr "document CSV"
 
 #: ../freedesktop.org.xml.in.h:545
-msgid "WavPack audio"
-msgstr "audio WavPack"
+msgid "license terms"
+msgstr "termes de licence"
 
 #: ../freedesktop.org.xml.in.h:546
-msgid "WavPack audio correction file"
-msgstr "fichier de correction audio WavPack"
+msgid "author credits"
+msgstr "remerciements"
 
 #: ../freedesktop.org.xml.in.h:547
-msgid "Wavelet video"
-msgstr "vidéo Wavelet"
+msgid "C source code"
+msgstr "code source C"
 
 #: ../freedesktop.org.xml.in.h:548
-msgid "Web application cache manifest"
-msgstr "manifeste de cache d'application Web"
+msgid "C# source code"
+msgstr "code source C#"
 
 #: ../freedesktop.org.xml.in.h:549
-msgid "WebM audio"
-msgstr "audio WebM"
+msgid "Vala source code"
+msgstr "code source Vala"
 
 #: ../freedesktop.org.xml.in.h:550
-msgid "WebM video"
-msgstr "vidéo WebM"
+msgid "OOC source code"
+msgstr "source code OOC"
 
 #: ../freedesktop.org.xml.in.h:551
-msgid "WebVTT subtitles"
-msgstr ""
+msgid "DCL script"
+msgstr "script DCL"
 
 #: ../freedesktop.org.xml.in.h:552
-msgid "Windows BMP image"
-msgstr "image Windows BMP"
+msgid "DSSSL document"
+msgstr "document DSSSL"
 
 #: ../freedesktop.org.xml.in.h:553
-msgid "Windows Imaging Format Disk Image"
-msgstr "image disque Windows Imaging Format"
+msgid "D source code"
+msgstr "code source D"
 
 #: ../freedesktop.org.xml.in.h:554
-msgid "Windows Installer package"
-msgstr "paquet d'installation Windows"
+msgid "DTD file"
+msgstr "fichier DTD"
 
 #: ../freedesktop.org.xml.in.h:555
-msgid "Windows Media Station file"
-msgstr "fichier Windows Media Station"
+msgid "Eiffel source code"
+msgstr "code source Eiffel"
 
 #: ../freedesktop.org.xml.in.h:556
-msgid "Windows Media audio"
-msgstr "audio Windows Media"
+msgid "Emacs Lisp source code"
+msgstr "code source Emacs Lisp"
 
 #: ../freedesktop.org.xml.in.h:557
-msgid "Windows Media video"
-msgstr "vidéo Windows Media"
+msgid "Erlang source code"
+msgstr "code source Erlang"
 
 #: ../freedesktop.org.xml.in.h:558
-msgid "Windows Registry extract"
-msgstr "extrait de registre Windows"
+msgid "Fortran source code"
+msgstr "code source Fortran"
 
 #: ../freedesktop.org.xml.in.h:559
-msgid "Windows animated cursor"
-msgstr "curseur animé Windows"
+msgid "translation file"
+msgstr "fichier de traduction"
 
 #: ../freedesktop.org.xml.in.h:560
-msgid "Windows cursor"
-msgstr "curseur Windows"
+msgid "translation template"
+msgstr "modèle de traduction"
+
+#: ../freedesktop.org.xml.in.h:561
+msgid "HTML document"
+msgstr "document HTML"
+
+#: ../freedesktop.org.xml.in.h:562
+msgid "Web application cache manifest"
+msgstr "manifeste de cache d'application Web"
 
-#. http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
-#. http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3
 #: ../freedesktop.org.xml.in.h:563
-msgid "Windows software"
-msgstr "logiciel Windows"
+msgid "Google Video Pointer"
+msgstr "pointeur vidéo Google"
 
 #: ../freedesktop.org.xml.in.h:564
-msgid "Word 2007 document"
-msgstr "document Word 2007"
+msgid "Haskell source code"
+msgstr "code source Haskell"
 
 #: ../freedesktop.org.xml.in.h:565
-msgid "Word 2007 document template"
-msgstr "modèle de document Word 2007"
+msgid "IDL document"
+msgstr "document IDL"
 
 #: ../freedesktop.org.xml.in.h:566
-msgid "Word document"
-msgstr "document Word"
+msgid "installation instructions"
+msgstr "instructions d'installation"
 
 #: ../freedesktop.org.xml.in.h:567
-msgid "Word macro-enabled document"
-msgstr "document Word avec macros"
+msgid "Java source code"
+msgstr "code source Java"
 
 #: ../freedesktop.org.xml.in.h:568
-msgid "Word macro-enabled document template"
-msgstr "modèle de document Word avec macros"
+msgid "LDIF address book"
+msgstr "carnet d'adresses LDIF"
 
 #: ../freedesktop.org.xml.in.h:569
-msgid "Word template"
-msgstr "modèle Word"
+msgid "Lilypond music sheet"
+msgstr "partition musicale Lilypond"
 
 #: ../freedesktop.org.xml.in.h:570
-msgid "WordPerfect document"
-msgstr "document WordPerfect"
+msgid "LHS source code"
+msgstr "code source LHS"
 
 #: ../freedesktop.org.xml.in.h:571
-msgid "WordPerfect/Drawperfect image"
-msgstr "image WordPerfect/DrawPerfect"
+msgid "application log"
+msgstr "journal d'application"
 
 #: ../freedesktop.org.xml.in.h:572
-msgid "X window image"
-msgstr "image X window"
+msgid "Makefile"
+msgstr "makefile"
 
 #: ../freedesktop.org.xml.in.h:573
-msgid "X-Motif UIL table"
-msgstr "table X-Motif UIL"
+msgid "Markdown document"
+msgstr "document Markdown"
 
 #: ../freedesktop.org.xml.in.h:574
-msgid "X.509 certificate"
-msgstr "certificat X.509"
+msgid "Qt MOC file"
+msgstr "fichier Qt MOC"
 
 #: ../freedesktop.org.xml.in.h:575
-msgid "X11 cursor"
-msgstr "curseur X11"
+msgid "Windows Registry extract"
+msgstr "extrait de registre Windows"
 
 #: ../freedesktop.org.xml.in.h:576
-msgid "XBEL bookmarks"
-msgstr "marque-pages XBEL"
+msgid "Managed Object Format"
+msgstr "format Managed Object"
 
 #: ../freedesktop.org.xml.in.h:577
-msgid "XBM image"
-msgstr "image XBM"
+msgid "Mup publication"
+msgstr "publication Mup"
 
 #: ../freedesktop.org.xml.in.h:578
-msgid "XFig image"
-msgstr "image XFig"
+msgid "Objective-C source code"
+msgstr "code source Objective-C"
 
 #: ../freedesktop.org.xml.in.h:579
-msgid "XHTML page"
-msgstr "page XHTML"
+msgid "OCaml source code"
+msgstr "code source OCaml"
 
 #: ../freedesktop.org.xml.in.h:580
-msgid "XLIFF translation file"
-msgstr "fichier de traduction XLIFF"
+msgid "MATLAB script/function"
+msgstr "script/fonction MATLAB"
 
 #: ../freedesktop.org.xml.in.h:581
-msgid "XMCD CD database"
-msgstr "base de données de CD XMCD"
+msgid "Pascal source code"
+msgstr "code source Pascal"
 
 #: ../freedesktop.org.xml.in.h:582
-msgid "XMF audio"
-msgstr "audio XMF"
+msgid "differences between files"
+msgstr "différences entre fichiers"
 
 #: ../freedesktop.org.xml.in.h:583
-msgid "XMI file"
-msgstr "fichier XMI"
+msgid "Go source code"
+msgstr "code source Go"
 
 #: ../freedesktop.org.xml.in.h:584
-msgid "XML document"
-msgstr "document XML"
+msgid "Python script"
+msgstr "script Python"
 
 #: ../freedesktop.org.xml.in.h:585
-msgid "XML entities document"
-msgstr "document d'entités XML"
+msgid "Lua script"
+msgstr "script Lua"
 
 #: ../freedesktop.org.xml.in.h:586
-msgid "XPInstall installer module"
-msgstr "module d'installation XPInstall"
+msgid "README document"
+msgstr "document LISEZ-MOI"
 
 #: ../freedesktop.org.xml.in.h:587
-msgid "XPM image"
-msgstr "image XPM"
+msgid "NFO document"
+msgstr "document NFO"
 
 #: ../freedesktop.org.xml.in.h:588
-msgid "XPS document"
-msgstr "document XPS"
+msgid "RPM spec file"
+msgstr "fichier de spécification RPM"
 
 #: ../freedesktop.org.xml.in.h:589
-msgid "XSL FO file"
-msgstr "fichier XSL FO"
+msgid "Scala source code"
+msgstr "code source Scala"
 
 #: ../freedesktop.org.xml.in.h:590
-msgid "XSLT stylesheet"
-msgstr "feuille de style XSLT"
+msgid "Scheme source code"
+msgstr "code source Scheme"
 
 #: ../freedesktop.org.xml.in.h:591
-msgid "XSPF playlist"
-msgstr "liste de lecture XSPF"
+msgid "Setext document"
+msgstr "document Setext"
 
 #: ../freedesktop.org.xml.in.h:592
-msgid "XUL interface document"
-msgstr "document d'interface XUL"
+msgid "SQL code"
+msgstr "code SQL"
 
 #: ../freedesktop.org.xml.in.h:593
-msgid "XZ archive"
-msgstr "archive XZ"
+msgid "Tcl script"
+msgstr "script Tcl"
 
 #: ../freedesktop.org.xml.in.h:594
-msgid "Xbase document"
-msgstr "document Xbase"
+msgid "TeX document"
+msgstr "document TeX"
 
 #: ../freedesktop.org.xml.in.h:595
-msgid "YAML document"
-msgstr "document YAML"
+msgid "TeXInfo document"
+msgstr "document TeXInfo"
 
 #: ../freedesktop.org.xml.in.h:596
-msgid "Zip archive"
-msgstr "archive zip"
+msgid "Troff ME input document"
+msgstr "document d'entrée Troff ME"
 
 #: ../freedesktop.org.xml.in.h:597
-msgid "Zoo archive"
-msgstr "archive zoo"
+msgid "Troff MM input document"
+msgstr "document d'entrée Troff MM"
 
 #: ../freedesktop.org.xml.in.h:598
-msgid "application log"
-msgstr "journal d'application"
+msgid "Troff MS input document"
+msgstr "document d'entrée Troff MS"
+
+#: ../freedesktop.org.xml.in.h:599
+msgid "X-Motif UIL table"
+msgstr "table X-Motif UIL"
 
-#. http://en.wikipedia.org/wiki/Red_Book_(audio_CD_standard)
 #: ../freedesktop.org.xml.in.h:600
-msgid "audio CD"
-msgstr "CD audio"
+msgid "resource location"
+msgstr "localisation de ressource"
+
+#: ../freedesktop.org.xml.in.h:601
+msgid "XMI file"
+msgstr "fichier XMI"
 
-#. http://en.wikipedia.org/wiki/DVD-Audio
 #: ../freedesktop.org.xml.in.h:602
-msgid "audio DVD"
-msgstr "DVD audio"
+msgid "XSL FO file"
+msgstr "fichier XSL FO"
 
 #: ../freedesktop.org.xml.in.h:603
-msgid "author credits"
-msgstr "remerciements"
+msgid "iptables configuration file"
+msgstr "fichier de configuration iptables"
 
 #: ../freedesktop.org.xml.in.h:604
-msgid "author list"
-msgstr "liste d'auteurs"
+msgid "XSLT stylesheet"
+msgstr "feuille de style XSLT"
 
 #: ../freedesktop.org.xml.in.h:605
-msgid "backup file"
-msgstr "fichier de sauvegarde"
+msgid "XMCD CD database"
+msgstr "base de données de CD XMCD"
+
+#: ../freedesktop.org.xml.in.h:606
+msgid "XML document"
+msgstr "document XML"
 
-#. http://en.wikipedia.org/wiki/Blu-ray_Disc
 #: ../freedesktop.org.xml.in.h:607
-msgid "blank Blu-ray disc"
-msgstr "disque Blu-Ray vierge"
+msgid "XML entities document"
+msgstr "document d'entités XML"
+
+#: ../freedesktop.org.xml.in.h:608
+msgid "DV video"
+msgstr "vidéo DV"
 
-#. http://en.wikipedia.org/wiki/Compact_Disc
 #: ../freedesktop.org.xml.in.h:609
-msgid "blank CD disc"
-msgstr "CD vierge"
+msgid "ISI video"
+msgstr "vidéo ISI"
+
+#: ../freedesktop.org.xml.in.h:610
+msgid "MPEG-2 transport stream"
+msgstr "flux de transport MPEG-2"
 
-#. http://en.wikipedia.org/wiki/DVD
 #: ../freedesktop.org.xml.in.h:611
-msgid "blank DVD disc"
-msgstr "DVD vierge"
+msgid "MPEG video"
+msgstr "vidéo MPEG"
+
+#: ../freedesktop.org.xml.in.h:612
+msgid "MPEG video (streamed)"
+msgstr "vidéo MPEG (flux)"
 
-#. http://en.wikipedia.org/wiki/HD_DVD
 #: ../freedesktop.org.xml.in.h:613
-msgid "blank HD DVD disc"
-msgstr "disque HD-DVD vierge"
+msgid "QuickTime video"
+msgstr "vidéo QuickTime"
 
 #: ../freedesktop.org.xml.in.h:614
-msgid "block device"
-msgstr "périphérique de blocs"
+msgid "QuickTime image"
+msgstr "image QuickTime"
 
 #: ../freedesktop.org.xml.in.h:615
-msgid "character device"
-msgstr "périphérique de caractères"
+msgid "Vivo video"
+msgstr "vidéo Vivo"
 
 #: ../freedesktop.org.xml.in.h:616
-msgid "comic book archive"
-msgstr "archive Comic Book"
+msgid "Wavelet video"
+msgstr "vidéo Wavelet"
 
 #: ../freedesktop.org.xml.in.h:617
-msgid "compound document"
-msgstr "document composé"
+msgid "ANIM animation"
+msgstr "animation ANIM"
 
 #: ../freedesktop.org.xml.in.h:618
-msgid "compound documents"
-msgstr "documents composés"
+msgid "FLIC animation"
+msgstr "animation FLIC"
 
 #: ../freedesktop.org.xml.in.h:619
-msgid "compressed GIMP image"
-msgstr "image GIMP compressée"
+msgid "Haansoft Hangul document"
+msgstr "document Haansoft Hangul"
 
 #: ../freedesktop.org.xml.in.h:620
-msgid "compressed SVG image"
-msgstr "image SVG compressée"
+msgid "Haansoft Hangul document template"
+msgstr "modèle de document Haansoft Hangul"
 
 #: ../freedesktop.org.xml.in.h:621
-msgid "compressed Tracker audio"
-msgstr "audio Tracker compressé"
+msgid "MNG animation"
+msgstr "animation MNG"
 
 #: ../freedesktop.org.xml.in.h:622
-msgid "desktop configuration file"
-msgstr "fichier de configuration desktop"
+msgid "ASF video"
+msgstr "vidéo ASF"
 
 #: ../freedesktop.org.xml.in.h:623
-msgid "detached OpenPGP signature"
-msgstr "signature OpenPGP détachée"
+msgid "Windows Media Station file"
+msgstr "fichier Windows Media Station"
 
 #: ../freedesktop.org.xml.in.h:624
-msgid "detached S/MIME signature"
-msgstr "signature S/MIME détachée"
+msgid "Windows Media video"
+msgstr "vidéo Windows Media"
 
 #: ../freedesktop.org.xml.in.h:625
-msgid "differences between files"
-msgstr "différences entre fichiers"
+msgid "AVI video"
+msgstr "vidéo AVI"
+
+#: ../freedesktop.org.xml.in.h:626
+msgid "NullSoft video"
+msgstr "vidéo NullSoft"
 
-#. http://en.wikipedia.org/wiki/Design_rule_for_Camera_File_system
 #: ../freedesktop.org.xml.in.h:627
-msgid "digital photos"
-msgstr "photos numériques"
+msgid "SDP multicast stream file"
+msgstr "fichier de flux multidiffusion SDP"
 
 #: ../freedesktop.org.xml.in.h:628
-msgid "digital raw image"
-msgstr "image brute numérique"
+msgid "SGI video"
+msgstr "vidéo SGI"
+
+#: ../freedesktop.org.xml.in.h:629
+msgid "eMusic download package"
+msgstr "paquet de téléchargement eMusic"
 
-#. see fd.o hal spec
 #: ../freedesktop.org.xml.in.h:630
-msgid "e-book reader"
-msgstr "lecteur de livre numérique"
+msgid "KML geographic data"
+msgstr "données géographiques KML"
 
 #: ../freedesktop.org.xml.in.h:631
-msgid "eMusic download package"
-msgstr "paquet de téléchargement eMusic"
+msgid "KML geographic compressed data"
+msgstr "données géographiques KML compressées"
 
 #: ../freedesktop.org.xml.in.h:632
-msgid "electronic book document"
-msgstr "document livre électronique"
+msgid "Citrix ICA settings file"
+msgstr "fichier de paramètres ICA Citrix"
 
 #: ../freedesktop.org.xml.in.h:633
-msgid "electronic business card"
-msgstr "carte de visite électronique"
+msgid "XUL interface document"
+msgstr "document d'interface XUL"
 
 #: ../freedesktop.org.xml.in.h:634
-msgid "email headers"
-msgstr "en-têtes de courriel"
+msgid "XPInstall installer module"
+msgstr "module d'installation XPInstall"
 
 #: ../freedesktop.org.xml.in.h:635
-msgid "email message"
-msgstr "message de courriel"
+msgid "Word 2007 document"
+msgstr "document Word 2007"
 
 #: ../freedesktop.org.xml.in.h:636
-msgid "empty document"
-msgstr "document vide"
+msgid "Word 2007 document template"
+msgstr "modèle de document Word 2007"
 
 #: ../freedesktop.org.xml.in.h:637
-msgid "encrypted message"
-msgstr "message chiffré"
+msgid "PowerPoint 2007 presentation"
+msgstr "présentation PowerPoint 2007"
 
 #: ../freedesktop.org.xml.in.h:638
-msgid "enriched text document"
-msgstr "document texte enrichi"
+msgid "PowerPoint 2007 slide"
+msgstr "diapositive PowerPoint 2007"
 
 #: ../freedesktop.org.xml.in.h:639
-msgid "executable"
-msgstr "exécutable"
+msgid "PowerPoint 2007 show"
+msgstr "diaporama PowerPoint 2007"
 
 #: ../freedesktop.org.xml.in.h:640
-msgid "folder"
-msgstr "dossier"
+msgid "PowerPoint 2007 presentation template"
+msgstr "modèle de présentation PowerPoint 2007"
 
 #: ../freedesktop.org.xml.in.h:641
-msgid "generic font file"
-msgstr "fichier de polices générique"
+msgid "Excel 2007 spreadsheet"
+msgstr "feuille de calcul Excel 2007"
 
 #: ../freedesktop.org.xml.in.h:642
-msgid "help page"
-msgstr "page d'aide"
+msgid "Excel 2007 spreadsheet template"
+msgstr "modèle de feuille de calcul Excel 2007"
 
 #: ../freedesktop.org.xml.in.h:643
-msgid "iMelody ringtone"
-msgstr "sonnerie iMelody"
+msgid "T602 document"
+msgstr "document T602"
 
 #: ../freedesktop.org.xml.in.h:644
-msgid "iPod firmware"
-msgstr "firmware iPod"
+msgid "Cisco VPN Settings"
+msgstr "paramètres VPN Cisco"
 
 #: ../freedesktop.org.xml.in.h:645
-msgid "iRiver Playlist"
-msgstr "liste de lecture iRiver"
+msgid "ICC profile"
+msgstr "profil ICC"
 
 #: ../freedesktop.org.xml.in.h:646
-msgid "installation instructions"
-msgstr "instructions d'installation"
-
-#: ../freedesktop.org.xml.in.h:647
-msgid "iptables configuration file"
-msgstr "fichier de configuration iptables"
+msgid "IT 8.7 color calibration file"
+msgstr "fichier de calibration couleur IT 8.7"
 
+#. http://en.wikipedia.org/wiki/Design_rule_for_Camera_File_system
 #: ../freedesktop.org.xml.in.h:648
-msgid "libtool shared library"
-msgstr "bibliothèque partagée libtool"
-
-#: ../freedesktop.org.xml.in.h:649
-msgid "license terms"
-msgstr "termes de licence"
-
-#: ../freedesktop.org.xml.in.h:650
-msgid "mail delivery report"
-msgstr "rapport de livraison de courriels"
-
-#: ../freedesktop.org.xml.in.h:651
-msgid "mail disposition report"
-msgstr "rapport de disposition de courriels"
+msgid "digital photos"
+msgstr "photos numériques"
 
+#. TRANSLATORS: This is a brand-name, not a generic term. Please see
+#. http://en.wikipedia.org/wiki/Video_CD
+#. http://www.herongyang.com/CD-DVD/VCD-Movie-File-Directory-Structure.html
 #: ../freedesktop.org.xml.in.h:652
-msgid "mail system report"
-msgstr "rapport système de courriels"
-
-#: ../freedesktop.org.xml.in.h:653
-msgid "mailbox file"
-msgstr "fichier boîte aux lettres"
-
-#: ../freedesktop.org.xml.in.h:654
-msgid "manual page (compressed)"
-msgstr "page de manuel (compressée)"
-
-#: ../freedesktop.org.xml.in.h:655
-msgid "message catalog"
-msgstr "catalogue de messages"
+msgid "Video CD"
+msgstr "CD vidéo"
 
+#. TRANSLATORS: This is a brand-name, not a generic term. Please see
+#. http://en.wikipedia.org/wiki/Super_Video_CD
+#. http://everything2.com/index.pl?node_id=1009222
 #: ../freedesktop.org.xml.in.h:656
-msgid "message digest"
-msgstr "condensé de message"
-
-#: ../freedesktop.org.xml.in.h:657
-msgid "message in several formats"
-msgstr "message en formats divers"
+msgid "Super Video CD"
+msgstr "Super VCD"
 
+#. http://en.wikipedia.org/wiki/DVD-Video
 #: ../freedesktop.org.xml.in.h:658
-msgid "mount point"
-msgstr "point d'accès"
-
-#: ../freedesktop.org.xml.in.h:659
-msgid "object code"
-msgstr "code objet"
+msgid "video DVD"
+msgstr "DVD vidéo"
 
+#. http://en.wikipedia.org/wiki/Red_Book_(audio_CD_standard)
 #: ../freedesktop.org.xml.in.h:660
-msgid "packed font file"
-msgstr "fichier de polices empaquetées"
-
-#: ../freedesktop.org.xml.in.h:661
-msgid "partial email message"
-msgstr "message partiel de courriel"
+msgid "audio CD"
+msgstr "CD audio"
 
+#. http://en.wikipedia.org/wiki/Compact_Disc
 #: ../freedesktop.org.xml.in.h:662
-msgid "pipe"
-msgstr "tube"
-
-#: ../freedesktop.org.xml.in.h:663
-msgid "plain text document"
-msgstr "document texte brut"
+msgid "blank CD disc"
+msgstr "CD vierge"
 
-#. see fd.o hal spec
-#: ../freedesktop.org.xml.in.h:665
-msgid "portable audio player"
-msgstr "lecteur audio portable"
+#. http://en.wikipedia.org/wiki/DVD
+#: ../freedesktop.org.xml.in.h:664
+msgid "blank DVD disc"
+msgstr "DVD vierge"
 
+#. http://en.wikipedia.org/wiki/Blu-ray_Disc
 #: ../freedesktop.org.xml.in.h:666
-msgid "profiler results"
-msgstr "résultats de profileur"
-
-#: ../freedesktop.org.xml.in.h:667
-msgid "program crash data"
-msgstr "données de plantage de programme"
+msgid "blank Blu-ray disc"
+msgstr "disque Blu-Ray vierge"
 
+#. http://en.wikipedia.org/wiki/HD_DVD
 #: ../freedesktop.org.xml.in.h:668
-msgid "raw CD image"
-msgstr "image CD brute"
-
-#: ../freedesktop.org.xml.in.h:669
-msgid "reference to remote file"
-msgstr "référence au fichier distant"
+msgid "blank HD DVD disc"
+msgstr "disque HD-DVD vierge"
 
+#. http://en.wikipedia.org/wiki/DVD-Audio
 #: ../freedesktop.org.xml.in.h:670
-msgid "rejected patch"
-msgstr "correctif rejeté"
-
-#: ../freedesktop.org.xml.in.h:671
-msgid "resource location"
-msgstr "localisation de ressource"
-
-#: ../freedesktop.org.xml.in.h:672
-msgid "rich text document"
-msgstr "document « rich text »"
+msgid "audio DVD"
+msgstr "DVD audio"
 
+#. http://en.wikipedia.org/wiki/Blu-ray_Disc
+#. http://www.blu-raydisc.com/Section-13470/Section-13890/Index.html
 #: ../freedesktop.org.xml.in.h:673
-msgid "shared library"
-msgstr "bibliothèque partagée"
-
-#: ../freedesktop.org.xml.in.h:674
-msgid "shell archive"
-msgstr "archive shell"
-
-#: ../freedesktop.org.xml.in.h:675
-msgid "shell script"
-msgstr "script shell"
+msgid "Blu-ray video disc"
+msgstr "disque vidéo Blu-Ray"
 
+#. http://en.wikipedia.org/wiki/HD_DVD
+#. http://www.dvdafteredit.com/wiki/The_HVDVD_TS_Folder
 #: ../freedesktop.org.xml.in.h:676
-msgid "shortcut to Kexi project on database server"
-msgstr "raccourci vers projet Kexi sur serveur de base de données"
-
-#: ../freedesktop.org.xml.in.h:677
-msgid "signed message"
-msgstr "message signé"
+msgid "HD DVD video disc"
+msgstr "disque vidéo HD DVD"
 
+#. see fd.o hal spec
 #: ../freedesktop.org.xml.in.h:678
-msgid "socket"
-msgstr "connecteur réseau"
-
-#. http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
-#. http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3
-#: ../freedesktop.org.xml.in.h:681
-msgid "software"
-msgstr "logiciel"
+msgid "e-book reader"
+msgstr "lecteur de livre numérique"
 
+#. TRANSLATORS: This is a brand-name, not a generic term. Please see
+#. http://en.wikipedia.org/wiki/Picture_CD
+#. http://www.re.org/kristin/picturecd.html
 #: ../freedesktop.org.xml.in.h:682
-msgid "spreadsheet interchange document"
-msgstr "document d'échange de feuilles de calcul"
-
-#: ../freedesktop.org.xml.in.h:683
-msgid "stream of data (server push)"
-msgstr "flux de données (émis par le serveur)"
+msgid "Picture CD"
+msgstr "CD Picture"
 
+#. see fd.o hal spec
 #: ../freedesktop.org.xml.in.h:684
-msgid "symbolic link"
-msgstr "lien symbolique"
-
-#: ../freedesktop.org.xml.in.h:685
-msgid "theme"
-msgstr "thème"
-
-#: ../freedesktop.org.xml.in.h:686
-msgid "translated messages (machine-readable)"
-msgstr "messages traduits (lisibles par machine)"
+msgid "portable audio player"
+msgstr "lecteur audio portable"
 
+#. http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
+#. http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3
 #: ../freedesktop.org.xml.in.h:687
-msgid "translation file"
-msgstr "fichier de traduction"
-
-#: ../freedesktop.org.xml.in.h:688
-msgid "translation template"
-msgstr "modèle de traduction"
-
-#: ../freedesktop.org.xml.in.h:689
-msgid "txt2tags document"
-msgstr "document txt2tags"
+msgid "software"
+msgstr "logiciel"
 
+#. http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
+#. http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3
 #: ../freedesktop.org.xml.in.h:690
-msgid "unknown"
-msgstr "inconnu"
+msgid "UNIX software"
+msgstr "logiciel UNIX"
 
-#. http://en.wikipedia.org/wiki/DVD-Video
-#: ../freedesktop.org.xml.in.h:692
-msgid "video DVD"
-msgstr "DVD vidéo"
+#. http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
+#. http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3
+#: ../freedesktop.org.xml.in.h:693
+msgid "Windows software"
+msgstr "logiciel Windows"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/sharutils.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/sharutils.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/sharutils.po	2012-01-02 17:26:56.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/sharutils.po	2012-02-23 06:31:23.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:12+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:57+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: lib/error.c:181
 msgid "Unknown system error"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/smart.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/smart.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/smart.po	2012-01-02 17:27:15.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/smart.po	2012-02-23 06:31:39.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:51+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:51+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "X-Poedit-Country: FRANCE\n"
 "X-Poedit-Language: French\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/software-properties.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/software-properties.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/software-properties.po	2012-01-02 17:27:23.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/software-properties.po	2012-02-23 06:31:46.000000000 +0000
@@ -10,41 +10,41 @@
 msgstr ""
 "Project-Id-Version: software-properties\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-21 15:45+0000\n"
-"PO-Revision-Date: 2011-12-18 14:27+0000\n"
-"Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
+"POT-Creation-Date: 2012-02-03 21:11+0000\n"
+"PO-Revision-Date: 2012-02-04 00:56+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Français <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:27+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:27+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../data/com.ubuntu.softwareproperties.policy.in.h:1
+msgid "Write Configuration"
+msgstr "Ecrire la Configuration"
+
+#: ../data/com.ubuntu.softwareproperties.policy.in.h:2
 msgid "To change software repository settings, you need to authenticate."
 msgstr ""
 "Vous devez vous authentifier pour modifier la configuration des dépôts "
 "logiciels."
 
-#: ../data/com.ubuntu.softwareproperties.policy.in.h:2
-msgid "Write Configuration"
-msgstr "Ecrire la Configuration"
-
 #: ../data/software-properties-gtk.desktop.in.h:1
 #: ../data/software-properties-kde.desktop.in.h:1
-msgid "Configure the sources for installable software and updates"
-msgstr ""
-"Configurer les sources d'installation de logiciels et de mises à jour"
-
-#: ../data/software-properties-gtk.desktop.in.h:2
-#: ../data/software-properties-kde.desktop.in.h:2
 #: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:582
 #: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:602
-#: ../data/gtkbuilder/main.ui.h:29
+#: ../data/gtkbuilder/main.ui.h:14
 msgid "Software Sources"
 msgstr "Sources de logiciels"
 
+#: ../data/software-properties-gtk.desktop.in.h:2
+#: ../data/software-properties-kde.desktop.in.h:2
+msgid "Configure the sources for installable software and updates"
+msgstr ""
+"Configurer les sources d'installation de logiciels et de mises à jour"
+
 #: ../add-apt-repository:35
 #, c-format
 msgid "The %s named '%s' has no PPA named '%s'"
@@ -87,34 +87,45 @@
 msgstr "Vouliez-vous dire 'ppa:%s/%s' ?"
 
 #: ../add-apt-repository:136
+#, c-format
+msgid ""
+"Cannot access PPA (%s) to get PPA information, please check your internet "
+"connection."
+msgstr ""
+
+#: ../add-apt-repository:142
+msgid "Adding private PPAs is not supported currently"
+msgstr ""
+
+#: ../add-apt-repository:146
 msgid "You are about to remove the following PPA from your system:"
 msgstr ""
 "Vous êtes sur le point de supprimer les PPA suivants de votre système:"
 
-#: ../add-apt-repository:138
+#: ../add-apt-repository:148
 msgid "You are about to add the following PPA to your system:"
 msgstr "Vous allez ajouter le PPA suivant à votre système :"
 
-#: ../add-apt-repository:140
+#: ../add-apt-repository:150
 #, c-format
 msgid " More info: %s"
 msgstr " Plus d’info : %s"
 
-#: ../add-apt-repository:144
+#: ../add-apt-repository:154
 msgid "Press [ENTER] to continue or ctrl-c to cancel removing it"
 msgstr ""
 "Appuyez sur [ENTREE] pour continuer ou Ctrl-C pour annuler la suppression"
 
-#: ../add-apt-repository:146
+#: ../add-apt-repository:156
 msgid "Press [ENTER] to continue or ctrl-c to cancel adding it"
 msgstr "Appuyez sur [ENTRÉE] pour continuer ou ctrl-c pour annuler l’ajout"
 
-#: ../add-apt-repository:160 ../add-apt-repository:164
+#: ../add-apt-repository:170 ../add-apt-repository:174
 #, c-format
 msgid "Error: '%s' doesn't exist in a sourcelist file"
 msgstr "Erreur : %s n'existe pas dans les fichiers de sources"
 
-#: ../add-apt-repository:168
+#: ../add-apt-repository:178
 #, c-format
 msgid "Error: '%s' invalid"
 msgstr "Erreur : « %s » non valable"
@@ -199,17 +210,17 @@
 msgstr "Tous les jours"
 
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:165
-#: ../data/gtkbuilder/main.ui.h:17
+#: ../data/gtkbuilder/main.ui.h:10
 msgid "Every two days"
 msgstr "Tous les deux jours"
 
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:166
-#: ../data/gtkbuilder/main.ui.h:35
+#: ../data/gtkbuilder/main.ui.h:11
 msgid "Weekly"
 msgstr "Toutes les semaines"
 
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:167
-#: ../data/gtkbuilder/main.ui.h:18
+#: ../data/gtkbuilder/main.ui.h:12
 msgid "Every two weeks"
 msgstr "Toutes les deux semaines"
 
@@ -344,11 +355,11 @@
 "dépôt de logiciels, comme par exemple « %s » ."
 
 #: ../softwareproperties/kde/DialogEdit.py:41
-#: ../data/gtkbuilder/dialog-edit-source.ui.h:6
+#: ../data/gtkbuilder/dialog-edit-source.ui.h:1
 msgid "Binary"
 msgstr "Binaire"
 
-#: ../softwareproperties/kde/DialogEdit.py:42 ../data/gtkbuilder/main.ui.h:30
+#: ../softwareproperties/kde/DialogEdit.py:42 ../data/gtkbuilder/main.ui.h:15
 msgid "Source code"
 msgstr "Code source"
 
@@ -446,17 +457,13 @@
 msgstr ""
 "Clé de signature automatique des images CD Ubuntu <cdimage@ubuntu.com>"
 
-#: ../data/gtkbuilder/dialog-edit-source.ui.h:1
-msgid "<b>Comment:</b>"
-msgstr "<b>Commentaire :</b>"
-
 #: ../data/gtkbuilder/dialog-edit-source.ui.h:2
-msgid "<b>Components:</b>"
-msgstr "<b>Composants :</b>"
+msgid "Source"
+msgstr "Source"
 
 #: ../data/gtkbuilder/dialog-edit-source.ui.h:3
-msgid "<b>Distribution:</b>"
-msgstr "<b>Distribution :</b>"
+msgid "Edit Source"
+msgstr "Modifier la source de mise à jour"
 
 #: ../data/gtkbuilder/dialog-edit-source.ui.h:4
 msgid "<b>Type:</b>"
@@ -466,13 +473,17 @@
 msgid "<b>URI:</b>"
 msgstr "<b>URI :</b>"
 
+#: ../data/gtkbuilder/dialog-edit-source.ui.h:6
+msgid "<b>Distribution:</b>"
+msgstr "<b>Distribution :</b>"
+
 #: ../data/gtkbuilder/dialog-edit-source.ui.h:7
-msgid "Edit Source"
-msgstr "Modifier la source de mise à jour"
+msgid "<b>Components:</b>"
+msgstr "<b>Composants :</b>"
 
 #: ../data/gtkbuilder/dialog-edit-source.ui.h:8
-msgid "Source"
-msgstr "Source"
+msgid "<b>Comment:</b>"
+msgstr "<b>Commentaire :</b>"
 
 #: ../data/gtkbuilder/dialog-add-sources-list.ui.h:1
 msgid "_Replace"
@@ -483,141 +494,141 @@
 msgstr "Analyse du CD-ROM"
 
 #: ../data/gtkbuilder/main.ui.h:1
-msgid "    "
-msgstr "    "
+msgid "Display immediately"
+msgstr "Afficher immédiatement"
 
 #: ../data/gtkbuilder/main.ui.h:2
-msgid "<b>Downloadable from the Internet</b>"
-msgstr "<b>Téléchargeables depuis Internet</b>"
+msgid "Display weekly"
+msgstr "Afficher une fois par semaine"
 
 #: ../data/gtkbuilder/main.ui.h:3
-msgid "<b>Installable from CD-ROM/DVD</b>"
-msgstr "<b>Installables à partir du CD/DVD</b>"
+msgid "Display every two weeks"
+msgstr "Afficher toutes les deux semaines"
 
 #: ../data/gtkbuilder/main.ui.h:4
-msgid "<b>Trusted software providers</b>"
-msgstr "<b>Fournisseurs de logiciels de confiance</b>"
+msgid "For any new version"
+msgstr "Pour chaque nouvelle version"
 
 #: ../data/gtkbuilder/main.ui.h:5
-msgid "Add Volume..."
-msgstr "Ajouter un volume..."
+msgid "For long-term support versions"
+msgstr "Pour les versions prises en charge sur le long-terme"
 
 #: ../data/gtkbuilder/main.ui.h:6
-msgid "Add..."
-msgstr "Ajouter…"
+msgid "Never"
+msgstr "Jamais"
 
 #: ../data/gtkbuilder/main.ui.h:7
-msgid "Authentication"
-msgstr "Authentification"
+msgid "Download automatically"
+msgstr "Télécharger automatiquement"
 
 #: ../data/gtkbuilder/main.ui.h:8
-msgid "Automatically check for updates:"
-msgstr "Vérifier automatiquement les mises à jour :"
-
-#: ../data/gtkbuilder/main.ui.h:10
-msgid "Display every two weeks"
-msgstr "Afficher toutes les deux semaines"
-
-#: ../data/gtkbuilder/main.ui.h:11
-msgid "Display immediately"
-msgstr "Afficher immédiatement"
-
-#: ../data/gtkbuilder/main.ui.h:12
-msgid "Display weekly"
-msgstr "Afficher une fois par semaine"
-
-#: ../data/gtkbuilder/main.ui.h:13
 msgid "Download and install automatically"
 msgstr "Télécharger et installer automatiquement"
 
-#: ../data/gtkbuilder/main.ui.h:14
-msgid "Download automatically"
-msgstr "Télécharger automatiquement"
+#: ../data/gtkbuilder/main.ui.h:13
+msgid "To install from a CD-ROM or DVD, insert the medium into the drive."
+msgstr ""
+"Pour installer depuis un CD-ROM ou un DVD, insérez le disque dans le lecteur."
 
-#: ../data/gtkbuilder/main.ui.h:15
+#: ../data/gtkbuilder/main.ui.h:16
 msgid "Download from:"
 msgstr "Télécharger depuis :"
 
-#: ../data/gtkbuilder/main.ui.h:16
-msgid "Edit..."
-msgstr "Éditer…"
+#: ../data/gtkbuilder/main.ui.h:17
+msgid "<b>Downloadable from the Internet</b>"
+msgstr "<b>Téléchargeables depuis Internet</b>"
+
+#: ../data/gtkbuilder/main.ui.h:18
+msgid "<b>Installable from CD-ROM/DVD</b>"
+msgstr "<b>Installables à partir du CD/DVD</b>"
 
 #: ../data/gtkbuilder/main.ui.h:19
-msgid "For any new version"
-msgstr "Pour chaque nouvelle version"
+msgid "Add..."
+msgstr "Ajouter…"
 
 #: ../data/gtkbuilder/main.ui.h:20
-msgid "For long-term support versions"
-msgstr "Pour les versions prises en charge sur le long-terme"
+msgid "Edit..."
+msgstr "Éditer…"
 
 #: ../data/gtkbuilder/main.ui.h:21
-msgid "Import the public key from a trusted software provider"
-msgstr ""
-"Importer la clé publique d'un fournisseur de logiciels digne de confiance"
+msgid "Add Volume..."
+msgstr "Ajouter un volume..."
 
 #: ../data/gtkbuilder/main.ui.h:22
-msgid "Install updates from:"
-msgstr "Installer les mises à jour depuis :"
+msgid "Other Software"
+msgstr "Autres logiciels"
 
 #: ../data/gtkbuilder/main.ui.h:23
-msgid ""
-"Keys are used to authenticate the correct source of software and so protect "
-"your computer from malicious software"
-msgstr ""
-"Les clés sont utilisées pour authentifier la véritable source d'un logiciel "
-"et ainsi protéger votre ordinateur contre les logiciels malveillants"
+msgid "Install updates from:"
+msgstr "Installer les mises à jour depuis :"
 
 #: ../data/gtkbuilder/main.ui.h:24
-msgid "Never"
-msgstr "Jamais"
+msgid "Automatically check for updates:"
+msgstr "Vérifier automatiquement les mises à jour :"
 
 #: ../data/gtkbuilder/main.ui.h:25
-msgid "Notify me of a new Ubuntu version:"
-msgstr "Me prévenir lorsqu'une nouvelle version d’Ubuntu est disponible :"
+msgid "When there are security updates:"
+msgstr "Lorsqu’il y a des mises à jour de sécurité :"
 
 #: ../data/gtkbuilder/main.ui.h:26
-msgid "Other Software"
-msgstr "Autres logiciels"
+msgid "When there are other updates:"
+msgstr "Lorsqu’il y a d’autres mises à jour :"
 
 #: ../data/gtkbuilder/main.ui.h:27
-msgid "Restore _Defaults"
-msgstr "Restaurer les clés par _défaut"
+msgid "Notify me of a new Ubuntu version:"
+msgstr "Me prévenir lorsqu'une nouvelle version d’Ubuntu est disponible :"
 
 #: ../data/gtkbuilder/main.ui.h:28
-msgid "Restore the default keys of your distribution"
-msgstr "Restaurer les clés par défaut de votre distribution"
+msgid "Updates"
+msgstr "Mises à jour"
+
+#: ../data/gtkbuilder/main.ui.h:29
+msgid "<b>Trusted software providers</b>"
+msgstr "<b>Fournisseurs de logiciels de confiance</b>"
+
+#: ../data/gtkbuilder/main.ui.h:30
+msgid "    "
+msgstr "    "
 
 #: ../data/gtkbuilder/main.ui.h:31
-msgid "Statistics"
-msgstr "Statistiques"
+msgid ""
+"Keys are used to authenticate the correct source of software and so protect "
+"your computer from malicious software"
+msgstr ""
+"Les clés sont utilisées pour authentifier la véritable source d'un logiciel "
+"et ainsi protéger votre ordinateur contre les logiciels malveillants"
 
 #: ../data/gtkbuilder/main.ui.h:32
-msgid "Submit statistical information"
-msgstr "Soumettre des statistiques sur l'utilisation des paquets"
+msgid "_Import Key File..."
+msgstr "_Importer la clé..."
 
 #: ../data/gtkbuilder/main.ui.h:33
-msgid "To install from a CD-ROM or DVD, insert the medium into the drive."
+msgid "Import the public key from a trusted software provider"
 msgstr ""
-"Pour installer depuis un CD-ROM ou un DVD, insérez le disque dans le lecteur."
+"Importer la clé publique d'un fournisseur de logiciels digne de confiance"
 
 #: ../data/gtkbuilder/main.ui.h:34
-msgid "Updates"
-msgstr "Mises à jour"
+msgid "Restore _Defaults"
+msgstr "Restaurer les clés par _défaut"
+
+#: ../data/gtkbuilder/main.ui.h:35
+msgid "Restore the default keys of your distribution"
+msgstr "Restaurer les clés par défaut de votre distribution"
 
 #: ../data/gtkbuilder/main.ui.h:36
-msgid "When there are other updates:"
-msgstr "Lorsqu’il y a d’autres mises à jour :"
+msgid "Authentication"
+msgstr "Authentification"
 
 #: ../data/gtkbuilder/main.ui.h:37
-msgid "When there are security updates:"
-msgstr "Lorsqu’il y a des mises à jour de sécurité :"
+msgid "Submit statistical information"
+msgstr "Soumettre des statistiques sur l'utilisation des paquets"
 
 #: ../data/gtkbuilder/main.ui.h:38
-msgid "_Import Key File..."
-msgstr "_Importer la clé..."
+msgid "Statistics"
+msgstr "Statistiques"
 
 #: ../data/gtkbuilder/dialog-cache-outofdate.ui.h:1
-#: ../data/gtkbuilder/dialog-mirror.ui.h:1
+#: ../data/gtkbuilder/dialog-mirror.ui.h:6
 msgid " "
 msgstr " "
 
@@ -625,7 +636,29 @@
 msgid "_Reload"
 msgstr "A_ctualiser"
 
+#: ../data/gtkbuilder/dialog-mirror.ui.h:1
+msgid "Choose a Download Server"
+msgstr "Choisissez un serveur de téléchargement"
+
 #: ../data/gtkbuilder/dialog-mirror.ui.h:2
+msgid "Protocol:"
+msgstr "Protocole :"
+
+#: ../data/gtkbuilder/dialog-mirror.ui.h:3
+msgid "_Select Best Server"
+msgstr "_Sélectionner le meilleur serveur"
+
+#: ../data/gtkbuilder/dialog-mirror.ui.h:4
+msgid "Performs a connection test to find the best mirror for your location"
+msgstr ""
+"Effectuer un test de connexion pour identifier le miroir correspondant le "
+"mieux à votre situation géographique"
+
+#: ../data/gtkbuilder/dialog-mirror.ui.h:5
+msgid "Choose _Server"
+msgstr "Choisir un _serveur"
+
+#: ../data/gtkbuilder/dialog-mirror.ui.h:7
 msgid ""
 "<b><big>Testing download servers</big></b>\n"
 "\n"
@@ -637,28 +670,6 @@
 "Des tests vont être effectués afin de déterminer le miroir le plus approprié "
 "à votre situation géographique."
 
-#: ../data/gtkbuilder/dialog-mirror.ui.h:5
-msgid "Choose _Server"
-msgstr "Choisir un _serveur"
-
-#: ../data/gtkbuilder/dialog-mirror.ui.h:6
-msgid "Choose a Download Server"
-msgstr "Choisissez un serveur de téléchargement"
-
-#: ../data/gtkbuilder/dialog-mirror.ui.h:7
-msgid "Performs a connection test to find the best mirror for your location"
-msgstr ""
-"Effectuer un test de connexion pour identifier le miroir correspondant le "
-"mieux à votre situation géographique"
-
-#: ../data/gtkbuilder/dialog-mirror.ui.h:8
-msgid "Protocol:"
-msgstr "Protocole :"
-
-#: ../data/gtkbuilder/dialog-mirror.ui.h:9
-msgid "_Select Best Server"
-msgstr "_Sélectionner le meilleur serveur"
-
 #: ../data/gtkbuilder/dialog-add.ui.h:2
 msgid "APT line:"
 msgstr "Ligne APT :"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/sound-theme-freedesktop.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/sound-theme-freedesktop.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/sound-theme-freedesktop.po	2012-01-02 17:27:29.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/sound-theme-freedesktop.po	2012-02-23 06:31:53.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 18:08+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:57+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../index.theme.in.h:1
 msgid "Default"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/sp5.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/sp5.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/sp5.po	2012-01-02 17:26:53.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/sp5.po	2012-02-23 06:31:19.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:52+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:43+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 msgid ""
 "no system identifier could be generated for meta-DTD for architecture %1"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/sphinx.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/sphinx.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/sphinx.po	2012-01-02 17:27:27.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/sphinx.po	2012-02-23 06:31:50.000000000 +0000
@@ -17,8 +17,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:16+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:14+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Generated-By: Babel 0.9.4\n"
 
 #: sphinx/environment.py:106 sphinx/writers/latex.py:184
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/subdomain_parser.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/subdomain_parser.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/subdomain_parser.po	2012-01-02 17:27:24.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/subdomain_parser.po	2012-02-23 06:31:47.000000000 +0000
@@ -6,14 +6,14 @@
 "Project-Id-Version: apparmor-parser\n"
 "Report-Msgid-Bugs-To: apparmor-general@forge.novell.com\n"
 "POT-Creation-Date: 2005-03-31 13:39-0800\n"
-"PO-Revision-Date: 2011-12-07 03:17+0000\n"
+"PO-Revision-Date: 2012-02-16 23:44+0000\n"
 "Last-Translator: Novell Language <Unknown>\n"
 "Language-Team: Novell Language <language@novell.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:37+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:36+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../parser_include.c:80
 msgid "Error couldn't allocate temporary file\n"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/subversion.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/subversion.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/subversion.po	2012-01-02 17:26:54.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/subversion.po	2012-02-23 06:31:20.000000000 +0000
@@ -17,8 +17,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:56+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:46+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #
 # TENTATIVE DE LEXIQUE DU VOCABULAIRE DE SUBVERSION EN FRANÇAIS
@@ -316,7 +316,7 @@
 msgstr "Erreur de lecture sur un pipeline (pipe)"
 
 #: ../include/svn_error_codes.h:265 ../libsvn_subr/cmdline.c:313
-#: ../libsvn_subr/cmdline.c:330 ../svn/util.c:912 ../svnlook/main.c:1716
+#: ../libsvn_subr/cmdline.c:330 ../svn/util.c:910 ../svnlook/main.c:1716
 #, c-format
 msgid "Write error"
 msgstr "Erreur d'écriture"
@@ -1254,11 +1254,11 @@
 msgid "Cannot calculate blame information for binary file '%s'"
 msgstr "Blame non calculable sur le fichier binaire '%s'"
 
-#: ../libsvn_client/blame.c:625
+#: ../libsvn_client/blame.c:623
 msgid "blame of the WORKING revision is not supported"
 msgstr "blame de la révision courante non supporté"
 
-#: ../libsvn_client/blame.c:639
+#: ../libsvn_client/blame.c:637
 msgid "Start revision must precede end revision"
 msgstr "La révision de début doit précéder la révision de fin"
 
@@ -1276,7 +1276,7 @@
 msgid "URL '%s' refers to a directory"
 msgstr "L'URL '%s' référence un répertoire"
 
-#: ../libsvn_client/checkout.c:135 ../libsvn_client/export.c:997
+#: ../libsvn_client/checkout.c:135 ../libsvn_client/export.c:992
 #, c-format
 msgid "URL '%s' doesn't exist"
 msgstr "L'URL '%s' n'existe pas"
@@ -1366,11 +1366,11 @@
 msgstr ""
 "Erreur lors du nettoyage d'après-propagation (post-commit), détails :"
 
-#: ../libsvn_client/commit.c:1255
+#: ../libsvn_client/commit.c:1253
 msgid "Are all the targets part of the same working copy?"
 msgstr "Les cibles font-elles parties de la même copie de travail ?"
 
-#: ../libsvn_client/commit.c:1292
+#: ../libsvn_client/commit.c:1290
 msgid ""
 "Cannot non-recursively commit a directory deletion of a directory with child "
 "nodes"
@@ -1378,23 +1378,23 @@
 "Propagation non récursive de la suppression d'un répertoire avec des sous-"
 "répertoires impossible"
 
-#: ../libsvn_client/commit.c:1343
+#: ../libsvn_client/commit.c:1341
 #, c-format
 msgid "'%s' is a URL, but URLs cannot be commit targets"
 msgstr "Une URL '%s' ne peut être la cible d'une propagation (commit)"
 
-#: ../libsvn_client/commit_util.c:57 ../libsvn_repos/commit.c:128
+#: ../libsvn_client/commit_util.c:57 ../libsvn_repos/commit.c:126
 #, c-format
 msgid "Directory '%s' is out of date"
 msgstr "Répertoire '%s' obsolète"
 
-#: ../libsvn_client/commit_util.c:58 ../libsvn_repos/commit.c:130
+#: ../libsvn_client/commit_util.c:58 ../libsvn_repos/commit.c:128
 #, c-format
 msgid "File '%s' is out of date"
 msgstr "Fichier '%s' obsolète"
 
-#: ../libsvn_client/commit_util.c:289 ../libsvn_client/commit_util.c:510
-#: ../libsvn_client/commit_util.c:985
+#: ../libsvn_client/commit_util.c:289 ../libsvn_client/commit_util.c:499
+#: ../libsvn_client/commit_util.c:974
 #, c-format
 msgid "Aborting commit: '%s' remains in conflict"
 msgstr "Arrêt de la propagation : '%s' demeure en conflit"
@@ -1404,34 +1404,34 @@
 msgid "Aborting commit: '%s' remains in tree-conflict"
 msgstr "Arrêt de la propagation : '%s' demeure en conflit arborescent"
 
-#: ../libsvn_client/commit_util.c:433 ../libsvn_client/commit_util.c:454
+#: ../libsvn_client/commit_util.c:432 ../libsvn_client/commit_util.c:443
 #: ../libsvn_wc/crop.c:168
 #, c-format
 msgid "Unknown entry kind for '%s'"
 msgstr "Type d'entrée inconnu pour '%s'"
 
-#: ../libsvn_client/commit_util.c:471
+#: ../libsvn_client/commit_util.c:460
 #, c-format
 msgid "Entry '%s' has unexpectedly changed special status"
 msgstr "L'entrée '%s' a changé de statut spécial de façon inattendue"
 
-#: ../libsvn_client/commit_util.c:580
+#: ../libsvn_client/commit_util.c:569
 #, c-format
 msgid "Did not expect '%s' to be a working copy root"
 msgstr "'%s' ne devrait pas être une racine de copie de travail"
 
-#: ../libsvn_client/commit_util.c:598 ../libsvn_client/commit_util.c:1322
+#: ../libsvn_client/commit_util.c:587 ../libsvn_client/commit_util.c:1311
 #, c-format
 msgid "Commit item '%s' has copy flag but no copyfrom URL"
 msgstr ""
 "L'élément de propagation '%s' marqué pour copie sans URL d'origine (copyfrom)"
 
-#: ../libsvn_client/commit_util.c:617
+#: ../libsvn_client/commit_util.c:606
 #, c-format
 msgid "'%s' is scheduled for addition, but is missing"
 msgstr "'%s' doit être ajouté, mais n'existe pas"
 
-#: ../libsvn_client/commit_util.c:885
+#: ../libsvn_client/commit_util.c:874
 #, c-format
 msgid ""
 "'%s' is not under version control and is not part of the commit, yet its "
@@ -1440,17 +1440,17 @@
 "'%s' n'est pas sous gestionnaire de version et ne fait pas partie de la "
 "propagation (commit), alors que son enfant '%s' en fait partie"
 
-#: ../libsvn_client/commit_util.c:993 ../libsvn_client/url.c:155
+#: ../libsvn_client/commit_util.c:982 ../libsvn_client/url.c:155
 #, c-format
 msgid "Entry for '%s' has no URL"
 msgstr "L'entrée pour '%s' n'a pas d'URL associée"
 
-#: ../libsvn_client/commit_util.c:1025
+#: ../libsvn_client/commit_util.c:1014
 #, c-format
 msgid "'%s' is scheduled for addition within unversioned parent"
 msgstr "'%s' doit être ajouté dans un répertoire non versionné"
 
-#: ../libsvn_client/commit_util.c:1045
+#: ../libsvn_client/commit_util.c:1034
 #, c-format
 msgid ""
 "Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
@@ -1461,20 +1461,20 @@
 "ajoutée. Peut-être propagez-vous (commit) un objet qui est à \n"
 "l'intérieur d'un répertoire non (encore) versionné ?"
 
-#: ../libsvn_client/commit_util.c:1178
+#: ../libsvn_client/commit_util.c:1167
 #, c-format
 msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
 msgstr ""
 "'%s' et '%s' réfèrent à la même URL et ne peuvent être propagés (commit) "
 "ensemble"
 
-#: ../libsvn_client/commit_util.c:1327
+#: ../libsvn_client/commit_util.c:1316
 #, c-format
 msgid "Commit item '%s' has copy flag but an invalid revision"
 msgstr ""
 "L'élément de propagation '%s' marqué pour copie avec une révision invalide"
 
-#: ../libsvn_client/commit_util.c:2089
+#: ../libsvn_client/commit_util.c:2078
 msgid "Standard properties can't be set explicitly as revision properties"
 msgstr ""
 "Les propriétés standards ne peuvent être définies explicitement comme des "
@@ -1655,8 +1655,8 @@
 msgid "Cannot display: file marked as a binary type.%s"
 msgstr "Impossible d'afficher : fichier considéré comme binaire.%s"
 
-#: ../libsvn_client/diff.c:924 ../libsvn_client/merge.c:5826
-#: ../libsvn_client/merge.c:7722
+#: ../libsvn_client/diff.c:924 ../libsvn_client/merge.c:5726
+#: ../libsvn_client/merge.c:7542
 msgid "Not all required revisions are specified"
 msgstr "Toutes les révisions requises ne sont pas précisées"
 
@@ -1713,7 +1713,7 @@
 msgid "'%s' already exists"
 msgstr "'%s' existe déjà"
 
-#: ../libsvn_client/export.c:773 ../libsvn_wc/adm_crawler.c:997
+#: ../libsvn_client/export.c:768 ../libsvn_wc/adm_crawler.c:997
 #: ../libsvn_wc/update_editor.c:4529
 #, c-format
 msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
@@ -1803,7 +1803,7 @@
 msgid "URL '%s' non-existent in revision %ld"
 msgstr "L'URL '%s' n'existe pas à la révision %ld"
 
-#: ../libsvn_client/list.c:242
+#: ../libsvn_client/list.c:233
 #, c-format
 msgid "URL '%s' non-existent in that revision"
 msgstr "L'URL '%s' n'existe pas à cette révision"
@@ -1814,9 +1814,9 @@
 "Aucun parent commun trouvé, impossible de travailler avec des arguments "
 "disjoints"
 
-#: ../libsvn_client/locking_commands.c:267 ../libsvn_client/merge.c:7739
-#: ../libsvn_client/merge.c:7745 ../libsvn_client/merge.c:8714
-#: ../libsvn_client/merge.c:8923 ../libsvn_client/ra.c:401
+#: ../libsvn_client/locking_commands.c:267 ../libsvn_client/merge.c:7559
+#: ../libsvn_client/merge.c:7565 ../libsvn_client/merge.c:8506
+#: ../libsvn_client/merge.c:8706 ../libsvn_client/ra.c:401
 #: ../libsvn_client/ra.c:433 ../libsvn_client/ra.c:636
 #, c-format
 msgid "'%s' has no URL"
@@ -1836,7 +1836,7 @@
 msgid "'%s' is not locked"
 msgstr "'%s' n'est pas verrouillé"
 
-#: ../libsvn_client/locking_commands.c:413 ../libsvn_fs/fs-loader.c:1191
+#: ../libsvn_client/locking_commands.c:413 ../libsvn_fs/fs-loader.c:1190
 #: ../libsvn_ra/ra_loader.c:961
 msgid "Lock comment contains illegal characters"
 msgstr "Le commentaire du verrou (lock) contient des caractères incorrects"
@@ -1873,21 +1873,21 @@
 #. xgettext: the '.working', '.merge-left.r%ld' and
 #. '.merge-right.r%ld' strings are used to tag onto a file
 #. name in case of a merge conflict
-#: ../libsvn_client/merge.c:1403
+#: ../libsvn_client/merge.c:1391
 msgid ".working"
 msgstr ".courant"
 
-#: ../libsvn_client/merge.c:1405
+#: ../libsvn_client/merge.c:1393
 #, c-format
 msgid ".merge-left.r%ld"
 msgstr ".fusion-gauche.r%ld"
 
-#: ../libsvn_client/merge.c:1408
+#: ../libsvn_client/merge.c:1396
 #, c-format
 msgid ".merge-right.r%ld"
 msgstr ".fusion-droit.r%ld"
 
-#: ../libsvn_client/merge.c:3567
+#: ../libsvn_client/merge.c:3541
 msgid ""
 "Cannot reverse-merge a range from a path's own future history; try updating "
 "first"
@@ -1895,7 +1895,7 @@
 "Impossible de fusionner un intervalle inversé à partir du futur du chemin "
 "considéré ; essayer une mise à jour d'abord"
 
-#: ../libsvn_client/merge.c:4295
+#: ../libsvn_client/merge.c:4197
 #, c-format
 msgid ""
 "One or more conflicts were produced while merging r%ld:%ld into\n"
@@ -1908,68 +1908,68 @@
 "résoudre tous les conflits et ré-exécuter la fusion (merge) pour \n"
 "appliquer les révisions non-fusionnées restantes"
 
-#: ../libsvn_client/merge.c:7361
+#: ../libsvn_client/merge.c:7222
 msgid "Use of two URLs is not compatible with mergeinfo modification"
 msgstr ""
 "L'utilisation de deux URLs n'est pas compatible avec la modification des "
 "informations de fusion 'mergeinfo'"
 
-#: ../libsvn_client/merge.c:7368 ../libsvn_client/merge.c:7613
+#: ../libsvn_client/merge.c:7229 ../libsvn_client/merge.c:7477
 msgid ""
 "Merge from foreign repository is not compatible with mergeinfo modification"
 msgstr ""
 "La fusion à partir d'un autre dépôt n'est pas compatible avec la "
 "modification des informations de fusion 'mergeinfo'"
 
-#: ../libsvn_client/merge.c:7783 ../libsvn_ra/ra_loader.c:514
+#: ../libsvn_client/merge.c:7603 ../libsvn_ra/ra_loader.c:514
 #, c-format
 msgid "'%s' isn't in the same repository as '%s'"
 msgstr "'%s' n'est pas dans le même dépôt que '%s'"
 
-#: ../libsvn_client/merge.c:7958
+#: ../libsvn_client/merge.c:7777
 msgid "Cannot reintegrate into a working copy with a switched subtree"
 msgstr ""
 "Impossible de réintégrer dans une copie de travail avec un sous-arbre ré-"
 "aiguillé"
 
-#: ../libsvn_client/merge.c:7963
+#: ../libsvn_client/merge.c:7782
 msgid "Cannot reintegrate into a working copy not entirely at infinite depth"
 msgstr ""
 "Impossible de reintégrer dans une copie de travail de profondeur partielle"
 
-#: ../libsvn_client/merge.c:7968
+#: ../libsvn_client/merge.c:7787
 msgid "Cannot reintegrate into a working copy that has local modifications"
 msgstr ""
 "Impossible de réintégrer dans une copie de travail avec des modifications "
 "locales"
 
-#: ../libsvn_client/merge.c:7974
+#: ../libsvn_client/merge.c:7793
 msgid "Cannot determine revision of working copy"
 msgstr "Impossible de déterminer la révision de la copie de travail"
 
-#: ../libsvn_client/merge.c:7978
+#: ../libsvn_client/merge.c:7797
 msgid ""
 "Cannot reintegrate into mixed-revision working copy; try updating first"
 msgstr ""
 "Impossible de reintégrer dans un copie de travail avec des révisions "
 "multiples ; Faire une mise à jour (update) d'abord"
 
-#: ../libsvn_client/merge.c:8060
+#: ../libsvn_client/merge.c:7876
 #, c-format
 msgid "At least one revision (r%ld) not yet merged from '%s'"
 msgstr "Au moins une révision (r%ld) non encore fusionnée à partir de '%s'"
 
-#: ../libsvn_client/merge.c:8534 ../libsvn_client/merge.c:8806
+#: ../libsvn_client/merge.c:8333 ../libsvn_client/merge.c:8592
 #, c-format
 msgid "'%s@%ld' must be ancestrally related to '%s@%ld'"
 msgstr "'%s@%ld' doit un ancêtre de '%s@%ld'"
 
-#: ../libsvn_client/merge.c:8731
+#: ../libsvn_client/merge.c:8522
 #, c-format
 msgid "'%s' must be from the same repository as '%s'"
 msgstr "'%s' doit être dans le même dépôt que '%s'"
 
-#: ../libsvn_client/merge.c:8755
+#: ../libsvn_client/merge.c:8555
 #, c-format
 msgid ""
 "Neither the reintegrate source nor target can be the root of the repository"
@@ -1977,7 +1977,7 @@
 "Ni la source ni la cible de la réintégration ne peuvent être la racine du "
 "dépôt"
 
-#: ../libsvn_client/merge.c:8831
+#: ../libsvn_client/merge.c:8616
 #, c-format
 msgid ""
 "Reintegrate can only be used if revisions %ld through %ld were previously "
@@ -2298,12 +2298,12 @@
 msgid "Path '%s' contains '.' or '..' element"
 msgstr "Le chemin '%s' contient une composante '.' ou '..'"
 
-#: ../libsvn_fs/fs-loader.c:1173
+#: ../libsvn_fs/fs-loader.c:1172
 #, c-format
 msgid "Malformed UUID '%s'"
 msgstr "UUID '%s' malformée"
 
-#: ../libsvn_fs/fs-loader.c:1197
+#: ../libsvn_fs/fs-loader.c:1196
 msgid "Negative expiration date passed to svn_fs_lock"
 msgstr "Date d'expiration négative passée à svn_fs_lock"
 
@@ -2320,23 +2320,23 @@
 msgid "deleting changes"
 msgstr "effaçant des modifications"
 
-#: ../libsvn_fs_base/bdb/changes-table.c:143 ../libsvn_fs_fs/fs_fs.c:3761
+#: ../libsvn_fs_base/bdb/changes-table.c:143 ../libsvn_fs_fs/fs_fs.c:3688
 msgid "Missing required node revision ID"
 msgstr "Absence de l'ID requise de la révision du nœud"
 
-#: ../libsvn_fs_base/bdb/changes-table.c:154 ../libsvn_fs_fs/fs_fs.c:3771
+#: ../libsvn_fs_base/bdb/changes-table.c:154 ../libsvn_fs_fs/fs_fs.c:3698
 msgid "Invalid change ordering: new node revision ID without delete"
 msgstr ""
 "Ordre de modificaiton invalide : nouvel ID de révision de nœud sans "
 "effacement"
 
-#: ../libsvn_fs_base/bdb/changes-table.c:164 ../libsvn_fs_fs/fs_fs.c:3782
+#: ../libsvn_fs_base/bdb/changes-table.c:164 ../libsvn_fs_fs/fs_fs.c:3709
 msgid "Invalid change ordering: non-add change on deleted path"
 msgstr ""
 "Ordre de modification invalide : modification autre qu'un ajout sur un "
 "chemin effacé"
 
-#: ../libsvn_fs_base/bdb/changes-table.c:173 ../libsvn_fs_fs/fs_fs.c:3791
+#: ../libsvn_fs_base/bdb/changes-table.c:173 ../libsvn_fs_fs/fs_fs.c:3718
 msgid "Invalid change ordering: add change on preexisting path"
 msgstr ""
 
@@ -2812,21 +2812,21 @@
 msgid "Unsupported FS loader version (%d) for bdb"
 msgstr "Version %d du chargeur FS non supportée pour bdb"
 
-#: ../libsvn_fs_base/lock.c:441 ../libsvn_fs_fs/lock.c:581
+#: ../libsvn_fs_base/lock.c:441 ../libsvn_fs_fs/lock.c:585
 #, c-format
 msgid "Cannot verify lock on path '%s'; no username available"
 msgstr ""
 "Impossible de vérifier le verrou sur le chemin '%s' ; Aucun nom "
 "d'utilisateur disponible"
 
-#: ../libsvn_fs_base/lock.c:447 ../libsvn_fs_fs/lock.c:587
+#: ../libsvn_fs_base/lock.c:447 ../libsvn_fs_fs/lock.c:591
 #, c-format
 msgid "User %s does not own lock on path '%s' (currently locked by %s)"
 msgstr ""
 "L'utilisateur '%s' ne possède pas le verrou sur '%s' (actuellement "
 "verrouillé par %s)"
 
-#: ../libsvn_fs_base/lock.c:454 ../libsvn_fs_fs/lock.c:594
+#: ../libsvn_fs_base/lock.c:454 ../libsvn_fs_fs/lock.c:598
 #, c-format
 msgid "Cannot verify lock on path '%s'; no matching lock-token available"
 msgstr "Le verrou sur '%s' ne peut être vérifié : pas de verrou de ce nom"
@@ -3049,7 +3049,7 @@
 msgid "Bad ID in cache"
 msgstr "Mauvais ID dans le cache"
 
-#: ../libsvn_fs_fs/dag.c:426 ../libsvn_ra_serf/serf.c:969
+#: ../libsvn_fs_fs/dag.c:426 ../libsvn_ra_serf/serf.c:953
 msgid "Can't get entries of non-directory"
 msgstr "Liste des entrées seulement pour un répertoire"
 
@@ -3154,56 +3154,56 @@
 msgid "Unsupported FS loader version (%d) for fsfs"
 msgstr "Version %d du chargeur FS non supportée pour fsfs"
 
-#: ../libsvn_fs_fs/fs_fs.c:264
+#: ../libsvn_fs_fs/fs_fs.c:263
 #, c-format
 msgid "Revision file '%s' does not exist, and r%ld is not packed"
 msgstr "Le fichier de révision '%s' n'existe pas, et r%ld n'est pas compacté"
 
-#: ../libsvn_fs_fs/fs_fs.c:500
+#: ../libsvn_fs_fs/fs_fs.c:499
 #, c-format
 msgid "Can't grab FSFS txn list mutex"
 msgstr "Impossible d'obtenir l'exclusivité (txn list mutex) de FSFS"
 
-#: ../libsvn_fs_fs/fs_fs.c:508
+#: ../libsvn_fs_fs/fs_fs.c:507
 #, c-format
 msgid "Can't ungrab FSFS txn list mutex"
 msgstr "Impossible de rendre l'exclusivité (txn list mutex) de FSFS"
 
-#: ../libsvn_fs_fs/fs_fs.c:561
+#: ../libsvn_fs_fs/fs_fs.c:560
 #, c-format
 msgid "Can't grab FSFS mutex for '%s'"
 msgstr "Impossible d'obtenir l'exclusivité (mutex) sur FSFS pour '%s'"
 
-#: ../libsvn_fs_fs/fs_fs.c:576
+#: ../libsvn_fs_fs/fs_fs.c:575
 #, c-format
 msgid "Can't ungrab FSFS mutex for '%s'"
 msgstr "Impossible de rendre l'exclusivité (mutex) sur FSFS pour '%s'"
 
-#: ../libsvn_fs_fs/fs_fs.c:647
+#: ../libsvn_fs_fs/fs_fs.c:646
 #, c-format
 msgid "Can't unlock unknown transaction '%s'"
 msgstr "Impossible de déverrouiller la transaction inconnue '%s'"
 
-#: ../libsvn_fs_fs/fs_fs.c:651
+#: ../libsvn_fs_fs/fs_fs.c:650
 #, c-format
 msgid "Can't unlock nonlocked transaction '%s'"
 msgstr "Impossible de déverrouiller la transaction non verrouillée '%s'"
 
-#: ../libsvn_fs_fs/fs_fs.c:658
+#: ../libsvn_fs_fs/fs_fs.c:657
 #, c-format
 msgid "Can't unlock prototype revision lockfile for transaction '%s'"
 msgstr ""
 "Impossible de déverrouiller le fichier verrou du prototype de révision pour "
 "la transaction '%s'"
 
-#: ../libsvn_fs_fs/fs_fs.c:664
+#: ../libsvn_fs_fs/fs_fs.c:663
 #, c-format
 msgid "Can't close prototype revision lockfile for transaction '%s'"
 msgstr ""
 "Impossible de fermer le fichier verrou du prototype de révision pour la "
 "transaction '%s'"
 
-#: ../libsvn_fs_fs/fs_fs.c:726
+#: ../libsvn_fs_fs/fs_fs.c:725
 #, c-format
 msgid ""
 "Cannot write to the prototype revision file of transaction '%s' because a "
@@ -3213,7 +3213,7 @@
 "transaction '%s' parce qu'une représentation précédente est en cours "
 "d'écriture par ce processus."
 
-#: ../libsvn_fs_fs/fs_fs.c:762
+#: ../libsvn_fs_fs/fs_fs.c:761
 #, c-format
 msgid ""
 "Cannot write to the prototype revision file of transaction '%s' because a "
@@ -3223,27 +3223,27 @@
 "transaction '%s' parce qu'une représentation précédente est en cours "
 "d'écriture par un autre processus"
 
-#: ../libsvn_fs_fs/fs_fs.c:769 ../libsvn_subr/io.c:1910
+#: ../libsvn_fs_fs/fs_fs.c:768 ../libsvn_subr/io.c:1604
 #, c-format
 msgid "Can't get exclusive lock on file '%s'"
 msgstr "Impossible d'obtenir le verrou exclusif sur le fichier '%s'"
 
-#: ../libsvn_fs_fs/fs_fs.c:881
+#: ../libsvn_fs_fs/fs_fs.c:880
 #, c-format
 msgid "Format file '%s' contains an unexpected non-digit"
 msgstr "Le fichier de format '%s' contient un caractère non-numérique"
 
-#: ../libsvn_fs_fs/fs_fs.c:930
+#: ../libsvn_fs_fs/fs_fs.c:929
 #, c-format
 msgid "Can't read first line of format file '%s'"
 msgstr "Impossible de lire la première ligne du fichier de format '%s'"
 
-#: ../libsvn_fs_fs/fs_fs.c:974
+#: ../libsvn_fs_fs/fs_fs.c:973
 #, c-format
 msgid "'%s' contains invalid filesystem format option '%s'"
 msgstr "'%s' contient une option invalide '%s' pour le format de stockage"
 
-#: ../libsvn_fs_fs/fs_fs.c:1050
+#: ../libsvn_fs_fs/fs_fs.c:1049
 #, c-format
 msgid "Expected FS format between '1' and '%d'; found format '%d'"
 msgstr "Format de stockage attendu entre '1' et '%d' ; format trouvé '%d'"
@@ -3261,101 +3261,101 @@
 "upgrade %s'"
 msgstr ""
 
-#: ../libsvn_fs_fs/fs_fs.c:1697 ../libsvn_fs_fs/fs_fs.c:1711
+#: ../libsvn_fs_fs/fs_fs.c:1624 ../libsvn_fs_fs/fs_fs.c:1638
 msgid "Found malformed header in revision file"
 msgstr "Entête malformée dans le fichier de révision"
 
-#: ../libsvn_fs_fs/fs_fs.c:1745
+#: ../libsvn_fs_fs/fs_fs.c:1672
 #, c-format
 msgid "Invalid revision number '%ld'"
 msgstr "Numéro de révision invalide '%ld'"
 
-#: ../libsvn_fs_fs/fs_fs.c:1760 ../libsvn_fs_fs/fs_fs.c:1786
-#: ../libsvn_fs_fs/fs_fs.c:2718 ../libsvn_repos/log.c:1919
-#: ../libsvn_repos/log.c:1923
+#: ../libsvn_fs_fs/fs_fs.c:1687 ../libsvn_fs_fs/fs_fs.c:1713
+#: ../libsvn_fs_fs/fs_fs.c:2645 ../libsvn_repos/log.c:1621
+#: ../libsvn_repos/log.c:1625
 #, c-format
 msgid "No such revision %ld"
 msgstr "Pas de révision %ld"
 
-#: ../libsvn_fs_fs/fs_fs.c:1949 ../libsvn_fs_fs/fs_fs.c:1963
-#: ../libsvn_fs_fs/fs_fs.c:1970 ../libsvn_fs_fs/fs_fs.c:1977
-#: ../libsvn_fs_fs/fs_fs.c:1985 ../libsvn_fs_fs/fs_fs.c:1998
-#: ../libsvn_fs_fs/fs_fs.c:2007
+#: ../libsvn_fs_fs/fs_fs.c:1876 ../libsvn_fs_fs/fs_fs.c:1890
+#: ../libsvn_fs_fs/fs_fs.c:1897 ../libsvn_fs_fs/fs_fs.c:1904
+#: ../libsvn_fs_fs/fs_fs.c:1912 ../libsvn_fs_fs/fs_fs.c:1925
+#: ../libsvn_fs_fs/fs_fs.c:1934
 msgid "Malformed text representation offset line in node-rev"
 msgstr ""
 "Ligne 'offset' d'une représentation textuelle malformée dans 'node-rev'"
 
-#: ../libsvn_fs_fs/fs_fs.c:2074
+#: ../libsvn_fs_fs/fs_fs.c:2001
 msgid "Missing id field in node-rev"
 msgstr "Champs 'id' manquant dans 'node-rev'"
 
-#: ../libsvn_fs_fs/fs_fs.c:2086
+#: ../libsvn_fs_fs/fs_fs.c:2013
 msgid "Missing kind field in node-rev"
 msgstr "Champs 'kind' manquant dans 'node-rev'"
 
-#: ../libsvn_fs_fs/fs_fs.c:2117
+#: ../libsvn_fs_fs/fs_fs.c:2044
 msgid "Missing cpath in node-rev"
 msgstr "'cpath' manquant dans 'node-rev'"
 
-#: ../libsvn_fs_fs/fs_fs.c:2144 ../libsvn_fs_fs/fs_fs.c:2150
+#: ../libsvn_fs_fs/fs_fs.c:2071 ../libsvn_fs_fs/fs_fs.c:2077
 msgid "Malformed copyroot line in node-rev"
 msgstr "Ligne 'copyroot' malformée dans 'node-rev'"
 
-#: ../libsvn_fs_fs/fs_fs.c:2168 ../libsvn_fs_fs/fs_fs.c:2174
+#: ../libsvn_fs_fs/fs_fs.c:2095 ../libsvn_fs_fs/fs_fs.c:2101
 msgid "Malformed copyfrom line in node-rev"
 msgstr "Ligne 'copyfrom' malformée dans 'node-rev'"
 
-#: ../libsvn_fs_fs/fs_fs.c:2331 ../libsvn_fs_fs/fs_fs.c:5165
+#: ../libsvn_fs_fs/fs_fs.c:2258 ../libsvn_fs_fs/fs_fs.c:5092
 msgid "Attempted to write to non-transaction"
 msgstr "Tentative d'écriture vers une non-transaction"
 
-#: ../libsvn_fs_fs/fs_fs.c:2417
+#: ../libsvn_fs_fs/fs_fs.c:2344
 msgid "Malformed representation header"
 msgstr "Entête de représentation mal formée"
 
-#: ../libsvn_fs_fs/fs_fs.c:2445
+#: ../libsvn_fs_fs/fs_fs.c:2372
 msgid "Missing node-id in node-rev"
 msgstr "'node-id' manquant dans 'node-rev'"
 
-#: ../libsvn_fs_fs/fs_fs.c:2451
+#: ../libsvn_fs_fs/fs_fs.c:2378
 msgid "Corrupt node-id in node-rev"
 msgstr "'node-id' corrompu dans 'node-rev'"
 
-#: ../libsvn_fs_fs/fs_fs.c:2526
+#: ../libsvn_fs_fs/fs_fs.c:2453
 #, c-format
 msgid "Revision file lacks trailing newline"
 msgstr "Il manque une saut de ligne à la fin du fichier de révision"
 
-#: ../libsvn_fs_fs/fs_fs.c:2538
+#: ../libsvn_fs_fs/fs_fs.c:2465
 #, c-format
 msgid "Final line in revision file longer than 64 characters"
 msgstr "Dernière ligne du fichier de révision plus longue que 64 caractères"
 
-#: ../libsvn_fs_fs/fs_fs.c:2553
+#: ../libsvn_fs_fs/fs_fs.c:2480
 msgid "Final line in revision file missing space"
 msgstr "Il manque espace à la dernière ligne du fichier de révision"
 
-#: ../libsvn_fs_fs/fs_fs.c:2792
+#: ../libsvn_fs_fs/fs_fs.c:2719
 msgid "Malformed svndiff data in representation"
 msgstr "Représentation des données de svndiff mal formées"
 
-#: ../libsvn_fs_fs/fs_fs.c:2984 ../libsvn_fs_fs/fs_fs.c:2997
+#: ../libsvn_fs_fs/fs_fs.c:2911 ../libsvn_fs_fs/fs_fs.c:2924
 msgid "Reading one svndiff window read beyond the end of the representation"
 msgstr "Lecture d'une fenêtre svndiff au delà de la fin de la représentation"
 
-#: ../libsvn_fs_fs/fs_fs.c:3137
+#: ../libsvn_fs_fs/fs_fs.c:3064
 msgid "svndiff data requested non-existent source"
 msgstr "Données de svndiff ayant requis une source inexistante"
 
-#: ../libsvn_fs_fs/fs_fs.c:3143
+#: ../libsvn_fs_fs/fs_fs.c:3070
 msgid "svndiff requested position beyond end of stream"
 msgstr "svndiff ayant requis une position au delà de la fin du flux"
 
-#: ../libsvn_fs_fs/fs_fs.c:3166 ../libsvn_fs_fs/fs_fs.c:3183
+#: ../libsvn_fs_fs/fs_fs.c:3093 ../libsvn_fs_fs/fs_fs.c:3110
 msgid "svndiff window length is corrupt"
 msgstr "Taille de fenêtre de svndiff corrompue"
 
-#: ../libsvn_fs_fs/fs_fs.c:3234
+#: ../libsvn_fs_fs/fs_fs.c:3161
 #, c-format
 msgid ""
 "Checksum mismatch while reading representation:\n"
@@ -3366,59 +3366,59 @@
 "   attendu :  %s\n"
 "    obtenu :  %s\n"
 
-#: ../libsvn_fs_fs/fs_fs.c:3536 ../libsvn_fs_fs/fs_fs.c:3549
-#: ../libsvn_fs_fs/fs_fs.c:3555 ../libsvn_fs_fs/fs_fs.c:6368
-#: ../libsvn_fs_fs/fs_fs.c:6377 ../libsvn_fs_fs/fs_fs.c:6383
+#: ../libsvn_fs_fs/fs_fs.c:3463 ../libsvn_fs_fs/fs_fs.c:3476
+#: ../libsvn_fs_fs/fs_fs.c:3482 ../libsvn_fs_fs/fs_fs.c:6267
+#: ../libsvn_fs_fs/fs_fs.c:6276 ../libsvn_fs_fs/fs_fs.c:6282
 msgid "Directory entry corrupt"
 msgstr "Entrée du répertoire corrompue"
 
-#: ../libsvn_fs_fs/fs_fs.c:3955 ../libsvn_fs_fs/fs_fs.c:3960
-#: ../libsvn_fs_fs/fs_fs.c:3966 ../libsvn_fs_fs/fs_fs.c:3983
-#: ../libsvn_fs_fs/fs_fs.c:4016 ../libsvn_fs_fs/fs_fs.c:4036
-#: ../libsvn_fs_fs/fs_fs.c:4070 ../libsvn_fs_fs/fs_fs.c:4075
+#: ../libsvn_fs_fs/fs_fs.c:3882 ../libsvn_fs_fs/fs_fs.c:3887
+#: ../libsvn_fs_fs/fs_fs.c:3893 ../libsvn_fs_fs/fs_fs.c:3910
+#: ../libsvn_fs_fs/fs_fs.c:3943 ../libsvn_fs_fs/fs_fs.c:3963
+#: ../libsvn_fs_fs/fs_fs.c:3997 ../libsvn_fs_fs/fs_fs.c:4002
 msgid "Invalid changes line in rev-file"
 msgstr "Lignes modifiées invalides dans le fichier révision (rev-file)"
 
-#: ../libsvn_fs_fs/fs_fs.c:4009
+#: ../libsvn_fs_fs/fs_fs.c:3936
 msgid "Invalid change kind in rev file"
 msgstr "Sorte de modification invalide dans le fichier révision (rev-file)"
 
-#: ../libsvn_fs_fs/fs_fs.c:4029
+#: ../libsvn_fs_fs/fs_fs.c:3956
 msgid "Invalid text-mod flag in rev-file"
 msgstr "'text-mod' invalide dans le fichier révision (rev-file)"
 
-#: ../libsvn_fs_fs/fs_fs.c:4049
+#: ../libsvn_fs_fs/fs_fs.c:3976
 msgid "Invalid prop-mod flag in rev-file"
 msgstr "'prop-mod' invalide dans le fichier révision (rev-file)"
 
-#: ../libsvn_fs_fs/fs_fs.c:4227
+#: ../libsvn_fs_fs/fs_fs.c:4154
 msgid "Copying from transactions not allowed"
 msgstr "Copie à partir des transactions impossible"
 
-#: ../libsvn_fs_fs/fs_fs.c:4382
+#: ../libsvn_fs_fs/fs_fs.c:4309
 #, c-format
 msgid "Unable to create transaction directory in '%s' for revision %ld"
 msgstr ""
 "Impossible de créer le répertoire de transaction '%s' pour la révision %ld"
 
-#: ../libsvn_fs_fs/fs_fs.c:4598 ../libsvn_fs_fs/fs_fs.c:4605
+#: ../libsvn_fs_fs/fs_fs.c:4525 ../libsvn_fs_fs/fs_fs.c:4532
 msgid "next-id file corrupt"
 msgstr "Fichier identificateur suivant (next-id) corrompu"
 
-#: ../libsvn_fs_fs/fs_fs.c:4716
+#: ../libsvn_fs_fs/fs_fs.c:4643
 msgid "Transaction cleanup failed"
 msgstr "Échec du nettoyage de la transaction"
 
-#: ../libsvn_fs_fs/fs_fs.c:4829
+#: ../libsvn_fs_fs/fs_fs.c:4756
 msgid "Invalid change type"
 msgstr "Type de modification invalide"
 
-#: ../libsvn_fs_fs/fs_fs.c:5184
+#: ../libsvn_fs_fs/fs_fs.c:5111
 msgid "Can't set text contents of a directory"
 msgstr "Impossible de définir le contenu textuel d'un répertoire"
 
-#: ../libsvn_fs_fs/fs_fs.c:5268 ../libsvn_fs_fs/fs_fs.c:5273
-#: ../libsvn_fs_fs/fs_fs.c:5280
+#: ../libsvn_fs_fs/fs_fs.c:5195 ../libsvn_fs_fs/fs_fs.c:5200
+#: ../libsvn_fs_fs/fs_fs.c:5207
 msgid "Corrupt current file"
 msgstr "Fichier courant corrompu"
 
@@ -3426,48 +3426,48 @@
 msgid "Truncated protorev file detected"
 msgstr ""
 
-#: ../libsvn_fs_fs/fs_fs.c:5614 ../libsvn_subr/io.c:3202 ../svn/util.c:406
-#: ../svn/util.c:421 ../svn/util.c:455
+#: ../libsvn_fs_fs/fs_fs.c:5522 ../libsvn_subr/io.c:2896 ../svn/util.c:406
+#: ../svn/util.c:421 ../svn/util.c:445
 #, c-format
 msgid "Can't stat '%s'"
 msgstr "'%s' n'est pas consultable (stat)"
 
-#: ../libsvn_fs_fs/fs_fs.c:5618
+#: ../libsvn_fs_fs/fs_fs.c:5526
 #, c-format
 msgid "Can't chmod '%s'"
 msgstr "Impossible de changer les droits (chmod) de '%s'"
 
-#: ../libsvn_fs_fs/fs_fs.c:5796
+#: ../libsvn_fs_fs/fs_fs.c:5704
 msgid "Transaction out of date"
 msgstr "Transaction obsolète"
 
-#: ../libsvn_fs_fs/fs_fs.c:6309
+#: ../libsvn_fs_fs/fs_fs.c:6208
 msgid "Recovery encountered a non-directory node"
 msgstr "La réparation a trouvé un nœud qui n'est pas un répertoire"
 
-#: ../libsvn_fs_fs/fs_fs.c:6331
+#: ../libsvn_fs_fs/fs_fs.c:6230
 msgid "Recovery encountered a deltified directory representation"
 msgstr ""
 "La réparation a trouvé une réprésentation différentielle de répertoire"
 
-#: ../libsvn_fs_fs/fs_fs.c:6476
+#: ../libsvn_fs_fs/fs_fs.c:6375
 #, c-format
 msgid "Expected current rev to be <= %ld but found %ld"
 msgstr "Révision courante attendue inférieure à %ld, mais %ld trouvée"
 
-#: ../libsvn_fs_fs/fs_fs.c:6527
+#: ../libsvn_fs_fs/fs_fs.c:6426
 #, c-format
 msgid "Revision %ld has a revs file but no revprops file"
 msgstr "La révision %ld a un fichier 'revs' mais pas de fichier 'revprops'"
 
-#: ../libsvn_fs_fs/fs_fs.c:6532
+#: ../libsvn_fs_fs/fs_fs.c:6431
 #, c-format
 msgid "Revision %ld has a non-file where its revprops file should be"
 msgstr ""
 "La révision %ld a quelque chose d'autre qu'un fichier à la place du "
 "'revprops'"
 
-#: ../libsvn_fs_fs/fs_fs.c:6709
+#: ../libsvn_fs_fs/fs_fs.c:6608
 #, c-format
 msgid ""
 "Node origin for '%s' exists with a different value (%s) than what we were "
@@ -3476,11 +3476,11 @@
 "Le nœud origine pour '%s' existe avec une valeur différente (%s) de ce que "
 "nous allions stocker (%s)"
 
-#: ../libsvn_fs_fs/fs_fs.c:6818
+#: ../libsvn_fs_fs/fs_fs.c:6717
 msgid "No such transaction"
 msgstr "Transaction non trouvée"
 
-#: ../libsvn_fs_fs/fs_fs.c:7163
+#: ../libsvn_fs_fs/fs_fs.c:7060
 msgid "FS format too old to pack, please upgrade."
 msgstr "Format de FS trop vieux pour tasser, mettre à jour svp."
 
@@ -3494,17 +3494,17 @@
 msgid "Can't parse lock/entries hashfile '%s'"
 msgstr "Impossible d'analyser le fichier-hash de verrouillage '%s'"
 
-#: ../libsvn_fs_fs/lock.c:681 ../libsvn_fs_fs/lock.c:702
+#: ../libsvn_fs_fs/lock.c:685 ../libsvn_fs_fs/lock.c:706
 #, c-format
 msgid "Path '%s' doesn't exist in HEAD revision"
 msgstr "Le chemin '%s' n'existe pas à la révision de tête (HEAD)"
 
-#: ../libsvn_fs_fs/lock.c:707
+#: ../libsvn_fs_fs/lock.c:711
 #, c-format
 msgid "Lock failed: newer version of '%s' exists"
 msgstr "Échec du verrouillage : il existe une version plus récente de '%s'"
 
-#: ../libsvn_fs_fs/rep-cache.c:107 ../libsvn_fs_fs/rep-cache.c:167
+#: ../libsvn_fs_fs/rep-cache.c:106 ../libsvn_fs_fs/rep-cache.c:146
 msgid "Only SHA1 checksums can be used as keys in the rep_cache table.\n"
 msgstr ""
 "Seule des sommes de contrôle SHA1 peuvent être utilisées comme clefs dans la "
@@ -3515,7 +3515,7 @@
 msgid "Youngest revision is r%ld, but rep-cache contains r%ld"
 msgstr ""
 
-#: ../libsvn_fs_fs/rep-cache.c:184
+#: ../libsvn_fs_fs/rep-cache.c:163
 #, c-format
 msgid ""
 "Representation key for checksum '%%s' exists in filesystem '%%s' with a "
@@ -3594,8 +3594,8 @@
 "Problème de version de module RA pour '%s': %d.%d.%d%s trouvé, %d.%d.%d%s "
 "attendu"
 
-#: ../libsvn_ra/ra_loader.c:362 ../libsvn_ra_serf/serf.c:506
-#: ../libsvn_ra_serf/serf.c:620
+#: ../libsvn_ra/ra_loader.c:362 ../libsvn_ra_serf/serf.c:490
+#: ../libsvn_ra_serf/serf.c:604
 #, c-format
 msgid "Illegal repository URL '%s'"
 msgstr "URL de dépôt svn illégale '%s'"
@@ -3646,8 +3646,8 @@
 msgid "URL '%s' is not a child of the session's repository root URL '%s'"
 msgstr "l'URL '%s' n'est pas descendante de l'URL du dépôt racine '%s'"
 
-#: ../libsvn_ra_local/ra_plugin.c:1394 ../libsvn_ra_neon/options.c:388
-#: ../libsvn_ra_serf/serf.c:304 ../libsvn_ra_svn/client.c:2332
+#: ../libsvn_ra_local/ra_plugin.c:1394 ../libsvn_ra_neon/options.c:372
+#: ../libsvn_ra_serf/serf.c:288 ../libsvn_ra_svn/client.c:2332
 #, c-format
 msgid "Don't know anything about capability '%s'"
 msgstr "Pas d'information à propos de la capacité '%s'"
@@ -3695,13 +3695,13 @@
 msgstr "La réponse au CHECKOUT ne contient pas l'entête 'Location:'"
 
 #: ../libsvn_ra_neon/commit.c:519 ../libsvn_ra_neon/props.c:210
-#: ../libsvn_ra_neon/util.c:521 ../libsvn_ra_serf/commit.c:1270
-#: ../libsvn_ra_serf/commit.c:1682 ../libsvn_ra_serf/update.c:2050
+#: ../libsvn_ra_neon/util.c:521 ../libsvn_ra_serf/commit.c:1264
+#: ../libsvn_ra_serf/commit.c:1676 ../libsvn_ra_serf/update.c:2037
 #, c-format
 msgid "Unable to parse URL '%s'"
 msgstr "Impossible d'analyser l'URL '%s'"
 
-#: ../libsvn_ra_neon/commit.c:1047 ../libsvn_ra_serf/commit.c:1521
+#: ../libsvn_ra_neon/commit.c:1047 ../libsvn_ra_serf/commit.c:1515
 #, c-format
 msgid "File '%s' already exists"
 msgstr "Le fichier '%s' existe déjà"
@@ -3738,7 +3738,7 @@
 msgid "Server response missing the expected deadprop-count property"
 msgstr "La réponse du serveur ne contient pas la propriété 'deadprop-count'"
 
-#: ../libsvn_ra_neon/fetch.c:1168 ../libsvn_ra_serf/commit.c:2061
+#: ../libsvn_ra_neon/fetch.c:1168 ../libsvn_ra_serf/commit.c:2049
 msgid ""
 "DAV request failed; it's possible that the repository's pre-revprop-change "
 "hook either failed or is non-existent"
@@ -3751,12 +3751,12 @@
 msgid "Missing rev attr in target-revision element"
 msgstr "Attribut révision 'rev' manquant dans un élément 'target-revision'"
 
-#: ../libsvn_ra_neon/fetch.c:1422 ../libsvn_ra_serf/update.c:1471
+#: ../libsvn_ra_neon/fetch.c:1422 ../libsvn_ra_serf/update.c:1460
 #, c-format
 msgid "Missing name attr in absent-directory element"
 msgstr "Attribut nom 'name' manquant dans un élément 'absent-directory'"
 
-#: ../libsvn_ra_neon/fetch.c:1438 ../libsvn_ra_serf/update.c:1494
+#: ../libsvn_ra_neon/fetch.c:1438 ../libsvn_ra_serf/update.c:1483
 #, c-format
 msgid "Missing name attr in absent-file element"
 msgstr "Attribut nom 'name' manquant dans un élément 'absent-directory'"
@@ -3772,13 +3772,13 @@
 msgstr "Attribut révision 'rev' manquant dans un élément 'open-directory'"
 
 #: ../libsvn_ra_neon/fetch.c:1493 ../libsvn_ra_serf/replay.c:261
-#: ../libsvn_ra_serf/update.c:1300
+#: ../libsvn_ra_serf/update.c:1289
 #, c-format
 msgid "Missing name attr in open-directory element"
 msgstr "Attribut nom 'name' manquant dans un élément 'open-directory'"
 
 #: ../libsvn_ra_neon/fetch.c:1520 ../libsvn_ra_serf/replay.c:287
-#: ../libsvn_ra_serf/update.c:1335
+#: ../libsvn_ra_serf/update.c:1324
 #, c-format
 msgid "Missing name attr in add-directory element"
 msgstr "Attribut nom 'name' manquant dans un élément 'add-directory'"
@@ -3794,13 +3794,13 @@
 msgstr "Attribut révision 'rev' manquant dans un élément 'open-file'"
 
 #: ../libsvn_ra_neon/fetch.c:1617 ../libsvn_ra_serf/replay.c:322
-#: ../libsvn_ra_serf/update.c:1375
+#: ../libsvn_ra_serf/update.c:1364
 #, c-format
 msgid "Missing name attr in open-file element"
 msgstr "Attribut nom 'name' manquant dans un élément 'open-file'"
 
 #: ../libsvn_ra_neon/fetch.c:1643 ../libsvn_ra_serf/replay.c:348
-#: ../libsvn_ra_serf/update.c:1410
+#: ../libsvn_ra_serf/update.c:1399
 #, c-format
 msgid "Missing name attr in add-file element"
 msgstr "Attribut nom 'name' manquant dans un élément 'add-file'"
@@ -3810,33 +3810,33 @@
 msgid "Missing copyfrom-rev attr in add-file element"
 msgstr "Attribut 'copyfrom-rev' manquant dans un élément 'add-file'"
 
-#: ../libsvn_ra_neon/fetch.c:1713
+#: ../libsvn_ra_neon/fetch.c:1711
 #, c-format
 msgid "Missing name attr in set-prop element"
 msgstr "Attribut nom 'name' manquant dans un élément 'set-prop'"
 
-#: ../libsvn_ra_neon/fetch.c:1727
+#: ../libsvn_ra_neon/fetch.c:1725
 #, c-format
 msgid "Missing name attr in remove-prop element"
 msgstr "Attribut nom 'name' manquant dans élément 'remove-prop'"
 
-#: ../libsvn_ra_neon/fetch.c:1801 ../libsvn_ra_serf/replay.c:235
-#: ../libsvn_ra_serf/update.c:1440
+#: ../libsvn_ra_neon/fetch.c:1799 ../libsvn_ra_serf/replay.c:235
+#: ../libsvn_ra_serf/update.c:1429
 #, c-format
 msgid "Missing name attr in delete-entry element"
 msgstr "Attribut nom 'name' manquant dans un élément 'delete-entry'"
 
-#: ../libsvn_ra_neon/fetch.c:1963
+#: ../libsvn_ra_neon/fetch.c:1961
 #, c-format
 msgid "Error writing to '%s': unexpected EOF"
 msgstr "Erreur d'écriture sur '%s' : fin de fichier (EOF) inattendue"
 
-#: ../libsvn_ra_neon/fetch.c:2110
+#: ../libsvn_ra_neon/fetch.c:2108
 #, c-format
 msgid "Unknown XML encoding: '%s'"
 msgstr "Encodage XML inconnu : '%s'"
 
-#: ../libsvn_ra_neon/fetch.c:2411
+#: ../libsvn_ra_neon/fetch.c:2409
 #, c-format
 msgid "REPORT response handling failed to complete the editor drive"
 msgstr "La gestion de la réponse au REPORT n'a pas clos le baton d'édition"
@@ -3881,7 +3881,7 @@
 msgstr "Données de verrouillage incomplètes"
 
 #: ../libsvn_ra_neon/get_locks.c:297 ../libsvn_ra_serf/property.c:355
-#: ../libsvn_ra_serf/update.c:1929
+#: ../libsvn_ra_serf/update.c:1916
 #, c-format
 msgid "Got unrecognized encoding '%s'"
 msgstr "Encodage non reconnu : '%s'"
@@ -3962,12 +3962,12 @@
 msgid "The MERGE property response had an error status"
 msgstr "Erreur dans la réponse à la fusion (MERGE) de propriété"
 
-#: ../libsvn_ra_neon/options.c:247 ../libsvn_ra_neon/util.c:1263
+#: ../libsvn_ra_neon/options.c:231 ../libsvn_ra_neon/util.c:1259
 #, c-format
 msgid "The %s request returned invalid XML in the response: %s (%s)"
 msgstr "La requête %s a retourné du XML invalide dans la réponse : %s (%s)"
 
-#: ../libsvn_ra_neon/options.c:258
+#: ../libsvn_ra_neon/options.c:242
 msgid ""
 "The OPTIONS response did not include the requested activity-collection-set; "
 "this often means that the URL is not WebDAV-enabled"
@@ -3975,12 +3975,12 @@
 "La réponse à OPTIONS n'inclut pas le 'activity-collection-set' demandé ; "
 "Cela signifie souvent que l'URL n'est pas WebDAV"
 
-#: ../libsvn_ra_neon/options.c:371 ../libsvn_ra_serf/serf.c:287
+#: ../libsvn_ra_neon/options.c:355 ../libsvn_ra_serf/serf.c:271
 #, c-format
 msgid "Don't know how to handle '%s' for capability '%s'"
 msgstr "Ne sais pas gérer '%s' pour la capacité '%s'"
 
-#: ../libsvn_ra_neon/options.c:395 ../libsvn_ra_serf/serf.c:311
+#: ../libsvn_ra_neon/options.c:379 ../libsvn_ra_serf/serf.c:295
 #, c-format
 msgid "Attempt to fetch capability '%s' resulted in '%s'"
 msgstr "la tentative de récuperer la capacité '%s' a résulté en '%s'"
@@ -4060,15 +4060,15 @@
 msgid "PIN for token \"%s\" in slot \"%s\""
 msgstr "PIN du signe \"%s\" dans le créneau \"%s\""
 
-#: ../libsvn_ra_neon/session.c:535 ../libsvn_ra_serf/serf.c:433
+#: ../libsvn_ra_neon/session.c:535 ../libsvn_ra_serf/serf.c:417
 msgid "Invalid URL: illegal character in proxy port number"
 msgstr "URL invalide : caractère illégal dans le numéro de port du proxy"
 
-#: ../libsvn_ra_neon/session.c:539 ../libsvn_ra_serf/serf.c:437
+#: ../libsvn_ra_neon/session.c:539 ../libsvn_ra_serf/serf.c:421
 msgid "Invalid URL: negative proxy port number"
 msgstr "URL invalide : numéro de port du proxy négatif"
 
-#: ../libsvn_ra_neon/session.c:542 ../libsvn_ra_serf/serf.c:440
+#: ../libsvn_ra_neon/session.c:542 ../libsvn_ra_serf/serf.c:424
 msgid ""
 "Invalid URL: proxy port number greater than maximum TCP port number 65535"
 msgstr ""
@@ -4123,7 +4123,7 @@
 msgstr ""
 "Configuration invalide : impossible de charger le fournisseur de PKCS#11 '%s'"
 
-#: ../libsvn_ra_neon/session.c:1121 ../libsvn_ra_serf/serf.c:1112
+#: ../libsvn_ra_neon/session.c:1121 ../libsvn_ra_serf/serf.c:1096
 msgid "The UUID property was not found on the resource or any of its parents"
 msgstr ""
 "La propriété UUID n'a pas été trouvée sur la ressource ou sur un de ses "
@@ -4152,7 +4152,7 @@
 msgid "%s of '%s'"
 msgstr "%s de '%s'"
 
-#: ../libsvn_ra_neon/util.c:547 ../libsvn_ra_serf/util.c:1534
+#: ../libsvn_ra_neon/util.c:547 ../libsvn_ra_serf/util.c:1499
 #, c-format
 msgid "'%s' path not found"
 msgstr "Chemin '%s' non trouvé"
@@ -4162,17 +4162,17 @@
 msgid "access to '%s' forbidden"
 msgstr ""
 
-#: ../libsvn_ra_neon/util.c:560 ../libsvn_ra_serf/util.c:1528
+#: ../libsvn_ra_neon/util.c:556 ../libsvn_ra_serf/util.c:1493
 #, c-format
 msgid "Repository moved permanently to '%s'; please relocate"
 msgstr "Dépôt definitivement déplacé en '%s' ; merci de relocaliser"
 
-#: ../libsvn_ra_neon/util.c:562 ../libsvn_ra_serf/util.c:1530
+#: ../libsvn_ra_neon/util.c:558 ../libsvn_ra_serf/util.c:1495
 #, c-format
 msgid "Repository moved temporarily to '%s'; please relocate"
 msgstr "Dépôt temporairement déplacé en '%s' ; merci de relocaliser"
 
-#: ../libsvn_ra_neon/util.c:570
+#: ../libsvn_ra_neon/util.c:566
 #, c-format
 msgid ""
 "Server sent unexpected return value (%d %s) in response to %s request for "
@@ -4181,29 +4181,29 @@
 "Le serveur a envoyé une valeur inattendue (%d %s) en réponse à la requête %s "
 "pour '%s'"
 
-#: ../libsvn_ra_neon/util.c:582
+#: ../libsvn_ra_neon/util.c:578
 #, c-format
 msgid "authorization failed: %s"
 msgstr "Échec à l'autorisation : %s"
 
-#: ../libsvn_ra_neon/util.c:584
+#: ../libsvn_ra_neon/util.c:580
 msgid "authorization failed"
 msgstr "Échec à l'autorisation"
 
-#: ../libsvn_ra_neon/util.c:589
+#: ../libsvn_ra_neon/util.c:585
 msgid "could not connect to server"
 msgstr "Impossible de se connecter au serveur"
 
-#: ../libsvn_ra_neon/util.c:593
+#: ../libsvn_ra_neon/util.c:589
 msgid "timed out waiting for server"
 msgstr "Temps expiré en attendant le serveur"
 
-#: ../libsvn_ra_neon/util.c:926
+#: ../libsvn_ra_neon/util.c:922
 #, c-format
 msgid "Can't calculate the request body size"
 msgstr "Impossible de calculer la taille du corps de la requête"
 
-#: ../libsvn_ra_neon/util.c:1253
+#: ../libsvn_ra_neon/util.c:1249
 #, c-format
 msgid "Error reading spooled %s request response"
 msgstr "Erreur en lisant un fichier temporaire de la réponse à la requête %s"
@@ -4217,7 +4217,7 @@
 msgid "Directory '%s' is out of date; try updating"
 msgstr "Répertoire '%s' obsolète ; mettre à jour"
 
-#: ../libsvn_ra_serf/commit.c:512 ../libsvn_repos/commit.c:390
+#: ../libsvn_ra_serf/commit.c:512 ../libsvn_repos/commit.c:388
 #, c-format
 msgid "Path '%s' not present"
 msgstr "Le chemin '%s' n'existe pas"
@@ -4244,14 +4244,14 @@
 msgid "%s of '%s': %d %s (%s://%s)"
 msgstr "%s de '%s': %d %s (%s://%s)"
 
-#: ../libsvn_ra_serf/commit.c:1290 ../libsvn_ra_serf/commit.c:1702
+#: ../libsvn_ra_serf/commit.c:1284 ../libsvn_ra_serf/commit.c:1696
 #: ../libsvn_ra_serf/property.c:984
 msgid ""
 "The OPTIONS response did not include the requested baseline-collection value"
 msgstr ""
 "La réponse à OPTIONS n'inclut pas de valeur pour 'baseline-collection'"
 
-#: ../libsvn_ra_serf/commit.c:1316
+#: ../libsvn_ra_serf/commit.c:1310
 #, c-format
 msgid "Adding a directory failed: %s on %s (%d)"
 msgstr "Échec à l'ajout du répertoire : %s sur %s (%d)"
@@ -4275,8 +4275,8 @@
 msgid "Unlock request failed: %d %s"
 msgstr "Échec de la demande de déverrouillage: %d %s"
 
-#: ../libsvn_ra_serf/property.c:970 ../libsvn_ra_serf/update.c:1142
-#: ../libsvn_ra_serf/update.c:1692
+#: ../libsvn_ra_serf/property.c:970 ../libsvn_ra_serf/update.c:1131
+#: ../libsvn_ra_serf/update.c:1679
 msgid "The OPTIONS response did not include the requested checked-in value"
 msgstr "La réponse à OPTIONS n'inclut pas de valeur pour 'checked-in'"
 
@@ -4284,7 +4284,7 @@
 msgid "The OPTIONS response did not include the requested version-name value"
 msgstr "La réponse à OPTIONS n'inclut pas de valeur pour 'version-name'"
 
-#: ../libsvn_ra_serf/replay.c:198 ../libsvn_ra_serf/update.c:1237
+#: ../libsvn_ra_serf/replay.c:198 ../libsvn_ra_serf/update.c:1226
 msgid "Missing revision attr in target-revision element"
 msgstr "Attribut révision 'rev' manquant dans un élément 'target-revision'"
 
@@ -4296,18 +4296,18 @@
 msgid "Missing revision attr in delete-entry element"
 msgstr "Attribut de révision manquant dans un élément 'delete-entry'"
 
-#: ../libsvn_ra_serf/replay.c:267 ../libsvn_ra_serf/update.c:1255
-#: ../libsvn_ra_serf/update.c:1291
+#: ../libsvn_ra_serf/replay.c:267 ../libsvn_ra_serf/update.c:1244
+#: ../libsvn_ra_serf/update.c:1280
 msgid "Missing revision attr in open-directory element"
 msgstr ""
 "Attribut révision 'revision' manquant dans un élément 'open-directory'"
 
-#: ../libsvn_ra_serf/replay.c:328 ../libsvn_ra_serf/update.c:1384
+#: ../libsvn_ra_serf/replay.c:328 ../libsvn_ra_serf/update.c:1373
 msgid "Missing revision attr in open-file element"
 msgstr "Attribut révision 'revision' manquant dans un élément 'open-file'"
 
-#: ../libsvn_ra_serf/replay.c:415 ../libsvn_ra_serf/update.c:1530
-#: ../libsvn_ra_serf/update.c:1612
+#: ../libsvn_ra_serf/replay.c:415 ../libsvn_ra_serf/update.c:1519
+#: ../libsvn_ra_serf/update.c:1601
 #, c-format
 msgid "Missing name attr in %s element"
 msgstr "Attribut nom 'name' manquant dans un élément %s"
@@ -4317,35 +4317,35 @@
 msgid "Error retrieving replay REPORT (%d)"
 msgstr "Erreur à la récupération du REPORT de rejou (%d)"
 
-#: ../libsvn_ra_serf/serf.c:327
+#: ../libsvn_ra_serf/serf.c:311
 msgid "Module for accessing a repository via WebDAV protocol using serf."
 msgstr "Module d'accès à un dépôt via le protocole WebDAV avec serf."
 
-#: ../libsvn_ra_serf/serf.c:550
+#: ../libsvn_ra_serf/serf.c:534
 #, c-format
 msgid "Could not lookup hostname `%s'"
 msgstr "Impossible de résoudre le nom d'hôte : `%s'"
 
-#: ../libsvn_ra_serf/serf.c:799
+#: ../libsvn_ra_serf/serf.c:783
 msgid "The OPTIONS response did not include the requested resourcetype value"
 msgstr "La réponse à OPTIONS n'inclut pas de valeur pour 'resourcetype'"
 
-#: ../libsvn_ra_serf/serf.c:963
+#: ../libsvn_ra_serf/serf.c:947
 msgid ""
 "The PROPFIND response did not include the requested resourcetype value"
 msgstr "La réponse à PROPFIND n'inclut pas de valeur pour 'resourcetype'"
 
-#: ../libsvn_ra_serf/serf.c:1181
+#: ../libsvn_ra_serf/serf.c:1165
 #, c-format
 msgid "Unsupported RA loader version (%d) for ra_serf"
 msgstr "Version %d du chargeur RA (accès dépôt) non supportée pour ra_serf"
 
-#: ../libsvn_ra_serf/update.c:829
+#: ../libsvn_ra_serf/update.c:820
 #, c-format
 msgid "GET request failed: %d %s"
 msgstr "Échec de la requête GET : %d %s"
 
-#: ../libsvn_ra_serf/update.c:2164 ../libsvn_ra_serf/util.c:1464
+#: ../libsvn_ra_serf/update.c:2151 ../libsvn_ra_serf/util.c:1429
 msgid ""
 "The OPTIONS response did not include the requested version-controlled-"
 "configuration value"
@@ -4353,16 +4353,16 @@
 "La réponse à OPTIONS n'inclut pas de valeur pour 'version-controlled-"
 "configuration'"
 
-#: ../libsvn_ra_serf/update.c:2219
+#: ../libsvn_ra_serf/update.c:2206
 #, c-format
 msgid "Error retrieving REPORT (%d)"
 msgstr "Erreur à la récupération du REPORT (%d)"
 
-#: ../libsvn_ra_serf/util.c:1193
+#: ../libsvn_ra_serf/util.c:1158
 msgid "Premature EOF seen from server"
 msgstr "Fin de fichier (EOF) prématurée rencontrée sur le serveur"
 
-#: ../libsvn_ra_serf/util.c:1246
+#: ../libsvn_ra_serf/util.c:1211
 msgid "Unspecified error message"
 msgstr "Message d'erreur non spécifié"
 
@@ -4622,7 +4622,7 @@
 msgid "Command 'finish-replay' invalid outside of replays"
 msgstr "La commande 'finish-replay' est invalide hors des rejous (replay)"
 
-#: ../libsvn_ra_svn/editorp.c:888 ../libsvn_ra_svn/marshal.c:962
+#: ../libsvn_ra_svn/editorp.c:888 ../libsvn_ra_svn/marshal.c:932
 #, c-format
 msgid "Unknown command '%s'"
 msgstr "Commande '%s' inconnue"
@@ -4652,15 +4652,15 @@
 msgid "Proplist element not a list"
 msgstr "L'élément 'proplist' n'est pas une liste"
 
-#: ../libsvn_ra_svn/marshal.c:856
+#: ../libsvn_ra_svn/marshal.c:841
 msgid "Empty error list"
 msgstr "Liste d'erreurs vide"
 
-#: ../libsvn_ra_svn/marshal.c:865 ../libsvn_ra_svn/marshal.c:891
+#: ../libsvn_ra_svn/marshal.c:850
 msgid "Malformed error list"
 msgstr "Liste d'erreurs malformée"
 
-#: ../libsvn_ra_svn/marshal.c:919
+#: ../libsvn_ra_svn/marshal.c:889
 #, c-format
 msgid "Unknown status '%s' in command response"
 msgstr "Statut '%s' inconnu dans la réponse"
@@ -4680,17 +4680,17 @@
 msgid "Can't get socket timeout"
 msgstr "Impossible d'obtenir un 'socket timeout'"
 
-#: ../libsvn_repos/commit.c:131
+#: ../libsvn_repos/commit.c:129
 #, c-format
 msgid "'%s' is out of date"
 msgstr "'%s' n'est pas à jour"
 
-#: ../libsvn_repos/commit.c:298 ../libsvn_repos/commit.c:443
+#: ../libsvn_repos/commit.c:296 ../libsvn_repos/commit.c:441
 #, c-format
 msgid "Got source path but no source revision for '%s'"
 msgstr "Chemin source mais pas de révision source pour '%s'"
 
-#: ../libsvn_repos/commit.c:330 ../libsvn_repos/commit.c:474
+#: ../libsvn_repos/commit.c:328 ../libsvn_repos/commit.c:472
 #, c-format
 msgid "Source url '%s' is from different repository"
 msgstr "L'URL source '%s' concerne un dépôt différent"
@@ -4707,7 +4707,7 @@
 msgid "Commit rejected because mergeinfo on '%s' is syntactically invalid"
 msgstr ""
 
-#: ../libsvn_repos/commit.c:636
+#: ../libsvn_repos/commit.c:599
 #, c-format
 msgid ""
 "Checksum mismatch for resulting fulltext\n"
@@ -4802,13 +4802,13 @@
 msgid "Unexpected node kind %d for '%s'"
 msgstr "Type de nœud %d inattendu pour '%s'"
 
-#: ../libsvn_repos/fs-wrap.c:62 ../libsvn_repos/load.c:1366
+#: ../libsvn_repos/fs-wrap.c:59 ../libsvn_repos/load.c:1358
 msgid "Commit succeeded, but post-commit hook failed"
 msgstr ""
 "Succès de la propagation (commit), mais échec de la procédure d'après "
 "propagation (post-commit hook)"
 
-#: ../libsvn_repos/fs-wrap.c:170
+#: ../libsvn_repos/fs-wrap.c:166
 #, c-format
 msgid ""
 "Storage of non-regular property '%s' is disallowed through the repository "
@@ -4817,30 +4817,30 @@
 "La sauvegarde de la propriété irrégulière '%s' est désactivé dans ce dépôt "
 "et peut indiquer un bogue de votre client"
 
-#: ../libsvn_repos/fs-wrap.c:185
+#: ../libsvn_repos/fs-wrap.c:181
 #, c-format
 msgid "Cannot accept '%s' property because it is not encoded in UTF-8"
 msgstr "Propriété '%s' refusée car non codée en UTF-8"
 
-#: ../libsvn_repos/fs-wrap.c:195
+#: ../libsvn_repos/fs-wrap.c:191
 #, c-format
 msgid "Cannot accept non-LF line endings in '%s' property"
 msgstr ""
 "Fin de ligne différente de 'line feed' refusée dans la propriété '%s'"
 
-#: ../libsvn_repos/fs-wrap.c:310
+#: ../libsvn_repos/fs-wrap.c:306
 #, c-format
 msgid "Write denied:  not authorized to read all of revision %ld"
 msgstr "Écriture refusée : non autorisé à lire toute la révision %ld"
 
-#: ../libsvn_repos/fs-wrap.c:487
+#: ../libsvn_repos/fs-wrap.c:483
 #, c-format
 msgid "Cannot unlock path '%s', no authenticated username available"
 msgstr ""
 "Impossible de déverrouiller le chemin '%s' ; pas de nom d'utilisateur "
 "authentifié"
 
-#: ../libsvn_repos/fs-wrap.c:502
+#: ../libsvn_repos/fs-wrap.c:498
 msgid "Unlock succeeded, but post-unlock hook failed"
 msgstr ""
 "Succès du déverrouillage (unlock), mais échec de la procédure d'après "
@@ -4995,38 +4995,38 @@
 msgid "Incomplete or unterminated property block"
 msgstr "Block de propriété incomplet ou pas terminé"
 
-#: ../libsvn_repos/load.c:489
+#: ../libsvn_repos/load.c:520
 msgid "Unexpected EOF writing contents"
 msgstr "Fin de fichier (EOF) inattendue pendant l'écriture"
 
-#: ../libsvn_repos/load.c:518
+#: ../libsvn_repos/load.c:549
 msgid "Malformed dumpfile header"
 msgstr "Entête de fichier de sauvegarde malformée"
 
-#: ../libsvn_repos/load.c:524 ../libsvn_repos/load.c:566
+#: ../libsvn_repos/load.c:555 ../libsvn_repos/load.c:597
 #, c-format
 msgid "Unsupported dumpfile version: %d"
 msgstr "Version %d du fichier de sauvegarde non supportée"
 
-#: ../libsvn_repos/load.c:669
+#: ../libsvn_repos/load.c:700
 msgid "Unrecognized record type in stream"
 msgstr "Type d'enregistrement inconnu dans le flux"
 
-#: ../libsvn_repos/load.c:782
+#: ../libsvn_repos/load.c:813
 msgid "Sum of subblock sizes larger than total block content length"
 msgstr "Somme des tailles des sous blocs plus grand que la taille totale"
 
-#: ../libsvn_repos/load.c:962
+#: ../libsvn_repos/load.c:993
 #, c-format
 msgid "<<< Started new transaction, based on original revision %ld\n"
 msgstr "<<< Début d'une nouvelle transaction basée sur la révision %ld\n"
 
-#: ../libsvn_repos/load.c:1007
+#: ../libsvn_repos/load.c:1038
 #, c-format
 msgid "Relative source revision %ld is not available in current repository"
 msgstr "Révision de source relative %ld non disponible dans le dépôt courant"
 
-#: ../libsvn_repos/load.c:1022
+#: ../libsvn_repos/load.c:1053
 #, c-format
 msgid ""
 "Copy source checksum mismatch on copy from '%s'@%ld\n"
@@ -5039,47 +5039,47 @@
 "   attendu :  %s\n"
 "    obtenu :  %s\n"
 
-#: ../libsvn_repos/load.c:1076
+#: ../libsvn_repos/load.c:1107
 msgid "Malformed dumpstream: Revision 0 must not contain node records"
 msgstr ""
 "Flux de sauvegarde mal formé : la révision 0 ne doit pas contenir "
 "d'enregistrements de nœud"
 
-#: ../libsvn_repos/load.c:1086
+#: ../libsvn_repos/load.c:1117
 #, c-format
 msgid "     * editing path : %s ..."
 msgstr "     * édition du chemin : %s ..."
 
-#: ../libsvn_repos/load.c:1093
+#: ../libsvn_repos/load.c:1124
 #, c-format
 msgid "     * deleting path : %s ..."
 msgstr "     * suppression du chemin : %s ..."
 
-#: ../libsvn_repos/load.c:1101
+#: ../libsvn_repos/load.c:1132
 #, c-format
 msgid "     * adding path : %s ..."
 msgstr "     * ajout du chemin : %s ..."
 
-#: ../libsvn_repos/load.c:1110
+#: ../libsvn_repos/load.c:1141
 #, c-format
 msgid "     * replacing path : %s ..."
 msgstr "     * remplacement du chemin : %s ..."
 
-#: ../libsvn_repos/load.c:1120
+#: ../libsvn_repos/load.c:1151
 #, c-format
 msgid "Unrecognized node-action on node '%s'"
 msgstr "'node-action' inconnu sur le nœud '%s'"
 
-#: ../libsvn_repos/load.c:1198
+#: ../libsvn_repos/load.c:411
 #, c-format
 msgid " removing '\\r' from %s ..."
 msgstr " retrait de '\\r' de %s ..."
 
-#: ../libsvn_repos/load.c:1304
+#: ../libsvn_repos/load.c:1307
 msgid " done.\n"
 msgstr " fait.\n"
 
-#: ../libsvn_repos/load.c:1390
+#: ../libsvn_repos/load.c:1382
 #, c-format
 msgid ""
 "\n"
@@ -5090,7 +5090,7 @@
 "------- Révision %ld propagée (commit) >>>\n"
 "\n"
 
-#: ../libsvn_repos/load.c:1396
+#: ../libsvn_repos/load.c:1388
 #, c-format
 msgid ""
 "\n"
@@ -5106,7 +5106,7 @@
 msgid "'%s' not found in filesystem"
 msgstr "'%s' non trouvé dans le système de fichiers"
 
-#: ../libsvn_repos/replay.c:426
+#: ../libsvn_repos/replay.c:383
 #, c-format
 msgid "Filesystem path '%s' is neither a file nor a directory"
 msgstr ""
@@ -5128,37 +5128,37 @@
 msgid "Working copy path '%s' does not exist in repository"
 msgstr "Le chemin de copie de travail '%s' n'existe pas dans le dépôt"
 
-#: ../libsvn_repos/reporter.c:1159
+#: ../libsvn_repos/reporter.c:1144
 msgid "Not authorized to open root of edit operation"
 msgstr "Non autorisé à ouvrir la racine de l'opération d'édition"
 
-#: ../libsvn_repos/reporter.c:1176
+#: ../libsvn_repos/reporter.c:1161
 #, c-format
 msgid "Target path '%s' does not exist"
 msgstr "Le chemin cible '%s' n'existe pas"
 
-#: ../libsvn_repos/reporter.c:1184
+#: ../libsvn_repos/reporter.c:1169
 msgid "Cannot replace a directory from within"
 msgstr "On ne peut remplacer un répertoire de l'intérieur de ce répertoire"
 
-#: ../libsvn_repos/reporter.c:1227
+#: ../libsvn_repos/reporter.c:1212
 msgid "Invalid report for top level of working copy"
 msgstr "Rapport invalide pour le sommet de la copie de travail"
 
-#: ../libsvn_repos/reporter.c:1242
+#: ../libsvn_repos/reporter.c:1227
 msgid "Two top-level reports with no target"
 msgstr "Deux rapports au sommet sans aucune cible"
 
-#: ../libsvn_repos/reporter.c:1300
+#: ../libsvn_repos/reporter.c:1285
 #, c-format
 msgid "Unsupported report depth '%s'"
 msgstr "Profondeur de rapport non supportée '%s'"
 
-#: ../libsvn_repos/reporter.c:1328
+#: ../libsvn_repos/reporter.c:1313
 msgid "Depth 'exclude' not supported for link"
 msgstr "Profondeur 'exclude' non supportée pour un lien"
 
-#: ../libsvn_repos/reporter.c:1388
+#: ../libsvn_repos/reporter.c:1373
 msgid "Request depth 'exclude' not supported"
 msgstr "Profondeur demandée 'exclude' non supportée"
 
@@ -5268,7 +5268,7 @@
 msgid "Unreadable path encountered; access denied"
 msgstr "Chemin illisible rencontré, accès refusé"
 
-#: ../libsvn_repos/rev_hunt.c:1132
+#: ../libsvn_repos/rev_hunt.c:1101
 #, c-format
 msgid "'%s' is not a file in revision %ld"
 msgstr "'%s' n'est pas un fichier à la révision %ld"
@@ -5412,7 +5412,7 @@
 "'%s': Commande inconnue.\n"
 "\n"
 
-#: ../libsvn_subr/deprecated.c:544 ../libsvn_subr/opt.c:1019
+#: ../libsvn_subr/deprecated.c:544 ../libsvn_subr/opt.c:1025
 #, c-format
 msgid "Type '%s help' for usage.\n"
 msgstr "Entrer '%s help' pour l'aide.\n"
@@ -5437,41 +5437,41 @@
 msgid "Can't ungrab DSO mutex"
 msgstr "Impossible de rendre l'exclusivité (mutex) du DSO"
 
-#: ../libsvn_subr/error.c:368
+#: ../libsvn_subr/error.c:360
 msgid "Can't recode error string from APR"
 msgstr "Impossible de recoder le message d'erreur de APR"
 
-#: ../libsvn_subr/error.c:466
+#: ../libsvn_subr/error.c:458
 #, c-format
 msgid "%swarning: %s\n"
 msgstr "%savertissement : %s\n"
 
-#: ../libsvn_subr/error.c:522
+#: ../libsvn_subr/error.c:509
 #, c-format
 msgid "In file '%s' line %d: assertion failed (%s)"
 msgstr "Fichier '%s' ligne %d : échec de la vérification (%s)"
 
-#: ../libsvn_subr/error.c:526
+#: ../libsvn_subr/error.c:513
 #, c-format
 msgid "In file '%s' line %d: internal malfunction"
 msgstr "Fichier '%s' ligne %d : dysfonctionnement interne"
 
-#: ../libsvn_subr/io.c:189
+#: ../libsvn_subr/io.c:160
 #, c-format
 msgid "Error converting entry in directory '%s' to UTF-8"
 msgstr "Erreur en convertissant une entrée du répertoire '%s' vers UTF8"
 
-#: ../libsvn_subr/io.c:256
+#: ../libsvn_subr/io.c:227
 #, c-format
 msgid "Can't check path '%s'"
 msgstr "Impossible de vérifier le chemin '%s'"
 
-#: ../libsvn_subr/io.c:462 ../libsvn_subr/io.c:601
+#: ../libsvn_subr/io.c:433
 #, c-format
 msgid "Can't open '%s'"
 msgstr "Impossible d'ouvrir '%s'"
 
-#: ../libsvn_subr/io.c:486 ../libsvn_subr/io.c:798
+#: ../libsvn_subr/io.c:457 ../libsvn_subr/io.c:556
 #, c-format
 msgid "Unable to make name for '%s'"
 msgstr "Impossible de créer un nom pour '%s'"
@@ -5491,209 +5491,209 @@
 msgid "Unable to make name in '%s'"
 msgstr ""
 
-#: ../libsvn_subr/io.c:785
+#: ../libsvn_subr/io.c:543
 #, c-format
 msgid "Can't create symbolic link '%s'"
 msgstr "Impossible de créer le lien symbolique '%s'"
 
-#: ../libsvn_subr/io.c:802 ../libsvn_subr/io.c:835 ../libsvn_subr/io.c:863
+#: ../libsvn_subr/io.c:560 ../libsvn_subr/io.c:593 ../libsvn_subr/io.c:621
 msgid "Symbolic links are not supported on this platform"
 msgstr "Les liens symboliques ne sont pas supportés sur cette plateforme"
 
-#: ../libsvn_subr/io.c:825
+#: ../libsvn_subr/io.c:583
 #, c-format
 msgid "Can't read contents of link"
 msgstr "Impossible de lire le contenu du lien"
 
-#: ../libsvn_subr/io.c:876
+#: ../libsvn_subr/io.c:634
 #, c-format
 msgid "Can't find a temporary directory"
 msgstr "Impossible de trouver de répertoire temporaire"
 
-#: ../libsvn_subr/io.c:984
+#: ../libsvn_subr/io.c:742
 #, c-format
 msgid "Can't copy '%s' to '%s'"
 msgstr "Impossible de copier '%s' vers '%s'"
 
-#: ../libsvn_subr/io.c:1031 ../libsvn_subr/io.c:2096
+#: ../libsvn_subr/io.c:1790
 #, c-format
 msgid "Can't get file name"
 msgstr "Impossible d'obtenir le nom de fichier"
 
-#: ../libsvn_subr/io.c:1035 ../libsvn_subr/io.c:1074
+#: ../libsvn_subr/io.c:808
 #, c-format
 msgid "Can't set permissions on '%s'"
 msgstr "Impossible de fixer les permissions sur '%s'"
 
-#: ../libsvn_subr/io.c:1096
+#: ../libsvn_subr/io.c:830
 #, c-format
 msgid "Can't append '%s' to '%s'"
 msgstr "Impossible d'ajouter le contenu de '%s' à '%s'"
 
-#: ../libsvn_subr/io.c:1130
+#: ../libsvn_subr/io.c:864
 #, c-format
 msgid "Source '%s' is not a directory"
 msgstr "La source '%s' n'est pas un répertoire"
 
-#: ../libsvn_subr/io.c:1136
+#: ../libsvn_subr/io.c:870
 #, c-format
 msgid "Destination '%s' is not a directory"
 msgstr "La destination '%s' n'est pas un répertoire"
 
-#: ../libsvn_subr/io.c:1142
+#: ../libsvn_subr/io.c:876
 #, c-format
 msgid "Destination '%s' already exists"
 msgstr "La destination '%s' existe déjà"
 
-#: ../libsvn_subr/io.c:1211 ../libsvn_subr/io.c:2286 ../libsvn_subr/io.c:2338
+#: ../libsvn_subr/io.c:945 ../libsvn_subr/io.c:1980 ../libsvn_subr/io.c:2032
 #, c-format
 msgid "Can't read directory '%s'"
 msgstr "Impossible de lire le répertoire '%s'"
 
-#: ../libsvn_subr/io.c:1216 ../libsvn_subr/io.c:2291 ../libsvn_subr/io.c:2343
-#: ../libsvn_subr/io.c:3542
+#: ../libsvn_subr/io.c:950 ../libsvn_subr/io.c:1985 ../libsvn_subr/io.c:2037
+#: ../libsvn_subr/io.c:3236
 #, c-format
 msgid "Error closing directory '%s'"
 msgstr "Erreur de fermeture du répertoire '%s'"
 
-#: ../libsvn_subr/io.c:1244
+#: ../libsvn_subr/io.c:978
 #, c-format
 msgid "Can't make directory '%s'"
 msgstr "Impossible de créer le répertoire '%s'"
 
-#: ../libsvn_subr/io.c:1308
+#: ../libsvn_subr/io.c:1042
 #, c-format
 msgid "Can't set access time of '%s'"
 msgstr "Impossible de changer l'heure du dernier accès à '%s'"
 
-#: ../libsvn_subr/io.c:1585 ../libsvn_subr/io.c:1692
+#: ../libsvn_subr/io.c:1304 ../libsvn_subr/io.c:1402
 #, c-format
 msgid "Can't change perms of file '%s'"
 msgstr "Impossible de changer les permissions du fichier '%s'"
 
-#: ../libsvn_subr/io.c:1733
+#: ../libsvn_subr/io.c:1443
 #, c-format
 msgid "Can't set file '%s' read-only"
 msgstr "Impossible de mettre le fichier '%s' en lecture seule"
 
-#: ../libsvn_subr/io.c:1765
+#: ../libsvn_subr/io.c:1475
 #, c-format
 msgid "Can't set file '%s' read-write"
 msgstr "Impossible de mettre le fichier '%s' en lecture-écriture"
 
-#: ../libsvn_subr/io.c:1809
+#: ../libsvn_subr/io.c:1519
 #, c-format
 msgid "Error getting UID of process"
 msgstr "Erreur à l'obtention du UID du processus"
 
-#: ../libsvn_subr/io.c:1906
+#: ../libsvn_subr/io.c:1600
 #, c-format
 msgid "Can't get shared lock on file '%s'"
 msgstr "Impossible d'obtenir le verrou partagé sur le fichier '%s'"
 
-#: ../libsvn_subr/io.c:1940
+#: ../libsvn_subr/io.c:1634
 #, c-format
 msgid "Can't flush file '%s'"
 msgstr "Impossible de vidanger (flush) le fichier '%s'"
 
-#: ../libsvn_subr/io.c:1941
+#: ../libsvn_subr/io.c:1635
 #, c-format
 msgid "Can't flush stream"
 msgstr "Impossible de vidanger (flush) le flux"
 
-#: ../libsvn_subr/io.c:1953 ../libsvn_subr/io.c:1970
+#: ../libsvn_subr/io.c:1647 ../libsvn_subr/io.c:1664
 #, c-format
 msgid "Can't flush file to disk"
 msgstr "Impossible de vidanger (flush) le fichier sur disque"
 
-#: ../libsvn_subr/io.c:2062 ../libsvn_subr/prompt.c:97 ../svnserve/main.c:592
+#: ../libsvn_subr/io.c:1756 ../libsvn_subr/prompt.c:97 ../svnserve/main.c:592
 #, c-format
 msgid "Can't open stdin"
 msgstr "Impossible d'ouvrir l'entrée standard (stdin)"
 
-#: ../libsvn_subr/io.c:2082
+#: ../libsvn_subr/io.c:1776
 msgid "Reading from stdin is disallowed"
 msgstr "Lire à partir de l'entrée standard n'est pas permis"
 
-#: ../libsvn_subr/io.c:2153
+#: ../libsvn_subr/io.c:1847
 #, c-format
 msgid "Can't remove file '%s'"
 msgstr "Impossible de supprimer le fichier '%s'"
 
-#: ../libsvn_subr/io.c:2242
+#: ../libsvn_subr/io.c:1936
 #, c-format
 msgid "Can't remove '%s'"
 msgstr "Impossible de supprimer '%s'"
 
-#: ../libsvn_subr/io.c:2407
+#: ../libsvn_subr/io.c:2101
 #, c-format
 msgid "Can't create process '%s' attributes"
 msgstr "Impossible de créer les attributs du processus '%s'"
 
-#: ../libsvn_subr/io.c:2413
+#: ../libsvn_subr/io.c:2107
 #, c-format
 msgid "Can't set process '%s' cmdtype"
 msgstr ""
 "Impossible de définir le type de commande (cmdtype) du processus '%s'"
 
-#: ../libsvn_subr/io.c:2425
+#: ../libsvn_subr/io.c:2119
 #, c-format
 msgid "Can't set process '%s' directory"
 msgstr "Impossible de définir le répertoire du processus '%s'"
 
-#: ../libsvn_subr/io.c:2438
+#: ../libsvn_subr/io.c:2132
 #, c-format
 msgid "Can't set process '%s' child input"
 msgstr "Impossible de définir l'entrée (input) du processus fils '%s'"
 
-#: ../libsvn_subr/io.c:2445
+#: ../libsvn_subr/io.c:2139
 #, c-format
 msgid "Can't set process '%s' child outfile"
 msgstr "Impossible de définir la sortie (outfile) du processus fils '%s'"
 
-#: ../libsvn_subr/io.c:2452
+#: ../libsvn_subr/io.c:2146
 #, c-format
 msgid "Can't set process '%s' child errfile"
 msgstr "Impossible de définir l'erreur (errfile) du processus fils '%s'"
 
-#: ../libsvn_subr/io.c:2459
+#: ../libsvn_subr/io.c:2153
 #, c-format
 msgid "Can't set process '%s' child errfile for error handler"
 msgstr ""
 "Impossible de définir l'erreur (errfile) pour gestion d'erreur du processus "
 "fils '%s'"
 
-#: ../libsvn_subr/io.c:2465
+#: ../libsvn_subr/io.c:2159
 #, c-format
 msgid "Can't set process '%s' error handler"
 msgstr "Impossible de définir la gestion d'erreur du processus '%s'"
 
-#: ../libsvn_subr/io.c:2487
+#: ../libsvn_subr/io.c:2181
 #, c-format
 msgid "Can't start process '%s'"
 msgstr "Impossible de démarrer le processus '%s'"
 
-#: ../libsvn_subr/io.c:2511
+#: ../libsvn_subr/io.c:2205
 #, c-format
 msgid "Error waiting for process '%s'"
 msgstr "Erreur à l'attente du processus '%s'"
 
-#: ../libsvn_subr/io.c:2519
+#: ../libsvn_subr/io.c:2213
 #, c-format
 msgid "Process '%s' failed (exitwhy %d)"
 msgstr "Échec du processus '%s' (sortie car %d)"
 
-#: ../libsvn_subr/io.c:2526
+#: ../libsvn_subr/io.c:2220
 #, c-format
 msgid "Process '%s' returned error exitcode %d"
 msgstr "Le processus '%s' a retourné code de sortie en erreur %d"
 
-#: ../libsvn_subr/io.c:2632
+#: ../libsvn_subr/io.c:2326
 #, c-format
 msgid "'%s' returned %d"
 msgstr "'%s' a retourné %d"
 
-#: ../libsvn_subr/io.c:2753
+#: ../libsvn_subr/io.c:2447
 #, c-format
 msgid ""
 "Error running '%s':  exitcode was %d, args were:\n"
@@ -5708,131 +5708,131 @@
 "%s\n"
 "%s"
 
-#: ../libsvn_subr/io.c:2890
+#: ../libsvn_subr/io.c:2584
 #, c-format
 msgid "Can't detect MIME type of non-file '%s'"
 msgstr "Impossible de détecter le type MIME de l'objet '%s' (pas un fichier)"
 
-#: ../libsvn_subr/io.c:2967
+#: ../libsvn_subr/io.c:2661
 #, c-format
 msgid "Can't open file '%s'"
 msgstr "Impossible d'ouvrir le fichier '%s'"
 
-#: ../libsvn_subr/io.c:3003
+#: ../libsvn_subr/io.c:2697
 #, c-format
 msgid "Can't close file '%s'"
 msgstr "Le fichier '%s' ne peut être fermé"
 
-#: ../libsvn_subr/io.c:3004
+#: ../libsvn_subr/io.c:2698
 #, c-format
 msgid "Can't close stream"
 msgstr "Impossible de fermer le flux"
 
-#: ../libsvn_subr/io.c:3014 ../libsvn_subr/io.c:3038 ../libsvn_subr/io.c:3051
+#: ../libsvn_subr/io.c:2708 ../libsvn_subr/io.c:2732 ../libsvn_subr/io.c:2745
 #, c-format
 msgid "Can't read file '%s'"
 msgstr "Impossible de lire le fichier '%s'"
 
-#: ../libsvn_subr/io.c:3015 ../libsvn_subr/io.c:3039 ../libsvn_subr/io.c:3052
+#: ../libsvn_subr/io.c:2709 ../libsvn_subr/io.c:2733 ../libsvn_subr/io.c:2746
 #, c-format
 msgid "Can't read stream"
 msgstr "Impossible de lire le flux"
 
-#: ../libsvn_subr/io.c:3026
+#: ../libsvn_subr/io.c:2720
 #, c-format
 msgid "Can't get attribute information from file '%s'"
 msgstr "Impossible d'obtenir les informations d'attribut du fichier '%s'"
 
-#: ../libsvn_subr/io.c:3027
+#: ../libsvn_subr/io.c:2721
 #, c-format
 msgid "Can't get attribute information from stream"
 msgstr "Impossible d'obtenir les informations d'attribut du flux"
 
-#: ../libsvn_subr/io.c:3063
+#: ../libsvn_subr/io.c:2757
 #, c-format
 msgid "Can't set position pointer in file '%s'"
 msgstr "Impossible de fixer le pointeur de position dans le fichier '%s'"
 
-#: ../libsvn_subr/io.c:3064
+#: ../libsvn_subr/io.c:2758
 #, c-format
 msgid "Can't set position pointer in stream"
 msgstr "Impossible de fixer le pointeur de position dans le flux"
 
-#: ../libsvn_subr/io.c:3075 ../libsvn_subr/io.c:3109
+#: ../libsvn_subr/io.c:2769 ../libsvn_subr/io.c:2803
 #, c-format
 msgid "Can't write to file '%s'"
 msgstr "Impossible d'écrire dans le fichier '%s'"
 
-#: ../libsvn_subr/io.c:3076 ../libsvn_subr/io.c:3110
+#: ../libsvn_subr/io.c:2770 ../libsvn_subr/io.c:2804
 #, c-format
 msgid "Can't write to stream"
 msgstr "Impossible d'écrire dans le flux"
 
-#: ../libsvn_subr/io.c:3138
+#: ../libsvn_subr/io.c:2832
 #, c-format
 msgid "Can't truncate file '%s'"
 msgstr "Impossible de tronquer le fichier '%s'"
 
-#: ../libsvn_subr/io.c:3139
+#: ../libsvn_subr/io.c:2833
 #, c-format
 msgid "Can't truncate stream"
 msgstr "Impossible de tronquer le flux"
 
-#: ../libsvn_subr/io.c:3179
+#: ../libsvn_subr/io.c:2873
 #, c-format
 msgid "Can't read length line in file '%s'"
 msgstr "Impossible de lire la longueur de la ligne dans le fichier '%s'"
 
-#: ../libsvn_subr/io.c:3183
+#: ../libsvn_subr/io.c:2877
 msgid "Can't read length line in stream"
 msgstr "Impossible de lire la longueur de la ligne dans le flux"
 
-#: ../libsvn_subr/io.c:3237
+#: ../libsvn_subr/io.c:2931
 #, c-format
 msgid "Can't move '%s' to '%s'"
 msgstr "Impossible de déplacer '%s' vers '%s'"
 
-#: ../libsvn_subr/io.c:3318
+#: ../libsvn_subr/io.c:3012
 #, c-format
 msgid "Can't create directory '%s'"
 msgstr "Impossible de créer le répertoire '%s'"
 
-#: ../libsvn_subr/io.c:3329 ../libsvn_wc/copy.c:648
+#: ../libsvn_subr/io.c:3023 ../libsvn_wc/copy.c:648
 #, c-format
 msgid "Can't hide directory '%s'"
 msgstr "Impossible de cacher le répertoire '%s'"
 
-#: ../libsvn_subr/io.c:3389 ../libsvn_subr/io.c:3479
+#: ../libsvn_subr/io.c:3083 ../libsvn_subr/io.c:3173
 #, c-format
 msgid "Can't open directory '%s'"
 msgstr "Impossible d'ouvrir le répertoire '%s'"
 
-#: ../libsvn_subr/io.c:3407
+#: ../libsvn_subr/io.c:3101
 #, c-format
 msgid "Can't remove directory '%s'"
 msgstr "Impossible de supprimer le répertoire '%s'"
 
-#: ../libsvn_subr/io.c:3425
+#: ../libsvn_subr/io.c:3119
 #, c-format
 msgid "Can't read directory"
 msgstr "Impossible de lire le répertoire"
 
-#: ../libsvn_subr/io.c:3498
+#: ../libsvn_subr/io.c:3192
 #, c-format
 msgid "Can't read directory entry in '%s'"
 msgstr "Impossible de lire l'entrée de répertoire dans '%s'"
 
-#: ../libsvn_subr/io.c:3623
+#: ../libsvn_subr/io.c:3317
 #, c-format
 msgid "Can't check directory '%s'"
 msgstr "Impossible de vérifier le répertoire '%s'"
 
-#: ../libsvn_subr/io.c:3683
+#: ../libsvn_subr/io.c:3377
 #, c-format
 msgid "Reading '%s'"
 msgstr "Lecture de '%s'"
 
-#: ../libsvn_subr/io.c:3699
+#: ../libsvn_subr/io.c:3393
 #, c-format
 msgid "First line of '%s' contains non-digit"
 msgstr "La première ligne de '%s' contient des caractères non-numériques"
@@ -5908,19 +5908,19 @@
 msgid "Could not parse mergeinfo string '%s'"
 msgstr "Impossible d'analyse la chaîne 'mergeinfo' '%s'"
 
-#: ../libsvn_subr/mergeinfo.c:1844
+#: ../libsvn_subr/mergeinfo.c:1751
 msgid "NULL mergeinfo catalog\n"
 msgstr "catalogue d'informations de fusion (mergeinfo) NULL\n"
 
-#: ../libsvn_subr/mergeinfo.c:1849
+#: ../libsvn_subr/mergeinfo.c:1756
 msgid "empty mergeinfo catalog\n"
 msgstr "catalogue d'informations de fusion (mergeinfo) vide\n"
 
-#: ../libsvn_subr/mergeinfo.c:1882
+#: ../libsvn_subr/mergeinfo.c:1789
 msgid "NULL mergeinfo\n"
 msgstr "Information de fusion (mergeinfo) NULL\n"
 
-#: ../libsvn_subr/mergeinfo.c:1887
+#: ../libsvn_subr/mergeinfo.c:1794
 msgid "empty mergeinfo\n"
 msgstr "Information de fusion (mergeinfo) vide\n"
 
@@ -5971,17 +5971,17 @@
 msgid "'%s' is just a peg revision. Maybe try '%s@' instead?"
 msgstr "'%s' est juste une révision fixée. Essayer '%s@' à la place ?"
 
-#: ../libsvn_subr/opt.c:910
+#: ../libsvn_subr/opt.c:916
 #, c-format
 msgid "URL '%s' contains a '..' element"
 msgstr "L'URL '%s' contient un composant '..'"
 
-#: ../libsvn_subr/opt.c:943
+#: ../libsvn_subr/opt.c:949
 #, c-format
 msgid "Error resolving case of '%s'"
 msgstr "Erreur à la résolution de la casse de '%s'"
 
-#: ../libsvn_subr/opt.c:962
+#: ../libsvn_subr/opt.c:968
 #, c-format
 msgid ""
 "%s, version %s\n"
@@ -6219,7 +6219,7 @@
 msgid "Expected SQLite database not found: %s"
 msgstr "Base de données SQLite non trouvée : %s"
 
-#: ../libsvn_subr/subst.c:1426 ../libsvn_wc/props.c:2375
+#: ../libsvn_subr/subst.c:1426 ../libsvn_wc/props.c:2367
 #, c-format
 msgid "File '%s' has inconsistent newlines"
 msgstr "Le fichier '%s' a des sauts de ligne incohérents"
@@ -6922,7 +6922,7 @@
 msgid "Error writing log for '%s'"
 msgstr "Erreur à l'écriture dans le journal pour '%s'"
 
-#: ../libsvn_wc/log.c:2539
+#: ../libsvn_wc/log.c:2530
 #, c-format
 msgid "'%s' is not a working copy directory"
 msgstr "'%s' n'est pas un répertoire d'une copie de travail"
@@ -6942,17 +6942,17 @@
 msgid "Missing end of line in wcprops file for '%s'"
 msgstr "Fin de ligne manquante dans le fichier wcprops pour '%s'"
 
-#: ../libsvn_wc/props.c:1274
+#: ../libsvn_wc/props.c:1273
 msgid "Conflict callback violated API: returned no results."
 msgstr ""
 "L'appel pour gestion de conflit viole l'API : aucun résultat retourné."
 
-#: ../libsvn_wc/props.c:1314
+#: ../libsvn_wc/props.c:1313
 msgid "Conflict callback violated API: returned no merged file."
 msgstr ""
 "L'appel de gestion de conflit viole l'API : retourne \"pas de fusion\"."
 
-#: ../libsvn_wc/props.c:1409
+#: ../libsvn_wc/props.c:1407
 #, c-format
 msgid ""
 "Trying to add new property '%s' with value '%s',\n"
@@ -6961,7 +6961,7 @@
 "Tentative de d'ajout d'une propriété '%s' de valeur '%s',\n"
 "mais elle existe déjà avec la valeur '%s'."
 
-#: ../libsvn_wc/props.c:1425
+#: ../libsvn_wc/props.c:1422
 #, c-format
 msgid ""
 "Trying to create property '%s' with value '%s',\n"
@@ -6970,7 +6970,7 @@
 "Tentative de création de la propriété '%s' de valeur '%s',\n"
 "mais elle a été locallement effacée."
 
-#: ../libsvn_wc/props.c:1500
+#: ../libsvn_wc/props.c:1496
 #, c-format
 msgid ""
 "Trying to delete property '%s' with value '%s'\n"
@@ -6979,7 +6979,7 @@
 "Tentative d'effacement la propriété '%s' de valeur '%s',\n"
 "mais valeur déjà modifiée de '%s' en '%s'."
 
-#: ../libsvn_wc/props.c:1522
+#: ../libsvn_wc/props.c:1517
 #, c-format
 msgid ""
 "Trying to delete property '%s' with value '%s'\n"
@@ -6988,7 +6988,7 @@
 "Tentative d'effacement de la propriété '%s' de valeur '%s',\n"
 "mais elle existe déjà avec la valeur '%s'."
 
-#: ../libsvn_wc/props.c:1596 ../libsvn_wc/props.c:1711
+#: ../libsvn_wc/props.c:1590 ../libsvn_wc/props.c:1704
 #, c-format
 msgid ""
 "Trying to change property '%s' from '%s' to '%s',\n"
@@ -6997,7 +6997,7 @@
 "Tentative de modification de la propriété '%s' de '%s' en '%s',\n"
 "mais elle a été localement effacée."
 
-#: ../libsvn_wc/props.c:1690
+#: ../libsvn_wc/props.c:1683
 #, c-format
 msgid ""
 "Trying to change property '%s' from '%s' to '%s',\n"
@@ -7006,7 +7006,7 @@
 "Essai de modifier la propriété '%s' de '%s' à '%s',\n"
 "mais elle existe déjà avec la valeur '%s'."
 
-#: ../libsvn_wc/props.c:1696
+#: ../libsvn_wc/props.c:1689
 #, c-format
 msgid ""
 "Trying to change property '%s' from '%s' to '%s',\n"
@@ -7015,7 +7015,7 @@
 "Tentative de modifier la propriété '%s' de '%s' en '%s',\n"
 "mais elle a déjà été localement modifiée de '%s' en '%s'."
 
-#: ../libsvn_wc/props.c:1704
+#: ../libsvn_wc/props.c:1697
 #, c-format
 msgid ""
 "Trying to change property '%s' from '%s' to '%s',\n"
@@ -7024,7 +7024,7 @@
 "Tentative de modification de la propriété '%s' de '%s' à '%s',\n"
 "mais elle a été ajoutée localement avec la valeur '%s'."
 
-#: ../libsvn_wc/props.c:1717
+#: ../libsvn_wc/props.c:1710
 #, c-format
 msgid ""
 "Trying to change property '%s' from '%s' to '%s',\n"
@@ -7033,32 +7033,32 @@
 "Tentative de modificat de la propriété '%s' de '%s' en '%s',\n"
 "mais elle n'existe pas."
 
-#: ../libsvn_wc/props.c:2087 ../libsvn_wc/props.c:2114
-#: ../libsvn_wc/props.c:2241 ../libsvn_wc/props.c:2461
+#: ../libsvn_wc/props.c:2079 ../libsvn_wc/props.c:2106
+#: ../libsvn_wc/props.c:2233 ../libsvn_wc/props.c:2453
 msgid "Failed to load properties from disk"
 msgstr "Échec au chargement des propriétés à partir du disque"
 
-#: ../libsvn_wc/props.c:2236 ../libsvn_wc/props.c:2405
+#: ../libsvn_wc/props.c:2228 ../libsvn_wc/props.c:2397
 #, c-format
 msgid "Property '%s' is an entry property"
 msgstr "La propriété '%s' n'est pas une propriété d'entrée"
 
-#: ../libsvn_wc/props.c:2280
+#: ../libsvn_wc/props.c:2272
 #, c-format
 msgid "Cannot set '%s' on a directory ('%s')"
 msgstr "Définition de '%s' sur un répertoire ('%s') impossible"
 
-#: ../libsvn_wc/props.c:2288
+#: ../libsvn_wc/props.c:2280
 #, c-format
 msgid "Cannot set '%s' on a file ('%s')"
 msgstr "Définition de '%s' sur un fichier ('%s') impossible"
 
-#: ../libsvn_wc/props.c:2294
+#: ../libsvn_wc/props.c:2286
 #, c-format
 msgid "'%s' is not a file or directory"
 msgstr "'%s' n'est ni un fichier ni un répertoire"
 
-#: ../libsvn_wc/props.c:2356
+#: ../libsvn_wc/props.c:2348
 #, c-format
 msgid "File '%s' has binary mime type property"
 msgstr "Le fichier '%s' a un type mime binaire"
@@ -7068,17 +7068,17 @@
 msgid "Unrecognized line ending style '%s' for '%s'"
 msgstr ""
 
-#: ../libsvn_wc/props.c:2960 ../libsvn_wc/props.c:3036
+#: ../libsvn_wc/props.c:2951 ../libsvn_wc/props.c:3027
 #, c-format
 msgid "Error parsing %s property on '%s': '%s'"
 msgstr "Erreur d'analyse de la propriété %s sur '%s' : '%s'"
 
-#: ../libsvn_wc/props.c:3005
+#: ../libsvn_wc/props.c:2996
 #, c-format
 msgid "Can't split line into components: '%s'"
 msgstr "Impossible de découper la ligne en composants : '%s'"
 
-#: ../libsvn_wc/props.c:3061
+#: ../libsvn_wc/props.c:3052
 #, c-format
 msgid ""
 "Invalid %s property on '%s': cannot use two absolute URLs ('%s' and '%s') in "
@@ -7089,7 +7089,7 @@
 "('%s' et '%s') comme référence externe ; l'une doit être un chemin vers "
 "lequel une URL relative ou absolue va être extraite"
 
-#: ../libsvn_wc/props.c:3070 ../libsvn_wc/props.c:3078
+#: ../libsvn_wc/props.c:3061 ../libsvn_wc/props.c:3069
 #, c-format
 msgid ""
 "Invalid %s property on '%s': cannot use a URL '%s' as the target directory "
@@ -7098,7 +7098,7 @@
 "Propriété %s invalide sur '%s' : on ne peut utiliser une URL '%s' comme "
 "répertoire destination d'une référence externe"
 
-#: ../libsvn_wc/props.c:3116
+#: ../libsvn_wc/props.c:3107
 #, c-format
 msgid ""
 "Invalid %s property on '%s': target '%s' is an absolute path or involves '..'"
@@ -7345,7 +7345,7 @@
 msgid "Skipping binary file: '%s'\n"
 msgstr "Omission du fichier binaire : '%s'\n"
 
-#: ../svn/changelist-cmd.c:57 ../svn/main.c:1549
+#: ../svn/changelist-cmd.c:57 ../svn/main.c:1525
 msgid "Changelist names must not be empty"
 msgstr "La liste de changements ne doit pas être vide"
 
@@ -7648,7 +7648,7 @@
 msgid "Path '%s' not relative to base URLs"
 msgstr "Le chemin '%s' n'est pas relatif à l'URL de base"
 
-#: ../svn/export-cmd.c:95
+#: ../svn/export-cmd.c:88
 msgid ""
 "Destination directory exists; please remove the directory or use --force to "
 "overwrite"
@@ -9243,7 +9243,7 @@
 "                             'theirs-conflict', 'mine-full', 'theirs-full')"
 msgstr ""
 "précise l'action de la résolution automatique de conflit\n"
-"    ('base', 'working', 'mine-conflict',\n"
+"    ('postpone', 'base', 'mine-conflict',\n"
 "     'theirs-conflict', 'mine-full', 'theirs-full')"
 
 #: ../svn/main.c:802
@@ -9557,7 +9557,7 @@
 msgid "Argument to --limit must be positive"
 msgstr "L'argument de --limit doit être positif"
 
-#: ../svn/main.c:1224 ../svn/main.c:1493
+#: ../svn/main.c:1224 ../svn/main.c:1469
 msgid "Can't specify -c with --old"
 msgstr "Option -c incompatible avec --old"
 
@@ -9566,26 +9566,26 @@
 msgid "Negative number in range (%s) not supported with -c"
 msgstr ""
 
-#: ../svn/main.c:1258
+#: ../svn/main.c:1243
 #, c-format
 msgid "Non-numeric change argument (%s) given to -c"
 msgstr "Argument non numérique (%s) donné à l'option -c"
 
-#: ../svn/main.c:1266
+#: ../svn/main.c:1251
 msgid "There is no change 0"
 msgstr "Il n'y a pas de changement (option -c) 0"
 
-#: ../svn/main.c:1311 ../svnadmin/main.c:1537
+#: ../svn/main.c:1287 ../svnadmin/main.c:1537
 #, c-format
 msgid "Syntax error in revision argument '%s'"
 msgstr "Erreur de syntaxe à l'argument de révision '%s'"
 
-#: ../svn/main.c:1384 ../svn/main.c:1403
+#: ../svn/main.c:1360 ../svn/main.c:1379
 #, c-format
 msgid "Error converting depth from locale to UTF-8"
 msgstr "Erreur en convertissant la profondeur de la 'locale' vers UTF8"
 
-#: ../svn/main.c:1392
+#: ../svn/main.c:1368
 #, c-format
 msgid ""
 "'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'"
@@ -9593,7 +9593,7 @@
 "'%s' n'est pas un profondeur valide ; essayer 'empty' (vide), 'files' "
 "(fichiers), 'immediates' (immédiat) ou 'infinity' (infini)"
 
-#: ../svn/main.c:1411
+#: ../svn/main.c:1387
 #, c-format
 msgid ""
 "'%s' is not a valid depth; try 'exclude', 'empty', 'files', 'immediates', or "
@@ -9602,34 +9602,34 @@
 "'%s' n'est pas un profondeur valide ; essayer 'exclude' (exclure), 'empty' "
 "(vide), 'files' (fichiers), 'immediates' (immédiat) ou 'infinity' (infini)"
 
-#: ../svn/main.c:1530
+#: ../svn/main.c:1506
 #, c-format
 msgid "Syntax error in native-eol argument '%s'"
 msgstr ""
 "Erreur de syntaxe à l'argument de fin de ligne native (native-eol) '%s'"
 
-#: ../svn/main.c:1585
+#: ../svn/main.c:1561
 #, c-format
 msgid "'%s' is not a valid --accept value"
 msgstr "'%s' n'est pas valide pour --accept"
 
-#: ../svn/main.c:1594
+#: ../svn/main.c:1570
 #, c-format
 msgid "'%s' is not a valid --show-revs value"
 msgstr "'%s' n'est pas valide pour --show-revs"
 
-#: ../svn/main.c:1656 ../svndumpfilter/main.c:1325 ../svnlook/main.c:2296
+#: ../svn/main.c:1632 ../svndumpfilter/main.c:1325 ../svnlook/main.c:2296
 #, c-format
 msgid "Subcommand argument required\n"
 msgstr "Argument de la sous-commande attendu\n"
 
-#: ../svn/main.c:1675 ../svnadmin/main.c:1672 ../svndumpfilter/main.c:1344
+#: ../svn/main.c:1651 ../svnadmin/main.c:1672 ../svndumpfilter/main.c:1344
 #: ../svnlook/main.c:2315
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "Commande inconnue : '%s'\n"
 
-#: ../svn/main.c:1709
+#: ../svn/main.c:1685
 #, c-format
 msgid ""
 "Subcommand '%s' doesn't accept option '%s'\n"
@@ -9638,7 +9638,7 @@
 "La sous-commande '%s' n'accepte pas l'option '%s'\n"
 "Entrer 'svn help %s' pour l'aide.\n"
 
-#: ../svn/main.c:1724
+#: ../svn/main.c:1700
 msgid ""
 "Multiple revision arguments encountered; can't specify -c twice, or both -c "
 "and -r"
@@ -9646,38 +9646,38 @@
 "Arguments de révision multiples : ne pas répéter -c, ou utiliser à la fois -"
 "c et -r"
 
-#: ../svn/main.c:1738
+#: ../svn/main.c:1714
 msgid "-r and -c can't be used with --reintegrate"
 msgstr "-r et -c ne peuvent être utilisées avec --reintegrate"
 
-#: ../svn/main.c:1747
+#: ../svn/main.c:1723
 msgid "--depth and --set-depth are mutually exclusive"
 msgstr "--depth et --set-depth sont mutuellement exclusives"
 
-#: ../svn/main.c:1757
+#: ../svn/main.c:1733
 msgid "--with-all-revprops and --with-no-revprops are mutually exclusive"
 msgstr ""
 "--with-all-revprops et --with-no-revprops sont mutuellement exclusives"
 
-#: ../svn/main.c:1767
+#: ../svn/main.c:1743
 msgid "--with-revprop and --with-no-revprops are mutually exclusive"
 msgstr "--with-revprop et --with-no-revprops sont mutuellement exclusives"
 
-#: ../svn/main.c:1776 ../svnsync/main.c:2250
+#: ../svn/main.c:1752 ../svnsync/main.c:2250
 msgid "--trust-server-cert requires --non-interactive"
 msgstr "--trust-server-cert requiert --non-interactive"
 
-#: ../svn/main.c:1826
+#: ../svn/main.c:1802
 msgid "Log message file is a versioned file; use '--force-log' to override"
 msgstr ""
 "Le fichier de l'entrée du journal est versionné; forcer avec '--force-log'"
 
-#: ../svn/main.c:1833
+#: ../svn/main.c:1809
 msgid "Lock comment file is a versioned file; use '--force-log' to override"
 msgstr ""
 "Le fichier de commentaire du verrou est versionné ; forcer avec '--force-log'"
 
-#: ../svn/main.c:1853
+#: ../svn/main.c:1829
 msgid ""
 "The log message is a pathname (was -F intended?); use '--force-log' to "
 "override"
@@ -9685,7 +9685,7 @@
 "Le message de propagation donné est un chemin (-F était voulu ?) ; forcer "
 "avec '--force-log'"
 
-#: ../svn/main.c:1860
+#: ../svn/main.c:1836
 msgid ""
 "The lock comment is a pathname (was -F intended?); use '--force-log' to "
 "override"
@@ -9693,41 +9693,41 @@
 "Le commentaire du verrou est un chemin de fichier (-F était voulu ?) ; "
 "forcer avec '--force-log'"
 
-#: ../svn/main.c:1871
+#: ../svn/main.c:1847
 msgid "--relocate and --depth are mutually exclusive"
 msgstr "--relocate et --depth sont mutuellement exclusives"
 
-#: ../svn/main.c:1957
+#: ../svn/main.c:1933
 msgid "Unrecognized file in argument of --config-option"
 msgstr "Fichier inconnu en argument de --config-option"
 
-#: ../svn/main.c:1977
+#: ../svn/main.c:1953
 msgid "--auto-props and --no-auto-props are mutually exclusive"
 msgstr "--auto-props et --no-auto-props sont mutuellement exclusives"
 
-#: ../svn/main.c:1991
+#: ../svn/main.c:1967
 msgid "--reintegrate cannot be used with --ignore-ancestry or --record-only"
 msgstr ""
 "--reintegrate ne peut être utilisé avec --ignore-ancestry ou --record-only"
 
-#: ../svn/main.c:1999
+#: ../svn/main.c:1975
 msgid "--reintegrate cannot be used with --ignore-ancestry"
 msgstr "--reintegrate ne peut être utilisé avec --ignore-ancestry"
 
-#: ../svn/main.c:2007
+#: ../svn/main.c:1983
 msgid "--reintegrate cannot be used with --record-only"
 msgstr "--reintegrate ne peut être utilise avec --record-only"
 
-#: ../svn/main.c:2121 ../svn/main.c:2127
+#: ../svn/main.c:2097 ../svn/main.c:2103
 #, c-format
 msgid "--accept=%s incompatible with --non-interactive"
 msgstr "--accept=%s incompatible avec --non-interactive"
 
-#: ../svn/main.c:2154
+#: ../svn/main.c:2130
 msgid "Try 'svn help' for more info"
 msgstr "Essayer 'svn help' pour plus d'information."
 
-#: ../svn/main.c:2164
+#: ../svn/main.c:2140
 msgid ""
 "svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
 "details)\n"
@@ -9755,11 +9755,11 @@
 msgstr ""
 "Une fusion à partir de sources locales nécessite une révision explicite"
 
-#: ../svn/merge-cmd.c:273
+#: ../svn/merge-cmd.c:292
 msgid "--depth cannot be used with --reintegrate"
 msgstr "--deth ne peut être utilisé avec --reintegrate"
 
-#: ../svn/merge-cmd.c:278
+#: ../svn/merge-cmd.c:297
 msgid "--force cannot be used with --reintegrate"
 msgstr "--force ne peut être utilisé avec --reintegrate"
 
@@ -10274,12 +10274,12 @@
 msgid "Can't change working directory to '%s'"
 msgstr "Répertoire '%s' inaccessible (pas de 'cd')"
 
-#: ../svn/util.c:186 ../svn/util.c:510
+#: ../svn/util.c:186 ../svn/util.c:508
 #, c-format
 msgid "Can't restore working directory"
 msgstr "Le répertoire de travail courant ne peut être rétabli"
 
-#: ../svn/util.c:193 ../svn/util.c:446
+#: ../svn/util.c:193 ../svn/util.c:436
 #, c-format
 msgid "system('%s') returned %d"
 msgstr "system('%s') a retourné %d"
@@ -10310,32 +10310,32 @@
 msgid "Can't write to '%s'"
 msgstr "'%s' n'est pas accessible en écriture"
 
-#: ../svn/util.c:479
+#: ../svn/util.c:477
 msgid "Error normalizing edited contents to internal format"
 msgstr "Erreur de normalisation du contenu édité vers le format interne"
 
-#: ../svn/util.c:552
+#: ../svn/util.c:550
 msgid "Log message contains a zero byte"
 msgstr "L'entrée du journal contient un octet 0"
 
-#: ../svn/util.c:615
+#: ../svn/util.c:613
 msgid "Your commit message was left in a temporary file:"
 msgstr "Le message de propagation a été laissé dans un fichier temporaire :"
 
-#: ../svn/util.c:667
+#: ../svn/util.c:665
 msgid "--This line, and those below, will be ignored--"
 msgstr "--Cette ligne, et les suivantes ci-dessous, seront ignorées--"
 
-#: ../svn/util.c:701
+#: ../svn/util.c:699
 msgid "Error normalizing log message to internal format"
 msgstr ""
 "Erreur de normalisation de l'entrée du journal vers le format interne"
 
-#: ../svn/util.c:788
+#: ../svn/util.c:786
 msgid "Cannot invoke editor to get log message when non-interactive"
 msgstr "L'éditeur ne peut être invoqué en mode non interactif"
 
-#: ../svn/util.c:801
+#: ../svn/util.c:799
 msgid ""
 "Could not use external editor to fetch log message; consider setting the "
 "$SVN_EDITOR environment variable or using the --message (-m) or --file (-F) "
@@ -10344,7 +10344,7 @@
 "Pas d'éditeur externe pour définir l'entrée du journal; définir la variable "
 "d'environnement SVN_EDITOR ou utiliser --message (-m) ou --file (-F)"
 
-#: ../svn/util.c:837
+#: ../svn/util.c:835
 msgid ""
 "\n"
 "Log message unchanged or not specified\n"
@@ -10354,39 +10354,39 @@
 "Entrée du journal non modifié ou non précisé\n"
 "(a)nnule, (c)ontinue, (e)dite\n"
 
-#: ../svn/util.c:890
+#: ../svn/util.c:888
 msgid "Use --force to override this restriction"
 msgstr "Utiliser --force pour passer cette restriction"
 
-#: ../svn/util.c:1048 ../svn/util.c:1081
+#: ../svn/util.c:1046 ../svn/util.c:1079
 msgid "none"
 msgstr "aucun"
 
-#: ../svn/util.c:1050
+#: ../svn/util.c:1048
 msgid "dir"
 msgstr "rép"
 
-#: ../svn/util.c:1052
+#: ../svn/util.c:1050
 msgid "file"
 msgstr "fichier"
 
-#: ../svn/util.c:1083
+#: ../svn/util.c:1081
 msgid "update"
 msgstr "mis à jour"
 
-#: ../svn/util.c:1085
+#: ../svn/util.c:1083
 msgid "switch"
 msgstr "ré-aiguille"
 
-#: ../svn/util.c:1087
+#: ../svn/util.c:1085
 msgid "merge"
 msgstr "fusion"
 
-#: ../svn/util.c:1089
+#: ../svn/util.c:1087
 msgid "unknown operation"
 msgstr "opération inconnue"
 
-#: ../svn/util.c:1191
+#: ../svn/util.c:1189
 msgid "(invalid date)"
 msgstr "(date invalide)"
 
@@ -11878,20 +11878,20 @@
 msgid "Can't create thread"
 msgstr "Impossible de créer une thread"
 
-#: ../svnserve/serve.c:1744
+#: ../svnserve/serve.c:1736
 msgid "Path is not a string"
 msgstr "Le chemin n'est pas une chaîne de caractère"
 
-#: ../svnserve/serve.c:1900
+#: ../svnserve/serve.c:1892
 msgid "Log revprop entry not a string"
 msgstr "L'entrée 'log' n'est pas une chaîne de caractères"
 
-#: ../svnserve/serve.c:1907
+#: ../svnserve/serve.c:1899
 #, c-format
 msgid "Unknown revprop word '%s' in log command"
 msgstr "Mot de propriété de révision '%s' inconnu dans une commande de log"
 
-#: ../svnserve/serve.c:1923
+#: ../svnserve/serve.c:1915
 msgid "Log path entry not a string"
 msgstr "L'entrée 'path' n'est pas une chaîne de caractères"
 
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/sudo.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/sudo.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/sudo.po	2012-01-02 17:27:49.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/sudo.po	2012-02-23 06:32:14.000000000 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: sudo\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-09-27 14:07-0400\n"
-"PO-Revision-Date: 2011-12-18 16:04+0000\n"
+"PO-Revision-Date: 2012-02-12 18:45+0000\n"
 "Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-30 01:43+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 06:53+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/error.c:82 src/error.c:86
 msgid ": "
@@ -733,4 +733,4 @@
 
 #: compat/strsignal.c:47
 msgid "Unknown signal"
-msgstr ""
+msgstr "Signal inconnu"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/swift.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/swift.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/swift.po	1970-01-01 00:00:00.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/swift.po	2012-02-23 06:32:14.000000000 +0000
@@ -0,0 +1,1029 @@
+# French translation for swift
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the swift package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: swift\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-26 23:59+0000\n"
+"PO-Revision-Date: 2012-02-01 17:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-02-22 06:55+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+
+#: swift/account/auditor.py:52 swift/account/auditor.py:75
+#, python-format
+msgid ""
+"Since %(time)s: Account audits: %(passed)s passed audit, %(failed)s failed "
+"audit"
+msgstr ""
+
+#: swift/account/auditor.py:100 swift/container/auditor.py:103
+#, python-format
+msgid "Audit passed for %s"
+msgstr ""
+
+#: swift/account/auditor.py:103
+#, python-format
+msgid "ERROR Could not get account info %s"
+msgstr "ERREUR Impossible d'obtenir les informations du compte %s"
+
+#: swift/account/reaper.py:80 swift/container/updater.py:64
+#, python-format
+msgid "Loading account ring from %s"
+msgstr ""
+
+#: swift/account/reaper.py:88 swift/obj/updater.py:57
+#, python-format
+msgid "Loading container ring from %s"
+msgstr ""
+
+#: swift/account/reaper.py:96
+#, python-format
+msgid "Loading object ring from %s"
+msgstr ""
+
+#: swift/account/reaper.py:106
+msgid "Daemon started."
+msgstr "Le démon a démarré."
+
+#: swift/account/reaper.py:122
+#, python-format
+msgid "Begin devices pass: %s"
+msgstr ""
+
+#: swift/account/reaper.py:128 swift/common/utils.py:805
+#: swift/obj/updater.py:74 swift/obj/updater.py:113
+#, python-format
+msgid "Skipping %s as it is not mounted"
+msgstr ""
+
+#: swift/account/reaper.py:132
+#, python-format
+msgid "Devices pass completed: %.02fs"
+msgstr ""
+
+#: swift/account/reaper.py:215
+#, python-format
+msgid "Beginning pass on account %s"
+msgstr ""
+
+#: swift/account/reaper.py:238
+#, python-format
+msgid "Exception with containers for account %s"
+msgstr ""
+
+#: swift/account/reaper.py:243
+#, python-format
+msgid "Exception with account %s"
+msgstr ""
+
+#: swift/account/reaper.py:244
+#, python-format
+msgid "Incomplete pass on account %s"
+msgstr ""
+
+#: swift/account/reaper.py:246
+#, python-format
+msgid ", %s containers deleted"
+msgstr ""
+
+#: swift/account/reaper.py:248
+#, python-format
+msgid ", %s objects deleted"
+msgstr ", %s objets supprimés"
+
+#: swift/account/reaper.py:250
+#, python-format
+msgid ", %s containers remaining"
+msgstr ""
+
+#: swift/account/reaper.py:253
+#, python-format
+msgid ", %s objects remaining"
+msgstr ""
+
+#: swift/account/reaper.py:255
+#, python-format
+msgid ", %s containers possibly remaining"
+msgstr ""
+
+#: swift/account/reaper.py:258
+#, python-format
+msgid ", %s objects possibly remaining"
+msgstr ""
+
+#: swift/account/reaper.py:261
+msgid ", return codes: "
+msgstr ""
+
+#: swift/account/reaper.py:265
+#, python-format
+msgid ", elapsed: %.02fs"
+msgstr ""
+
+#: swift/account/reaper.py:320 swift/account/reaper.py:355
+#: swift/account/reaper.py:406 swift/container/updater.py:277
+#, python-format
+msgid "Exception with %(ip)s:%(port)s/%(device)s"
+msgstr ""
+
+#: swift/account/reaper.py:333
+#, python-format
+msgid ""
+"Exception with objects for container %(container)s for account %(account)s"
+msgstr ""
+
+#: swift/account/server.py:309 swift/container/server.py:397
+#: swift/obj/server.py:597
+#, python-format
+msgid "ERROR __call__ error with %(method)s %(path)s "
+msgstr ""
+
+#: swift/auth/server.py:96 swift/common/middleware/swauth.py:94
+msgid "No super_admin_key set in conf file! Exiting."
+msgstr ""
+
+#: swift/auth/server.py:152
+#, python-format
+msgid ""
+"\n"
+"THERE ARE ACCOUNTS IN YOUR auth.db THAT DO NOT BEGIN WITH YOUR NEW RESELLER\n"
+"PREFIX OF \"%(reseller)s\".\n"
+"YOU HAVE A FEW OPTIONS:\n"
+"    1. RUN \"swift-auth-update-reseller-prefixes %(db_file)s "
+"%(reseller)s\",\n"
+"       \"swift-init auth-server restart\", AND\n"
+"       \"swift-auth-recreate-accounts -K ...\" TO CREATE FRESH ACCOUNTS.\n"
+"    OR\n"
+"    2. REMOVE %(db_file)s, RUN \"swift-init auth-server restart\", AND RUN\n"
+"       \"swift-auth-add-user ...\" TO CREATE BRAND NEW ACCOUNTS THAT WAY.\n"
+"    OR\n"
+"    3. ADD \"reseller_prefix = %(previous)s\" (WITHOUT THE QUOTES) TO YOUR\n"
+"       proxy-server.conf IN THE [filter:auth] SECTION AND TO YOUR\n"
+"       auth-server.conf IN THE [app:auth-server] SECTION AND RUN\n"
+"       \"swift-init proxy-server restart\" AND \"swift-init auth-server "
+"restart\"\n"
+"       TO REVERT BACK TO YOUR PREVIOUS RESELLER PREFIX.\n"
+"\n"
+"    %(note)s\n"
+"                    "
+msgstr ""
+
+#: swift/auth/server.py:173
+msgid ""
+"\n"
+"    SINCE YOUR PREVIOUS RESELLER PREFIX WAS AN EMPTY STRING, IT IS NOT\n"
+"    RECOMMENDED TO PERFORM OPTION 3 AS THAT WOULD MAKE SUPPORTING MULTIPLE\n"
+"    RESELLERS MORE DIFFICULT.\n"
+"                    "
+msgstr ""
+
+#: swift/auth/server.py:178
+msgid "CRITICAL: "
+msgstr "CRITIQUE: "
+
+#: swift/auth/server.py:213
+#, python-format
+msgid "ERROR attempting to create account %(url)s: %(status)s %(reason)s"
+msgstr ""
+"ERREUR lors de la tentative de création de compte %(url)s: %(status)s "
+"%(reason)s"
+
+#: swift/auth/server.py:346
+#, python-format
+msgid ""
+"ALREADY EXISTS create_user(%(account)s, %(user)s, _, %(admin)s, "
+"%(reseller_admin)s) [%(elapsed).02f]"
+msgstr ""
+
+#: swift/auth/server.py:364
+#, python-format
+msgid ""
+"FAILED create_user(%(account)s, %(user)s, _, %(admin)s, %(reseller_admin)s) "
+"[%(elapsed).02f]"
+msgstr ""
+
+#: swift/auth/server.py:381
+#, python-format
+msgid ""
+"SUCCESS create_user(%(account)s, %(user)s, _, %(admin)s, %(reseller_admin)s) "
+"= %(url)s [%(elapsed).02f]"
+msgstr ""
+
+#: swift/auth/server.py:656
+msgid "ERROR Unhandled exception in ReST request"
+msgstr ""
+
+#: swift/common/bench.py:85
+#, python-format
+msgid "%(complete)s %(title)s [%(fail)s failures], %(rate).01f/s"
+msgstr ""
+
+#: swift/common/bench.py:97
+msgid "CannotSendRequest.  Skipping..."
+msgstr ""
+
+#: swift/common/bufferedhttp.py:96
+#, python-format
+msgid ""
+"HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)"
+msgstr ""
+
+#: swift/common/db.py:299
+msgid "Broker error trying to rollback locked connection"
+msgstr ""
+
+#: swift/common/db.py:754 swift/common/db.py:1221
+#, python-format
+msgid "Invalid pending entry %(file)s: %(entry)s"
+msgstr ""
+
+#: swift/common/db_replicator.py:84
+#, python-format
+msgid "ERROR reading HTTP response from %s"
+msgstr ""
+
+#: swift/common/db_replicator.py:123
+#, python-format
+msgid ""
+"Attempted to replicate %(count)d dbs in %(time).5f seconds (%(rate).5f/s)"
+msgstr ""
+
+#: swift/common/db_replicator.py:129
+#, python-format
+msgid "Removed %(remove)d dbs"
+msgstr ""
+
+#: swift/common/db_replicator.py:130
+#, python-format
+msgid "%(success)s successes, %(failure)s failures"
+msgstr "%(success)s succès, %(failure)s échecs"
+
+#: swift/common/db_replicator.py:155
+#, python-format
+msgid "ERROR rsync failed with %(code)s: %(args)s"
+msgstr ""
+
+#: swift/common/db_replicator.py:205
+#, python-format
+msgid "Syncing chunks with %s"
+msgstr ""
+
+#: swift/common/db_replicator.py:213
+#, python-format
+msgid "ERROR Bad response %(status)s from %(host)s"
+msgstr "ERREUR Mauvaise réponse %(status)s de %(host)s"
+
+#: swift/common/db_replicator.py:278
+#, python-format
+msgid "ERROR Unable to connect to remote server: %s"
+msgstr "ERREUR Impossible de se connecter au serveur distant: %s"
+
+#: swift/common/db_replicator.py:316
+#, python-format
+msgid "Replicating db %s"
+msgstr ""
+
+#: swift/common/db_replicator.py:325 swift/common/db_replicator.py:479
+#, python-format
+msgid "Quarantining DB %s"
+msgstr "Mise en quarantaine de la BD %s"
+
+#: swift/common/db_replicator.py:328
+#, python-format
+msgid "ERROR reading db %s"
+msgstr "ERREUR lors de lecture de la BD %s"
+
+#: swift/common/db_replicator.py:361
+#, python-format
+msgid "ERROR Remote drive not mounted %s"
+msgstr ""
+
+#: swift/common/db_replicator.py:363
+#, python-format
+msgid "ERROR syncing %(file)s with node %(node)s"
+msgstr ""
+
+#: swift/common/db_replicator.py:405
+msgid "ERROR Failed to get my own IPs?"
+msgstr ""
+
+#: swift/common/db_replicator.py:412
+#, python-format
+msgid "Skipping %(device)s as it is not mounted"
+msgstr ""
+
+#: swift/common/db_replicator.py:420
+msgid "Beginning replication run"
+msgstr ""
+
+#: swift/common/db_replicator.py:425
+msgid "Replication run OVER"
+msgstr ""
+
+#: swift/common/db_replicator.py:436
+msgid "ERROR trying to replicate"
+msgstr ""
+
+#: swift/common/memcached.py:69
+#, python-format
+msgid "Timeout %(action)s to memcached: %(server)s"
+msgstr ""
+
+#: swift/common/memcached.py:72
+#, python-format
+msgid "Error %(action)s to memcached: %(server)s"
+msgstr ""
+
+#: swift/common/memcached.py:81
+#, python-format
+msgid "Error limiting server %s"
+msgstr ""
+
+#: swift/common/utils.py:88
+#, python-format
+msgid "Unable to locate %s in libc.  Leaving as a no-op."
+msgstr ""
+
+#: swift/common/utils.py:255
+msgid "STDOUT: Connection reset by peer"
+msgstr ""
+
+#: swift/common/utils.py:257 swift/common/utils.py:260
+#, python-format
+msgid "STDOUT: %s"
+msgstr "STDOUT: %s"
+
+#: swift/common/utils.py:324
+msgid "Connection refused"
+msgstr "Connexion refusée."
+
+#: swift/common/utils.py:326
+msgid "Host unreachable"
+msgstr "Hôte inaccessible"
+
+#: swift/common/utils.py:328
+msgid "Connection timeout"
+msgstr "Erreur de temporisation de la connexion"
+
+#: swift/common/utils.py:464
+msgid "UNCAUGHT EXCEPTION"
+msgstr ""
+
+#: swift/common/utils.py:511
+msgid "Error: missing config file argument"
+msgstr ""
+
+#: swift/common/utils.py:516
+#, python-format
+msgid "Error: unable to locate %s"
+msgstr ""
+
+#: swift/common/utils.py:743
+#, python-format
+msgid "Unable to read config file %s"
+msgstr "Impossible de lire le fichier de configuration %s"
+
+#: swift/common/utils.py:749
+#, python-format
+msgid "Unable to find %s config section in %s"
+msgstr ""
+
+#: swift/common/middleware/catch_errors.py:39
+#, python-format
+msgid "Error: %s"
+msgstr "Erreur: %s"
+
+#: swift/common/middleware/cname_lookup.py:91
+#, python-format
+msgid "Mapped %(given_domain)s to %(found_domain)s"
+msgstr ""
+
+#: swift/common/middleware/cname_lookup.py:102
+#, python-format
+msgid "Following CNAME chain for  %(given_domain)s to %(found_domain)s"
+msgstr ""
+
+#: swift/common/middleware/ratelimit.py:172
+msgid "Returning 497 because of blacklisting"
+msgstr ""
+
+#: swift/common/middleware/ratelimit.py:185
+#, python-format
+msgid ""
+"Ratelimit sleep log: %(sleep)s for %(account)s/%(container)s/%(object)s"
+msgstr ""
+
+#: swift/common/middleware/ratelimit.py:192
+#, python-format
+msgid "Returning 498 because of ops rate limiting (Max Sleep) %s"
+msgstr ""
+
+#: swift/common/middleware/ratelimit.py:212
+msgid "Warning: Cannot ratelimit without a memcached client"
+msgstr ""
+
+#: swift/common/middleware/swauth.py:635
+#, python-format
+msgid ""
+"ERROR: Exception while trying to communicate with "
+"%(scheme)s://%(host)s:%(port)s/%(path)s"
+msgstr ""
+
+#: swift/container/auditor.py:54 swift/container/auditor.py:78
+#, python-format
+msgid ""
+"Since %(time)s: Container audits: %(pass)s passed audit, %(fail)s failed "
+"audit"
+msgstr ""
+
+#: swift/container/auditor.py:68
+msgid "Begin container audit \"once\" mode"
+msgstr ""
+
+#: swift/container/auditor.py:88
+#, python-format
+msgid "Container audit \"once\" mode completed: %.02fs"
+msgstr ""
+
+#: swift/container/auditor.py:106
+#, python-format
+msgid "ERROR Could not get container info %s"
+msgstr ""
+
+#: swift/container/server.py:114
+#, python-format
+msgid ""
+"ERROR Account update failed with %(ip)s:%(port)s/%(device)s (will retry "
+"later): Response %(status)s %(reason)s"
+msgstr ""
+
+#: swift/container/server.py:122
+#, python-format
+msgid ""
+"ERROR account update failed with %(ip)s:%(port)s/%(device)s (will retry "
+"later)"
+msgstr ""
+
+#: swift/container/updater.py:78 swift/obj/replicator.py:492
+#, python-format
+msgid "%s is not mounted"
+msgstr ""
+
+#: swift/container/updater.py:97
+#, python-format
+msgid "ERROR with loading suppressions from %s: "
+msgstr ""
+
+#: swift/container/updater.py:107
+msgid "Begin container update sweep"
+msgstr ""
+
+#: swift/container/updater.py:140
+#, python-format
+msgid ""
+"Container update sweep of %(path)s completed: %(elapsed).02fs, %(success)s "
+"successes, %(fail)s failures, %(no_change)s with no changes"
+msgstr ""
+
+#: swift/container/updater.py:154
+#, python-format
+msgid "Container update sweep completed: %.02fs"
+msgstr ""
+
+#: swift/container/updater.py:164
+msgid "Begin container update single threaded sweep"
+msgstr ""
+
+#: swift/container/updater.py:172
+#, python-format
+msgid ""
+"Container update single threaded sweep completed: %(elapsed).02fs, "
+"%(success)s successes, %(fail)s failures, %(no_change)s with no changes"
+msgstr ""
+
+#: swift/container/updater.py:224
+#, python-format
+msgid "Update report sent for %(container)s %(dbfile)s"
+msgstr ""
+
+#: swift/container/updater.py:232
+#, python-format
+msgid "Update report failed for %(container)s %(dbfile)s"
+msgstr ""
+
+#: swift/container/updater.py:266
+#, python-format
+msgid ""
+"ERROR account update failed with %(ip)s:%(port)s/%(device)s (will retry "
+"later): "
+msgstr ""
+
+#: swift/obj/auditor.py:61
+#, python-format
+msgid "Begin object audit \"%s\" mode"
+msgstr ""
+
+#: swift/obj/auditor.py:73
+#, python-format
+msgid ""
+"Since %(start_time)s: Locally: %(passes)d passed audit, %(quars)d "
+"quarantined, %(errors)d errors files/sec: %(frate).2f , bytes/sec: "
+"%(brate).2f"
+msgstr ""
+
+#: swift/obj/auditor.py:90
+#, python-format
+msgid ""
+"Object audit \"%(mode)s\" mode completed: %(elapsed).02fs. Total files/sec: "
+"%(frate).2f , Total bytes/sec: %(brate).2f "
+msgstr ""
+
+#: swift/obj/auditor.py:141
+#, python-format
+msgid "ERROR Object %(obj)s failed audit and will be quarantined: %(err)s"
+msgstr ""
+
+#: swift/obj/auditor.py:150
+#, python-format
+msgid "ERROR Trying to audit %s"
+msgstr ""
+
+#: swift/obj/replicator.py:182
+msgid "Error hashing suffix"
+msgstr ""
+
+#: swift/obj/replicator.py:246
+#, python-format
+msgid "Killing long-running rsync: %s"
+msgstr ""
+
+#: swift/obj/replicator.py:257
+#, python-format
+msgid "Bad rsync return code: %(args)s -> %(ret)d"
+msgstr ""
+
+#: swift/obj/replicator.py:261 swift/obj/replicator.py:265
+#, python-format
+msgid "Successful rsync of %(src)s at %(dst)s (%(time).03f)"
+msgstr ""
+
+#: swift/obj/replicator.py:350
+#, python-format
+msgid "Removing partition: %s"
+msgstr ""
+
+#: swift/obj/replicator.py:353
+msgid "Error syncing handoff partition"
+msgstr ""
+
+#: swift/obj/replicator.py:383
+#, python-format
+msgid "%(ip)s/%(device)s responded as unmounted"
+msgstr ""
+
+#: swift/obj/replicator.py:388
+#, python-format
+msgid "Invalid response %(resp)s from %(ip)s"
+msgstr ""
+
+#: swift/obj/replicator.py:410
+#, python-format
+msgid "Error syncing with node: %s"
+msgstr ""
+
+#: swift/obj/replicator.py:414
+msgid "Error syncing partition"
+msgstr ""
+
+#: swift/obj/replicator.py:424
+#, python-format
+msgid ""
+"%(replicated)d/%(total)d (%(percentage).2f%%) partitions replicated in "
+"%(time).2fs (%(rate).2f/sec, %(remaining)s remaining)"
+msgstr ""
+
+#: swift/obj/replicator.py:433
+#, python-format
+msgid ""
+"%(checked)d suffixes checked - %(hashed).2f%% hashed, %(synced).2f%% synced"
+msgstr ""
+
+#: swift/obj/replicator.py:439
+#, python-format
+msgid "Partition times: max %(max).4fs, min %(min).4fs, med %(med).4fs"
+msgstr ""
+
+#: swift/obj/replicator.py:446
+#, python-format
+msgid "Nothing replicated for %s seconds."
+msgstr ""
+
+#: swift/obj/replicator.py:475
+msgid "Lockup detected.. killing live coros."
+msgstr ""
+
+#: swift/obj/replicator.py:530
+msgid "Ring change detected. Aborting current replication pass."
+msgstr ""
+
+#: swift/obj/replicator.py:540
+msgid "Exception in top-level replication loop"
+msgstr ""
+
+#: swift/obj/replicator.py:549
+msgid "Running object replicator in script mode."
+msgstr ""
+
+#: swift/obj/replicator.py:553 swift/obj/replicator.py:565
+#, python-format
+msgid "Object replication complete. (%.02f minutes)"
+msgstr ""
+
+#: swift/obj/replicator.py:560
+msgid "Starting object replication pass."
+msgstr ""
+
+#: swift/obj/replicator.py:566
+#, python-format
+msgid "Replication sleeping for %s seconds."
+msgstr ""
+
+#: swift/obj/server.py:313
+#, python-format
+msgid ""
+"ERROR Container update failed (saving for async update later): %(status)d "
+"response from %(ip)s:%(port)s/%(dev)s"
+msgstr ""
+
+#: swift/obj/server.py:319
+#, python-format
+msgid ""
+"ERROR container update failed with %(ip)s:%(port)s/%(dev)s (saving for async "
+"update later)"
+msgstr ""
+
+#: swift/obj/updater.py:65
+msgid "Begin object update sweep"
+msgstr ""
+
+#: swift/obj/updater.py:89
+#, python-format
+msgid ""
+"Object update sweep of %(device)s completed: %(elapsed).02fs, %(success)s "
+"successes, %(fail)s failures"
+msgstr ""
+
+#: swift/obj/updater.py:98
+#, python-format
+msgid "Object update sweep completed: %.02fs"
+msgstr ""
+
+#: swift/obj/updater.py:105
+msgid "Begin object update single threaded sweep"
+msgstr ""
+
+#: swift/obj/updater.py:117
+#, python-format
+msgid ""
+"Object update single threaded sweep completed: %(elapsed).02fs, %(success)s "
+"successes, %(fail)s failures"
+msgstr ""
+
+#: swift/obj/updater.py:157
+#, python-format
+msgid "ERROR Pickle problem, quarantining %s"
+msgstr ""
+
+#: swift/obj/updater.py:177
+#, python-format
+msgid "Update sent for %(obj)s %(path)s"
+msgstr ""
+
+#: swift/obj/updater.py:182
+#, python-format
+msgid "Update failed for %(obj)s %(path)s"
+msgstr ""
+
+#: swift/obj/updater.py:206
+#, python-format
+msgid "ERROR with remote server %(ip)s:%(port)s/%(device)s"
+msgstr ""
+
+#: swift/proxy/server.py:165 swift/proxy/server.py:629
+#: swift/proxy/server.py:696 swift/proxy/server.py:712
+#: swift/proxy/server.py:721 swift/proxy/server.py:1004
+#: swift/proxy/server.py:1044 swift/proxy/server.py:1089
+msgid "Object"
+msgstr ""
+
+#: swift/proxy/server.py:170
+#, python-format
+msgid "Could not load object segment %(path)s: %(status)s"
+msgstr ""
+
+#: swift/proxy/server.py:177 swift/proxy/server.py:210
+#: swift/proxy/server.py:257
+#, python-format
+msgid "ERROR: While processing manifest /%(acc)s/%(cont)s/%(obj)s"
+msgstr ""
+
+#: swift/proxy/server.py:292
+#, python-format
+msgid "%(msg)s %(ip)s:%(port)s"
+msgstr ""
+
+#: swift/proxy/server.py:304
+#, python-format
+msgid "ERROR with %(type)s server %(ip)s:%(port)s/%(device)s re: %(info)s"
+msgstr ""
+
+#: swift/proxy/server.py:328
+#, python-format
+msgid "Node error limited %(ip)s:%(port)s (%(device)s)"
+msgstr ""
+
+#: swift/proxy/server.py:388 swift/proxy/server.py:1451
+#: swift/proxy/server.py:1497 swift/proxy/server.py:1545
+#: swift/proxy/server.py:1590
+msgid "Account"
+msgstr ""
+
+#: swift/proxy/server.py:389
+#, python-format
+msgid "Trying to get account info for %s"
+msgstr ""
+
+#: swift/proxy/server.py:466 swift/proxy/server.py:740
+#: swift/proxy/server.py:772 swift/proxy/server.py:1214
+#: swift/proxy/server.py:1301 swift/proxy/server.py:1356
+#: swift/proxy/server.py:1413
+msgid "Container"
+msgstr ""
+
+#: swift/proxy/server.py:467
+#, python-format
+msgid "Trying to get container info for %s"
+msgstr ""
+
+#: swift/proxy/server.py:552
+#, python-format
+msgid "%(type)s returning 503 for %(statuses)s"
+msgstr ""
+
+#: swift/proxy/server.py:598 swift/proxy/server.py:697
+#, python-format
+msgid "Trying to %(method)s %(path)s"
+msgstr ""
+
+#: swift/proxy/server.py:627
+msgid "Client disconnected on read"
+msgstr ""
+
+#: swift/proxy/server.py:630
+#, python-format
+msgid "Trying to read during GET of %s"
+msgstr ""
+
+#: swift/proxy/server.py:653
+#, python-format
+msgid "ERROR %(status)d %(body)s From %(type)s Server"
+msgstr ""
+
+#: swift/proxy/server.py:692
+#, python-format
+msgid "ERROR %(status)d %(body)s From Object Server"
+msgstr ""
+
+#: swift/proxy/server.py:776 swift/proxy/server.py:783
+#, python-format
+msgid "Object manifest GET could not continue listing: %s %s"
+msgstr ""
+
+#: swift/proxy/server.py:905
+msgid "Object POST"
+msgstr ""
+
+#: swift/proxy/server.py:1005
+#, python-format
+msgid "Expect: 100-continue on %s"
+msgstr ""
+
+#: swift/proxy/server.py:1017
+#, python-format
+msgid "Object PUT returning 503, %(conns)s/%(nodes)s required connections"
+msgstr ""
+
+#: swift/proxy/server.py:1045
+#, python-format
+msgid "Trying to write to %s"
+msgstr ""
+
+#: swift/proxy/server.py:1049
+#, python-format
+msgid ""
+"Object PUT exceptions during send, %(conns)s/%(nodes)s required connections"
+msgstr ""
+
+#: swift/proxy/server.py:1058
+#, python-format
+msgid "ERROR Client read timeout (%ss)"
+msgstr ""
+
+#: swift/proxy/server.py:1063
+msgid "ERROR Exception causing client disconnect"
+msgstr ""
+
+#: swift/proxy/server.py:1068
+msgid "Client disconnected without sending enough data"
+msgstr ""
+
+#: swift/proxy/server.py:1083
+#, python-format
+msgid "ERROR %(status)d %(body)s From Object Server re: %(path)s"
+msgstr ""
+
+#: swift/proxy/server.py:1090
+#, python-format
+msgid "Trying to get final status of PUT to %s"
+msgstr ""
+
+#: swift/proxy/server.py:1093
+#, python-format
+msgid "Object servers returned %s mismatched etags"
+msgstr ""
+
+#: swift/proxy/server.py:1101
+msgid "Object PUT"
+msgstr ""
+
+#: swift/proxy/server.py:1153
+msgid "Object DELETE"
+msgstr ""
+
+#: swift/proxy/server.py:1302 swift/proxy/server.py:1498
+#, python-format
+msgid "Trying to PUT to %s"
+msgstr ""
+
+#: swift/proxy/server.py:1314
+msgid "Container PUT"
+msgstr ""
+
+#: swift/proxy/server.py:1357 swift/proxy/server.py:1546
+#, python-format
+msgid "Trying to POST %s"
+msgstr ""
+
+#: swift/proxy/server.py:1369
+msgid "Container POST"
+msgstr ""
+
+#: swift/proxy/server.py:1414 swift/proxy/server.py:1591
+#, python-format
+msgid "Trying to DELETE %s"
+msgstr ""
+
+#: swift/proxy/server.py:1426
+msgid "Container DELETE"
+msgstr ""
+
+#: swift/proxy/server.py:1433
+msgid "Returning 503 because not all container nodes confirmed DELETE"
+msgstr ""
+
+#: swift/proxy/server.py:1508
+msgid "Account PUT"
+msgstr ""
+
+#: swift/proxy/server.py:1556
+msgid "Account POST"
+msgstr ""
+
+#: swift/proxy/server.py:1601
+msgid "Account DELETE"
+msgstr "SUPPRESSION du compte"
+
+#: swift/proxy/server.py:1757
+msgid "ERROR Unhandled exception in request"
+msgstr ""
+
+#: swift/stats/access_processor.py:63 swift/stats/stats_processor.py:40
+#, python-format
+msgid "Bad line data: %s"
+msgstr ""
+
+#: swift/stats/access_processor.py:67
+#, python-format
+msgid "Bad server name: found \"%(found)s\" expected \"%(expected)s\""
+msgstr "Mauvais nom de serveur: trouvé: \"%(found)s\",\"%(expected)s\" prévu"
+
+#: swift/stats/access_processor.py:75
+#, python-format
+msgid "Invalid path: %(error)s from data: %(log)s"
+msgstr ""
+
+#: swift/stats/access_processor.py:199
+#, python-format
+msgid ""
+"I found a bunch of bad lines in %(name)s (%(bad)d bad, %(total)d total)"
+msgstr ""
+
+#: swift/stats/account_stats.py:55
+msgid "Gathering account stats"
+msgstr "Récupération des statistiques du compte"
+
+#: swift/stats/account_stats.py:59
+#, python-format
+msgid "Gathering account stats complete (%0.2f minutes)"
+msgstr ""
+
+#: swift/stats/account_stats.py:75
+#, python-format
+msgid "Device %s is not mounted, skipping."
+msgstr ""
+
+#: swift/stats/account_stats.py:81
+#, python-format
+msgid "Path %s does not exist, skipping."
+msgstr ""
+
+#: swift/stats/log_processor.py:62
+#, python-format
+msgid "Loaded plugin \"%s\""
+msgstr "Plugin \"%s\" chargé"
+
+#: swift/stats/log_processor.py:79
+#, python-format
+msgid "Processing %(obj)s with plugin \"%(plugin)s\""
+msgstr ""
+
+#: swift/stats/log_processor.py:179
+#, python-format
+msgid "Bad compressed data for %s"
+msgstr "Données mal compressées pour %s"
+
+#: swift/stats/log_processor.py:240
+msgid "Beginning log processing"
+msgstr "Début du traitement du log"
+
+#: swift/stats/log_processor.py:278
+#, python-format
+msgid "found %d processed files"
+msgstr "%d fichiers traités trouvés"
+
+#: swift/stats/log_processor.py:283
+#, python-format
+msgid "loaded %d files to process"
+msgstr "%d fichiers chargés pour traitement"
+
+#: swift/stats/log_processor.py:286 swift/stats/log_processor.py:360
+#, python-format
+msgid "Log processing done (%0.2f minutes)"
+msgstr "Fin du traitement du log (%0.2f minutes)"
+
+#: swift/stats/log_uploader.py:71
+msgid "Uploading logs"
+msgstr "Téléchargement des logs"
+
+#: swift/stats/log_uploader.py:74
+#, python-format
+msgid "Uploading logs complete (%0.2f minutes)"
+msgstr "Fin du téléchargement des logs (%0.2f minutes)"
+
+#: swift/stats/log_uploader.py:129
+#, python-format
+msgid "Unexpected log: %s"
+msgstr "Log inattendu: %s"
+
+#: swift/stats/log_uploader.py:135
+#, python-format
+msgid "Skipping log: %(file)s (< %(cutoff)d seconds old)"
+msgstr ""
+
+#: swift/stats/log_uploader.py:142
+#, python-format
+msgid "Log %s is 0 length, skipping"
+msgstr "Le log %s est d'une taille de 0,"
+
+#: swift/stats/log_uploader.py:144
+#, python-format
+msgid "Processing log: %s"
+msgstr "Traitement du log: %s"
+
+#: swift/stats/log_uploader.py:165
+#, python-format
+msgid "Uploaded log %(file)s to %(target)s"
+msgstr ""
+
+#: swift/stats/log_uploader.py:170
+#, python-format
+msgid "ERROR: Upload of log %s failed!"
+msgstr "ERREUR: Le téléchargement du log %s a échoué!"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/sysstat.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/sysstat.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/sysstat.po	2012-01-02 17:27:15.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/sysstat.po	2012-02-23 06:31:39.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:52+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:51+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: cifsiostat.c:69 iostat.c:80 mpstat.c:86 nfsiostat.c:68 pidstat.c:78
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/system-config-cluster.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/system-config-cluster.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/system-config-cluster.po	2012-01-02 17:27:17.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/system-config-cluster.po	2012-02-23 06:31:40.000000000 +0000
@@ -17,8 +17,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:09+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:10+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/clui.glade.h:1
 msgid "1"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/system-config-kickstart.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/system-config-kickstart.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/system-config-kickstart.po	2012-01-02 17:27:15.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/system-config-kickstart.po	2012-02-23 06:31:39.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:52+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:52+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../src/RHELPackageGroupList.py:12
 msgid "X Window System"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/system-service.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/system-service.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/system-service.po	2012-01-02 17:27:29.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/system-service.po	2012-02-23 06:31:52.000000000 +0000
@@ -7,69 +7,69 @@
 msgstr ""
 "Project-Id-Version: ubuntu-system-service\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-11-28 10:51+0000\n"
+"POT-Creation-Date: 2012-01-10 09:07+0000\n"
 "PO-Revision-Date: 2010-09-09 17:54+0000\n"
 "Last-Translator: 65GYgzf <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:56+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:49+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../backend/com.ubuntu.systemservice.policy.in.h:1
-msgid "Check if the package system is locked"
-msgstr "Vérifier si le système de paquets est verrouillé"
+msgid "Get current global proxy"
+msgstr "Obtenir le serveur mandataire global actuel"
 
 #: ../backend/com.ubuntu.systemservice.policy.in.h:2
-msgid "Get current global keyboard"
-msgstr "Obtenir le clavier global actuel"
+msgid "System policy prevents querying proxy settings"
+msgstr ""
+"La politique du système interdit l'accès à la configuration du serveur "
+"mandataire"
 
 #: ../backend/com.ubuntu.systemservice.policy.in.h:3
-msgid "Get current global proxy"
-msgstr "Obtenir le serveur mandataire global actuel"
+msgid "Set current global proxy"
+msgstr "Définir le serveur mandataire global actuel"
 
 #: ../backend/com.ubuntu.systemservice.policy.in.h:4
-msgid "Set current global keyboard"
-msgstr "Définir le clavier global actuel"
+msgid "System policy prevents setting proxy settings"
+msgstr ""
+"La politique du système interdit l'accès à la configuration du serveur "
+"mandataire"
 
 #: ../backend/com.ubuntu.systemservice.policy.in.h:5
-msgid "Set current global proxy"
-msgstr "Définir le serveur mandataire global actuel"
-
-#: ../backend/com.ubuntu.systemservice.policy.in.h:6
 msgid "Set current global proxy exception"
 msgstr "Définir une exception pour le serveur mandataire global actuel"
 
-#: ../backend/com.ubuntu.systemservice.policy.in.h:7
-msgid "System policy prevents querying keyboard settings"
+#: ../backend/com.ubuntu.systemservice.policy.in.h:6
+msgid "System policy prevents setting no_proxy settings"
 msgstr ""
-"La politique du système interdit l'accès à la configuration du clavier"
+"La politique du système interdit la configuration sans serveur mandataire"
+
+#: ../backend/com.ubuntu.systemservice.policy.in.h:7
+msgid "Set current global keyboard"
+msgstr "Définir le clavier global actuel"
 
 #: ../backend/com.ubuntu.systemservice.policy.in.h:8
-msgid "System policy prevents querying package system lock"
+msgid "System policy prevents setting global keyboard settings"
 msgstr ""
-"La politique du système interdit l'accès au verrouillage du système de "
-"paquets"
+"La politique du système interdit l'accès à la configuration du clavier global"
 
 #: ../backend/com.ubuntu.systemservice.policy.in.h:9
-msgid "System policy prevents querying proxy settings"
-msgstr ""
-"La politique du système interdit l'accès à la configuration du serveur "
-"mandataire"
+msgid "Get current global keyboard"
+msgstr "Obtenir le clavier global actuel"
 
 #: ../backend/com.ubuntu.systemservice.policy.in.h:10
-msgid "System policy prevents setting global keyboard settings"
+msgid "System policy prevents querying keyboard settings"
 msgstr ""
-"La politique du système interdit l'accès à la configuration du clavier global"
+"La politique du système interdit l'accès à la configuration du clavier"
 
 #: ../backend/com.ubuntu.systemservice.policy.in.h:11
-msgid "System policy prevents setting no_proxy settings"
-msgstr ""
-"La politique du système interdit la configuration sans serveur mandataire"
+msgid "Check if the package system is locked"
+msgstr "Vérifier si le système de paquets est verrouillé"
 
 #: ../backend/com.ubuntu.systemservice.policy.in.h:12
-msgid "System policy prevents setting proxy settings"
+msgid "System policy prevents querying package system lock"
 msgstr ""
-"La politique du système interdit l'accès à la configuration du serveur "
-"mandataire"
+"La politique du système interdit l'accès au verrouillage du système de "
+"paquets"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/tar.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/tar.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/tar.po	2012-01-02 17:26:56.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/tar.po	2012-02-23 06:31:23.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:12+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:58+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: gnu/argmatch.c:135
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/tasksel.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/tasksel.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/tasksel.po	2012-01-02 17:27:16.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/tasksel.po	2012-02-23 06:31:39.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:53+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:53+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../tasksel.pl:433
 msgid ""
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/texinfo.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/texinfo.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/texinfo.po	2012-01-02 17:26:51.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/texinfo.po	2012-02-23 06:31:17.000000000 +0000
@@ -11,61 +11,128 @@
 msgstr ""
 "Project-Id-Version: texinfo 4.7.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2004-12-21 16:20-0800\n"
-"PO-Revision-Date: 2009-11-24 08:27+0000\n"
+"POT-Creation-Date: 2008-09-18 20:38+0200\n"
+"PO-Revision-Date: 2011-09-07 02:18+0000\n"
 "Last-Translator: Laurent Bourbeau <Unknown>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:34+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:25+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+"Language: fr\n"
+
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr "Erreur système inconnue."
 
-#: info/echo-area.c:284 info/session.c:689
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: l'option « %s » est ambiguë\n"
+
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: l'option « --%s » ne permet pas un argument\n"
+
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: l'option « %c%s » ne permet pas un argument\n"
+
+#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
+#: gnulib/lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: l'option « %s » exige un argument\n"
+
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: option non reconnue « --%s »\n"
+
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: option non reconnue « %c%s »\n"
+
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: option illégale -- %c\n"
+
+#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: option invalide -- %c\n"
+
+#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
+#: gnulib/lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: l'option exige un argument -- %c\n"
+
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: l'option « -W %s » est ambiguë\n"
+
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: l'option « -W %s » ne permet pas un argument\n"
+
+#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "mémoire épuisée"
+
+#: info/echo-area.c:283 info/session.c:966
 msgid "Move forward a character"
 msgstr "Avancer d'un caractère"
 
-#: info/echo-area.c:296 info/session.c:705
+#: info/echo-area.c:295 info/session.c:993
 msgid "Move backward a character"
 msgstr "Reculer d'un caractère"
 
-#: info/echo-area.c:308
+#: info/echo-area.c:307
 msgid "Move to the start of this line"
 msgstr "Se déplacer au début de cette ligne"
 
-#: info/echo-area.c:313
+#: info/echo-area.c:312
 msgid "Move to the end of this line"
 msgstr "Se déplacer à la fin de cette ligne"
 
-#: info/echo-area.c:321 info/session.c:723
+#: info/echo-area.c:320 info/session.c:1025
 msgid "Move forward a word"
 msgstr "Avancer d'un mot"
 
-#: info/echo-area.c:361 info/session.c:772
+#: info/echo-area.c:360 info/session.c:1049
 msgid "Move backward a word"
 msgstr "Reculer d'un mot"
 
-#: info/echo-area.c:401
+#: info/echo-area.c:400
 msgid "Delete the character under the cursor"
 msgstr "Éliminer le caractère sous le curseur"
 
-#: info/echo-area.c:431
+#: info/echo-area.c:430
 msgid "Delete the character behind the cursor"
 msgstr "Éliminer le caractère précédent le curseur"
 
-#: info/echo-area.c:452
+#: info/echo-area.c:451
 msgid "Cancel or quit operation"
 msgstr "Annuler ou opération de quitter"
 
-#: info/echo-area.c:467
+#: info/echo-area.c:466
 msgid "Accept (or force completion of) this line"
 msgstr "Accepter cette ligne (ou en forcer la complétion)"
 
-#: info/echo-area.c:472
+#: info/echo-area.c:471
 msgid "Insert next character verbatim"
 msgstr "Insérer le prochain caractère textuellement"
 
-#: info/echo-area.c:480
+#: info/echo-area.c:479
 msgid "Insert this character"
 msgstr "Insérer ce caractère"
 
@@ -101,52 +168,52 @@
 msgid "Kill the word following the cursor"
 msgstr "Effacer le mot suivant le curseur"
 
-#: info/echo-area.c:653
+#: info/echo-area.c:654
 msgid "Kill the word preceding the cursor"
 msgstr "Effacer le mot précédent le curseur"
 
-#: info/echo-area.c:868 info/echo-area.c:924
+#: info/echo-area.c:870 info/echo-area.c:926
 msgid "No completions"
 msgstr "Aucune complétion"
 
-#: info/echo-area.c:870
+#: info/echo-area.c:872
 msgid "Not complete"
 msgstr "Non complet"
 
-#: info/echo-area.c:911
+#: info/echo-area.c:913
 msgid "List possible completions"
 msgstr "Énumérer les complétions possibles"
 
-#: info/echo-area.c:928
+#: info/echo-area.c:930
 msgid "Sole completion"
 msgstr "Une seule complétion"
 
-#: info/echo-area.c:937
+#: info/echo-area.c:939
 msgid "One completion:\n"
 msgstr "Une complétion:\n"
 
-#: info/echo-area.c:938
+#: info/echo-area.c:940
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d complétions:\n"
 
-#: info/echo-area.c:1085
+#: info/echo-area.c:1087
 msgid "Insert completion"
 msgstr "Insérer la complétion"
 
-#: info/echo-area.c:1220
+#: info/echo-area.c:1222
 msgid "Building completions..."
 msgstr "Construction des complétions..."
 
-#: info/echo-area.c:1340
+#: info/echo-area.c:1342
 msgid "Scroll the completions window"
 msgstr "Dérouler la fenêtre des complétions"
 
-#: info/footnotes.c:213
+#: info/footnotes.c:212
 msgid "Footnotes could not be displayed"
 msgstr "Les notes en bas de page ne peuvent pas être affichées"
 
-#: info/footnotes.c:239
+#: info/footnotes.c:238
 msgid "Show the footnotes associated with this node in another window"
 msgstr ""
 "Montrer les notes en bas de page associées à ce noeud dans une autre fenêtre"
@@ -156,77 +223,77 @@
 msgid "---------- Footnotes ----------"
 msgstr "----- Notes de bas de page ----"
 
-#: info/indices.c:172
+#: info/indices.c:171
 msgid "Look up a string in the index for this file"
 msgstr "Rechercher une chaîne dans l'index pour ce fichier"
 
-#: info/indices.c:199
+#: info/indices.c:198
 msgid "Finding index entries..."
 msgstr "Recherche des entrées d'index..."
 
-#: info/indices.c:207
+#: info/indices.c:206
 msgid "No indices found."
 msgstr "Aucun indice retrouvé."
 
-#: info/indices.c:217
+#: info/indices.c:216
 msgid "Index entry: "
 msgstr "Entrée d'index: "
 
-#: info/indices.c:325
+#: info/indices.c:324
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
 "Aller à prochaine référence d'index à partir de la dernière commande « \\"
 "[index-search] »"
 
-#: info/indices.c:335
+#: info/indices.c:334
 msgid "No previous index search string."
 msgstr "Aucune autre chaîne de fouille d'index."
 
-#: info/indices.c:342
+#: info/indices.c:341
 msgid "No index entries."
 msgstr "Aucune entrée d'index."
 
-#: info/indices.c:375
+#: info/indices.c:374
 #, c-format
 msgid "No %sindex entries containing `%s'."
 msgstr "Aucune entrée %sindex contenant « %s »."
 
-#: info/indices.c:376
+#: info/indices.c:375
 msgid "more "
 msgstr "plus "
 
-#: info/indices.c:386
+#: info/indices.c:385
 msgid "CAN'T SEE THIS"
 msgstr "NE PEUT PAS VOIR CECI"
 
-#: info/indices.c:422
+#: info/indices.c:421
 #, c-format
 msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr ""
 "« %s » repéré dans %s.  (« \\[next-index-match] » cherchera le prochain.)"
 
-#: info/indices.c:541
+#: info/indices.c:549
 #, c-format
 msgid "Scanning indices of `%s'..."
 msgstr "Fouille des indices de « %s »..."
 
-#: info/indices.c:596
+#: info/indices.c:604
 #, c-format
 msgid "No available info files have `%s' in their indices."
 msgstr "Aucun fichier info disponible n'a « %s » dans leurs indices."
 
-#: info/indices.c:622
+#: info/indices.c:630
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr ""
 "Aplatir tous les indices de fichier Info connus pour une chaîne et "
 "construire un menu"
 
-#: info/indices.c:626
+#: info/indices.c:634
 msgid "Index apropos: "
 msgstr "Index à-propos: "
 
-#: info/indices.c:654
+#: info/indices.c:662
 #, c-format
 msgid ""
 "\n"
@@ -240,117 +307,105 @@
 msgid "Try --help for more information.\n"
 msgstr "Utiliser --help pour plus d'informations.\n"
 
-#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
-#: util/texindex.c:343
+#: info/info.c:294 info/infokey.c:145 install-info/install-info.c:2101
+#: makeinfo/makeinfo.c:802 util/texindex.c:295
 #, c-format
 msgid ""
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later "
+"<http://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"AUCUNE garantie n'est donnée.  Vous pouvez redistribuer des copies\n"
-"de ce logiciel selon les termes de la licence GNU General Public License.\n"
-"Pour plus d'informations, consultez le fichier COPYING.\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"Licence GPLv3+ : GNU GPL version 3 ou ultérieure "
+"<http://gnu.org/licenses/gpl.html>\n"
+"Ceci est un logiciel libre : vous pouvez le modifier et le redistribuer.\n"
+"Il n'y a PAS DE GARANTIE, dans la mesure de ce que permet la loi.\n"
 
-#: info/info.c:498
+#: info/info.c:506
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "aucune entrée d'index retrouvée pour « %s »\n"
 
-#: info/info.c:590
-msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
-msgstr ""
-"  -b, --speech-friendly        Être compatible au synthétiseur de voix.\n"
-
-#: info/info.c:597
+#: info/info.c:600
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
 "Read documentation in Info format.\n"
-"\n"
+msgstr ""
+
+#: info/info.c:606
+msgid ""
 "Options:\n"
-"      --apropos=STRING         look up STRING in all indices of all "
+"  -k, --apropos=STRING         look up STRING in all indices of all "
 "manuals.\n"
 "  -d, --directory=DIR          add DIR to INFOPATH.\n"
 "      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
-"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -f, --file=FILENAME          specify Info file to visit."
+msgstr ""
+
+#: info/info.c:613
+msgid ""
 "  -h, --help                   display this help and exit.\n"
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
-"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME."
+msgstr ""
+
+#: info/info.c:619
+msgid ""
 "  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
 "      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
-"  -O, --show-options, --usage  go to command-line options node.\n"
-"%s      --subnodes               recursively output menu items.\n"
-"  -w, --where, --location      print physical location of Info file.\n"
+"  -O, --show-options, --usage  go to command-line options node."
+msgstr ""
+
+#: info/info.c:626
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers."
+msgstr ""
+
+#: info/info.c:630
+msgid ""
+"      --subnodes               recursively output menu items.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
+"  -w, --where, --location      print physical location of Info file."
+msgstr ""
+
+#: info/info.c:636
+msgid ""
 "\n"
 "The first non-option argument, if present, is the menu entry to start from;\n"
 "it is searched for in all `dir' files along INFOPATH.\n"
 "If it is not present, info merges all `dir' files and shows the result.\n"
 "Any remaining arguments are treated as the names of menu\n"
-"items relative to the initial node visited.\n"
+"items relative to the initial node visited."
+msgstr ""
+
+#: info/info.c:643
+msgid ""
+"\n"
+"For a summary of key bindings, type h within Info."
+msgstr ""
+
+#: info/info.c:646
+msgid ""
 "\n"
 "Examples:\n"
 "  info                       show top-level dir menu\n"
+"  info info                  show the general manual for Info readers\n"
+"  info info-stnd             show the manual specific to this Info program\n"
 "  info emacs                 start at emacs node from top-level dir\n"
 "  info emacs buffers         start at buffers node within emacs manual\n"
 "  info --show-options emacs  start at node with emacs' command line options\n"
-"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+"  info --subnodes -o out.txt emacs  dump entire manual to out.txt\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir"
 msgstr ""
-"Usage: %s [OPTION]... [ITEM-MENU...]\n"
-"\n"
-"Lire la documentation en format Info.\n"
-"\n"
-"Options:\n"
-"      --apropos=SUJET          Consulter SUJET dans tout indice de tout "
-"manuel.\n"
-"  -d, --directory=RÉP          Ajouter le RÉPertoire dans INFOPATH.\n"
-"      --dribble=FICHIER        Accumuler les clés-clavier de l'usager dans "
-"FICHIER.\n"
-"  -f, --file=FICHIER           Spécifier le fichier Info à visiter.\n"
-"  -h, --help                   Afficher ce menu d'aide et quitter.\n"
-"      --index-search=CHAÎNE    Aller au noeud pointé par CHAÎNE d'entrée "
-"d'index.\n"
-"  -n, --node=NOEUD             Spécifier les NOEUDS dans le fichier Info "
-"visité en premier.\n"
-"  -o, --output=FICHIER         Écrire dans FICHIER les noeuds sélectionnés.\n"
-"  -R, --raw-escapes            Ne pas enlever les séquences d'échappements "
-"ANSI des man pages.\n"
-"      --no-raw-escapes         Fournir les séquences d'échappements comme du "
-"texte.\n"
-"      --restore=FICHIER        Lire du FICHIER les clés-clavier initiales.\n"
-"  -O, --show-options, --usage  Aller au noeud des options de ligne-de-"
-"commande.\n"
-"%s    --subnodes               Écrire récursivement les items-menu.\n"
-"      --vi-keys                Utiliser les raccourcis-clavier comme vi et "
-"less.\n"
-"      --version                Afficher la version du logiciel et quitter.\n"
-"\n"
-"Le premier argument, n'étant pas une option et si présent, est l'entrée "
-"menu\n"
-"de départ; il est recherché dans tous les fichiers « dir » le long de "
-"INFOPATH.\n"
-"S'il est absent, Info fusionne tous les fichiers « dir » et montre le "
-"résultat.\n"
-"Tous les arguments subséquents sont traités comme des noms d'items de menu\n"
-"relatifs au noeud initial visité.\n"
-"\n"
-"Exemples:\n"
-"  info                       Montrer le menu dir de niveau-supérieur\n"
-"  info emacs                 Partir du noeud emacs dans dir niveau-"
-"supérieur\n"
-"  info emacs buffers         Partir du noeud buffers dans le niveau emacs\n"
-"  info --show-options emacs  Partir du noeud --show-options dans niveau "
-"emacs\n"
-"  info -f ./foo.info         Montrer le fichier ./foo.info, sans chercher "
-"dir\n"
 
-#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
-#: util/install-info.c:466 util/texindex.c:292
+#: info/info.c:657 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: util/texindex.c:259
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -362,426 +417,367 @@
 "vos questions et autre discussion à help-texinfo@gnu.org.\n"
 "Site de Texinfo: http://www.gnu.org/software/texinfo/"
 
-#: info/info.c:669
+#: info/info.c:691
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Ne peut pas trouver le noeud « %s »."
 
-#: info/info.c:670
+#: info/info.c:692
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Ne peut pas trouver le noeud « (%s)%s »."
 
-#: info/info.c:671
+#: info/info.c:693
 msgid "Cannot find a window!"
 msgstr "Ne peut pas trouver une fenêtre permanente!"
 
-#: info/info.c:672
+#: info/info.c:694
 msgid "Point doesn't appear within this window's node!"
 msgstr "Le point courant n'apparaît pas dans ce noeud de fenêtre!"
 
-#: info/info.c:673
+#: info/info.c:695
 msgid "Cannot delete the last window."
 msgstr "Ne peut pas éliminer la dernière fenêtre."
 
-#: info/info.c:674
+#: info/info.c:696
 msgid "No menu in this node."
 msgstr "Aucun menu dans ce noeud."
 
-#: info/info.c:675
+#: info/info.c:697
 msgid "No footnotes in this node."
 msgstr "Aucune note de bas de page dans ce noeud."
 
-#: info/info.c:676
+#: info/info.c:698
 msgid "No cross references in this node."
 msgstr "Aucune référence croisée dans ce noeud."
 
-#: info/info.c:677
+#: info/info.c:699
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Aucun pointeur « %s » pour ce noeud."
 
-#: info/info.c:678
+#: info/info.c:700
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Commande Info « %c> » inconnue; essayer « ? » pour de l'aide."
 
-#: info/info.c:679
+#: info/info.c:701
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "Le type de terminal « %s » n'est pas en mesure de rouler Info."
 
-#: info/info.c:680
+#: info/info.c:702
 msgid "You are already at the last page of this node."
 msgstr "Vous êtes déjà au point terminal de ce noeud."
 
-#: info/info.c:681
+#: info/info.c:703
 msgid "You are already at the first page of this node."
 msgstr "Vous êtes déjà au point initial de ce noeud."
 
-#: info/info.c:682
+#: info/info.c:704
 msgid "Only one window."
 msgstr "Une seule fenêtre."
 
-#: info/info.c:683
+#: info/info.c:705
 msgid "Resulting window would be too small."
 msgstr "La fenêtre résultante sera trop petite."
 
-#: info/info.c:684
+#: info/info.c:706
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Pas assez de place pour une fenêtre d'aide, fermer svp une fenêtre."
 
-#: info/infodoc.c:46 info/infodoc.c:95
-msgid ""
-"Basic Commands in Info Windows\n"
-"******************************\n"
+#: info/infodoc.c:45
+msgid "Basic Info command keys\n"
 msgstr ""
-"Commandes de base en Info Windows\n"
-"---------------------------------\n"
 
-#: info/infodoc.c:49
-msgid "\\%-10[quit-help]  Quit this help.\n"
-msgstr "\\%-10[quit-help]  Quitter ce menu d'aide.\n"
+#: info/infodoc.c:47
+msgid "\\%-10[quit-help]  Close this help window.\n"
+msgstr ""
 
-#: info/infodoc.c:50
+#: info/infodoc.c:48
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "\\%-10[quit]  Quitter complètement le mode Info.\n"
 
-#: info/infodoc.c:51
+#: info/infodoc.c:49
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "\\%-10[get-info-help-node]  Faire appel au tutoriel Info.\n"
 
-# Est-ce vraiment un message à traduire?  NON.
-#: info/infodoc.c:53 info/infodoc.c:102
-msgid ""
-"Selecting other nodes:\n"
-"----------------------\n"
+#: info/infodoc.c:51
+msgid "\\%-10[prev-line]  Move up one line.\n"
+msgstr ""
+
+#: info/infodoc.c:52
+msgid "\\%-10[next-line]  Move down one line.\n"
+msgstr ""
+
+#: info/infodoc.c:53
+msgid "\\%-10[scroll-backward]  Scroll backward one screenful.\n"
+msgstr ""
+
+#: info/infodoc.c:54
+msgid "\\%-10[scroll-forward]  Scroll forward one screenful.\n"
 msgstr ""
-"Sélection d'autres modes:\n"
-"------------------------\n"
 
 #: info/infodoc.c:55
-msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
-msgstr "\\%-10[next-node]  Aller au noeud « next » de ce noeud.\n"
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Aller au point initial de ce noeud.\n"
 
 #: info/infodoc.c:56
-msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
-msgstr "\\%-10[prev-node]  Aller au noeud « previous » de ce noeud.\n"
-
-#: info/infodoc.c:57
-msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
-msgstr "\\%-10[up-node]  Aller au noeud « up » à partir de ce noeud.\n"
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Aller au point terminal de ce noeud.\n"
 
 #: info/infodoc.c:58
-msgid ""
-"\\%-10[menu-item]  Pick menu item specified by name.\n"
-"              Picking a menu item causes another node to be selected.\n"
+msgid "\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"
 msgstr ""
-"\\%-10[menu-item]  Choisir un item menu à partir de son nom.\n"
-"              Choisir un item menu provoque la sélection d'un autre noeud.\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:59
 msgid ""
-"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
+"\\%-10[select-reference-this-line]  Follow the hypertext link under the "
+"cursor.\n"
 msgstr ""
-"\\%-10[xref-item]  Suivre une référence croisée.  Lire le nom de la "
-"référence.\n"
 
-#: info/infodoc.c:61
-msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+#: info/infodoc.c:60
+msgid "\\%-10[history-node]  Go back to the last node seen in this window.\n"
 msgstr ""
-"\\%-10[history-node]  Aller au dernier noeud observé dans cette fenêtre.\n"
 
 #: info/infodoc.c:62
-msgid ""
-"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
+msgid "\\%-10[global-prev-node]  Go to the previous node in the document.\n"
 msgstr ""
-"\\%-10[move-to-next-xref]  Sauter au prochain hyperlien à l'intérieur de ce "
-"noeud.\n"
 
 #: info/infodoc.c:63
-msgid ""
-"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
-"node.\n"
+msgid "\\%-10[global-next-node]  Go to the next node in the document.\n"
 msgstr ""
-"\\%-10[move-to-prev-xref]  Sauter au prochain hyperlien à l'intérieur de ce "
-"noeud.\n"
 
 #: info/infodoc.c:64
-msgid ""
-"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
+msgid "\\%-10[prev-node]  Go to the previous node on this level.\n"
 msgstr ""
-"\\%-10[select-reference-this-line]  Suivre l'hyperlien sous le curseur.\n"
 
 #: info/infodoc.c:65
-msgid ""
-"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
-"node] (DIR)'.\n"
+msgid "\\%-10[next-node]  Go to the next node on this level.\n"
 msgstr ""
-"\\%-10[dir-node]  Aller au noeud « directory ».  Équivalent à « g (DIR) ».\n"
 
 #: info/infodoc.c:66
-msgid ""
-"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
+msgid "\\%-10[up-node]  Go up one level.\n"
 msgstr ""
-"\\%-10[top-node]  Aller au noeud supérieur Top.  Équivalent à « g Top ».\n"
 
-# Est-ce vraiment un message à traduire?  NON.
-#: info/infodoc.c:68 info/infodoc.c:116
-msgid ""
-"Moving within a node:\n"
-"---------------------\n"
+#: info/infodoc.c:67
+msgid "\\%-10[top-node]  Go to the top node of this document.\n"
+msgstr ""
+
+#: info/infodoc.c:68
+msgid "\\%-10[dir-node]  Go to the main `directory' node.\n"
 msgstr ""
-"Se déplacer à l'intérieur d'un noeud:\n"
-"------------------------------------\n"
 
 #: info/infodoc.c:70
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
-msgstr "\\%-10[beginning-of-node]  Aller au point initial de ce noeud.\n"
+msgid "1...9       Pick the first...ninth item in this node's menu.\n"
+msgstr ""
 
 #: info/infodoc.c:71
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "\\%-10[end-of-node]  Aller au point terminal de ce noeud.\n"
+msgid "\\%-10[last-menu-item]  Pick the last item in this node's menu.\n"
+msgstr ""
 
 #: info/infodoc.c:72
-msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
-msgstr "\\%-10[next-line]  Avancer de 1 ligne.\n"
+msgid "\\%-10[menu-item]  Pick a menu item specified by name.\n"
+msgstr ""
 
 #: info/infodoc.c:73
-msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
-msgstr "\\%-10[prev-line]  Reculer de 1 ligne.\n"
+msgid "\\%-10[xref-item]  Follow a cross reference specified by name.\n"
+msgstr ""
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "\\%-10[scroll-forward]  Avancer d'une page.\n"
-
-#: info/infodoc.c:75
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "\\%-10[scroll-backward]  Reculer d'une page.\n"
-
-# Est-ce vraiment un message à traduire?  NON.
-#: info/infodoc.c:77 info/infodoc.c:125
-msgid ""
-"Other commands:\n"
-"---------------\n"
+msgid "\\%-10[goto-node]  Go to a node specified by name.\n"
 msgstr ""
-"Autres commandes:\n"
-"----------------\n"
 
-#: info/infodoc.c:79
-msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+#: info/infodoc.c:76
+msgid "\\%-10[search]  Search forward for a specified string.\n"
 msgstr ""
-"\\%-10[menu-digit]  Choisir d'abord ... le neuvième item dans le menu de "
-"noeuds.\n"
 
-#: info/infodoc.c:80
-msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
+#: info/infodoc.c:77
+msgid "\\%-10[search-previous]  Search for previous occurrence.\n"
 msgstr ""
-"\\%-10[last-menu-item]  Choisir le dernier item dans le menu de noeuds.\n"
 
-#: info/infodoc.c:81
-msgid ""
-"\\%-10[index-search]  Search for a specified string in the index entries of "
-"this Info\n"
-"              file, and select the node referenced by the first entry "
-"found.\n"
+#: info/infodoc.c:78
+msgid "\\%-10[search-next]  Search for next occurrence.\n"
 msgstr ""
-"\\%-10[index-search]  Choisir la chaîne spécifiée dans les entrées d'index "
-"de ce Info\n"
-"              et sélectionner le noeud référencé par la première entrée "
-"trouvée.\n"
 
-#: info/infodoc.c:83
+#: info/infodoc.c:79
 msgid ""
-"\\%-10[goto-node]  Move to node specified by name.\n"
-"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
+"\\%-10[index-search]  Search for a specified string in the index, and\n"
+"              select the node referenced by the first entry found.\n"
 msgstr ""
-"\\%-10[goto-node]  Aller au noeud spécifié par le nom.\n"
-"              Vous pouvez aussi bien inclure un nom de fichier, comme dans "
-"(FILENAME)NODENAME.\n"
 
-#: info/infodoc.c:85
-msgid ""
-"\\%-10[search]  Search forward for a specified string\n"
-"              and select the node in which the next occurrence is found.\n"
+#: info/infodoc.c:81
+msgid "\\%-10[abort-key]  Cancel the current operation.\n"
 msgstr ""
-"\\%-10[search]  Fouiller à reculons pour une chaîne spécifiée\n"
-"              et sélectionner le noeud dans lequel se trouve la prochaine "
-"occurrence.\n"
 
-#: info/infodoc.c:87
+#: info/infodoc.c:89
 msgid ""
-"\\%-10[search-backward]  Search backward for a specified string\n"
-"              and select the node in which the previous occurrence is "
-"found.\n"
+"Basic Commands in Info Windows\n"
+"******************************\n"
 msgstr ""
-"\\%-10[search-backward]  Fouiller à reculons pour une chaîne spécifiée\n"
-"              et sélectionner le noeud dans lequel se trouve la prochaine "
-"occurrence.\n"
+"Commandes de base en Info Windows\n"
+"---------------------------------\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:92
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  Quitter ce menu d'aide.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:93
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Quitter complètement le mode Info.\n"
 
-#: info/infodoc.c:100
+#: info/infodoc.c:94
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Faire appel au guide Info.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  Aller au noeud « next » de ce noeud.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  Aller au noeud « previous » de ce noeud.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  Aller au noeud « up » à partir de ce noeud.\n"
 
-#: info/infodoc.c:107
+#: info/infodoc.c:101
 #, c-format
-msgid "  %-10s  Pick menu item specified by name.\n"
-msgstr "  %-10s  Choisir l'item menu indiqué par le nom.\n"
-
-#: info/infodoc.c:108
 msgid ""
+"  %-10s  Pick menu item specified by name.\n"
 "              Picking a menu item causes another node to be selected.\n"
 msgstr ""
-"              Choisir un item menu provoque la sélection d'un autre noeud.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:103
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr ""
 "  %-10s  Suivre une référence croisée.  Lire le nom de la référence.\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  Aller au dernier noeud observé dans cette fenêtre.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  Sauter au prochain hyperlien à l'intérieur de ce noeud.\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  Suivre l'hyperlien sous le curseur.\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  Aller au noeud « directory ».  Équivalent à « g (DIR) ».\n"
 
-#: info/infodoc.c:114
+#: info/infodoc.c:108
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  Aller au noeud supérieur Top.  Équivalent à « g Top ».\n"
 
-#: info/infodoc.c:118
+# Est-ce vraiment un message à traduire?  NON.
+#: info/infodoc.c:110
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+"Se déplacer à l'intérieur d'un noeud:\n"
+"------------------------------------\n"
+
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  Avancer d'une page.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  Reculer d'une page.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  Aller au point initial de ce noeud.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:115
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s  Aller au point terminal de ce noeud.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:116
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  Avancer de 1 ligne.\n"
 
-#: info/infodoc.c:123
+#: info/infodoc.c:117
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  Reculer de 1 ligne.\n"
 
-#: info/infodoc.c:127
+# Est-ce vraiment un message à traduire?  NON.
+#: info/infodoc.c:119
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"Autres commandes:\n"
+"----------------\n"
+
+#: info/infodoc.c:121
 #, c-format
-msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
+msgid "  %-10s  Pick first...ninth item in node's menu.\n"
 msgstr ""
-"  %-10s  Choisir d'abord ... le neuvième item dans le menu de noeuds.\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  Choisir le dernier item dans le menu de noeuds.\n"
 
-#: info/infodoc.c:129
+#: info/infodoc.c:125
 #, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
-msgstr ""
-"  %-10s  Fouiller pour une chaîne spécifiée dans les entrées d'index de ce "
-"fichier Info,\n"
-
-#: info/infodoc.c:130
-msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr ""
-"              et sélectionner le noeud référencé par la première entrée "
-"trouvée.\n"
 
-#: info/infodoc.c:131
+#: info/infodoc.c:127
 #, c-format
-msgid "  %-10s  Move to node specified by name.\n"
-msgstr "  %-10s  Aller au noeud indiqué par le nom.\n"
-
-#: info/infodoc.c:132
 msgid ""
+"  %-10s  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
-"              Vous pouvez aussi bien inclure un nom de fichier, comme dans "
-"(FILENAME)NODENAME.\n"
 
-#: info/infodoc.c:133
+#: info/infodoc.c:129
 #, c-format
-msgid "  %-10s  Search forward for a specified string,\n"
-msgstr "  %-10s  Fouiller vers l'avant pour une chaîne spécifiée,\n"
-
-#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
+"  %-10s  Search forward for a specified string,\n"
 "              and select the node in which the next occurrence is found.\n"
 msgstr ""
-"              et sélectionner le noeud dans lequel se trouve la prochaine "
-"occurrence.\n"
 
-#: info/infodoc.c:135
+#: info/infodoc.c:131
 #, c-format
-msgid "  %-10s  Search backward for a specified string\n"
-msgstr "  %-10s  Fouiller à reculons pour une chaîne spécifiée\n"
+msgid ""
+"  %-10s  Search backward for a specified string,\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
 
-#: info/infodoc.c:316
+#: info/infodoc.c:312
 msgid "The current search path is:\n"
 msgstr "Le chemin de fouille courant est:\n"
 
-#: info/infodoc.c:320
+#: info/infodoc.c:316
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -789,7 +785,7 @@
 "Commandes disponibles en Info Windows:\n"
 "\n"
 
-#: info/infodoc.c:324
+#: info/infodoc.c:320
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
@@ -797,7 +793,7 @@
 "Commandes disponibles dans la zone « echo area »:\n"
 "\n"
 
-#: info/infodoc.c:347
+#: info/infodoc.c:343
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -806,7 +802,7 @@
 "Les commandes suivantes peuvent être invoquées uniquement via %s:\n"
 "\n"
 
-#: info/infodoc.c:351
+#: info/infodoc.c:347
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
@@ -814,83 +810,74 @@
 "Les commandes suivantes ne peuvent pas être invoquées:\n"
 "\n"
 
-#: info/infodoc.c:375
-msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
-msgstr ""
-"--- Utiliser « \\[history-node] » ou « \\[kill-node] » pour sortir ---\n"
-
-#: info/infodoc.c:485
+#: info/infodoc.c:477
 msgid "Display help message"
 msgstr "Afficher le message d'aide"
 
-#: info/infodoc.c:503
+#: info/infodoc.c:495
 msgid "Visit Info node `(info)Help'"
 msgstr "Visiter le noeud Info « (info)Help »"
 
-#: info/infodoc.c:641
+#: info/infodoc.c:633
 msgid "Print documentation for KEY"
 msgstr "Imprimer la documentation relative à KEY"
 
-#: info/infodoc.c:653
+#: info/infodoc.c:645
 #, c-format
 msgid "Describe key: %s"
 msgstr "Décrire la clé: %s"
 
-#: info/infodoc.c:664
+#: info/infodoc.c:656
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s est non défini."
 
-#: info/infodoc.c:680 info/infodoc.c:709
+#: info/infodoc.c:672 info/infodoc.c:701
 #, c-format
 msgid "%s is undefined."
 msgstr "%s est non défini."
 
-#: info/infodoc.c:730
+#: info/infodoc.c:722
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s est défini à %s."
 
-#: info/infodoc.c:1153
+#: info/infodoc.c:1146
 msgid "Show what to type to execute a given command"
 msgstr "Montrer quoi écrire afin d'exécuter une commande donnée"
 
-#: info/infodoc.c:1157
+#: info/infodoc.c:1150
 msgid "Where is command: "
 msgstr "Où se trouve la commande: "
 
-#: info/infodoc.c:1179
+#: info/infodoc.c:1172
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "« %s » ne se trouve pas sur une clé quelconque"
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1179
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s peut être invoqué uniquement via %s."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1183
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s peut être invoqué via %s."
 
-#: info/infodoc.c:1195
+#: info/infodoc.c:1188
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "Il n'y a pas de fonction nommée « %s »"
 
-#: info/infokey.c:145
-#, c-format
+# Est-ce vraiment un message à traduire?  NON.
+#: info/infodoc.c:96
 msgid ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING.\n"
-msgstr ""
-"Copyright © %s Free Software Foundation, Inc.\n"
-"AUCUNE garantie n'est donnée.  Vous pouvez redistribuer des copies\n"
-"de ce logiciel selon les termes de la licence GNU General Public License.\n"
-"Pour plus d'informations, consultez le fichier COPYING.\n"
+"Selecting other nodes:\n"
+"----------------------\n"
+msgstr ""
+"Sélection d'autres modes:\n"
+"------------------------\n"
 
 #: info/infokey.c:170
 msgid "incorrect number of arguments"
@@ -1002,22 +989,22 @@
 "  --help                Afficher le menu d'aide et quitter.\n"
 "  --version             Afficher le version du logiciel et quitter.\n"
 
-#: info/infomap.c:1500
+#: info/infomap.c:955
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr "Fichier infokey invalide ignoré « %s » - trop petit"
 
-#: info/infomap.c:1503
+#: info/infomap.c:958
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr "Fichier infokey invalide ignoré « %s » - trop gros"
 
-#: info/infomap.c:1516
+#: info/infomap.c:971
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr "Erreur de lecture du fichier infokey « %s » - lecture écourtée"
 
-#: info/infomap.c:1535
+#: info/infomap.c:990
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
@@ -1025,14 +1012,14 @@
 "Fichier infokey invalide « %s » (nombre magique erroné) -- exécuter infokey "
 "pour le mettre à jour"
 
-#: info/infomap.c:1544
+#: info/infomap.c:999
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr ""
 "Votre fichier infokey « %s » est désuet -- exécuter inforkey pour le mettre "
 "à jour"
 
-#: info/infomap.c:1560
+#: info/infomap.c:1015
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
@@ -1040,7 +1027,7 @@
 "Fichier infokey invalide « %s » (longueur de section erronée) -- exécuter "
 "infokey pour la mettre à jour"
 
-#: info/infomap.c:1581
+#: info/infomap.c:1036
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
@@ -1048,49 +1035,49 @@
 "Fichier infokey invalide « %s » (code de section erroné) -- exécuter infokey "
 "pour le mettre à jour"
 
-#: info/infomap.c:1716
+#: info/infomap.c:1171
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr ""
 "Données erronées dans le fichier infokey -- quelques jumelages de clés "
 "ignorés"
 
-#: info/infomap.c:1766
+#: info/infomap.c:1221
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr ""
 "Données erronées dans le fichier infokey -- quelques initialisations de "
 "variables ignorées"
 
-#: info/m-x.c:69
+#: info/m-x.c:68
 msgid "Read the name of an Info command and describe it"
 msgstr "Lire le nom d'une commande Info et la décrire"
 
-#: info/m-x.c:73
+#: info/m-x.c:72
 msgid "Describe command: "
 msgstr "Décrire la commande: "
 
-#: info/m-x.c:96
+#: info/m-x.c:95
 msgid "Read a command name in the echo area and execute it"
 msgstr "Lire le nom d'une commande dans la zone « echo area » et l'exécuter"
 
-#: info/m-x.c:140
+#: info/m-x.c:139
 msgid "Cannot execute an `echo-area' command here."
 msgstr "Ne peut pas exécuter une commande « echo-area » en cet endroit."
 
-#: info/m-x.c:154
+#: info/m-x.c:153
 #, c-format
 msgid "Undefined command: %s"
 msgstr "commandes indéfinie: %s"
 
-#: info/m-x.c:160
+#: info/m-x.c:159
 msgid "Set the height of the displayed window"
 msgstr "Ajuster la hauteur de la fenêtre affichée"
 
-#: info/m-x.c:173
+#: info/m-x.c:172
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "Ajuster la hauteur de l'écran à (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:166 info/makedoc.c:174
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1099,12 +1086,12 @@
 "   Les fichiers sources aplatis pour faire ce fichier incluent:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:556
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Ne peut pas manipuler le fichier %s.\n"
 
-#: info/nodemenu.c:31
+#: info/nodemenu.c:30
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1116,7 +1103,7 @@
 "  (Fichier)Noeud                    Lignes  Taille  Contenant Fichier(s)\n"
 "  --------------                    ------  ------  --------------------"
 
-#: info/nodemenu.c:202
+#: info/nodemenu.c:201
 msgid ""
 "Here is the menu of nodes you have recently visited.\n"
 "Select one from this menu, or use `\\[history-node]' in another window.\n"
@@ -1125,25 +1112,30 @@
 "Sélectionner en un de ce menu, ou utiliser « \\[history-node] » dans une "
 "autre fenêtre.\n"
 
-#: info/nodemenu.c:224
+#: info/nodemenu.c:223
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr ""
 "Faire une fenêtre contenant un menu de tous les noeuds actuellement visités"
 
-#: info/nodemenu.c:304
+#: info/nodemenu.c:303
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "Sélectionner un noeud qui a déjà été visité dans une fenêtre visible"
 
-#: info/nodemenu.c:317
+#: info/nodemenu.c:316
 msgid "Select visited node: "
 msgstr "Sélectionner un noeud visité: "
 
-#: info/nodemenu.c:337 info/session.c:2264
+#: info/nodemenu.c:336 info/session.c:2578
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "La référence est disparue! (%s)."
 
-#: info/session.c:162
+#: info/search.c:166
+#, c-format
+msgid "regexp error: %s"
+msgstr ""
+
+#: info/session.c:164
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1153,111 +1145,82 @@
 "Taper « \\[get-help-window] » pour obtenir de l'aide.\n"
 "Taper « \\[menu-item] » pour obtenir un item menu."
 
-#: info/session.c:620
+#: info/session.c:625
 msgid "Move down to the next line"
 msgstr "Descendre à la ligne suivante"
 
-#: info/session.c:635
+#: info/session.c:661
 msgid "Move up to the previous line"
 msgstr "Monter à la ligne précédente"
 
-#: info/session.c:650
+#: info/session.c:931
 msgid "Move to the end of the line"
 msgstr "Aller à la fin de la ligne"
 
-#: info/session.c:670
+#: info/session.c:942
 msgid "Move to the start of the line"
 msgstr "Aller au début de la ligne"
 
-#: info/session.c:860 makeinfo/node.c:1424
+#: info/session.c:1142
 msgid "Next"
 msgstr "Noeud « Next »"
 
-#: info/session.c:863
-msgid "Following Next node..."
-msgstr "Suivre le noeud « Next »..."
-
-#: info/session.c:881
-msgid "Selecting first menu item..."
-msgstr "Sélectionner le premier item menu..."
-
-#: info/session.c:893
-msgid "Selecting Next node..."
-msgstr "Sélectionner le noeud « Next »..."
-
-#: info/session.c:964
-#, c-format
-msgid "Moving Up %d time(s), then Next."
-msgstr "Monter via « Up » %d fois, puis passer au noeud « Next »."
-
-#: info/session.c:988
+#: info/session.c:1158 info/session.c:1283
 msgid "No more nodes within this document."
 msgstr "Aucun autre noeud dans ce document."
 
-#: info/session.c:1011
+#: info/session.c:1309
 msgid "No `Prev' for this node."
 msgstr "Aucun noeud « Prev » pour ce noeud."
 
-#: info/session.c:1014 info/session.c:1073
-msgid "Moving Prev in this window."
-msgstr "Monter au noeud « Prev » dans cette fenêtre."
-
-#: info/session.c:1030
+#: info/session.c:1329
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr "Aucun noeud « Prev » ou « Up » pour ce noeud dans ce document."
 
-#: info/session.c:1034
-msgid "Moving Up in this window."
-msgstr "Monter au noeud « Up » dans cette fenêtre."
-
-#: info/session.c:1084
-msgid "Moving to `Prev's last menu item."
-msgstr "Aller au dernier item menu du noeud « Prev »."
-
-#: info/session.c:1095
+#: info/session.c:1391
 msgid "Move forwards or down through node structure"
 msgstr "Avancer ou descendre à travers la structure de noeuds"
 
-#: info/session.c:1111
+#: info/session.c:1407
 msgid "Move backwards or up through node structure"
 msgstr "Reculer ou monter à travers la structure de noeuds"
 
-#: info/session.c:1205
+#: info/session.c:1508
 msgid "Scroll forward in this window"
 msgstr "Défiler vers l'avant dans cette fenêtre"
 
-#: info/session.c:1213
+#: info/session.c:1516
 msgid "Scroll forward in this window and set default window size"
 msgstr ""
 "Défiler vers l'avant dans cette fenêtre et en fixer la dimension par défaut"
 
-#: info/session.c:1221
+#: info/session.c:1524
 msgid "Scroll forward in this window staying within node"
 msgstr ""
 "Défiler vers l'avant dans cette fenêtre en demeurant à l'intérieur du noeud"
 
-#: info/session.c:1229
+#: info/session.c:1532
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
 "Défiler vers l'avant dans cette fenêtre en demeurant à l'intérieur du noeud "
 "et en fixer la dimension par défaut"
 
-#: info/session.c:1237
+#: info/session.c:1540
 msgid "Scroll backward in this window"
 msgstr "Défiler à reculons dans cette fenêtre"
 
-#: info/session.c:1245
+#: info/session.c:1548
 msgid "Scroll backward in this window and set default window size"
 msgstr ""
 "Défiler à reculons dans cette fenêtre et en fixer la dimension par défaut"
 
-#: info/session.c:1254
+#: info/session.c:1557
 msgid "Scroll backward in this window staying within node"
 msgstr ""
 "Défiler à reculons dans cette fenêtre en demeurant à l'intérieur de ce noeud"
 
-#: info/session.c:1262
+#: info/session.c:1565
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
@@ -1265,403 +1228,431 @@
 "Défiler à reculons dans cette fenêtre en demeurant à l'intérieur du noeud et "
 "en fixer la dimension par défaut"
 
-#: info/session.c:1270
+#: info/session.c:1573
 msgid "Move to the start of this node"
 msgstr "Aller au point initial de ce noeud"
 
-#: info/session.c:1277
+#: info/session.c:1580
 msgid "Move to the end of this node"
 msgstr "Aller au point terminal de ce noeud"
 
-#: info/session.c:1284
+#: info/session.c:1587
 msgid "Scroll down by lines"
 msgstr "Défiler vers le bas par pas de N lignes"
 
-#: info/session.c:1301
+#: info/session.c:1604
 msgid "Scroll up by lines"
 msgstr "Défiler vers le haut par pas de N lignes"
 
-#: info/session.c:1319
+#: info/session.c:1622
 msgid "Scroll down by half screen size"
 msgstr "Défiler vers le bas par pas d'un demi écran"
 
-#: info/session.c:1345
+#: info/session.c:1648
 msgid "Scroll up by half screen size"
 msgstr "Défiler vers le haut par pas d'un demi écran"
 
-#: info/session.c:1374
+#: info/session.c:1677
 msgid "Select the next window"
 msgstr "Sélectionner la fenêtre suivante"
 
-#: info/session.c:1413
+#: info/session.c:1716
 msgid "Select the previous window"
 msgstr "Sélectionner la fenêtre précédente"
 
-#: info/session.c:1464
+#: info/session.c:1767
 msgid "Split the current window"
 msgstr "Diviser en deux la fenêtre courante"
 
-#: info/session.c:1545
+#: info/session.c:1848
 msgid "Delete the current window"
 msgstr "Éliminer la fenêtre courante"
 
-#: info/session.c:1553
+#: info/session.c:1856
 msgid "Cannot delete a permanent window"
 msgstr "Ne peut pas éliminer une fenêtre permanente"
 
-#: info/session.c:1585
+#: info/session.c:1888
 msgid "Delete all other windows"
 msgstr "Éliminer toutes les autres fenêtres"
 
-#: info/session.c:1631
+#: info/session.c:1934
 msgid "Scroll the other window"
 msgstr "Défiler l'autre fenêtre"
 
-#: info/session.c:1652
+#: info/session.c:1955
 msgid "Scroll the other window backward"
 msgstr "Défiler l'autre fenêtre à reculons"
 
-#: info/session.c:1658
+#: info/session.c:1961
 msgid "Grow (or shrink) this window"
 msgstr "Agrandir (ou réduire) cette fenêtre"
 
-#: info/session.c:1669
+#: info/session.c:1972
 msgid "Divide the available screen space among the visible windows"
 msgstr "Répartir l'espace écran disponible parmi les fenêtres visibles"
 
-#: info/session.c:1676
+#: info/session.c:1979
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "Basculer l'état du remplissage de ligne dans la fenêtre courante"
 
-#: info/session.c:1848
+#: info/session.c:1986
+msgid "Toggle the usage of regular expressions in searches"
+msgstr ""
+
+#: info/session.c:1990
+msgid "Using regular expressions for searches."
+msgstr ""
+
+#: info/session.c:1991
+msgid "Using literal strings for searches."
+msgstr ""
+
+#: info/session.c:2162
 msgid "Select the Next node"
 msgstr "Sélectionner le noeud « Next »"
 
-#: info/session.c:1856
+#: info/session.c:2170
 msgid "Select the Prev node"
 msgstr "Sélectionner le noeud « Prev »"
 
-#: info/session.c:1864
+#: info/session.c:2178
 msgid "Select the Up node"
 msgstr "Sélectionner le noeud « Up »"
 
-#: info/session.c:1871
+#: info/session.c:2185
 msgid "Select the last node in this file"
 msgstr "Sélectionner le dernier noeud dans ce fichier"
 
-#: info/session.c:1898 info/session.c:1931
+#: info/session.c:2212 info/session.c:2245
 msgid "This window has no additional nodes"
 msgstr "Cette fenêtre a aucun noeud additionnel"
 
-#: info/session.c:1904
+#: info/session.c:2218
 msgid "Select the first node in this file"
 msgstr "Sélectionner le premier noeud dans ce fichier"
 
-#: info/session.c:1938
+#: info/session.c:2252
 msgid "Select the last item in this node's menu"
 msgstr "Sélectionner le dernier item dans ce menu de noeuds"
 
-#: info/session.c:1944
+#: info/session.c:2258
 msgid "Select this menu item"
 msgstr "Sélectionner cet item menu"
 
-#: info/session.c:1977
+#: info/session.c:2291
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "Il n'y a pas %d items dans ce menu."
 
-#: info/session.c:2171 info/session.c:2172
+#: info/session.c:2485 info/session.c:2486
 #, c-format
 msgid "Menu item (%s): "
 msgstr "Item menu (%s): "
 
-#: info/session.c:2175
+#: info/session.c:2489
 msgid "Menu item: "
 msgstr "Item menu: "
 
-#: info/session.c:2182 info/session.c:2183
+#: info/session.c:2496 info/session.c:2497
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "Suivre xref (%s): "
 
-#: info/session.c:2186
+#: info/session.c:2500
 msgid "Follow xref: "
 msgstr "Suivre xref: "
 
-#: info/session.c:2315
+#: info/session.c:2629
 msgid "Read a menu item and select its node"
 msgstr "Lire un item menu et sélectionner son noeud"
 
-#: info/session.c:2323
+#: info/session.c:2637
 msgid "Read a footnote or cross reference and select its node"
 msgstr ""
 "Lire une note de bas de page ou une référence croisée et sélectionner son "
 "noeud"
 
-#: info/session.c:2329
+#: info/session.c:2643
 msgid "Move to the start of this node's menu"
 msgstr "Aller au point initial de ce menu de noeuds"
 
-#: info/session.c:2353
+#: info/session.c:2667
 msgid "Visit as many menu items at once as possible"
 msgstr "Visiter d'un seul coup autant d'items menu que possible"
 
-#: info/session.c:2381
+#: info/session.c:2695
 msgid "Read a node name and select it"
 msgstr "Lire un nom de noeud et sélectionner ce noeud"
 
-#: info/session.c:2436 info/session.c:2441
+#: info/session.c:2750 info/session.c:2755
 msgid "Goto node: "
 msgstr "Aller au noeud: "
 
-#: info/session.c:2505
+#: info/session.c:2819
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "Aucun menu dans le noeud « %s »."
 
-#: info/session.c:2551
+#: info/session.c:2865
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "Aucun item menu « %s » dans le noeud « %s »."
 
-#: info/session.c:2581
+#: info/session.c:2895
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "Incapable de trouver le noeud référencé par « %s » dans « %s »."
 
-#: info/session.c:2631
+#: info/session.c:2945
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "Lire une liste de menus en partant de « dir » et les suivre"
 
-#: info/session.c:2633
+#: info/session.c:2947
 msgid "Follow menus: "
 msgstr "Suivre les menus: "
 
-#: info/session.c:2826
+#: info/session.c:3140
 msgid "Find the node describing program invocation"
 msgstr "Trouver le noeud décrivant l'invocation au programme"
 
-#: info/session.c:2828
+#: info/session.c:3142
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "Trouver le noeud Invocation de [%s]: "
 
-#: info/session.c:2866
+#: info/session.c:3180
 msgid "Read a manpage reference and select it"
 msgstr "Lire une référence de page-manuel et la sélectionner"
 
-#: info/session.c:2870
+#: info/session.c:3184
 msgid "Get Manpage: "
 msgstr "Obtenir la Page-manuel: "
 
-#: info/session.c:2900
+#: info/session.c:3214
 msgid "Select the node `Top' in this file"
 msgstr "Sélectionner le noeud « Top » dans ce fichier"
 
-#: info/session.c:2906
+#: info/session.c:3220
 msgid "Select the node `(dir)'"
 msgstr "Sélectionner le noeud « (dir) »"
 
-#: info/session.c:2923 info/session.c:2925
+#: info/session.c:3237 info/session.c:3239
 #, c-format
 msgid "Kill node (%s): "
 msgstr "Effacer le noeud (%s): "
 
-#: info/session.c:2977
+#: info/session.c:3291
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "Ne peut pas effacer le noeud « %s »"
 
-#: info/session.c:2987
+#: info/session.c:3301
 msgid "Cannot kill the last node"
 msgstr "Ne peut pas effacer le dernier noeud"
 
-#: info/session.c:3073
+#: info/session.c:3387
 msgid "Select the most recently selected node"
 msgstr "Choisir le noeud qui a été le plus récemment sélectionné"
 
-#: info/session.c:3079
+#: info/session.c:3393
 msgid "Kill this node"
 msgstr "Effacer ce noeud"
 
-#: info/session.c:3087
+#: info/session.c:3401
 msgid "Read the name of a file and select it"
 msgstr "Lire le nom d'un fichier et le sélectionner"
 
-#: info/session.c:3091
+#: info/session.c:3405
 msgid "Find file: "
 msgstr "Trouver le fichier: "
 
-#: info/session.c:3108
+#: info/session.c:3422
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "Ne peut pas trouver « %s »."
 
-#: info/session.c:3151 info/session.c:3269
+#: info/session.c:3465 info/session.c:3583
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "Ne peut pas créer le fichier de sortie « %s »."
 
-#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+#: info/session.c:3479 info/session.c:3601 info/session.c:3661
 msgid "Done."
 msgstr "Terminé."
 
-#: info/session.c:3220
+#: info/session.c:3534
 #, c-format
 msgid "Writing node %s..."
 msgstr "Écriture du noeud « %s »..."
 
-#: info/session.c:3296
+#: info/session.c:3610
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr "Acheminer les contenus de ce noeud à travers INFO_PRINT_COMMAND"
 
-#: info/session.c:3331
+#: info/session.c:3645
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "Ne peut ouvrir un tube de communication à « %s »."
 
-#: info/session.c:3337
+#: info/session.c:3651
 #, c-format
 msgid "Printing node %s..."
 msgstr "Impression du noeud « %s »..."
 
-#: info/session.c:3567
+#: info/session.c:3900
+msgid "Search continued from the end of the document."
+msgstr ""
+
+#: info/session.c:3905
+msgid "Search continued from the beginning of the document."
+msgstr ""
+
+#: info/session.c:3922
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "Fouille du sous-fichier « %s »..."
 
-#: info/session.c:3619
+#: info/session.c:3979
 msgid "Read a string and search for it case-sensitively"
 msgstr ""
 "Lire une chaîne et en faire la fouille en distinguant les majuscules et "
 "minuscules"
 
-#: info/session.c:3626
+#: info/session.c:3986
 msgid "Read a string and search for it"
 msgstr "Lire une chaîne et en faire la fouille"
 
-#: info/session.c:3634
+#: info/session.c:3994
 msgid "Read a string and search backward for it"
 msgstr "Lire une chaîne et en faire la fouille à reculons"
 
-#: info/session.c:3670 info/session.c:3677
+#: info/session.c:4030 info/session.c:4036
 #, c-format
-msgid "%s%sfor string [%s]: "
-msgstr "%s%s pour la chaîne [%s]: "
+msgid "%s%s%s [%s]: "
+msgstr ""
+
+#: info/session.c:4031 info/session.c:4037
+msgid "Regexp search"
+msgstr ""
+
+#: info/session.c:4032 info/session.c:4038
+msgid " case-sensitively"
+msgstr ""
 
-#: info/session.c:3671 info/session.c:3678
-msgid "Search backward"
-msgstr "Fouiller à reculons"
+#: info/session.c:4033 info/session.c:4039
+msgid " backward"
+msgstr ""
 
-#: info/session.c:3672 info/session.c:3678
+#: info/session.c:4037
 msgid "Search"
 msgstr "Fouiller"
 
-#: info/session.c:3673 info/session.c:3679
-msgid " case-sensitively "
-msgstr " en distinguant les casses majuscules et minuscules "
-
-#: info/session.c:3674 info/session.c:3679
-msgid " "
-msgstr " "
-
-#: info/session.c:3718
+#: info/session.c:4079
 msgid "Search failed."
 msgstr "Fouille infructueuse."
 
-#: info/session.c:3736
+#: info/session.c:4097
 msgid "Repeat last search in the same direction"
 msgstr "Répéter la dernière fouille dans la même direction"
 
-#: info/session.c:3739 info/session.c:3749
+#: info/session.c:4100 info/session.c:4110
 msgid "No previous search string"
 msgstr "Aucune chaîne de fouille antérieure"
 
-#: info/session.c:3746
+#: info/session.c:4107
 msgid "Repeat last search in the reverse direction"
 msgstr "Répéter la dernière fouille dans la direction inverse"
 
-#: info/session.c:3765 info/session.c:3771
+#: info/session.c:4126 info/session.c:4132
 msgid "Search interactively for a string as you type it"
 msgstr "Fouiller interactivement pour une chaîne telle que vous la tapez"
 
-#: info/session.c:3851
+#: info/session.c:4212
+msgid "Regexp I-search backward: "
+msgstr ""
+
+#: info/session.c:4213
 msgid "I-search backward: "
 msgstr "Fouille I-search à reculons: "
 
-#: info/session.c:3853
+#: info/session.c:4215
+msgid "Regexp I-search: "
+msgstr ""
+
+#: info/session.c:4216
 msgid "I-search: "
 msgstr "Fouille I-search: "
 
-#: info/session.c:3878 info/session.c:3880
+#: info/session.c:4241 info/session.c:4243
 msgid "Failing "
 msgstr "Échec "
 
-#: info/session.c:4340
+#: info/session.c:4734
 msgid "Move to the previous cross reference"
 msgstr "Aller à la référence croisée précédente"
 
-#: info/session.c:4349
+#: info/session.c:4752
 msgid "Move to the next cross reference"
 msgstr "Aller à la prochaine référence croisée"
 
-#: info/session.c:4359
+#: info/session.c:4774
 msgid "Select reference or menu item appearing on this line"
 msgstr ""
 "Sélectionner la référence ou l'item menu apparaissant sur cette ligne"
 
-#: info/session.c:4382
+#: info/session.c:4797
 msgid "Cancel current operation"
 msgstr "Annuler l'opération courante"
 
-#: info/session.c:4389
+#: info/session.c:4804
 msgid "Quit"
 msgstr "Quitter"
 
-#: info/session.c:4398
+#: info/session.c:4813
 msgid "Move the cursor to a specific line of the window"
 msgstr "Déplacer le curseur sur une ligne spécifique de la fenêtre"
 
-#: info/session.c:4430
+#: info/session.c:4845
 msgid "Redraw the display"
 msgstr "Redessiner l'affichage écran"
 
-#: info/session.c:4467
+#: info/session.c:4882
 msgid "Quit using Info"
 msgstr "Quitter en utilisant Info"
 
-#: info/session.c:4480
+#: info/session.c:4895
 msgid "Run command bound to this key's lowercase variant"
 msgstr "Exécuter la commande liée à cette variante de touche en minuscule"
 
-#: info/session.c:4491
+#: info/session.c:4906
 #, c-format
 msgid "Unknown command (%s)."
 msgstr "Commande inconnue (%s)."
 
-#: info/session.c:4494
+#: info/session.c:4909
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "« %s » est invalide"
 
-#: info/session.c:4495
+#: info/session.c:4910
 #, c-format
 msgid "`%s' is invalid"
 msgstr "« %s » est invalide"
 
-#: info/session.c:4709
+#: info/session.c:5125
 msgid "Add this digit to the current numeric argument"
 msgstr "Ajouter ce chiffre à l'argument numérique courant"
 
-#: info/session.c:4718
+#: info/session.c:5134
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "Enclencher (ou multiplier par 4) l'argument numérique courant"
 
-#: info/session.c:4733
+#: info/session.c:5149
 msgid "Internally used by \\[universal-argument]"
 msgstr "Utilisé internement par \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:336
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "lecture: Mémoire virtuelle épuisée!\n"
@@ -1707,196 +1698,362 @@
 msgstr ""
 "Contrôler ce qui arrive lorsqu'un défilement est requis à la fin d'un noeud"
 
-#: info/variables.c:64
+#: info/variables.c:65
+msgid "Same as scroll-behaviour"
+msgstr ""
+
+#: info/variables.c:69
 msgid "The number lines to scroll when the cursor moves out of the window"
 msgstr "Le nombre de lignes à défiler quand le curseur va hors de la fenêtre"
 
-#: info/variables.c:68
+#: info/variables.c:73
+msgid "Controls whether scroll-behavior affects cursor movement commands"
+msgstr ""
+
+#: info/variables.c:77
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
 msgstr "En position « On », Info accepte et affiche les caractères ISO Latin"
 
-#: info/variables.c:74
+#: info/variables.c:81
+msgid ""
+"What to do when a scrolling command is issued at the end of the last node"
+msgstr ""
+
+#: info/variables.c:88
 msgid "Explain the use of a variable"
 msgstr "Expliquer l'usage d'une variable"
 
-#: info/variables.c:80
+#: info/variables.c:94
 msgid "Describe variable: "
 msgstr "Décrire la variable: "
 
-#: info/variables.c:99
+#: info/variables.c:113
 msgid "Set the value of an Info variable"
 msgstr "Fixer la valeur d'une variable Info"
 
-#: info/variables.c:105
+#: info/variables.c:119
 msgid "Set variable: "
 msgstr "Fixer la variable: "
 
-#: info/variables.c:123
+#: info/variables.c:137
 #, c-format
 msgid "Set %s to value (%d): "
 msgstr "Fixer %s à la valeur (%d): "
 
-#: info/variables.c:164
+#: info/variables.c:178
 #, c-format
 msgid "Set %s to value (%s): "
 msgstr "Fixer %s à la valeur (%s): "
 
 # Est-ce vraiment un message à traduire?
-#: info/window.c:1138
+#: info/window.c:1026
 msgid "--*** Tags out of Date ***"
 msgstr "--*** Étiquettes passées Date ***"
 
-#: info/window.c:1149
+#: info/window.c:1037
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), lignes ----, "
 
-#: info/window.c:1156
+#: info/window.c:1044
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d lignes --%s--"
 
-#: info/window.c:1160
+#: info/window.c:1048
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d lignes --%s--"
 
-#: info/window.c:1167
+#: info/window.c:1055
 #, c-format
 msgid " Subfile: %s"
 msgstr " Sous-fichier: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
+#: install-info/install-info.c:221
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: l'option « %s » est ambiguë\n"
+msgid "%s: warning: "
+msgstr "%s: avertissement: "
 
-#: lib/getopt.c:603 lib/getopt.c:607
+#: install-info/install-info.c:270
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: l'option « --%s » ne permet pas un argument\n"
+msgid " for %s"
+msgstr " pour %s"
 
-#: lib/getopt.c:616 lib/getopt.c:621
+#: install-info/install-info.c:500
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: l'option « %c%s » ne permet pas un argument\n"
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "\t\\tUtiliser « %s --help » pour une liste complète des options.\n"
 
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#: install-info/install-info.c:508
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: l'option « %s » exige un argument\n"
+msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+msgstr ""
+
+#: install-info/install-info.c:510
+msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
+msgstr ""
 
-#: lib/getopt.c:727 lib/getopt.c:730
+#: install-info/install-info.c:513
+msgid ""
+"Options:\n"
+" --debug             report what is being done.\n"
+" --delete            delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                      don't insert any new entries.\n"
+" --description=TEXT  the description of the entry is TEXT; used with\n"
+"                      the --name option to become synonymous with the\n"
+"                      --entry option.\n"
+" --dir-file=NAME     specify file name of Info directory file;\n"
+"                      equivalent to using the DIR-FILE argument.\n"
+" --dry-run           same as --test."
+msgstr ""
+
+#: install-info/install-info.c:525
+msgid ""
+" --entry=TEXT        insert TEXT as an Info directory entry.\n"
+"                      TEXT is written as an Info menu item line followed\n"
+"                       by zero or more extra lines starting with "
+"whitespace.\n"
+"                      If you specify more than one entry, all are added.\n"
+"                      If you don't specify any entries, they are determined\n"
+"                       from information in the Info file itself.\n"
+"                      When removing, TEXT specifies the entry to remove.\n"
+"                      TEXT is only removed as a last resort, if the\n"
+"                      entry as determined from the Info file is not "
+"present,\n"
+"                      and the basename of the Info file isn't found either."
+msgstr ""
+
+#: install-info/install-info.c:537
+msgid ""
+" --help              display this help and exit.\n"
+" --info-dir=DIR      same as --dir-file=DIR/dir.\n"
+" --info-file=FILE    specify Info file to install in the directory;\n"
+"                      equivalent to using the INFO-FILE argument.\n"
+" --item=TEXT         same as --entry=TEXT.\n"
+" --keep-old          do not replace entries, or remove empty sections.\n"
+" --menuentry=TEXT    same as --name=TEXT.\n"
+" --name=TEXT         the name of the entry is TEXT; used with --description\n"
+"                      to become synonymous with the --entry option.\n"
+" --no-indent         do not format new entries in the DIR file.\n"
+" --quiet             suppress warnings."
+msgstr ""
+
+#: install-info/install-info.c:550
+msgid ""
+" --regex=R           put this file's entries in all sections that match the\n"
+"                      regular expression R (ignoring case).\n"
+" --remove            same as --delete.\n"
+" --remove-exactly    only remove if the info file name matches exactly;\n"
+"                      suffixes such as .info and .gz are not ignored.\n"
+" --section=SEC       put entries in section SEC of the directory.\n"
+"                      If you specify more than one section, all the entries\n"
+"                       are added in each of the sections.\n"
+"                      If you don't specify any sections, they are "
+"determined\n"
+"                       from information in the Info file itself.\n"
+" --section R SEC     equivalent to --regex=R --section=SEC --add-once."
+msgstr ""
+
+#: install-info/install-info.c:563
+msgid ""
+" --silent            suppress warnings.\n"
+" --test              suppress updating of DIR-FILE.\n"
+" --version           display version information and exit."
+msgstr ""
+
+#: install-info/install-info.c:570
+msgid ""
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+
+#: install-info/install-info.c:597
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: option non reconnue « --%s »\n"
+msgid ""
+"This is the file .../info/dir, which contains the\n"
+"topmost node of the Info hierarchy, called (dir)Top.\n"
+"The first time you invoke Info you start off looking at this node.\n"
+"\n"
+"%s\tThis is the top of the INFO tree\n"
+"\n"
+"  This (the Directory node) gives a menu of major topics.\n"
+"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"Ceci est le fichier .../info/dir, lequel contient le noeud \n"
+"le plus haut dans la hiérarchie Info, noeud appelé (dir)Top.\n"
+"La première fois que Info est invoqué, vous démarrez la recherche \n"
+"à partir de ce noeud.\n"
+"\n"
+"%s\tCeci est le haut de l'arborescence INFO\n"
+"\n"
+"  Ceci (le noeud Répertoire) fournit un menu des sujets majeurs.\n"
+"  Taper « q » pour quitter, « ? » pour lister toutes les commandes Info,\n"
+"  « d » pour revenir à cet endroit,\n"
+"  « h » fournit un guide d'initiation pour les nouveaux venus,\n"
+"  « mEmacs<Return> » démarre une consultation du manuel Emacs, etc.\n"
+"\n"
+"  En Emacs, vous pouvez cliquer avec le bouton-2 de la souris sur un item "
+"menu \n"
+"  ou sur une référence croisée pour le sélectionner.\n"
+"\n"
+"%s\n"
 
-#: lib/getopt.c:738 lib/getopt.c:741
+#: install-info/install-info.c:622
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: option non reconnue « %c%s »\n"
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s: ne peut pas lire (%s) et ne peut pas créer (%s)\n"
 
-#: lib/getopt.c:796 lib/getopt.c:799
+#: install-info/install-info.c:715
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: option illégale -- %c\n"
+msgid "%s: empty file"
+msgstr "%s: fichier vide"
+
+#: install-info/install-info.c:1046 install-info/install-info.c:1086
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "START-INFO-DIR-ENTRY non apparié avec END-INFO-DIR-ENTRY"
 
-#: lib/getopt.c:805 lib/getopt.c:808
+#: install-info/install-info.c:1081
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "END-INFO-DIR-ENTRY non apparié avec START-INFO-DIR-ENTRY"
+
+#: install-info/install-info.c:1946 install-info/install-info.c:1956
 #, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: option invalide -- %c\n"
+msgid "%s: already have dir file: %s\n"
+msgstr "%s: a déjà un fichier répertoire: %s\n"
 
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#: install-info/install-info.c:2036
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: l'option exige un argument -- %c\n"
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s: Spécifier le fichier Info seulement une fois.\n"
 
-#: lib/getopt.c:935 lib/getopt.c:954
+#: install-info/install-info.c:2069
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: l'option « -W %s » est ambiguë\n"
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
+#: install-info/install-info.c:2081
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: l'option « -W %s » ne permet pas un argument\n"
+msgid "Error in regular expression `%s': %s"
+msgstr ""
 
-#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#: install-info/install-info.c:2139
+#, c-format
+msgid "excess command line argument `%s'"
+msgstr "excédent d'argument de ligne de commande « %s »"
+
+#: install-info/install-info.c:2143
+msgid "No input file specified; try --help for more information."
+msgstr ""
+"Aucun fichier d'entrée spécifié; utiliser --help pour plus d'informations."
+
+#: install-info/install-info.c:2146
+msgid "No dir file specified; try --help for more information."
+msgstr ""
+"Aucun fichier dir spécifié; utiliser --help pour plus d'informations."
+
+#: install-info/install-info.c:2288
+#, c-format
+msgid "no info dir entry in `%s'"
+msgstr "aucune entrée répertoire Info dans « %s »"
+
+#: install-info/install-info.c:2536
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "aucune entrée trouvée pour « %s »; rien n'a été éliminé"
+
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
+
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
+
+#: makeinfo/cmds.c:582 makeinfo/cmds.c:604
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr "arguments à @%s ignorés"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "January"
 msgstr "janvier"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "February"
 msgstr "février"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "March"
 msgstr "mars"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "April"
 msgstr "avril"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:779
 msgid "May"
 msgstr "mai"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "June"
 msgstr "juin"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "July"
 msgstr "juillet"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "August"
 msgstr "août"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "September"
 msgstr "septembre"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:780
 msgid "October"
 msgstr "octobre"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "November"
 msgstr "novembre"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:781
 msgid "December"
 msgstr "décembre"
 
-#: makeinfo/cmds.c:936
+#: makeinfo/cmds.c:1131
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "caractère %c improbable dans la macro @var"
 
-#: makeinfo/cmds.c:979
+#: makeinfo/cmds.c:1174
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "argument de la macro @sc tout en majuscules, alors aucun effet"
 
-#: makeinfo/cmds.c:1034
+#: makeinfo/cmds.c:1229
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "« { » attendu, mais a vu « %c »"
 
-#: makeinfo/cmds.c:1074
+#: makeinfo/cmds.c:1269
 msgid "end of file inside verb block"
 msgstr "fin de fichier à l'intérieur du bloc verbe"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1277
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "« } » attendu, mais a vu « %c »"
 
-#: makeinfo/cmds.c:1112
+#: makeinfo/cmds.c:1308
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
@@ -1904,331 +2061,315 @@
 "@strong{Note...} produit une table douteuse de références croisées dans "
 "Info; réécrire pour éviter cela"
 
-#: makeinfo/cmds.c:1305
+#: makeinfo/cmds.c:1504
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s est périmé"
 
-#: makeinfo/cmds.c:1414
+#: makeinfo/cmds.c:1612
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "La macro @sp exige un argument numérique positif, pas « %s »"
 
-#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Mauvais argument à %c%s"
 
-#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4317
 msgid "asis"
 msgstr "« asis »"
 
-#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4319
 msgid "none"
 msgstr "« none »"
 
-#: makeinfo/cmds.c:1789
+#: makeinfo/cmds.c:2049
 #, c-format
 msgid "Bad argument to @%s"
 msgstr "Mauvais argument à @%s"
 
-#: makeinfo/cmds.c:1803
+#: makeinfo/cmds.c:2063
 msgid "insert"
 msgstr "insérer"
 
-#: makeinfo/defun.c:84
-msgid "Missing `}' in @def arg"
-msgstr "Accolade « } » manquante dans @def arg"
+#: makeinfo/cmds.c:2079
+#, c-format
+msgid "Bad argument to @%s: %s"
+msgstr ""
 
-#: makeinfo/defun.c:403
-msgid "Function"
-msgstr "Fonction"
-
-#: makeinfo/defun.c:406
-msgid "Macro"
-msgstr "Macro"
-
-#: makeinfo/defun.c:409
-msgid "Special Form"
-msgstr "Forme Spéciale"
-
-#: makeinfo/defun.c:413
-msgid "Variable"
-msgstr "Variable"
-
-#: makeinfo/defun.c:416
-msgid "User Option"
-msgstr "Option de l'Usager"
-
-#: makeinfo/defun.c:420
-msgid "Instance Variable"
-msgstr "Variable d'Instance"
-
-#: makeinfo/defun.c:424
-msgid "Method"
-msgstr "Méthode"
+#: makeinfo/cmds.c:2162
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
+msgstr ""
 
-#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2229
-msgid "of"
-msgstr "de"
+#: makeinfo/cmds.c:2182
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgstr ""
 
-#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
-msgid "on"
-msgstr "sur"
+#: makeinfo/defun.c:83
+msgid "Missing `}' in @def arg"
+msgstr "Accolade « } » manquante dans @def arg"
 
 #: makeinfo/defun.c:711
 #, c-format
 msgid "Must be in `@%s' environment to use `@%s'"
 msgstr "Doit être dans une insertion « @%s » afin d'utiliser « @%s »."
 
-#: makeinfo/files.c:435
+#: makeinfo/files.c:434
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
-#: makeinfo/files.c:638
+#: makeinfo/files.c:637
 #, c-format
 msgid "`%s' omitted before output filename"
 msgstr "« %s » omis avant le nom de fichier de sortie"
 
-#: makeinfo/files.c:646
+#: makeinfo/files.c:645
 #, c-format
 msgid "`%s' omitted since writing to stdout"
 msgstr "« %s » omis avant l'écriture sur la sortie standard"
 
-#: makeinfo/files.c:694
+#: makeinfo/files.c:693
 msgid "Output buffer not empty."
 msgstr "Tampon de sortie n'est pas vide."
 
-#: makeinfo/footnote.c:150
+#: makeinfo/float.c:181
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr ""
+
+#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:959
+#: makeinfo/index.c:965
+msgid "See "
+msgstr "Voir "
+
+#: makeinfo/footnote.c:149
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
 msgstr "« %c%s » nécessite un argument « {...} », non pas « %s » uniquement"
 
-#: makeinfo/footnote.c:165
+#: makeinfo/footnote.c:164
 #, c-format
 msgid "No closing brace for footnote `%s'"
 msgstr "Accolade fermante « } » manquante pour la note de bas de page « %s »"
 
-#: makeinfo/footnote.c:198
+#: makeinfo/footnote.c:197
 msgid "Footnote defined without parent node"
 msgstr "La note de bas de page est définie sans noeud parent"
 
-#: makeinfo/footnote.c:210
+#: makeinfo/footnote.c:209
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "Les notes de bas de page récursives ne sont pas permises"
 
 # Est-ce vraiement un message à traduire?
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:301 makeinfo/index.c:187
 msgid "Footnotes"
 msgstr "Notes de bas de page"
 
-#: makeinfo/html.c:87
+#: makeinfo/html.c:91
 #, c-format
 msgid "%s: could not open --css-file: %s"
 msgstr "%s: ne peut ouvrir --css-file: %s"
 
-#: makeinfo/html.c:172
+#: makeinfo/html.c:180
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s%d: --css-file terminé dans le commentaire"
 
-#: makeinfo/html.c:207
-msgid "Untitled"
-msgstr "Sans titre"
-
-#: makeinfo/html.c:422
+#: makeinfo/html.c:426
 msgid "[unexpected] no html tag to pop"
 msgstr "[inattendu] pas d'étiquette html à dépiler"
 
-#: makeinfo/html.c:752
+#: makeinfo/html.c:800
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[inattendu] nom de noeud invalide: « %s »"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:167
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Nom d'index inconnu « %s »"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:232
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr "Info ne peut traiter « : » dans l'entrée d'index « %s »"
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:410
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "L'index « %s » existe toujours"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:453
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "Nom d'index « %s » inconnu et/ou « %s » dans @synindex"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:676
 msgid "(line )"
 msgstr "(ligne )"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:684
 #, c-format
 msgid "(line %*d)"
 msgstr "(ligne %*d)"
 
-#: makeinfo/index.c:750
+#: makeinfo/index.c:765
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Nom d'index « %s » inconnu dans @printindex"
 
-#: makeinfo/index.c:819
+#: makeinfo/index.c:834
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "Entrée pour l'index « %s » à l'extérieure de tout noeud"
 
-#: makeinfo/index.c:822 makeinfo/index.c:858
+#: makeinfo/index.c:837 makeinfo/index.c:873
 msgid "(outside of any node)"
 msgstr "(à l'extérieur de tout noeud)"
 
-#: makeinfo/index.c:919 makeinfo/index.c:925
-msgid "See "
-msgstr "Voir "
-
-#: makeinfo/insertion.c:160
+#: makeinfo/insertion.c:161
 msgid "@item not allowed in argument to @itemize"
 msgstr "@item n'est pas permis dans l'agument @itemize"
 
-#: makeinfo/insertion.c:238
+#: makeinfo/insertion.c:242
 msgid "Broken-Type in insertion_type_pname"
 msgstr "Type impossible dans la fonction insertion_type_pname"
 
-#: makeinfo/insertion.c:334
+#: makeinfo/insertion.c:338
 msgid "Enumeration stack overflow"
 msgstr "Débordement de la pile d'énumérations"
 
-#: makeinfo/insertion.c:366
+#: makeinfo/insertion.c:370
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "débordement du lettrage, reprise à partir de %c"
 
-#: makeinfo/insertion.c:631
+#: makeinfo/insertion.c:639
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr "%s exige un argument: le formateur pour %citem"
 
-#: makeinfo/insertion.c:719
+#: makeinfo/insertion.c:727
 #, c-format
 msgid "%cfloat environments cannot be nested"
 msgstr "%cenvironnements float ne peuvent être imbriqués"
 
-#: makeinfo/insertion.c:973
+#: makeinfo/insertion.c:981
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr "« @end » s'attendait à « %s », mais a vu « %s »"
 
-#: makeinfo/insertion.c:1337
+#: makeinfo/insertion.c:1349
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "« %cend %s » non apparié"
 
-#: makeinfo/insertion.c:1592
+#: makeinfo/insertion.c:1618
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s exige une lettre ou un chiffre"
 
-#: makeinfo/insertion.c:1687
+#: makeinfo/insertion.c:1718
 msgid "end of file inside verbatim block"
 msgstr "fin de fichier à l'intérieur du bloc verbatim"
 
-#: makeinfo/insertion.c:1913
+#: makeinfo/insertion.c:1942
 #, c-format
 msgid "@%s not meaningful outside `@float' environment"
 msgstr "@%s n'a aucun sens à l'extérieur de l'environnement « @float »"
 
-#: makeinfo/insertion.c:1949
+#: makeinfo/insertion.c:1978
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "@menu vu avant le premier @node, création du noeud « Top »"
 
-#: makeinfo/insertion.c:1950
+#: makeinfo/insertion.c:1979
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr ""
 "votre noeud @top devrait se retrouver peut-être dans @ifnottex plutôt que "
 "dans @ifinfo?"
 
-#: makeinfo/insertion.c:1962
+#: makeinfo/insertion.c:1991
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "@detailmenu vu avant le premier noeud, création du noeud « Top »"
 
-#: makeinfo/insertion.c:2018
+#: makeinfo/insertion.c:2047
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
 msgstr ""
 "@%s n'a aucun sens à l'extérieur des environnements « @titlepage » et « "
 "@quotation »"
 
-#: makeinfo/insertion.c:2032
+#: makeinfo/insertion.c:2061
 #, c-format
 msgid "@%s not meaningful outside `@titlepage' environment"
 msgstr "@%s n'a aucun sens à l'extérieur de l'environnement « @titlepage »"
 
-#: makeinfo/insertion.c:2063
+#: makeinfo/insertion.c:2092
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "« %c%s » non apparié"
 
-#: makeinfo/insertion.c:2068
+#: makeinfo/insertion.c:2097
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "« %c%s » a besoin de quelque chose après lui"
 
-#: makeinfo/insertion.c:2074
+#: makeinfo/insertion.c:2103
 #, c-format
 msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr "Mauvais argument « %s » à « @%s » utilisant « %s »"
 
-#: makeinfo/insertion.c:2171
+#: makeinfo/insertion.c:2200
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "macro @%s inactive à l'intérieur d'un bloc « %s »"
 
-#: makeinfo/insertion.c:2180
+#: makeinfo/insertion.c:2209
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "macro @itemx inactive à l'intérieur d'un bloc « %s »"
 
-#: makeinfo/insertion.c:2356
+#: makeinfo/insertion.c:2383
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s est trouvé à l'extérieur d'un bloc d'insertion"
 
-#: makeinfo/lang.c:580
+#: makeinfo/lang.c:1218
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1281
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s n'est pas un code ISO 639 valide pour l'identification de langue"
 
-#: makeinfo/lang.c:655
+#: makeinfo/lang.c:1399
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "nom d'encodage non reconnu « %s »"
 
-#: makeinfo/lang.c:663
+#: makeinfo/lang.c:1407
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "désolé, l'encodage « %s » n'est pas supporté"
 
-#: makeinfo/lang.c:715
+#: makeinfo/lang.c:1492
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "caractère encodé invalide « %s »"
 
-#: makeinfo/lang.c:1009
+#: makeinfo/lang.c:1800
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s s'attend à argument « i » ou « j », non pas « %c »"
 
-#: makeinfo/lang.c:1013
+#: makeinfo/lang.c:1804
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s attend un argument d'un seul caractère « i » ou « j »"
@@ -2243,7 +2384,7 @@
 msgid "here is the previous definition of `%s'"
 msgstr "ici se trouve la définition précédente de « %s »"
 
-#: makeinfo/macro.c:355
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
@@ -2254,46 +2395,50 @@
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "Macro « %s » appelée à la ligne %d avec trop d'arguments"
 
-#: makeinfo/macro.c:586
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "macro %cend non trouvée"
 
-#: makeinfo/macro.c:624
-msgid "@quote-arg only useful for single-argument macros"
-msgstr "macro @quote-arg utile seulement pour des macros à un seul argument"
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
+msgstr ""
+
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
 
-#: makeinfo/macro.c:660
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "macro @end %s non balancée avec @%s"
 
-#: makeinfo/makeinfo.c:184
+#: makeinfo/makeinfo.c:188
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "Beaucoup trop d'erreurs!  Abandon.\n"
 
-#: makeinfo/makeinfo.c:302
+#: makeinfo/makeinfo.c:306
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: avertissement: "
 
-#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
 #, c-format
 msgid "Misplaced %c"
 msgstr "%c égarée ou mal placée"
 
-#: makeinfo/makeinfo.c:340
+#: makeinfo/makeinfo.c:344
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Utiliser « %s --help » pour plus d'informations.\n"
 
-#: makeinfo/makeinfo.c:343
+#: makeinfo/makeinfo.c:347
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Usage: %s [OPTION]... FICHIER-TEXINFO...\n"
 
-#: makeinfo/makeinfo.c:346
+#: makeinfo/makeinfo.c:350
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -2301,142 +2446,94 @@
 "Traduire une documentation Texinfo source en divers autres formats:\n"
 "Fichiers Info adéquats pour lire en ligne avec Emacs ou GNU Info autonome\n"
 
-#: makeinfo/makeinfo.c:350
+#: makeinfo/makeinfo.c:354
 #, c-format
 msgid ""
 "General options:\n"
 "      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --document-language=STR locale to use in translating Texinfo keywords\n"
+"                                for the output document (default C).\n"
 "      --force                 preserve output even if errors.\n"
 "      --help                  display this help and exit.\n"
 "      --no-validate           suppress node cross-reference validation.\n"
 "      --no-warn               suppress warnings (but not errors).\n"
-"      --reference-limit=NUM   warn about at most NUM references (default "
-"%d).\n"
 "  -v, --verbose               explain what is being done.\n"
 "      --version               display version information and exit.\n"
 msgstr ""
-"Options générales:\n"
-" --error-limit=NUM         Quitter après NUM erreurs (par défaut %d).\n"
-" --force                   Conserver la sortie même s'il y a des erreurs.\n"
-" --help                    Afficher ce menu d'aide et quitter.\n"
-" --no-validate             Supprimer la validation de la table de "
-"références.\n"
-" --no-warn                 Supprimer les avertissements (mais pas les "
-"erreurs).\n"
-" --reference-limit=NUM     Avertir après plus de NUM références (défaut "
-"%d).\n"
-" -v, --verbose             En mode bavard, expliquer ce qui a été fait.\n"
-" --version                 Afficher la version du logiciel et quitter.\n"
 
-#: makeinfo/makeinfo.c:364
+#: makeinfo/makeinfo.c:369
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output Docbook XML rather than Info.\n"
-"      --html                output HTML rather than Info.\n"
-"      --xml                 output Texinfo XML rather than Info.\n"
-"      --plaintext           output plain text rather than Info.\n"
-msgstr ""
-"Options de sélection de format de sortie (par défaut produire Info):\n"
-" --docbook                 Écrire en format DocBook XML plutôt qu'en format "
-"Info.\n"
-" --html                    Écrire en format HTML plutôt qu'en format Info;\n"
-" --xml                     Produire en Texinfo XML plutôt qu'en format "
-"Info.\n"
-" --plaintext               Produire en formast plein texte plutôt qu'en "
-"format Info.\n"
+"      --docbook               output Docbook XML rather than Info.\n"
+"      --html                  output HTML rather than Info.\n"
+"      --xml                   output Texinfo XML rather than Info.\n"
+"      --plaintext             output plain text rather than Info.\n"
+msgstr ""
 
-#: makeinfo/makeinfo.c:372
+#: makeinfo/makeinfo.c:377
 msgid ""
 "General output options:\n"
-"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
-"                            ignoring any @setfilename.\n"
-"      --no-headers          suppress node separators, Node: lines, and "
+"  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
+"                                ignoring any @setfilename.\n"
+"      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
-"                              from Info output (thus producing plain text)\n"
-"                              or from HTML (thus producing shorter output);\n"
-"                              also, write to standard output by default.\n"
-"      --no-split            suppress splitting of Info or HTML output,\n"
-"                            generate only one output file.\n"
-"      --number-sections     output chapter and sectioning numbers.\n"
-"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
-msgstr ""
-"Options générales de sortie:\n"
-"  -E, --macro-expand FICHIER produire dans le FICHIER l'expension source de "
-"macro.\n"
-"                            ignorer tout @setfilename.\n"
-"      --no-headers          Supprimer les séparateurs de noeud Info et "
-"Node:\n"
-"                            lignes et écrire une sortie standard sans --"
-"output.\n"
-"      --no-split            suprimer les divisions de sortie Info ou HTML,\n"
-"                            générer seulement un seul fichier de sortie.\n"
-"      --number-sections     produire les numéros de chapitres et de "
-"sections.\n"
-"  -o, --output=FICHIER      produire la sortie dans le FICHIER (répertoire "
-"si division en HTML),\n"
+"                                from Info output (thus producing plain "
+"text)\n"
+"                                or from HTML (thus producing shorter "
+"output);\n"
+"                                also, write to standard output by default.\n"
+"      --no-split              suppress the splitting of Info or HTML "
+"output,\n"
+"                                generate only one output file.\n"
+"      --number-sections       output chapter and sectioning numbers.\n"
+"  -o, --output=FILE           output to FILE (or directory if split HTML).\n"
+msgstr ""
 
-#: makeinfo/makeinfo.c:386
+#: makeinfo/makeinfo.c:391
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
-"      --enable-encoding       output accented and special characters in\n"
-"                                Info output based on @documentencoding.\n"
+"      --disable-encoding      do not output accented and special characters\n"
+"                                in Info output based on @documentencoding.\n"
+"      --enable-encoding       override --disable-encoding (default).\n"
 "      --fill-column=NUM       break Info lines at NUM characters (default "
 "%d).\n"
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
-"                                `end' to put them at the end of the node\n"
-"                                  in which they are defined (default).\n"
+"                                `end' to put them at the end of the node, "
+"in\n"
+"                                which they are defined (this is the "
+"default).\n"
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
 "%d).\n"
 "                                If VAL is `none', do not indent; if VAL is\n"
 "                                `asis', preserve existing indentation.\n"
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
-"Options pour Info et texte:\n"
-" --enable-encoding       produire les caractères accentués et spéciaux\n"
-"                          dans une sortie Info basée sur @documentencoding.\n"
-" --fill-column=NUM       briser les lignes Info à chaque NUM caractères (par "
-"défaut %d).\n"
-" --footnote-style=STYLE  produire les notes des bas de page en Info selon le "
-"STYLE:\n"
-"                          « separate » pour les placer dans leur propre "
-"noeud;\n"
-"                          « end » pour les placer à la fin de leur noeud\n"
-"                           où ils sont définis (par défaut).\n"
-" --paragraph-indent=NUM  indenter les paragraphes Info par NUM espaces (par "
-"défaut %d).\n"
-"                           Si NUM est « none », ne pas indenter; si NUM est\n"
-"                          « asis », préserver l'indentation existente.\n"
-" --split-size=NUM        séparer les fichiers Info selon la taille NUM (par "
-"défaut %d).\n"
 
-#: makeinfo/makeinfo.c:403
+#: makeinfo/makeinfo.c:409
 msgid ""
 "Options for HTML:\n"
-"      --css-include=FILE        include FILE in HTML <style> output;\n"
-"                                  read stdin if FILE is -.\n"
+"      --css-include=FILE      include FILE in HTML <style> output;\n"
+"                                read stdin if FILE is -.\n"
+"      --css-ref=URL           generate reference to a CSS file.\n"
+"      --internal-links=FILE   produce list of internal links in FILE.\n"
+"      --transliterate-file-names\n"
+"                              produce file names in ASCII transliteration.\n"
 msgstr ""
-"--css-include=FICHIER       inclure le FICHIER dans le <style> de sortie "
-"HTML;\n"
-"                                  lire de stdin si le FICHIER est -.\n"
 
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:419
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
-"      --output-indent=VAL       indent XML elements by VAL spaces (default "
+"      --output-indent=VAL     indent XML elements by VAL spaces (default "
 "%d).\n"
-"                                  If VAL is 0, ignorable whitespace is "
+"                                If VAL is 0, ignorable whitespace is "
 "dropped.\n"
 msgstr ""
-"--output-indent=VAL       indenter les éléments XML à l'aide dee VAL espaces "
-"(par défaut %d).\n"
-"                                  Si VAL vaut 0, les espaces pouvant être "
-"ignorés sont éliminés.\n"
 
-#: makeinfo/makeinfo.c:416
+#: makeinfo/makeinfo.c:426
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2456,7 +2553,7 @@
 " -U VAR                    Rendre indéfinie une variable, comme avec "
 "@clear.\n"
 
-#: makeinfo/makeinfo.c:425
+#: makeinfo/makeinfo.c:435
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2496,7 +2593,7 @@
 "  Aussi pour l'options --no-ifFORMAT, ne pas traiter le textuel "
 "@ifnotFORMAT.\n"
 
-#: makeinfo/makeinfo.c:444
+#: makeinfo/makeinfo.c:454
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
@@ -2512,61 +2609,54 @@
 "» ;\n"
 "en génération XML, --ifxml est « on » et les autres sont « off ».\n"
 
-#: makeinfo/makeinfo.c:452
+#: makeinfo/makeinfo.c:462
 msgid ""
 "Examples:\n"
-"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
-"  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
-"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
-"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"  makeinfo foo.texi                      write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi               write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi                write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi            write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi         write plain text to standard "
+"output\n"
 "\n"
-"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"  makeinfo --html --no-headers foo.texi  write html without node lines, "
 "menus\n"
-"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
-"  makeinfo --no-split foo.texi          write one Info file however big\n"
+"  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
-"Examples:\n"
-"  makeinfo foo.texi                    Écrire en Info dans @setfilename de "
-"foo\n"
-"  makeinfo --html foo.texi             Écrire en HTML dans @setfilename de "
-"foo\n"
-"  makeinfo --xml foo.texi              Écrire en XML dans @setfilename de "
-"foo\n"
-"  makeinfo --docbook foo.texi          Écrire le DocBook en XML dans "
-"@setfilename\n"
-"  makeinfo --no-headers foo.texi       Écrire en plein texte en sortie "
-"standard\n"
-"\n"
-"  makeinfo --html --no-headers foo.texi Écrire en HTML sans les lignes de "
-"noeuds et de menus\n"
-"  makeinfo --number-sections foo.texi  Écrire en Info avec sections "
-"numérotées\n"
-"  makeinfo --no-split foo.texi         Écrire un fichier Info même "
-"volumineux\n"
 
-#: makeinfo/makeinfo.c:603
+#: makeinfo/makeinfo.c:622
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr "%s: valeur TEXINFO_OUTPUT_FORMAT non reconnue est ignoré « %s »\n"
 
-#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
-#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
+#: makeinfo/makeinfo.c:780
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: l'argument %s doit être numérique, non pas « %s ».\n"
 
-#: makeinfo/makeinfo.c:660
+#: makeinfo/makeinfo.c:683
 #, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "%s: ne peut ouvrir la sortie d'expansion de macro « %s »"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:688
 #, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr "%s: ignorer la sortie de l'expansion de la seconde macro « %s »\n"
 
-#: makeinfo/makeinfo.c:707
+#: makeinfo/makeinfo.c:733
+#, c-format
+msgid "%s: could not open internal links output `%s'"
+msgstr ""
+
+#: makeinfo/makeinfo.c:738
+#, c-format
+msgid "%s: ignoring second internal links output `%s'.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:751
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
@@ -2574,57 +2664,51 @@
 "ou\n"
 "« asis », non pas « %s ».\n"
 
-#: makeinfo/makeinfo.c:732
+#: makeinfo/makeinfo.c:769
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: l'argument de l'option --footnote-style doit être « separate » ou\n"
 "« end », non pas « %s ».\n"
 
-#: makeinfo/makeinfo.c:806
+#: makeinfo/makeinfo.c:844
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: absence d'un argument fichier.\n"
 
-#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr "Commande multilignes %c%s utilisé de manière incorrecte"
 
-#: makeinfo/makeinfo.c:1000
+#: makeinfo/makeinfo.c:1044
 #, c-format
 msgid "Expected `%s'"
 msgstr "« %s » attendue"
 
-#: makeinfo/makeinfo.c:1479
+#: makeinfo/makeinfo.c:1521
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Ne peut créer le répertoire « %s »: %s"
 
-#: makeinfo/makeinfo.c:1525
+#: makeinfo/makeinfo.c:1567
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Aucun « %s » trouvé dans « %s »"
 
-#: makeinfo/makeinfo.c:1605
+#: makeinfo/makeinfo.c:1647
 #, c-format
 msgid ""
 "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 "%s: Sauter l'expansion de macro qui irait sur stdout comme la sortie Info.\n"
 
-#: makeinfo/makeinfo.c:1638
+#: makeinfo/makeinfo.c:1677
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "Fabrication du fichier %s « %s » à partir de « %s ».\n"
 
-#: makeinfo/makeinfo.c:1673
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr ""
-"Ceci est le fichier Info %s, produit par Makeinfo version %s à partir %s.\n"
-
-#: makeinfo/makeinfo.c:1709
+#: makeinfo/makeinfo.c:1744
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2632,7 +2716,7 @@
 "%s: Enlèvement du fichier de sortie de macro « %s » à cause d'erreurs;\n"
 "utiliser l'option --force pour préserver.\n"
 
-#: makeinfo/makeinfo.c:1773
+#: makeinfo/makeinfo.c:1799
 #, c-format
 msgid ""
 "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
@@ -2640,75 +2724,82 @@
 "%s: Enlèvement du fichier de sortie « %s » à cause d'erreurs;\n"
 "utiliser l'option --force pour préserver.\n"
 
-#: makeinfo/makeinfo.c:2034
+#: makeinfo/makeinfo.c:1818
+#, c-format
+msgid ""
+"%s: Removing internal links output file `%s' due to errors; use --force to "
+"preserve.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:2113
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Commande inconnue « %s »."
 
-#: makeinfo/makeinfo.c:2056
+#: makeinfo/makeinfo.c:2135
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr ""
 "Utiliser des accolades pour donner une commande comme argument à « @%s »"
 
-#: makeinfo/makeinfo.c:2314
+#: makeinfo/makeinfo.c:2394
 #, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s accolades attendues"
 
-#: makeinfo/makeinfo.c:2327
+#: makeinfo/makeinfo.c:2407
 msgid "Unmatched }"
 msgstr "Accolade « } » non appariée"
 
-#: makeinfo/makeinfo.c:2375
+#: makeinfo/makeinfo.c:2455
 msgid "NO_NAME!"
 msgstr "NOM_INCONNU!"
 
-#: makeinfo/makeinfo.c:2396
+#: makeinfo/makeinfo.c:2476
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s accolade fermante manquante"
 
-#: makeinfo/makeinfo.c:3309
+#: makeinfo/makeinfo.c:3482
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "commande @image dans un fichier (pour HTML) « %s » illisible: %s"
 
-#: makeinfo/makeinfo.c:3315
+#: makeinfo/makeinfo.c:3488
 #, c-format
 msgid "No such file `%s'"
 msgstr "Aucun fichier  « %s »"
 
-#: makeinfo/makeinfo.c:3447
+#: makeinfo/makeinfo.c:3624
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "commande @image avec un fichier (texte) « %s » illisible: %s"
 
-#: makeinfo/makeinfo.c:3456
+#: makeinfo/makeinfo.c:3633
 msgid "@image missing filename argument"
 msgstr "commande @image ayant un argument fichier absent"
 
-#: makeinfo/makeinfo.c:3675
+#: makeinfo/makeinfo.c:3851
 #, c-format
 msgid "undefined flag: %s"
 msgstr "fanion indéfini: %s"
 
-#: makeinfo/makeinfo.c:3676
+#: makeinfo/makeinfo.c:3852
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Aucune valeur pour « %s »}"
 
-#: makeinfo/makeinfo.c:3728
+#: makeinfo/makeinfo.c:3904
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s exige un nom"
 
-#: makeinfo/makeinfo.c:3834
+#: makeinfo/makeinfo.c:4010
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Fin de fichier rencontré avant l'appariement de @end %s"
 
-#: makeinfo/makeinfo.c:4082
+#: makeinfo/makeinfo.c:4258
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr ""
@@ -2718,114 +2809,92 @@
 msgid "Missing } in @multitable template"
 msgstr "Accolade « } » manquante dans un patron @multitable"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:260
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "abandon du texte orphelin « %s » après la commande @multitable"
 
-#: makeinfo/multi.c:393
+#: makeinfo/multi.c:400
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "Trop de colonnes dans un item de multitable (%d max)"
 
-#: makeinfo/multi.c:555
+#: makeinfo/multi.c:563
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr ""
 "[inattendu] ne peut pas sélectionner la colonne #%d dans une multitable."
 
-#: makeinfo/multi.c:584
+#: makeinfo/multi.c:592
 msgid "ignoring @tab outside of multitable"
 msgstr "inhibition d'une commande @tab à l'extérieur d'une multitable"
 
-#: makeinfo/multi.c:632
+#: makeinfo/multi.c:640
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Sortie en multicolonnes à partir de la dernière rangée:\n"
 
-#: makeinfo/multi.c:635
+#: makeinfo/multi.c:643
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* colonne #%d: sortie = %s\n"
 
-#: makeinfo/node.c:280
+#: makeinfo/node.c:279
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "Le noeud « %s » défini antérieurement à la ligne %d"
 
-#: makeinfo/node.c:648
+#: makeinfo/node.c:647
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "Écriture du noeud « %s »...\n"
 
-#: makeinfo/node.c:716
+#: makeinfo/node.c:714
 #, c-format
 msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr "Le noeud « %s » exige une commande de subdivision (i.e. %c%s)"
 
-#: makeinfo/node.c:879
+#: makeinfo/node.c:878
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "Aucun nom de noeud spécifié pour la commande « %c%s »"
 
-#: makeinfo/node.c:920 makeinfo/node.c:1151
+#: makeinfo/node.c:919 makeinfo/node.c:1163
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "Ancre « %s » et mode « %s » pointe vers le même nom de fichier"
 
-#: makeinfo/node.c:923
+#: makeinfo/node.c:922
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 "Commande @anchor ignorée; les références vers celle-ci ne fonctionneront pas"
 
-#: makeinfo/node.c:925 makeinfo/node.c:1154
+#: makeinfo/node.c:924 makeinfo/node.c:1166
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "Renommer cette ancre ou utiliser l'option « --no-split »"
 
-#: makeinfo/node.c:955
+#: makeinfo/node.c:954
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr "Chaîne inattendue à la fin du fichier morcelé HTML « %s »"
 
-#: makeinfo/node.c:991
-msgid "Next:"
-msgstr "Noeud « Next »:"
-
-# Est-ce vraiment un message à traduire?
-#: makeinfo/node.c:1007
-msgid "Previous:"
-msgstr "Noeud « Previous »:"
-
-# Est-ce vraiment un message à traduire?
-#: makeinfo/node.c:1021
-msgid "Up:"
-msgstr "Noeud « Up »:"
-
-#: makeinfo/node.c:1148
+#: makeinfo/node.c:1160
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "Ancre « %s » et mode « %s » pointe vers le même nom de fichier"
 
-#: makeinfo/node.c:1153
+#: makeinfo/node.c:1165
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 "Commande @anchor ignorée; les références vers celle-ci ne fonctionneront pas"
 
-#: makeinfo/node.c:1347
+#: makeinfo/node.c:1362
 #, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr ""
 "%s réfère à un noeud « %s » inexistant (à mois d'un sectionnement incorrect?)"
 
-#: makeinfo/node.c:1363
-msgid "Menu"
-msgstr "Menu"
-
-#: makeinfo/node.c:1365
-msgid "Cross"
-msgstr "Référence"
-
-#: makeinfo/node.c:1447
+#: makeinfo/node.c:1462
 #, c-format
 msgid ""
 "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
@@ -2833,59 +2902,44 @@
 "Le champ Next du noeud « %s » n'a pas de pointeur de retour en amont (à "
 "moins d'un sectionnement incorrect?)"
 
-#: makeinfo/node.c:1450
+#: makeinfo/node.c:1465
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Ce noeud (%s) a un noeud « Prev » erroné"
 
-# Est-ce vraiment un message à traduire?
-#: makeinfo/node.c:1462
-msgid "Prev"
-msgstr "Noeud « Previous »"
-
-#: makeinfo/node.c:1505
+#: makeinfo/node.c:1520
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Le champ Prev du noeud « %s » n'a pas de pointeur de retour en amont"
 
-#: makeinfo/node.c:1509
+#: makeinfo/node.c:1524
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Ce noeud (%s) a un noeud « Next » erroné"
 
-#: makeinfo/node.c:1521
+#: makeinfo/node.c:1536
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr "« %s » n'a pas de champ Up (à moins d'un sectionnement incorrect?)"
 
-# Est-ce vraiment un message à traduire?
-#: makeinfo/node.c:1524
-msgid "Up"
-msgstr "Noeud « Up »"
-
-#: makeinfo/node.c:1590
+#: makeinfo/node.c:1605
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 "Le noeud « %s » manque d'un item menu pour « %s » en dépit d'être son noeud "
 "« Up » cible"
 
-#: makeinfo/node.c:1619
-#, c-format
-msgid "node `%s' has been referenced %d times"
-msgstr "Le noeud « %s » a été référencé %d fois"
-
-#: makeinfo/node.c:1633
+#: makeinfo/node.c:1637
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "noeud « %s » non référencé"
 
-#: makeinfo/node.c:1723
+#: makeinfo/node.c:1727
 #, c-format
 msgid "Removing %s\n"
 msgstr "Retrait de %s\n"
 
-#: makeinfo/node.c:1727
+#: makeinfo/node.c:1731
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Ne peut enlever le fichier « %s »: %s"
@@ -2900,268 +2954,100 @@
 msgid "Internal error (search_sectioning) `%s'!"
 msgstr "Erreur interne (search_sectioning) « %s »!"
 
-#: makeinfo/sectioning.c:562
+#: makeinfo/sectioning.c:563
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "Erreur interne (search_sectioning) « %s »!"
 
-#: makeinfo/sectioning.c:623
+#: makeinfo/sectioning.c:624
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s est périmé; utiliser plutôt %c%s"
 
-#: makeinfo/sectioning.c:639
+#: makeinfo/sectioning.c:640
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "Le noeud avec %ctop en tant que section existe déjà"
 
-#: makeinfo/sectioning.c:647
+#: makeinfo/sectioning.c:648
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "Le noeud %ctop se trouve ici"
 
-#: makeinfo/sectioning.c:663
+#: makeinfo/sectioning.c:664
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "noeud %ctop utilisé avant %cnode, %s implicitement"
 
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr "Table des matières"
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr "Sommaire"
-
-#: makeinfo/xml.c:1605
+#: makeinfo/xml.c:1669
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "commande @image avec un fichier « %s » illisible: %s"
 
-#: makeinfo/xml.c:2097
+#: makeinfo/xml.c:2014
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
 "@headitem comme dernier item de @multitable produit des documents Docbook "
 "invalides"
 
-#: util/install-info.c:154
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: avertissement: "
-
-#: util/install-info.c:203
-#, c-format
-msgid " for %s"
-msgstr " pour %s"
+#: makeinfo/xml.c:2150
+msgid "of"
+msgstr "de"
 
-#: util/install-info.c:426
-#, c-format
-msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr "\t\\tUtiliser « %s --help » pour une liste complète des options.\n"
+#: makeinfo/xml.c:2155
+msgid "on"
+msgstr "sur"
 
-#: util/install-info.c:434
-#, c-format
-msgid ""
-"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"\n"
-"Install or delete dir entries from INFO-FILE in the Info directory file\n"
-"DIR-FILE.\n"
-"\n"
-"Options:\n"
-" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
-"                     don't insert any new entries.\n"
-" --dir-file=NAME   specify file name of Info directory file.\n"
-"                     This is equivalent to using the DIR-FILE argument.\n"
-" --entry=TEXT      insert TEXT as an Info directory entry.\n"
-"                     TEXT should have the form of an Info menu item line\n"
-"                     plus zero or more extra lines starting with "
-"whitespace.\n"
-"                     If you specify more than one entry, they are all "
-"added.\n"
-"                     If you don't specify any entries, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --help            display this help and exit.\n"
-" --info-file=FILE  specify Info file to install in the directory.\n"
-"                     This is equivalent to using the INFO-FILE argument.\n"
-" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
-" --item=TEXT       same as --entry TEXT.\n"
-"                     An Info directory entry is actually a menu item.\n"
-" --quiet           suppress warnings.\n"
-" --remove          same as --delete.\n"
-" --section=SEC     put this file's entries in section SEC of the directory.\n"
-"                     If you specify more than one section, all the entries\n"
-"                     are added in each of the sections.\n"
-"                     If you don't specify any sections, they are determined\n"
-"                     from information in the Info file itself.\n"
-" --version         display version information and exit.\n"
-msgstr ""
-"Usage: %s [OPTION]... [INFO-FICHIER [DIR-FICHIER]]\n"
-"\n"
-"Installer ou éliminer des entrées dir à partir de INFO-FICHIER dans le "
-"fichier\n"
-"répertoire Info DIR-FICHIER.\n"
-"\n"
-"Options:\n"
-" --delete          Éliminer les entrées existantes pour INFO-FICHIER à "
-"partir\n"
-"                   de DIR-FICHIER; ne pas insérer aucunes nouvelles "
-"entrées.\n"
-" --dir-file=NOM    Spécifier le NOM du répertoire de fichiers Info.\n"
-"                   Ceci équivaut à utiliser l'argument DIR-FICHIER.\n"
-" --entry=TEXTE     Insérer TEXTE comme une entrée du répertoire Info.\n"
-"                   TEXTE doit avoir la forme d'une ligne d'item menu Info\n"
-"                   avec zéro ou plusieurs lignes en extra commençant avec\n"
-"                   un blanc.  Si plus d'une entrée est spécifiée, elles\n"
-"                   seront toutes ajoutées.  Si aucune n'est indiquée,\n"
-"                   elles seront déterminées à partir de l'information\n"
-"                   se trouvant dans le fichier Info lui-même.\n"
-" --help            Afficher ce menu d'aide et quitter.\n"
-" --info-file=FICHIER Spécifier le FICHIER Info à installer dans le "
-"répertoire\n"
-"                   de fichiers Info.  Ceci équivaut à utiliser l'argument\n"
-"                   INFO-FICHIER.\n"
-" --info-dir=RÉP    Identique à l'option --dir-file=RÉP/dir.\n"
-" --item=TEXTE      Identique à l'option --entry=TEXTE\n"
-"                   Une entrée de répertoire Info est en fait un item menu.\n"
-" --quiet           Supprimer les avertissements.\n"
-" --remove          Identique à l'option --delete.\n"
-" --section=SEC     Mettre cette entrée de fichier dans la section SEC du\n"
-"                   répertoire.  Si plus d'une section est spécifiée, toutes\n"
-"                   les entrées sont ajoutées dans chacune des sections.\n"
-"                   Si aucune section n'est spécifiée, elles seront "
-"déterminées\n"
-"                   à partir de l'information dans le fichier Info lui-même.\n"
-" --version         Afficher le nom et la version du logiciel et quitter.\n"
+#: makeinfo/xref.c:127
+msgid "First argument to cross-reference may not be empty"
+msgstr "Premier argument de références croisée peut ne pas être vide"
 
-#: util/install-info.c:488
+#: makeinfo/xref.c:252
 #, c-format
-msgid ""
-"This is the file .../info/dir, which contains the\n"
-"topmost node of the Info hierarchy, called (dir)Top.\n"
-"The first time you invoke Info you start off looking at this node.\n"
-"\n"
-"%s\tThis is the top of the INFO tree\n"
-"\n"
-"  This (the Directory node) gives a menu of major topics.\n"
-"  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
-"  \"h\" gives a primer for first-timers,\n"
-"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
-"\n"
-"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
-"  to select it.\n"
-"\n"
-"%s\n"
+msgid "Empty file name for HTML cross reference in `%s'"
 msgstr ""
-"Ceci est le fichier .../info/dir, lequel contient le noeud \n"
-"le plus haut dans la hiérarchie Info, noeud appelé (dir)Top.\n"
-"La première fois que Info est invoqué, vous démarrez la recherche \n"
-"à partir de ce noeud.\n"
-"\n"
-"%s\tCeci est le haut de l'arborescence INFO\n"
-"\n"
-"  Ceci (le noeud Répertoire) fournit un menu des sujets majeurs.\n"
-"  Taper « q » pour quitter, « ? » pour lister toutes les commandes Info,\n"
-"  « d » pour revenir à cet endroit,\n"
-"  « h » fournit un guide d'initiation pour les nouveaux venus,\n"
-"  « mEmacs<Return> » démarre une consultation du manuel Emacs, etc.\n"
-"\n"
-"  En Emacs, vous pouvez cliquer avec le bouton-2 de la souris sur un item "
-"menu \n"
-"  ou sur une référence croisée pour le sélectionner.\n"
-"\n"
-"%s\n"
-
-#: util/install-info.c:513
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr "%s: ne peut pas lire (%s) et ne peut pas créer (%s)\n"
-
-#: util/install-info.c:600
-#, c-format
-msgid "%s: empty file"
-msgstr "%s: fichier vide"
-
-#: util/install-info.c:913 util/install-info.c:953
-msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
-msgstr "START-INFO-DIR-ENTRY non apparié avec END-INFO-DIR-ENTRY"
-
-#: util/install-info.c:948
-msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
-msgstr "END-INFO-DIR-ENTRY non apparié avec START-INFO-DIR-ENTRY"
 
-#: util/install-info.c:1191 util/install-info.c:1201
-#, c-format
-msgid "%s: already have dir file: %s\n"
-msgstr "%s: a déjà un fichier répertoire: %s\n"
-
-#: util/install-info.c:1236
-#, c-format
-msgid "%s: Specify the Info file only once.\n"
-msgstr "%s: Spécifier le fichier Info seulement une fois.\n"
+#: makeinfo/xref.c:387
+msgid "End of file reached while looking for `.' or `,'"
+msgstr "Fin du fichier atteint lors de la recherche de `.' ou `,'"
 
-#: util/install-info.c:1284
+#: makeinfo/xref.c:390
 #, c-format
-msgid "excess command line argument `%s'"
-msgstr "excédent d'argument de ligne de commande « %s »"
-
-#: util/install-info.c:1288
-msgid "No input file specified; try --help for more information."
+msgid "`.' or `,' must follow @%s, not `%c'"
 msgstr ""
-"Aucun fichier d'entrée spécifié; utiliser --help pour plus d'informations."
 
-#: util/install-info.c:1291
-msgid "No dir file specified; try --help for more information."
+#: makeinfo/xref.c:392
+msgid "for cross-references in parentheses, use @pxref"
 msgstr ""
-"Aucun fichier dir spécifié; utiliser --help pour plus d'informations."
 
-#: util/install-info.c:1313
-#, c-format
-msgid "no info dir entry in `%s'"
-msgstr "aucune entrée répertoire Info dans « %s »"
-
-#: util/install-info.c:1426
-#, c-format
-msgid "menu item `%s' already exists, for file `%s'"
-msgstr "item menu « %s » déjà existant, pour le fichier « %s »"
-
-#: util/install-info.c:1449
-#, c-format
-msgid "no entries found for `%s'; nothing deleted"
-msgstr "aucune entrée trouvée pour « %s »; rien n'a été éliminé"
+#: makeinfo/xref.c:435
+msgid "First argument to @inforef may not be empty"
+msgstr "Premier argument de @inforef peut ne pas être vide"
 
-#: util/texindex.c:252
+#: util/texindex.c:223
 msgid "display this help and exit"
 msgstr "afficher cet aide-mémoire et quitter"
 
-#: util/texindex.c:254
-msgid "keep temporary files around after processing"
-msgstr "conserver les fichiers temporaires après le traitement"
-
-#: util/texindex.c:256
-msgid "do not keep temporary files around after processing (default)"
-msgstr ""
-"ne pas conserver les fichiers temporaires après le traitement (défaut)"
-
-#: util/texindex.c:258
+#: util/texindex.c:225
 msgid "send output to FILE"
 msgstr "envoyer la sortie dans FICHIER"
 
-#: util/texindex.c:260
+#: util/texindex.c:227
 msgid "display version information and exit"
 msgstr "afficher la version du logiciel et quitter"
 
-#: util/texindex.c:270
+#: util/texindex.c:237
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Usage: %s [OPTION]... FICHIER...\n"
 
-#: util/texindex.c:271
+#: util/texindex.c:238
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "Générer un index trié pour chaque FICHIER de sortie TeX.\n"
 
-#: util/texindex.c:274
+#: util/texindex.c:241
 #, c-format
 msgid ""
 "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
@@ -3169,7 +3055,7 @@
 "Habituellement FICHIER... est indiqué comme « foo.%c%c » pour un document « "
 "foo.texi ».\n"
 
-#: util/texindex.c:276
+#: util/texindex.c:243
 #, c-format
 msgid ""
 "\n"
@@ -3178,23 +3064,22 @@
 "\n"
 "Options:\n"
 
-#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
-#: util/texindex.c:1011
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: pas un fichier index en format Texinfo"
-
-#: util/texindex.c:968
+#: util/texindex.c:743
 #, c-format
 msgid "failure reopening %s"
 msgstr "échec lors de la réouverture de %s"
 
-#: util/texindex.c:1218
+#: util/texindex.c:758 util/texindex.c:786
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: pas un fichier index en format Texinfo"
+
+#: util/texindex.c:993
 #, c-format
 msgid "No page number in %s"
 msgstr "Aucun numéro de page dans %s"
 
-#: util/texindex.c:1291
+#: util/texindex.c:1066
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "l'entrée %s suit une entrée ayant un nom secondaire"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/tmispell-voikko.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/tmispell-voikko.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/tmispell-voikko.po	2012-01-02 17:27:23.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/tmispell-voikko.po	2012-02-23 06:31:46.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:22+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:22+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/charset.cc:73
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/transmission-gtk.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/transmission-gtk.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/transmission-gtk.po	2012-01-02 17:27:23.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/transmission-gtk.po	2012-02-23 06:31:46.000000000 +0000
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: Transmission\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-05 07:23+0000\n"
+"POT-Creation-Date: 2012-02-15 12:23+0000\n"
 "PO-Revision-Date: 2011-11-06 14:13+0000\n"
 "Last-Translator: Nicolas Delvaux <Unknown>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -21,224 +21,242 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:23+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:23+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
-#: ../gtk/actions.c:49
+#: ../gtk/actions.c:45
 msgid "Sort by _Activity"
 msgstr "Trier par _activité"
 
-#: ../gtk/actions.c:50
+#: ../gtk/actions.c:46
 msgid "Sort by _Name"
 msgstr "Trier par _nom"
 
-#: ../gtk/actions.c:51
+#: ../gtk/actions.c:47
 msgid "Sort by _Progress"
 msgstr "Trier par _progression"
 
-#: ../gtk/actions.c:52
+#: ../gtk/actions.c:48
+msgid "Sort by _Queue"
+msgstr ""
+
+#: ../gtk/actions.c:49
 msgid "Sort by Rati_o"
 msgstr "Trier par rati_o"
 
-#: ../gtk/actions.c:53
+#: ../gtk/actions.c:50
 msgid "Sort by Stat_e"
 msgstr "Tri_er par état"
 
-#: ../gtk/actions.c:54
+#: ../gtk/actions.c:51
 msgid "Sort by A_ge"
 msgstr "Trier par â_ge"
 
-#: ../gtk/actions.c:55
+#: ../gtk/actions.c:52
 msgid "Sort by Time _Left"
 msgstr "Trier par te_mps restant"
 
-#: ../gtk/actions.c:56
+#: ../gtk/actions.c:53
 msgid "Sort by Si_ze"
 msgstr "Trier par _taille"
 
-#: ../gtk/actions.c:73
+#: ../gtk/actions.c:70
 msgid "_Show Transmission"
 msgstr "_Afficher Transmission"
 
-#: ../gtk/actions.c:74
+#: ../gtk/actions.c:71
 msgid "Message _Log"
 msgstr "Journa_l des messages"
 
-#: ../gtk/actions.c:89
+#: ../gtk/actions.c:86
 msgid "Enable Alternative Speed _Limits"
 msgstr "Activer les _limites de vitesse alternatives"
 
-#: ../gtk/actions.c:90
+#: ../gtk/actions.c:87
 msgid "_Compact View"
 msgstr "Vue _compacte"
 
-#: ../gtk/actions.c:91
+#: ../gtk/actions.c:88
 msgid "Re_verse Sort Order"
 msgstr "In_verser le tri"
 
-#: ../gtk/actions.c:92
+#: ../gtk/actions.c:89
 msgid "_Filterbar"
 msgstr "Barre des _filtres"
 
-#: ../gtk/actions.c:93
+#: ../gtk/actions.c:90
 msgid "_Statusbar"
 msgstr "_Barre d'état"
 
-#: ../gtk/actions.c:94
+#: ../gtk/actions.c:91
 msgid "_Toolbar"
 msgstr "Barre d'ou_tils"
 
-#: ../gtk/actions.c:99
+#: ../gtk/actions.c:96
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../gtk/actions.c:100
+#: ../gtk/actions.c:97
 msgid "_Torrent"
 msgstr "_Torrent"
 
-#: ../gtk/actions.c:101
+#: ../gtk/actions.c:98
 msgid "_View"
 msgstr "_Affichage"
 
-#: ../gtk/actions.c:102
+#: ../gtk/actions.c:99
 msgid "_Sort Torrents By"
 msgstr "Trier les torrent_s par"
 
-#: ../gtk/actions.c:103 ../gtk/details.c:2444
+#: ../gtk/actions.c:100
+msgid "_Queue"
+msgstr ""
+
+#: ../gtk/actions.c:101 ../gtk/details.c:2436
 msgid "_Edit"
 msgstr "É_dition"
 
-#: ../gtk/actions.c:104
+#: ../gtk/actions.c:102
 msgid "_Help"
 msgstr "Aid_e"
 
-#: ../gtk/actions.c:105
+#: ../gtk/actions.c:103
 msgid "Copy _Magnet Link to Clipboard"
 msgstr "Copier le lien _magnet dans le presse-papier"
 
-#: ../gtk/actions.c:106
-msgid "Open _URL..."
-msgstr "Ouvrir une _URL…"
-
-#: ../gtk/actions.c:106
-msgid "Open URL..."
-msgstr "Ouvrir une URL…"
+#: ../gtk/actions.c:104
+msgid "Open _URL…"
+msgstr ""
+
+#: ../gtk/actions.c:104
+msgid "Open URL…"
+msgstr ""
 
-#: ../gtk/actions.c:107 ../gtk/actions.c:108
+#: ../gtk/actions.c:105 ../gtk/actions.c:106
 msgid "Open a torrent"
 msgstr "Ouvrir un torrent"
 
-#: ../gtk/actions.c:109
+#: ../gtk/actions.c:107
 msgid "_Start"
 msgstr "_Démarrer"
 
-#: ../gtk/actions.c:109
+#: ../gtk/actions.c:107
 msgid "Start torrent"
 msgstr "Démarrer le ou les torrent(s) sélectionné(s)"
 
-#: ../gtk/actions.c:110
+#: ../gtk/actions.c:108
+msgid "Start _Now"
+msgstr ""
+
+#: ../gtk/actions.c:108
+msgid "Start torrent now"
+msgstr ""
+
+#: ../gtk/actions.c:109
 msgid "_Statistics"
 msgstr "_Statistiques"
 
-#: ../gtk/actions.c:111
+#: ../gtk/actions.c:110
 msgid "_Donate"
 msgstr "_Faire un don"
 
-#: ../gtk/actions.c:112
+#: ../gtk/actions.c:111
 msgid "_Verify Local Data"
 msgstr "_Vérifier les données locales"
 
-#: ../gtk/actions.c:113
+#: ../gtk/actions.c:112
 msgid "_Pause"
 msgstr "_Suspendre"
 
-#: ../gtk/actions.c:113
+#: ../gtk/actions.c:112
 msgid "Pause torrent"
 msgstr "Suspendre le ou les torrent(s) sélectionné(s)"
 
-#: ../gtk/actions.c:114
+#: ../gtk/actions.c:113
 msgid "_Pause All"
 msgstr "Tout sus_pendre"
 
-#: ../gtk/actions.c:114
+#: ../gtk/actions.c:113
 msgid "Pause all torrents"
 msgstr "Suspendre tous les torrents"
 
-#: ../gtk/actions.c:115
+#: ../gtk/actions.c:114
 msgid "_Start All"
 msgstr "Tout _démarrer"
 
-#: ../gtk/actions.c:115
+#: ../gtk/actions.c:114
 msgid "Start all torrents"
 msgstr "Démarrer tous les torrents"
 
-#: ../gtk/actions.c:116
-msgid "Set _Location..."
-msgstr "Définir l’_emplacement…"
+#: ../gtk/actions.c:115
+msgid "Set _Location…"
+msgstr ""
 
-#: ../gtk/actions.c:117
+#: ../gtk/actions.c:116
 msgid "Remove torrent"
 msgstr "Supprimer le torrent"
 
-#: ../gtk/actions.c:118
+#: ../gtk/actions.c:117
 msgid "_Delete Files and Remove"
 msgstr "_Supprimer les fichiers et enlever"
 
-#: ../gtk/actions.c:119
-msgid "_New..."
-msgstr "_Nouveau..."
+#: ../gtk/actions.c:118
+msgid "_New…"
+msgstr ""
 
-#: ../gtk/actions.c:119
+#: ../gtk/actions.c:118
 msgid "Create a torrent"
 msgstr "Créer un torrent"
 
-#: ../gtk/actions.c:120
+#: ../gtk/actions.c:119
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../gtk/actions.c:121
+#: ../gtk/actions.c:120
 msgid "Select _All"
 msgstr "_Tout sélectionner"
 
-#: ../gtk/actions.c:122
+#: ../gtk/actions.c:121
 msgid "Dese_lect All"
 msgstr "Tout désé_lectionner"
 
-#: ../gtk/actions.c:124
+#: ../gtk/actions.c:123
 msgid "Torrent properties"
 msgstr "Propriétés du torrent"
 
-#: ../gtk/actions.c:125
+#: ../gtk/actions.c:124
 msgid "Open Fold_er"
 msgstr "Ouvrir le dossi_er"
 
-#: ../gtk/actions.c:127
+#: ../gtk/actions.c:126
 msgid "_Contents"
 msgstr "_Sommaire"
 
-#: ../gtk/actions.c:128
+#: ../gtk/actions.c:127
 msgid "Ask Tracker for _More Peers"
 msgstr "Demander _plus de pairs au traqueur"
 
-#: ../gtk/conf.c:62 ../libtransmission/fdlimit.c:369
-#: ../libtransmission/metainfo.c:112 ../libtransmission/utils.c:556
-#: ../libtransmission/utils.c:567
-#, c-format
-msgid "Couldn't create \"%1$s\": %2$s"
-msgstr "Impossible de créer « %1$s » : %2$s"
+#: ../gtk/actions.c:128
+msgid "Move to _Top"
+msgstr ""
 
-#: ../gtk/conf.c:85 ../libtransmission/fdlimit.c:359
-#: ../libtransmission/fdlimit.c:390
-#, c-format
-msgid "Couldn't open \"%1$s\": %2$s"
-msgstr "Impossible d'ouvrir « %1$s » : %2$s"
+#: ../gtk/actions.c:129
+msgid "Move _Up"
+msgstr ""
 
-#: ../gtk/conf.c:90
-#, c-format
-msgid "%s is already running."
-msgstr "%s est déjà en cours d'exécution."
+#: ../gtk/actions.c:130
+msgid "Move _Down"
+msgstr ""
+
+#: ../gtk/actions.c:131
+msgid "Move to _Bottom"
+msgstr ""
 
-#: ../gtk/conf.c:401 ../gtk/conf.c:406
+#: ../gtk/actions.c:132
+msgid "Present Main Window"
+msgstr ""
+
+#: ../gtk/conf.c:317 ../gtk/conf.c:322
 #, c-format
 msgid "Importing \"%s\""
 msgstr "Importation de « %s »"
@@ -263,7 +281,7 @@
 msgid "Stop seeding if idle for N minutes:"
 msgstr "Arrêter de partager si inactif depuis N minutes :"
 
-#: ../gtk/details.c:478 ../gtk/tr-prefs.c:1251
+#: ../gtk/details.c:478 ../gtk/tr-prefs.c:1287
 msgid "Speed"
 msgstr "Vitesse"
 
@@ -305,373 +323,384 @@
 msgid "_Maximum peers:"
 msgstr "Nombre maximum de pairs :"
 
-#: ../gtk/details.c:560 ../gtk/torrent-cell-renderer.c:220
-msgid "Waiting to verify local data"
-msgstr "Attente de la vérification des données locales"
+#: ../gtk/details.c:560 ../gtk/torrent-cell-renderer.c:201
+#: ../libtransmission/verify.c:260
+msgid "Queued for verification"
+msgstr "En attente de vérification"
 
 #: ../gtk/details.c:561
 msgid "Verifying local data"
 msgstr "Vérification des données locales"
 
-#: ../gtk/details.c:562 ../gtk/filter.c:699 ../gtk/tr-prefs.c:295
+#: ../gtk/details.c:562 ../gtk/torrent-cell-renderer.c:204
+msgid "Queued for download"
+msgstr ""
+
+#: ../gtk/details.c:563 ../gtk/filter.c:698
+msgctxt "Verb"
 msgid "Downloading"
-msgstr "Réception"
+msgstr ""
 
-#: ../gtk/details.c:563 ../gtk/filter.c:700 ../gtk/tr-prefs.c:319
+#: ../gtk/details.c:564 ../gtk/torrent-cell-renderer.c:207
+msgid "Queued for seeding"
+msgstr ""
+
+#: ../gtk/details.c:565 ../gtk/filter.c:699
+msgctxt "Verb"
 msgid "Seeding"
-msgstr "Partage"
+msgstr ""
 
-#: ../gtk/details.c:564 ../gtk/filter.c:702 ../gtk/torrent-cell-renderer.c:214
+#: ../gtk/details.c:566 ../gtk/filter.c:701 ../gtk/torrent-cell-renderer.c:198
 msgid "Finished"
 msgstr "Terminé"
 
-#: ../gtk/details.c:564 ../gtk/filter.c:701 ../gtk/torrent-cell-renderer.c:216
+#: ../gtk/details.c:566 ../gtk/filter.c:700 ../gtk/torrent-cell-renderer.c:198
 msgid "Paused"
 msgstr "Suspendu"
 
-#: ../gtk/details.c:597
+#: ../gtk/details.c:599
 msgid "N/A"
 msgstr "N/D"
 
-#: ../gtk/details.c:609 ../gtk/file-list.c:618
+#: ../gtk/details.c:611 ../gtk/file-list.c:605
 msgid "Mixed"
 msgstr "Mixte"
 
-#: ../gtk/details.c:610
+#: ../gtk/details.c:612
 msgid "No Torrents Selected"
 msgstr "Aucun torrent sélectionné"
 
-#: ../gtk/details.c:632
+#: ../gtk/details.c:634
 msgid "Private to this tracker -- DHT and PEX disabled"
 msgstr "Restreint à ce traqueur -- DHT et PEX désactivés"
 
-#: ../gtk/details.c:634
+#: ../gtk/details.c:636
 msgid "Public torrent"
 msgstr "Torrent public"
 
-#: ../gtk/details.c:657
+#: ../gtk/details.c:659
 #, c-format
 msgid "Created by %1$s"
 msgstr "Créé par %1$s"
 
-#: ../gtk/details.c:659
+#: ../gtk/details.c:661
 #, c-format
 msgid "Created on %1$s"
 msgstr "Créé le %1$s"
 
-#: ../gtk/details.c:661
+#: ../gtk/details.c:663
 #, c-format
 msgid "Created by %1$s on %2$s"
 msgstr "Créé par %1$s le %2$s"
 
-#: ../gtk/details.c:747
+#: ../gtk/details.c:749
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../gtk/details.c:775
+#: ../gtk/details.c:777
 #, c-format
 msgid "%1$s (%2$'d piece @ %3$s)"
 msgid_plural "%1$s (%2$'d pieces @ %3$s)"
 msgstr[0] "%1$s (%2$'d partie @ %3$s)"
 msgstr[1] "%1$s (%2$'d parties @ %3$s)"
 
-#: ../gtk/details.c:781
+#: ../gtk/details.c:783
 #, c-format
 msgid "%1$s (%2$'d piece)"
 msgid_plural "%1$s (%2$'d pieces)"
 msgstr[0] "%1$s (%2$'d partie)"
 msgstr[1] "%1$s (%2$'d parties)"
 
-#: ../gtk/details.c:818
+#: ../gtk/details.c:817
 #, c-format
 msgid "%1$s (%2$s%%)"
 msgstr "%1$s (%2$s%%)"
 
-#: ../gtk/details.c:820
+#: ../gtk/details.c:819
 #, c-format
 msgid "%1$s (%2$s%% of %3$s%% Available)"
 msgstr "%1$s (%2$s%% sur %3$s%% disponible)"
 
-#: ../gtk/details.c:822
+#: ../gtk/details.c:821
 #, c-format
 msgid "%1$s (%2$s%% of %3$s%% Available); %4$s Unverified"
 msgstr "%1$s (%2$s%% sur %3$s%% disponibles) ; %4$s non-vérifiés"
 
-#: ../gtk/details.c:841
+#: ../gtk/details.c:840
 #, c-format
 msgid "%1$s (+%2$s corrupt)"
 msgstr "%1$s (+%2$s corrompu)"
 
-#: ../gtk/details.c:863
+#: ../gtk/details.c:862
 #, c-format
 msgid "%s (Ratio: %s)"
 msgstr "%s (ratio : %s)"
 
-#: ../gtk/details.c:891
+#: ../gtk/details.c:890
 msgid "No errors"
 msgstr "Aucune erreur"
 
-#: ../gtk/details.c:904
+#: ../gtk/details.c:903
 msgid "Never"
 msgstr "Jamais"
 
-#: ../gtk/details.c:908
+#: ../gtk/details.c:907
 msgid "Active now"
 msgstr "actif actuellement"
 
-#: ../gtk/details.c:912
+#: ../gtk/details.c:911
 #, c-format
 msgid "%1$s ago"
 msgstr "Il y a %1$s"
 
-#: ../gtk/details.c:931
+#: ../gtk/details.c:930
 msgid "Activity"
 msgstr "Activité"
 
-#: ../gtk/details.c:936
+#: ../gtk/details.c:935
 msgid "Torrent size:"
 msgstr "Taille du torrent :"
 
-#: ../gtk/details.c:941
+#: ../gtk/details.c:940
 msgid "Have:"
 msgstr "Obtenu :"
 
-#: ../gtk/details.c:946 ../gtk/stats.c:155 ../gtk/stats.c:172
+#: ../gtk/details.c:945 ../gtk/stats.c:155 ../gtk/stats.c:172
 msgid "Downloaded:"
 msgstr "Reçu :"
 
-#: ../gtk/details.c:951 ../gtk/stats.c:152 ../gtk/stats.c:169
+#: ../gtk/details.c:950 ../gtk/stats.c:152 ../gtk/stats.c:169
 msgid "Uploaded:"
 msgstr "Envoyé :"
 
-#: ../gtk/details.c:956
+#: ../gtk/details.c:955
 msgid "State:"
 msgstr "État :"
 
-#: ../gtk/details.c:961
+#: ../gtk/details.c:960
 msgid "Running time:"
 msgstr "Temps d'exécution :"
 
-#: ../gtk/details.c:966
+#: ../gtk/details.c:965
 msgid "Remaining time:"
 msgstr "Temps restant :"
 
-#: ../gtk/details.c:971
+#: ../gtk/details.c:970
 msgid "Last activity:"
 msgstr "Dernière activité :"
 
-#: ../gtk/details.c:977
+#: ../gtk/details.c:976
 msgid "Error:"
 msgstr "Erreur :"
 
-#: ../gtk/details.c:982
+#: ../gtk/details.c:981
 msgid "Details"
 msgstr "Détails"
 
-#: ../gtk/details.c:988
+#: ../gtk/details.c:987
 msgid "Location:"
 msgstr "Emplacement :"
 
-#: ../gtk/details.c:995
+#: ../gtk/details.c:994
 msgid "Hash:"
 msgstr "Hachage :"
 
 # à vérifier
-#: ../gtk/details.c:1001
+#: ../gtk/details.c:1000
 msgid "Privacy:"
 msgstr "Confidentialité :"
 
-#: ../gtk/details.c:1008
+#: ../gtk/details.c:1007
 msgid "Origin:"
 msgstr "Origine :"
 
-#: ../gtk/details.c:1025
+#: ../gtk/details.c:1024
 msgid "Comment:"
 msgstr "Commentaire :"
 
-#: ../gtk/details.c:1057
+#: ../gtk/details.c:1056
 msgid "Webseeds"
 msgstr "Partages Web"
 
-#: ../gtk/details.c:1059 ../gtk/details.c:1112
+#: ../gtk/details.c:1058 ../gtk/details.c:1111
 msgid "Down"
 msgstr "Réception"
 
-#: ../gtk/details.c:1110
+#: ../gtk/details.c:1109
 msgid "Address"
 msgstr "Adresse"
 
-#: ../gtk/details.c:1114
+#: ../gtk/details.c:1113
 msgid "Up"
 msgstr "Envoi"
 
-#: ../gtk/details.c:1115
+#: ../gtk/details.c:1114
 msgid "Client"
 msgstr "Client"
 
-#: ../gtk/details.c:1116
+#: ../gtk/details.c:1115
 msgid "%"
 msgstr "%"
 
-#: ../gtk/details.c:1118
+#: ../gtk/details.c:1117
 msgid "Up Reqs"
 msgstr "Demandes d'envoi"
 
-#: ../gtk/details.c:1120
+#: ../gtk/details.c:1119
 msgid "Dn Reqs"
 msgstr "Demandes de réception"
 
-#: ../gtk/details.c:1122
+#: ../gtk/details.c:1121
 msgid "Dn Blocks"
 msgstr "Blocs reçus"
 
-#: ../gtk/details.c:1124
+#: ../gtk/details.c:1123
 msgid "Up Blocks"
 msgstr "Blocs envoyés"
 
-#: ../gtk/details.c:1126
+#: ../gtk/details.c:1125
 msgid "We Cancelled"
 msgstr "Annulé par nous"
 
-#: ../gtk/details.c:1128
+#: ../gtk/details.c:1127
 msgid "They Cancelled"
 msgstr "Annulé par eux"
 
-#: ../gtk/details.c:1129
+#: ../gtk/details.c:1128
 msgid "Flags"
 msgstr "Drapeaux"
 
-#: ../gtk/details.c:1485
+#: ../gtk/details.c:1483
 msgid "Optimistic unchoke"
 msgstr "Proposition d'échanges optimiste"
 
-#: ../gtk/details.c:1486
+#: ../gtk/details.c:1484
 msgid "Downloading from this peer"
 msgstr "Réception à partir de ce pair"
 
-#: ../gtk/details.c:1487
+#: ../gtk/details.c:1485
 msgid "We would download from this peer if they would let us"
 msgstr "Nous téléchargerions à partir de ce pair s'il nous le permettait"
 
-#: ../gtk/details.c:1488
+#: ../gtk/details.c:1486
 msgid "Uploading to peer"
 msgstr "Envoi au pair"
 
-#: ../gtk/details.c:1489
+#: ../gtk/details.c:1487
 msgid "We would upload to this peer if they asked"
 msgstr "Nous enverrions vers ce pair s'il nous le demandait"
 
-#: ../gtk/details.c:1490
+#: ../gtk/details.c:1488
 msgid "Peer has unchoked us, but we're not interested"
 msgstr ""
 "Le pair nous a proposé un échange, mais nous ne sommes pas intéressés"
 
-#: ../gtk/details.c:1491
+#: ../gtk/details.c:1489
 msgid "We unchoked this peer, but they're not interested"
 msgstr "Nous avons proposé un échange à ce pair, mais il n'est pas intéressé"
 
-#: ../gtk/details.c:1492
+#: ../gtk/details.c:1490
 msgid "Encrypted connection"
 msgstr "Connexion chiffrée"
 
-#: ../gtk/details.c:1493
+#: ../gtk/details.c:1491
 msgid "Peer was found through Peer Exchange (PEX)"
 msgstr "Pair trouvé par échange de pairs (PEX)"
 
-#: ../gtk/details.c:1494
+#: ../gtk/details.c:1492
 msgid "Peer was found through DHT"
 msgstr "Pair trouvé par DHT"
 
-#: ../gtk/details.c:1495
+#: ../gtk/details.c:1493
 msgid "Peer is an incoming connection"
 msgstr "Le pair est une connexion entrante"
 
-#: ../gtk/details.c:1496
+#: ../gtk/details.c:1494
 msgid "Peer is connected over µTP"
 msgstr "Pair connecté via µTP"
 
-#: ../gtk/details.c:1751 ../gtk/details.c:2459
+#: ../gtk/details.c:1743 ../gtk/details.c:2451
 msgid "Show _more details"
 msgstr "Afficher _plus de détails"
 
-#: ../gtk/details.c:1822
+#: ../gtk/details.c:1814
 #, c-format
 msgid "Got a list of %1$s%2$'d peers%3$s %4$s ago"
 msgstr "Liste de %1$s%2$'d pairs reçue il y a %3$s  %4$s"
 
-#: ../gtk/details.c:1826
+#: ../gtk/details.c:1818
 #, c-format
 msgid "Peer list request %1$stimed out%2$s %3$s ago; will retry"
 msgstr ""
 "Demande de la liste de pairs %1$sexpirée il y a %2$s %3$s ; nouvelle "
 "tentative programmée"
 
-#: ../gtk/details.c:1829
+#: ../gtk/details.c:1821
 #, c-format
 msgid "Got an error %1$s\"%2$s\"%3$s %4$s ago"
 msgstr "Erreur survenue il y a %1$s\"%2$s\"%3$s %4$s"
 
-#: ../gtk/details.c:1837
+#: ../gtk/details.c:1829
 msgid "No updates scheduled"
 msgstr "Aucune mise à jour prévue"
 
-#: ../gtk/details.c:1842
+#: ../gtk/details.c:1834
 #, c-format
 msgid "Asking for more peers in %s"
 msgstr "Demande de plus de pairs dans %s"
 
-#: ../gtk/details.c:1846
+#: ../gtk/details.c:1838
 msgid "Queued to ask for more peers"
 msgstr "En attente pour demander plus de pairs"
 
-#: ../gtk/details.c:1851
+#: ../gtk/details.c:1843
 #, c-format
-msgid "Asking for more peers now... <small>%s</small>"
-msgstr "Demande de pairs supplémentaires en cours… <small>%s</small>"
+msgid "Asking for more peers now… <small>%s</small>"
+msgstr ""
 
-#: ../gtk/details.c:1861
+#: ../gtk/details.c:1853
 #, c-format
 msgid "Tracker had %s%'d seeders and %'d leechers%s %s ago"
 msgstr ""
 "Le traqueur avait %s%'d fournisseurs et %'d téléchargeurs il y a %s %s"
 
-#: ../gtk/details.c:1865
+#: ../gtk/details.c:1857
 #, c-format
 msgid "Got a scrape error \"%s%s%s\" %s ago"
 msgstr "Erreur de rassemblement (scrape) « %s%s%s » il y a %s"
 
-#: ../gtk/details.c:1875
+#: ../gtk/details.c:1867
 #, c-format
 msgid "Asking for peer counts in %s"
 msgstr "Décompte des pairs dans %s"
 
-#: ../gtk/details.c:1879
+#: ../gtk/details.c:1871
 msgid "Queued to ask for peer counts"
 msgstr "Décompte des pairs en attente"
 
-#: ../gtk/details.c:1884
+#: ../gtk/details.c:1876
 #, c-format
-msgid "Asking for peer counts now... <small>%s</small>"
-msgstr "Décompte des pairs en cours… <small>%s</small>"
+msgid "Asking for peer counts now… <small>%s</small>"
+msgstr ""
 
-#: ../gtk/details.c:2154
+#: ../gtk/details.c:2146
 msgid "List contains invalid URLs"
 msgstr "La liste contient des URL non valables"
 
-#: ../gtk/details.c:2159
+#: ../gtk/details.c:2151
 msgid "Please correct the errors and try again."
 msgstr "Veuillez corriger les erreurs et réessayer."
 
-#: ../gtk/details.c:2209
+#: ../gtk/details.c:2201
 #, c-format
 msgid "%s - Edit Trackers"
 msgstr "%s - Éditer les traqueurs"
 
-#: ../gtk/details.c:2219
+#: ../gtk/details.c:2211
 msgid "Tracker Announce URLs"
 msgstr "URL d'annonce des traqueurs"
 
-#: ../gtk/details.c:2222 ../gtk/makemeta-ui.c:496
+#: ../gtk/details.c:2214 ../gtk/makemeta-ui.c:490
 msgid ""
 "To add a backup URL, add it on the line after the primary URL.\n"
 "To add another primary URL, add it after a blank line."
@@ -680,63 +709,63 @@
 "primaire.\n"
 "Pour ajouter une autre URL primaire, placez-la après une ligne vide."
 
-#: ../gtk/details.c:2320
+#: ../gtk/details.c:2312
 #, c-format
 msgid "%s - Add Tracker"
 msgstr "%s - Ajouter un traqueur"
 
-#: ../gtk/details.c:2334
+#: ../gtk/details.c:2326
 msgid "Tracker"
 msgstr "Traqueur"
 
-#: ../gtk/details.c:2340
+#: ../gtk/details.c:2332
 msgid "_Announce URL:"
 msgstr "_URL d'annonce :"
 
-#: ../gtk/details.c:2415 ../gtk/details.c:2559 ../gtk/filter.c:322
+#: ../gtk/details.c:2407 ../gtk/details.c:2551 ../gtk/filter.c:322
 msgid "Trackers"
 msgstr "Traqueurs"
 
-#: ../gtk/details.c:2439
+#: ../gtk/details.c:2431
 msgid "_Add"
 msgstr "_Ajouter"
 
-#: ../gtk/details.c:2450
+#: ../gtk/details.c:2442
 msgid "_Remove"
 msgstr "_Enlever"
 
-#: ../gtk/details.c:2466
+#: ../gtk/details.c:2458
 msgid "Show _backup trackers"
 msgstr "Afficher les traqueurs de secours"
 
-#: ../gtk/details.c:2551 ../gtk/msgwin.c:418
+#: ../gtk/details.c:2543 ../gtk/msgwin.c:429
 msgid "Information"
 msgstr "Informations"
 
-#: ../gtk/details.c:2555
+#: ../gtk/details.c:2547
 msgid "Peers"
 msgstr "Pairs"
 
-#: ../gtk/details.c:2564
+#: ../gtk/details.c:2556
 msgid "File listing not available for combined torrent properties"
 msgstr ""
 "La liste des fichiers n'est pas disponible avec la sélection multiple de "
 "torrents"
 
-#: ../gtk/details.c:2568 ../gtk/makemeta-ui.c:443
+#: ../gtk/details.c:2560 ../gtk/makemeta-ui.c:437
 msgid "Files"
 msgstr "Fichiers"
 
-#: ../gtk/details.c:2572 ../gtk/tr-prefs.c:1209 ../gtk/tr-window.c:638
+#: ../gtk/details.c:2564 ../gtk/tr-prefs.c:1242 ../gtk/tr-window.c:664
 msgid "Options"
 msgstr "Options"
 
-#: ../gtk/details.c:2596
+#: ../gtk/details.c:2588
 #, c-format
 msgid "%s Properties"
 msgstr "Propriétés de %s"
 
-#: ../gtk/details.c:2607
+#: ../gtk/details.c:2599
 #, c-format
 msgid "%'d Torrent Properties"
 msgstr "Propriétés de %d torrents"
@@ -793,47 +822,47 @@
 msgstr[0] "Le téléchargement d'un de ces torrents n'est pas terminé."
 msgstr[1] "Le téléchargement de plusieurs de ces torrents n'est pas terminé."
 
-#: ../gtk/file-list.c:615 ../gtk/filter.c:347 ../gtk/util.c:636
+#: ../gtk/file-list.c:602 ../gtk/filter.c:347 ../gtk/util.c:465
 msgid "High"
 msgstr "Élevée"
 
-#: ../gtk/file-list.c:616 ../gtk/filter.c:351 ../gtk/util.c:637
+#: ../gtk/file-list.c:603 ../gtk/filter.c:351 ../gtk/util.c:466
 msgid "Normal"
 msgstr "Normale"
 
-#: ../gtk/file-list.c:617 ../gtk/filter.c:355 ../gtk/util.c:638
+#: ../gtk/file-list.c:604 ../gtk/filter.c:355 ../gtk/util.c:467
 msgid "Low"
 msgstr "Basse"
 
-#: ../gtk/file-list.c:835 ../gtk/msgwin.c:295
+#: ../gtk/file-list.c:822 ../gtk/msgwin.c:295
 msgid "Name"
 msgstr "Nom"
 
 #. add "size" column
-#: ../gtk/file-list.c:850
+#: ../gtk/file-list.c:837
 msgid "Size"
 msgstr "Taille"
 
 #. add "progress" column
-#: ../gtk/file-list.c:865
+#: ../gtk/file-list.c:852
 msgid "Have"
 msgstr "Obtenu"
 
 #. add "enabled" column
-#: ../gtk/file-list.c:878
+#: ../gtk/file-list.c:865
 msgid "Download"
 msgstr "Téléchargement"
 
 #. add priority column
-#: ../gtk/file-list.c:894 ../gtk/filter.c:342
+#: ../gtk/file-list.c:881 ../gtk/filter.c:342
 msgid "Priority"
 msgstr "Priorité"
 
-#: ../gtk/filter.c:314 ../gtk/filter.c:696
+#: ../gtk/filter.c:314 ../gtk/filter.c:695
 msgid "All"
 msgstr "Tous"
 
-#: ../gtk/filter.c:328 ../gtk/tr-prefs.c:537 ../gtk/tr-prefs.c:1254
+#: ../gtk/filter.c:328 ../gtk/tr-prefs.c:570 ../gtk/tr-prefs.c:1290
 msgid "Privacy"
 msgstr "Confidentialité"
 
@@ -845,35 +874,32 @@
 msgid "Private"
 msgstr "Privé"
 
-#: ../gtk/filter.c:698
+#: ../gtk/filter.c:697
 msgid "Active"
 msgstr "Actif"
 
-#: ../gtk/filter.c:703
-msgid "Queued"
-msgstr "En file d'attente"
-
-#: ../gtk/filter.c:704
+#: ../gtk/filter.c:702
+msgctxt "Verb"
 msgid "Verifying"
-msgstr "Vérification"
+msgstr ""
 
-#: ../gtk/filter.c:705 ../gtk/msgwin.c:417
+#: ../gtk/filter.c:703 ../gtk/msgwin.c:428
 msgid "Error"
 msgstr "Erreur"
 
 #. add the activity combobox
-#: ../gtk/filter.c:984
+#: ../gtk/filter.c:990
 msgid "_Show:"
 msgstr "_Afficher :"
 
-#: ../gtk/main.c:374
+#: ../gtk/main.c:307
 #, c-format
 msgid "Error registering Transmission as x-scheme-handler/magnet handler: %s"
 msgstr ""
 "Erreur lors de l'enregistrement de Transmission en tant que gestionnaire x-"
 "scheme-handler/magnet : %s"
 
-#: ../gtk/main.c:542
+#: ../gtk/main.c:472
 #, c-format
 msgid ""
 "Got signal %d; trying to shut down cleanly. Do it again if it gets stuck."
@@ -881,44 +907,39 @@
 "Signal %d reçu ; tentative de fermeture propre. Recommencez si cela se "
 "bloque."
 
-#: ../gtk/main.c:627
+#: ../gtk/main.c:604
+msgid "Where to look for configuration files"
+msgstr "Emplacement où rechercher les fichiers de configuration"
+
+#: ../gtk/main.c:605
 msgid "Start with all torrents paused"
 msgstr "Démarrer avec tous les torrents suspendus"
 
-#: ../gtk/main.c:629
-msgid "Show version number and exit"
-msgstr "Afficher le numéro de version et quitter"
-
-#: ../gtk/main.c:633
+#: ../gtk/main.c:606
 msgid "Start minimized in notification area"
 msgstr "Démarrer minimisé dans la zone de notification"
 
-#: ../gtk/main.c:636
-msgid "Where to look for configuration files"
-msgstr "Emplacement où rechercher les fichiers de configuration"
+#: ../gtk/main.c:607
+msgid "Show version number and exit"
+msgstr "Afficher le numéro de version et quitter"
 
-#: ../gtk/main.c:645 ../gtk/transmission-gtk.desktop.in.h:3
+#: ../gtk/main.c:625 ../gtk/transmission-gtk.desktop.in.h:1
 msgid "Transmission"
 msgstr "Transmission"
 
-#: ../gtk/main.c:655
+#. parse the command line
+#: ../gtk/main.c:629
 msgid "[torrent files or urls]"
 msgstr "[Fichiers torrent ou URL]"
 
-#: ../gtk/main.c:718
+#: ../gtk/main.c:633
+#, c-format
 msgid ""
-"Transmission is already running, but is not responding. To start a new "
-"session, you must first close the existing Transmission process."
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"Transmission est déjà en cours d'exécution, mais ne répond pas. Pour "
-"démarrer une nouvelle session, vous devez d'abord fermer le processus "
-"existant."
-
-#: ../gtk/main.c:783
-msgid "Transmission cannot be started."
-msgstr "Transmission ne peut pas être démarré."
 
-#: ../gtk/main.c:859
+#: ../gtk/main.c:730
 msgid ""
 "Transmission is a file-sharing program. When you run a torrent, its data "
 "will be made available to others by means of upload. You and you alone are "
@@ -930,46 +951,46 @@
 "seul êtes pleinement responsable de l'exercice du jugement approprié et du "
 "respects de votre législation locale."
 
-#: ../gtk/main.c:861
+#: ../gtk/main.c:732
 msgid "I _Accept"
 msgstr "J'_accepte"
 
-#: ../gtk/main.c:1073
+#: ../gtk/main.c:941
 msgid "<b>Closing Connections</b>"
 msgstr "<b>Fermeture des connexions</b>"
 
-#: ../gtk/main.c:1077
-msgid "Sending upload/download totals to tracker..."
-msgstr "Envoi des totaux d'émission et de réception au traqueur..."
+#: ../gtk/main.c:945
+msgid "Sending upload/download totals to tracker…"
+msgstr ""
 
-#: ../gtk/main.c:1082
+#: ../gtk/main.c:950
 msgid "_Quit Now"
 msgstr "_Quitter maintenant"
 
-#: ../gtk/main.c:1140
+#: ../gtk/main.c:1008
 msgid "Couldn't add corrupt torrent"
 msgid_plural "Couldn't add corrupt torrents"
 msgstr[0] "Impossible d'ajouter un torrent corrompu"
 msgstr[1] "Impossible d'ajouter des torrents corrompus"
 
-#: ../gtk/main.c:1147
+#: ../gtk/main.c:1015
 msgid "Couldn't add duplicate torrent"
 msgid_plural "Couldn't add duplicate torrents"
 msgstr[0] "Impossible d'ajouter un torrent dupliqué"
 msgstr[1] "Impossible d'ajouter des torrents dupliqués"
 
-#: ../gtk/main.c:1443
+#: ../gtk/main.c:1316
 msgid "A fast and easy BitTorrent client"
 msgstr "Un client BitTorrent simple et rapide"
 
-#: ../gtk/main.c:1444
+#: ../gtk/main.c:1317
 msgid "Copyright (c) The Transmission Project"
 msgstr "Copyright (c) « The Transmission Project »"
 
 #. Translators: translate "translator-credits" as your name
 #. to have it appear in the credits in the "About"
 #. dialog
-#: ../gtk/main.c:1450
+#: ../gtk/main.c:1323
 msgid "translator-credits"
 msgstr ""
 "Pierre-Henri Quelen <pierrehenri.quelen@gmail.com>, 2006.\n"
@@ -988,6 +1009,7 @@
 "  Claude Gagné https://launchpad.net/~miltiad\n"
 "  Damien Haïkal https://launchpad.net/~damien-haikal\n"
 "  DarkRedman https://launchpad.net/~darkredman\n"
+"  Emilien Klein https://launchpad.net/~emilien-klein\n"
 "  Francois Magimel https://launchpad.net/~linkid\n"
 "  Fred https://launchpad.net/~frederic-plante\n"
 "  Gabriel U. https://launchpad.net/~gabriel-ull\n"
@@ -1009,6 +1031,7 @@
 "  TuniX12 https://launchpad.net/~tunix12-deactivatedaccount\n"
 "  [MA]Pascal https://launchpad.net/~pborreli\n"
 "  charles https://launchpad.net/~charlesk\n"
+"  demonipuch https://launchpad.net/~demonipuch\n"
 "  gwendi70 https://launchpad.net/~gwendi70\n"
 "  jac3n https://launchpad.net/~jacen-mail\n"
 "  jijijaco https://launchpad.net/~jijijaco\n"
@@ -1052,13 +1075,13 @@
 msgid "Scanned %s"
 msgstr "%s analysé"
 
-#: ../gtk/makemeta-ui.c:167 ../gtk/makemeta-ui.c:431
+#: ../gtk/makemeta-ui.c:167 ../gtk/makemeta-ui.c:425
 msgid "New Torrent"
 msgstr "Nouveau torrent"
 
 #: ../gtk/makemeta-ui.c:183
-msgid "Creating torrent..."
-msgstr "Création du torrent…"
+msgid "Creating torrent…"
+msgstr ""
 
 #: ../gtk/makemeta-ui.c:292
 msgid "No source selected"
@@ -1078,35 +1101,35 @@
 msgstr[0] "%1$'d fragment @ %2$s"
 msgstr[1] "%1$'d fragments @ %2$s"
 
-#: ../gtk/makemeta-ui.c:445
+#: ../gtk/makemeta-ui.c:439
 msgid "Sa_ve to:"
 msgstr "Enregistrer _sous :"
 
-#: ../gtk/makemeta-ui.c:451
+#: ../gtk/makemeta-ui.c:445
 msgid "Source F_older:"
 msgstr "D_ossier source :"
 
-#: ../gtk/makemeta-ui.c:463
+#: ../gtk/makemeta-ui.c:457
 msgid "Source _File:"
 msgstr "_Fichier source :"
 
-#: ../gtk/makemeta-ui.c:475
+#: ../gtk/makemeta-ui.c:469
 msgid "<i>No source selected</i>"
 msgstr "<i>Aucune source sélectionnée</i>"
 
-#: ../gtk/makemeta-ui.c:479
+#: ../gtk/makemeta-ui.c:473
 msgid "Properties"
 msgstr "Propriétés"
 
-#: ../gtk/makemeta-ui.c:481
+#: ../gtk/makemeta-ui.c:475
 msgid "_Trackers:"
 msgstr "_Traqueurs :"
 
-#: ../gtk/makemeta-ui.c:503
+#: ../gtk/makemeta-ui.c:497
 msgid "Co_mment:"
 msgstr "Co_mmentaire :"
 
-#: ../gtk/makemeta-ui.c:512
+#: ../gtk/makemeta-ui.c:506
 msgid "_Private torrent"
 msgstr "Torrent _privé"
 
@@ -1128,43 +1151,39 @@
 msgid "Message"
 msgstr "Messages"
 
-#: ../gtk/msgwin.c:419
+#: ../gtk/msgwin.c:430
 msgid "Debug"
 msgstr "Débogage"
 
-#: ../gtk/msgwin.c:445
+#: ../gtk/msgwin.c:456
 msgid "Message Log"
 msgstr "Journal des messages"
 
-#: ../gtk/msgwin.c:478
+#: ../gtk/msgwin.c:493
 msgid "Level"
 msgstr "Niveau"
 
-#: ../gtk/notify.c:159
-msgid "Download complete"
-msgstr "Téléchargement terminé"
-
-#: ../gtk/notify.c:169
-msgid "Torrent Complete"
-msgstr "Torrent complet"
-
-#: ../gtk/notify.c:177
+#: ../gtk/notify.c:213
 msgid "Open File"
 msgstr "Ouvrir un fichier"
 
-#: ../gtk/notify.c:183
+#: ../gtk/notify.c:218
 msgid "Open Folder"
 msgstr "Ouvrir le dossier"
 
-#: ../gtk/notify.c:198
+#: ../gtk/notify.c:226
+msgid "Torrent Complete"
+msgstr "Torrent complet"
+
+#: ../gtk/notify.c:248
 msgid "Torrent Added"
 msgstr "Torrent ajouté"
 
-#: ../gtk/open-dialog.c:239
+#: ../gtk/open-dialog.c:240
 msgid "Torrent files"
 msgstr "Fichiers torrent"
 
-#: ../gtk/open-dialog.c:244
+#: ../gtk/open-dialog.c:245
 msgid "All files"
 msgstr "Tous les fichiers"
 
@@ -1173,11 +1192,11 @@
 msgid "Torrent Options"
 msgstr "Options du torrent"
 
-#: ../gtk/open-dialog.c:293 ../gtk/tr-prefs.c:280
+#: ../gtk/open-dialog.c:293 ../gtk/tr-prefs.c:335
 msgid "Mo_ve .torrent file to the trash"
 msgstr "_Déplacer le fichier .torrent dans la corbeille"
 
-#: ../gtk/open-dialog.c:295 ../gtk/tr-prefs.c:272
+#: ../gtk/open-dialog.c:295 ../gtk/tr-prefs.c:327
 msgid "_Start when added"
 msgstr "Démarrer dè_s l'ajout"
 
@@ -1197,23 +1216,23 @@
 msgid "Select Destination Folder"
 msgstr "Sélectionnez un dossier de destination"
 
-#: ../gtk/open-dialog.c:424
+#: ../gtk/open-dialog.c:427
 msgid "Open a Torrent"
 msgstr "Ouvrir un torrent"
 
-#: ../gtk/open-dialog.c:440 ../gtk/tr-prefs.c:276
+#: ../gtk/open-dialog.c:443 ../gtk/tr-prefs.c:331
 msgid "Show _options dialog"
 msgstr "Afficher les _options"
 
-#: ../gtk/open-dialog.c:495
+#: ../gtk/open-dialog.c:487
 msgid "Open URL"
 msgstr "Ouvrir une URL"
 
-#: ../gtk/open-dialog.c:508
+#: ../gtk/open-dialog.c:500
 msgid "Open torrent from URL"
 msgstr "Ouvrir un torrent depuis une URL"
 
-#: ../gtk/open-dialog.c:513
+#: ../gtk/open-dialog.c:505
 msgid "_URL"
 msgstr "_URL"
 
@@ -1227,14 +1246,14 @@
 msgstr "Impossible de déplacer le torrent"
 
 #: ../gtk/relocate.c:125
-msgid "This may take a moment..."
-msgstr "Ceci peut prendre un moment…"
+msgid "This may take a moment…"
+msgstr ""
 
 #: ../gtk/relocate.c:156 ../gtk/relocate.c:176
 msgid "Set Torrent Location"
 msgstr "Définir l'emplacement du torrent"
 
-#: ../gtk/relocate.c:172
+#: ../gtk/relocate.c:172 ../gtk/tr-prefs.c:269
 msgid "Location"
 msgstr "Emplacement"
 
@@ -1273,7 +1292,7 @@
 msgid "_Reset"
 msgstr "_Réinitialiser"
 
-#: ../gtk/stats.c:134 ../gtk/tr-window.c:679
+#: ../gtk/stats.c:134 ../gtk/tr-window.c:705
 msgid "Statistics"
 msgstr "Statistiques"
 
@@ -1296,7 +1315,7 @@
 #. %1$s is how much we've got,
 #. %2$s is how much we'll have when done,
 #. %3$s%% is a percentage of the two
-#: ../gtk/torrent-cell-renderer.c:77
+#: ../gtk/torrent-cell-renderer.c:61
 #, c-format
 msgid "%1$s of %2$s (%3$s%%)"
 msgstr "%1$s de %2$s (%3$s% %)"
@@ -1307,7 +1326,7 @@
 #. %4$s is how much we've uploaded,
 #. %5$s is our upload-to-download ratio,
 #. %6$s is the ratio we want to reach before we stop uploading
-#: ../gtk/torrent-cell-renderer.c:93
+#: ../gtk/torrent-cell-renderer.c:77
 #, c-format
 msgid "%1$s of %2$s (%3$s%%), uploaded %4$s (Ratio: %5$s Goal: %6$s)"
 msgstr "%1$s de %2$s (%3$s% %), envoyé %4$s (ratio : %5$s objectif : %6$s)"
@@ -1317,7 +1336,7 @@
 #. %3$s%% is a percentage of the two,
 #. %4$s is how much we've uploaded,
 #. %5$s is our upload-to-download ratio
-#: ../gtk/torrent-cell-renderer.c:109
+#: ../gtk/torrent-cell-renderer.c:93
 #, c-format
 msgid "%1$s of %2$s (%3$s%%), uploaded %4$s (Ratio: %5$s)"
 msgstr "%1$s de %2$s (%3$s% %), envoyé %4$s (ratio : %5$s)"
@@ -1326,7 +1345,7 @@
 #. %2$s is how much we've uploaded,
 #. %3$s is our upload-to-download ratio,
 #. %4$s is the ratio we want to reach before we stop uploading
-#: ../gtk/torrent-cell-renderer.c:126
+#: ../gtk/torrent-cell-renderer.c:110
 #, c-format
 msgid "%1$s, uploaded %2$s (Ratio: %3$s Goal: %4$s)"
 msgstr "%1$s, envoyé %2$s (ratio : %3$s objectif : %4$s)"
@@ -1334,71 +1353,74 @@
 #. %1$s is the torrent's total size,
 #. %2$s is how much we've uploaded,
 #. %3$s is our upload-to-download ratio
-#: ../gtk/torrent-cell-renderer.c:138
+#: ../gtk/torrent-cell-renderer.c:122
 #, c-format
 msgid "%1$s, uploaded %2$s (Ratio: %3$s)"
 msgstr "%1$s, envoyé %2$s (Ratio : %3$s)"
 
-#: ../gtk/torrent-cell-renderer.c:152
+#: ../gtk/torrent-cell-renderer.c:136
 msgid "Remaining time unknown"
 msgstr "Temps restant inconnu"
 
 #. time remaining
-#: ../gtk/torrent-cell-renderer.c:158
+#: ../gtk/torrent-cell-renderer.c:142
 #, c-format
 msgid "%s remaining"
 msgstr "%s restant"
 
 #. 1==down arrow, 2==down speed, 3==up arrow, 4==down speed
-#: ../gtk/torrent-cell-renderer.c:183
+#: ../gtk/torrent-cell-renderer.c:167
 #, c-format
 msgid "%1$s %2$s, %3$s %4$s"
 msgstr "%1$s %2$s, %3$s %4$s"
 
 #. bandwidth speed + unicode arrow
-#: ../gtk/torrent-cell-renderer.c:188 ../gtk/torrent-cell-renderer.c:192
+#: ../gtk/torrent-cell-renderer.c:172 ../gtk/torrent-cell-renderer.c:176
 #, c-format
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#. the torrent isn't uploading or downloading
-#: ../gtk/torrent-cell-renderer.c:196 ../gtk/tr-icon.c:74
+#: ../gtk/torrent-cell-renderer.c:179
+msgid "Stalled"
+msgstr "Bloqué"
+
+#: ../gtk/torrent-cell-renderer.c:181 ../gtk/tr-icon.c:69
 msgid "Idle"
 msgstr "Inactif"
 
-#: ../gtk/torrent-cell-renderer.c:225
+#: ../gtk/torrent-cell-renderer.c:211
 #, c-format
 msgid "Verifying local data (%.1f%% tested)"
 msgstr "Vérification des données locales (%.1f %% testé)"
 
-#: ../gtk/torrent-cell-renderer.c:236
+#: ../gtk/torrent-cell-renderer.c:222
 #, c-format
 msgid "Ratio %s"
 msgstr "Ratio %s"
 
-#: ../gtk/torrent-cell-renderer.c:262
+#: ../gtk/torrent-cell-renderer.c:244
 #, c-format
 msgid "Tracker gave a warning: \"%s\""
 msgstr "Le traqueur a envoyé l'avertissement : \"%s\""
 
-#: ../gtk/torrent-cell-renderer.c:263
+#: ../gtk/torrent-cell-renderer.c:245
 #, c-format
 msgid "Tracker gave an error: \"%s\""
 msgstr "Le traqueur a signalé l'erreur : \"%s\""
 
-#: ../gtk/torrent-cell-renderer.c:264
+#: ../gtk/torrent-cell-renderer.c:246
 #, c-format
 msgid "Error: %s"
 msgstr "Erreur : %s"
 
-#: ../gtk/torrent-cell-renderer.c:282
+#: ../gtk/torrent-cell-renderer.c:266
 #, c-format
 msgid "Downloading from %1$'d of %2$'d connected peer"
 msgid_plural "Downloading from %1$'d of %2$'d connected peers"
 msgstr[0] "Réception depuis %1$'d de %2$'d pair connecté"
 msgstr[1] "Réception depuis %1$'d de %2$'d pairs connectés"
 
-#: ../gtk/torrent-cell-renderer.c:291
+#: ../gtk/torrent-cell-renderer.c:275
 #, c-format
 msgid "Downloading metadata from %1$'d peer (%2$d%% done)"
 msgid_plural "Downloading metadata from %1$'d peers (%2$d%% done)"
@@ -1407,47 +1429,49 @@
 msgstr[1] ""
 "Téléchargement de méta-données depuis %1$'d pairs (%2$d%% effectués)"
 
-#: ../gtk/torrent-cell-renderer.c:302
+#: ../gtk/torrent-cell-renderer.c:286
 #, c-format
 msgid "Seeding to %1$'d of %2$'d connected peer"
 msgid_plural "Seeding to %1$'d of %2$'d connected peers"
 msgstr[0] "Partage vers %1$'d de %2$'d pair connecté"
 msgstr[1] "Partage vers %1$'d de %2$'d pairs connectés"
 
-#: ../gtk/transmission-gtk.desktop.in.h:1
+#: ../gtk/transmission-gtk.desktop.in.h:2
 msgid "BitTorrent Client"
 msgstr "Client BitTorrent"
 
-#: ../gtk/transmission-gtk.desktop.in.h:2
-msgid "Download and share files over BitTorrent"
-msgstr "Reçoit et partage des fichiers via BitTorrent"
-
-#: ../gtk/transmission-gtk.desktop.in.h:4
+#: ../gtk/transmission-gtk.desktop.in.h:3
 msgid "Transmission BitTorrent Client"
 msgstr "Client BitTorrent Transmission"
 
-#: ../gtk/tr-core.c:1531
-msgid "Transmission Bittorrent Client"
-msgstr "Client Bittorrent Transmission"
+#: ../gtk/transmission-gtk.desktop.in.h:4
+msgid "Download and share files over BitTorrent"
+msgstr "Reçoit et partage des fichiers via BitTorrent"
 
-#: ../gtk/tr-core.c:1532
-msgid "BitTorrent Activity"
-msgstr "Activité BitTorrent"
+#: ../gtk/tr-core.c:1083
+#, c-format
+msgid "Couldn't read \"%s\": %s"
+msgstr ""
+
+#: ../gtk/tr-core.c:1175
+#, c-format
+msgid "Skipping unknown torrent \"%s\""
+msgstr ""
 
-#: ../gtk/tr-core.c:1545
-msgid "Disallowing desktop hibernation"
-msgstr "Inhiber l'hibernation"
+#: ../gtk/tr-core.c:1411
+msgid "Inhibiting desktop hibernation"
+msgstr ""
 
-#: ../gtk/tr-core.c:1548
+#: ../gtk/tr-core.c:1413
 #, c-format
-msgid "Couldn't disable desktop hibernation: %s"
-msgstr "L'hibernation n'a pas pu être inhibée : %s"
+msgid "Couldn't inhibit desktop hibernation: %s"
+msgstr ""
 
-#: ../gtk/tr-core.c:1572
+#: ../gtk/tr-core.c:1446
 msgid "Allowing desktop hibernation"
 msgstr "Permettre l'hibernation"
 
-#: ../gtk/tr-icon.c:91 ../gtk/tr-icon.c:107
+#: ../gtk/tr-icon.c:86 ../gtk/tr-icon.c:102
 #, c-format
 msgid "(Limit: %s)"
 msgstr "(Limite : %s)"
@@ -1456,7 +1480,7 @@
 #. * %2$s: current upload limit, if any
 #. * %3$s: current download speed
 #. * %4$s: current download limit, if any
-#: ../gtk/tr-icon.c:114
+#: ../gtk/tr-icon.c:109
 #, c-format
 msgid ""
 "Transmission\n"
@@ -1467,373 +1491,407 @@
 "Émission : %1$s %2$s\n"
 "Réception : %3$s %4$s"
 
-#: ../gtk/tr-prefs.c:270
-msgid "Adding"
-msgstr "Ajout"
+#: ../gtk/tr-prefs.c:272
+msgid "Save to _Location:"
+msgstr "Enregistrer _vers :"
 
-#: ../gtk/tr-prefs.c:285
-msgid "Automatically _add torrents from:"
-msgstr "Ajouter automatiquement les torrents de :"
+#: ../gtk/tr-prefs.c:275
+msgid "Queue"
+msgstr ""
+
+#: ../gtk/tr-prefs.c:277
+msgid "Maximum active _downloads:"
+msgstr ""
+
+#: ../gtk/tr-prefs.c:281
+msgid "Downloads sharing data in the last N minutes are _active:"
+msgstr ""
 
-#: ../gtk/tr-prefs.c:297
+#: ../gtk/tr-prefs.c:286 ../libtransmission/torrent.c:1903
+msgid "Incomplete"
+msgstr "Incomplet"
+
+#: ../gtk/tr-prefs.c:288
 msgid "Append \"._part\" to incomplete files' names"
 msgstr "Ajouter « ._part » au nom des fichiers incomplets"
 
-#: ../gtk/tr-prefs.c:302
-msgid "Save to _Location:"
-msgstr "Enregistrer _vers :"
-
-#: ../gtk/tr-prefs.c:304
+#: ../gtk/tr-prefs.c:292
 msgid "Keep _incomplete torrents in:"
 msgstr "Conserver les torrents _incomplets dans :"
 
-#: ../gtk/tr-prefs.c:311
-msgid "Call scrip_t when torrent is completed:"
-msgstr "Appeler ce scrip_t quand un torrent est terminé :"
+#: ../gtk/tr-prefs.c:299
+msgid "Call _script when torrent is completed:"
+msgstr ""
 
-#: ../gtk/tr-prefs.c:321
+#: ../gtk/tr-prefs.c:325
+msgctxt "Gerund"
+msgid "Adding"
+msgstr ""
+
+#: ../gtk/tr-prefs.c:339
+msgid "Automatically _add torrents from:"
+msgstr "Ajouter automatiquement les torrents de :"
+
+#: ../gtk/tr-prefs.c:347
+msgctxt "Gerund"
+msgid "Seeding"
+msgstr ""
+
+#: ../gtk/tr-prefs.c:349
 msgid "Stop seeding at _ratio:"
 msgstr "Partager jusqu’à un ratio de :"
 
-#: ../gtk/tr-prefs.c:328
+#: ../gtk/tr-prefs.c:356
 msgid "Stop seeding if idle for _N minutes:"
 msgstr "Arrêter de partager si inactif depuis _N minutes :"
 
-#: ../gtk/tr-prefs.c:352 ../gtk/tr-prefs.c:1260
+#: ../gtk/tr-prefs.c:380 ../gtk/tr-prefs.c:1296
 msgid "Desktop"
 msgstr "Bureau"
 
-#: ../gtk/tr-prefs.c:354
-msgid "Inhibit _hibernation when torrents are active"
+#: ../gtk/tr-prefs.c:382
+msgid "_Inhibit hibernation when torrents are active"
 msgstr ""
-"Empêc_her la mise en veille sur disque lorsque des torrents sont actifs"
 
-#: ../gtk/tr-prefs.c:358
+#: ../gtk/tr-prefs.c:386
 msgid "Show Transmission icon in the _notification area"
 msgstr "Afficher l'icône de Transmission dans le zone de _notification"
 
-#: ../gtk/tr-prefs.c:362
-msgid "Show _popup notifications"
-msgstr "Afficher les _bulles de notifications"
-
-#: ../gtk/tr-prefs.c:367
-msgid "Play _sound when downloads are complete"
-msgstr "Émettre un _son lorsque les téléchargements sont terminés"
+#: ../gtk/tr-prefs.c:391
+msgid "Notification"
+msgstr ""
+
+#: ../gtk/tr-prefs.c:393
+msgid "Show a notification when torrents are a_dded"
+msgstr ""
 
 #: ../gtk/tr-prefs.c:397
+msgid "Show a notification when torrents _finish"
+msgstr ""
+
+#: ../gtk/tr-prefs.c:401
+msgid "Play a _sound when torrents finish"
+msgstr ""
+
+#: ../gtk/tr-prefs.c:430
 #, c-format
 msgid "Blocklist contains %'d rule"
 msgid_plural "Blocklist contains %'d rules"
 msgstr[0] "La liste de blocage contient %'d règle"
 msgstr[1] "La liste de blocage contient %'d règles"
 
-#: ../gtk/tr-prefs.c:430
+#: ../gtk/tr-prefs.c:463
 #, c-format
 msgid "Blocklist has %'d rule."
 msgid_plural "Blocklist has %'d rules."
 msgstr[0] "La liste de blocage a récupéré %'d règle."
 msgstr[1] "La liste de blocage a récupéré %'d règles."
 
-#: ../gtk/tr-prefs.c:434
+#: ../gtk/tr-prefs.c:467
 msgid "<b>Update succeeded!</b>"
 msgstr "<b>Mise à jour réussie !</b>"
 
-#: ../gtk/tr-prefs.c:434
+#: ../gtk/tr-prefs.c:467
 msgid "<b>Unable to update.</b>"
 msgstr "<b>Mise à jour impossible.</b>"
 
-#: ../gtk/tr-prefs.c:449
+#: ../gtk/tr-prefs.c:482
 msgid "Update Blocklist"
 msgstr "Mettre à jour la liste d'exclusion"
 
-#: ../gtk/tr-prefs.c:451
-msgid "Getting new blocklist..."
-msgstr "Récupération de la nouvelle liste d'exclusion..."
+#: ../gtk/tr-prefs.c:484
+msgid "Getting new blocklist…"
+msgstr ""
 
-#: ../gtk/tr-prefs.c:479
+#: ../gtk/tr-prefs.c:512
 msgid "Allow encryption"
 msgstr "Autoriser le chiffrement"
 
-#: ../gtk/tr-prefs.c:480
+#: ../gtk/tr-prefs.c:513
 msgid "Prefer encryption"
 msgstr "Chiffrement préféré"
 
-#: ../gtk/tr-prefs.c:481
+#: ../gtk/tr-prefs.c:514
 msgid "Require encryption"
 msgstr "Chiffrement requis"
 
-#: ../gtk/tr-prefs.c:505
+#: ../gtk/tr-prefs.c:538
 msgid "Blocklist"
 msgstr "Liste d'exclusion"
 
-#: ../gtk/tr-prefs.c:507
+#: ../gtk/tr-prefs.c:540
 msgid "Enable _blocklist:"
 msgstr "Activer la liste d’exclusion :"
 
-#: ../gtk/tr-prefs.c:521
+#: ../gtk/tr-prefs.c:554
 msgid "_Update"
 msgstr "Mettre à jo_ur"
 
-#: ../gtk/tr-prefs.c:531
+#: ../gtk/tr-prefs.c:564
 msgid "Enable _automatic updates"
 msgstr "Activer les mises à jour _automatiques"
 
-#: ../gtk/tr-prefs.c:539
+#: ../gtk/tr-prefs.c:572
 msgid "_Encryption mode:"
 msgstr "Mode de chiffr_ement :"
 
-#: ../gtk/tr-prefs.c:543
+#: ../gtk/tr-prefs.c:576
 msgid "Use PE_X to find more peers"
 msgstr "Utiliser PE_X pour trouver plus de pairs"
 
-#: ../gtk/tr-prefs.c:545
+#: ../gtk/tr-prefs.c:578
 msgid ""
 "PEX is a tool for exchanging peer lists with the peers you're connected to."
 msgstr ""
 "PEX est un outil permettant d'échanger des listes de pairs avec ceux "
 "auxquels vous êtes connecté."
 
-#: ../gtk/tr-prefs.c:549
+#: ../gtk/tr-prefs.c:582
 msgid "Use _DHT to find more peers"
 msgstr "Utiliser _DHT pour trouver plus de pairs"
 
-#: ../gtk/tr-prefs.c:551
+#: ../gtk/tr-prefs.c:584
 msgid "DHT is a tool for finding peers without a tracker."
 msgstr ""
 "DHT est un outil permettant de trouver des pairs en l'absence de traqueur."
 
-#: ../gtk/tr-prefs.c:555
+#: ../gtk/tr-prefs.c:588
 msgid "Use _Local Peer Discovery to find more peers"
 msgstr "Utiliser la découverte de pairs _locaux pour trouver plus de pairs"
 
-#: ../gtk/tr-prefs.c:557
+#: ../gtk/tr-prefs.c:590
 msgid "LPD is a tool for finding peers on your local network."
 msgstr "LPD est un outil pour trouver des pairs sur votre réseau local."
 
-#: ../gtk/tr-prefs.c:774
+#: ../gtk/tr-prefs.c:807
 msgid "Web Client"
 msgstr "Client Web"
 
 #. "enabled" checkbutton
-#: ../gtk/tr-prefs.c:777
+#: ../gtk/tr-prefs.c:810
 msgid "_Enable web client"
 msgstr "Activ_er le client Web"
 
-#: ../gtk/tr-prefs.c:783
+#: ../gtk/tr-prefs.c:816
 msgid "_Open web client"
 msgstr "_Ouvrir le client Web"
 
-#: ../gtk/tr-prefs.c:792
+#: ../gtk/tr-prefs.c:825
 msgid "HTTP _port:"
 msgstr "_Port HTTP :"
 
 #. require authentication
-#: ../gtk/tr-prefs.c:796
+#: ../gtk/tr-prefs.c:829
 msgid "Use _authentication"
 msgstr "Utiliser l'_authentification"
 
 #. username
-#: ../gtk/tr-prefs.c:804
+#: ../gtk/tr-prefs.c:837
 msgid "_Username:"
 msgstr "Nom d'_utilisateur :"
 
 #. password
-#: ../gtk/tr-prefs.c:811
+#: ../gtk/tr-prefs.c:844
 msgid "Pass_word:"
 msgstr "Mot de _passe :"
 
 #. require authentication
-#: ../gtk/tr-prefs.c:819
+#: ../gtk/tr-prefs.c:852
 msgid "Only allow these IP a_ddresses to connect:"
 msgstr "Permettre uniquement à ces a_dresses IP de se connecter :"
 
-#: ../gtk/tr-prefs.c:844
+#: ../gtk/tr-prefs.c:877
 msgid "IP addresses may use wildcards, such as 192.168.*.*"
 msgstr "Les adresses IP peuvent utiliser des jokers, comme 192.168.*.*"
 
-#: ../gtk/tr-prefs.c:866
+#: ../gtk/tr-prefs.c:899
 msgid "Addresses:"
 msgstr "Adresses :"
 
-#: ../gtk/tr-prefs.c:984
+#: ../gtk/tr-prefs.c:1017
 msgid "Every Day"
 msgstr "Quotidiennement"
 
-#: ../gtk/tr-prefs.c:985
+#: ../gtk/tr-prefs.c:1018
 msgid "Weekdays"
 msgstr "de la semaine"
 
-#: ../gtk/tr-prefs.c:986
+#: ../gtk/tr-prefs.c:1019
 msgid "Weekends"
 msgstr "du weekend"
 
-#: ../gtk/tr-prefs.c:987
+#: ../gtk/tr-prefs.c:1020
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: ../gtk/tr-prefs.c:988
+#: ../gtk/tr-prefs.c:1021
 msgid "Monday"
 msgstr "Lundi"
 
-#: ../gtk/tr-prefs.c:989
+#: ../gtk/tr-prefs.c:1022
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: ../gtk/tr-prefs.c:990
+#: ../gtk/tr-prefs.c:1023
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: ../gtk/tr-prefs.c:991
+#: ../gtk/tr-prefs.c:1024
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: ../gtk/tr-prefs.c:992
+#: ../gtk/tr-prefs.c:1025
 msgid "Friday"
 msgstr "Vendredi"
 
-#: ../gtk/tr-prefs.c:993
+#: ../gtk/tr-prefs.c:1026
 msgid "Saturday"
 msgstr "Samedi"
 
-#: ../gtk/tr-prefs.c:1024
+#: ../gtk/tr-prefs.c:1057
 msgid "Speed Limits"
 msgstr "Limites de vitesse"
 
-#: ../gtk/tr-prefs.c:1026
+#: ../gtk/tr-prefs.c:1059
 #, c-format
 msgid "_Upload (%s):"
 msgstr "_Envoi (%s) :"
 
-#: ../gtk/tr-prefs.c:1033
+#: ../gtk/tr-prefs.c:1066
 #, c-format
 msgid "_Download (%s):"
 msgstr "_Téléchargement (%s) :"
 
-#: ../gtk/tr-prefs.c:1044
+#: ../gtk/tr-prefs.c:1077
 msgid "Alternative Speed Limits"
 msgstr "Limites de vitesse alternatives"
 
-#: ../gtk/tr-prefs.c:1051
+#: ../gtk/tr-prefs.c:1084
 msgid "Override normal speed limits manually or at scheduled times"
 msgstr ""
 "Outrepasser les limites de vitesse manuellement ou au périodes définies"
 
-#: ../gtk/tr-prefs.c:1058
+#: ../gtk/tr-prefs.c:1091
 #, c-format
 msgid "U_pload (%s):"
 msgstr "E_nvoi (%s) :"
 
-#: ../gtk/tr-prefs.c:1062
+#: ../gtk/tr-prefs.c:1095
 #, c-format
 msgid "Do_wnload (%s):"
 msgstr "Té_léchargement (%s) :"
 
-#: ../gtk/tr-prefs.c:1066
+#: ../gtk/tr-prefs.c:1099
 msgid "_Scheduled times:"
 msgstr "Période_s :"
 
-#: ../gtk/tr-prefs.c:1071
+#: ../gtk/tr-prefs.c:1104
 msgid " _to "
 msgstr " _vers "
 
-#: ../gtk/tr-prefs.c:1082
+#: ../gtk/tr-prefs.c:1115
 msgid "_On days:"
 msgstr "_les jours :"
 
-#: ../gtk/tr-prefs.c:1116 ../gtk/tr-prefs.c:1182
+#: ../gtk/tr-prefs.c:1149 ../gtk/tr-prefs.c:1215
 msgid "Status unknown"
 msgstr "État inconnu"
 
-#: ../gtk/tr-prefs.c:1138
+#: ../gtk/tr-prefs.c:1171
 msgid "Port is <b>open</b>"
 msgstr "Le port est <b>ouvert</b>"
 
-#: ../gtk/tr-prefs.c:1138
+#: ../gtk/tr-prefs.c:1171
 msgid "Port is <b>closed</b>"
 msgstr "Le port est <b>fermé</b>"
 
-#: ../gtk/tr-prefs.c:1152
-msgid "<i>Testing TCP port...</i>"
-msgstr "<i>Test du port TCP...</i>"
+#: ../gtk/tr-prefs.c:1185
+msgid "<i>Testing TCP port…</i>"
+msgstr ""
 
-#: ../gtk/tr-prefs.c:1175
+#: ../gtk/tr-prefs.c:1208
 msgid "Listening Port"
 msgstr "Port d'écoute"
 
-#: ../gtk/tr-prefs.c:1177
+#: ../gtk/tr-prefs.c:1210
 msgid "_Port used for incoming connections:"
 msgstr "_Port utilisé pour les connexions entrantes :"
 
-#: ../gtk/tr-prefs.c:1185
+#: ../gtk/tr-prefs.c:1218
 msgid "Te_st Port"
 msgstr "Te_ster le port"
 
-#: ../gtk/tr-prefs.c:1192
+#: ../gtk/tr-prefs.c:1225
 msgid "Pick a _random port every time Transmission is started"
 msgstr "Choisir un port au hasa_rd a chaque démarrage de Transmission"
 
-#: ../gtk/tr-prefs.c:1196
+#: ../gtk/tr-prefs.c:1229
 msgid "Use UPnP or NAT-PMP port _forwarding from my router"
 msgstr ""
 "Utiliser les redirections des ports UPnP ou NAT-PMP depuis mon routeur."
 
-#: ../gtk/tr-prefs.c:1201
+#: ../gtk/tr-prefs.c:1234
 msgid "Peer Limits"
 msgstr "Limites du pair"
 
-#: ../gtk/tr-prefs.c:1204
+#: ../gtk/tr-prefs.c:1237
 msgid "Maximum peers per _torrent:"
 msgstr "Nombre maximum de pairs par _torrent :"
 
-#: ../gtk/tr-prefs.c:1206
+#: ../gtk/tr-prefs.c:1239
 msgid "Maximum peers _overall:"
 msgstr "Nombre maximum de pairs (_globalement) :"
 
-#: ../gtk/tr-prefs.c:1212
+#: ../gtk/tr-prefs.c:1245
 msgid "Enable _uTP for peer communication"
 msgstr "Activer _uTP pour la communication entre pairs"
 
-#: ../gtk/tr-prefs.c:1214
+#: ../gtk/tr-prefs.c:1247
 msgid "uTP is a tool for reducing network congestion."
 msgstr "uTP est un outil destiné à réduire la congestion du réseau."
 
-#: ../gtk/tr-prefs.c:1234
+#: ../gtk/tr-prefs.c:1267
 msgid "Transmission Preferences"
 msgstr "Préférences de Transmission"
 
-#: ../gtk/tr-prefs.c:1248
+#: ../gtk/tr-prefs.c:1281
 msgid "Torrents"
 msgstr "Torrents"
 
-#: ../gtk/tr-prefs.c:1257
+#: ../gtk/tr-prefs.c:1284
+msgctxt "Gerund"
+msgid "Downloading"
+msgstr ""
+
+#: ../gtk/tr-prefs.c:1293
 msgid "Network"
 msgstr "Réseau"
 
-#: ../gtk/tr-prefs.c:1263
+#: ../gtk/tr-prefs.c:1299
 msgid "Web"
 msgstr "Web"
 
-#: ../gtk/tr-window.c:123
+#: ../gtk/tr-window.c:148
 msgid "Torrent"
 msgstr "Torrent"
 
-#: ../gtk/tr-window.c:227
+#: ../gtk/tr-window.c:256
 msgid "Total Ratio"
 msgstr "Ratio total"
 
-#: ../gtk/tr-window.c:228
+#: ../gtk/tr-window.c:257
 msgid "Session Ratio"
 msgstr "Ratio de la session"
 
-#: ../gtk/tr-window.c:229
+#: ../gtk/tr-window.c:258
 msgid "Total Transfer"
 msgstr "Transfert total"
 
-#: ../gtk/tr-window.c:230
+#: ../gtk/tr-window.c:259
 msgid "Session Transfer"
 msgstr "Transfert de la session"
 
-#: ../gtk/tr-window.c:259
+#: ../gtk/tr-window.c:288
 #, c-format
 msgid ""
 "Click to disable Alternative Speed Limits\n"
@@ -1842,7 +1900,7 @@
 "Cliquez pour désactiver les limites de vitesse alternatives\n"
 "(%1$s en téléchargement, %2$s en envoi)"
 
-#: ../gtk/tr-window.c:260
+#: ../gtk/tr-window.c:289
 #, c-format
 msgid ""
 "Click to enable Alternative Speed Limits\n"
@@ -1851,163 +1909,184 @@
 "Cliquez pour activer les limites de vitesse alternatives\n"
 "(%1$s en téléchargement, %2$s en envoi)"
 
-#: ../gtk/tr-window.c:327
+#: ../gtk/tr-window.c:354
 #, c-format
 msgid "Tracker will allow requests in %s"
 msgstr "Le traqueur autorisera les requêtes dans %s"
 
-#: ../gtk/tr-window.c:398
+#: ../gtk/tr-window.c:423
 msgid "Unlimited"
 msgstr "Illimité"
 
-#: ../gtk/tr-window.c:465
+#: ../gtk/tr-window.c:490
 msgid "Seed Forever"
 msgstr "Partage illimité"
 
-#: ../gtk/tr-window.c:503
+#: ../gtk/tr-window.c:528
 msgid "Limit Download Speed"
 msgstr "Limiter la vitesse de téléchargement"
 
-#: ../gtk/tr-window.c:507
+#: ../gtk/tr-window.c:532
 msgid "Limit Upload Speed"
 msgstr "Limiter la vitesse d'envoi"
 
-#: ../gtk/tr-window.c:514
+#: ../gtk/tr-window.c:539
 msgid "Stop Seeding at Ratio"
 msgstr "Arrêter l'envoi au ratio"
 
-#: ../gtk/tr-window.c:548
+#: ../gtk/tr-window.c:573
 #, c-format
 msgid "Stop at Ratio (%s)"
 msgstr "Arrêter au ratio (%s)"
 
-#: ../gtk/tr-window.c:751
+#: ../gtk/tr-window.c:777
 #, c-format
 msgid "%1$'d of %2$'d Torrent"
 msgid_plural "%1$'d of %2$'d Torrents"
 msgstr[0] "%1$'d sur %2$'d transfert"
 msgstr[1] "%1$'d sur %2$'d transferts"
 
-#: ../gtk/tr-window.c:757
+#: ../gtk/tr-window.c:783
 #, c-format
 msgid "%'d Torrent"
 msgid_plural "%'d Torrents"
 msgstr[0] "%'d torrent"
 msgstr[1] "%'d torrents"
 
-#: ../gtk/tr-window.c:777 ../gtk/tr-window.c:805
+#: ../gtk/tr-window.c:803 ../gtk/tr-window.c:831
 #, c-format
 msgid "Ratio: %s"
 msgstr "Ratio : %s"
 
-#: ../gtk/tr-window.c:788 ../gtk/tr-window.c:799
+#: ../gtk/tr-window.c:814
+#, c-format
+msgid "Down: %1$s, Up: %2$s"
+msgstr ""
+
+#: ../gtk/tr-window.c:825
 #, c-format
 msgid "size|Down: %1$s, Up: %2$s"
 msgstr "Réception : %1$s, Émission : %2$s"
 
-#: ../gtk/util.c:45 ../gtk/util.c:51
+#: ../gtk/util.c:38
 msgid "KiB"
 msgstr "Kio"
 
-#: ../gtk/util.c:46 ../gtk/util.c:52
+#: ../gtk/util.c:39
 msgid "MiB"
 msgstr "Mio"
 
-#: ../gtk/util.c:47 ../gtk/util.c:53
+#: ../gtk/util.c:40
 msgid "GiB"
 msgstr "Gio"
 
-#: ../gtk/util.c:48 ../gtk/util.c:54
+#: ../gtk/util.c:41
 msgid "TiB"
 msgstr "Tio"
 
-#: ../gtk/util.c:57
-msgid "KiB/s"
-msgstr "Kio/s"
-
-#: ../gtk/util.c:58
-msgid "MiB/s"
-msgstr "Mio/s"
-
-#: ../gtk/util.c:59
-msgid "GiB/s"
-msgstr "Gio/s"
-
-#: ../gtk/util.c:60
-msgid "TiB/s"
-msgstr "Tio/s"
-
-#: ../gtk/util.c:142
-msgid "size|None"
-msgstr "taille|aucune"
+#: ../gtk/util.c:44
+msgid "kB"
+msgstr ""
+
+#: ../gtk/util.c:45
+msgid "MB"
+msgstr ""
+
+#: ../gtk/util.c:46
+msgid "GB"
+msgstr ""
+
+#: ../gtk/util.c:47
+msgid "TB"
+msgstr ""
+
+#: ../gtk/util.c:50
+msgid "kB/s"
+msgstr ""
+
+#: ../gtk/util.c:51
+msgid "MB/s"
+msgstr ""
+
+#: ../gtk/util.c:52
+msgid "GB/s"
+msgstr ""
 
-#: ../gtk/util.c:163
+#: ../gtk/util.c:53
+msgid "TB/s"
+msgstr ""
+
+#: ../gtk/util.c:87 ../libtransmission/utils.c:1485
+msgid "None"
+msgstr "aucun"
+
+#: ../gtk/util.c:108
 #, c-format
 msgid "%'d day"
 msgid_plural "%'d days"
 msgstr[0] "%'d jour"
 msgstr[1] "%'d jours"
 
-#: ../gtk/util.c:164
+#: ../gtk/util.c:109
 #, c-format
 msgid "%'d hour"
 msgid_plural "%'d hours"
 msgstr[0] "%'d heure"
 msgstr[1] "%'d heures"
 
-#: ../gtk/util.c:165
+#: ../gtk/util.c:110
 #, c-format
 msgid "%'d minute"
 msgid_plural "%'d minutes"
 msgstr[0] "%'d minute"
 msgstr[1] "%'d minutes"
 
-#: ../gtk/util.c:166
+#: ../gtk/util.c:111
 #, c-format
 msgid "%'d second"
 msgid_plural "%'d seconds"
 msgstr[0] "%'d seconde"
 msgstr[1] "%'d secondes"
 
-#: ../gtk/util.c:286
+#: ../gtk/util.c:221
 #, c-format
 msgid "The torrent file \"%s\" contains invalid data."
 msgstr "Le fichier torrent « %s » contient des données invalides."
 
-#: ../gtk/util.c:287
+#: ../gtk/util.c:222
 #, c-format
 msgid "The torrent file \"%s\" is already in use."
 msgstr "Le fichier torrent « %s » est déjà en cours d'utilisation."
 
-#: ../gtk/util.c:288
+#: ../gtk/util.c:223
 #, c-format
 msgid "The torrent file \"%s\" encountered an unknown error."
 msgstr "Le fichier torrent « %s » a rencontré une erreur inconnue."
 
-#: ../gtk/util.c:296
+#: ../gtk/util.c:231
 msgid "Error opening torrent"
 msgstr "Erreur lors de l'ouverture du torrent"
 
-#: ../gtk/util.c:810
+#: ../gtk/util.c:554
 #, c-format
 msgid "Error opening \"%s\""
 msgstr "Impossible d'ouvrir « %s »"
 
-#: ../gtk/util.c:813
+#: ../gtk/util.c:557
 #, c-format
 msgid "Server returned \"%1$ld %2$s\""
 msgstr "Le serveur a retourné « %1$ld%2$s »"
 
-#: ../gtk/util.c:833
+#: ../gtk/util.c:577
 msgid "Unrecognized URL"
 msgstr "URL non reconnue"
 
-#: ../gtk/util.c:835
+#: ../gtk/util.c:579
 #, c-format
 msgid "Transmission doesn't know how to use \"%s\""
 msgstr "Transmission ne sait pas comment utiliser « %s »"
 
-#: ../gtk/util.c:840
+#: ../gtk/util.c:584
 #, c-format
 msgid ""
 "This magnet link appears to be intended for something other than BitTorrent. "
@@ -2021,17 +2100,17 @@
 msgid "Invalid metadata"
 msgstr "Métadonnées non valides"
 
-#: ../libtransmission/bencode.c:1706 ../libtransmission/bencode.c:1734
+#: ../libtransmission/bencode.c:1716 ../libtransmission/bencode.c:1744
 #, c-format
 msgid "Couldn't save temporary file \"%1$s\": %2$s"
 msgstr "Impossible d'enregistrer le fichier temporaire « %1$s » : %2$s"
 
-#: ../libtransmission/bencode.c:1721
+#: ../libtransmission/bencode.c:1731
 #, c-format
 msgid "Saved \"%s\""
 msgstr "« %s » enregistré"
 
-#: ../libtransmission/bencode.c:1726 ../libtransmission/blocklist.c:417
+#: ../libtransmission/bencode.c:1736 ../libtransmission/blocklist.c:417
 #, c-format
 msgid "Couldn't save file \"%1$s\": %2$s"
 msgstr "Impossible d'enregistrer le fichier « %1$s » : %2$s"
@@ -2059,12 +2138,23 @@
 msgid "Blocklist \"%s\" updated with %zu entries"
 msgstr "Liste d’exclusion « %s » mise à jour avec %zu entrées."
 
-#: ../libtransmission/fdlimit.c:405
+#: ../libtransmission/fdlimit.c:360 ../libtransmission/metainfo.c:112
+#: ../libtransmission/utils.c:568 ../libtransmission/utils.c:579
+#, c-format
+msgid "Couldn't create \"%1$s\": %2$s"
+msgstr "Impossible de créer « %1$s » : %2$s"
+
+#: ../libtransmission/fdlimit.c:381
+#, c-format
+msgid "Couldn't open \"%1$s\": %2$s"
+msgstr "Impossible d'ouvrir « %1$s » : %2$s"
+
+#: ../libtransmission/fdlimit.c:396
 #, c-format
 msgid "Couldn't truncate \"%1$s\": %2$s"
 msgstr "Impossible de tronquer « %1$s » : %2$s"
 
-#: ../libtransmission/fdlimit.c:686
+#: ../libtransmission/fdlimit.c:682
 #, c-format
 msgid "Couldn't create socket: %s"
 msgstr "Impossible de créer un connecteur : %s"
@@ -2074,7 +2164,7 @@
 msgid "Torrent Creator is skipping file \"%s\": %s"
 msgstr "Le créateur de torrent ignore le fichier « %s » : %s"
 
-#: ../libtransmission/metainfo.c:559
+#: ../libtransmission/metainfo.c:587
 #, c-format
 msgid "Invalid metadata entry \"%s\""
 msgstr "L'entrée de métadonnées « %s » est invalide"
@@ -2103,32 +2193,32 @@
 msgid "Port %d forwarded successfully"
 msgstr "Port %d redirigé avec succès"
 
-#: ../libtransmission/net.c:268
+#: ../libtransmission/net.c:266
 #, c-format
 msgid "Couldn't set source address %s on %d: %s"
 msgstr "Impossible de définir l'adresse source %s sur %d : %s"
 
-#: ../libtransmission/net.c:284
+#: ../libtransmission/net.c:282
 #, c-format
 msgid "Couldn't connect socket %d to %s, port %d (errno %d - %s)"
 msgstr ""
 "Impossible de connecter le connecteur %d à %s, port %d (n° d'erreur %d - %s)"
 
-#: ../libtransmission/net.c:356
+#: ../libtransmission/net.c:354
 msgid "Is another copy of Transmission already running?"
 msgstr "Une autre instance de Transmission s'exécute-t-elle ?"
 
-#: ../libtransmission/net.c:361
+#: ../libtransmission/net.c:359
 #, c-format
 msgid "Couldn't bind port %d on %s: %s"
 msgstr "Impossible se connecter au port %d sur %s : %s"
 
-#: ../libtransmission/net.c:363
+#: ../libtransmission/net.c:361
 #, c-format
 msgid "Couldn't bind port %d on %s: %s (%s)"
 msgstr "Impossible de s'attacher au port %d sur %s : %s (%s)"
 
-#: ../libtransmission/peer-msgs.c:1891
+#: ../libtransmission/peer-msgs.c:1893
 #, c-format
 msgid "Please Verify Local Data! Piece #%zu is corrupt."
 msgstr ""
@@ -2154,7 +2244,7 @@
 msgid "Not forwarded"
 msgstr "Non redirigé"
 
-#: ../libtransmission/port-forwarding.c:91 ../libtransmission/torrent.c:1953
+#: ../libtransmission/port-forwarding.c:91 ../libtransmission/torrent.c:2040
 #, c-format
 msgid "State changed from \"%1$s\" to \"%2$s\""
 msgstr "État modifié de « %1$s » en « %2$s »"
@@ -2165,27 +2255,27 @@
 
 #. first %s is the application name
 #. second %s is the version number
-#: ../libtransmission/session.c:704
+#: ../libtransmission/session.c:718
 #, c-format
 msgid "%s %s started"
 msgstr "%s %s démarré"
 
-#: ../libtransmission/session.c:1905
+#: ../libtransmission/session.c:1937
 #, c-format
 msgid "Loaded %d torrents"
 msgstr "%d torrents chargés"
 
-#: ../libtransmission/torrent.c:527
+#: ../libtransmission/torrent.c:524
 #, c-format
 msgid "Tracker warning: \"%s\""
 msgstr "Avertissement du traqueur : « %s »"
 
-#: ../libtransmission/torrent.c:534
+#: ../libtransmission/torrent.c:531
 #, c-format
 msgid "Tracker error: \"%s\""
 msgstr "Erreur du traqueur : « %s »"
 
-#: ../libtransmission/torrent.c:781
+#: ../libtransmission/torrent.c:778
 msgid ""
 "No data found! Ensure your drives are connected or use \"Set Location\". To "
 "re-download, remove the torrent and re-add it."
@@ -2194,58 +2284,54 @@
 "utilisez « Définir l'emplacement ». Pour re-télécharger, retirez le torrent "
 "et ajoutez-le à nouveau."
 
-#: ../libtransmission/torrent.c:1582
+#: ../libtransmission/torrent.c:1661
 msgid "Restarted manually -- disabling its seed ratio"
 msgstr "Redémarré manuellement -- désactivation de son ratio de source"
 
-#: ../libtransmission/torrent.c:1726
+#: ../libtransmission/torrent.c:1813
 msgid "Removing torrent"
 msgstr "Suppression du torrent"
 
-#: ../libtransmission/torrent.c:1810
+#: ../libtransmission/torrent.c:1897
 msgid "Done"
 msgstr "Effectué"
 
-#: ../libtransmission/torrent.c:1813
+#: ../libtransmission/torrent.c:1900
 msgid "Complete"
 msgstr "Complet"
 
-#: ../libtransmission/torrent.c:1816
-msgid "Incomplete"
-msgstr "Incomplet"
-
-#: ../libtransmission/upnp.c:26
+#: ../libtransmission/upnp.c:35
 msgid "Port Forwarding (UPnP)"
 msgstr "Redirection de port (UPnP)"
 
-#: ../libtransmission/upnp.c:112
+#: ../libtransmission/upnp.c:201
 #, c-format
 msgid "Found Internet Gateway Device \"%s\""
 msgstr "Périphérique de passerelle Internet trouvé « %s »"
 
-#: ../libtransmission/upnp.c:115
+#: ../libtransmission/upnp.c:204
 #, c-format
 msgid "Local Address is \"%s\""
 msgstr "L'adresse locale est « %s »"
 
-#: ../libtransmission/upnp.c:151
+#: ../libtransmission/upnp.c:233
 #, c-format
 msgid "Port %d isn't forwarded"
 msgstr "Le port %d n'est pas redirigé"
 
-#: ../libtransmission/upnp.c:168
+#: ../libtransmission/upnp.c:244
 #, c-format
 msgid "Stopping port forwarding through \"%s\", service \"%s\""
 msgstr "Arrêt de la redirection de port via « %s », service « %s »"
 
-#: ../libtransmission/upnp.c:219
+#: ../libtransmission/upnp.c:277
 #, c-format
 msgid ""
 "Port forwarding through \"%s\", service \"%s\". (local address: %s:%d)"
 msgstr ""
 "Translation de port via « %s », service « %s ». (adresse locale : %s:%d)"
 
-#: ../libtransmission/upnp.c:224
+#: ../libtransmission/upnp.c:282
 msgid "Port forwarding successful!"
 msgstr "La redirection de port a réussi !"
 
@@ -2258,19 +2344,11 @@
 msgstr "L'allocation de mémoire a échoué."
 
 #. Node exists but isn't a folder
-#: ../libtransmission/utils.c:566
+#: ../libtransmission/utils.c:578
 #, c-format
 msgid "File \"%s\" is in the way"
 msgstr "Le fichier « %s » est en chemin"
 
-#: ../libtransmission/utils.c:1457
-msgid "None"
-msgstr "aucun"
-
 #: ../libtransmission/verify.c:218
 msgid "Verifying torrent"
 msgstr "Vérification du torrent"
-
-#: ../libtransmission/verify.c:260
-msgid "Queued for verification"
-msgstr "En attente de vérification"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ubuntuone-client.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ubuntuone-client.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ubuntuone-client.po	2012-01-02 17:27:30.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ubuntuone-client.po	2012-02-23 06:31:54.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubuntuone-client\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-12-23 16:27+0000\n"
+"POT-Creation-Date: 2012-02-21 05:09+0000\n"
 "PO-Revision-Date: 2011-07-12 17:54+0000\n"
 "Last-Translator: dupoxy <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 18:21+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:07+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../ubuntuone/clientdefs.py.in:39
 #: ../ubuntuone/platform/credentials/__init__.py:69
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ubuntuone-control-panel.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ubuntuone-control-panel.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ubuntuone-control-panel.po	2012-01-02 17:27:36.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ubuntuone-control-panel.po	2012-02-23 06:31:59.000000000 +0000
@@ -7,53 +7,53 @@
 msgstr ""
 "Project-Id-Version: ubuntuone-control-panel\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-12-23 21:52+0000\n"
+"POT-Creation-Date: 2012-02-16 16:32+0000\n"
 "PO-Revision-Date: 2011-12-24 12:12+0000\n"
 "Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:34+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 02:13+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:75
+#: ../ubuntuone/controlpanel/gui/__init__.py:74
 msgid "Always in sync"
 msgstr "Toujours synchronisé"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:76
+#: ../ubuntuone/controlpanel/gui/__init__.py:75
 msgid "Connect to Ubuntu One"
 msgstr "Se connecter à Ubuntu One"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:77
+#: ../ubuntuone/controlpanel/gui/__init__.py:76
 msgid "Thunderbird plug-in"
 msgstr "Greffon Thunderbird"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:78
+#: ../ubuntuone/controlpanel/gui/__init__.py:77
 msgid "There was a problem while retrieving the credentials."
 msgstr ""
 "Un problème est survenu lors de la récupération des informations "
 "d'identification."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:79
+#: ../ubuntuone/controlpanel/gui/__init__.py:78
 msgid "View your personal details and service summary"
 msgstr ""
 "Voir le détail vos informations personnelles et un récapitulatif de vos "
 "services"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:81
+#: ../ubuntuone/controlpanel/gui/__init__.py:80
 msgid "Welcome to Ubuntu One!"
 msgstr "Bienvenue sur Ubuntu One !"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:82
+#: ../ubuntuone/controlpanel/gui/__init__.py:81
 msgid ""
 "The information could not be retrieved. Maybe your internet connection is "
 "down?"
 msgstr ""
 "L'information n'a pas pu être récupérée. Vérifiez votre connexion à Internet."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:85
-#: ../ubuntuone/controlpanel/gui/__init__.py:161
+#: ../ubuntuone/controlpanel/gui/__init__.py:84
+#: ../ubuntuone/controlpanel/gui/__init__.py:160
 msgid ""
 "The settings could not be changed,\n"
 "previous values were restored."
@@ -61,37 +61,37 @@
 "Les paramètres n'ont pas  pu être modifiés,\n"
 "les valeurs précédentes ont été restaurées."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:87
+#: ../ubuntuone/controlpanel/gui/__init__.py:86
 msgid "Are you sure you want to remove this device from Ubuntu One?"
 msgstr "Voulez-vous vraiment retirer cet appareil d'Ubuntu One ?"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:90
+#: ../ubuntuone/controlpanel/gui/__init__.py:89
 msgid "The device could not be removed."
 msgstr "L'appareil n'a pas pu être retiré."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:91
+#: ../ubuntuone/controlpanel/gui/__init__.py:90
 msgid "Manage devices registered with your personal cloud"
 msgstr "Gérer les appareils liés à votre nuage personnel"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:93
+#: ../ubuntuone/controlpanel/gui/__init__.py:92
 msgid "The devices connected with your personal cloud are listed below."
 msgstr ""
 "Les appareils connectés à votre nuage personnel sont listés ci-dessous."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:95
+#: ../ubuntuone/controlpanel/gui/__init__.py:94
 msgid "Explore"
 msgstr "Explorer"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:96
+#: ../ubuntuone/controlpanel/gui/__init__.py:95
 #, python-format
 msgid "<i>%(package_name)s</i> could not be installed"
 msgstr "<i>%(package_name)s</i> n'a pas pu être installé"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:97
+#: ../ubuntuone/controlpanel/gui/__init__.py:96
 msgid "Sync another folder with your cloud"
 msgstr "Synchroniser un autre dossier avec votre nuage"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:98
+#: ../ubuntuone/controlpanel/gui/__init__.py:97
 #, python-format
 msgid ""
 "The chosen directory \"%(folder_path)s\" is not valid. \n"
@@ -104,16 +104,16 @@
 "Merci de choisir un dossier dans votre dossier « %(home_folder)s », et ne "
 "chevauchant pas un dossier existant dans votre nuage."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:103
+#: ../ubuntuone/controlpanel/gui/__init__.py:102
 msgid "My personal folders"
 msgstr "Mes dossiers personnels"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:104
+#: ../ubuntuone/controlpanel/gui/__init__.py:103
 #, python-format
 msgid "Shared by %(other_user_display_name)s"
 msgstr "Partagé par %(other_user_display_name)s"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:105
+#: ../ubuntuone/controlpanel/gui/__init__.py:104
 #, python-format
 msgid ""
 "The contents of your cloud folder will be merged with your local folder "
@@ -124,118 +124,118 @@
 "avec celui de votre dossier local « %(folder_path)s ».\n"
 "Voulez-vous souscrire à ce dossier du nuage ?"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:109
+#: ../ubuntuone/controlpanel/gui/__init__.py:108
 msgid "Manage your cloud folders"
 msgstr "Gérer les dossiers de votre nuage personnel"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:111
+#: ../ubuntuone/controlpanel/gui/__init__.py:110
 msgid ""
 "Select which folders from your cloud you want to sync with this computer"
 msgstr ""
 "Sélectionnez les dossiers du nuage à synchroniser avec cet ordinateur"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:113
+#: ../ubuntuone/controlpanel/gui/__init__.py:112
 msgid "Connect"
 msgstr "Se connecter"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:114
+#: ../ubuntuone/controlpanel/gui/__init__.py:113
 msgid "Connect the file sync service with your personal cloud"
 msgstr ""
 "Connecter le service de synchronisation des fichiers à votre nuage personnel"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:116
+#: ../ubuntuone/controlpanel/gui/__init__.py:115
 msgid "File Sync is disabled."
 msgstr "Synchronisation des fichiers désactivée."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:117
+#: ../ubuntuone/controlpanel/gui/__init__.py:116
 msgid "Disconnect"
 msgstr "Se déconnecter"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:118
+#: ../ubuntuone/controlpanel/gui/__init__.py:117
 msgid "Disconnect the file sync service from your personal cloud"
 msgstr ""
 "Déconnecter le service de synchronisation des fichiers de votre nuage "
 "personnel"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:120
+#: ../ubuntuone/controlpanel/gui/__init__.py:119
 msgid "File Sync is disconnected."
 msgstr "Synchronisation des fichiers déconnectée."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:121
+#: ../ubuntuone/controlpanel/gui/__init__.py:120
 msgid "Enable"
 msgstr "Activer"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:122
+#: ../ubuntuone/controlpanel/gui/__init__.py:121
 msgid "Enable the file sync service"
 msgstr "Activer le service de synchronisation des fichiers"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:123
+#: ../ubuntuone/controlpanel/gui/__init__.py:122
 msgid "File Sync error."
 msgstr "Erreur de synchronisation des fichiers."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:124
+#: ../ubuntuone/controlpanel/gui/__init__.py:123
 msgid "File Sync is up-to-date."
 msgstr "Tous les fichiers sont synchronisés."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:125
+#: ../ubuntuone/controlpanel/gui/__init__.py:124
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:126
+#: ../ubuntuone/controlpanel/gui/__init__.py:125
 msgid "Restart the file sync service"
 msgstr "Redémarrer le service de synchronisation des fichiers"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:127
+#: ../ubuntuone/controlpanel/gui/__init__.py:126
 msgid "File Sync"
 msgstr "Synchronisation des fichiers"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:128
+#: ../ubuntuone/controlpanel/gui/__init__.py:127
 msgid "Start"
 msgstr "Démarrer"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:129
+#: ../ubuntuone/controlpanel/gui/__init__.py:128
 msgid "Start the file sync service"
 msgstr "Démarrer le service de synchronisation des fichiers"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:130
+#: ../ubuntuone/controlpanel/gui/__init__.py:129
 msgid "File Sync starting..."
 msgstr "Démarrage de la synchronisation des fichiers..."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:131
+#: ../ubuntuone/controlpanel/gui/__init__.py:130
 msgid "Stop"
 msgstr "Arrêter"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:132
+#: ../ubuntuone/controlpanel/gui/__init__.py:131
 msgid "Stop the file sync service"
 msgstr "Arrêter le service de synchronisation des fichiers"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:133
+#: ../ubuntuone/controlpanel/gui/__init__.py:132
 msgid "File Sync is stopped."
 msgstr "Synchronisation des fichiers arrêtée."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:134
+#: ../ubuntuone/controlpanel/gui/__init__.py:133
 msgid "File Sync in progress..."
 msgstr "Synchronisation des fichiers en cours..."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:135
+#: ../ubuntuone/controlpanel/gui/__init__.py:134
 #, python-format
 msgid "%(free_space)s available storage"
 msgstr "%(free_space)s d'espace de stockage disponible"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:136
+#: ../ubuntuone/controlpanel/gui/__init__.py:135
 msgid "Ubuntu One experienced an error"
 msgstr "Ubuntu One a rencontré une erreur"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:137
+#: ../ubuntuone/controlpanel/gui/__init__.py:136
 msgid "Sorry, an error has occurred and Ubuntu One needs to close."
 msgstr "Désolé, une erreur est survenue et Ubuntu One a besoin d'être fermé."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:139
+#: ../ubuntuone/controlpanel/gui/__init__.py:138
 #, python-format
 msgid "Hi %(user_display_name)s"
 msgstr "Bonjour %(user_display_name)s"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:140
+#: ../ubuntuone/controlpanel/gui/__init__.py:139
 #, python-format
 msgid ""
 "You need to install the package <i>%(package_name)s</i> in order to enable "
@@ -244,40 +244,40 @@
 "Vous avez besoin d'installer <i>%(package_name)s</i> pour pouvoir activer "
 "davantage de services de synchronisation."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:142
+#: ../ubuntuone/controlpanel/gui/__init__.py:141
 #, python-format
 msgid "Install the %(plugin_name)s for the sync service: %(service_name)s"
 msgstr ""
 "Installez %(plugin_name)s pour le service de synchronisation : "
 "%(service_name)s"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:144
+#: ../ubuntuone/controlpanel/gui/__init__.py:143
 #, python-format
 msgid "Installation of <i>%(package_name)s</i> in progress"
 msgstr "Installation de <i>%(package_name)s</i> en cours"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:145
+#: ../ubuntuone/controlpanel/gui/__init__.py:144
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:146
+#: ../ubuntuone/controlpanel/gui/__init__.py:145
 #, python-format
 msgid "%(app_name)s Control Panel"
 msgstr "Panneau de configuration de %(app_name)s"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:147
+#: ../ubuntuone/controlpanel/gui/__init__.py:146
 msgid "My folders"
 msgstr "Mes dossiers"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:148
+#: ../ubuntuone/controlpanel/gui/__init__.py:147
 msgid "[unknown user name]"
 msgstr "[nom d'utilisateur inconnu]"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:149
+#: ../ubuntuone/controlpanel/gui/__init__.py:148
 msgid "Purchased Music"
 msgstr "Musique achetée"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:151
+#: ../ubuntuone/controlpanel/gui/__init__.py:150
 #, python-format
 msgid ""
 "An internet connection is required to join or sign in to %(app_name)s."
@@ -285,64 +285,64 @@
 "Une connexion Internet fonctionnelle est nécessaire pour s'inscrire ou se "
 "connecter à %(app_name)s."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:153
+#: ../ubuntuone/controlpanel/gui/__init__.py:152
 msgid "No devices to show."
 msgstr "Aucun appareil à afficher."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:154
+#: ../ubuntuone/controlpanel/gui/__init__.py:153
 msgid "No folders to show."
 msgstr "Aucun dossier à afficher."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:155
+#: ../ubuntuone/controlpanel/gui/__init__.py:154
 msgid "There is no Ubuntu One pairing record."
 msgstr ""
 "Il n'y a aucun historique d'association de périphériques à Ubuntu One."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:156
+#: ../ubuntuone/controlpanel/gui/__init__.py:155
 #, python-format
 msgid "%(percentage)s used"
 msgstr "%(percentage)s d'utilisés"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:157
+#: ../ubuntuone/controlpanel/gui/__init__.py:156
 #, python-format
 msgid "Using %(used)s of %(total)s (%(percentage).0f%%)"
 msgstr "%(used)s utilisés sur %(total)s (%(percentage).0f%%)"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:158
+#: ../ubuntuone/controlpanel/gui/__init__.py:157
 #, python-format
 msgid "%(used)s of %(total)s"
 msgstr "%(used)s sur %(total)s"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:159
+#: ../ubuntuone/controlpanel/gui/__init__.py:158
 msgid "Manage the sync services"
 msgstr "Gérer les services de synchronisation"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:160
+#: ../ubuntuone/controlpanel/gui/__init__.py:159
 msgid "Enable the sync services for this computer."
 msgstr "Activer les services de synchronisation pour cet ordinateur."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:163
+#: ../ubuntuone/controlpanel/gui/__init__.py:162
 msgid "Manage the shares offered to others"
 msgstr "Gérer les partages avec d'autres utilisateurs"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:164
+#: ../ubuntuone/controlpanel/gui/__init__.py:163
 msgid "Manage permissions for shares made to other users."
 msgstr "Gérer les autorisations de partage avec d'autres utilisateurs."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:165
+#: ../ubuntuone/controlpanel/gui/__init__.py:164
 #, python-format
 msgid "<i>%(package_name)s</i> was successfully installed"
 msgstr "<i>%(package_name)s</i> a été installé avec succès"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:166 ../data/gtk/volumes.ui.h:1
+#: ../ubuntuone/controlpanel/gui/__init__.py:165 ../data/gtk/volumes.ui.h:1
 msgid "Sync locally?"
 msgstr "Synchroniser localement ?"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:167
+#: ../ubuntuone/controlpanel/gui/__init__.py:166
 msgid "Value could not be retrieved."
 msgstr "La valeur n'a pas pu être récupérée."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:168
+#: ../ubuntuone/controlpanel/gui/__init__.py:167
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ubuntuone-installer.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ubuntuone-installer.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ubuntuone-installer.po	2012-01-02 17:27:49.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ubuntuone-installer.po	2012-02-23 06:32:13.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntuone-installer\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-12-21 10:31+0000\n"
+"POT-Creation-Date: 2012-02-15 20:51+0000\n"
 "PO-Revision-Date: 2011-09-24 11:39+0000\n"
 "Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-30 01:36+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 06:46+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../ubuntuone-installer.desktop.in.h:1
 msgid "Configure and manage your Ubuntu One account"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ubuntu-sso-client.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ubuntu-sso-client.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ubuntu-sso-client.po	2012-01-02 17:27:35.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ubuntu-sso-client.po	2012-02-23 06:31:59.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:24+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 02:03+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../ubuntu_sso/gtk/gui.py:152
 msgid "Type the characters above"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ubuntu-wallpapers.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ubuntu-wallpapers.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ubuntu-wallpapers.po	2012-01-02 17:27:26.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ubuntu-wallpapers.po	2012-02-23 06:31:49.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:03+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:02+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: ../ubuntu-wallpapers.xml.in.h:1
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/udisks.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/udisks.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/udisks.po	2012-01-02 17:27:34.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/udisks.po	2012-02-23 06:31:58.000000000 +0000
@@ -7,191 +7,191 @@
 msgstr ""
 "Project-Id-Version: udisks master fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-21 06:02+0000\n"
+"POT-Creation-Date: 2012-01-04 12:24+0000\n"
 "PO-Revision-Date: 2010-03-26 19:56+0000\n"
 "Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:14+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:53+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:1
-msgid "Authentication is required to cancel a job initiated by another user"
-msgstr ""
-"Il est nécessaire de s'authentifier pour annuler une tâche lancée par une "
-"autre personne"
+msgid "Mount a device"
+msgstr "Monter un périphérique"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:2
-msgid "Authentication is required to check the file system on the device"
-msgstr ""
-"Il est nécessaire de s'authentifier pour vérifier le système de fichiers sur "
-"le périphérique"
+msgid "Authentication is required to mount the device"
+msgstr "Il est nécessaire de s'authentifier pour monter le périphérique"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:3
-msgid "Authentication is required to configure Linux LVM2"
-msgstr "Il est nécessaire de s'authentifier pour configurer LVM2 Linux"
+msgid "Mount a system-internal device"
+msgstr "Monter un périphérique système interne"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:4
-msgid "Authentication is required to configure Linux Software RAID devices"
-msgstr ""
-"Il est nécessaire de s'authentifier pour configurer des périphériques RAID "
-"logiciel Linux"
+msgid "Check file system on a device"
+msgstr "Vérifier le système de fichiers d'un périphérique"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:5
-msgid "Authentication is required to configure drive spindown timeout"
+msgid "Authentication is required to check the file system on the device"
 msgstr ""
-"Il est nécessaire de s'authentifier pour configurer le délai d'arrêt d'un "
-"disque"
+"Il est nécessaire de s'authentifier pour vérifier le système de fichiers sur "
+"le périphérique"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:6
-msgid "Authentication is required to detach the drive"
-msgstr "Il est nécessaire de s'authentifier pour détacher le disque"
+msgid "Check file system of a system-internal device"
+msgstr "Vérifier le système de fichiers d'un périphérique système interne"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:7
-msgid "Authentication is required to eject media from the device"
-msgstr ""
-"Il est nécessaire de s'authentifier pour éjecter un média du périphérique"
+msgid "Unmount a device mounted by another user"
+msgstr "Démonter un périphérique monté par une autre personne"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:8
-msgid "Authentication is required to inhibit media detection"
+msgid "Authentication is required to unmount devices mounted by another user"
 msgstr ""
-"Il est nécessaire de s'authentifier pour désactiver la détection de média"
+"Il est nécessaire de s'authentifier pour démonter des périphériques montés "
+"par une autre personne"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:9
+msgid "List open files"
+msgstr "Afficher la liste des fichiers ouverts"
+
+#: ../policy/org.freedesktop.udisks.policy.in.h:10
 msgid ""
 "Authentication is required to list open files on a mounted file system"
 msgstr ""
 "Il est nécessaire de s'authentifier pour afficher la liste des fichiers "
 "ouverts sur un système de fichiers monté"
 
-#: ../policy/org.freedesktop.udisks.policy.in.h:10
-msgid ""
-"Authentication is required to lock an encrypted device unlocked by another "
-"user"
-msgstr ""
-"Il est nécessaire de s'authentifier pour verrouiller un périphérique chiffré "
-"déverrouillé par une autre personne"
-
 #: ../policy/org.freedesktop.udisks.policy.in.h:11
-msgid "Authentication is required to modify the device"
-msgstr "Il est nécessaire de s'authentifier pour modifier le périphérique"
+msgid "List open files on a system-internal device"
+msgstr ""
+"Afficher la liste des fichiers ouverts sur un périphérique système interne"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:12
-msgid "Authentication is required to mount the device"
-msgstr "Il est nécessaire de s'authentifier pour monter le périphérique"
+msgid "Eject media from a device"
+msgstr "Éjecter un média d'un périphérique"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:13
-msgid "Authentication is required to refresh ATA SMART data"
+msgid "Authentication is required to eject media from the device"
 msgstr ""
-"Il est nécessaire de s'authentifier pour actualiser les données SMART ATA"
+"Il est nécessaire de s'authentifier pour éjecter un média du périphérique"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:14
-msgid "Authentication is required to retrieve historical ATA SMART data"
-msgstr ""
-"Il est nécessaire de s'authentifier pour obtenir les données d'historique "
-"SMART ATA"
+msgid "Detach a drive"
+msgstr "Détacher un disque"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:15
-msgid "Authentication is required to run ATA SMART self tests"
-msgstr ""
-"Il est nécessaire de s'authentifier pour lancer les auto-tests SMART ATA"
+msgid "Authentication is required to detach the drive"
+msgstr "Il est nécessaire de s'authentifier pour détacher le disque"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:16
-msgid "Authentication is required to unlock an encrypted device"
-msgstr ""
-"Il est nécessaire de s'authentifier pour déverrouiller un périphérique "
-"chiffré"
+msgid "Modify a device"
+msgstr "Modifier un périphérique"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:17
-msgid "Authentication is required to unmount devices mounted by another user"
-msgstr ""
-"Il est nécessaire de s'authentifier pour démonter des périphériques montés "
-"par une autre personne"
+msgid "Authentication is required to modify the device"
+msgstr "Il est nécessaire de s'authentifier pour modifier le périphérique"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:18
-msgid "Cancel a job initiated by another user"
-msgstr "Annuler une tâche lancée par une autre personne"
+msgid "Modify a system-internal device"
+msgstr "Modifier un périphérique système interne"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:19
-msgid "Check file system of a system-internal device"
-msgstr "Vérifier le système de fichiers d'un périphérique système interne"
+msgid "Refresh ATA SMART data"
+msgstr "Actualiser des données SMART ATA"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:20
-msgid "Check file system on a device"
-msgstr "Vérifier le système de fichiers d'un périphérique"
+msgid "Authentication is required to refresh ATA SMART data"
+msgstr ""
+"Il est nécessaire de s'authentifier pour actualiser les données SMART ATA"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:21
-msgid "Configure Linux LVM2"
-msgstr "Configurer LVM2 Linux"
+msgid "Run ATA SMART Self Tests"
+msgstr "Lancer des auto-tests SMART ATA"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:22
-msgid "Configure Linux Software RAID"
-msgstr "Configurer un RAID logiciel Linux"
+msgid "Authentication is required to run ATA SMART self tests"
+msgstr ""
+"Il est nécessaire de s'authentifier pour lancer les auto-tests SMART ATA"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:23
-msgid "Detach a drive"
-msgstr "Détacher un disque"
+msgid "Retrieve historical ATA SMART data"
+msgstr "Obtenir les données d'historique SMART ATA"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:24
-msgid "Eject media from a device"
-msgstr "Éjecter un média d'un périphérique"
+msgid "Authentication is required to retrieve historical ATA SMART data"
+msgstr ""
+"Il est nécessaire de s'authentifier pour obtenir les données d'historique "
+"SMART ATA"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:25
-msgid "Inhibit media detection"
-msgstr "Désactiver la détection de média"
+msgid "Unlock an encrypted device"
+msgstr "Déverrouiller un périphérique chiffré"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:26
-msgid "List open files"
-msgstr "Afficher la liste des fichiers ouverts"
+msgid "Authentication is required to unlock an encrypted device"
+msgstr ""
+"Il est nécessaire de s'authentifier pour déverrouiller un périphérique "
+"chiffré"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:27
-msgid "List open files on a system-internal device"
+msgid "Lock an encrypted device unlocked by another user"
 msgstr ""
-"Afficher la liste des fichiers ouverts sur un périphérique système interne"
+"Verrouiller un périphérique chiffré déverrouillé par une autre personne"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:28
-msgid "Lock an encrypted device unlocked by another user"
+msgid ""
+"Authentication is required to lock an encrypted device unlocked by another "
+"user"
 msgstr ""
-"Verrouiller un périphérique chiffré déverrouillé par une autre personne"
+"Il est nécessaire de s'authentifier pour verrouiller un périphérique chiffré "
+"déverrouillé par une autre personne"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:29
-msgid "Modify a device"
-msgstr "Modifier un périphérique"
+msgid "Configure Linux Software RAID"
+msgstr "Configurer un RAID logiciel Linux"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:30
-msgid "Modify a system-internal device"
-msgstr "Modifier un périphérique système interne"
+msgid "Authentication is required to configure Linux Software RAID devices"
+msgstr ""
+"Il est nécessaire de s'authentifier pour configurer des périphériques RAID "
+"logiciel Linux"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:31
-msgid "Mount a device"
-msgstr "Monter un périphérique"
+msgid "Configure Linux LVM2"
+msgstr "Configurer LVM2 Linux"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:32
-msgid "Mount a system-internal device"
-msgstr "Monter un périphérique système interne"
+msgid "Authentication is required to configure Linux LVM2"
+msgstr "Il est nécessaire de s'authentifier pour configurer LVM2 Linux"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:33
-msgid "Refresh ATA SMART data"
-msgstr "Actualiser des données SMART ATA"
+msgid "Cancel a job initiated by another user"
+msgstr "Annuler une tâche lancée par une autre personne"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:34
-msgid "Retrieve historical ATA SMART data"
-msgstr "Obtenir les données d'historique SMART ATA"
+msgid "Authentication is required to cancel a job initiated by another user"
+msgstr ""
+"Il est nécessaire de s'authentifier pour annuler une tâche lancée par une "
+"autre personne"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:35
-msgid "Run ATA SMART Self Tests"
-msgstr "Lancer des auto-tests SMART ATA"
+msgid "Inhibit media detection"
+msgstr "Désactiver la détection de média"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:36
-msgid "Set drive spindown timeout"
-msgstr "Définir le délai d'arrêt d'un disque"
+msgid "Authentication is required to inhibit media detection"
+msgstr ""
+"Il est nécessaire de s'authentifier pour désactiver la détection de média"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:37
-msgid "Unlock an encrypted device"
-msgstr "Déverrouiller un périphérique chiffré"
+msgid "Set drive spindown timeout"
+msgstr "Définir le délai d'arrêt d'un disque"
 
 #: ../policy/org.freedesktop.udisks.policy.in.h:38
-msgid "Unmount a device mounted by another user"
-msgstr "Démonter un périphérique monté par une autre personne"
+msgid "Authentication is required to configure drive spindown timeout"
+msgstr ""
+"Il est nécessaire de s'authentifier pour configurer le délai d'arrêt d'un "
+"disque"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ufw.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ufw.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ufw.po	2012-01-02 17:27:26.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ufw.po	2012-02-23 06:31:49.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:12+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:10+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/ufw:46
 msgid ": Need at least python 2.5)\n"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/unattended-upgrades.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/unattended-upgrades.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/unattended-upgrades.po	2012-01-02 17:27:18.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/unattended-upgrades.po	2012-02-23 06:31:42.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:26+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:28+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: ../unattended-upgrade:106
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/unity-2d.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/unity-2d.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/unity-2d.po	2012-01-02 17:27:36.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/unity-2d.po	2012-02-23 06:32:00.000000000 +0000
@@ -8,15 +8,15 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/unity-2d/+filebug\n"
 "POT-Creation-Date: 2011-09-29 11:48+0200\n"
-"PO-Revision-Date: 2011-12-07 22:31+0000\n"
-"Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
+"PO-Revision-Date: 2012-01-26 15:36+0000\n"
+"Last-Translator: Alexandre Franke <alexandre.franke@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:41+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 02:18+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: \n"
 
 #: libunity-2d-private/src/launcherdevice.cpp:273
@@ -132,7 +132,7 @@
 
 #: places/HomeShortcuts.qml:74
 msgid "Find Files"
-msgstr "Trouver des fichiers"
+msgstr "Rechercher des fichiers"
 
 #: places/HomeShortcuts.qml:81
 msgid "Browse the Web"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/update-manager.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/update-manager.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/update-manager.po	2012-01-02 17:26:56.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/update-manager.po	2012-02-23 06:31:23.000000000 +0000
@@ -8,41 +8,33 @@
 msgstr ""
 "Project-Id-Version: update-manager 0.37.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-10 19:09+0000\n"
-"PO-Revision-Date: 2011-12-23 12:31+0000\n"
-"Last-Translator: seb123 <Unknown>\n"
+"POT-Creation-Date: 2012-02-17 03:06+0000\n"
+"PO-Revision-Date: 2012-02-16 23:28+0000\n"
+"Last-Translator: Bruno Patri <Unknown>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:14+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
-
-#. TRANSLATORS: download size is 0
-#: ../DistUpgrade/utils.py:392 ../UpdateManager/Core/utils.py:392
-msgid "0 kB"
-msgstr "0 kio"
-
-#. TRANSLATORS: download size of very small updates
-#: ../DistUpgrade/utils.py:395 ../UpdateManager/Core/utils.py:395
-msgid "1 kB"
-msgstr "1 kio"
+"X-Launchpad-Export-Date: 2012-02-21 18:59+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 kB"
-#: ../DistUpgrade/utils.py:398 ../UpdateManager/Core/utils.py:398
+#: ../DistUpgrade/utils.py:397 ../UpdateManager/Core/utils.py:397
 #, python-format
-msgid "%.0f kB"
-msgstr "%.0f kio"
+msgid "%(size).0f kB"
+msgid_plural "%(size).0f kB"
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../DistUpgrade/utils.py:401 ../UpdateManager/Core/utils.py:401
+#: ../DistUpgrade/utils.py:352 ../UpdateManager/Core/utils.py:352
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f Mio"
 
 #. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:210 ../DistUpgrade/distro.py:438
+#: ../DistUpgrade/distro.py:208 ../DistUpgrade/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Serveur pour %s"
@@ -50,20 +42,20 @@
 #. More than one server is used. Since we don't handle this case
 #. in the user interface we set "custom servers" to true and
 #. append a list of all used servers
-#: ../DistUpgrade/distro.py:228 ../DistUpgrade/distro.py:234
-#: ../DistUpgrade/distro.py:250
+#: ../DistUpgrade/distro.py:226 ../DistUpgrade/distro.py:232
+#: ../DistUpgrade/distro.py:248
 msgid "Main server"
 msgstr "Serveur principal"
 
-#: ../DistUpgrade/distro.py:254
+#: ../DistUpgrade/distro.py:252
 msgid "Custom servers"
 msgstr "Serveurs personnalisés"
 
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:141
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:131
 msgid "Could not calculate sources.list entry"
 msgstr "Impossible d'évaluer la ligne de source.list"
 
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:244
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:234
 msgid ""
 "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
 "wrong architecture?"
@@ -71,11 +63,11 @@
 "Impossible de localiser les fichiers des paquets. Ce n'est peut-être pas un "
 "disque Ubuntu ou alors il est prévu pour une autre architecture."
 
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:287
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:277
 msgid "Failed to add the CD"
 msgstr "Impossible d'ajouter le CD"
 
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:288
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:278
 #, python-format
 msgid ""
 "There was a error adding the CD, the upgrade will abort. Please report this "
@@ -90,13 +82,13 @@
 "Le message d'erreur est :\n"
 "« %s »"
 
-#: ../DistUpgrade/DistUpgradeCache.py:147
+#: ../DistUpgrade/DistUpgradeCache.py:130
 msgid "Remove package in bad state"
 msgid_plural "Remove packages in bad state"
 msgstr[0] "Supprimer le paquet endommagé"
 msgstr[1] "Supprimer les paquets endommagés"
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:133
 #, python-format
 msgid ""
 "The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -117,15 +109,15 @@
 
 #. FIXME: not ideal error message, but we just reuse a
 #. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:231
 msgid "The server may be overloaded"
 msgstr "Le serveur est peut-être surchargé"
 
-#: ../DistUpgrade/DistUpgradeCache.py:361
+#: ../DistUpgrade/DistUpgradeCache.py:341
 msgid "Broken packages"
 msgstr "Paquets cassés"
 
-#: ../DistUpgrade/DistUpgradeCache.py:362
+#: ../DistUpgrade/DistUpgradeCache.py:342
 msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
@@ -135,7 +127,7 @@
 "avant de continuer."
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:659
+#: ../DistUpgrade/DistUpgradeCache.py:631
 #, python-format
 msgid ""
 "An unresolvable problem occurred while calculating the upgrade:\n"
@@ -157,12 +149,12 @@
 " * un paquet logiciel non officiel, non fourni par Ubuntu.\n"
 "\n"
 
-#: ../DistUpgrade/DistUpgradeCache.py:669
+#: ../DistUpgrade/DistUpgradeCache.py:641
 msgid "This is most likely a transient problem, please try again later."
 msgstr ""
 "Cela ressemble fort à un problème temporaire. Veuillez réessayer plus tard."
 
-#: ../DistUpgrade/DistUpgradeCache.py:672
+#: ../DistUpgrade/DistUpgradeCache.py:673
 msgid ""
 "If none of this applies, then please report this bug using the command "
 "'ubuntu-bug update-manager' in a terminal."
@@ -170,16 +162,16 @@
 "Si rien de tout cela s'applique, merci de signaler ce bogue en utilisant la "
 "commande « ubuntu-bug update-manager » dans un terminal."
 
-#: ../DistUpgrade/DistUpgradeCache.py:677
-#: ../UpdateManager/UpdateManager.py:1034
+#: ../DistUpgrade/DistUpgradeCache.py:650
+#: ../UpdateManager/UpdateManager.py:772
 msgid "Could not calculate the upgrade"
 msgstr "Impossible d'évaluer la mise à niveau"
 
-#: ../DistUpgrade/DistUpgradeCache.py:728
+#: ../DistUpgrade/DistUpgradeCache.py:700
 msgid "Error authenticating some packages"
 msgstr "Erreur lors de l'authentification de certains paquets"
 
-#: ../DistUpgrade/DistUpgradeCache.py:729
+#: ../DistUpgrade/DistUpgradeCache.py:701
 msgid ""
 "It was not possible to authenticate some packages. This may be a transient "
 "network problem. You may want to try again later. See below for a list of "
@@ -190,7 +182,7 @@
 "ultérieurement. Vous trouverez ci-dessous une liste des paquets non "
 "authentifiés."
 
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:721
 #, python-format
 msgid ""
 "The package '%s' is marked for removal but it is in the removal blacklist."
@@ -198,22 +190,22 @@
 "Le paquet « %s » est marqué pour suppression mais il est dans la liste noire "
 "des suppressions."
 
-#: ../DistUpgrade/DistUpgradeCache.py:753
+#: ../DistUpgrade/DistUpgradeCache.py:725
 #, python-format
 msgid "The essential package '%s' is marked for removal."
 msgstr "Le paquet essentiel « %s » est marqué pour suppression."
 
-#: ../DistUpgrade/DistUpgradeCache.py:762
+#: ../DistUpgrade/DistUpgradeCache.py:734
 #, python-format
 msgid "Trying to install blacklisted version '%s'"
 msgstr "Tentative d'installation de la version en liste noire « %s »"
 
-#: ../DistUpgrade/DistUpgradeCache.py:880
+#: ../DistUpgrade/DistUpgradeCache.py:851
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Impossible d'installer « %s »"
 
-#: ../DistUpgrade/DistUpgradeCache.py:881
+#: ../DistUpgrade/DistUpgradeCache.py:882
 msgid ""
 "It was impossible to install a required package. Please report this as a bug "
 "using 'ubuntu-bug update-manager' in a terminal."
@@ -222,11 +214,11 @@
 "problème en saisissant « ubuntu-bug update-manager » dans un terminal."
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:892
+#: ../DistUpgrade/DistUpgradeCache.py:861
 msgid "Can't guess meta-package"
 msgstr "Impossible de déterminer le méta-paquet"
 
-#: ../DistUpgrade/DistUpgradeCache.py:893
+#: ../DistUpgrade/DistUpgradeCache.py:862
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-"
 "desktop or edubuntu-desktop package and it was not possible to detect which "
@@ -240,15 +232,15 @@
 " Veuillez d'abord installer l'un des paquets ci-dessus en utilisant Synaptic "
 "ou apt-get avant de continuer."
 
-#: ../DistUpgrade/DistUpgradeController.py:100
+#: ../DistUpgrade/DistUpgradeController.py:86
 msgid "Reading cache"
 msgstr "Lecture du cache"
 
-#: ../DistUpgrade/DistUpgradeController.py:210
+#: ../DistUpgrade/DistUpgradeController.py:189
 msgid "Unable to get exclusive lock"
 msgstr "Impossible d'obtenir un verrou exclusif"
 
-#: ../DistUpgrade/DistUpgradeController.py:211
+#: ../DistUpgrade/DistUpgradeController.py:190
 msgid ""
 "This usually means that another package management application (like apt-get "
 "or aptitude) already running. Please close that application first."
@@ -257,12 +249,12 @@
 "(telle que apt-get ou aptitude) est déjà en cours d'exécution. Veuillez "
 "d'abord fermer cette application."
 
-#: ../DistUpgrade/DistUpgradeController.py:244
+#: ../DistUpgrade/DistUpgradeController.py:236
 msgid "Upgrading over remote connection not supported"
 msgstr ""
 "La mise à niveau via une connexion distante n'est pas prise en charge"
 
-#: ../DistUpgrade/DistUpgradeController.py:245
+#: ../DistUpgrade/DistUpgradeController.py:237
 msgid ""
 "You are running the upgrade over a remote ssh connection with a frontend "
 "that does not support this. Please try a text mode upgrade with 'do-release-"
@@ -276,11 +268,11 @@
 "\n"
 "La mise à niveau va maintenant être annulée. Veuillez essayer sans SSH."
 
-#: ../DistUpgrade/DistUpgradeController.py:259
+#: ../DistUpgrade/DistUpgradeController.py:251
 msgid "Continue running under SSH?"
 msgstr "Continuer dans une session SSH ?"
 
-#: ../DistUpgrade/DistUpgradeController.py:260
+#: ../DistUpgrade/DistUpgradeController.py:252
 #, python-format
 msgid ""
 "This session appears to be running under ssh. It is not recommended to "
@@ -297,11 +289,11 @@
 "Si vous continuez, un nouveau service SSH va être lancé sur le port « %s ».\n"
 "Voulez-vous continuer ?"
 
-#: ../DistUpgrade/DistUpgradeController.py:274
+#: ../DistUpgrade/DistUpgradeController.py:267
 msgid "Starting additional sshd"
 msgstr "Lancement d'un processus sshd supplémentaire"
 
-#: ../DistUpgrade/DistUpgradeController.py:275
+#: ../DistUpgrade/DistUpgradeController.py:268
 #, python-format
 msgid ""
 "To make recovery in case of failure easier, an additional sshd will be "
@@ -312,7 +304,7 @@
 "supplémentaire sera lancé sur le port « %s ». En cas de problème avec le SSH "
 "existant, vous pourrez toujours vous connecter avec l'autre.\n"
 
-#: ../DistUpgrade/DistUpgradeController.py:283
+#: ../DistUpgrade/DistUpgradeController.py:282
 #, python-format
 msgid ""
 "If you run a firewall, you may need to temporarily open this port. As this "
@@ -325,60 +317,54 @@
 "Vous pouvez ouvrir le port avec par exemple :\n"
 "« %s »"
 
-#: ../DistUpgrade/DistUpgradeController.py:355
-#: ../DistUpgrade/DistUpgradeController.py:400
+#: ../DistUpgrade/DistUpgradeController.py:339
+#: ../DistUpgrade/DistUpgradeController.py:384
 msgid "Can not upgrade"
 msgstr "Mise à niveau impossible"
 
-#: ../DistUpgrade/DistUpgradeController.py:356
+#: ../DistUpgrade/DistUpgradeController.py:340
 #, python-format
 msgid "An upgrade from '%s' to '%s' is not supported with this tool."
 msgstr ""
 "La mise à niveau de « %s » vers « %s » n'est pas prise en charge par cet "
 "outil."
 
-#: ../DistUpgrade/DistUpgradeController.py:365
+#: ../DistUpgrade/DistUpgradeController.py:349
 msgid "Sandbox setup failed"
 msgstr "La configuration de l'espace protégé (sandbox) a échoué"
 
-#: ../DistUpgrade/DistUpgradeController.py:366
+#: ../DistUpgrade/DistUpgradeController.py:350
 msgid "It was not possible to create the sandbox environment."
 msgstr ""
 "La création de l'environnement pour l'espace protégé (sandbox) n'a pas été "
 "possible."
 
-#: ../DistUpgrade/DistUpgradeController.py:372
+#: ../DistUpgrade/DistUpgradeController.py:356
 msgid "Sandbox mode"
 msgstr "Mode espace protégé (sandbox)"
 
-#: ../DistUpgrade/DistUpgradeController.py:373
+#: ../DistUpgrade/DistUpgradeController.py:372
 #, python-format
 msgid ""
 "This upgrade is running in sandbox (test) mode. All changes are written to "
 "'%s' and will be lost on the next reboot.\n"
 "\n"
-"*No* changes written to a systemdir from now until the next reboot are "
-"permanent."
+"*No* changes written to a system directory from now until the next reboot "
+"are permanent."
 msgstr ""
-"Cette mise à niveau se déroule en espace protégé (mode sandbox). Tous les "
-"changements sont écrits dans « %s » et seront perdus lors du prochain "
-"redémarrage.\n"
-"\n"
-"*AUCUNE* des modifications effectuées sur les répertoires systèmes à partir "
-"de maintenant ne sera conservée lors du prochain redémarrage."
 
-#: ../DistUpgrade/DistUpgradeController.py:401
+#: ../DistUpgrade/DistUpgradeController.py:385
 msgid ""
 "Your python install is corrupted. Please fix the '/usr/bin/python' symlink."
 msgstr ""
 "Votre installation de Python est endommagée. Veuillez réparer le lien "
 "symbolique « /usr/bin/python »."
 
-#: ../DistUpgrade/DistUpgradeController.py:427
+#: ../DistUpgrade/DistUpgradeController.py:411
 msgid "Package 'debsig-verify' is installed"
 msgstr "Le paquet « debsig-verify » est installé"
 
-#: ../DistUpgrade/DistUpgradeController.py:428
+#: ../DistUpgrade/DistUpgradeController.py:412
 msgid ""
 "The upgrade can not continue with that package installed.\n"
 "Please remove it with synaptic or 'apt-get remove debsig-verify' first and "
@@ -388,27 +374,24 @@
 "Veuillez le supprimer avec Synaptic ou avec « apt-get remove debsig-"
 "verify », puis relancez la mise à jour."
 
-#: ../DistUpgrade/DistUpgradeController.py:440
+#: ../DistUpgrade/DistUpgradeController.py:439
 #, python-format
 msgid "Can not write to '%s'"
 msgstr "Impossible d'écrire dans '%s'"
 
-#: ../DistUpgrade/DistUpgradeController.py:441
+#: ../DistUpgrade/DistUpgradeController.py:440
 #, python-format
 msgid ""
-"Its not possible to write to the systemdir '%s' on your system. The upgrade "
-"can not continue.\n"
-"Please make sure that the system dir is writable."
+"Its not possible to write to the system directory '%s' on your system. The "
+"upgrade can not continue.\n"
+"Please make sure that the system directory is writable."
 msgstr ""
-"Il n'est pas possible d'écrire sur votre répertoire système '%s'. La mise à "
-"niveau ne peut pas continuer.\n"
-"Veuillez vous assurer que le répertoire système est accessible en écriture."
 
-#: ../DistUpgrade/DistUpgradeController.py:452
+#: ../DistUpgrade/DistUpgradeController.py:422
 msgid "Include latest updates from the Internet?"
 msgstr "Inclure les dernières mises à jour en provenance d'Internet ?"
 
-#: ../DistUpgrade/DistUpgradeController.py:453
+#: ../DistUpgrade/DistUpgradeController.py:423
 msgid ""
 "The upgrade system can use the internet to automatically download the latest "
 "updates and install them during the upgrade.  If you have a network "
@@ -430,16 +413,16 @@
 "après la mise à jour.\n"
 "Si vous répondez « non », le réseau ne sera pas utilisé du tout."
 
-#: ../DistUpgrade/DistUpgradeController.py:673
+#: ../DistUpgrade/DistUpgradeController.py:647
 #, python-format
 msgid "disabled on upgrade to %s"
 msgstr "désactivé pour la mise à niveau vers %s"
 
-#: ../DistUpgrade/DistUpgradeController.py:700
+#: ../DistUpgrade/DistUpgradeController.py:674
 msgid "No valid mirror found"
 msgstr "Aucun miroir valable trouvé"
 
-#: ../DistUpgrade/DistUpgradeController.py:701
+#: ../DistUpgrade/DistUpgradeController.py:675
 #, python-format
 msgid ""
 "While scanning your repository information no mirror entry for the upgrade "
@@ -459,11 +442,11 @@
 "« non », la mise à niveau sera annulée."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeController.py:721
+#: ../DistUpgrade/DistUpgradeController.py:695
 msgid "Generate default sources?"
 msgstr "Générer les sources par défaut ?"
 
-#: ../DistUpgrade/DistUpgradeController.py:722
+#: ../DistUpgrade/DistUpgradeController.py:696
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -477,25 +460,21 @@
 "Les entrées par défaut pour « %s » doivent-elles être ajoutées ? Si vous "
 "choisissez « non », la mise à niveau sera annulée."
 
-#: ../DistUpgrade/DistUpgradeController.py:757
+#: ../DistUpgrade/DistUpgradeController.py:731
 msgid "Repository information invalid"
 msgstr "Informations sur les dépôts non valables"
 
-#: ../DistUpgrade/DistUpgradeController.py:758
+#: ../DistUpgrade/DistUpgradeController.py:757
 msgid ""
-"Upgrading the repository information resulted in a invalid file. Please "
-"report this as a bug using the command 'ubuntu-bug update-manager' in a "
-"terminal."
+"Upgrading the repository information resulted in a invalid file so a bug "
+"reporting process is being started."
 msgstr ""
-"De la mise à jour des informations du dépôt a résulté un fichier invalide. "
-"Veuillez signaler ce bogue en tapant « ubuntu-bug update-manager » dans un "
-"terminal."
 
-#: ../DistUpgrade/DistUpgradeController.py:766
+#: ../DistUpgrade/DistUpgradeController.py:738
 msgid "Third party sources disabled"
 msgstr "Sources provenant de tiers désactivées"
 
-#: ../DistUpgrade/DistUpgradeController.py:767
+#: ../DistUpgrade/DistUpgradeController.py:739
 msgid ""
 "Some third party entries in your sources.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or your "
@@ -505,13 +484,13 @@
 "parties, ont été désactivées. Vous pouvez les réactiver après la mise à "
 "niveau avec l'outil « Sources de logiciels » ou avec Synaptic."
 
-#: ../DistUpgrade/DistUpgradeController.py:807
+#: ../DistUpgrade/DistUpgradeController.py:779
 msgid "Package in inconsistent state"
 msgid_plural "Packages in inconsistent state"
 msgstr[0] "Paquet dans un état incohérent"
 msgstr[1] "Paquets dans un état incohérent"
 
-#: ../DistUpgrade/DistUpgradeController.py:810
+#: ../DistUpgrade/DistUpgradeController.py:782
 #, python-format
 msgid ""
 "The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -530,11 +509,11 @@
 "mais aucune archive les contenant n'a été trouvée. Veuillez réinstaller ces "
 "paquets manuellement ou les supprimer de votre système."
 
-#: ../DistUpgrade/DistUpgradeController.py:858
+#: ../DistUpgrade/DistUpgradeController.py:830
 msgid "Error during update"
 msgstr "Erreur lors de la mise à jour"
 
-#: ../DistUpgrade/DistUpgradeController.py:859
+#: ../DistUpgrade/DistUpgradeController.py:831
 msgid ""
 "A problem occurred during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -544,12 +523,12 @@
 "réessayer."
 
 #. print "on_button_install_clicked"
-#: ../DistUpgrade/DistUpgradeController.py:868
-#: ../UpdateManager/UpdateManager.py:759
+#: ../DistUpgrade/DistUpgradeController.py:840
+#: ../UpdateManager/UpdateManager.py:577
 msgid "Not enough free disk space"
 msgstr "Espace libre insuffisant sur le disque"
 
-#: ../DistUpgrade/DistUpgradeController.py:869
+#: ../DistUpgrade/DistUpgradeController.py:867
 #, python-format
 msgid ""
 "The upgrade has aborted. The upgrade needs a total of %s free space on disk "
@@ -566,21 +545,21 @@
 
 #. calc the dist-upgrade and see if the removals are ok/expected
 #. do the dist-upgrade
-#: ../DistUpgrade/DistUpgradeController.py:898
-#: ../DistUpgrade/DistUpgradeController.py:1643
+#: ../DistUpgrade/DistUpgradeController.py:869
+#: ../DistUpgrade/DistUpgradeController.py:1610
 msgid "Calculating the changes"
 msgstr "Évaluation des modifications"
 
-#. ask the user
-#: ../DistUpgrade/DistUpgradeController.py:930
+#. ask the user if he wants to do the changes
+#: ../DistUpgrade/DistUpgradeController.py:920
 msgid "Do you want to start the upgrade?"
 msgstr "Voulez-vous commencer la mise à niveau ?"
 
-#: ../DistUpgrade/DistUpgradeController.py:996
+#: ../DistUpgrade/DistUpgradeController.py:985
 msgid "Upgrade canceled"
 msgstr "Mise à niveau annulée"
 
-#: ../DistUpgrade/DistUpgradeController.py:997
+#: ../DistUpgrade/DistUpgradeController.py:995
 msgid ""
 "The upgrade will cancel now and the original system state will be restored. "
 "You can resume the upgrade at a later time."
@@ -588,12 +567,12 @@
 "La mise à niveau va maintenant être annulée et l’état originel du système "
 "restauré. Vous pouvez la reprendre  plus tard."
 
-#: ../DistUpgrade/DistUpgradeController.py:1003
-#: ../DistUpgrade/DistUpgradeController.py:1129
+#: ../DistUpgrade/DistUpgradeController.py:991
+#: ../DistUpgrade/DistUpgradeController.py:1097
 msgid "Could not download the upgrades"
 msgstr "Impossible de télécharger les mises à jour"
 
-#: ../DistUpgrade/DistUpgradeController.py:1004
+#: ../DistUpgrade/DistUpgradeController.py:1002
 msgid ""
 "The upgrade has aborted. Please check your Internet connection or "
 "installation media and try again. All files downloaded so far have been kept."
@@ -604,27 +583,27 @@
 
 #. FIXME: strings are not good, but we are in string freeze
 #. currently
-#: ../DistUpgrade/DistUpgradeController.py:1080
-#: ../DistUpgrade/DistUpgradeController.py:1117
-#: ../DistUpgrade/DistUpgradeController.py:1222
+#: ../DistUpgrade/DistUpgradeController.py:1049
+#: ../DistUpgrade/DistUpgradeController.py:1085
+#: ../DistUpgrade/DistUpgradeController.py:1190
 msgid "Error during commit"
 msgstr "Erreur pendant la soumission"
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1082
-#: ../DistUpgrade/DistUpgradeController.py:1119
-#: ../DistUpgrade/DistUpgradeController.py:1261
+#: ../DistUpgrade/DistUpgradeController.py:1051
+#: ../DistUpgrade/DistUpgradeController.py:1087
+#: ../DistUpgrade/DistUpgradeController.py:1229
 msgid "Restoring original system state"
 msgstr "Restauration du système dans son état d'origine"
 
-#: ../DistUpgrade/DistUpgradeController.py:1083
-#: ../DistUpgrade/DistUpgradeController.py:1098
-#: ../DistUpgrade/DistUpgradeController.py:1120
+#: ../DistUpgrade/DistUpgradeController.py:1052
+#: ../DistUpgrade/DistUpgradeController.py:1066
+#: ../DistUpgrade/DistUpgradeController.py:1088
 msgid "Could not install the upgrades"
 msgstr "Impossible d'installer les mises à niveau"
 
 #. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1088
+#: ../DistUpgrade/DistUpgradeController.py:1086
 msgid ""
 "The upgrade has aborted. Your system could be in an unusable state. A "
 "recovery will run now (dpkg --configure -a)."
@@ -632,23 +611,18 @@
 "La mise à niveau a échoué. Votre système pourrait être inutilisable. Une "
 "tentative de récupération va maintenant avoir lieu (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeController.py:1093
+#: ../DistUpgrade/DistUpgradeController.py:1091
 #, python-format
 msgid ""
 "\n"
 "\n"
-"Please report this bug using the command 'ubuntu-bug update-manager' in a "
-"terminal and include the files in /var/log/dist-upgrade/ in the bug report.\n"
+"Please report this bug in a browser at "
+"http://bugs.launchpad.net/ubuntu/+source/update-manager/+filebug and attach "
+"the files in /var/log/dist-upgrade/ to the bug report.\n"
 "%s"
 msgstr ""
-"\n"
-"\n"
-"Veuillez signaler ce bogue en tapant « ubuntu-bug update-manager » dans un "
-"terminal et incluez les fichiers situés dans /var/log/dist-upgrade/ dans le "
-"signalement de bogue.\n"
-"%s"
 
-#: ../DistUpgrade/DistUpgradeController.py:1130
+#: ../DistUpgrade/DistUpgradeController.py:1128
 msgid ""
 "The upgrade has aborted. Please check your Internet connection or "
 "installation media and try again. "
@@ -656,20 +630,20 @@
 "La mise à niveau a échoué.  Veuillez vérifier votre connexion Internet et le "
 "support d'installation avant de réessayer. "
 
-#: ../DistUpgrade/DistUpgradeController.py:1210
+#: ../DistUpgrade/DistUpgradeController.py:1178
 msgid "Remove obsolete packages?"
 msgstr "Supprimer les paquets obsolètes ?"
 
-#: ../DistUpgrade/DistUpgradeController.py:1211
-#: ../DistUpgrade/DistUpgrade.ui.h:8
+#: ../DistUpgrade/DistUpgradeController.py:1179
+#: ../DistUpgrade/DistUpgrade.ui.h:22
 msgid "_Keep"
 msgstr "_Conserver"
 
-#: ../DistUpgrade/DistUpgradeController.py:1211
+#: ../DistUpgrade/DistUpgradeController.py:1179
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: ../DistUpgrade/DistUpgradeController.py:1223
+#: ../DistUpgrade/DistUpgradeController.py:1191
 msgid ""
 "A problem occurred during the clean-up. Please see the below message for "
 "more information. "
@@ -679,130 +653,111 @@
 
 #. FIXME: instead of error out, fetch and install it
 #. here
-#: ../DistUpgrade/DistUpgradeController.py:1299
+#: ../DistUpgrade/DistUpgradeController.py:1267
 msgid "Required depends is not installed"
 msgstr "Dépendance nécessaire non installée"
 
-#: ../DistUpgrade/DistUpgradeController.py:1300
+#: ../DistUpgrade/DistUpgradeController.py:1268
 #, python-format
 msgid "The required dependency '%s' is not installed. "
 msgstr "La dépendance nécessaire « %s » n'est pas installée. "
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1540
-#: ../DistUpgrade/DistUpgradeController.py:1610
+#: ../DistUpgrade/DistUpgradeController.py:1513
+#: ../DistUpgrade/DistUpgradeController.py:1580
 msgid "Checking package manager"
 msgstr "Vérification du gestionnaire de paquets"
 
-#: ../DistUpgrade/DistUpgradeController.py:1545
+#: ../DistUpgrade/DistUpgradeController.py:1518
 msgid "Preparing the upgrade failed"
 msgstr "Échec lors de la préparation de la mise à niveau"
 
-#: ../DistUpgrade/DistUpgradeController.py:1546
+#: ../DistUpgrade/DistUpgradeController.py:1543
 msgid ""
-"Preparing the system for the upgrade failed. Please report this using the "
-"command 'ubuntu-bug update-manager' in a terminal and include the files in "
-"/var/log/dist-upgrade/ in the bug report."
+"Preparing the system for the upgrade failed so a bug reporting process "
+"isbeing started."
 msgstr ""
-"La préparation du système pour la mise à jour a échoué. Veuillez signaler ce "
-"bogue en tapant « ubuntu-bug update-manager » dans un terminal et incluez "
-"les fichiers situés dans /var/log/dist-upgrade/ dans le signalement de bogue."
 
-#: ../DistUpgrade/DistUpgradeController.py:1562
+#: ../DistUpgrade/DistUpgradeController.py:1535
 msgid "Getting upgrade prerequisites failed"
 msgstr "Impossible d'obtenir les pré-requis nécessaires à la mise à niveau"
 
-#: ../DistUpgrade/DistUpgradeController.py:1563
+#: ../DistUpgrade/DistUpgradeController.py:1558
 msgid ""
 "The system was unable to get the prerequisites for the upgrade. The upgrade "
 "will abort now and restore the original system state.\n"
 "\n"
-"Please report this as a bug using the command 'ubuntu-bug update-manager' in "
-"a terminal and include the files in /var/log/dist-upgrade/ in the bug report."
+"Additionally, a bug reporting process is being started."
 msgstr ""
-"Le système n'a pas été en mesure de se préparer pour la mise à jour. La mise "
-"à jour va s'interrompre et restaurer le système dans son état original.\n"
-"\n"
-"Veuillez signaler ce bogue en tapant « ubuntu-bug update-manager » dans un "
-"terminal et incluez les fichiers situés dans /var/log/dist-upgrade/ dans le "
-"signalement de bogue."
 
-#: ../DistUpgrade/DistUpgradeController.py:1594
+#: ../DistUpgrade/DistUpgradeController.py:1566
 msgid "Updating repository information"
 msgstr "Mise à jour des informations sur les dépôts"
 
-#: ../DistUpgrade/DistUpgradeController.py:1601
+#: ../DistUpgrade/DistUpgradeController.py:1593
 msgid "Failed to add the cdrom"
 msgstr "Impossible d'ajouter le CD"
 
-#: ../DistUpgrade/DistUpgradeController.py:1602
+#: ../DistUpgrade/DistUpgradeController.py:1594
 msgid "Sorry, adding the cdrom was not successful."
 msgstr "Désolé, l'ajout du CD a échoué."
 
-#: ../DistUpgrade/DistUpgradeController.py:1630
+#: ../DistUpgrade/DistUpgradeController.py:1598
 msgid "Invalid package information"
 msgstr "Informations sur les paquets non valables"
 
-#: ../DistUpgrade/DistUpgradeController.py:1631
+#: ../DistUpgrade/DistUpgradeController.py:1623
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
-"not be found anymore.\n"
-"This indicates a serious error, please report this bug using the command "
-"'ubuntu-bug update-manager' in a terminal and include the files in "
-"/var/log/dist-upgrade/ in the bug report."
-msgstr ""
-"Après avoir mis à jour l'information sur les paquets, le paquet essentiel « "
-"%s » est introuvable.\n"
-"Ceci signale d'une erreur grave, veuillez signaler ce bogue en saisissant « "
-"ubuntu-bug update-manager » dans un terminal et incluez les fichiers "
-"présents dans le dossier /var/log/dist-upgrade/ dans le signalement de bogue."
+"not be found anymore so a bug reporting process is being started."
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeController.py:1649
-#: ../DistUpgrade/DistUpgradeController.py:1702
+#: ../DistUpgrade/DistUpgradeController.py:1616
+#: ../DistUpgrade/DistUpgradeController.py:1664
 msgid "Fetching"
 msgstr "Récupération"
 
-#: ../DistUpgrade/DistUpgradeController.py:1655
-#: ../DistUpgrade/DistUpgradeController.py:1706
+#: ../DistUpgrade/DistUpgradeController.py:1622
+#: ../DistUpgrade/DistUpgradeController.py:1668
 msgid "Upgrading"
 msgstr "Mise à niveau"
 
 #. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1660
-#: ../DistUpgrade/DistUpgradeController.py:1708
-#: ../DistUpgrade/DistUpgradeController.py:1715
-#: ../DistUpgrade/DistUpgradeController.py:1726
+#: ../DistUpgrade/DistUpgradeController.py:1627
+#: ../DistUpgrade/DistUpgradeController.py:1670
+#: ../DistUpgrade/DistUpgradeController.py:1677
+#: ../DistUpgrade/DistUpgradeController.py:1688
 msgid "Upgrade complete"
 msgstr "Mise à niveau terminée"
 
-#: ../DistUpgrade/DistUpgradeController.py:1661
-#: ../DistUpgrade/DistUpgradeController.py:1709
-#: ../DistUpgrade/DistUpgradeController.py:1716
+#: ../DistUpgrade/DistUpgradeController.py:1651
+#: ../DistUpgrade/DistUpgradeController.py:1699
+#: ../DistUpgrade/DistUpgradeController.py:1706
 msgid ""
 "The upgrade has completed but there were errors during the upgrade process."
 msgstr ""
 "La mise à niveau est terminée, mais des erreurs se sont produites lors de ce "
 "processus."
 
-#: ../DistUpgrade/DistUpgradeController.py:1668
+#: ../DistUpgrade/DistUpgradeController.py:1635
 msgid "Searching for obsolete software"
 msgstr "Recherche de logiciels obsolètes"
 
-#: ../DistUpgrade/DistUpgradeController.py:1677
+#: ../DistUpgrade/DistUpgradeController.py:1640
 msgid "System upgrade is complete."
 msgstr "La mise à niveau du système est terminée."
 
-#: ../DistUpgrade/DistUpgradeController.py:1727
+#: ../DistUpgrade/DistUpgradeController.py:1689
 msgid "The partial upgrade was completed."
 msgstr "La mise à niveau partielle est terminée."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:202
+#: ../DistUpgrade/DistUpgradeQuirks.py:168
 msgid "evms in use"
 msgstr "evms est en cours d'utilisation"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:203
+#: ../DistUpgrade/DistUpgradeQuirks.py:169
 msgid ""
 "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' "
 "software is no longer supported, please switch it off and run the upgrade "
@@ -812,13 +767,13 @@
 "Le logiciel « evms » n’est plus pris en charge. Veuillez le désactiver avant "
 "d'exécuter à nouveau la mise à niveau."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:508
+#: ../DistUpgrade/DistUpgradeQuirks.py:496
 msgid "Your graphics hardware may not be fully supported in Ubuntu 11.04."
 msgstr ""
 "Votre configuration graphique matérielle pourrait ne pas être totalement "
 "prise en charge dans Ubuntu 11.04."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:510
+#: ../DistUpgrade/DistUpgradeQuirks.py:498
 msgid ""
 "The support in Ubuntu 11.04 for your intel graphics hardware is limited and "
 "you may encounter problems after the upgrade. Do you want to continue with "
@@ -828,9 +783,9 @@
 "limitée dans Ubuntu 11.04 et vous pourriez rencontrer des problèmes après la "
 "mise à jour. Voulez-vous continuer la mise à jour ?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:530
-#: ../DistUpgrade/DistUpgradeQuirks.py:558
-#: ../DistUpgrade/DistUpgradeQuirks.py:585
+#: ../DistUpgrade/DistUpgradeQuirks.py:444
+#: ../DistUpgrade/DistUpgradeQuirks.py:472
+#: ../DistUpgrade/DistUpgradeQuirks.py:499
 msgid ""
 "Upgrading may reduce desktop effects, and performance in games and other "
 "graphically intensive programs."
@@ -839,8 +794,8 @@
 "performances pour les jeux et autres programmes exigeants au niveau "
 "graphique."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:534
-#: ../DistUpgrade/DistUpgradeQuirks.py:562
+#: ../DistUpgrade/DistUpgradeQuirks.py:448
+#: ../DistUpgrade/DistUpgradeQuirks.py:476
 msgid ""
 "This computer is currently using the NVIDIA 'nvidia' graphics driver. No "
 "version of this driver is available that works with your video card in "
@@ -854,7 +809,7 @@
 "\n"
 "Voulez-vous continuer ?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:589
+#: ../DistUpgrade/DistUpgradeQuirks.py:503
 msgid ""
 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
 "of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -868,11 +823,11 @@
 "\n"
 "Voulez-vous continuer ?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:619
+#: ../DistUpgrade/DistUpgradeQuirks.py:607
 msgid "No i686 CPU"
 msgstr "Pas de processeur i686"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:620
+#: ../DistUpgrade/DistUpgradeQuirks.py:608
 msgid ""
 "Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
 "extension. All packages were built with optimizations requiring i686 as the "
@@ -885,11 +840,11 @@
 "impossible de mettre à niveau votre système vers une nouvelle version "
 "d'Ubuntu avec votre matériel actuel."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:656
+#: ../DistUpgrade/DistUpgradeQuirks.py:530
 msgid "No ARMv6 CPU"
 msgstr "Pas de processeur ARMv6"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:657
+#: ../DistUpgrade/DistUpgradeQuirks.py:531
 msgid ""
 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
 "packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -901,11 +856,11 @@
 "nécessitant au minimum une architecture ARMv6. Il est impossible de mettre à "
 "niveau votre système vers la nouvelle version d'Ubuntu."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:677
+#: ../DistUpgrade/DistUpgradeQuirks.py:551
 msgid "No init available"
 msgstr "Initialisation indisponible"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:678
+#: ../DistUpgrade/DistUpgradeQuirks.py:552
 msgid ""
 "Your system appears to be a virtualised environment without an init daemon, "
 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -921,17 +876,17 @@
 "\n"
 "Voulez-vous vraiment continuer ?"
 
-#: ../DistUpgrade/DistUpgradeMain.py:63
+#: ../DistUpgrade/DistUpgradeMain.py:48
 msgid "Sandbox upgrade using aufs"
 msgstr "Mise à niveau en espace protégé (sandbox) en utilisant aufs"
 
-#: ../DistUpgrade/DistUpgradeMain.py:65
+#: ../DistUpgrade/DistUpgradeMain.py:50
 msgid "Use the given path to search for a cdrom with upgradable packages"
 msgstr ""
 "Utiliser l'emplacement spécifié pour rechercher un CD-ROM contenant des "
 "paquets à mettre à niveau"
 
-#: ../DistUpgrade/DistUpgradeMain.py:71
+#: ../DistUpgrade/DistUpgradeMain.py:56
 msgid ""
 "Use frontend. Currently available: \n"
 "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE"
@@ -943,7 +898,7 @@
 msgid "*DEPRECATED* this option will be ignored"
 msgstr "*OBSOLÈTE* cette option sera ignorée"
 
-#: ../DistUpgrade/DistUpgradeMain.py:77
+#: ../DistUpgrade/DistUpgradeMain.py:62
 msgid "Perform a partial upgrade only (no sources.list rewriting)"
 msgstr ""
 "Effectuer une mise à niveau partielle uniquement (sources.list ne sera pas "
@@ -953,45 +908,39 @@
 msgid "Disable GNU screen support"
 msgstr "Désactiver la prise en charge de GNU screen"
 
-#: ../DistUpgrade/DistUpgradeMain.py:82
+#: ../DistUpgrade/DistUpgradeMain.py:64
 msgid "Set datadir"
 msgstr "Définir l'emplacement des données"
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:114
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:117
-#: ../DistUpgrade/DistUpgradeViewKDE.py:189
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewKDE.py:190
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Veuillez insérer « %s » dans le lecteur « %s »"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:135
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:138
-#: ../DistUpgrade/DistUpgradeViewKDE.py:203
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewKDE.py:204
 msgid "Fetching is complete"
 msgstr "Récupération des fichiers terminée"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:146
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:149
-#: ../DistUpgrade/DistUpgradeViewKDE.py:216
+#: ../DistUpgrade/DistUpgradeViewGtk.py:142
+#: ../DistUpgrade/DistUpgradeViewKDE.py:217
 #, python-format
 msgid "Fetching file %li of %li at %sB/s"
 msgstr "Récupération du fichier %li sur %li à %s octets/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
-#: ../DistUpgrade/DistUpgradeViewGtk.py:295
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:152
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:301
-#: ../DistUpgrade/DistUpgradeViewKDE.py:217
-#: ../DistUpgrade/DistUpgradeViewKDE.py:361
+#: ../DistUpgrade/DistUpgradeViewGtk.py:143
+#: ../DistUpgrade/DistUpgradeViewGtk.py:280
+#: ../DistUpgrade/DistUpgradeViewKDE.py:218
+#: ../DistUpgrade/DistUpgradeViewKDE.py:358
 #, python-format
 msgid "About %s remaining"
 msgstr "Temps restant : environ %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:152
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:155
-#: ../DistUpgrade/DistUpgradeViewKDE.py:219
+#: ../DistUpgrade/DistUpgradeViewGtk.py:145
+#: ../DistUpgrade/DistUpgradeViewKDE.py:220
 #, python-format
 msgid "Fetching file %li of %li"
 msgstr "Téléchargement du fichier %li sur %li"
@@ -999,29 +948,25 @@
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:183
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:186
-#: ../DistUpgrade/DistUpgradeViewKDE.py:253
+#: ../DistUpgrade/DistUpgradeViewGtk.py:177
+#: ../DistUpgrade/DistUpgradeViewKDE.py:254
 msgid "Applying changes"
 msgstr "Application des changements"
 
 #. we do not report followup errors from earlier failures
-#: ../DistUpgrade/DistUpgradeViewGtk.py:208
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:211
-#: ../DistUpgrade/DistUpgradeViewKDE.py:266
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
+#: ../DistUpgrade/DistUpgradeViewKDE.py:267
 msgid "dependency problems - leaving unconfigured"
 msgstr "problèmes de dépendances - laissé non configuré"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:213
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:216
-#: ../DistUpgrade/DistUpgradeViewKDE.py:268
+#: ../DistUpgrade/DistUpgradeViewGtk.py:207
+#: ../DistUpgrade/DistUpgradeViewKDE.py:269
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Impossible d'installer « %s »"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:214
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:217
-#: ../DistUpgrade/DistUpgradeViewKDE.py:269
+#: ../DistUpgrade/DistUpgradeViewGtk.py:208
+#: ../DistUpgrade/DistUpgradeViewKDE.py:270
 #, python-format
 msgid ""
 "The upgrade will continue but the '%s' package may not be in a working "
@@ -1031,9 +976,8 @@
 "fonctionnel. Veuillez signaler ceci comme un bogue."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:231
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:234
-#: ../DistUpgrade/DistUpgradeViewKDE.py:290
+#: ../DistUpgrade/DistUpgradeViewGtk.py:225
+#: ../DistUpgrade/DistUpgradeViewKDE.py:291
 #, python-format
 msgid ""
 "Replace the customized configuration file\n"
@@ -1042,9 +986,8 @@
 "Remplacer le fichier de configuration personnalisé\n"
 "« %s » ?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:232
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:235
-#: ../DistUpgrade/DistUpgradeViewKDE.py:291
+#: ../DistUpgrade/DistUpgradeViewGtk.py:226
+#: ../DistUpgrade/DistUpgradeViewKDE.py:292
 msgid ""
 "You will lose any changes you have made to this configuration file if you "
 "choose to replace it with a newer version."
@@ -1052,15 +995,13 @@
 "Toutes les modifications apportées à ce fichier de configuration seront "
 "perdues si vous décidez de le remplacer par une version plus récente."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:250
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:253
-#: ../DistUpgrade/DistUpgradeViewKDE.py:313
+#: ../DistUpgrade/DistUpgradeViewGtk.py:240
+#: ../DistUpgrade/DistUpgradeViewKDE.py:310
 msgid "The 'diff' command was not found"
 msgstr "La commande « diff » n'a pas été trouvée"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:463
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:469
-#: ../DistUpgrade/DistUpgradeViewText.py:90
+#: ../DistUpgrade/DistUpgradeViewGtk.py:445
+#: ../DistUpgrade/DistUpgradeViewText.py:88
 msgid "A fatal error occurred"
 msgstr "Une erreur fatale est survenue"
 
@@ -1078,13 +1019,11 @@
 "Votre fichier souce.list original a été enregistré dans "
 "/etc/apt/sources.list.distUpgrade."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:481
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:487
+#: ../DistUpgrade/DistUpgradeViewGtk.py:463
 msgid "Ctrl-c pressed"
 msgstr "Ctrl+C détecté"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:482
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:488
+#: ../DistUpgrade/DistUpgradeViewGtk.py:464
 msgid ""
 "This will abort the operation and may leave the system in a broken state. "
 "Are you sure you want to do that?"
@@ -1093,8 +1032,7 @@
 "état inutilisable. Voulez-vous vraiment faire cela ?"
 
 #. append warning
-#: ../DistUpgrade/DistUpgradeViewGtk.py:630
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:621
+#: ../DistUpgrade/DistUpgradeViewGtk.py:611
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 "Pour éviter toute perte de données, veuillez fermer toutes les applications "
@@ -1137,93 +1075,97 @@
 msgstr "Mettre à jour (%s)"
 
 #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel)
-#: ../DistUpgrade/DistUpgradeViewKDE.py:190
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:149
+#: ../DistUpgrade/DistUpgradeViewKDE.py:191
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
 msgid "Media Change"
 msgstr "Changement de média"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:325
+#: ../DistUpgrade/DistUpgradeViewKDE.py:322
 msgid "Show Difference >>>"
 msgstr "Afficher les différences >>>"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:328
+#: ../DistUpgrade/DistUpgradeViewKDE.py:325
 msgid "<<< Hide Difference"
 msgstr "<<< Masquer les différences"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:543
+#: ../DistUpgrade/DistUpgradeViewKDE.py:539
 msgid "Error"
 msgstr "Erreur"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:555
+#: ../DistUpgrade/DistUpgradeViewKDE.py:551
 msgid "&Cancel"
 msgstr "&Annuler"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:557
-#: ../DistUpgrade/DistUpgradeViewKDE.py:799
+#: ../DistUpgrade/DistUpgradeViewKDE.py:553
+#: ../DistUpgrade/DistUpgradeViewKDE.py:792
 msgid "&Close"
 msgstr "&Fermer"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:603
+#: ../DistUpgrade/DistUpgradeViewKDE.py:599
 msgid "Show Terminal >>>"
 msgstr "Afficher le terminal >>>"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:606
+#: ../DistUpgrade/DistUpgradeViewKDE.py:602
 msgid "<<< Hide Terminal"
 msgstr "<<< Masquer le terminal"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:686
+#: ../DistUpgrade/DistUpgradeViewKDE.py:682
 msgid "Information"
 msgstr "Informations"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:737
-#: ../DistUpgrade/DistUpgradeViewKDE.py:782
-#: ../DistUpgrade/DistUpgradeViewKDE.py:785 ../DistUpgrade/DistUpgrade.ui.h:7
+#: ../DistUpgrade/DistUpgradeViewKDE.py:732
+#: ../DistUpgrade/DistUpgradeViewKDE.py:775
+#: ../DistUpgrade/DistUpgradeViewKDE.py:778 ../DistUpgrade/DistUpgrade.ui.h:11
 msgid "Details"
 msgstr "Détails"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:763
+#: ../DistUpgrade/DistUpgradeViewKDE.py:767
 #, python-format
 msgid "No longer supported %s"
 msgstr "N'est plus maintenu (%s)"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:765
+#: ../DistUpgrade/DistUpgradeViewGtk.py:627
+#: ../DistUpgrade/DistUpgradeViewKDE.py:758
 #, python-format
 msgid "Remove %s"
 msgstr "Supprimer %s"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:767
-#: ../DistUpgrade/DistUpgradeViewText.py:179
+#: ../DistUpgrade/DistUpgradeViewGtk.py:632
+#: ../DistUpgrade/DistUpgradeViewKDE.py:760
+#: ../DistUpgrade/DistUpgradeViewText.py:169
 #, python-format
 msgid "Remove (was auto installed) %s"
 msgstr "Supprimer (avait été installé automatiquement) %s"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:769
+#: ../DistUpgrade/DistUpgradeViewGtk.py:635
+#: ../DistUpgrade/DistUpgradeViewKDE.py:762
 #, python-format
 msgid "Install %s"
 msgstr "Installer %s"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:771
+#: ../DistUpgrade/DistUpgradeViewGtk.py:637
+#: ../DistUpgrade/DistUpgradeViewKDE.py:764
 #, python-format
 msgid "Upgrade %s"
 msgstr "Mettre à niveau %s"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:795
-#: ../DistUpgrade/DistUpgradeViewText.py:227
+#: ../DistUpgrade/DistUpgradeViewKDE.py:788
+#: ../DistUpgrade/DistUpgradeViewText.py:217
 msgid "Restart required"
 msgstr "Redémarrage nécessaire de l'ordinateur"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:795
+#: ../DistUpgrade/DistUpgradeViewKDE.py:788
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
 msgstr ""
 "<b><big>Redémarrez le système pour terminer la mise à niveau</big></b>"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:798 ../DistUpgrade/DistUpgrade.ui.h:14
-#: ../data/gtkbuilder/UpdateManager.ui.h:26
+#: ../DistUpgrade/DistUpgradeViewKDE.py:791 ../DistUpgrade/DistUpgrade.ui.h:25
+#: ../data/glade/UpdateManager.ui.h:31
 msgid "_Restart Now"
 msgstr "_Redémarrer maintenant"
 
 #. FIXME make this user friendly
-#: ../DistUpgrade/DistUpgradeViewKDE.py:816
+#: ../DistUpgrade/DistUpgradeViewKDE.py:809
 msgid ""
 "<b><big>Cancel the running upgrade?</big></b>\n"
 "\n"
@@ -1235,32 +1177,32 @@
 "Le système pourrait devenir inutilisable suite à l'annulation de la mise à "
 "niveau. Il vous est fortement recommandé de reprendre celle-ci."
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:820
+#: ../DistUpgrade/DistUpgradeViewKDE.py:813
 msgid "Cancel Upgrade?"
 msgstr "_Annuler la mise à niveau ?"
 
-#: ../DistUpgrade/DistUpgradeView.py:59
+#: ../DistUpgrade/DistUpgradeView.py:60
 #, python-format
 msgid "%li day"
 msgid_plural "%li days"
 msgstr[0] "%li jour"
 msgstr[1] "%li jours"
 
-#: ../DistUpgrade/DistUpgradeView.py:61
+#: ../DistUpgrade/DistUpgradeView.py:62
 #, python-format
 msgid "%li hour"
 msgid_plural "%li hours"
 msgstr[0] "%li heure"
 msgstr[1] "%li heures"
 
-#: ../DistUpgrade/DistUpgradeView.py:63
+#: ../DistUpgrade/DistUpgradeView.py:64
 #, python-format
 msgid "%li minute"
 msgid_plural "%li minutes"
 msgstr[0] "%li minute"
 msgstr[1] "%li minutes"
 
-#: ../DistUpgrade/DistUpgradeView.py:64
+#: ../DistUpgrade/DistUpgradeView.py:65
 #, python-format
 msgid "%li second"
 msgid_plural "%li seconds"
@@ -1276,7 +1218,7 @@
 #. plural form
 #. 
 #. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:80
+#: ../DistUpgrade/DistUpgradeView.py:78
 #, python-format
 msgid "%(str_days)s %(str_hours)s"
 msgstr "%(str_days)s %(str_hours)s"
@@ -1290,14 +1232,14 @@
 #. plural form
 #. 
 #. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:98
+#: ../DistUpgrade/DistUpgradeView.py:93
 #, python-format
 msgid "%(str_hours)s %(str_minutes)s"
 msgstr "%(str_hours)s %(str_minutes)s"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
-#: ../DistUpgrade/DistUpgradeView.py:147
+#: ../DistUpgrade/DistUpgradeView.py:128
 #, python-format
 msgid ""
 "This download will take about %s with a 1Mbit DSL connection and about %s "
@@ -1307,32 +1249,32 @@
 "environ %s avec un modem 56 k."
 
 #. if we have a estimated speed, use it
-#: ../DistUpgrade/DistUpgradeView.py:151
+#: ../DistUpgrade/DistUpgradeView.py:132
 #, python-format
 msgid "This download will take about %s with your connection. "
 msgstr "Ce téléchargement prendra environ %s avec votre connexion. "
 
-#: ../DistUpgrade/DistUpgradeView.py:253 ../DistUpgrade/DistUpgrade.ui.h:21
+#: ../DistUpgrade/DistUpgradeView.py:234 ../DistUpgrade/DistUpgrade.ui.h:16
 msgid "Preparing to upgrade"
 msgstr "Préparation de la mise à niveau"
 
-#: ../DistUpgrade/DistUpgradeView.py:254
+#: ../DistUpgrade/DistUpgradeView.py:235
 msgid "Getting new software channels"
 msgstr "Obtention de nouveaux dépôts logiciels"
 
-#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:23
+#: ../DistUpgrade/DistUpgradeView.py:236 ../DistUpgrade/DistUpgrade.ui.h:14
 msgid "Getting new packages"
 msgstr "Obtention de nouveaux paquets"
 
-#: ../DistUpgrade/DistUpgradeView.py:256 ../DistUpgrade/DistUpgrade.ui.h:26
+#: ../DistUpgrade/DistUpgradeView.py:237 ../DistUpgrade/DistUpgrade.ui.h:15
 msgid "Installing the upgrades"
 msgstr "Installation des mises à niveau"
 
-#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:25
+#: ../DistUpgrade/DistUpgradeView.py:238 ../DistUpgrade/DistUpgrade.ui.h:10
 msgid "Cleaning up"
 msgstr "Nettoyage"
 
-#: ../DistUpgrade/DistUpgradeView.py:342
+#: ../DistUpgrade/DistUpgradeView.py:344
 #, python-format
 msgid ""
 "%(amount)d installed package is no longer supported by Canonical. You can "
@@ -1349,28 +1291,28 @@
 
 #. FIXME: make those two separate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeView.py:351
+#: ../DistUpgrade/DistUpgradeView.py:322
 #, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
 msgstr[0] "%d paquet va être supprimé."
 msgstr[1] "%d paquets vont être supprimés."
 
-#: ../DistUpgrade/DistUpgradeView.py:356
+#: ../DistUpgrade/DistUpgradeView.py:327
 #, python-format
 msgid "%d new package is going to be installed."
 msgid_plural "%d new packages are going to be installed."
 msgstr[0] "%d nouveau paquet va être installé."
 msgstr[1] "%d nouveaux paquets vont être installés."
 
-#: ../DistUpgrade/DistUpgradeView.py:362
+#: ../DistUpgrade/DistUpgradeView.py:333
 #, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
 msgstr[0] "%d paquet va être mis à jour."
 msgstr[1] "%d paquets vont être mis à jour."
 
-#: ../DistUpgrade/DistUpgradeView.py:367
+#: ../DistUpgrade/DistUpgradeView.py:338
 #, python-format
 msgid ""
 "\n"
@@ -1381,21 +1323,28 @@
 "\n"
 "Vous devez télécharger un total de %s. "
 
-#: ../DistUpgrade/DistUpgradeView.py:371
+#: ../DistUpgrade/DistUpgradeView.py:374
+msgid ""
+"Installing the upgrade can take several hours. Once the download has "
+"finished, the process cannot be canceled."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:378
 msgid ""
 "Fetching and installing the upgrade can take several hours. Once the "
-"download has finished, the process cannot be cancelled."
+"download has finished, the process cannot be canceled."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:383
+msgid "Removing the packages can take several hours. "
 msgstr ""
-"La récupération et l'installation de la mise à niveau peuvent prendre "
-"plusieurs heures. Une fois le téléchargement terminé, l'opération ne peut "
-"plus être annulée."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeView.py:377 ../UpdateManager/UpdateManager.py:676
+#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:675
 msgid "The software on this computer is up to date."
 msgstr "Les logiciels sur cet ordinateur sont à jour."
 
-#: ../DistUpgrade/DistUpgradeView.py:378
+#: ../DistUpgrade/DistUpgradeView.py:349
 msgid ""
 "There are no upgrades available for your system. The upgrade will now be "
 "canceled."
@@ -1403,11 +1352,11 @@
 "Aucune mise à niveau n'est disponible pour votre système. La mise à niveau "
 "va maintenant être annulée."
 
-#: ../DistUpgrade/DistUpgradeView.py:391
+#: ../DistUpgrade/DistUpgradeView.py:362
 msgid "Reboot required"
 msgstr "Redémarrage nécessaire de l'ordinateur"
 
-#: ../DistUpgrade/DistUpgradeView.py:392
+#: ../DistUpgrade/DistUpgradeView.py:363
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -1426,10 +1375,10 @@
 msgid "extracting '%s'"
 msgstr "extraction de '%s'"
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:130
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:132
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:133
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:132
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:133
 msgid "Could not run the upgrade tool"
 msgstr "Impossible de lancer l'outil de mise à niveau"
 
@@ -1443,35 +1392,35 @@
 "signaler ce bogue en saisissant « ubuntu-bug update-manager » dans un "
 "terminal."
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:206
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:202
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:202
 msgid "Upgrade tool signature"
 msgstr "Signature de l'outil de mise à niveau"
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:213
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:205
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:205
 msgid "Upgrade tool"
 msgstr "Outil de mise à niveau"
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:247
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:234
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234
 msgid "Failed to fetch"
 msgstr "Récupération impossible"
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:248
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:235
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:235
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 "La récupération de la mise à niveau à échoué. Il y a peut-être un problème "
 "de réseau. "
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:252
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:239
 msgid "Authentication failed"
 msgstr "Échec de l'authentification"
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:253
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:240
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:240
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -1479,13 +1428,13 @@
 "L'authentification de la mise à niveau a échoué. Il y a peut-être un "
 "problème de réseau ou de serveur. "
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:258
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:245
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:245
 msgid "Failed to extract"
 msgstr "Extraction impossible"
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:259
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:246
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:246
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -1493,13 +1442,13 @@
 "L'extraction de la mise à niveau a échoué. Il y a peut-être un problème de "
 "réseau ou de serveur. "
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:264
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:251
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:251
 msgid "Verification failed"
 msgstr "La vérification a échoué"
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:265
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:252
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252
 msgid ""
 "Verifying the upgrade failed.  There may be a problem with the network or "
 "with the server. "
@@ -1507,10 +1456,10 @@
 "La vérification de la mise à niveau a échoué. Il y a peut-être un problème "
 "de réseau ou de serveur. "
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:266
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:272
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:266
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:272
 msgid "Can not run the upgrade"
 msgstr "Impossible de lancer la mise à niveau"
 
@@ -1523,8 +1472,8 @@
 "Ceci est habituellement dû a un système ou /tmp est monté en mode noexec. "
 "Veuillez remonter sans l'option noexec et mettre à jour à nouveau."
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:273
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273
 #, python-format
 msgid "The error message is '%s'."
 msgstr "Le message d'erreur est « %s »."
@@ -1542,11 +1491,11 @@
 "Votre fichier souce.list original a été enregistré dans "
 "/etc/apt/sources.list.distUpgrade."
 
-#: ../DistUpgrade/DistUpgradeViewText.py:115
+#: ../DistUpgrade/DistUpgradeViewText.py:113
 msgid "Aborting"
 msgstr "Annulation"
 
-#: ../DistUpgrade/DistUpgradeViewText.py:120
+#: ../DistUpgrade/DistUpgradeViewText.py:118
 msgid "Demoted:\n"
 msgstr "Rétrogradé :\n"
 
@@ -1554,33 +1503,33 @@
 msgid "To continue please press [ENTER]"
 msgstr "Veuillez appuyer sur [Entrée] pour continuer"
 
-#: ../DistUpgrade/DistUpgradeViewText.py:155
-#: ../DistUpgrade/DistUpgradeViewText.py:193
-#: ../DistUpgrade/DistUpgradeViewText.py:200
+#: ../DistUpgrade/DistUpgradeViewText.py:150
+#: ../DistUpgrade/DistUpgradeViewText.py:183
+#: ../DistUpgrade/DistUpgradeViewText.py:190
 msgid "Continue [yN] "
 msgstr "_Continuer [oN] "
 
-#: ../DistUpgrade/DistUpgradeViewText.py:155
-#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:150
+#: ../DistUpgrade/DistUpgradeViewText.py:183
 msgid "Details [d]"
 msgstr "Détails [d]"
 
 #. TRANSLATORS: the "y" is "yes"
 #. TRANSLATORS: first letter of a positive (yes) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:159
-#: ../DistUpgrade/DistUpgradeViewText.py:203
+#: ../DistUpgrade/DistUpgradeViewText.py:154
+#: ../DistUpgrade/DistUpgradeViewText.py:193
 msgid "y"
 msgstr "o"
 
 #. TRANSLATORS: the "n" is "no"
 #. TRANSLATORS: first letter of a negative (no) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:162
-#: ../DistUpgrade/DistUpgradeViewText.py:210
+#: ../DistUpgrade/DistUpgradeViewText.py:157
+#: ../DistUpgrade/DistUpgradeViewText.py:200
 msgid "n"
 msgstr "n"
 
 #. TRANSLATORS: the "d" is "details"
-#: ../DistUpgrade/DistUpgradeViewText.py:165
+#: ../DistUpgrade/DistUpgradeViewText.py:160
 msgid "d"
 msgstr "d"
 
@@ -1589,26 +1538,26 @@
 msgid "No longer supported: %s\n"
 msgstr "N'est plus maintenu : %s\n"
 
-#: ../DistUpgrade/DistUpgradeViewText.py:175
+#: ../DistUpgrade/DistUpgradeViewText.py:165
 #, python-format
 msgid "Remove: %s\n"
 msgstr "Supprimer : %s\n"
 
-#: ../DistUpgrade/DistUpgradeViewText.py:185
+#: ../DistUpgrade/DistUpgradeViewText.py:175
 #, python-format
 msgid "Install: %s\n"
 msgstr "Installer : %s\n"
 
-#: ../DistUpgrade/DistUpgradeViewText.py:190
+#: ../DistUpgrade/DistUpgradeViewText.py:180
 #, python-format
 msgid "Upgrade: %s\n"
 msgstr "Mettre à niveau : %s\n"
 
-#: ../DistUpgrade/DistUpgradeViewText.py:207
+#: ../DistUpgrade/DistUpgradeViewText.py:197
 msgid "Continue [Yn] "
 msgstr "Continuer [o/n] "
 
-#: ../DistUpgrade/DistUpgradeViewText.py:228
+#: ../DistUpgrade/DistUpgradeViewText.py:218
 msgid ""
 "To finish the upgrade, a restart is required.\n"
 "If you select 'y' the system will be restarted."
@@ -1616,15 +1565,15 @@
 "Un redémarrage est nécessaire pour terminer la mise à niveau.\n"
 "Si vous choisissez « o », le système sera redémarré."
 
-#: ../DistUpgrade/DistUpgrade.ui.h:1
+#: ../DistUpgrade/DistUpgrade.ui.h:20
 msgid "_Cancel Upgrade"
 msgstr "Ann_uler la mise à niveau"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:2
+#: ../DistUpgrade/DistUpgrade.ui.h:26
 msgid "_Resume Upgrade"
 msgstr "_Reprendre la mise à niveau"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:3
+#: ../DistUpgrade/DistUpgrade.ui.h:2
 msgid ""
 "<b><big>Cancel the running upgrade?</big></b>\n"
 "\n"
@@ -1636,31 +1585,31 @@
 "Le système pourrait devenir inutilisable suite à l'annulation de la mise à "
 "niveau. Il vous est fortement conseillé de reprendre celle-ci."
 
-#: ../DistUpgrade/DistUpgrade.ui.h:6
+#: ../DistUpgrade/DistUpgrade.ui.h:27
 msgid "_Start Upgrade"
 msgstr "Lancer la mi_se à niveau"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:9
+#: ../DistUpgrade/DistUpgrade.ui.h:23
 msgid "_Replace"
 msgstr "Re_mplacer"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:10
+#: ../DistUpgrade/DistUpgrade.ui.h:12
 msgid "Difference between the files"
 msgstr "Différence entre les fichiers"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:11
+#: ../DistUpgrade/DistUpgrade.ui.h:24
 msgid "_Report Bug"
 msgstr "Signale_r un bogue"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:12
+#: ../DistUpgrade/DistUpgrade.ui.h:21
 msgid "_Continue"
 msgstr "_Continuer"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:13
+#: ../DistUpgrade/DistUpgrade.ui.h:8
 msgid "<b><big>Start the upgrade?</big></b>"
 msgstr "<b><big>Lancer la mise à niveau ?</big></b>"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:15
+#: ../DistUpgrade/DistUpgrade.ui.h:5
 msgid ""
 "<b><big>Restart the system to complete the upgrade</big></b>\n"
 "\n"
@@ -1670,7 +1619,7 @@
 "\n"
 "Veuillez enregistrer vos travaux avant de poursuivre."
 
-#: ../DistUpgrade/DistUpgrade.ui.h:18
+#: ../DistUpgrade/DistUpgrade.ui.h:13
 msgid "Distribution Upgrade"
 msgstr "Mise à niveau de la distribution"
 
@@ -1678,100 +1627,100 @@
 msgid "<b><big>Upgrading Ubuntu to version 12.04</big></b>"
 msgstr "<b><big>Mise à niveau d'Ubuntu vers la version 12.04</big></b>"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:20
+#: ../DistUpgrade/DistUpgrade.ui.h:1
 msgid "    "
 msgstr "    "
 
-#: ../DistUpgrade/DistUpgrade.ui.h:22
+#: ../DistUpgrade/DistUpgrade.ui.h:18
 msgid "Setting new software channels"
 msgstr "Définition de nouveaux dépôts logiciels"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:24
+#: ../DistUpgrade/DistUpgrade.ui.h:17
 msgid "Restarting the computer"
 msgstr "Redémarrage du système"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:27
+#: ../DistUpgrade/DistUpgrade.ui.h:19
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:60
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:42
 msgid "Please wait, this can take some time."
 msgstr "Veuillez patienter, cela peut prendre du temps."
 
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:62
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:44
 msgid "Update is complete"
 msgstr "La mise à jour est terminée"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:108
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:102
+#: ../UpdateManager/DistUpgradeFetcher.py:85
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:103
 msgid "Could not find the release notes"
 msgstr "Impossible de trouver les notes de version"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:109
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:103
+#: ../UpdateManager/DistUpgradeFetcher.py:86
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:104
 msgid "The server may be overloaded. "
 msgstr "Le serveur est peut-être surchargé. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:119
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:107
+#: ../UpdateManager/DistUpgradeFetcher.py:96
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:108
 msgid "Could not download the release notes"
 msgstr "Impossible de télécharger les notes de version"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:120
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:108
+#: ../UpdateManager/DistUpgradeFetcher.py:97
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
 msgid "Please check your internet connection."
 msgstr "Veuillez vérifier votre connexion Internet."
 
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:61
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:84
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:62
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:85
 msgid "Upgrade"
 msgstr "Mettre à niveau"
 
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:88
-#: ../data/gtkbuilder/UpdateManager.ui.h:20
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:89
+#: ../data/glade/UpdateManager.ui.h:12
+#: ../data/glade/UpgradePromptDialog.ui.h:4
 msgid "Release Notes"
 msgstr "Notes de version"
 
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:127
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:140
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:142
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:128
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
 msgid "Downloading additional package files..."
 msgstr "Téléchargement des paquets supplémentaires..."
 
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:140
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
 #, python-format
 msgid "File %s of %s at %sB/s"
 msgstr "Fichier %s sur %s à %s octets/s"
 
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:142
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
 #, python-format
 msgid "File %s of %s"
 msgstr "Fichier %s sur %s"
 
-#: ../UpdateManager/ChangelogViewer.py:73
+#: ../UpdateManager/ChangelogViewer.py:70
 msgid "Open Link in Browser"
 msgstr "Ouvrir le lien dans un navigateur"
 
-#: ../UpdateManager/ChangelogViewer.py:76
+#: ../UpdateManager/ChangelogViewer.py:72
 msgid "Copy Link to Clipboard"
 msgstr "Copier le lien dans le presse-papiers"
 
-#: ../UpdateManager/GtkProgress.py:159
+#: ../UpdateManager/GtkProgress.py:116
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Téléchargement du fichier %(current)li sur %(total)li à %(speed)s/s"
 
-#: ../UpdateManager/GtkProgress.py:164
+#: ../UpdateManager/GtkProgress.py:121
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Téléchargement du fichier %(current)li sur %(total)li"
 
-#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:96
+#: ../UpdateManager/UpdateManager.py:104 ../do-release-upgrade:95
 msgid "Your Ubuntu release is not supported anymore."
 msgstr "Votre version d'Ubuntu n'est plus prise en charge."
 
-#: ../UpdateManager/UpdateManager.py:106
+#: ../UpdateManager/UpdateManager.py:105
 msgid ""
 "You will not get any further security fixes or critical updates. Please "
 "upgrade to a later version of Ubuntu Linux."
@@ -1780,69 +1729,69 @@
 "critiques. Veuillez mettre à niveau vers une version plus récente d'Ubuntu "
 "Linux."
 
-#: ../UpdateManager/UpdateManager.py:114
+#: ../UpdateManager/UpdateManager.py:827
 msgid "Upgrade information"
 msgstr "Informations de mise à niveau"
 
-#. upload_archive = version_match.group(2).strip()
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:308
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s : \n"
 
-#: ../UpdateManager/UpdateManager.py:446
+#: ../UpdateManager/UpdateManager.py:445
 msgid ""
 "No network connection detected, you can not download changelog information."
 msgstr ""
 "Aucune connexion réseau n'a été détectée. Vous ne pouvez pas télécharger la "
 "liste de changements."
 
-#: ../UpdateManager/UpdateManager.py:454
+#: ../UpdateManager/UpdateManager.py:365
 msgid "Downloading list of changes..."
 msgstr "Téléchargement de la liste des modifications…"
 
-#: ../UpdateManager/UpdateManager.py:498
+#: ../UpdateManager/UpdateManager.py:497
 msgid "_Deselect All"
 msgstr "Tout _désélectionner"
 
-#: ../UpdateManager/UpdateManager.py:504
+#: ../UpdateManager/UpdateManager.py:503
 msgid "Select _All"
 msgstr "Tout _sélectionner"
 
-#: ../UpdateManager/UpdateManager.py:564
+#: ../UpdateManager/UpdateManager.py:563
 #, python-format
 msgid "%(count)s update has been selected."
 msgid_plural "%(count)s updates have been selected."
 msgstr[0] "%(count)s mise à jour a été sélectionnée."
 msgstr[1] "%(count)s mises à jour ont été sélectionnées."
 
-#: ../UpdateManager/UpdateManager.py:568
+#: ../UpdateManager/UpdateManager.py:567
 #, python-format
 msgid "%s will be downloaded."
 msgstr "%s vont être téléchargés."
 
-#: ../UpdateManager/UpdateManager.py:580
-msgid "The update has already been downloaded, but not installed"
-msgid_plural "The updates have already been downloaded, but not installed"
-msgstr[0] "La mise à jour a déjà été téléchargée, mais pas installée"
-msgstr[1] "Les mises à jour ont déjà été téléchargées, mais pas installées"
-
-#: ../UpdateManager/UpdateManager.py:585
-msgid "There are no updates to install"
-msgstr "Aucune mise à jour à installer"
+#: ../UpdateManager/UpdateManager.py:579
+msgid "The update has already been downloaded, but not installed."
+msgid_plural "The updates have already been downloaded, but not installed."
+msgstr[0] "La mise à jour a déjà été téléchargée, mais pas encore installée."
+msgstr[1] ""
+"Les mises à jour ont déjà été téléchargées, mais pas encore installées."
+
+#: ../UpdateManager/UpdateManager.py:584
+msgid "There are no updates to install."
+msgstr "Il n'y a pas de mises à jour à installer."
 
 #. TRANSLATORS: this allows to switch the order of the count of
 #. updates and the download size string (if needed)
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:590
 #, python-format
 msgid "%(count_str)s %(download_str)s"
 msgstr "%(count_str)s %(download_str)s"
 
-#: ../UpdateManager/UpdateManager.py:598
+#: ../UpdateManager/UpdateManager.py:597
 msgid "Unknown download size."
 msgstr "Taille du téléchargement inconnue."
 
-#: ../UpdateManager/UpdateManager.py:624
+#: ../UpdateManager/UpdateManager.py:623
 msgid ""
 "It is unknown when the package information was updated last. Please click "
 "the 'Check' button to update the information."
@@ -1850,7 +1799,7 @@
 "La date de dernière mise à jour des informations de paquets est inconnue. "
 "Veillez cliquer sur le bouton “Vérifier” pour mettre à jour ces informations."
 
-#: ../UpdateManager/UpdateManager.py:630
+#: ../UpdateManager/UpdateManager.py:629
 #, python-format
 msgid ""
 "The package information was last updated %(days_ago)s days ago.\n"
@@ -1860,7 +1809,7 @@
 "Cliquez sur le bouton « Vérifier » ci-dessous pour vérifier les nouvelles "
 "mises à jour des logiciels."
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:634
 #, python-format
 msgid "The package information was last updated %(days_ago)s day ago."
 msgid_plural ""
@@ -1872,7 +1821,7 @@
 "Les informations sur les paquets ont été mises à jour il y a %(days_ago)s "
 "jours."
 
-#: ../UpdateManager/UpdateManager.py:639
+#: ../UpdateManager/UpdateManager.py:638
 #, python-format
 msgid "The package information was last updated %(hours_ago)s hour ago."
 msgid_plural ""
@@ -1885,18 +1834,17 @@
 "heures."
 
 #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago
-#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:643 ../UpdateManager/UpdateManager.py:645
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "The package information was last updated about %s minutes ago."
 msgstr "Les informations des paquets ont été mise à jour il y a %s minutes."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:649
 msgid "The package information was just updated."
 msgstr "Les informations des paquets viennent d'être mises à jour."
 
-#: ../UpdateManager/UpdateManager.py:670
-#: ../data/gtkbuilder/UpdateManager.ui.h:2
+#: ../UpdateManager/UpdateManager.py:505 ../data/glade/UpdateManager.ui.h:23
 msgid ""
 "Software updates correct errors, eliminate security vulnerabilities and "
 "provide new features."
@@ -1904,15 +1852,15 @@
 "Les mises à jour logicielles corrigent des erreurs, éliminent des failles de "
 "sécurité et apportent de nouvelles fonctionnalités."
 
-#: ../UpdateManager/UpdateManager.py:689
+#: ../UpdateManager/UpdateManager.py:688
 msgid "Software updates may be available for your computer."
 msgstr "Des mises à jour peuvent être disponibles pour votre ordinateur."
 
-#: ../UpdateManager/UpdateManager.py:697
+#: ../UpdateManager/UpdateManager.py:524
 msgid "Welcome to Ubuntu"
 msgstr "Bienvenue sur Ubuntu"
 
-#: ../UpdateManager/UpdateManager.py:699
+#: ../UpdateManager/UpdateManager.py:698
 msgid ""
 "These software updates have been issued since this version of Ubuntu was "
 "released. If you don't want to install them now, choose \"Update Manager\" "
@@ -1923,7 +1871,7 @@
 "installer plus tard à partir du « Gestionnaire de mises à jour » situé dans "
 "le menu Applications."
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:700
 msgid ""
 "These software updates have been issued since this version of Ubuntu was "
 "released. If you don't want to install them now, choose \"Update Manager\" "
@@ -1934,11 +1882,11 @@
 "installer plus tard à partir du « Gestionnaire de mises à jour » situé dans "
 "le menu Administration."
 
-#: ../UpdateManager/UpdateManager.py:704
+#: ../UpdateManager/UpdateManager.py:528
 msgid "Software updates are available for this computer"
 msgstr "Des mises à jour sont disponibles pour cet ordinateur"
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:705
 msgid ""
 "If you don't want to install them now, choose \"Update Manager\" from "
 "Applications later."
@@ -1946,7 +1894,7 @@
 "Si vous ne voulez pas les installer maintenant, vous pourrez le faire plus "
 "tard avec le « Gestionnaire de mises à jour »."
 
-#: ../UpdateManager/UpdateManager.py:708
+#: ../UpdateManager/UpdateManager.py:529
 msgid ""
 "If you don't want to install them now, choose \"Update Manager\" from the "
 "Administration menu later."
@@ -1955,7 +1903,7 @@
 "retrouver plus tard dans le « Gestionnaire de mises à jour » du menu "
 "Administration."
 
-#: ../UpdateManager/UpdateManager.py:760
+#: ../UpdateManager/UpdateManager.py:578
 #, python-format
 msgid ""
 "The upgrade needs a total of %s free space on disk '%s'. Please free at "
@@ -1967,7 +1915,7 @@
 "corbeille et supprimez les paquets temporaires des précédentes installations "
 "en utilisant « sudo apt-get clean »."
 
-#: ../UpdateManager/UpdateManager.py:785
+#: ../data/glade/UpdateManager.ui.h:24
 msgid ""
 "The computer needs to restart to finish installing updates. Please save your "
 "work before continuing."
@@ -1975,24 +1923,25 @@
 "L'ordinateur doit être redémarré pour terminer l'installation des mises à "
 "jour. Veuillez enregistrer vos travaux avant de poursuivre."
 
-#: ../UpdateManager/UpdateManager.py:849
+#: ../UpdateManager/UpdateManager.py:637
+#: ../UpdateManagerHildon/UpdateManagerHildon.py:114
 msgid "Reading package information"
 msgstr "Lecture des informations sur les paquets"
 
-#: ../UpdateManager/UpdateManager.py:864
+#: ../UpdateManager/UpdateManager.py:863
 msgid "Connecting..."
 msgstr "Connexion…"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:880
 msgid "You may not be able to check for updates or download new updates."
 msgstr ""
 "Vous ne pouvez peut-être pas vérifier ou télécharger des mises à jour."
 
-#: ../UpdateManager/UpdateManager.py:1005
+#: ../UpdateManager/UpdateManager.py:750
 msgid "Could not initialize the package information"
 msgstr "Impossible d'initialiser les données sur les paquets"
 
-#: ../UpdateManager/UpdateManager.py:1006
+#: ../UpdateManager/UpdateManager.py:751
 msgid ""
 "An unresolvable problem occurred while initializing the package "
 "information.\n"
@@ -2006,7 +1955,7 @@
 "Veuillez signaler ce bogue du paquet « update-manager » en y joignant le "
 "message d'erreur suivant :\n"
 
-#: ../UpdateManager/UpdateManager.py:1035
+#: ../UpdateManager/UpdateManager.py:773
 msgid ""
 "An unresolvable problem occurred while calculating the upgrade.\n"
 "\n"
@@ -2019,31 +1968,31 @@
 "Veuillez signaler ce bogue du paquet « update-manager » en y joignant le "
 "message d'erreur suivant :"
 
-#: ../UpdateManager/UpdateManager.py:1060
+#: ../UpdateManager/UpdateManager.py:796
 msgid " (New install)"
 msgstr " (Nouvelle installation)"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:1067
+#: ../UpdateManager/UpdateManager.py:800
 #, python-format
 msgid "(Size: %s)"
 msgstr "(Taille : %s)"
 
-#: ../UpdateManager/UpdateManager.py:1069
+#: ../UpdateManager/UpdateManager.py:802
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr "De la version %(old_version)s vers la version %(new_version)s"
 
-#: ../UpdateManager/UpdateManager.py:1073
+#: ../UpdateManager/UpdateManager.py:806
 #, python-format
 msgid "Version %s"
 msgstr "Version %s"
 
-#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:108
+#: ../UpdateManager/UpdateManager.py:1103 ../do-release-upgrade:107
 msgid "Release upgrade not possible right now"
 msgstr "Mise à niveau impossible dans l'immédiat."
 
-#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:109
+#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:108
 #, c-format, python-format
 msgid ""
 "The release upgrade can not be performed currently, please try again later. "
@@ -2052,21 +2001,22 @@
 "La mise à niveau de la distribution ne peut s'exécuter pour le moment. "
 "Veuillez réessayer plus tard. Le serveur a renvoyé : « %s »"
 
-#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:116
+#. print "on_button_dist_upgrade_clicked"
+#: ../UpdateManager/UpdateManager.py:847 ../check-new-release-gtk:87
 msgid "Downloading the release upgrade tool"
 msgstr "Téléchargement de l'outil de mise à niveau de distribution"
 
-#: ../UpdateManager/UpdateManager.py:1114
+#: ../UpdateManager/UpdateManager.py:854
 #, python-format
 msgid "<b>New Ubuntu release '%s' is available</b>"
 msgstr "<b>La nouvelle version « %s » d'Ubuntu est disponible</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:1153
+#: ../UpdateManager/UpdateManager.py:893
 msgid "Software index is broken"
 msgstr "La liste des logiciels est corrompue"
 
-#: ../UpdateManager/UpdateManager.py:1154
+#: ../UpdateManager/UpdateManager.py:894
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -2084,11 +2034,11 @@
 msgid "Install All Available Updates"
 msgstr "Installer toutes les mises à jour disponibles"
 
-#: ../UpdateManagerText/UpdateManagerText.py:31
+#: ../UpdateManagerText/UpdateManagerText.py:26
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../UpdateManagerText/UpdateManagerText.py:32
+#: ../UpdateManagerText/UpdateManagerText.py:27
 msgid "Install"
 msgstr "Installer"
 
@@ -2100,11 +2050,11 @@
 msgid "Updates"
 msgstr "Mises à jour"
 
-#: ../UpdateManagerText/UpdateManagerText.py:50
+#: ../UpdateManagerText/UpdateManagerText.py:45
 msgid "Building Updates List"
 msgstr "Construction de la liste des mises à jour"
 
-#: ../UpdateManagerText/UpdateManagerText.py:53
+#: ../UpdateManagerText/UpdateManagerText.py:48
 msgid ""
 "\n"
 "A normal upgrade can not be calculated, please run: \n"
@@ -2128,11 +2078,11 @@
 " * des paquets non officiels, non fournis par Ubuntu ;\n"
 " * des modifications normales liées à une pré-version d'Ubuntu."
 
-#: ../UpdateManagerText/UpdateManagerText.py:122
+#: ../UpdateManagerText/UpdateManagerText.py:117
 msgid "Downloading changelog"
 msgstr "Téléchargement de l'historique de développement"
 
-#: ../UpdateManager/Core/MyCache.py:130
+#: ../UpdateManager/Core/MyCache.py:124
 #, python-format
 msgid "Other updates (%s)"
 msgstr "Autres mises à Jour (%s)"
@@ -2156,7 +2106,7 @@
 "Cette mise à jour provient d'une source ne fournissant pas de notes de "
 "version."
 
-#: ../UpdateManager/Core/MyCache.py:305 ../UpdateManager/Core/MyCache.py:326
+#: ../UpdateManager/Core/MyCache.py:297
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -2164,7 +2114,7 @@
 "Échec lors du téléchargement de la liste des modifications. \n"
 "Veuillez vérifier votre connexion Internet."
 
-#: ../UpdateManager/Core/MyCache.py:315
+#: ../UpdateManager/Core/MyCache.py:286
 #, python-format
 msgid ""
 "The changelog does not contain any relevant changes.\n"
@@ -2178,7 +2128,7 @@
 "Veuillez utiliser http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "jusqu'à ce que les modifications soient disponibles ou réessayez plus tard."
 
-#: ../UpdateManager/Core/MyCache.py:320
+#: ../UpdateManager/Core/MyCache.py:291
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -2191,54 +2141,54 @@
 "Consultez http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "en attendant qu'elle soit disponible ou réessayez plus tard."
 
-#: ../UpdateManager/Core/UpdateList.py:49
+#: ../UpdateManager/Core/UpdateList.py:50
 msgid "Failed to detect distribution"
 msgstr "Impossible de détecter la distribution"
 
-#: ../UpdateManager/Core/UpdateList.py:50
+#: ../UpdateManager/Core/UpdateList.py:51
 #, python-format
 msgid "A error '%s' occurred while checking what system you are using."
 msgstr ""
 "Une erreur « %s » s'est produite en essayant de déterminer le système que "
 "vous utilisez."
 
-#: ../UpdateManager/Core/UpdateList.py:61
+#: ../UpdateManager/Core/UpdateList.py:62
 msgid "Important security updates"
 msgstr "Mises à jour de sécurité importantes"
 
-#: ../UpdateManager/Core/UpdateList.py:62
+#: ../UpdateManager/Core/UpdateList.py:63
 msgid "Recommended updates"
 msgstr "Mises à jour recommandées"
 
-#: ../UpdateManager/Core/UpdateList.py:63
+#: ../UpdateManager/Core/UpdateList.py:64
 msgid "Proposed updates"
 msgstr "Mises à jour proposées"
 
-#: ../UpdateManager/Core/UpdateList.py:64
+#: ../UpdateManager/Core/UpdateList.py:65
 msgid "Backports"
 msgstr "Rétro-portages"
 
-#: ../UpdateManager/Core/UpdateList.py:65
+#: ../UpdateManager/Core/UpdateList.py:66
 msgid "Distribution updates"
 msgstr "Mises à jour de la distribution"
 
-#: ../UpdateManager/Core/UpdateList.py:70
+#: ../UpdateManager/Core/UpdateList.py:71
 msgid "Other updates"
 msgstr "Autres mises à jour"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:1
+#: ../data/glade/UpdateManager.ui.h:6
 msgid "<big><b>Starting Update Manager</b></big>"
 msgstr "<big><b>Démarrage du gestionnaire de mises à jour</b></big>"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:3
+#: ../data/glade/UpdateManager.ui.h:30
 msgid "_Partial Upgrade"
 msgstr "Mise à niveau _partielle"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:4
+#: ../data/glade/UpdateManager.ui.h:4
 msgid "<big><b>Not all updates can be installed</b></big>"
 msgstr "<big><b>Impossible d'installer certaines mises à jour</b></big>"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:5
+#: ../data/glade/UpdateManager.ui.h:14
 msgid ""
 "Run a partial upgrade, to install as many updates as possible. \n"
 "\n"
@@ -2256,11 +2206,11 @@
 " * des paquets non officiels, non fournis par Ubuntu ;\n"
 " * des modifications normales liées à une pré-version d'Ubuntu."
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:12
+#: ../data/glade/UpdateManager.ui.h:8
 msgid "Chec_k"
 msgstr "_Vérifier"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:13
+#: ../data/glade/UpdateManager.ui.h:1
 msgid ""
 "<b><big>You must check for updates manually</big></b>\n"
 "\n"
@@ -2274,34 +2224,34 @@
 "Vous pouvez configurer ce comportement dans l'onglet <i>Mises à jour</i> de "
 "l'application <i>Sources de logiciels</i>."
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:16
+#: ../data/glade/UpdateManager.ui.h:28
 msgid "_Hide this information in the future"
 msgstr "_Masquer ces informations à l'avenir"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:17
+#: ../data/glade/UpdateManager.ui.h:9
 msgid "Co_ntinue"
 msgstr "Co_ntinuer"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:18
+#: ../data/glade/UpdateManager.ui.h:5
 msgid "<big><b>Running on battery</b></big>"
 msgstr "<big><b>Fonctionnement sur batterie</b></big>"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:19
+#: ../data/glade/UpdateManager.ui.h:27
 msgid "Your system is running on battery. Are you sure you want to continue?"
 msgstr ""
 "Votre ordinateur fonctionne sur batterie. Voulez-vous vraiment continuer ?"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:21
+#: ../data/glade/UpdateManager.ui.h:32
 msgid "_Upgrade"
 msgstr "Mettre à _niveau"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:22
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:8
+#: ../data/glade/UpdateManager.ui.h:22
+#: ../data/glade/UpgradePromptDialog.ui.h:5
 msgid "Show progress of individual files"
 msgstr "Afficher l'avancement de chaque fichier"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:23
-#: ../data/update-manager.desktop.in.h:1
+#: ../data/glade/UpdateManager.ui.h:26 ../data/update-manager.desktop.in.h:3
+#: ../data/update-manager-hildon.desktop.in.h:3
 msgid "Update Manager"
 msgstr "Gestionnaire de mises à jour"
 
@@ -2309,11 +2259,11 @@
 msgid "Starting Update Manager"
 msgstr "Démarrage du gestionnaire de mises à jour"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:25
+#: ../data/glade/UpdateManager.ui.h:25
 msgid "U_pgrade"
 msgstr "M_ettre à niveau"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:27
+#: ../data/glade/UpdateManager.ui.h:33
 msgid "updates"
 msgstr "mises à jour"
 
@@ -2335,19 +2285,19 @@
 "Il est plus sûr de brancher l'ordinateur sur une alimentation secteur avant "
 "la mise à jour."
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:31
+#: ../data/glade/UpdateManager.ui.h:29
 msgid "_Install Updates"
 msgstr "_Installer les mises à jour"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:32
+#: ../data/glade/UpdateManager.ui.h:7
 msgid "Changes"
 msgstr "Changements"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:33
+#: ../data/glade/UpdateManager.ui.h:10
 msgid "Description"
 msgstr "Description"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:34
+#: ../data/glade/UpdateManager.ui.h:11
 msgid "Description of update"
 msgstr "Description de la mise à jour"
 
@@ -2355,30 +2305,30 @@
 msgid "_Settings..."
 msgstr "_Paramètres..."
 
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1
+#: ../data/glade/UpgradePromptDialog.ui.h:1
 msgid ""
 "<b>A new version of Ubuntu is available. Would you like to upgrade?</b>"
 msgstr ""
 "<b>Une nouvelle version d'Ubuntu est disponible. Souhaitez-vous mettre à "
 "niveau votre système ?</b>"
 
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:3
+#: ../data/glade/UpgradePromptDialog.ui.h:3
 msgid "Don't Upgrade"
 msgstr "Ne pas mettre à niveau"
 
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:4
+#: ../data/glade/UpgradePromptDialog.ui.h:2
 msgid "Ask Me Later"
 msgstr "Me le demander plus tard"
 
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:5
+#: ../data/glade/UpgradePromptDialog.ui.h:6
 msgid "Yes, Upgrade Now"
 msgstr "Oui, mettre à niveau maintenant"
 
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:6
+#: ../data/glade/UpgradePromptDialog.ui.h:8
 msgid "You have declined to upgrade to the new Ubuntu"
 msgstr "Vous avez refusé la mise à niveau vers la nouvelle version d'Ubuntu."
 
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7
+#: ../data/glade/UpgradePromptDialog.ui.h:7
 msgid ""
 "You can upgrade at a later time by opening Update Manager and click on "
 "\"Upgrade\"."
@@ -2387,42 +2337,44 @@
 "mises à jour » et en cliquant sur « Mettre à niveau »."
 
 #: ../data/update-manager.desktop.in.h:2
+#: ../data/update-manager-hildon.desktop.in.h:2
 msgid "Software Updates"
 msgstr "Mises à jour des logiciels"
 
-#: ../data/update-manager.desktop.in.h:3
+#: ../data/update-manager.desktop.in.h:1
+#: ../data/update-manager-hildon.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr "Afficher et installer les mises à jour disponibles"
 
-#: ../update-manager:61 ../update-manager-text:49 ../do-release-upgrade:47
+#: ../update-manager:53 ../do-release-upgrade:33
 msgid "Show version and exit"
 msgstr "Afficher le numéro de version et fermer"
 
-#: ../update-manager:64
+#: ../update-manager:56
 msgid "Directory that contains the data files"
 msgstr "Dossier contenant les fichiers de données"
 
-#: ../update-manager:67
+#: ../update-manager:59
 msgid "Check if a new Ubuntu release is available"
 msgstr "Vérifier si une nouvelle version d'Ubuntu est disponible"
 
-#: ../update-manager:70 ../do-release-upgrade:50 ../check-new-release-gtk:180
+#: ../update-manager:62 ../do-release-upgrade:36 ../check-new-release-gtk:138
 msgid "Check if upgrading to the latest devel release is possible"
 msgstr ""
 "Vérifier si la mise à niveau vers la dernière version de développement est "
 "possible"
 
-#: ../update-manager:74
+#: ../update-manager:66
 msgid "Upgrade using the latest proposed version of the release upgrader"
 msgstr ""
 "Mettre à niveau en utilisant la dernière version proposée de l'assistant de "
 "mise à niveau de la distribution"
 
-#: ../update-manager:81
+#: ../update-manager:73
 msgid "Do not focus on map when starting"
 msgstr "Ne pas capturer le focus au démarrage"
 
-#: ../update-manager:84
+#: ../update-manager:76
 msgid "Try to run a dist-upgrade"
 msgstr "Essayer d'exécuter un « dist-upgrade »"
 
@@ -2430,26 +2382,26 @@
 msgid "Do not check for updates when starting"
 msgstr "Ne pas vérifier les mises à jour au démarrage"
 
-#: ../update-manager:91 ../do-release-upgrade:66
+#: ../update-manager:80 ../do-release-upgrade:52
 msgid "Test upgrade with a sandbox aufs overlay"
 msgstr "Tester la mise à niveau dans un environnement protégé (sandbox aufs)"
 
-#: ../update-manager:111
+#: ../update-manager:100
 msgid "Running partial upgrade"
 msgstr "Lancement d'une mise à niveau partielle"
 
-#: ../update-manager-text:53
+#: ../update-manager-text:54
 msgid "Show description of the package instead of the changelog"
 msgstr "Voir la description du paquet au lieu de la liste des modifications"
 
-#: ../do-release-upgrade:54 ../check-new-release-gtk:184
+#: ../do-release-upgrade:40 ../check-new-release-gtk:142
 msgid ""
 "Try upgrading to the latest release using the upgrader from $distro-proposed"
 msgstr ""
 "Essayer de mettre à niveau vers la dernière version disponible en utilisant "
 "l'outil de mise à niveau de $distro-proposed"
 
-#: ../do-release-upgrade:58
+#: ../do-release-upgrade:44
 msgid ""
 "Run in a special upgrade mode.\n"
 "Currently 'desktop' for regular upgrades of a desktop system and 'server' "
@@ -2460,11 +2412,11 @@
 "standard d'un ordinateur de bureau et « server » pour les installations de "
 "type serveur."
 
-#: ../do-release-upgrade:64
+#: ../do-release-upgrade:50
 msgid "Run the specified frontend"
 msgstr "Lancer l'interface spécifiée"
 
-#: ../do-release-upgrade:69
+#: ../do-release-upgrade:55
 msgid ""
 "Check only if a new distribution release is available and report the result "
 "via the exit code"
@@ -2472,12 +2424,11 @@
 "Vérifier seulement si une nouvelle distribution est disponible et afficher "
 "le résultat en sortie"
 
-#: ../do-release-upgrade:83
-msgid "Checking for a new ubuntu release"
+#: ../do-release-upgrade:82
+msgid "Checking for a new Ubuntu release"
 msgstr ""
-"Vérification de la disponibilité d'une nouvelle version de la distribution"
 
-#: ../do-release-upgrade:97
+#: ../do-release-upgrade:96
 msgid ""
 "For upgrade information, please visit:\n"
 "%(url)s\n"
@@ -2485,59 +2436,59 @@
 "Pour plus d'informations sur la mise à jour, veuillez visiter :\n"
 "%(url)s\n"
 
-#: ../do-release-upgrade:103
+#: ../do-release-upgrade:79
 msgid "No new release found"
 msgstr "Aucune nouvelle version trouvée"
 
-#: ../do-release-upgrade:115
+#: ../do-release-upgrade:84
 #, c-format
 msgid "New release '%s' available."
 msgstr "Nouvelle version « %s » disponible."
 
-#: ../do-release-upgrade:116
+#: ../do-release-upgrade:85
 msgid "Run 'do-release-upgrade' to upgrade to it."
 msgstr "Lancer « do-release-upgrade » pour mettre à niveau vers celle-ci."
 
-#: ../check-new-release-gtk:91
+#: ../check-new-release-gtk:67
 msgid "Ubuntu %(version)s Upgrade Available"
 msgstr "Mise à niveau vers Ubuntu %(version)s disponible"
 
-#: ../check-new-release-gtk:132
+#: ../check-new-release-gtk:103
 #, c-format
 msgid "You have declined the upgrade to Ubuntu %s"
 msgstr "Vous avez refusé la mise à niveau vers Ubuntu %s"
 
-#: ../check-new-release-gtk:190
+#: ../check-new-release-gtk:192
 msgid "Add debug output"
 msgstr "Ajouter la sortie de débogage"
 
-#: ../ubuntu-support-status:81
+#: ../ubuntu-support-status:79
 msgid "Show unsupported packages on this machine"
 msgstr "Afficher les paquets non pris en charge présents sur cette machine"
 
-#: ../ubuntu-support-status:84
+#: ../ubuntu-support-status:82
 msgid "Show supported packages on this machine"
 msgstr "Afficher les paquets pris en charge présents sur cette machine"
 
-#: ../ubuntu-support-status:87
+#: ../ubuntu-support-status:85
 msgid "Show all packages with their status"
 msgstr "Voir tous les paquets avec leur statut"
 
-#: ../ubuntu-support-status:90
+#: ../ubuntu-support-status:88
 msgid "Show all packages in a list"
 msgstr "Afficher tous les paquets en liste"
 
-#: ../ubuntu-support-status:132
+#: ../ubuntu-support-status:130
 #, c-format
 msgid "Support status summary of '%s':"
 msgstr ""
 
-#: ../ubuntu-support-status:135
+#: ../ubuntu-support-status:133
 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s"
 msgstr ""
 "Vous avez %(num)s paquets (%(percent).1f%%) pris en charge jusqu'à %(temps)s"
 
-#: ../ubuntu-support-status:141
+#: ../ubuntu-support-status:139
 msgid ""
 "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be "
 "downloaded"
@@ -2545,12 +2496,12 @@
 "Vous avez %(num)s paquets (%(percent).1f%%) qui ne peuvent pas ou plus être "
 "téléchargés"
 
-#: ../ubuntu-support-status:144
+#: ../ubuntu-support-status:142
 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported"
 msgstr ""
 "Vous avez %(num)s paquets (%(pour cent).1f%%) qui ne sont pas pris en charge"
 
-#: ../ubuntu-support-status:152
+#: ../ubuntu-support-status:150
 msgid ""
 "Run with --show-unsupported, --show-supported or --show-all to see more "
 "details"
@@ -2558,20 +2509,20 @@
 "Exécuter avec --show-unsupported, --show-supported ou --show-all pour voir "
 "plus de détails"
 
-#: ../ubuntu-support-status:156
+#: ../ubuntu-support-status:154
 msgid "No longer downloadable:"
 msgstr "N'est plus téléchargeable:"
 
-#: ../ubuntu-support-status:159
+#: ../ubuntu-support-status:157
 msgid "Unsupported: "
 msgstr "Non pris en charge: "
 
-#: ../ubuntu-support-status:164
+#: ../ubuntu-support-status:162
 #, c-format
 msgid "Supported until %s:"
 msgstr "Pris en charge jusqu'en %s:"
 
-#: ../ubuntu-support-status:173
+#: ../ubuntu-support-status:171
 msgid "Unsupported"
 msgstr "Non pris en charge"
 
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/upower.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/upower.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/upower.po	2012-01-02 17:27:34.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/upower.po	2012-02-23 06:31:58.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:14+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:53+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../policy/org.freedesktop.upower.policy.in.h:1
 msgid "Authentication is required to hibernate the system"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/upstart.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/upstart.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/upstart.po	2012-01-02 17:27:19.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/upstart.po	2012-02-23 06:31:43.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: upstart\n"
 "Report-Msgid-Bugs-To: new@bugs.launchpad.net\n"
-"POT-Creation-Date: 2011-07-25 17:06+0100\n"
+"POT-Creation-Date: 2011-12-14 11:53+0000\n"
 "PO-Revision-Date: 2011-10-05 20:56+0000\n"
 "Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:38+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:41+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: init/conf.c:356 init/session.c:337
 msgid "Unable to load configuration"
@@ -63,7 +63,7 @@
 msgid "Disconnected from system bus"
 msgstr "Déconnecté du bus système"
 
-#: init/control.c:370 init/main.c:694
+#: init/control.c:370 init/main.c:830
 msgid "Reloading configuration"
 msgstr "Rechargement de la configuration"
 
@@ -101,6 +101,14 @@
 msgid "Mismatched braces"
 msgstr ""
 
+#: init/errors.h:64
+msgid "Invalid setuid user name does not exist"
+msgstr ""
+
+#: init/errors.h:65
+msgid "Invalid setgid group name does not exist"
+msgstr ""
+
 #: init/errors.h:66
 msgid "Illegal interval, expected number of seconds"
 msgstr ""
@@ -273,6 +281,10 @@
 msgid "%s %s process (%d)"
 msgstr "processus %s %s (%d)"
 
+#: init/job_process.c:461
+msgid "No available ptys"
+msgstr ""
+
 #: init/job_process.c:491
 #, c-format
 msgid "Pausing %s (%d) [pre-exec] for debug"
@@ -328,6 +340,24 @@
 msgid "unable to execute: %s"
 msgstr "impossible d'exécuter : %s"
 
+#: init/job_process.c:1087
+#, c-format
+msgid "unable to getpwnam: %s"
+msgstr ""
+
+#: init/job_process.c:1092
+#, c-format
+msgid "unable to getgrnam: %s"
+msgstr ""
+
+#: init/job_process.c:1097
+msgid "unable to find setuid user"
+msgstr ""
+
+#: init/job_process.c:1101
+msgid "unable to find setgid group"
+msgstr ""
+
 #: init/job_process.c:1105
 #, c-format
 msgid "unable to setuid: %s"
@@ -343,6 +373,26 @@
 msgid "unable to chown: %s"
 msgstr ""
 
+#: init/job_process.c:1120
+#, c-format
+msgid "unable to open pt master: %s"
+msgstr ""
+
+#: init/job_process.c:1125
+#, c-format
+msgid "unable to unlockpt: %s"
+msgstr ""
+
+#: init/job_process.c:1130
+#, c-format
+msgid "unable to get ptsname: %s"
+msgstr ""
+
+#: init/job_process.c:1135
+#, c-format
+msgid "unable to open pt slave: %s"
+msgstr ""
+
 #: init/job_process.c:1166 init/job_process.c:1216
 #, c-format
 msgid "Sending %s signal to %s %s process (%d)"
@@ -441,31 +491,47 @@
 msgid "%s %s process (%d) executable changed"
 msgstr "L'exécutable du processus %s %s (%d) a changé"
 
-#: init/main.c:131
+#: init/log.c:260
+msgid "Failed to write to log file"
+msgstr ""
+
+#: init/main.c:135
 msgid "specify alternative directory to load configuration files from"
 msgstr ""
 
-#: init/main.c:132
-msgid "Disable user and chroot sessions"
+#: init/main.c:138
+msgid "default value for console stanza"
+msgstr ""
+
+#: init/main.c:141
+msgid "specify alternative directory to store job output logs in"
+msgstr ""
+
+#: init/main.c:144
+msgid "disable job logging"
 msgstr ""
 
-#: init/main.c:146
+#: init/main.c:147
+msgid "disable user and chroot sessions"
+msgstr ""
+
+#: init/main.c:150
 msgid "do not emit any startup event (for testing)"
 msgstr ""
 
-#: init/main.c:151
+#: init/main.c:155
 msgid "use D-Bus session bus rather than system bus (for testing)"
 msgstr ""
 
-#: init/main.c:154
+#: init/main.c:158
 msgid "specify an alternative initial event (for testing)"
 msgstr ""
 
-#: init/main.c:174
+#: init/main.c:178
 msgid "Process management daemon."
 msgstr "Démon de gestion de processus."
 
-#: init/main.c:176
+#: init/main.c:180
 msgid ""
 "This daemon is normally executed by the kernel and given process id 1 to "
 "denote its special status.  When executed by a user process, it will "
@@ -475,63 +541,87 @@
 "son statut spécial. Quand il est exécuté par un processus utilisateur, c'est "
 "en réalité /sbin/telinit qui sera exécuté."
 
-#: init/main.c:197 util/reboot.c:166 util/shutdown.c:363 util/telinit.c:148
+#: init/main.c:201 util/reboot.c:166 util/shutdown.c:363 util/telinit.c:148
 msgid "Need to be root"
 msgstr "Nécessite d'être super-utilisateur (root)"
 
-#: init/main.c:206
+#: init/main.c:210
 msgid "Not being executed as init"
 msgstr "N'est pas executé comme init"
 
-#: init/main.c:269 init/main.c:604
+#: init/main.c:251
+msgid "Unable to initialize console, will try /dev/null"
+msgstr ""
+
+#: init/main.c:257
+msgid "Unable to initialize console as /dev/null"
+msgstr ""
+
+#: init/main.c:273 init/main.c:687
 msgid "Unable to set root directory"
 msgstr "Impossible de définir le répertoire racine"
 
-#: init/main.c:280
+#: init/main.c:284
 msgid "Unable to mount /proc filesystem"
 msgstr "Impossible de monter le système de fichiers /proc"
 
-#: init/main.c:289
+#: init/main.c:293
 msgid "Unable to mount /sys filesystem"
 msgstr "Impossible de monter le système de fichiers /sys"
 
-#: init/main.c:417
+#: init/main.c:403 init/main.c:409
+msgid "Unable to set default oom score"
+msgstr ""
+
+#: init/main.c:428
 msgid "Unable to listen for private connections"
 msgstr "Impossible d'écouter des connexions privées"
 
-#: init/main.c:621
+#: init/main.c:461
+msgid "Unable to setup standard file descriptors"
+msgstr ""
+
+#: init/main.c:704
 #, c-format
 msgid "Caught %s, core dumped"
 msgstr "L'erreur %s a été détectée, un fichier « core » a été généré"
 
-#: init/main.c:625
+#: init/main.c:708
 #, c-format
 msgid "Caught %s, unable to dump core"
 msgstr ""
 "L'erreur %s été détectée, aucun fichier « core » n'a pas pu être généré"
 
-#: init/main.c:661
+#: init/main.c:737
 #, c-format
 msgid "Re-executing %s"
 msgstr "Ré-exécution de %s"
 
-#: init/main.c:686
+#: init/main.c:762
 #, c-format
 msgid "Failed to re-execute %s: %s"
 msgstr "Échec de la ré-exécution de %s : %s"
 
-#: init/main.c:711
+#: init/main.c:847
 msgid "Reconnecting to system bus"
 msgstr "Reconnexion au bus système"
 
-#: init/main.c:717
+#: init/main.c:853
 msgid "Unable to connect to the system bus"
 msgstr "Impossible de se connecter au bus système"
 
+#: init/main.c:929
+msgid "invalid console type specified"
+msgstr ""
+
 #: init/process.c:78
 msgid "main"
 msgstr "principal"
 
+#: init/session.c:223 init/session.c:313
+msgid "Unable to lookup home directory"
+msgstr ""
+
 #: util/initctl.c:305
 msgid "Unable to connect to system bus"
 msgstr "Impossible de se connecter au bus système"
@@ -1090,6 +1180,10 @@
 msgid "Detach and run in the background"
 msgstr "Détacher et exécuter en arrière plan"
 
+#: extra/upstart-udev-bridge.c:87
+msgid "Do not strip non-printable bytes from udev message data"
+msgstr ""
+
 #: extra/upstart-udev-bridge.c:106
 msgid "Bridge udev events into upstart"
 msgstr ""
@@ -1115,3 +1209,41 @@
 #: extra/upstart-udev-bridge.c:333 extra/upstart-socket-bridge.c:623
 msgid "Disconnected from Upstart"
 msgstr ""
+
+#: extra/upstart-socket-bridge.c:148
+msgid "Bridge socket events into upstart"
+msgstr ""
+
+#: extra/upstart-socket-bridge.c:150
+msgid ""
+"By default, upstart-socket-bridge does not detach from the console and "
+"remains in the foreground.  Use the --daemon option to have it detach."
+msgstr ""
+
+#: extra/upstart-socket-bridge.c:163
+msgid "Could not create epoll descriptor"
+msgstr ""
+
+#: extra/upstart-socket-bridge.c:207
+msgid "Could not create JobAdded signal connection"
+msgstr ""
+
+#: extra/upstart-socket-bridge.c:219
+msgid "Could not create JobRemoved signal connection"
+msgstr ""
+
+#: extra/upstart-socket-bridge.c:231
+msgid "Could not obtain job list"
+msgstr ""
+
+#: extra/upstart-socket-bridge.c:287
+msgid "Error from epoll"
+msgstr ""
+
+#: extra/upstart-socket-bridge.c:350
+msgid "Could not send socket event"
+msgstr ""
+
+#: extra/upstart-socket-bridge.c:642
+msgid "Error emitting socket event"
+msgstr ""
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ureadahead.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ureadahead.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/ureadahead.po	2012-01-02 17:27:33.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/ureadahead.po	2012-02-23 06:31:57.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:03+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:43+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/ureadahead.c:111
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/usbcreator.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/usbcreator.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/usbcreator.po	2012-01-02 17:27:29.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/usbcreator.po	2012-02-23 06:31:52.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: usb-creator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-07 12:02+0000\n"
+"POT-Creation-Date: 2012-01-13 09:16+0000\n"
 "PO-Revision-Date: 2011-06-20 15:34+0000\n"
 "Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:58+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:51+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: .././usbcreator/install.py:133
 #, python-format
@@ -167,7 +167,7 @@
 msgstr "Effacement en cours..."
 
 #: .././usbcreator/frontends/gtk/frontend.py:481
-#: .././gui/usbcreator-gtk.ui.h:4 usbcreator-kde.ui.py:42
+#: .././gui/usbcreator-gtk.ui.h:15 usbcreator-kde.ui.py:42
 msgid "Erase Disk"
 msgstr "Effacer le disque"
 
@@ -249,7 +249,7 @@
 #. set title of progress window (same as gtk frontend)
 #: .././usbcreator/frontends/winui/install_window.py:23
 #: .././usbcreator/frontends/kde/frontend.py:180
-#: .././gui/usbcreator-gtk.ui.h:9 usbcreator/frontends/kde/frontend.py:180
+#: .././gui/usbcreator-gtk.ui.h:7 usbcreator/frontends/kde/frontend.py:180
 msgid "Installing"
 msgstr "Installation"
 
@@ -286,7 +286,7 @@
 msgstr "Créer un disque de démarrage"
 
 #: .././usbcreator/frontends/winui/main_dialog.py:21
-#: .././gui/usbcreator-gtk.ui.h:18 usbcreator-kde.ui.py:6
+#: .././gui/usbcreator-gtk.ui.h:11 usbcreator-kde.ui.py:6
 msgid ""
 "To try or install Ubuntu from a removable disk, it needs to be set up as a "
 "startup disk."
@@ -295,7 +295,7 @@
 "défini comme disque de démarrage."
 
 #: .././usbcreator/frontends/winui/main_dialog.py:24
-#: .././gui/usbcreator-gtk.ui.h:13 usbcreator-kde.ui.py:9
+#: .././gui/usbcreator-gtk.ui.h:12 usbcreator-kde.ui.py:9
 msgid "Source disc image (.iso) or CD:"
 msgstr "Image du disque source (.iso) ou CD :"
 
@@ -304,7 +304,7 @@
 msgstr "Image"
 
 #: .././usbcreator/frontends/winui/main_dialog.py:32
-#: .././gui/usbcreator-gtk.ui.h:11 usbcreator-kde.ui.py:24
+#: .././gui/usbcreator-gtk.ui.h:13 usbcreator-kde.ui.py:24
 msgid "Other..."
 msgstr "Autre..."
 
@@ -313,7 +313,7 @@
 msgstr "Disque amovible à utiliser :"
 
 #: .././usbcreator/frontends/winui/main_dialog.py:42
-#: .././gui/usbcreator-gtk.ui.h:19 usbcreator-kde.ui.py:45
+#: .././gui/usbcreator-gtk.ui.h:16 usbcreator-kde.ui.py:45
 msgid "When starting up from this disk, documents and settings will be:"
 msgstr ""
 "Lors du démarrage depuis ce disque, les documents et les réglages seront :"
@@ -323,12 +323,12 @@
 msgstr "Stockés en espace réservé"
 
 #: .././usbcreator/frontends/winui/main_dialog.py:46
-#: .././gui/usbcreator-gtk.ui.h:5 usbcreator-kde.ui.py:51
+#: .././gui/usbcreator-gtk.ui.h:18 usbcreator-kde.ui.py:51
 msgid "How much:"
 msgstr "Taille :"
 
 #: .././usbcreator/frontends/winui/main_dialog.py:52
-#: .././gui/usbcreator-gtk.ui.h:1 usbcreator-kde.ui.py:57
+#: .././gui/usbcreator-gtk.ui.h:19 usbcreator-kde.ui.py:57
 msgid "Discarded on shutdown, unless you save them elsewhere"
 msgstr ""
 "Supprimés à l'extinction, à moins que vous ne les enregistriez ailleurs"
@@ -363,38 +363,46 @@
 msgstr "Réessayer ?"
 
 #: .././usbcreator/frontends/kde/frontend.py:481
-#: .././gui/usbcreator-gtk.ui.h:12 usbcreator/frontends/kde/frontend.py:481
+#: .././gui/usbcreator-gtk.ui.h:8 usbcreator/frontends/kde/frontend.py:481
 msgid "Quit the installation?"
 msgstr "Quitter l'installation ?"
 
 #: .././usbcreator/frontends/kde/frontend.py:482
-#: .././gui/usbcreator-gtk.ui.h:3 usbcreator/frontends/kde/frontend.py:482
+#: .././gui/usbcreator-gtk.ui.h:9 usbcreator/frontends/kde/frontend.py:482
 msgid "Do you really want to quit the installation now?"
 msgstr "Voulez-vous vraiment quitter l'installation maintenant ?"
 
 #: .././desktop/usb-creator-kde.desktop.in.h:1
 #: .././desktop/usb-creator-gtk.desktop.in.h:1
-msgid "Create a startup disk using a CD or disc image"
-msgstr "Créer un disque de démarrage à partir d'un CD ou d'une image disque"
+msgid "Startup Disk Creator"
+msgstr "Créateur de disque de démarrage"
 
 #: .././desktop/usb-creator-kde.desktop.in.h:2
 #: .././desktop/usb-creator-gtk.desktop.in.h:2
-msgid "Startup Disk Creator"
-msgstr "Créateur de disque de démarrage"
+msgid "Create a startup disk using a CD or disc image"
+msgstr "Créer un disque de démarrage à partir d'un CD ou d'une image disque"
 
-#: .././gui/usbcreator-gtk.ui.h:2 usbcreator-kde.ui.py:27
-msgid "Disk to use:"
-msgstr "Disque à utiliser :"
+#: .././gui/usbcreator-gtk.ui.h:1
+msgid "Installation Failed"
+msgstr "L'installation a échoué"
 
-#: .././gui/usbcreator-gtk.ui.h:6
+#: .././gui/usbcreator-gtk.ui.h:2
+msgid ""
+"The installation failed.  Please see ~/.cache/usb-creator.log for more "
+"details.\n"
+msgstr ""
+"L'installation a échoué. Veuillez consulter ~/.cache/usb-creator.log pour "
+"plus de détails.\n"
+
+#: .././gui/usbcreator-gtk.ui.h:4
 msgid "Installation Complete"
 msgstr "Installation terminée"
 
-#: .././gui/usbcreator-gtk.ui.h:7
-msgid "Installation Failed"
-msgstr "L'installation a échoué"
+#: .././gui/usbcreator-gtk.ui.h:5
+msgid "Test Disk"
+msgstr "Disque de Test"
 
-#: .././gui/usbcreator-gtk.ui.h:8
+#: .././gui/usbcreator-gtk.ui.h:6
 msgid ""
 "Installation is complete.  You may now run Ubuntu on other computers by "
 "booting them with this drive inserted."
@@ -402,54 +410,46 @@
 "L'installation est terminée. Vous pouvez maintenant utiliser Ubuntu sur "
 "d'autres ordinateurs en les faisant démarrer sur cette clé USB."
 
-#: .././gui/usbcreator-gtk.ui.h:14 usbcreator-kde.ui.py:48
+#: .././gui/usbcreator-gtk.ui.h:14 usbcreator-kde.ui.py:27
+msgid "Disk to use:"
+msgstr "Disque à utiliser :"
+
+#: .././gui/usbcreator-gtk.ui.h:17 usbcreator-kde.ui.py:48
 msgid "Stored in reserved extra space"
 msgstr "Enregistrés sur un espace réservé supplémentaire"
 
-#: .././gui/usbcreator-gtk.ui.h:15
-msgid "Test Disk"
-msgstr "Disque de Test"
-
-#: .././gui/usbcreator-gtk.ui.h:16
-msgid ""
-"The installation failed.  Please see ~/.cache/usb-creator.log for more "
-"details.\n"
-msgstr ""
-"L'installation a échoué. Veuillez consulter ~/.cache/usb-creator.log pour "
-"plus de détails.\n"
-
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:1
-msgid "Format the device"
-msgstr "Formater le volume"
+msgid "Install the bootloader"
+msgstr "Installer le chargeur d'amorçage"
 
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:2
-msgid "Image the device"
-msgstr "Faire une image du volume"
+msgid "System policy prevents installing the bootloader"
+msgstr "La politique du système interdit d'installer le chargeur d'amorçage"
 
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:3
-msgid "Install the bootloader"
-msgstr "Installer le chargeur d'amorçage"
+msgid "Format the device"
+msgstr "Formater le volume"
 
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:4
-msgid "Mount a device"
-msgstr "Monter un volume"
-
-#: .././dbus/com.ubuntu.usbcreator.policy.in.h:5
 msgid "System policy prevents formatting this device"
 msgstr "La politique du système interdit de formater ce volume"
 
+#: .././dbus/com.ubuntu.usbcreator.policy.in.h:5
+msgid "Image the device"
+msgstr "Faire une image du volume"
+
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:6
-msgid "System policy prevents installing the bootloader"
-msgstr "La politique du système interdit d'installer le chargeur d'amorçage"
+msgid "System policy prevents writing a disk image to this device"
+msgstr ""
+"La politique du système interdit d'écrire un image disque sur ce volume"
 
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:7
-msgid "System policy prevents mounting"
-msgstr "La politique du système interdit le montage"
+msgid "Mount a device"
+msgstr "Monter un volume"
 
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:8
-msgid "System policy prevents writing a disk image to this device"
-msgstr ""
-"La politique du système interdit d'écrire un image disque sur ce volume"
+msgid "System policy prevents mounting"
+msgstr "La politique du système interdit le montage"
 
 #: .././main.py:38
 msgid "Please run this program as an administrator to continue."
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/util-linux.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/util-linux.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/util-linux.po	2012-01-02 17:26:44.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/util-linux.po	2012-02-23 06:31:10.000000000 +0000
@@ -22,8 +22,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:17+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:33+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: disk-utils/blockdev.c:61
 msgid "set read-only"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/virtinst.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/virtinst.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/virtinst.po	2012-01-02 17:27:25.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/virtinst.po	2012-02-23 06:31:48.000000000 +0000
@@ -1,43 +1,46 @@
-# translation of virtinst.tip.po to french
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Gauthier Ancelin <gauthier.ancelin@laposte.net>, 2008.
-# Boris BARNIER <b.barnier@gmail.com>, 2010.
+# Translators:
+# Cole Robinson <crobinso@redhat.com>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: virtinst.tip\n"
+"Project-Id-Version: virtinst\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 19:53-0400\n"
-"PO-Revision-Date: 2011-04-02 04:35+0000\n"
-"Last-Translator: Boris BARNIER <Unknown>\n"
-"Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
+"POT-Creation-Date: 2012-01-31 20:20-0500\n"
+"PO-Revision-Date: 2012-02-11 21:36+0000\n"
+"Last-Translator: MarbolanGos <Unknown>\n"
+"Language-Team: French "
+"(http://www.transifex.net/projects/p/virtinst/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:59+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:58+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: virtinst/CapabilitiesParser.py:104
 #, python-format
 msgid "Unknown CPU model '%s'"
-msgstr ""
+msgstr "Modèle de CPU inconnu « %s »"
 
 #: virtinst/CapabilitiesParser.py:379
 #, python-format
 msgid ", domain type '%s'"
-msgstr ""
+msgstr ", type de domaine « %s »"
 
 #: virtinst/CapabilitiesParser.py:381
 #, python-format
 msgid ", machine type '%s'"
-msgstr ""
+msgstr ", type de machine  « %s »"
 
 #: virtinst/CapabilitiesParser.py:383
 #, python-format
 msgid "No domains available for virt type '%(type)s', arch '%(arch)s'"
 msgstr ""
+"Aucun domaine disponible pour le type virtuel  « %(type)s », d'architecture "
+"%(arch)s"
 
 #: virtinst/CapabilitiesParser.py:723
 #, python-format
@@ -51,7 +54,7 @@
 
 #: virtinst/CapabilitiesParser.py:729
 msgid "any virtualization options"
-msgstr ""
+msgstr "options de virtualisation"
 
 #: virtinst/CapabilitiesParser.py:731
 #, python-format
@@ -64,16 +67,18 @@
 "Host does not support domain type %(domain)s%(machine)s for virtualization "
 "type '%(virttype)s' arch '%(arch)s'"
 msgstr ""
+"L'hôte ne supporte pas les domaines de type %(domain)s%(machine)s pour "
+"virtualiser le type « %(virttype)s' arch '%(arch)s »"
 
 #: virtinst/cli.py:320
 msgid "Must be root to create Xen guests"
-msgstr "Il faut être superutilisateur pour créer des invités Xen"
+msgstr "Il faut être super-utilisateur pour créer des invités Xen"
 
-#: virtinst/cli.py:457
+#: virtinst/cli.py:456
 msgid "Exiting at user request."
 msgstr "Sortie sur demande de l'utilisateur."
 
-#: virtinst/cli.py:467
+#: virtinst/cli.py:466
 #, python-format
 msgid ""
 "Domain installation does not appear to have been successful.\n"
@@ -81,38 +86,42 @@
 "  %s\n"
 "otherwise, please restart your installation."
 msgstr ""
+"L'installation du domaine ne semble pas s'être terminée avec succès.\n"
+"Si c'est bon, vous pouvez démarrer le domaine en lançant :\n"
+" %s\n"
+"sinon, recommencez l'installation."
 
-#: virtinst/cli.py:495
+#: virtinst/cli.py:494
 #, python-format
 msgid "Couldn't create default storage pool '%s': %s"
-msgstr ""
+msgstr "Impossible de créer l'ensemble de stockage par défaut : « %s » : %s"
 
-#: virtinst/cli.py:537
+#: virtinst/cli.py:539
 msgid "A yes or no response is required"
-msgstr ""
+msgstr "Une réponse par oui ou non est requise"
 
-#: virtinst/cli.py:560
+#: virtinst/cli.py:563
 msgid " (Use --prompt or --force to override)"
 msgstr " (Utilisez --prompt ou --force pour surcharger)"
 
-#: virtinst/cli.py:608
+#: virtinst/cli.py:611
 msgid "Do you really want to use this disk (yes or no)"
 msgstr "Voulez-vous vraiment utiliser le disque (« yes » ou « no »)"
 
-#: virtinst/cli.py:621
+#: virtinst/cli.py:624
 msgid "A disk path must be specified."
 msgstr "Un chemin de disque doit être spécifié."
 
-#: virtinst/cli.py:623
+#: virtinst/cli.py:626
 #, python-format
 msgid "A disk path must be specified to clone '%s'."
 msgstr "Un chemin de disque doit être spécifié pour cloner « %s »."
 
-#: virtinst/cli.py:627
+#: virtinst/cli.py:630
 msgid "What would you like to use as the disk (file path)?"
 msgstr "Que souhaitez-vous utiliser comme disque (chemin d'accès) ?"
 
-#: virtinst/cli.py:629
+#: virtinst/cli.py:632
 #, python-format
 msgid ""
 "Please enter the path to the file you would like to use for storage. It will "
@@ -121,167 +130,203 @@
 "Veuillez entrer le chemin d'accès vers le fichier que vous souhaitez "
 "utiliser pour le stockage. Il aura une taille de %s Gio."
 
-#: virtinst/cli.py:643
+#: virtinst/cli.py:646
 msgid "A size must be specified for non-existent disks."
 msgstr "Une taille doit être spécifiée pour les disques qui n'existent pas."
 
-#: virtinst/cli.py:644
+#: virtinst/cli.py:647
 #, python-format
 msgid "How large would you like the disk (%s) to be (in gigabytes)?"
 msgstr "Quelle taille le disque %s doit-il avoir (en Gio) ?"
 
-#: virtinst/cli.py:669
+#: virtinst/cli.py:672
 #, python-format
 msgid "This will overwrite the existing path '%s'"
 msgstr "Cela va écraser le chemin existant « %s »"
 
-#: virtinst/cli.py:682
+#: virtinst/cli.py:685
 #, python-format
 msgid "Disk %s is already in use by another guest"
 msgstr "Le disque %s est déjà en cours d'utilisation par un autre invité"
 
-#: virtinst/cli.py:735 virt-install:145
+#: virtinst/cli.py:738 virt-install:145
 #, python-format
 msgid "Error with storage parameters: %s"
 msgstr "Erreur avec les paramètres de stockage : %s"
 
-#: virtinst/cli.py:757
+#: virtinst/cli.py:760
 msgid "--name is required"
-msgstr ""
+msgstr "--name est nécessaire"
 
-#: virtinst/cli.py:758
+#: virtinst/cli.py:761
 msgid "--ram amount in MB is required"
-msgstr ""
+msgstr "la quantité --ram en Mio est nécessaire"
 
-#: virtinst/cli.py:761
+#: virtinst/cli.py:764
 msgid "What is the name of your virtual machine?"
 msgstr "Quel est le nom de votre machine virtuelle ?"
 
-#: virtinst/cli.py:769
+#: virtinst/cli.py:772
 msgid "How much RAM should be allocated (in megabytes)?"
 msgstr "Quelle quantité de RAM devrait être allouée (en Mo) ?"
 
-#: virtinst/cli.py:775
+#: virtinst/cli.py:778
 #, python-format
 msgid "Installs currently require %d megs of RAM."
 msgstr "Les installations exigent actuellement %d Mo de RAM."
 
-#: virtinst/cli.py:812
+#: virtinst/cli.py:815
 #, python-format
 msgid ""
 "You have asked for more virtual CPUs (%d) than there are physical CPUs (%d) "
 "on the host. This will work, but performance will be poor. "
 msgstr ""
-"Vous avez demandé à avoir plus d'UC virtuelles (%d) qu'il n'y a d'UC "
-"physiques (%d) sur l'hôte. Ceci peut fonctionner, mais les performances "
-"seront faibles. "
+"Vous avez demandé plus de CPU virtuels (%d) que de CPU physiques (%d) "
+"disponibles sur l'hôte. Cela fonctionnera mais avec des performances "
+"réduites. "
 
-#: virtinst/cli.py:815
+#: virtinst/cli.py:818
 msgid "Are you sure? (yes or no)"
 msgstr "Êtes-vous certains ? (« yes » ou « no »)"
 
-#: virtinst/cli.py:854
+#: virtinst/cli.py:857
 msgid "Cannot mix both --bridge and --network arguments"
 msgstr "Impossible de mélanger les arguments de --bridge et de --network"
 
-#: virtinst/cli.py:884
+#: virtinst/cli.py:887
 #, python-format
 msgid "Error in network device parameters: %s"
-msgstr ""
+msgstr "Erreur dans les paramètres du périphérique réseau : %s"
 
-#: virtinst/cli.py:908
+#: virtinst/cli.py:911
 msgid "Cannot mix --graphics and old style graphical options"
 msgstr ""
+"Impossible de mélanger --graphics et les anciennes options graphiques"
 
-#: virtinst/cli.py:912
+#: virtinst/cli.py:915
 msgid "Can't specify more than one of VNC, SDL, --graphics or --nographics"
 msgstr ""
+"Impossible de spécifier plus d'une option parmi VNC, SDL, --graphics ou --"
+"nographics"
 
-#: virtinst/cli.py:955
+#: virtinst/cli.py:958
 #, python-format
 msgid "Error in graphics device parameters: %s"
-msgstr ""
+msgstr "Erreur dans les paramètres du périphérique graphique : %s"
 
-#: virtinst/cli.py:992
+#: virtinst/cli.py:995
 #, python-format
 msgid "Error in smartcard device parameters: %s"
+msgstr "Erreur dans les paramètres du périphérique de carte à puce : %s"
+
+#: virtinst/cli.py:1005
+#, python-format
+msgid "Error in controller device parameters: %s"
 msgstr ""
 
-#: virtinst/cli.py:1003
-msgid "Connect to hypervisor with libvirt URI"
+#: virtinst/cli.py:1015
+#, python-format
+msgid "Error in redirdev device parameters: %s"
 msgstr ""
 
-#: virtinst/cli.py:1007
+#: virtinst/cli.py:1026
+msgid "Connect to hypervisor with libvirt URI"
+msgstr "Connecte à l'hyperviseur avec l'URI libvirt"
+
+#: virtinst/cli.py:1030
 msgid ""
 "Number of vcpus to configure for your guest. Ex:\n"
 "--vcpus 5\n"
 "--vcpus 5,maxcpus=10\n"
 "--vcpus sockets=2,cores=4,threads=2"
 msgstr ""
+"Nombre de vcpus à configurer pour l'invité. Ex. :\n"
+"--vcpus 5\n"
+"--vcpus 5,maxcpus=10\n"
+"--vcpus sockets=2,cores=4,threads=2"
 
-#: virtinst/cli.py:1012
+#: virtinst/cli.py:1035
 msgid "Set which physical CPUs domain can use."
-msgstr ""
+msgstr "Défini les domaines physiques des CPU accessibles."
 
-#: virtinst/cli.py:1014
+#: virtinst/cli.py:1037
 msgid "CPU model and features. Ex: --cpu coreduo,+x2apic"
-msgstr ""
+msgstr "Modèle et fonctionnalités du CPU. Ex : --cpu coreduo,+x2apic"
 
-#: virtinst/cli.py:1025
+#: virtinst/cli.py:1048
 msgid "Graphics Configuration"
 msgstr "Configuration graphique"
 
-#: virtinst/cli.py:1045 virt-clone:165
+#: virtinst/cli.py:1068 virt-clone:165
 msgid "Networking Configuration"
-msgstr ""
+msgstr "Configuration réseau"
 
-#: virtinst/cli.py:1059
+#: virtinst/cli.py:1082
 msgid ""
 "Configure a guest network interface. Ex:\n"
 "--network bridge=mybr0\n"
 "--network network=my_libvirt_virtual_net\n"
 "--network network=mynet,model=virtio,mac=00:11..."
 msgstr ""
+"Configurer une interface réseau invitée. Ex :\n"
+"--network bridge=mybr0\n"
+"--network network=my_libvirt_virtual_net\n"
+"--network network=mynet,model=virtio,mac=00:11..."
+
+#: virtinst/cli.py:1089
+msgid ""
+"Configure a guest controller device. Ex:\n"
+"--controller type=usb,model=ich9-ehci1"
+msgstr ""
 
-#: virtinst/cli.py:1066
+#: virtinst/cli.py:1092
 msgid "Configure a guest serial device"
-msgstr ""
+msgstr "Configurer un périphérique série invité"
 
-#: virtinst/cli.py:1068
+#: virtinst/cli.py:1094
 msgid "Configure a guest parallel device"
-msgstr ""
+msgstr "Configurer un périphérique parallèle invité"
 
-#: virtinst/cli.py:1070
+#: virtinst/cli.py:1096
 msgid "Configure a guest communication channel"
-msgstr ""
+msgstr "Configurer un canal de communication invité"
 
-#: virtinst/cli.py:1072
+#: virtinst/cli.py:1098
 msgid "Configure a text console connection between the guest and host"
 msgstr ""
+"Configurer une connexion console en mode texte entre l'hôte et l'invité"
 
-#: virtinst/cli.py:1075
+#: virtinst/cli.py:1101
 msgid "Configure physical host devices attached to the guest"
-msgstr ""
+msgstr "Configurer les périphériques physiques hôte attachés à l'invité"
 
-#: virtinst/cli.py:1078
+#: virtinst/cli.py:1104
 msgid "Configure guest sound device emulation"
-msgstr ""
+msgstr "Configurer l'émulation du périphérique sonore invité"
 
-#: virtinst/cli.py:1080
+#: virtinst/cli.py:1106
 msgid "Configure a guest watchdog device"
-msgstr ""
+msgstr "Configurer le périphérique de surveillance invité"
 
-#: virtinst/cli.py:1082
+#: virtinst/cli.py:1108
 msgid "Configure guest video hardware."
-msgstr ""
+msgstr "Configurer le matériel vidéo invité."
 
-#: virtinst/cli.py:1084
+#: virtinst/cli.py:1110
 msgid ""
 "Configure a guest smartcard device. Ex:\n"
 "--smartcard mode=passthrough"
 msgstr ""
+"Configurer un périphérique de carte à puces. Ex :\n"
+"--smartcard mode=passthrough"
 
-#: virtinst/cli.py:1089
+#: virtinst/cli.py:1113
+msgid ""
+"Configure a guest redirection device. Ex:\n"
+"--redirdev usb,type=tcp,server=192.168.1.1:4000"
+msgstr ""
+
+#: virtinst/cli.py:1118
 msgid ""
 "Configure guest display settings. Ex:\n"
 "--graphics vnc\n"
@@ -289,67 +334,86 @@
 "--graphics none\n"
 "--graphics vnc,password=foobar,port=5910,keymap=ja"
 msgstr ""
+"Configurer des paramètres d'affichage invité. Ex :\n"
+"--graphics vnc\n"
+"--graphics spice,port=5901,tlsport=5902\n"
+"--graphics none\n"
+"--graphics vnc,password=foobar,port=5910,keymap=ja"
 
-#: virtinst/cli.py:1097
+#: virtinst/cli.py:1126
 msgid ""
 "Pass host directory to the guest. Ex: \n"
 "--filesystem /my/source/dir,/dir/in/guest\n"
 "--filesystem template_name,/,type=template"
 msgstr ""
+"Passer le répertoire hôte vers l'invité. Ex :\n"
+"--filesystem /my/source/dir,/dir/in/guest\n"
+"--filesystem template_name,/,type=template"
 
-#: virtinst/cli.py:1219 virtinst/cli.py:1256 virtinst/cli.py:1310
-#: virtinst/cli.py:1365 virtinst/cli.py:1412 virtinst/cli.py:1581
-#: virtinst/cli.py:1626 virtinst/cli.py:1678 virtinst/cli.py:1704
-#: virtinst/cli.py:1730 virtinst/cli.py:1797 virtinst/cli.py:1828
-#: virtinst/cli.py:1847 virtinst/cli.py:1865
+#: virtinst/cli.py:1248 virtinst/cli.py:1285 virtinst/cli.py:1339
+#: virtinst/cli.py:1394 virtinst/cli.py:1445 virtinst/cli.py:1614
+#: virtinst/cli.py:1659 virtinst/cli.py:1711 virtinst/cli.py:1741
+#: virtinst/cli.py:1767 virtinst/cli.py:1803 virtinst/cli.py:1829
+#: virtinst/cli.py:1896 virtinst/cli.py:1927 virtinst/cli.py:1946
+#: virtinst/cli.py:1964
 #, python-format
 msgid "Unknown options %s"
-msgstr ""
+msgstr "Options inconnues %s"
 
-#: virtinst/cli.py:1344
+#: virtinst/cli.py:1373
 msgid "--boot menu must be 'on' or 'off'"
-msgstr ""
+msgstr "le menu --boot  doit être « on » ou « off »"
 
-#: virtinst/cli.py:1435
+#: virtinst/cli.py:1468
 msgid "Cannot specify more than 1 storage path"
-msgstr ""
+msgstr "Impossible de définir plus d'un emplacement de stockage"
 
-#: virtinst/cli.py:1444
+#: virtinst/cli.py:1477
 msgid "Size must be specified with all 'pool='"
-msgstr ""
+msgstr "La taille soit être définie avec tous les « pool= »"
 
-#: virtinst/cli.py:1458
+#: virtinst/cli.py:1491
 msgid "Format attribute not supported for this volume type"
-msgstr ""
+msgstr "Format d'attribut non supporté pour ce type de volume"
 
-#: virtinst/cli.py:1467
+#: virtinst/cli.py:1500
 msgid "Storage volume must be specified as vol=poolname/volname"
-msgstr ""
+msgstr "Le volume de stockage doit être spécifié comme vol=poolname/volname"
 
-#: virtinst/cli.py:1496 virtinst/cli.py:1519
+#: virtinst/cli.py:1529 virtinst/cli.py:1552
 #, python-format
 msgid "Unknown '%s' value '%s'"
-msgstr ""
+msgstr "« %s » est une valeur « %s » inconnue"
 
-#: virtinst/cli.py:1506
+#: virtinst/cli.py:1539
 #, python-format
 msgid "Improper value for 'size': %s"
-msgstr ""
+msgstr "Mauvaise taille pour « size » : %s"
 
-#: virtinst/cli.py:1649
+#: virtinst/cli.py:1682
 #, python-format
 msgid "Didn't match keymap '%s' in keytable!"
 msgstr ""
 "Le mappage clavier « %s » ne correspond à aucun enregistrement dans la table "
 "des clés."
 
-#: virtinst/cli.py:1766
+#: virtinst/cli.py:1794
+msgid "The server option is invalid with spicevmc redirection"
+msgstr ""
+
+#: virtinst/cli.py:1797
+msgid "The server option is missing for TCP redirection"
+msgstr ""
+
+#: virtinst/cli.py:1865
 #, python-format
 msgid ""
 "%(devtype)s type '%(chartype)s' does not support '%(optname)s' option."
 msgstr ""
+"%(devtype)s de type « %(chartype)s » ne supporte pas l'option « %(optname)s "
+"»."
 
-#: virtinst/CloneManager.py:122
+#: virtinst/CloneManager.py:121
 msgid "Connection must be a 'virConnect' instance."
 msgstr "La connexion doit être une instance « virConnect »."
 
@@ -385,13 +449,13 @@
 msgid "Original guest name or xml is required."
 msgstr "Le nom originel de la machine virtuelle ou son XML est requis."
 
-#: virtinst/CloneManager.py:421
+#: virtinst/CloneManager.py:426
 msgid "Domain with devices to clone must be paused or shutoff."
 msgstr ""
 "Les domaines avec des périphériques à cloner doivent être en pause ou "
 "arrêtés."
 
-#: virtinst/CloneManager.py:478
+#: virtinst/CloneManager.py:439
 #, python-format
 msgid ""
 "More disks to clone than new paths specified. (%(passed)d specified, "
@@ -400,17 +464,22 @@
 "Plus de disques à cloner que de nouveaux chemins ont été définis (%(passed)d "
 "définis, %(need)d attendus"
 
-#: virtinst/CloneManager.py:603
+#: virtinst/CloneManager.py:477
+#, python-format
+msgid "Clone onto existing storage volume is not supported: '%s'"
+msgstr ""
+
+#: virtinst/CloneManager.py:550
 #, python-format
 msgid "Disk '%s' does not exist."
 msgstr "Le disque « %s » n'existe pas."
 
-#: virtinst/CloneManager.py:616
+#: virtinst/CloneManager.py:563
 #, python-format
 msgid "Could not determine original disk information: %s"
 msgstr "Impossible de déterminer l'information initiale du disque : %s"
 
-#: virtinst/CloneManager.py:661
+#: virtinst/CloneManager.py:604
 #, python-format
 msgid "Domain '%s' was not found."
 msgstr "Le domaine « %s » n'a pas été trouvé."
@@ -423,28 +492,32 @@
 msgid "Invalid NFS format: No path specified."
 msgstr "Format NFS invalide : pas de chemin défini."
 
-#: virtinst/DistroInstaller.py:128
+#: virtinst/DistroInstaller.py:115
+msgid "Failed to lookup scratch media volume"
+msgstr ""
+
+#: virtinst/DistroInstaller.py:130
 #, python-format
 msgid "Transferring %s"
-msgstr ""
+msgstr "Transfert de %s"
 
-#: virtinst/DistroInstaller.py:190
+#: virtinst/DistroInstaller.py:192
 #, python-format
 msgid "Invalid 'location' type %s."
 msgstr "L'élément « location » de type « %s » est invalide."
 
-#: virtinst/DistroInstaller.py:196
+#: virtinst/DistroInstaller.py:198
 msgid "'conn' must be specified if 'location' is a storage tuple."
 msgstr "« conn » doit être spécifié si « location » est un tuple de stockage"
 
-#: virtinst/DistroInstaller.py:234
+#: virtinst/DistroInstaller.py:237
 #, python-format
 msgid "Checking installer location failed: Could not find media '%s'."
 msgstr ""
 "La vérification de l'emplacement de l'installeur a échoué : impossible de "
 "trouver le média « %s »."
 
-#: virtinst/DistroInstaller.py:237
+#: virtinst/DistroInstaller.py:240
 msgid ""
 "Install media location must be an NFS, HTTP or FTP network install source, "
 "or an existing file/device"
@@ -452,7 +525,7 @@
 "L'emplacement du média d'installation doit être une source réseau NFS, HTTP "
 "ou FTP, ou un fichier ou un périphérique existant"
 
-#: virtinst/DistroInstaller.py:244
+#: virtinst/DistroInstaller.py:247
 msgid "Privilege is required for NFS installations"
 msgstr "Des privilèges sont nécessaires pour les installations par NFS"
 
@@ -475,71 +548,71 @@
 "Le nombre d'UC physiques dans « cpuset » doit être inférieur au nombre d'UC "
 "physiques."
 
-#: virtinst/Guest.py:132
+#: virtinst/Guest.py:133
 msgid "No topology section in capabilities xml."
 msgstr "Pas de section topologie dans le XML des fonctionnalités."
 
-#: virtinst/Guest.py:136
+#: virtinst/Guest.py:137
 msgid "Capabilities only show <= 1 cell. Not NUMA capable"
 msgstr ""
 "Les fonctionnalités uniquement affichées ne doivent pas dépasser une "
 "cellule. Pas de fonctionnalités NUMA"
 
-#: virtinst/Guest.py:163
+#: virtinst/Guest.py:164
 msgid "Could not find any usable NUMA cell/cpu combinations."
 msgstr "Impossible de trouver une cellule ou une combinaisons CPU NUMA."
 
-#: virtinst/Guest.py:186
+#: virtinst/Guest.py:187
 msgid "Unable to connect to hypervisor, aborting installation!"
 msgstr ""
 "Impossible de se connecter à l'hyperviseur, arrêt de l'installation !"
 
-#: virtinst/Guest.py:296
+#: virtinst/Guest.py:298
 msgid "Guest"
 msgstr "Invité"
 
-#: virtinst/Guest.py:308
+#: virtinst/Guest.py:310
 #, python-format
 msgid "Guest name '%s' is already in use."
 msgstr "Le nom d'invité « %s » est déjà utilisé."
 
-#: virtinst/Guest.py:319
+#: virtinst/Guest.py:321
 msgid "Memory value must be an integer greater than 0"
 msgstr "La valeur de la mémoire doit être un entier plus grand que 0"
 
-#: virtinst/Guest.py:337
+#: virtinst/Guest.py:339
 msgid "Max Memory value must be an integer greater than 0"
 msgstr ""
 "La valeur maximale de la mémoire doit être un entier plus grand que 0"
 
-#: virtinst/Guest.py:360
+#: virtinst/Guest.py:370
 msgid "Number of vcpus must be a positive integer."
-msgstr ""
+msgstr "Le nombre de vcpus doit être un nombre entier positif."
 
-#: virtinst/Guest.py:362
+#: virtinst/Guest.py:372
 #, python-format
 msgid "Number of vcpus must be no greater than %d for this vm type."
 msgstr ""
 "Le nombre d'UC virtuelles ne doit pas dépasser %d pour ce type de machine "
 "virtuelle."
 
-#: virtinst/Guest.py:427
+#: virtinst/Guest.py:437
 msgid "OS type must be a string."
 msgstr ""
 "Le type de système d'exploitation doit être une chaîne de caractères."
 
-#: virtinst/Guest.py:436
+#: virtinst/Guest.py:446
 #, python-format
 msgid "OS type '%s' does not exist in our dictionary"
 msgstr ""
 "Le type de système d'exploitation « %s » n'existe pas dans le dictionnaire"
 
-#: virtinst/Guest.py:445
+#: virtinst/Guest.py:455
 msgid "OS variant must be a string."
 msgstr ""
 "Le variant de système d'exploitation doit être une chaîne de caractères."
 
-#: virtinst/Guest.py:452
+#: virtinst/Guest.py:462
 #, python-format
 msgid ""
 "OS variant '%(var)s' does not exist in our dictionary for OS type '%(ty)s'"
@@ -547,78 +620,78 @@
 "La variante du système d'exploitation « %(var)s » n'existe pas dans le "
 "dictionnaire pour le type de système d'exploitation « %(ty)s »"
 
-#: virtinst/Guest.py:467
+#: virtinst/Guest.py:477
 #, python-format
 msgid "Unknown OS variant '%s'"
 msgstr "La variante du système d'exploitation « %s » est inconnue"
 
-#: virtinst/Guest.py:508
+#: virtinst/Guest.py:518
 msgid "Whether we should overwrite an existing guest with the same name."
 msgstr "Si nous devons écraser un invité existant avec le même nom."
 
-#: virtinst/Guest.py:545
+#: virtinst/Guest.py:555
 msgid "Must specify whether graphics are enabled"
 msgstr "Vous devez spécifier si les graphiques sont activés"
 
-#: virtinst/Guest.py:571
+#: virtinst/Guest.py:581
 msgid "Graphics enabled must be True or False"
 msgstr "« Graphics enabled » doit être à « True » ou « False »"
 
-#: virtinst/Guest.py:654
+#: virtinst/Guest.py:664
 msgid "Must pass a VirtualDevice instance."
 msgstr "Il faut passer une instance d'une VirtualDevice."
 
-#: virtinst/Guest.py:744
+#: virtinst/Guest.py:754
 #, python-format
 msgid "Did not find device %s"
 msgstr "Le périphérique %s n'a pas été trouvé"
 
-#: virtinst/Guest.py:1092
+#: virtinst/Guest.py:1108
 msgid "Domain has already been started!"
 msgstr "Le domaine à déjà été lancé !"
 
-#: virtinst/Guest.py:1095
+#: virtinst/Guest.py:1111
 msgid "Name and memory must be specified for all guests!"
 msgstr "Le nom et la mémoire doivent être spécifiés pour tous les invités !"
 
-#: virtinst/Guest.py:1099
+#: virtinst/Guest.py:1115
 msgid "The UUID you entered is already in use by another guest!"
 msgstr ""
 "L'UUID que vous avez entré est déjà en cours d'utilisation par un autre "
 "invité !"
 
-#: virtinst/Guest.py:1180
+#: virtinst/Guest.py:1196
 #, python-format
 msgid "Domain named %s already exists!"
 msgstr "Un domaine nommé %s existe déjà !"
 
-#: virtinst/Guest.py:1192
+#: virtinst/Guest.py:1208
 #, python-format
 msgid "Could not remove old vm '%s': %s"
 msgstr "Impossible de retirer l'ancienne machine virtuelle « %s » : %s"
 
-#: virtinst/Guest.py:1251
+#: virtinst/Guest.py:1267
 msgid "Creating domain..."
 msgstr "Création du domaine ..."
 
-#: virtinst/Guest.py:1253
+#: virtinst/Guest.py:1269
 msgid "Starting domain..."
 msgstr "Démarrage du domaine..."
 
-#: virtinst/Guest.py:1328
+#: virtinst/Guest.py:1344
 msgid ""
 "Domain has not existed.  You should be able to find more information in the "
 "logs"
 msgstr ""
-"Le domaine n'a encore jamais existé. Vous devriez pouvoir trouver des "
+"Le domaine n'a jamais été créé. Vous devriez pouvoir trouver des "
 "informations plus détaillées dans les fichiers journaux"
 
-#: virtinst/Guest.py:1331
+#: virtinst/Guest.py:1347
 msgid ""
 "Domain has not run yet.  You should be able to find more information in the "
 "logs"
 msgstr ""
-"Le domaine n'a encore jamais été exécuté. Vous devriez pouvoir trouver des "
+"Le domaine n'a jamais été exécuté. Vous devriez pouvoir trouver des "
 "informations plus détaillées dans les fichiers journaux"
 
 #: virtinst/ImageFetcher.py:88
@@ -715,8 +788,8 @@
 #: virtinst/Installer.py:230
 msgid "Kernel and initrd must be specified by a list, dict, or tuple."
 msgstr ""
-"Le noyau et initrd doivent être spécifiés dans une liste, un dict ou un "
-"tuple."
+"Le noyau et initrd doivent être spécifiés dans une liste, un dictionnaire ou "
+"un tuple."
 
 #: virtinst/Installer.py:491
 msgid "A connection must be specified."
@@ -724,504 +797,523 @@
 
 #: virtinst/Interface.py:114 virtinst/Storage.py:148
 msgid "'conn' must be a libvirt connection object."
-msgstr ""
+msgstr "« conn » doit être un objet de connexion libvirt."
 
 #: virtinst/Interface.py:116
 msgid "Passed connection is not libvirt interface capable"
-msgstr ""
+msgstr "La connexion utilisée n'est pas une interface libvirt compatible"
 
 #: virtinst/Interface.py:126
 msgid "Interface name"
-msgstr ""
+msgstr "Nom d'interface"
 
 #: virtinst/Interface.py:131
 msgid "Name for the interface object."
-msgstr ""
+msgstr "Nom de l'objet d'interface."
 
 #: virtinst/Interface.py:138
 msgid "Maximum transmit size in bytes"
-msgstr ""
+msgstr "Taille maximale d'envoi en bits"
 
 #: virtinst/Interface.py:146
 msgid "Interface MAC address"
-msgstr ""
+msgstr "Adresse MAC de l'interface"
 
 #: virtinst/Interface.py:152
 #, python-format
 msgid "Unknown start mode '%s"
-msgstr ""
+msgstr "Mode de démarrage inconnu « %s »"
 
 #: virtinst/Interface.py:155
 msgid "When the interface will be auto-started."
-msgstr ""
+msgstr "Quand l'interface démarrera automatiquement."
 
 #: virtinst/Interface.py:162
 msgid "Network protocol configuration"
-msgstr ""
+msgstr "Configuration du protocole réseau"
 
 #: virtinst/Interface.py:181
 #, python-format
 msgid "Name '%s' already in use by another interface."
-msgstr ""
+msgstr "Le nom « %s » est déjà utilisé par une autre interface."
 
 #: virtinst/Interface.py:242
 #, python-format
 msgid "Could not define interface: %s"
-msgstr ""
+msgstr "Impossible de définir l'interface : %s"
 
 #: virtinst/Interface.py:249
 #, python-format
 msgid "Could not create interface: %s"
-msgstr ""
+msgstr "Impossible de créer l'interface : %s"
 
 #: virtinst/Interface.py:334
 msgid "Whether STP is enabled on the bridge"
-msgstr ""
+msgstr "Indique si STP est activé en mode pont"
 
 #: virtinst/Interface.py:341
 msgid "Delay in seconds before forwarding begins when joining a network."
 msgstr ""
+"Délai, en secondes, avant de commencer le transfert après avoir été connecté "
+"au réseau."
 
 #: virtinst/Interface.py:402
 msgid "Mode of operation of the bonding device"
-msgstr ""
+msgstr "Mode d'opération du périphérique de liaison"
 
 #: virtinst/Interface.py:413
 msgid "Availability monitoring mode for the bond device"
 msgstr ""
+"Disponibilité du mode de surveillance pour le périphérique de liaison"
 
 #: virtinst/Interface.py:422
 msgid "ARP monitoring interval in milliseconds"
-msgstr ""
+msgstr "Intervalle de surveillance ARP en millisecondes"
 
 #: virtinst/Interface.py:429
 msgid "IP target used in ARP monitoring packets"
-msgstr ""
+msgstr "IP cible utilisée pour surveiller les paquets ARP"
 
 #: virtinst/Interface.py:437
 msgid "ARP monitor validation mode"
-msgstr ""
+msgstr "Mode de validation de la surveillance ARP"
 
 #: virtinst/Interface.py:445
 msgid "MII monitoring method."
-msgstr ""
+msgstr "Méthode de surveillance MII."
 
 #: virtinst/Interface.py:452
 msgid "MII monitoring interval in milliseconds"
-msgstr ""
+msgstr "Intervalle de surveillance MII en millisecondes"
 
 #: virtinst/Interface.py:459
 msgid ""
 "Time in milliseconds to wait before enabling a slave after link recovery "
 msgstr ""
+"Temps, en millisecondes, avant de démarrer un esclave après un retour du "
+"lien "
 
 #: virtinst/Interface.py:467
 msgid ""
 "Time in milliseconds to wait before disabling a slave after link failure"
 msgstr ""
+"Temps, en millisecondes, avant de désactiver un esclave après un échec de "
+"lien"
 
 #: virtinst/Interface.py:547
 msgid "VLAN device tag number"
-msgstr ""
+msgstr "Balise numérale de périphérique VLAN"
 
 #: virtinst/Interface.py:559
 msgid "Parent interface to create VLAN on"
-msgstr ""
+msgstr "Interface parent sur laquelle le VLAN est créé"
 
 #: virtinst/Interface.py:563
 msgid "Tag and parent interface are required."
-msgstr ""
+msgstr "Balise et interface parent sont requis."
 
 #: virtinst/Interface.py:637
 msgid "Whether to enable DHCP"
-msgstr ""
+msgstr "Indique s'il faut activer le DHCP"
 
 #: virtinst/Interface.py:650
 msgid "Network gateway address"
-msgstr ""
+msgstr "Adresse de passerelle réseau"
 
 #: virtinst/Interface.py:657
 msgid "Static IP addresses"
-msgstr ""
+msgstr "Adresses IP statiques"
 
 #: virtinst/Interface.py:698
 msgid "Whether to enable IPv6 autoconfiguration"
-msgstr ""
+msgstr "Indique s'il faut activer l'auto-configuration IPv6"
 
 #: virtinst/Interface.py:719
 msgid "IPv6 address prefix"
-msgstr ""
+msgstr "Préfixe d'adresse IPv6"
 
 #: virtinst/Interface.py:726
 msgid "IP address"
-msgstr ""
+msgstr "Adresse IP"
 
 #: virtinst/LiveCDInstaller.py:65
 msgid "CDROM media must be specified for the live CD installer."
-msgstr ""
+msgstr "Un média CDROM doit être défini pour une installation « live CD »."
 
 #: virtinst/NodeDeviceParser.py:121
 msgid "System"
-msgstr ""
+msgstr "Système"
 
 #: virtinst/NodeDeviceParser.py:154
 #, python-format
 msgid "Interface %s"
-msgstr ""
+msgstr "Interface %s"
 
 #: virtinst/NodeDeviceParser.py:429 virtinst/NodeDeviceParser.py:509
 msgid "Connection does not support host device enumeration."
-msgstr ""
+msgstr "La connexion ne supporte pas l'énumération du périphérique hôte."
 
 #: virtinst/NodeDeviceParser.py:514
 #, python-format
 msgid "Could not determine format of '%s'"
-msgstr ""
+msgstr "Impossible de déterminer le format de « %s »"
 
 #: virtinst/NodeDeviceParser.py:525
 #, python-format
 msgid "Did not find a matching node device for '%s'"
-msgstr ""
+msgstr "Le nœud du périphérique ne correspond pas à « %s »"
 
 #: virtinst/osdict.py:223
 #, python-format
 msgid "Invalid dictionary entry for device '%s %s'"
-msgstr ""
+msgstr "Entrée dans le dictionnaire invalide pour le périphérique « %s %s »"
 
-#: virtinst/OSDistro.py:110
+#: virtinst/OSDistro.py:112
 #, python-format
 msgid ""
 "Could not find an installable distribution at '%s'\n"
 "The location must be the root directory of an install tree."
 msgstr ""
+"Impossible de trouver une distribution installable à « %s »\n"
+"L'emplacement doit être le répertoire racine de l'arbre d'installation"
 
-#: virtinst/OSDistro.py:124
+#: virtinst/OSDistro.py:126
 msgid "Invalid install location: "
 msgstr "Emplacement d'installation invalide : "
 
-#: virtinst/OSDistro.py:272
+#: virtinst/OSDistro.py:274
 #, python-format
 msgid "Couldn't find %(type)s kernel for %(distro)s tree."
-msgstr ""
+msgstr "Impossible de trouver le noyau %(type)s pour l'arbre %(distro)s."
 
-#: virtinst/OSDistro.py:287
+#: virtinst/OSDistro.py:289
 #, python-format
 msgid "Could not find boot.iso in %s tree."
-msgstr ""
+msgstr "Impossible de trouver boot.iso dans l'arbre %s."
 
-#: virtinst/OSDistro.py:450
+#: virtinst/OSDistro.py:452
 #, python-format
 msgid "Could not find a kernel path for virt type '%s'"
-msgstr ""
+msgstr "Impossible de trouver un chemin noyau pour le type virt « %s »"
 
-#: virtinst/OSDistro.py:459
+#: virtinst/OSDistro.py:461
 msgid "Could not find a boot iso path for this tree."
 msgstr ""
+"Impossible de trouver le chemin de l'iso de démarrage pour cet arbre."
 
-#: virtinst/OSDistro.py:768
+#: virtinst/OSDistro.py:770
 msgid "Unable to determine kernel RPM path"
 msgstr "Impossible de déterminer le chemin d'accès au RPM du noyau"
 
-#: virtinst/OSDistro.py:770
+#: virtinst/OSDistro.py:772
 msgid "Unable to determine install-initrd RPM path"
 msgstr "Impossible de déterminer le chemin d'accès au RPM d'install-initrd"
 
-#: virtinst/OSDistro.py:781
+#: virtinst/OSDistro.py:783
 msgid "Building initrd"
 msgstr "Construction de initrd"
 
-#: virtinst/OSDistro.py:1143
+#: virtinst/OSDistro.py:1148
 #, python-format
 msgid "Solaris miniroot not found at %s"
-msgstr ""
+msgstr "Le « miniroot » Solaris n'a pas été trouvé à %s"
 
-#: virtinst/OSDistro.py:1181
+#: virtinst/OSDistro.py:1186
 #, python-format
 msgid "OpenSolaris PV kernel not found at %s"
-msgstr ""
+msgstr "Le noyau OpenSolaris PV n'a pas été trouvé à %s"
 
 #: virtinst/Storage.py:125
 #, python-format
 msgid "Unknown storage object type: %s"
-msgstr ""
+msgstr "Type d'objet de stockage inconnu : %s"
 
 #: virtinst/Storage.py:150
 msgid "Passed connection is not libvirt storage capable"
-msgstr ""
+msgstr "La connexion passée n'est pas un type de stockage libvirt utilisable"
 
 #: virtinst/Storage.py:160
 msgid "Storage object"
-msgstr ""
+msgstr "Objet de stockage"
 
 #: virtinst/Storage.py:165
 msgid "Name for the storage object."
-msgstr ""
+msgstr "Nom de l'objet de stockage."
 
 #: virtinst/Storage.py:172
 msgid "Permissions must be passed as a dict object"
-msgstr ""
+msgstr "Les permissions doivent être envoyées comme un objet dictionnaire"
 
 #: virtinst/Storage.py:175
 msgid "Permissions must contain 'mode', 'owner' and 'group' keys."
 msgstr ""
+"Les permissions doivent contenir les clés « mode », « propriétaire » et « "
+"groupe »."
 
 #: virtinst/Storage.py:182
 #, python-format
 msgid "'%s' is not an absolute path."
-msgstr ""
+msgstr "« %s » n'est pas un chemin absolu."
 
 #: virtinst/Storage.py:250
 msgid "Filesystem Directory"
-msgstr ""
+msgstr "Répertoire des fichiers système"
 
 #: virtinst/Storage.py:251
 msgid "Pre-Formatted Block Device"
-msgstr ""
+msgstr "Périphérique de bloc pré-formaté"
 
 #: virtinst/Storage.py:252
 msgid "Network Exported Directory"
-msgstr ""
+msgstr "Répertoire réseau exporté"
 
 #: virtinst/Storage.py:253
 msgid "LVM Volume Group"
-msgstr ""
+msgstr "Volume de groupe LVM"
 
 #: virtinst/Storage.py:254
 msgid "Physical Disk Device"
-msgstr ""
+msgstr "Périphérique de disque physique"
 
 #: virtinst/Storage.py:255
 msgid "iSCSI Target"
-msgstr ""
+msgstr "Cible iSCSI"
 
 #: virtinst/Storage.py:256
 msgid "SCSI Host Adapter"
-msgstr ""
+msgstr "Adaptateur hôte SCSI"
 
 #: virtinst/Storage.py:257
 msgid "Multipath Device Enumerator"
-msgstr ""
+msgstr "Périphérique énumérateur multi-chemin"
 
 #: virtinst/Storage.py:267 virtinst/Storage.py:355
 #, python-format
 msgid "Unknown storage pool type: %s"
-msgstr ""
+msgstr "Type d'ensemble de stockage inconnu : %s"
 
 #: virtinst/Storage.py:379
 msgid "Storage device type the pool will represent."
-msgstr ""
+msgstr "Type de périphérique de stockage représenté par l'ensemble."
 
 #: virtinst/Storage.py:398
 msgid "Host name must be a string"
-msgstr ""
+msgstr "Le nom d'hôte doit être une chaîne de caractères."
 
 #: virtinst/Storage.py:417
 #, python-format
 msgid "Name '%s' already in use by another pool."
-msgstr ""
+msgstr "Le nom « %s » est déjà utilisé par un autre ensemble."
 
 #: virtinst/Storage.py:455
 #, python-format
 msgid "Could not define storage pool: %s"
-msgstr ""
+msgstr "Impossible de définir l'ensemble de stockage : %s"
 
 #: virtinst/Storage.py:465
 #, python-format
 msgid "Could not build storage pool: %s"
-msgstr ""
+msgstr "Impossible de construire l'ensemble de stockage : %s"
 
 #: virtinst/Storage.py:474
 #, python-format
 msgid "Could not start storage pool: %s"
-msgstr ""
+msgstr "Impossible de démarrer l'ensemble de stockage : %s"
 
 #: virtinst/Storage.py:480
 #, python-format
 msgid "Could not set pool autostart flag: %s"
 msgstr ""
+"Impossible de définir l'ensemble des drapeaux de démarrage automatique : %s"
 
 #: virtinst/Storage.py:507
 msgid "Directory to use for the storage pool."
-msgstr ""
+msgstr "Répertoire à utiliser pour l'ensemble de stockage."
 
 #: virtinst/Storage.py:543
 msgid "The existing device to mount for the pool."
-msgstr ""
+msgstr "Le périphérique existant à monter pour l'ensemble."
 
 #: virtinst/Storage.py:546 virtinst/Storage.py:604
 msgid "Location to mount the source device."
-msgstr ""
+msgstr "Emplacement où monter le périphérique source."
 
 #: virtinst/Storage.py:564
 #, python-format
 msgid "Unknown Filesystem format: %s"
-msgstr ""
+msgstr "Format de fichier système inconnu : %s"
 
 #: virtinst/Storage.py:567
 msgid "Filesystem type of the source device."
-msgstr ""
+msgstr "Type des fichiers système pour le périphérique source."
 
 #: virtinst/Storage.py:580
 msgid "Device path is required"
-msgstr ""
+msgstr "Le chemin du périphérique est nécessaire"
 
 #: virtinst/Storage.py:599 virtinst/Storage.py:843
 msgid "Path on the host that is being shared."
-msgstr ""
+msgstr "Chemin de l'hôte qui est partagé."
 
 #: virtinst/Storage.py:601 virtinst/Storage.py:814
 msgid "Name of the host sharing the storage."
-msgstr ""
+msgstr "Nom de l'hôte partageant le stockage."
 
 #: virtinst/Storage.py:622
 #, python-format
 msgid "Unknown Network Filesystem format: %s"
-msgstr ""
+msgstr "Format de fichier système réseau inconnu : %s"
 
 #: virtinst/Storage.py:625
 msgid "Type of network filesystem."
-msgstr ""
+msgstr "Type des fichiers système réseau."
 
 #: virtinst/Storage.py:637 virtinst/Storage.py:861
 msgid "Hostname is required"
-msgstr ""
+msgstr "Le nom d'hôte est nécessaire"
 
 #: virtinst/Storage.py:639 virtinst/Storage.py:791 virtinst/Storage.py:863
 msgid "Host path is required"
-msgstr ""
+msgstr "Le chemin d'hôte est nécessaire"
 
 #: virtinst/Storage.py:657
 msgid "Location of the existing LVM volume group."
-msgstr ""
+msgstr "Emplacement du volume de groupe LVM existant."
 
 #: virtinst/Storage.py:687
 msgid "Optional device(s) to build new LVM volume on."
 msgstr ""
+"Périphérique optionnel sur lequel le nouveau volume LVM est construit."
 
 #: virtinst/Storage.py:710
 msgid "Name of the Volume Group"
-msgstr ""
+msgstr "Nom du volume de groupe"
 
 #: virtinst/Storage.py:741
 msgid "Must explicitly specify source path if building pool"
 msgstr ""
+"Le chemin source doit être spécifié explicitement en construisant l'ensemble"
 
 #: virtinst/Storage.py:757
 msgid "Path to the existing disk device."
-msgstr ""
+msgstr "Chemin vers le périphérique de disque existant."
 
 #: virtinst/Storage.py:760 virtinst/Storage.py:817 virtinst/Storage.py:884
 #: virtinst/Storage.py:928
 msgid "Root location for identifying new storage volumes."
-msgstr ""
+msgstr "Emplacement racine pour trouver les nouveaux volumes de stockage."
 
 #: virtinst/Storage.py:777
 #, python-format
 msgid "Unknown Disk format: %s"
-msgstr ""
+msgstr "Format de disque inconnu : %s"
 
 #: virtinst/Storage.py:780
 msgid "Format of the source device's partition table."
-msgstr ""
+msgstr "Format de la table de partition du périphérique source."
 
 #: virtinst/Storage.py:803
 msgid "Must explicitly specify disk format if formatting disk device."
 msgstr ""
+"Le format de disque doit être spécifié explicitement en formatant le "
+"périphérique de disque."
 
 #: virtinst/Storage.py:821
 msgid "iSCSI volume creation is not supported."
-msgstr ""
+msgstr "La création de volume iSCSI n'est pas supportée."
 
 #: virtinst/Storage.py:850
 msgid "iSCSI initiator qualified name"
-msgstr ""
+msgstr "Initialisation d'un nom qualifié iSCSI"
 
 #: virtinst/Storage.py:888
 msgid "SCSI volume creation is not supported."
-msgstr ""
+msgstr "La création de volume SCSI n'est pas supportée."
 
 #: virtinst/Storage.py:906
 msgid "Name of the scsi adapter (ex. host2)"
-msgstr ""
+msgstr "Nom de l'adaptateur scsi (ex : host2)"
 
 #: virtinst/Storage.py:917
 msgid "Adapter name is required"
-msgstr ""
+msgstr "Un nom pour l'adaptateur est requis"
 
 #: virtinst/Storage.py:932
 msgid "Multipath volume creation is not supported."
-msgstr ""
+msgstr "La création de volume multi-chemin n'est pas supportée."
 
 #: virtinst/Storage.py:976
 msgid "One of pool or pool_name must be specified."
-msgstr ""
+msgstr "Un ensemble ou un « pool_name » doit être spécifié."
 
 #: virtinst/Storage.py:979 virtinst/Storage.py:1051
 msgid "'conn' must be specified with 'pool_name'"
-msgstr ""
+msgstr "« conn » doit être spécifié avec « pool_name »"
 
 #: virtinst/Storage.py:1047
 msgid "Must specify pool_object or pool_name"
-msgstr ""
+msgstr "Vous devez définir pool_object ou pool_name"
 
 #: virtinst/Storage.py:1053
 msgid "Connection does not support storage management."
-msgstr ""
+msgstr "La connexion ne supporte pas la gestion du stockage."
 
 #: virtinst/Storage.py:1058
 #, python-format
 msgid "Couldn't find storage pool '%s': %s"
-msgstr ""
+msgstr "Impossible de trouver l'ensemble de stockage « %s » : %s"
 
 #: virtinst/Storage.py:1062
 msgid "pool_object must be a virStoragePool"
-msgstr ""
+msgstr "pool_object doit être un virStoragePool"
 
 #: virtinst/Storage.py:1076
 msgid "Capacity must be a positive number"
-msgstr ""
+msgstr "La capacité doit être un nombre entier positif"
 
 #: virtinst/Storage.py:1097
 msgid "Allocation must be a non-negative number"
-msgstr ""
+msgstr "L'allocation doit être un nombre non négatif"
 
 #: virtinst/Storage.py:1117
 msgid "'pool' must be a virStoragePool instance."
-msgstr ""
+msgstr "« pool » doit être une instance virStoragePool."
 
 #: virtinst/Storage.py:1119
 #, python-format
 msgid "pool '%s' must be active."
-msgstr ""
+msgstr "l'ensemble « %s » doit être actif."
 
 #: virtinst/Storage.py:1131 virtinst/Storage.py:1372
 msgid "input_vol must be a virStorageVol"
-msgstr ""
+msgstr "input_vol doit être un virStoragePool"
 
 #: virtinst/Storage.py:1133
 msgid ""
 "Creating storage from an existing volume is not supported by this libvirt "
 "version."
 msgstr ""
+"La création d'un stockage à partir d'un volume existant n'est pas disponible "
+"dans cette version de libvirt."
 
 #: virtinst/Storage.py:1137
 msgid "virStorageVolume pointer to clone/use as input."
-msgstr ""
+msgstr "Pointeur virStorageVolume pour cloner/utiliser comme entrée."
 
 #: virtinst/Storage.py:1145
 #, python-format
 msgid "'%s' is not a valid format."
-msgstr ""
+msgstr "« %s » n'est pas un format valide."
 
 #: virtinst/Storage.py:1155
 #, python-format
 msgid "Name '%s' already in use by another volume."
-msgstr ""
+msgstr "Le nom « %s » est utilisé par un autre volume."
 
 #: virtinst/Storage.py:1208
 #, python-format
 msgid "Allocating '%s'"
-msgstr ""
+msgstr "Allocation de « %s »"
 
 #: virtinst/Storage.py:1273
 #, python-format
@@ -1229,6 +1321,8 @@
 "There is not enough free space on the storage pool to create the volume. (%d "
 "M requested allocation > %d M available)"
 msgstr ""
+"Il n'y a pas assez d'espace libre sur l'ensemble de stockage pour créer le "
+"volume (l'allocation requiert %d M > %d M disponible)."
 
 #: virtinst/Storage.py:1279
 #, python-format
@@ -1236,16 +1330,18 @@
 "The requested volume capacity will exceed the available pool space when the "
 "volume is fully allocated. (%d M requested capacity > %d M available)"
 msgstr ""
+"La capacité requise pour le volume dépassera l'espace libre quand le volume "
+"sera plein (l'allocation requiert %d M > %d M disponible)."
 
-#: virtinst/support.py:411 virtinst/XMLBuilderDomain.py:408
+#: virtinst/support.py:414 virtinst/XMLBuilderDomain.py:422
 msgid "'conn' must be a virConnect instance."
-msgstr ""
+msgstr "« conn » doit être une instance virConnect."
 
-#: virtinst/_util.py:136
+#: virtinst/_util.py:135
 msgid "UUID must be a string."
 msgstr "UUID doit être une chaîne de caractères."
 
-#: virtinst/_util.py:144
+#: virtinst/_util.py:143
 msgid ""
 "UUID must be a 32-digit hexadecimal number. It may take the form XXXXXXXX-"
 "XXXX-XXXX-XXXX-XXXXXXXXXXXX or may omit hyphens altogether."
@@ -1253,35 +1349,37 @@
 "L'UUID doit être un nombre hexadécimal sur 32 bits. Il peut prendre la forme "
 "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX avec ou sans traits d'union."
 
-#: virtinst/_util.py:155
+#: virtinst/_util.py:154
 #, python-format
 msgid "%s name must be a string"
-msgstr ""
+msgstr "Le nom %s doit être une chaîne de caractères"
 
-#: virtinst/_util.py:159
+#: virtinst/_util.py:158
 #, python-format
 msgid "%s name must be less than 50 characters"
-msgstr ""
+msgstr "Le nom %s doit avoir moins de 50 caractères"
 
-#: virtinst/_util.py:162
+#: virtinst/_util.py:161
 #, python-format
 msgid "%s name can not be only numeric characters"
-msgstr ""
+msgstr "Le nom %s ne peut être constitué seulement de chiffres"
 
-#: virtinst/_util.py:165
+#: virtinst/_util.py:164
 #, python-format
 msgid "%s name can only contain alphanumeric, '_', '.', or '-' characters"
 msgstr ""
+"Le nom %s ne peut contenir que des caractères alphanumériques, « _ », « . » "
+"ou « - »"
 
-#: virtinst/_util.py:173
+#: virtinst/_util.py:172
 msgid "MAC address must be a string."
-msgstr ""
+msgstr "L'adresse MAC doit être une chaîne de caractères."
 
-#: virtinst/_util.py:177
+#: virtinst/_util.py:176
 msgid "MAC address must be of the format AA:BB:CC:DD:EE:FF"
 msgstr "L'adresse MAC doit être au format AA:BB:CC:DD:EE:FF"
 
-#: virtinst/_util.py:309
+#: virtinst/_util.py:291
 msgid "Name generation range exceeded."
 msgstr ""
 
@@ -1295,396 +1393,426 @@
 msgid "Defaulting bridge to xenbr%d"
 msgstr "Pont fixé par défaut à xenbr%d"
 
-#: virtinst/util.py:511 virtconv/parsers/ovf.py:160
+#: virtinst/util.py:514 virtconv/parsers/ovf.py:160
 msgid "'path' or 'func' is required."
-msgstr ""
+msgstr "« path » ou « func » sont requis."
 
 #: virtinst/VirtualAudio.py:48 virtinst/VirtualWatchdog.py:75
 #, python-format
 msgid "'model' must be a string,  was '%s'."
-msgstr ""
+msgstr "« model » doit être une chaînes de caractères. Elle valait « %s »."
 
 #: virtinst/VirtualAudio.py:51
 #, python-format
 msgid "Unsupported sound model '%s'"
-msgstr ""
+msgstr "Modèle de son non supporté « %s »"
 
 #: virtinst/VirtualCharDevice.py:93
 msgid "Pseudo TTY"
-msgstr ""
+msgstr "Pseudo TTY"
 
 #: virtinst/VirtualCharDevice.py:95
 msgid "Physical host character device"
-msgstr ""
+msgstr "Périphérique hôte de caractères physique"
 
 #: virtinst/VirtualCharDevice.py:97
 msgid "Standard input/output"
-msgstr ""
+msgstr "Entrée/sortie standard"
 
 #: virtinst/VirtualCharDevice.py:99
 msgid "Named pipe"
-msgstr ""
+msgstr "Tube nommé"
 
 #: virtinst/VirtualCharDevice.py:101
 msgid "Output to a file"
-msgstr ""
+msgstr "Sortie vers un fichier"
 
 #: virtinst/VirtualCharDevice.py:103
 msgid "Virtual console"
-msgstr ""
+msgstr "Console virtuelle"
 
 #: virtinst/VirtualCharDevice.py:105
 msgid "Null device"
-msgstr ""
+msgstr "Périphérique vide"
 
 #: virtinst/VirtualCharDevice.py:107
 msgid "TCP net console"
-msgstr ""
+msgstr "Console réseau TCP"
 
 #: virtinst/VirtualCharDevice.py:109
 msgid "UDP net console"
-msgstr ""
+msgstr "Console réseau UDP"
 
 #: virtinst/VirtualCharDevice.py:111
 msgid "Unix socket"
-msgstr ""
+msgstr "Socket Unix"
 
 #: virtinst/VirtualCharDevice.py:113
 msgid "Spice agent"
-msgstr ""
+msgstr "Agent « spice »"
 
 #: virtinst/VirtualCharDevice.py:125
-msgid "Client mode."
+msgid "Client mode"
 msgstr ""
 
 #: virtinst/VirtualCharDevice.py:127
-msgid "Server mode."
+msgid "Server mode"
 msgstr ""
 
 #: virtinst/VirtualCharDevice.py:169
 #, python-format
 msgid "Unknown character device type '%s'."
-msgstr ""
+msgstr "Type de périphérique de caractères inconnu « %s »."
 
 #: virtinst/VirtualCharDevice.py:181 virtinst/VirtualCharDevice.py:248
 #, python-format
 msgid "Unknown character device type '%s'"
-msgstr ""
+msgstr "Type de périphérique de caractères inconnu « %s »."
 
 #: virtinst/VirtualCharDevice.py:252
 msgid "Method used to expose character device in the host."
 msgstr ""
+"Méthode utilisée pour exposer le périphérique de caractères à l'hôte."
 
 #: virtinst/VirtualCharDevice.py:270
 #, python-format
 msgid "Unknown character mode '%s'."
-msgstr ""
+msgstr "Mode de caractère inconnu « %s »."
 
 #: virtinst/VirtualCharDevice.py:318
 #, python-format
 msgid "Unknown protocol '%s'."
-msgstr ""
+msgstr "Protocole inconnu « %s »."
 
 #: virtinst/VirtualCharDevice.py:328
 #, python-format
 msgid "Unknown target type '%s'. Must be in: "
-msgstr ""
+msgstr "Type cible inconnue « %s ». Doit être parmi : "
 
 #: virtinst/VirtualCharDevice.py:332 virtinst/VirtualCharDevice.py:367
 msgid "Channel type as exposed in the guest."
-msgstr ""
+msgstr "Type de canal comme défini pour l'hôte."
 
 #: virtinst/VirtualCharDevice.py:340
 msgid "Guest forward channel address in the guest."
-msgstr ""
+msgstr "Adresse du canal de retour invité pour l'invité."
 
 #: virtinst/VirtualCharDevice.py:348
 msgid "Guest forward channel port in the guest."
-msgstr ""
+msgstr "Port du canal de retour invité pour l'invité."
 
 #: virtinst/VirtualCharDevice.py:356
 msgid "Sysfs name of virtio port in the guest"
-msgstr ""
+msgstr "Nom sysfs du port virtio pour l'invité"
 
 #: virtinst/VirtualCharDevice.py:363
 #, python-format
 msgid "Unknown address type '%s'. Must be in: "
-msgstr ""
+msgstr "Type d'adresse inconnue « %s ». Doit être parmi : "
 
 #: virtinst/VirtualCharDevice.py:386
 #, python-format
 msgid "A source path is required for character device type '%s'"
 msgstr ""
+"Un chemin source est requis pour le type de périphérique de caractères « %s »"
 
 #: virtinst/VirtualCharDevice.py:503
 msgid "Host character device to attach to guest."
-msgstr ""
+msgstr "Périphérique de caractères de l'hôte à attacher à l'invité."
 
 #: virtinst/VirtualCharDevice.py:509
 msgid "Named pipe to use for input and output."
-msgstr ""
+msgstr "Tube nommé à utiliser pour l'entrée et la sortie."
 
 #: virtinst/VirtualCharDevice.py:515
 msgid "File path to record device output."
-msgstr ""
+msgstr "Chemin du fichier pour enregistrer le périphérique de sortie."
 
 #: virtinst/VirtualCharDevice.py:523 virtinst/VirtualCharDevice.py:533
 msgid "Target connect/listen mode."
-msgstr ""
+msgstr "Mode de connexion/écoute pour la cible."
 
 #: virtinst/VirtualCharDevice.py:526
 msgid "Unix socket path."
-msgstr ""
+msgstr "Chemin du socket Unix."
 
 #: virtinst/VirtualCharDevice.py:536
 msgid "Address to connect/listen to."
-msgstr ""
+msgstr "Adresse ou se connecter/écouter."
 
 #: virtinst/VirtualCharDevice.py:539
 msgid "Port on target host to connect/listen to."
-msgstr ""
+msgstr "Port sur l'hôte cible ou se connecter/écouter."
 
 #: virtinst/VirtualCharDevice.py:542
 msgid "Format used when sending data."
-msgstr ""
+msgstr "Format utilisé pour envoyer les données."
 
 #: virtinst/VirtualCharDevice.py:546
 msgid "A host and port must be specified."
-msgstr ""
+msgstr "Un hôte et port doit être défini."
 
 #: virtinst/VirtualCharDevice.py:558
 msgid "Host address to bind to."
-msgstr ""
+msgstr "Adresse de l'hôte où se lier."
 
 #: virtinst/VirtualCharDevice.py:561
 msgid "Host port to bind to."
-msgstr ""
+msgstr "Port de l'hôte où se lier."
 
 #: virtinst/VirtualCharDevice.py:564
 msgid "Host address to send output to."
-msgstr ""
+msgstr "Adresse de l'hôte où envoyer la sortie."
 
 #: virtinst/VirtualCharDevice.py:567
 msgid "Host port to send output to."
-msgstr ""
+msgstr "Port de l'hôte où envoyer la sortie."
 
 #: virtinst/VirtualCharDevice.py:572
 msgid "A connection port must be specified."
-msgstr ""
+msgstr "Un port de connexion doit être défini."
 
-#: virtinst/VirtualDevice.py:87
+#: virtinst/VirtualDevice.py:90
 msgid "Virtual device type must be set in subclass."
 msgstr ""
+"Le type du périphérique virtuel doit être défini dans la sous-classe."
 
-#: virtinst/VirtualDevice.py:90
+#: virtinst/VirtualDevice.py:93
 #, python-format
 msgid "Unknown virtual device type '%s'."
+msgstr "Type de périphérique virtuel inconnu « %s »."
+
+#: virtinst/VirtualDevice.py:189 virtinst/VirtualRedirDevice.py:106
+#, python-format
+msgid "Could not determine or unsupported format of '%s'"
 msgstr ""
 
-#: virtinst/VirtualDisk.py:215
+#: virtinst/VirtualDisk.py:218
 #, python-format
 msgid ""
 "Cannot use storage '%(path)s': '%(rootdir)s' is not managed on the remote "
 "host."
 msgstr ""
+"Le stockage « %(path)s » ne peut pas être utilisé : « %(rootdir)s » n'est "
+"pas géré par l'hôte distant."
 
-#: virtinst/VirtualDisk.py:220
+#: virtinst/VirtualDisk.py:223
 #, python-format
 msgid "Cannot use storage %(path)s: %(err)s"
-msgstr ""
+msgstr "Le stockage %(path)s ne peut pas être utilisé : %(err)s"
 
-#: virtinst/VirtualDisk.py:231
+#: virtinst/VirtualDisk.py:234
 #, python-format
 msgid "Size must be specified for non existent volume path '%s'"
 msgstr ""
 
-#: virtinst/VirtualDisk.py:523
-msgid "volName must be a tuple of the form ('poolname', 'volname')"
+#: virtinst/VirtualDisk.py:441
+#, python-format
+msgid "Permissions on '%s' did not stick"
 msgstr ""
 
-#: virtinst/VirtualDisk.py:527
+#: virtinst/VirtualDisk.py:534
+msgid "volName must be a tuple of the form ('poolname', 'volname')"
+msgstr "volName doit être un tuple de la forme ('poolname', 'volname')"
+
+#: virtinst/VirtualDisk.py:538
 msgid "'volName' requires a passed connection."
-msgstr ""
+msgstr "« volName » a besoin d'une connexion établie."
 
-#: virtinst/VirtualDisk.py:529
+#: virtinst/VirtualDisk.py:540
 msgid "Connection does not support storage lookup."
-msgstr ""
+msgstr "La connexion ne supporte pas la recherche de stockage."
 
-#: virtinst/VirtualDisk.py:535
+#: virtinst/VirtualDisk.py:546
 #, python-format
 msgid "Couldn't lookup volume object: %s"
-msgstr ""
+msgstr "Impossible de chercher l'objet volume : %s"
 
-#: virtinst/VirtualDisk.py:692
+#: virtinst/VirtualDisk.py:703
 msgid "vol_object must be a virStorageVol instance"
-msgstr ""
+msgstr "vol_object doit être une instance virStorageVol"
 
-#: virtinst/VirtualDisk.py:703
+#: virtinst/VirtualDisk.py:714
 msgid "vol_install must be a StorageVolume  instance."
-msgstr ""
+msgstr "vol_install doit être une instance StorageVolume"
 
-#: virtinst/VirtualDisk.py:730
+#: virtinst/VirtualDisk.py:741
 #, python-format
 msgid "Error validating clone path: %s"
-msgstr ""
+msgstr "Erreur en validant le chemin du clone : %s"
 
-#: virtinst/VirtualDisk.py:746
+#: virtinst/VirtualDisk.py:757
 msgid "'size' must be a number greater than 0."
-msgstr ""
+msgstr "« size » doit être un nombre supérieur à 0."
 
-#: virtinst/VirtualDisk.py:759
+#: virtinst/VirtualDisk.py:770
 #, python-format
 msgid "Unknown storage type '%s'"
-msgstr ""
+msgstr "Type de stockage inconnu « %s »"
 
-#: virtinst/VirtualDisk.py:769
+#: virtinst/VirtualDisk.py:780
 #, python-format
 msgid "Unknown device type '%s'"
-msgstr ""
+msgstr "Type de périphérique inconnu « %s »"
 
-#: virtinst/VirtualDisk.py:850
+#: virtinst/VirtualDisk.py:861
 #, python-format
 msgid "Unknown cache mode '%s'"
-msgstr ""
+msgstr "Mode de cache inconnu « %s »"
 
-#: virtinst/VirtualDisk.py:863
+#: virtinst/VirtualDisk.py:874
 #, python-format
 msgid "Unknown io mode '%s'"
-msgstr ""
+msgstr "Mode d'« io  » inconnu « %s »"
 
-#: virtinst/VirtualDisk.py:875
+#: virtinst/VirtualDisk.py:886
 #, python-format
 msgid "Unknown error policy '%s'"
-msgstr ""
+msgstr "Politique d'erreur inconnue « %s »"
 
-#: virtinst/VirtualDisk.py:914
+#: virtinst/VirtualDisk.py:925
 #, python-format
 msgid "SELinux label '%s' is not valid."
-msgstr ""
+msgstr "Marqueur SELinux « %s » invalide."
 
-#: virtinst/VirtualDisk.py:994
+#: virtinst/VirtualDisk.py:1008
 msgid "Storage type does not support format parameter."
 msgstr ""
 
-#: virtinst/VirtualDisk.py:1000
+#: virtinst/VirtualDisk.py:1014
 msgid "Format cannot be specified for unmanaged storage."
-msgstr ""
+msgstr "Le format ne peut pas être défini pour un stockage non géré."
 
-#: virtinst/VirtualDisk.py:1183
+#: virtinst/VirtualDisk.py:1212
 #, python-format
 msgid "Device type '%s' requires a path"
-msgstr ""
+msgstr "Le type de périphérique « %s » nécessite un chemin"
 
-#: virtinst/VirtualDisk.py:1193
+#: virtinst/VirtualDisk.py:1222
 msgid "Connection doesn't support remote storage."
-msgstr ""
+msgstr "La connexion ne supporte pas un stockage distant."
 
-#: virtinst/VirtualDisk.py:1196
+#: virtinst/VirtualDisk.py:1225
 msgid "Must specify libvirt managed storage if on a remote connection"
 msgstr ""
+"Vous devez définir la gestion du stockage par libvirt dans le cas d'une "
+"connexion distante"
 
-#: virtinst/VirtualDisk.py:1215
+#: virtinst/VirtualDisk.py:1244
 #, python-format
 msgid "The path '%s' must be a file or a device, not a directory"
 msgstr ""
+"Le chemin « %s » doit être un fichier ou un périphérique, pas un répertoire"
 
-#: virtinst/VirtualDisk.py:1223
+#: virtinst/VirtualDisk.py:1252
 #, python-format
 msgid "Cannot create storage for %s device."
-msgstr ""
+msgstr "Impossible de créer le stockage pour le périphérique %s."
 
-#: virtinst/VirtualDisk.py:1228
+#: virtinst/VirtualDisk.py:1257
 #, python-format
 msgid "Local block device path '%s' must exist."
-msgstr ""
+msgstr "Le chemin du périphérique de bloc local  « %s » doit exister."
 
-#: virtinst/VirtualDisk.py:1236
+#: virtinst/VirtualDisk.py:1265
 #, python-format
 msgid "size is required for non-existent disk '%s'"
-msgstr ""
+msgstr "la taille est nécessaire pour un disque inexistant « %s »"
 
-#: virtinst/VirtualDisk.py:1239
+#: virtinst/VirtualDisk.py:1268
 #, python-format
 msgid "No write access to directory '%s'"
-msgstr ""
+msgstr "Pas de droit en écriture sur le dossier « %s »"
 
-#: virtinst/VirtualDisk.py:1261
+#: virtinst/VirtualDisk.py:1290
 #, python-format
 msgid "Cloning %(srcfile)s"
-msgstr ""
+msgstr "Copie de %(srcfile)s"
 
-#: virtinst/VirtualDisk.py:1264
+#: virtinst/VirtualDisk.py:1293
 #, python-format
 msgid "Creating storage file %s"
-msgstr ""
+msgstr "Création du fichier de stockage %s"
 
-#: virtinst/VirtualDisk.py:1277
+#: virtinst/VirtualDisk.py:1306
 msgid "copying to an existing vdisk is not supported"
-msgstr ""
+msgstr "la copie vers un vdisk existant n'est pas supporté"
 
-#: virtinst/VirtualDisk.py:1280
+#: virtinst/VirtualDisk.py:1309
 msgid "failed to clone disk"
-msgstr ""
+msgstr "le clonage du disque a échoué"
 
-#: virtinst/VirtualDisk.py:1291
+#: virtinst/VirtualDisk.py:1320
 #, python-format
 msgid "Error creating vdisk %s"
-msgstr ""
+msgstr "Erreur à la création du vdisk %s"
 
-#: virtinst/VirtualDisk.py:1326
+#: virtinst/VirtualDisk.py:1355
 #, python-format
 msgid "Error creating diskimage %s: %s"
-msgstr ""
+msgstr "Erreur à la création de l'image disque %s : %s"
 
-#: virtinst/VirtualDisk.py:1381
+#: virtinst/VirtualDisk.py:1410
 #, python-format
 msgid "Error cloning diskimage %s to %s: %s"
-msgstr ""
+msgstr "Erreur au clonage de l'image disque %s vers %s : %s"
 
-#: virtinst/VirtualDisk.py:1437
+#: virtinst/VirtualDisk.py:1466
 msgid "'disknode' or self.target must be set!"
-msgstr ""
+msgstr "« disknode » ou self.target doit être défini !"
 
-#: virtinst/VirtualDisk.py:1535
+#: virtinst/VirtualDisk.py:1564
 msgid ""
 "The filesystem will not have enough free space to fully allocate the sparse "
 "file when the guest is running."
 msgstr ""
+"Le système de fichiers n'aura pas assez d'espace disque pour allouer "
+"totalement les fichiers dispersés quand l'invité fonctionnera."
 
-#: virtinst/VirtualDisk.py:1540
+#: virtinst/VirtualDisk.py:1569
 msgid "There is not enough free space to create the disk."
-msgstr ""
+msgstr "Il n'y a pas assez d'espace disque libre pour créer le disque."
 
-#: virtinst/VirtualDisk.py:1544
+#: virtinst/VirtualDisk.py:1573
 #, python-format
 msgid " %d M requested > %d M available"
 msgstr ""
 
-#: virtinst/VirtualDisk.py:1698
+#: virtinst/VirtualDisk.py:1727
 msgid "Cannot determine device bus/type."
 msgstr ""
 
-#: virtinst/VirtualDisk.py:1720
+#: virtinst/VirtualDisk.py:1772
 #, python-format
 msgid "No more space for disks of type '%s'"
 msgstr ""
 
-#: virtinst/VirtualFilesystem.py:82
+#: virtinst/VirtualFilesystem.py:96
 #, python-format
 msgid "Unsupported filesystem type '%s'"
 msgstr ""
 
-#: virtinst/VirtualFilesystem.py:90
+#: virtinst/VirtualFilesystem.py:104
 #, python-format
 msgid "Unsupported filesystem mode '%s'"
 msgstr ""
 
-#: virtinst/VirtualFilesystem.py:120
+#: virtinst/VirtualFilesystem.py:112
+#, python-format
+msgid "Unsupported filesystem write policy '%s'"
+msgstr ""
+
+#: virtinst/VirtualFilesystem.py:127
+#, python-format
+msgid "Unsupported filesystem driver '%s'"
+msgstr ""
+
+#: virtinst/VirtualFilesystem.py:166
 #, python-format
 msgid "Filesystem target '%s' must be an absolute path"
 msgstr ""
 
-#: virtinst/VirtualFilesystem.py:139
+#: virtinst/VirtualFilesystem.py:193
 msgid "A filesystem source and target must be specified"
 msgstr ""
 
@@ -1721,36 +1849,31 @@
 msgid "Unknown graphics type"
 msgstr "Type de graphique inconnu"
 
-#: virtinst/VirtualHostDevice.py:49
+#: virtinst/VirtualHostDevice.py:47
 msgid "'name' or 'nodedev' required."
 msgstr ""
 
-#: virtinst/VirtualHostDevice.py:68
+#: virtinst/VirtualHostDevice.py:66
 #, python-format
 msgid "Node device type '%s' cannot be attached to  guest."
 msgstr ""
 
-#: virtinst/VirtualHostDevice.py:215
+#: virtinst/VirtualHostDevice.py:213
 msgid "'nodedev' must be a USBDevice instance."
 msgstr ""
 
-#: virtinst/VirtualHostDevice.py:231
+#: virtinst/VirtualHostDevice.py:229
 msgid "'vendor' and 'product', or 'bus' and  'device' are required."
 msgstr ""
 
-#: virtinst/VirtualHostDevice.py:264
+#: virtinst/VirtualHostDevice.py:250
 msgid "'nodedev' must be a PCIDevice instance."
 msgstr ""
 
-#: virtinst/VirtualHostDevice.py:273
+#: virtinst/VirtualHostDevice.py:259
 msgid "'domain', 'bus', 'slot', and 'function' must be specified."
 msgstr ""
 
-#: virtinst/VirtualHostDevice.py:310
-#, python-format
-msgid "Could not detach PCI device: %s"
-msgstr ""
-
 #: virtinst/VirtualInputDevice.py:66
 #, python-format
 msgid "Unknown input type '%s'."
@@ -1809,6 +1932,20 @@
 "machine."
 msgstr ""
 
+#: virtinst/VirtualRedirDevice.py:67
+#, python-format
+msgid "Unsupported bus '%s'"
+msgstr ""
+
+#: virtinst/VirtualRedirDevice.py:80
+#, python-format
+msgid "Unsupported redirection type '%s'"
+msgstr ""
+
+#: virtinst/VirtualRedirDevice.py:89
+msgid "Invalid host value"
+msgstr ""
+
 #: virtinst/VirtualSmartCardDevice.py:58
 #, python-format
 msgid "Unknown smartcard mode '%s'"
@@ -1848,12 +1985,12 @@
 msgid "Unsupported watchdog model '%s'"
 msgstr ""
 
-#: virtinst/XMLBuilderDomain.py:435
+#: virtinst/XMLBuilderDomain.py:449
 #, python-format
 msgid "'%s' must be True or False"
 msgstr ""
 
-#: virtinst/XMLBuilderDomain.py:439
+#: virtinst/XMLBuilderDomain.py:453
 #, python-format
 msgid "'%s' must be a string, not '%s'."
 msgstr ""
@@ -1971,7 +2108,7 @@
 msgid "What would you like to use as the cloned disk (file path) for '%s'?"
 msgstr ""
 
-#: virt-clone:132 virt-image:59 virt-install:798
+#: virt-clone:132 virt-image:59 virt-install:811
 msgid "General Options"
 msgstr ""
 
@@ -1998,7 +2135,7 @@
 msgstr ""
 "Nouvel UUID pour l'invité cloné ; par défaut, un UUID aléatoire est généré"
 
-#: virt-clone:148 virt-install:848
+#: virt-clone:148 virt-install:861
 msgid "Storage Configuration"
 msgstr ""
 
@@ -2034,7 +2171,7 @@
 "Nouvelle adresse MAC fixe pour l'invité cloné ; par défaut, une adresse "
 "aléatoire est générée"
 
-#: virt-clone:171 virt-image:91 virt-install:920
+#: virt-clone:171 virt-image:91 virt-install:933
 msgid "Miscellaneous Options"
 msgstr ""
 
@@ -2049,11 +2186,11 @@
 "new clone"
 msgstr ""
 
-#: virt-clone:179 virt-convert:85 virt-image:107 virt-install:947
+#: virt-clone:179 virt-convert:85 virt-image:107 virt-install:960
 msgid "Print debugging information"
 msgstr "Imprime des informations de débogage"
 
-#: virt-clone:182 virt-install:944
+#: virt-clone:182 virt-install:957
 msgid "Request user input for ambiguous situations or required options."
 msgstr ""
 
@@ -2063,11 +2200,11 @@
 "other prompts"
 msgstr ""
 
-#: virt-clone:189 virt-convert:83 virt-image:117 virt-install:941
+#: virt-clone:189 virt-convert:83 virt-image:117 virt-install:954
 msgid "Suppress non-error output"
 msgstr ""
 
-#: virt-clone:206 virt-install:966
+#: virt-clone:206 virt-install:979
 #, python-format
 msgid "Unknown argument '%s'"
 msgstr ""
@@ -2081,7 +2218,7 @@
 msgid "Clone '%s' created successfully."
 msgstr ""
 
-#: virt-clone:257 virt-image:211 virt-install:1000
+#: virt-clone:257 virt-image:211 virt-install:1013
 msgid "Installation aborted at user request"
 msgstr ""
 
@@ -2097,11 +2234,11 @@
 msgid "Output disk format"
 msgstr ""
 
-#: virt-convert:56 virt-install:893
+#: virt-convert:56 virt-install:906
 msgid "This guest should be a fully virtualized guest"
 msgstr "Cet invité devrait être complètement virtualisé"
 
-#: virt-convert:58 virt-install:895
+#: virt-convert:58 virt-install:908
 msgid "This guest should be a paravirtualized guest"
 msgstr "Cet invité devrait être paravirtualisé"
 
@@ -2124,7 +2261,7 @@
 "La variante de SE pour les invités complètement virtualisés, par exemple « "
 "fedora6 », « rhel5 x, « solaris10 », « win2k », « vista »"
 
-#: virt-convert:73 virt-install:910
+#: virt-convert:73 virt-install:923
 msgid ""
 "Disables APIC for fully virtualized guest (overrides value in os-type/os-"
 "variant db)"
@@ -2132,7 +2269,7 @@
 "Désactive l'APIC pour les invités complètement virtualisés (surcharge la "
 "valeur de la base de données des os-type/os-variant)"
 
-#: virt-convert:77 virt-install:914
+#: virt-convert:77 virt-install:927
 msgid ""
 "Disables ACPI for fully virtualized guest (overrides value in os-type/os-"
 "variant db)"
@@ -2226,19 +2363,19 @@
 msgid "The image requires %i network interface."
 msgstr ""
 
-#: virt-image:61 virt-install:800
+#: virt-image:61 virt-install:813
 msgid "Name of the guest instance"
 msgstr "Nom de l'instance de l'invité"
 
-#: virt-image:63 virt-install:802
+#: virt-image:63 virt-install:815
 msgid "Memory to allocate for guest instance in megabytes"
 msgstr "Mémoire à allouer à l'instance de l'invité en Mo"
 
-#: virt-image:66 virt-install:917
+#: virt-image:66 virt-install:930
 msgid "UUID for the guest."
 msgstr ""
 
-#: virt-image:69 virt-install:838
+#: virt-image:69 virt-install:851
 msgid "The OS type being installed, e.g. 'linux', 'unix', 'windows'"
 msgstr ""
 
@@ -2271,7 +2408,7 @@
 msgid "Overwrite, or destroy, an existing image with the same name"
 msgstr ""
 
-#: virt-image:102 virt-install:931
+#: virt-image:102 virt-install:944
 msgid "Don't boot guest after completing install."
 msgstr ""
 
@@ -2323,99 +2460,103 @@
 msgid "Error in filesystem device parameters: %s"
 msgstr ""
 
-#: virt-install:194
+#: virt-install:196
 msgid ""
 "Would you like a fully virtualized guest (yes or no)? This will allow you to "
 "run unmodified operating systems."
 msgstr ""
 
-#: virt-install:219
+#: virt-install:221
 #, python-format
 msgid "Would you like to use %s acceleration? (yes or no)"
 msgstr ""
 
-#: virt-install:232
+#: virt-install:234
 msgid "Can't do more than one of --hvm, --paravirt, or --container"
 msgstr ""
 
-#: virt-install:256 virt-install:257
+#: virt-install:258 virt-install:259
 msgid "default"
 msgstr ""
 
-#: virt-install:304
+#: virt-install:306
 #, python-format
 msgid "Error validating install location: %s"
 msgstr ""
 
-#: virt-install:308
+#: virt-install:310
 msgid "What is the install CD-ROM/ISO or URL?"
 msgstr ""
 
-#: virt-install:310
+#: virt-install:312
 msgid "What is the install URL?"
 msgstr ""
 
-#: virt-install:375
+#: virt-install:384
 msgid "Cannot specify storage and use --nodisks"
 msgstr ""
 
-#: virt-install:379
+#: virt-install:388
 msgid ""
 "Cannot mix --file, --nonsparse, or --file-size with --disk options. Use --"
 "disk PATH[,size=SIZE][,sparse=yes|no]"
 msgstr ""
 
-#: virt-install:385
+#: virt-install:394
 msgid "Cannot use --mac with --nonetworks"
 msgstr ""
 
-#: virt-install:387
+#: virt-install:396
 msgid "Cannot use --bridges with --nonetworks"
 msgstr ""
 
-#: virt-install:389
+#: virt-install:398
 msgid "Cannot use --network with --nonetworks"
 msgstr ""
 
-#: virt-install:395
+#: virt-install:404
 #, python-format
 msgid "Only one install method can be used (%(methods)s)"
 msgstr ""
 
-#: virt-install:401
+#: virt-install:410
 #, python-format
 msgid "Install methods (%s) cannot be specified for container guests"
 msgstr ""
 
-#: virt-install:406
+#: virt-install:415
 msgid "Network PXE boot is not supported for paravirtualized guests"
 msgstr ""
 
-#: virt-install:409
+#: virt-install:418
 msgid "Paravirtualized guests cannot install off cdrom media."
 msgstr ""
 
-#: virt-install:414
+#: virt-install:423
 msgid "Libvirt version does not support remote --location installs"
 msgstr ""
 
-#: virt-install:417
+#: virt-install:426
 msgid "--extra-args only work if specified with --location."
 msgstr ""
 
-#: virt-install:430
+#: virt-install:428
+msgid "--initrd-inject only works if specified with --location."
+msgstr ""
+
+#: virt-install:441
 msgid "Can't use --pxe with --nonetworks"
 msgstr ""
 
-#: virt-install:437
+#: virt-install:448
 msgid "A disk device must be specified with --import."
 msgstr ""
 
-#: virt-install:525
+#: virt-install:538
 msgid "The guest's network configuration does not support PXE"
 msgstr ""
 
-#: virt-install:550
+#: virt-install:563
 msgid ""
 "Unable to connect to graphical console: virt-viewer not installed. Please "
 "install the 'virt-viewer' package."
@@ -2423,147 +2564,147 @@
 "Impossible de se connecter à la console graphique : virt-viewer n'est pas "
 "installé. Veuillez installer le paquetage « virt-viewer »."
 
-#: virt-install:613
+#: virt-install:626
 msgid ""
 "\n"
 "Starting install..."
 msgstr ""
 
-#: virt-install:635
+#: virt-install:648
 #, python-format
 msgid ""
 "Domain creation completed. You can restart your domain by running:\n"
 "  %s"
 msgstr ""
 
-#: virt-install:639
+#: virt-install:652
 msgid "Guest installation complete... restarting guest."
 msgstr "Installation de l'invité terminée... Redémarrage de l'invité."
 
-#: virt-install:646
+#: virt-install:659
 msgid "Domain install interrupted."
 msgstr ""
 
-#: virt-install:668
+#: virt-install:681
 msgid "Domain has crashed."
 msgstr ""
 
-#: virt-install:705
+#: virt-install:718
 msgid ""
 "Domain installation still in progress. You can reconnect to \n"
 "the console to complete the installation process."
 msgstr ""
 
-#: virt-install:710
+#: virt-install:723
 #, python-format
 msgid "%d minutes "
 msgstr ""
 
-#: virt-install:712
+#: virt-install:725
 #, python-format
 msgid ""
 "Domain installation still in progress. Waiting %sfor installation to "
 "complete."
 msgstr ""
 
-#: virt-install:718
+#: virt-install:731
 msgid "Domain has shutdown. Continuing."
 msgstr ""
 
-#: virt-install:725
+#: virt-install:738
 #, python-format
 msgid "Could not lookup domain after install: %s"
 msgstr ""
 
-#: virt-install:732
+#: virt-install:745
 msgid "Installation has exceeded specified time limit. Exiting application."
 msgstr ""
 
-#: virt-install:757
+#: virt-install:770
 msgid "Dry run completed successfully"
 msgstr ""
 
-#: virt-install:763
+#: virt-install:776
 msgid ""
 "--print-xml can only be used with guests that do not have an installation "
 "phase (--import, --boot, etc.). To see all generated XML, please use --print-"
 "step all."
 msgstr ""
 
-#: virt-install:773
+#: virt-install:786
 msgid "Requested installation does not have XML step 2"
 msgstr ""
 
-#: virt-install:777
+#: virt-install:790
 msgid "Requested installation does not have XML step 3"
 msgstr ""
 
-#: virt-install:806
+#: virt-install:819
 msgid "Human readable description of the VM to store in the generated XML."
 msgstr ""
 
-#: virt-install:809
+#: virt-install:822
 msgid "Set domain security driver configuration."
 msgstr ""
 
-#: virt-install:811
+#: virt-install:824
 msgid "Tune NUMA policy for the domain process."
 msgstr ""
 
-#: virt-install:814
+#: virt-install:827
 msgid "Installation Method Options"
 msgstr ""
 
-#: virt-install:816
+#: virt-install:829
 msgid "CD-ROM installation media"
 msgstr ""
 
-#: virt-install:818
+#: virt-install:831
 msgid ""
 "Installation source (eg, nfs:host:/path, http://host/path, ftp://host/path)"
 msgstr ""
 
-#: virt-install:821
+#: virt-install:834
 msgid "Boot from the network using the PXE protocol"
 msgstr ""
 
-#: virt-install:823
+#: virt-install:836
 msgid "Build guest around an existing disk image"
 msgstr ""
 
-#: virt-install:825
+#: virt-install:838
 msgid ""
 "Path to init binary for container guest. Ex:\n"
 "--init /path/to/app (to contain an application)\n"
 "--init /sbin/init (for a full OS container)"
 msgstr ""
 
-#: virt-install:829
+#: virt-install:842
 msgid "Treat the CD-ROM media as a Live CD"
 msgstr ""
 
-#: virt-install:832
+#: virt-install:845
 msgid ""
 "Additional arguments to pass to the install kernel booted from --location"
 msgstr ""
 
-#: virt-install:836
+#: virt-install:849
 msgid "Add given file to root of initrd from --location"
 msgstr ""
 
-#: virt-install:841
+#: virt-install:854
 msgid ""
 "The OS variant being installed guests, e.g. 'fedora6', 'rhel5', 'solaris10', "
 "'win2k'"
 msgstr ""
 
-#: virt-install:844
+#: virt-install:857
 msgid ""
 "Optionally configure post-install boot order, menu, permanent kernel boot, "
 "etc."
 msgstr ""
 
-#: virt-install:850
+#: virt-install:863
 msgid ""
 "Specify storage with various options. Ex.\n"
 "--disk path=/my/existing/disk\n"
@@ -2571,70 +2712,70 @@
 "--disk vol=poolname:volname,device=cdrom,bus=scsi,..."
 msgstr ""
 
-#: virt-install:855
+#: virt-install:868
 msgid "Don't set up any disks for the guest."
 msgstr "Ne pas configurer de disque pour l'invité."
 
-#: virt-install:872
+#: virt-install:885
 msgid "Don't create network interfaces for the guest."
 msgstr ""
 
-#: virt-install:878
+#: virt-install:891
 msgid "Don't automatically try to connect to the guest console"
 msgstr ""
 "Ne pas essayer de se connecter automatiquement à la console de l'invité"
 
-#: virt-install:882
+#: virt-install:895
 msgid "Device Options"
 msgstr ""
 
-#: virt-install:891
+#: virt-install:904
 msgid "Virtualization Platform Options"
 msgstr ""
 
-#: virt-install:898
+#: virt-install:911
 msgid "This guest should be a container guest"
 msgstr ""
 
-#: virt-install:901
+#: virt-install:914
 msgid "Hypervisor name to use (kvm, qemu, xen, ...)"
 msgstr ""
 
-#: virt-install:905
+#: virt-install:918
 msgid "The CPU architecture to simulate"
 msgstr "L'architecture processeur à simuler"
 
-#: virt-install:907
+#: virt-install:920
 msgid "The machine type to emulate"
 msgstr ""
 
-#: virt-install:923
+#: virt-install:936
 msgid "Have domain autostart on host boot up."
 msgstr ""
 
-#: virt-install:925
+#: virt-install:938
 msgid "Print the generated domain XML rather than define the guest."
 msgstr ""
 
-#: virt-install:928
+#: virt-install:941
 msgid ""
 "Print XML of a specific install step (1, 2, 3, all) rather than define the "
 "guest."
 msgstr ""
 
-#: virt-install:933
+#: virt-install:946
 msgid "Time to wait (in minutes)"
 msgstr ""
 
-#: virt-install:935
+#: virt-install:948
 msgid ""
 "Run through install process, but do not create devices or define the guest."
 msgstr ""
 
-#: virt-install:938
+#: virt-install:951
 msgid "Forces 'yes' for any applicable prompts, terminates for all others"
 msgstr ""
 
-#: virt-install:978
+#: virt-install:991
 msgid "--print-step must be 1, 2, 3, or all"
 msgstr ""
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/virt-manager.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/virt-manager.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/virt-manager.po	2012-01-02 17:27:25.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/virt-manager.po	2012-02-23 06:31:49.000000000 +0000
@@ -12,18 +12,18 @@
 msgstr ""
 "Project-Id-Version: virt-manager.tip\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-22 16:26+0000\n"
-"PO-Revision-Date: 2011-12-22 18:13+0000\n"
+"POT-Creation-Date: 2012-02-11 19:13+0000\n"
+"PO-Revision-Date: 2012-02-11 21:43+0000\n"
 "Last-Translator: Laurent Léonard <laurent@open-minds.org>\n"
 "Language-Team: French <trans-fr@lists.fedoraproject.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:59+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:59+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
-#: ../src/virt-manager.desktop.in.in.h:1 ../src/virtManager/systray.py:131
+#: ../src/virt-manager.desktop.in.in.h:1 ../src/virtManager/systray.py:133
 #: ../src/vmm-manager.glade.h:1
 msgid "Virtual Machine Manager"
 msgstr "Gestionnaire de machine virtuelle"
@@ -309,141 +309,145 @@
 msgid "Default manager window width"
 msgstr "Largeur par défaut de la fenêtre de gestion"
 
-#: ../src/virtManager/addhardware.py:339 ../src/virtManager/create.py:488
-#: ../src/virtManager/create.py:586
+#: ../src/virtManager/addhardware.py:353 ../src/virtManager/create.py:490
+#: ../src/virtManager/create.py:588
 msgid "Connection does not support storage management."
 msgstr "La connexion ne prend pas en charge la gestion du stockage."
 
-#: ../src/virtManager/addhardware.py:353 ../src/virtManager/addhardware.py:358
-#: ../src/virtManager/addhardware.py:361 ../src/virtManager/addhardware.py:365
-#: ../src/virtManager/addhardware.py:369 ../src/virtManager/addhardware.py:386
+#: ../src/virtManager/addhardware.py:367 ../src/virtManager/addhardware.py:372
+#: ../src/virtManager/addhardware.py:375 ../src/virtManager/addhardware.py:379
+#: ../src/virtManager/addhardware.py:383 ../src/virtManager/addhardware.py:400
 msgid "Not supported for this guest type."
 msgstr "Non pris en charge pour ce type d'invité."
 
-#: ../src/virtManager/addhardware.py:373 ../src/virtManager/addhardware.py:377
+#: ../src/virtManager/addhardware.py:387 ../src/virtManager/addhardware.py:391
 msgid "Connection does not support host device enumeration"
 msgstr ""
 "La connexion ne prend pas en charge l'énumération des périphériques de l'hôte"
 
-#: ../src/virtManager/addhardware.py:383
+#: ../src/virtManager/addhardware.py:397
 msgid "Libvirt version does not support video devices."
 msgstr ""
 "La version de libvirt ne prend pas en charge les périphériques vidéo."
 
-#: ../src/virtManager/addhardware.py:392
+#: ../src/virtManager/addhardware.py:406
 msgid "Not supported for this hypervisor/libvirt combination."
 msgstr ""
 
-#: ../src/virtManager/addhardware.py:515 ../src/virtManager/details.py:2786
+#: ../src/virtManager/addhardware.py:535 ../src/virtManager/details.py:2903
 msgid "EvTouch USB Graphics Tablet"
 msgstr "Tablette graphique USB evTouch"
 
 #. XXX libvirt needs to support 'model' for input devices to distinguish
 #. wacom from evtouch tablets
 #. model.append([_("Wacom Graphics Tablet"), "tablet", "usb", True])
-#: ../src/virtManager/addhardware.py:519 ../src/virtManager/details.py:2788
+#: ../src/virtManager/addhardware.py:539 ../src/virtManager/details.py:2905
 msgid "Generic USB Mouse"
 msgstr "Souris USB générique"
 
-#: ../src/virtManager/addhardware.py:523
+#: ../src/virtManager/addhardware.py:543
 msgid "VNC server"
 msgstr "Serveur VNC"
 
-#: ../src/virtManager/addhardware.py:524
+#: ../src/virtManager/addhardware.py:544
 msgid "Spice server"
 msgstr ""
 
-#: ../src/virtManager/addhardware.py:525
+#: ../src/virtManager/addhardware.py:545
 msgid "Local SDL window"
 msgstr "Fenêtre SDL locale"
 
-#: ../src/virtManager/addhardware.py:547
+#: ../src/virtManager/addhardware.py:567
 msgid "No Devices Available"
 msgstr "Aucun périphérique disponible"
 
-#: ../src/virtManager/addhardware.py:796
+#: ../src/virtManager/addhardware.py:868
 #, python-format
 msgid "Uncaught error validating hardware input: %s"
 msgstr "Erreur inattendue lors de la validation de l'entrée du matériel : %s"
 
-#: ../src/virtManager/addhardware.py:808
+#: ../src/virtManager/addhardware.py:880
 #, python-format
 msgid "Unable to add device: %s"
 msgstr "Impossible d'ajouter le périphérique : %s"
 
-#: ../src/virtManager/addhardware.py:896
+#: ../src/virtManager/addhardware.py:972
 msgid "Error"
 msgstr "Erreur"
 
-#: ../src/virtManager/addhardware.py:898 ../src/vmm-create.glade.h:50
+#: ../src/virtManager/addhardware.py:974 ../src/vmm-create.glade.h:50
 #: ../src/vmm-host.glade.h:45
 msgid "Storage"
 msgstr "Stockage"
 
-#: ../src/virtManager/addhardware.py:900
+#: ../src/virtManager/addhardware.py:976
 msgid "Network"
 msgstr "Réseau"
 
-#: ../src/virtManager/addhardware.py:902 ../src/virtManager/details.py:3204
+#: ../src/virtManager/addhardware.py:978 ../src/virtManager/details.py:3370
 msgid "Input"
 msgstr "Entrée"
 
-#: ../src/virtManager/addhardware.py:904
+#: ../src/virtManager/addhardware.py:980
 msgid "Graphics"
 msgstr "Graphique"
 
-#: ../src/virtManager/addhardware.py:906
+#: ../src/virtManager/addhardware.py:982
 msgid "Sound"
 msgstr "Son"
 
-#: ../src/virtManager/addhardware.py:908
+#: ../src/virtManager/addhardware.py:984
 msgid "Video Device"
 msgstr "Périphérique vidéo"
 
-#: ../src/virtManager/addhardware.py:910
+#: ../src/virtManager/addhardware.py:986
 msgid "Watchdog Device"
 msgstr "Périphérique chien de garde"
 
-#: ../src/virtManager/addhardware.py:912
+#: ../src/virtManager/addhardware.py:988
 msgid "Filesystem Passthrough"
 msgstr ""
 
-#: ../src/virtManager/addhardware.py:914 ../src/virtManager/details.py:3269
+#: ../src/virtManager/addhardware.py:990 ../src/virtManager/details.py:3450
 msgid "Smartcard"
 msgstr ""
 
-#: ../src/virtManager/addhardware.py:972
+#: ../src/virtManager/addhardware.py:992
+msgid "USB Redirection"
+msgstr ""
+
+#: ../src/virtManager/addhardware.py:1061
 msgid "Te_mplate:"
 msgstr ""
 
-#: ../src/virtManager/addhardware.py:974
+#: ../src/virtManager/addhardware.py:1063
 msgid "_Source path:"
 msgstr ""
 
-#: ../src/virtManager/addhardware.py:1006
+#: ../src/virtManager/addhardware.py:1125
 msgid "Creating Storage File"
 msgstr "Création d'un fichier de stockage"
 
-#: ../src/virtManager/addhardware.py:1007
+#: ../src/virtManager/addhardware.py:1126
 msgid "Allocation of disk storage may take a few minutes to complete."
 msgstr "L'allocation du stockage disque peut prendre plusieurs minutes."
 
-#: ../src/virtManager/addhardware.py:1033
+#: ../src/virtManager/addhardware.py:1152
 msgid "Are you sure you want to add this device?"
 msgstr "Êtes-vous certain de vouloir ajouter ce périphérique ?"
 
-#: ../src/virtManager/addhardware.py:1036
+#: ../src/virtManager/addhardware.py:1155
 msgid ""
 "This device could not be attached to the running machine. Would you like to "
 "make the device available after the next guest shutdown?"
 msgstr ""
 
-#: ../src/virtManager/addhardware.py:1050
+#: ../src/virtManager/addhardware.py:1169
 #, python-format
 msgid "Error adding device: %s"
 msgstr "Erreur lors de l'ajout du périphérique : %s"
 
-#: ../src/virtManager/addhardware.py:1125 ../src/virtManager/create.py:1672
+#: ../src/virtManager/addhardware.py:1246 ../src/virtManager/create.py:1681
 #, python-format
 msgid ""
 "The following storage already exists, but is not\n"
@@ -454,120 +458,131 @@
 "Would you like to reuse this storage?"
 msgstr ""
 
-#: ../src/virtManager/addhardware.py:1133 ../src/virtManager/create.py:1680
+#: ../src/virtManager/addhardware.py:1254 ../src/virtManager/create.py:1689
 msgid "A storage path must be specified."
 msgstr "Un chemin de stockage doit être spécifié."
 
-#: ../src/virtManager/addhardware.py:1151 ../src/virtManager/create.py:1688
+#: ../src/virtManager/addhardware.py:1272 ../src/virtManager/create.py:1697
 msgid "Storage parameter error."
 msgstr "Erreur de paramètre de stockage."
 
 #. Fatal errors are reported when setting 'size'
-#: ../src/virtManager/addhardware.py:1165 ../src/virtManager/create.py:1693
+#: ../src/virtManager/addhardware.py:1286 ../src/virtManager/create.py:1702
 msgid "Not Enough Free Space"
 msgstr "Pas assez d'espace libre"
 
-#: ../src/virtManager/addhardware.py:1171 ../src/virtManager/create.py:1699
+#: ../src/virtManager/addhardware.py:1292 ../src/virtManager/create.py:1708
 #, python-format
 msgid "Disk \"%s\" is already in use by another guest!"
 msgstr "Le disque « %s » est déjà utilisé par un autre invité !"
 
-#: ../src/virtManager/addhardware.py:1173 ../src/virtManager/create.py:1701
+#: ../src/virtManager/addhardware.py:1294 ../src/virtManager/create.py:1710
 msgid "Do you really want to use the disk?"
 msgstr "Voulez-vous vraiment utiliser le disque ?"
 
-#: ../src/virtManager/addhardware.py:1190
+#: ../src/virtManager/addhardware.py:1311
 msgid "Network selection error."
 msgstr "Erreur de sélection du réseau."
 
-#: ../src/virtManager/addhardware.py:1191
+#: ../src/virtManager/addhardware.py:1312
 msgid "A network source must be selected."
 msgstr "Une source de réseau doit être sélectionnée."
 
-#: ../src/virtManager/addhardware.py:1194
+#: ../src/virtManager/addhardware.py:1315
 msgid "Invalid MAC address"
 msgstr "Adresse MAC invalide"
 
-#: ../src/virtManager/addhardware.py:1195
+#: ../src/virtManager/addhardware.py:1316
 msgid "A MAC address must be entered."
 msgstr "Une adresse MAC doit être entrée."
 
-#: ../src/virtManager/addhardware.py:1227
+#: ../src/virtManager/addhardware.py:1348
 msgid "Graphics device parameter error"
 msgstr "Erreur de paramètre de périphérique graphique"
 
-#: ../src/virtManager/addhardware.py:1235
+#: ../src/virtManager/addhardware.py:1356
 msgid "Sound device parameter error"
 msgstr "Erreur de paramètre de périphérique son"
 
-#: ../src/virtManager/addhardware.py:1242
+#: ../src/virtManager/addhardware.py:1363
 msgid "Physical Device Required"
 msgstr "Périphérique physique requis"
 
-#: ../src/virtManager/addhardware.py:1243
+#: ../src/virtManager/addhardware.py:1364
 msgid "A device must be selected."
 msgstr "Un périphérique doit être sélectionné."
 
-#: ../src/virtManager/addhardware.py:1250
+#: ../src/virtManager/addhardware.py:1371
 msgid "Host device parameter error"
 msgstr "Erreur de paramètre de périphérique hôte"
 
-#: ../src/virtManager/addhardware.py:1292
+#: ../src/virtManager/addhardware.py:1416
 #, python-format
 msgid "%s device parameter error"
 msgstr "Erreur de paramètre de périphérique %s"
 
-#: ../src/virtManager/addhardware.py:1303
-#: ../src/virtManager/addhardware.py:1350
+#: ../src/virtManager/addhardware.py:1427
 msgid "Video device parameter error"
 msgstr "Erreur de paramètre de périphérique vidéo"
 
-#: ../src/virtManager/addhardware.py:1316
+#: ../src/virtManager/addhardware.py:1439
 msgid "Watchdog parameter error"
 msgstr "Erreur de paramètre de chien de garde"
 
-#: ../src/virtManager/addhardware.py:1327
+#: ../src/virtManager/addhardware.py:1452
 msgid "A filesystem source must be specified"
 msgstr ""
 
-#: ../src/virtManager/addhardware.py:1329
+#: ../src/virtManager/addhardware.py:1454
 msgid "A filesystem target must be specified"
 msgstr ""
 
-#: ../src/virtManager/addhardware.py:1340
+#: ../src/virtManager/addhardware.py:1457
+msgid "Invalid target path. A filesystem with that target already exists"
+msgstr ""
+
+#: ../src/virtManager/addhardware.py:1475
 msgid "Filesystem parameter error"
 msgstr ""
 
-#: ../src/virtManager/asyncjob.py:175
+#: ../src/virtManager/addhardware.py:1493
+msgid "Smartcard device parameter error"
+msgstr ""
+
+#: ../src/virtManager/addhardware.py:1508
+msgid "USB redirected device parameter error"
+msgstr ""
+
+#: ../src/virtManager/asyncjob.py:243
 msgid "Cancel the job before closing window?"
 msgstr "Annuler l'opération avant de fermer la fenêtre ?"
 
-#: ../src/virtManager/asyncjob.py:207
+#: ../src/virtManager/asyncjob.py:262
 msgid "Cancelling job..."
 msgstr "Annulation de l'opération…"
 
-#: ../src/virtManager/asyncjob.py:214 ../src/virtManager/asyncjob.py:224
+#: ../src/virtManager/asyncjob.py:273 ../src/virtManager/asyncjob.py:282
 #: ../src/vmm-progress.glade.h:3
 msgid "Processing..."
 msgstr "Traitement en cours…"
 
-#: ../src/virtManager/asyncjob.py:241
+#: ../src/virtManager/asyncjob.py:298
 msgid "Completed"
 msgstr "Terminé"
 
-#: ../src/virtManager/choosecd.py:96 ../src/virtManager/choosecd.py:102
+#: ../src/virtManager/choosecd.py:100 ../src/virtManager/choosecd.py:106
 msgid "Invalid Media Path"
 msgstr "Chemin de média invalide"
 
-#: ../src/virtManager/choosecd.py:97
+#: ../src/virtManager/choosecd.py:101
 msgid "A media path must be specified."
 msgstr "Un chemin de média doit être spécifié."
 
-#: ../src/virtManager/choosecd.py:142
+#: ../src/virtManager/choosecd.py:146
 msgid "Floppy D_rive"
 msgstr "Lecteu_r de disquettes"
 
-#: ../src/virtManager/choosecd.py:143
+#: ../src/virtManager/choosecd.py:147
 msgid "Floppy _Image"
 msgstr "_Image de disquette"
 
@@ -591,11 +606,11 @@
 "Les périphériques blocs à cloner doivent\n"
 "être des volumes de stockage gérés par libvirt."
 
-#: ../src/virtManager/clone.py:86 ../src/virtManager/delete.py:334
+#: ../src/virtManager/clone.py:86 ../src/virtManager/delete.py:336
 msgid "No write access to parent directory."
 msgstr "Pas d'accès en écriture au dossier parent."
 
-#: ../src/virtManager/clone.py:88 ../src/virtManager/delete.py:332
+#: ../src/virtManager/clone.py:88 ../src/virtManager/delete.py:334
 msgid "Path does not exist."
 msgstr "Le chemin n'existe pas"
 
@@ -615,49 +630,49 @@
 msgid "Shareable"
 msgstr "Partageable"
 
-#: ../src/virtManager/clone.py:283 ../src/virtManager/clone.py:529
+#: ../src/virtManager/clone.py:285 ../src/virtManager/clone.py:531
 msgid "Details..."
 msgstr "Détails…"
 
-#: ../src/virtManager/clone.py:314
+#: ../src/virtManager/clone.py:316
 msgid "Usermode"
 msgstr "Mode utilisateur"
 
-#: ../src/virtManager/clone.py:326
+#: ../src/virtManager/clone.py:328
 msgid "Virtual Network"
 msgstr "Réseau virtuel"
 
-#: ../src/virtManager/clone.py:398
+#: ../src/virtManager/clone.py:400
 msgid "Nothing to clone."
 msgstr "Rien à cloner."
 
-#: ../src/virtManager/clone.py:521
+#: ../src/virtManager/clone.py:523
 msgid "Clone this disk"
 msgstr "Cloner ce disque"
 
-#: ../src/virtManager/clone.py:525
+#: ../src/virtManager/clone.py:527
 #, python-format
 msgid "Share disk with %s"
 msgstr "Partager ce disque avec %s"
 
-#: ../src/virtManager/clone.py:537
+#: ../src/virtManager/clone.py:539
 msgid "Storage cannot be shared or cloned."
 msgstr "Le stockage ne peut être partagé ou cloné."
 
-#: ../src/virtManager/clone.py:593
+#: ../src/virtManager/clone.py:595
 msgid "One or more disks cannot be cloned or shared."
 msgstr "Un ou plusieurs disques ne peuvent être clonés ou partagés."
 
-#: ../src/virtManager/clone.py:686
+#: ../src/virtManager/clone.py:688
 #, python-format
 msgid "Error changing MAC address: %s"
 msgstr "Erreur lors de la modification de l'adresse MAC : %s"
 
-#: ../src/virtManager/clone.py:713
+#: ../src/virtManager/clone.py:715
 msgid "Cloning will overwrite the existing file"
 msgstr "Le clonage va écraser le fichier existant"
 
-#: ../src/virtManager/clone.py:715
+#: ../src/virtManager/clone.py:717
 msgid ""
 "Using an existing image will overwrite the path during the clone process. "
 "Are you sure you want to use this path?"
@@ -665,16 +680,16 @@
 "L'utilisation d'une image existante écrasera le chemin lors du processus de "
 "clonage. Êtes-vous certain de vouloir utiliser ce chemin ?"
 
-#: ../src/virtManager/clone.py:727
+#: ../src/virtManager/clone.py:729
 #, python-format
 msgid "Error changing storage path: %s"
 msgstr "Erreur lors de la modification du chemin de stockage : %s"
 
-#: ../src/virtManager/clone.py:778
+#: ../src/virtManager/clone.py:780
 msgid "Skipping disks may cause data to be overwritten."
 msgstr "L'omission de disques peut occasionner des écrasements de données."
 
-#: ../src/virtManager/clone.py:779
+#: ../src/virtManager/clone.py:781
 #, python-format
 msgid ""
 "The following disk devices will not be cloned:\n"
@@ -688,22 +703,22 @@
 "Le lancement du nouvel invité peut écraser les données dans cette image "
 "disque."
 
-#: ../src/virtManager/clone.py:797 ../src/virtManager/createpool.py:441
-#: ../src/virtManager/createvol.py:204 ../src/virtManager/migrate.py:464
+#: ../src/virtManager/clone.py:799 ../src/virtManager/createpool.py:443
+#: ../src/virtManager/createvol.py:215 ../src/virtManager/migrate.py:465
 #, python-format
 msgid "Uncaught error validating input: %s"
 msgstr "Erreur inattendue lors de la validation de l'entrée : %s"
 
-#: ../src/virtManager/clone.py:803
+#: ../src/virtManager/clone.py:805
 #, python-format
 msgid "Creating virtual machine clone '%s'"
 msgstr "Création du clone « %s » de la machine virtuelle"
 
-#: ../src/virtManager/clone.py:807 ../src/virtManager/delete.py:135
+#: ../src/virtManager/clone.py:809 ../src/virtManager/delete.py:137
 msgid " and selected storage (this may take a while)"
 msgstr " et le stockage sélectionné (cela peut prendre un moment)"
 
-#: ../src/virtManager/clone.py:816
+#: ../src/virtManager/clone.py:818
 #, python-format
 msgid "Error creating virtual machine clone '%s': %s"
 msgstr ""
@@ -717,101 +732,101 @@
 msgid "Locate existing storage"
 msgstr "Localiser un stockage existant"
 
-#: ../src/virtManager/config.py:53
+#: ../src/virtManager/config.py:55
 msgid "Locate ISO media volume"
 msgstr "Localiser le volume du média ISO"
 
-#: ../src/virtManager/config.py:54
+#: ../src/virtManager/config.py:56
 msgid "Locate ISO media"
 msgstr "Localiser le média ISO"
 
-#: ../src/virtManager/config.py:59
+#: ../src/virtManager/config.py:61
 msgid "Locate floppy media volume"
 msgstr ""
 
-#: ../src/virtManager/config.py:60
+#: ../src/virtManager/config.py:62
 msgid "Locate floppy media"
 msgstr ""
 
-#: ../src/virtManager/config.py:65 ../src/virtManager/config.py:66
+#: ../src/virtManager/config.py:67 ../src/virtManager/config.py:68
 msgid "Locate directory volume"
 msgstr ""
 
-#: ../src/virtManager/connect.py:333
+#: ../src/virtManager/connect.py:336
 msgid "A hostname is required for remote connections."
 msgstr "Un nom d'hôte est requis pour les connexions distantes."
 
-#: ../src/virtManager/connection.py:132
+#: ../src/virtManager/connection.py:161
 #, python-format
 msgid "Could not build physical interface list via libvirt: %s"
 msgstr ""
 "La liste des interfaces physiques ne peut être construite via libvirt : %s"
 
-#: ../src/virtManager/connection.py:138
+#: ../src/virtManager/connection.py:167
 msgid "Libvirt version does not support physical interface listing"
 msgstr ""
 "La version de libvirt ne prend pas en charge le listage des interfaces "
 "physiques"
 
-#: ../src/virtManager/connection.py:149
+#: ../src/virtManager/connection.py:178
 #, python-format
 msgid "Could not initialize HAL for interface listing: %s"
 msgstr ""
 "HAL ne peut pas être initialisé pour le listage des interfaces physiques : %s"
 
-#: ../src/virtManager/connection.py:152
+#: ../src/virtManager/connection.py:181
 msgid "Libvirt version does not support physical interface listing."
 msgstr ""
 "La version de libvirt ne prend pas en charge le listage des interfaces "
 "physiques."
 
-#: ../src/virtManager/connection.py:171
+#: ../src/virtManager/connection.py:200
 #, python-format
 msgid "Could not build media list via libvirt: %s"
 msgstr "La liste des médias ne peut être construite via libvirt : %s"
 
-#: ../src/virtManager/connection.py:178 ../src/virtManager/connection.py:192
+#: ../src/virtManager/connection.py:207 ../src/virtManager/connection.py:221
 msgid "Libvirt version does not support media listing."
 msgstr "La version de libvirt ne prend pas en charge le listage des médias."
 
-#: ../src/virtManager/connection.py:189
+#: ../src/virtManager/connection.py:218
 #, python-format
 msgid "Could not initialize HAL for media listing: %s"
 msgstr "HAL ne peut pas être initialisé pour le listage des médias : %s"
 
-#: ../src/virtManager/connection.py:606
+#: ../src/virtManager/connection.py:643
 msgid "Disconnected"
 msgstr "Déconnecté"
 
-#: ../src/virtManager/connection.py:608
+#: ../src/virtManager/connection.py:645
 msgid "Connecting"
 msgstr "Connexion"
 
-#: ../src/virtManager/connection.py:611
+#: ../src/virtManager/connection.py:648
 msgid "Active (RO)"
 msgstr "Actif (lecture seule)"
 
-#: ../src/virtManager/connection.py:613 ../src/virtManager/host.py:524
-#: ../src/virtManager/host.py:787 ../src/virtManager/host.py:1035
+#: ../src/virtManager/connection.py:650 ../src/virtManager/host.py:526
+#: ../src/virtManager/host.py:789 ../src/virtManager/host.py:1046
 #: ../src/vmm-host.glade.h:36
 msgid "Active"
 msgstr "Actif"
 
-#: ../src/virtManager/connection.py:615 ../src/virtManager/host.py:524
-#: ../src/virtManager/host.py:567 ../src/virtManager/host.py:787
-#: ../src/virtManager/host.py:827 ../src/virtManager/host.py:1035
-#: ../src/virtManager/uihelpers.py:507
+#: ../src/virtManager/connection.py:652 ../src/virtManager/host.py:526
+#: ../src/virtManager/host.py:569 ../src/virtManager/host.py:789
+#: ../src/virtManager/host.py:829 ../src/virtManager/host.py:1046
+#: ../src/virtManager/uihelpers.py:526
 msgid "Inactive"
 msgstr "Inactif"
 
-#: ../src/virtManager/connection.py:617 ../src/virtManager/create.py:2016
-#: ../src/virtManager/details.py:2399 ../src/virtManager/details.py:2666
-#: ../src/virtManager/details.py:2867 ../src/virtManager/details.py:2868
-#: ../src/virtManager/host.py:1029
+#: ../src/virtManager/connection.py:654 ../src/virtManager/create.py:2026
+#: ../src/virtManager/details.py:2509 ../src/virtManager/details.py:2783
+#: ../src/virtManager/details.py:2984 ../src/virtManager/details.py:2985
+#: ../src/virtManager/host.py:1040
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../src/virtManager/connection.py:793
+#: ../src/virtManager/connection.py:830
 #, python-format
 msgid ""
 "Domain rename failed. Attempting to recover also failed.\n"
@@ -821,307 +836,288 @@
 "Recover error: %s"
 msgstr ""
 
-#: ../src/virtManager/console.py:324
+#: ../src/virtManager/console.py:323
 msgid "Unable to provide requested credentials to the VNC server"
 msgstr "Impossible de fournir les références requises au serveur VNC"
 
-#: ../src/virtManager/console.py:326
+#: ../src/virtManager/console.py:325
 #, python-format
 msgid "The credential type %s is not supported"
 msgstr "Le type de référence %s n'est pas pris en charge"
 
-#: ../src/virtManager/console.py:328
+#: ../src/virtManager/console.py:327
 msgid "Unable to authenticate"
 msgstr "Impossible d'authentifier"
 
-#: ../src/virtManager/console.py:335
+#: ../src/virtManager/console.py:334
 msgid "Unsupported console authentication type"
 msgstr "Type d'authentification de console non prise en charge"
 
-#: ../src/virtManager/console.py:382
+#: ../src/virtManager/console.py:381
 #, python-format
 msgid "Error opening socket path '%s': %s"
 msgstr "Erreur lors de l'ouverture du chemin du socket « %s » : %s"
 
-#: ../src/virtManager/console.py:387
+#: ../src/virtManager/console.py:386
 #, python-format
 msgid "Error opening socket path '%s'"
 msgstr "Erreur lors de l'ouverture du chemin du socket « %s »"
 
-#: ../src/virtManager/console.py:621
+#: ../src/virtManager/console.py:629
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virtManager/console.py:641
+#: ../src/virtManager/console.py:650
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virtManager/console.py:659 ../src/vmm-details.glade.h:1
+#: ../src/virtManager/console.py:668 ../src/vmm-details.glade.h:1
 msgid "Virtual Machine"
 msgstr "Machine virtuelle"
 
-#: ../src/virtManager/console.py:663
+#: ../src/virtManager/console.py:672
 #, python-format
 msgid "Press %s to release pointer."
 msgstr "Appuyez sur %s pour libérer le pointeur."
 
 #. Guest isn't running, schedule another try
-#: ../src/virtManager/console.py:829 ../src/virtManager/console.py:1026
+#: ../src/virtManager/console.py:843 ../src/virtManager/console.py:1036
 msgid "Guest not running"
 msgstr "Invité inactif"
 
-#: ../src/virtManager/console.py:832
+#: ../src/virtManager/console.py:846
 msgid "Guest has crashed"
 msgstr "L'invité a planté"
 
-#: ../src/virtManager/console.py:965
+#: ../src/virtManager/console.py:975
 msgid ""
 "Error: viewer connection to hypervisor host got refused or disconnected!"
 msgstr ""
 "Erreur : la connexion de l'afficheur graphique à l'hôte hyperviseur a été "
 "refusée ou interrompue !"
 
-#: ../src/virtManager/console.py:1043
+#: ../src/virtManager/console.py:1053
 msgid "Graphical console not configured for guest"
 msgstr "Console graphique non configurée pour l'invité"
 
-#: ../src/virtManager/console.py:1050
+#: ../src/virtManager/console.py:1060
 #, python-format
 msgid "Cannot display graphical console type '%s'"
 msgstr "Ne peut afficher le type de console graphique « %s »"
 
-#: ../src/virtManager/console.py:1060
+#: ../src/virtManager/console.py:1070
 msgid "Graphical console is not yet active for guest"
 msgstr "La console graphique n'est pas encore active pour l'invité"
 
-#: ../src/virtManager/console.py:1065
+#: ../src/virtManager/console.py:1075
 msgid "Connecting to graphical console for guest"
 msgstr "Connexion à la console graphique en cours pour l'invité"
 
-#: ../src/virtManager/console.py:1101
+#: ../src/virtManager/console.py:1111
 msgid "Error connecting to graphical console"
 msgstr "Erreur lors de la connexion à la console graphique"
 
-#: ../src/virtManager/create.py:357
+#: ../src/virtManager/create.py:359
 msgid "No active connection to install on."
 msgstr "Aucune connexion active pour installer."
 
-#: ../src/virtManager/create.py:419
+#: ../src/virtManager/create.py:421
 msgid "Connection is read only."
 msgstr "La connexion est en lecture seule."
 
-#: ../src/virtManager/create.py:422
-msgid ""
-"No hypervisor options were found for this\n"
-"connection."
+#: ../src/virtManager/create.py:424
+msgid "No hypervisor options were found for this connection."
 msgstr ""
-"Aucune option d'hyperviseur n'a été trouvée pour cette\n"
-"connexion."
 
-#: ../src/virtManager/create.py:427
+#: ../src/virtManager/create.py:429
 msgid ""
-"This usually means that QEMU or KVM is not\n"
-"installed on your machine, or the KVM kernel modules are not loaded."
+"This usually means that QEMU or KVM is not installed on your machine, or the "
+"KVM kernel modules are not loaded."
 msgstr ""
-"Cela veut habituellement dire que QEMU ou KVM n'est pas\n"
-"installé sur votre machine ou que les modules noyau de KVM ne sont pas "
-"chargés."
 
-#: ../src/virtManager/create.py:442
+#: ../src/virtManager/create.py:444
 msgid ""
-"Host supports full virtualization, but\n"
-"no related install options are available.\n"
-"This may mean support is disabled in your\n"
-"system BIOS."
+"Host supports full virtualization, but no related install options are "
+"available. This may mean support is disabled in your system BIOS."
 msgstr ""
-"L'hôte prend en charge la virtualisation complète, mais\n"
-"aucune option d'installation relative n'est disponible.\n"
-"Cela peut signifier que la prise en charge est désactivée dans le\n"
-"BIOS de votre système."
 
-#: ../src/virtManager/create.py:449
+#: ../src/virtManager/create.py:451
 msgid ""
-"Host does not appear to support hardware\n"
-"virtualization. Install options may be limited."
+"Host does not appear to support hardware virtualization. Install options may "
+"be limited."
 msgstr ""
-"L'hôte ne paraît pas prendre en charge la virtualisation\n"
-"matérielle. Les options d'installation peuvent être limitées."
 
-#: ../src/virtManager/create.py:455
+#: ../src/virtManager/create.py:457
 msgid ""
-"KVM is not available. This may mean the KVM\n"
-"package is not installed, or the KVM kernel modules \n"
-"are not loaded. Your virtual machines may perform poorly."
+"KVM is not available. This may mean the KVM package is not installed, or the "
+"KVM kernel modules are not loaded. Your virtual machines may perform poorly."
 msgstr ""
-"KVM n'est pas disponible. Cela peut signifier que le paquet\n"
-"KVM n'est pas installé ou que les modules noyau de KVM\n"
-"ne sont pas chargés. Vos machines virtuelles peuvent fonctionner lentement."
 
-#: ../src/virtManager/create.py:482
+#: ../src/virtManager/create.py:484
 #, python-format
 msgid "%s installs not available for paravirt guests."
 msgstr ""
 "Installations de « %s » non disponibles pour les invités paravirtualisés."
 
-#: ../src/virtManager/create.py:486
+#: ../src/virtManager/create.py:488
 msgid "Libvirt version does not support remote URL installs."
 msgstr ""
 
-#: ../src/virtManager/create.py:500
+#: ../src/virtManager/create.py:502
 msgid "No install options available for this connection."
 msgstr "Aucune option d'installation disponible pour cette connexion."
 
-#: ../src/virtManager/create.py:547
+#: ../src/virtManager/create.py:549
 #, python-format
 msgid "Up to %(maxmem)s available on the host"
 msgstr "Jusqu'à %(maxmem)s disponibles sur l'hôte"
 
-#: ../src/virtManager/create.py:561
+#: ../src/virtManager/create.py:563
 #, python-format
 msgid "Hypervisor only supports %d virtual CPUs."
 msgstr "L'hyperviseur ne prend en charge que %d CPU virtuelle(s)."
 
-#: ../src/virtManager/create.py:570
+#: ../src/virtManager/create.py:572
 #, python-format
 msgid "Up to %(numcpus)d available"
 msgstr "Jusqu'à %(numcpus)d disponible(s)"
 
-#: ../src/virtManager/create.py:659
+#: ../src/virtManager/create.py:661
 msgid "Only URL or import installs are supported for paravirt."
 msgstr ""
 "Seules les installations URL ou importées sont prises en charges pour la "
 "paravirtualisation."
 
-#: ../src/virtManager/create.py:755 ../src/virtManager/create.py:773
-#: ../src/virtManager/create.py:871 ../src/virtManager/create.py:873
+#: ../src/virtManager/create.py:757 ../src/virtManager/create.py:775
+#: ../src/virtManager/create.py:874 ../src/virtManager/create.py:876
 msgid "Generic"
 msgstr "Générique"
 
 #. Add action option
-#: ../src/virtManager/create.py:765 ../src/virtManager/create.py:793
+#: ../src/virtManager/create.py:767 ../src/virtManager/create.py:795
 msgid "Show all OS options"
 msgstr ""
 
-#: ../src/virtManager/create.py:842
+#: ../src/virtManager/create.py:845
 msgid "Local CDROM/ISO"
 msgstr "CD-ROM/ISO local"
 
-#: ../src/virtManager/create.py:844
+#: ../src/virtManager/create.py:847
 msgid "URL Install Tree"
 msgstr "Arbre d'installation URL"
 
-#: ../src/virtManager/create.py:846
+#: ../src/virtManager/create.py:849
 msgid "PXE Install"
 msgstr "Installation PXE"
 
-#: ../src/virtManager/create.py:848
+#: ../src/virtManager/create.py:851
 msgid "Import existing OS image"
 msgstr "Importer un image de SE existante"
 
-#: ../src/virtManager/create.py:850 ../src/vmm-create.glade.h:13
+#: ../src/virtManager/create.py:853 ../src/vmm-create.glade.h:13
 msgid "Application container"
 msgstr ""
 
-#: ../src/virtManager/create.py:852 ../src/vmm-create.glade.h:14
+#: ../src/virtManager/create.py:855 ../src/vmm-create.glade.h:14
 msgid "Operating system container"
 msgstr ""
 
-#: ../src/virtManager/create.py:863
+#: ../src/virtManager/create.py:866
 msgid "Host filesystem"
 msgstr ""
 
-#: ../src/virtManager/create.py:865 ../src/virtManager/details.py:2400
-#: ../src/virtManager/details.py:2461
+#: ../src/virtManager/create.py:868 ../src/virtManager/details.py:2510
+#: ../src/virtManager/details.py:2576
 msgid "None"
 msgstr "Aucun"
 
-#: ../src/virtManager/create.py:869
+#: ../src/virtManager/create.py:872
 msgid "Linux"
 msgstr ""
 
-#: ../src/virtManager/create.py:1081
+#: ../src/virtManager/create.py:1084
 msgid "Network selection does not support PXE"
 msgstr "La sélection réseau ne prend pas en charge PXE"
 
-#: ../src/virtManager/create.py:1348 ../src/virtManager/createinterface.py:886
+#: ../src/virtManager/create.py:1351 ../src/virtManager/createinterface.py:891
 #, python-format
 msgid "Step %(current_page)d of %(max_page)d"
 msgstr "Étape %(current_page)d sur %(max_page)d"
 
-#: ../src/virtManager/create.py:1425
+#: ../src/virtManager/create.py:1432
 #, python-format
 msgid "Error setting UUID: %s"
 msgstr "Erreur lors de la définition de l'UUID : %s"
 
-#: ../src/virtManager/create.py:1439
+#: ../src/virtManager/create.py:1446
 msgid "Error setting up default devices:"
 msgstr ""
 
-#: ../src/virtManager/create.py:1458 ../src/virtManager/createinterface.py:915
+#: ../src/virtManager/create.py:1465 ../src/virtManager/createinterface.py:920
 #, python-format
 msgid "Uncaught error validating install parameters: %s"
 msgstr ""
 "Erreur inattendue lors de la validation des paramètres d'installation : %s"
 
-#: ../src/virtManager/create.py:1469
+#: ../src/virtManager/create.py:1476
 msgid "Invalid System Name"
 msgstr "Nom du système invalide"
 
-#: ../src/virtManager/create.py:1490
+#: ../src/virtManager/create.py:1498
 msgid "An install media selection is required."
 msgstr "Une sélection de média d'installation est requise."
 
-#: ../src/virtManager/create.py:1500
+#: ../src/virtManager/create.py:1508
 msgid "An install tree is required."
 msgstr "Un arbre d'installation est requis."
 
-#: ../src/virtManager/create.py:1513
+#: ../src/virtManager/create.py:1522
 msgid "A storage path to import is required."
 msgstr "Un chemin de stockage pour importer doit être spécifié."
 
-#: ../src/virtManager/create.py:1520
+#: ../src/virtManager/create.py:1529
 msgid "An application path is required."
 msgstr ""
 
-#: ../src/virtManager/create.py:1527
+#: ../src/virtManager/create.py:1536
 msgid "An OS directory path is required."
 msgstr ""
 
-#: ../src/virtManager/create.py:1537
+#: ../src/virtManager/create.py:1547
 msgid "Error setting installer parameters."
 msgstr "Erreur lors de la définition des paramètres de l'installeur."
 
-#: ../src/virtManager/create.py:1565
+#: ../src/virtManager/create.py:1576
 msgid "Error setting install media location."
 msgstr ""
 "Erreur lors de la définition de l'emplacement du média d'installation."
 
-#: ../src/virtManager/create.py:1575
+#: ../src/virtManager/create.py:1585
 msgid "Error setting OS information."
 msgstr "Erreur lors de la définition des informations du SE."
 
-#: ../src/virtManager/create.py:1610
+#: ../src/virtManager/create.py:1619
 msgid "Error setting CPUs."
 msgstr "Erreur lors de la définition des CPU."
 
-#: ../src/virtManager/create.py:1617
+#: ../src/virtManager/create.py:1626
 msgid "Error setting guest memory."
 msgstr "Erreur lors de la définition de la mémoire de l'invité."
 
-#: ../src/virtManager/create.py:1732
+#: ../src/virtManager/create.py:1742
 #, python-format
 msgid "Network device required for %s install."
 msgstr "Un périphérique réseau est requis pour l'installation de « %s »."
 
-#: ../src/virtManager/create.py:1829
+#: ../src/virtManager/create.py:1839
 msgid "Error starting installation: "
 msgstr "Erreur lors du démarrage de l'installation : "
 
-#: ../src/virtManager/create.py:1866
+#: ../src/virtManager/create.py:1876
 msgid "Creating Virtual Machine"
 msgstr "Création d'une machine virtuelle"
 
-#: ../src/virtManager/create.py:1867
+#: ../src/virtManager/create.py:1877
 msgid ""
 "The virtual machine is now being created. Allocation of disk storage and "
 "retrieval of the installation images may take a few minutes to complete."
@@ -1130,86 +1126,86 @@
 "stockage disque et la récupération des images d'installation peuvent prendre "
 "quelques minutes."
 
-#: ../src/virtManager/create.py:1879
+#: ../src/virtManager/create.py:1889
 #, python-format
 msgid "Unable to complete install: '%s'"
 msgstr "Impossible de terminer l'installation : « %s »"
 
-#: ../src/virtManager/create.py:1950
+#: ../src/virtManager/create.py:1960
 #, python-format
 msgid "Error continue install: %s"
 msgstr "Erreur à la poursuite de l'installation : %s"
 
-#: ../src/virtManager/create.py:2058
+#: ../src/virtManager/create.py:2068
 msgid "Detecting"
 msgstr "Détection"
 
-#: ../src/virtManager/createinterface.py:201
-#: ../src/virtManager/uihelpers.py:397
+#: ../src/virtManager/createinterface.py:206
+#: ../src/virtManager/uihelpers.py:416
 msgid "Bridge"
 msgstr "Pont"
 
-#: ../src/virtManager/createinterface.py:203
+#: ../src/virtManager/createinterface.py:208
 msgid "Bond"
 msgstr "Association"
 
-#: ../src/virtManager/createinterface.py:205
+#: ../src/virtManager/createinterface.py:210
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/virtManager/createinterface.py:207
+#: ../src/virtManager/createinterface.py:212
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/virtManager/createinterface.py:222 ../src/virtManager/details.py:673
-#: ../src/virtManager/manager.py:366 ../src/virtManager/storagebrowse.py:125
+#: ../src/virtManager/createinterface.py:227 ../src/virtManager/details.py:705
+#: ../src/virtManager/manager.py:371 ../src/virtManager/storagebrowse.py:127
 #: ../src/vmm-create-net.glade.h:14 ../src/vmm-create-pool.glade.h:7
 #: ../src/vmm-create.glade.h:15
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/virtManager/createinterface.py:223
+#: ../src/virtManager/createinterface.py:228
 msgid "Type"
 msgstr "Type"
 
-#: ../src/virtManager/createinterface.py:224
+#: ../src/virtManager/createinterface.py:229
 msgid "In use by"
 msgstr "En cours d'utilisation par"
 
-#: ../src/virtManager/createinterface.py:262
-#: ../src/virtManager/createinterface.py:272
+#: ../src/virtManager/createinterface.py:267
+#: ../src/virtManager/createinterface.py:277
 msgid "System default"
 msgstr "Par défaut pour le système"
 
-#: ../src/virtManager/createinterface.py:506
+#: ../src/virtManager/createinterface.py:511
 msgid "Choose interface(s) to bridge:"
 msgstr "Choisissez la/les interface(s) à ponter :"
 
-#: ../src/virtManager/createinterface.py:509
+#: ../src/virtManager/createinterface.py:514
 msgid "Choose parent interface:"
 msgstr "Choisissez l'interface parent :"
 
-#: ../src/virtManager/createinterface.py:511
+#: ../src/virtManager/createinterface.py:516
 msgid "Choose interfaces to bond:"
 msgstr "Choisissez les interfaces à associer :"
 
-#: ../src/virtManager/createinterface.py:513
+#: ../src/virtManager/createinterface.py:518
 msgid "Choose an unconfigured interface:"
 msgstr "Choisissez une interface non configurée :"
 
-#: ../src/virtManager/createinterface.py:568
+#: ../src/virtManager/createinterface.py:573
 msgid "No interface selected"
 msgstr "Aucune interface sélectionnée"
 
-#: ../src/virtManager/createinterface.py:927
+#: ../src/virtManager/createinterface.py:932
 msgid "An interface name is required."
 msgstr "Un nom d'interface est requis."
 
-#: ../src/virtManager/createinterface.py:931
+#: ../src/virtManager/createinterface.py:936
 msgid "An interface must be selected"
 msgstr "Une interface doit être sélectionnée"
 
-#: ../src/virtManager/createinterface.py:962
+#: ../src/virtManager/createinterface.py:967
 #, python-format
 msgid ""
 "The following interface(s) are already configured:\n"
@@ -1226,125 +1222,125 @@
 "La/les utiliser peut écraser sa/leur configuration existante. Êtes-vous "
 "certain de vouloir utiliser la/les interface(s) sélectionnée(s) ?"
 
-#: ../src/virtManager/createinterface.py:1000
+#: ../src/virtManager/createinterface.py:1006
 msgid "Error setting interface parameters."
 msgstr "Erreur lors de la définition des paramètres de l'interface."
 
-#: ../src/virtManager/createinterface.py:1077
+#: ../src/virtManager/createinterface.py:1082
 #, python-format
 msgid "Error validating IP configuration: %s"
 msgstr ""
 "Erreur lors de la validation de la configuration de la configuration IP : %s"
 
-#: ../src/virtManager/createinterface.py:1122
+#: ../src/virtManager/createinterface.py:1127
 msgid "Creating virtual interface"
 msgstr "Création d'une interface virtuelle"
 
-#: ../src/virtManager/createinterface.py:1123
+#: ../src/virtManager/createinterface.py:1128
 msgid "The virtual interface is now being created."
 msgstr "L'interface virtuelle est maintenant en cours de création."
 
-#: ../src/virtManager/createinterface.py:1131
+#: ../src/virtManager/createinterface.py:1136
 #, python-format
 msgid "Error creating interface: '%s'"
 msgstr "Erreur lors de la création de l'interface : « %s »"
 
-#: ../src/virtManager/createnet.py:104
+#: ../src/virtManager/createnet.py:106
 msgid "Any physical device"
 msgstr "N'importe quel périphérique physique"
 
-#: ../src/virtManager/createnet.py:107
+#: ../src/virtManager/createnet.py:109
 #, python-format
 msgid "Physical device %s"
 msgstr "Périphérique physique %s"
 
-#: ../src/virtManager/createnet.py:118 ../src/virtManager/network.py:33
+#: ../src/virtManager/createnet.py:120 ../src/virtManager/network.py:33
 msgid "NAT"
 msgstr "NAT"
 
-#: ../src/virtManager/createnet.py:119
+#: ../src/virtManager/createnet.py:121
 msgid "Routed"
 msgstr "Routé"
 
-#: ../src/virtManager/createnet.py:179
+#: ../src/virtManager/createnet.py:181
 #, python-format
 msgid "%d addresses"
 msgstr "%d adresses"
 
-#: ../src/virtManager/createnet.py:183
+#: ../src/virtManager/createnet.py:185
 msgid "Public"
 msgstr "Public"
 
-#: ../src/virtManager/createnet.py:185 ../src/vmm-create-net.glade.h:17
+#: ../src/virtManager/createnet.py:187 ../src/vmm-create-net.glade.h:17
 msgid "Private"
 msgstr "Privé"
 
-#: ../src/virtManager/createnet.py:187
+#: ../src/virtManager/createnet.py:189
 msgid "Reserved"
 msgstr "Réservé"
 
-#: ../src/virtManager/createnet.py:189
+#: ../src/virtManager/createnet.py:191
 msgid "Other"
 msgstr "Autre"
 
-#: ../src/virtManager/createnet.py:275 ../src/vmm-create-net.glade.h:51
+#: ../src/virtManager/createnet.py:277 ../src/vmm-create-net.glade.h:51
 msgid "Start address:"
 msgstr "Adresse de début :"
 
-#: ../src/virtManager/createnet.py:279 ../src/vmm-details.glade.h:46
+#: ../src/virtManager/createnet.py:281 ../src/vmm-details.glade.h:46
 msgid "Status:"
 msgstr "État :"
 
-#: ../src/virtManager/createnet.py:280 ../src/virtManager/details.py:2486
-#: ../src/virtManager/details.py:2487 ../src/virtManager/details.py:2488
-#: ../src/virtManager/details.py:2489 ../src/virtManager/host.py:547
-#: ../src/virtManager/host.py:548
+#: ../src/virtManager/createnet.py:282 ../src/virtManager/details.py:2601
+#: ../src/virtManager/details.py:2602 ../src/virtManager/details.py:2603
+#: ../src/virtManager/details.py:2604 ../src/virtManager/host.py:549
+#: ../src/virtManager/host.py:550
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: ../src/virtManager/createnet.py:353
+#: ../src/virtManager/createnet.py:355
 #, python-format
 msgid "Error creating virtual network: %s"
 msgstr "Erreur lors de la création du réseau virtuel : %s"
 
-#: ../src/virtManager/createnet.py:362 ../src/virtManager/createnet.py:366
+#: ../src/virtManager/createnet.py:364 ../src/virtManager/createnet.py:368
 msgid "Invalid Network Name"
 msgstr "Nom de réseau invalide"
 
-#: ../src/virtManager/createnet.py:363
+#: ../src/virtManager/createnet.py:365
 msgid "Network name must be non-blank and less than 50 characters"
 msgstr ""
 "Le nom du réseau ne doit pas être vide et doit être composé de moins de 50 "
 "caractères"
 
-#: ../src/virtManager/createnet.py:367
+#: ../src/virtManager/createnet.py:369
 msgid "Network name may contain alphanumeric and '_' characters only"
 msgstr ""
 "Le nom du réseau ne peut contenir que des caractères alphanumériques ainsi "
 "que des « _ »"
 
-#: ../src/virtManager/createnet.py:374 ../src/virtManager/createnet.py:378
-#: ../src/virtManager/createnet.py:382
+#: ../src/virtManager/createnet.py:376 ../src/virtManager/createnet.py:380
+#: ../src/virtManager/createnet.py:384
 msgid "Invalid Network Address"
 msgstr "Adresse réseau invalide"
 
-#: ../src/virtManager/createnet.py:375
+#: ../src/virtManager/createnet.py:377
 msgid "The network address could not be understood"
 msgstr "L'adresse réseau ne peut pas être interprétée"
 
-#: ../src/virtManager/createnet.py:379
+#: ../src/virtManager/createnet.py:381
 msgid "The network must be an IPv4 address"
 msgstr "Le réseau doit être une adresse IPv4"
 
-#: ../src/virtManager/createnet.py:383
+#: ../src/virtManager/createnet.py:385
 msgid "The network prefix must be at least /4 (16 addresses)"
 msgstr "Le préfixe du réseau doit être au moins /4 (16 adresses)"
 
-#: ../src/virtManager/createnet.py:386
+#: ../src/virtManager/createnet.py:388
 msgid "Check Network Address"
 msgstr "Vérifier l'adresse du réseau"
 
-#: ../src/virtManager/createnet.py:387
+#: ../src/virtManager/createnet.py:389
 msgid ""
 "The network should normally use a private IPv4 address. Use this non-private "
 "address anyway?"
@@ -1352,63 +1348,63 @@
 "Le réseau devrait normalement utiliser une adresse IPv4 privée. Utiliser "
 "tout de même cette adresse non privée ?"
 
-#: ../src/virtManager/createnet.py:401 ../src/virtManager/createnet.py:404
-#: ../src/virtManager/createnet.py:408 ../src/virtManager/createnet.py:412
+#: ../src/virtManager/createnet.py:403 ../src/virtManager/createnet.py:406
+#: ../src/virtManager/createnet.py:410 ../src/virtManager/createnet.py:414
 msgid "Invalid DHCP Address"
 msgstr "Adresse DHCP invalide"
 
-#: ../src/virtManager/createnet.py:402
+#: ../src/virtManager/createnet.py:404
 msgid "The DHCP start address could not be understood"
 msgstr "L'adresse DHCP de départ ne peut pas être interprétée"
 
-#: ../src/virtManager/createnet.py:405
+#: ../src/virtManager/createnet.py:407
 msgid "The DHCP end address could not be understood"
 msgstr "L'adresse DHCP de fin ne peut pas être interprétée"
 
-#: ../src/virtManager/createnet.py:409
+#: ../src/virtManager/createnet.py:411
 #, python-format
 msgid "The DHCP start address is not with the network %s"
 msgstr "L'adresse DHCP de départ n'est pas dans le réseau %s"
 
-#: ../src/virtManager/createnet.py:413
+#: ../src/virtManager/createnet.py:415
 #, python-format
 msgid "The DHCP end address is not with the network %s"
 msgstr "L'adresse DHCP de fin n'est pas dans le réseau %s"
 
-#: ../src/virtManager/createnet.py:423
+#: ../src/virtManager/createnet.py:425
 msgid "Invalid forwarding mode"
 msgstr "Mode de réacheminement invalide"
 
-#: ../src/virtManager/createnet.py:424
+#: ../src/virtManager/createnet.py:426
 msgid "Please select where the traffic should be forwarded"
 msgstr "Veuillez sélectionner vers où le trafic devrait être réacheminé"
 
-#: ../src/virtManager/createpool.py:417
+#: ../src/virtManager/createpool.py:419
 msgid "Choose source path"
 msgstr "Choisissez le chemin d'accès à la source"
 
-#: ../src/virtManager/createpool.py:423
+#: ../src/virtManager/createpool.py:425
 msgid "Choose target directory"
 msgstr "Choisissez le dossier cible"
 
-#: ../src/virtManager/createpool.py:454
+#: ../src/virtManager/createpool.py:456
 msgid "Creating storage pool..."
 msgstr "Création d'une réserve de stockage…"
 
-#: ../src/virtManager/createpool.py:455
+#: ../src/virtManager/createpool.py:457
 msgid "Creating the storage pool may take a while..."
 msgstr "La création de la réserve de stockage peut prendre un moment…"
 
-#: ../src/virtManager/createpool.py:464
+#: ../src/virtManager/createpool.py:466
 #, python-format
 msgid "Error creating pool: %s"
 msgstr "Erreur lors de la création de la réserve : %s"
 
-#: ../src/virtManager/createpool.py:525 ../src/virtManager/createpool.py:550
+#: ../src/virtManager/createpool.py:527 ../src/virtManager/createpool.py:552
 msgid "Pool Parameter Error"
 msgstr "Erreur de paramètre de réserve"
 
-#: ../src/virtManager/createpool.py:556
+#: ../src/virtManager/createpool.py:558
 msgid ""
 "Building a pool of this type will format the source device. Are you sure you "
 "want to 'build' this pool?"
@@ -1416,95 +1412,95 @@
 "Construire une réserve de ce type formatera le périphérique source. Êtes-"
 "vous certains de vouloir construire cette réserve ?"
 
-#: ../src/virtManager/createpool.py:573
+#: ../src/virtManager/createpool.py:575
 msgid "Format the source device."
 msgstr "Formater le périphérique source."
 
-#: ../src/virtManager/createpool.py:575
+#: ../src/virtManager/createpool.py:577
 msgid "Create a logical volume group from the source device."
 msgstr "Créer un groupe de volumes logiques depuis le périphérique source."
 
-#: ../src/virtManager/createvol.py:214
+#: ../src/virtManager/createvol.py:225
 msgid "Creating storage volume..."
 msgstr "Création d'un volume de stockage…"
 
-#: ../src/virtManager/createvol.py:215
+#: ../src/virtManager/createvol.py:226
 msgid "Creating the storage volume may take a while..."
 msgstr "La création du volume de stockage peut prendre un moment…"
 
-#: ../src/virtManager/createvol.py:224
+#: ../src/virtManager/createvol.py:235
 #, python-format
 msgid "Error creating vol: %s"
 msgstr "Erreur lors de la création du volume : %s"
 
-#: ../src/virtManager/createvol.py:258
+#: ../src/virtManager/createvol.py:269
 msgid "Volume Parameter Error"
 msgstr "Erreur de paramètre de volume"
 
-#: ../src/virtManager/delete.py:94
+#: ../src/virtManager/delete.py:96
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../src/virtManager/delete.py:132
+#: ../src/virtManager/delete.py:134
 #, python-format
 msgid "Deleting virtual machine '%s'"
 msgstr "Supprimer la machine virtuelle « %s »"
 
-#: ../src/virtManager/delete.py:166
+#: ../src/virtManager/delete.py:168
 #, python-format
 msgid "Deleting path '%s'"
 msgstr "Supprimer le chemin « %s »"
 
-#: ../src/virtManager/delete.py:177
+#: ../src/virtManager/delete.py:179
 #, python-format
 msgid "Error deleting virtual machine '%s': %s"
 msgstr "Erreur lors de la suppression de la machine virtuelle « %s » : %s"
 
-#: ../src/virtManager/delete.py:193
+#: ../src/virtManager/delete.py:195
 msgid "Additionally, there were errors removing certain storage devices: \n"
 msgstr ""
 "Il y a également eu des erreurs lors du retrait de certains périphériques de "
 "stockage : \n"
 
-#: ../src/virtManager/delete.py:197
+#: ../src/virtManager/delete.py:199
 msgid "Errors encountered while removing certain storage devices."
 msgstr ""
 "Des erreurs sont survenues lors du retrait de certains périphériques de "
 "stockage."
 
-#: ../src/virtManager/delete.py:278
+#: ../src/virtManager/delete.py:280
 msgid "Storage Path"
 msgstr "Chemin de stockage"
 
-#: ../src/virtManager/delete.py:279
+#: ../src/virtManager/delete.py:281
 msgid "Target"
 msgstr "Cible"
 
-#: ../src/virtManager/delete.py:327
+#: ../src/virtManager/delete.py:329
 msgid "Cannot delete iscsi share."
 msgstr "Ne peut supprimer le partage iSCSI."
 
-#: ../src/virtManager/delete.py:330
+#: ../src/virtManager/delete.py:332
 msgid "Cannot delete unmanaged remote storage."
 msgstr "Ne peut supprimer le stockage non-géré distant."
 
-#: ../src/virtManager/delete.py:336
+#: ../src/virtManager/delete.py:338
 msgid "Cannot delete unmanaged block device."
 msgstr "Ne peut supprimer le périphérique bloc non-géré."
 
-#: ../src/virtManager/delete.py:356
+#: ../src/virtManager/delete.py:358
 msgid "Storage is read-only."
 msgstr "Le stockage est en lecture seule."
 
-#: ../src/virtManager/delete.py:358
+#: ../src/virtManager/delete.py:360
 msgid "No write access to path."
 msgstr "Pas d'accès en écriture au chemin."
 
-#: ../src/virtManager/delete.py:361
+#: ../src/virtManager/delete.py:363
 msgid "Storage is marked as shareable."
 msgstr "Le stockage est marqué comme partageable."
 
-#: ../src/virtManager/delete.py:371
+#: ../src/virtManager/delete.py:373
 #, python-format
 msgid ""
 "Storage is in use by the following virtual machines:\n"
@@ -1514,19 +1510,29 @@
 ":\n"
 "- %s "
 
-#: ../src/virtManager/details.py:573
+#: ../src/virtManager/details.py:189
+#, python-format
+msgid "%s:%s"
+msgstr ""
+
+#: ../src/virtManager/details.py:193
+#, python-format
+msgid "Redirected %s"
+msgstr ""
+
+#: ../src/virtManager/details.py:605
 msgid "_Add Hardware"
 msgstr ""
 
-#: ../src/virtManager/details.py:580
+#: ../src/virtManager/details.py:612
 msgid "_Remove Hardware"
 msgstr ""
 
-#: ../src/virtManager/details.py:674
+#: ../src/virtManager/details.py:706
 msgid "Version"
 msgstr ""
 
-#: ../src/virtManager/details.py:709
+#: ../src/virtManager/details.py:767
 msgid ""
 "Static SELinux security type tells libvirt to always start the guest process "
 "with the specified label. The administrator is responsible for making sure "
@@ -1537,7 +1543,7 @@
 "responsable de s'assurer que les images sont correctement étiquetées sur le "
 "disque."
 
-#: ../src/virtManager/details.py:711
+#: ../src/virtManager/details.py:769
 msgid ""
 "The dynamic SELinux security type tells libvirt to automatically pick a "
 "unique label for the guest process and guest image, ensuring total isolation "
@@ -1547,69 +1553,69 @@
 "récupérer une étiquette unique pour le processus invité et l'image invitée, "
 "assurant une totale isolation pour l'invité. (Défaut)"
 
-#: ../src/virtManager/details.py:720
+#: ../src/virtManager/details.py:778
 msgid "Libvirt did not detect NUMA capabilities."
 msgstr "Libvirt n'a pas détecté de capacités NUMA."
 
-#: ../src/virtManager/details.py:728
+#: ../src/virtManager/details.py:786
 msgid "VCPU"
 msgstr "VCPU"
 
-#: ../src/virtManager/details.py:729
+#: ../src/virtManager/details.py:787
 msgid "On CPU"
 msgstr "Sur le CPU"
 
-#: ../src/virtManager/details.py:730
+#: ../src/virtManager/details.py:788
 msgid "Pinning"
 msgstr "Affinités"
 
-#: ../src/virtManager/details.py:987
+#: ../src/virtManager/details.py:1059
 msgid "No text console available"
 msgstr "Aucune console texte disponible"
 
-#: ../src/virtManager/details.py:1059
+#: ../src/virtManager/details.py:1131
 msgid "No graphical console available"
 msgstr "Aucune console graphique disponible"
 
-#: ../src/virtManager/details.py:1064
+#: ../src/virtManager/details.py:1136
 #, python-format
 msgid "Graphical Console %s"
 msgstr "Console graphique %s"
 
-#: ../src/virtManager/details.py:1147
+#: ../src/virtManager/details.py:1226
 msgid "There are unapplied changes. Would you like to apply them now?"
 msgstr ""
 
-#: ../src/virtManager/details.py:1149
+#: ../src/virtManager/details.py:1228
 msgid "Don't warn me again."
 msgstr ""
 
-#: ../src/virtManager/details.py:1221
+#: ../src/virtManager/details.py:1302
 #, python-format
 msgid "Error refreshing hardware page: %s"
 msgstr "Erreur lors du rafraîchissement de la page du matériel : %s"
 
-#: ../src/virtManager/details.py:1280 ../src/virtManager/manager.py:949
+#: ../src/virtManager/details.py:1361 ../src/virtManager/manager.py:975
 msgid "_Restore"
 msgstr "_Restaurer"
 
 #. Build VM context menu
-#: ../src/virtManager/details.py:1282 ../src/virtManager/manager.py:315
-#: ../src/virtManager/manager.py:951 ../src/virtManager/systray.py:166
+#: ../src/virtManager/details.py:1363 ../src/virtManager/manager.py:320
+#: ../src/virtManager/manager.py:977 ../src/virtManager/systray.py:169
 #: ../src/vmm-details.glade.h:5 ../src/vmm-manager.glade.h:19
 msgid "_Run"
 msgstr "_Démarrer"
 
-#: ../src/virtManager/details.py:1394
+#: ../src/virtManager/details.py:1476
 #, python-format
 msgid "Error launching hardware dialog: %s"
 msgstr ""
 
-#: ../src/virtManager/details.py:1466
+#: ../src/virtManager/details.py:1548
 msgid "Save Virtual Machine Screenshot"
 msgstr "Enregistrer la capture d'écran de la machine virtuelle"
 
-#: ../src/virtManager/details.py:1490
+#: ../src/virtManager/details.py:1572
 #, python-format
 msgid ""
 "The screenshot has been saved to:\n"
@@ -1618,253 +1624,269 @@
 "La capture d'écran a été enregistrée dans :\n"
 "%s"
 
-#: ../src/virtManager/details.py:1492
+#: ../src/virtManager/details.py:1574
 msgid "Screenshot saved"
 msgstr "Capture d'écran enregistrée"
 
-#: ../src/virtManager/details.py:1668
-#, python-format
-msgid "Error generating CPU configuration: %s"
-msgstr "Erreur lors de la génération de la configuration du CPU : %s"
+#: ../src/virtManager/details.py:1750
+msgid "Error generating CPU configuration"
+msgstr ""
 
-#: ../src/virtManager/details.py:1702
+#: ../src/virtManager/details.py:1784
 #, python-format
 msgid "Error copying host CPU: %s"
 msgstr "Erreur lors de la copie du CPU de l'hôte : %s"
 
-#: ../src/virtManager/details.py:1837
+#: ../src/virtManager/details.py:1859
 #, python-format
-msgid "Error apply changes: %s"
+msgid "Error disconnecting media: %s"
 msgstr ""
 
-#: ../src/virtManager/details.py:1964
+#: ../src/virtManager/details.py:1878
 #, python-format
-msgid "Error building pin list: %s"
-msgstr "Erreur lors de la construction de la liste des affinités : %s"
+msgid "Error launching media dialog: %s"
+msgstr ""
 
-#: ../src/virtManager/details.py:1970
+#: ../src/virtManager/details.py:1930
 #, python-format
-msgid "Error pinning vcpus: %s"
-msgstr "Erreur lors de la mise en place des affinités des VCPU : %s"
+msgid "Error apply changes: %s"
+msgstr ""
 
-#: ../src/virtManager/details.py:2019
+#: ../src/virtManager/details.py:2061
+msgid "Error building pin list"
+msgstr ""
+
+#: ../src/virtManager/details.py:2067
+msgid "Error pinning vcpus"
+msgstr ""
+
+#: ../src/virtManager/details.py:2116
 #, python-format
 msgid "Error changing autostart value: %s"
 msgstr ""
 "Erreur lors de la modification de la valeur de démarrage automatique : %s"
 
-#: ../src/virtManager/details.py:2037
+#: ../src/virtManager/details.py:2134
 msgid "Cannot set initrd without specifying a kernel path"
 msgstr ""
 
-#: ../src/virtManager/details.py:2040
+#: ../src/virtManager/details.py:2137
 msgid "Cannot set kernel arguments without specifying a kernel path"
 msgstr ""
 
-#: ../src/virtManager/details.py:2047
+#: ../src/virtManager/details.py:2144
 msgid "An init path must be specified"
 msgstr ""
 
-#: ../src/virtManager/details.py:2181
+#: ../src/virtManager/details.py:2278
 #, python-format
 msgid ""
 "You are switching graphics type to %(gtype)s, would you like to %(action)s "
 "Spice agent channels?"
 msgstr ""
 
-#: ../src/virtManager/details.py:2242
+#: ../src/virtManager/details.py:2351
 msgid "Are you sure you want to remove this device?"
 msgstr "Êtes-vous certain de vouloir retirer ce périphérique ?"
 
-#: ../src/virtManager/details.py:2249
+#: ../src/virtManager/details.py:2358
 #, python-format
 msgid "Error Removing Device: %s"
 msgstr "Erreur lors du retrait du périphérique : %s"
 
-#: ../src/virtManager/details.py:2265
+#: ../src/virtManager/details.py:2375
 msgid "Device could not be removed from the running machine"
 msgstr ""
 "Le périphérique ne peut pas être retiré de la machine en cours de "
 "fonctionnement"
 
-#: ../src/virtManager/details.py:2267
+#: ../src/virtManager/details.py:2377
 msgid "This change will take effect after the next guest shutdown."
 msgstr ""
 
-#: ../src/virtManager/details.py:2321
+#: ../src/virtManager/details.py:2431
 #, python-format
 msgid "Error changing VM configuration: %s"
 msgstr "Erreur lors de la modification de la configuration de la MV : %s"
 
-#: ../src/virtManager/details.py:2331
+#: ../src/virtManager/details.py:2441
 msgid "Some changes may require a guest shutdown to take effect."
 msgstr ""
 
-#: ../src/virtManager/details.py:2334
+#: ../src/virtManager/details.py:2444
 msgid "These changes will take effect after the next guest shutdown."
 msgstr ""
 
-#: ../src/virtManager/details.py:2407 ../src/virtManager/details.py:2411
+#: ../src/virtManager/details.py:2517 ../src/virtManager/details.py:2521
 msgid "unknown"
 msgstr ""
 
-#: ../src/virtManager/details.py:2451 ../src/vmm-add-hardware.glade.h:28
+#: ../src/virtManager/details.py:2562 ../src/vmm-add-hardware.glade.h:28
 msgid "Same as host"
 msgstr "Identique à l'hôte"
 
-#: ../src/virtManager/details.py:2551
+#: ../src/virtManager/details.py:2666
 msgid "VCPU info only available for running domain."
 msgstr ""
 "Les informations du VCPU sont uniquement valables pour les domaines en cours "
 "de fonctionnement."
 
-#: ../src/virtManager/details.py:2556
+#: ../src/virtManager/details.py:2671
 #, python-format
 msgid "Error getting VCPU info: %s"
 msgstr "Erreur lors de la récupération des informations du VCPU : %s"
 
-#: ../src/virtManager/details.py:2559
+#: ../src/virtManager/details.py:2674
 msgid "Virtual machine does not support runtime VPCU info."
 msgstr ""
 "La machine virtuelle ne prend pas en charge les informations des VCPU lors "
 "de son fonctionnement."
 
-#: ../src/virtManager/details.py:2790
+#: ../src/virtManager/details.py:2907
 msgid "Xen Mouse"
 msgstr "Souris Xen"
 
-#: ../src/virtManager/details.py:2792
+#: ../src/virtManager/details.py:2909
 msgid "PS/2 Mouse"
 msgstr "Souris PS/2"
 
-#: ../src/virtManager/details.py:2797
+#: ../src/virtManager/details.py:2914
 msgid "Absolute Movement"
 msgstr "Mouvement absolu"
 
-#: ../src/virtManager/details.py:2799
+#: ../src/virtManager/details.py:2916
 msgid "Relative Movement"
 msgstr "Mouvement relatif"
 
-#: ../src/virtManager/details.py:2834
+#: ../src/virtManager/details.py:2951
 msgid "Automatically allocated"
 msgstr "Alloué automatiquement"
 
-#: ../src/virtManager/details.py:2842
+#: ../src/virtManager/details.py:2959
 #, python-format
 msgid "%(graphicstype)s Server"
 msgstr "Serveur %(graphicstype)s"
 
-#: ../src/virtManager/details.py:2865
+#: ../src/virtManager/details.py:2982
 msgid "Local SDL Window"
 msgstr "Fenêtre SDL locale"
 
-#: ../src/virtManager/details.py:2938
+#: ../src/virtManager/details.py:3069
 msgid "Serial Device"
 msgstr "Périphérique série"
 
-#: ../src/virtManager/details.py:2940
+#: ../src/virtManager/details.py:3071
 msgid "Parallel Device"
 msgstr "Périphérique parallèle"
 
-#: ../src/virtManager/details.py:2942
+#: ../src/virtManager/details.py:3073
 msgid "Console Device"
 msgstr "Périphérique console"
 
-#: ../src/virtManager/details.py:2944
+#: ../src/virtManager/details.py:3075
 msgid "Channel Device"
 msgstr "Périphérique channel"
 
-#: ../src/virtManager/details.py:2946
+#: ../src/virtManager/details.py:3077
 #, python-format
 msgid "%s Device"
 msgstr "Périphérique %s"
 
-#: ../src/virtManager/details.py:2951
+#: ../src/virtManager/details.py:3082
 msgid "Primary Console"
 msgstr "Console primaire"
 
-#: ../src/virtManager/details.py:3199
+#: ../src/virtManager/details.py:3155 ../src/virtManager/details.py:3186
+#: ../src/virtManager/details.py:3188 ../src/vmm-add-hardware.glade.h:55
+msgid "Default"
+msgstr ""
+
+#: ../src/virtManager/details.py:3365
 msgid "Tablet"
 msgstr "Tablette"
 
-#: ../src/virtManager/details.py:3202
+#: ../src/virtManager/details.py:3368
 msgid "Mouse"
 msgstr "Souris"
 
-#: ../src/virtManager/details.py:3211
+#: ../src/virtManager/details.py:3377
 #, python-format
 msgid "Display %s"
 msgstr "Affichage %s"
 
-#: ../src/virtManager/details.py:3217
+#: ../src/virtManager/details.py:3383
 #, python-format
 msgid "Sound: %s"
 msgstr "Son : %s"
 
-#: ../src/virtManager/details.py:3245
+#: ../src/virtManager/details.py:3422
 msgid "Video"
 msgstr "Vidéo"
 
-#: ../src/virtManager/details.py:3249
+#: ../src/virtManager/details.py:3426
 msgid "Watchdog"
 msgstr "Chien de garde"
 
-#: ../src/virtManager/details.py:3256
+#: ../src/virtManager/details.py:3437
 #, python-format
 msgid "Controller %s"
 msgstr "Contrôleur %s"
 
-#: ../src/virtManager/details.py:3263
+#: ../src/virtManager/details.py:3444
 #, python-format
 msgid "Filesystem %s"
 msgstr ""
 
-#: ../src/virtManager/domain.py:316
+#: ../src/virtManager/domain.py:327
 #, python-format
 msgid "Could not find specified device in the inactive VM configuration: %s"
 msgstr ""
 "Le périphérique spécifié ne peut pas être trouvé dans la configuration de la "
 "MV inactive : %s"
 
-#: ../src/virtManager/domain.py:374
+#: ../src/virtManager/domain.py:385
 msgid "Cannot rename an active guest"
 msgstr ""
 
-#: ../src/virtManager/domain.py:1048
+#: ../src/virtManager/domain.py:1112
 msgid "Cannot start guest while cloning operation in progress"
 msgstr ""
 "Ne peut démarrer un invité lorsqu'une opération de clonage est en cours"
 
-#: ../src/virtManager/domain.py:1062
+#: ../src/virtManager/domain.py:1131
 msgid "Cannot resume guest while cloning operation in progress"
 msgstr ""
 "Ne peut reprendre un invité lorsqu'une opération de clonage est en cours"
 
-#: ../src/virtManager/domain.py:1077
+#: ../src/virtManager/domain.py:1146
 msgid "Saving domain to disk"
 msgstr "Sauvegarde du domaine sur le disque"
 
-#: ../src/virtManager/domain.py:1121
+#: ../src/virtManager/domain.py:1190
 msgid "Migrating domain"
 msgstr "Migration du domaine"
 
-#: ../src/virtManager/domain.py:1331
+#: ../src/virtManager/domain.py:1400
 msgid "Running"
 msgstr "En cours de fonctionnement"
 
-#: ../src/virtManager/domain.py:1333
+#: ../src/virtManager/domain.py:1402
 msgid "Paused"
 msgstr "Suspendue"
 
-#: ../src/virtManager/domain.py:1335
+#: ../src/virtManager/domain.py:1404
 msgid "Shutting Down"
 msgstr "Extinction"
 
-#: ../src/virtManager/domain.py:1337
+#: ../src/virtManager/domain.py:1407
+msgid "Saved"
+msgstr ""
+
+#: ../src/virtManager/domain.py:1409
 msgid "Shutoff"
 msgstr "Éteinte"
 
-#: ../src/virtManager/domain.py:1339
+#: ../src/virtManager/domain.py:1411
 msgid "Crashed"
 msgstr "Plantée"
 
@@ -2106,7 +2128,7 @@
 msgid "Input Error"
 msgstr "Erreur d'entrée"
 
-#: ../src/virtManager/error.py:193 ../src/vmm-details.glade.h:29
+#: ../src/virtManager/error.py:204 ../src/vmm-details.glade.h:29
 msgid "Details"
 msgstr "Détails"
 
@@ -2114,263 +2136,263 @@
 msgid "Copy Volume Path"
 msgstr "Chemin du volume de copie"
 
-#: ../src/virtManager/host.py:370
+#: ../src/virtManager/host.py:372
 #, python-format
 msgid "%(currentmem)s of %(maxmem)s"
 msgstr "%(currentmem)s sur %(maxmem)s"
 
-#: ../src/virtManager/host.py:384 ../src/virtManager/host.py:385
-#: ../src/virtManager/host.py:386
+#: ../src/virtManager/host.py:386 ../src/virtManager/host.py:387
+#: ../src/virtManager/host.py:388
 msgid "Connection not active."
 msgstr "Connexion inactive."
 
-#: ../src/virtManager/host.py:391
+#: ../src/virtManager/host.py:393
 msgid "Libvirt connection does not support virtual network management."
 msgstr ""
 "La connexion libvirt ne prend pas en charge la gestion du réseau virtuel."
 
-#: ../src/virtManager/host.py:396
+#: ../src/virtManager/host.py:398
 msgid "Libvirt connection does not support storage management."
 msgstr "La connexion libvirt ne prend pas en charge la gestion du stockage."
 
-#: ../src/virtManager/host.py:400
+#: ../src/virtManager/host.py:402
 msgid "Libvirt connection does not support interface management."
 msgstr ""
 "La connexion libvirt ne prend pas en charge la gestion des interfaces."
 
-#: ../src/virtManager/host.py:415
+#: ../src/virtManager/host.py:417
 #, python-format
 msgid "Are you sure you want to permanently delete the network %s?"
 msgstr ""
 "Êtes-vous certain de vouloir supprimer de manière irréversible le réseau %s ?"
 
-#: ../src/virtManager/host.py:422
+#: ../src/virtManager/host.py:424
 #, python-format
 msgid "Error deleting network '%s'"
 msgstr ""
 
-#: ../src/virtManager/host.py:431
+#: ../src/virtManager/host.py:433
 #, python-format
 msgid "Error starting network '%s'"
 msgstr ""
 
-#: ../src/virtManager/host.py:440
+#: ../src/virtManager/host.py:442
 #, python-format
 msgid "Error stopping network '%s'"
 msgstr ""
 
-#: ../src/virtManager/host.py:449
+#: ../src/virtManager/host.py:451
 #, python-format
 msgid "Error launching network wizard: %s"
 msgstr "Erreur lors du lancement de l'assistant du réseau : %s"
 
-#: ../src/virtManager/host.py:461
+#: ../src/virtManager/host.py:463
 #, python-format
 msgid "Error setting net autostart: %s"
 msgstr "Erreur lors de la définition du démarrage automatique du réseau : %s"
 
-#: ../src/virtManager/host.py:468 ../src/virtManager/host.py:539
-#: ../src/virtManager/host.py:740 ../src/virtManager/host.py:789
+#: ../src/virtManager/host.py:470 ../src/virtManager/host.py:541
+#: ../src/virtManager/host.py:742 ../src/virtManager/host.py:791
 msgid "On Boot"
 msgstr "Au démarrage"
 
-#: ../src/virtManager/host.py:469 ../src/virtManager/host.py:539
-#: ../src/virtManager/host.py:573 ../src/virtManager/host.py:741
-#: ../src/virtManager/host.py:789 ../src/virtManager/host.py:829
+#: ../src/virtManager/host.py:471 ../src/virtManager/host.py:541
+#: ../src/virtManager/host.py:575 ../src/virtManager/host.py:743
+#: ../src/virtManager/host.py:791 ../src/virtManager/host.py:831
 msgid "Never"
 msgstr "Jamais"
 
-#: ../src/virtManager/host.py:503
+#: ../src/virtManager/host.py:505
 msgid "No virtual network selected."
 msgstr "Aucun réseau virtuel sélectionné."
 
-#: ../src/virtManager/host.py:513
+#: ../src/virtManager/host.py:515
 #, python-format
 msgid "Error selecting network: %s"
 msgstr "Erreur lors de la sélection du réseau : %s"
 
-#: ../src/virtManager/host.py:581
+#: ../src/virtManager/host.py:583
 msgid "Isolated virtual network"
 msgstr "Réseau virtuel isolé"
 
-#: ../src/virtManager/host.py:614
+#: ../src/virtManager/host.py:616
 #, python-format
 msgid "Error stopping pool '%s'"
 msgstr ""
 
-#: ../src/virtManager/host.py:623
+#: ../src/virtManager/host.py:625
 #, python-format
 msgid "Error starting pool '%s'"
 msgstr ""
 
-#: ../src/virtManager/host.py:630
+#: ../src/virtManager/host.py:632
 #, python-format
 msgid "Are you sure you want to permanently delete the pool %s?"
 msgstr ""
 "Êtes-vous certain de vouloir supprimer de manière irréversible la réserve %s "
 "?"
 
-#: ../src/virtManager/host.py:637
+#: ../src/virtManager/host.py:639
 #, python-format
 msgid "Error deleting pool '%s'"
 msgstr ""
 
-#: ../src/virtManager/host.py:650
+#: ../src/virtManager/host.py:652
 #, python-format
 msgid "Error refreshing pool '%s'"
 msgstr ""
 
-#: ../src/virtManager/host.py:657
+#: ../src/virtManager/host.py:659
 #, python-format
 msgid "Are you sure you want to permanently delete the volume %s?"
 msgstr ""
 "Êtes-vous certain de vouloir supprimer de manière irréversible le volume %s ?"
 
-#: ../src/virtManager/host.py:669
+#: ../src/virtManager/host.py:671
 #, python-format
 msgid "Error refreshing volume '%s'"
 msgstr ""
 
-#: ../src/virtManager/host.py:678
+#: ../src/virtManager/host.py:680
 #, python-format
 msgid "Error launching pool wizard: %s"
 msgstr "Erreur lors du lancement de l'assistant de la réserve : %s"
 
-#: ../src/virtManager/host.py:695 ../src/virtManager/storagebrowse.py:286
+#: ../src/virtManager/host.py:697 ../src/virtManager/storagebrowse.py:289
 #, python-format
 msgid "Error launching volume wizard: %s"
 msgstr "Erreur lors du lancement de l'assistant du volume : %s"
 
-#: ../src/virtManager/host.py:733
+#: ../src/virtManager/host.py:735
 #, python-format
 msgid "Error setting pool autostart: %s"
 msgstr ""
 "Erreur lors de la définition du démarrage automatique de la réserve : %s"
 
-#: ../src/virtManager/host.py:753
+#: ../src/virtManager/host.py:755
 msgid "No storage pool selected."
 msgstr "Aucune réserve de stockage sélectionnée."
 
-#: ../src/virtManager/host.py:763
+#: ../src/virtManager/host.py:765
 #, python-format
 msgid "Error selecting pool: %s"
 msgstr "Erreur lors de la sélection de la réserve de stockage : %s"
 
-#: ../src/virtManager/host.py:903
+#: ../src/virtManager/host.py:914
 #, python-format
 msgid "Are you sure you want to stop the interface '%s'?"
 msgstr "Êtes-vous certain de vouloir arrêter l'interface « %s » ?"
 
-#: ../src/virtManager/host.py:909
+#: ../src/virtManager/host.py:920
 #, python-format
 msgid "Error stopping interface '%s'"
 msgstr ""
 
-#: ../src/virtManager/host.py:918
+#: ../src/virtManager/host.py:929
 #, python-format
 msgid "Are you sure you want to start the interface '%s'?"
 msgstr "Êtes-vous certain de vouloir démarrer l'interface « %s » ?"
 
-#: ../src/virtManager/host.py:924
+#: ../src/virtManager/host.py:935
 #, python-format
 msgid "Error starting interface '%s'"
 msgstr ""
 
-#: ../src/virtManager/host.py:931
+#: ../src/virtManager/host.py:942
 #, python-format
 msgid "Are you sure you want to permanently delete the interface %s?"
 msgstr ""
 "Êtes-vous certain de vouloir supprimer de manière irréversible l'interface "
 "%s ?"
 
-#: ../src/virtManager/host.py:939
+#: ../src/virtManager/host.py:950
 #, python-format
 msgid "Error deleting interface '%s'"
 msgstr ""
 
-#: ../src/virtManager/host.py:948
+#: ../src/virtManager/host.py:959
 #, python-format
 msgid "Error launching interface wizard: %s"
 msgstr "Erreur lors du lancement de l'assistant de l'interface : %s"
 
-#: ../src/virtManager/host.py:981
+#: ../src/virtManager/host.py:992
 #, python-format
 msgid "Error setting interface startmode: %s"
 msgstr ""
 "Erreur lors de la définition du démarrage automatique de l'interface : %s"
 
-#: ../src/virtManager/host.py:1000
+#: ../src/virtManager/host.py:1011
 msgid "No interface selected."
 msgstr "Aucune interface sélectionnée."
 
-#: ../src/virtManager/host.py:1010
+#: ../src/virtManager/host.py:1021
 #, python-format
 msgid "Error selecting interface: %s"
 msgstr "Erreur lors de la sélection de l'interface : %s"
 
-#: ../src/virtManager/manager.py:316 ../src/virtManager/systray.py:153
+#: ../src/virtManager/manager.py:321 ../src/virtManager/systray.py:156
 #: ../src/vmm-details.glade.h:6 ../src/vmm-manager.glade.h:21
 msgid "_Pause"
 msgstr "Sus_pendre"
 
-#: ../src/virtManager/manager.py:317
+#: ../src/virtManager/manager.py:322
 msgid "R_esume"
 msgstr "R_eprendre"
 
-#: ../src/virtManager/manager.py:319 ../src/virtManager/manager.py:322
-#: ../src/virtManager/systray.py:180 ../src/virtManager/systray.py:198
-#: ../src/virtManager/uihelpers.py:830
+#: ../src/virtManager/manager.py:324 ../src/virtManager/manager.py:327
+#: ../src/virtManager/systray.py:183 ../src/virtManager/systray.py:201
+#: ../src/virtManager/uihelpers.py:849
 msgid "_Shut Down"
 msgstr "_Éteindre"
 
 #. Shutdown menu
-#: ../src/virtManager/manager.py:321 ../src/virtManager/systray.py:173
-#: ../src/virtManager/uihelpers.py:824 ../src/vmm-details.glade.h:8
+#: ../src/virtManager/manager.py:326 ../src/virtManager/systray.py:176
+#: ../src/virtManager/uihelpers.py:843 ../src/vmm-details.glade.h:8
 msgid "_Reboot"
 msgstr "_Redémarrer"
 
-#: ../src/virtManager/manager.py:324 ../src/virtManager/systray.py:187
-#: ../src/virtManager/uihelpers.py:836 ../src/vmm-details.glade.h:9
+#: ../src/virtManager/manager.py:329 ../src/virtManager/systray.py:190
+#: ../src/virtManager/uihelpers.py:855 ../src/vmm-details.glade.h:9
 msgid "_Force Off"
 msgstr "_Forcer l'extinction"
 
-#: ../src/virtManager/manager.py:327 ../src/virtManager/uihelpers.py:846
+#: ../src/virtManager/manager.py:332 ../src/virtManager/uihelpers.py:865
 msgid "Sa_ve"
 msgstr "Sau_vegarder"
 
-#: ../src/virtManager/manager.py:330
+#: ../src/virtManager/manager.py:335
 msgid "_Clone..."
 msgstr "_Cloner…"
 
-#: ../src/virtManager/manager.py:331 ../src/vmm-details.glade.h:11
+#: ../src/virtManager/manager.py:336 ../src/vmm-details.glade.h:11
 msgid "_Migrate..."
 msgstr "_Migrer…"
 
-#: ../src/virtManager/manager.py:332
+#: ../src/virtManager/manager.py:337
 msgid "_Delete"
 msgstr "_Supprimer"
 
-#: ../src/virtManager/manager.py:346
+#: ../src/virtManager/manager.py:351
 msgid "D_etails"
 msgstr ""
 
-#: ../src/virtManager/manager.py:409
+#: ../src/virtManager/manager.py:414
 msgid "CPU usage"
 msgstr "Utilisation CPU"
 
-#: ../src/virtManager/manager.py:413
+#: ../src/virtManager/manager.py:418
 msgid "Host CPU usage"
 msgstr ""
 
-#: ../src/virtManager/manager.py:417
+#: ../src/virtManager/manager.py:422
 msgid "Disk I/O"
 msgstr "E/S disque"
 
-#: ../src/virtManager/manager.py:421
+#: ../src/virtManager/manager.py:426
 msgid "Network I/O"
 msgstr "E/S réseau"
 
-#: ../src/virtManager/manager.py:549
+#: ../src/virtManager/manager.py:554
 #, python-format
 msgid ""
 "This will remove the connection:\n"
@@ -2384,43 +2406,69 @@
 "%s\n"
 "Êtes-vous certain ?"
 
-#: ../src/virtManager/manager.py:649
+#: ../src/virtManager/manager.py:654
+#, python-format
 msgid ""
-"Unable to open a connection to the Xen hypervisor/daemon.\n"
+"Unable to connect to libvirt:\n"
 "\n"
-msgstr ""
-"Impossible d'ouvrir une connexion vers l'hyperviseur/démon Xen.\n"
+"%s\n"
 "\n"
-
-#: ../src/virtManager/manager.py:654 ../src/virtManager/manager.py:665
-msgid "Virtual Machine Manager Connection Failure"
-msgstr "Échec de connexion au gestionnaire de machines virtuelles"
+msgstr ""
 
 #: ../src/virtManager/manager.py:657
 msgid ""
-"Unable to open a connection to the libvirt management daemon.\n"
+"Verify that:\n"
+" - A Xen host kernel was booted\n"
+" - The Xen service has been started\n"
+msgstr ""
+
+#: ../src/virtManager/manager.py:667
+msgid ""
+"\n"
+" - The remote netcat understands the '-U' option"
+msgstr ""
+
+#: ../src/virtManager/manager.py:670
+msgid ""
+"Could not detect a local session: if you are \n"
+"running virt-manager over ssh -X or VNC, you \n"
+"may not be able to connect to libvirt as a \n"
+"regular user. Try running as root.\n"
 "\n"
 msgstr ""
-"Impossible d'ouvrir une connexion vers le démon de gestion libvirt.\n"
+
+#: ../src/virtManager/manager.py:675
+msgid "Verify that:\n"
+msgstr "Vérifiez que :\n"
+
+#: ../src/virtManager/manager.py:686
+#, python-format
+msgid ""
+"Libvirt URI is: %s\n"
 "\n"
+msgstr ""
 
-#: ../src/virtManager/manager.py:702
+#: ../src/virtManager/manager.py:690
+msgid "Virtual Machine Manager Connection Failure"
+msgstr "Échec de connexion au gestionnaire de machines virtuelles"
+
+#: ../src/virtManager/manager.py:727
 msgid "Double click to connect"
 msgstr "Double-cliquez pour vous connecter"
 
-#: ../src/virtManager/manager.py:707
+#: ../src/virtManager/manager.py:734
 msgid "Not Connected"
 msgstr "Non connecté"
 
-#: ../src/virtManager/manager.py:709
+#: ../src/virtManager/manager.py:736
 msgid "Connecting..."
 msgstr "Connexion…"
 
-#: ../src/virtManager/manager.py:1103
+#: ../src/virtManager/manager.py:1129
 msgid "Disabled in preferences dialog."
 msgstr "Désactivé dans la boîte de dialogue des préférences."
 
-#: ../src/virtManager/manager.py:1109
+#: ../src/virtManager/manager.py:1135
 msgid " (disabled)"
 msgstr " (désactivé)"
 
@@ -2432,23 +2480,23 @@
 msgid "Media Unknown"
 msgstr "Média inconnu"
 
-#: ../src/virtManager/migrate.py:125
+#: ../src/virtManager/migrate.py:127
 msgid "Migrate"
 msgstr "Migrer"
 
-#: ../src/virtManager/migrate.py:153
+#: ../src/virtManager/migrate.py:155
 msgid "Libvirt version does not support setting downtime."
 msgstr ""
 "La version de libvirt ne prend pas en charge la définition du temps "
 "d'indisponibilité."
 
-#: ../src/virtManager/migrate.py:169
+#: ../src/virtManager/migrate.py:171
 msgid "Libvirt version does not support tunnelled migration."
 msgstr ""
 "La version de libvirt ne prend pas en charge la migration au travers d'un "
 "tunnel."
 
-#: ../src/virtManager/migrate.py:186
+#: ../src/virtManager/migrate.py:188
 msgid "A valid destination connection must be selected."
 msgstr "Une connexion de destination valide doit être sélectionnée."
 
@@ -2457,7 +2505,7 @@
 #. /etc/hosts is likely borked and the only hostname it will
 #. give us is localhost. Remember, the dest machine can actually
 #. be our local machine so we may not already know its hostname
-#: ../src/virtManager/migrate.py:267
+#: ../src/virtManager/migrate.py:269
 msgid ""
 "Could not determine remotely accessible hostname for destination connection."
 msgstr ""
@@ -2492,23 +2540,23 @@
 msgid "Port must be greater than 0."
 msgstr "Le port doit être plus grand que 0."
 
-#: ../src/virtManager/migrate.py:482
+#: ../src/virtManager/migrate.py:483
 #, python-format
 msgid "Migrating VM '%s'"
 msgstr "Migration de la MV « %s »"
 
-#: ../src/virtManager/migrate.py:483
+#: ../src/virtManager/migrate.py:484
 #, python-format
 msgid "Migrating VM '%s' from %s to %s. This may take awhile."
 msgstr ""
 "Migration de la MV « %s » de %s vers %s. Cela peut prendre quelques instants."
 
-#: ../src/virtManager/migrate.py:495
+#: ../src/virtManager/migrate.py:496
 #, python-format
 msgid "Unable to migrate guest: %s"
 msgstr "Impossible de migrer l'invité : %s"
 
-#: ../src/virtManager/migrate.py:527
+#: ../src/virtManager/migrate.py:528
 #, python-format
 msgid "Error cancelling migrate job: %s"
 msgstr "Erreur lors de l'annulation de l'opération de migration : %s"
@@ -2531,17 +2579,11 @@
 msgid "Isolated network"
 msgstr "Réseau isolé"
 
-#: ../src/virtManager/preferences.py:178
-msgid "Installed version of GTK-VNC doesn't support configurable grab keys"
-msgstr ""
-"La version de GTK-VNC installée ne prend pas en charge les touches "
-"d'appropriation configurables"
-
-#: ../src/virtManager/preferences.py:234
+#: ../src/virtManager/preferences.py:248
 msgid "Configure grab key combination"
 msgstr "Configurer la combinaison des touches d'appropriation"
 
-#: ../src/virtManager/preferences.py:243
+#: ../src/virtManager/preferences.py:257
 msgid ""
 "You can now define grab keys by pressing them.\n"
 "To confirm your selection please click OK button\n"
@@ -2552,55 +2594,63 @@
 "Pour confirmer votre sélection, cliquez sur le bouton « Valider »\n"
 "lorsque vous aurez appuyé sur les touches désirées."
 
-#: ../src/virtManager/preferences.py:246
+#: ../src/virtManager/preferences.py:260
 msgid "Please press desired grab key combination"
 msgstr ""
 "Veuillez appuyer sur la combinaison désirée pour les touches d'appropriation"
 
-#: ../src/virtManager/serialcon.py:259
+#: ../src/virtManager/serialcon.py:195
+msgid "Cannot open a device with no alias name"
+msgstr ""
+
+#: ../src/virtManager/serialcon.py:267
 msgid "Serial console not yet supported over remote connection"
 msgstr ""
 
-#: ../src/virtManager/serialcon.py:262
+#: ../src/virtManager/serialcon.py:270
 msgid "Serial console not available for inactive guest"
 msgstr ""
 
-#: ../src/virtManager/serialcon.py:264
+#: ../src/virtManager/serialcon.py:272
 #, python-format
 msgid "Console for device type '%s' not yet supported"
 msgstr ""
 
-#: ../src/virtManager/serialcon.py:269
+#: ../src/virtManager/serialcon.py:277
 #, python-format
 msgid "Can not access console path '%s'"
 msgstr ""
 
-#: ../src/virtManager/serialcon.py:371
+#: ../src/virtManager/serialcon.py:381
+msgid "vte2 is required for text console support"
+msgstr ""
+
+#: ../src/virtManager/serialcon.py:388
 #, python-format
 msgid "Error connecting to text console: %s"
 msgstr ""
 
-#: ../src/virtManager/storagebrowse.py:133
+#: ../src/virtManager/storagebrowse.py:135
 msgid "Size"
 msgstr "Taille"
 
-#: ../src/virtManager/storagebrowse.py:141 ../src/vmm-create-pool.glade.h:18
+#: ../src/virtManager/storagebrowse.py:143 ../src/vmm-create-pool.glade.h:18
 msgid "Format"
 msgstr "Format"
 
-#: ../src/virtManager/storagebrowse.py:149
+#: ../src/virtManager/storagebrowse.py:151
 msgid "Used By"
 msgstr "Utilisé par"
 
-#: ../src/virtManager/storagebrowse.py:189
+#: ../src/virtManager/storagebrowse.py:191
 msgid "Cannot use local storage on remote connection."
 msgstr "Ne peut utiliser un stockage local sur une connexion distante."
 
-#: ../src/virtManager/systray.py:159
+#: ../src/virtManager/systray.py:162
 msgid "_Resume"
 msgstr "_Reprendre"
 
-#: ../src/virtManager/systray.py:332 ../src/virtManager/systray.py:384
+#: ../src/virtManager/systray.py:335 ../src/virtManager/systray.py:387
 msgid "No virtual machines"
 msgstr "Aucune machine virtuelle"
 
@@ -2637,53 +2687,53 @@
 msgstr "La réserve de stockage « %s » ne peut pas être démarrée : %s"
 
 #. [xml value, label]
-#: ../src/virtManager/uihelpers.py:289
+#: ../src/virtManager/uihelpers.py:308
 msgid "Hypervisor default"
 msgstr "Par défaut pour l'hyperviseur"
 
-#: ../src/virtManager/uihelpers.py:393
+#: ../src/virtManager/uihelpers.py:412
 msgid "Usermode networking"
 msgstr "Réseau en mode utilisateur"
 
-#: ../src/virtManager/uihelpers.py:399
+#: ../src/virtManager/uihelpers.py:418
 msgid "Virtual network"
 msgstr "Réseau virtuel"
 
-#: ../src/virtManager/uihelpers.py:525
+#: ../src/virtManager/uihelpers.py:544
 msgid "No virtual networks available"
 msgstr "Aucun réseau virtuel disponible"
 
-#: ../src/virtManager/uihelpers.py:547
+#: ../src/virtManager/uihelpers.py:566
 msgid "(Empty bridge)"
 msgstr "(Pont vide)"
 
-#: ../src/virtManager/uihelpers.py:554
+#: ../src/virtManager/uihelpers.py:573
 msgid "macvtap"
 msgstr ""
 
-#: ../src/virtManager/uihelpers.py:557
+#: ../src/virtManager/uihelpers.py:576
 msgid "Not bridged"
 msgstr "Non ponté"
 
-#: ../src/virtManager/uihelpers.py:559
+#: ../src/virtManager/uihelpers.py:578
 #, python-format
 msgid "Host device %s %s"
 msgstr "Périphérique hôte %s %s"
 
-#: ../src/virtManager/uihelpers.py:597
+#: ../src/virtManager/uihelpers.py:616
 msgid "No networking"
 msgstr ""
 
 #. After all is said and done, add a manual bridge option
-#: ../src/virtManager/uihelpers.py:602
+#: ../src/virtManager/uihelpers.py:621
 msgid "Specify shared device name"
 msgstr "Spécifiez le nom du périphérique partagé"
 
-#: ../src/virtManager/uihelpers.py:621
+#: ../src/virtManager/uihelpers.py:640
 msgid "Virtual Network is not active."
 msgstr "Le réseau virtuel n'est pas actif."
 
-#: ../src/virtManager/uihelpers.py:622
+#: ../src/virtManager/uihelpers.py:641
 #, python-format
 msgid ""
 "Virtual Network '%s' is not active. Would you like to start the network now?"
@@ -2691,56 +2741,56 @@
 "Le réseau virtuel « %s » n'est pas actif. Souhaitez-vous le démarrer "
 "maintenant ?"
 
-#: ../src/virtManager/uihelpers.py:634
+#: ../src/virtManager/uihelpers.py:653
 #, python-format
 msgid "Could not start virtual network '%s': %s"
 msgstr "Le réseau virtuel « %s » ne peut pas être démarré : %s"
 
-#: ../src/virtManager/uihelpers.py:657
+#: ../src/virtManager/uihelpers.py:676
 msgid "Error with network parameters."
 msgstr "Erreur de paramètre réseau."
 
-#: ../src/virtManager/uihelpers.py:662 ../src/virtManager/uihelpers.py:664
+#: ../src/virtManager/uihelpers.py:681 ../src/virtManager/uihelpers.py:683
 msgid "Mac address collision."
 msgstr "Collision d'adresses MAC."
 
-#: ../src/virtManager/uihelpers.py:665
+#: ../src/virtManager/uihelpers.py:684
 #, python-format
 msgid "%s Are you sure you want to use this address?"
 msgstr "Êtes-vous certain de vouloir utiliser l'adresse « %s » ?"
 
-#: ../src/virtManager/uihelpers.py:717
+#: ../src/virtManager/uihelpers.py:736
 msgid "No device present"
 msgstr "Aucun périphérique présent"
 
-#: ../src/virtManager/uihelpers.py:874
+#: ../src/virtManager/uihelpers.py:893
 #, python-format
 msgid "The emulator may not have search permissions for the path '%s'."
 msgstr ""
 "L'émulateur peut ne pas avoir les permissions de recherche pour le chemin « "
 "%s »."
 
-#: ../src/virtManager/uihelpers.py:876
+#: ../src/virtManager/uihelpers.py:895
 msgid "Do you want to correct this now?"
 msgstr "Voulez-vous corriger ceci maintenant ?"
 
-#: ../src/virtManager/uihelpers.py:877 ../src/virtManager/uihelpers.py:901
+#: ../src/virtManager/uihelpers.py:896 ../src/virtManager/uihelpers.py:920
 msgid "Don't ask about these directories again."
 msgstr "Ne plus demander à propos de ces dossiers."
 
-#: ../src/virtManager/uihelpers.py:890
+#: ../src/virtManager/uihelpers.py:909
 msgid ""
 "Errors were encountered changing permissions for the following directories:"
 msgstr ""
 "Des erreurs ont été rencontrées lors de la modification des permissions pour "
 "les dossiers suivants :"
 
-#: ../src/virtManager/util.py:69
+#: ../src/virtManager/util.py:71
 #, python-format
 msgid "Couldn't create default storage pool '%s': %s"
 msgstr "N'a pas pu créer la réserve de stockage par défaut « %s » : %s"
 
-#: ../src/virtManager/util.py:378
+#: ../src/virtManager/util.py:384
 msgid "Don't ask me again"
 msgstr ""
 
@@ -2795,9 +2845,9 @@
 msgid "Select _managed or other existing storage"
 msgstr "Sélectionner un stockage _géré ou un autre stockage existant"
 
-#: ../src/vmm-add-hardware.glade.h:7 ../src/vmm-create.glade.h:29
-msgid "B_rowse..."
-msgstr "Pa_rcourir…"
+#: ../src/vmm-add-hardware.glade.h:7 ../src/vmm-create.glade.h:19
+msgid "Bro_wse..."
+msgstr "_Parcourir…"
 
 #: ../src/vmm-add-hardware.glade.h:8
 msgid "Device Type Field"
@@ -2807,13 +2857,13 @@
 msgid "_Device type:"
 msgstr "Type de _périphérique :"
 
-#: ../src/vmm-add-hardware.glade.h:10
-msgid "Cache _mode:"
-msgstr "_Mode de cache :"
+#: ../src/vmm-add-hardware.glade.h:10 ../src/vmm-details.glade.h:129
+msgid "Cac_he mode:"
+msgstr "Mode de cac_he :"
 
 #: ../src/vmm-add-hardware.glade.h:11
-msgid "Storage _format:"
-msgstr "_Format de stockage :"
+msgid "S_torage format:"
+msgstr ""
 
 #: ../src/vmm-add-hardware.glade.h:12
 msgid ""
@@ -2844,7 +2894,7 @@
 msgstr "Périphérique _hôte :"
 
 #: ../src/vmm-add-hardware.glade.h:18 ../src/vmm-create.glade.h:57
-#: ../src/vmm-details.glade.h:136
+#: ../src/vmm-details.glade.h:138
 msgid "_Bridge name:"
 msgstr "Nom du _pont :"
 
@@ -2890,7 +2940,7 @@
 msgid "Listen on all public network interfaces "
 msgstr "Écouter toutes les interfaces de réseau publiques "
 
-#: ../src/vmm-add-hardware.glade.h:27 ../src/vmm-details.glade.h:149
+#: ../src/vmm-add-hardware.glade.h:27 ../src/vmm-details.glade.h:151
 msgid "_Keymap:"
 msgstr "Disposition du _clavier :"
 
@@ -2937,9 +2987,11 @@
 msgid "<b>Character Device</b>"
 msgstr "<b>Périphérique à caractères</b>"
 
-#: ../src/vmm-add-hardware.glade.h:39 ../src/vmm-host.glade.h:19
-msgid "Name:"
-msgstr "Nom :"
+#: ../src/vmm-add-hardware.glade.h:39 ../src/vmm-create-interface.glade.h:35
+#: ../src/vmm-create-pool.glade.h:5 ../src/vmm-create-vol.glade.h:5
+#: ../src/vmm-create.glade.h:5 ../src/vmm-details.glade.h:48
+msgid "_Name:"
+msgstr "_Nom :"
 
 #: ../src/vmm-add-hardware.glade.h:40
 msgid "Use Te_lnet:"
@@ -2971,7 +3023,7 @@
 msgstr "<b>Paramètres de périphérique</b>"
 
 #: ../src/vmm-add-hardware.glade.h:47 ../src/vmm-create-pool.glade.h:17
-#: ../src/vmm-details.glade.h:150
+#: ../src/vmm-details.glade.h:64
 msgid "label"
 msgstr "étiquette"
 
@@ -3001,25 +3053,41 @@
 "access in the guest."
 msgstr ""
 
-#: ../src/vmm-add-hardware.glade.h:55
-msgid "Default"
+#: ../src/vmm-add-hardware.glade.h:56
+msgid "_Driver:"
 msgstr ""
 
-#: ../src/vmm-add-hardware.glade.h:56
+#: ../src/vmm-add-hardware.glade.h:57
+msgid "_Write Policy:"
+msgstr ""
+
+#: ../src/vmm-add-hardware.glade.h:58
 msgid "Ta_rget path:"
 msgstr ""
 
-#: ../src/vmm-add-hardware.glade.h:57 ../src/vmm-choose-cd.glade.h:2
+#: ../src/vmm-add-hardware.glade.h:59
+msgid "E_xport filesystem as readonly mount"
+msgstr ""
+
+#: ../src/vmm-add-hardware.glade.h:60 ../src/vmm-choose-cd.glade.h:2
 #: ../src/vmm-clone.glade.h:12
 msgid "_Browse..."
 msgstr "_Parcourir…"
 
-#: ../src/vmm-add-hardware.glade.h:58
+#: ../src/vmm-add-hardware.glade.h:61
 msgid ""
 "Please indicate what smartcard device mode to connect to the virtual machine."
 msgstr ""
 
-#: ../src/vmm-add-hardware.glade.h:59 ../src/vmm-create-interface.glade.h:44
+#: ../src/vmm-add-hardware.glade.h:62
+msgid "Please indicate the parameters of the redirected device."
+msgstr ""
+
+#: ../src/vmm-add-hardware.glade.h:63
+msgid "_Host:"
+msgstr ""
+
+#: ../src/vmm-add-hardware.glade.h:64 ../src/vmm-create-interface.glade.h:44
 #: ../src/vmm-create-net.glade.h:56 ../src/vmm-create-pool.glade.h:19
 #: ../src/vmm-create-vol.glade.h:25 ../src/vmm-create.glade.h:63
 msgid "_Finish"
@@ -3270,12 +3338,6 @@
 msgid "_Interface type:"
 msgstr "Type d'_interface :"
 
-#: ../src/vmm-create-interface.glade.h:35 ../src/vmm-create-pool.glade.h:5
-#: ../src/vmm-create-vol.glade.h:5 ../src/vmm-create.glade.h:5
-#: ../src/vmm-details.glade.h:48
-msgid "_Name:"
-msgstr "_Nom :"
-
 #: ../src/vmm-create-interface.glade.h:36
 msgid "_Start mode:"
 msgstr "_Mode de démarrage :"
@@ -3392,7 +3454,7 @@
 msgstr ""
 "Vous devrez choisir un espace d'adressage IPv4 pour le réseau virtuel :"
 
-#: ../src/vmm-create-net.glade.h:18 ../src/vmm-details.glade.h:68
+#: ../src/vmm-create-net.glade.h:18 ../src/vmm-details.glade.h:70
 msgid "Type:"
 msgstr "Type :"
 
@@ -3645,7 +3707,7 @@
 msgstr "espace disponible :"
 
 #: ../src/vmm-create-vol.glade.h:8 ../src/vmm-create.glade.h:42
-#: ../src/vmm-details.glade.h:104
+#: ../src/vmm-details.glade.h:106
 msgid "MB"
 msgstr "Mo"
 
@@ -3747,10 +3809,6 @@
 msgid "Use _ISO image:"
 msgstr "Utiliser une image _ISO :"
 
-#: ../src/vmm-create.glade.h:19
-msgid "Bro_wse..."
-msgstr "_Parcourir…"
-
 #: ../src/vmm-create.glade.h:20
 msgid "ISO"
 msgstr "ISO"
@@ -3787,6 +3845,10 @@
 msgid "Provide the existing storage path:"
 msgstr "Fournissez le chemin de stockage existant :"
 
+#: ../src/vmm-create.glade.h:29
+msgid "B_rowse..."
+msgstr "Pa_rcourir…"
+
 #: ../src/vmm-create.glade.h:30
 msgid "Provide the _application path:"
 msgstr ""
@@ -4111,30 +4173,34 @@
 msgstr "Décalage de l'hor_loge"
 
 #: ../src/vmm-details.glade.h:63
+msgid "Machine _Type: "
+msgstr ""
+
+#: ../src/vmm-details.glade.h:65
 msgid "<b>Machine Settings</b>"
 msgstr "<b>Paramètres de la machine</b>"
 
-#: ../src/vmm-details.glade.h:64
+#: ../src/vmm-details.glade.h:66
 msgid "_Label:"
 msgstr "_Étiquette :"
 
-#: ../src/vmm-details.glade.h:65
+#: ../src/vmm-details.glade.h:67
 msgid "D_ynamic"
 msgstr "D_ynamique"
 
-#: ../src/vmm-details.glade.h:66
+#: ../src/vmm-details.glade.h:68
 msgid "_Static"
 msgstr "_Statique"
 
-#: ../src/vmm-details.glade.h:67
+#: ../src/vmm-details.glade.h:69
 msgid "M_odel:"
 msgstr "M_odèle :"
 
-#: ../src/vmm-details.glade.h:69
+#: ../src/vmm-details.glade.h:71
 msgid "<b>Security</b>"
 msgstr "<b>Sécurité</b>"
 
-#: ../src/vmm-details.glade.h:70
+#: ../src/vmm-details.glade.h:72
 msgid ""
 "CPU\n"
 "usage:"
@@ -4142,7 +4208,7 @@
 "Utilisation\n"
 "CPU :"
 
-#: ../src/vmm-details.glade.h:72
+#: ../src/vmm-details.glade.h:74
 msgid ""
 "Memory\n"
 "usage:"
@@ -4150,7 +4216,7 @@
 "Utilisation\n"
 "mémoire :"
 
-#: ../src/vmm-details.glade.h:74
+#: ../src/vmm-details.glade.h:76
 msgid ""
 "Disk\n"
 "I/O:"
@@ -4158,7 +4224,7 @@
 "E/S\n"
 "disque :"
 
-#: ../src/vmm-details.glade.h:76
+#: ../src/vmm-details.glade.h:78
 msgid ""
 "Network\n"
 "I/O:"
@@ -4166,7 +4232,7 @@
 "E/S\n"
 "Réseau :"
 
-#: ../src/vmm-details.glade.h:78
+#: ../src/vmm-details.glade.h:80
 msgid ""
 "0 KBytes/s\n"
 "0KBytes/s"
@@ -4174,213 +4240,209 @@
 "0 Ko/s\n"
 "0 Ko/s"
 
-#: ../src/vmm-details.glade.h:80 ../src/vmm-host.glade.h:17
+#: ../src/vmm-details.glade.h:82 ../src/vmm-host.glade.h:17
 msgid "<b>Performance</b>"
 msgstr "<b>Performance</b>"
 
-#: ../src/vmm-details.glade.h:81
+#: ../src/vmm-details.glade.h:83
 msgid "Logical host CPUs:"
 msgstr "Unités centrales logiques hébergées :"
 
-#: ../src/vmm-details.glade.h:82
+#: ../src/vmm-details.glade.h:84
 msgid "Maximum allocation:"
 msgstr "Allocation maximale :"
 
-#: ../src/vmm-details.glade.h:83
+#: ../src/vmm-details.glade.h:85
 msgid "Current a_llocation:"
 msgstr "A_llocation actuelle :"
 
-#: ../src/vmm-details.glade.h:84
+#: ../src/vmm-details.glade.h:86
 msgid "Virtual CPU Select"
 msgstr "Sélection des CPU virtuelles"
 
-#: ../src/vmm-details.glade.h:85
+#: ../src/vmm-details.glade.h:87
 msgid "<small>Overcommitting vCPUs can hurt performance</small>"
 msgstr ""
 "<small>L'utilisation d'un nombre trop important de VCPU peut affecter la "
 "performance</small>"
 
-#: ../src/vmm-details.glade.h:86
+#: ../src/vmm-details.glade.h:88
 msgid "<b>CPUs</b>"
 msgstr "<b>CPU</b>"
 
-#: ../src/vmm-details.glade.h:87
+#: ../src/vmm-details.glade.h:89
 msgid "Model:"
 msgstr "Modèle :"
 
-#: ../src/vmm-details.glade.h:88
+#: ../src/vmm-details.glade.h:90
 msgid "Copy host CPU configuration"
 msgstr "Copier la configuration CPU de l'hôte"
 
-#: ../src/vmm-details.glade.h:89
+#: ../src/vmm-details.glade.h:91
 msgid "<b>CPU Features</b>"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:90
+#: ../src/vmm-details.glade.h:92
 msgid "<b>Configuration</b>"
 msgstr "<b>Configuration</b>"
 
-#: ../src/vmm-details.glade.h:91
+#: ../src/vmm-details.glade.h:93
 msgid "Manually set CPU topology"
 msgstr "Définir manuellement la topologie CPU"
 
-#: ../src/vmm-details.glade.h:92
+#: ../src/vmm-details.glade.h:94
 msgid "Threads:"
 msgstr "Threads :"
 
-#: ../src/vmm-details.glade.h:93
+#: ../src/vmm-details.glade.h:95
 msgid "Cores:"
 msgstr "Cœurs :"
 
-#: ../src/vmm-details.glade.h:94
+#: ../src/vmm-details.glade.h:96
 msgid "Sockets:"
 msgstr "Sockets :"
 
-#: ../src/vmm-details.glade.h:95
+#: ../src/vmm-details.glade.h:97
 msgid "<b>Topology</b>"
 msgstr "<b>Topologie</b>"
 
-#: ../src/vmm-details.glade.h:96
+#: ../src/vmm-details.glade.h:98
 msgid "Default _pinning:"
 msgstr "_Affinités initiales :"
 
-#: ../src/vmm-details.glade.h:97
+#: ../src/vmm-details.glade.h:99
 msgid "Virtual CPU Affinity Select"
 msgstr "Sélection de l'affinité des CPU virtuelles"
 
-#: ../src/vmm-details.glade.h:98
+#: ../src/vmm-details.glade.h:100
 msgid "Generate from host _NUMA configuration"
 msgstr "Générer à partir de la configuration _NUMA de l'hôte"
 
-#: ../src/vmm-details.glade.h:99
+#: ../src/vmm-details.glade.h:101
 msgid "R_untime pinning:"
 msgstr "Affinités lors de l'exéc_ution :"
 
-#: ../src/vmm-details.glade.h:100
+#: ../src/vmm-details.glade.h:102
 msgid "<b>Pinning</b>"
 msgstr "<b>Affinités</b>"
 
-#: ../src/vmm-details.glade.h:101
+#: ../src/vmm-details.glade.h:103
 msgid "Ma_ximum allocation:"
 msgstr "Allocation ma_ximale :"
 
-#: ../src/vmm-details.glade.h:102
+#: ../src/vmm-details.glade.h:104
 msgid "Total host memory:"
 msgstr "Mémoire totale de l'hôte :"
 
-#: ../src/vmm-details.glade.h:103
+#: ../src/vmm-details.glade.h:105
 msgid "Memory Select"
 msgstr "Sélection de la mémoire"
 
-#: ../src/vmm-details.glade.h:105
+#: ../src/vmm-details.glade.h:107
 msgid "Max Memory Select"
 msgstr "Sélection de la mémoire maximale"
 
-#: ../src/vmm-details.glade.h:106
+#: ../src/vmm-details.glade.h:108
 msgid "<b>Memory</b>"
 msgstr "<b>Mémoire</b>"
 
-#: ../src/vmm-details.glade.h:107
+#: ../src/vmm-details.glade.h:109
 msgid "Start virt_ual machine on host boot up"
 msgstr "Démarrer la machine virt_uelle au démarrage de l'hôte"
 
-#: ../src/vmm-details.glade.h:108
+#: ../src/vmm-details.glade.h:110
 msgid "<b>Autostart</b>"
 msgstr "<b>Démarrage automatique</b>"
 
-#: ../src/vmm-details.glade.h:109
+#: ../src/vmm-details.glade.h:111
 msgid "Enable boot me_nu"
 msgstr "Activer le me_nu de démarrage"
 
-#: ../src/vmm-details.glade.h:110
+#: ../src/vmm-details.glade.h:112
 msgid "<b>Boot device order</b>"
 msgstr "<b>Ordre des périphériques de démarrage</b>"
 
-#: ../src/vmm-details.glade.h:111
+#: ../src/vmm-details.glade.h:113
 msgid "Kernel path:"
 msgstr "Chemin du noyau :"
 
-#: ../src/vmm-details.glade.h:112
+#: ../src/vmm-details.glade.h:114
 msgid "Initrd path:"
 msgstr "Chemin du fichier initrd :"
 
-#: ../src/vmm-details.glade.h:113
+#: ../src/vmm-details.glade.h:115
 msgid "Browse"
 msgstr "Parcourir"
 
-#: ../src/vmm-details.glade.h:114
+#: ../src/vmm-details.glade.h:116
 msgid "Kernel arguments:"
 msgstr "Arguments du noyau :"
 
-#: ../src/vmm-details.glade.h:115
+#: ../src/vmm-details.glade.h:117
 msgid "<b>Direct kernel boot</b>"
 msgstr "<b>Démarrage direct sur le noyau</b>"
 
-#: ../src/vmm-details.glade.h:116
+#: ../src/vmm-details.glade.h:118
 msgid "Init path:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:117
+#: ../src/vmm-details.glade.h:119
 msgid "<b>Container init</b>"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:118
+#: ../src/vmm-details.glade.h:120
 msgid "R_eadonly:"
 msgstr "L_ecture seule"
 
-#: ../src/vmm-details.glade.h:119
+#: ../src/vmm-details.glade.h:121
 msgid "Sharea_ble:"
 msgstr "Partagea_ble :"
 
-#: ../src/vmm-details.glade.h:120
+#: ../src/vmm-details.glade.h:122
 msgid "Target device:"
 msgstr "Périphérique cible :"
 
-#: ../src/vmm-details.glade.h:121
+#: ../src/vmm-details.glade.h:123
 msgid "Source path:"
 msgstr "Chemin d'accès à la source :"
 
-#: ../src/vmm-details.glade.h:122
+#: ../src/vmm-details.glade.h:124
 msgid "Connect or disconnect media"
 msgstr "Connecter ou déconnecter le média"
 
-#: ../src/vmm-details.glade.h:123
+#: ../src/vmm-details.glade.h:125
 msgid "Storage size:"
 msgstr "Taille de stockage :"
 
-#: ../src/vmm-details.glade.h:124
+#: ../src/vmm-details.glade.h:126
 msgid "Storage forma_t:"
 msgstr "Forma_t de stockage :"
 
-#: ../src/vmm-details.glade.h:125
+#: ../src/vmm-details.glade.h:127
 msgid "Disk b_us:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:126
+#: ../src/vmm-details.glade.h:128
 msgid "Serial num_ber:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:127
-msgid "Cac_he mode:"
-msgstr "Mode de cac_he :"
-
-#: ../src/vmm-details.glade.h:128
+#: ../src/vmm-details.glade.h:130
 msgid "_IO mode:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:129
+#: ../src/vmm-details.glade.h:131
 msgid "_Performance options"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:130
+#: ../src/vmm-details.glade.h:132
 msgid "Advanced _options"
 msgstr "_Options avancées"
 
-#: ../src/vmm-details.glade.h:131
+#: ../src/vmm-details.glade.h:133
 msgid "<b>Virtual Disk</b>"
 msgstr "<b>Disque virtuel</b>"
 
-#: ../src/vmm-details.glade.h:132
+#: ../src/vmm-details.glade.h:134
 msgid ""
 "<b>Tip:</b> 'source' refers to information seen from the host OS, while "
 "'target' refers to information seen from the guest OS"
@@ -4389,55 +4451,55 @@
 "système d'exploitation hôte alors que « cible » fait référence au nom du "
 "périphérique vu par le système d'exploitation invité"
 
-#: ../src/vmm-details.glade.h:133
+#: ../src/vmm-details.glade.h:135
 msgid "Source device:"
 msgstr "Périphérique source :"
 
-#: ../src/vmm-details.glade.h:134
+#: ../src/vmm-details.glade.h:136
 msgid "MAC address:"
 msgstr "Adresse MAC :"
 
-#: ../src/vmm-details.glade.h:135
+#: ../src/vmm-details.glade.h:137
 msgid "Device m_odel:"
 msgstr "M_odèle de périphérique :"
 
-#: ../src/vmm-details.glade.h:137
+#: ../src/vmm-details.glade.h:139
 msgid "Source mode:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:138
+#: ../src/vmm-details.glade.h:140
 msgid "<b>Virtual Network Interface</b>"
 msgstr "<b>Interface réseau virtuelle</b>"
 
-#: ../src/vmm-details.glade.h:139
+#: ../src/vmm-details.glade.h:141
 msgid "Instance id:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:140
+#: ../src/vmm-details.glade.h:142
 msgid "Typeid version:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:141
+#: ../src/vmm-details.glade.h:143
 msgid "Typeid:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:142
+#: ../src/vmm-details.glade.h:144
 msgid "Managerid:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:143
+#: ../src/vmm-details.glade.h:145
 msgid "Virtual port"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:144 ../src/vmm-host.glade.h:50
+#: ../src/vmm-details.glade.h:146 ../src/vmm-host.glade.h:50
 msgid "Mode:"
 msgstr "Mode :"
 
-#: ../src/vmm-details.glade.h:145
+#: ../src/vmm-details.glade.h:147
 msgid "<b>Virtual Pointer</b>"
 msgstr "<b>Pointeur virtuel</b>"
 
-#: ../src/vmm-details.glade.h:146
+#: ../src/vmm-details.glade.h:148
 msgid ""
 "<b>Tip:</b> A graphics tablet configured as the default pointer in the guest "
 "OS will ensure that the virtual cursor moves in sync with the local desktop "
@@ -4448,90 +4510,114 @@
 "virtuel s'effectuent de manière synchronisée avec le curseur du bureau "
 "local.</small>"
 
-#: ../src/vmm-details.glade.h:147
+#: ../src/vmm-details.glade.h:149
 msgid "Port:"
 msgstr "Port :"
 
-#: ../src/vmm-details.glade.h:148 ../src/vmm-host.glade.h:51
+#: ../src/vmm-details.glade.h:150 ../src/vmm-host.glade.h:51
 msgid "Address:"
 msgstr "Adresse :"
 
-#: ../src/vmm-details.glade.h:151
+#: ../src/vmm-details.glade.h:152
 msgid "TLS Port:"
 msgstr "Port TLS :"
 
-#: ../src/vmm-details.glade.h:152
+#: ../src/vmm-details.glade.h:153
 msgid "<b>Sound Device</b>"
 msgstr "<b>Périphérique son</b>"
 
-#: ../src/vmm-details.glade.h:153
+#: ../src/vmm-details.glade.h:154
 msgid "Device type:"
 msgstr "Type de périphérique :"
 
-#: ../src/vmm-details.glade.h:154
+#: ../src/vmm-details.glade.h:155
 msgid "Bind host:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:155
+#: ../src/vmm-details.glade.h:156
 msgid "Target type:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:156
+#: ../src/vmm-details.glade.h:157
 msgid "Target name:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:157
+#: ../src/vmm-details.glade.h:158
 msgid "Source host:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:158
+#: ../src/vmm-details.glade.h:159
 msgid "<b>insert type</b>"
 msgstr "<b>insérer type</b>"
 
-#: ../src/vmm-details.glade.h:159 ../src/vmm-host.glade.h:20
+#: ../src/vmm-details.glade.h:160 ../src/vmm-host.glade.h:20
 msgid "Device:"
 msgstr "Périphérique :"
 
-#: ../src/vmm-details.glade.h:160
+#: ../src/vmm-details.glade.h:161
 msgid "RAM:"
 msgstr "RAM :"
 
-#: ../src/vmm-details.glade.h:161
+#: ../src/vmm-details.glade.h:162
 msgid "Heads:"
 msgstr "Tête(s) :"
 
-#: ../src/vmm-details.glade.h:162
+#: ../src/vmm-details.glade.h:163
 msgid "<b>Video</b>"
 msgstr "<b>Vidéo</b>"
 
-#: ../src/vmm-details.glade.h:163
+#: ../src/vmm-details.glade.h:164
 msgid "A_ction:"
 msgstr "A_ction :"
 
-#: ../src/vmm-details.glade.h:164
+#: ../src/vmm-details.glade.h:165
 msgid "<b>Controller</b>"
 msgstr "<b>Contrôleur</b>"
 
-#: ../src/vmm-details.glade.h:165
+#: ../src/vmm-details.glade.h:166
+msgid "Driver:"
+msgstr ""
+
+#: ../src/vmm-details.glade.h:167
+msgid "Write Policy:"
+msgstr ""
+
+#: ../src/vmm-details.glade.h:168
 msgid "Source:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:166
+#: ../src/vmm-details.glade.h:169
 msgid "Target:"
 msgstr "Cible :"
 
-#: ../src/vmm-details.glade.h:167
+#: ../src/vmm-details.glade.h:170
+msgid "Readonly Filesystem:"
+msgstr ""
+
+#: ../src/vmm-details.glade.h:171
 msgid "<b>Filesystem</b>"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:168
+#: ../src/vmm-details.glade.h:172
 msgid "M_ode:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:169
+#: ../src/vmm-details.glade.h:173
 msgid "<b>Smartcard Device</b>"
 msgstr ""
 
+#: ../src/vmm-details.glade.h:174
+msgid "T_ype:"
+msgstr ""
+
+#: ../src/vmm-details.glade.h:175
+msgid "foo:12"
+msgstr ""
+
+#: ../src/vmm-details.glade.h:176
+msgid "<b>Redirected device</b>"
+msgstr ""
+
 #: ../src/vmm-host.glade.h:1
 msgid "Connection Details"
 msgstr ""
@@ -4577,6 +4663,10 @@
 msgid "Overview"
 msgstr "Aperçu"
 
+#: ../src/vmm-host.glade.h:19
+msgid "Name:"
+msgstr "Nom :"
+
 #: ../src/vmm-host.glade.h:21
 msgid "State:"
 msgstr "État :"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/vorbis-tools.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/vorbis-tools.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/vorbis-tools.po	2012-01-02 17:26:57.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/vorbis-tools.po	2012-02-23 06:31:23.000000000 +0000
@@ -38,8 +38,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:18+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:03+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ogg123/buffer.c:117
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/w3m.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/w3m.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/w3m.po	2012-01-02 17:26:57.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/w3m.po	2012-02-23 06:31:23.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:18+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:03+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: menu.c:267
 msgid " Back         (b) "
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/wdiff-gnulib.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/wdiff-gnulib.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/wdiff-gnulib.po	2012-01-02 17:27:16.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/wdiff-gnulib.po	2012-02-23 06:31:39.000000000 +0000
@@ -17,8 +17,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:54+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:53+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: lib/error.c:181
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/wdiff.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/wdiff.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/wdiff.po	2012-01-02 17:27:16.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/wdiff.po	2012-02-23 06:31:39.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:54+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:53+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: src/mdiff.c:376
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/wget.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/wget.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/wget.po	2012-01-02 17:26:57.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/wget.po	2012-02-23 06:31:23.000000000 +0000
@@ -8,16 +8,16 @@
 msgstr ""
 "Project-Id-Version: GNU wget 1.12-pre7\n"
 "Report-Msgid-Bugs-To: bug-wget@gnu.org\n"
-"POT-Creation-Date: 2011-11-29 08:26+0000\n"
-"PO-Revision-Date: 2011-12-07 20:55+0000\n"
+"POT-Creation-Date: 2012-02-13 07:09+0000\n"
+"PO-Revision-Date: 2012-02-13 11:47+0000\n"
 "Last-Translator: Nicolas Provost <nprovost@quadriv.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:19+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:03+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: lib/error.c:185
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/whois.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/whois.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/whois.po	2012-01-02 17:26:57.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/whois.po	2012-02-23 06:31:23.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: whois 4.6.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-29 08:21+0000\n"
+"POT-Creation-Date: 2012-01-02 12:06+0000\n"
 "PO-Revision-Date: 2011-12-06 18:43+0000\n"
 "Last-Translator: Simon Paillard <Unknown>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:19+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:04+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: ../whois.c:146
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/xdiagnose.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/xdiagnose.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/xdiagnose.po	2012-01-02 17:27:35.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/xdiagnose.po	2012-02-23 06:31:59.000000000 +0000
@@ -7,30 +7,22 @@
 msgstr ""
 "Project-Id-Version: xdiagnose\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-12-15 09:36+0000\n"
+"POT-Creation-Date: 2012-01-11 17:01+0000\n"
 "PO-Revision-Date: 2011-10-30 12:46+0000\n"
 "Last-Translator: Aquilon <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:26+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 02:04+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
-#: ../bin/xdiagnose.py:43 ../bin/dpkg-log-summary.py:98
+#: ../bin/xdiagnose.py:43
 msgid "Show debug messages"
 msgstr "Afficher les messages de débogage"
 
-#: ../bin/dpkg-log-summary.py:101
-msgid "List dates on which updates were performed"
-msgstr "Liste des dates où des mises à jour ont été effectuées"
-
-#: ../bin/dpkg-log-summary.py:104
-msgid "Only include entries from this date forward (YYYY/MM/DD)"
-msgstr ""
-
-#: ../bin/dpkg-log-summary.py:107
-msgid "Only include entries from this date and earlier (YYYY/MM/DD)"
+#: ../bin/xdiagnose.py:46
+msgid "Troubleshoot failure to start a graphical X11 session"
 msgstr ""
 
 #: ../xdiagnose.desktop.in.h:1
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/xfsdump.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/xfsdump.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/xfsdump.po	2012-01-02 17:26:57.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/xfsdump.po	2012-02-23 06:31:23.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:20+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:04+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: .././common/content_common.c:65 .././restore/content.c:6834
 msgid "change media dialog"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/xfsprogs.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/xfsprogs.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/xfsprogs.po	2012-01-02 17:26:57.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/xfsprogs.po	2012-02-23 06:31:24.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:21+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:04+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: .././libxcmd/quit.c:42
 msgid "exit the program"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/xkeyboard-config.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/xkeyboard-config.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/xkeyboard-config.po	2012-01-02 17:27:17.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/xkeyboard-config.po	2012-02-23 06:31:41.000000000 +0000
@@ -11,3980 +11,4072 @@
 msgstr ""
 "Project-Id-Version: xkeyboard-config 2.3.99\n"
 "Report-Msgid-Bugs-To: svu@users.sourceforge.net\n"
-"POT-Creation-Date: 2011-10-05 18:48+0200\n"
-"PO-Revision-Date: 2011-10-05 18:26+0000\n"
+"POT-Creation-Date: 2012-01-23 22:42+0000\n"
+"PO-Revision-Date: 2012-01-24 05:42+0000\n"
 "Last-Translator: Jean-Philippe Guérard <jean-"
 "philippe.guerard@tigreraye.org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:12+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:12+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: ../rules/base.xml.in.h:1
-msgid "&lt;Less/Greater&gt;"
-msgstr "&lt;Plus petit/Plus grand&gt;"
+msgid "Generic 101-key PC"
+msgstr "PC générique 101 touches"
 
 #: ../rules/base.xml.in.h:2
-msgid ""
-"&lt;Less/Greater&gt; (chooses 3rd level, latches when pressed together with "
-"another 3rd-level-chooser)"
-msgstr ""
-"&lt;Plus petit/Plus grand&gt; sélectionne le 3e niveau ; enclenche le 3e "
-"niveau par un appui simultané avec un autre sélecteur de 3e niveau"
+msgid "Generic 102-key (Intl) PC"
+msgstr "PC générique 102 touches (intl)"
 
 #: ../rules/base.xml.in.h:3
-msgid ""
-"&lt;Less/Greater&gt; chooses 5th level and activates level5-Lock when "
-"pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr ""
-"&lt;Plus petit/Plus grand&gt; sélectionne le 5e niveau ; verrouille le 5e "
-"niveau par un appui simultané avec un autre sélecteur de 5e niveau ; un "
-"appui libère le verrou"
+msgid "Generic 104-key PC"
+msgstr "PC générique 104 touches"
 
 #: ../rules/base.xml.in.h:4
-msgid ""
-"&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with "
-"another 5th-level-chooser"
-msgstr ""
-"&lt;Plus petit/Plus grand&gt; sélectionne le 5e niveau ; se verrouille par "
-"un appui simultané avec un autre sélecteur de 5e niveau"
+msgid "Generic 105-key (Intl) PC"
+msgstr "PC générique 105 touches (intl)"
 
 #: ../rules/base.xml.in.h:5
-msgid ""
-"&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with "
-"another 5th-level-chooser, one press releases the lock"
-msgstr ""
-"&lt;Plus petit/Plus grand&gt; sélectionne le 5e niveau ; se verrouille par "
-"un appui simultané avec un autre sélecteur de 5e niveau ; un appui libère le "
-"verrou"
+msgid "Dell 101-key PC"
+msgstr "Dell PC 101 touches"
 
 #: ../rules/base.xml.in.h:6
-msgid "A4Tech KB-21"
-msgstr "A4Tech KB-21"
+msgid "Dell Latitude series laptop"
+msgstr "Dell portable de la série Latitude"
 
 #: ../rules/base.xml.in.h:7
-msgid "A4Tech KBS-8"
-msgstr "A4Tech KBS-8"
+msgid "Dell Precision M65"
+msgstr "Dell Precision M65"
 
 #: ../rules/base.xml.in.h:8
-msgid "A4Tech Wireless Desktop RFKB-23"
-msgstr "A4Tech Wireless Desktop RFKB-23"
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
 
 #: ../rules/base.xml.in.h:9
-msgid "ATM/phone-style"
-msgstr "Clavier de type téléphonique"
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
 
 #: ../rules/base.xml.in.h:10
-msgid "Acer AirKey V"
-msgstr "Acer AirKey V"
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
 
 #: ../rules/base.xml.in.h:11
-msgid "Acer C300"
-msgstr "Acer C300"
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
 
 #: ../rules/base.xml.in.h:12
-msgid "Acer Ferrari 4000"
-msgstr "Acer Ferrari 4000"
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
 
 #: ../rules/base.xml.in.h:13
-msgid "Acer Laptop"
-msgstr "Acer : Portable"
+msgid "PC-98xx Series"
+msgstr "PC-98xx"
 
 #: ../rules/base.xml.in.h:14
-msgid "Add the standard behavior to Menu key"
-msgstr "Ajouter du comportement standard à la touche Menu"
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
 
 #: ../rules/base.xml.in.h:15
-msgid "Adding Esperanto circumflexes (supersigno)"
-msgstr "Ajout de l'accent circonflexe espéranto (supersigno)"
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
 
 #: ../rules/base.xml.in.h:16
-msgid "Adding currency signs to certain keys"
-msgstr "Ajout des signes monétaires sur certaines touches"
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
 
 #: ../rules/base.xml.in.h:17
-msgid "Advance Scorpius KI"
-msgstr "Advance Scorpius KI"
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
 
 #: ../rules/base.xml.in.h:18
-msgid "Afghani"
-msgstr "Afghan"
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 clavier internet sans fil"
 
 #: ../rules/base.xml.in.h:19
-msgid "Akan"
-msgstr "Akan"
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
 
 #: ../rules/base.xml.in.h:20
-msgid "Albanian"
-msgstr "Albanais"
+msgid "Brother Internet Keyboard"
+msgstr "Brother : Clavier internet"
 
 #: ../rules/base.xml.in.h:21
-msgid "Alt and Meta are on Alt keys"
-msgstr "Alt et Meta sont sur les touches Alt."
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF multimédia"
 
 #: ../rules/base.xml.in.h:22
-msgid "Alt is mapped to Right Win, Super to Menu"
-msgstr "Alt. est placé sur Windows droite, Super sur Menu"
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
 
 #: ../rules/base.xml.in.h:23
-msgid "Alt+Caps Lock"
-msgstr "Alt+Verr. maj."
+msgid "BTC 6301URF"
+msgstr "BTC 6301URF"
 
 #: ../rules/base.xml.in.h:24
-msgid "Alt+Ctrl"
-msgstr "Alt.+Ctrl"
+msgid "BTC 9000"
+msgstr "BTC 9000"
 
 #: ../rules/base.xml.in.h:25
-msgid "Alt+Shift"
-msgstr "Alt+Maj."
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
 
 #: ../rules/base.xml.in.h:26
-msgid "Alt+Space"
-msgstr "Alt+Espace"
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
 
 #: ../rules/base.xml.in.h:27
-msgid "Alt/Win key behavior"
-msgstr "Comportement des touches Alt et Windows"
+msgid "BTC 5090"
+msgstr "BTC 5090"
 
 #: ../rules/base.xml.in.h:28
-msgid "Amharic"
-msgstr "Amharique"
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
 
 #: ../rules/base.xml.in.h:29
-msgid "Any Alt key"
-msgstr "N'importe quelle touche Alt"
+msgid "BTC 9116U Mini Wireless Internet and Gaming"
+msgstr "BTC 9116U Mini Wireless Internet and Gaming"
 
 #: ../rules/base.xml.in.h:30
-msgid "Any Win key"
-msgstr "N'importe quelle touche Windows"
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
 
 #: ../rules/base.xml.in.h:31
-msgid "Any Win key (while pressed)"
-msgstr "N'importe quelle touche Windows (enfoncée)"
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
 
 #: ../rules/base.xml.in.h:32
-msgid "Apple"
-msgstr "Apple"
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (variante)"
 
 #: ../rules/base.xml.in.h:33
-msgid "Apple Aluminium Keyboard (ANSI)"
-msgstr "Clavier aluminium Apple (ANSI)"
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd concentrateur USB"
 
 #: ../rules/base.xml.in.h:34
-msgid "Apple Aluminium Keyboard (ISO)"
-msgstr "Clavier aluminium Apple (ISO)"
+msgid "Cherry CyMotion Expert"
+msgstr "Cherry CyMotion Expert"
 
 #: ../rules/base.xml.in.h:35
-msgid "Apple Aluminium Keyboard (JIS)"
-msgstr "Clavier aluminium Apple (JIS)"
+msgid "Cherry B.UNLIMITED"
+msgstr "Cherry B.UNLIMITED"
 
 #: ../rules/base.xml.in.h:36
-msgid ""
-"Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num "
-"Lock)"
-msgstr ""
-"Clavier aluminium Apple : émulation des touches PC (Impr. écr. ; défil. ; "
-"pause ; Verr. Num.)"
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony clavier internet"
 
 #: ../rules/base.xml.in.h:37
-msgid "Apple Laptop"
-msgstr "Apple : Portable"
+msgid "Chicony KU-0108"
+msgstr "Chicony KU-0108"
 
 #: ../rules/base.xml.in.h:38
-msgid "Arabic"
-msgstr "Arabe"
+msgid "Chicony KU-0420"
+msgstr "Chicony KU-0108"
 
 #: ../rules/base.xml.in.h:39
-msgid "Arabic (Buckwalter)"
-msgstr "Arabe (Buckwalter)"
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
 
 #: ../rules/base.xml.in.h:40
-msgid "Arabic (Morocco)"
-msgstr "Arabe (Maroc)"
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access"
 
 #: ../rules/base.xml.in.h:41
-msgid "Arabic (Pakistan)"
-msgstr "Arabe (Pakistan)"
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet (7 touches)"
 
 #: ../rules/base.xml.in.h:42
-msgid "Arabic (Syria)"
-msgstr "Arabe (Syrie)"
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet (13 touches)"
 
 #: ../rules/base.xml.in.h:43
-msgid "Arabic (azerty)"
-msgstr "Arabe (azerty)"
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet (18 touches)"
 
 #: ../rules/base.xml.in.h:44
-msgid "Arabic (azerty/digits)"
-msgstr "Arabe (azerty/chiffres)"
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
 
 #: ../rules/base.xml.in.h:45
-msgid "Arabic (digits)"
-msgstr "Arabe (chiffres)"
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Compaq portable (p.ex. Armada)"
 
 #: ../rules/base.xml.in.h:46
-msgid "Arabic (qwerty)"
-msgstr "Arabe (qwerty)"
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Compaq portable clavier Internet (p.ex. Presario)"
 
 #: ../rules/base.xml.in.h:47
-msgid "Arabic (qwerty/digits)"
-msgstr "Arabe (qwerty/chiffres)"
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq"
 
-#: ../rules/base.xml.in.h:48 ../rules/base.extras.xml.in.h:2
-msgid "Armenian"
-msgstr "Arménien"
+#: ../rules/base.xml.in.h:48
+msgid "Dell"
+msgstr "Dell"
 
 #: ../rules/base.xml.in.h:49
-msgid "Armenian (alternative eastern)"
-msgstr "Arménien (variante, orientale)"
+msgid "Dell SK-8125"
+msgstr "Dell SK-8125"
 
 #: ../rules/base.xml.in.h:50
-msgid "Armenian (alternative phonetic)"
-msgstr "Arménien (variante, phonétique)"
+msgid "Dell SK-8135"
+msgstr "Dell SK-8135"
 
 #: ../rules/base.xml.in.h:51
-msgid "Armenian (eastern)"
-msgstr "Arménien (orientale)"
+msgid "Dell USB Multimedia Keyboard"
+msgstr "Dell clavier multimédia USB"
 
 #: ../rules/base.xml.in.h:52
-msgid "Armenian (phonetic)"
-msgstr "Arménien (phonétique)"
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell portable Inspiron 6xxx/8xxx"
 
 #: ../rules/base.xml.in.h:53
-msgid "Armenian (western)"
-msgstr "Arménien (occidentale)"
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell portable Precision série M"
 
 #: ../rules/base.xml.in.h:54
-msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
-msgstr "Asturien (Espagne, avec H point bas et L point bas)"
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa clavier sans fil"
 
 #: ../rules/base.xml.in.h:55
-msgid "Asus Laptop"
-msgstr "Asus : portable"
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond séries 9801 / 9802"
 
 #: ../rules/base.xml.in.h:56
-msgid "At bottom left"
-msgstr "En bas à gauche"
+msgid "DTK2000"
+msgstr "DTK2000"
 
 #: ../rules/base.xml.in.h:57
-msgid "At left of 'A'"
-msgstr "À gauche du « A »"
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
 
 #: ../rules/base.xml.in.h:58
-msgid "Avatime"
-msgstr "Avatime"
+msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgstr "Portable Fujitsu-Siemens Computers AMILO"
 
 #: ../rules/base.xml.in.h:59
-msgid "Azerbaijani"
-msgstr "Azéri"
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / MM KWD-910"
 
 #: ../rules/base.xml.in.h:60
-msgid "Azerbaijani (Cyrillic)"
-msgstr "Azéri (cyrillique)"
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
 
 #: ../rules/base.xml.in.h:61
-msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr "Azona RF2300 clavier internet sans fil"
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
 
 #: ../rules/base.xml.in.h:62
-msgid "BTC 5090"
-msgstr "BTC 5090"
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
 
 #: ../rules/base.xml.in.h:63
-msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF multimédia"
+msgid "Genius KKB-2050HS"
+msgstr "Genius KKB-2050HS"
 
 #: ../rules/base.xml.in.h:64
-msgid "BTC 5126T"
-msgstr "BTC 5126T"
+msgid "Gyration"
+msgstr "Gyration"
 
 #: ../rules/base.xml.in.h:65
-msgid "BTC 6301URF"
-msgstr "BTC 6301URF"
+msgid "HTC Dream"
+msgstr "HTC Dream"
 
+# Claviers.
+# http://www.kinesis-ergo.com/keyboards.htm
 #: ../rules/base.xml.in.h:66
-msgid "BTC 9000"
-msgstr "BTC 9000"
+msgid "Kinesis"
+msgstr "Kinesis"
 
 #: ../rules/base.xml.in.h:67
-msgid "BTC 9000A"
-msgstr "BTC 9000A"
+msgid "Logitech Generic Keyboard"
+msgstr "Clavier Logitech générique"
 
 #: ../rules/base.xml.in.h:68
-msgid "BTC 9001AH"
-msgstr "BTC 9001AH"
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Touches supplémentaires Logitech G15 via le démon G15"
 
 #: ../rules/base.xml.in.h:69
-msgid "BTC 9019U"
-msgstr "BTC 9019U"
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard clavier internet"
 
 #: ../rules/base.xml.in.h:70
-msgid "BTC 9116U Mini Wireless Internet and Gaming"
-msgstr "BTC 9116U Mini Wireless Internet and Gaming"
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-250x, clavier multimedia"
 
 #: ../rules/base.xml.in.h:71
-msgid "Backslash"
-msgstr "Barre oblique inverse"
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
 
 #: ../rules/base.xml.in.h:72
-msgid ""
-"Backslash (chooses 3rd level, latches when pressed together with another 3rd-"
-"level-chooser)"
-msgstr ""
-"Barre oblique inverse (sélectionne le 3e niveau ; enclenche le 3e niveau par "
-"un appui simultané avec un autre sélecteur de 3e niveau)"
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
 
 #: ../rules/base.xml.in.h:73
-msgid "Bambara"
-msgstr "Bambara"
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Bachkir
 #: ../rules/base.xml.in.h:74
-msgid "Bashkirian"
-msgstr "Bachkir"
+msgid "Hewlett-Packard Pavilion dv5"
+msgstr "Hewlett-Packard Pavilion dv5"
 
 #: ../rules/base.xml.in.h:75
-msgid "Belarusian"
-msgstr "Biélorusse"
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
 
 #: ../rules/base.xml.in.h:76
-msgid "Belarusian (Latin)"
-msgstr "Biélorusse (latin)"
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
 
 #: ../rules/base.xml.in.h:77
-msgid "Belarusian (legacy)"
-msgstr "Biélorusse (obsolète)"
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
 
 #: ../rules/base.xml.in.h:78
-msgid "Belgian"
-msgstr "Belge"
+msgid "Hewlett-Packard nx9020"
+msgstr "Hewlett-Packard nx9020"
 
 #: ../rules/base.xml.in.h:79
-msgid "Belgian (ISO alternate)"
-msgstr "Belge (variante ISO)"
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
 
 #: ../rules/base.xml.in.h:80
-msgid "Belgian (Sun dead keys)"
-msgstr "Belge (touches mortes Sun)"
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
 
 #: ../rules/base.xml.in.h:81
-msgid "Belgian (Wang model 724 azerty)"
-msgstr "Belge (Wang modèle 724 azerty)"
+msgid "Hewlett-Packard Mini 110 Notebook"
+msgstr "Hewlett-Packard portable Mini 110"
 
 #: ../rules/base.xml.in.h:82
-msgid "Belgian (alternative)"
-msgstr "Belge (variante)"
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
 
 #: ../rules/base.xml.in.h:83
-msgid "Belgian (alternative, Sun dead keys)"
-msgstr "Belge (variante, touches mortes Sun)"
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
 
 #: ../rules/base.xml.in.h:84
-msgid "Belgian (alternative, latin-9 only)"
-msgstr "Belge (variante, latin-9 uniquement)"
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
 #: ../rules/base.xml.in.h:85
-msgid "Belgian (eliminate dead keys)"
-msgstr "Belge (sans touche morte)"
+msgid "IBM ThinkPad R60/T60/R61/T61"
+msgstr "IBM ThinkPad R60/T60/R61/T61"
 
 #: ../rules/base.xml.in.h:86
-msgid "BenQ X-Touch"
-msgstr "BenQ X-Touch"
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
 #: ../rules/base.xml.in.h:87
-msgid "BenQ X-Touch 730"
-msgstr "BenQ X-Touch 730"
+msgid "IBM Space Saver"
+msgstr "IBM Space Saver"
 
 #: ../rules/base.xml.in.h:88
-msgid "BenQ X-Touch 800"
-msgstr "BenQ X-Touch 800"
+msgid "Logitech Access Keyboard"
+msgstr "Clavier Logitech Access"
 
 #: ../rules/base.xml.in.h:89
-msgid "Bengali"
-msgstr "Bengali"
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
 
 #: ../rules/base.xml.in.h:90
-msgid "Bengali (Probhat)"
-msgstr "Bengali (Probhat)"
+msgid "Logitech Internet 350 Keyboard"
+msgstr "Clavier Logitech Internet 350"
 
 #: ../rules/base.xml.in.h:91
-msgid "Berber (Morocco, Tifinagh alternative phonetic)"
-msgstr "Berbère (Maroc, variante Tifinagh phonétique)"
+msgid "Logitech Media Elite Keyboard"
+msgstr "Clavier Logitech Media Elite"
 
 #: ../rules/base.xml.in.h:92
-msgid "Berber (Morocco, Tifinagh alternative)"
-msgstr "Berbère (Maroc, variante Tifinagh)"
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
 
 #: ../rules/base.xml.in.h:93
-msgid "Berber (Morocco, Tifinagh extended phonetic)"
-msgstr "Berbère (Maroc, Tifinagh étendu phonétique)"
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
 
 #: ../rules/base.xml.in.h:94
-msgid "Berber (Morocco, Tifinagh extended)"
-msgstr "Berbère (Maroc, Tifinagh étendu)"
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
 
 #: ../rules/base.xml.in.h:95
-msgid "Berber (Morocco, Tifinagh phonetic)"
-msgstr "Berbère (Maroc, Tifinagh phonétique)"
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
 
 #: ../rules/base.xml.in.h:96
-msgid "Berber (Morocco, Tifinagh)"
-msgstr "Berbère (Maroc, Tifinagh)"
+msgid "Logitech Cordless Desktop (alternate option)"
+msgstr "Logitech Cordless Desktop (variante)"
 
 #: ../rules/base.xml.in.h:97
-msgid "Bosnian"
-msgstr "Bosniaque"
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr "Logitech Cordless Desktop Pro (variante 2)"
 
 #: ../rules/base.xml.in.h:98
-msgid "Bosnian (US keyboard with Bosnian digraphs)"
-msgstr "Bosniaque (clavier US avec digraphes bosniaques)"
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
 #: ../rules/base.xml.in.h:99
-msgid "Bosnian (US keyboard with Bosnian letters)"
-msgstr "Bosniaque (clavier US avec lettres bosniaques)"
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless (modèle Y-RB6)"
 
 #: ../rules/base.xml.in.h:100
-msgid "Bosnian (use Bosnian digraphs)"
-msgstr "Bosniaque (utilise les digraphes bosniaques)"
+msgid "Logitech Internet Keyboard"
+msgstr "Clavier Logitech Internet"
 
 #: ../rules/base.xml.in.h:101
-msgid "Bosnian (use guillemets for quotes)"
-msgstr ""
-"Bosniaque (utilise des guillemets typographiques à la place des guillemets "
-"simples)"
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
 
 #: ../rules/base.xml.in.h:102
-msgid "Both Alt keys together"
-msgstr "Les deux Alt ensemble"
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Clavier Logitech Internet Navigator"
 
 #: ../rules/base.xml.in.h:103
-msgid "Both Ctrl keys together"
-msgstr "Les deux Ctrl ensemble"
+msgid "Logitech Cordless Desktop EX110"
+msgstr "Logitech Cordless Desktop EX110"
 
 #: ../rules/base.xml.in.h:104
-msgid "Both Shift keys together"
-msgstr "Les deux Maj. ensemble"
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech Internet Navigator iTouch SE"
 
 #: ../rules/base.xml.in.h:105
-msgid ""
-"Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
-msgstr ""
-"Les deux touches majuscule activent le verrouillage majuscule, une le "
-"désactive"
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech Internet Navigator iTouch SE (USB)"
 
 #: ../rules/base.xml.in.h:106
-msgid "Both Shift-Keys together toggle Caps Lock"
-msgstr "Les deux touches Maj. activent ou désactivent Verr. maj."
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Clavier Logitech Ultra-X"
 
 #: ../rules/base.xml.in.h:107
-msgid "Both Shift-Keys together toggle ShiftLock"
-msgstr "Les deux touches Maj. activent ou désactivent le blocage majuscule"
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgstr "Clavier Logitech sans-fil Ultra-X Media"
 
 #: ../rules/base.xml.in.h:108
-msgid "Braille"
-msgstr "Braille"
+msgid "Logitech diNovo Keyboard"
+msgstr "Clavier Logitech diNovo"
 
 #: ../rules/base.xml.in.h:109
-msgid "Braille (left hand)"
-msgstr "Braille (main gauche)"
+msgid "Logitech diNovo Edge Keyboard"
+msgstr "Clavier Logitech diNovo Edge"
 
 #: ../rules/base.xml.in.h:110
-msgid "Braille (right hand)"
-msgstr "Braille (main droite)"
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
 
 #: ../rules/base.xml.in.h:111
-msgid "Brother Internet Keyboard"
-msgstr "Brother : Clavier internet"
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access"
 
 #: ../rules/base.xml.in.h:112
-msgid "Bulgarian"
-msgstr "Bulgare"
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
 
 #: ../rules/base.xml.in.h:113
-msgid "Bulgarian (new phonetic)"
-msgstr "Bulgare (phonétique, nouveau)"
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 
 #: ../rules/base.xml.in.h:114
-msgid "Bulgarian (traditional phonetic)"
-msgstr "Bulgare (phonétique, traditionnel)"
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 
 #: ../rules/base.xml.in.h:115
-msgid "Burmese"
-msgstr "Birman"
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Clavier internet"
 
 #: ../rules/base.xml.in.h:116
-msgid "Canadian Multilingual"
-msgstr "Canadien multilingue"
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Pro / Internet Pro"
 
 #: ../rules/base.xml.in.h:117
-msgid "Canadian Multilingual (first part)"
-msgstr "Canadien multilingue (première partie)"
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Pro USB / Internet Pro"
 
 #: ../rules/base.xml.in.h:118
-msgid "Canadian Multilingual (second part)"
-msgstr "Canadien multilingue (seconde partie)"
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Pro OEM"
 
 #: ../rules/base.xml.in.h:119
-msgid "Caps Lock"
-msgstr "Verr. maj."
+msgid "ViewSonic KU-306 Internet Keyboard"
+msgstr "ViewSonic KU-306 Internet Keyboard"
 
 #: ../rules/base.xml.in.h:120
-msgid ""
-"Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-"
-"level-chooser)"
-msgstr ""
-"Verr. maj. (sélectionne le 3e niveau ; s'enclenche par un appui simultané "
-"avec un autre sélecteur de 3e niveau)"
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Clavier Internet Pro, suédois"
 
 #: ../rules/base.xml.in.h:121
-msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
-msgstr ""
-"Verr. maj. (première disposition), Maj.+Verr. maj. (dernière disposition)"
+msgid "Microsoft Office Keyboard"
+msgstr "Clavier Microsoft Office"
 
 #: ../rules/base.xml.in.h:122
-msgid ""
-"Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
-msgstr ""
-"Verr. maj. (si enfoncé), Alt+Verr. maj. joue le rôle original de Verr. maj."
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Clavier Microsoft Multimedia sans fil 1.0A"
 
 #: ../rules/base.xml.in.h:123
-msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
-msgstr ""
-"Verr. maj. agit comme un verrouillage de maj. Maj. l'annule temporairement"
+msgid "Microsoft Natural Keyboard Elite"
+msgstr "Microsoft Natural Elite"
 
 #: ../rules/base.xml.in.h:124
-msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
-msgstr ""
-"Verr. maj. agit comme maj. quand il est verrouillé. Maj. n'a pas d'effet sur "
-"verr. Maj."
+msgid "Microsoft Comfort Curve Keyboard 2000"
+msgstr "Microsoft Clavier Comfort Curve 2000"
 
 #: ../rules/base.xml.in.h:125
-msgid "Caps Lock is disabled"
-msgstr "Verr. maj. est désactivé"
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek Clavier internet / MCK-800 MM"
 
 #: ../rules/base.xml.in.h:126
-msgid "Caps Lock key behavior"
-msgstr "Comportement de la touche Verr. maj."
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
 
 #: ../rules/base.xml.in.h:127
-msgid "Caps Lock toggles Shift so all keys are affected"
-msgstr ""
-"Verr. maj. active ou désactive maj., ce qui affecte toutes les touches"
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
 
 #: ../rules/base.xml.in.h:128
-msgid "Caps Lock toggles normal capitalization of alphabetic characters"
-msgstr ""
-"Verr. maj. active ou désactive la mise en majuscule usuelle des caractères "
-"alphabétiques"
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
 
 #: ../rules/base.xml.in.h:129
-msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
-msgstr ""
-"Verr. maj. utilise la mise en majuscule interne. Maj. annule temporairement "
-"Verr. maj."
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
 
 #: ../rules/base.xml.in.h:130
-msgid ""
-"Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
-msgstr ""
-"Verr. maj. utilise la mise en majuscule interne. Maj. n'a pas d'effet sur "
-"Verr. maj."
+msgid "Sanwa Supply SKB-KG3"
+msgstr "Sanwa Supply SKB-KG3"
 
 #: ../rules/base.xml.in.h:131
-msgid "Catalan"
-msgstr "Catalan"
+msgid "SK-1300"
+msgstr "SK-1300"
 
 #: ../rules/base.xml.in.h:132
-msgid "Catalan (Spain, with middle-dot L)"
-msgstr "Catalan (Espagne, avec L point médian)"
+msgid "SK-2500"
+msgstr "SK-2500"
 
 #: ../rules/base.xml.in.h:133
-msgid "Cherokee"
-msgstr "Cherokee"
+msgid "SK-6200"
+msgstr "SK-6200"
 
 #: ../rules/base.xml.in.h:134
-msgid "Cherry B.UNLIMITED"
-msgstr "Cherry B.UNLIMITED"
+msgid "SK-7100"
+msgstr "SK-7100"
 
 #: ../rules/base.xml.in.h:135
-msgid "Cherry Blue Line CyBo@rd"
-msgstr "Cherry Blue Line CyBo@rd"
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
 
 #: ../rules/base.xml.in.h:136
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr "Cherry Blue Line CyBo@rd (variante)"
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
 
 #: ../rules/base.xml.in.h:137
-msgid "Cherry CyBo@rd USB-Hub"
-msgstr "Cherry CyBo@rd concentrateur USB"
+msgid "SVEN Slim 303"
+msgstr "SVEN Slim 303"
 
 #: ../rules/base.xml.in.h:138
-msgid "Cherry CyMotion Expert"
-msgstr "Cherry CyMotion Expert"
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablette tactile)"
 
 #: ../rules/base.xml.in.h:139
-msgid "Cherry CyMotion Master Linux"
-msgstr "Cherry CyMotion Master Linux"
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
 
 #: ../rules/base.xml.in.h:140
-msgid "Cherry CyMotion Master XPress"
-msgstr "Cherry CyMotion Master XPress"
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Classic"
 
 #: ../rules/base.xml.in.h:141
-msgid "Chicony Internet Keyboard"
-msgstr "Chicony clavier internet"
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access"
 
 #: ../rules/base.xml.in.h:142
-msgid "Chicony KB-9885"
-msgstr "Chicony KB-9885"
+msgid "Trust Slimline"
+msgstr "Trust Slimline"
 
 #: ../rules/base.xml.in.h:143
-msgid "Chicony KU-0108"
-msgstr "Chicony KU-0108"
+msgid "TypeMatrix EZ-Reach 2020"
+msgstr "TypeMatrix EZ-Reach 2020"
 
 #: ../rules/base.xml.in.h:144
-msgid "Chicony KU-0420"
-msgstr "Chicony KU-0108"
+msgid "TypeMatrix EZ-Reach 2030 PS2"
+msgstr "TypeMatrix EZ-Reach 2030 PS2"
 
 #: ../rules/base.xml.in.h:145
-msgid "Chinese"
-msgstr "Chinois"
+msgid "TypeMatrix EZ-Reach 2030 USB"
+msgstr "TypeMatrix EZ-Reach 2030 USB"
 
 #: ../rules/base.xml.in.h:146
-msgid "Chuvash"
-msgstr "Chuvash"
+msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
+msgstr "TypeMatrix EZ-Reach 2030 USB (mode 102/105:EU)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Tchouvache
 #: ../rules/base.xml.in.h:147
-msgid "Chuvash (Latin)"
-msgstr "Tchouvache (latin)"
+msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
+msgstr "TypeMatrix EZ-Reach 2030 USB (mode 106:JP)"
 
 #: ../rules/base.xml.in.h:148
-msgid "Classmate PC"
-msgstr "Classmate PC"
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Clavier Internet"
 
 #: ../rules/base.xml.in.h:149
-msgid "CloGaelach"
-msgstr "Cló Gaelach"
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
 
 #: ../rules/base.xml.in.h:150
-msgid "Compaq Easy Access Keyboard"
-msgstr "Compaq Easy Access"
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (Intl)"
 
 #: ../rules/base.xml.in.h:151
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "Compaq Internet (13 touches)"
+msgid "Macintosh"
+msgstr "Macintosh"
 
 #: ../rules/base.xml.in.h:152
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "Compaq Internet (18 touches)"
+msgid "Macintosh Old"
+msgstr "Macintosh (ancien)"
 
 #: ../rules/base.xml.in.h:153
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "Compaq Internet (7 touches)"
+msgid "Happy Hacking Keyboard for Mac"
+msgstr "Happy Hacking pour Mac"
 
 #: ../rules/base.xml.in.h:154
-msgid "Compaq iPaq Keyboard"
-msgstr "Compaq iPaq"
+msgid "Acer C300"
+msgstr "Acer C300"
 
 #: ../rules/base.xml.in.h:155
-msgid "Compose key position"
-msgstr "Position de la touche Compose"
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
 
 #: ../rules/base.xml.in.h:156
-msgid "Control + Alt + Backspace"
-msgstr "Control + Alt + Eff. arrière"
+msgid "Acer Laptop"
+msgstr "Acer : Portable"
 
 #: ../rules/base.xml.in.h:157
-msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
-msgstr "Ctrl est placé sur les touches Alt., Alt. sur les touches Windows"
+msgid "Asus Laptop"
+msgstr "Asus : portable"
 
 #: ../rules/base.xml.in.h:158
-msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
-msgstr ""
-"Ctrl est placé sur les touches Windows (et les touches Ctrl habituelles)"
+msgid "Apple"
+msgstr "Apple"
 
 #: ../rules/base.xml.in.h:159
-msgid "Creative Desktop Wireless 7000"
-msgstr "Creative Desktop Wireless 7000"
+msgid "Apple Laptop"
+msgstr "Apple : Portable"
 
 #: ../rules/base.xml.in.h:160
-msgid "Crimean Tatar (Turkish Alt-Q)"
-msgstr "Tatar de Crimée (Alt.-Q turc)"
+msgid "Apple Aluminium Keyboard (ANSI)"
+msgstr "Clavier aluminium Apple (ANSI)"
 
 #: ../rules/base.xml.in.h:161
-msgid "Crimean Tatar (Turkish F)"
-msgstr "Tatar de Crimée (F turc)"
+msgid "Apple Aluminium Keyboard (ISO)"
+msgstr "Clavier aluminium Apple (ISO)"
 
 #: ../rules/base.xml.in.h:162
-msgid "Crimean Tatar (Turkish Q)"
-msgstr "Tatar de Crimée (Q turc)"
+msgid "Apple Aluminium Keyboard (JIS)"
+msgstr "Clavier aluminium Apple (JIS)"
 
 #: ../rules/base.xml.in.h:163
-msgid "Croatian"
-msgstr "Croate"
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
 #: ../rules/base.xml.in.h:164
-msgid "Croatian (US keyboard with Croatian digraphs)"
-msgstr "Croate (clavier US avec digraphes croates)"
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "eMachines m68xx"
 
 #: ../rules/base.xml.in.h:165
-msgid "Croatian (US keyboard with Croatian letters)"
-msgstr "Croate (clavier US avec lettres croates)"
+msgid "BenQ X-Touch"
+msgstr "BenQ X-Touch"
 
 #: ../rules/base.xml.in.h:166
-msgid "Croatian (use Croatian digraphs)"
-msgstr "Croate (utilise les digraphes croates)"
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
 
 #: ../rules/base.xml.in.h:167
-msgid "Croatian (use guillemets for quotes)"
-msgstr "Croate (utilise des guillemets typo. au lieu des guillemets simples)"
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
 
 #: ../rules/base.xml.in.h:168
-msgid "Ctrl key position"
-msgstr "Position de la touche Ctrl"
+msgid "Happy Hacking Keyboard"
+msgstr "Happy Hacking"
 
 #: ../rules/base.xml.in.h:169
-msgid "Ctrl+Shift"
-msgstr "Ctrl+Maj."
+msgid "Classmate PC"
+msgstr "Classmate PC"
 
 #: ../rules/base.xml.in.h:170
-msgid "Czech"
-msgstr "Tchèque"
+msgid "OLPC"
+msgstr "OLPC"
 
-# http://repo.or.cz/w/ucwcs-xkb.git/blob_plain/HEAD:/README
-# http://www.ucw.cz/
 #: ../rules/base.xml.in.h:171
-msgid "Czech (UCW layout, accented letters only)"
-msgstr "Tchèque (disposition UCW, lettres accentuées seulement)"
+msgid "Sun Type 5/6"
+msgstr "Sun type 5/6"
 
-# http://repo.or.cz/w/ucwcs-xkb.git/blob_plain/HEAD:/README
-# http://www.ucw.cz/
 #: ../rules/base.xml.in.h:172
-msgid "Czech (US Dvorak with CZ UCW support)"
-msgstr "Tchèque (Dvorak US avec support UCW CZ)"
+msgid "Targa Visionary 811"
+msgstr "Targa Visionary 811"
 
 #: ../rules/base.xml.in.h:173
-msgid "Czech (qwerty)"
-msgstr "Tchèque (qwerty)"
+msgid "Unitek KB-1925"
+msgstr "Unitek KB-1925"
 
 #: ../rules/base.xml.in.h:174
-msgid "Czech (qwerty, extended Backslash)"
-msgstr "Tchèque (qwerty, barre oblique inverse étendue)"
+msgid "FL90"
+msgstr "FL90"
 
 #: ../rules/base.xml.in.h:175
-msgid "Czech (with &lt;\\|&gt; key)"
-msgstr "Tchèque (avec la touche &lt;\\|&gt;)"
+msgid "Creative Desktop Wireless 7000"
+msgstr "Creative Desktop Wireless 7000"
 
 #: ../rules/base.xml.in.h:176
-msgid "DTK2000"
-msgstr "DTK2000"
-
-#: ../rules/base.xml.in.h:177
-msgid "Danish"
-msgstr "Danois"
-
-#: ../rules/base.xml.in.h:178
-msgid "Danish (Dvorak)"
-msgstr "Danois (Dvorak)"
+msgid "Htc Dream phone"
+msgstr "Htc Dream"
 
-#: ../rules/base.xml.in.h:179
-msgid "Danish (Macintosh)"
-msgstr "Danois (Macintosh)"
+#. Keyboard indicator for English layouts
+#: ../rules/base.xml.in.h:178 ../rules/base.extras.xml.in.h:29
+msgid "en"
+msgstr "en"
 
-#: ../rules/base.xml.in.h:180
-msgid "Danish (Macintosh, eliminate dead keys)"
-msgstr "Danois (Macintosh, sans touche morte)"
+#: ../rules/base.xml.in.h:179 ../rules/base.extras.xml.in.h:30
+msgid "English (US)"
+msgstr "Anglais (USA)"
 
+#. Keyboard indicator for Cherokee layouts
 #: ../rules/base.xml.in.h:181
-msgid "Danish (eliminate dead keys)"
-msgstr "Danois (sans touche morte)"
+msgid "chr"
+msgstr "chr"
 
 #: ../rules/base.xml.in.h:182
-msgid "Default numeric keypad keys"
-msgstr "Touches du pavé numérique par défaut"
+msgid "Cherokee"
+msgstr "Cherokee"
 
 #: ../rules/base.xml.in.h:183
-msgid "Dell"
-msgstr "Dell"
+msgid "English (US, with euro on 5)"
+msgstr "Anglais (USA, avec l'Euro sur le 5)"
 
 #: ../rules/base.xml.in.h:184
-msgid "Dell 101-key PC"
-msgstr "Dell PC 101 touches"
+msgid "English (US, international with dead keys)"
+msgstr "Anglais (USA, variante internationale, avec touches mortes)"
 
 #: ../rules/base.xml.in.h:185
-msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
-msgstr "Dell portable Inspiron 6xxx/8xxx"
+msgid "English (US, alternative international)"
+msgstr "Anglais (USA, variante internationale)"
 
+# http://colemak.com/
 #: ../rules/base.xml.in.h:186
-msgid "Dell Laptop/notebook Precision M series"
-msgstr "Dell portable Precision série M"
+msgid "English (Colemak)"
+msgstr "Anglais (Colemak)"
 
+# https://secure.wikimedia.org/wikipedia/en/wiki/Dvorak_Simplified_Keyboard
 #: ../rules/base.xml.in.h:187
-msgid "Dell Latitude series laptop"
-msgstr "Dell portable de la série Latitude"
+msgid "English (Dvorak)"
+msgstr "Anglais (Dvorak)"
 
+# https://secure.wikimedia.org/wikipedia/en/wiki/Dvorak_Simplified_Keyboard
 #: ../rules/base.xml.in.h:188
-msgid "Dell Precision M65"
-msgstr "Dell Precision M65"
+msgid "English (Dvorak international with dead keys)"
+msgstr "Anglais (Dvorak, international avec touche morte)"
 
+# https://secure.wikimedia.org/wikipedia/en/wiki/Dvorak_Simplified_Keyboard
 #: ../rules/base.xml.in.h:189
-msgid "Dell SK-8125"
-msgstr "Dell SK-8125"
+msgid "English (Dvorak alternative international no dead keys)"
+msgstr "Anglais (Dvorak, variante internationale, sans touche morte)"
 
 #: ../rules/base.xml.in.h:190
-msgid "Dell SK-8135"
-msgstr "Dell SK-8135"
+msgid "English (left handed Dvorak)"
+msgstr "Anglais (Dvorak pour gaucher)"
 
 #: ../rules/base.xml.in.h:191
-msgid "Dell USB Multimedia Keyboard"
-msgstr "Dell clavier multimédia USB"
+msgid "English (right handed Dvorak)"
+msgstr "Anglais (Dvorak pour droitier)"
 
 #: ../rules/base.xml.in.h:192
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr "Dexxa clavier sans fil"
+msgid "English (classic Dvorak)"
+msgstr "Anglais (Dvorak classique)"
 
 #: ../rules/base.xml.in.h:193
-msgid "Dhivehi"
-msgstr "Divehi"
-
-#: ../rules/base.xml.in.h:194
-msgid "Diamond 9801 / 9802 series"
-msgstr "Diamond séries 9801 / 9802"
+msgid "English (programmer Dvorak)"
+msgstr "Anglais (Dvorak pour programmeur)"
 
-#: ../rules/base.xml.in.h:195
-msgid "Dutch"
-msgstr "Néerlandais"
+#. Keyboard indicator for Russian layouts
+#: ../rules/base.xml.in.h:195 ../rules/base.extras.xml.in.h:46
+msgid "ru"
+msgstr "ru"
 
 #: ../rules/base.xml.in.h:196
-msgid "Dutch (Macintosh)"
-msgstr "Néerlandais (Macintosh)"
+msgid "Russian (US, phonetic)"
+msgstr "Russe (US, phonétique)"
 
 #: ../rules/base.xml.in.h:197
-msgid "Dutch (Sun dead keys)"
-msgstr "Néerlandais (touches mortes Sun)"
+msgid "English (Macintosh)"
+msgstr "Anglais (Macintosh)"
 
 #: ../rules/base.xml.in.h:198
-msgid "Dutch (standard)"
-msgstr "Néerlandais (standard)"
+msgid "English (international AltGr dead keys)"
+msgstr "Anglais (international, AltGr, touches mortes)"
 
 #: ../rules/base.xml.in.h:199
-msgid "Dzongkha"
-msgstr "Dzongkha"
+msgid "English (layout toggle on multiply/divide key)"
+msgstr ""
+"Anglais (la touche multiplier/diviser modifie la disposition clavier)"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Serbo-croate
 #: ../rules/base.xml.in.h:200
-msgid "Enable extra typographic characters"
-msgstr "Active des caractères typographiques supplémentaires"
-
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Cameroun
-#: ../rules/base.xml.in.h:201
-msgid "English (Cameroon Dvorak)"
-msgstr "Anglais (Cameroun, Dvorak)"
+msgid "Serbo-Croatian (US)"
+msgstr "Serbo-Croate (US)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Cameroun
+#. Keyboard indicator for Catalan layouts
 #: ../rules/base.xml.in.h:202
-msgid "English (Cameroon qwerty)"
-msgstr "Anglais (Cameroun, qwerty)"
+msgid "ca"
+msgstr "cb"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Cameroun
 #: ../rules/base.xml.in.h:203
-msgid "English (Cameroon)"
-msgstr "Anglais (Cameroun)"
-
-#: ../rules/base.xml.in.h:204
-msgid "English (Canada)"
-msgstr "Anglais (Canada)"
+msgid "Catalan"
+msgstr "Catalan"
 
-# http://colemak.com/
-#: ../rules/base.xml.in.h:205
-msgid "English (Colemak)"
-msgstr "Anglais (Colemak)"
+#. Keyboard indicator for Persian layouts
+#: ../rules/base.xml.in.h:205 ../rules/base.extras.xml.in.h:13
+msgid "fa"
+msgstr "fa"
 
-# https://secure.wikimedia.org/wikipedia/en/wiki/Dvorak_Simplified_Keyboard
 #: ../rules/base.xml.in.h:206
-msgid "English (Dvorak alternative international no dead keys)"
-msgstr "Anglais (Dvorak, variante internationale, sans touche morte)"
-
-# https://secure.wikimedia.org/wikipedia/en/wiki/Dvorak_Simplified_Keyboard
-#: ../rules/base.xml.in.h:207
-msgid "English (Dvorak international with dead keys)"
-msgstr "Anglais (Dvorak, international avec touche morte)"
+msgid "Afghani"
+msgstr "Afghan"
 
-# https://secure.wikimedia.org/wikipedia/en/wiki/Dvorak_Simplified_Keyboard
+#. Keyboard indicator for Pashto layouts
 #: ../rules/base.xml.in.h:208
-msgid "English (Dvorak)"
-msgstr "Anglais (Dvorak)"
+msgid "ps"
+msgstr "ps"
 
 #: ../rules/base.xml.in.h:209
-msgid "English (Ghana)"
-msgstr "Anglais (Ghana)"
-
-# http://www.gillbt.org/
-#: ../rules/base.xml.in.h:210
-msgid "English (Ghana, GILLBT)"
-msgstr "Anglais (Ghana, GILLBT)"
+msgid "Pashto"
+msgstr "Pachto"
 
+#. Keyboard indicator for Uzbek layouts
 #: ../rules/base.xml.in.h:211
-msgid "English (Ghana, multilingual)"
-msgstr "Anglais (Ghana, multilingue)"
+msgid "uz"
+msgstr "uz"
 
 #: ../rules/base.xml.in.h:212
-msgid "English (India, with RupeeSign)"
-msgstr "Anglais (Inde, avec le symbole Roupie)"
+msgid "Uzbek (Afghanistan)"
+msgstr "Ouzbek (Afghanistan)"
 
 #: ../rules/base.xml.in.h:213
-msgid "English (Macintosh)"
-msgstr "Anglais (Macintosh)"
+msgid "Pashto (Afghanistan, OLPC)"
+msgstr "Pachto (Afghanistan, OLPC)"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Dari
 #: ../rules/base.xml.in.h:214
-msgid "English (Mali, US Macintosh)"
-msgstr "Anglais (Mali, Macintosh USA)"
+msgid "Persian (Afghanistan, Dari OLPC)"
+msgstr "Persan (Afghanistan, Dari, OLPC)"
 
 #: ../rules/base.xml.in.h:215
-msgid "English (Mali, US international)"
-msgstr "Anglais (Mali, USA international)"
-
-#: ../rules/base.xml.in.h:216
-msgid "English (Nigeria)"
-msgstr "Anglais (Nigeria)"
+msgid "Uzbek (Afghanistan, OLPC)"
+msgstr "Ouzbek (Afghanistan, OLPC)"
 
+#. Keyboard indicator for Arabic layouts
 #: ../rules/base.xml.in.h:217
-msgid "English (South Africa)"
-msgstr "Anglais (Afrique du Sud)"
+msgid "ar"
+msgstr "ar"
 
 #: ../rules/base.xml.in.h:218
-msgid "English (UK)"
-msgstr "Anglais (Royaume-Uni)"
+msgid "Arabic"
+msgstr "Arabe"
 
-# http://colemak.com/
 #: ../rules/base.xml.in.h:219
-msgid "English (UK, Colemak)"
-msgstr "Anglais (Royaume-Uni, Colemak)"
+msgid "Arabic (azerty)"
+msgstr "Arabe (azerty)"
 
 #: ../rules/base.xml.in.h:220
-msgid "English (UK, Dvorak with UK punctuation)"
-msgstr "Anglais (Royaume-Uni, Dvorak, ponctuation britannique)"
+msgid "Arabic (azerty/digits)"
+msgstr "Arabe (azerty/chiffres)"
 
 #: ../rules/base.xml.in.h:221
-msgid "English (UK, Dvorak)"
-msgstr "Anglais (Royaume-Uni, Dvorak)"
+msgid "Arabic (digits)"
+msgstr "Arabe (chiffres)"
 
 #: ../rules/base.xml.in.h:222
-msgid "English (UK, Macintosh international)"
-msgstr "Anglais (Royaume-Uni, Macintosh international)"
+msgid "Arabic (qwerty)"
+msgstr "Arabe (qwerty)"
 
 #: ../rules/base.xml.in.h:223
-msgid "English (UK, Macintosh)"
-msgstr "Anglais (Royaume-Uni, Macintosh)"
+msgid "Arabic (qwerty/digits)"
+msgstr "Arabe (qwerty/chiffres)"
 
 #: ../rules/base.xml.in.h:224
-msgid "English (UK, extended WinKeys)"
-msgstr "Anglais (Royaume-Uni, touche Windows étendue)"
-
-#: ../rules/base.xml.in.h:225
-msgid "English (UK, international with dead keys)"
-msgstr "Anglais (Royaume-Uni, international, avec touches mortes)"
+msgid "Arabic (Buckwalter)"
+msgstr "Arabe (Buckwalter)"
 
-#: ../rules/base.xml.in.h:226 ../rules/base.extras.xml.in.h:8
-msgid "English (US)"
-msgstr "Anglais (USA)"
+#. Keyboard indicator for Albanian layouts
+#: ../rules/base.xml.in.h:226
+msgid "sq"
+msgstr "sq"
 
 #: ../rules/base.xml.in.h:227
-msgid "English (US, alternative international)"
-msgstr "Anglais (USA, variante internationale)"
-
-#: ../rules/base.xml.in.h:228
-msgid "English (US, international with dead keys)"
-msgstr "Anglais (USA, variante internationale, avec touches mortes)"
+msgid "Albanian"
+msgstr "Albanais"
 
-#: ../rules/base.xml.in.h:229
-msgid "English (US, with euro on 5)"
-msgstr "Anglais (USA, avec l'Euro sur le 5)"
+#. Keyboard indicator for Armenian layouts
+#: ../rules/base.xml.in.h:229 ../rules/base.extras.xml.in.h:49
+msgid "hy"
+msgstr "hy"
 
-#: ../rules/base.xml.in.h:230
-msgid "English (classic Dvorak)"
-msgstr "Anglais (Dvorak classique)"
+#: ../rules/base.xml.in.h:230 ../rules/base.extras.xml.in.h:50
+msgid "Armenian"
+msgstr "Arménien"
 
 #: ../rules/base.xml.in.h:231
-msgid "English (international AltGr dead keys)"
-msgstr "Anglais (international, AltGr, touches mortes)"
+msgid "Armenian (phonetic)"
+msgstr "Arménien (phonétique)"
 
 #: ../rules/base.xml.in.h:232
-msgid "English (layout toggle on multiply/divide key)"
-msgstr ""
-"Anglais (la touche multiplier/diviser modifie la disposition clavier)"
+msgid "Armenian (alternative phonetic)"
+msgstr "Arménien (variante, phonétique)"
 
 #: ../rules/base.xml.in.h:233
-msgid "English (left handed Dvorak)"
-msgstr "Anglais (Dvorak pour gaucher)"
+msgid "Armenian (eastern)"
+msgstr "Arménien (orientale)"
 
 #: ../rules/base.xml.in.h:234
-msgid "English (programmer Dvorak)"
-msgstr "Anglais (Dvorak pour programmeur)"
+msgid "Armenian (western)"
+msgstr "Arménien (occidentale)"
 
 #: ../rules/base.xml.in.h:235
-msgid "English (right handed Dvorak)"
-msgstr "Anglais (Dvorak pour droitier)"
-
-#: ../rules/base.xml.in.h:236
-msgid "Ennyah DKB-1008"
-msgstr "Ennyah DKB-1008"
+msgid "Armenian (alternative eastern)"
+msgstr "Arménien (variante, orientale)"
 
-#: ../rules/base.xml.in.h:237
-msgid "Enter on keypad"
-msgstr "Entrée sur le pavé numérique"
+#. Keyboard indicator for German layouts
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:9
+msgid "de"
+msgstr "de"
 
 #: ../rules/base.xml.in.h:238
-msgid "Esperanto"
-msgstr "Espéranto"
+msgid "German (Austria)"
+msgstr "Allemand (Autriche)"
 
-# http://tecladobrasileiro.com.br/index.php?option=com_content&task=view&id=20&Itemid=62
 #: ../rules/base.xml.in.h:239
-msgid "Esperanto (Portugal, Nativo)"
-msgstr "Espéranto (Portugal, PT-Nativo)"
+msgid "German (Austria, eliminate dead keys)"
+msgstr "Allemand (Autriche, sans touche morte)"
 
 #: ../rules/base.xml.in.h:240
-msgid "Esperanto (displaced semicolon and quote, obsolete)"
-msgstr "Espéranto (point-virgule et guillemets simples déplacés, obsolète)"
+msgid "German (Austria, Sun dead keys)"
+msgstr "Allemand (Autriche, touches mortes Sun)"
 
 #: ../rules/base.xml.in.h:241
-msgid "Estonian"
-msgstr "Estonien"
-
-#: ../rules/base.xml.in.h:242
-msgid "Estonian (Dvorak)"
-msgstr "Estonien (Dvorak)"
+msgid "German (Austria, Macintosh)"
+msgstr "Allemand (Autriche, Macintosh)"
 
+#. Keyboard indicator for Azerbaijani layouts
 #: ../rules/base.xml.in.h:243
-msgid "Estonian (US keyboard with Estonian letters)"
-msgstr "Estonien (clavier US avec lettres estoniennes)"
+msgid "az"
+msgstr "az"
 
 #: ../rules/base.xml.in.h:244
-msgid "Estonian (eliminate dead keys)"
-msgstr "Estonien (sans touche morte)"
+msgid "Azerbaijani"
+msgstr "Azéri"
 
 #: ../rules/base.xml.in.h:245
-msgid "Euro on 2"
-msgstr "Euro sur le 2"
-
-#: ../rules/base.xml.in.h:246
-msgid "Euro on 4"
-msgstr "Euro sur le 4"
+msgid "Azerbaijani (Cyrillic)"
+msgstr "Azéri (cyrillique)"
 
+#. Keyboard indicator for Belarusian layouts
 #: ../rules/base.xml.in.h:247
-msgid "Euro on 5"
-msgstr "Euro sur le 5"
+msgid "by"
+msgstr ""
 
 #: ../rules/base.xml.in.h:248
-msgid "Euro on E"
-msgstr "Euro sur le E"
+msgid "Belarusian"
+msgstr "Biélorusse"
 
 #: ../rules/base.xml.in.h:249
-msgid "Everex STEPnote"
-msgstr "Everex STEPnote"
+msgid "Belarusian (legacy)"
+msgstr "Biélorusse (obsolète)"
 
 #: ../rules/base.xml.in.h:250
-msgid "Ewe"
-msgstr "Éwé"
-
-#: ../rules/base.xml.in.h:251
-msgid "FL90"
-msgstr "FL90"
+msgid "Belarusian (Latin)"
+msgstr "Biélorusse (latin)"
 
+#. Keyboard indicator for Belgian layouts
 #: ../rules/base.xml.in.h:252
-msgid "Faroese"
-msgstr "Féroïen"
+msgid "be"
+msgstr "be"
 
 #: ../rules/base.xml.in.h:253
-msgid "Faroese (eliminate dead keys)"
-msgstr "Féroïen (sans touche morte)"
+msgid "Belgian"
+msgstr "Belge"
 
 #: ../rules/base.xml.in.h:254
-msgid "Filipino"
-msgstr "Filipino"
+msgid "Belgian (alternative)"
+msgstr "Belge (variante)"
 
-# http://www.michaelcapewell.com/projects/keyboard/#The_Capewell-Dvorak_Layout
 #: ../rules/base.xml.in.h:255
-msgid "Filipino (Capewell-Dvorak Baybayin)"
-msgstr "Filipino (Capewell-Dvorak, baybayin)"
+msgid "Belgian (alternative, latin-9 only)"
+msgstr "Belge (variante, latin-9 uniquement)"
 
-# http://www.michaelcapewell.com/projects/keyboard/#The_Capewell-Dvorak_Layout
 #: ../rules/base.xml.in.h:256
-msgid "Filipino (Capewell-Dvorak Latin)"
-msgstr "Filipino (Capewell-Dvorak, latin)"
+msgid "Belgian (alternative, Sun dead keys)"
+msgstr "Belge (variante, touches mortes Sun)"
 
-# http://www.michaelcapewell.com/projects/keyboard/#The_QWERF_Layout
 #: ../rules/base.xml.in.h:257
-msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
-msgstr "Filipino (Capewell-QWERF 2006, baybayin)"
+msgid "Belgian (ISO alternate)"
+msgstr "Belge (variante ISO)"
 
-# http://www.michaelcapewell.com/projects/keyboard/#The_QWERF_Layout
 #: ../rules/base.xml.in.h:258
-msgid "Filipino (Capewell-QWERF 2006 Latin)"
-msgstr "Filipino (Capewell-QWERF 2006, latin)"
+msgid "Belgian (eliminate dead keys)"
+msgstr "Belge (sans touche morte)"
 
 #: ../rules/base.xml.in.h:259
-msgid "Filipino (Colemak Baybayin)"
-msgstr "Filipino (Colemak, baybayin)"
+msgid "Belgian (Sun dead keys)"
+msgstr "Belge (touches mortes Sun)"
 
 #: ../rules/base.xml.in.h:260
-msgid "Filipino (Colemak Latin)"
-msgstr "Filipino (Colemak, latin)"
-
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Baybayin
-#: ../rules/base.xml.in.h:261
-msgid "Filipino (Dvorak Baybayin)"
-msgstr "Filipino (Dvorak, baybayin)"
+msgid "Belgian (Wang model 724 azerty)"
+msgstr "Belge (Wang modèle 724 azerty)"
 
+#. Keyboard indicator for Bengali layouts
 #: ../rules/base.xml.in.h:262
-msgid "Filipino (Dvorak Latin)"
-msgstr "Filipino (Dvorak, latin)"
+msgid "bn"
+msgstr "bn"
 
 #: ../rules/base.xml.in.h:263
-msgid "Filipino (QWERTY Baybayin)"
-msgstr "Filipino (baybayin, qwerty)"
+msgid "Bengali"
+msgstr "Bengali"
 
 #: ../rules/base.xml.in.h:264
-msgid "Finnish"
-msgstr "Finnois"
-
-#: ../rules/base.xml.in.h:265
-msgid "Finnish (Macintosh)"
-msgstr "Finnois (Macintosh)"
+msgid "Bengali (Probhat)"
+msgstr "Bengali (Probhat)"
 
+#. Keyboard indicator for Indian layouts
 #: ../rules/base.xml.in.h:266
-msgid "Finnish (classic)"
-msgstr "Finnois (classique)"
+msgid "in"
+msgstr "in"
 
 #: ../rules/base.xml.in.h:267
-msgid "Finnish (classic, eliminate dead keys)"
-msgstr "Finnois (classique, sans touche morte)"
+msgid "Indian"
+msgstr "Indien"
+
+#: ../rules/base.xml.in.h:268
+msgid "Bengali (India)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:269
+msgid "Bengali (India, Probhat)"
+msgstr ""
 
-#. This assumes the KP_ abstract symbols are actually useful for some apps
-#. The description needs to be rewritten
 #: ../rules/base.xml.in.h:270
-msgid "Four-level key with abstract separators"
-msgstr "Touche à quatre niveaux avec le séparateur décimal abstrait"
+msgid "Bengali (India, Baishakhi)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:271
-msgid "Four-level key with comma"
-msgstr "Touche à quatre niveaux avec virgule"
+msgid "Bengali (India, Bornona)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:272
-msgid "Four-level key with dot"
-msgstr "Touche à quatre niveaux avec point"
+msgid "Bengali (India, Uni Gitanjali)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:273
-msgid "Four-level key with dot, latin-9 restriction"
-msgstr "Touche à quatre niveaux avec point, latin-9 uniquement"
-
-# Le momayyez est le séparateur décimal perse.
-#: ../rules/base.xml.in.h:274
-msgid "Four-level key with momayyez"
-msgstr "Touche à quatre niveaux avec le séparateur décimal momayyez"
+msgid "Bengali (India, Baishakhi Inscript)"
+msgstr ""
 
+#. Keyboard indicator for Gujarati layouts
 #: ../rules/base.xml.in.h:275
-msgid "French"
-msgstr "Français"
+msgid "gu"
+msgstr "gu"
 
-# http://bepo.fr
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Gujar%C3%A2t%C3%AE
 #: ../rules/base.xml.in.h:276
-msgid "French (Bepo, ergonomic, Dvorak way)"
-msgstr "Français (Bépo, ergonomique, façon Dvorak)"
-
-# http://bepo.fr
-#: ../rules/base.xml.in.h:277
-msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
-msgstr "Français (Bépo, ergonomique, façon Dvorak, latin-9 uniquement)"
+msgid "Gujarati"
+msgstr "Gujarâtî"
 
+#. Keyboard indicator for Punjabi layouts
 #: ../rules/base.xml.in.h:278
-msgid "French (Breton)"
-msgstr "Français (breton)"
+msgid "pa"
+msgstr "pa"
 
 #: ../rules/base.xml.in.h:279
-msgid "French (Cameroon azerty)"
-msgstr "Français (Cameroun, azerty)"
+msgid "Punjabi (Gurmukhi)"
+msgstr "Penjabi (Gurmukhî)"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Penjabi
 #: ../rules/base.xml.in.h:280
-msgid "French (Cameroon)"
-msgstr "Français (Cameroun)"
-
-#: ../rules/base.xml.in.h:281 ../rules/base.extras.xml.in.h:11
-msgid "French (Canada)"
-msgstr "Français (Canada)"
+msgid "Punjabi (Gurmukhi Jhelum)"
+msgstr "Penjabi (Gurmukhî, Jhelum)"
 
+#. Keyboard indicator for Kannada layouts
 #: ../rules/base.xml.in.h:282
-msgid "French (Canada, Dvorak)"
-msgstr "Français (Canada, Dvorak)"
+msgid "kn"
+msgstr "kn"
 
 #: ../rules/base.xml.in.h:283
-msgid "French (Canada, legacy)"
-msgstr "Français (Canada, obsolète)"
-
-#: ../rules/base.xml.in.h:284
-msgid "French (Democratic Republic of the Congo)"
-msgstr "Français (République démocratique du Congo)"
+msgid "Kannada"
+msgstr "Kannada"
 
+#. Keyboard indicator for Malayalam layouts
 #: ../rules/base.xml.in.h:285
-msgid "French (Dvorak)"
-msgstr "Français (Dvorak)"
+msgid "ml"
+msgstr "ml"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Malay%C3%A2lam
 #: ../rules/base.xml.in.h:286
-msgid "French (Guinea)"
-msgstr "Français (Guinée)"
+msgid "Malayalam"
+msgstr "Malayâlam"
 
 #: ../rules/base.xml.in.h:287
-msgid "French (Macintosh)"
-msgstr "Français (Macintosh)"
+msgid "Malayalam (Lalitha)"
+msgstr "Malayâlam (lalitha)"
 
+# https://secure.wikimedia.org/wikipedia/en/wiki/InScript_keyboard
 #: ../rules/base.xml.in.h:288
-msgid "French (Mali, alternative)"
-msgstr "Français (Mali, variante)"
-
-#: ../rules/base.xml.in.h:289
-msgid "French (Morocco)"
-msgstr "Français (Maroc)"
+msgid "Malayalam (enhanced Inscript with Rupee Sign)"
+msgstr "Malayâlam (Inscript amélioré avec le symbole monétaire Roupie)"
 
+#. Keyboard indicator for Oriya layouts
 #: ../rules/base.xml.in.h:290
-msgid "French (Sun dead keys)"
-msgstr "Français (touches mortes Sun)"
+msgid "or"
+msgstr "or"
 
 #: ../rules/base.xml.in.h:291
-msgid "French (Switzerland)"
-msgstr "Français (Suisse)"
-
-#: ../rules/base.xml.in.h:292
-msgid "French (Switzerland, Macintosh)"
-msgstr "Français (Suisse, Macintosh)"
+msgid "Oriya"
+msgstr "Oriya"
 
+#. Keyboard indicator for Tamil layouts
 #: ../rules/base.xml.in.h:293
-msgid "French (Switzerland, Sun dead keys)"
-msgstr "Français (Suisse, touches mortes Sun)"
+msgid "ta"
+msgstr "ta"
 
 #: ../rules/base.xml.in.h:294
-msgid "French (Switzerland, eliminate dead keys)"
-msgstr "Français (Suisse, sans touche morte)"
+msgid "Tamil (Unicode)"
+msgstr "Tamoul (Unicode)"
 
 #: ../rules/base.xml.in.h:295
-msgid "French (alternative)"
-msgstr "Français (variante)"
+msgid "Tamil (keyboard with numerals)"
+msgstr "Tamoul (clavier avec chiffres)"
 
+# TAB et TSCII sont des codages tamouls.
 #: ../rules/base.xml.in.h:296
-msgid "French (alternative, Sun dead keys)"
-msgstr "Français (variante, touches mortes Sun)"
+msgid "Tamil (TAB typewriter)"
+msgstr "Tamoul (machine à écrire, TAB)"
 
 #: ../rules/base.xml.in.h:297
-msgid "French (alternative, eliminate dead keys)"
-msgstr "Français (variante, sans touche morte)"
+msgid "Tamil (TSCII typewriter)"
+msgstr "Tamoul (machine à écrire, TSCII)"
 
 #: ../rules/base.xml.in.h:298
-msgid "French (alternative, latin-9 only)"
-msgstr "Français (variante, latin-9 uniquement)"
-
-#: ../rules/base.xml.in.h:299
-msgid "French (eliminate dead keys)"
-msgstr "Français (sans touche morte)"
+msgid "Tamil"
+msgstr "Tamoul"
 
+#. Keyboard indicator for Telugu layouts
 #: ../rules/base.xml.in.h:300
-msgid "French (legacy, alternative)"
-msgstr "Français (variante obsolète)"
+msgid "te"
+msgstr "te"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/T%C3%A9lougou
 #: ../rules/base.xml.in.h:301
-msgid "French (legacy, alternative, Sun dead keys)"
-msgstr "Français (variante obsolète, touches mortes Sun)"
-
-#: ../rules/base.xml.in.h:302
-msgid "French (legacy, alternative, eliminate dead keys)"
-msgstr "Français (variante obsolète, sans touche morte)"
+msgid "Telugu"
+msgstr "Télougou"
 
+#. Keyboard indicator for Urdu layouts
 #: ../rules/base.xml.in.h:303
-msgid "Fujitsu-Siemens Computers AMILO laptop"
-msgstr "Portable Fujitsu-Siemens Computers AMILO"
+msgid "ur"
+msgstr "ur"
 
-# https://secure.wikimedia.org/wikipedia/en/wiki/Fula_language
 #: ../rules/base.xml.in.h:304
-msgid "Fula"
-msgstr "Peul"
+msgid "Urdu (phonetic)"
+msgstr "Ourdou (phonétique)"
 
 #: ../rules/base.xml.in.h:305
-msgid "Ga"
-msgstr "Ga"
+msgid "Urdu (alternative phonetic)"
+msgstr "Ourdou (variante, phonétique)"
 
 #: ../rules/base.xml.in.h:306
-msgid "Generic 101-key PC"
-msgstr "PC générique 101 touches"
-
-#: ../rules/base.xml.in.h:307
-msgid "Generic 102-key (Intl) PC"
-msgstr "PC générique 102 touches (intl)"
+msgid "Urdu (WinKeys)"
+msgstr "Ourdou (touches Windows)"
 
+#. Keyboard indicator for Hindi layouts
 #: ../rules/base.xml.in.h:308
-msgid "Generic 104-key PC"
-msgstr "PC générique 104 touches"
+msgid "hi"
+msgstr "hi"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Hindi
+# http://indlinux.org/wiki/index.php/BolNagri
 #: ../rules/base.xml.in.h:309
-msgid "Generic 105-key (Intl) PC"
-msgstr "PC générique 105 touches (intl)"
+msgid "Hindi (Bolnagri)"
+msgstr "Hindi (bolnagri)"
 
 #: ../rules/base.xml.in.h:310
-msgid "Genius Comfy KB-12e"
-msgstr "Genius Comfy KB-12e"
+msgid "Hindi (Wx)"
+msgstr "Hindi (Wx)"
 
 #: ../rules/base.xml.in.h:311
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr "Genius Comfy KB-16M / MM KWD-910"
-
-#: ../rules/base.xml.in.h:312
-msgid "Genius Comfy KB-21e-Scroll"
-msgstr "Genius Comfy KB-21e-Scroll"
+msgid "English (India, with RupeeSign)"
+msgstr "Anglais (Inde, avec le symbole Roupie)"
 
+#. Keyboard indicator for Bosnian layouts
 #: ../rules/base.xml.in.h:313
-msgid "Genius KB-19e NB"
-msgstr "Genius KB-19e NB"
+msgid "bs"
+msgstr "bs"
 
 #: ../rules/base.xml.in.h:314
-msgid "Genius KKB-2050HS"
-msgstr "Genius KKB-2050HS"
+msgid "Bosnian"
+msgstr "Bosniaque"
 
 #: ../rules/base.xml.in.h:315
-msgid "Georgian"
-msgstr "Géorgien"
+msgid "Bosnian (use guillemets for quotes)"
+msgstr ""
+"Bosniaque (utilise des guillemets typographiques à la place des guillemets "
+"simples)"
 
-# As the name suggests, this layout is based on French AZERTY keyboard. The layout is based on the Georgian AZERTY layout model by Georgian language and localizaton expert Vasil "Tskapo" Kekelia.
-#
-# http://www.gakartuleba.org/layouts/index.php
 #: ../rules/base.xml.in.h:316
-msgid "Georgian (France, AZERTY Tskapo)"
-msgstr "Géorgien (France, azerty Tskapo)"
+msgid "Bosnian (use Bosnian digraphs)"
+msgstr "Bosniaque (utilise les digraphes bosniaques)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Oss%C3%A8te
 #: ../rules/base.xml.in.h:317
-msgid "Georgian (Italy)"
-msgstr "Géorgien (Italie)"
+msgid "Bosnian (US keyboard with Bosnian digraphs)"
+msgstr "Bosniaque (clavier US avec digraphes bosniaques)"
 
 #: ../rules/base.xml.in.h:318
-msgid "Georgian (MESS)"
-msgstr "Géorgien (MESS)"
-
-#: ../rules/base.xml.in.h:319
-msgid "Georgian (ergonomic)"
-msgstr "Géorgien (ergonomique)"
+msgid "Bosnian (US keyboard with Bosnian letters)"
+msgstr "Bosniaque (clavier US avec lettres bosniaques)"
 
+#. Keyboard indicator for Portuguese layouts
 #: ../rules/base.xml.in.h:320
-msgid "German"
-msgstr "Allemand"
+msgid "pt"
+msgstr "pt"
 
 #: ../rules/base.xml.in.h:321
-msgid "German (Austria)"
-msgstr "Allemand (Autriche)"
+msgid "Portuguese (Brazil)"
+msgstr "Portugais (Brésil)"
 
 #: ../rules/base.xml.in.h:322
-msgid "German (Austria, Macintosh)"
-msgstr "Allemand (Autriche, Macintosh)"
+msgid "Portuguese (Brazil, eliminate dead keys)"
+msgstr "Portugais (Brésil, sans touche morte)"
 
 #: ../rules/base.xml.in.h:323
-msgid "German (Austria, Sun dead keys)"
-msgstr "Allemand (Autriche, touches mortes Sun)"
+msgid "Portuguese (Brazil, Dvorak)"
+msgstr "Portugais (Brésil, Dvorak)"
 
+# https://secure.wikimedia.org/wikipedia/en/wiki/Dvorak_Simplified_Keyboard#Other_languages
+# http://tecladobrasileiro.com.br/images/stories/br-nativo/br-nativo-simples.svg
 #: ../rules/base.xml.in.h:324
-msgid "German (Austria, eliminate dead keys)"
-msgstr "Allemand (Autriche, sans touche morte)"
+msgid "Portuguese (Brazil, nativo)"
+msgstr "Portugais (Brésil, BR-Nativo)"
 
 #: ../rules/base.xml.in.h:325
-msgid "German (Dvorak)"
-msgstr "Allemand (Dvorak)"
+msgid "Portuguese (Brazil, nativo for USA keyboards)"
+msgstr "Portugais (Brésil, BR-Nativo pour claviers US)"
 
 #: ../rules/base.xml.in.h:326
-msgid "German (Macintosh)"
-msgstr "Allemand (Macintosh)"
-
-#: ../rules/base.xml.in.h:327
-msgid "German (Macintosh, eliminate dead keys)"
-msgstr "Allemand (Macintosh, sans touche morte)"
+msgid "Portuguese (Brazil, nativo for Esperanto)"
+msgstr "Portugais (Brésil, BR-Nativo pour l'Espéranto)"
 
-# https://secure.wikimedia.org/wikipedia/en/wiki/Keyboard_layout#Neo
+#. Keyboard indicator for Bulgarian layouts
 #: ../rules/base.xml.in.h:328
-msgid "German (Neo 2)"
-msgstr "Allemand (Neo 2)"
+msgid "bg"
+msgstr "bg"
 
 #: ../rules/base.xml.in.h:329
-msgid "German (Sun dead keys)"
-msgstr "Allemand (touches mortes Sun)"
+msgid "Bulgarian"
+msgstr "Bulgare"
 
 #: ../rules/base.xml.in.h:330
-msgid "German (Switzerland)"
-msgstr "Allemand (Suisse)"
+msgid "Bulgarian (traditional phonetic)"
+msgstr "Bulgare (phonétique, traditionnel)"
 
 #: ../rules/base.xml.in.h:331
-msgid "German (Switzerland, Macintosh)"
-msgstr "Allemand (Suisse, Macintosh)"
+msgid "Bulgarian (new phonetic)"
+msgstr "Bulgare (phonétique, nouveau)"
 
 #: ../rules/base.xml.in.h:332
-msgid "German (Switzerland, Sun dead keys)"
-msgstr "Allemand (Suisse, touches mortes Sun)"
-
-#: ../rules/base.xml.in.h:333
-msgid "German (Switzerland, eliminate dead keys)"
-msgstr "Allemand (Suisse, sans touche morte)"
+msgid "Arabic (Morocco)"
+msgstr "Arabe (Maroc)"
 
-#: ../rules/base.xml.in.h:334
-msgid "German (Switzerland, legacy)"
-msgstr "Allemand (Suisse, obsolète)"
+#. Keyboard indicator for French layouts
+#: ../rules/base.xml.in.h:334 ../rules/base.extras.xml.in.h:3
+msgid "fr"
+msgstr "fr"
 
 #: ../rules/base.xml.in.h:335
-msgid "German (dead acute)"
-msgstr "Allemand (accent aigu en touche morte)"
-
-#: ../rules/base.xml.in.h:336
-msgid "German (dead grave acute)"
-msgstr "Allemand (accents aigu et grave en touches mortes)"
+msgid "French (Morocco)"
+msgstr "Français (Maroc)"
 
+#. Keyboard indicator for Berber layouts
 #: ../rules/base.xml.in.h:337
-msgid "German (eliminate dead keys)"
-msgstr "Allemand (sans touche morte)"
+msgid "ber"
+msgstr "ber"
 
 #: ../rules/base.xml.in.h:338
-msgid "German (qwerty)"
-msgstr "Allemand (qwerty)"
+msgid "Berber (Morocco, Tifinagh)"
+msgstr "Berbère (Maroc, Tifinagh)"
 
 #: ../rules/base.xml.in.h:339
-msgid "Greek"
-msgstr "Grec"
+msgid "Berber (Morocco, Tifinagh alternative)"
+msgstr "Berbère (Maroc, variante Tifinagh)"
 
 #: ../rules/base.xml.in.h:340
-msgid "Greek (eliminate dead keys)"
-msgstr "Grec (sans touche morte)"
+msgid "Berber (Morocco, Tifinagh alternative phonetic)"
+msgstr "Berbère (Maroc, variante Tifinagh phonétique)"
 
 #: ../rules/base.xml.in.h:341
-msgid "Greek (extended)"
-msgstr "Grec (étendu)"
+msgid "Berber (Morocco, Tifinagh extended)"
+msgstr "Berbère (Maroc, Tifinagh étendu)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Diacritiques_de_l%27alphabet_grec
 #: ../rules/base.xml.in.h:342
-msgid "Greek (polytonic)"
-msgstr "Grec (polytonique)"
+msgid "Berber (Morocco, Tifinagh phonetic)"
+msgstr "Berbère (Maroc, Tifinagh phonétique)"
 
 #: ../rules/base.xml.in.h:343
-msgid "Greek (simple)"
-msgstr "Grec (simple)"
-
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Gujar%C3%A2t%C3%AE
-#: ../rules/base.xml.in.h:344
-msgid "Gujarati"
-msgstr "Gujarâtî"
+msgid "Berber (Morocco, Tifinagh extended phonetic)"
+msgstr "Berbère (Maroc, Tifinagh étendu phonétique)"
 
+#. Keyboard indicator for Cameroon layouts
 #: ../rules/base.xml.in.h:345
-msgid "Gyration"
-msgstr "Gyration"
+msgid "cm"
+msgstr "cm"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Cameroun
 #: ../rules/base.xml.in.h:346
-msgid "HTC Dream"
-msgstr "HTC Dream"
+msgid "English (Cameroon)"
+msgstr "Anglais (Cameroun)"
 
 #: ../rules/base.xml.in.h:347
-msgid "Happy Hacking Keyboard"
-msgstr "Happy Hacking"
+msgid "French (Cameroon)"
+msgstr "Français (Cameroun)"
 
 #: ../rules/base.xml.in.h:348
-msgid "Happy Hacking Keyboard for Mac"
-msgstr "Happy Hacking pour Mac"
+msgid "Cameroon Multilingual (qwerty)"
+msgstr "Cameroun multilingue (qwerty)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Haoussa
 #: ../rules/base.xml.in.h:349
-msgid "Hausa"
-msgstr "Haoussa"
+msgid "Cameroon Multilingual (azerty)"
+msgstr "Cameroun multilingue (azerty)"
 
 #: ../rules/base.xml.in.h:350
-msgid "Hebrew"
-msgstr "Hébreu"
-
-# http://wiki.jewishliturgy.org/Hebrew_Font_and_Keyboard_Layout_Setup
-#: ../rules/base.xml.in.h:351
-msgid "Hebrew (Biblical, Tiro)"
-msgstr "Hébreu (biblique, Tiro)"
+msgid "Cameroon Multilingual (Dvorak)"
+msgstr ""
 
+#. Keyboard indicator for Burmese layouts
 #: ../rules/base.xml.in.h:352
-msgid "Hebrew (lyx)"
-msgstr "Hébreu (lyx)"
+msgid "my"
+msgstr "my"
 
 #: ../rules/base.xml.in.h:353
-msgid "Hebrew (phonetic)"
-msgstr "Hébreu (phonétique)"
+msgid "Burmese"
+msgstr "Birman"
 
-#: ../rules/base.xml.in.h:354
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr "Hewlett-Packard clavier internet"
+#: ../rules/base.xml.in.h:354 ../rules/base.extras.xml.in.h:4
+msgid "French (Canada)"
+msgstr "Français (Canada)"
 
 #: ../rules/base.xml.in.h:355
-msgid "Hewlett-Packard Mini 110 Notebook"
-msgstr "Hewlett-Packard portable Mini 110"
+msgid "French (Canada, Dvorak)"
+msgstr "Français (Canada, Dvorak)"
 
 #: ../rules/base.xml.in.h:356
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "Hewlett-Packard Omnibook 500 FA"
+msgid "French (Canada, legacy)"
+msgstr "Français (Canada, obsolète)"
 
 #: ../rules/base.xml.in.h:357
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr "Hewlett-Packard Omnibook 5xx"
+msgid "Canadian Multilingual"
+msgstr "Canadien multilingue"
 
 #: ../rules/base.xml.in.h:358
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr "Hewlett-Packard Omnibook 6000/6100"
+msgid "Canadian Multilingual (first part)"
+msgstr "Canadien multilingue (première partie)"
 
 #: ../rules/base.xml.in.h:359
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr "Hewlett-Packard Omnibook XE3 GC"
-
-#: ../rules/base.xml.in.h:360
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr "Hewlett-Packard Omnibook XE3 GF"
+msgid "Canadian Multilingual (second part)"
+msgstr "Canadien multilingue (seconde partie)"
 
+#. Keyboard indicator for Inuktikut layouts
 #: ../rules/base.xml.in.h:361
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr "Hewlett-Packard Omnibook XT1000"
+msgid "ike"
+msgstr "ike"
 
 #: ../rules/base.xml.in.h:362
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr "Hewlett-Packard Pavilion ZT11xx"
+msgid "Inuktitut"
+msgstr "Inuktitut"
 
 #: ../rules/base.xml.in.h:363
-msgid "Hewlett-Packard Pavilion dv5"
-msgstr "Hewlett-Packard Pavilion dv5"
+msgid "English (Canada)"
+msgstr "Anglais (Canada)"
 
 #: ../rules/base.xml.in.h:364
-msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
-msgstr "Hewlett-Packard SK-250x, clavier multimedia"
-
-#: ../rules/base.xml.in.h:365
-msgid "Hewlett-Packard nx9020"
-msgstr "Hewlett-Packard nx9020"
+msgid "French (Democratic Republic of the Congo)"
+msgstr "Français (République démocratique du Congo)"
 
+#. Keyboard indicator for Taiwanese layouts
 #: ../rules/base.xml.in.h:366
-msgid "Hexadecimal"
-msgstr "Hexadécimal"
+msgid "zh"
+msgstr "zh"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Hindi
-# http://indlinux.org/wiki/index.php/BolNagri
 #: ../rules/base.xml.in.h:367
-msgid "Hindi (Bolnagri)"
-msgstr "Hindi (bolnagri)"
+msgid "Chinese"
+msgstr "Chinois"
 
 #: ../rules/base.xml.in.h:368
-msgid "Hindi (Wx)"
-msgstr "Hindi (Wx)"
+msgid "Tibetan"
+msgstr "Tibétain"
 
 #: ../rules/base.xml.in.h:369
-msgid "Honeywell Euroboard"
-msgstr "Honeywell Euroboard"
+msgid "Tibetan (with ASCII numerals)"
+msgstr "Tibétain (avec chiffres ASCII)"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Ou%C3%AFghour
 #: ../rules/base.xml.in.h:370
-msgid "Htc Dream phone"
-msgstr "Htc Dream"
-
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Hongrois
-#: ../rules/base.xml.in.h:371
-msgid "Hungarian"
-msgstr "Hongrois"
+msgid "Uyghur"
+msgstr "Ouïghour"
 
+#. Keyboard indicator for Croatian layouts
 #: ../rules/base.xml.in.h:372
-msgid "Hungarian (101/qwerty/comma/dead keys)"
-msgstr "Hongrois (101, qwerty, virgule, touches mortes)"
+msgid "hr"
+msgstr "hr"
 
 #: ../rules/base.xml.in.h:373
-msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
-msgstr "Hongrois (101, qwerty, virgule, sans touche morte)"
+msgid "Croatian"
+msgstr "Croate"
 
 #: ../rules/base.xml.in.h:374
-msgid "Hungarian (101/qwerty/dot/dead keys)"
-msgstr "Hongrois (101, qwerty, point, touches mortes)"
+msgid "Croatian (use guillemets for quotes)"
+msgstr "Croate (utilise des guillemets typo. au lieu des guillemets simples)"
 
 #: ../rules/base.xml.in.h:375
-msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
-msgstr "Hongrois (101, qwerty, point, sans touche morte)"
+msgid "Croatian (use Croatian digraphs)"
+msgstr "Croate (utilise les digraphes croates)"
 
 #: ../rules/base.xml.in.h:376
-msgid "Hungarian (101/qwertz/comma/dead keys)"
-msgstr "Hongrois (101, qwertz, virgule, touches mortes)"
+msgid "Croatian (US keyboard with Croatian digraphs)"
+msgstr "Croate (clavier US avec digraphes croates)"
 
 #: ../rules/base.xml.in.h:377
-msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
-msgstr "Hongrois (101, qwertz, virgule, touches mortes)"
-
-#: ../rules/base.xml.in.h:378
-msgid "Hungarian (101/qwertz/dot/dead keys)"
-msgstr "Hongrois (101, qwertz, point,  touches mortes)"
+msgid "Croatian (US keyboard with Croatian letters)"
+msgstr "Croate (clavier US avec lettres croates)"
 
+#. Keyboard indicator for Chech layouts
 #: ../rules/base.xml.in.h:379
-msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
-msgstr "Hongrois (101, qwertz, point, sans touche morte)"
+msgid "cs"
+msgstr "cs"
 
 #: ../rules/base.xml.in.h:380
-msgid "Hungarian (102/qwerty/comma/dead keys)"
-msgstr "Hongrois (102, qwerty, virgule, touches mortes)"
+msgid "Czech"
+msgstr "Tchèque"
 
 #: ../rules/base.xml.in.h:381
-msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
-msgstr "Hongrois (102, qwerty, virgule, sans touche morte)"
+msgid "Czech (with &lt;\\|&gt; key)"
+msgstr "Tchèque (avec la touche &lt;\\|&gt;)"
 
 #: ../rules/base.xml.in.h:382
-msgid "Hungarian (102/qwerty/dot/dead keys)"
-msgstr "Hongrois (102, qwerty, point, touches mortes)"
+msgid "Czech (qwerty)"
+msgstr "Tchèque (qwerty)"
 
 #: ../rules/base.xml.in.h:383
-msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
-msgstr "Hongrois (102, qwerty, point, sans touche morte)"
+msgid "Czech (qwerty, extended Backslash)"
+msgstr "Tchèque (qwerty, barre oblique inverse étendue)"
 
+# http://repo.or.cz/w/ucwcs-xkb.git/blob_plain/HEAD:/README
+# http://www.ucw.cz/
 #: ../rules/base.xml.in.h:384
-msgid "Hungarian (102/qwertz/comma/dead keys)"
-msgstr "Hongrois (102, qwertz, virgule, touches mortes)"
+msgid "Czech (UCW layout, accented letters only)"
+msgstr "Tchèque (disposition UCW, lettres accentuées seulement)"
 
+# http://repo.or.cz/w/ucwcs-xkb.git/blob_plain/HEAD:/README
+# http://www.ucw.cz/
 #: ../rules/base.xml.in.h:385
-msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
-msgstr "Hongrois (102, qwertz, virgule, sans touche morte)"
-
-#: ../rules/base.xml.in.h:386
-msgid "Hungarian (102/qwertz/dot/dead keys)"
-msgstr "Hongrois (102, qwertz, point, touches mortes)"
+msgid "Czech (US Dvorak with CZ UCW support)"
+msgstr "Tchèque (Dvorak US avec support UCW CZ)"
 
+#. Keyboard indicator for Danish layouts
 #: ../rules/base.xml.in.h:387
-msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
-msgstr "Hongrois (102, qwertz, point, sans touche morte)"
+msgid "da"
+msgstr "da"
 
 #: ../rules/base.xml.in.h:388
-msgid "Hungarian (eliminate dead keys)"
-msgstr "Hongrois (sans touche morte)"
+msgid "Danish"
+msgstr "Danois"
 
 #: ../rules/base.xml.in.h:389
-msgid "Hungarian (qwerty)"
-msgstr "Hongrois (qwerty)"
+msgid "Danish (eliminate dead keys)"
+msgstr "Danois (sans touche morte)"
 
 #: ../rules/base.xml.in.h:390
-msgid "Hungarian (standard)"
-msgstr "Hongrois (standard)"
+msgid "Danish (Macintosh)"
+msgstr "Danois (Macintosh)"
 
 #: ../rules/base.xml.in.h:391
-msgid "Hyper is mapped to Win-keys"
-msgstr "Hyper est placé sur les touches Windows"
+msgid "Danish (Macintosh, eliminate dead keys)"
+msgstr "Danois (Macintosh, sans touche morte)"
 
 #: ../rules/base.xml.in.h:392
-msgid "IBM Rapid Access"
-msgstr "IBM Rapid Access"
-
-#: ../rules/base.xml.in.h:393
-msgid "IBM Rapid Access II"
-msgstr "IBM Rapid Access II"
+msgid "Danish (Dvorak)"
+msgstr "Danois (Dvorak)"
 
+#. Keyboard indicator for Dutch layouts
 #: ../rules/base.xml.in.h:394
-msgid "IBM Space Saver"
-msgstr "IBM Space Saver"
+msgid "nl"
+msgstr "nl"
 
 #: ../rules/base.xml.in.h:395
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+msgid "Dutch"
+msgstr "Néerlandais"
 
 #: ../rules/base.xml.in.h:396
-msgid "IBM ThinkPad R60/T60/R61/T61"
-msgstr "IBM ThinkPad R60/T60/R61/T61"
+msgid "Dutch (Sun dead keys)"
+msgstr "Néerlandais (touches mortes Sun)"
 
 #: ../rules/base.xml.in.h:397
-msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
-msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgid "Dutch (Macintosh)"
+msgstr "Néerlandais (Macintosh)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Islandais
 #: ../rules/base.xml.in.h:398
-msgid "Icelandic"
-msgstr "Islandais"
-
-#: ../rules/base.xml.in.h:399
-msgid "Icelandic (Dvorak)"
-msgstr "Islandais (Dvorak)"
+msgid "Dutch (standard)"
+msgstr "Néerlandais (standard)"
 
+#. Keyboard indicator for Dzongkha layouts
 #: ../rules/base.xml.in.h:400
-msgid "Icelandic (Macintosh)"
-msgstr "Islandais (Macintosh)"
+msgid "dz"
+msgstr "dz"
 
 #: ../rules/base.xml.in.h:401
-msgid "Icelandic (Sun dead keys)"
-msgstr "Islandais (touches mortes Sun)"
-
-#: ../rules/base.xml.in.h:402
-msgid "Icelandic (eliminate dead keys)"
-msgstr "Islandais (sans touche morte)"
+msgid "Dzongkha"
+msgstr "Dzongkha"
 
+#. Keyboard indicator for Estonian layouts
 #: ../rules/base.xml.in.h:403
-msgid "Igbo"
-msgstr "Igbo"
+msgid "et"
+msgstr "et"
 
 #: ../rules/base.xml.in.h:404
-msgid "Indian"
-msgstr "Indien"
+msgid "Estonian"
+msgstr "Estonien"
 
 #: ../rules/base.xml.in.h:405
-msgid "Inuktitut"
-msgstr "Inuktitut"
+msgid "Estonian (eliminate dead keys)"
+msgstr "Estonien (sans touche morte)"
 
 #: ../rules/base.xml.in.h:406
-msgid "Iraqi"
-msgstr "Irakien"
+msgid "Estonian (Dvorak)"
+msgstr "Estonien (Dvorak)"
 
 #: ../rules/base.xml.in.h:407
-msgid "Irish"
-msgstr "Irlandais"
+msgid "Estonian (US keyboard with Estonian letters)"
+msgstr "Estonien (clavier US avec lettres estoniennes)"
 
-#: ../rules/base.xml.in.h:408
-msgid "Irish (UnicodeExpert)"
-msgstr "Irlandais (UnicodeExpert)"
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Persan
+#: ../rules/base.xml.in.h:408 ../rules/base.extras.xml.in.h:14
+msgid "Persian"
+msgstr "Persan"
 
 #: ../rules/base.xml.in.h:409
-msgid "Italian"
-msgstr "Italien"
-
-#: ../rules/base.xml.in.h:410
-msgid "Italian (Macintosh)"
-msgstr "Italien (Macintosh)"
+msgid "Persian (with Persian Keypad)"
+msgstr "Persan (avec pavé numérique persan)"
 
+#. Keyboard indicator for Kurdish layouts
 #: ../rules/base.xml.in.h:411
-msgid "Italian (US keyboard with Italian letters)"
-msgstr "Italien (clavier US avec lettres italiennes)"
+msgid "ku"
+msgstr "ku"
 
 #: ../rules/base.xml.in.h:412
-msgid "Italian (eliminate dead keys)"
-msgstr "Italien (sans touche morte)"
+msgid "Kurdish (Iran, Latin Q)"
+msgstr "Kurde (Iran, Q latin)"
 
 #: ../rules/base.xml.in.h:413
-msgid "Japanese"
-msgstr "Japonais"
+msgid "Kurdish (Iran, F)"
+msgstr "Kurde (Iran, F)"
 
 #: ../rules/base.xml.in.h:414
-msgid "Japanese (Kana 86)"
-msgstr "Japonais (Kana 86)"
+msgid "Kurdish (Iran, Latin Alt-Q)"
+msgstr "Kurde (Iran, Alt-Q latin)"
 
 #: ../rules/base.xml.in.h:415
-msgid "Japanese (Kana)"
-msgstr "Japonais (Kana)"
+msgid "Kurdish (Iran, Arabic-Latin)"
+msgstr "Kurde (Iran, arabe-latin)"
 
 #: ../rules/base.xml.in.h:416
-msgid "Japanese (Macintosh)"
-msgstr "Japonais (Macintosh)"
+msgid "Iraqi"
+msgstr "Irakien"
 
 #: ../rules/base.xml.in.h:417
-msgid "Japanese (OADG 109A)"
-msgstr "Japonais (OADG 109A)"
+msgid "Kurdish (Iraq, Latin Q)"
+msgstr "Kurde (Irak, Q latin)"
 
 #: ../rules/base.xml.in.h:418
-msgid "Japanese (PC-98xx Series)"
-msgstr "Japonais (PC-98xx)"
+msgid "Kurdish (Iraq, F)"
+msgstr "Kurde (Irak, F)"
 
 #: ../rules/base.xml.in.h:419
-msgid "Japanese keyboard options"
-msgstr "Options des claviers japonais"
+msgid "Kurdish (Iraq, Latin Alt-Q)"
+msgstr "Kurde (Irak, Alt-Q latin)"
 
 #: ../rules/base.xml.in.h:420
-msgid "Kalmyk"
-msgstr "Kalmyk"
-
-#: ../rules/base.xml.in.h:421
-msgid "Kana Lock key is locking"
-msgstr "La touche « verrouillage Kana » verrouille"
+msgid "Kurdish (Iraq, Arabic-Latin)"
+msgstr "Kurde (Irak, arabe-latin)"
 
+#. Keyboard indicator for Faroese layouts
 #: ../rules/base.xml.in.h:422
-msgid "Kannada"
-msgstr "Kannada"
+msgid "fo"
+msgstr "fo"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Cachoube
 #: ../rules/base.xml.in.h:423
-msgid "Kashubian"
-msgstr "Cachoube"
+msgid "Faroese"
+msgstr "Féroïen"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Kazakh
 #: ../rules/base.xml.in.h:424
-msgid "Kazakh"
-msgstr "Kazakh"
-
-#: ../rules/base.xml.in.h:425
-msgid "Kazakh (with Russian)"
-msgstr "Kazakh (avec russe)"
+msgid "Faroese (eliminate dead keys)"
+msgstr "Féroïen (sans touche morte)"
 
+#. Keyboard indicator for Finnish layouts
 #: ../rules/base.xml.in.h:426
-msgid "Key sequence to kill the X server"
-msgstr "Séquence de touches pour tuer le serveur X"
+msgid "fi"
+msgstr "fi"
 
 #: ../rules/base.xml.in.h:427
-msgid "Key to choose 3rd level"
-msgstr "Touche sélectionnant le 3e niveau"
+msgid "Finnish"
+msgstr "Finnois"
 
 #: ../rules/base.xml.in.h:428
-msgid "Key to choose 5th level"
-msgstr "Touche sélectionnant le 5e niveau"
+msgid "Finnish (classic)"
+msgstr "Finnois (classique)"
 
 #: ../rules/base.xml.in.h:429
-msgid "Key(s) to change layout"
-msgstr "Touches modifiant la disposition du clavier"
+msgid "Finnish (classic, eliminate dead keys)"
+msgstr "Finnois (classique, sans touche morte)"
 
 #: ../rules/base.xml.in.h:430
-msgid "Keytronic FlexPro"
-msgstr "Keytronic FlexPro"
+msgid "Northern Saami (Finland)"
+msgstr "Sami du Nord (Finlande)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Khmer
 #: ../rules/base.xml.in.h:431
-msgid "Khmer (Cambodia)"
-msgstr "Khmer (Cambodge)"
+msgid "Finnish (Macintosh)"
+msgstr "Finnois (Macintosh)"
 
-# Langue bantoue.
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Kikuyu_%28langue%29
 #: ../rules/base.xml.in.h:432
-msgid "Kikuyu"
-msgstr "Kikuyu"
+msgid "French"
+msgstr "Français"
 
-# Claviers.
-# http://www.kinesis-ergo.com/keyboards.htm
 #: ../rules/base.xml.in.h:433
-msgid "Kinesis"
-msgstr "Kinesis"
+msgid "French (eliminate dead keys)"
+msgstr "Français (sans touche morte)"
 
 #: ../rules/base.xml.in.h:434
-msgid "Komi"
-msgstr "Komi"
+msgid "French (Sun dead keys)"
+msgstr "Français (touches mortes Sun)"
 
 #: ../rules/base.xml.in.h:435
-msgid "Korean"
-msgstr "Coréen"
+msgid "French (alternative)"
+msgstr "Français (variante)"
 
 #: ../rules/base.xml.in.h:436
-msgid "Korean (101/104 key compatible)"
-msgstr "Coréen (compatible 101/104 touches)"
+msgid "French (alternative, latin-9 only)"
+msgstr "Français (variante, latin-9 uniquement)"
 
 #: ../rules/base.xml.in.h:437
-msgid "Kurdish (Iran, Arabic-Latin)"
-msgstr "Kurde (Iran, arabe-latin)"
+msgid "French (alternative, eliminate dead keys)"
+msgstr "Français (variante, sans touche morte)"
 
 #: ../rules/base.xml.in.h:438
-msgid "Kurdish (Iran, F)"
-msgstr "Kurde (Iran, F)"
-
+msgid "French (alternative, Sun dead keys)"
+msgstr "Français (variante, touches mortes Sun)"
+
 #: ../rules/base.xml.in.h:439
-msgid "Kurdish (Iran, Latin Alt-Q)"
-msgstr "Kurde (Iran, Alt-Q latin)"
+msgid "French (legacy, alternative)"
+msgstr "Français (variante obsolète)"
 
 #: ../rules/base.xml.in.h:440
-msgid "Kurdish (Iran, Latin Q)"
-msgstr "Kurde (Iran, Q latin)"
+msgid "French (legacy, alternative, eliminate dead keys)"
+msgstr "Français (variante obsolète, sans touche morte)"
 
 #: ../rules/base.xml.in.h:441
-msgid "Kurdish (Iraq, Arabic-Latin)"
-msgstr "Kurde (Irak, arabe-latin)"
+msgid "French (legacy, alternative, Sun dead keys)"
+msgstr "Français (variante obsolète, touches mortes Sun)"
 
+# http://bepo.fr
 #: ../rules/base.xml.in.h:442
-msgid "Kurdish (Iraq, F)"
-msgstr "Kurde (Irak, F)"
+msgid "French (Bepo, ergonomic, Dvorak way)"
+msgstr "Français (Bépo, ergonomique, façon Dvorak)"
 
+# http://bepo.fr
 #: ../rules/base.xml.in.h:443
-msgid "Kurdish (Iraq, Latin Alt-Q)"
-msgstr "Kurde (Irak, Alt-Q latin)"
+msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
+msgstr "Français (Bépo, ergonomique, façon Dvorak, latin-9 uniquement)"
 
 #: ../rules/base.xml.in.h:444
-msgid "Kurdish (Iraq, Latin Q)"
-msgstr "Kurde (Irak, Q latin)"
+msgid "French (Dvorak)"
+msgstr "Français (Dvorak)"
 
 #: ../rules/base.xml.in.h:445
-msgid "Kurdish (Syria, F)"
-msgstr "Kurde (Syrie, F)"
+msgid "French (Macintosh)"
+msgstr "Français (Macintosh)"
 
 #: ../rules/base.xml.in.h:446
-msgid "Kurdish (Syria, Latin Alt-Q)"
-msgstr "Kurde (Syrie, Alt-Q latin)"
+msgid "French (Breton)"
+msgstr "Français (breton)"
 
 #: ../rules/base.xml.in.h:447
-msgid "Kurdish (Syria, Latin Q)"
-msgstr "Kurde (Syrie, Q latin)"
+msgid "Occitan"
+msgstr "Occitan"
 
+# As the name suggests, this layout is based on French AZERTY keyboard. The layout is based on the Georgian AZERTY layout model by Georgian language and localizaton expert Vasil "Tskapo" Kekelia.
+#
+# http://www.gakartuleba.org/layouts/index.php
 #: ../rules/base.xml.in.h:448
-msgid "Kurdish (Turkey, F)"
-msgstr "Kurde (Turquie, F)"
+msgid "Georgian (France, AZERTY Tskapo)"
+msgstr "Géorgien (France, azerty Tskapo)"
 
 #: ../rules/base.xml.in.h:449
-msgid "Kurdish (Turkey, Latin Alt-Q)"
-msgstr "Kurde (Turquie, Alt-Q latin)"
+msgid "English (Ghana)"
+msgstr "Anglais (Ghana)"
 
 #: ../rules/base.xml.in.h:450
-msgid "Kurdish (Turkey, Latin Q)"
-msgstr "Kurde (Turquie, Q latin)"
-
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Kirghize_%28langue%29
-#: ../rules/base.xml.in.h:451
-msgid "Kyrgyz"
-msgstr "Kirghize"
+msgid "English (Ghana, multilingual)"
+msgstr "Anglais (Ghana, multilingue)"
 
+#. Keyboard indicator for Akan layouts
 #: ../rules/base.xml.in.h:452
-msgid "Kyrgyz (phonetic)"
-msgstr "Kirghize (phonétique)"
+msgid "ak"
+msgstr "ak"
 
 #: ../rules/base.xml.in.h:453
-msgid "Lao"
-msgstr "Lao"
-
-# STEA = Agence pour la science, la technologie et l'environnement.
-# http://www.clear-vu.com.hk/resources/lao_keyboard.asp
-#: ../rules/base.xml.in.h:454
-msgid "Lao (STEA proposed standard layout)"
-msgstr "Lao (disposition proposée par la STEA)"
+msgid "Akan"
+msgstr "Akan"
 
+#. Keyboard indicator for Ewe layouts
 #: ../rules/base.xml.in.h:455
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr "Compaq portable (p.ex. Armada)"
+msgid "ee"
+msgstr "ee"
 
 #: ../rules/base.xml.in.h:456
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr "Compaq portable clavier Internet (p.ex. Presario)"
-
-#: ../rules/base.xml.in.h:457
-msgid "Laptop/notebook eMachines m68xx"
-msgstr "eMachines m68xx"
+msgid "Ewe"
+msgstr "Éwé"
 
-#: ../rules/base.xml.in.h:458 ../rules/base.extras.xml.in.h:13
-msgid "Latvian"
-msgstr "Letton"
+#. Keyboard indicator for Fula layouts
+#: ../rules/base.xml.in.h:458
+msgid "ff"
+msgstr "ff"
 
+# https://secure.wikimedia.org/wikipedia/en/wiki/Fula_language
 #: ../rules/base.xml.in.h:459
-msgid "Latvian (F variant)"
-msgstr "Letton (variante F)"
-
-#: ../rules/base.xml.in.h:460
-msgid "Latvian (adapted)"
-msgstr "Letton (adapté)"
+msgid "Fula"
+msgstr "Peul"
 
+#. Keyboard indicator for Ga layouts
 #: ../rules/base.xml.in.h:461
-msgid "Latvian (apostrophe variant)"
-msgstr "Letton (variante apostrophe)"
+msgid "gaa"
+msgstr "gaa"
 
 #: ../rules/base.xml.in.h:462
-msgid "Latvian (ergonomic, ŪGJRMV)"
-msgstr "Letton (ergonomique, ŪGJRMV)"
-
-#: ../rules/base.xml.in.h:463
-msgid "Latvian (modern)"
-msgstr "Letton (moderne)"
+msgid "Ga"
+msgstr "Ga"
 
+#. Keyboard indicator for Hausa layouts
 #: ../rules/base.xml.in.h:464
-msgid "Latvian (tilde variant)"
-msgstr "Letton (variante tilde)"
+msgid "ha"
+msgstr "ha"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Haoussa
 #: ../rules/base.xml.in.h:465
-msgid "Left Alt"
-msgstr "Alt gauche"
-
-#: ../rules/base.xml.in.h:466
-msgid "Left Alt (while pressed)"
-msgstr "Alt gauche (si enfoncé)"
+msgid "Hausa"
+msgstr "Haoussa"
 
+#. Keyboard indicator for Avatime layouts
 #: ../rules/base.xml.in.h:467
-msgid "Left Alt is swapped with Left Win"
-msgstr "Alt. gauche échangé avec Windows droit"
+msgid "avn"
+msgstr "avn"
 
 #: ../rules/base.xml.in.h:468
-msgid "Left Ctrl"
-msgstr "Ctrl gauche"
+msgid "Avatime"
+msgstr "Avatime"
 
+# http://www.gillbt.org/
 #: ../rules/base.xml.in.h:469
-msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
-msgstr ""
-"Ctrl gauche (première disposition), Ctrl droit (dernière disposition)"
+msgid "English (Ghana, GILLBT)"
+msgstr "Anglais (Ghana, GILLBT)"
 
 #: ../rules/base.xml.in.h:470
-msgid "Left Ctrl+Left Shift"
-msgstr "Ctrl gauche+Maj. gauche"
-
-#: ../rules/base.xml.in.h:471
-msgid "Left Shift"
-msgstr "Maj. gauche"
+msgid "French (Guinea)"
+msgstr "Français (Guinée)"
 
+#. Keyboard indicator for Georgian layouts
 #: ../rules/base.xml.in.h:472
-msgid "Left Win"
-msgstr "Touche Windows gauche"
+msgid "ka"
+msgstr "ka"
 
 #: ../rules/base.xml.in.h:473
-msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
-msgstr ""
-"Touche Windows gauche (première disposition), touche Windows droite "
-"(dernière disposition)"
+msgid "Georgian"
+msgstr "Géorgien"
 
 #: ../rules/base.xml.in.h:474
-msgid "Left Win (while pressed)"
-msgstr "Windows gauche (si enfoncé)"
+msgid "Georgian (ergonomic)"
+msgstr "Géorgien (ergonomique)"
 
 #: ../rules/base.xml.in.h:475
-msgid ""
-"Left Win chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser"
-msgstr ""
-"Windows gauche sélectionne le 5e niveau ; se verrouille par un appui "
-"simultané avec un autre sélecteur de 5e niveau"
+msgid "Georgian (MESS)"
+msgstr "Géorgien (MESS)"
 
 #: ../rules/base.xml.in.h:476
-msgid ""
-"Left Win chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser, one press releases the lock"
-msgstr ""
-"Windows sélectionne le 5e niveau ; se verrouille par un appui simultané avec "
-"un autre sélecteur de 5e niveau ; un appui libère le verrou"
+msgid "Russian (Georgia)"
+msgstr "Russe (Géorgie)"
 
 #: ../rules/base.xml.in.h:477
-msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
-msgstr ""
-"Ctrl gauche + Windows gauche (première disposition), Ctrl droit + Menu "
-"(seconde disposition)"
+msgid "Ossetian (Georgia)"
+msgstr "Ossète (Géorgie)"
 
-#: ../rules/base.xml.in.h:478
-msgid "Legacy"
-msgstr "Obsolète"
+#: ../rules/base.xml.in.h:478 ../rules/base.extras.xml.in.h:10
+msgid "German"
+msgstr "Allemand"
 
 #: ../rules/base.xml.in.h:479
-msgid "Legacy Wang 724"
-msgstr "Wang 724 (clavier obsolète)"
+msgid "German (dead acute)"
+msgstr "Allemand (accent aigu en touche morte)"
+
+#: ../rules/base.xml.in.h:480
+msgid "German (dead grave acute)"
+msgstr "Allemand (accents aigu et grave en touches mortes)"
 
-#. Actually, with KP_SEPARATOR, as the old keypad(comma)
 #: ../rules/base.xml.in.h:481
-msgid "Legacy key with comma"
-msgstr "Touche obsolète avec virgule"
+msgid "German (eliminate dead keys)"
+msgstr "Allemand (sans touche morte)"
 
 #: ../rules/base.xml.in.h:482
-msgid "Legacy key with dot"
-msgstr "Touche obsolète avec point"
+msgid "Romanian (Germany)"
+msgstr "Roumain (Allemagne)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Lituanien
-#: ../rules/base.xml.in.h:483 ../rules/base.extras.xml.in.h:22
-msgid "Lithuanian"
-msgstr "Lituanien"
+#: ../rules/base.xml.in.h:483
+msgid "Romanian (Germany, eliminate dead keys)"
+msgstr "Roumain (Allemagne, sans touche morte)"
 
 #: ../rules/base.xml.in.h:484
-msgid "Lithuanian (IBM LST 1205-92)"
-msgstr "Lituanien (IBM LST 1205-92)"
+msgid "German (Dvorak)"
+msgstr "Allemand (Dvorak)"
 
-# http://lekp.info/LithuanianErgonomic
 #: ../rules/base.xml.in.h:485
-msgid "Lithuanian (LEKP)"
-msgstr "Lituanien (LEKP)"
+msgid "German (Sun dead keys)"
+msgstr "Allemand (touches mortes Sun)"
 
+# https://secure.wikimedia.org/wikipedia/en/wiki/Keyboard_layout#Neo
 #: ../rules/base.xml.in.h:486
-msgid "Lithuanian (LEKPa)"
-msgstr "Lituanien (LEKPa)"
+msgid "German (Neo 2)"
+msgstr "Allemand (Neo 2)"
 
 #: ../rules/base.xml.in.h:487
-msgid "Lithuanian (US keyboard with Lithuanian letters)"
-msgstr "Lituanien (clavier US avec lettres lituaniennes)"
+msgid "German (Macintosh)"
+msgstr "Allemand (Macintosh)"
 
 #: ../rules/base.xml.in.h:488
-msgid "Lithuanian (standard)"
-msgstr "Lituanien (standard)"
+msgid "German (Macintosh, eliminate dead keys)"
+msgstr "Allemand (Macintosh, sans touche morte)"
 
 #: ../rules/base.xml.in.h:489
-msgid "Logitech Access Keyboard"
-msgstr "Clavier Logitech Access"
+msgid "Lower Sorbian"
+msgstr "Bas-sorabe"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Bas-sorabe
 #: ../rules/base.xml.in.h:490
-msgid "Logitech Cordless Desktop"
-msgstr "Logitech Cordless Desktop"
+msgid "Lower Sorbian (qwertz)"
+msgstr "Bas-sorabe (qwertz)"
 
 #: ../rules/base.xml.in.h:491
-msgid "Logitech Cordless Desktop (alternate option)"
-msgstr "Logitech Cordless Desktop (variante)"
-
-#: ../rules/base.xml.in.h:492
-msgid "Logitech Cordless Desktop EX110"
-msgstr "Logitech Cordless Desktop EX110"
+msgid "Russian (Germany, phonetic)"
+msgstr "Russe (Allemagne, phonétique)"
 
+#. Keyboard indicator for Greek layouts
 #: ../rules/base.xml.in.h:493
-msgid "Logitech Cordless Desktop LX-300"
-msgstr "Logitech Cordless Desktop LX-300"
+msgid "gr"
+msgstr "gr"
 
 #: ../rules/base.xml.in.h:494
-msgid "Logitech Cordless Desktop Navigator"
-msgstr "Logitech Cordless Desktop Navigator"
+msgid "Greek"
+msgstr "Grec"
 
 #: ../rules/base.xml.in.h:495
-msgid "Logitech Cordless Desktop Optical"
-msgstr "Logitech Cordless Desktop Optical"
+msgid "Greek (simple)"
+msgstr "Grec (simple)"
 
 #: ../rules/base.xml.in.h:496
-msgid "Logitech Cordless Desktop Pro (alternate option 2)"
-msgstr "Logitech Cordless Desktop Pro (variante 2)"
+msgid "Greek (extended)"
+msgstr "Grec (étendu)"
 
 #: ../rules/base.xml.in.h:497
-msgid "Logitech Cordless Desktop iTouch"
-msgstr "Logitech Cordless Desktop iTouch"
+msgid "Greek (eliminate dead keys)"
+msgstr "Grec (sans touche morte)"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Diacritiques_de_l%27alphabet_grec
 #: ../rules/base.xml.in.h:498
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr "Logitech Cordless Freedom/Desktop Navigator"
-
-#: ../rules/base.xml.in.h:499
-msgid "Logitech G15 extra keys via G15daemon"
-msgstr "Touches supplémentaires Logitech G15 via le démon G15"
+msgid "Greek (polytonic)"
+msgstr "Grec (polytonique)"
 
+#. Keyboard indicator for Hungarian layouts
 #: ../rules/base.xml.in.h:500
-msgid "Logitech Generic Keyboard"
-msgstr "Clavier Logitech générique"
+msgid "hu"
+msgstr "hu"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Hongrois
 #: ../rules/base.xml.in.h:501
-msgid "Logitech Internet 350 Keyboard"
-msgstr "Clavier Logitech Internet 350"
+msgid "Hungarian"
+msgstr "Hongrois"
 
 #: ../rules/base.xml.in.h:502
-msgid "Logitech Internet Keyboard"
-msgstr "Clavier Logitech Internet"
+msgid "Hungarian (standard)"
+msgstr "Hongrois (standard)"
 
 #: ../rules/base.xml.in.h:503
-msgid "Logitech Internet Navigator Keyboard"
-msgstr "Clavier Logitech Internet Navigator"
+msgid "Hungarian (eliminate dead keys)"
+msgstr "Hongrois (sans touche morte)"
 
 #: ../rules/base.xml.in.h:504
-msgid "Logitech Media Elite Keyboard"
-msgstr "Clavier Logitech Media Elite"
+msgid "Hungarian (qwerty)"
+msgstr "Hongrois (qwerty)"
 
 #: ../rules/base.xml.in.h:505
-msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
-msgstr "Clavier Logitech sans-fil Ultra-X Media"
+msgid "Hungarian (101/qwertz/comma/dead keys)"
+msgstr "Hongrois (101, qwertz, virgule, touches mortes)"
 
 #: ../rules/base.xml.in.h:506
-msgid "Logitech Ultra-X Keyboard"
-msgstr "Clavier Logitech Ultra-X"
+msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
+msgstr "Hongrois (101, qwertz, virgule, touches mortes)"
 
 #: ../rules/base.xml.in.h:507
-msgid "Logitech diNovo Edge Keyboard"
-msgstr "Clavier Logitech diNovo Edge"
+msgid "Hungarian (101/qwertz/dot/dead keys)"
+msgstr "Hongrois (101, qwertz, point,  touches mortes)"
 
 #: ../rules/base.xml.in.h:508
-msgid "Logitech diNovo Keyboard"
-msgstr "Clavier Logitech diNovo"
+msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
+msgstr "Hongrois (101, qwertz, point, sans touche morte)"
 
 #: ../rules/base.xml.in.h:509
-msgid "Logitech iTouch"
-msgstr "Logitech iTouch"
+msgid "Hungarian (101/qwerty/comma/dead keys)"
+msgstr "Hongrois (101, qwerty, virgule, touches mortes)"
 
 #: ../rules/base.xml.in.h:510
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "Logitech iTouch Cordless (modèle Y-RB6)"
+msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
+msgstr "Hongrois (101, qwerty, virgule, sans touche morte)"
 
 #: ../rules/base.xml.in.h:511
-msgid "Logitech iTouch Internet Navigator Keyboard SE"
-msgstr "Logitech Internet Navigator iTouch SE"
+msgid "Hungarian (101/qwerty/dot/dead keys)"
+msgstr "Hongrois (101, qwerty, point, touches mortes)"
 
 #: ../rules/base.xml.in.h:512
-msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-msgstr "Logitech Internet Navigator iTouch SE (USB)"
+msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
+msgstr "Hongrois (101, qwerty, point, sans touche morte)"
 
 #: ../rules/base.xml.in.h:513
-msgid "Lower Sorbian"
-msgstr "Bas-sorabe"
+msgid "Hungarian (102/qwertz/comma/dead keys)"
+msgstr "Hongrois (102, qwertz, virgule, touches mortes)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Bas-sorabe
 #: ../rules/base.xml.in.h:514
-msgid "Lower Sorbian (qwertz)"
-msgstr "Bas-sorabe (qwertz)"
+msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
+msgstr "Hongrois (102, qwertz, virgule, sans touche morte)"
 
 #: ../rules/base.xml.in.h:515
-msgid "MacBook/MacBook Pro"
-msgstr "MacBook/MacBook Pro"
+msgid "Hungarian (102/qwertz/dot/dead keys)"
+msgstr "Hongrois (102, qwertz, point, touches mortes)"
 
 #: ../rules/base.xml.in.h:516
-msgid "MacBook/MacBook Pro (Intl)"
-msgstr "MacBook/MacBook Pro (Intl)"
+msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
+msgstr "Hongrois (102, qwertz, point, sans touche morte)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Mac%C3%A9donien
 #: ../rules/base.xml.in.h:517
-msgid "Macedonian"
-msgstr "Macédonien"
+msgid "Hungarian (102/qwerty/comma/dead keys)"
+msgstr "Hongrois (102, qwerty, virgule, touches mortes)"
 
 #: ../rules/base.xml.in.h:518
-msgid "Macedonian (eliminate dead keys)"
-msgstr "Macédonien (sans touche morte)"
+msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
+msgstr "Hongrois (102, qwerty, virgule, sans touche morte)"
 
 #: ../rules/base.xml.in.h:519
-msgid "Macintosh"
-msgstr "Macintosh"
+msgid "Hungarian (102/qwerty/dot/dead keys)"
+msgstr "Hongrois (102, qwerty, point, touches mortes)"
 
 #: ../rules/base.xml.in.h:520
-msgid "Macintosh Old"
-msgstr "Macintosh (ancien)"
-
-#: ../rules/base.xml.in.h:521
-msgid "Make Caps Lock an additional Backspace"
-msgstr "Faire de Verr. maj. un Effacement. arriière supplémentaire."
+msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
+msgstr "Hongrois (102, qwerty, point, sans touche morte)"
 
-# http://www.x.org/wiki/KeySyms
+#. Keyboard indicator for Icelandic layouts
 #: ../rules/base.xml.in.h:522
-msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
-msgstr ""
-"Faire de Verr. maj. un Contrôle supplémentaire, mais garder le même nom "
-"symbolique (Caps_Lock)"
+msgid "is"
+msgstr "is"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Islandais
 #: ../rules/base.xml.in.h:523
-msgid "Make Caps Lock an additional Ctrl"
-msgstr "Faire de Verr. maj. un Contrôle supplémentaire"
+msgid "Icelandic"
+msgstr "Islandais"
 
 #: ../rules/base.xml.in.h:524
-msgid "Make Caps Lock an additional ESC"
-msgstr "Faire de Verr. maj. un Échap. supplémentaire."
+msgid "Icelandic (Sun dead keys)"
+msgstr "Islandais (touches mortes Sun)"
 
 #: ../rules/base.xml.in.h:525
-msgid "Make Caps Lock an additional Hyper"
-msgstr "Faire de Verr. maj. un Hyper supplémentaire"
+msgid "Icelandic (eliminate dead keys)"
+msgstr "Islandais (sans touche morte)"
 
 #: ../rules/base.xml.in.h:526
-msgid "Make Caps Lock an additional Num Lock"
-msgstr "Faire de Verr. maj. un Verr. Num. supplémentaire"
+msgid "Icelandic (Macintosh)"
+msgstr "Islandais (Macintosh)"
 
 #: ../rules/base.xml.in.h:527
-msgid "Make Caps Lock an additional Super"
-msgstr "Faire de Verr. maj. un Super supplémentaire."
-
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Malay%C3%A2lam
-#: ../rules/base.xml.in.h:528
-msgid "Malayalam"
-msgstr "Malayâlam"
+msgid "Icelandic (Dvorak)"
+msgstr "Islandais (Dvorak)"
 
+#. Keyboard indicator for Hebrew layouts
 #: ../rules/base.xml.in.h:529
-msgid "Malayalam (Lalitha)"
-msgstr "Malayâlam (lalitha)"
+msgid "he"
+msgstr "he"
 
-# https://secure.wikimedia.org/wikipedia/en/wiki/InScript_keyboard
 #: ../rules/base.xml.in.h:530
-msgid "Malayalam (enhanced Inscript with Rupee Sign)"
-msgstr "Malayâlam (Inscript amélioré avec le symbole monétaire Roupie)"
+msgid "Hebrew"
+msgstr "Hébreu"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Maltais
 #: ../rules/base.xml.in.h:531
-msgid "Maltese"
-msgstr "Maltais"
+msgid "Hebrew (lyx)"
+msgstr "Hébreu (lyx)"
 
 #: ../rules/base.xml.in.h:532
-msgid "Maltese (with US layout)"
-msgstr "Maltais (avec disposition US)"
+msgid "Hebrew (phonetic)"
+msgstr "Hébreu (phonétique)"
 
+# http://wiki.jewishliturgy.org/Hebrew_Font_and_Keyboard_Layout_Setup
 #: ../rules/base.xml.in.h:533
-msgid "Maori"
-msgstr "Maori"
-
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Mari_%28langue%29
-#: ../rules/base.xml.in.h:534
-msgid "Mari"
-msgstr "Mari"
+msgid "Hebrew (Biblical, Tiro)"
+msgstr "Hébreu (biblique, Tiro)"
 
+#. Keyboard indicator for Italian layouts
 #: ../rules/base.xml.in.h:535
-msgid "Memorex MX1998"
-msgstr "Memorex MX1998"
+msgid "it"
+msgstr "it"
 
 #: ../rules/base.xml.in.h:536
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr "Memorex MX2500 EZ-Access"
+msgid "Italian"
+msgstr "Italien"
 
 #: ../rules/base.xml.in.h:537
-msgid "Memorex MX2750"
-msgstr "Memorex MX2750"
+msgid "Italian (eliminate dead keys)"
+msgstr "Italien (sans touche morte)"
 
 #: ../rules/base.xml.in.h:538
-msgid "Menu"
-msgstr "Menu"
+msgid "Italian (Macintosh)"
+msgstr "Italien (Macintosh)"
 
 #: ../rules/base.xml.in.h:539
-msgid "Meta is mapped to Left Win"
-msgstr "Méta est placé sur Windows gauche"
+msgid "Italian (US keyboard with Italian letters)"
+msgstr "Italien (clavier US avec lettres italiennes)"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Oss%C3%A8te
 #: ../rules/base.xml.in.h:540
-msgid "Meta is mapped to Win keys"
-msgstr "Méta est placé sur les touches Windows"
-
-#: ../rules/base.xml.in.h:541
-msgid "Meta on Left Ctrl"
-msgstr "Méta s'obtient avec Ctrl gauche"
+msgid "Georgian (Italy)"
+msgstr "Géorgien (Italie)"
 
+#. Keyboard indicator for Japanese layouts
 #: ../rules/base.xml.in.h:542
-msgid "Microsoft Comfort Curve Keyboard 2000"
-msgstr "Microsoft Clavier Comfort Curve 2000"
+msgid "ja"
+msgstr "ja"
 
 #: ../rules/base.xml.in.h:543
-msgid "Microsoft Internet Keyboard"
-msgstr "Microsoft Clavier internet"
+msgid "Japanese"
+msgstr "Japonais"
 
 #: ../rules/base.xml.in.h:544
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "Microsoft Clavier Internet Pro, suédois"
+msgid "Japanese (Kana)"
+msgstr "Japonais (Kana)"
 
 #: ../rules/base.xml.in.h:545
-msgid "Microsoft Natural"
-msgstr "Microsoft Natural"
+msgid "Japanese (Kana 86)"
+msgstr "Japonais (Kana 86)"
 
 #: ../rules/base.xml.in.h:546
-msgid "Microsoft Natural Keyboard Elite"
-msgstr "Microsoft Natural Elite"
+msgid "Japanese (OADG 109A)"
+msgstr "Japonais (OADG 109A)"
 
 #: ../rules/base.xml.in.h:547
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Pro / Internet Pro"
-
-#: ../rules/base.xml.in.h:548
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "Microsoft Natural Pro OEM"
+msgid "Japanese (Macintosh)"
+msgstr "Japonais (Macintosh)"
 
+#. Keyboard indicator for Kikuyu layouts
 #: ../rules/base.xml.in.h:549
-msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Pro USB / Internet Pro"
+msgid "ki"
+msgstr "ki"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Kirghize_%28langue%29
 #: ../rules/base.xml.in.h:550
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
-msgstr "Microsoft Natural Wireless Ergonomic Keyboard 4000"
+msgid "Kyrgyz"
+msgstr "Kirghize"
 
 #: ../rules/base.xml.in.h:551
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
-msgstr "Microsoft Natural Wireless Ergonomic Keyboard 7000"
-
-#: ../rules/base.xml.in.h:552
-msgid "Microsoft Office Keyboard"
-msgstr "Clavier Microsoft Office"
+msgid "Kyrgyz (phonetic)"
+msgstr "Kirghize (phonétique)"
 
+#. Keyboard indicator for Khmer layouts
 #: ../rules/base.xml.in.h:553
-msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
-msgstr "Clavier Microsoft Multimedia sans fil 1.0A"
+msgid "km"
+msgstr "km"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Khmer
 #: ../rules/base.xml.in.h:554
-msgid "Miscellaneous compatibility options"
-msgstr "Diverses options de compatibilité"
-
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Mongol
-#: ../rules/base.xml.in.h:555
-msgid "Mongolian"
-msgstr "Mongol"
+msgid "Khmer (Cambodia)"
+msgstr "Khmer (Cambodge)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Mont%C3%A9n%C3%A9grin
+#. Keyboard indicator for Kazakh layouts
 #: ../rules/base.xml.in.h:556
-msgid "Montenegrin"
-msgstr "Monténégrin"
+msgid "kk"
+msgstr "kk"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Kazakh
 #: ../rules/base.xml.in.h:557
-msgid "Montenegrin (Cyrillic with guillemets)"
-msgstr "Monténégrin (cyrillique avec guillemets)"
+msgid "Kazakh"
+msgstr "Kazakh"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Kazakhstan
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Kazakh
 #: ../rules/base.xml.in.h:558
-msgid "Montenegrin (Cyrillic)"
-msgstr "Monténégrin (cyrillique)"
+msgid "Russian (Kazakhstan, with Kazakh)"
+msgstr "Russe (Kazakhstan, avec kazakh)"
 
 #: ../rules/base.xml.in.h:559
-msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
-msgstr "Monténégrin (cyrillique, Z et ZHE intervertis)"
-
-#: ../rules/base.xml.in.h:560
-msgid "Montenegrin (Latin Unicode qwerty)"
-msgstr "Monténégrin (qwerty Unicode latin)"
+msgid "Kazakh (with Russian)"
+msgstr "Kazakh (avec russe)"
 
+#. Keyboard indicator for Lao layouts
 #: ../rules/base.xml.in.h:561
-msgid "Montenegrin (Latin Unicode)"
-msgstr "Monténégrin (Unicode latin)"
+msgid "lo"
+msgstr "lo"
 
 #: ../rules/base.xml.in.h:562
-msgid "Montenegrin (Latin qwerty)"
-msgstr "Monténégrin (qwerty latin)"
+msgid "Lao"
+msgstr "Lao"
 
+# STEA = Agence pour la science, la technologie et l'environnement.
+# http://www.clear-vu.com.hk/resources/lao_keyboard.asp
 #: ../rules/base.xml.in.h:563
-msgid "Montenegrin (Latin with guillemets)"
-msgstr "Monténégrin (latin avec guillemets)"
-
-#: ../rules/base.xml.in.h:564
-msgid "NICOLA-F style Backspace"
-msgstr "Eff. Arr. du type NICOLA-F"
+msgid "Lao (STEA proposed standard layout)"
+msgstr "Lao (disposition proposée par la STEA)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/N%C3%A9palais
+#. Keyboard indicator for Spanish layouts
 #: ../rules/base.xml.in.h:565
-msgid "Nepali"
-msgstr "Népalais"
+msgid "es"
+msgstr "es"
 
 #: ../rules/base.xml.in.h:566
-msgid "Non-breakable space character at fourth level"
-msgstr "Espace insécable au 4e niveau"
+msgid "Spanish (Latin American)"
+msgstr "Espagnol (Amérique latine)"
 
 #: ../rules/base.xml.in.h:567
-msgid ""
-"Non-breakable space character at fourth level, thin non-breakable space "
-"character at sixth level"
-msgstr "Espace insécable au 4e niveau, espace fine insécable au 6e niveau"
+msgid "Spanish (Latin American, eliminate dead keys)"
+msgstr "Espagnol (Amérique latine, sans touche morte)"
 
 #: ../rules/base.xml.in.h:568
-msgid ""
-"Non-breakable space character at fourth level, thin non-breakable space "
-"character at sixth level (via Ctrl+Shift)"
-msgstr ""
-"Espace insécable au 4e niveau, espace fine insécable au 6e niveau (via "
-"Ctrl+Maj.)"
+msgid "Spanish (Latin American, include dead tilde)"
+msgstr "Espagnol (Amérique latine, y compris la touche morte tilde)"
 
 #: ../rules/base.xml.in.h:569
-msgid "Non-breakable space character at second level"
-msgstr "Espace insécable au 2e niveau"
-
-#: ../rules/base.xml.in.h:570
-msgid "Non-breakable space character at third level"
-msgstr "Espace insécable au 3e niveau"
+msgid "Spanish (Latin American, Sun dead keys)"
+msgstr "Espagnol (Amérique latine, touches mortes Sun)"
 
-#: ../rules/base.xml.in.h:571
-msgid "Non-breakable space character at third level, nothing at fourth level"
-msgstr "Espace insécable au 3e niveau, rien au 4e niveau"
+#. Keyboard indicator for Lithuanian layouts
+#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:16
+msgid "lt"
+msgstr "lt"
 
-#: ../rules/base.xml.in.h:572
-msgid ""
-"Non-breakable space character at third level, thin non-breakable space "
-"character at fourth level"
-msgstr "Espace insécable au 3e niveau, espace fine insécable au 4e niveau"
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Lituanien
+#: ../rules/base.xml.in.h:572 ../rules/base.extras.xml.in.h:17
+msgid "Lithuanian"
+msgstr "Lituanien"
 
 #: ../rules/base.xml.in.h:573
-msgid "Northern Saami (Finland)"
-msgstr "Sami du Nord (Finlande)"
+msgid "Lithuanian (standard)"
+msgstr "Lituanien (standard)"
 
 #: ../rules/base.xml.in.h:574
-msgid "Northern Saami (Norway)"
-msgstr "Sami du Nord (Norvège)"
+msgid "Lithuanian (US keyboard with Lithuanian letters)"
+msgstr "Lituanien (clavier US avec lettres lituaniennes)"
 
 #: ../rules/base.xml.in.h:575
-msgid "Northern Saami (Norway, eliminate dead keys)"
-msgstr "Sami du Nord (Norvège, sans touche morte)"
+msgid "Lithuanian (IBM LST 1205-92)"
+msgstr "Lituanien (IBM LST 1205-92)"
 
+# http://lekp.info/LithuanianErgonomic
 #: ../rules/base.xml.in.h:576
-msgid "Northern Saami (Sweden)"
-msgstr "Sami du Nord (Suède)"
+msgid "Lithuanian (LEKP)"
+msgstr "Lituanien (LEKP)"
 
 #: ../rules/base.xml.in.h:577
-msgid "Northgate OmniKey 101"
-msgstr "Northgate OmniKey 101"
-
-#: ../rules/base.xml.in.h:578
-msgid "Norwegian"
-msgstr "Norvégien"
+msgid "Lithuanian (LEKPa)"
+msgstr "Lituanien (LEKPa)"
 
-#: ../rules/base.xml.in.h:579
-msgid "Norwegian (Dvorak)"
-msgstr "Norvégien (Dvorak)"
+#. Keyboard indicator for Latvian layouts
+#: ../rules/base.xml.in.h:579 ../rules/base.extras.xml.in.h:19
+msgid "lv"
+msgstr "lv"
 
-#: ../rules/base.xml.in.h:580
-msgid "Norwegian (Macintosh)"
-msgstr "Norvégien (Macintosh)"
+#: ../rules/base.xml.in.h:580 ../rules/base.extras.xml.in.h:20
+msgid "Latvian"
+msgstr "Letton"
 
 #: ../rules/base.xml.in.h:581
-msgid "Norwegian (Macintosh, eliminate dead keys)"
-msgstr "Norvégien (Macintosh, sans touche morte)"
+msgid "Latvian (apostrophe variant)"
+msgstr "Letton (variante apostrophe)"
 
 #: ../rules/base.xml.in.h:582
-msgid "Norwegian (eliminate dead keys)"
-msgstr "Norvégien (sans touche morte)"
+msgid "Latvian (tilde variant)"
+msgstr "Letton (variante tilde)"
 
 #: ../rules/base.xml.in.h:583
-msgid "Num Lock"
-msgstr "Verr. Num."
+msgid "Latvian (F variant)"
+msgstr "Letton (variante F)"
 
 #: ../rules/base.xml.in.h:584
-msgid "Numeric keypad delete key behaviour"
-msgstr "Comportement de la touche de Suppr. du pavé numérique"
+msgid "Latvian (modern)"
+msgstr "Letton (moderne)"
 
 #: ../rules/base.xml.in.h:585
-msgid "Numeric keypad keys work as with Macintosh"
-msgstr "Les touches du pavé numérique se comportent comme sur Macintosh"
+msgid "Latvian (ergonomic, ŪGJRMV)"
+msgstr "Letton (ergonomique, ŪGJRMV)"
 
 #: ../rules/base.xml.in.h:586
-msgid "Numeric keypad layout selection"
-msgstr "Disposition du pavé numérique"
-
-#: ../rules/base.xml.in.h:587
-msgid "OLPC"
-msgstr "OLPC"
+msgid "Latvian (adapted)"
+msgstr "Letton (adapté)"
 
+#. Keyboard indicator for Maori layouts
 #: ../rules/base.xml.in.h:588
-msgid "Occitan"
-msgstr "Occitan"
+msgid "mi"
+msgstr "mi"
 
 #: ../rules/base.xml.in.h:589
-msgid "Ogham"
-msgstr "Ogham"
-
-#: ../rules/base.xml.in.h:590
-msgid "Ogham (IS434)"
-msgstr "Ogham (IS434)"
+msgid "Maori"
+msgstr "Maori"
 
-#: ../rules/base.xml.in.h:591
-msgid "Oriya"
-msgstr "Oriya"
+#. Keyboard indicator for Serbian layouts
+#: ../rules/base.xml.in.h:591 ../rules/base.extras.xml.in.h:43
+msgid "sr"
+msgstr "sr"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Mont%C3%A9n%C3%A9grin
 #: ../rules/base.xml.in.h:592
-msgid "Ortek MCK-800 MM/Internet keyboard"
-msgstr "Ortek Clavier internet / MCK-800 MM"
+msgid "Montenegrin"
+msgstr "Monténégrin"
 
 #: ../rules/base.xml.in.h:593
-msgid "Ossetian (Georgia)"
-msgstr "Ossète (Géorgie)"
+msgid "Montenegrin (Cyrillic)"
+msgstr "Monténégrin (cyrillique)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Oss%C3%A8te
 #: ../rules/base.xml.in.h:594
-msgid "Ossetian (WinKeys)"
-msgstr "Ossète (touches Windows)"
+msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
+msgstr "Monténégrin (cyrillique, Z et ZHE intervertis)"
 
 #: ../rules/base.xml.in.h:595
-msgid "Ossetian (legacy)"
-msgstr "Ossète (obsolète)"
+msgid "Montenegrin (Latin Unicode)"
+msgstr "Monténégrin (Unicode latin)"
 
 #: ../rules/base.xml.in.h:596
-msgid "PC-98xx Series"
-msgstr "PC-98xx"
+msgid "Montenegrin (Latin qwerty)"
+msgstr "Monténégrin (qwerty latin)"
 
 #: ../rules/base.xml.in.h:597
-msgid "Pannonian Rusyn (homophonic)"
-msgstr "Ruthène pannonien (homophonique)"
+msgid "Montenegrin (Latin Unicode qwerty)"
+msgstr "Monténégrin (qwerty Unicode latin)"
 
 #: ../rules/base.xml.in.h:598
-msgid "Pashto"
-msgstr "Pachto"
+msgid "Montenegrin (Cyrillic with guillemets)"
+msgstr "Monténégrin (cyrillique avec guillemets)"
 
 #: ../rules/base.xml.in.h:599
-msgid "Pashto (Afghanistan, OLPC)"
-msgstr "Pachto (Afghanistan, OLPC)"
-
-#: ../rules/base.xml.in.h:600
-msgid "Pause"
-msgstr "Pause"
+msgid "Montenegrin (Latin with guillemets)"
+msgstr "Monténégrin (latin avec guillemets)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Persan
-#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:24
-msgid "Persian"
-msgstr "Persan"
+#. Keyboard indicator for Macedonian layouts
+#: ../rules/base.xml.in.h:601
+msgid "mk"
+msgstr "mk"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Dari
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Mac%C3%A9donien
 #: ../rules/base.xml.in.h:602
-msgid "Persian (Afghanistan, Dari OLPC)"
-msgstr "Persan (Afghanistan, Dari, OLPC)"
+msgid "Macedonian"
+msgstr "Macédonien"
 
 #: ../rules/base.xml.in.h:603
-msgid "Persian (with Persian Keypad)"
-msgstr "Persan (avec pavé numérique persan)"
-
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Polonais
-#: ../rules/base.xml.in.h:604 ../rules/base.extras.xml.in.h:25
-msgid "Polish"
-msgstr "Polonais"
+msgid "Macedonian (eliminate dead keys)"
+msgstr "Macédonien (sans touche morte)"
 
+#. Keyboard indicator for Maltese layouts
 #: ../rules/base.xml.in.h:605
-msgid "Polish (Dvorak)"
-msgstr "Polonais (Dvorak)"
+msgid "mt"
+msgstr "mt"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Maltais
 #: ../rules/base.xml.in.h:606
-msgid "Polish (Dvorak, Polish quotes on key 1)"
-msgstr "Polonais (Dvorak, guillemets polonais sur le « 1 »)"
+msgid "Maltese"
+msgstr "Maltais"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Disposition_Dvorak
-#
-# Sur le clavier Dvorak, les guillemets sont sur une seule et même touche.
 #: ../rules/base.xml.in.h:607
-msgid "Polish (Dvorak, Polish quotes on quotemark key)"
-msgstr "Polonais (Dvorak, guillemets polonais sur la touche guillemets)"
-
-#: ../rules/base.xml.in.h:608
-msgid "Polish (programmer Dvorak)"
-msgstr "Polonais (Dvorak pour le programmeur)"
+msgid "Maltese (with US layout)"
+msgstr "Maltais (avec disposition US)"
 
+#. Keyboard indicator for Mongolian layouts
 #: ../rules/base.xml.in.h:609
-msgid "Polish (qwertz)"
-msgstr "Polonais (qwertz)"
+msgid "mn"
+msgstr "mn"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Mongol
 #: ../rules/base.xml.in.h:610
-msgid "Portuguese"
-msgstr "Portugais"
-
-#: ../rules/base.xml.in.h:611
-msgid "Portuguese (Brazil)"
-msgstr "Portugais (Brésil)"
+msgid "Mongolian"
+msgstr "Mongol"
 
+#. Keyboard indicator for Norwegian layouts
 #: ../rules/base.xml.in.h:612
-msgid "Portuguese (Brazil, Dvorak)"
-msgstr "Portugais (Brésil, Dvorak)"
+msgid "no"
+msgstr "no"
 
 #: ../rules/base.xml.in.h:613
-msgid "Portuguese (Brazil, eliminate dead keys)"
-msgstr "Portugais (Brésil, sans touche morte)"
+msgid "Norwegian"
+msgstr "Norvégien"
 
 #: ../rules/base.xml.in.h:614
-msgid "Portuguese (Brazil, nativo for Esperanto)"
-msgstr "Portugais (Brésil, BR-Nativo pour l'Espéranto)"
+msgid "Norwegian (eliminate dead keys)"
+msgstr "Norvégien (sans touche morte)"
 
 #: ../rules/base.xml.in.h:615
-msgid "Portuguese (Brazil, nativo for USA keyboards)"
-msgstr "Portugais (Brésil, BR-Nativo pour claviers US)"
+msgid "Norwegian (Dvorak)"
+msgstr "Norvégien (Dvorak)"
 
-# https://secure.wikimedia.org/wikipedia/en/wiki/Dvorak_Simplified_Keyboard#Other_languages
-# http://tecladobrasileiro.com.br/images/stories/br-nativo/br-nativo-simples.svg
 #: ../rules/base.xml.in.h:616
-msgid "Portuguese (Brazil, nativo)"
-msgstr "Portugais (Brésil, BR-Nativo)"
+msgid "Northern Saami (Norway)"
+msgstr "Sami du Nord (Norvège)"
 
 #: ../rules/base.xml.in.h:617
-msgid "Portuguese (Macintosh)"
-msgstr "Portugais (Macintosh)"
+msgid "Northern Saami (Norway, eliminate dead keys)"
+msgstr "Sami du Nord (Norvège, sans touche morte)"
 
 #: ../rules/base.xml.in.h:618
-msgid "Portuguese (Macintosh, Sun dead keys)"
-msgstr "Portugais (Macintosh, touches mortes Sun)"
+msgid "Norwegian (Macintosh)"
+msgstr "Norvégien (Macintosh)"
 
 #: ../rules/base.xml.in.h:619
-msgid "Portuguese (Macintosh, eliminate dead keys)"
-msgstr "Portugais (Macintosh, sans touche morte)"
+msgid "Norwegian (Macintosh, eliminate dead keys)"
+msgstr "Norvégien (Macintosh, sans touche morte)"
 
-#: ../rules/base.xml.in.h:620
-msgid "Portuguese (Nativo for USA keyboards)"
-msgstr "Portugais (PT-Nativo pour claviers US)"
-
-#: ../rules/base.xml.in.h:621
-msgid "Portuguese (Nativo)"
-msgstr "Portugais (PT-Nativo)"
+#. Keyboard indicator for Polish layouts
+#: ../rules/base.xml.in.h:621 ../rules/base.extras.xml.in.h:35
+msgid "pl"
+msgstr "pl"
 
-#: ../rules/base.xml.in.h:622
-msgid "Portuguese (Sun dead keys)"
-msgstr "Portugais (touches mortes Sun)"
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Polonais
+#: ../rules/base.xml.in.h:622 ../rules/base.extras.xml.in.h:36
+msgid "Polish"
+msgstr "Polonais"
 
 #: ../rules/base.xml.in.h:623
-msgid "Portuguese (eliminate dead keys)"
-msgstr "Portugais (sans touche morte)"
+msgid "Polish (qwertz)"
+msgstr "Polonais (qwertz)"
 
 #: ../rules/base.xml.in.h:624
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager (KTEZ-1000)"
+msgid "Polish (Dvorak)"
+msgstr "Polonais (Dvorak)"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Disposition_Dvorak
+#
+# Sur le clavier Dvorak, les guillemets sont sur une seule et même touche.
 #: ../rules/base.xml.in.h:625
-msgid "PrtSc"
-msgstr "Impr. Écr."
+msgid "Polish (Dvorak, Polish quotes on quotemark key)"
+msgstr "Polonais (Dvorak, guillemets polonais sur la touche guillemets)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Penjabi
 #: ../rules/base.xml.in.h:626
-msgid "Punjabi (Gurmukhi Jhelum)"
-msgstr "Penjabi (Gurmukhî, Jhelum)"
+msgid "Polish (Dvorak, Polish quotes on key 1)"
+msgstr "Polonais (Dvorak, guillemets polonais sur le « 1 »)"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Cachoube
 #: ../rules/base.xml.in.h:627
-msgid "Punjabi (Gurmukhi)"
-msgstr "Penjabi (Gurmukhî)"
+msgid "Kashubian"
+msgstr "Cachoube"
 
 #: ../rules/base.xml.in.h:628
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
+msgid "Russian (Poland, phonetic Dvorak)"
+msgstr "Russe (Pologne, Dvorak phonétique)"
 
 #: ../rules/base.xml.in.h:629
-msgid "Right Alt"
-msgstr "Alt. droite"
+msgid "Polish (programmer Dvorak)"
+msgstr "Polonais (Dvorak pour le programmeur)"
 
 #: ../rules/base.xml.in.h:630
-msgid "Right Alt (while pressed)"
-msgstr "Alt. droite (si enfoncé)"
+msgid "Portuguese"
+msgstr "Portugais"
 
 #: ../rules/base.xml.in.h:631
-msgid ""
-"Right Alt chooses 5th level and activates level5-Lock when pressed together "
-"with another 5th-level-chooser, one press releases the lock"
-msgstr ""
-"Alt. droite sélectionne le 5e niveau ; verrouille le 5e niveau par un appui "
-"simultané avec un autre sélecteur de 5e niveau ; un appui libère le verrou"
+msgid "Portuguese (eliminate dead keys)"
+msgstr "Portugais (sans touche morte)"
 
 #: ../rules/base.xml.in.h:632
-msgid ""
-"Right Alt chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser"
-msgstr ""
-"Alt. droite sélectionne le 5e niveau ; se verrouille par un appui simultané "
-"avec un autre sélecteur de 5e niveau"
+msgid "Portuguese (Sun dead keys)"
+msgstr "Portugais (touches mortes Sun)"
 
 #: ../rules/base.xml.in.h:633
-msgid ""
-"Right Alt chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser, one press releases the lock"
-msgstr ""
-"Alt. droite sélectionne le 5e niveau ; se verrouille par un appui simultané "
-"avec un autre sélecteur de 5e niveau ; un appui libère le verrou"
+msgid "Portuguese (Macintosh)"
+msgstr "Portugais (Macintosh)"
 
 #: ../rules/base.xml.in.h:634
-msgid "Right Alt key never chooses 3rd level"
-msgstr "Alt. droite ne sélectionne jamais le 3e niveau"
+msgid "Portuguese (Macintosh, eliminate dead keys)"
+msgstr "Portugais (Macintosh, sans touche morte)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Touche_compose
 #: ../rules/base.xml.in.h:635
-msgid "Right Alt, Shift+Right Alt key is Multi_Key"
-msgstr "Alt. droite, Maj.+Alt. droite est une touche compose (Multi_Key)"
+msgid "Portuguese (Macintosh, Sun dead keys)"
+msgstr "Portugais (Macintosh, touches mortes Sun)"
 
 #: ../rules/base.xml.in.h:636
-msgid "Right Ctrl"
-msgstr "Crtl droite"
+msgid "Portuguese (Nativo)"
+msgstr "Portugais (PT-Nativo)"
 
 #: ../rules/base.xml.in.h:637
-msgid "Right Ctrl (while pressed)"
-msgstr "Ctrl droite (si enfoncé)"
+msgid "Portuguese (Nativo for USA keyboards)"
+msgstr "Portugais (PT-Nativo pour claviers US)"
 
+# http://tecladobrasileiro.com.br/index.php?option=com_content&task=view&id=20&Itemid=62
 #: ../rules/base.xml.in.h:638
-msgid "Right Ctrl as Right Alt"
-msgstr "Ctrl droite comme Alt. droite"
-
-#: ../rules/base.xml.in.h:639
-msgid "Right Ctrl is mapped to Menu"
-msgstr "Méta est placé sur Menu"
+msgid "Esperanto (Portugal, Nativo)"
+msgstr "Espéranto (Portugal, PT-Nativo)"
 
-#: ../rules/base.xml.in.h:640
-msgid "Right Ctrl+Right Shift"
-msgstr "Ctrl  droite + Maj. droite"
+#. Keyboard indicator for Romanian layouts
+#: ../rules/base.xml.in.h:640 ../rules/base.extras.xml.in.h:38
+msgid "ro"
+msgstr "ro"
 
-#: ../rules/base.xml.in.h:641
-msgid "Right Shift"
-msgstr "Maj. droite"
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Roumain
+#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:39
+msgid "Romanian"
+msgstr "Roumain"
 
 #: ../rules/base.xml.in.h:642
-msgid "Right Win"
-msgstr "Windows droite"
+msgid "Romanian (cedilla)"
+msgstr "Roumain (cédille)"
 
 #: ../rules/base.xml.in.h:643
-msgid "Right Win (while pressed)"
-msgstr "Windows droite (si enfoncé)"
+msgid "Romanian (standard)"
+msgstr "Roumain (standard)"
 
 #: ../rules/base.xml.in.h:644
-msgid ""
-"Right Win chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser"
-msgstr ""
-"Windows droite sélectionne le 5e niveau ; se verrouille par un appui "
-"simultané avec un autre sélecteur de 5e niveau"
+msgid "Romanian (standard cedilla)"
+msgstr "Roumain (standard, cédille)"
 
 #: ../rules/base.xml.in.h:645
-msgid ""
-"Right Win chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser, one press releases the lock"
-msgstr ""
-"Windows droite sélectionne le 5e niveau ; se verrouille par un appui "
-"simultané avec un autre sélecteur de 5e niveau ; un appui libère le verrou"
+msgid "Romanian (WinKeys)"
+msgstr "Roumain (touche Windows)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Roumain
-#: ../rules/base.xml.in.h:646 ../rules/base.extras.xml.in.h:27
-msgid "Romanian"
-msgstr "Roumain"
+#: ../rules/base.xml.in.h:646 ../rules/base.extras.xml.in.h:47
+msgid "Russian"
+msgstr "Russe"
 
 #: ../rules/base.xml.in.h:647
-msgid "Romanian (Germany)"
-msgstr "Roumain (Allemagne)"
+msgid "Russian (phonetic)"
+msgstr "Russe (phonétique)"
 
 #: ../rules/base.xml.in.h:648
-msgid "Romanian (Germany, eliminate dead keys)"
-msgstr "Roumain (Allemagne, sans touche morte)"
+msgid "Russian (phonetic WinKeys)"
+msgstr "Russe (phonétique, touches Windows)"
 
 #: ../rules/base.xml.in.h:649
-msgid "Romanian (WinKeys)"
-msgstr "Roumain (touche Windows)"
+msgid "Russian (typewriter)"
+msgstr "Russe (machine à écrire)"
 
 #: ../rules/base.xml.in.h:650
-msgid "Romanian (cedilla)"
-msgstr "Roumain (cédille)"
+msgid "Russian (legacy)"
+msgstr "Russe (obsolète)"
 
 #: ../rules/base.xml.in.h:651
-msgid "Romanian (standard cedilla)"
-msgstr "Roumain (standard, cédille)"
+msgid "Russian (typewriter, legacy)"
+msgstr "Russe (machine à écrire, obsolète)"
 
 #: ../rules/base.xml.in.h:652
-msgid "Romanian (standard)"
-msgstr "Roumain (standard)"
+msgid "Tatar"
+msgstr "Tatar"
 
 #: ../rules/base.xml.in.h:653
-msgid "Rupee on 4"
-msgstr "Roupie sur le 4"
+msgid "Ossetian (legacy)"
+msgstr "Ossète (obsolète)"
 
-#: ../rules/base.xml.in.h:654 ../rules/base.extras.xml.in.h:29
-msgid "Russian"
-msgstr "Russe"
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Oss%C3%A8te
+#: ../rules/base.xml.in.h:654
+msgid "Ossetian (WinKeys)"
+msgstr "Ossète (touches Windows)"
 
 #: ../rules/base.xml.in.h:655
-msgid "Russian (DOS)"
-msgstr "Russe (DOS)"
+msgid "Chuvash"
+msgstr "Chuvash"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Tchouvache
 #: ../rules/base.xml.in.h:656
-msgid "Russian (Georgia)"
-msgstr "Russe (Géorgie)"
+msgid "Chuvash (Latin)"
+msgstr "Tchouvache (latin)"
 
 #: ../rules/base.xml.in.h:657
-msgid "Russian (Germany, phonetic)"
-msgstr "Russe (Allemagne, phonétique)"
+msgid "Udmurt"
+msgstr "Oudmourte"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Kazakhstan
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Kazakh
 #: ../rules/base.xml.in.h:658
-msgid "Russian (Kazakhstan, with Kazakh)"
-msgstr "Russe (Kazakhstan, avec kazakh)"
+msgid "Komi"
+msgstr "Komi"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Iakoute
 #: ../rules/base.xml.in.h:659
-msgid "Russian (Poland, phonetic Dvorak)"
-msgstr "Russe (Pologne, Dvorak phonétique)"
+msgid "Yakut"
+msgstr "Iakute"
 
 #: ../rules/base.xml.in.h:660
-msgid "Russian (Sweden, phonetic)"
-msgstr "Russe (Suède, phonétique)"
+msgid "Kalmyk"
+msgstr "Kalmyk"
 
 #: ../rules/base.xml.in.h:661
-msgid "Russian (Sweden, phonetic, eliminate dead keys)"
-msgstr "Russe (Suède, phonétique, sans touche morte)"
+msgid "Russian (DOS)"
+msgstr "Russe (DOS)"
 
 #: ../rules/base.xml.in.h:662
-msgid "Russian (US, phonetic)"
-msgstr "Russe (US, phonétique)"
+msgid "Serbian (Russia)"
+msgstr "Serbe (Russe)"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Bachkir
 #: ../rules/base.xml.in.h:663
-msgid "Russian (Ukraine, standard RSTU)"
-msgstr "Russe (Ukraine, RSTU standard)"
+msgid "Bashkirian"
+msgstr "Bachkir"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Mari_%28langue%29
 #: ../rules/base.xml.in.h:664
-msgid "Russian (legacy)"
-msgstr "Russe (obsolète)"
+msgid "Mari"
+msgstr "Mari"
 
 #: ../rules/base.xml.in.h:665
-msgid "Russian (phonetic WinKeys)"
-msgstr "Russe (phonétique, touches Windows)"
+msgid "Serbian (Cyrillic)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:666
-msgid "Russian (phonetic)"
-msgstr "Russe (phonétique)"
+msgid "Serbian (Cyrillic, Z and ZHE swapped)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:667
-msgid "Russian (typewriter)"
-msgstr "Russe (machine à écrire)"
+msgid "Serbian (Latin)"
+msgstr "Serbe (Latin)"
 
 #: ../rules/base.xml.in.h:668
-msgid "Russian (typewriter, legacy)"
-msgstr "Russe (machine à écrire, obsolète)"
+msgid "Serbian (Latin Unicode)"
+msgstr "Serbe (latin, Unicode)"
 
 #: ../rules/base.xml.in.h:669
-msgid "SILVERCREST Multimedia Wireless Keyboard"
-msgstr "SILVERCREST Multimedia Wireless Keyboard"
+msgid "Serbian (Latin qwerty)"
+msgstr "Serbe (latin, qwerty)"
 
 #: ../rules/base.xml.in.h:670
-msgid "SK-1300"
-msgstr "SK-1300"
+msgid "Serbian (Latin Unicode qwerty)"
+msgstr "Serbe (latin, Unicode, qwerty)"
 
 #: ../rules/base.xml.in.h:671
-msgid "SK-2500"
-msgstr "SK-2500"
+msgid "Serbian (Cyrillic with guillemets)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:672
-msgid "SK-6200"
-msgstr "SK-6200"
+msgid "Serbian (Latin with guillemets)"
+msgstr "Serbe (Latin avec guillemets)"
 
 #: ../rules/base.xml.in.h:673
-msgid "SK-7100"
-msgstr "SK-7100"
-
-#: ../rules/base.xml.in.h:674
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN Ergonomic 2500"
+msgid "Pannonian Rusyn (homophonic)"
+msgstr "Ruthène pannonien (homophonique)"
 
+#. Keyboard indicator for Slovenian layouts
 #: ../rules/base.xml.in.h:675
-msgid "SVEN Slim 303"
-msgstr "SVEN Slim 303"
+msgid "sl"
+msgstr "sl"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Slov%C3%A8ne
 #: ../rules/base.xml.in.h:676
-msgid "Saisiyat (Taiwan)"
-msgstr "Saisiyat (Taïwan)"
+msgid "Slovenian"
+msgstr "Slovène"
 
 #: ../rules/base.xml.in.h:677
-msgid "Samsung SDM 4500P"
-msgstr "Samsung SDM 4500P"
+msgid "Slovenian (use guillemets for quotes)"
+msgstr ""
+"Slovène (utilise des guillemets typographiques au lieu des guillemets "
+"simples)"
 
 #: ../rules/base.xml.in.h:678
-msgid "Samsung SDM 4510P"
-msgstr "Samsung SDM 4510P"
-
-#: ../rules/base.xml.in.h:679
-msgid "Sanwa Supply SKB-KG3"
-msgstr "Sanwa Supply SKB-KG3"
+msgid "Slovenian (US keyboard with Slovenian letters)"
+msgstr "Slovène (clavier US avec lettres slovènes)"
 
+#. Keyboard indicator for Slovak layouts
 #: ../rules/base.xml.in.h:680
-msgid "Scroll Lock"
-msgstr "Arrêt défilement"
+msgid "sk"
+msgstr "sk"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Slovaque
 #: ../rules/base.xml.in.h:681
-msgid "Semi-colon on third level"
-msgstr "Point-virgule au 3e niveau"
+msgid "Slovak"
+msgstr "Slovaque"
 
-#: ../rules/base.xml.in.h:682 ../rules/base.extras.xml.in.h:32
-msgid "Serbian"
-msgstr "Serbe"
+#: ../rules/base.xml.in.h:682
+msgid "Slovak (extended Backslash)"
+msgstr "Slovaque (barre oblique inverse étendue)"
 
 #: ../rules/base.xml.in.h:683
-msgid "Serbian (Latin Unicode qwerty)"
-msgstr "Serbe (latin, Unicode, qwerty)"
+msgid "Slovak (qwerty)"
+msgstr "Slovaque (qwerty)"
 
 #: ../rules/base.xml.in.h:684
-msgid "Serbian (Latin Unicode)"
-msgstr "Serbe (latin, Unicode)"
+msgid "Slovak (qwerty, extended Backslash)"
+msgstr "Slovaque (qwerty, barre oblique inverse étendue)"
 
 #: ../rules/base.xml.in.h:685
-msgid "Serbian (Latin qwerty)"
-msgstr "Serbe (latin, qwerty)"
+msgid "Spanish"
+msgstr "Espagnol"
 
 #: ../rules/base.xml.in.h:686
-msgid "Serbian (Latin with guillemets)"
-msgstr "Serbe (Latin avec guillemets)"
+msgid "Spanish (eliminate dead keys)"
+msgstr "Espagnol (sans touche morte)"
 
 #: ../rules/base.xml.in.h:687
-msgid "Serbian (Latin)"
-msgstr "Serbe (Latin)"
+msgid "Spanish (include dead tilde)"
+msgstr "Espagnol (y compris la touche morte tilde)"
 
 #: ../rules/base.xml.in.h:688
-msgid "Serbian (Russia)"
-msgstr "Serbe (Russe)"
+msgid "Spanish (Sun dead keys)"
+msgstr "Espagnol (touches mortes Sun)"
 
 #: ../rules/base.xml.in.h:689
-msgid "Serbian (Z and ZHE swapped)"
-msgstr "Serbe (Z et ZHE intervertis)"
+msgid "Spanish (Dvorak)"
+msgstr "Espagnol (Dvorak)"
 
 #: ../rules/base.xml.in.h:690
-msgid "Serbian (with guillemets)"
-msgstr "Serbe (avec guillemets)"
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
+msgstr "Asturien (Espagne, avec H point bas et L point bas)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Serbo-croate
 #: ../rules/base.xml.in.h:691
-msgid "Serbo-Croatian (US)"
-msgstr "Serbo-Croate (US)"
+msgid "Catalan (Spain, with middle-dot L)"
+msgstr "Catalan (Espagne, avec L point médian)"
 
 #: ../rules/base.xml.in.h:692
-msgid "Shift cancels Caps Lock"
-msgstr "Maj. annule Verr. maj."
-
-#: ../rules/base.xml.in.h:693
-msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
-msgstr "Maj. n'annule pas Verr. maj., mais sélectionne le 3e niveau"
+msgid "Spanish (Macintosh)"
+msgstr "Espagnol (Macintosh)"
 
+#. Keyboard indicator for Swedish layouts
 #: ../rules/base.xml.in.h:694
-msgid "Shift with numeric keypad keys works as in MS Windows"
-msgstr "Maj. avec le pavé numérique se comporte comme dans Windows"
+msgid "sv"
+msgstr "sv"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Su%C3%A9dois
 #: ../rules/base.xml.in.h:695
-msgid "Shift+Caps Lock"
-msgstr "Maj.+ Verr. maj."
+msgid "Swedish"
+msgstr "Suédois"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Sindhi
 #: ../rules/base.xml.in.h:696
-msgid "Sindhi"
-msgstr "Sindhî"
+msgid "Swedish (eliminate dead keys)"
+msgstr "Suédois (sans touche morte)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Cingalais
 #: ../rules/base.xml.in.h:697
-msgid "Sinhala"
-msgstr "Cingalais"
+msgid "Swedish (Dvorak)"
+msgstr "Suédois (Dvorak)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Slovaque
 #: ../rules/base.xml.in.h:698
-msgid "Slovak"
-msgstr "Slovaque"
+msgid "Russian (Sweden, phonetic)"
+msgstr "Russe (Suède, phonétique)"
 
 #: ../rules/base.xml.in.h:699
-msgid "Slovak (extended Backslash)"
-msgstr "Slovaque (barre oblique inverse étendue)"
+msgid "Russian (Sweden, phonetic, eliminate dead keys)"
+msgstr "Russe (Suède, phonétique, sans touche morte)"
 
 #: ../rules/base.xml.in.h:700
-msgid "Slovak (qwerty)"
-msgstr "Slovaque (qwerty)"
+msgid "Northern Saami (Sweden)"
+msgstr "Sami du Nord (Suède)"
 
 #: ../rules/base.xml.in.h:701
-msgid "Slovak (qwerty, extended Backslash)"
-msgstr "Slovaque (qwerty, barre oblique inverse étendue)"
+msgid "Swedish (Macintosh)"
+msgstr "Suédois (Macintosh)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Slov%C3%A8ne
 #: ../rules/base.xml.in.h:702
-msgid "Slovenian"
-msgstr "Slovène"
+msgid "Swedish (Svdvorak)"
+msgstr "Suédois (Svdvorak)"
 
 #: ../rules/base.xml.in.h:703
-msgid "Slovenian (US keyboard with Slovenian letters)"
-msgstr "Slovène (clavier US avec lettres slovènes)"
+msgid "Swedish Sign Language"
+msgstr "Langue des signes suédoise"
 
 #: ../rules/base.xml.in.h:704
-msgid "Slovenian (use guillemets for quotes)"
-msgstr ""
-"Slovène (utilise des guillemets typographiques au lieu des guillemets "
-"simples)"
+msgid "German (Switzerland)"
+msgstr "Allemand (Suisse)"
 
 #: ../rules/base.xml.in.h:705
-msgid "Spanish"
-msgstr "Espagnol"
+msgid "German (Switzerland, legacy)"
+msgstr "Allemand (Suisse, obsolète)"
 
 #: ../rules/base.xml.in.h:706
-msgid "Spanish (Dvorak)"
-msgstr "Espagnol (Dvorak)"
+msgid "German (Switzerland, eliminate dead keys)"
+msgstr "Allemand (Suisse, sans touche morte)"
 
 #: ../rules/base.xml.in.h:707
-msgid "Spanish (Latin American)"
-msgstr "Espagnol (Amérique latine)"
+msgid "German (Switzerland, Sun dead keys)"
+msgstr "Allemand (Suisse, touches mortes Sun)"
 
 #: ../rules/base.xml.in.h:708
-msgid "Spanish (Latin American, Sun dead keys)"
-msgstr "Espagnol (Amérique latine, touches mortes Sun)"
+msgid "French (Switzerland)"
+msgstr "Français (Suisse)"
 
 #: ../rules/base.xml.in.h:709
-msgid "Spanish (Latin American, eliminate dead keys)"
-msgstr "Espagnol (Amérique latine, sans touche morte)"
+msgid "French (Switzerland, eliminate dead keys)"
+msgstr "Français (Suisse, sans touche morte)"
 
 #: ../rules/base.xml.in.h:710
-msgid "Spanish (Latin American, include dead tilde)"
-msgstr "Espagnol (Amérique latine, y compris la touche morte tilde)"
+msgid "French (Switzerland, Sun dead keys)"
+msgstr "Français (Suisse, touches mortes Sun)"
 
 #: ../rules/base.xml.in.h:711
-msgid "Spanish (Macintosh)"
-msgstr "Espagnol (Macintosh)"
+msgid "French (Switzerland, Macintosh)"
+msgstr "Français (Suisse, Macintosh)"
 
 #: ../rules/base.xml.in.h:712
-msgid "Spanish (Sun dead keys)"
-msgstr "Espagnol (touches mortes Sun)"
+msgid "German (Switzerland, Macintosh)"
+msgstr "Allemand (Suisse, Macintosh)"
 
 #: ../rules/base.xml.in.h:713
-msgid "Spanish (eliminate dead keys)"
-msgstr "Espagnol (sans touche morte)"
-
-#: ../rules/base.xml.in.h:714
-msgid "Spanish (include dead tilde)"
-msgstr "Espagnol (y compris la touche morte tilde)"
+msgid "Arabic (Syria)"
+msgstr "Arabe (Syrie)"
 
-# https://help.ubuntu.com/7.04/user-guide/C/prefs-hardware.html
+#. Keyboard indicator for Syriac layouts
 #: ../rules/base.xml.in.h:715
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
-msgstr ""
-"Les combinaisons spéciales (Ctrl+Alt+&lt;touche&gt;) sont traitées par le "
-"serveur X"
+msgid "syc"
+msgstr "syc"
 
 #: ../rules/base.xml.in.h:716
-msgid "Sun Type 5/6"
-msgstr "Sun type 5/6"
+msgid "Syriac"
+msgstr "Syriaque"
 
 #: ../rules/base.xml.in.h:717
-msgid "Super Power Multimedia Keyboard"
-msgstr "Super Power Multimedia Keyboard"
+msgid "Syriac (phonetic)"
+msgstr "Syriaque (phonétique)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Swahili
 #: ../rules/base.xml.in.h:718
-msgid "Swahili (Kenya)"
-msgstr "Swahili (Kenya)"
+msgid "Kurdish (Syria, Latin Q)"
+msgstr "Kurde (Syrie, Q latin)"
 
 #: ../rules/base.xml.in.h:719
-msgid "Swahili (Tanzania)"
-msgstr "Swahili (Tanzanie)"
+msgid "Kurdish (Syria, F)"
+msgstr "Kurde (Syrie, F)"
 
 #: ../rules/base.xml.in.h:720
-msgid "Swap Ctrl and Caps Lock"
-msgstr "Intervertir Ctrl et Verr. maj."
-
-#: ../rules/base.xml.in.h:721
-msgid "Swap ESC and Caps Lock"
-msgstr "Intervertir Échap. et Verr. maj."
+msgid "Kurdish (Syria, Latin Alt-Q)"
+msgstr "Kurde (Syrie, Alt-Q latin)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Su%C3%A9dois
+#. Keyboard indicator for Tajik layouts
 #: ../rules/base.xml.in.h:722
-msgid "Swedish"
-msgstr "Suédois"
+msgid "tg"
+msgstr "tg"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Tadjik
 #: ../rules/base.xml.in.h:723
-msgid "Swedish (Dvorak)"
-msgstr "Suédois (Dvorak)"
+msgid "Tajik"
+msgstr "Tadjik"
 
 #: ../rules/base.xml.in.h:724
-msgid "Swedish (Macintosh)"
-msgstr "Suédois (Macintosh)"
-
-#: ../rules/base.xml.in.h:725
-msgid "Swedish (Svdvorak)"
-msgstr "Suédois (Svdvorak)"
+msgid "Tajik (legacy)"
+msgstr "Tadjik (obsolète)"
 
+#. Keyboard indicator for Sinhala layouts
 #: ../rules/base.xml.in.h:726
-msgid "Swedish (eliminate dead keys)"
-msgstr "Suédois (sans touche morte)"
+msgid "si"
+msgstr "si"
 
 #: ../rules/base.xml.in.h:727
-msgid "Swedish Sign Language"
-msgstr "Langue des signes suédoise"
+msgid "Sinhala (phonetic)"
+msgstr "Cingalais (phonétique)"
 
 #: ../rules/base.xml.in.h:728
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook (tablette tactile)"
+msgid "Tamil (Sri Lanka, Unicode)"
+msgstr "Tamoul (Sri Lanka, Unicode)"
 
 #: ../rules/base.xml.in.h:729
-msgid "Syriac"
-msgstr "Syriaque"
-
-#: ../rules/base.xml.in.h:730
-msgid "Syriac (phonetic)"
-msgstr "Syriaque (phonétique)"
+msgid "Tamil (Sri Lanka, TAB Typewriter)"
+msgstr "Tamoul (Sri Lanka, machine à écrire, TAB)"
 
+#. Keyboard indicator for Thai layouts
 #: ../rules/base.xml.in.h:731
-msgid "Taiwanese"
-msgstr "Taïwanais"
+msgid "th"
+msgstr "th"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Tha%C3%AF_%28langue%29
 #: ../rules/base.xml.in.h:732
-msgid "Taiwanese (indigenous)"
-msgstr "Taïwanais (indigène)"
+msgid "Thai"
+msgstr "Thaï"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Tadjik
 #: ../rules/base.xml.in.h:733
-msgid "Tajik"
-msgstr "Tadjik"
+msgid "Thai (TIS-820.2538)"
+msgstr "Thaï (TIS-820.2538)"
 
 #: ../rules/base.xml.in.h:734
-msgid "Tajik (legacy)"
-msgstr "Tadjik (obsolète)"
-
-#: ../rules/base.xml.in.h:735
-msgid "Tamil"
-msgstr "Tamoul"
+msgid "Thai (Pattachote)"
+msgstr "Thaï (Pattachote)"
 
+#. Keyboard indicator for Turkish layouts
 #: ../rules/base.xml.in.h:736
-msgid "Tamil (Sri Lanka, TAB Typewriter)"
-msgstr "Tamoul (Sri Lanka, machine à écrire, TAB)"
+msgid "tr"
+msgstr "tr"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Turc
 #: ../rules/base.xml.in.h:737
-msgid "Tamil (Sri Lanka, Unicode)"
-msgstr "Tamoul (Sri Lanka, Unicode)"
+msgid "Turkish"
+msgstr "Turc"
 
-# TAB et TSCII sont des codages tamouls.
 #: ../rules/base.xml.in.h:738
-msgid "Tamil (TAB typewriter)"
-msgstr "Tamoul (machine à écrire, TAB)"
+msgid "Turkish (F)"
+msgstr "Turc (F)"
 
 #: ../rules/base.xml.in.h:739
-msgid "Tamil (TSCII typewriter)"
-msgstr "Tamoul (machine à écrire, TSCII)"
+msgid "Turkish (Alt-Q)"
+msgstr "Turc (Alt-Q)"
 
 #: ../rules/base.xml.in.h:740
-msgid "Tamil (Unicode)"
-msgstr "Tamoul (Unicode)"
+msgid "Turkish (Sun dead keys)"
+msgstr "Turc (touches mortes Sun)"
 
 #: ../rules/base.xml.in.h:741
-msgid "Tamil (keyboard with numerals)"
-msgstr "Tamoul (clavier avec chiffres)"
+msgid "Kurdish (Turkey, Latin Q)"
+msgstr "Kurde (Turquie, Q latin)"
 
 #: ../rules/base.xml.in.h:742
-msgid "Targa Visionary 811"
-msgstr "Targa Visionary 811"
+msgid "Kurdish (Turkey, F)"
+msgstr "Kurde (Turquie, F)"
 
 #: ../rules/base.xml.in.h:743
-msgid "Tatar"
-msgstr "Tatar"
+msgid "Kurdish (Turkey, Latin Alt-Q)"
+msgstr "Kurde (Turquie, Alt-Q latin)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/T%C3%A9lougou
 #: ../rules/base.xml.in.h:744
-msgid "Telugu"
-msgstr "Télougou"
-
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Tha%C3%AF_%28langue%29
-#: ../rules/base.xml.in.h:745
-msgid "Thai"
-msgstr "Thaï"
+msgid "Turkish (international with dead keys)"
+msgstr "Turc (international avec touches mortes)"
 
-#: ../rules/base.xml.in.h:746
-msgid "Thai (Pattachote)"
-msgstr "Thaï (Pattachote)"
+#. Keyboard indicator for Crimean Tatar layouts
+#: ../rules/base.xml.in.h:746 ../rules/base.extras.xml.in.h:40
+msgid "crh"
+msgstr "crh"
 
 #: ../rules/base.xml.in.h:747
-msgid "Thai (TIS-820.2538)"
-msgstr "Thaï (TIS-820.2538)"
+msgid "Crimean Tatar (Turkish Q)"
+msgstr "Tatar de Crimée (Q turc)"
 
 #: ../rules/base.xml.in.h:748
-msgid "Tibetan"
-msgstr "Tibétain"
+msgid "Crimean Tatar (Turkish F)"
+msgstr "Tatar de Crimée (F turc)"
 
 #: ../rules/base.xml.in.h:749
-msgid "Tibetan (with ASCII numerals)"
-msgstr "Tibétain (avec chiffres ASCII)"
+msgid "Crimean Tatar (Turkish Alt-Q)"
+msgstr "Tatar de Crimée (Alt.-Q turc)"
 
 #: ../rules/base.xml.in.h:750
-msgid "To the corresponding key in a Dvorak keyboard."
-msgstr "Vers la touche correspondante sur un clavier Dvorak."
+msgid "Taiwanese"
+msgstr "Taïwanais"
 
 #: ../rules/base.xml.in.h:751
-msgid "To the corresponding key in a Qwerty keyboard."
-msgstr "Vers la touche correspondante sur un clavier qwerty."
-
-# http://who-t.blogspot.com/2010/11/xkb-mouse-emulation-removed-from.html
-#: ../rules/base.xml.in.h:752
-msgid "Toggle PointerKeys with Shift + NumLock."
-msgstr ""
-"Active ou désactive le contrôle de la souris (PointerKeys) avec Maj. + Verr. "
-"num."
+msgid "Taiwanese (indigenous)"
+msgstr "Taïwanais (indigène)"
 
+#. Keyboard indicator for Saisiyat layouts
 #: ../rules/base.xml.in.h:753
-msgid "Toshiba Satellite S3000"
-msgstr "Toshiba Satellite S3000"
+msgid "xsy"
+msgstr "xsy"
 
 #: ../rules/base.xml.in.h:754
-msgid "Trust Direct Access Keyboard"
-msgstr "Trust Direct Access"
-
-#: ../rules/base.xml.in.h:755
-msgid "Trust Slimline"
-msgstr "Trust Slimline"
+msgid "Saisiyat (Taiwan)"
+msgstr "Saisiyat (Taïwan)"
 
+#. Keyboard indicator for Ukranian layouts
 #: ../rules/base.xml.in.h:756
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Trust Wireless Classic"
+msgid "uk"
+msgstr "uk"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Tswana
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Ukrainien
 #: ../rules/base.xml.in.h:757
-msgid "Tswana"
-msgstr "Tswana"
+msgid "Ukrainian"
+msgstr "Ukrainien"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Turc
 #: ../rules/base.xml.in.h:758
-msgid "Turkish"
-msgstr "Turc"
+msgid "Ukrainian (phonetic)"
+msgstr "Ukrainien (phonétique)"
 
 #: ../rules/base.xml.in.h:759
-msgid "Turkish (Alt-Q)"
-msgstr "Turc (Alt-Q)"
+msgid "Ukrainian (typewriter)"
+msgstr "Ukrainien (machine à écrire)"
 
 #: ../rules/base.xml.in.h:760
-msgid "Turkish (F)"
-msgstr "Turc (F)"
+msgid "Ukrainian (WinKeys)"
+msgstr "Ukrainien (touches Windows)"
 
 #: ../rules/base.xml.in.h:761
-msgid "Turkish (Sun dead keys)"
-msgstr "Turc (touches mortes Sun)"
+msgid "Ukrainian (legacy)"
+msgstr "Ukrainien (obsolète)"
 
 #: ../rules/base.xml.in.h:762
-msgid "Turkish (international with dead keys)"
-msgstr "Turc (international avec touches mortes)"
+msgid "Ukrainian (standard RSTU)"
+msgstr "Ukrainien (RSTU standard)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Turkm%C3%A8ne
 #: ../rules/base.xml.in.h:763
-msgid "Turkmen"
-msgstr "Turkmène"
+msgid "Russian (Ukraine, standard RSTU)"
+msgstr "Russe (Ukraine, RSTU standard)"
 
 #: ../rules/base.xml.in.h:764
-msgid "Turkmen (Alt-Q)"
-msgstr "Turkmène (Alt-Q)"
+msgid "Ukrainian (homophonic)"
+msgstr "Ukrainien (homophonique)"
 
 #: ../rules/base.xml.in.h:765
-msgid "TypeMatrix EZ-Reach 2020"
-msgstr "TypeMatrix EZ-Reach 2020"
+msgid "English (UK)"
+msgstr "Anglais (Royaume-Uni)"
 
 #: ../rules/base.xml.in.h:766
-msgid "TypeMatrix EZ-Reach 2030 PS2"
-msgstr "TypeMatrix EZ-Reach 2030 PS2"
+msgid "English (UK, extended WinKeys)"
+msgstr "Anglais (Royaume-Uni, touche Windows étendue)"
 
 #: ../rules/base.xml.in.h:767
-msgid "TypeMatrix EZ-Reach 2030 USB"
-msgstr "TypeMatrix EZ-Reach 2030 USB"
+msgid "English (UK, international with dead keys)"
+msgstr "Anglais (Royaume-Uni, international, avec touches mortes)"
 
 #: ../rules/base.xml.in.h:768
-msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
-msgstr "TypeMatrix EZ-Reach 2030 USB (mode 102/105:EU)"
+msgid "English (UK, Dvorak)"
+msgstr "Anglais (Royaume-Uni, Dvorak)"
 
 #: ../rules/base.xml.in.h:769
-msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
-msgstr "TypeMatrix EZ-Reach 2030 USB (mode 106:JP)"
+msgid "English (UK, Dvorak with UK punctuation)"
+msgstr "Anglais (Royaume-Uni, Dvorak, ponctuation britannique)"
 
 #: ../rules/base.xml.in.h:770
-msgid "Udmurt"
-msgstr "Oudmourte"
+msgid "English (UK, Macintosh)"
+msgstr "Anglais (Royaume-Uni, Macintosh)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Ukrainien
 #: ../rules/base.xml.in.h:771
-msgid "Ukrainian"
-msgstr "Ukrainien"
+msgid "English (UK, Macintosh international)"
+msgstr "Anglais (Royaume-Uni, Macintosh international)"
 
+# http://colemak.com/
 #: ../rules/base.xml.in.h:772
-msgid "Ukrainian (WinKeys)"
-msgstr "Ukrainien (touches Windows)"
+msgid "English (UK, Colemak)"
+msgstr "Anglais (Royaume-Uni, Colemak)"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Ouzbek
 #: ../rules/base.xml.in.h:773
-msgid "Ukrainian (homophonic)"
-msgstr "Ukrainien (homophonique)"
+msgid "Uzbek"
+msgstr "Ouzbek"
 
 #: ../rules/base.xml.in.h:774
-msgid "Ukrainian (legacy)"
-msgstr "Ukrainien (obsolète)"
-
-#: ../rules/base.xml.in.h:775
-msgid "Ukrainian (phonetic)"
-msgstr "Ukrainien (phonétique)"
+msgid "Uzbek (Latin)"
+msgstr "Ouzbek (latin)"
 
+#. Keyboard indicator for Vietnamese layouts
 #: ../rules/base.xml.in.h:776
-msgid "Ukrainian (standard RSTU)"
-msgstr "Ukrainien (RSTU standard)"
+msgid "vi"
+msgstr "vi"
 
 #: ../rules/base.xml.in.h:777
-msgid "Ukrainian (typewriter)"
-msgstr "Ukrainien (machine à écrire)"
-
-#: ../rules/base.xml.in.h:778
-msgid "Unicode additions (arrows and math operators)"
-msgstr "Ajouts Unicode (opérateurs mathématiques et flèches)"
+msgid "Vietnamese"
+msgstr "Vietnamien"
 
+#. Keyboard indicator for Korean layouts
 #: ../rules/base.xml.in.h:779
-msgid ""
-"Unicode additions (arrows and math operators). Math operators on default "
-"level"
-msgstr ""
-"Ajouts Unicode (opérateurs mathématiques et flèches). Les opérateurs "
-"mathématiques se trouvent au niveau par défaut"
+msgid "ko"
+msgstr "ko"
 
 #: ../rules/base.xml.in.h:780
-msgid "Unitek KB-1925"
-msgstr "Unitek KB-1925"
+msgid "Korean"
+msgstr "Coréen"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Ourdou
 #: ../rules/base.xml.in.h:781
-msgid "Urdu (Pakistan)"
-msgstr "Ourdou (Pakistan)"
+msgid "Korean (101/104 key compatible)"
+msgstr "Coréen (compatible 101/104 touches)"
 
 #: ../rules/base.xml.in.h:782
-msgid "Urdu (Pakistan, CRULP)"
-msgstr "Ourdou (Pakistan, CRULP)"
-
-#: ../rules/base.xml.in.h:783
-msgid "Urdu (Pakistan, NLA)"
-msgstr "Ourdou (Pakistan, NLA)"
+msgid "Japanese (PC-98xx Series)"
+msgstr "Japonais (PC-98xx)"
 
+#. Keyboard indicator for Irish layouts
 #: ../rules/base.xml.in.h:784
-msgid "Urdu (WinKeys)"
-msgstr "Ourdou (touches Windows)"
+msgid "ie"
+msgstr "ie"
 
 #: ../rules/base.xml.in.h:785
-msgid "Urdu (alternative phonetic)"
-msgstr "Ourdou (variante, phonétique)"
+msgid "Irish"
+msgstr "Irlandais"
 
 #: ../rules/base.xml.in.h:786
-msgid "Urdu (phonetic)"
-msgstr "Ourdou (phonétique)"
+msgid "CloGaelach"
+msgstr "Cló Gaelach"
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=518156
 #: ../rules/base.xml.in.h:787
-msgid "Use keyboard LED to show alternative layout"
-msgstr ""
-"Utiliser les voyants du clavier pour indiquer une disposition alternative"
+msgid "Irish (UnicodeExpert)"
+msgstr "Irlandais (UnicodeExpert)"
 
 #: ../rules/base.xml.in.h:788
-msgid "Using space key to input non-breakable space character"
-msgstr "Utiliser la barre d'espacement pour insérer une espace insécable"
+msgid "Ogham"
+msgstr "Ogham"
 
 #: ../rules/base.xml.in.h:789
-msgid "Usual space at any level"
-msgstr "L'espace habituelle quelque-soit le niveau"
+msgid "Ogham (IS434)"
+msgstr "Ogham (IS434)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Ou%C3%AFghour
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Ourdou
 #: ../rules/base.xml.in.h:790
-msgid "Uyghur"
-msgstr "Ouïghour"
+msgid "Urdu (Pakistan)"
+msgstr "Ourdou (Pakistan)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Ouzbek
 #: ../rules/base.xml.in.h:791
-msgid "Uzbek"
-msgstr "Ouzbek"
+msgid "Urdu (Pakistan, CRULP)"
+msgstr "Ourdou (Pakistan, CRULP)"
 
 #: ../rules/base.xml.in.h:792
-msgid "Uzbek (Afghanistan)"
-msgstr "Ouzbek (Afghanistan)"
+msgid "Urdu (Pakistan, NLA)"
+msgstr "Ourdou (Pakistan, NLA)"
 
 #: ../rules/base.xml.in.h:793
-msgid "Uzbek (Afghanistan, OLPC)"
-msgstr "Ouzbek (Afghanistan, OLPC)"
-
-#: ../rules/base.xml.in.h:794
-msgid "Uzbek (Latin)"
-msgstr "Ouzbek (latin)"
+msgid "Arabic (Pakistan)"
+msgstr "Arabe (Pakistan)"
 
+#. Keyboard indicator for Sindhi layouts
 #: ../rules/base.xml.in.h:795
-msgid "Vietnamese"
-msgstr "Vietnamien"
+msgid "sd"
+msgstr "sd"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Sindhi
 #: ../rules/base.xml.in.h:796
-msgid "ViewSonic KU-306 Internet Keyboard"
-msgstr "ViewSonic KU-306 Internet Keyboard"
-
-#: ../rules/base.xml.in.h:797
-msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
-msgstr "Wang 724 avec ajouts Unicode (opérateurs mathématiques et flèches)"
+msgid "Sindhi"
+msgstr "Sindhî"
 
+#. Keyboard indicator for Dhivehi layouts
 #: ../rules/base.xml.in.h:798
-msgid ""
-"Wang 724 keypad with Unicode additions (arrows and math operators). Math "
-"operators on default level"
-msgstr ""
-"Wang 724 avec ajouts Unicode (opérateurs mathématiques et flèches). Les "
-"opérateurs mathématiques se trouvent au niveau par défaut"
+msgid "dv"
+msgstr "dv"
 
 #: ../rules/base.xml.in.h:799
-msgid "Winbook Model XP5"
-msgstr "Winbook Model XP5"
+msgid "Dhivehi"
+msgstr "Divehi"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Wolof_%28langue%29
 #: ../rules/base.xml.in.h:800
-msgid "Wolof"
-msgstr "Wolof"
-
-#: ../rules/base.xml.in.h:801
-msgid "Yahoo! Internet Keyboard"
-msgstr "Yahoo! Clavier Internet"
+msgid "English (South Africa)"
+msgstr "Anglais (Afrique du Sud)"
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/Iakoute
+#. Keyboard indicator for Esperanto layouts
 #: ../rules/base.xml.in.h:802
-msgid "Yakut"
-msgstr "Iakute"
+msgid "eo"
+msgstr "eo"
 
 #: ../rules/base.xml.in.h:803
-msgid "Yoruba"
-msgstr "Yoruba"
+msgid "Esperanto"
+msgstr "Espéranto"
 
-# http://hapax.qc.ca/glossaire.htm
 #: ../rules/base.xml.in.h:804
-msgid "Zero-width non-joiner character at second level"
-msgstr "Antiliant à chasse nulle au 2e niveau"
-
-#: ../rules/base.xml.in.h:805
-msgid ""
-"Zero-width non-joiner character at second level, non-breakable space "
-"character at third level"
-msgstr "Antiliant à chasse nulle au 2e niveau. espace insécable au 3e niveau"
+msgid "Esperanto (displaced semicolon and quote, obsolete)"
+msgstr "Espéranto (point-virgule et guillemets simples déplacés, obsolète)"
 
+#. Keyboard indicator for Nepali layouts
 #: ../rules/base.xml.in.h:806
-msgid ""
-"Zero-width non-joiner character at second level, non-breakable space "
-"character at third level, nothing at fourth level"
-msgstr ""
-"Antiliant à chasse nulle au 2e niveau. espace insécable au 3e niveau, rien "
-"au 4e niveau"
+msgid "ne"
+msgstr "ne"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/N%C3%A9palais
 #: ../rules/base.xml.in.h:807
-msgid ""
-"Zero-width non-joiner character at second level, non-breakable space "
-"character at third level, thin non-breakable space at fourth level"
-msgstr ""
-"Antiliant à chasse nulle au 2e niveau. espace insécable au 3e niveau, espace "
-"fine insécable au 4e niveau"
+msgid "Nepali"
+msgstr "Népalais"
 
 #: ../rules/base.xml.in.h:808
-msgid ""
-"Zero-width non-joiner character at second level, non-breakable space "
-"character at third level, zero-width joiner at fourth level"
-msgstr ""
-"Antiliant à chasse nulle au 2e niveau. espace insécable au 3e niveau, liant "
-"à chasse nulle au 4e niveau"
-
-#: ../rules/base.xml.in.h:809
-msgid ""
-"Zero-width non-joiner character at second level, zero-width joiner character "
-"at third level"
-msgstr ""
-"Antiliant à chasse nulle au 2e niveau, liant à chasse nulle au 3e niveau"
+msgid "English (Nigeria)"
+msgstr "Anglais (Nigeria)"
 
+#. Keyboard indicator for Igbo layouts
 #: ../rules/base.xml.in.h:810
-msgid ""
-"Zero-width non-joiner character at second level, zero-width joiner character "
-"at third level, non-breakable space character at fourth level"
-msgstr ""
-"Antiliant à chasse nulle au 2e niveau, liant à chasse nulle au 3e niveau, "
-"espace insécable au 4e niveau"
+msgid "ig"
+msgstr "ig"
 
 #: ../rules/base.xml.in.h:811
-msgid ""
-"Zero-width non-joiner character at third level, zero-width joiner at fourth "
-"level"
-msgstr ""
-"Antiliant à chasse nulle au 3e niveau, liant à chasse nulle au 4e niveau"
-
-#: ../rules/base.xml.in.h:812
-msgid "ak"
-msgstr "ak"
+msgid "Igbo"
+msgstr "Igbo"
 
+#. Keyboard indicator for Yoruba layouts
 #: ../rules/base.xml.in.h:813
-msgid "am"
-msgstr "am"
+msgid "yo"
+msgstr "yo"
 
 #: ../rules/base.xml.in.h:814
-msgid "ar"
-msgstr "ar"
-
-#: ../rules/base.xml.in.h:815
-msgid "avn"
-msgstr "avn"
+msgid "Yoruba"
+msgstr "Yoruba"
 
+#. Keyboard indicator for Amharic layouts
 #: ../rules/base.xml.in.h:816
-msgid "az"
-msgstr "az"
+msgid "am"
+msgstr "am"
 
 #: ../rules/base.xml.in.h:817
-msgid "be"
-msgstr "be"
-
-#: ../rules/base.xml.in.h:818
-msgid "ber"
-msgstr "ber"
+msgid "Amharic"
+msgstr "Amharique"
 
+#. Keyboard indicator for Wolof layouts
 #: ../rules/base.xml.in.h:819
-msgid "bg"
-msgstr "bg"
+msgid "wo"
+msgstr "wo"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Wolof_%28langue%29
 #: ../rules/base.xml.in.h:820
-msgid "bm"
-msgstr "bm"
-
-#: ../rules/base.xml.in.h:821
-msgid "bn"
-msgstr "bn"
+msgid "Wolof"
+msgstr "Wolof"
 
+#. Keyboard indicator for Braille layouts
 #: ../rules/base.xml.in.h:822
 msgid "brl"
 msgstr "brl"
 
 #: ../rules/base.xml.in.h:823
-msgid "bs"
-msgstr "bs"
+msgid "Braille"
+msgstr "Braille"
 
 #: ../rules/base.xml.in.h:824
-msgid "ca"
-msgstr "cb"
+msgid "Braille (left hand)"
+msgstr "Braille (main gauche)"
 
 #: ../rules/base.xml.in.h:825
-msgid "chr"
-msgstr "chr"
-
-#: ../rules/base.xml.in.h:826
-msgid "cm"
-msgstr "cm"
+msgid "Braille (right hand)"
+msgstr "Braille (main droite)"
 
-#: ../rules/base.xml.in.h:827 ../rules/base.extras.xml.in.h:35
-msgid "crh"
-msgstr "crh"
+#. Keyboard indicator for Turkmen layouts
+#: ../rules/base.xml.in.h:827
+msgid "tk"
+msgstr "tk"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Turkm%C3%A8ne
 #: ../rules/base.xml.in.h:828
-msgid "cs"
-msgstr "cs"
+msgid "Turkmen"
+msgstr "Turkmène"
 
 #: ../rules/base.xml.in.h:829
-msgid "da"
-msgstr "da"
-
-#: ../rules/base.xml.in.h:830
-msgid "de"
-msgstr "de"
+msgid "Turkmen (Alt-Q)"
+msgstr "Turkmène (Alt-Q)"
 
+#. Keyboard indicator for Bambara layouts
 #: ../rules/base.xml.in.h:831
-msgid "dv"
-msgstr "dv"
+msgid "bm"
+msgstr "bm"
 
 #: ../rules/base.xml.in.h:832
-msgid "dz"
-msgstr "dz"
+msgid "Bambara"
+msgstr "Bambara"
 
 #: ../rules/base.xml.in.h:833
-msgid "ee"
-msgstr "ee"
+msgid "French (Mali, alternative)"
+msgstr "Français (Mali, variante)"
 
-#: ../rules/base.xml.in.h:834 ../rules/base.extras.xml.in.h:36
-msgid "en"
-msgstr "en"
+#: ../rules/base.xml.in.h:834
+msgid "English (Mali, US Macintosh)"
+msgstr "Anglais (Mali, Macintosh USA)"
 
 #: ../rules/base.xml.in.h:835
-msgid "eo"
-msgstr "eo"
-
-#: ../rules/base.xml.in.h:836
-msgid "es"
-msgstr "es"
+msgid "English (Mali, US international)"
+msgstr "Anglais (Mali, USA international)"
 
+#. Keyboard indicator for Swahili layouts
 #: ../rules/base.xml.in.h:837
-msgid "et"
-msgstr "et"
+msgid "sw"
+msgstr "sw"
 
-#: ../rules/base.xml.in.h:838 ../rules/base.extras.xml.in.h:37
-msgid "fa"
-msgstr "fa"
+#: ../rules/base.xml.in.h:838
+msgid "Swahili (Tanzania)"
+msgstr "Swahili (Tanzanie)"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Swahili
 #: ../rules/base.xml.in.h:839
-msgid "ff"
-msgstr "ff"
+msgid "Swahili (Kenya)"
+msgstr "Swahili (Kenya)"
 
+# Langue bantoue.
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Kikuyu_%28langue%29
 #: ../rules/base.xml.in.h:840
-msgid "fi"
-msgstr "fi"
-
-#: ../rules/base.xml.in.h:841
-msgid "fo"
-msgstr "fo"
+msgid "Kikuyu"
+msgstr "Kikuyu"
 
-#: ../rules/base.xml.in.h:842 ../rules/base.extras.xml.in.h:38
-msgid "fr"
-msgstr "fr"
+#. Keyboard indicator for Tswana layouts
+#: ../rules/base.xml.in.h:842
+msgid "tn"
+msgstr "tn"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Tswana
 #: ../rules/base.xml.in.h:843
-msgid "gaa"
-msgstr "gaa"
-
-#: ../rules/base.xml.in.h:844
-msgid "gr"
-msgstr "gr"
+msgid "Tswana"
+msgstr "Tswana"
 
+#. Keyboard indicator for Filipino layouts
 #: ../rules/base.xml.in.h:845
-msgid "gu"
-msgstr "gu"
+msgid "ph"
+msgstr "ph"
 
 #: ../rules/base.xml.in.h:846
-msgid "ha"
-msgstr "ha"
+msgid "Filipino"
+msgstr "Filipino"
 
 #: ../rules/base.xml.in.h:847
-msgid "he"
-msgstr "he"
+msgid "Filipino (QWERTY Baybayin)"
+msgstr "Filipino (baybayin, qwerty)"
 
+# http://www.michaelcapewell.com/projects/keyboard/#The_Capewell-Dvorak_Layout
 #: ../rules/base.xml.in.h:848
-msgid "hi"
-msgstr "hi"
+msgid "Filipino (Capewell-Dvorak Latin)"
+msgstr "Filipino (Capewell-Dvorak, latin)"
 
+# http://www.michaelcapewell.com/projects/keyboard/#The_Capewell-Dvorak_Layout
 #: ../rules/base.xml.in.h:849
-msgid "hr"
-msgstr "hr"
+msgid "Filipino (Capewell-Dvorak Baybayin)"
+msgstr "Filipino (Capewell-Dvorak, baybayin)"
 
+# http://www.michaelcapewell.com/projects/keyboard/#The_QWERF_Layout
 #: ../rules/base.xml.in.h:850
-msgid "hu"
-msgstr "hu"
+msgid "Filipino (Capewell-QWERF 2006 Latin)"
+msgstr "Filipino (Capewell-QWERF 2006, latin)"
 
-#: ../rules/base.xml.in.h:851 ../rules/base.extras.xml.in.h:39
-msgid "hy"
-msgstr "hy"
+# http://www.michaelcapewell.com/projects/keyboard/#The_QWERF_Layout
+#: ../rules/base.xml.in.h:851
+msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
+msgstr "Filipino (Capewell-QWERF 2006, baybayin)"
 
 #: ../rules/base.xml.in.h:852
-msgid "ie"
-msgstr "ie"
+msgid "Filipino (Colemak Latin)"
+msgstr "Filipino (Colemak, latin)"
 
 #: ../rules/base.xml.in.h:853
-msgid "ig"
-msgstr "ig"
+msgid "Filipino (Colemak Baybayin)"
+msgstr "Filipino (Colemak, baybayin)"
 
 #: ../rules/base.xml.in.h:854
-msgid "ike"
-msgstr "ike"
+msgid "Filipino (Dvorak Latin)"
+msgstr "Filipino (Dvorak, latin)"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Baybayin
 #: ../rules/base.xml.in.h:855
-msgid "in"
-msgstr "in"
+msgid "Filipino (Dvorak Baybayin)"
+msgstr "Filipino (Dvorak, baybayin)"
 
 #: ../rules/base.xml.in.h:856
-msgid "is"
-msgstr "is"
+msgid "Key(s) to change layout"
+msgstr "Touches modifiant la disposition du clavier"
 
 #: ../rules/base.xml.in.h:857
-msgid "it"
-msgstr "it"
+msgid "Right Alt (while pressed)"
+msgstr "Alt. droite (si enfoncé)"
 
 #: ../rules/base.xml.in.h:858
-msgid "ja"
-msgstr "ja"
+msgid "Left Alt (while pressed)"
+msgstr "Alt gauche (si enfoncé)"
 
 #: ../rules/base.xml.in.h:859
-msgid "ka"
-msgstr "ka"
+msgid "Left Win (while pressed)"
+msgstr "Windows gauche (si enfoncé)"
 
 #: ../rules/base.xml.in.h:860
-msgid "ki"
-msgstr "ki"
+msgid "Right Win (while pressed)"
+msgstr "Windows droite (si enfoncé)"
 
 #: ../rules/base.xml.in.h:861
-msgid "kk"
-msgstr "kk"
+msgid "Any Win key (while pressed)"
+msgstr "N'importe quelle touche Windows (enfoncée)"
 
 #: ../rules/base.xml.in.h:862
-msgid "km"
-msgstr "km"
+msgid ""
+"Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
+msgstr ""
+"Verr. maj. (si enfoncé), Alt+Verr. maj. joue le rôle original de Verr. maj."
 
 #: ../rules/base.xml.in.h:863
-msgid "kn"
-msgstr "kn"
+msgid "Right Ctrl (while pressed)"
+msgstr "Ctrl droite (si enfoncé)"
 
 #: ../rules/base.xml.in.h:864
-msgid "ko"
-msgstr "ko"
+msgid "Right Alt"
+msgstr "Alt. droite"
 
 #: ../rules/base.xml.in.h:865
-msgid "ku"
-msgstr "ku"
+msgid "Left Alt"
+msgstr "Alt gauche"
 
 #: ../rules/base.xml.in.h:866
-msgid "lo"
-msgstr "lo"
+msgid "Caps Lock"
+msgstr "Verr. maj."
 
-#: ../rules/base.xml.in.h:867 ../rules/base.extras.xml.in.h:41
-msgid "lt"
-msgstr "lt"
+#: ../rules/base.xml.in.h:867
+msgid "Shift+Caps Lock"
+msgstr "Maj.+ Verr. maj."
 
-#: ../rules/base.xml.in.h:868 ../rules/base.extras.xml.in.h:42
-msgid "lv"
-msgstr "lv"
+#: ../rules/base.xml.in.h:868
+msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
+msgstr ""
+"Verr. maj. (première disposition), Maj.+Verr. maj. (dernière disposition)"
 
 #: ../rules/base.xml.in.h:869
-msgid "mi"
-msgstr "mi"
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgstr ""
+"Touche Windows gauche (première disposition), touche Windows droite "
+"(dernière disposition)"
 
 #: ../rules/base.xml.in.h:870
-msgid "mk"
-msgstr "mk"
+msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
+msgstr ""
+"Ctrl gauche (première disposition), Ctrl droit (dernière disposition)"
 
 #: ../rules/base.xml.in.h:871
-msgid "ml"
-msgstr "ml"
+msgid "Alt+Caps Lock"
+msgstr "Alt+Verr. maj."
 
 #: ../rules/base.xml.in.h:872
-msgid "mn"
-msgstr "mn"
+msgid "Both Shift keys together"
+msgstr "Les deux Maj. ensemble"
 
 #: ../rules/base.xml.in.h:873
-msgid "mt"
-msgstr "mt"
+msgid "Both Alt keys together"
+msgstr "Les deux Alt ensemble"
 
 #: ../rules/base.xml.in.h:874
-msgid "my"
-msgstr "my"
+msgid "Both Ctrl keys together"
+msgstr "Les deux Ctrl ensemble"
 
 #: ../rules/base.xml.in.h:875
-msgid "ne"
-msgstr "ne"
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Maj."
 
 #: ../rules/base.xml.in.h:876
-msgid "nl"
-msgstr "nl"
+msgid "Left Ctrl+Left Shift"
+msgstr "Ctrl gauche+Maj. gauche"
 
 #: ../rules/base.xml.in.h:877
-msgid "no"
-msgstr "no"
+msgid "Right Ctrl+Right Shift"
+msgstr "Ctrl  droite + Maj. droite"
 
 #: ../rules/base.xml.in.h:878
-msgid "or"
-msgstr "or"
+msgid "Alt+Ctrl"
+msgstr "Alt.+Ctrl"
 
 #: ../rules/base.xml.in.h:879
-msgid "pa"
-msgstr "pa"
+msgid "Alt+Shift"
+msgstr "Alt+Maj."
 
 #: ../rules/base.xml.in.h:880
-msgid "ph"
-msgstr "ph"
+msgid "Left Alt+Left Shift"
+msgstr ""
 
-#: ../rules/base.xml.in.h:881 ../rules/base.extras.xml.in.h:43
-msgid "pl"
-msgstr "pl"
+#: ../rules/base.xml.in.h:881
+msgid "Alt+Space"
+msgstr "Alt+Espace"
 
 #: ../rules/base.xml.in.h:882
-msgid "ps"
-msgstr "ps"
+msgid "Menu"
+msgstr "Menu"
 
 #: ../rules/base.xml.in.h:883
-msgid "pt"
-msgstr "pt"
+msgid "Left Win"
+msgstr "Touche Windows gauche"
 
-#: ../rules/base.xml.in.h:884 ../rules/base.extras.xml.in.h:44
-msgid "ro"
-msgstr "ro"
+#: ../rules/base.xml.in.h:884
+msgid "Right Win"
+msgstr "Windows droite"
 
-#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:45
-msgid "ru"
-msgstr "ru"
+#: ../rules/base.xml.in.h:885
+msgid "Left Shift"
+msgstr "Maj. gauche"
 
 #: ../rules/base.xml.in.h:886
-msgid "sd"
-msgstr "sd"
+msgid "Right Shift"
+msgstr "Maj. droite"
 
 #: ../rules/base.xml.in.h:887
-msgid "si"
-msgstr "si"
+msgid "Left Ctrl"
+msgstr "Ctrl gauche"
 
 #: ../rules/base.xml.in.h:888
-msgid "sk"
-msgstr "sk"
+msgid "Right Ctrl"
+msgstr "Crtl droite"
 
 #: ../rules/base.xml.in.h:889
-msgid "sl"
-msgstr "sl"
+msgid "Scroll Lock"
+msgstr "Arrêt défilement"
 
 #: ../rules/base.xml.in.h:890
-msgid "sq"
-msgstr "sq"
+msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
+msgstr ""
+"Ctrl gauche + Windows gauche (première disposition), Ctrl droit + Menu "
+"(seconde disposition)"
 
-#: ../rules/base.xml.in.h:891 ../rules/base.extras.xml.in.h:47
-msgid "sr"
-msgstr "sr"
+#: ../rules/base.xml.in.h:891
+msgid "Key to choose 3rd level"
+msgstr "Touche sélectionnant le 3e niveau"
 
 #: ../rules/base.xml.in.h:892
-msgid "sv"
-msgstr "sv"
+msgid "Any Win key"
+msgstr "N'importe quelle touche Windows"
 
 #: ../rules/base.xml.in.h:893
-msgid "sw"
-msgstr "sw"
+msgid "Any Alt key"
+msgstr "N'importe quelle touche Alt"
 
+# https://secure.wikimedia.org/wikipedia/fr/wiki/Touche_compose
 #: ../rules/base.xml.in.h:894
-msgid "syc"
-msgstr "syc"
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgstr "Alt. droite, Maj.+Alt. droite est une touche compose (Multi_Key)"
 
 #: ../rules/base.xml.in.h:895
-msgid "ta"
-msgstr "ta"
+msgid "Right Alt key never chooses 3rd level"
+msgstr "Alt. droite ne sélectionne jamais le 3e niveau"
 
 #: ../rules/base.xml.in.h:896
-msgid "te"
-msgstr "te"
+msgid "Enter on keypad"
+msgstr "Entrée sur le pavé numérique"
 
 #: ../rules/base.xml.in.h:897
-msgid "tg"
-msgstr "tg"
+msgid "Backslash"
+msgstr "Barre oblique inverse"
 
 #: ../rules/base.xml.in.h:898
-msgid "th"
-msgstr "th"
+msgid "&lt;Less/Greater&gt;"
+msgstr "&lt;Plus petit/Plus grand&gt;"
 
 #: ../rules/base.xml.in.h:899
-msgid "tk"
-msgstr "tk"
+msgid ""
+"Caps Lock chooses 3rd level, acts as onetime lock when pressed together with "
+"another 3rd-level-chooser"
+msgstr ""
 
 #: ../rules/base.xml.in.h:900
-msgid "tn"
-msgstr "tn"
+msgid ""
+"Backslash chooses 3rd level, acts as onetime lock when pressed together with "
+"another 3rd-level-chooser"
+msgstr ""
 
 #: ../rules/base.xml.in.h:901
-msgid "tr"
-msgstr "tr"
+msgid ""
+"&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed "
+"together with another 3rd-level-chooser"
+msgstr ""
 
 #: ../rules/base.xml.in.h:902
-msgid "uk"
-msgstr "uk"
+msgid "Ctrl key position"
+msgstr "Position de la touche Ctrl"
 
 #: ../rules/base.xml.in.h:903
-msgid "ur"
-msgstr "ur"
+msgid "Caps Lock as Ctrl"
+msgstr "Verr. maj. comme Ctrl"
 
 #: ../rules/base.xml.in.h:904
-msgid "uz"
-msgstr "uz"
+msgid "Left Ctrl as Meta"
+msgstr "Ctrl gauche comme Méta"
 
 #: ../rules/base.xml.in.h:905
-msgid "vi"
-msgstr "vi"
+msgid "Swap Ctrl and Caps Lock"
+msgstr "Intervertir Ctrl et Verr. maj."
 
 #: ../rules/base.xml.in.h:906
-msgid "wo"
-msgstr "wo"
+msgid "At left of 'A'"
+msgstr "À gauche du « A »"
 
 #: ../rules/base.xml.in.h:907
-msgid "xsy"
-msgstr "xsy"
+msgid "At bottom left"
+msgstr "En bas à gauche"
 
 #: ../rules/base.xml.in.h:908
-msgid "yo"
-msgstr "yo"
+msgid "Right Ctrl as Right Alt"
+msgstr "Ctrl droite comme Alt. droite"
 
 #: ../rules/base.xml.in.h:909
-msgid "zh"
-msgstr "zh"
+msgid "Menu as Right Ctrl"
+msgstr "Menu comme Crtl droite"
 
-# https://secure.wikimedia.org/wikipedia/en/wiki/APL_%28programming_language%29
-#: ../rules/base.extras.xml.in.h:1
-msgid "APL Keyboard Symbols"
-msgstr "Symboles APL"
+#: ../rules/base.xml.in.h:910
+msgid "Right Alt as Right Ctrl"
+msgstr "Alt. droite comme Ctrl droite"
 
-#: ../rules/base.extras.xml.in.h:3
-msgid "Armenian (OLPC phonetic)"
+# https://bugzilla.gnome.org/show_bug.cgi?id=518156
+#: ../rules/base.xml.in.h:911
+msgid "Use keyboard LED to show alternative layout"
 msgstr ""
+"Utiliser les voyants du clavier pour indiquer une disposition alternative"
 
-#: ../rules/base.extras.xml.in.h:4
-msgid "Atsina"
-msgstr "Atsina"
-
-#: ../rules/base.extras.xml.in.h:5
-msgid "Avestan"
-msgstr "Avestique"
+#: ../rules/base.xml.in.h:912
+msgid "Num Lock"
+msgstr "Verr. Num."
 
-# https://secure.wikimedia.org/wikipedia/fr/wiki/C%C5%93ur_d%27Al%C3%A8ne_%28langue%29
-#: ../rules/base.extras.xml.in.h:6
-msgid "Couer D'alene Salish"
-msgstr "Salish Cœur d'Alène"
+#: ../rules/base.xml.in.h:913
+msgid "Numeric keypad layout selection"
+msgstr "Disposition du pavé numérique"
 
-#: ../rules/base.extras.xml.in.h:7
-msgid "Crimean Tatar (Dobruja Q)"
-msgstr "Tatar de Crimée (Q dobroudja)"
+#: ../rules/base.xml.in.h:914
+msgid "Legacy"
+msgstr "Obsolète"
 
-#: ../rules/base.extras.xml.in.h:9
-msgid "English (US, international AltGr Unicode combining)"
-msgstr "Anglais (USA, international, AltGr combinatoire Unicode)"
+#: ../rules/base.xml.in.h:915
+msgid "Unicode additions (arrows and math operators)"
+msgstr "Ajouts Unicode (opérateurs mathématiques et flèches)"
 
-#: ../rules/base.extras.xml.in.h:10
-msgid "English (US, international AltGr Unicode combining, alternative)"
-msgstr "Anglais (USA, international, AltGr combinatoire Unicode, variante)"
+#: ../rules/base.xml.in.h:916
+msgid ""
+"Unicode additions (arrows and math operators). Math operators on default "
+"level"
+msgstr ""
+"Ajouts Unicode (opérateurs mathématiques et flèches). Les opérateurs "
+"mathématiques se trouvent au niveau par défaut"
 
-# http://www.thecanadianencyclopedia.com/index.cfm?PgNm=TCE&Params=f1ARTf0004367
-#: ../rules/base.extras.xml.in.h:12
-msgid "Kutenai"
-msgstr "kutenai"
+#: ../rules/base.xml.in.h:917
+msgid "Legacy Wang 724"
+msgstr "Wang 724 (clavier obsolète)"
 
-# http://colemak.com/
-#: ../rules/base.extras.xml.in.h:14
-msgid "Latvian (US Colemak)"
-msgstr "Letton (Colemak USA)"
+#: ../rules/base.xml.in.h:918
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
+msgstr "Wang 724 avec ajouts Unicode (opérateurs mathématiques et flèches)"
 
-#: ../rules/base.extras.xml.in.h:15
-msgid "Latvian (US Colemak, apostrophe variant)"
-msgstr "Letton (Colemak USA, variante apostrophe)"
+#: ../rules/base.xml.in.h:919
+msgid ""
+"Wang 724 keypad with Unicode additions (arrows and math operators). Math "
+"operators on default level"
+msgstr ""
+"Wang 724 avec ajouts Unicode (opérateurs mathématiques et flèches). Les "
+"opérateurs mathématiques se trouvent au niveau par défaut"
+
+#: ../rules/base.xml.in.h:920
+msgid "Hexadecimal"
+msgstr "Hexadécimal"
+
+#: ../rules/base.xml.in.h:921
+msgid "ATM/phone-style"
+msgstr "Clavier de type téléphonique"
+
+#: ../rules/base.xml.in.h:922
+msgid "Numeric keypad delete key behaviour"
+msgstr "Comportement de la touche de Suppr. du pavé numérique"
+
+#: ../rules/base.xml.in.h:923
+msgid "Legacy key with dot"
+msgstr "Touche obsolète avec point"
+
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:925
+msgid "Legacy key with comma"
+msgstr "Touche obsolète avec virgule"
+
+#: ../rules/base.xml.in.h:926
+msgid "Four-level key with dot"
+msgstr "Touche à quatre niveaux avec point"
+
+#: ../rules/base.xml.in.h:927
+msgid "Four-level key with dot, latin-9 restriction"
+msgstr "Touche à quatre niveaux avec point, latin-9 uniquement"
+
+#: ../rules/base.xml.in.h:928
+msgid "Four-level key with comma"
+msgstr "Touche à quatre niveaux avec virgule"
+
+# Le momayyez est le séparateur décimal perse.
+#: ../rules/base.xml.in.h:929
+msgid "Four-level key with momayyez"
+msgstr "Touche à quatre niveaux avec le séparateur décimal momayyez"
+
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:932
+msgid "Four-level key with abstract separators"
+msgstr "Touche à quatre niveaux avec le séparateur décimal abstrait"
+
+#: ../rules/base.xml.in.h:933
+msgid "Semi-colon on third level"
+msgstr "Point-virgule au 3e niveau"
+
+#: ../rules/base.xml.in.h:934
+msgid "Caps Lock key behavior"
+msgstr "Comportement de la touche Verr. maj."
+
+#: ../rules/base.xml.in.h:935
+msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
+msgstr ""
+"Verr. maj. utilise la mise en majuscule interne. Maj. annule temporairement "
+"Verr. maj."
+
+#: ../rules/base.xml.in.h:936
+msgid ""
+"Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
+msgstr ""
+"Verr. maj. utilise la mise en majuscule interne. Maj. n'a pas d'effet sur "
+"Verr. maj."
+
+#: ../rules/base.xml.in.h:937
+msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
+msgstr ""
+"Verr. maj. agit comme un verrouillage de maj. Maj. l'annule temporairement"
+
+#: ../rules/base.xml.in.h:938
+msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
+msgstr ""
+"Verr. maj. agit comme maj. quand il est verrouillé. Maj. n'a pas d'effet sur "
+"verr. Maj."
+
+#: ../rules/base.xml.in.h:939
+msgid "Caps Lock toggles normal capitalization of alphabetic characters"
+msgstr ""
+"Verr. maj. active ou désactive la mise en majuscule usuelle des caractères "
+"alphabétiques"
+
+#: ../rules/base.xml.in.h:940
+msgid "Make Caps Lock an additional Num Lock"
+msgstr "Faire de Verr. maj. un Verr. Num. supplémentaire"
+
+#: ../rules/base.xml.in.h:941
+msgid "Swap ESC and Caps Lock"
+msgstr "Intervertir Échap. et Verr. maj."
+
+#: ../rules/base.xml.in.h:942
+msgid "Make Caps Lock an additional ESC"
+msgstr "Faire de Verr. maj. un Échap. supplémentaire."
+
+#: ../rules/base.xml.in.h:943
+msgid "Make Caps Lock an additional Backspace"
+msgstr "Faire de Verr. maj. un Effacement. arriière supplémentaire."
+
+#: ../rules/base.xml.in.h:944
+msgid "Make Caps Lock an additional Super"
+msgstr "Faire de Verr. maj. un Super supplémentaire."
+
+#: ../rules/base.xml.in.h:945
+msgid "Make Caps Lock an additional Hyper"
+msgstr "Faire de Verr. maj. un Hyper supplémentaire"
+
+#: ../rules/base.xml.in.h:946
+msgid "Caps Lock toggles Shift so all keys are affected"
+msgstr ""
+"Verr. maj. active ou désactive maj., ce qui affecte toutes les touches"
+
+#: ../rules/base.xml.in.h:947
+msgid "Caps Lock is disabled"
+msgstr "Verr. maj. est désactivé"
+
+# http://www.x.org/wiki/KeySyms
+#: ../rules/base.xml.in.h:948
+msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
+msgstr ""
+"Faire de Verr. maj. un Contrôle supplémentaire, mais garder le même nom "
+"symbolique (Caps_Lock)"
+
+#: ../rules/base.xml.in.h:949
+msgid "Alt/Win key behavior"
+msgstr "Comportement des touches Alt et Windows"
+
+#: ../rules/base.xml.in.h:950
+msgid "Add the standard behavior to Menu key"
+msgstr "Ajouter du comportement standard à la touche Menu"
+
+#: ../rules/base.xml.in.h:951
+msgid "Alt and Meta are on Alt keys"
+msgstr "Alt et Meta sont sur les touches Alt."
+
+#: ../rules/base.xml.in.h:952
+msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
+msgstr ""
+"Ctrl est placé sur les touches Windows (et les touches Ctrl habituelles)"
+
+#: ../rules/base.xml.in.h:953
+msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
+msgstr "Ctrl est placé sur les touches Alt., Alt. sur les touches Windows"
+
+#: ../rules/base.xml.in.h:954
+msgid "Meta is mapped to Win keys"
+msgstr "Méta est placé sur les touches Windows"
+
+#: ../rules/base.xml.in.h:955
+msgid "Meta is mapped to Left Win"
+msgstr "Méta est placé sur Windows gauche"
+
+#: ../rules/base.xml.in.h:956
+msgid "Hyper is mapped to Win-keys"
+msgstr "Hyper est placé sur les touches Windows"
+
+#: ../rules/base.xml.in.h:957
+msgid "Alt is mapped to Right Win, Super to Menu"
+msgstr "Alt. est placé sur Windows droite, Super sur Menu"
+
+#: ../rules/base.xml.in.h:958
+msgid "Left Alt is swapped with Left Win"
+msgstr "Alt. gauche échangé avec Windows droit"
+
+#: ../rules/base.xml.in.h:959
+msgid "Compose key position"
+msgstr "Position de la touche Compose"
+
+#: ../rules/base.xml.in.h:960
+msgid "Pause"
+msgstr "Pause"
+
+#: ../rules/base.xml.in.h:961
+msgid "PrtSc"
+msgstr "Impr. Écr."
+
+#: ../rules/base.xml.in.h:962
+msgid "Miscellaneous compatibility options"
+msgstr "Diverses options de compatibilité"
+
+#: ../rules/base.xml.in.h:963
+msgid "Default numeric keypad keys"
+msgstr "Touches du pavé numérique par défaut"
+
+#: ../rules/base.xml.in.h:964
+msgid "Numeric keypad keys always enter digits (as in Mac OS)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:965
+msgid "Shift with numeric keypad keys works as in MS Windows"
+msgstr "Maj. avec le pavé numérique se comporte comme dans Windows"
+
+#: ../rules/base.xml.in.h:966
+msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
+msgstr "Maj. n'annule pas Verr. maj., mais sélectionne le 3e niveau"
+
+# https://help.ubuntu.com/7.04/user-guide/C/prefs-hardware.html
+#: ../rules/base.xml.in.h:967
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+msgstr ""
+"Les combinaisons spéciales (Ctrl+Alt+&lt;touche&gt;) sont traitées par le "
+"serveur X"
+
+#: ../rules/base.xml.in.h:968
+msgid ""
+"Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num "
+"Lock)"
+msgstr ""
+"Clavier aluminium Apple : émulation des touches PC (Impr. écr. ; défil. ; "
+"pause ; Verr. Num.)"
+
+#: ../rules/base.xml.in.h:969
+msgid "Shift cancels Caps Lock"
+msgstr "Maj. annule Verr. maj."
+
+#: ../rules/base.xml.in.h:970
+msgid "Enable extra typographic characters"
+msgstr "Active des caractères typographiques supplémentaires"
+
+#: ../rules/base.xml.in.h:971
+msgid "Both Shift-Keys together toggle Caps Lock"
+msgstr "Les deux touches Maj. activent ou désactivent Verr. maj."
+
+#: ../rules/base.xml.in.h:972
+msgid ""
+"Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
+msgstr ""
+"Les deux touches majuscule activent le verrouillage majuscule, une le "
+"désactive"
+
+#: ../rules/base.xml.in.h:973
+msgid "Both Shift-Keys together toggle ShiftLock"
+msgstr "Les deux touches Maj. activent ou désactivent le blocage majuscule"
+
+# http://who-t.blogspot.com/2010/11/xkb-mouse-emulation-removed-from.html
+#: ../rules/base.xml.in.h:974
+msgid "Toggle PointerKeys with Shift + NumLock."
+msgstr ""
+"Active ou désactive le contrôle de la souris (PointerKeys) avec Maj. + Verr. "
+"num."
+
+#: ../rules/base.xml.in.h:975
+msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:976
+msgid "Adding currency signs to certain keys"
+msgstr "Ajout des signes monétaires sur certaines touches"
+
+#: ../rules/base.xml.in.h:977
+msgid "Euro on E"
+msgstr "Euro sur le E"
+
+#: ../rules/base.xml.in.h:978
+msgid "Euro on 2"
+msgstr "Euro sur le 2"
+
+#: ../rules/base.xml.in.h:979
+msgid "Euro on 4"
+msgstr "Euro sur le 4"
+
+#: ../rules/base.xml.in.h:980
+msgid "Euro on 5"
+msgstr "Euro sur le 5"
+
+#: ../rules/base.xml.in.h:981
+msgid "Rupee on 4"
+msgstr "Roupie sur le 4"
+
+#: ../rules/base.xml.in.h:982
+msgid "Key to choose 5th level"
+msgstr "Touche sélectionnant le 5e niveau"
+
+#: ../rules/base.xml.in.h:983
+msgid ""
+"&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with "
+"another 5th-level-chooser"
+msgstr ""
+"&lt;Plus petit/Plus grand&gt; sélectionne le 5e niveau ; se verrouille par "
+"un appui simultané avec un autre sélecteur de 5e niveau"
+
+#: ../rules/base.xml.in.h:984
+msgid ""
+"Right Alt chooses 5th level, locks when pressed together with another 5th-"
+"level-chooser"
+msgstr ""
+"Alt. droite sélectionne le 5e niveau ; se verrouille par un appui simultané "
+"avec un autre sélecteur de 5e niveau"
+
+#: ../rules/base.xml.in.h:985
+msgid ""
+"Left Win chooses 5th level, locks when pressed together with another 5th-"
+"level-chooser"
+msgstr ""
+"Windows gauche sélectionne le 5e niveau ; se verrouille par un appui "
+"simultané avec un autre sélecteur de 5e niveau"
+
+#: ../rules/base.xml.in.h:986
+msgid ""
+"Right Win chooses 5th level, locks when pressed together with another 5th-"
+"level-chooser"
+msgstr ""
+"Windows droite sélectionne le 5e niveau ; se verrouille par un appui "
+"simultané avec un autre sélecteur de 5e niveau"
+
+#: ../rules/base.xml.in.h:987
+msgid "Using space key to input non-breakable space character"
+msgstr "Utiliser la barre d'espacement pour insérer une espace insécable"
 
-#: ../rules/base.extras.xml.in.h:16
+#: ../rules/base.xml.in.h:988
+msgid "Usual space at any level"
+msgstr "L'espace habituelle quelque-soit le niveau"
+
+#: ../rules/base.xml.in.h:989
+msgid "Non-breakable space character at second level"
+msgstr "Espace insécable au 2e niveau"
+
+#: ../rules/base.xml.in.h:990
+msgid "Non-breakable space character at third level"
+msgstr "Espace insécable au 3e niveau"
+
+#: ../rules/base.xml.in.h:991
+msgid "Non-breakable space character at third level, nothing at fourth level"
+msgstr "Espace insécable au 3e niveau, rien au 4e niveau"
+
+#: ../rules/base.xml.in.h:992
+msgid ""
+"Non-breakable space character at third level, thin non-breakable space "
+"character at fourth level"
+msgstr "Espace insécable au 3e niveau, espace fine insécable au 4e niveau"
+
+#: ../rules/base.xml.in.h:993
+msgid "Non-breakable space character at fourth level"
+msgstr "Espace insécable au 4e niveau"
+
+#: ../rules/base.xml.in.h:994
+msgid ""
+"Non-breakable space character at fourth level, thin non-breakable space "
+"character at sixth level"
+msgstr "Espace insécable au 4e niveau, espace fine insécable au 6e niveau"
+
+#: ../rules/base.xml.in.h:995
+msgid ""
+"Non-breakable space character at fourth level, thin non-breakable space "
+"character at sixth level (via Ctrl+Shift)"
+msgstr ""
+"Espace insécable au 4e niveau, espace fine insécable au 6e niveau (via "
+"Ctrl+Maj.)"
+
+# http://hapax.qc.ca/glossaire.htm
+#: ../rules/base.xml.in.h:996
+msgid "Zero-width non-joiner character at second level"
+msgstr "Antiliant à chasse nulle au 2e niveau"
+
+#: ../rules/base.xml.in.h:997
+msgid ""
+"Zero-width non-joiner character at second level, zero-width joiner character "
+"at third level"
+msgstr ""
+"Antiliant à chasse nulle au 2e niveau, liant à chasse nulle au 3e niveau"
+
+#: ../rules/base.xml.in.h:998
+msgid ""
+"Zero-width non-joiner character at second level, zero-width joiner character "
+"at third level, non-breakable space character at fourth level"
+msgstr ""
+"Antiliant à chasse nulle au 2e niveau, liant à chasse nulle au 3e niveau, "
+"espace insécable au 4e niveau"
+
+#: ../rules/base.xml.in.h:999
+msgid ""
+"Zero-width non-joiner character at second level, non-breakable space "
+"character at third level"
+msgstr "Antiliant à chasse nulle au 2e niveau. espace insécable au 3e niveau"
+
+#: ../rules/base.xml.in.h:1000
+msgid ""
+"Zero-width non-joiner character at second level, non-breakable space "
+"character at third level, nothing at fourth level"
+msgstr ""
+"Antiliant à chasse nulle au 2e niveau. espace insécable au 3e niveau, rien "
+"au 4e niveau"
+
+#: ../rules/base.xml.in.h:1001
+msgid ""
+"Zero-width non-joiner character at second level, non-breakable space "
+"character at third level, zero-width joiner at fourth level"
+msgstr ""
+"Antiliant à chasse nulle au 2e niveau. espace insécable au 3e niveau, liant "
+"à chasse nulle au 4e niveau"
+
+#: ../rules/base.xml.in.h:1002
+msgid ""
+"Zero-width non-joiner character at second level, non-breakable space "
+"character at third level, thin non-breakable space at fourth level"
+msgstr ""
+"Antiliant à chasse nulle au 2e niveau. espace insécable au 3e niveau, espace "
+"fine insécable au 4e niveau"
+
+#: ../rules/base.xml.in.h:1003
+msgid ""
+"Zero-width non-joiner character at third level, zero-width joiner at fourth "
+"level"
+msgstr ""
+"Antiliant à chasse nulle au 3e niveau, liant à chasse nulle au 4e niveau"
+
+#: ../rules/base.xml.in.h:1004
+msgid "Japanese keyboard options"
+msgstr "Options des claviers japonais"
+
+#: ../rules/base.xml.in.h:1005
+msgid "Kana Lock key is locking"
+msgstr "La touche « verrouillage Kana » verrouille"
+
+#: ../rules/base.xml.in.h:1006
+msgid "NICOLA-F style Backspace"
+msgstr "Eff. Arr. du type NICOLA-F"
+
+#: ../rules/base.xml.in.h:1007
+msgid "Make Zenkaku Hankaku an additional ESC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:1008
+msgid "Adding Esperanto circumflexes (supersigno)"
+msgstr "Ajout de l'accent circonflexe espéranto (supersigno)"
+
+#: ../rules/base.xml.in.h:1009
+msgid "To the corresponding key in a Qwerty keyboard."
+msgstr "Vers la touche correspondante sur un clavier qwerty."
+
+#: ../rules/base.xml.in.h:1010
+msgid "To the corresponding key in a Dvorak keyboard."
+msgstr "Vers la touche correspondante sur un clavier Dvorak."
+
+#: ../rules/base.xml.in.h:1011
+msgid "Key sequence to kill the X server"
+msgstr "Séquence de touches pour tuer le serveur X"
+
+#: ../rules/base.xml.in.h:1012
+msgid "Control + Alt + Backspace"
+msgstr "Control + Alt + Eff. arrière"
+
+#: ../rules/base.extras.xml.in.h:1
+msgid "apl"
+msgstr "apl"
+
+# https://secure.wikimedia.org/wikipedia/en/wiki/APL_%28programming_language%29
+#: ../rules/base.extras.xml.in.h:2
+msgid "APL Keyboard Symbols"
+msgstr "Symboles APL"
+
+#: ../rules/base.extras.xml.in.h:5
+msgid "kut"
+msgstr "kut"
+
+# http://www.thecanadianencyclopedia.com/index.cfm?PgNm=TCE&Params=f1ARTf0004367
+#: ../rules/base.extras.xml.in.h:6
+msgid "Kutenai"
+msgstr "Kutenai"
+
+#: ../rules/base.extras.xml.in.h:7
+msgid "shs"
+msgstr "shs"
+
+#: ../rules/base.extras.xml.in.h:8
+msgid "Secwepemctsin"
+msgstr "Secwepemctsin"
+
+#: ../rules/base.extras.xml.in.h:11
+msgid "German (US keyboard with German letters)"
+msgstr "Allemand (clavier US avec lettres allemandes)"
+
+#: ../rules/base.extras.xml.in.h:12
+msgid "German (with Hungarian letters and no dead keys)"
+msgstr "Allemand (avec les lettres hongroises, sans touche mortes)"
+
+#: ../rules/base.extras.xml.in.h:15
+msgid "Avestan"
+msgstr "Avestique"
+
+#: ../rules/base.extras.xml.in.h:18
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
+msgstr "Lituanien (Dvorak USA avec lettres lituaniennes)"
+
+#: ../rules/base.extras.xml.in.h:21
 msgid "Latvian (US Dvorak)"
 msgstr "Letton (Dvorak USA)"
 
-#: ../rules/base.extras.xml.in.h:17
+#: ../rules/base.extras.xml.in.h:22
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr "Letton (Dvorak USA, variante Y)"
 
-#: ../rules/base.extras.xml.in.h:18
+#: ../rules/base.extras.xml.in.h:23
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr "Letton (Dvorak USA, variante moins)"
 
-#: ../rules/base.extras.xml.in.h:19
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (programmer US Dvorak)"
 msgstr "Letton (Dvorak pour le programmeur USA)"
 
-#: ../rules/base.extras.xml.in.h:20
+#: ../rules/base.extras.xml.in.h:25
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr "Letton (Dvorak pour le programmeur USA, variante Y)"
 
-#: ../rules/base.extras.xml.in.h:21
+#: ../rules/base.extras.xml.in.h:26
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr "Letton (Dvorak pour le programmeur USA, variante moins)"
 
-#: ../rules/base.extras.xml.in.h:23
-msgid "Lithuanian (US Dvorak with Lithuanian letters)"
-msgstr "Lituanien (Dvorak USA avec lettres lituaniennes)"
+# http://colemak.com/
+#: ../rules/base.extras.xml.in.h:27
+msgid "Latvian (US Colemak)"
+msgstr "Letton (Colemak USA)"
 
-#: ../rules/base.extras.xml.in.h:26
+#: ../rules/base.extras.xml.in.h:28
+msgid "Latvian (US Colemak, apostrophe variant)"
+msgstr "Letton (Colemak USA, variante apostrophe)"
+
+#: ../rules/base.extras.xml.in.h:31
+msgid "English (US, international AltGr Unicode combining)"
+msgstr "Anglais (USA, international, AltGr combinatoire Unicode)"
+
+#: ../rules/base.extras.xml.in.h:32
+msgid "English (US, international AltGr Unicode combining, alternative)"
+msgstr "Anglais (USA, international, AltGr combinatoire Unicode, variante)"
+
+#: ../rules/base.extras.xml.in.h:33
+msgid "Atsina"
+msgstr "Atsina"
+
+# https://secure.wikimedia.org/wikipedia/fr/wiki/C%C5%93ur_d%27Al%C3%A8ne_%28langue%29
+#: ../rules/base.extras.xml.in.h:34
+msgid "Couer D'alene Salish"
+msgstr "Salish Cœur d'Alène"
+
+#: ../rules/base.extras.xml.in.h:37
 msgid "Polish (international with dead keys)"
 msgstr "Polonais (international avec touches mortes)"
 
-#: ../rules/base.extras.xml.in.h:28
+#: ../rules/base.extras.xml.in.h:41
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr "Tatar de Crimée (Q dobroudja)"
+
+#: ../rules/base.extras.xml.in.h:42
 msgid "Romanian (ergonomic Touchtype)"
 msgstr "Roumain (ergonomique dactylographique)"
 
-#: ../rules/base.extras.xml.in.h:30
-msgid "Russian (with UKR and BEL layout)"
-msgstr "Russe (avec dispositions UKR et BEL)"
-
-#: ../rules/base.extras.xml.in.h:31
-msgid "Secwepemctsin"
-msgstr "Secwepemctsin"
+#: ../rules/base.extras.xml.in.h:44
+msgid "Serbian"
+msgstr "Serbe"
 
-#: ../rules/base.extras.xml.in.h:33
+#: ../rules/base.extras.xml.in.h:45
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr "Serbe (accents combinatoires à la place des touches mortes)"
 
-#: ../rules/base.extras.xml.in.h:34
-msgid "apl"
-msgstr "apl"
+#: ../rules/base.extras.xml.in.h:48
+msgid "Russian (with Ukrainian-Belorussian layout)"
+msgstr "Russe (Ukrainien-Biélorusse)"
 
-#: ../rules/base.extras.xml.in.h:40
-msgid "kut"
-msgstr "kut"
-
-#: ../rules/base.extras.xml.in.h:46
-msgid "shs"
-msgstr "shs"
+#: ../rules/base.extras.xml.in.h:51
+msgid "Armenian (OLPC phonetic)"
+msgstr "Arménien (phonétique OLPC)"
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/xscreensaver.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/xscreensaver.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/xscreensaver.po	2012-01-02 17:26:57.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/xscreensaver.po	2012-02-23 06:31:24.000000000 +0000
@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: xscreensaver 5.00\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-10 16:19+0000\n"
-"PO-Revision-Date: 2011-10-30 11:31+0000\n"
+"POT-Creation-Date: 2012-01-31 01:10+0000\n"
+"PO-Revision-Date: 2012-02-19 20:07+0000\n"
 "Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:22+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:06+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../driver/demo-Gtk-conf.c:882
 msgid "Browse..."
@@ -27,27 +27,27 @@
 #: ../driver/demo-Gtk-support.c:135
 #, c-format
 msgid "Couldn't find pixmap file: %s"
-msgstr "Impossible de trouver le fichier d'image : %s"
+msgstr "Impossible de trouver le fichier pixmap : %s"
 
 #: ../driver/demo-Gtk-support.c:147 ../driver/demo-Gtk-support.c:179
 #, c-format
 msgid "Error loading pixmap file: %s"
-msgstr "Erreur lors du chargement du fichier d'image : %s"
+msgstr "Erreur lors du chargement du fichier pixmap: %s"
 
 #: ../driver/demo-Gtk-support.c:182
 #, c-format
 msgid "reason: %s\n"
 msgstr "Raison : %s\n"
 
-#: ../driver/demo-Gtk-widgets.c:161 ../driver/xscreensaver-demo.glade2.h:73
+#: ../driver/demo-Gtk-widgets.c:161 ../driver/xscreensaver-demo.glade2.h:1
 msgid "XScreenSaver"
 msgstr "XScreenSaver"
 
-#: ../driver/demo-Gtk-widgets.c:182 ../driver/xscreensaver-demo.glade2.h:86
+#: ../driver/demo-Gtk-widgets.c:182 ../driver/xscreensaver-demo.glade2.h:2
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../driver/demo-Gtk-widgets.c:202 ../driver/xscreensaver-demo.glade2.h:78
+#: ../driver/demo-Gtk-widgets.c:202 ../driver/xscreensaver-demo.glade2.h:3
 msgid "_Blank Screen Now"
 msgstr "_Economiser l'écran maintenant"
 
@@ -58,7 +58,7 @@
 "Activer l'agent XScreenSaver (verrouille l'écran si l'option correspondante "
 "est activée)"
 
-#: ../driver/demo-Gtk-widgets.c:215 ../driver/xscreensaver-demo.glade2.h:91
+#: ../driver/demo-Gtk-widgets.c:215 ../driver/xscreensaver-demo.glade2.h:4
 msgid "_Lock Screen Now"
 msgstr "_Verrouiller l'écran maintenant"
 
@@ -68,7 +68,7 @@
 "Verrouille l'écran maintenant (même si «Verrouiller l'écran» n'est pas "
 "validé)."
 
-#: ../driver/demo-Gtk-widgets.c:228 ../driver/xscreensaver-demo.glade2.h:89
+#: ../driver/demo-Gtk-widgets.c:228 ../driver/xscreensaver-demo.glade2.h:5
 msgid "_Kill Daemon"
 msgstr "_Tuer le démon"
 
@@ -76,7 +76,7 @@
 msgid "Tell the running XScreenSaver daemon to exit."
 msgstr "Demande au démon courant de XScreenSaver de se terminer."
 
-#: ../driver/demo-Gtk-widgets.c:241 ../driver/xscreensaver-demo.glade2.h:102
+#: ../driver/demo-Gtk-widgets.c:241 ../driver/xscreensaver-demo.glade2.h:6
 msgid "_Restart Daemon"
 msgstr "_Redémarrer le démon"
 
@@ -96,11 +96,11 @@
 "Sort du programme xscreensaver-demo (mais laisse le démon XScreenSaver actif "
 "en arrière-plan)."
 
-#: ../driver/demo-Gtk-widgets.c:276 ../driver/xscreensaver-demo.glade2.h:87
+#: ../driver/demo-Gtk-widgets.c:276 ../driver/xscreensaver-demo.glade2.h:8
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../driver/demo-Gtk-widgets.c:296 ../driver/xscreensaver-demo.glade2.h:74
+#: ../driver/demo-Gtk-widgets.c:296 ../driver/xscreensaver-demo.glade2.h:9
 msgid "_About..."
 msgstr "A _propos..."
 
@@ -108,7 +108,7 @@
 msgid "Display version information."
 msgstr "Affiche les informations de version"
 
-#: ../driver/demo-Gtk-widgets.c:309 ../driver/xscreensaver-demo.glade2.h:85
+#: ../driver/demo-Gtk-widgets.c:309 ../driver/xscreensaver-demo.glade2.h:10
 msgid "_Documentation..."
 msgstr "_Documentation..."
 
@@ -120,11 +120,11 @@
 msgid "Cycle After"
 msgstr "Changement au bout de"
 
-#: ../driver/demo-Gtk-widgets.c:370 ../driver/xscreensaver-demo.glade2.h:64
+#: ../driver/demo-Gtk-widgets.c:370 ../driver/xscreensaver-demo.glade2.h:12
 msgid "Whether a password should be required to un-blank the screen."
 msgstr "Un mot de passe est-il requis pour débloquer l'écran."
 
-#: ../driver/demo-Gtk-widgets.c:372 ../driver/xscreensaver-demo.glade2.h:32
+#: ../driver/demo-Gtk-widgets.c:372 ../driver/xscreensaver-demo.glade2.h:17
 msgid "Lock Screen After"
 msgstr "Verrouiller l'écran après"
 
@@ -140,7 +140,7 @@
 #: ../driver/demo-Gtk-widgets.c:407 ../driver/demo-Gtk-widgets.c:419
 #: ../driver/demo-Gtk-widgets.c:431 ../driver/demo-Gtk-widgets.c:1020
 #: ../driver/demo-Gtk-widgets.c:1032 ../driver/demo-Gtk-widgets.c:1044
-#: ../driver/xscreensaver-demo.glade2.h:110
+#: ../driver/xscreensaver-demo.glade2.h:19
 msgid "minutes"
 msgstr "minutes"
 
@@ -148,7 +148,7 @@
 msgid "Preview"
 msgstr "Aperçu"
 
-#: ../driver/demo-Gtk-widgets.c:490 ../driver/xscreensaver-demo.glade2.h:9
+#: ../driver/demo-Gtk-widgets.c:490 ../driver/xscreensaver-demo.glade2.h:21
 msgid ""
 "Demo the selected screen saver in full-screen mode (click the mouse to "
 "return.)"
@@ -160,7 +160,7 @@
 msgid "Settings..."
 msgstr "Réglages..."
 
-#: ../driver/demo-Gtk-widgets.c:500 ../driver/xscreensaver-demo.glade2.h:6
+#: ../driver/demo-Gtk-widgets.c:500 ../driver/xscreensaver-demo.glade2.h:23
 msgid "Customization and explanation of the selected screen saver."
 msgstr ""
 "Configuration et explications pour l'économiseur d'écran sélectionné."
@@ -191,34 +191,34 @@
 
 #: ../driver/demo-Gtk-widgets.c:591 ../driver/demo-Gtk.c:2524
 msgid "Screen Saver"
-msgstr "Économiseur d'écran"
+msgstr "Écran de veille"
 
 #: ../driver/demo-Gtk-widgets.c:644
 msgid "\\/"
 msgstr "\\/"
 
-#: ../driver/demo-Gtk-widgets.c:652 ../driver/xscreensaver-demo.glade2.h:40
+#: ../driver/demo-Gtk-widgets.c:652 ../driver/xscreensaver-demo.glade2.h:36
 msgid ""
 "Run the next screen saver in the list in full-screen mode (click the mouse "
 "to return.)"
 msgstr ""
 "Lance l'économiseur d'écran suivant dans la liste en mode plein-écran "
-"(cliquer la souris pour revenir.)"
+"(cliquer la souris pour sortir)"
 
 #: ../driver/demo-Gtk-widgets.c:654
 msgid "/\\"
 msgstr "/\\"
 
-#: ../driver/demo-Gtk-widgets.c:662 ../driver/xscreensaver-demo.glade2.h:41
+#: ../driver/demo-Gtk-widgets.c:662 ../driver/xscreensaver-demo.glade2.h:37
 msgid ""
 "Run the previous screen saver in the list in full-screen mode (click the "
 "mouse to return.)"
 msgstr ""
 "Lance l'économiseur d'écran précédent dans la liste en mode plein-écran "
-"(cliquer la souris pour revenir.)"
+"(cliquer la souris pour sortir)"
 
 #: ../driver/demo-Gtk-widgets.c:664 ../driver/demo-Gtk-widgets.c:1608
-#: ../driver/xscreensaver-demo.glade2.h:10
+#: ../driver/xscreensaver-demo.glade2.h:50
 msgid "Description"
 msgstr "Description"
 
@@ -236,7 +236,7 @@
 
 #: ../driver/demo-Gtk-widgets.c:753
 msgid "Verbose Diagnostics"
-msgstr "Diagnostiques verbeux"
+msgstr "Diagnostics détaillés"
 
 #: ../driver/demo-Gtk-widgets.c:768
 msgid ""
@@ -266,7 +266,7 @@
 msgid "Colormaps"
 msgstr "Palettes de couleurs"
 
-#: ../driver/demo-Gtk-widgets.c:840 ../driver/xscreensaver-demo.glade2.h:72
+#: ../driver/demo-Gtk-widgets.c:840 ../driver/xscreensaver-demo.glade2.h:91
 msgid ""
 "Whether to install a private colormap when running in 8-bit mode on the "
 "default Visual."
@@ -278,7 +278,7 @@
 msgid "Install Colormap"
 msgstr "Installer une palette de couleur"
 
-#: ../driver/demo-Gtk-widgets.c:865 ../driver/xscreensaver-demo.glade2.h:71
+#: ../driver/demo-Gtk-widgets.c:865 ../driver/xscreensaver-demo.glade2.h:84
 msgid ""
 "Whether the screen should slowly fade to black when the screen saver "
 "activates."
@@ -290,7 +290,7 @@
 msgid "Fade To Black When Blanking"
 msgstr "Fondu au noir lors du verrouillage"
 
-#: ../driver/demo-Gtk-widgets.c:882 ../driver/xscreensaver-demo.glade2.h:70
+#: ../driver/demo-Gtk-widgets.c:882 ../driver/xscreensaver-demo.glade2.h:86
 msgid ""
 "Whether the screen should slowly fade in from black when the screen saver "
 "deactivates."
@@ -306,19 +306,19 @@
 msgid "Fade Duration"
 msgstr "Durée du fondu"
 
-#: ../driver/demo-Gtk-widgets.c:928 ../driver/xscreensaver-demo.glade2.h:25
+#: ../driver/demo-Gtk-widgets.c:928 ../driver/xscreensaver-demo.glade2.h:89
 msgid "How long it should take for the screen to fade in and out."
 msgstr "Combien de temps doivent durer les fondus avec le noir."
 
-#: ../driver/demo-Gtk-widgets.c:932 ../driver/xscreensaver-demo.glade2.h:115
+#: ../driver/demo-Gtk-widgets.c:932 ../driver/xscreensaver-demo.glade2.h:90
 msgid "seconds"
 msgstr "secondes"
 
-#: ../driver/demo-Gtk-widgets.c:942 ../driver/xscreensaver-demo.glade2.h:12
+#: ../driver/demo-Gtk-widgets.c:942 ../driver/xscreensaver-demo.glade2.h:83
 msgid "Display Power Management"
 msgstr "Gestion d'alimentation de l'écran"
 
-#: ../driver/demo-Gtk-widgets.c:986 ../driver/xscreensaver-demo.glade2.h:68
+#: ../driver/demo-Gtk-widgets.c:986 ../driver/xscreensaver-demo.glade2.h:73
 msgid "Whether the monitor should be powered down after a while."
 msgstr ""
 "Le moniteur doit-il passer en économie d'énergie au bout d'un moment."
@@ -339,19 +339,19 @@
 msgid "Standby After"
 msgstr "En attente après"
 
-#: ../driver/demo-Gtk-widgets.c:1105 ../driver/xscreensaver-demo.glade2.h:27
+#: ../driver/demo-Gtk-widgets.c:1105 ../driver/xscreensaver-demo.glade2.h:79
 msgid "How long until the monitor goes into power-saving mode."
 msgstr "Durée avant que le moniteur passe en mode d'économie d'énergie."
 
-#: ../driver/demo-Gtk-widgets.c:1119 ../driver/xscreensaver-demo.glade2.h:28
+#: ../driver/demo-Gtk-widgets.c:1119 ../driver/xscreensaver-demo.glade2.h:78
 msgid "How long until the monitor powers down."
 msgstr "Durée avant que le moniteur coupe l'alimentation."
 
-#: ../driver/demo-Gtk-widgets.c:1123 ../driver/xscreensaver-demo.glade2.h:29
+#: ../driver/demo-Gtk-widgets.c:1123 ../driver/xscreensaver-demo.glade2.h:61
 msgid "Image Manipulation"
 msgstr "Manipulation d'images"
 
-#: ../driver/demo-Gtk-widgets.c:1167 ../driver/xscreensaver-demo.glade2.h:65
+#: ../driver/demo-Gtk-widgets.c:1167 ../driver/xscreensaver-demo.glade2.h:52
 msgid ""
 "Whether the image-manipulating modes should be allowed to operate on an "
 "image of your desktop."
@@ -375,28 +375,30 @@
 msgid "Grab Video Frames"
 msgstr "Capturer des trames vidéo"
 
-#: ../driver/demo-Gtk-widgets.c:1201 ../driver/xscreensaver-demo.glade2.h:67
-msgid ""
-"Whether the image-manipulating modes should operate on random images loaded "
-"from disk."
+#: ../driver/demo-Gtk-widgets.c:1201 ../driver/xscreensaver-demo.glade2.h:56
+msgid "Whether the image-manipulating modes should load image files."
 msgstr ""
-"Les modes qui manipulent des images sont-ils autorisés à utiliser des images "
-"chargées aléatoirement depuis le disque."
+"Si les modes de manipulation d'images doivent charger les fichiers image ou "
+"non."
 
 #: ../driver/demo-Gtk-widgets.c:1203
 msgid "Choose Random Image:"
 msgstr "Choisir une image aléatoire :"
 
-#: ../driver/demo-Gtk-widgets.c:1236 ../driver/xscreensaver-demo.glade2.h:54
-msgid "The directory from which images will be randomly chosen."
-msgstr "Répertoire source des images aléatoires."
+#: ../driver/demo-Gtk-widgets.c:1236 ../driver/xscreensaver-demo.glade2.h:58
+msgid ""
+"The local directory, RSS feed or Atom feed from which images will be "
+"randomly chosen."
+msgstr ""
+"Le répertoire local, flux RSS ou Atom à partir duquel les images seront "
+"choisies au hasard."
 
 #: ../driver/demo-Gtk-widgets.c:1238
 msgid "Browse"
 msgstr "Parcourir"
 
 #: ../driver/demo-Gtk-widgets.c:1246 ../driver/demo-Gtk-widgets.c:1600
-#: ../driver/xscreensaver-demo.glade2.h:1
+#: ../driver/xscreensaver-demo.glade2.h:115
 msgid "Advanced"
 msgstr "Avancés"
 
@@ -404,11 +406,11 @@
 msgid "XScreenSaver: Mode-Specific Settings"
 msgstr "XScreenSaver : réglages spécifiques au mode"
 
-#: ../driver/demo-Gtk-widgets.c:1467 ../driver/xscreensaver-demo.glade2.h:42
+#: ../driver/demo-Gtk-widgets.c:1467 ../driver/xscreensaver-demo.glade2.h:116
 msgid "Settings"
 msgstr "Réglages"
 
-#: ../driver/demo-Gtk-widgets.c:1496 ../driver/xscreensaver-demo.glade2.h:44
+#: ../driver/demo-Gtk-widgets.c:1496 ../driver/xscreensaver-demo.glade2.h:99
 msgid "Standard"
 msgstr "Standard"
 
@@ -418,55 +420,55 @@
 
 #: ../driver/demo-Gtk-widgets.c:1551 ../driver/demo-Gtk-widgets.c:1574
 #: ../driver/demo-Gtk.c:1775 ../driver/demo-Gtk.c:3351
-#: ../driver/xscreensaver-demo.glade2.h:2
+#: ../driver/xscreensaver-demo.glade2.h:102
 msgid "Any"
 msgstr "N'importe"
 
-#: ../driver/demo-Gtk-widgets.c:1552 ../driver/xscreensaver-demo.glade2.h:3
+#: ../driver/demo-Gtk-widgets.c:1552 ../driver/xscreensaver-demo.glade2.h:103
 msgid "Best"
 msgstr "Le meilleur"
 
-#: ../driver/demo-Gtk-widgets.c:1553 ../driver/xscreensaver-demo.glade2.h:7
+#: ../driver/demo-Gtk-widgets.c:1553 ../driver/xscreensaver-demo.glade2.h:104
 msgid "Default"
 msgstr "Par défaut"
 
-#: ../driver/demo-Gtk-widgets.c:1554 ../driver/xscreensaver-demo.glade2.h:8
+#: ../driver/demo-Gtk-widgets.c:1554 ../driver/xscreensaver-demo.glade2.h:105
 msgid "Default-N"
 msgstr "Défaut-N"
 
-#: ../driver/demo-Gtk-widgets.c:1555 ../driver/xscreensaver-demo.glade2.h:17
+#: ../driver/demo-Gtk-widgets.c:1555 ../driver/xscreensaver-demo.glade2.h:106
 msgid "GL"
 msgstr "OpenGL"
 
-#: ../driver/demo-Gtk-widgets.c:1556 ../driver/xscreensaver-demo.glade2.h:55
+#: ../driver/demo-Gtk-widgets.c:1556 ../driver/xscreensaver-demo.glade2.h:107
 msgid "TrueColor"
 msgstr "Couleurs vraies"
 
-#: ../driver/demo-Gtk-widgets.c:1557 ../driver/xscreensaver-demo.glade2.h:39
+#: ../driver/demo-Gtk-widgets.c:1557 ../driver/xscreensaver-demo.glade2.h:108
 msgid "PseudoColor"
 msgstr "Pseudo-couleurs"
 
-#: ../driver/demo-Gtk-widgets.c:1558 ../driver/xscreensaver-demo.glade2.h:45
+#: ../driver/demo-Gtk-widgets.c:1558 ../driver/xscreensaver-demo.glade2.h:109
 msgid "StaticGray"
 msgstr "StaticGray"
 
-#: ../driver/demo-Gtk-widgets.c:1559 ../driver/xscreensaver-demo.glade2.h:21
+#: ../driver/demo-Gtk-widgets.c:1559 ../driver/xscreensaver-demo.glade2.h:110
 msgid "GrayScale"
 msgstr "Niveaux de gris"
 
-#: ../driver/demo-Gtk-widgets.c:1560 ../driver/xscreensaver-demo.glade2.h:11
+#: ../driver/demo-Gtk-widgets.c:1560 ../driver/xscreensaver-demo.glade2.h:111
 msgid "DirectColor"
 msgstr "Couleurs directes"
 
-#: ../driver/demo-Gtk-widgets.c:1561 ../driver/xscreensaver-demo.glade2.h:5
+#: ../driver/demo-Gtk-widgets.c:1561 ../driver/xscreensaver-demo.glade2.h:112
 msgid "Color"
 msgstr "Couleur"
 
-#: ../driver/demo-Gtk-widgets.c:1562 ../driver/xscreensaver-demo.glade2.h:20
+#: ../driver/demo-Gtk-widgets.c:1562 ../driver/xscreensaver-demo.glade2.h:113
 msgid "Gray"
 msgstr "Gris"
 
-#: ../driver/demo-Gtk-widgets.c:1563 ../driver/xscreensaver-demo.glade2.h:33
+#: ../driver/demo-Gtk-widgets.c:1563 ../driver/xscreensaver-demo.glade2.h:114
 msgid "Mono"
 msgstr "Monochrome"
 
@@ -488,8 +490,7 @@
 
 #: ../driver/demo-Gtk-widgets.c:1656
 msgid "Click here to read the manual for this display mode, if it has one."
-msgstr ""
-"Cliquer ici pour lire le manuel de ce mode d'affichage, s'il en possède un."
+msgstr "Cliquer ici pour lire le manuel de ce mode d'affichage, s'il existe."
 
 #: ../driver/demo-Gtk-widgets.c:1681
 msgid "Advanced >>"
@@ -665,7 +666,7 @@
 msgstr ""
 "Erreur :\n"
 "\n"
-"Répertoire «%s» inexistant.\n"
+"Fichier «%s» inexistant.\n"
 
 #: ../driver/demo-Gtk.c:2976
 msgid "Descriptions not available: no XML support compiled in."
@@ -838,51 +839,39 @@
 msgstr "Préférences économiseur d'écran"
 
 #: ../driver/screensaver-properties.desktop.in.h:1
+msgid "Screensaver"
+msgstr "Économiseur d'écran"
+
+#: ../driver/screensaver-properties.desktop.in.h:2
 msgid "Change screensaver properties"
 msgstr "Modifier les propriétés de l'économiseur d'écran"
 
-#: ../driver/screensaver-properties.desktop.in.h:2
-msgid "Screensaver"
-msgstr "Économiseur d'écran"
+#: ../driver/xscreensaver-demo.glade2.h:7
+msgid "_Quit"
+msgstr "_Quitter"
 
-#: ../driver/xscreensaver-demo.glade2.h:4
-msgid "Choose _Random Image:"
-msgstr "Choisir une image _Aléatoire :"
+#: ../driver/xscreensaver-demo.glade2.h:11
+msgid "_Cycle After"
+msgstr "_Changement au bout de"
 
 #: ../driver/xscreensaver-demo.glade2.h:13
-msgid "F_ade Duration"
-msgstr "Durée du _fondu"
+msgid "_Lock Screen After  "
+msgstr "_Verrouillage de l'écran après  "
 
 #: ../driver/xscreensaver-demo.glade2.h:14
-msgid "Fade from Black When _Unblanking"
-msgstr "Fondu depuis le noir lors du dé-verrouillage"
+msgid "Lock Screen"
+msgstr "Verrouiller l'écran"
 
 #: ../driver/xscreensaver-demo.glade2.h:15
-msgid "Fade to Black when _Blanking"
-msgstr "Fondu au noir lors du _verrouillage"
+msgid "How long before the screen saver activates."
+msgstr "Combien de temps avant l'activation de l'économiseur d'écran."
 
 #: ../driver/xscreensaver-demo.glade2.h:16
-msgid "Fading and Colormaps"
-msgstr "Fondu et palette de couleurs"
-
-#: ../driver/xscreensaver-demo.glade2.h:18
-msgid "Grab Desktop _Images"
-msgstr "Capturer des _images du bureau"
-
-#: ../driver/xscreensaver-demo.glade2.h:19
-msgid "Grab _Video Frames"
-msgstr "Capturer des trames _vidéo"
-
-#: ../driver/xscreensaver-demo.glade2.h:22
 msgid "How long after the screen blanks until a password will be required."
 msgstr ""
 "Combien de temps avant qu'il soit nécessaire de donner un mot de passe."
 
-#: ../driver/xscreensaver-demo.glade2.h:23
-msgid "How long before the screen saver activates."
-msgstr "Combien de temps avant l'activation de l'économiseur d'écran."
-
-#: ../driver/xscreensaver-demo.glade2.h:24
+#: ../driver/xscreensaver-demo.glade2.h:18
 msgid ""
 "How long each display mode should run before choosing a new one (in Random "
 "mode.)"
@@ -890,23 +879,75 @@
 "Combien de temps avant l'activation d'un autre économiseur d'écran (en mode "
 "aléatoire)."
 
+#: ../driver/xscreensaver-demo.glade2.h:20
+msgid "_Blank After"
+msgstr "_Verrouillage après"
+
+#: ../driver/xscreensaver-demo.glade2.h:22
+msgid "_Preview"
+msgstr "_Aperçu"
+
+#: ../driver/xscreensaver-demo.glade2.h:24
+msgid "_Settings..."
+msgstr "_Paramètres..."
+
+#: ../driver/xscreensaver-demo.glade2.h:25
+msgid "_Mode:"
+msgstr "_Mode :"
+
 #: ../driver/xscreensaver-demo.glade2.h:26
-msgid "How long until the monitor goes completely black."
-msgstr "Durée avant que le moniteur passe complètement au noir."
+msgid "Never blank the screen or power down the monitor."
+msgstr "Ne jamais effacer l'écran ou éteindre le moniteur."
+
+#: ../driver/xscreensaver-demo.glade2.h:27
+msgid "_Disable Screen Saver"
+msgstr "_Désactiver l'économiseur d'écran"
+
+#: ../driver/xscreensaver-demo.glade2.h:28
+msgid "When idle or locked, blacken the screen only."
+msgstr "En attente ou blocage, seulement effacer l'écran."
+
+#: ../driver/xscreensaver-demo.glade2.h:29
+msgid "_Blank Screen Only"
+msgstr "_Économiser l'écran uniquement"
 
 #: ../driver/xscreensaver-demo.glade2.h:30
-msgid "Install _Colormap"
-msgstr "Installer la palette de _couleurs"
+msgid "When idle or locked, run the display mode selected below."
+msgstr "En attente ou blocage, lancer le mode sélectionné ci-dessous."
 
 #: ../driver/xscreensaver-demo.glade2.h:31
-msgid "Lock Screen"
-msgstr "Verrouiller l'écran"
+msgid "_Only One Screen Saver"
+msgstr "_Seulement un économiseur d'écran"
+
+#: ../driver/xscreensaver-demo.glade2.h:32
+msgid ""
+"When idle or locked, choose a random display mode from among the checked "
+"items in the list below."
+msgstr ""
+"En attente ou blocage, choisir un mode d'afficahge parmi ceux sélectionnés "
+"dans la liste ci-dessous."
+
+#: ../driver/xscreensaver-demo.glade2.h:33
+msgid "_Random Screen Saver"
+msgstr "Économiseur d'écran _aléatoire"
 
 #: ../driver/xscreensaver-demo.glade2.h:34
-msgid "Never blank the screen or power down the monitor."
-msgstr "Ne jamais effacer l'écran ou éteindre le moniteur."
+msgid ""
+"When idle or locked, choose a random display mode from among the checked "
+"items in the list below.  Run that same mode on each monitor."
+msgstr ""
+"En attente ou blocage, choisir un mode d'afficahge parmi ceux sélectionnés "
+"dans la liste ci-dessous. Lancer le même mode sur tous les moniteurs."
 
 #: ../driver/xscreensaver-demo.glade2.h:35
+msgid "_Same Random Savers"
+msgstr "_Mêmes économiseurs aléatoires"
+
+#: ../driver/xscreensaver-demo.glade2.h:38
+msgid "preview"
+msgstr "aperçu"
+
+#: ../driver/xscreensaver-demo.glade2.h:39
 msgid ""
 "No Preview\n"
 "Available"
@@ -914,7 +955,11 @@
 "Pas d'aperçu\n"
 "Disponible"
 
-#: ../driver/xscreensaver-demo.glade2.h:37
+#: ../driver/xscreensaver-demo.glade2.h:41
+msgid "no preview"
+msgstr "pas d'aperçu"
+
+#: ../driver/xscreensaver-demo.glade2.h:42
 msgid ""
 "Not\n"
 "Installed"
@@ -922,51 +967,11 @@
 "Non\n"
 "installé"
 
-#: ../driver/xscreensaver-demo.glade2.h:43
-msgid "Stand_by After"
-msgstr "Blo_cage après"
-
-#: ../driver/xscreensaver-demo.glade2.h:46
-msgid "Sus_pend After"
-msgstr "Sus_pend après"
-
-#: ../driver/xscreensaver-demo.glade2.h:47
-msgid "Text Manipulation"
-msgstr "Manipulation de texte"
-
-#: ../driver/xscreensaver-demo.glade2.h:48
-msgid "Text _file"
-msgstr "_Fichier texte"
-
-#: ../driver/xscreensaver-demo.glade2.h:49
-msgid ""
-"Text-displaying modes will display the contents of this URL (HTML or RSS)."
-msgstr ""
-"Les modes qui affichent du texte utiliseront le contenu de cette URL (HTML "
-"ou RSS)."
-
-#: ../driver/xscreensaver-demo.glade2.h:50
-msgid "Text-displaying modes will display the contents of this file."
-msgstr ""
-"Les modes qui affichent du texte utiliseront le contenu de ce fichier."
-
-#: ../driver/xscreensaver-demo.glade2.h:51
-msgid ""
-"Text-displaying modes will display the local host name, date, and time."
-msgstr ""
-"Les modes qui affichent du texte utiliseront le nom de la machine, la date "
-"et l'heure."
-
-#: ../driver/xscreensaver-demo.glade2.h:52
-msgid "Text-displaying modes will display the output of this program."
-msgstr ""
-"Les modes qui affichent du texte utiliseront la sortie de ce programme."
-
-#: ../driver/xscreensaver-demo.glade2.h:53
-msgid "Text-displaying modes will display the text typed here."
-msgstr "Les modes qui affichent du texte utiliseront ce texte."
+#: ../driver/xscreensaver-demo.glade2.h:44
+msgid "not installed"
+msgstr "non installé"
 
-#: ../driver/xscreensaver-demo.glade2.h:56
+#: ../driver/xscreensaver-demo.glade2.h:45
 msgid ""
 "Very few (or no) screen savers appear to be available.\n"
 "\n"
@@ -978,261 +983,322 @@
 "Ceci peut s'expliquer si les paquets «xscreensaver-extras» et «screensaver-"
 "gl-extras» ne sont pas installés."
 
-#: ../driver/xscreensaver-demo.glade2.h:60
-msgid "When idle or locked, blacken the screen only."
-msgstr "En attente ou blocage, seulement effacer l'écran."
+#: ../driver/xscreensaver-demo.glade2.h:49
+msgid "nothing"
+msgstr "rien"
+
+#: ../driver/xscreensaver-demo.glade2.h:51
+msgid "_Display Modes"
+msgstr "_Modes d'affichage"
+
+#: ../driver/xscreensaver-demo.glade2.h:53
+msgid "Grab Desktop _Images"
+msgstr "Capturer des _images du bureau"
 
-#: ../driver/xscreensaver-demo.glade2.h:61
+#: ../driver/xscreensaver-demo.glade2.h:54
 msgid ""
-"When idle or locked, choose a random display mode from among the checked "
-"items in the list below."
+"Whether the image-manipulating modes should operate on images captured from "
+"the system's video input (if there is one.)"
 msgstr ""
-"En attente ou blocage, choisir un mode d'afficahge parmi ceux sélectionnés "
-"dans la liste ci-dessous."
+"Les modes qui manipulent des images sont-ils autorisés à utiliser des images "
+"capturées par l'entrée vidéo du système (si il y en a une)."
+
+#: ../driver/xscreensaver-demo.glade2.h:55
+msgid "Grab _Video Frames"
+msgstr "Capturer des trames _vidéo"
+
+#: ../driver/xscreensaver-demo.glade2.h:57
+msgid "Choose _Random Image:"
+msgstr "Choisir une image _Aléatoire :"
+
+#: ../driver/xscreensaver-demo.glade2.h:59
+msgid "_Browse"
+msgstr "_Parcourir"
+
+#: ../driver/xscreensaver-demo.glade2.h:60
+msgid "Local directory, or RSS feed URL."
+msgstr "Répertoire local ou URL de flux RSS"
 
 #: ../driver/xscreensaver-demo.glade2.h:62
-msgid ""
-"When idle or locked, choose a random display mode from among the checked "
-"items in the list below.  Run that same mode on each monitor."
-msgstr ""
-"En attente ou blocage, choisir un mode d'afficahge parmi ceux sélectionnés "
-"dans la liste ci-dessous. Lancer le même mode sur tous les moniteurs."
+msgid "Text-displaying modes will display the text typed here."
+msgstr "Les modes qui affichent du texte utiliseront ce texte."
 
 #: ../driver/xscreensaver-demo.glade2.h:63
-msgid "When idle or locked, run the display mode selected below."
-msgstr "En attente ou blocage, lancer le mode sélectionné ci-dessous."
+msgid "_Text"
+msgstr "_Texte"
+
+#: ../driver/xscreensaver-demo.glade2.h:64
+msgid "Text-displaying modes will display the contents of this file."
+msgstr ""
+"Les modes qui affichent du texte utiliseront le contenu de ce fichier."
+
+#: ../driver/xscreensaver-demo.glade2.h:65
+msgid "Text _file"
+msgstr "_Fichier texte"
 
 #: ../driver/xscreensaver-demo.glade2.h:66
+msgid "Text-displaying modes will display the output of this program."
+msgstr ""
+"Les modes qui affichent du texte utiliseront la sortie de ce programme."
+
+#: ../driver/xscreensaver-demo.glade2.h:67
+msgid "_Program"
+msgstr "_Programme"
+
+#: ../driver/xscreensaver-demo.glade2.h:68
 msgid ""
-"Whether the image-manipulating modes should operate on images captured from "
-"the system's video input (if there is one.)"
+"Text-displaying modes will display the contents of this URL (HTML or RSS)."
 msgstr ""
-"Les modes qui manipulent des images sont-ils autorisés à utiliser des images "
-"capturées par l'entrée vidéo du système (si il y en a une)."
+"Les modes qui affichent du texte utiliseront le contenu de cette URL (HTML "
+"ou RSS)."
 
 #: ../driver/xscreensaver-demo.glade2.h:69
+msgid "_URL"
+msgstr "_URL"
+
+#: ../driver/xscreensaver-demo.glade2.h:70
 msgid ""
-"Whether the monitor should be powered off immediately in \"Blank Screen "
-"Only\" mode, regardless of the above power-management timeouts."
+"Text-displaying modes will display the local host name, date, and time."
 msgstr ""
+"Les modes qui affichent du texte utiliseront le nom de la machine, la date "
+"et l'heure."
+
+#: ../driver/xscreensaver-demo.glade2.h:71
+msgid "_Host Name and Time"
+msgstr "_Nom de la machine et heure"
+
+#: ../driver/xscreensaver-demo.glade2.h:72
+msgid "Text Manipulation"
+msgstr "Manipulation de texte"
+
+#: ../driver/xscreensaver-demo.glade2.h:74
+msgid "_Power Management Enabled"
+msgstr "_Gestion d'alimentation de l'écran"
 
 #: ../driver/xscreensaver-demo.glade2.h:75
-msgid "_Advanced"
-msgstr "_Avancé"
+msgid "Stand_by After"
+msgstr "Blo_cage après"
 
 #: ../driver/xscreensaver-demo.glade2.h:76
-msgid "_Advanced >>"
-msgstr "_Avancé >>"
+msgid "Sus_pend After"
+msgstr "Sus_pend après"
 
 #: ../driver/xscreensaver-demo.glade2.h:77
-msgid "_Blank After"
-msgstr "_Verrouillage après"
-
-#: ../driver/xscreensaver-demo.glade2.h:79
-msgid "_Blank Screen Only"
-msgstr "_Économiser l'écran uniquement"
+msgid "_Off After"
+msgstr "Coup_ure après"
 
 #: ../driver/xscreensaver-demo.glade2.h:80
-msgid "_Browse"
-msgstr "_Parcourir"
+msgid "How long until the monitor goes completely black."
+msgstr "Durée avant que le moniteur passe complètement au noir."
 
 #: ../driver/xscreensaver-demo.glade2.h:81
-msgid "_Command Line:"
-msgstr "_Ligne de commande :"
+msgid ""
+"Whether the monitor should be powered off immediately in \"Blank Screen "
+"Only\" mode, regardless of the above power-management timeouts."
+msgstr ""
 
 #: ../driver/xscreensaver-demo.glade2.h:82
-msgid "_Cycle After"
-msgstr "_Changement au bout de"
+msgid "_Quick Power-off in Blank Only Mode"
+msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:83
-msgid "_Disable Screen Saver"
-msgstr "_Désactiver l'économiseur d'écran"
+#: ../driver/xscreensaver-demo.glade2.h:85
+msgid "Fade to Black when _Blanking"
+msgstr "Fondu au noir lors du _verrouillage"
 
-#: ../driver/xscreensaver-demo.glade2.h:84
-msgid "_Display Modes"
-msgstr "_Modes d'affichage"
+#: ../driver/xscreensaver-demo.glade2.h:87
+msgid "Fade from Black When _Unblanking"
+msgstr "Fondu depuis le noir lors du dé-verrouillage"
 
 #: ../driver/xscreensaver-demo.glade2.h:88
-msgid "_Host Name and Time"
-msgstr "_Nom de la machine et heure"
-
-#: ../driver/xscreensaver-demo.glade2.h:90
-msgid "_Lock Screen After  "
-msgstr "_Verrouillage de l'écran après  "
+msgid "F_ade Duration"
+msgstr "Durée du _fondu"
 
 #: ../driver/xscreensaver-demo.glade2.h:92
-msgid "_Mode:"
-msgstr "_Mode :"
+msgid "Install _Colormap"
+msgstr "Installer la palette de _couleurs"
 
 #: ../driver/xscreensaver-demo.glade2.h:93
-msgid "_Off After"
-msgstr "Coup_ure après"
+msgid "Fading and Colormaps"
+msgstr "Fondu et palette de couleurs"
 
 #: ../driver/xscreensaver-demo.glade2.h:94
-msgid "_Only One Screen Saver"
-msgstr "_Seulement un économiseur d'écran"
+msgid "_Advanced"
+msgstr "_Avancé"
 
 #: ../driver/xscreensaver-demo.glade2.h:95
-msgid "_Power Management Enabled"
-msgstr "_Gestion d'alimentation de l'écran"
+msgid "dialog1"
+msgstr "dialog1"
 
 #: ../driver/xscreensaver-demo.glade2.h:96
-msgid "_Preview"
-msgstr "_Aperçu"
+msgid "_Advanced >>"
+msgstr "_Avancé >>"
 
 #: ../driver/xscreensaver-demo.glade2.h:97
-msgid "_Program"
-msgstr "_Programme"
+msgid "_Standard <<"
+msgstr "_Standard <<"
 
 #: ../driver/xscreensaver-demo.glade2.h:98
-msgid "_Quick Power-off in Blank Only Mode"
-msgstr ""
-
-#: ../driver/xscreensaver-demo.glade2.h:99
-msgid "_Quit"
-msgstr "_Quitter"
-
-#: ../driver/xscreensaver-demo.glade2.h:100
-msgid "_Random Screen Saver"
-msgstr "Économiseur d'écran _aléatoire"
-
-#: ../driver/xscreensaver-demo.glade2.h:101
 msgid "_Reset to Defaults"
 msgstr "_Réinitialiser aux valeurs par défaut"
 
-#: ../driver/xscreensaver-demo.glade2.h:103
-msgid "_Same Random Savers"
-msgstr "_Mêmes économiseurs aléatoires"
-
-#: ../driver/xscreensaver-demo.glade2.h:104
-msgid "_Settings..."
-msgstr "_Paramètres..."
-
-#: ../driver/xscreensaver-demo.glade2.h:105
-msgid "_Standard <<"
-msgstr "_Standard <<"
-
-#: ../driver/xscreensaver-demo.glade2.h:106
-msgid "_Text"
-msgstr "_Texte"
-
-#: ../driver/xscreensaver-demo.glade2.h:107
-msgid "_URL"
-msgstr "_URL"
+#: ../driver/xscreensaver-demo.glade2.h:100
+msgid "_Command Line:"
+msgstr "_Ligne de commande :"
 
-#: ../driver/xscreensaver-demo.glade2.h:108
+#: ../driver/xscreensaver-demo.glade2.h:101
 msgid "_Visual:"
 msgstr "_Visuels :"
 
-#: ../driver/xscreensaver-demo.glade2.h:109
-msgid "dialog1"
-msgstr "dialog1"
-
-#: ../driver/xscreensaver-demo.glade2.h:111
-msgid "no preview"
-msgstr "pas d'aperçu"
-
-#: ../driver/xscreensaver-demo.glade2.h:112
-msgid "not installed"
-msgstr "non installé"
-
-#: ../driver/xscreensaver-demo.glade2.h:113
-msgid "nothing"
-msgstr "rien"
-
-#: ../driver/xscreensaver-demo.glade2.h:114
-msgid "preview"
-msgstr "aperçu"
-
-#: ../hacks/config/abstractile.xml.h:1 ../hacks/config/ccurve.xml.h:1
-#: ../hacks/config/flame.xml.h:1 ../hacks/config/maze.xml.h:1
-msgid "0 seconds"
-msgstr "0 seconde"
-
-#: ../hacks/config/abstractile.xml.h:2 ../hacks/config/voronoi.xml.h:3
-msgid "60 seconds"
-msgstr "60 secondes"
-
-#: ../hacks/config/abstractile.xml.h:3
+#: ../hacks/config/abstractile.xml.h:1
 msgid "Abstractile"
 msgstr "Mosaïque abstraite"
 
-#: ../hacks/config/abstractile.xml.h:4
-msgid "Block tiles"
-msgstr "Mosaïques"
+#. 
+#. -withdraw 1200
+#. -turnspeed 50
+#. 
+#: ../hacks/config/abstractile.xml.h:2 ../hacks/config/anemone.xml.h:6
+#: ../hacks/config/apollonian.xml.h:13 ../hacks/config/atlantis.xml.h:5
+#: ../hacks/config/attraction.xml.h:24 ../hacks/config/blitspin.xml.h:2
+#: ../hacks/config/boing.xml.h:5 ../hacks/config/bouncingcow.xml.h:5
+#: ../hacks/config/boxed.xml.h:5 ../hacks/config/carousel.xml.h:5
+#: ../hacks/config/ccurve.xml.h:5 ../hacks/config/circuit.xml.h:8
+#: ../hacks/config/companioncube.xml.h:5 ../hacks/config/cube21.xml.h:8
+#: ../hacks/config/cubenetic.xml.h:17 ../hacks/config/cubestorm.xml.h:5
+#: ../hacks/config/cubicgrid.xml.h:5 ../hacks/config/dangerball.xml.h:5
+#: ../hacks/config/eruption.xml.h:10 ../hacks/config/fliptext.xml.h:5
+#: ../hacks/config/flyingtoasters.xml.h:5 ../hacks/config/fontglide.xml.h:5
+#: ../hacks/config/fuzzyflakes.xml.h:5 ../hacks/config/gears.xml.h:5
+#: ../hacks/config/gflux.xml.h:5 ../hacks/config/glcells.xml.h:25
+#: ../hacks/config/glknots.xml.h:5 ../hacks/config/glmatrix.xml.h:8
+#: ../hacks/config/glsnake.xml.h:11 ../hacks/config/goop.xml.h:5
+#: ../hacks/config/hilbert.xml.h:8 ../hacks/config/hyperball.xml.h:5
+#: ../hacks/config/hypercube.xml.h:5 ../hacks/config/hypnowheel.xml.h:2
+#: ../hacks/config/interference.xml.h:5 ../hacks/config/jigglypuff.xml.h:6
+#: ../hacks/config/jigsaw.xml.h:5 ../hacks/config/juggle.xml.h:5
+#: ../hacks/config/juggler3d.xml.h:5 ../hacks/config/moebiusgears.xml.h:5
+#: ../hacks/config/penetrate.xml.h:2 ../hacks/config/petri.xml.h:18
+#: ../hacks/config/phosphor.xml.h:6 ../hacks/config/photopile.xml.h:12
+#: ../hacks/config/piecewise.xml.h:8 ../hacks/config/pinion.xml.h:5
+#: ../hacks/config/polyhedra.xml.h:5 ../hacks/config/pong.xml.h:2
+#: ../hacks/config/pyro.xml.h:2 ../hacks/config/rd-bomb.xml.h:2
+#: ../hacks/config/rdbomb.xml.h:2 ../hacks/config/rocks.xml.h:8
+#: ../hacks/config/rubik.xml.h:6 ../hacks/config/rubikblocks.xml.h:8
+#: ../hacks/config/skytentacles.xml.h:15 ../hacks/config/slidescreen.xml.h:11
+#: ../hacks/config/sonar.xml.h:5 ../hacks/config/speedmine.xml.h:5
+#: ../hacks/config/superquadrics.xml.h:5 ../hacks/config/tangram.xml.h:8
+#: ../hacks/config/topblock.xml.h:5 ../hacks/config/tronbit.xml.h:5
+#: ../hacks/config/twang.xml.h:8 ../hacks/config/voronoi.xml.h:2
+#: ../hacks/config/wormhole.xml.h:5 ../hacks/config/xjack.xml.h:2
+msgid "Slow"
+msgstr "Lent(e)"
 
 #. 
 #. -withdraw 1200
 #. -turnspeed 50
 #. 
-#: ../hacks/config/abstractile.xml.h:5 ../hacks/config/anemone.xml.h:7
-#: ../hacks/config/apollonian.xml.h:9 ../hacks/config/atlantis.xml.h:6
-#: ../hacks/config/attraction.xml.h:7 ../hacks/config/blitspin.xml.h:6
-#: ../hacks/config/boing.xml.h:2 ../hacks/config/bouncingcow.xml.h:4
-#: ../hacks/config/boxed.xml.h:7 ../hacks/config/carousel.xml.h:5
-#: ../hacks/config/ccurve.xml.h:7 ../hacks/config/circuit.xml.h:4
-#: ../hacks/config/cube21.xml.h:6 ../hacks/config/cubenetic.xml.h:5
-#: ../hacks/config/cubestorm.xml.h:4 ../hacks/config/cubicgrid.xml.h:7
-#: ../hacks/config/dangerball.xml.h:3 ../hacks/config/eruption.xml.h:5
-#: ../hacks/config/fliptext.xml.h:3 ../hacks/config/flyingtoasters.xml.h:5
-#: ../hacks/config/fontglide.xml.h:2 ../hacks/config/fuzzyflakes.xml.h:6
-#: ../hacks/config/gears.xml.h:3 ../hacks/config/gflux.xml.h:7
-#: ../hacks/config/glknots.xml.h:2 ../hacks/config/glmatrix.xml.h:4
-#: ../hacks/config/glsnake.xml.h:7 ../hacks/config/goop.xml.h:4
-#: ../hacks/config/hyperball.xml.h:1 ../hacks/config/hypercube.xml.h:2
-#: ../hacks/config/hypnowheel.xml.h:6 ../hacks/config/interference.xml.h:5
-#: ../hacks/config/jigglypuff.xml.h:7 ../hacks/config/jigsaw.xml.h:2
-#: ../hacks/config/juggle.xml.h:4 ../hacks/config/juggler3d.xml.h:6
-#: ../hacks/config/moebiusgears.xml.h:2 ../hacks/config/penetrate.xml.h:3
-#: ../hacks/config/petri.xml.h:5 ../hacks/config/phosphor.xml.h:3
-#: ../hacks/config/photopile.xml.h:6 ../hacks/config/piecewise.xml.h:3
-#: ../hacks/config/pinion.xml.h:4 ../hacks/config/polyhedra.xml.h:16
-#: ../hacks/config/pong.xml.h:3 ../hacks/config/pyro.xml.h:4
-#: ../hacks/config/rd-bomb.xml.h:8 ../hacks/config/rdbomb.xml.h:8
-#: ../hacks/config/rocks.xml.h:3 ../hacks/config/rubik.xml.h:4
-#: ../hacks/config/rubikblocks.xml.h:3 ../hacks/config/skytentacles.xml.h:5
-#: ../hacks/config/slidescreen.xml.h:5 ../hacks/config/sonar.xml.h:3
-#: ../hacks/config/speedmine.xml.h:3 ../hacks/config/starwars.xml.h:7
-#: ../hacks/config/superquadrics.xml.h:3 ../hacks/config/tangram.xml.h:3
-#: ../hacks/config/topblock.xml.h:7 ../hacks/config/voronoi.xml.h:5
-#: ../hacks/config/wormhole.xml.h:1 ../hacks/config/xjack.xml.h:1
+#: ../hacks/config/abstractile.xml.h:3 ../hacks/config/anemone.xml.h:11
+#: ../hacks/config/apollonian.xml.h:14 ../hacks/config/attraction.xml.h:25
+#: ../hacks/config/boing.xml.h:6 ../hacks/config/boxed.xml.h:6
+#: ../hacks/config/cubestorm.xml.h:6 ../hacks/config/cubicgrid.xml.h:6
+#: ../hacks/config/fliptext.xml.h:6 ../hacks/config/fontglide.xml.h:6
+#: ../hacks/config/fuzzyflakes.xml.h:6 ../hacks/config/gears.xml.h:6
+#: ../hacks/config/glknots.xml.h:6 ../hacks/config/goop.xml.h:6
+#: ../hacks/config/hilbert.xml.h:11 ../hacks/config/hypnowheel.xml.h:5
+#: ../hacks/config/jigsaw.xml.h:6 ../hacks/config/juggle.xml.h:6
+#: ../hacks/config/juggler3d.xml.h:6 ../hacks/config/moebiusgears.xml.h:6
+#: ../hacks/config/polyhedra.xml.h:6 ../hacks/config/skytentacles.xml.h:18
+#: ../hacks/config/sonar.xml.h:6 ../hacks/config/xjack.xml.h:3
+msgid "Speed"
+msgstr "Vitesse"
+
+#. 
+#. -withdraw 1200
+#. -turnspeed 50
+#. 
+#: ../hacks/config/abstractile.xml.h:4 ../hacks/config/anemone.xml.h:16
+#: ../hacks/config/apollonian.xml.h:15 ../hacks/config/atlantis.xml.h:7
+#: ../hacks/config/attraction.xml.h:26 ../hacks/config/blitspin.xml.h:4
+#: ../hacks/config/boing.xml.h:7 ../hacks/config/bouncingcow.xml.h:7
+#: ../hacks/config/boxed.xml.h:7 ../hacks/config/carousel.xml.h:7
+#: ../hacks/config/ccurve.xml.h:7 ../hacks/config/circuit.xml.h:10
+#: ../hacks/config/companioncube.xml.h:7 ../hacks/config/cube21.xml.h:10
+#: ../hacks/config/cubenetic.xml.h:19 ../hacks/config/cubestorm.xml.h:7
+#: ../hacks/config/cubicgrid.xml.h:7 ../hacks/config/dangerball.xml.h:7
+#: ../hacks/config/eruption.xml.h:12 ../hacks/config/fliptext.xml.h:7
+#: ../hacks/config/flyingtoasters.xml.h:7 ../hacks/config/fontglide.xml.h:7
+#: ../hacks/config/fuzzyflakes.xml.h:7 ../hacks/config/gears.xml.h:7
+#: ../hacks/config/gflux.xml.h:7 ../hacks/config/glknots.xml.h:7
+#: ../hacks/config/glmatrix.xml.h:10 ../hacks/config/glsnake.xml.h:13
+#: ../hacks/config/goop.xml.h:7 ../hacks/config/hilbert.xml.h:10
+#: ../hacks/config/hyperball.xml.h:7 ../hacks/config/hypercube.xml.h:7
+#: ../hacks/config/hypnowheel.xml.h:4 ../hacks/config/interference.xml.h:7
+#: ../hacks/config/jigglypuff.xml.h:8 ../hacks/config/jigsaw.xml.h:7
+#: ../hacks/config/juggle.xml.h:7 ../hacks/config/juggler3d.xml.h:7
+#: ../hacks/config/moebiusgears.xml.h:7 ../hacks/config/penetrate.xml.h:4
+#: ../hacks/config/petri.xml.h:20 ../hacks/config/phosphor.xml.h:8
+#: ../hacks/config/photopile.xml.h:14 ../hacks/config/piecewise.xml.h:10
+#: ../hacks/config/pinion.xml.h:7 ../hacks/config/polyhedra.xml.h:7
+#: ../hacks/config/pong.xml.h:4 ../hacks/config/pyro.xml.h:4
+#: ../hacks/config/rd-bomb.xml.h:4 ../hacks/config/rdbomb.xml.h:4
+#: ../hacks/config/rocks.xml.h:10 ../hacks/config/rubik.xml.h:8
+#: ../hacks/config/rubikblocks.xml.h:10 ../hacks/config/skytentacles.xml.h:17
+#: ../hacks/config/slidescreen.xml.h:13 ../hacks/config/sonar.xml.h:7
+#: ../hacks/config/speedmine.xml.h:7 ../hacks/config/starwars.xml.h:5
+#: ../hacks/config/superquadrics.xml.h:7 ../hacks/config/tangram.xml.h:10
+#: ../hacks/config/topblock.xml.h:7 ../hacks/config/tronbit.xml.h:7
+#: ../hacks/config/voronoi.xml.h:4 ../hacks/config/wormhole.xml.h:7
+#: ../hacks/config/xjack.xml.h:4
 msgid "Fast"
 msgstr "Rapide"
 
-#: ../hacks/config/abstractile.xml.h:6
-msgid "Flat tiles"
-msgstr "Mosaïques"
-
-#: ../hacks/config/abstractile.xml.h:7
-msgid ""
-"Generates mosaic patterns of interlocking tiles. Written by Steve Sundstrom; "
-"2004."
-msgstr ""
-"Génère des motifs en mosaïque d'emboitement de tuiles. Écrit par Steve "
-"Sundstrom; 2004."
+#: ../hacks/config/abstractile.xml.h:5 ../hacks/config/ccurve.xml.h:2
+#: ../hacks/config/flame.xml.h:5 ../hacks/config/maze.xml.h:5
+msgid "0 seconds"
+msgstr "0 seconde"
 
-#: ../hacks/config/abstractile.xml.h:8 ../hacks/config/boxed.xml.h:13
-#: ../hacks/config/celtic.xml.h:5 ../hacks/config/coral.xml.h:9
-#: ../hacks/config/cube21.xml.h:10 ../hacks/config/epicycle.xml.h:8
-#: ../hacks/config/flame.xml.h:9 ../hacks/config/glcells.xml.h:15
-#: ../hacks/config/helix.xml.h:6 ../hacks/config/imsmap.xml.h:10
-#: ../hacks/config/rorschach.xml.h:5 ../hacks/config/rubikblocks.xml.h:7
-#: ../hacks/config/tangram.xml.h:6 ../hacks/config/xlyap.xml.h:4
+#: ../hacks/config/abstractile.xml.h:6 ../hacks/config/boxed.xml.h:17
+#: ../hacks/config/celtic.xml.h:6 ../hacks/config/coral.xml.h:6
+#: ../hacks/config/cube21.xml.h:22 ../hacks/config/epicycle.xml.h:9
+#: ../hacks/config/flame.xml.h:6 ../hacks/config/glcells.xml.h:6
+#: ../hacks/config/helix.xml.h:6 ../hacks/config/imsmap.xml.h:6
+#: ../hacks/config/rorschach.xml.h:9 ../hacks/config/rubikblocks.xml.h:16
+#: ../hacks/config/tangram.xml.h:6 ../hacks/config/xlyap.xml.h:6
 #: ../hacks/config/xspirograph.xml.h:6
 msgid "Linger"
 msgstr "Persistance"
 
+#: ../hacks/config/abstractile.xml.h:7 ../hacks/config/voronoi.xml.h:16
+msgid "60 seconds"
+msgstr "60 secondes"
+
+#: ../hacks/config/abstractile.xml.h:8
+msgid "Random tile layout"
+msgstr "Motif aléatoire de carreaux"
+
 #: ../hacks/config/abstractile.xml.h:9
-msgid "Neon tiles"
-msgstr "Carreaux en néon"
+msgid "Flat tiles"
+msgstr "Mosaïques"
 
 #: ../hacks/config/abstractile.xml.h:10
+msgid "Thin tiles"
+msgstr "Carreaux fins"
+
+#: ../hacks/config/abstractile.xml.h:11
 msgid "Outline tiles"
 msgstr "Carreaux de contour"
 
-#: ../hacks/config/abstractile.xml.h:11
-msgid "Random tile layout"
-msgstr "Motif aléatoire de carreaux"
+#: ../hacks/config/abstractile.xml.h:12
+msgid "Block tiles"
+msgstr "Mosaïques"
+
+#: ../hacks/config/abstractile.xml.h:13
+msgid "Neon tiles"
+msgstr "Carreaux en néon"
+
+#: ../hacks/config/abstractile.xml.h:14
+msgid "Tiled tiles"
+msgstr "Taille des carreaux"
 
 #. 
 #. <number id="ncolors" type="slider" arg="-ncolors %"
@@ -1261,772 +1327,782 @@
 #. #### -3d
 #. #### -font []
 #. #### -w []
-#: ../hacks/config/abstractile.xml.h:12 ../hacks/config/anemone.xml.h:17
-#: ../hacks/config/anemotaxis.xml.h:12 ../hacks/config/ant.xml.h:15
-#: ../hacks/config/antinspect.xml.h:7 ../hacks/config/antmaze.xml.h:6
-#: ../hacks/config/antspotlight.xml.h:6 ../hacks/config/apollonian.xml.h:15
-#: ../hacks/config/apple2.xml.h:6 ../hacks/config/atlantis.xml.h:16
-#: ../hacks/config/attraction.xml.h:25 ../hacks/config/atunnel.xml.h:7
-#: ../hacks/config/barcode.xml.h:10 ../hacks/config/blaster.xml.h:11
-#: ../hacks/config/blinkbox.xml.h:10 ../hacks/config/blitspin.xml.h:9
-#: ../hacks/config/blocktube.xml.h:10 ../hacks/config/boing.xml.h:8
-#: ../hacks/config/bouboule.xml.h:10 ../hacks/config/bouncingcow.xml.h:11
-#: ../hacks/config/boxed.xml.h:21 ../hacks/config/boxfit.xml.h:15
-#: ../hacks/config/braid.xml.h:13 ../hacks/config/bsod.xml.h:27
+#: ../hacks/config/abstractile.xml.h:15 ../hacks/config/anemone.xml.h:33
+#: ../hacks/config/anemotaxis.xml.h:12 ../hacks/config/ant.xml.h:22
+#: ../hacks/config/antinspect.xml.h:5 ../hacks/config/antmaze.xml.h:5
+#: ../hacks/config/antspotlight.xml.h:5 ../hacks/config/apollonian.xml.h:16
+#: ../hacks/config/apple2.xml.h:6 ../hacks/config/atlantis.xml.h:19
+#: ../hacks/config/attraction.xml.h:32 ../hacks/config/atunnel.xml.h:8
+#: ../hacks/config/barcode.xml.h:9 ../hacks/config/blaster.xml.h:11
+#: ../hacks/config/blinkbox.xml.h:12 ../hacks/config/blitspin.xml.h:9
+#: ../hacks/config/blocktube.xml.h:11 ../hacks/config/boing.xml.h:14
+#: ../hacks/config/bouboule.xml.h:11 ../hacks/config/bouncingcow.xml.h:12
+#: ../hacks/config/boxed.xml.h:23 ../hacks/config/boxfit.xml.h:15
+#: ../hacks/config/braid.xml.h:13 ../hacks/config/bsod.xml.h:5
 #: ../hacks/config/bubble3d.xml.h:7 ../hacks/config/bubbles.xml.h:11
-#: ../hacks/config/bumps.xml.h:12 ../hacks/config/cage.xml.h:5
-#: ../hacks/config/carousel.xml.h:13 ../hacks/config/ccurve.xml.h:11
-#: ../hacks/config/celtic.xml.h:10 ../hacks/config/circuit.xml.h:13
-#: ../hacks/config/cloudlife.xml.h:12 ../hacks/config/compass.xml.h:5
-#: ../hacks/config/coral.xml.h:13 ../hacks/config/crackberg.xml.h:18
-#: ../hacks/config/critical.xml.h:7 ../hacks/config/crystal.xml.h:14
-#: ../hacks/config/cube21.xml.h:17 ../hacks/config/cubenetic.xml.h:19
-#: ../hacks/config/cubestorm.xml.h:10 ../hacks/config/cubicgrid.xml.h:11
-#: ../hacks/config/cwaves.xml.h:8 ../hacks/config/cynosure.xml.h:11
-#: ../hacks/config/dangerball.xml.h:10 ../hacks/config/decayscreen.xml.h:21
-#: ../hacks/config/deco.xml.h:12 ../hacks/config/deluxe.xml.h:12
-#: ../hacks/config/demon.xml.h:13 ../hacks/config/discrete.xml.h:9
-#: ../hacks/config/distort.xml.h:19 ../hacks/config/dnalogo.xml.h:9
-#: ../hacks/config/drift.xml.h:11 ../hacks/config/endgame.xml.h:7
-#: ../hacks/config/engine.xml.h:16 ../hacks/config/epicycle.xml.h:13
-#: ../hacks/config/eruption.xml.h:22 ../hacks/config/euler2d.xml.h:27
-#: ../hacks/config/extrusion.xml.h:12 ../hacks/config/fadeplot.xml.h:10
-#: ../hacks/config/fiberlamp.xml.h:11 ../hacks/config/fireworkx.xml.h:11
-#: ../hacks/config/flag.xml.h:9 ../hacks/config/flame.xml.h:14
-#: ../hacks/config/flipflop.xml.h:10 ../hacks/config/flipscreen3d.xml.h:7
-#: ../hacks/config/fliptext.xml.h:12 ../hacks/config/flow.xml.h:18
-#: ../hacks/config/fluidballs.xml.h:19 ../hacks/config/flurry.xml.h:9
-#: ../hacks/config/flyingtoasters.xml.h:13 ../hacks/config/fontglide.xml.h:14
-#: ../hacks/config/forest.xml.h:7 ../hacks/config/fuzzyflakes.xml.h:21
-#: ../hacks/config/galaxy.xml.h:12 ../hacks/config/gears.xml.h:9
-#: ../hacks/config/gflux.xml.h:15 ../hacks/config/glblur.xml.h:15
-#: ../hacks/config/glcells.xml.h:30 ../hacks/config/gleidescope.xml.h:12
-#: ../hacks/config/glforestfire.xml.h:13 ../hacks/config/glhanoi.xml.h:15
-#: ../hacks/config/glknots.xml.h:17 ../hacks/config/glmatrix.xml.h:16
-#: ../hacks/config/glplanet.xml.h:11 ../hacks/config/glschool.xml.h:15
-#: ../hacks/config/glslideshow.xml.h:20 ../hacks/config/glsnake.xml.h:14
-#: ../hacks/config/gltext.xml.h:17 ../hacks/config/goop.xml.h:12
-#: ../hacks/config/grav.xml.h:11 ../hacks/config/greynetic.xml.h:7
-#: ../hacks/config/halftone.xml.h:17 ../hacks/config/halo.xml.h:14
-#: ../hacks/config/helix.xml.h:8 ../hacks/config/hopalong.xml.h:20
-#: ../hacks/config/hyperball.xml.h:6 ../hacks/config/hypercube.xml.h:9
-#: ../hacks/config/hypertorus.xml.h:18 ../hacks/config/hypnowheel.xml.h:12
-#: ../hacks/config/ifs.xml.h:13 ../hacks/config/imsmap.xml.h:16
-#: ../hacks/config/interaggregate.xml.h:9
-#: ../hacks/config/interference.xml.h:17
-#: ../hacks/config/intermomentary.xml.h:9 ../hacks/config/jigglypuff.xml.h:17
-#: ../hacks/config/jigsaw.xml.h:11 ../hacks/config/juggle.xml.h:18
-#: ../hacks/config/juggler3d.xml.h:19 ../hacks/config/julia.xml.h:13
-#: ../hacks/config/kaleidescope.xml.h:12 ../hacks/config/klein.xml.h:21
+#: ../hacks/config/bumps.xml.h:11 ../hacks/config/cage.xml.h:6
+#: ../hacks/config/carousel.xml.h:18 ../hacks/config/ccurve.xml.h:11
+#: ../hacks/config/celtic.xml.h:9 ../hacks/config/circuit.xml.h:14
+#: ../hacks/config/cloudlife.xml.h:12 ../hacks/config/companioncube.xml.h:14
+#: ../hacks/config/compass.xml.h:5 ../hacks/config/coral.xml.h:14
+#: ../hacks/config/crackberg.xml.h:18 ../hacks/config/critical.xml.h:8
+#: ../hacks/config/crystal.xml.h:15 ../hacks/config/cube21.xml.h:26
+#: ../hacks/config/cubenetic.xml.h:26 ../hacks/config/cubestorm.xml.h:17
+#: ../hacks/config/cubicgrid.xml.h:12 ../hacks/config/cwaves.xml.h:9
+#: ../hacks/config/cynosure.xml.h:11 ../hacks/config/dangerball.xml.h:14
+#: ../hacks/config/decayscreen.xml.h:23 ../hacks/config/deco.xml.h:14
+#: ../hacks/config/deluxe.xml.h:16 ../hacks/config/demon.xml.h:15
+#: ../hacks/config/discrete.xml.h:11 ../hacks/config/distort.xml.h:22
+#: ../hacks/config/dnalogo.xml.h:9 ../hacks/config/drift.xml.h:11
+#: ../hacks/config/endgame.xml.h:6 ../hacks/config/engine.xml.h:19
+#: ../hacks/config/epicycle.xml.h:14 ../hacks/config/eruption.xml.h:22
+#: ../hacks/config/euler2d.xml.h:29 ../hacks/config/extrusion.xml.h:17
+#: ../hacks/config/fadeplot.xml.h:14 ../hacks/config/fiberlamp.xml.h:11
+#: ../hacks/config/fireworkx.xml.h:11 ../hacks/config/flag.xml.h:13
+#: ../hacks/config/flame.xml.h:14 ../hacks/config/flipflop.xml.h:14
+#: ../hacks/config/flipscreen3d.xml.h:6 ../hacks/config/fliptext.xml.h:15
+#: ../hacks/config/flow.xml.h:21 ../hacks/config/fluidballs.xml.h:22
+#: ../hacks/config/flurry.xml.h:2 ../hacks/config/flyingtoasters.xml.h:14
+#: ../hacks/config/fontglide.xml.h:16 ../hacks/config/forest.xml.h:8
+#: ../hacks/config/fuzzyflakes.xml.h:12 ../hacks/config/galaxy.xml.h:13
+#: ../hacks/config/gears.xml.h:14 ../hacks/config/gflux.xml.h:19
+#: ../hacks/config/glblur.xml.h:17 ../hacks/config/glcells.xml.h:32
+#: ../hacks/config/gleidescope.xml.h:14 ../hacks/config/glforestfire.xml.h:16
+#: ../hacks/config/glhanoi.xml.h:16 ../hacks/config/glknots.xml.h:24
+#: ../hacks/config/glmatrix.xml.h:20 ../hacks/config/glplanet.xml.h:13
+#: ../hacks/config/glschool.xml.h:17 ../hacks/config/glslideshow.xml.h:20
+#: ../hacks/config/glsnake.xml.h:18 ../hacks/config/gltext.xml.h:19
+#: ../hacks/config/goop.xml.h:13 ../hacks/config/grav.xml.h:12
+#: ../hacks/config/greynetic.xml.h:6 ../hacks/config/halftone.xml.h:17
+#: ../hacks/config/halo.xml.h:14 ../hacks/config/helix.xml.h:8
+#: ../hacks/config/hilbert.xml.h:20 ../hacks/config/hopalong.xml.h:23
+#: ../hacks/config/hyperball.xml.h:13 ../hacks/config/hypercube.xml.h:17
+#: ../hacks/config/hypertorus.xml.h:5 ../hacks/config/hypnowheel.xml.h:8
+#: ../hacks/config/ifs.xml.h:68 ../hacks/config/imsmap.xml.h:18
+#: ../hacks/config/interaggregate.xml.h:8
+#: ../hacks/config/interference.xml.h:21
+#: ../hacks/config/intermomentary.xml.h:8 ../hacks/config/jigglypuff.xml.h:27
+#: ../hacks/config/jigsaw.xml.h:15 ../hacks/config/juggle.xml.h:21
+#: ../hacks/config/juggler3d.xml.h:21 ../hacks/config/julia.xml.h:14
+#: ../hacks/config/kaleidescope.xml.h:13 ../hacks/config/klein.xml.h:5
 #: ../hacks/config/kumppa.xml.h:8 ../hacks/config/lament.xml.h:7
-#: ../hacks/config/laser.xml.h:11 ../hacks/config/lavalite.xml.h:26
-#: ../hacks/config/lcdscrub.xml.h:11 ../hacks/config/lightning.xml.h:7
-#: ../hacks/config/lisa.xml.h:12 ../hacks/config/lissie.xml.h:11
-#: ../hacks/config/lmorph.xml.h:15 ../hacks/config/lockward.xml.h:13
-#: ../hacks/config/loop.xml.h:10 ../hacks/config/m6502.xml.h:5
-#: ../hacks/config/maze.xml.h:15 ../hacks/config/memscroller.xml.h:9
-#: ../hacks/config/menger.xml.h:17 ../hacks/config/metaballs.xml.h:15
-#: ../hacks/config/mirrorblob.xml.h:21 ../hacks/config/mismunch.xml.h:10
-#: ../hacks/config/moebius.xml.h:6 ../hacks/config/moebiusgears.xml.h:10
-#: ../hacks/config/moire.xml.h:10 ../hacks/config/moire2.xml.h:8
-#: ../hacks/config/molecule.xml.h:25 ../hacks/config/morph3d.xml.h:11
-#: ../hacks/config/mountain.xml.h:11 ../hacks/config/munch.xml.h:14
-#: ../hacks/config/nerverot.xml.h:21 ../hacks/config/noof.xml.h:6
-#: ../hacks/config/noseguy.xml.h:3 ../hacks/config/pacman.xml.h:6
-#: ../hacks/config/pedal.xml.h:9 ../hacks/config/penetrate.xml.h:6
-#: ../hacks/config/penrose.xml.h:10 ../hacks/config/petri.xml.h:24
-#: ../hacks/config/phosphor.xml.h:9 ../hacks/config/photopile.xml.h:19
-#: ../hacks/config/piecewise.xml.h:13 ../hacks/config/pinion.xml.h:14
-#: ../hacks/config/pipes.xml.h:20 ../hacks/config/polyhedra.xml.h:111
-#: ../hacks/config/polyominoes.xml.h:12 ../hacks/config/polytopes.xml.h:19
-#: ../hacks/config/pong.xml.h:8 ../hacks/config/popsquares.xml.h:19
-#: ../hacks/config/providence.xml.h:7 ../hacks/config/pulsar.xml.h:15
-#: ../hacks/config/pyro.xml.h:13 ../hacks/config/qix.xml.h:20
-#: ../hacks/config/queens.xml.h:5 ../hacks/config/rd-bomb.xml.h:18
-#: ../hacks/config/rdbomb.xml.h:18 ../hacks/config/ripples.xml.h:16
-#: ../hacks/config/rocks.xml.h:13 ../hacks/config/rorschach.xml.h:8
-#: ../hacks/config/rotor.xml.h:11 ../hacks/config/rotzoomer.xml.h:11
-#: ../hacks/config/rubik.xml.h:11 ../hacks/config/rubikblocks.xml.h:14
-#: ../hacks/config/sballs.xml.h:13 ../hacks/config/shadebobs.xml.h:14
-#: ../hacks/config/sierpinski.xml.h:9 ../hacks/config/sierpinski3d.xml.h:8
-#: ../hacks/config/skytentacles.xml.h:13 ../hacks/config/slidescreen.xml.h:14
-#: ../hacks/config/slip.xml.h:9 ../hacks/config/sonar.xml.h:20
-#: ../hacks/config/speedmine.xml.h:11 ../hacks/config/sphere.xml.h:6
-#: ../hacks/config/spheremonics.xml.h:18 ../hacks/config/spiral.xml.h:9
-#: ../hacks/config/spotlight.xml.h:9 ../hacks/config/sproingies.xml.h:7
-#: ../hacks/config/squiral.xml.h:15 ../hacks/config/stairs.xml.h:5
-#: ../hacks/config/starfish.xml.h:13 ../hacks/config/starwars.xml.h:13
-#: ../hacks/config/stonerview.xml.h:5 ../hacks/config/strange.xml.h:9
-#: ../hacks/config/substrate.xml.h:17 ../hacks/config/superquadrics.xml.h:10
-#: ../hacks/config/surfaces.xml.h:22 ../hacks/config/swirl.xml.h:10
-#: ../hacks/config/t3d.xml.h:12 ../hacks/config/tangram.xml.h:10
-#: ../hacks/config/thornbird.xml.h:13 ../hacks/config/timetunnel.xml.h:7
-#: ../hacks/config/topblock.xml.h:19 ../hacks/config/triangle.xml.h:7
-#: ../hacks/config/truchet.xml.h:5 ../hacks/config/twang.xml.h:13
-#: ../hacks/config/vermiculate.xml.h:5 ../hacks/config/vidwhacker.xml.h:5
-#: ../hacks/config/vines.xml.h:6 ../hacks/config/voronoi.xml.h:12
-#: ../hacks/config/wander.xml.h:12 ../hacks/config/webcollage.xml.h:9
-#: ../hacks/config/whirlwindwarp.xml.h:7 ../hacks/config/whirlygig.xml.h:6
-#: ../hacks/config/worm.xml.h:8 ../hacks/config/wormhole.xml.h:8
-#: ../hacks/config/xanalogtv.xml.h:1 ../hacks/config/xflame.xml.h:7
-#: ../hacks/config/xjack.xml.h:3 ../hacks/config/xlyap.xml.h:8
-#: ../hacks/config/xmatrix.xml.h:17 ../hacks/config/xrayswarm.xml.h:5
-#: ../hacks/config/xspirograph.xml.h:8 ../hacks/config/zoom.xml.h:12
+#: ../hacks/config/laser.xml.h:12 ../hacks/config/lavalite.xml.h:16
+#: ../hacks/config/lcdscrub.xml.h:7 ../hacks/config/lightning.xml.h:8
+#: ../hacks/config/lisa.xml.h:16 ../hacks/config/lissie.xml.h:15
+#: ../hacks/config/lmorph.xml.h:17 ../hacks/config/lockward.xml.h:9
+#: ../hacks/config/loop.xml.h:12 ../hacks/config/m6502.xml.h:6
+#: ../hacks/config/maze.xml.h:16 ../hacks/config/memscroller.xml.h:9
+#: ../hacks/config/menger.xml.h:20 ../hacks/config/metaballs.xml.h:16
+#: ../hacks/config/mirrorblob.xml.h:25 ../hacks/config/mismunch.xml.h:13
+#: ../hacks/config/moebius.xml.h:7 ../hacks/config/moebiusgears.xml.h:14
+#: ../hacks/config/moire.xml.h:12 ../hacks/config/moire2.xml.h:9
+#: ../hacks/config/molecule.xml.h:15 ../hacks/config/morph3d.xml.h:11
+#: ../hacks/config/mountain.xml.h:11 ../hacks/config/munch.xml.h:16
+#: ../hacks/config/nerverot.xml.h:21 ../hacks/config/noof.xml.h:5
+#: ../hacks/config/noseguy.xml.h:2 ../hacks/config/pacman.xml.h:6
+#: ../hacks/config/pedal.xml.h:9 ../hacks/config/penetrate.xml.h:8
+#: ../hacks/config/penrose.xml.h:12 ../hacks/config/petri.xml.h:5
+#: ../hacks/config/phosphor.xml.h:9 ../hacks/config/photopile.xml.h:22
+#: ../hacks/config/piecewise.xml.h:15 ../hacks/config/pinion.xml.h:16
+#: ../hacks/config/pipes.xml.h:19 ../hacks/config/polyhedra.xml.h:168
+#: ../hacks/config/polyominoes.xml.h:12 ../hacks/config/polytopes.xml.h:29
+#: ../hacks/config/pong.xml.h:9 ../hacks/config/popsquares.xml.h:21
+#: ../hacks/config/providence.xml.h:7 ../hacks/config/pulsar.xml.h:14
+#: ../hacks/config/pyro.xml.h:14 ../hacks/config/qix.xml.h:24
+#: ../hacks/config/queens.xml.h:6 ../hacks/config/rd-bomb.xml.h:23
+#: ../hacks/config/rdbomb.xml.h:23 ../hacks/config/ripples.xml.h:18
+#: ../hacks/config/rocks.xml.h:17 ../hacks/config/rorschach.xml.h:11
+#: ../hacks/config/rotor.xml.h:13 ../hacks/config/rotzoomer.xml.h:13
+#: ../hacks/config/rubik.xml.h:11 ../hacks/config/rubikblocks.xml.h:20
+#: ../hacks/config/sballs.xml.h:16 ../hacks/config/shadebobs.xml.h:16
+#: ../hacks/config/sierpinski.xml.h:13 ../hacks/config/sierpinski3d.xml.h:10
+#: ../hacks/config/skytentacles.xml.h:25 ../hacks/config/slidescreen.xml.h:18
+#: ../hacks/config/slip.xml.h:13 ../hacks/config/sonar.xml.h:30
+#: ../hacks/config/speedmine.xml.h:17 ../hacks/config/sphere.xml.h:8
+#: ../hacks/config/spheremonics.xml.h:22 ../hacks/config/spiral.xml.h:11
+#: ../hacks/config/spotlight.xml.h:11 ../hacks/config/sproingies.xml.h:9
+#: ../hacks/config/squiral.xml.h:17 ../hacks/config/stairs.xml.h:5
+#: ../hacks/config/starfish.xml.h:17 ../hacks/config/starwars.xml.h:15
+#: ../hacks/config/stonerview.xml.h:7 ../hacks/config/strange.xml.h:11
+#: ../hacks/config/substrate.xml.h:18 ../hacks/config/superquadrics.xml.h:13
+#: ../hacks/config/surfaces.xml.h:27 ../hacks/config/swirl.xml.h:11
+#: ../hacks/config/t3d.xml.h:16 ../hacks/config/tangram.xml.h:16
+#: ../hacks/config/thornbird.xml.h:16 ../hacks/config/timetunnel.xml.h:8
+#: ../hacks/config/topblock.xml.h:24 ../hacks/config/triangle.xml.h:8
+#: ../hacks/config/tronbit.xml.h:11 ../hacks/config/truchet.xml.h:6
+#: ../hacks/config/twang.xml.h:18 ../hacks/config/vermiculate.xml.h:5
+#: ../hacks/config/vidwhacker.xml.h:6 ../hacks/config/vines.xml.h:8
+#: ../hacks/config/voronoi.xml.h:11 ../hacks/config/wander.xml.h:13
+#: ../hacks/config/webcollage.xml.h:11 ../hacks/config/whirlwindwarp.xml.h:8
+#: ../hacks/config/whirlygig.xml.h:31 ../hacks/config/worm.xml.h:11
+#: ../hacks/config/wormhole.xml.h:11 ../hacks/config/xanalogtv.xml.h:2
+#: ../hacks/config/xflame.xml.h:7 ../hacks/config/xjack.xml.h:6
+#: ../hacks/config/xlyap.xml.h:9 ../hacks/config/xmatrix.xml.h:21
+#: ../hacks/config/xrayswarm.xml.h:5 ../hacks/config/xspirograph.xml.h:9
+#: ../hacks/config/zoom.xml.h:15
 msgid "Show frame rate"
 msgstr "Afficher le nombre d'images par seconde"
 
-#. 
-#. -withdraw 1200
-#. -turnspeed 50
-#. 
-#: ../hacks/config/abstractile.xml.h:13 ../hacks/config/anemone.xml.h:22
-#: ../hacks/config/apollonian.xml.h:16 ../hacks/config/atlantis.xml.h:18
-#: ../hacks/config/attraction.xml.h:26 ../hacks/config/blitspin.xml.h:10
-#: ../hacks/config/boing.xml.h:10 ../hacks/config/bouncingcow.xml.h:12
-#: ../hacks/config/boxed.xml.h:22 ../hacks/config/carousel.xml.h:14
-#: ../hacks/config/ccurve.xml.h:12 ../hacks/config/circuit.xml.h:14
-#: ../hacks/config/cube21.xml.h:20 ../hacks/config/cubenetic.xml.h:20
-#: ../hacks/config/cubestorm.xml.h:11 ../hacks/config/cubicgrid.xml.h:12
-#: ../hacks/config/dangerball.xml.h:11 ../hacks/config/eruption.xml.h:23
-#: ../hacks/config/fliptext.xml.h:13 ../hacks/config/flyingtoasters.xml.h:14
-#: ../hacks/config/fontglide.xml.h:15 ../hacks/config/fuzzyflakes.xml.h:22
-#: ../hacks/config/gears.xml.h:10 ../hacks/config/gflux.xml.h:16
-#: ../hacks/config/glcells.xml.h:31 ../hacks/config/glknots.xml.h:18
-#: ../hacks/config/glmatrix.xml.h:17 ../hacks/config/glsnake.xml.h:16
-#: ../hacks/config/goop.xml.h:13 ../hacks/config/hyperball.xml.h:7
-#: ../hacks/config/hypercube.xml.h:10 ../hacks/config/hypnowheel.xml.h:13
-#: ../hacks/config/interference.xml.h:18 ../hacks/config/jigglypuff.xml.h:18
-#: ../hacks/config/jigsaw.xml.h:12 ../hacks/config/juggle.xml.h:19
-#: ../hacks/config/juggler3d.xml.h:20 ../hacks/config/moebiusgears.xml.h:11
-#: ../hacks/config/penetrate.xml.h:8 ../hacks/config/petri.xml.h:25
-#: ../hacks/config/phosphor.xml.h:10 ../hacks/config/photopile.xml.h:21
-#: ../hacks/config/piecewise.xml.h:14 ../hacks/config/pinion.xml.h:15
-#: ../hacks/config/polyhedra.xml.h:112 ../hacks/config/pong.xml.h:9
-#: ../hacks/config/pyro.xml.h:14 ../hacks/config/rd-bomb.xml.h:19
-#: ../hacks/config/rdbomb.xml.h:19 ../hacks/config/rocks.xml.h:14
-#: ../hacks/config/rubik.xml.h:13 ../hacks/config/rubikblocks.xml.h:15
-#: ../hacks/config/skytentacles.xml.h:15 ../hacks/config/slidescreen.xml.h:17
-#: ../hacks/config/sonar.xml.h:25 ../hacks/config/speedmine.xml.h:14
-#: ../hacks/config/superquadrics.xml.h:11 ../hacks/config/tangram.xml.h:11
-#: ../hacks/config/topblock.xml.h:20 ../hacks/config/twang.xml.h:14
-#: ../hacks/config/voronoi.xml.h:13 ../hacks/config/wormhole.xml.h:9
-#: ../hacks/config/xjack.xml.h:4
-msgid "Slow"
-msgstr "Lent(e)"
-
-#. 
-#. -withdraw 1200
-#. -turnspeed 50
-#. 
-#: ../hacks/config/abstractile.xml.h:14 ../hacks/config/anemone.xml.h:27
-#: ../hacks/config/apollonian.xml.h:17 ../hacks/config/attraction.xml.h:28
-#: ../hacks/config/boing.xml.h:12 ../hacks/config/boxed.xml.h:23
-#: ../hacks/config/cubestorm.xml.h:12 ../hacks/config/cubicgrid.xml.h:13
-#: ../hacks/config/fliptext.xml.h:14 ../hacks/config/fontglide.xml.h:16
-#: ../hacks/config/fuzzyflakes.xml.h:24 ../hacks/config/gears.xml.h:11
-#: ../hacks/config/glknots.xml.h:20 ../hacks/config/goop.xml.h:14
-#: ../hacks/config/hypnowheel.xml.h:14 ../hacks/config/jigsaw.xml.h:14
-#: ../hacks/config/juggle.xml.h:20 ../hacks/config/juggler3d.xml.h:21
-#: ../hacks/config/moebiusgears.xml.h:12 ../hacks/config/polyhedra.xml.h:146
-#: ../hacks/config/skytentacles.xml.h:17 ../hacks/config/sonar.xml.h:27
-#: ../hacks/config/xjack.xml.h:5
-msgid "Speed"
-msgstr "Vitesse"
-
-#: ../hacks/config/abstractile.xml.h:15
-msgid "Thin tiles"
-msgstr "Carreaux fins"
-
 #: ../hacks/config/abstractile.xml.h:16
-msgid "Tiled tiles"
-msgstr "Taille des carreaux"
+msgid ""
+"Generates mosaic patterns of interlocking tiles. Written by Steve Sundstrom; "
+"2004."
+msgstr ""
+"Génère des motifs en mosaïque d'emboitement de tuiles. Écrit par Steve "
+"Sundstrom; 2004."
 
 #: ../hacks/config/anemone.xml.h:1
 msgid "Anemone"
 msgstr "Anémone"
 
-#: ../hacks/config/anemone.xml.h:2 ../hacks/config/fuzzyflakes.xml.h:1
-#: ../hacks/config/hypnowheel.xml.h:4
-msgid "Arms"
-msgstr "Bras"
-
-#: ../hacks/config/anemone.xml.h:8 ../hacks/config/anemotaxis.xml.h:5
-#: ../hacks/config/blaster.xml.h:3 ../hacks/config/bouboule.xml.h:3
-#: ../hacks/config/boxed.xml.h:8 ../hacks/config/coral.xml.h:6
-#: ../hacks/config/crackberg.xml.h:5 ../hacks/config/cubenetic.xml.h:6
-#: ../hacks/config/cubestorm.xml.h:5 ../hacks/config/dangerball.xml.h:4
-#: ../hacks/config/eruption.xml.h:6 ../hacks/config/euler2d.xml.h:8
-#: ../hacks/config/fiberlamp.xml.h:2 ../hacks/config/flame.xml.h:4
-#: ../hacks/config/flow.xml.h:3 ../hacks/config/fluidballs.xml.h:4
-#: ../hacks/config/fuzzyflakes.xml.h:7 ../hacks/config/glcells.xml.h:6
-#: ../hacks/config/glschool.xml.h:5 ../hacks/config/goop.xml.h:5
-#: ../hacks/config/grav.xml.h:1 ../hacks/config/halftone.xml.h:5
-#: ../hacks/config/halo.xml.h:3 ../hacks/config/interaggregate.xml.h:2
-#: ../hacks/config/interference.xml.h:6 ../hacks/config/jigsaw.xml.h:3
-#: ../hacks/config/julia.xml.h:3 ../hacks/config/kaleidescope.xml.h:4
-#: ../hacks/config/lisa.xml.h:4 ../hacks/config/lmorph.xml.h:3
-#: ../hacks/config/nerverot.xml.h:9 ../hacks/config/pedal.xml.h:4
-#: ../hacks/config/petri.xml.h:7 ../hacks/config/piecewise.xml.h:4
-#: ../hacks/config/qix.xml.h:7 ../hacks/config/rocks.xml.h:4
-#: ../hacks/config/sierpinski.xml.h:1 ../hacks/config/slip.xml.h:2
-#: ../hacks/config/spiral.xml.h:3 ../hacks/config/substrate.xml.h:8
-#: ../hacks/config/swirl.xml.h:2 ../hacks/config/thornbird.xml.h:2
-#: ../hacks/config/topblock.xml.h:8 ../hacks/config/voronoi.xml.h:6
-#: ../hacks/config/whirlwindwarp.xml.h:1 ../hacks/config/wormhole.xml.h:2
+#: ../hacks/config/anemone.xml.h:17 ../hacks/config/anemotaxis.xml.h:8
+#: ../hacks/config/blaster.xml.h:7 ../hacks/config/bouboule.xml.h:5
+#: ../hacks/config/boxed.xml.h:8 ../hacks/config/coral.xml.h:11
+#: ../hacks/config/crackberg.xml.h:8 ../hacks/config/cubenetic.xml.h:5
+#: ../hacks/config/cubestorm.xml.h:8 ../hacks/config/dangerball.xml.h:8
+#: ../hacks/config/eruption.xml.h:5 ../hacks/config/euler2d.xml.h:5
+#: ../hacks/config/fiberlamp.xml.h:5 ../hacks/config/flame.xml.h:8
+#: ../hacks/config/flow.xml.h:5 ../hacks/config/fluidballs.xml.h:5
+#: ../hacks/config/fuzzyflakes.xml.h:8 ../hacks/config/glcells.xml.h:8
+#: ../hacks/config/glschool.xml.h:5 ../hacks/config/goop.xml.h:8
+#: ../hacks/config/grav.xml.h:5 ../hacks/config/halftone.xml.h:5
+#: ../hacks/config/halo.xml.h:5 ../hacks/config/interaggregate.xml.h:5
+#: ../hacks/config/interference.xml.h:11 ../hacks/config/jigsaw.xml.h:8
+#: ../hacks/config/julia.xml.h:5 ../hacks/config/kaleidescope.xml.h:5
+#: ../hacks/config/lisa.xml.h:5 ../hacks/config/lmorph.xml.h:5
+#: ../hacks/config/nerverot.xml.h:8 ../hacks/config/pedal.xml.h:5
+#: ../hacks/config/petri.xml.h:12 ../hacks/config/piecewise.xml.h:5
+#: ../hacks/config/qix.xml.h:5 ../hacks/config/rocks.xml.h:5
+#: ../hacks/config/sierpinski.xml.h:5 ../hacks/config/slip.xml.h:5
+#: ../hacks/config/spiral.xml.h:5 ../hacks/config/substrate.xml.h:8
+#: ../hacks/config/swirl.xml.h:5 ../hacks/config/thornbird.xml.h:5
+#: ../hacks/config/topblock.xml.h:13 ../hacks/config/voronoi.xml.h:5
+#: ../hacks/config/whirlwindwarp.xml.h:2 ../hacks/config/wormhole.xml.h:8
 msgid "Few"
 msgstr "Peu"
 
+#: ../hacks/config/anemone.xml.h:18 ../hacks/config/fuzzyflakes.xml.h:20
+#: ../hacks/config/hypnowheel.xml.h:13
+msgid "Arms"
+msgstr "Bras"
+
+#. 
+#. On a 2.93 gHz iMac i7, I get these rates with -delay 0:
+#. 
+#. detail 3:  invisible
+#. detail 4:  barely visible
+#. detail 5:  1000+ fps, looks like noise at -delay 0, ok at -delay 20000
+#. detail 8:  ~700+ fps
+#. detail 9:  ~400 fps
+#. detail 10: ~300 fps
+#. detail 11: ~100 fps
+#. detail 12:  ~50 fps
+#. detail 13:  ~17 fps
+#. detail 14:   ~8 fps
+#. detail 15:   ~2 fps
+#. 
+#. With the default -delay, CPU load only starts causing the frame rate
+#. to drop below 30 fps detail 12 or higher.
+#. 
 #. #### -color [random]
-#: ../hacks/config/anemone.xml.h:9 ../hacks/config/anemotaxis.xml.h:9
-#: ../hacks/config/ant.xml.h:10 ../hacks/config/apollonian.xml.h:11
-#: ../hacks/config/attraction.xml.h:16 ../hacks/config/blaster.xml.h:8
-#: ../hacks/config/bouboule.xml.h:7 ../hacks/config/braid.xml.h:9
-#: ../hacks/config/coral.xml.h:11 ../hacks/config/critical.xml.h:5
-#: ../hacks/config/crystal.xml.h:9 ../hacks/config/cubenetic.xml.h:11
-#: ../hacks/config/cubestorm.xml.h:9 ../hacks/config/cynosure.xml.h:7
-#: ../hacks/config/deco.xml.h:6 ../hacks/config/deluxe.xml.h:9
-#: ../hacks/config/demon.xml.h:11 ../hacks/config/discrete.xml.h:6
-#: ../hacks/config/drift.xml.h:8 ../hacks/config/epicycle.xml.h:10
-#: ../hacks/config/eruption.xml.h:15 ../hacks/config/euler2d.xml.h:18
-#: ../hacks/config/fadeplot.xml.h:8 ../hacks/config/fiberlamp.xml.h:9
-#: ../hacks/config/flag.xml.h:6 ../hacks/config/flame.xml.h:11
-#: ../hacks/config/flow.xml.h:11 ../hacks/config/fluidballs.xml.h:14
-#: ../hacks/config/forest.xml.h:5 ../hacks/config/fuzzyflakes.xml.h:16
-#: ../hacks/config/galaxy.xml.h:8 ../hacks/config/glcells.xml.h:19
-#: ../hacks/config/goop.xml.h:10 ../hacks/config/grav.xml.h:6
-#: ../hacks/config/halftone.xml.h:12 ../hacks/config/halo.xml.h:8
-#: ../hacks/config/hopalong.xml.h:15 ../hacks/config/ifs.xml.h:8
-#: ../hacks/config/imsmap.xml.h:12 ../hacks/config/interaggregate.xml.h:7
-#: ../hacks/config/interference.xml.h:14 ../hacks/config/jigsaw.xml.h:8
-#: ../hacks/config/julia.xml.h:11 ../hacks/config/kaleidescope.xml.h:9
-#: ../hacks/config/laser.xml.h:8 ../hacks/config/lightning.xml.h:5
-#: ../hacks/config/lisa.xml.h:10 ../hacks/config/lissie.xml.h:9
-#: ../hacks/config/lmorph.xml.h:11 ../hacks/config/loop.xml.h:8
-#: ../hacks/config/metaballs.xml.h:8 ../hacks/config/mismunch.xml.h:6
-#: ../hacks/config/moire.xml.h:5 ../hacks/config/moire2.xml.h:5
-#: ../hacks/config/mountain.xml.h:6 ../hacks/config/munch.xml.h:7
-#: ../hacks/config/nerverot.xml.h:16 ../hacks/config/pedal.xml.h:6
-#: ../hacks/config/penrose.xml.h:7 ../hacks/config/petri.xml.h:12
-#: ../hacks/config/piecewise.xml.h:9 ../hacks/config/polyominoes.xml.h:7
-#: ../hacks/config/qix.xml.h:14 ../hacks/config/rd-bomb.xml.h:12
-#: ../hacks/config/rdbomb.xml.h:12 ../hacks/config/rocks.xml.h:8
-#: ../hacks/config/rotor.xml.h:7 ../hacks/config/shadebobs.xml.h:8
-#: ../hacks/config/sierpinski.xml.h:6 ../hacks/config/slip.xml.h:7
-#: ../hacks/config/sphere.xml.h:4 ../hacks/config/spiral.xml.h:7
-#: ../hacks/config/squiral.xml.h:9 ../hacks/config/starfish.xml.h:9
-#: ../hacks/config/strange.xml.h:6 ../hacks/config/swirl.xml.h:7
-#: ../hacks/config/thornbird.xml.h:6 ../hacks/config/topblock.xml.h:14
-#: ../hacks/config/triangle.xml.h:5 ../hacks/config/vines.xml.h:4
-#: ../hacks/config/voronoi.xml.h:9 ../hacks/config/whirlwindwarp.xml.h:4
-#: ../hacks/config/worm.xml.h:5
+#: ../hacks/config/anemone.xml.h:19 ../hacks/config/anemotaxis.xml.h:10
+#: ../hacks/config/ant.xml.h:21 ../hacks/config/apollonian.xml.h:12
+#: ../hacks/config/attraction.xml.h:19 ../hacks/config/blaster.xml.h:9
+#: ../hacks/config/bouboule.xml.h:7 ../hacks/config/braid.xml.h:10
+#: ../hacks/config/coral.xml.h:13 ../hacks/config/critical.xml.h:7
+#: ../hacks/config/crystal.xml.h:7 ../hacks/config/cubenetic.xml.h:7
+#: ../hacks/config/cubestorm.xml.h:10 ../hacks/config/cynosure.xml.h:7
+#: ../hacks/config/deco.xml.h:7 ../hacks/config/deluxe.xml.h:13
+#: ../hacks/config/demon.xml.h:13 ../hacks/config/discrete.xml.h:10
+#: ../hacks/config/drift.xml.h:10 ../hacks/config/epicycle.xml.h:7
+#: ../hacks/config/eruption.xml.h:7 ../hacks/config/euler2d.xml.h:7
+#: ../hacks/config/fadeplot.xml.h:13 ../hacks/config/fiberlamp.xml.h:7
+#: ../hacks/config/flag.xml.h:11 ../hacks/config/flame.xml.h:10
+#: ../hacks/config/flow.xml.h:7 ../hacks/config/fluidballs.xml.h:7
+#: ../hacks/config/forest.xml.h:7 ../hacks/config/fuzzyflakes.xml.h:10
+#: ../hacks/config/galaxy.xml.h:11 ../hacks/config/glcells.xml.h:10
+#: ../hacks/config/goop.xml.h:10 ../hacks/config/grav.xml.h:7
+#: ../hacks/config/halftone.xml.h:7 ../hacks/config/halo.xml.h:7
+#: ../hacks/config/hopalong.xml.h:11 ../hacks/config/ifs.xml.h:64
+#: ../hacks/config/imsmap.xml.h:13 ../hacks/config/interaggregate.xml.h:7
+#: ../hacks/config/interference.xml.h:13 ../hacks/config/jigsaw.xml.h:10
+#: ../hacks/config/julia.xml.h:13 ../hacks/config/kaleidescope.xml.h:7
+#: ../hacks/config/laser.xml.h:11 ../hacks/config/lightning.xml.h:7
+#: ../hacks/config/lisa.xml.h:7 ../hacks/config/lissie.xml.h:10
+#: ../hacks/config/lmorph.xml.h:7 ../hacks/config/loop.xml.h:10
+#: ../hacks/config/metaballs.xml.h:10 ../hacks/config/mismunch.xml.h:10
+#: ../hacks/config/moire.xml.h:7 ../hacks/config/moire2.xml.h:7
+#: ../hacks/config/mountain.xml.h:10 ../hacks/config/munch.xml.h:10
+#: ../hacks/config/nerverot.xml.h:10 ../hacks/config/pedal.xml.h:7
+#: ../hacks/config/penrose.xml.h:7 ../hacks/config/petri.xml.h:14
+#: ../hacks/config/piecewise.xml.h:7 ../hacks/config/polyominoes.xml.h:11
+#: ../hacks/config/qix.xml.h:7 ../hacks/config/rd-bomb.xml.h:16
+#: ../hacks/config/rdbomb.xml.h:16 ../hacks/config/rocks.xml.h:7
+#: ../hacks/config/rotor.xml.h:10 ../hacks/config/shadebobs.xml.h:10
+#: ../hacks/config/sierpinski.xml.h:7 ../hacks/config/slip.xml.h:7
+#: ../hacks/config/sphere.xml.h:7 ../hacks/config/spiral.xml.h:7
+#: ../hacks/config/squiral.xml.h:15 ../hacks/config/starfish.xml.h:16
+#: ../hacks/config/strange.xml.h:10 ../hacks/config/swirl.xml.h:7
+#: ../hacks/config/thornbird.xml.h:7 ../hacks/config/topblock.xml.h:15
+#: ../hacks/config/triangle.xml.h:7 ../hacks/config/vines.xml.h:7
+#: ../hacks/config/voronoi.xml.h:7 ../hacks/config/whirlwindwarp.xml.h:4
+#: ../hacks/config/worm.xml.h:7
 msgid "Many"
 msgstr "Beaucoup"
 
-#: ../hacks/config/anemone.xml.h:10 ../hacks/config/pyro.xml.h:9
-msgid "Often"
-msgstr "Souvent"
-
-#: ../hacks/config/anemone.xml.h:11
-msgid "Rarely"
-msgstr "Rarement"
-
-#: ../hacks/config/anemone.xml.h:28 ../hacks/config/skytentacles.xml.h:18
+#: ../hacks/config/anemone.xml.h:20 ../hacks/config/skytentacles.xml.h:3
 msgid "Tentacles"
 msgstr "Tentacules"
 
-#: ../hacks/config/anemone.xml.h:29 ../hacks/config/cubestorm.xml.h:15
-#: ../hacks/config/deluxe.xml.h:13 ../hacks/config/fadeplot.xml.h:12
-#: ../hacks/config/fuzzyflakes.xml.h:25 ../hacks/config/glknots.xml.h:21
-#: ../hacks/config/lmorph.xml.h:16 ../hacks/config/skytentacles.xml.h:21
-#: ../hacks/config/starfish.xml.h:15 ../hacks/config/thornbird.xml.h:14
-msgid "Thick"
-msgstr "Épais(se)"
+#: ../hacks/config/anemone.xml.h:21 ../hacks/config/cubestorm.xml.h:11
+#: ../hacks/config/deluxe.xml.h:5 ../hacks/config/fadeplot.xml.h:5
+#: ../hacks/config/fuzzyflakes.xml.h:21 ../hacks/config/glknots.xml.h:19
+#: ../hacks/config/hilbert.xml.h:15 ../hacks/config/lmorph.xml.h:11
+#: ../hacks/config/skytentacles.xml.h:8 ../hacks/config/starfish.xml.h:11
+#: ../hacks/config/thornbird.xml.h:8
+msgid "Thin"
+msgstr "Fin(e)"
 
-#: ../hacks/config/anemone.xml.h:30 ../hacks/config/fadeplot.xml.h:13
-#: ../hacks/config/fuzzyflakes.xml.h:26 ../hacks/config/glknots.xml.h:22
-#: ../hacks/config/moire2.xml.h:9 ../hacks/config/skytentacles.xml.h:22
-#: ../hacks/config/thornbird.xml.h:15
+#: ../hacks/config/anemone.xml.h:22 ../hacks/config/fadeplot.xml.h:6
+#: ../hacks/config/fuzzyflakes.xml.h:22 ../hacks/config/glknots.xml.h:20
+#: ../hacks/config/moire2.xml.h:8 ../hacks/config/skytentacles.xml.h:9
+#: ../hacks/config/thornbird.xml.h:9
 msgid "Thickness"
 msgstr "Épaisseur"
 
-#: ../hacks/config/anemone.xml.h:31 ../hacks/config/cubestorm.xml.h:16
-#: ../hacks/config/deluxe.xml.h:14 ../hacks/config/fadeplot.xml.h:14
-#: ../hacks/config/fuzzyflakes.xml.h:27 ../hacks/config/glknots.xml.h:23
-#: ../hacks/config/lmorph.xml.h:17 ../hacks/config/skytentacles.xml.h:23
-#: ../hacks/config/starfish.xml.h:16 ../hacks/config/thornbird.xml.h:16
-msgid "Thin"
-msgstr "Fin(e)"
+#: ../hacks/config/anemone.xml.h:23 ../hacks/config/cubestorm.xml.h:13
+#: ../hacks/config/deluxe.xml.h:7 ../hacks/config/fadeplot.xml.h:7
+#: ../hacks/config/fuzzyflakes.xml.h:23 ../hacks/config/glknots.xml.h:21
+#: ../hacks/config/hilbert.xml.h:17 ../hacks/config/lmorph.xml.h:13
+#: ../hacks/config/skytentacles.xml.h:10 ../hacks/config/starfish.xml.h:13
+#: ../hacks/config/thornbird.xml.h:10
+msgid "Thick"
+msgstr "Épais(se)"
+
+#: ../hacks/config/anemone.xml.h:24 ../hacks/config/pyro.xml.h:10
+msgid "Often"
+msgstr "Souvent"
+
+#: ../hacks/config/anemone.xml.h:25
+msgid "Withdraw freqency"
+msgstr "Fréquence de retrait"
 
-#: ../hacks/config/anemone.xml.h:32
+#: ../hacks/config/anemone.xml.h:26
+msgid "Rarely"
+msgstr "Rarement"
+
+#: ../hacks/config/anemone.xml.h:27
 msgid "Turn speed"
 msgstr "Vitesse de rotation"
 
-#: ../hacks/config/anemone.xml.h:33
+#: ../hacks/config/anemone.xml.h:34
 msgid "Wiggling tentacles. Written by Gabriel Finch; 2002."
 msgstr "Tentacules agitées. Écrit par Gabriel Finch; 2002."
 
-#: ../hacks/config/anemone.xml.h:34
-msgid "Withdraw freqency"
-msgstr "Fréquence de retrait"
-
 #: ../hacks/config/anemotaxis.xml.h:1
 msgid "Anemotaxis"
 msgstr "Anemotaxis"
 
-#: ../hacks/config/anemotaxis.xml.h:2
-msgid ""
-"Anemotaxis demonstrates a search algorithm designed for locating a source of "
-"odor in turbulent atmosphere. The searcher is able to sense the odor and "
-"determine local instantaneous wind direction. The goal is to find the source "
-"in the shortest mean time. http://en.wikipedia.org/wiki/Anemotaxis Written "
-"by Eugene Balkovsky; 2004."
-msgstr ""
-"Anemotaxis fait la démonstration d'un algorithme de recherche conçu pour "
-"localiser la source d'une odeur dans une atmosphère turbulente. Le moteur "
-"est capable de sentir l'odeur et de déterminer la direction du vent local "
-"instantané. Le but est de trouver la source dans un temps donné le plus "
-"court. http://en.wikipedia.org/wiki/Anemotaxis écrit par Eugene Balkovsky ; "
-"2004."
-
-#: ../hacks/config/anemotaxis.xml.h:3
-msgid "Distance"
-msgstr "Distance"
-
-#: ../hacks/config/anemotaxis.xml.h:4 ../hacks/config/cubicgrid.xml.h:6
-#: ../hacks/config/hypercube.xml.h:1
-msgid "Far"
-msgstr "Loin"
-
 #. #### -colorcount [64]
-#: ../hacks/config/anemotaxis.xml.h:6 ../hacks/config/ant.xml.h:6
-#: ../hacks/config/antinspect.xml.h:4 ../hacks/config/antmaze.xml.h:3
-#: ../hacks/config/antspotlight.xml.h:3 ../hacks/config/atlantis.xml.h:8
-#: ../hacks/config/atunnel.xml.h:3 ../hacks/config/barcode.xml.h:6
-#: ../hacks/config/blaster.xml.h:4 ../hacks/config/blinkbox.xml.h:5
-#: ../hacks/config/blocktube.xml.h:5 ../hacks/config/bouboule.xml.h:4
-#: ../hacks/config/bouncingcow.xml.h:5 ../hacks/config/boxed.xml.h:9
-#: ../hacks/config/boxfit.xml.h:8 ../hacks/config/braid.xml.h:4
-#: ../hacks/config/bubble3d.xml.h:4 ../hacks/config/bubbles.xml.h:7
-#: ../hacks/config/bumps.xml.h:7 ../hacks/config/cage.xml.h:2
-#: ../hacks/config/carousel.xml.h:6 ../hacks/config/celtic.xml.h:3
-#: ../hacks/config/circuit.xml.h:6 ../hacks/config/cloudlife.xml.h:3
-#: ../hacks/config/compass.xml.h:2 ../hacks/config/coral.xml.h:7
-#: ../hacks/config/crackberg.xml.h:8 ../hacks/config/critical.xml.h:2
-#: ../hacks/config/crystal.xml.h:5 ../hacks/config/cube21.xml.h:7
-#: ../hacks/config/cubenetic.xml.h:7 ../hacks/config/cubestorm.xml.h:6
-#: ../hacks/config/cubicgrid.xml.h:8 ../hacks/config/cwaves.xml.h:4
-#: ../hacks/config/cynosure.xml.h:3 ../hacks/config/dangerball.xml.h:5
-#: ../hacks/config/decayscreen.xml.h:5 ../hacks/config/deluxe.xml.h:5
-#: ../hacks/config/demon.xml.h:7 ../hacks/config/discrete.xml.h:2
-#: ../hacks/config/distort.xml.h:7 ../hacks/config/drift.xml.h:4
-#: ../hacks/config/endgame.xml.h:3 ../hacks/config/engine.xml.h:8
-#: ../hacks/config/epicycle.xml.h:4 ../hacks/config/eruption.xml.h:7
-#: ../hacks/config/euler2d.xml.h:9 ../hacks/config/extrusion.xml.h:3
-#: ../hacks/config/fadeplot.xml.h:4 ../hacks/config/fiberlamp.xml.h:5
-#: ../hacks/config/fireworkx.xml.h:5 ../hacks/config/flag.xml.h:2
-#: ../hacks/config/flame.xml.h:6 ../hacks/config/flipflop.xml.h:6
-#: ../hacks/config/flipscreen3d.xml.h:2 ../hacks/config/fliptext.xml.h:8
-#: ../hacks/config/flow.xml.h:5 ../hacks/config/fluidballs.xml.h:6
-#: ../hacks/config/flyingtoasters.xml.h:7 ../hacks/config/fontglide.xml.h:5
-#: ../hacks/config/forest.xml.h:2 ../hacks/config/fuzzyflakes.xml.h:8
-#: ../hacks/config/galaxy.xml.h:3 ../hacks/config/gears.xml.h:4
-#: ../hacks/config/gflux.xml.h:9 ../hacks/config/glblur.xml.h:4
-#: ../hacks/config/glcells.xml.h:7 ../hacks/config/gleidescope.xml.h:4
-#: ../hacks/config/glforestfire.xml.h:5 ../hacks/config/glhanoi.xml.h:8
-#: ../hacks/config/glknots.xml.h:3 ../hacks/config/glmatrix.xml.h:6
-#: ../hacks/config/glplanet.xml.h:2 ../hacks/config/glschool.xml.h:8
-#: ../hacks/config/glslideshow.xml.h:11 ../hacks/config/glsnake.xml.h:8
-#: ../hacks/config/gltext.xml.h:6 ../hacks/config/goop.xml.h:6
+#: ../hacks/config/anemotaxis.xml.h:2 ../hacks/config/ant.xml.h:2
+#: ../hacks/config/antinspect.xml.h:2 ../hacks/config/antmaze.xml.h:2
+#: ../hacks/config/antspotlight.xml.h:2 ../hacks/config/atlantis.xml.h:2
+#: ../hacks/config/attraction.xml.h:11 ../hacks/config/atunnel.xml.h:2
+#: ../hacks/config/barcode.xml.h:2 ../hacks/config/blaster.xml.h:2
+#: ../hacks/config/blinkbox.xml.h:2 ../hacks/config/blocktube.xml.h:2
+#: ../hacks/config/bouboule.xml.h:2 ../hacks/config/bouncingcow.xml.h:2
+#: ../hacks/config/boxed.xml.h:2 ../hacks/config/boxfit.xml.h:2
+#: ../hacks/config/braid.xml.h:2 ../hacks/config/bubble3d.xml.h:2
+#: ../hacks/config/bubbles.xml.h:2 ../hacks/config/bumps.xml.h:3
+#: ../hacks/config/cage.xml.h:2 ../hacks/config/carousel.xml.h:2
+#: ../hacks/config/ccurve.xml.h:8 ../hacks/config/celtic.xml.h:2
+#: ../hacks/config/circuit.xml.h:2 ../hacks/config/cloudlife.xml.h:2
+#: ../hacks/config/companioncube.xml.h:2 ../hacks/config/compass.xml.h:2
+#: ../hacks/config/coral.xml.h:2 ../hacks/config/crackberg.xml.h:2
+#: ../hacks/config/critical.xml.h:2 ../hacks/config/crystal.xml.h:2
+#: ../hacks/config/cube21.xml.h:2 ../hacks/config/cubenetic.xml.h:2
+#: ../hacks/config/cubestorm.xml.h:2 ../hacks/config/cubicgrid.xml.h:2
+#: ../hacks/config/cwaves.xml.h:2 ../hacks/config/cynosure.xml.h:2
+#: ../hacks/config/dangerball.xml.h:2 ../hacks/config/decayscreen.xml.h:2
+#: ../hacks/config/deluxe.xml.h:2 ../hacks/config/demon.xml.h:2
+#: ../hacks/config/discrete.xml.h:2 ../hacks/config/distort.xml.h:2
+#: ../hacks/config/dnalogo.xml.h:2 ../hacks/config/drift.xml.h:2
+#: ../hacks/config/endgame.xml.h:2 ../hacks/config/engine.xml.h:2
+#: ../hacks/config/epicycle.xml.h:2 ../hacks/config/eruption.xml.h:2
+#: ../hacks/config/euler2d.xml.h:2 ../hacks/config/extrusion.xml.h:2
+#: ../hacks/config/fadeplot.xml.h:2 ../hacks/config/fiberlamp.xml.h:2
+#: ../hacks/config/fireworkx.xml.h:2 ../hacks/config/flag.xml.h:3
+#: ../hacks/config/flame.xml.h:2 ../hacks/config/flipflop.xml.h:2
+#: ../hacks/config/flipscreen3d.xml.h:2 ../hacks/config/fliptext.xml.h:2
+#: ../hacks/config/flow.xml.h:2 ../hacks/config/fluidballs.xml.h:2
+#: ../hacks/config/flyingtoasters.xml.h:2 ../hacks/config/fontglide.xml.h:2
+#: ../hacks/config/forest.xml.h:2 ../hacks/config/fuzzyflakes.xml.h:2
+#: ../hacks/config/galaxy.xml.h:2 ../hacks/config/gears.xml.h:2
+#: ../hacks/config/gflux.xml.h:2 ../hacks/config/glblur.xml.h:2
+#: ../hacks/config/glcells.xml.h:2 ../hacks/config/gleidescope.xml.h:2
+#: ../hacks/config/glforestfire.xml.h:2 ../hacks/config/glhanoi.xml.h:2
+#: ../hacks/config/glknots.xml.h:2 ../hacks/config/glmatrix.xml.h:2
+#: ../hacks/config/glplanet.xml.h:2 ../hacks/config/glschool.xml.h:2
+#: ../hacks/config/glslideshow.xml.h:2 ../hacks/config/glsnake.xml.h:2
+#: ../hacks/config/gltext.xml.h:2 ../hacks/config/goop.xml.h:2
 #: ../hacks/config/grav.xml.h:2 ../hacks/config/greynetic.xml.h:2
-#: ../hacks/config/halftone.xml.h:6 ../hacks/config/halo.xml.h:4
-#: ../hacks/config/helix.xml.h:3 ../hacks/config/hopalong.xml.h:9
-#: ../hacks/config/hyperball.xml.h:2 ../hacks/config/hypercube.xml.h:3
-#: ../hacks/config/hypertorus.xml.h:4 ../hacks/config/hypnowheel.xml.h:7
-#: ../hacks/config/ifs.xml.h:4 ../hacks/config/imsmap.xml.h:6
-#: ../hacks/config/interaggregate.xml.h:3 ../hacks/config/interference.xml.h:7
-#: ../hacks/config/intermomentary.xml.h:4 ../hacks/config/jigglypuff.xml.h:9
-#: ../hacks/config/jigsaw.xml.h:4 ../hacks/config/juggle.xml.h:6
-#: ../hacks/config/juggler3d.xml.h:7 ../hacks/config/julia.xml.h:4
-#: ../hacks/config/kaleidescope.xml.h:5 ../hacks/config/klein.xml.h:9
-#: ../hacks/config/kumppa.xml.h:2 ../hacks/config/lament.xml.h:3
-#: ../hacks/config/laser.xml.h:3 ../hacks/config/lavalite.xml.h:9
-#: ../hacks/config/lcdscrub.xml.h:4 ../hacks/config/lightning.xml.h:1
-#: ../hacks/config/lisa.xml.h:5 ../hacks/config/lissie.xml.h:4
-#: ../hacks/config/lmorph.xml.h:4 ../hacks/config/lockward.xml.h:3
-#: ../hacks/config/loop.xml.h:1 ../hacks/config/maze.xml.h:4
-#: ../hacks/config/memscroller.xml.h:5 ../hacks/config/menger.xml.h:3
-#: ../hacks/config/metaballs.xml.h:4 ../hacks/config/mirrorblob.xml.h:13
+#: ../hacks/config/halftone.xml.h:2 ../hacks/config/halo.xml.h:2
+#: ../hacks/config/helix.xml.h:2 ../hacks/config/hopalong.xml.h:2
+#: ../hacks/config/hyperball.xml.h:2 ../hacks/config/hypercube.xml.h:2
+#: ../hacks/config/hypertorus.xml.h:2 ../hacks/config/hypnowheel.xml.h:14
+#: ../hacks/config/ifs.xml.h:2 ../hacks/config/imsmap.xml.h:2
+#: ../hacks/config/interaggregate.xml.h:2 ../hacks/config/interference.xml.h:2
+#: ../hacks/config/intermomentary.xml.h:2 ../hacks/config/jigglypuff.xml.h:3
+#: ../hacks/config/jigsaw.xml.h:2 ../hacks/config/juggle.xml.h:2
+#: ../hacks/config/juggler3d.xml.h:2 ../hacks/config/julia.xml.h:2
+#: ../hacks/config/kaleidescope.xml.h:2 ../hacks/config/klein.xml.h:2
+#: ../hacks/config/kumppa.xml.h:2 ../hacks/config/lament.xml.h:2
+#: ../hacks/config/laser.xml.h:2 ../hacks/config/lavalite.xml.h:2
+#: ../hacks/config/lcdscrub.xml.h:2 ../hacks/config/lightning.xml.h:2
+#: ../hacks/config/lisa.xml.h:2 ../hacks/config/lissie.xml.h:2
+#: ../hacks/config/lmorph.xml.h:2 ../hacks/config/lockward.xml.h:2
+#: ../hacks/config/loop.xml.h:2 ../hacks/config/maze.xml.h:2
+#: ../hacks/config/memscroller.xml.h:2 ../hacks/config/menger.xml.h:2
+#: ../hacks/config/metaballs.xml.h:2 ../hacks/config/mirrorblob.xml.h:2
 #: ../hacks/config/mismunch.xml.h:2 ../hacks/config/moebius.xml.h:2
-#: ../hacks/config/moebiusgears.xml.h:3 ../hacks/config/moire2.xml.h:1
-#: ../hacks/config/molecule.xml.h:12 ../hacks/config/morph3d.xml.h:3
-#: ../hacks/config/mountain.xml.h:1 ../hacks/config/munch.xml.h:3
-#: ../hacks/config/nerverot.xml.h:10 ../hacks/config/noof.xml.h:2
-#: ../hacks/config/pacman.xml.h:1 ../hacks/config/penrose.xml.h:3
-#: ../hacks/config/petri.xml.h:8 ../hacks/config/phosphor.xml.h:5
-#: ../hacks/config/photopile.xml.h:7 ../hacks/config/piecewise.xml.h:5
-#: ../hacks/config/pinion.xml.h:5 ../hacks/config/pipes.xml.h:8
-#: ../hacks/config/polyhedra.xml.h:17 ../hacks/config/polyominoes.xml.h:2
-#: ../hacks/config/polytopes.xml.h:10 ../hacks/config/popsquares.xml.h:8
-#: ../hacks/config/providence.xml.h:3 ../hacks/config/pulsar.xml.h:10
-#: ../hacks/config/pyro.xml.h:5 ../hacks/config/qix.xml.h:8
-#: ../hacks/config/queens.xml.h:1 ../hacks/config/rd-bomb.xml.h:10
-#: ../hacks/config/rdbomb.xml.h:10 ../hacks/config/ripples.xml.h:8
-#: ../hacks/config/rocks.xml.h:5 ../hacks/config/rotor.xml.h:2
-#: ../hacks/config/rotzoomer.xml.h:6 ../hacks/config/rubik.xml.h:5
-#: ../hacks/config/rubikblocks.xml.h:4 ../hacks/config/sballs.xml.h:4
-#: ../hacks/config/shadebobs.xml.h:3 ../hacks/config/sierpinski.xml.h:2
-#: ../hacks/config/sierpinski3d.xml.h:2 ../hacks/config/skytentacles.xml.h:7
-#: ../hacks/config/slidescreen.xml.h:6 ../hacks/config/slip.xml.h:3
-#: ../hacks/config/sonar.xml.h:5 ../hacks/config/speedmine.xml.h:4
-#: ../hacks/config/sphere.xml.h:1 ../hacks/config/spheremonics.xml.h:5
-#: ../hacks/config/spiral.xml.h:4 ../hacks/config/spotlight.xml.h:5
-#: ../hacks/config/sproingies.xml.h:2 ../hacks/config/squiral.xml.h:4
+#: ../hacks/config/moebiusgears.xml.h:2 ../hacks/config/moire2.xml.h:2
+#: ../hacks/config/molecule.xml.h:2 ../hacks/config/morph3d.xml.h:2
+#: ../hacks/config/mountain.xml.h:2 ../hacks/config/munch.xml.h:2
+#: ../hacks/config/nerverot.xml.h:2 ../hacks/config/noof.xml.h:2
+#: ../hacks/config/pacman.xml.h:2 ../hacks/config/penrose.xml.h:2
+#: ../hacks/config/petri.xml.h:2 ../hacks/config/phosphor.xml.h:2
+#: ../hacks/config/photopile.xml.h:15 ../hacks/config/piecewise.xml.h:2
+#: ../hacks/config/pinion.xml.h:2 ../hacks/config/pipes.xml.h:2
+#: ../hacks/config/polyhedra.xml.h:2 ../hacks/config/polyominoes.xml.h:3
+#: ../hacks/config/polytopes.xml.h:23 ../hacks/config/popsquares.xml.h:2
+#: ../hacks/config/providence.xml.h:2 ../hacks/config/pulsar.xml.h:2
+#: ../hacks/config/pyro.xml.h:11 ../hacks/config/qix.xml.h:2
+#: ../hacks/config/queens.xml.h:2 ../hacks/config/ripples.xml.h:2
+#: ../hacks/config/rocks.xml.h:2 ../hacks/config/rotor.xml.h:2
+#: ../hacks/config/rotzoomer.xml.h:2 ../hacks/config/rubik.xml.h:2
+#: ../hacks/config/rubikblocks.xml.h:2 ../hacks/config/sballs.xml.h:2
+#: ../hacks/config/shadebobs.xml.h:2 ../hacks/config/sierpinski.xml.h:2
+#: ../hacks/config/sierpinski3d.xml.h:2 ../hacks/config/skytentacles.xml.h:11
+#: ../hacks/config/slidescreen.xml.h:2 ../hacks/config/slip.xml.h:2
+#: ../hacks/config/sonar.xml.h:2 ../hacks/config/speedmine.xml.h:2
+#: ../hacks/config/sphere.xml.h:2 ../hacks/config/spheremonics.xml.h:2
+#: ../hacks/config/spiral.xml.h:2 ../hacks/config/spotlight.xml.h:2
+#: ../hacks/config/sproingies.xml.h:2 ../hacks/config/squiral.xml.h:2
 #: ../hacks/config/stairs.xml.h:2 ../hacks/config/starfish.xml.h:5
-#: ../hacks/config/stonerview.xml.h:2 ../hacks/config/strange.xml.h:3
-#: ../hacks/config/substrate.xml.h:9 ../hacks/config/superquadrics.xml.h:4
-#: ../hacks/config/surfaces.xml.h:7 ../hacks/config/swirl.xml.h:4
-#: ../hacks/config/t3d.xml.h:6 ../hacks/config/tangram.xml.h:4
-#: ../hacks/config/thornbird.xml.h:3 ../hacks/config/topblock.xml.h:10
-#: ../hacks/config/triangle.xml.h:1 ../hacks/config/truchet.xml.h:1
-#: ../hacks/config/twang.xml.h:6 ../hacks/config/vines.xml.h:1
-#: ../hacks/config/voronoi.xml.h:7 ../hacks/config/wander.xml.h:6
-#: ../hacks/config/worm.xml.h:2 ../hacks/config/wormhole.xml.h:4
-#: ../hacks/config/xflame.xml.h:4 ../hacks/config/xlyap.xml.h:2
-#: ../hacks/config/xmatrix.xml.h:5 ../hacks/config/xrayswarm.xml.h:2
-#: ../hacks/config/xspirograph.xml.h:3 ../hacks/config/zoom.xml.h:8
+#: ../hacks/config/stonerview.xml.h:2 ../hacks/config/strange.xml.h:2
+#: ../hacks/config/substrate.xml.h:2 ../hacks/config/superquadrics.xml.h:2
+#: ../hacks/config/surfaces.xml.h:2 ../hacks/config/swirl.xml.h:2
+#: ../hacks/config/t3d.xml.h:2 ../hacks/config/tangram.xml.h:2
+#: ../hacks/config/thornbird.xml.h:2 ../hacks/config/topblock.xml.h:2
+#: ../hacks/config/triangle.xml.h:2 ../hacks/config/tronbit.xml.h:2
+#: ../hacks/config/truchet.xml.h:2 ../hacks/config/twang.xml.h:2
+#: ../hacks/config/vines.xml.h:2 ../hacks/config/wander.xml.h:2
+#: ../hacks/config/whirlygig.xml.h:4 ../hacks/config/worm.xml.h:2
+#: ../hacks/config/wormhole.xml.h:2 ../hacks/config/xflame.xml.h:2
+#: ../hacks/config/xlyap.xml.h:2 ../hacks/config/xmatrix.xml.h:15
+#: ../hacks/config/xrayswarm.xml.h:2 ../hacks/config/xspirograph.xml.h:2
+#: ../hacks/config/zoom.xml.h:2
+msgid "Low"
+msgstr "Bas(se)"
+
+#. #### -colorcount [64]
+#: ../hacks/config/anemotaxis.xml.h:3 ../hacks/config/ant.xml.h:3
+#: ../hacks/config/antinspect.xml.h:3 ../hacks/config/antmaze.xml.h:3
+#: ../hacks/config/antspotlight.xml.h:3 ../hacks/config/atlantis.xml.h:3
+#: ../hacks/config/atunnel.xml.h:3 ../hacks/config/barcode.xml.h:3
+#: ../hacks/config/blaster.xml.h:3 ../hacks/config/blinkbox.xml.h:3
+#: ../hacks/config/blocktube.xml.h:3 ../hacks/config/bouboule.xml.h:3
+#: ../hacks/config/bouncingcow.xml.h:3 ../hacks/config/boxed.xml.h:3
+#: ../hacks/config/boxfit.xml.h:3 ../hacks/config/braid.xml.h:3
+#: ../hacks/config/bubble3d.xml.h:3 ../hacks/config/bubbles.xml.h:3
+#: ../hacks/config/bumps.xml.h:5 ../hacks/config/cage.xml.h:3
+#: ../hacks/config/carousel.xml.h:3 ../hacks/config/celtic.xml.h:3
+#: ../hacks/config/circuit.xml.h:3 ../hacks/config/cloudlife.xml.h:3
+#: ../hacks/config/companioncube.xml.h:3 ../hacks/config/compass.xml.h:3
+#: ../hacks/config/coral.xml.h:3 ../hacks/config/crackberg.xml.h:3
+#: ../hacks/config/critical.xml.h:3 ../hacks/config/crystal.xml.h:3
+#: ../hacks/config/cube21.xml.h:3 ../hacks/config/cubenetic.xml.h:3
+#: ../hacks/config/cubestorm.xml.h:3 ../hacks/config/cubicgrid.xml.h:3
+#: ../hacks/config/cwaves.xml.h:3 ../hacks/config/cynosure.xml.h:3
+#: ../hacks/config/dangerball.xml.h:3 ../hacks/config/decayscreen.xml.h:3
+#: ../hacks/config/deluxe.xml.h:3 ../hacks/config/demon.xml.h:3
+#: ../hacks/config/discrete.xml.h:3 ../hacks/config/distort.xml.h:3
+#: ../hacks/config/drift.xml.h:3 ../hacks/config/endgame.xml.h:3
+#: ../hacks/config/engine.xml.h:3 ../hacks/config/epicycle.xml.h:3
+#: ../hacks/config/eruption.xml.h:3 ../hacks/config/euler2d.xml.h:3
+#: ../hacks/config/extrusion.xml.h:3 ../hacks/config/fadeplot.xml.h:3
+#: ../hacks/config/fiberlamp.xml.h:3 ../hacks/config/fireworkx.xml.h:3
+#: ../hacks/config/flag.xml.h:4 ../hacks/config/flame.xml.h:3
+#: ../hacks/config/flipflop.xml.h:3 ../hacks/config/flipscreen3d.xml.h:3
+#: ../hacks/config/fliptext.xml.h:3 ../hacks/config/flow.xml.h:3
+#: ../hacks/config/fluidballs.xml.h:3 ../hacks/config/flyingtoasters.xml.h:3
+#: ../hacks/config/fontglide.xml.h:3 ../hacks/config/forest.xml.h:3
+#: ../hacks/config/fuzzyflakes.xml.h:3 ../hacks/config/galaxy.xml.h:3
+#: ../hacks/config/gears.xml.h:3 ../hacks/config/gflux.xml.h:3
+#: ../hacks/config/glblur.xml.h:3 ../hacks/config/glcells.xml.h:3
+#: ../hacks/config/gleidescope.xml.h:3 ../hacks/config/glforestfire.xml.h:3
+#: ../hacks/config/glhanoi.xml.h:3 ../hacks/config/glknots.xml.h:3
+#: ../hacks/config/glmatrix.xml.h:3 ../hacks/config/glplanet.xml.h:3
+#: ../hacks/config/glschool.xml.h:3 ../hacks/config/glslideshow.xml.h:3
+#: ../hacks/config/glsnake.xml.h:3 ../hacks/config/gltext.xml.h:3
+#: ../hacks/config/goop.xml.h:3 ../hacks/config/grav.xml.h:3
+#: ../hacks/config/greynetic.xml.h:3 ../hacks/config/halftone.xml.h:3
+#: ../hacks/config/halo.xml.h:3 ../hacks/config/helix.xml.h:3
+#: ../hacks/config/hilbert.xml.h:9 ../hacks/config/hopalong.xml.h:3
+#: ../hacks/config/hyperball.xml.h:3 ../hacks/config/hypercube.xml.h:3
+#: ../hacks/config/hypertorus.xml.h:3 ../hacks/config/hypnowheel.xml.h:3
+#: ../hacks/config/ifs.xml.h:3 ../hacks/config/imsmap.xml.h:3
+#: ../hacks/config/interaggregate.xml.h:3 ../hacks/config/interference.xml.h:3
+#: ../hacks/config/intermomentary.xml.h:3 ../hacks/config/jigglypuff.xml.h:4
+#: ../hacks/config/jigsaw.xml.h:3 ../hacks/config/juggle.xml.h:3
+#: ../hacks/config/juggler3d.xml.h:3 ../hacks/config/julia.xml.h:3
+#: ../hacks/config/kaleidescope.xml.h:3 ../hacks/config/klein.xml.h:3
+#: ../hacks/config/kumppa.xml.h:3 ../hacks/config/lament.xml.h:3
+#: ../hacks/config/laser.xml.h:3 ../hacks/config/lavalite.xml.h:3
+#: ../hacks/config/lcdscrub.xml.h:3 ../hacks/config/lightning.xml.h:3
+#: ../hacks/config/lisa.xml.h:3 ../hacks/config/lissie.xml.h:3
+#: ../hacks/config/lmorph.xml.h:3 ../hacks/config/lockward.xml.h:3
+#: ../hacks/config/loop.xml.h:3 ../hacks/config/maze.xml.h:3
+#: ../hacks/config/memscroller.xml.h:3 ../hacks/config/menger.xml.h:3
+#: ../hacks/config/metaballs.xml.h:3 ../hacks/config/mirrorblob.xml.h:3
+#: ../hacks/config/mismunch.xml.h:3 ../hacks/config/moebius.xml.h:3
+#: ../hacks/config/moebiusgears.xml.h:3 ../hacks/config/moire2.xml.h:3
+#: ../hacks/config/molecule.xml.h:3 ../hacks/config/morph3d.xml.h:3
+#: ../hacks/config/mountain.xml.h:3 ../hacks/config/munch.xml.h:3
+#: ../hacks/config/nerverot.xml.h:3 ../hacks/config/noof.xml.h:3
+#: ../hacks/config/pacman.xml.h:3 ../hacks/config/penrose.xml.h:3
+#: ../hacks/config/petri.xml.h:3 ../hacks/config/phosphor.xml.h:3
+#: ../hacks/config/photopile.xml.h:16 ../hacks/config/piecewise.xml.h:3
+#: ../hacks/config/pinion.xml.h:3 ../hacks/config/pipes.xml.h:3
+#: ../hacks/config/polyhedra.xml.h:3 ../hacks/config/polyominoes.xml.h:4
+#: ../hacks/config/polytopes.xml.h:24 ../hacks/config/popsquares.xml.h:3
+#: ../hacks/config/providence.xml.h:3 ../hacks/config/pulsar.xml.h:3
+#: ../hacks/config/pyro.xml.h:3 ../hacks/config/qix.xml.h:3
+#: ../hacks/config/queens.xml.h:3 ../hacks/config/rd-bomb.xml.h:3
+#: ../hacks/config/rdbomb.xml.h:3 ../hacks/config/ripples.xml.h:3
+#: ../hacks/config/rocks.xml.h:3 ../hacks/config/rotor.xml.h:3
+#: ../hacks/config/rotzoomer.xml.h:3 ../hacks/config/rubik.xml.h:3
+#: ../hacks/config/rubikblocks.xml.h:3 ../hacks/config/sballs.xml.h:3
+#: ../hacks/config/shadebobs.xml.h:3 ../hacks/config/sierpinski.xml.h:3
+#: ../hacks/config/sierpinski3d.xml.h:3 ../hacks/config/skytentacles.xml.h:16
+#: ../hacks/config/slidescreen.xml.h:3 ../hacks/config/slip.xml.h:3
+#: ../hacks/config/sonar.xml.h:3 ../hacks/config/speedmine.xml.h:3
+#: ../hacks/config/sphere.xml.h:3 ../hacks/config/spheremonics.xml.h:3
+#: ../hacks/config/spiral.xml.h:3 ../hacks/config/spotlight.xml.h:3
+#: ../hacks/config/sproingies.xml.h:3 ../hacks/config/squiral.xml.h:3
+#: ../hacks/config/stairs.xml.h:3 ../hacks/config/starfish.xml.h:6
+#: ../hacks/config/stonerview.xml.h:3 ../hacks/config/strange.xml.h:3
+#: ../hacks/config/substrate.xml.h:3 ../hacks/config/superquadrics.xml.h:3
+#: ../hacks/config/surfaces.xml.h:3 ../hacks/config/swirl.xml.h:3
+#: ../hacks/config/t3d.xml.h:3 ../hacks/config/tangram.xml.h:3
+#: ../hacks/config/thornbird.xml.h:3 ../hacks/config/topblock.xml.h:3
+#: ../hacks/config/triangle.xml.h:3 ../hacks/config/tronbit.xml.h:3
+#: ../hacks/config/truchet.xml.h:3 ../hacks/config/twang.xml.h:3
+#: ../hacks/config/vines.xml.h:3 ../hacks/config/voronoi.xml.h:3
+#: ../hacks/config/wander.xml.h:3 ../hacks/config/worm.xml.h:3
+#: ../hacks/config/wormhole.xml.h:3 ../hacks/config/xflame.xml.h:3
+#: ../hacks/config/xlyap.xml.h:3 ../hacks/config/xmatrix.xml.h:16
+#: ../hacks/config/xrayswarm.xml.h:3 ../hacks/config/xspirograph.xml.h:3
+#: ../hacks/config/zoom.xml.h:3
 msgid "Frame rate"
 msgstr "Nombre d'images par seconde"
 
 #. #### -colorcount [64]
-#: ../hacks/config/anemotaxis.xml.h:7 ../hacks/config/ant.xml.h:7
-#: ../hacks/config/antinspect.xml.h:5 ../hacks/config/antmaze.xml.h:4
-#: ../hacks/config/antspotlight.xml.h:4 ../hacks/config/atlantis.xml.h:10
-#: ../hacks/config/attraction.xml.h:9 ../hacks/config/atunnel.xml.h:4
-#: ../hacks/config/barcode.xml.h:7 ../hacks/config/blaster.xml.h:5
-#: ../hacks/config/blinkbox.xml.h:6 ../hacks/config/blocktube.xml.h:6
-#: ../hacks/config/bouboule.xml.h:5 ../hacks/config/bouncingcow.xml.h:7
-#: ../hacks/config/boxed.xml.h:11 ../hacks/config/boxfit.xml.h:11
-#: ../hacks/config/braid.xml.h:5 ../hacks/config/bubble3d.xml.h:5
-#: ../hacks/config/bubbles.xml.h:8 ../hacks/config/bumps.xml.h:9
-#: ../hacks/config/cage.xml.h:3 ../hacks/config/carousel.xml.h:7
-#: ../hacks/config/ccurve.xml.h:9 ../hacks/config/celtic.xml.h:4
-#: ../hacks/config/circuit.xml.h:7 ../hacks/config/cloudlife.xml.h:6
-#: ../hacks/config/compass.xml.h:3 ../hacks/config/coral.xml.h:8
-#: ../hacks/config/crackberg.xml.h:9 ../hacks/config/critical.xml.h:3
-#: ../hacks/config/crystal.xml.h:6 ../hacks/config/cube21.xml.h:8
-#: ../hacks/config/cubenetic.xml.h:8 ../hacks/config/cubestorm.xml.h:7
-#: ../hacks/config/cubicgrid.xml.h:9 ../hacks/config/cwaves.xml.h:5
-#: ../hacks/config/cynosure.xml.h:4 ../hacks/config/dangerball.xml.h:6
-#: ../hacks/config/decayscreen.xml.h:7 ../hacks/config/deluxe.xml.h:6
-#: ../hacks/config/demon.xml.h:8 ../hacks/config/discrete.xml.h:3
-#: ../hacks/config/distort.xml.h:9 ../hacks/config/dnalogo.xml.h:7
-#: ../hacks/config/drift.xml.h:5 ../hacks/config/endgame.xml.h:4
-#: ../hacks/config/engine.xml.h:9 ../hacks/config/epicycle.xml.h:6
-#: ../hacks/config/eruption.xml.h:10 ../hacks/config/euler2d.xml.h:10
-#: ../hacks/config/extrusion.xml.h:7 ../hacks/config/fadeplot.xml.h:5
-#: ../hacks/config/fiberlamp.xml.h:6 ../hacks/config/fireworkx.xml.h:7
-#: ../hacks/config/flag.xml.h:3 ../hacks/config/flame.xml.h:7
-#: ../hacks/config/flipflop.xml.h:7 ../hacks/config/flipscreen3d.xml.h:4
-#: ../hacks/config/fliptext.xml.h:9 ../hacks/config/flow.xml.h:6
-#: ../hacks/config/fluidballs.xml.h:9 ../hacks/config/flyingtoasters.xml.h:8
-#: ../hacks/config/fontglide.xml.h:6 ../hacks/config/forest.xml.h:3
-#: ../hacks/config/fuzzyflakes.xml.h:11 ../hacks/config/galaxy.xml.h:5
-#: ../hacks/config/gears.xml.h:7 ../hacks/config/gflux.xml.h:11
-#: ../hacks/config/glblur.xml.h:6 ../hacks/config/glcells.xml.h:10
-#: ../hacks/config/gleidescope.xml.h:6 ../hacks/config/glforestfire.xml.h:7
-#: ../hacks/config/glhanoi.xml.h:10 ../hacks/config/glknots.xml.h:6
-#: ../hacks/config/glmatrix.xml.h:12 ../hacks/config/glplanet.xml.h:4
-#: ../hacks/config/glschool.xml.h:11 ../hacks/config/glslideshow.xml.h:13
-#: ../hacks/config/glsnake.xml.h:10 ../hacks/config/gltext.xml.h:8
-#: ../hacks/config/goop.xml.h:8 ../hacks/config/grav.xml.h:4
-#: ../hacks/config/greynetic.xml.h:5 ../hacks/config/halftone.xml.h:9
-#: ../hacks/config/halo.xml.h:6 ../hacks/config/helix.xml.h:5
-#: ../hacks/config/hopalong.xml.h:10 ../hacks/config/hyperball.xml.h:3
-#: ../hacks/config/hypercube.xml.h:4 ../hacks/config/hypertorus.xml.h:5
-#: ../hacks/config/hypnowheel.xml.h:8 ../hacks/config/ifs.xml.h:5
-#: ../hacks/config/imsmap.xml.h:7 ../hacks/config/interaggregate.xml.h:4
-#: ../hacks/config/interference.xml.h:8 ../hacks/config/intermomentary.xml.h:5
-#: ../hacks/config/jigglypuff.xml.h:10 ../hacks/config/jigsaw.xml.h:5
-#: ../hacks/config/juggle.xml.h:7 ../hacks/config/juggler3d.xml.h:8
-#: ../hacks/config/julia.xml.h:5 ../hacks/config/kaleidescope.xml.h:6
-#: ../hacks/config/klein.xml.h:10 ../hacks/config/kumppa.xml.h:3
-#: ../hacks/config/lament.xml.h:4 ../hacks/config/laser.xml.h:4
-#: ../hacks/config/lavalite.xml.h:11 ../hacks/config/lcdscrub.xml.h:5
-#: ../hacks/config/lightning.xml.h:2 ../hacks/config/lisa.xml.h:6
-#: ../hacks/config/lissie.xml.h:5 ../hacks/config/lmorph.xml.h:5
-#: ../hacks/config/lockward.xml.h:4 ../hacks/config/loop.xml.h:4
-#: ../hacks/config/maze.xml.h:7 ../hacks/config/memscroller.xml.h:6
-#: ../hacks/config/menger.xml.h:4 ../hacks/config/metaballs.xml.h:5
-#: ../hacks/config/mirrorblob.xml.h:14 ../hacks/config/mismunch.xml.h:3
-#: ../hacks/config/moebius.xml.h:3 ../hacks/config/moebiusgears.xml.h:4
-#: ../hacks/config/moire2.xml.h:3 ../hacks/config/molecule.xml.h:13
-#: ../hacks/config/morph3d.xml.h:4 ../hacks/config/mountain.xml.h:3
-#: ../hacks/config/munch.xml.h:4 ../hacks/config/nerverot.xml.h:12
-#: ../hacks/config/noof.xml.h:3 ../hacks/config/pacman.xml.h:2
-#: ../hacks/config/penrose.xml.h:4 ../hacks/config/petri.xml.h:9
-#: ../hacks/config/phosphor.xml.h:6 ../hacks/config/photopile.xml.h:8
-#: ../hacks/config/piecewise.xml.h:6 ../hacks/config/pinion.xml.h:7
-#: ../hacks/config/pipes.xml.h:10 ../hacks/config/polyhedra.xml.h:71
-#: ../hacks/config/polyominoes.xml.h:3 ../hacks/config/polytopes.xml.h:11
-#: ../hacks/config/popsquares.xml.h:9 ../hacks/config/providence.xml.h:4
-#: ../hacks/config/pulsar.xml.h:11 ../hacks/config/pyro.xml.h:6
-#: ../hacks/config/qix.xml.h:10 ../hacks/config/queens.xml.h:2
-#: ../hacks/config/ripples.xml.h:10 ../hacks/config/rocks.xml.h:6
-#: ../hacks/config/rotor.xml.h:3 ../hacks/config/rotzoomer.xml.h:7
-#: ../hacks/config/rubik.xml.h:7 ../hacks/config/rubikblocks.xml.h:5
-#: ../hacks/config/sballs.xml.h:5 ../hacks/config/shadebobs.xml.h:4
-#: ../hacks/config/sierpinski.xml.h:3 ../hacks/config/sierpinski3d.xml.h:3
-#: ../hacks/config/skytentacles.xml.h:8 ../hacks/config/slidescreen.xml.h:8
-#: ../hacks/config/slip.xml.h:4 ../hacks/config/sonar.xml.h:6
-#: ../hacks/config/speedmine.xml.h:6 ../hacks/config/sphere.xml.h:2
-#: ../hacks/config/spheremonics.xml.h:6 ../hacks/config/spiral.xml.h:5
-#: ../hacks/config/spotlight.xml.h:6 ../hacks/config/sproingies.xml.h:3
-#: ../hacks/config/squiral.xml.h:6 ../hacks/config/stairs.xml.h:3
-#: ../hacks/config/starfish.xml.h:6 ../hacks/config/starwars.xml.h:11
-#: ../hacks/config/stonerview.xml.h:3 ../hacks/config/strange.xml.h:4
-#: ../hacks/config/substrate.xml.h:10 ../hacks/config/superquadrics.xml.h:5
-#: ../hacks/config/surfaces.xml.h:9 ../hacks/config/swirl.xml.h:5
-#: ../hacks/config/t3d.xml.h:7 ../hacks/config/tangram.xml.h:5
-#: ../hacks/config/thornbird.xml.h:4 ../hacks/config/topblock.xml.h:11
-#: ../hacks/config/triangle.xml.h:3 ../hacks/config/truchet.xml.h:2
-#: ../hacks/config/twang.xml.h:8 ../hacks/config/vines.xml.h:2
-#: ../hacks/config/wander.xml.h:7 ../hacks/config/whirlygig.xml.h:2
-#: ../hacks/config/worm.xml.h:3 ../hacks/config/wormhole.xml.h:5
-#: ../hacks/config/xflame.xml.h:5 ../hacks/config/xlyap.xml.h:3
-#: ../hacks/config/xmatrix.xml.h:9 ../hacks/config/xrayswarm.xml.h:3
-#: ../hacks/config/xspirograph.xml.h:4 ../hacks/config/zoom.xml.h:9
+#: ../hacks/config/anemotaxis.xml.h:4 ../hacks/config/ant.xml.h:4
+#: ../hacks/config/antinspect.xml.h:4 ../hacks/config/antmaze.xml.h:4
+#: ../hacks/config/antspotlight.xml.h:4 ../hacks/config/atlantis.xml.h:4
+#: ../hacks/config/attraction.xml.h:13 ../hacks/config/atunnel.xml.h:4
+#: ../hacks/config/barcode.xml.h:4 ../hacks/config/blaster.xml.h:4
+#: ../hacks/config/blinkbox.xml.h:4 ../hacks/config/blocktube.xml.h:4
+#: ../hacks/config/bouboule.xml.h:4 ../hacks/config/bouncingcow.xml.h:4
+#: ../hacks/config/boxed.xml.h:4 ../hacks/config/boxfit.xml.h:4
+#: ../hacks/config/braid.xml.h:4 ../hacks/config/bubble3d.xml.h:4
+#: ../hacks/config/bubbles.xml.h:4 ../hacks/config/bumps.xml.h:7
+#: ../hacks/config/cage.xml.h:4 ../hacks/config/carousel.xml.h:4
+#: ../hacks/config/ccurve.xml.h:10 ../hacks/config/celtic.xml.h:4
+#: ../hacks/config/circuit.xml.h:4 ../hacks/config/cloudlife.xml.h:4
+#: ../hacks/config/companioncube.xml.h:4 ../hacks/config/compass.xml.h:4
+#: ../hacks/config/coral.xml.h:4 ../hacks/config/crackberg.xml.h:4
+#: ../hacks/config/critical.xml.h:4 ../hacks/config/crystal.xml.h:4
+#: ../hacks/config/cube21.xml.h:4 ../hacks/config/cubenetic.xml.h:4
+#: ../hacks/config/cubestorm.xml.h:4 ../hacks/config/cubicgrid.xml.h:4
+#: ../hacks/config/cwaves.xml.h:4 ../hacks/config/cynosure.xml.h:4
+#: ../hacks/config/dangerball.xml.h:4 ../hacks/config/decayscreen.xml.h:4
+#: ../hacks/config/deluxe.xml.h:4 ../hacks/config/demon.xml.h:4
+#: ../hacks/config/discrete.xml.h:4 ../hacks/config/distort.xml.h:4
+#: ../hacks/config/dnalogo.xml.h:4 ../hacks/config/drift.xml.h:4
+#: ../hacks/config/endgame.xml.h:4 ../hacks/config/engine.xml.h:4
+#: ../hacks/config/epicycle.xml.h:4 ../hacks/config/eruption.xml.h:4
+#: ../hacks/config/euler2d.xml.h:4 ../hacks/config/extrusion.xml.h:4
+#: ../hacks/config/fadeplot.xml.h:4 ../hacks/config/fiberlamp.xml.h:4
+#: ../hacks/config/fireworkx.xml.h:4 ../hacks/config/flag.xml.h:5
+#: ../hacks/config/flame.xml.h:4 ../hacks/config/flipflop.xml.h:4
+#: ../hacks/config/flipscreen3d.xml.h:4 ../hacks/config/fliptext.xml.h:4
+#: ../hacks/config/flow.xml.h:4 ../hacks/config/fluidballs.xml.h:4
+#: ../hacks/config/flyingtoasters.xml.h:4 ../hacks/config/fontglide.xml.h:4
+#: ../hacks/config/forest.xml.h:4 ../hacks/config/fuzzyflakes.xml.h:4
+#: ../hacks/config/galaxy.xml.h:4 ../hacks/config/gears.xml.h:4
+#: ../hacks/config/gflux.xml.h:4 ../hacks/config/glblur.xml.h:4
+#: ../hacks/config/glcells.xml.h:4 ../hacks/config/gleidescope.xml.h:4
+#: ../hacks/config/glforestfire.xml.h:4 ../hacks/config/glhanoi.xml.h:4
+#: ../hacks/config/glknots.xml.h:4 ../hacks/config/glmatrix.xml.h:4
+#: ../hacks/config/glplanet.xml.h:4 ../hacks/config/glschool.xml.h:4
+#: ../hacks/config/glslideshow.xml.h:4 ../hacks/config/glsnake.xml.h:4
+#: ../hacks/config/gltext.xml.h:4 ../hacks/config/goop.xml.h:4
+#: ../hacks/config/grav.xml.h:4 ../hacks/config/greynetic.xml.h:4
+#: ../hacks/config/halftone.xml.h:4 ../hacks/config/halo.xml.h:4
+#: ../hacks/config/helix.xml.h:4 ../hacks/config/hopalong.xml.h:4
+#: ../hacks/config/hyperball.xml.h:4 ../hacks/config/hypercube.xml.h:4
+#: ../hacks/config/hypertorus.xml.h:4 ../hacks/config/hypnowheel.xml.h:16
+#: ../hacks/config/ifs.xml.h:4 ../hacks/config/imsmap.xml.h:4
+#: ../hacks/config/interaggregate.xml.h:4 ../hacks/config/interference.xml.h:4
+#: ../hacks/config/intermomentary.xml.h:4 ../hacks/config/jigglypuff.xml.h:5
+#: ../hacks/config/jigsaw.xml.h:4 ../hacks/config/juggle.xml.h:4
+#: ../hacks/config/juggler3d.xml.h:4 ../hacks/config/julia.xml.h:4
+#: ../hacks/config/kaleidescope.xml.h:4 ../hacks/config/klein.xml.h:4
+#: ../hacks/config/kumppa.xml.h:4 ../hacks/config/lament.xml.h:4
+#: ../hacks/config/laser.xml.h:4 ../hacks/config/lavalite.xml.h:4
+#: ../hacks/config/lcdscrub.xml.h:4 ../hacks/config/lightning.xml.h:4
+#: ../hacks/config/lisa.xml.h:4 ../hacks/config/lissie.xml.h:4
+#: ../hacks/config/lmorph.xml.h:4 ../hacks/config/lockward.xml.h:4
+#: ../hacks/config/loop.xml.h:4 ../hacks/config/maze.xml.h:4
+#: ../hacks/config/memscroller.xml.h:4 ../hacks/config/menger.xml.h:4
+#: ../hacks/config/metaballs.xml.h:4 ../hacks/config/mirrorblob.xml.h:4
+#: ../hacks/config/mismunch.xml.h:4 ../hacks/config/moebius.xml.h:4
+#: ../hacks/config/moebiusgears.xml.h:4 ../hacks/config/moire2.xml.h:4
+#: ../hacks/config/molecule.xml.h:4 ../hacks/config/morph3d.xml.h:4
+#: ../hacks/config/mountain.xml.h:4 ../hacks/config/munch.xml.h:4
+#: ../hacks/config/nerverot.xml.h:4 ../hacks/config/noof.xml.h:4
+#: ../hacks/config/pacman.xml.h:4 ../hacks/config/penrose.xml.h:4
+#: ../hacks/config/petri.xml.h:4 ../hacks/config/phosphor.xml.h:4
+#: ../hacks/config/photopile.xml.h:17 ../hacks/config/piecewise.xml.h:4
+#: ../hacks/config/pinion.xml.h:4 ../hacks/config/pipes.xml.h:4
+#: ../hacks/config/polyhedra.xml.h:4 ../hacks/config/polyominoes.xml.h:5
+#: ../hacks/config/polytopes.xml.h:25 ../hacks/config/popsquares.xml.h:4
+#: ../hacks/config/providence.xml.h:4 ../hacks/config/pulsar.xml.h:4
+#: ../hacks/config/pyro.xml.h:13 ../hacks/config/qix.xml.h:4
+#: ../hacks/config/queens.xml.h:4 ../hacks/config/ripples.xml.h:4
+#: ../hacks/config/rocks.xml.h:4 ../hacks/config/rotor.xml.h:4
+#: ../hacks/config/rotzoomer.xml.h:4 ../hacks/config/rubik.xml.h:4
+#: ../hacks/config/rubikblocks.xml.h:4 ../hacks/config/sballs.xml.h:4
+#: ../hacks/config/shadebobs.xml.h:4 ../hacks/config/sierpinski.xml.h:4
+#: ../hacks/config/sierpinski3d.xml.h:4 ../hacks/config/skytentacles.xml.h:13
+#: ../hacks/config/slidescreen.xml.h:4 ../hacks/config/slip.xml.h:4
+#: ../hacks/config/sonar.xml.h:4 ../hacks/config/speedmine.xml.h:4
+#: ../hacks/config/sphere.xml.h:4 ../hacks/config/spheremonics.xml.h:4
+#: ../hacks/config/spiral.xml.h:4 ../hacks/config/spotlight.xml.h:4
+#: ../hacks/config/sproingies.xml.h:4 ../hacks/config/squiral.xml.h:4
+#: ../hacks/config/stairs.xml.h:4 ../hacks/config/starfish.xml.h:7
+#: ../hacks/config/starwars.xml.h:3 ../hacks/config/stonerview.xml.h:4
+#: ../hacks/config/strange.xml.h:4 ../hacks/config/substrate.xml.h:4
+#: ../hacks/config/superquadrics.xml.h:4 ../hacks/config/surfaces.xml.h:4
+#: ../hacks/config/swirl.xml.h:4 ../hacks/config/t3d.xml.h:4
+#: ../hacks/config/tangram.xml.h:4 ../hacks/config/thornbird.xml.h:4
+#: ../hacks/config/topblock.xml.h:4 ../hacks/config/triangle.xml.h:4
+#: ../hacks/config/tronbit.xml.h:4 ../hacks/config/truchet.xml.h:4
+#: ../hacks/config/twang.xml.h:4 ../hacks/config/vines.xml.h:4
+#: ../hacks/config/wander.xml.h:4 ../hacks/config/whirlygig.xml.h:6
+#: ../hacks/config/worm.xml.h:4 ../hacks/config/wormhole.xml.h:4
+#: ../hacks/config/xflame.xml.h:4 ../hacks/config/xlyap.xml.h:4
+#: ../hacks/config/xmatrix.xml.h:17 ../hacks/config/xrayswarm.xml.h:4
+#: ../hacks/config/xspirograph.xml.h:4 ../hacks/config/zoom.xml.h:4
 msgid "High"
 msgstr "Haut(e)"
 
-#. #### -colorcount [64]
-#: ../hacks/config/anemotaxis.xml.h:8 ../hacks/config/ant.xml.h:9
-#: ../hacks/config/antinspect.xml.h:6 ../hacks/config/antmaze.xml.h:5
-#: ../hacks/config/antspotlight.xml.h:5 ../hacks/config/atlantis.xml.h:11
-#: ../hacks/config/attraction.xml.h:15 ../hacks/config/atunnel.xml.h:6
-#: ../hacks/config/barcode.xml.h:8 ../hacks/config/blaster.xml.h:7
-#: ../hacks/config/blinkbox.xml.h:8 ../hacks/config/blocktube.xml.h:8
-#: ../hacks/config/bouboule.xml.h:6 ../hacks/config/bouncingcow.xml.h:8
-#: ../hacks/config/boxed.xml.h:15 ../hacks/config/boxfit.xml.h:12
-#: ../hacks/config/braid.xml.h:8 ../hacks/config/bubble3d.xml.h:6
-#: ../hacks/config/bubbles.xml.h:10 ../hacks/config/bumps.xml.h:11
-#: ../hacks/config/cage.xml.h:4 ../hacks/config/carousel.xml.h:9
-#: ../hacks/config/ccurve.xml.h:10 ../hacks/config/celtic.xml.h:7
-#: ../hacks/config/circuit.xml.h:9 ../hacks/config/cloudlife.xml.h:9
-#: ../hacks/config/compass.xml.h:4 ../hacks/config/coral.xml.h:10
-#: ../hacks/config/crackberg.xml.h:15 ../hacks/config/critical.xml.h:4
-#: ../hacks/config/crystal.xml.h:8 ../hacks/config/cube21.xml.h:12
-#: ../hacks/config/cubenetic.xml.h:10 ../hacks/config/cubestorm.xml.h:8
-#: ../hacks/config/cubicgrid.xml.h:10 ../hacks/config/cwaves.xml.h:6
-#: ../hacks/config/cynosure.xml.h:6 ../hacks/config/dangerball.xml.h:7
-#: ../hacks/config/decayscreen.xml.h:8 ../hacks/config/deluxe.xml.h:8
-#: ../hacks/config/demon.xml.h:10 ../hacks/config/discrete.xml.h:5
-#: ../hacks/config/distort.xml.h:15 ../hacks/config/dnalogo.xml.h:8
-#: ../hacks/config/drift.xml.h:7 ../hacks/config/endgame.xml.h:5
-#: ../hacks/config/engine.xml.h:12 ../hacks/config/epicycle.xml.h:9
-#: ../hacks/config/eruption.xml.h:14 ../hacks/config/euler2d.xml.h:17
-#: ../hacks/config/extrusion.xml.h:9 ../hacks/config/fadeplot.xml.h:7
-#: ../hacks/config/fiberlamp.xml.h:8 ../hacks/config/fireworkx.xml.h:9
-#: ../hacks/config/flag.xml.h:5 ../hacks/config/flame.xml.h:10
-#: ../hacks/config/flipflop.xml.h:9 ../hacks/config/flipscreen3d.xml.h:5
-#: ../hacks/config/fliptext.xml.h:10 ../hacks/config/flow.xml.h:10
-#: ../hacks/config/fluidballs.xml.h:13 ../hacks/config/flyingtoasters.xml.h:9
-#: ../hacks/config/fontglide.xml.h:9 ../hacks/config/forest.xml.h:4
-#: ../hacks/config/fuzzyflakes.xml.h:14 ../hacks/config/galaxy.xml.h:7
-#: ../hacks/config/gears.xml.h:8 ../hacks/config/gflux.xml.h:12
-#: ../hacks/config/glblur.xml.h:7 ../hacks/config/glcells.xml.h:17
-#: ../hacks/config/gleidescope.xml.h:9 ../hacks/config/glforestfire.xml.h:9
-#: ../hacks/config/glhanoi.xml.h:12 ../hacks/config/glknots.xml.h:7
-#: ../hacks/config/glmatrix.xml.h:13 ../hacks/config/glplanet.xml.h:8
-#: ../hacks/config/glschool.xml.h:13 ../hacks/config/glslideshow.xml.h:16
-#: ../hacks/config/glsnake.xml.h:12 ../hacks/config/gltext.xml.h:9
-#: ../hacks/config/goop.xml.h:9 ../hacks/config/grav.xml.h:5
-#: ../hacks/config/greynetic.xml.h:6 ../hacks/config/halftone.xml.h:11
-#: ../hacks/config/halo.xml.h:7 ../hacks/config/helix.xml.h:7
-#: ../hacks/config/hopalong.xml.h:14 ../hacks/config/hyperball.xml.h:5
-#: ../hacks/config/hypercube.xml.h:6 ../hacks/config/hypertorus.xml.h:7
-#: ../hacks/config/hypnowheel.xml.h:11 ../hacks/config/ifs.xml.h:7
-#: ../hacks/config/imsmap.xml.h:11 ../hacks/config/interaggregate.xml.h:6
-#: ../hacks/config/interference.xml.h:12
-#: ../hacks/config/intermomentary.xml.h:7 ../hacks/config/jigglypuff.xml.h:13
-#: ../hacks/config/jigsaw.xml.h:7 ../hacks/config/juggle.xml.h:12
-#: ../hacks/config/juggler3d.xml.h:13 ../hacks/config/julia.xml.h:10
-#: ../hacks/config/kaleidescope.xml.h:8 ../hacks/config/klein.xml.h:13
-#: ../hacks/config/kumppa.xml.h:5 ../hacks/config/lament.xml.h:6
-#: ../hacks/config/laser.xml.h:7 ../hacks/config/lavalite.xml.h:14
-#: ../hacks/config/lcdscrub.xml.h:10 ../hacks/config/lightning.xml.h:4
-#: ../hacks/config/lisa.xml.h:9 ../hacks/config/lissie.xml.h:8
-#: ../hacks/config/lmorph.xml.h:10 ../hacks/config/lockward.xml.h:6
-#: ../hacks/config/loop.xml.h:7 ../hacks/config/maze.xml.h:11
-#: ../hacks/config/memscroller.xml.h:7 ../hacks/config/menger.xml.h:6
-#: ../hacks/config/metaballs.xml.h:7 ../hacks/config/mirrorblob.xml.h:15
-#: ../hacks/config/mismunch.xml.h:5 ../hacks/config/moebius.xml.h:4
-#: ../hacks/config/moebiusgears.xml.h:5 ../hacks/config/moire2.xml.h:4
-#: ../hacks/config/molecule.xml.h:15 ../hacks/config/morph3d.xml.h:6
-#: ../hacks/config/mountain.xml.h:5 ../hacks/config/munch.xml.h:6
-#: ../hacks/config/nerverot.xml.h:15 ../hacks/config/noof.xml.h:4
-#: ../hacks/config/pacman.xml.h:3 ../hacks/config/penrose.xml.h:6
-#: ../hacks/config/petri.xml.h:11 ../hacks/config/phosphor.xml.h:7
-#: ../hacks/config/photopile.xml.h:13 ../hacks/config/piecewise.xml.h:8
-#: ../hacks/config/pinion.xml.h:9 ../hacks/config/pipes.xml.h:13
-#: ../hacks/config/polyhedra.xml.h:77 ../hacks/config/polyominoes.xml.h:6
-#: ../hacks/config/polytopes.xml.h:12 ../hacks/config/popsquares.xml.h:16
-#: ../hacks/config/providence.xml.h:5 ../hacks/config/pulsar.xml.h:12
-#: ../hacks/config/pyro.xml.h:8 ../hacks/config/qix.xml.h:13
-#: ../hacks/config/queens.xml.h:3 ../hacks/config/ripples.xml.h:11
-#: ../hacks/config/rocks.xml.h:7 ../hacks/config/rotor.xml.h:6
-#: ../hacks/config/rotzoomer.xml.h:8 ../hacks/config/rubik.xml.h:8
-#: ../hacks/config/rubikblocks.xml.h:9 ../hacks/config/sballs.xml.h:7
-#: ../hacks/config/shadebobs.xml.h:6 ../hacks/config/sierpinski.xml.h:5
-#: ../hacks/config/sierpinski3d.xml.h:5 ../hacks/config/skytentacles.xml.h:11
-#: ../hacks/config/slidescreen.xml.h:11 ../hacks/config/slip.xml.h:6
-#: ../hacks/config/sonar.xml.h:9 ../hacks/config/speedmine.xml.h:7
-#: ../hacks/config/sphere.xml.h:3 ../hacks/config/spheremonics.xml.h:8
-#: ../hacks/config/spiral.xml.h:6 ../hacks/config/spotlight.xml.h:8
-#: ../hacks/config/sproingies.xml.h:5 ../hacks/config/squiral.xml.h:8
-#: ../hacks/config/stairs.xml.h:4 ../hacks/config/starfish.xml.h:8
-#: ../hacks/config/stonerview.xml.h:4 ../hacks/config/strange.xml.h:5
-#: ../hacks/config/substrate.xml.h:14 ../hacks/config/superquadrics.xml.h:7
-#: ../hacks/config/surfaces.xml.h:14 ../hacks/config/swirl.xml.h:6
-#: ../hacks/config/t3d.xml.h:8 ../hacks/config/tangram.xml.h:8
-#: ../hacks/config/thornbird.xml.h:5 ../hacks/config/topblock.xml.h:13
-#: ../hacks/config/triangle.xml.h:4 ../hacks/config/truchet.xml.h:3
-#: ../hacks/config/twang.xml.h:11 ../hacks/config/vines.xml.h:3
-#: ../hacks/config/wander.xml.h:10 ../hacks/config/whirlygig.xml.h:5
-#: ../hacks/config/worm.xml.h:4 ../hacks/config/wormhole.xml.h:7
-#: ../hacks/config/xflame.xml.h:6 ../hacks/config/xlyap.xml.h:6
-#: ../hacks/config/xmatrix.xml.h:12 ../hacks/config/xrayswarm.xml.h:4
-#: ../hacks/config/xspirograph.xml.h:7 ../hacks/config/zoom.xml.h:11
-msgid "Low"
-msgstr "Bas(se)"
-
-#: ../hacks/config/anemotaxis.xml.h:10 ../hacks/config/hypercube.xml.h:7
+#: ../hacks/config/anemotaxis.xml.h:5 ../hacks/config/hypercube.xml.h:10
 msgid "Near"
 msgstr "Proche"
 
-#: ../hacks/config/anemotaxis.xml.h:11
-msgid "Searchers"
-msgstr "Chercheurs"
+#: ../hacks/config/anemotaxis.xml.h:6
+msgid "Distance"
+msgstr "Distance"
 
-#: ../hacks/config/anemotaxis.xml.h:13
+#: ../hacks/config/anemotaxis.xml.h:7 ../hacks/config/cubicgrid.xml.h:10
+#: ../hacks/config/hypercube.xml.h:12
+msgid "Far"
+msgstr "Loin"
+
+#: ../hacks/config/anemotaxis.xml.h:9
 msgid "Sources"
 msgstr "Sources"
 
+#: ../hacks/config/anemotaxis.xml.h:11
+msgid "Searchers"
+msgstr "Chercheurs"
+
+#: ../hacks/config/anemotaxis.xml.h:13
+msgid ""
+"Anemotaxis demonstrates a search algorithm designed for locating a source of "
+"odor in turbulent atmosphere. The searcher is able to sense the odor and "
+"determine local instantaneous wind direction. The goal is to find the source "
+"in the shortest mean time. http://en.wikipedia.org/wiki/Anemotaxis Written "
+"by Eugene Balkovsky; 2004."
+msgstr ""
+"Anemotaxis fait la démonstration d'un algorithme de recherche conçu pour "
+"localiser la source d'une odeur dans une atmosphère turbulente. Le moteur "
+"est capable de sentir l'odeur et de déterminer la direction du vent local "
+"instantané. Le but est de trouver la source dans un temps donné le plus "
+"court. http://en.wikipedia.org/wiki/Anemotaxis écrit par Eugene Balkovsky ; "
+"2004."
+
 #: ../hacks/config/ant.xml.h:1
 msgid "Ant"
 msgstr "Fourmis"
 
-#: ../hacks/config/ant.xml.h:2
-msgid "Ant size"
-msgstr "Taille de la fourmi"
-
-#: ../hacks/config/ant.xml.h:3
-msgid "Ants count"
-msgstr "Nombre de fourmis"
-
-#: ../hacks/config/ant.xml.h:4
-msgid "Draw eyes"
-msgstr "Dessiner les yeux"
+#. #### -slow
+#: ../hacks/config/ant.xml.h:5 ../hacks/config/attraction.xml.h:21
+#: ../hacks/config/blinkbox.xml.h:5 ../hacks/config/cloudlife.xml.h:9
+#: ../hacks/config/cube21.xml.h:5 ../hacks/config/cubenetic.xml.h:20
+#: ../hacks/config/demon.xml.h:8 ../hacks/config/discrete.xml.h:5
+#: ../hacks/config/distort.xml.h:9 ../hacks/config/fadeplot.xml.h:8
+#: ../hacks/config/flag.xml.h:6 ../hacks/config/flow.xml.h:8
+#: ../hacks/config/fluidballs.xml.h:8 ../hacks/config/fuzzyflakes.xml.h:25
+#: ../hacks/config/glcells.xml.h:11 ../hacks/config/gleidescope.xml.h:5
+#: ../hacks/config/halftone.xml.h:8 ../hacks/config/hopalong.xml.h:5
+#: ../hacks/config/interference.xml.h:8 ../hacks/config/julia.xml.h:8
+#: ../hacks/config/lisa.xml.h:10 ../hacks/config/lissie.xml.h:5
+#: ../hacks/config/loop.xml.h:5 ../hacks/config/metaballs.xml.h:12
+#: ../hacks/config/moire.xml.h:8 ../hacks/config/penrose.xml.h:8
+#: ../hacks/config/photopile.xml.h:2 ../hacks/config/piecewise.xml.h:11
+#: ../hacks/config/rd-bomb.xml.h:11 ../hacks/config/rdbomb.xml.h:11
+#: ../hacks/config/rorschach.xml.h:2 ../hacks/config/rubikblocks.xml.h:5
+#: ../hacks/config/sierpinski.xml.h:8 ../hacks/config/slidescreen.xml.h:14
+#: ../hacks/config/slip.xml.h:8 ../hacks/config/spotlight.xml.h:8
+#: ../hacks/config/topblock.xml.h:8 ../hacks/config/twang.xml.h:14
+msgid "Small"
+msgstr "Faible"
 
-#: ../hacks/config/ant.xml.h:5
-msgid "Four sided cells"
-msgstr "Cellules à quatre cotés"
+#: ../hacks/config/ant.xml.h:6 ../hacks/config/demon.xml.h:9
+#: ../hacks/config/discrete.xml.h:6 ../hacks/config/flag.xml.h:7
+#: ../hacks/config/flow.xml.h:9 ../hacks/config/lissie.xml.h:6
+#: ../hacks/config/loop.xml.h:6 ../hacks/config/sierpinski.xml.h:9
+#: ../hacks/config/slip.xml.h:9
+msgid "Timeout"
+msgstr "Délai"
 
 #. #### -slow
-#: ../hacks/config/ant.xml.h:8 ../hacks/config/attraction.xml.h:12
-#: ../hacks/config/blinkbox.xml.h:7 ../hacks/config/cloudlife.xml.h:8
-#: ../hacks/config/cube21.xml.h:9 ../hacks/config/cubenetic.xml.h:9
-#: ../hacks/config/demon.xml.h:9 ../hacks/config/discrete.xml.h:4
-#: ../hacks/config/distort.xml.h:11 ../hacks/config/fadeplot.xml.h:6
-#: ../hacks/config/flag.xml.h:4 ../hacks/config/flow.xml.h:7
-#: ../hacks/config/fluidballs.xml.h:12 ../hacks/config/fuzzyflakes.xml.h:12
-#: ../hacks/config/glcells.xml.h:14 ../hacks/config/gleidescope.xml.h:8
-#: ../hacks/config/halftone.xml.h:10 ../hacks/config/hopalong.xml.h:13
-#: ../hacks/config/interference.xml.h:11 ../hacks/config/julia.xml.h:8
-#: ../hacks/config/lisa.xml.h:7 ../hacks/config/lissie.xml.h:6
-#: ../hacks/config/loop.xml.h:5 ../hacks/config/moire.xml.h:4
-#: ../hacks/config/penrose.xml.h:5 ../hacks/config/photopile.xml.h:10
-#: ../hacks/config/piecewise.xml.h:7 ../hacks/config/rd-bomb.xml.h:11
-#: ../hacks/config/rdbomb.xml.h:11 ../hacks/config/rorschach.xml.h:4
-#: ../hacks/config/rubikblocks.xml.h:6 ../hacks/config/sierpinski.xml.h:4
-#: ../hacks/config/slidescreen.xml.h:9 ../hacks/config/slip.xml.h:5
-#: ../hacks/config/spotlight.xml.h:7 ../hacks/config/topblock.xml.h:12
-#: ../hacks/config/twang.xml.h:10
+#: ../hacks/config/ant.xml.h:7 ../hacks/config/attraction.xml.h:23
+#: ../hacks/config/blinkbox.xml.h:7 ../hacks/config/cloudlife.xml.h:11
+#: ../hacks/config/cube21.xml.h:7 ../hacks/config/cubenetic.xml.h:22
+#: ../hacks/config/demon.xml.h:10 ../hacks/config/discrete.xml.h:7
+#: ../hacks/config/distort.xml.h:13 ../hacks/config/fadeplot.xml.h:10
+#: ../hacks/config/flag.xml.h:8 ../hacks/config/flow.xml.h:10
+#: ../hacks/config/fluidballs.xml.h:10 ../hacks/config/fuzzyflakes.xml.h:27
+#: ../hacks/config/glcells.xml.h:27 ../hacks/config/gleidescope.xml.h:7
+#: ../hacks/config/halftone.xml.h:12 ../hacks/config/hopalong.xml.h:7
+#: ../hacks/config/interference.xml.h:10 ../hacks/config/julia.xml.h:10
+#: ../hacks/config/lisa.xml.h:12 ../hacks/config/lissie.xml.h:7
+#: ../hacks/config/loop.xml.h:7 ../hacks/config/moire.xml.h:10
+#: ../hacks/config/penrose.xml.h:10 ../hacks/config/photopile.xml.h:4
+#: ../hacks/config/piecewise.xml.h:13 ../hacks/config/rd-bomb.xml.h:13
+#: ../hacks/config/rdbomb.xml.h:13 ../hacks/config/rorschach.xml.h:4
+#: ../hacks/config/rubikblocks.xml.h:7 ../hacks/config/sierpinski.xml.h:10
+#: ../hacks/config/slidescreen.xml.h:16 ../hacks/config/slip.xml.h:10
+#: ../hacks/config/spotlight.xml.h:10 ../hacks/config/topblock.xml.h:10
+#: ../hacks/config/twang.xml.h:16
 msgid "Large"
 msgstr "Important(e)"
 
+#: ../hacks/config/ant.xml.h:8
+msgid "Sharp turns"
+msgstr "Virages serrés"
+
+#: ../hacks/config/ant.xml.h:9
+msgid "Truchet lines"
+msgstr ""
+
+#: ../hacks/config/ant.xml.h:10
+msgid "Draw eyes"
+msgstr "Dessiner les yeux"
+
 #: ../hacks/config/ant.xml.h:11
-msgid "Nine sided cells"
-msgstr "Cellule à neuf cotés"
+msgid "Ants count"
+msgstr "Nombre de fourmis"
 
-#. #### -color [random]
-#: ../hacks/config/ant.xml.h:12 ../hacks/config/apollonian.xml.h:12
-#: ../hacks/config/attraction.xml.h:17 ../hacks/config/bouboule.xml.h:8
-#: ../hacks/config/braid.xml.h:10 ../hacks/config/critical.xml.h:6
-#: ../hacks/config/crystal.xml.h:11 ../hacks/config/cynosure.xml.h:8
-#: ../hacks/config/deco.xml.h:11 ../hacks/config/deluxe.xml.h:10
-#: ../hacks/config/demon.xml.h:12 ../hacks/config/discrete.xml.h:8
-#: ../hacks/config/drift.xml.h:9 ../hacks/config/epicycle.xml.h:11
-#: ../hacks/config/eruption.xml.h:17 ../hacks/config/euler2d.xml.h:19
-#: ../hacks/config/fadeplot.xml.h:9 ../hacks/config/flag.xml.h:7
-#: ../hacks/config/flame.xml.h:12 ../hacks/config/flow.xml.h:12
-#: ../hacks/config/forest.xml.h:6 ../hacks/config/galaxy.xml.h:9
-#: ../hacks/config/grav.xml.h:7 ../hacks/config/halo.xml.h:10
-#: ../hacks/config/hopalong.xml.h:17 ../hacks/config/ifs.xml.h:9
-#: ../hacks/config/imsmap.xml.h:13 ../hacks/config/interference.xml.h:15
-#: ../hacks/config/julia.xml.h:12 ../hacks/config/laser.xml.h:9
-#: ../hacks/config/lightning.xml.h:6 ../hacks/config/lisa.xml.h:11
-#: ../hacks/config/lissie.xml.h:10 ../hacks/config/loop.xml.h:9
-#: ../hacks/config/metaballs.xml.h:13 ../hacks/config/moire.xml.h:7
-#: ../hacks/config/moire2.xml.h:7 ../hacks/config/mountain.xml.h:8
-#: ../hacks/config/penrose.xml.h:8 ../hacks/config/polyominoes.xml.h:8
-#: ../hacks/config/popsquares.xml.h:17 ../hacks/config/rd-bomb.xml.h:13
-#: ../hacks/config/rdbomb.xml.h:13 ../hacks/config/rocks.xml.h:9
-#: ../hacks/config/rotor.xml.h:8 ../hacks/config/shadebobs.xml.h:10
-#: ../hacks/config/sierpinski.xml.h:7 ../hacks/config/slip.xml.h:8
-#: ../hacks/config/sphere.xml.h:5 ../hacks/config/spiral.xml.h:8
-#: ../hacks/config/squiral.xml.h:10 ../hacks/config/starfish.xml.h:10
-#: ../hacks/config/strange.xml.h:7 ../hacks/config/swirl.xml.h:8
-#: ../hacks/config/triangle.xml.h:6 ../hacks/config/vines.xml.h:5
-#: ../hacks/config/worm.xml.h:6
-msgid "Number of colors"
-msgstr "Nombre de couleurs"
+#: ../hacks/config/ant.xml.h:12
+msgid "Ant size"
+msgstr "Taille de la fourmi"
 
 #: ../hacks/config/ant.xml.h:13
 msgid "Random cell shape"
 msgstr "Forme de cellule aléatoire"
 
 #: ../hacks/config/ant.xml.h:14
-msgid "Sharp turns"
-msgstr "Virages serrés"
+msgid "Three sided cells"
+msgstr "Cellule à trois cotés"
+
+#: ../hacks/config/ant.xml.h:15
+msgid "Four sided cells"
+msgstr "Cellules à quatre cotés"
 
 #: ../hacks/config/ant.xml.h:16
 msgid "Six sided cells"
 msgstr "Cellules à six cotés"
 
-#. #### -slow
-#: ../hacks/config/ant.xml.h:17 ../hacks/config/attraction.xml.h:27
-#: ../hacks/config/blinkbox.xml.h:12 ../hacks/config/cloudlife.xml.h:13
-#: ../hacks/config/cube21.xml.h:21 ../hacks/config/cubenetic.xml.h:21
-#: ../hacks/config/demon.xml.h:14 ../hacks/config/discrete.xml.h:10
-#: ../hacks/config/distort.xml.h:21 ../hacks/config/fadeplot.xml.h:11
-#: ../hacks/config/flag.xml.h:10 ../hacks/config/flow.xml.h:19
-#: ../hacks/config/fluidballs.xml.h:20 ../hacks/config/fuzzyflakes.xml.h:23
-#: ../hacks/config/glcells.xml.h:32 ../hacks/config/gleidescope.xml.h:14
-#: ../hacks/config/halftone.xml.h:18 ../hacks/config/hopalong.xml.h:22
-#: ../hacks/config/interference.xml.h:19 ../hacks/config/julia.xml.h:14
-#: ../hacks/config/lisa.xml.h:14 ../hacks/config/lissie.xml.h:13
-#: ../hacks/config/loop.xml.h:12 ../hacks/config/metaballs.xml.h:16
-#: ../hacks/config/moire.xml.h:11 ../hacks/config/penrose.xml.h:11
-#: ../hacks/config/photopile.xml.h:22 ../hacks/config/piecewise.xml.h:15
-#: ../hacks/config/rd-bomb.xml.h:20 ../hacks/config/rdbomb.xml.h:20
-#: ../hacks/config/rorschach.xml.h:9 ../hacks/config/rubikblocks.xml.h:16
-#: ../hacks/config/sierpinski.xml.h:11 ../hacks/config/slidescreen.xml.h:18
-#: ../hacks/config/slip.xml.h:11 ../hacks/config/spotlight.xml.h:10
-#: ../hacks/config/topblock.xml.h:21 ../hacks/config/twang.xml.h:15
-msgid "Small"
-msgstr "Faible"
+#: ../hacks/config/ant.xml.h:17
+msgid "Nine sided cells"
+msgstr "Cellule à neuf cotés"
+
+#: ../hacks/config/ant.xml.h:18
+msgid "Twelve sided cells"
+msgstr "Cellules à douze cotés"
 
 #: ../hacks/config/ant.xml.h:19
+msgid "Three"
+msgstr "Trois"
+
+#. 
+#. On a 2.93 gHz iMac i7, I get these rates with -delay 0:
+#. 
+#. detail 3:  invisible
+#. detail 4:  barely visible
+#. detail 5:  1000+ fps, looks like noise at -delay 0, ok at -delay 20000
+#. detail 8:  ~700+ fps
+#. detail 9:  ~400 fps
+#. detail 10: ~300 fps
+#. detail 11: ~100 fps
+#. detail 12:  ~50 fps
+#. detail 13:  ~17 fps
+#. detail 14:   ~8 fps
+#. detail 15:   ~2 fps
+#. 
+#. With the default -delay, CPU load only starts causing the frame rate
+#. to drop below 30 fps detail 12 or higher.
+#. 
+#. #### -color [random]
+#: ../hacks/config/ant.xml.h:20 ../hacks/config/apollonian.xml.h:11
+#: ../hacks/config/attraction.xml.h:18 ../hacks/config/bouboule.xml.h:9
+#: ../hacks/config/braid.xml.h:9 ../hacks/config/critical.xml.h:6
+#: ../hacks/config/crystal.xml.h:6 ../hacks/config/cynosure.xml.h:6
+#: ../hacks/config/deco.xml.h:6 ../hacks/config/deluxe.xml.h:12
+#: ../hacks/config/demon.xml.h:12 ../hacks/config/discrete.xml.h:9
+#: ../hacks/config/drift.xml.h:9 ../hacks/config/epicycle.xml.h:6
+#: ../hacks/config/eruption.xml.h:6 ../hacks/config/euler2d.xml.h:28
+#: ../hacks/config/fadeplot.xml.h:12 ../hacks/config/flag.xml.h:10
+#: ../hacks/config/flame.xml.h:13 ../hacks/config/flow.xml.h:12
+#: ../hacks/config/forest.xml.h:6 ../hacks/config/galaxy.xml.h:10
+#: ../hacks/config/grav.xml.h:9 ../hacks/config/halo.xml.h:9
+#: ../hacks/config/hopalong.xml.h:10 ../hacks/config/ifs.xml.h:45
+#: ../hacks/config/imsmap.xml.h:12 ../hacks/config/interference.xml.h:16
+#: ../hacks/config/julia.xml.h:12 ../hacks/config/laser.xml.h:10
+#: ../hacks/config/lightning.xml.h:6 ../hacks/config/lisa.xml.h:9
+#: ../hacks/config/lissie.xml.h:9 ../hacks/config/loop.xml.h:9
+#: ../hacks/config/metaballs.xml.h:9 ../hacks/config/moire.xml.h:6
+#: ../hacks/config/moire2.xml.h:6 ../hacks/config/mountain.xml.h:9
+#: ../hacks/config/penrose.xml.h:6 ../hacks/config/polyominoes.xml.h:10
+#: ../hacks/config/popsquares.xml.h:7 ../hacks/config/rd-bomb.xml.h:15
+#: ../hacks/config/rdbomb.xml.h:15 ../hacks/config/rocks.xml.h:15
+#: ../hacks/config/rotor.xml.h:9 ../hacks/config/shadebobs.xml.h:8
+#: ../hacks/config/sierpinski.xml.h:12 ../hacks/config/slip.xml.h:12
+#: ../hacks/config/sphere.xml.h:6 ../hacks/config/spiral.xml.h:10
+#: ../hacks/config/squiral.xml.h:14 ../hacks/config/starfish.xml.h:15
+#: ../hacks/config/strange.xml.h:9 ../hacks/config/swirl.xml.h:9
+#: ../hacks/config/triangle.xml.h:6 ../hacks/config/vines.xml.h:6
+#: ../hacks/config/worm.xml.h:6
+msgid "Number of colors"
+msgstr "Nombre de couleurs"
+
+#: ../hacks/config/ant.xml.h:24
 #, no-c-format
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
@@ -2044,39 +2120,15 @@
 "influencé http://en.wikipedia.org/wiki/Langton%27s_ant "
 "http://en.wikipedia.org/wiki/Turing_machine écrit par David Bagley ; 1997."
 
-#: ../hacks/config/ant.xml.h:20
-msgid "Three"
-msgstr "Trois"
-
-#: ../hacks/config/ant.xml.h:21
-msgid "Three sided cells"
-msgstr "Cellule à trois cotés"
-
-#: ../hacks/config/ant.xml.h:22 ../hacks/config/demon.xml.h:16
-#: ../hacks/config/discrete.xml.h:11 ../hacks/config/flag.xml.h:13
-#: ../hacks/config/flow.xml.h:21 ../hacks/config/lissie.xml.h:15
-#: ../hacks/config/loop.xml.h:13 ../hacks/config/sierpinski.xml.h:13
-#: ../hacks/config/slip.xml.h:13
-msgid "Timeout"
-msgstr "Délai"
-
-#: ../hacks/config/ant.xml.h:23
-msgid "Truchet lines"
-msgstr ""
-
-#: ../hacks/config/ant.xml.h:24
-msgid "Twelve sided cells"
-msgstr "Cellules à douze cotés"
-
 #: ../hacks/config/antinspect.xml.h:1
 msgid "AntInspect"
 msgstr "Inspection des fourmis"
 
-#: ../hacks/config/antinspect.xml.h:2
+#: ../hacks/config/antinspect.xml.h:6
 msgid "Draw shadows"
 msgstr "Afficher les ombres"
 
-#: ../hacks/config/antinspect.xml.h:3
+#: ../hacks/config/antinspect.xml.h:7
 msgid ""
 "Draws a trio of ants moving their spheres around a circle. Written by Blair "
 "Tennessy; 2004."
@@ -2088,7 +2140,7 @@
 msgid "AntMaze"
 msgstr "Labyrinthe des fourmis"
 
-#: ../hacks/config/antmaze.xml.h:2
+#: ../hacks/config/antmaze.xml.h:6
 msgid ""
 "Draws a few views of a few ants walking around in a simple maze. Written by "
 "Blair Tennessy; 2005."
@@ -2100,7 +2152,7 @@
 msgid "AntSpotlight"
 msgstr "Faisceau lumineux"
 
-#: ../hacks/config/antspotlight.xml.h:2
+#: ../hacks/config/antspotlight.xml.h:6
 msgid ""
 "Draws an ant (with a headlight) who walks on top of an image of your desktop "
 "or other image. Written by Blair Tennessy; 2003."
@@ -2112,21 +2164,61 @@
 msgid "Apollonian"
 msgstr "Apollonien"
 
-#. don't know what -count does
+#: ../hacks/config/apollonian.xml.h:2 ../hacks/config/tangram.xml.h:13
+msgid "Draw labels"
+msgstr "Afficher étiquettes"
+
 #: ../hacks/config/apollonian.xml.h:3
-msgid "Deep"
-msgstr "Profond"
+msgid "Include alternate geometries"
+msgstr "Inclure d'autres géométries"
+
+#. don't know what -count does
+#: ../hacks/config/apollonian.xml.h:5
+msgid "Shallow"
+msgstr "Peu profond"
 
 #. don't know what -count does
-#: ../hacks/config/apollonian.xml.h:5 ../hacks/config/flipflop.xml.h:1
+#: ../hacks/config/apollonian.xml.h:7 ../hacks/config/flipflop.xml.h:11
 msgid "Depth"
 msgstr "Profondeur"
 
-#: ../hacks/config/apollonian.xml.h:6 ../hacks/config/tangram.xml.h:2
-msgid "Draw labels"
-msgstr "Afficher étiquettes"
+#. don't know what -count does
+#: ../hacks/config/apollonian.xml.h:9
+msgid "Deep"
+msgstr "Profond"
+
+#. #### -color [random]
+#: ../hacks/config/apollonian.xml.h:10 ../hacks/config/attraction.xml.h:17
+#: ../hacks/config/bouboule.xml.h:8 ../hacks/config/braid.xml.h:8
+#: ../hacks/config/critical.xml.h:5 ../hacks/config/crystal.xml.h:5
+#: ../hacks/config/cynosure.xml.h:5 ../hacks/config/deco.xml.h:5
+#: ../hacks/config/deluxe.xml.h:11 ../hacks/config/demon.xml.h:11
+#: ../hacks/config/discrete.xml.h:8 ../hacks/config/drift.xml.h:8
+#: ../hacks/config/epicycle.xml.h:5 ../hacks/config/euler2d.xml.h:27
+#: ../hacks/config/fadeplot.xml.h:11 ../hacks/config/flag.xml.h:9
+#: ../hacks/config/flame.xml.h:12 ../hacks/config/flow.xml.h:11
+#: ../hacks/config/forest.xml.h:5 ../hacks/config/galaxy.xml.h:9
+#: ../hacks/config/grav.xml.h:8 ../hacks/config/halo.xml.h:8
+#: ../hacks/config/hopalong.xml.h:9 ../hacks/config/imsmap.xml.h:11
+#: ../hacks/config/interference.xml.h:15 ../hacks/config/julia.xml.h:11
+#: ../hacks/config/laser.xml.h:9 ../hacks/config/lightning.xml.h:5
+#: ../hacks/config/lisa.xml.h:8 ../hacks/config/lissie.xml.h:8
+#: ../hacks/config/loop.xml.h:8 ../hacks/config/metaballs.xml.h:8
+#: ../hacks/config/moire.xml.h:5 ../hacks/config/moire2.xml.h:5
+#: ../hacks/config/mountain.xml.h:8 ../hacks/config/nerverot.xml.h:11
+#: ../hacks/config/penrose.xml.h:5 ../hacks/config/polyominoes.xml.h:9
+#: ../hacks/config/rd-bomb.xml.h:14 ../hacks/config/rdbomb.xml.h:14
+#: ../hacks/config/rocks.xml.h:14 ../hacks/config/rotor.xml.h:8
+#: ../hacks/config/shadebobs.xml.h:6 ../hacks/config/sierpinski.xml.h:11
+#: ../hacks/config/slip.xml.h:11 ../hacks/config/sphere.xml.h:5
+#: ../hacks/config/spiral.xml.h:9 ../hacks/config/squiral.xml.h:13
+#: ../hacks/config/starfish.xml.h:14 ../hacks/config/strange.xml.h:8
+#: ../hacks/config/swirl.xml.h:8 ../hacks/config/triangle.xml.h:5
+#: ../hacks/config/vines.xml.h:5 ../hacks/config/worm.xml.h:5
+msgid "Two"
+msgstr "Deux"
 
-#: ../hacks/config/apollonian.xml.h:8
+#: ../hacks/config/apollonian.xml.h:18
 #, no-c-format
 msgid ""
 "Draws an Apollonian gasket: a fractal packing of circles with smaller "
@@ -2141,46 +2233,6 @@
 "http://fr.wikipedia.org/wiki/Théorème_de_Descartes. Ecrit par Allan R. Wilks "
 "et David Bagley; 2002."
 
-#: ../hacks/config/apollonian.xml.h:10
-msgid "Include alternate geometries"
-msgstr "Inclure d'autres géométries"
-
-#. don't know what -count does
-#: ../hacks/config/apollonian.xml.h:14
-msgid "Shallow"
-msgstr "Peu profond"
-
-#. #### -color [random]
-#: ../hacks/config/apollonian.xml.h:18 ../hacks/config/attraction.xml.h:32
-#: ../hacks/config/bouboule.xml.h:12 ../hacks/config/braid.xml.h:14
-#: ../hacks/config/critical.xml.h:9 ../hacks/config/crystal.xml.h:15
-#: ../hacks/config/cynosure.xml.h:12 ../hacks/config/deco.xml.h:15
-#: ../hacks/config/deluxe.xml.h:17 ../hacks/config/demon.xml.h:17
-#: ../hacks/config/discrete.xml.h:12 ../hacks/config/drift.xml.h:12
-#: ../hacks/config/epicycle.xml.h:15 ../hacks/config/euler2d.xml.h:31
-#: ../hacks/config/fadeplot.xml.h:15 ../hacks/config/flag.xml.h:14
-#: ../hacks/config/flame.xml.h:15 ../hacks/config/flow.xml.h:22
-#: ../hacks/config/forest.xml.h:9 ../hacks/config/galaxy.xml.h:14
-#: ../hacks/config/grav.xml.h:13 ../hacks/config/halo.xml.h:15
-#: ../hacks/config/hopalong.xml.h:24 ../hacks/config/imsmap.xml.h:19
-#: ../hacks/config/interference.xml.h:20 ../hacks/config/julia.xml.h:15
-#: ../hacks/config/laser.xml.h:13 ../hacks/config/lightning.xml.h:9
-#: ../hacks/config/lisa.xml.h:17 ../hacks/config/lissie.xml.h:16
-#: ../hacks/config/loop.xml.h:14 ../hacks/config/metaballs.xml.h:17
-#: ../hacks/config/moire.xml.h:12 ../hacks/config/moire2.xml.h:10
-#: ../hacks/config/mountain.xml.h:12 ../hacks/config/nerverot.xml.h:23
-#: ../hacks/config/penrose.xml.h:13 ../hacks/config/polyominoes.xml.h:13
-#: ../hacks/config/rd-bomb.xml.h:21 ../hacks/config/rdbomb.xml.h:21
-#: ../hacks/config/rocks.xml.h:17 ../hacks/config/rotor.xml.h:14
-#: ../hacks/config/shadebobs.xml.h:17 ../hacks/config/sierpinski.xml.h:14
-#: ../hacks/config/slip.xml.h:14 ../hacks/config/sphere.xml.h:9
-#: ../hacks/config/spiral.xml.h:12 ../hacks/config/squiral.xml.h:18
-#: ../hacks/config/starfish.xml.h:18 ../hacks/config/strange.xml.h:12
-#: ../hacks/config/swirl.xml.h:12 ../hacks/config/triangle.xml.h:9
-#: ../hacks/config/vines.xml.h:8 ../hacks/config/worm.xml.h:11
-msgid "Two"
-msgstr "Deux"
-
 #: ../hacks/config/apple2.xml.h:1
 msgid "Apple2"
 msgstr "Apple2"
@@ -2190,13 +2242,13 @@
 msgstr "Mode aléatoire"
 
 #: ../hacks/config/apple2.xml.h:3
-msgid "Display images"
-msgstr "Afficher des images"
-
-#: ../hacks/config/apple2.xml.h:4
 msgid "Display scrolling text"
 msgstr "Afficher un texte défilant"
 
+#: ../hacks/config/apple2.xml.h:4
+msgid "Display images"
+msgstr "Afficher des images"
+
 #: ../hacks/config/apple2.xml.h:5
 msgid "Run basic programs"
 msgstr "Exécuter des programmes élémentaires"
@@ -2209,239 +2261,243 @@
 "program and runs it. In \"Text Mode\", it displays the output of a program, "
 "or the contents of a file or URL. In \"Slideshow Mode\", it chooses random "
 "images and displays them within the limitations of the Apple ][ display "
-"hardware. (Six available colors in hi-res mode!) On X11 systems, This "
-"program is also a fully-functional VT100 emulator. "
+"hardware. (Six available colors in hi-res mode!) This program is also a "
+"fully-functional VT100 emulator! Run it as an application instead of as a "
+"screen saver and you can use it as a terminal. "
 "http://en.wikipedia.org/wiki/Apple_II_series Written by Trevor Blackwell; "
 "2003."
 msgstr ""
 
-#: ../hacks/config/atlantis.xml.h:1 ../hacks/config/deluxe.xml.h:2
-#: ../hacks/config/demon.xml.h:2 ../hacks/config/gears.xml.h:2
-#: ../hacks/config/glhanoi.xml.h:4 ../hacks/config/lisa.xml.h:2
-#: ../hacks/config/lissie.xml.h:2 ../hacks/config/skytentacles.xml.h:2
-msgid "20"
-msgstr "20"
-
-#: ../hacks/config/atlantis.xml.h:2
-msgid ""
-"A 3D animation of a number of sharks, dolphins, and whales. Written by Mark "
-"Kilgard; 1998."
-msgstr ""
-"Une animation 3D avec des requins, des dauphins et des baleines. "
-"Initialement écrit par Mark Kilgard ; 1994. Porté par Eric Lassauge pour "
-"xlock; 1998."
-
-#: ../hacks/config/atlantis.xml.h:3
-msgid "Agressive"
-msgstr "Agressif"
-
-#: ../hacks/config/atlantis.xml.h:4
+#: ../hacks/config/atlantis.xml.h:1
 msgid "Atlantis"
 msgstr "Atlantis"
 
-#: ../hacks/config/atlantis.xml.h:5
-msgid "Clear water"
-msgstr "Eau claire"
+#: ../hacks/config/atlantis.xml.h:6
+msgid "Whale speed"
+msgstr "Vitesse des baleines"
 
-#: ../hacks/config/atlantis.xml.h:7
-msgid "Flat background"
-msgstr "Fond uni"
+#: ../hacks/config/atlantis.xml.h:8
+msgid "Shy"
+msgstr "Timide"
 
 #: ../hacks/config/atlantis.xml.h:9
-msgid "Gradient background"
-msgstr "Fond en dégradé de couleur"
+msgid "Shark proximity"
+msgstr "Proximité des requins"
 
-#: ../hacks/config/atlantis.xml.h:12 ../hacks/config/boxed.xml.h:16
-#: ../hacks/config/flyingtoasters.xml.h:10 ../hacks/config/glschool.xml.h:14
-#: ../hacks/config/glslideshow.xml.h:17 ../hacks/config/jigglypuff.xml.h:14
-#: ../hacks/config/juggle.xml.h:13 ../hacks/config/juggler3d.xml.h:14
-#: ../hacks/config/mirrorblob.xml.h:17 ../hacks/config/pipes.xml.h:14
-#: ../hacks/config/webcollage.xml.h:7
+#: ../hacks/config/atlantis.xml.h:10
+msgid "Agressive"
+msgstr "Agressif"
+
+#: ../hacks/config/atlantis.xml.h:11 ../hacks/config/boxed.xml.h:20
+#: ../hacks/config/flyingtoasters.xml.h:8 ../hacks/config/glschool.xml.h:8
+#: ../hacks/config/glslideshow.xml.h:16 ../hacks/config/jigglypuff.xml.h:10
+#: ../hacks/config/juggle.xml.h:11 ../hacks/config/juggler3d.xml.h:11
+#: ../hacks/config/mirrorblob.xml.h:11 ../hacks/config/pipes.xml.h:11
+#: ../hacks/config/webcollage.xml.h:2
 msgid "None"
 msgstr "Aucun"
 
-#: ../hacks/config/atlantis.xml.h:13
+#: ../hacks/config/atlantis.xml.h:12
 msgid "Number of sharks"
 msgstr "Nombre de requins"
 
-#: ../hacks/config/atlantis.xml.h:14
-msgid "Shark proximity"
-msgstr "Proximité des requins"
+#: ../hacks/config/atlantis.xml.h:13 ../hacks/config/companioncube.xml.h:10
+#: ../hacks/config/deluxe.xml.h:10 ../hacks/config/demon.xml.h:7
+#: ../hacks/config/gears.xml.h:10 ../hacks/config/glhanoi.xml.h:11
+#: ../hacks/config/lisa.xml.h:15 ../hacks/config/lissie.xml.h:13
+#: ../hacks/config/skytentacles.xml.h:4
+msgid "20"
+msgstr "20"
 
-#: ../hacks/config/atlantis.xml.h:15
+#: ../hacks/config/atlantis.xml.h:14
 msgid "Shimmering water"
 msgstr "Eau miroitante"
 
-#: ../hacks/config/atlantis.xml.h:17
-msgid "Shy"
-msgstr "Timide"
+#: ../hacks/config/atlantis.xml.h:15
+msgid "Clear water"
+msgstr "Eau claire"
 
-#: ../hacks/config/atlantis.xml.h:19
-msgid "Whale speed"
-msgstr "Vitesse des baleines"
+#: ../hacks/config/atlantis.xml.h:16
+msgid "Flat background"
+msgstr "Fond uni"
+
+#: ../hacks/config/atlantis.xml.h:17
+msgid "Gradient background"
+msgstr "Fond en dégradé de couleur"
 
 #. #### -mipmap
-#: ../hacks/config/atlantis.xml.h:20 ../hacks/config/atunnel.xml.h:9
-#: ../hacks/config/blinkbox.xml.h:13 ../hacks/config/blocktube.xml.h:12
-#: ../hacks/config/boing.xml.h:15 ../hacks/config/bouncingcow.xml.h:13
-#: ../hacks/config/boxed.xml.h:25 ../hacks/config/cage.xml.h:7
-#: ../hacks/config/crackberg.xml.h:24 ../hacks/config/cube21.xml.h:28
-#: ../hacks/config/cubenetic.xml.h:27 ../hacks/config/cubestorm.xml.h:18
-#: ../hacks/config/dangerball.xml.h:15 ../hacks/config/dnalogo.xml.h:10
-#: ../hacks/config/extrusion.xml.h:18 ../hacks/config/flipflop.xml.h:15
-#: ../hacks/config/flyingtoasters.xml.h:16 ../hacks/config/gears.xml.h:15
-#: ../hacks/config/glcells.xml.h:34 ../hacks/config/glforestfire.xml.h:17
-#: ../hacks/config/glhanoi.xml.h:18 ../hacks/config/glknots.xml.h:25
-#: ../hacks/config/glmatrix.xml.h:21 ../hacks/config/glplanet.xml.h:14
-#: ../hacks/config/glschool.xml.h:18 ../hacks/config/glsnake.xml.h:18
-#: ../hacks/config/gltext.xml.h:20 ../hacks/config/jigglypuff.xml.h:28
-#: ../hacks/config/lament.xml.h:9 ../hacks/config/lavalite.xml.h:30
-#: ../hacks/config/menger.xml.h:21 ../hacks/config/mirrorblob.xml.h:27
-#: ../hacks/config/moebiusgears.xml.h:15 ../hacks/config/molecule.xml.h:27
-#: ../hacks/config/pinion.xml.h:17 ../hacks/config/polyhedra.xml.h:169
-#: ../hacks/config/providence.xml.h:8 ../hacks/config/queens.xml.h:7
-#: ../hacks/config/rubikblocks.xml.h:21 ../hacks/config/sballs.xml.h:17
-#: ../hacks/config/sierpinski3d.xml.h:11 ../hacks/config/speedmine.xml.h:18
-#: ../hacks/config/spheremonics.xml.h:23 ../hacks/config/sproingies.xml.h:11
-#: ../hacks/config/stonerview.xml.h:8 ../hacks/config/superquadrics.xml.h:14
-#: ../hacks/config/tangram.xml.h:14 ../hacks/config/topblock.xml.h:25
+#: ../hacks/config/atlantis.xml.h:18 ../hacks/config/atunnel.xml.h:7
+#: ../hacks/config/blinkbox.xml.h:11 ../hacks/config/blocktube.xml.h:10
+#: ../hacks/config/boing.xml.h:13 ../hacks/config/bouncingcow.xml.h:11
+#: ../hacks/config/boxed.xml.h:24 ../hacks/config/cage.xml.h:5
+#: ../hacks/config/companioncube.xml.h:13 ../hacks/config/crackberg.xml.h:17
+#: ../hacks/config/cube21.xml.h:25 ../hacks/config/cubenetic.xml.h:25
+#: ../hacks/config/cubestorm.xml.h:16 ../hacks/config/dangerball.xml.h:13
+#: ../hacks/config/dnalogo.xml.h:8 ../hacks/config/extrusion.xml.h:16
+#: ../hacks/config/flipflop.xml.h:13 ../hacks/config/flyingtoasters.xml.h:13
+#: ../hacks/config/gears.xml.h:13 ../hacks/config/glcells.xml.h:33
+#: ../hacks/config/glforestfire.xml.h:15 ../hacks/config/glhanoi.xml.h:15
+#: ../hacks/config/glknots.xml.h:23 ../hacks/config/glmatrix.xml.h:19
+#: ../hacks/config/glplanet.xml.h:12 ../hacks/config/glschool.xml.h:13
+#: ../hacks/config/glsnake.xml.h:17 ../hacks/config/gltext.xml.h:18
+#: ../hacks/config/hilbert.xml.h:21 ../hacks/config/jigglypuff.xml.h:26
+#: ../hacks/config/lament.xml.h:6 ../hacks/config/lavalite.xml.h:15
+#: ../hacks/config/menger.xml.h:19 ../hacks/config/mirrorblob.xml.h:26
+#: ../hacks/config/moebiusgears.xml.h:13 ../hacks/config/molecule.xml.h:11
+#: ../hacks/config/pinion.xml.h:15 ../hacks/config/polyhedra.xml.h:166
+#: ../hacks/config/providence.xml.h:6 ../hacks/config/queens.xml.h:5
+#: ../hacks/config/rubikblocks.xml.h:19 ../hacks/config/sballs.xml.h:15
+#: ../hacks/config/sierpinski3d.xml.h:9 ../hacks/config/speedmine.xml.h:16
+#: ../hacks/config/spheremonics.xml.h:21 ../hacks/config/sproingies.xml.h:8
+#: ../hacks/config/stonerview.xml.h:5 ../hacks/config/superquadrics.xml.h:12
+#: ../hacks/config/tangram.xml.h:14 ../hacks/config/topblock.xml.h:23
+#: ../hacks/config/tronbit.xml.h:10
 msgid "Wireframe"
 msgstr "Fil de fer"
 
+#: ../hacks/config/atlantis.xml.h:20
+msgid ""
+"A 3D animation of a number of sharks, dolphins, and whales. Written by Mark "
+"Kilgard; 1998."
+msgstr ""
+"Une animation 3D avec des requins, des dauphins et des baleines. "
+"Initialement écrit par Mark Kilgard ; 1994. Porté par Eric Lassauge pour "
+"xlock; 1998."
+
 #: ../hacks/config/attraction.xml.h:1
 msgid "Attraction"
 msgstr "Attraction"
 
-#: ../hacks/config/attraction.xml.h:2
-msgid "Ball count"
-msgstr "Nombre de boules"
-
-#: ../hacks/config/attraction.xml.h:3
-msgid "Ball mass"
-msgstr "Masse d'une boule"
-
-#: ../hacks/config/attraction.xml.h:4 ../hacks/config/juggle.xml.h:1
-#: ../hacks/config/juggler3d.xml.h:1
+#: ../hacks/config/attraction.xml.h:2 ../hacks/config/juggle.xml.h:13
+#: ../hacks/config/juggler3d.xml.h:13
 msgid "Balls"
 msgstr "Balles"
 
+#: ../hacks/config/attraction.xml.h:3 ../hacks/config/deluxe.xml.h:6
+#: ../hacks/config/lmorph.xml.h:12 ../hacks/config/pedal.xml.h:6
+#: ../hacks/config/starfish.xml.h:12 ../hacks/config/surfaces.xml.h:23
+#: ../hacks/config/whirlygig.xml.h:3
+msgid "Lines"
+msgstr "Ligne"
+
+#: ../hacks/config/attraction.xml.h:4
+msgid "Tails"
+msgstr "Queues"
+
 #: ../hacks/config/attraction.xml.h:5
-msgid "Bounce off walls"
-msgstr "Rebondir sur les murs"
+msgid "Polygons"
+msgstr "Polygones"
 
 #: ../hacks/config/attraction.xml.h:6
-msgid "Environmental viscosity"
-msgstr "Viscosité environnementale"
+msgid "Splines"
+msgstr "Rayons"
 
-#: ../hacks/config/attraction.xml.h:8
+#: ../hacks/config/attraction.xml.h:7
 msgid "Filled splines"
 msgstr "Cannelures pleines"
 
-#: ../hacks/config/attraction.xml.h:10
+#: ../hacks/config/attraction.xml.h:8
+msgid "Bounce off walls"
+msgstr "Rebondir sur les murs"
+
+#: ../hacks/config/attraction.xml.h:9
 msgid "Ignore screen edges"
 msgstr "Ne pas prendre en compte les bords de l'écran"
 
-#: ../hacks/config/attraction.xml.h:11
-msgid "Inward"
-msgstr "Intérieur"
+#: ../hacks/config/attraction.xml.h:10
+msgid "Ball count"
+msgstr "Nombre de boules"
 
-#: ../hacks/config/attraction.xml.h:13 ../hacks/config/deluxe.xml.h:7
-#: ../hacks/config/lmorph.xml.h:9 ../hacks/config/pedal.xml.h:5
-#: ../hacks/config/starfish.xml.h:7 ../hacks/config/surfaces.xml.h:12
-#: ../hacks/config/whirlygig.xml.h:4
-msgid "Lines"
-msgstr "Ligne"
+#: ../hacks/config/attraction.xml.h:12
+msgid "Environmental viscosity"
+msgstr "Viscosité environnementale"
 
 #. 
 #. <number id="eulerpower" type="slider" arg="-eulerpower %"
 #. _label="Power" _low-label="Low" _high-label="High"
 #. low="0.5" high="3.0" default="1.0"/>
 #. 
-#: ../hacks/config/attraction.xml.h:14 ../hacks/config/blocktube.xml.h:7
-#: ../hacks/config/braid.xml.h:7 ../hacks/config/celtic.xml.h:6
-#: ../hacks/config/cube21.xml.h:11 ../hacks/config/cynosure.xml.h:5
-#: ../hacks/config/drift.xml.h:6 ../hacks/config/eruption.xml.h:13
-#: ../hacks/config/euler2d.xml.h:16 ../hacks/config/fiberlamp.xml.h:7
-#: ../hacks/config/flow.xml.h:9 ../hacks/config/fontglide.xml.h:8
-#: ../hacks/config/galaxy.xml.h:6 ../hacks/config/glcells.xml.h:16
-#: ../hacks/config/juggle.xml.h:11 ../hacks/config/juggler3d.xml.h:12
-#: ../hacks/config/laser.xml.h:6 ../hacks/config/menger.xml.h:5
-#: ../hacks/config/metaballs.xml.h:6 ../hacks/config/mismunch.xml.h:4
-#: ../hacks/config/munch.xml.h:5 ../hacks/config/nerverot.xml.h:14
-#: ../hacks/config/petri.xml.h:10 ../hacks/config/photopile.xml.h:12
-#: ../hacks/config/pipes.xml.h:11 ../hacks/config/polyominoes.xml.h:5
-#: ../hacks/config/rotor.xml.h:5 ../hacks/config/rubikblocks.xml.h:8
-#: ../hacks/config/shadebobs.xml.h:5 ../hacks/config/sierpinski3d.xml.h:4
-#: ../hacks/config/skytentacles.xml.h:10 ../hacks/config/slidescreen.xml.h:10
-#: ../hacks/config/sonar.xml.h:8 ../hacks/config/spheremonics.xml.h:7
-#: ../hacks/config/substrate.xml.h:12 ../hacks/config/superquadrics.xml.h:6
-#: ../hacks/config/surfaces.xml.h:13 ../hacks/config/tangram.xml.h:7
-#: ../hacks/config/vermiculate.xml.h:3 ../hacks/config/wander.xml.h:9
-#: ../hacks/config/whirlwindwarp.xml.h:3 ../hacks/config/xlyap.xml.h:5
-msgid "Long"
-msgstr "Long(ue)"
-
-#: ../hacks/config/attraction.xml.h:18
-msgid "Orbital mode"
-msgstr "Mode orbital"
+#: ../hacks/config/attraction.xml.h:14 ../hacks/config/blocktube.xml.h:5
+#: ../hacks/config/braid.xml.h:5 ../hacks/config/celtic.xml.h:5
+#: ../hacks/config/cube21.xml.h:21 ../hacks/config/cynosure.xml.h:8
+#: ../hacks/config/drift.xml.h:5 ../hacks/config/eruption.xml.h:19
+#: ../hacks/config/euler2d.xml.h:13 ../hacks/config/fiberlamp.xml.h:8
+#: ../hacks/config/flow.xml.h:13 ../hacks/config/galaxy.xml.h:6
+#: ../hacks/config/glcells.xml.h:5 ../hacks/config/juggle.xml.h:8
+#: ../hacks/config/juggler3d.xml.h:8 ../hacks/config/laser.xml.h:6
+#: ../hacks/config/menger.xml.h:5 ../hacks/config/metaballs.xml.h:5
+#: ../hacks/config/mismunch.xml.h:5 ../hacks/config/munch.xml.h:5
+#: ../hacks/config/nerverot.xml.h:5 ../hacks/config/petri.xml.h:24
+#: ../hacks/config/photopile.xml.h:18 ../hacks/config/pipes.xml.h:8
+#: ../hacks/config/polyominoes.xml.h:6 ../hacks/config/rotor.xml.h:5
+#: ../hacks/config/rubikblocks.xml.h:15 ../hacks/config/shadebobs.xml.h:13
+#: ../hacks/config/sierpinski3d.xml.h:5 ../hacks/config/skytentacles.xml.h:5
+#: ../hacks/config/slidescreen.xml.h:5 ../hacks/config/sonar.xml.h:20
+#: ../hacks/config/spheremonics.xml.h:5 ../hacks/config/substrate.xml.h:5
+#: ../hacks/config/superquadrics.xml.h:9 ../hacks/config/surfaces.xml.h:5
+#: ../hacks/config/vermiculate.xml.h:2 ../hacks/config/wander.xml.h:6
+#: ../hacks/config/whirlwindwarp.xml.h:5
+msgid "Short"
+msgstr "Court(e)"
 
-#: ../hacks/config/attraction.xml.h:19
-msgid "Outward"
-msgstr "Extérieur"
+#: ../hacks/config/attraction.xml.h:15 ../hacks/config/euler2d.xml.h:14
+#: ../hacks/config/juggle.xml.h:12 ../hacks/config/juggler3d.xml.h:12
+#: ../hacks/config/sonar.xml.h:21
+msgid "Trail length"
+msgstr "Longueur de la queue"
 
-#: ../hacks/config/attraction.xml.h:20
-msgid "Polygons"
-msgstr "Polygones"
+#. 
+#. <number id="eulerpower" type="slider" arg="-eulerpower %"
+#. _label="Power" _low-label="Low" _high-label="High"
+#. low="0.5" high="3.0" default="1.0"/>
+#. 
+#: ../hacks/config/attraction.xml.h:16 ../hacks/config/blocktube.xml.h:7
+#: ../hacks/config/braid.xml.h:7 ../hacks/config/celtic.xml.h:7
+#: ../hacks/config/cube21.xml.h:23 ../hacks/config/cynosure.xml.h:10
+#: ../hacks/config/drift.xml.h:7 ../hacks/config/eruption.xml.h:21
+#: ../hacks/config/euler2d.xml.h:20 ../hacks/config/fiberlamp.xml.h:10
+#: ../hacks/config/flow.xml.h:15 ../hacks/config/fontglide.xml.h:13
+#: ../hacks/config/galaxy.xml.h:8 ../hacks/config/glcells.xml.h:7
+#: ../hacks/config/juggle.xml.h:10 ../hacks/config/juggler3d.xml.h:10
+#: ../hacks/config/laser.xml.h:8 ../hacks/config/menger.xml.h:7
+#: ../hacks/config/metaballs.xml.h:7 ../hacks/config/mismunch.xml.h:7
+#: ../hacks/config/munch.xml.h:7 ../hacks/config/nerverot.xml.h:7
+#: ../hacks/config/petri.xml.h:26 ../hacks/config/photopile.xml.h:20
+#: ../hacks/config/pipes.xml.h:10 ../hacks/config/polyominoes.xml.h:8
+#: ../hacks/config/rotor.xml.h:7 ../hacks/config/rubikblocks.xml.h:17
+#: ../hacks/config/shadebobs.xml.h:15 ../hacks/config/sierpinski3d.xml.h:7
+#: ../hacks/config/skytentacles.xml.h:7 ../hacks/config/slidescreen.xml.h:7
+#: ../hacks/config/sonar.xml.h:22 ../hacks/config/spheremonics.xml.h:7
+#: ../hacks/config/substrate.xml.h:7 ../hacks/config/superquadrics.xml.h:11
+#: ../hacks/config/surfaces.xml.h:7 ../hacks/config/tangram.xml.h:7
+#: ../hacks/config/vermiculate.xml.h:4 ../hacks/config/wander.xml.h:8
+#: ../hacks/config/whirlwindwarp.xml.h:7 ../hacks/config/xlyap.xml.h:7
+msgid "Long"
+msgstr "Long(ue)"
 
-#: ../hacks/config/attraction.xml.h:21 ../hacks/config/fuzzyflakes.xml.h:18
-msgid "Radius"
-msgstr "Rayon"
+#: ../hacks/config/attraction.xml.h:20
+msgid "Ball mass"
+msgstr "Masse d'une boule"
 
 #: ../hacks/config/attraction.xml.h:22
 msgid "Repulsion threshold"
 msgstr "Seuil de répulsion"
 
-#. 
-#. <number id="eulerpower" type="slider" arg="-eulerpower %"
-#. _label="Power" _low-label="Low" _high-label="High"
-#. low="0.5" high="3.0" default="1.0"/>
-#. 
-#: ../hacks/config/attraction.xml.h:23 ../hacks/config/blocktube.xml.h:9
-#: ../hacks/config/braid.xml.h:12 ../hacks/config/celtic.xml.h:9
-#: ../hacks/config/cube21.xml.h:16 ../hacks/config/cynosure.xml.h:10
-#: ../hacks/config/drift.xml.h:10 ../hacks/config/eruption.xml.h:21
-#: ../hacks/config/euler2d.xml.h:26 ../hacks/config/fiberlamp.xml.h:10
-#: ../hacks/config/flow.xml.h:17 ../hacks/config/galaxy.xml.h:11
-#: ../hacks/config/glcells.xml.h:29 ../hacks/config/juggle.xml.h:17
-#: ../hacks/config/juggler3d.xml.h:18 ../hacks/config/laser.xml.h:10
-#: ../hacks/config/menger.xml.h:16 ../hacks/config/metaballs.xml.h:14
-#: ../hacks/config/mismunch.xml.h:9 ../hacks/config/munch.xml.h:13
-#: ../hacks/config/nerverot.xml.h:20 ../hacks/config/petri.xml.h:23
-#: ../hacks/config/photopile.xml.h:17 ../hacks/config/pipes.xml.h:19
-#: ../hacks/config/polyominoes.xml.h:11 ../hacks/config/rotor.xml.h:10
-#: ../hacks/config/rubikblocks.xml.h:13 ../hacks/config/shadebobs.xml.h:13
-#: ../hacks/config/sierpinski3d.xml.h:7 ../hacks/config/skytentacles.xml.h:12
-#: ../hacks/config/slidescreen.xml.h:13 ../hacks/config/sonar.xml.h:19
-#: ../hacks/config/spheremonics.xml.h:17 ../hacks/config/substrate.xml.h:16
-#: ../hacks/config/superquadrics.xml.h:9 ../hacks/config/surfaces.xml.h:21
-#: ../hacks/config/vermiculate.xml.h:4 ../hacks/config/wander.xml.h:11
-#: ../hacks/config/whirlwindwarp.xml.h:6
-msgid "Short"
-msgstr "Court(e)"
+#: ../hacks/config/attraction.xml.h:27
+msgid "Orbital mode"
+msgstr "Mode orbital"
+
+#: ../hacks/config/attraction.xml.h:28 ../hacks/config/fuzzyflakes.xml.h:26
+msgid "Radius"
+msgstr "Rayon"
 
 #: ../hacks/config/attraction.xml.h:29
-msgid "Splines"
-msgstr "Rayons"
+msgid "Outward"
+msgstr "Extérieur"
 
 #: ../hacks/config/attraction.xml.h:30
-msgid "Tails"
-msgstr "Queues"
-
-#: ../hacks/config/attraction.xml.h:31 ../hacks/config/euler2d.xml.h:30
-#: ../hacks/config/juggle.xml.h:22 ../hacks/config/juggler3d.xml.h:22
-#: ../hacks/config/sonar.xml.h:31
-msgid "Trail length"
-msgstr "Longueur de la queue"
+msgid "Inward"
+msgstr "Intérieur"
 
 #: ../hacks/config/attraction.xml.h:33
 msgid ""
@@ -2456,7 +2512,18 @@
 msgid "Atunnel"
 msgstr "Tunnel GL"
 
-#: ../hacks/config/atunnel.xml.h:2
+#: ../hacks/config/atunnel.xml.h:5 ../hacks/config/blocktube.xml.h:9
+#: ../hacks/config/cubenetic.xml.h:24 ../hacks/config/glmatrix.xml.h:18
+#: ../hacks/config/lament.xml.h:5 ../hacks/config/sballs.xml.h:14
+msgid "Textured"
+msgstr "Texturé"
+
+#: ../hacks/config/atunnel.xml.h:6 ../hacks/config/boing.xml.h:11
+#: ../hacks/config/crackberg.xml.h:12 ../hacks/config/glplanet.xml.h:11
+msgid "Lighting"
+msgstr "Éclair"
+
+#: ../hacks/config/atunnel.xml.h:9
 msgid ""
 "Draws an animation of a textured tunnel in GL. Written by Eric Lassauge and "
 "Roman Podobedov; 2003."
@@ -2464,34 +2531,27 @@
 "Dessine une animation d'un tunnel texturé en 3D. Écrit par Eric Lassauge "
 "<lassauge@users.sourceforge.net> et Roman Podobedov; 2003."
 
-#: ../hacks/config/atunnel.xml.h:5 ../hacks/config/boing.xml.h:4
-#: ../hacks/config/crackberg.xml.h:14 ../hacks/config/glplanet.xml.h:7
-msgid "Lighting"
-msgstr "Éclair"
-
-#: ../hacks/config/atunnel.xml.h:8 ../hacks/config/blocktube.xml.h:11
-#: ../hacks/config/cubenetic.xml.h:25 ../hacks/config/glmatrix.xml.h:19
-#: ../hacks/config/lament.xml.h:8 ../hacks/config/sballs.xml.h:16
-msgid "Textured"
-msgstr "Texturé"
-
 #: ../hacks/config/barcode.xml.h:1
 msgid "Barcode"
 msgstr "Code-barres"
 
-#: ../hacks/config/barcode.xml.h:2
-msgid "Barcode clock (24 hour)"
-msgstr "Horloge en code barres (24 heures)"
+#: ../hacks/config/barcode.xml.h:5
+msgid "Scrolling barcodes"
+msgstr "Codes barres mouvants"
+
+#: ../hacks/config/barcode.xml.h:6
+msgid "Barcode grid"
+msgstr "Grille de code barres"
 
-#: ../hacks/config/barcode.xml.h:3
+#: ../hacks/config/barcode.xml.h:7
 msgid "Barcode clock (AM/PM)"
 msgstr "Horloge en code barres (AM/PM)"
 
-#: ../hacks/config/barcode.xml.h:4
-msgid "Barcode grid"
-msgstr "Grille de code barres"
+#: ../hacks/config/barcode.xml.h:8
+msgid "Barcode clock (24 hour)"
+msgstr "Horloge en code barres (24 heures)"
 
-#: ../hacks/config/barcode.xml.h:5
+#: ../hacks/config/barcode.xml.h:10
 msgid ""
 "Draws a random sequence of colorful barcodes scrolling across your screen. "
 "CONSUME! The barcodes follow the UPC-A, UPC-E, EAN-8 or EAN-13 standards. "
@@ -2504,15 +2564,23 @@
 "EAN-8 ou EAN-13. http://fr.wikipedia.org/wiki/Code_universel_des_produits "
 "http://fr.wikipedia.org/wiki/Code-barres_EAN Ecrit par Dan Dornstein; 2003."
 
-#: ../hacks/config/barcode.xml.h:9
-msgid "Scrolling barcodes"
-msgstr "Codes barres mouvants"
-
 #: ../hacks/config/blaster.xml.h:1
 msgid "Blaster"
 msgstr "Explosion"
 
-#: ../hacks/config/blaster.xml.h:2
+#: ../hacks/config/blaster.xml.h:5
+msgid "Robots"
+msgstr "Robots"
+
+#: ../hacks/config/blaster.xml.h:6 ../hacks/config/penetrate.xml.h:5
+msgid "Lasers"
+msgstr "Lasers"
+
+#: ../hacks/config/blaster.xml.h:8 ../hacks/config/glplanet.xml.h:10
+msgid "Stars"
+msgstr "Étoiles"
+
+#: ../hacks/config/blaster.xml.h:12
 msgid ""
 "Draws a simulation of flying space-combat robots (cleverly disguised as "
 "colored circles) doing battle in front of a moving star field. Written by "
@@ -2522,31 +2590,15 @@
 "en cercles colorés) en guerre sur un fond de champ stellaire animé. Écrit "
 "par Jonathan Lin; 1999."
 
-#: ../hacks/config/blaster.xml.h:6 ../hacks/config/penetrate.xml.h:4
-msgid "Lasers"
-msgstr "Lasers"
-
-#: ../hacks/config/blaster.xml.h:9
-msgid "Robots"
-msgstr "Robots"
-
-#: ../hacks/config/blaster.xml.h:12 ../hacks/config/glplanet.xml.h:12
-msgid "Stars"
-msgstr "Étoiles"
-
 #: ../hacks/config/blinkbox.xml.h:1
 msgid "BlinkBox"
 msgstr "BlinkBox"
 
-#: ../hacks/config/blinkbox.xml.h:2
+#: ../hacks/config/blinkbox.xml.h:6
 msgid "Box size"
 msgstr "Taille de la boîte"
 
-#: ../hacks/config/blinkbox.xml.h:3
-msgid "Dissolve"
-msgstr "Dissolution"
-
-#: ../hacks/config/blinkbox.xml.h:4 ../hacks/config/phosphor.xml.h:2
+#: ../hacks/config/blinkbox.xml.h:8 ../hacks/config/phosphor.xml.h:7
 msgid "Fade"
 msgstr "Flétrissement"
 
@@ -2554,7 +2606,11 @@
 msgid "Motion blur"
 msgstr "Flou Cinétique"
 
-#: ../hacks/config/blinkbox.xml.h:11
+#: ../hacks/config/blinkbox.xml.h:10
+msgid "Dissolve"
+msgstr "Dissolution"
+
+#: ../hacks/config/blinkbox.xml.h:13
 msgid ""
 "Shows a ball contained inside of a bounding box. Colored blocks blink in "
 "when the ball hits the sides. Written by Jeremy English; 2003."
@@ -2563,66 +2619,66 @@
 "la boîte clignotent lorsque la balle touche les cotés. Écrit par Jeremy "
 "English ; 2003."
 
-#: ../hacks/config/blitspin.xml.h:1 ../hacks/config/bumps.xml.h:1
-#: ../hacks/config/decayscreen.xml.h:1 ../hacks/config/distort.xml.h:1
-#: ../hacks/config/ripples.xml.h:1 ../hacks/config/rotzoomer.xml.h:1
-#: ../hacks/config/slidescreen.xml.h:1 ../hacks/config/spotlight.xml.h:1
-#: ../hacks/config/twang.xml.h:1 ../hacks/config/zoom.xml.h:5
-msgid "10 minutes"
-msgstr "10 minutes"
-
-#: ../hacks/config/blitspin.xml.h:2 ../hacks/config/bumps.xml.h:2
-#: ../hacks/config/decayscreen.xml.h:2 ../hacks/config/distort.xml.h:2
-#: ../hacks/config/flame.xml.h:2 ../hacks/config/gleidescope.xml.h:1
-#: ../hacks/config/glslideshow.xml.h:2 ../hacks/config/maze.xml.h:2
-#: ../hacks/config/ripples.xml.h:2 ../hacks/config/rotzoomer.xml.h:2
-#: ../hacks/config/slidescreen.xml.h:2 ../hacks/config/spotlight.xml.h:2
-#: ../hacks/config/twang.xml.h:2 ../hacks/config/zoom.xml.h:6
-msgid "10 seconds"
-msgstr "10 secondes"
+#: ../hacks/config/blitspin.xml.h:1
+msgid "BlitSpin"
+msgstr "Rotation Bitmap"
 
 #: ../hacks/config/blitspin.xml.h:3
+msgid "Fuzzy rotation speed"
+msgstr "Vitesse de rotation imprécise"
+
+#: ../hacks/config/blitspin.xml.h:5
 msgid "90 degree rotation speed"
 msgstr "Vitesse de rotation à 90°"
 
-#: ../hacks/config/blitspin.xml.h:4
-msgid "BlitSpin"
-msgstr "Rotation Bitmap"
+#: ../hacks/config/blitspin.xml.h:6 ../hacks/config/bumps.xml.h:8
+#: ../hacks/config/decayscreen.xml.h:5 ../hacks/config/distort.xml.h:5
+#: ../hacks/config/flame.xml.h:7 ../hacks/config/gleidescope.xml.h:8
+#: ../hacks/config/glslideshow.xml.h:5 ../hacks/config/maze.xml.h:7
+#: ../hacks/config/ripples.xml.h:5 ../hacks/config/rotzoomer.xml.h:5
+#: ../hacks/config/slidescreen.xml.h:8 ../hacks/config/spotlight.xml.h:5
+#: ../hacks/config/twang.xml.h:5 ../hacks/config/zoom.xml.h:5
+msgid "10 seconds"
+msgstr "10 secondes"
 
 #. 
 #. <number id="eulerpower" type="slider" arg="-eulerpower %"
 #. _label="Power" _low-label="Low" _high-label="High"
 #. low="0.5" high="3.0" default="1.0"/>
 #. 
-#: ../hacks/config/blitspin.xml.h:5 ../hacks/config/braid.xml.h:3
-#: ../hacks/config/bsod.xml.h:10 ../hacks/config/bumps.xml.h:5
-#: ../hacks/config/cynosure.xml.h:2 ../hacks/config/decayscreen.xml.h:4
-#: ../hacks/config/deco.xml.h:4 ../hacks/config/distort.xml.h:6
-#: ../hacks/config/drift.xml.h:3 ../hacks/config/eruption.xml.h:2
-#: ../hacks/config/euler2d.xml.h:6 ../hacks/config/galaxy.xml.h:2
-#: ../hacks/config/glsnake.xml.h:6 ../hacks/config/hopalong.xml.h:2
-#: ../hacks/config/laser.xml.h:2 ../hacks/config/menger.xml.h:2
-#: ../hacks/config/metaballs.xml.h:3 ../hacks/config/mismunch.xml.h:1
-#: ../hacks/config/moire.xml.h:3 ../hacks/config/molecule.xml.h:11
-#: ../hacks/config/munch.xml.h:2 ../hacks/config/nerverot.xml.h:8
-#: ../hacks/config/pedal.xml.h:3 ../hacks/config/polyhedra.xml.h:15
-#: ../hacks/config/polyominoes.xml.h:1 ../hacks/config/ripples.xml.h:6
-#: ../hacks/config/rotzoomer.xml.h:5 ../hacks/config/shadebobs.xml.h:2
-#: ../hacks/config/sierpinski3d.xml.h:1 ../hacks/config/slidescreen.xml.h:4
-#: ../hacks/config/spheremonics.xml.h:4 ../hacks/config/spotlight.xml.h:4
-#: ../hacks/config/starfish.xml.h:4 ../hacks/config/substrate.xml.h:7
-#: ../hacks/config/superquadrics.xml.h:2 ../hacks/config/surfaces.xml.h:5
-#: ../hacks/config/twang.xml.h:5 ../hacks/config/vermiculate.xml.h:2
-#: ../hacks/config/vidwhacker.xml.h:3 ../hacks/config/wander.xml.h:5
-#: ../hacks/config/zoom.xml.h:7
+#: ../hacks/config/blitspin.xml.h:7 ../hacks/config/braid.xml.h:6
+#: ../hacks/config/bsod.xml.h:3 ../hacks/config/bumps.xml.h:9
+#: ../hacks/config/cynosure.xml.h:9 ../hacks/config/decayscreen.xml.h:6
+#: ../hacks/config/deco.xml.h:3 ../hacks/config/distort.xml.h:6
+#: ../hacks/config/drift.xml.h:6 ../hacks/config/eruption.xml.h:20
+#: ../hacks/config/euler2d.xml.h:26 ../hacks/config/galaxy.xml.h:7
+#: ../hacks/config/glsnake.xml.h:6 ../hacks/config/hopalong.xml.h:6
+#: ../hacks/config/laser.xml.h:7 ../hacks/config/menger.xml.h:6
+#: ../hacks/config/metaballs.xml.h:6 ../hacks/config/mismunch.xml.h:6
+#: ../hacks/config/moire.xml.h:3 ../hacks/config/molecule.xml.h:6
+#: ../hacks/config/munch.xml.h:6 ../hacks/config/nerverot.xml.h:6
+#: ../hacks/config/pedal.xml.h:3 ../hacks/config/polyhedra.xml.h:9
+#: ../hacks/config/polyominoes.xml.h:7 ../hacks/config/ripples.xml.h:6
+#: ../hacks/config/rotzoomer.xml.h:6 ../hacks/config/shadebobs.xml.h:14
+#: ../hacks/config/sierpinski3d.xml.h:6 ../hacks/config/slidescreen.xml.h:9
+#: ../hacks/config/spheremonics.xml.h:6 ../hacks/config/spotlight.xml.h:6
+#: ../hacks/config/starfish.xml.h:9 ../hacks/config/substrate.xml.h:6
+#: ../hacks/config/superquadrics.xml.h:10 ../hacks/config/surfaces.xml.h:6
+#: ../hacks/config/twang.xml.h:6 ../hacks/config/vermiculate.xml.h:3
+#: ../hacks/config/vidwhacker.xml.h:3 ../hacks/config/wander.xml.h:7
+#: ../hacks/config/zoom.xml.h:6
 msgid "Duration"
 msgstr "Durée"
 
-#: ../hacks/config/blitspin.xml.h:7
-msgid "Fuzzy rotation speed"
-msgstr "Vitesse de rotation imprécise"
+#: ../hacks/config/blitspin.xml.h:8 ../hacks/config/bumps.xml.h:10
+#: ../hacks/config/decayscreen.xml.h:7 ../hacks/config/distort.xml.h:7
+#: ../hacks/config/ripples.xml.h:7 ../hacks/config/rotzoomer.xml.h:7
+#: ../hacks/config/slidescreen.xml.h:10 ../hacks/config/spotlight.xml.h:7
+#: ../hacks/config/twang.xml.h:7 ../hacks/config/zoom.xml.h:7
+msgid "10 minutes"
+msgstr "10 minutes"
 
-#: ../hacks/config/blitspin.xml.h:8
+#: ../hacks/config/blitspin.xml.h:10
 msgid ""
 "Repeatedly rotates a bitmap by 90 degrees by using logical operations: the "
 "bitmap is divided into quadrants, and the quadrants are shifted clockwise. "
@@ -2636,54 +2692,61 @@
 msgid "BlockTube"
 msgstr "Tube de blocs"
 
-#: ../hacks/config/blocktube.xml.h:2
-msgid "Color change time"
-msgstr "Durée du changement de couleur"
-
-#: ../hacks/config/blocktube.xml.h:3
+#: ../hacks/config/blocktube.xml.h:6
 msgid "Color hold time"
 msgstr "Durée de conservation de la couleur"
 
-#: ../hacks/config/blocktube.xml.h:4
+#: ../hacks/config/blocktube.xml.h:8
+msgid "Color change time"
+msgstr "Durée du changement de couleur"
+
+#: ../hacks/config/blocktube.xml.h:12
 msgid ""
 "Draws a swirling, falling tunnel of reflective slabs. They fade from hue to "
 "hue. Written by Lars R. Damerow; 2003."
 msgstr ""
+"Dessine un tunnel tourbillonnant et descendant de plaques réfléchissantes. "
+"Elles disparaissent en fondu de teinte. Écrit par Lars R. Damerow ; 2003."
 
 #: ../hacks/config/boing.xml.h:1
 msgid "Boing"
 msgstr "Boïng"
 
-#: ../hacks/config/boing.xml.h:3 ../hacks/config/boxed.xml.h:12
-#: ../hacks/config/glcells.xml.h:12 ../hacks/config/pinion.xml.h:8
-#: ../hacks/config/sonar.xml.h:7
+#: ../hacks/config/boing.xml.h:2 ../hacks/config/boxed.xml.h:11
+#: ../hacks/config/pinion.xml.h:9 ../hacks/config/sonar.xml.h:17
+msgid "Tiny"
+msgstr "Fin(e)"
+
+#: ../hacks/config/boing.xml.h:3 ../hacks/config/lisa.xml.h:11
+#: ../hacks/config/lissie.xml.h:14 ../hacks/config/loop.xml.h:11
+#: ../hacks/config/rotor.xml.h:12 ../hacks/config/rubik.xml.h:9
+#: ../hacks/config/wander.xml.h:11 ../hacks/config/worm.xml.h:9
+msgid "Size"
+msgstr "Taille"
+
+#: ../hacks/config/boing.xml.h:4 ../hacks/config/boxed.xml.h:13
+#: ../hacks/config/glcells.xml.h:13 ../hacks/config/pinion.xml.h:11
+#: ../hacks/config/sonar.xml.h:19
 msgid "Huge"
 msgstr "Énorme"
 
-#: ../hacks/config/boing.xml.h:5
+#: ../hacks/config/boing.xml.h:8
 msgid "Meridians"
 msgstr "Méridiens"
 
-#: ../hacks/config/boing.xml.h:6
+#: ../hacks/config/boing.xml.h:9
 msgid "Parallels"
 msgstr "Parallèles"
 
-#: ../hacks/config/boing.xml.h:7
-msgid "Scanlines"
-msgstr "Lignes"
-
-#: ../hacks/config/boing.xml.h:9 ../hacks/config/lisa.xml.h:13
-#: ../hacks/config/lissie.xml.h:12 ../hacks/config/loop.xml.h:11
-#: ../hacks/config/rotor.xml.h:12 ../hacks/config/rubik.xml.h:12
-#: ../hacks/config/wander.xml.h:13 ../hacks/config/worm.xml.h:9
-msgid "Size"
-msgstr "Taille"
-
-#: ../hacks/config/boing.xml.h:11
+#: ../hacks/config/boing.xml.h:10
 msgid "Smoothing"
 msgstr "Lissage"
 
-#: ../hacks/config/boing.xml.h:13
+#: ../hacks/config/boing.xml.h:12
+msgid "Scanlines"
+msgstr "Lignes"
+
+#: ../hacks/config/boing.xml.h:15
 msgid ""
 "This bouncing ball is a clone of the first graphics demo for the Amiga 1000, "
 "which was written by Dale Luck and RJ Mical during a break at the 1984 "
@@ -2693,25 +2756,28 @@
 "http://en.wikipedia.org/wiki/Amiga#Boing_Ball Written by Jamie Zawinski; "
 "2005."
 msgstr ""
-
-#: ../hacks/config/boing.xml.h:14 ../hacks/config/boxed.xml.h:24
-#: ../hacks/config/pinion.xml.h:16 ../hacks/config/sonar.xml.h:30
-msgid "Tiny"
-msgstr "Fin(e)"
+"Cette boîte rebondissante est un clone de la première démonstration "
+"graphique de l'Amiga 1000, qui a été écrite Dale Luck et RJ Mical lors d'une "
+"pause au Consumer Electronics Show de 1984 (comme véhiculé par la légende). "
+"Ceci ressemble à la démonstration originale de l'Amiga si vous désactivez "
+"les options « Lissage » et « Éclairage » et que vous activez l'option "
+"« Cannelures ». Cela aura toutefois l'air plus moderne. "
+"http://en.wikipedia.org/wiki/Amiga#Boing_Ball Écrit par Jamie Zawinski ; "
+"2005."
 
 #: ../hacks/config/bouboule.xml.h:1
 msgid "Bouboule"
 msgstr "Bouboule"
 
-#: ../hacks/config/bouboule.xml.h:2 ../hacks/config/rocks.xml.h:2
+#: ../hacks/config/bouboule.xml.h:6
+msgid "Number of spots"
+msgstr "Nombre de projecteurs"
+
+#: ../hacks/config/bouboule.xml.h:10 ../hacks/config/rocks.xml.h:13
 msgid "Do Red/Blue 3D separation"
 msgstr "Séparation rouge/bleu 3D"
 
-#: ../hacks/config/bouboule.xml.h:9
-msgid "Number of spots"
-msgstr ""
-
-#: ../hacks/config/bouboule.xml.h:11
+#: ../hacks/config/bouboule.xml.h:12
 msgid ""
 "This draws what looks like a spinning, deforming balloon with varying-sized "
 "spots painted on its invisible surface. Written by Jeremie Petit; 1997."
@@ -2721,126 +2787,134 @@
 "1997."
 
 #: ../hacks/config/bouncingcow.xml.h:1
-msgid ""
-"A Cow. A Trampoline. Together, they fight crime. Written by Jamie Zawinski; "
-"2003."
-msgstr ""
-"Une vache. Un trampoline. Ensemble ils combattent le crime. Écrit par Jamie "
-"Zawinski; 2003."
-
-#: ../hacks/config/bouncingcow.xml.h:2
-msgid "Bounce speed"
-msgstr "Vitesse de rebond"
-
-#: ../hacks/config/bouncingcow.xml.h:3
 msgid "BouncingCow"
 msgstr "Vache bondissante"
 
 #: ../hacks/config/bouncingcow.xml.h:6
-msgid "Herd"
-msgstr "Troupeau"
+msgid "Bounce speed"
+msgstr "Vitesse de rebond"
 
-#: ../hacks/config/bouncingcow.xml.h:9
+#: ../hacks/config/bouncingcow.xml.h:8
 msgid "Moo"
 msgstr "Meuh"
 
-#: ../hacks/config/bouncingcow.xml.h:10
+#: ../hacks/config/bouncingcow.xml.h:9
 msgid "Number of cows"
 msgstr "Nombre de vaches"
 
-#: ../hacks/config/boxed.xml.h:1 ../hacks/config/fluidballs.xml.h:2
-msgid "Ball size"
-msgstr "Taille de la balle"
-
-#: ../hacks/config/boxed.xml.h:2
-msgid "Boxed"
-msgstr "En boîte"
+#: ../hacks/config/bouncingcow.xml.h:10
+msgid "Herd"
+msgstr "Troupeau"
 
-#: ../hacks/config/boxed.xml.h:3
+#: ../hacks/config/bouncingcow.xml.h:13
 msgid ""
-"Draws a box full of 3D bouncing balls that explode. Written by Sander van "
-"Grieken; 2002."
+"A Cow. A Trampoline. Together, they fight crime. Written by Jamie Zawinski; "
+"2003."
 msgstr ""
-"Dessine une boîte remplie de balles 3D qui explosent. Écrit par Sander van "
-"Grieken; 2002."
-
-#: ../hacks/config/boxed.xml.h:4
-msgid "Explosion decay"
-msgstr "Affaiblissement de l'explosion"
-
-#: ../hacks/config/boxed.xml.h:5
-msgid "Explosion force"
-msgstr "Force de l'explosion"
+"Une vache. Un trampoline. Ensemble ils combattent le crime. Écrit par Jamie "
+"Zawinski; 2003."
 
-#: ../hacks/config/boxed.xml.h:6
-msgid "Explosion momentum"
-msgstr "Dynamisme de l'explosion"
+#: ../hacks/config/boxed.xml.h:1
+msgid "Boxed"
+msgstr "En boîte"
 
-#: ../hacks/config/boxed.xml.h:10 ../hacks/config/xmatrix.xml.h:6
-msgid "Full"
-msgstr "Complet"
+#: ../hacks/config/boxed.xml.h:9 ../hacks/config/fluidballs.xml.h:6
+msgid "Number of balls"
+msgstr "Nombre de balles"
 
-#: ../hacks/config/boxed.xml.h:14 ../hacks/config/circuit.xml.h:8
-#: ../hacks/config/glschool.xml.h:12 ../hacks/config/julia.xml.h:9
-#: ../hacks/config/mountain.xml.h:4 ../hacks/config/pipes.xml.h:12
-#: ../hacks/config/sproingies.xml.h:4 ../hacks/config/substrate.xml.h:13
-#: ../hacks/config/wormhole.xml.h:6
+#: ../hacks/config/boxed.xml.h:10 ../hacks/config/circuit.xml.h:7
+#: ../hacks/config/glschool.xml.h:7 ../hacks/config/julia.xml.h:7
+#: ../hacks/config/mountain.xml.h:7 ../hacks/config/pipes.xml.h:13
+#: ../hacks/config/sproingies.xml.h:6 ../hacks/config/substrate.xml.h:10
+#: ../hacks/config/wormhole.xml.h:10
 msgid "Lots"
 msgstr "Beaucoup"
 
-#: ../hacks/config/boxed.xml.h:17
+#: ../hacks/config/boxed.xml.h:12 ../hacks/config/fluidballs.xml.h:9
+msgid "Ball size"
+msgstr "Taille de la balle"
+
+#: ../hacks/config/boxed.xml.h:14 ../hacks/config/hopalong.xml.h:14
+msgid "Popcorn"
+msgstr "Popcorn"
+
+#: ../hacks/config/boxed.xml.h:15
+msgid "Explosion force"
+msgstr "Force de l'explosion"
+
+#: ../hacks/config/boxed.xml.h:16
 msgid "Nuke"
 msgstr "Explosion"
 
-#: ../hacks/config/boxed.xml.h:18 ../hacks/config/fluidballs.xml.h:16
-msgid "Number of balls"
-msgstr "Nombre de balles"
+#: ../hacks/config/boxed.xml.h:18
+msgid "Explosion decay"
+msgstr "Affaiblissement de l'explosion"
 
 #: ../hacks/config/boxed.xml.h:19
 msgid "Pop!"
 msgstr "Pop!"
 
-#: ../hacks/config/boxed.xml.h:20 ../hacks/config/hopalong.xml.h:18
-msgid "Popcorn"
-msgstr "Popcorn"
+#: ../hacks/config/boxed.xml.h:21
+msgid "Explosion momentum"
+msgstr "Dynamisme de l'explosion"
 
-#: ../hacks/config/boxfit.xml.h:1 ../hacks/config/popsquares.xml.h:1
-msgid "Border"
-msgstr "Bordure"
+#: ../hacks/config/boxed.xml.h:22 ../hacks/config/xmatrix.xml.h:20
+msgid "Full"
+msgstr "Complet"
+
+#: ../hacks/config/boxed.xml.h:25
+msgid ""
+"Draws a box full of 3D bouncing balls that explode. Written by Sander van "
+"Grieken; 2002."
+msgstr ""
+"Dessine une boîte remplie de balles 3D qui explosent. Écrit par Sander van "
+"Grieken; 2002."
 
-#: ../hacks/config/boxfit.xml.h:2
+#: ../hacks/config/boxfit.xml.h:1
 msgid "BoxFit"
 msgstr "BoxFit"
 
-#: ../hacks/config/boxfit.xml.h:3 ../hacks/config/cubenetic.xml.h:1
+#: ../hacks/config/boxfit.xml.h:5 ../hacks/config/cubenetic.xml.h:6
 msgid "Boxes"
 msgstr "Boîtes"
 
-#: ../hacks/config/boxfit.xml.h:4
-msgid "Boxes only"
-msgstr "Seulement des boîtes"
+#: ../hacks/config/boxfit.xml.h:6
+msgid "Grow by"
+msgstr "Agrandir de"
+
+#: ../hacks/config/boxfit.xml.h:7
+msgid "Spacing"
+msgstr "Espacement"
+
+#: ../hacks/config/boxfit.xml.h:8 ../hacks/config/popsquares.xml.h:6
+msgid "Border"
+msgstr "Bordure"
 
-#: ../hacks/config/boxfit.xml.h:5
+#: ../hacks/config/boxfit.xml.h:9
 msgid "Boxes or circles"
 msgstr "Boîtes ou cercles"
 
-#: ../hacks/config/boxfit.xml.h:6
+#: ../hacks/config/boxfit.xml.h:10
+msgid "Boxes only"
+msgstr "Seulement des boîtes"
+
+#: ../hacks/config/boxfit.xml.h:11
 msgid "Circles only"
 msgstr "Seulement des cercles"
 
-#: ../hacks/config/boxfit.xml.h:7
+#: ../hacks/config/boxfit.xml.h:12
 msgid "Color gradient"
 msgstr "Gradient de couleurs"
 
-#: ../hacks/config/boxfit.xml.h:9
+#: ../hacks/config/boxfit.xml.h:13
 msgid "Grab images"
 msgstr "Récupérer des images"
 
-#: ../hacks/config/boxfit.xml.h:10
-msgid "Grow by"
-msgstr "Agrandir de"
+#: ../hacks/config/boxfit.xml.h:14
+msgid "Peek at underlying images"
+msgstr "Coup d'oeil aux images en arrière-plan"
 
-#: ../hacks/config/boxfit.xml.h:13
+#: ../hacks/config/boxfit.xml.h:16
 msgid ""
 "Packs the screen with growing squares or circles, colored according to a "
 "horizontal or vertical gradient, or according to the colors of the desktop "
@@ -2849,19 +2923,20 @@
 "Jamie Zawinski; 2005."
 msgstr ""
 
-#: ../hacks/config/boxfit.xml.h:14
-msgid "Peek at underlying images"
-msgstr "Coup d'oeil aux images en arrière-plan"
+#: ../hacks/config/braid.xml.h:1
+msgid "Braid"
+msgstr "Entrelacement"
 
-#: ../hacks/config/boxfit.xml.h:16
-msgid "Spacing"
-msgstr "Espacement"
+#: ../hacks/config/braid.xml.h:11
+msgid "Number of rings"
+msgstr "Nombre d'anneaux"
 
-#: ../hacks/config/braid.xml.h:1
-msgid "Braid"
-msgstr "Entrelacement"
+#: ../hacks/config/braid.xml.h:12 ../hacks/config/epicycle.xml.h:11
+#: ../hacks/config/hilbert.xml.h:16 ../hacks/config/nerverot.xml.h:20
+msgid "Line thickness"
+msgstr "Épaisseur de la ligne"
 
-#: ../hacks/config/braid.xml.h:2
+#: ../hacks/config/braid.xml.h:14
 msgid ""
 "Draws random color-cycling inter-braided concentric circles. Written by John "
 "Neil; 1997."
@@ -2869,156 +2944,151 @@
 "Dessine des cercles concentriques aléatoires entrelacés, avec des cycles de "
 "couleurs. Écrit par John Neil; 1997."
 
-#: ../hacks/config/braid.xml.h:6 ../hacks/config/epicycle.xml.h:7
-#: ../hacks/config/nerverot.xml.h:13
-msgid "Line thickness"
-msgstr "Épaisseur de la ligne"
-
-#: ../hacks/config/braid.xml.h:11
-msgid "Number of rings"
-msgstr "Nombre d'anneaux"
-
-#: ../hacks/config/bsod.xml.h:1 ../hacks/config/m6502.xml.h:1
-#: ../hacks/config/molecule.xml.h:1 ../hacks/config/vidwhacker.xml.h:1
-msgid "2 minutes"
-msgstr "2 minutes"
+#: ../hacks/config/bsod.xml.h:1
+msgid "BSOD"
+msgstr "BSOD"
 
-#: ../hacks/config/bsod.xml.h:2 ../hacks/config/carousel.xml.h:2
-#: ../hacks/config/m6502.xml.h:2 ../hacks/config/molecule.xml.h:2
+#: ../hacks/config/bsod.xml.h:2 ../hacks/config/carousel.xml.h:8
+#: ../hacks/config/m6502.xml.h:2 ../hacks/config/molecule.xml.h:5
 msgid "5 seconds"
 msgstr "5 secondes"
 
-#: ../hacks/config/bsod.xml.h:3
-msgid "ATM"
-msgstr ""
-
-#: ../hacks/config/bsod.xml.h:4
-msgid "AmigaDOS"
-msgstr "Amiga DOS"
-
-#: ../hacks/config/bsod.xml.h:5
-msgid "Apple ]["
-msgstr "Apple ]["
+#: ../hacks/config/bsod.xml.h:4 ../hacks/config/m6502.xml.h:4
+#: ../hacks/config/molecule.xml.h:7 ../hacks/config/vidwhacker.xml.h:4
+msgid "2 minutes"
+msgstr "2 minutes"
 
 #: ../hacks/config/bsod.xml.h:6
-msgid "Atari"
-msgstr "Atari"
+msgid "Windows 3.1"
+msgstr "Windows 3.1"
 
 #: ../hacks/config/bsod.xml.h:7
-msgid "BSD"
-msgstr "BSD"
+msgid "Windows NT"
+msgstr "Windows NT"
 
 #: ../hacks/config/bsod.xml.h:8
-msgid "BSOD"
-msgstr "BSOD"
+msgid "Windows 2000  "
+msgstr "Windows 2000  "
 
 #: ../hacks/config/bsod.xml.h:9
-msgid ""
-"BSOD stands for \"Blue Screen of Death\". The finest in personal computer "
-"emulation, BSOD simulates popular screen savers from a number of less robust "
-"operating systems. Written by Jamie Zawinski; 1998."
-msgstr ""
-"BSOD signifie « Blue Screen Of Death » (l'écran bleu de la mort). Cet écran "
-"de veille simule les écrans de veille populaires de certains systèmes "
-"d'exploitation peu robustes. Écrit par Jamie Zawinski en 1998."
+msgid "MS-DOS"
+msgstr "M$-DOS"
+
+#: ../hacks/config/bsod.xml.h:10
+msgid "AmigaDOS"
+msgstr "Amiga DOS"
 
 #: ../hacks/config/bsod.xml.h:11
 msgid "GLaDOS"
 msgstr "GLaDOS"
 
 #: ../hacks/config/bsod.xml.h:12
-msgid "HPUX"
-msgstr "HPUX"
+msgid "Apple ]["
+msgstr "Apple ]["
 
 #: ../hacks/config/bsod.xml.h:13
-msgid "HVX/GCOS6"
-msgstr "HVX/GCOS6"
+msgid "NVidia"
+msgstr "NVidia"
 
 #: ../hacks/config/bsod.xml.h:14
-msgid "Linux (fsck)"
-msgstr "Linux (dsck)"
+msgid "OS/2"
+msgstr "OS/2"
 
 #: ../hacks/config/bsod.xml.h:15
-msgid "Linux (hppa)"
-msgstr "Linux (hppa)"
+msgid "Sad Mac"
+msgstr "Mac Triste"
 
 #: ../hacks/config/bsod.xml.h:16
-msgid "Linux (sparc)"
-msgstr "Linux (sparc)"
+msgid "Mac bomb"
+msgstr "Les bombes du Mac"
 
 #: ../hacks/config/bsod.xml.h:17
-msgid "MS-DOS"
-msgstr "M$-DOS"
+msgid "MacsBug"
+msgstr "Bogue Mac"
 
 #: ../hacks/config/bsod.xml.h:18
-msgid "Mac bomb"
-msgstr "Les bombes du Mac"
+msgid "Atari"
+msgstr "Atari"
 
 #: ../hacks/config/bsod.xml.h:19
 msgid "MacOS X"
 msgstr "MacOS X"
 
 #: ../hacks/config/bsod.xml.h:20
-msgid "MacsBug"
-msgstr "Bogue Mac"
+msgid "OS/390"
+msgstr "OS/390"
 
 #: ../hacks/config/bsod.xml.h:21
-msgid "NCD X Terminal  "
-msgstr "Terminal X NCD  "
+msgid "VMS"
+msgstr "VMS"
 
 #: ../hacks/config/bsod.xml.h:22
-msgid "NVidia"
-msgstr "NVidia"
+msgid "HVX/GCOS6"
+msgstr "HVX/GCOS6"
 
 #: ../hacks/config/bsod.xml.h:23
-msgid "OS/2"
-msgstr "OS/2"
+msgid "NCD X Terminal  "
+msgstr "Terminal X NCD  "
 
 #: ../hacks/config/bsod.xml.h:24
-msgid "OS/390"
-msgstr "OS/390"
+msgid "ATM"
+msgstr ""
 
 #: ../hacks/config/bsod.xml.h:25
-msgid "SCO"
-msgstr "SCO"
+msgid "BSD"
+msgstr "BSD"
 
 #: ../hacks/config/bsod.xml.h:26
-msgid "Sad Mac"
-msgstr "Mac Triste"
+msgid "Linux (fsck)"
+msgstr "Linux (dsck)"
+
+#: ../hacks/config/bsod.xml.h:27
+msgid "Linux (sparc)"
+msgstr "Linux (sparc)"
 
 #: ../hacks/config/bsod.xml.h:28
-msgid "Solaris"
-msgstr "Solaris"
+msgid "Linux (hppa)"
+msgstr "Linux (hppa)"
 
 #: ../hacks/config/bsod.xml.h:29
-msgid "Tru64"
-msgstr "Tru64"
+msgid "Solaris"
+msgstr "Solaris"
 
 #: ../hacks/config/bsod.xml.h:30
-msgid "VMS"
-msgstr "VMS"
+msgid "SCO"
+msgstr "SCO"
 
 #: ../hacks/config/bsod.xml.h:31
-msgid "Windows 2000  "
-msgstr "Windows 2000  "
+msgid "HPUX"
+msgstr "HPUX"
 
 #: ../hacks/config/bsod.xml.h:32
-msgid "Windows 3.1"
-msgstr "Windows 3.1"
+msgid "Tru64"
+msgstr "Tru64"
 
 #: ../hacks/config/bsod.xml.h:33
-msgid "Windows NT"
-msgstr "Windows NT"
+msgid ""
+"BSOD stands for \"Blue Screen of Death\". The finest in personal computer "
+"emulation, BSOD simulates popular screen savers from a number of less robust "
+"operating systems. Written by Jamie Zawinski; 1998."
+msgstr ""
+"BSOD signifie « Blue Screen Of Death » (l'écran bleu de la mort). Cet écran "
+"de veille simule les écrans de veille populaires de certains systèmes "
+"d'exploitation peu robustes. Écrit par Jamie Zawinski en 1998."
 
 #: ../hacks/config/bubble3d.xml.h:1
-msgid "Bubble color"
-msgstr "Couleur de la bulle"
-
-#: ../hacks/config/bubble3d.xml.h:2
 msgid "Bubble3D"
 msgstr "Bulles 3D"
 
-#: ../hacks/config/bubble3d.xml.h:3
+#: ../hacks/config/bubble3d.xml.h:5
+msgid "Transparent bubbles"
+msgstr "Bulles transparentes"
+
+#: ../hacks/config/bubble3d.xml.h:6
+msgid "Bubble color"
+msgstr "Couleur de la bulle"
+
+#: ../hacks/config/bubble3d.xml.h:8
 msgid ""
 "Draws a stream of rising, undulating 3D bubbles, rising toward the top of "
 "the screen, with transparency and specular reflections. Written by Richard "
@@ -3028,38 +3098,34 @@
 "l'écran, avec de belles réflexions spéculaires. Écrit par Richard Jones; "
 "1998."
 
-#: ../hacks/config/bubble3d.xml.h:8
-msgid "Transparent bubbles"
-msgstr "Bulles transparentes"
-
 #: ../hacks/config/bubbles.xml.h:1
 msgid "Bubbles"
 msgstr "Bulles"
 
-#: ../hacks/config/bubbles.xml.h:2
-msgid "Bubbles fall"
-msgstr "Chute des bulles"
-
-#: ../hacks/config/bubbles.xml.h:3
-msgid "Bubbles float"
-msgstr "Flottaison des bulles"
-
-#: ../hacks/config/bubbles.xml.h:4
-msgid "Bubbles rise"
-msgstr ""
-
 #: ../hacks/config/bubbles.xml.h:5
-msgid "Don't hide bubbles when they pop"
-msgstr "Ne pas masquer les bulles lorsqu'elles éclatent"
-
-#: ../hacks/config/bubbles.xml.h:6
 msgid "Draw circles instead of bubble images"
 msgstr "Tracer des cercles au lieu des images de bulles"
 
-#: ../hacks/config/bubbles.xml.h:9
+#: ../hacks/config/bubbles.xml.h:6
+msgid "Don't hide bubbles when they pop"
+msgstr "Ne pas masquer les bulles lorsqu'elles éclatent"
+
+#: ../hacks/config/bubbles.xml.h:7
 msgid "Leave trails"
 msgstr "Laisse des traînées"
 
+#: ../hacks/config/bubbles.xml.h:8
+msgid "Bubbles rise"
+msgstr ""
+
+#: ../hacks/config/bubbles.xml.h:9
+msgid "Bubbles float"
+msgstr "Flottaison des bulles"
+
+#: ../hacks/config/bubbles.xml.h:10
+msgid "Bubbles fall"
+msgstr "Chute des bulles"
+
 #: ../hacks/config/bubbles.xml.h:12
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
@@ -3068,8 +3134,17 @@
 "they combine to form larger bubbles, which eventually pop. Written by James "
 "Macnicol; 1996."
 msgstr ""
+"Cet écran de veille a été retiré de la distribution de XScreenSaver depuis "
+"la version 5.08. Ceci simule le type de bulle qui se forme quand l'eau boue. "
+"De petites bulles apparaissent et quand elles se rapprochent les unes des "
+"autres elles fusionnent pour former de grandes bulles qui éventuellement "
+"éclatent. Écrit par James Macnicol en 1996."
+
+#: ../hacks/config/bumps.xml.h:1 ../hacks/config/mirrorblob.xml.h:15
+msgid "Bumps"
+msgstr "Reliefs"
 
-#: ../hacks/config/bumps.xml.h:3
+#: ../hacks/config/bumps.xml.h:12
 msgid ""
 "A spotlight roams across an embossed version of your desktop or other "
 "picture. Written by Shane Smit; 1999."
@@ -3077,15 +3152,11 @@
 "Un projecteur erre dans une version en relief de votre bureau ou dans toute "
 "autre image. Ecrit par Shane Smit, 1999."
 
-#: ../hacks/config/bumps.xml.h:4 ../hacks/config/mirrorblob.xml.h:7
-msgid "Bumps"
-msgstr "Reliefs"
-
 #: ../hacks/config/cage.xml.h:1
 msgid "Cage"
 msgstr "Cage"
 
-#: ../hacks/config/cage.xml.h:6
+#: ../hacks/config/cage.xml.h:7
 msgid ""
 "This draws Escher's \"Impossible Cage\", a 3d analog of a moebius strip, and "
 "rotates it in three dimensions. "
@@ -3097,87 +3168,91 @@
 "http://fr.wikipedia.org/wiki/Maurits_Cornelis_Escher; Écrit par Marcelo "
 "Vianna en 1998."
 
-#: ../hacks/config/carousel.xml.h:1 ../hacks/config/coral.xml.h:1
-#: ../hacks/config/deco.xml.h:1 ../hacks/config/helix.xml.h:1
-#: ../hacks/config/moire.xml.h:1 ../hacks/config/pedal.xml.h:1
-#: ../hacks/config/rorschach.xml.h:1 ../hacks/config/xspirograph.xml.h:1
-msgid "1 minute"
-msgstr "1 minute"
+#: ../hacks/config/carousel.xml.h:1
+msgid "Carousel"
+msgstr "Caroussel"
 
-#: ../hacks/config/carousel.xml.h:3 ../hacks/config/ccurve.xml.h:3
-#: ../hacks/config/photopile.xml.h:3
+#: ../hacks/config/carousel.xml.h:6 ../hacks/config/ccurve.xml.h:6
+#: ../hacks/config/photopile.xml.h:13 ../hacks/config/tronbit.xml.h:6
 msgid "Animation speed"
 msgstr "Vitesse de l'animation"
 
-#: ../hacks/config/carousel.xml.h:4
-msgid "Carousel"
-msgstr "Caroussel"
-
-#: ../hacks/config/carousel.xml.h:8
-msgid ""
-"Loads several random images, and displays them flying in a circular "
-"formation. The formation changes speed and direction randomly, and images "
-"periodically drop out to be replaced by new ones. Written by Jamie Zawinski; "
-"2005."
-msgstr ""
+#: ../hacks/config/carousel.xml.h:9 ../hacks/config/glslideshow.xml.h:6
+#: ../hacks/config/mirrorblob.xml.h:9 ../hacks/config/photopile.xml.h:19
+msgid "Time until loading a new image"
+msgstr "Durée avant de charger une nouvelle image"
 
-#: ../hacks/config/carousel.xml.h:10
-msgid "No tilting"
-msgstr ""
+#: ../hacks/config/carousel.xml.h:10 ../hacks/config/coral.xml.h:7
+#: ../hacks/config/deco.xml.h:4 ../hacks/config/helix.xml.h:7
+#: ../hacks/config/moire.xml.h:4 ../hacks/config/pedal.xml.h:4
+#: ../hacks/config/rorschach.xml.h:10 ../hacks/config/xspirograph.xml.h:7
+msgid "1 minute"
+msgstr "1 minute"
 
-#: ../hacks/config/carousel.xml.h:11 ../hacks/config/photopile.xml.h:15
+#: ../hacks/config/carousel.xml.h:11 ../hacks/config/photopile.xml.h:8
 msgid "Number of images"
 msgstr "Nombre d'images"
 
-#: ../hacks/config/carousel.xml.h:12 ../hacks/config/glslideshow.xml.h:19
-#: ../hacks/config/photopile.xml.h:18
-msgid "Show file names"
-msgstr "Montrer les noms des fichiers"
-
-#: ../hacks/config/carousel.xml.h:15
+#: ../hacks/config/carousel.xml.h:12
 msgid "Tilt in/out and left/right"
 msgstr "Bascule en avant ou en arrière et à gauche ou à droite"
 
-#: ../hacks/config/carousel.xml.h:16
+#: ../hacks/config/carousel.xml.h:13
 msgid "Tilt in/out only"
 msgstr "Bascule en avant ou en arrière seulement"
 
-#: ../hacks/config/carousel.xml.h:17
+#: ../hacks/config/carousel.xml.h:14
 msgid "Tilt left/right only"
 msgstr "Bascule à gauche ou à droite seulement"
 
-#: ../hacks/config/carousel.xml.h:18 ../hacks/config/glslideshow.xml.h:21
-#: ../hacks/config/mirrorblob.xml.h:24 ../hacks/config/photopile.xml.h:23
-msgid "Time until loading a new image"
-msgstr "Durée avant de charger une nouvelle image"
+#: ../hacks/config/carousel.xml.h:15
+msgid "No tilting"
+msgstr "Aucun basculement"
 
-#: ../hacks/config/carousel.xml.h:19
+#: ../hacks/config/carousel.xml.h:16
 msgid "Zoom in/out"
 msgstr "Zoomer/Dézoomer"
 
-#: ../hacks/config/ccurve.xml.h:2 ../hacks/config/epicycle.xml.h:2
-#: ../hacks/config/glslideshow.xml.h:5 ../hacks/config/glsnake.xml.h:2
-#: ../hacks/config/polyhedra.xml.h:2 ../hacks/config/starfish.xml.h:2
-msgid "30 seconds"
-msgstr "30 secondes"
+#: ../hacks/config/carousel.xml.h:17 ../hacks/config/glslideshow.xml.h:19
+#: ../hacks/config/photopile.xml.h:21
+msgid "Show file names"
+msgstr "Montrer les noms des fichiers"
+
+#: ../hacks/config/carousel.xml.h:19
+msgid ""
+"Loads several random images, and displays them flying in a circular "
+"formation. The formation changes speed and direction randomly, and images "
+"periodically drop out to be replaced by new ones. Written by Jamie Zawinski; "
+"2005."
+msgstr ""
+"Charge un nombre important d'images aléatoirement, et les affiche dans une "
+"formation circulaire. La formation change de vitesse ou de direction "
+"aléatoirement et les images sautent régulièrement pour être remplacées par "
+"de nouvelles. Écrit par Jamie Zawinski ; 2005."
 
-#: ../hacks/config/ccurve.xml.h:4
+#: ../hacks/config/ccurve.xml.h:1
 msgid "CCurve"
 msgstr ""
 
-#: ../hacks/config/ccurve.xml.h:5
+#: ../hacks/config/ccurve.xml.h:3
 msgid "Change image every"
 msgstr "Changer d'image tout les"
 
-#: ../hacks/config/ccurve.xml.h:6 ../hacks/config/coral.xml.h:5
-#: ../hacks/config/imsmap.xml.h:5 ../hacks/config/kumppa.xml.h:1
-#: ../hacks/config/qix.xml.h:6 ../hacks/config/squiral.xml.h:2
-#: ../hacks/config/superquadrics.xml.h:1 ../hacks/config/wander.xml.h:2
-#: ../hacks/config/xmatrix.xml.h:2
+#: ../hacks/config/ccurve.xml.h:4 ../hacks/config/epicycle.xml.h:10
+#: ../hacks/config/glslideshow.xml.h:15 ../hacks/config/glsnake.xml.h:7
+#: ../hacks/config/polyhedra.xml.h:10 ../hacks/config/starfish.xml.h:10
+msgid "30 seconds"
+msgstr "30 secondes"
+
+#: ../hacks/config/ccurve.xml.h:9 ../hacks/config/coral.xml.h:9
+#: ../hacks/config/imsmap.xml.h:9 ../hacks/config/kumppa.xml.h:5
+#: ../hacks/config/qix.xml.h:9 ../hacks/config/squiral.xml.h:11
+#: ../hacks/config/superquadrics.xml.h:8 ../hacks/config/wander.xml.h:5
+#: ../hacks/config/xmatrix.xml.h:19
 msgid "Density"
 msgstr "Densité"
 
-#: ../hacks/config/ccurve.xml.h:8
+#: ../hacks/config/ccurve.xml.h:12
 msgid ""
 "Generates self-similar linear fractals, including the classic \"C Curve\". "
 "http://en.wikipedia.org/wiki/Levy_C_curve Written by Rick Campbell; 1999."
@@ -3190,11 +3265,11 @@
 msgid "Celtic"
 msgstr "Celtique"
 
-#: ../hacks/config/celtic.xml.h:2
+#: ../hacks/config/celtic.xml.h:8
 msgid "Draw graph"
 msgstr "Dessiner un graphique"
 
-#: ../hacks/config/celtic.xml.h:8
+#: ../hacks/config/celtic.xml.h:10
 msgid ""
 "Repeatedly draws random Celtic cross-stitch patterns. "
 "http://en.wikipedia.org/wiki/Celtic_knot Written by Max Froumentin; 2005."
@@ -3203,58 +3278,75 @@
 "http://en.wikipedia.org/wiki/Celtic_knot Ecrit par Max Froumentin; 2005."
 
 #: ../hacks/config/circuit.xml.h:1
-msgid ""
-"Animates a number of 3D electronic components. Written by Ben Buxton; 2001."
-msgstr ""
-"Anime plusieurs composants électroniques 3D. Écrit par Ben Buxton; 2001."
-
-#: ../hacks/config/circuit.xml.h:2
 msgid "Circuit"
 msgstr "Circuit"
 
-#: ../hacks/config/circuit.xml.h:3 ../hacks/config/gflux.xml.h:5
-msgid "Directional lighting"
-msgstr "Lumière directionnelle"
-
-#: ../hacks/config/circuit.xml.h:5
-msgid "Flat coloring"
-msgstr "Coloration unie"
-
-#: ../hacks/config/circuit.xml.h:10 ../hacks/config/mismunch.xml.h:8
-#: ../hacks/config/mountain.xml.h:9 ../hacks/config/munch.xml.h:12
-#: ../hacks/config/pipes.xml.h:16 ../hacks/config/shadebobs.xml.h:11
-#: ../hacks/config/sproingies.xml.h:6
+#: ../hacks/config/circuit.xml.h:5 ../hacks/config/mismunch.xml.h:8
+#: ../hacks/config/mountain.xml.h:5 ../hacks/config/munch.xml.h:8
+#: ../hacks/config/pipes.xml.h:5 ../hacks/config/shadebobs.xml.h:11
+#: ../hacks/config/sproingies.xml.h:5
 msgid "One"
 msgstr "Un(e)"
 
-#: ../hacks/config/circuit.xml.h:11
+#: ../hacks/config/circuit.xml.h:6
 msgid "Parts"
 msgstr "Composants"
 
-#: ../hacks/config/circuit.xml.h:12 ../hacks/config/jigglypuff.xml.h:16
-#: ../hacks/config/pinion.xml.h:12
+#: ../hacks/config/circuit.xml.h:9 ../hacks/config/jigglypuff.xml.h:7
+#: ../hacks/config/pinion.xml.h:6
 msgid "Rotation speed"
 msgstr "Vitesse de rotation"
 
-#: ../hacks/config/circuit.xml.h:15 ../hacks/config/cube21.xml.h:22
-#: ../hacks/config/cubestorm.xml.h:13 ../hacks/config/dangerball.xml.h:13
-#: ../hacks/config/engine.xml.h:17 ../hacks/config/flipflop.xml.h:11
-#: ../hacks/config/gears.xml.h:12 ../hacks/config/moebiusgears.xml.h:13
-#: ../hacks/config/polyhedra.xml.h:147 ../hacks/config/rubikblocks.xml.h:17
-#: ../hacks/config/surfaces.xml.h:23
+#: ../hacks/config/circuit.xml.h:11 ../hacks/config/companioncube.xml.h:11
+#: ../hacks/config/cube21.xml.h:19 ../hacks/config/cubestorm.xml.h:15
+#: ../hacks/config/dangerball.xml.h:12 ../hacks/config/engine.xml.h:18
+#: ../hacks/config/flipflop.xml.h:6 ../hacks/config/gears.xml.h:12
+#: ../hacks/config/hilbert.xml.h:19 ../hacks/config/moebiusgears.xml.h:11
+#: ../hacks/config/polyhedra.xml.h:164 ../hacks/config/rubikblocks.xml.h:13
+#: ../hacks/config/surfaces.xml.h:26 ../hacks/config/tronbit.xml.h:8
 msgid "Spin"
 msgstr "Rotation des objets"
 
-#: ../hacks/config/cloudlife.xml.h:1 ../hacks/config/demon.xml.h:5
-#: ../hacks/config/petri.xml.h:1 ../hacks/config/slidescreen.xml.h:3
-msgid "Cell size"
-msgstr "Taille d'une cellule"
+#: ../hacks/config/circuit.xml.h:12
+msgid "Flat coloring"
+msgstr "Coloration unie"
+
+#: ../hacks/config/circuit.xml.h:13 ../hacks/config/gflux.xml.h:16
+msgid "Directional lighting"
+msgstr "Lumière directionnelle"
+
+#: ../hacks/config/circuit.xml.h:15
+msgid ""
+"Animates a number of 3D electronic components. Written by Ben Buxton; 2001."
+msgstr ""
+"Anime plusieurs composants électroniques 3D. Écrit par Ben Buxton; 2001."
 
-#: ../hacks/config/cloudlife.xml.h:2
+#: ../hacks/config/cloudlife.xml.h:1
 msgid "CloudLife"
 msgstr "Nuages"
 
 #: ../hacks/config/cloudlife.xml.h:5
+msgid "Young"
+msgstr "Jeune"
+
+#: ../hacks/config/cloudlife.xml.h:6
+msgid "Max age"
+msgstr "Âge maximal"
+
+#: ../hacks/config/cloudlife.xml.h:7
+msgid "Old"
+msgstr "Vieux"
+
+#: ../hacks/config/cloudlife.xml.h:8
+msgid "Initial density"
+msgstr "Densité initiale"
+
+#: ../hacks/config/cloudlife.xml.h:10 ../hacks/config/demon.xml.h:14
+#: ../hacks/config/petri.xml.h:6 ../hacks/config/slidescreen.xml.h:15
+msgid "Cell size"
+msgstr "Taille d'une cellule"
+
+#: ../hacks/config/cloudlife.xml.h:14
 #, no-c-format
 msgid ""
 "Generates cloud-like formations based on a variant of Conway's Life. The "
@@ -3265,21 +3357,54 @@
 "2003."
 msgstr ""
 
-#: ../hacks/config/cloudlife.xml.h:7
-msgid "Initial density"
-msgstr "Densité initiale"
+#: ../hacks/config/companioncube.xml.h:1
+msgid "CompanionCube"
+msgstr ""
 
-#: ../hacks/config/cloudlife.xml.h:10
-msgid "Max age"
-msgstr "Âge maximal"
+#: ../hacks/config/companioncube.xml.h:6 ../hacks/config/distort.xml.h:17
+msgid "Bounce"
+msgstr "Rebond"
 
-#: ../hacks/config/cloudlife.xml.h:11
-msgid "Old"
-msgstr "Vieux"
+#: ../hacks/config/companioncube.xml.h:8 ../hacks/config/deluxe.xml.h:8
+#: ../hacks/config/gflux.xml.h:11 ../hacks/config/glcells.xml.h:28
+#: ../hacks/config/glhanoi.xml.h:9 ../hacks/config/glsnake.xml.h:5
+#: ../hacks/config/hypnowheel.xml.h:9 ../hacks/config/lavalite.xml.h:8
+#: ../hacks/config/lisa.xml.h:13 ../hacks/config/lissie.xml.h:11
+#: ../hacks/config/skytentacles.xml.h:2
+msgid "1"
+msgstr "1"
 
-#: ../hacks/config/cloudlife.xml.h:14
-msgid "Young"
-msgstr "Jeune"
+#: ../hacks/config/companioncube.xml.h:9
+msgid "Number of cubes"
+msgstr "Nombre de cubes"
+
+#. #### -no-optimize
+#: ../hacks/config/companioncube.xml.h:12 ../hacks/config/cube21.xml.h:20
+#: ../hacks/config/cubenetic.xml.h:8 ../hacks/config/cubestorm.xml.h:14
+#: ../hacks/config/dangerball.xml.h:11 ../hacks/config/engine.xml.h:17
+#: ../hacks/config/gears.xml.h:11 ../hacks/config/glblur.xml.h:8
+#: ../hacks/config/glforestfire.xml.h:11 ../hacks/config/glknots.xml.h:22
+#: ../hacks/config/glplanet.xml.h:7 ../hacks/config/gltext.xml.h:9
+#: ../hacks/config/hilbert.xml.h:18 ../hacks/config/hypnowheel.xml.h:6
+#: ../hacks/config/lavalite.xml.h:14 ../hacks/config/menger.xml.h:10
+#: ../hacks/config/moebiusgears.xml.h:10 ../hacks/config/molecule.xml.h:16
+#: ../hacks/config/polyhedra.xml.h:165 ../hacks/config/rubikblocks.xml.h:14
+#: ../hacks/config/spheremonics.xml.h:9 ../hacks/config/surfaces.xml.h:25
+#: ../hacks/config/tronbit.xml.h:9 ../hacks/config/wander.xml.h:1
+msgid "Wander"
+msgstr "Déplacement"
+
+#: ../hacks/config/companioncube.xml.h:16
+#, no-c-format
+msgid ""
+"The symptoms most commonly produced by Enrichment Center testing are "
+"superstition, perceiving inanimate objects as alive, and hallucinations. The "
+"Enrichment Center reminds you that the weighted companion cube will never "
+"threaten to stab you and, in fact, cannot speak. In the event that the "
+"Weighted Companion Cube does speak, the Enrichment Center urges you to "
+"disregard its advice. http://en.wikipedia.org/wiki/Portal_%28video_game%29 "
+"Written by Jamie Zawinski; 2011."
+msgstr ""
 
 #: ../hacks/config/compass.xml.h:1
 msgid "Compass"
@@ -3293,33 +3418,42 @@
 "Dessine une boussole, dont tous les éléments tournent de manière aléatoire, "
 "pour obtenir cette sensation de «mal de mer». Écrit par Jamie Zawinski; 1999."
 
-#: ../hacks/config/coral.xml.h:2 ../hacks/config/deco.xml.h:2
-#: ../hacks/config/epicycle.xml.h:1 ../hacks/config/glslideshow.xml.h:1
-#: ../hacks/config/helix.xml.h:2 ../hacks/config/moire.xml.h:2
-#: ../hacks/config/pedal.xml.h:2 ../hacks/config/polyhedra.xml.h:1
-#: ../hacks/config/rorschach.xml.h:2 ../hacks/config/starfish.xml.h:1
-#: ../hacks/config/xspirograph.xml.h:2
+#: ../hacks/config/coral.xml.h:1
+msgid "Coral"
+msgstr "Corail"
+
+#: ../hacks/config/coral.xml.h:5 ../hacks/config/deco.xml.h:2
+#: ../hacks/config/epicycle.xml.h:8 ../hacks/config/glslideshow.xml.h:13
+#: ../hacks/config/helix.xml.h:5 ../hacks/config/moire.xml.h:2
+#: ../hacks/config/pedal.xml.h:2 ../hacks/config/polyhedra.xml.h:8
+#: ../hacks/config/rorschach.xml.h:8 ../hacks/config/starfish.xml.h:8
+#: ../hacks/config/xspirograph.xml.h:5
 msgid "1 second"
 msgstr "1 seconde"
 
-#: ../hacks/config/coral.xml.h:3
-msgid "Coral"
-msgstr "Corail"
+#: ../hacks/config/coral.xml.h:8 ../hacks/config/fireworkx.xml.h:7
+#: ../hacks/config/gflux.xml.h:8 ../hacks/config/glblur.xml.h:5
+#: ../hacks/config/glmatrix.xml.h:5 ../hacks/config/imsmap.xml.h:8
+#: ../hacks/config/lavalite.xml.h:5 ../hacks/config/pyro.xml.h:5
+#: ../hacks/config/qix.xml.h:8 ../hacks/config/squiral.xml.h:10
+#: ../hacks/config/xmatrix.xml.h:18
+msgid "Sparse"
+msgstr "Faible"
 
-#: ../hacks/config/coral.xml.h:4 ../hacks/config/fireworkx.xml.h:2
-#: ../hacks/config/gflux.xml.h:4 ../hacks/config/glblur.xml.h:2
-#: ../hacks/config/glmatrix.xml.h:2 ../hacks/config/imsmap.xml.h:4
-#: ../hacks/config/lavalite.xml.h:6 ../hacks/config/pyro.xml.h:1
-#: ../hacks/config/qix.xml.h:5 ../hacks/config/squiral.xml.h:1
+#: ../hacks/config/coral.xml.h:10 ../hacks/config/fireworkx.xml.h:5
+#: ../hacks/config/gflux.xml.h:10 ../hacks/config/glblur.xml.h:7
+#: ../hacks/config/glmatrix.xml.h:7 ../hacks/config/imsmap.xml.h:10
+#: ../hacks/config/lavalite.xml.h:7 ../hacks/config/pyro.xml.h:7
+#: ../hacks/config/qix.xml.h:10 ../hacks/config/squiral.xml.h:12
 msgid "Dense"
 msgstr "Dense"
 
-#: ../hacks/config/coral.xml.h:12 ../hacks/config/glcells.xml.h:28
-#: ../hacks/config/squiral.xml.h:13
+#: ../hacks/config/coral.xml.h:12 ../hacks/config/glcells.xml.h:29
+#: ../hacks/config/squiral.xml.h:6
 msgid "Seeds"
 msgstr "Germes"
 
-#: ../hacks/config/coral.xml.h:14
+#: ../hacks/config/coral.xml.h:15
 msgid ""
 "Simulates coral growth, albeit somewhat slowly. Written by Frederick Roeber; "
 "1997."
@@ -3327,322 +3461,312 @@
 "Simule la croissance du corail, bien que un peu lentement. Écrit par "
 "Frederick Roeber; 1997."
 
-#: ../hacks/config/coral.xml.h:15 ../hacks/config/fireworkx.xml.h:12
-#: ../hacks/config/gflux.xml.h:17 ../hacks/config/glblur.xml.h:16
-#: ../hacks/config/glmatrix.xml.h:18 ../hacks/config/imsmap.xml.h:17
-#: ../hacks/config/lavalite.xml.h:28 ../hacks/config/pyro.xml.h:15
-#: ../hacks/config/qix.xml.h:22 ../hacks/config/squiral.xml.h:16
-#: ../hacks/config/xmatrix.xml.h:20
-msgid "Sparse"
-msgstr "Faible"
-
 #: ../hacks/config/crackberg.xml.h:1
-msgid "Confused"
-msgstr "Embrouillé"
-
-#: ../hacks/config/crackberg.xml.h:2
 msgid "Crackberg"
 msgstr "Crackberg"
 
-#: ../hacks/config/crackberg.xml.h:3
-msgid "Eagle nest"
-msgstr "Nid d'aigle"
-
-#: ../hacks/config/crackberg.xml.h:4
-msgid "Earthy coloration"
-msgstr "Coloration terreuse"
+#: ../hacks/config/crackberg.xml.h:5
+msgid "Mouse hole"
+msgstr "Trou de souris"
 
 #: ../hacks/config/crackberg.xml.h:6
-msgid "Flat shading"
-msgstr "Ombrage plat"
+msgid "Visibility"
+msgstr "Visibilité"
 
 #: ../hacks/config/crackberg.xml.h:7
-msgid ""
-"Flies through height maps, optionally animating the creation and destruction "
-"of generated tiles; tiles `grow' into place. Written by Matus Telgarsky; "
-"2005."
-msgstr ""
+msgid "Eagle nest"
+msgstr "Nid d'aigle"
+
+#: ../hacks/config/crackberg.xml.h:9
+msgid "Subdivisions"
+msgstr "Sub-divisions"
 
 #: ../hacks/config/crackberg.xml.h:10
 msgid "Hurt me"
 msgstr "Blesse moi"
 
 #: ../hacks/config/crackberg.xml.h:11
-msgid "Icy coloration"
-msgstr "Coloration glacée"
+msgid "Flat shading"
+msgstr "Ombrage plat"
+
+#: ../hacks/config/crackberg.xml.h:13 ../hacks/config/flurry.xml.h:6
+msgid "Water"
+msgstr "Eau"
+
+#: ../hacks/config/crackberg.xml.h:14
+msgid "Confused"
+msgstr "Embrouillé"
 
-#: ../hacks/config/crackberg.xml.h:12
+#: ../hacks/config/crackberg.xml.h:15
 msgid "Immediate"
 msgstr "Immédiat"
 
-#: ../hacks/config/crackberg.xml.h:13 ../hacks/config/glslideshow.xml.h:14
+#: ../hacks/config/crackberg.xml.h:16 ../hacks/config/glslideshow.xml.h:18
 msgid "Letterbox"
 msgstr "Boîte aux lettres"
 
-#: ../hacks/config/crackberg.xml.h:16
-msgid "Mouse hole"
-msgstr "Trou de souris"
-
-#: ../hacks/config/crackberg.xml.h:17 ../hacks/config/imsmap.xml.h:14
+#: ../hacks/config/crackberg.xml.h:19 ../hacks/config/imsmap.xml.h:14
 msgid "Random coloration"
 msgstr "Coloration aléatoire"
 
-#: ../hacks/config/crackberg.xml.h:19
-msgid "Subdivisions"
-msgstr "Sub-divisions"
-
 #: ../hacks/config/crackberg.xml.h:20
-msgid "Swampy coloration"
-msgstr "Coloration marécageuse"
+msgid "Earthy coloration"
+msgstr "Coloration terreuse"
 
 #: ../hacks/config/crackberg.xml.h:21
-msgid "Visibility"
-msgstr "Visibilité"
+msgid "Icy coloration"
+msgstr "Coloration glacée"
 
 #: ../hacks/config/crackberg.xml.h:22
+msgid "Swampy coloration"
+msgstr "Coloration marécageuse"
+
+#: ../hacks/config/crackberg.xml.h:23
 msgid "Vomitous coloration"
 msgstr "Coloration nauséeuse"
 
-#: ../hacks/config/crackberg.xml.h:23 ../hacks/config/flurry.xml.h:11
-msgid "Water"
-msgstr "Eau"
+#: ../hacks/config/crackberg.xml.h:24
+msgid ""
+"Flies through height maps, optionally animating the creation and destruction "
+"of generated tiles; tiles `grow' into place. Written by Matus Telgarsky; "
+"2005."
+msgstr ""
 
 #: ../hacks/config/critical.xml.h:1
 msgid "Critical"
 msgstr "Critique"
 
-#: ../hacks/config/critical.xml.h:8
+#: ../hacks/config/critical.xml.h:9
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Draws a system of self-organizing lines. It starts out as "
 "random squiggles, but after a few iterations, order begins to appear. "
 "Written by Martin Pool; 1999."
 msgstr ""
+"Cet écran de veille a été retiré de la distribution de XScreenSaver depuis "
+"la version 5.08. Dessine un système auto-organisé de lignes. Cela commence "
+"comme un gribouillis quelconque puis après plusieurs itérations, l'ordre "
+"commence à apparaître. Écrit par Martin Pool ; 1999."
 
 #: ../hacks/config/crystal.xml.h:1
-msgid "Center on screen"
-msgstr ""
-
-#: ../hacks/config/crystal.xml.h:2
 msgid "Crystal"
 msgstr "Cristal"
 
-#: ../hacks/config/crystal.xml.h:3
-msgid "Draw cell"
-msgstr "Dessiner une cellule"
-
-#: ../hacks/config/crystal.xml.h:4 ../hacks/config/spheremonics.xml.h:3
-msgid "Draw grid"
-msgstr "Dessiner une grille"
+#. #### -shift (color cycling)
+#: ../hacks/config/crystal.xml.h:9
+msgid "Number of crystals"
+msgstr "Nombre de cristaux"
 
-#: ../hacks/config/crystal.xml.h:7
+#: ../hacks/config/crystal.xml.h:10
 msgid "Horizontal symmetries"
 msgstr "Symétries horizontales"
 
-#: ../hacks/config/crystal.xml.h:10
-msgid ""
-"Moving polygons, similar to a kaleidoscope. See also the \"Kaleidescope\" "
-"and \"GLeidescope\" screen savers. http://en.wikipedia.org/wiki/Kaleidoscope "
-"Written by Jouk Jansen; 1998."
-msgstr ""
+#: ../hacks/config/crystal.xml.h:11
+msgid "Vertical symmetries"
+msgstr "Symétries verticales"
+
+#: ../hacks/config/crystal.xml.h:12 ../hacks/config/spheremonics.xml.h:19
+msgid "Draw grid"
+msgstr "Dessiner une grille"
 
-#. #### -shift (color cycling)
 #: ../hacks/config/crystal.xml.h:13
-msgid "Number of crystals"
-msgstr "Nombre de cristaux"
+msgid "Draw cell"
+msgstr "Dessiner une cellule"
 
-#: ../hacks/config/crystal.xml.h:16
-msgid "Vertical symmetries"
-msgstr "Symétries verticales"
+#: ../hacks/config/crystal.xml.h:14
+msgid "Center on screen"
+msgstr "Centré à l'écran"
 
-#: ../hacks/config/cube21.xml.h:2
-#, no-c-format
+#: ../hacks/config/crystal.xml.h:16
 msgid ""
-"Animates a Rubik-like puzzle known as Cube 21 or Square-1. The rotations are "
-"chosen randomly. See also the \"Rubik\", \"RubikBlocks\" and \"GLSnake\" "
-"screen savers. http://en.wikipedia.org/wiki/Square_One_%28puzzle%29 Written "
-"by Vasek Potocek; 2005."
+"Moving polygons, similar to a kaleidoscope. See also the \"Kaleidescope\" "
+"and \"GLeidescope\" screen savers. http://en.wikipedia.org/wiki/Kaleidoscope "
+"Written by Jouk Jansen; 1998."
 msgstr ""
+"Bouge des polygones, comme dans un kaléidoscope. Voir aussi les écrans de "
+"veille « Kaléidoscope » et « GLéidoscope ». "
+"http://en.wikipedia.org/wiki/Kaleidoscope Écrit par Jouk Jansen ; 1998."
 
-#: ../hacks/config/cube21.xml.h:3
-msgid "Classic edition"
-msgstr "Édition classique"
-
-#: ../hacks/config/cube21.xml.h:4 ../hacks/config/rubikblocks.xml.h:2
-msgid "Cube size"
-msgstr "Taille du cube"
-
-#: ../hacks/config/cube21.xml.h:5
+#: ../hacks/config/cube21.xml.h:1
 msgid "Cube21"
 msgstr "Cube21"
 
-#: ../hacks/config/cube21.xml.h:13 ../hacks/config/rubikblocks.xml.h:10
-msgid "Outlines"
-msgstr "Cannelures"
-
-#: ../hacks/config/cube21.xml.h:14
-msgid "Random color"
-msgstr "Couleurs aléatoires"
+#: ../hacks/config/cube21.xml.h:6 ../hacks/config/rubikblocks.xml.h:6
+msgid "Cube size"
+msgstr "Taille du cube"
 
-#: ../hacks/config/cube21.xml.h:15 ../hacks/config/rocks.xml.h:11
-#: ../hacks/config/rubik.xml.h:9 ../hacks/config/rubikblocks.xml.h:11
-#: ../hacks/config/topblock.xml.h:18
+#: ../hacks/config/cube21.xml.h:9 ../hacks/config/rocks.xml.h:11
+#: ../hacks/config/rubik.xml.h:7 ../hacks/config/rubikblocks.xml.h:9
+#: ../hacks/config/topblock.xml.h:16
 msgid "Rotation"
 msgstr "Rotation"
 
-#: ../hacks/config/cube21.xml.h:18
-msgid "Silver edition"
-msgstr "Édition argentée"
-
-#: ../hacks/config/cube21.xml.h:19
-msgid "Six random colors"
-msgstr "Six couleurs aléatoires"
-
-#: ../hacks/config/cube21.xml.h:23 ../hacks/config/rubikblocks.xml.h:18
+#: ../hacks/config/cube21.xml.h:11 ../hacks/config/rubikblocks.xml.h:11
 msgid "Start as cube"
 msgstr "Démarrage par le cube"
 
-#: ../hacks/config/cube21.xml.h:24 ../hacks/config/rubikblocks.xml.h:19
+#: ../hacks/config/cube21.xml.h:12 ../hacks/config/rubikblocks.xml.h:12
 msgid "Start as random shape"
 msgstr "Démarrage avec une forme aléatoire"
 
-#: ../hacks/config/cube21.xml.h:25
+#: ../hacks/config/cube21.xml.h:13
+msgid "White"
+msgstr "Blanc"
+
+#: ../hacks/config/cube21.xml.h:14
+msgid "Random color"
+msgstr "Couleurs aléatoires"
+
+#: ../hacks/config/cube21.xml.h:15
+msgid "Silver edition"
+msgstr "Édition argentée"
+
+#: ../hacks/config/cube21.xml.h:16
 msgid "Two random colors"
 msgstr "Deux couleurs aléatoires"
 
-#. #### -no-optimize
-#: ../hacks/config/cube21.xml.h:26 ../hacks/config/cubenetic.xml.h:26
-#: ../hacks/config/cubestorm.xml.h:17 ../hacks/config/dangerball.xml.h:14
-#: ../hacks/config/engine.xml.h:20 ../hacks/config/gears.xml.h:14
-#: ../hacks/config/glblur.xml.h:18 ../hacks/config/glforestfire.xml.h:16
-#: ../hacks/config/glknots.xml.h:24 ../hacks/config/glplanet.xml.h:13
-#: ../hacks/config/gltext.xml.h:19 ../hacks/config/hypnowheel.xml.h:17
-#: ../hacks/config/lavalite.xml.h:29 ../hacks/config/menger.xml.h:20
-#: ../hacks/config/moebiusgears.xml.h:14 ../hacks/config/molecule.xml.h:26
-#: ../hacks/config/polyhedra.xml.h:168 ../hacks/config/rubikblocks.xml.h:20
-#: ../hacks/config/spheremonics.xml.h:22 ../hacks/config/surfaces.xml.h:27
-#: ../hacks/config/wander.xml.h:14
-msgid "Wander"
-msgstr "Déplacement"
+#: ../hacks/config/cube21.xml.h:17
+msgid "Classic edition"
+msgstr "Édition classique"
 
-#: ../hacks/config/cube21.xml.h:27
-msgid "White"
-msgstr "Blanc"
+#: ../hacks/config/cube21.xml.h:18
+msgid "Six random colors"
+msgstr "Six couleurs aléatoires"
+
+#: ../hacks/config/cube21.xml.h:24 ../hacks/config/rubikblocks.xml.h:18
+msgid "Outlines"
+msgstr "Cannelures"
+
+#: ../hacks/config/cube21.xml.h:28
+#, no-c-format
+msgid ""
+"Animates a Rubik-like puzzle known as Cube 21 or Square-1. The rotations are "
+"chosen randomly. See also the \"Rubik\", \"RubikBlocks\" and \"GLSnake\" "
+"screen savers. http://en.wikipedia.org/wiki/Square_One_%28puzzle%29 Written "
+"by Vasek Potocek; 2005."
+msgstr ""
+"Anime un puzzle de type Rubik appelé Cube 21 ou Square-1. Les rotations sont "
+"choisies de manière aléatoire. Voir aussi les écrans de veille « Rubik », "
+"\"RubikBlocks\" et « GLSnake ». "
+"http://en.wikipedia.org/wiki/Square_One_%28puzzle%29 Écrit par Vasek "
+"Potocek ; 2005."
 
-#: ../hacks/config/cubenetic.xml.h:2
+#: ../hacks/config/cubenetic.xml.h:1
 msgid "Cubenetic"
 msgstr "Rectangles de couleur"
 
-#: ../hacks/config/cubenetic.xml.h:3 ../hacks/config/glblur.xml.h:3
-#: ../hacks/config/glknots.xml.h:1 ../hacks/config/gltext.xml.h:5
-#: ../hacks/config/menger.xml.h:1 ../hacks/config/molecule.xml.h:4
-#: ../hacks/config/spheremonics.xml.h:1
+#: ../hacks/config/cubenetic.xml.h:9 ../hacks/config/glblur.xml.h:9
+#: ../hacks/config/glknots.xml.h:8 ../hacks/config/gltext.xml.h:10
+#: ../hacks/config/menger.xml.h:11 ../hacks/config/molecule.xml.h:17
+#: ../hacks/config/spheremonics.xml.h:10
 msgid "Don't rotate"
 msgstr "Ne pas tourner"
 
-#: ../hacks/config/cubenetic.xml.h:4
-msgid ""
-"Draws a pulsating set of overlapping boxes with ever-chaning blobby patterns "
-"undulating across their surfaces. It's sort of a cubist Lavalite. Written by "
-"Jamie Zawinski; 2002."
-msgstr ""
+#: ../hacks/config/cubenetic.xml.h:10 ../hacks/config/glblur.xml.h:10
+#: ../hacks/config/glknots.xml.h:9 ../hacks/config/gltext.xml.h:11
+#: ../hacks/config/lavalite.xml.h:23 ../hacks/config/menger.xml.h:12
+#: ../hacks/config/molecule.xml.h:18 ../hacks/config/spheremonics.xml.h:11
+msgid "Rotate around X axis"
+msgstr "Rotation autour de l'axe X"
+
+#: ../hacks/config/cubenetic.xml.h:11 ../hacks/config/glblur.xml.h:11
+#: ../hacks/config/glknots.xml.h:10 ../hacks/config/gltext.xml.h:12
+#: ../hacks/config/lavalite.xml.h:24 ../hacks/config/menger.xml.h:13
+#: ../hacks/config/molecule.xml.h:19 ../hacks/config/spheremonics.xml.h:12
+msgid "Rotate around Y axis"
+msgstr "Rotation autour de l'axe Y"
 
-#: ../hacks/config/cubenetic.xml.h:12 ../hacks/config/glblur.xml.h:8
-#: ../hacks/config/glknots.xml.h:9 ../hacks/config/gltext.xml.h:10
-#: ../hacks/config/lavalite.xml.h:19 ../hacks/config/menger.xml.h:9
-#: ../hacks/config/molecule.xml.h:18 ../hacks/config/spheremonics.xml.h:10
+#: ../hacks/config/cubenetic.xml.h:12 ../hacks/config/glblur.xml.h:12
+#: ../hacks/config/glknots.xml.h:11 ../hacks/config/gltext.xml.h:13
+#: ../hacks/config/lavalite.xml.h:25 ../hacks/config/menger.xml.h:14
+#: ../hacks/config/molecule.xml.h:20 ../hacks/config/spheremonics.xml.h:13
+msgid "Rotate around Z axis"
+msgstr "Rotation autour de l'axe Z"
+
+#: ../hacks/config/cubenetic.xml.h:13 ../hacks/config/glblur.xml.h:13
+#: ../hacks/config/glknots.xml.h:12 ../hacks/config/gltext.xml.h:14
+#: ../hacks/config/lavalite.xml.h:26 ../hacks/config/menger.xml.h:15
+#: ../hacks/config/molecule.xml.h:21 ../hacks/config/spheremonics.xml.h:14
 msgid "Rotate around X and Y axes"
 msgstr "Rotation autour des axes X et Y"
 
-#: ../hacks/config/cubenetic.xml.h:13 ../hacks/config/glblur.xml.h:9
-#: ../hacks/config/glknots.xml.h:10 ../hacks/config/gltext.xml.h:11
-#: ../hacks/config/lavalite.xml.h:20 ../hacks/config/menger.xml.h:10
-#: ../hacks/config/molecule.xml.h:19 ../hacks/config/spheremonics.xml.h:11
+#: ../hacks/config/cubenetic.xml.h:14 ../hacks/config/glblur.xml.h:14
+#: ../hacks/config/glknots.xml.h:13 ../hacks/config/gltext.xml.h:15
+#: ../hacks/config/lavalite.xml.h:27 ../hacks/config/menger.xml.h:16
+#: ../hacks/config/molecule.xml.h:22 ../hacks/config/spheremonics.xml.h:15
 msgid "Rotate around X and Z axes"
 msgstr "Rotation autour des axes X et Z"
 
-#: ../hacks/config/cubenetic.xml.h:14 ../hacks/config/glblur.xml.h:10
-#: ../hacks/config/glknots.xml.h:11 ../hacks/config/gltext.xml.h:12
-#: ../hacks/config/lavalite.xml.h:21 ../hacks/config/menger.xml.h:11
-#: ../hacks/config/molecule.xml.h:20 ../hacks/config/spheremonics.xml.h:12
-msgid "Rotate around X axis"
-msgstr "Rotation autour de l'axe X"
-
-#: ../hacks/config/cubenetic.xml.h:15 ../hacks/config/glblur.xml.h:11
-#: ../hacks/config/glknots.xml.h:12 ../hacks/config/gltext.xml.h:13
-#: ../hacks/config/lavalite.xml.h:22 ../hacks/config/menger.xml.h:12
-#: ../hacks/config/molecule.xml.h:21 ../hacks/config/spheremonics.xml.h:13
+#: ../hacks/config/cubenetic.xml.h:15 ../hacks/config/glblur.xml.h:15
+#: ../hacks/config/glknots.xml.h:14 ../hacks/config/gltext.xml.h:16
+#: ../hacks/config/lavalite.xml.h:28 ../hacks/config/menger.xml.h:17
+#: ../hacks/config/molecule.xml.h:23 ../hacks/config/spheremonics.xml.h:16
 msgid "Rotate around Y and Z axes"
 msgstr "Rotation autour des axes Y et Z"
 
-#: ../hacks/config/cubenetic.xml.h:16 ../hacks/config/glblur.xml.h:12
-#: ../hacks/config/glknots.xml.h:13 ../hacks/config/gltext.xml.h:14
-#: ../hacks/config/lavalite.xml.h:23 ../hacks/config/menger.xml.h:13
-#: ../hacks/config/molecule.xml.h:22 ../hacks/config/spheremonics.xml.h:14
-msgid "Rotate around Y axis"
-msgstr "Rotation autour de l'axe Y"
-
-#: ../hacks/config/cubenetic.xml.h:17 ../hacks/config/glblur.xml.h:13
-#: ../hacks/config/glknots.xml.h:14 ../hacks/config/gltext.xml.h:15
-#: ../hacks/config/lavalite.xml.h:24 ../hacks/config/menger.xml.h:14
-#: ../hacks/config/molecule.xml.h:23 ../hacks/config/spheremonics.xml.h:15
-msgid "Rotate around Z axis"
-msgstr "Rotation autour de l'axe Z"
-
-#: ../hacks/config/cubenetic.xml.h:18 ../hacks/config/glblur.xml.h:14
-#: ../hacks/config/glknots.xml.h:15 ../hacks/config/gltext.xml.h:16
-#: ../hacks/config/lavalite.xml.h:25 ../hacks/config/menger.xml.h:15
-#: ../hacks/config/molecule.xml.h:24 ../hacks/config/spheremonics.xml.h:16
+#: ../hacks/config/cubenetic.xml.h:16 ../hacks/config/glblur.xml.h:16
+#: ../hacks/config/glknots.xml.h:15 ../hacks/config/gltext.xml.h:17
+#: ../hacks/config/lavalite.xml.h:29 ../hacks/config/menger.xml.h:18
+#: ../hacks/config/molecule.xml.h:24 ../hacks/config/spheremonics.xml.h:17
 msgid "Rotate around all three axes"
 msgstr "Rotation autour des trois axes"
 
-#: ../hacks/config/cubenetic.xml.h:22
-msgid "Surface pattern complexity"
-msgstr "Complexité des motifs de surface"
+#: ../hacks/config/cubenetic.xml.h:18
+msgid "Surface pattern speed"
+msgstr "Vitesse des motifs de surface"
 
-#: ../hacks/config/cubenetic.xml.h:23
+#: ../hacks/config/cubenetic.xml.h:21
 msgid "Surface pattern overlap"
 msgstr "Chevauchement des motifs de surface"
 
-#: ../hacks/config/cubenetic.xml.h:24
-msgid "Surface pattern speed"
-msgstr "Vitesse des motifs de surface"
+#: ../hacks/config/cubenetic.xml.h:23
+msgid "Surface pattern complexity"
+msgstr "Complexité des motifs de surface"
 
-#: ../hacks/config/cubestorm.xml.h:1
-msgid "CubeStorm"
+#: ../hacks/config/cubenetic.xml.h:27
+msgid ""
+"Draws a pulsating set of overlapping boxes with ever-chaning blobby patterns "
+"undulating across their surfaces. It's sort of a cubist Lavalite. Written by "
+"Jamie Zawinski; 2002."
+msgstr ""
+
+#: ../hacks/config/cubestorm.xml.h:1
+msgid "CubeStorm"
 msgstr "Tempête de cubes"
 
-#: ../hacks/config/cubestorm.xml.h:2
+#: ../hacks/config/cubestorm.xml.h:9
 msgid "Cubes"
 msgstr "Cubes"
 
-#: ../hacks/config/cubestorm.xml.h:3
+#: ../hacks/config/cubestorm.xml.h:12
+msgid "Struts"
+msgstr ""
+
+#: ../hacks/config/cubestorm.xml.h:18
 msgid ""
 "Draws a series of rotating 3D boxes that intersect each other and eventually "
 "fill space. Written by Jamie Zawinski; 2003."
 msgstr ""
-
-#: ../hacks/config/cubestorm.xml.h:14
-msgid "Struts"
-msgstr ""
+"Dessine une série de boîtes 3D en rotation qui se croisent et finalement "
+"remplissent l'espace. Écrit par Jamie Zawinski ; 2003."
 
 #: ../hacks/config/cubicgrid.xml.h:1
-msgid "Big dots"
-msgstr "Gros points"
+msgid "CubicGrid"
+msgstr "CubicGrid"
 
-#: ../hacks/config/cubicgrid.xml.h:2
+#: ../hacks/config/cubicgrid.xml.h:8
 msgid "Close"
 msgstr "Fermer"
 
-#: ../hacks/config/cubicgrid.xml.h:3
-msgid "CubicGrid"
-msgstr ""
-
-#: ../hacks/config/cubicgrid.xml.h:4
+#: ../hacks/config/cubicgrid.xml.h:9
 msgid "Dot spacing"
 msgstr "Espacement des points"
 
-#: ../hacks/config/cubicgrid.xml.h:5
+#: ../hacks/config/cubicgrid.xml.h:11
+msgid "Big dots"
+msgstr "Gros points"
+
+#: ../hacks/config/cubicgrid.xml.h:13
 msgid ""
 "Draws the view of an observer located inside a rotating 3D lattice of "
 "colored points. Written by Vasek Potocek; 2007."
@@ -3652,24 +3776,24 @@
 
 #: ../hacks/config/cwaves.xml.h:1
 msgid "CWaves"
-msgstr ""
+msgstr "CWaves"
 
-#: ../hacks/config/cwaves.xml.h:2
-msgid "Color transitions"
-msgstr "Transition de couleurs"
-
-#: ../hacks/config/cwaves.xml.h:3 ../hacks/config/flame.xml.h:3
-#: ../hacks/config/jigglypuff.xml.h:4
+#: ../hacks/config/cwaves.xml.h:5 ../hacks/config/flame.xml.h:11
+#: ../hacks/config/jigglypuff.xml.h:13
 msgid "Complexity"
 msgstr "Complexité"
 
-#: ../hacks/config/cwaves.xml.h:7
+#: ../hacks/config/cwaves.xml.h:6
 msgid "Rough"
 msgstr "Rugueux"
 
-#: ../hacks/config/cwaves.xml.h:9 ../hacks/config/glknots.xml.h:19
-#: ../hacks/config/jigsaw.xml.h:13 ../hacks/config/lavalite.xml.h:27
-#: ../hacks/config/skytentacles.xml.h:16
+#: ../hacks/config/cwaves.xml.h:7
+msgid "Color transitions"
+msgstr "Transition de couleurs"
+
+#: ../hacks/config/cwaves.xml.h:8 ../hacks/config/glknots.xml.h:18
+#: ../hacks/config/jigsaw.xml.h:13 ../hacks/config/lavalite.xml.h:13
+#: ../hacks/config/skytentacles.xml.h:24
 msgid "Smooth"
 msgstr "Lisse"
 
@@ -3678,12 +3802,14 @@
 "This generates a languidly-scrolling vertical field of sinusoidal colors. "
 "Written by Jamie Zawinski; 2007."
 msgstr ""
+"Cela génère un défilement ralenti de champs verticaux avec des couleurs "
+"sinusoïdales. Écrit par Jamie Zawinski ; 2007."
 
 #: ../hacks/config/cynosure.xml.h:1
 msgid "Cynosure"
 msgstr "Cynosure"
 
-#: ../hacks/config/cynosure.xml.h:9
+#: ../hacks/config/cynosure.xml.h:12
 msgid ""
 "Random dropshadowed rectangles pop onto the screen in lockstep. Written by "
 "Ozymandias G. Desiderata, Jamie Zawinski, and Stephen Linhart; 1998."
@@ -3693,88 +3819,88 @@
 msgid "DangerBall"
 msgstr "Balle dangereuse"
 
-#: ../hacks/config/dangerball.xml.h:2
-msgid ""
-"Draws a ball that periodically extrudes many random spikes. Ouch! Written by "
-"Jamie Zawinski; 2001."
-msgstr ""
-"Dessine une balle qui se hérisse régulièrement de nombreux picots "
-"aléatoires. Ouille ! Écrit par Jamie Zawinski; 2001."
+#: ../hacks/config/dangerball.xml.h:6
+msgid "Spike growth"
+msgstr "Croissance des piques"
 
-#: ../hacks/config/dangerball.xml.h:8
+#: ../hacks/config/dangerball.xml.h:9
 msgid "Number of spikes"
 msgstr "Nombre de piques"
 
-#: ../hacks/config/dangerball.xml.h:9
+#: ../hacks/config/dangerball.xml.h:10
 msgid "Ouch"
 msgstr "Aie !"
 
-#: ../hacks/config/dangerball.xml.h:12
-msgid "Spike growth"
-msgstr "Croissance des piques"
+#: ../hacks/config/dangerball.xml.h:15
+msgid ""
+"Draws a ball that periodically extrudes many random spikes. Ouch! Written by "
+"Jamie Zawinski; 2001."
+msgstr ""
+"Dessine une balle qui se hérisse régulièrement de nombreux picots "
+"aléatoires. Ouille ! Écrit par Jamie Zawinski; 2001."
 
-#: ../hacks/config/decayscreen.xml.h:3
+#: ../hacks/config/decayscreen.xml.h:1
 msgid "DecayScreen"
 msgstr "Écran fondu"
 
-#: ../hacks/config/decayscreen.xml.h:6
-msgid "Fuzzy melt"
+#: ../hacks/config/decayscreen.xml.h:8
+msgid "Random melt style"
 msgstr ""
 
 #: ../hacks/config/decayscreen.xml.h:9
-msgid "Melt away from center"
+msgid "Shuffle melt"
 msgstr ""
 
 #: ../hacks/config/decayscreen.xml.h:10
-msgid "Melt down"
-msgstr ""
+msgid "Melt up"
+msgstr "Coulée vers le haut"
 
 #: ../hacks/config/decayscreen.xml.h:11
-msgid "Melt down, left"
-msgstr ""
+msgid "Melt down"
+msgstr "Coulée vers le bas"
 
 #: ../hacks/config/decayscreen.xml.h:12
-msgid "Melt down, right"
-msgstr ""
+msgid "Melt left"
+msgstr "Coulée vers la gauche"
 
 #: ../hacks/config/decayscreen.xml.h:13
-msgid "Melt left"
-msgstr ""
+msgid "Melt right"
+msgstr "Coulée vers la droite"
 
 #: ../hacks/config/decayscreen.xml.h:14
-msgid "Melt right"
-msgstr ""
+msgid "Melt up, left"
+msgstr "Coulée vers le coin haut gauche"
 
 #: ../hacks/config/decayscreen.xml.h:15
-msgid "Melt towards center"
-msgstr ""
+msgid "Melt up, right"
+msgstr "Coulée vers le coin haut droit"
 
 #: ../hacks/config/decayscreen.xml.h:16
-msgid "Melt up"
-msgstr ""
+msgid "Melt down, left"
+msgstr "Coulée vers le coin bas gauche"
 
 #: ../hacks/config/decayscreen.xml.h:17
-msgid "Melt up, left"
-msgstr ""
+msgid "Melt down, right"
+msgstr "Coulée vers le coin bas droit"
 
 #: ../hacks/config/decayscreen.xml.h:18
-msgid "Melt up, right"
-msgstr ""
+msgid "Melt towards center"
+msgstr "Coulée vers le centre"
 
 #: ../hacks/config/decayscreen.xml.h:19
-msgid "Melty melt"
-msgstr ""
+msgid "Melt away from center"
+msgstr "Coulée vers l'extérieur du centre"
 
 #: ../hacks/config/decayscreen.xml.h:20
-msgid "Random melt style"
+msgid "Melty melt"
 msgstr ""
 
-#: ../hacks/config/decayscreen.xml.h:22
-msgid "Shuffle melt"
+#: ../hacks/config/decayscreen.xml.h:21
+msgid "Stretchy melt"
 msgstr ""
 
-#: ../hacks/config/decayscreen.xml.h:23
-msgid "Stretchy melt"
+#: ../hacks/config/decayscreen.xml.h:22
+msgid "Fuzzy melt"
 msgstr ""
 
 #: ../hacks/config/decayscreen.xml.h:24
@@ -3791,35 +3917,35 @@
 "poursuit après désactivation de l'économiseur, cherchez de l'aide. Écrit par "
 "David Wald, Vivek Khera, Jamie Zawinski, et Vince Levey; 1993."
 
-#: ../hacks/config/deco.xml.h:3
+#: ../hacks/config/deco.xml.h:1
 msgid "Deco"
 msgstr "Déco"
 
-#: ../hacks/config/deco.xml.h:5
-msgid "Golden ratio"
-msgstr ""
-
-#: ../hacks/config/deco.xml.h:7
-msgid "Maximum depth"
-msgstr "Profondeur minimum"
-
 #: ../hacks/config/deco.xml.h:8
-msgid "Minimum height"
-msgstr "Hauteur minimum"
-
-#: ../hacks/config/deco.xml.h:9
 msgid "Minimum width"
 msgstr "Largeur minimum"
 
+#: ../hacks/config/deco.xml.h:9
+msgid "Minimum height"
+msgstr "Hauteur minimum"
+
 #: ../hacks/config/deco.xml.h:10
-msgid "Mondrian"
-msgstr "Mondrian"
+msgid "Maximum depth"
+msgstr "Profondeur minimum"
 
-#: ../hacks/config/deco.xml.h:13
+#: ../hacks/config/deco.xml.h:11
 msgid "Smooth colors"
 msgstr "Couleurs douces"
 
-#: ../hacks/config/deco.xml.h:14
+#: ../hacks/config/deco.xml.h:12
+msgid "Golden ratio"
+msgstr "Nombre d’or"
+
+#: ../hacks/config/deco.xml.h:13
+msgid "Mondrian"
+msgstr "Mondrian"
+
+#: ../hacks/config/deco.xml.h:15
 msgid ""
 "Subdivides and colors rectangles randomly. It looks kind of like Brady-Bunch-"
 "era rec-room wall paneling. "
@@ -3829,40 +3955,40 @@
 "Subdivise et colore des rectangles aléatoirement. Cela ressemble aux "
 "tableaux de Piet Mondrian. Écrit par Jamie Zawinski et Michael Bayne ; 1997."
 
-#: ../hacks/config/deluxe.xml.h:1 ../hacks/config/gflux.xml.h:1
-#: ../hacks/config/glcells.xml.h:1 ../hacks/config/glhanoi.xml.h:2
-#: ../hacks/config/glsnake.xml.h:1 ../hacks/config/hypnowheel.xml.h:1
-#: ../hacks/config/lavalite.xml.h:1 ../hacks/config/lisa.xml.h:1
-#: ../hacks/config/lissie.xml.h:1 ../hacks/config/skytentacles.xml.h:1
-msgid "1"
-msgstr "1"
-
-#: ../hacks/config/deluxe.xml.h:3
+#: ../hacks/config/deluxe.xml.h:1
 msgid "Deluxe"
 msgstr "Deluxe"
 
-#: ../hacks/config/deluxe.xml.h:4
-msgid ""
-"Draws a pulsing sequence of transparent stars, circles, and lines. Written "
-"by Jamie Zawinski; 1999."
-msgstr ""
-
-#: ../hacks/config/deluxe.xml.h:11
+#: ../hacks/config/deluxe.xml.h:9
 msgid "Shapes"
 msgstr "Formes"
 
 #. #### -speed [15]
-#: ../hacks/config/deluxe.xml.h:16 ../hacks/config/mirrorblob.xml.h:26
+#: ../hacks/config/deluxe.xml.h:15 ../hacks/config/mirrorblob.xml.h:18
 msgid "Transparency"
 msgstr "Transparence"
 
-#: ../hacks/config/demon.xml.h:1 ../hacks/config/gears.xml.h:1
-#: ../hacks/config/glhanoi.xml.h:1 ../hacks/config/interference.xml.h:1
-#: ../hacks/config/voronoi.xml.h:1
+#: ../hacks/config/deluxe.xml.h:17
+msgid ""
+"Draws a pulsing sequence of transparent stars, circles, and lines. Written "
+"by Jamie Zawinski; 1999."
+msgstr ""
+
+#: ../hacks/config/demon.xml.h:1
+msgid "Demon"
+msgstr "Démon"
+
+#: ../hacks/config/demon.xml.h:5 ../hacks/config/gears.xml.h:8
+#: ../hacks/config/glhanoi.xml.h:5 ../hacks/config/interference.xml.h:18
+#: ../hacks/config/voronoi.xml.h:8
 msgid "0"
 msgstr "0°"
 
-#: ../hacks/config/demon.xml.h:4
+#: ../hacks/config/demon.xml.h:6
+msgid "States"
+msgstr "États"
+
+#: ../hacks/config/demon.xml.h:17
 #, no-c-format
 msgid ""
 "A cellular automaton that starts with a random field, and organizes it into "
@@ -3870,193 +3996,181 @@
 "by David Bagley; 1999."
 msgstr ""
 
-#: ../hacks/config/demon.xml.h:6
-msgid "Demon"
-msgstr "Démon"
-
-#: ../hacks/config/demon.xml.h:15
-msgid "States"
-msgstr "États"
-
 #: ../hacks/config/discrete.xml.h:1
 msgid "Discrete"
 msgstr "Discrète"
 
-#: ../hacks/config/discrete.xml.h:7
+#: ../hacks/config/discrete.xml.h:12
 msgid ""
 "More \"discrete map\" systems, including new variants of Hopalong and Julia, "
 "and a few others. See also the \"Hopalong\" and \"Julia\" screen savers. "
 "Written by Tim Auckland; 1998."
 msgstr ""
 
-#: ../hacks/config/distort.xml.h:3
-msgid "Black hole"
-msgstr "Trou noir"
-
-#: ../hacks/config/distort.xml.h:4
-msgid "Bounce"
-msgstr "Rebond"
-
-#: ../hacks/config/distort.xml.h:5
+#: ../hacks/config/distort.xml.h:1
 msgid "Distort"
 msgstr "Distortion"
 
-#: ../hacks/config/distort.xml.h:8
-msgid ""
-"Grabs an image of the screen, and then lets a transparent lens wander around "
-"the screen, magnifying whatever is underneath. Written by Jonas Munsin; 1998."
-msgstr ""
-"Capture une image de l'écran et laisse une lentille transparente s'y "
-"promener en agrandissant ce qu'elle réfléchit. Écrit par Jonas Munsin; 1998."
-
-#: ../hacks/config/distort.xml.h:12
-msgid "Lens count"
-msgstr "Nombre de lentilles"
-
 #. #### -slow
-#: ../hacks/config/distort.xml.h:14
+#: ../hacks/config/distort.xml.h:11
 msgid "Lens size"
 msgstr "Taille des lentilles"
 
-#: ../hacks/config/distort.xml.h:16
-msgid "Magnify"
-msgstr "Agrandir"
+#: ../hacks/config/distort.xml.h:14
+msgid "Lens count"
+msgstr "Nombre de lentilles"
 
-#: ../hacks/config/distort.xml.h:17
+#: ../hacks/config/distort.xml.h:15
 msgid "Normal"
 msgstr "Normal"
 
+#: ../hacks/config/distort.xml.h:16
+msgid "Swamp thing"
+msgstr "Marécageux"
+
 #: ../hacks/config/distort.xml.h:18
 msgid "Reflect"
 msgstr "Réfléchir"
 
-#: ../hacks/config/distort.xml.h:22
-msgid "Swamp thing"
-msgstr "Marécageux"
+#: ../hacks/config/distort.xml.h:19
+msgid "Magnify"
+msgstr "Agrandir"
 
-#: ../hacks/config/distort.xml.h:23
+#: ../hacks/config/distort.xml.h:20
+msgid "Black hole"
+msgstr "Trou noir"
+
+#: ../hacks/config/distort.xml.h:21
 msgid "Vortex"
 msgstr "Vortex"
 
+#: ../hacks/config/distort.xml.h:23
+msgid ""
+"Grabs an image of the screen, and then lets a transparent lens wander around "
+"the screen, magnifying whatever is underneath. Written by Jonas Munsin; 1998."
+msgstr ""
+"Capture une image de l'écran et laisse une lentille transparente s'y "
+"promener en agrandissant ce qu'elle réfléchit. Écrit par Jonas Munsin; 1998."
+
 #: ../hacks/config/dnalogo.xml.h:1
 msgid "DNA Logo"
 msgstr "Logo DNA"
 
-#: ../hacks/config/dnalogo.xml.h:2
-msgid ""
-"DNA Lounge Restaurant -- Bar -- Nightclub -- Cafe -- Est. 1985. 375 Eleventh "
-"Street San Francisco, CA 94103 http://www.dnalounge.com/ "
-"http://www.dnapizza.com/ Written by Jamie Zawinski; 2001."
-msgstr ""
-
 #: ../hacks/config/dnalogo.xml.h:3
-msgid "DNA Lounge and DNA Pizza logos"
-msgstr ""
+msgid "Frame Rate"
+msgstr "Vitesse de trame"
 
-#: ../hacks/config/dnalogo.xml.h:4
+#: ../hacks/config/dnalogo.xml.h:5
 msgid "DNA Lounge logo"
 msgstr ""
 
-#: ../hacks/config/dnalogo.xml.h:5
+#: ../hacks/config/dnalogo.xml.h:6
 msgid "DNA Pizza logo"
 msgstr ""
 
-#: ../hacks/config/dnalogo.xml.h:6
-msgid "Frame Rate"
-msgstr "Vitesse de trame"
+#: ../hacks/config/dnalogo.xml.h:7
+msgid "DNA Lounge and DNA Pizza logos"
+msgstr ""
+
+#: ../hacks/config/dnalogo.xml.h:10
+msgid ""
+"DNA Lounge Restaurant -- Bar -- Nightclub -- Cafe -- Est. 1985. 375 Eleventh "
+"Street San Francisco, CA 94103 http://www.dnalounge.com/ "
+"http://www.dnapizza.com/ Written by Jamie Zawinski; 2001."
+msgstr ""
 
 #: ../hacks/config/drift.xml.h:1
 msgid "Drift"
 msgstr "Dérive"
 
-#: ../hacks/config/drift.xml.h:2
+#: ../hacks/config/drift.xml.h:12
 msgid ""
 "Drifting recursive fractal cosmic flames. Written by Scott Draves; 1997."
 msgstr "Un autre générateur fractal itératif. Écrit par Scott Draves; 1997."
 
 #: ../hacks/config/endgame.xml.h:1
+msgid "Endgame"
+msgstr "Fin de partie"
+
+#: ../hacks/config/endgame.xml.h:5
+msgid "Low resolution chess pieces"
+msgstr "Pièces d'échec basse résolution"
+
+#: ../hacks/config/endgame.xml.h:7
 msgid ""
 "Black slips out of three mating nets, but the fourth one holds him tight! A "
 "brilliant composition! See also the \"Queens\" screen saver. "
 "http://en.wikipedia.org/wiki/Chess_endgame Written by Blair Tennessy; 2002."
 msgstr ""
 
-#: ../hacks/config/endgame.xml.h:2
-msgid "Endgame"
-msgstr "Fin de partie"
+#: ../hacks/config/engine.xml.h:1
+msgid "Engine"
+msgstr "Moteur"
 
-#: ../hacks/config/endgame.xml.h:6
-msgid "Low resolution chess pieces"
-msgstr "Pièces d'échec basse résolution"
+#: ../hacks/config/engine.xml.h:5
+msgid "Random engine"
+msgstr "Moteur aléatoire"
 
-#: ../hacks/config/engine.xml.h:1
-msgid "Audi Quattro (5 cylinders)"
-msgstr "Audi Quattro (5 cylindres)"
+#: ../hacks/config/engine.xml.h:6
+msgid "Honda Insight (3 cylinders)"
+msgstr "Honda Insight (3 cylindres)"
 
-#: ../hacks/config/engine.xml.h:2
+#: ../hacks/config/engine.xml.h:7
 msgid "BMW M3 (4 cylinders)"
 msgstr "BMW M3 (4 cylindres)"
 
-#: ../hacks/config/engine.xml.h:3
+#: ../hacks/config/engine.xml.h:8
+msgid "VW Beetle (4 cylinders, flat)"
+msgstr "VW Beetle (4 cylindres à plat)"
+
+#: ../hacks/config/engine.xml.h:9
+msgid "Audi Quattro (5 cylinders)"
+msgstr "Audi Quattro (5 cylindres)"
+
+#: ../hacks/config/engine.xml.h:10
 msgid "BMW M5 (6 cylinders)"
 msgstr "BMW M5 (6 cylindres)"
 
-#: ../hacks/config/engine.xml.h:4
+#: ../hacks/config/engine.xml.h:11
+msgid "Subaru XT (6 cylinders, V)"
+msgstr "Subaru XT (6 cylindres en V)"
+
+#: ../hacks/config/engine.xml.h:12
+msgid "Porsche 911 (6 cylinders, flat)"
+msgstr "Porsche 911 (6 cylindres à plat)"
+
+#: ../hacks/config/engine.xml.h:13
 msgid "Corvette Z06 (8 cylinders, V)"
 msgstr "Corvette Z06 (8 cylindres en V)"
 
-#: ../hacks/config/engine.xml.h:5
+#: ../hacks/config/engine.xml.h:14
 msgid "Dodge Viper (10 cylinders, V)"
 msgstr "Dodge Viper (10 cylindres en V)"
 
-#: ../hacks/config/engine.xml.h:6
-msgid ""
-"Draws a simple model of an engine that floats around the screen. "
-"http://en.wikipedia.org/wiki/Internal_combustion_engine#Operation Written by "
-"Ben Buxton and Ed Beroset; 2001."
-msgstr ""
-
-#: ../hacks/config/engine.xml.h:7
-msgid "Engine"
-msgstr "Moteur"
-
-#: ../hacks/config/engine.xml.h:10
-msgid "Honda Insight (3 cylinders)"
-msgstr "Honda Insight (3 cylindres)"
-
-#: ../hacks/config/engine.xml.h:11
+#: ../hacks/config/engine.xml.h:15
 msgid "Jaguar XKE (12 cylinders, V)"
 msgstr "Jaguar XKE (12 cylindres en V)"
 
-#: ../hacks/config/engine.xml.h:13
-msgid "Porsche 911 (6 cylinders, flat)"
-msgstr "Porsche 911 (6 cylindres à plat)"
-
-#: ../hacks/config/engine.xml.h:14
-msgid "Random engine"
-msgstr "Moteur aléatoire"
-
-#: ../hacks/config/engine.xml.h:15
+#: ../hacks/config/engine.xml.h:16
 msgid "Show engine name"
 msgstr "Affiche le nom du moteur"
 
-#: ../hacks/config/engine.xml.h:18
-msgid "Subaru XT (6 cylinders, V)"
-msgstr "Subaru XT (6 cylindres en V)"
-
-#: ../hacks/config/engine.xml.h:19
-msgid "VW Beetle (4 cylinders, flat)"
-msgstr "VW Beetle (4 cylindres à plat)"
+#: ../hacks/config/engine.xml.h:20
+msgid ""
+"Draws a simple model of an engine that floats around the screen. "
+"http://en.wikipedia.org/wiki/Internal_combustion_engine#Operation Written by "
+"Ben Buxton and Ed Beroset; 2001."
+msgstr ""
 
-#: ../hacks/config/epicycle.xml.h:3
+#: ../hacks/config/epicycle.xml.h:1
 msgid "Epicycle"
 msgstr "Épicycle"
 
-#: ../hacks/config/epicycle.xml.h:5
+#: ../hacks/config/epicycle.xml.h:12
 msgid "Harmonics"
 msgstr "Harmoniques"
 
-#: ../hacks/config/epicycle.xml.h:14
+#: ../hacks/config/epicycle.xml.h:15
 msgid ""
 "This draws the path traced out by a point on the edge of a circle. That "
 "circle rotates around a point on the rim of another circle, and so on, "
@@ -4066,63 +4180,63 @@
 msgstr ""
 
 #: ../hacks/config/eruption.xml.h:1
-msgid "Cooling factor"
-msgstr "Facteur de refroidissement"
-
-#: ../hacks/config/eruption.xml.h:3
 msgid "Eruption"
 msgstr "Éruption"
 
-#: ../hacks/config/eruption.xml.h:4
-msgid ""
-"Exploding fireworks. See also the \"Fireworkx\", \"XFlame\" and \"Pyro\" "
-"screen savers. Written by W.P. van Paassen; 2003."
-msgstr ""
-"Feu d'artifice qui explose. Voir aussi les écrans de veille « Fireworkx », "
-"« XFlame » et « Pyro ». Écrit par W.P. van Paassen ; 2003."
-
-#: ../hacks/config/eruption.xml.h:8 ../hacks/config/fluidballs.xml.h:8
-#: ../hacks/config/qix.xml.h:9 ../hacks/config/speedmine.xml.h:5
-msgid "Gravity"
-msgstr "Gravité"
+#: ../hacks/config/eruption.xml.h:8
+msgid "Little"
+msgstr "Faible"
 
 #: ../hacks/config/eruption.xml.h:9
+msgid "Number of particles"
+msgstr "Nombre de particules"
+
+#: ../hacks/config/eruption.xml.h:11
+msgid "Cooling factor"
+msgstr "Facteur de refroidissement"
+
+#: ../hacks/config/eruption.xml.h:13
+msgid "Pleasant"
+msgstr "Plaisante"
+
+#: ../hacks/config/eruption.xml.h:14
 msgid "Heat"
 msgstr "Chaleur"
 
-#: ../hacks/config/eruption.xml.h:11
+#: ../hacks/config/eruption.xml.h:15
 msgid "Inferno"
 msgstr "Infernale"
 
-#: ../hacks/config/eruption.xml.h:12
-msgid "Little"
-msgstr "Faible"
-
 #: ../hacks/config/eruption.xml.h:16
 msgid "Negative"
 msgstr "Négative"
 
-#: ../hacks/config/eruption.xml.h:18
-msgid "Number of particles"
-msgstr "Nombre de particules"
-
-#: ../hacks/config/eruption.xml.h:19
-msgid "Pleasant"
-msgstr "Plaisante"
+#: ../hacks/config/eruption.xml.h:17 ../hacks/config/fluidballs.xml.h:12
+#: ../hacks/config/qix.xml.h:23 ../hacks/config/speedmine.xml.h:9
+msgid "Gravity"
+msgstr "Gravité"
 
-#: ../hacks/config/eruption.xml.h:20
+#: ../hacks/config/eruption.xml.h:18
 msgid "Positive"
 msgstr "Positive"
 
-#: ../hacks/config/euler2d.xml.h:7
+#: ../hacks/config/eruption.xml.h:23
+msgid ""
+"Exploding fireworks. See also the \"Fireworkx\", \"XFlame\" and \"Pyro\" "
+"screen savers. Written by W.P. van Paassen; 2003."
+msgstr ""
+"Feu d'artifice qui explose. Voir aussi les écrans de veille « Fireworkx », "
+"« XFlame » et « Pyro ». Écrit par W.P. van Paassen ; 2003."
+
+#: ../hacks/config/euler2d.xml.h:1
 msgid "Euler2D"
 msgstr "Euler2D"
 
-#: ../hacks/config/euler2d.xml.h:20 ../hacks/config/whirlwindwarp.xml.h:5
+#: ../hacks/config/euler2d.xml.h:6 ../hacks/config/whirlwindwarp.xml.h:3
 msgid "Particles"
 msgstr "Particules"
 
-#: ../hacks/config/euler2d.xml.h:29
+#: ../hacks/config/euler2d.xml.h:31
 #, no-c-format
 msgid ""
 "Simulates two dimensional incompressible inviscid fluid flow. "
@@ -4136,66 +4250,70 @@
 "Smith ; 2002."
 
 #: ../hacks/config/extrusion.xml.h:1
-msgid ""
-"Draws various rotating extruded shapes that twist around, lengthen, and turn "
-"inside out. Written by Linas Vepstas, David Konerding, and Jamie Zawinski; "
-"1999."
-msgstr ""
-"Dessine diverses formes extrudées en rotation qui se tournent, s'allongent "
-"et se retournent. Écrit par Linas Vepstas, David Konerding et Jamie "
-"Zawinski; 1999."
-
-#: ../hacks/config/extrusion.xml.h:2
 msgid "Extrusion"
 msgstr "Extrusion"
 
-#: ../hacks/config/extrusion.xml.h:4
+#: ../hacks/config/extrusion.xml.h:5 ../hacks/config/morph3d.xml.h:5
+#: ../hacks/config/polytopes.xml.h:5
+msgid "Random object"
+msgstr "Objet aléatoire"
+
+#: ../hacks/config/extrusion.xml.h:6
 msgid "Helix 2"
 msgstr "Hélice 2"
 
-#: ../hacks/config/extrusion.xml.h:5
+#: ../hacks/config/extrusion.xml.h:7
 msgid "Helix 3"
 msgstr "Hélice 3"
 
-#: ../hacks/config/extrusion.xml.h:6
+#: ../hacks/config/extrusion.xml.h:8
 msgid "Helix 4"
 msgstr "Hélice 4"
 
-#: ../hacks/config/extrusion.xml.h:8
+#: ../hacks/config/extrusion.xml.h:9
 msgid "Join offset"
 msgstr ""
 
-#: ../hacks/config/extrusion.xml.h:10 ../hacks/config/morph3d.xml.h:10
-#: ../hacks/config/polytopes.xml.h:18
-msgid "Random object"
-msgstr ""
-
-#: ../hacks/config/extrusion.xml.h:11
+#: ../hacks/config/extrusion.xml.h:10
 msgid "Screw"
 msgstr "Vis"
 
-#: ../hacks/config/extrusion.xml.h:13
+#: ../hacks/config/extrusion.xml.h:11
 msgid "Taper"
 msgstr "Pic"
 
-#: ../hacks/config/extrusion.xml.h:14
+#: ../hacks/config/extrusion.xml.h:12
 msgid "Twistoid"
 msgstr "Twistoïde"
 
-#: ../hacks/config/extrusion.xml.h:15
+#: ../hacks/config/extrusion.xml.h:13
 msgid "Use flat coloring"
 msgstr "Utiliser des couleurs unies"
 
-#: ../hacks/config/extrusion.xml.h:16
+#: ../hacks/config/extrusion.xml.h:14
 msgid "Use lighting"
 msgstr "Utiliser la lumière"
 
-#: ../hacks/config/fadeplot.xml.h:1 ../hacks/config/lcdscrub.xml.h:1
-#: ../hacks/config/spiral.xml.h:2
+#: ../hacks/config/extrusion.xml.h:18
+msgid ""
+"Draws various rotating extruded shapes that twist around, lengthen, and turn "
+"inside out. Written by Linas Vepstas, David Konerding, and Jamie Zawinski; "
+"1999."
+msgstr ""
+"Dessine diverses formes extrudées en rotation qui se tournent, s'allongent "
+"et se retournent. Écrit par Linas Vepstas, David Konerding et Jamie "
+"Zawinski; 1999."
+
+#: ../hacks/config/fadeplot.xml.h:1
+msgid "FadePlot"
+msgstr "FadePlot"
+
+#: ../hacks/config/fadeplot.xml.h:9 ../hacks/config/lcdscrub.xml.h:6
+#: ../hacks/config/spiral.xml.h:8
 msgid "Cycles"
 msgstr "Fréquence des cycles"
 
-#: ../hacks/config/fadeplot.xml.h:2
+#: ../hacks/config/fadeplot.xml.h:15
 msgid ""
 "Draws what looks like a waving ribbon following a sinusoidal path. Written "
 "by Bas van Gaalen and Charles Vidal; 1997."
@@ -4203,65 +4321,61 @@
 "Dessine une sorte de ruban ondulant suivant un chemin sinusoïdal. Écrit par "
 "Bas van Gaalen et Charles Vidal; 1997."
 
-#: ../hacks/config/fadeplot.xml.h:3
-msgid "FadePlot"
-msgstr "FadePlot"
-
 #: ../hacks/config/fiberlamp.xml.h:1
-msgid ""
-"Draws a groovy rotating fiber optic lamp. Written by Tim Auckland; 2005."
-msgstr ""
-"Dessine une lampe à fibre optique en rotation. Écrit par Tim Auckland; 2005."
-
-#: ../hacks/config/fiberlamp.xml.h:3
 msgid "Fiberlamp"
 msgstr "Lampe à fibres"
 
-#: ../hacks/config/fiberlamp.xml.h:4
+#: ../hacks/config/fiberlamp.xml.h:6
 msgid "Fibers"
 msgstr "Fibres"
 
-#: ../hacks/config/fiberlamp.xml.h:12
+#: ../hacks/config/fiberlamp.xml.h:9
 msgid "Time between knocks"
-msgstr ""
-
-#: ../hacks/config/fireworkx.xml.h:1 ../hacks/config/lavalite.xml.h:3
-msgid "Activity"
-msgstr "Activité"
+msgstr "Durée entre les frappes"
 
-#: ../hacks/config/fireworkx.xml.h:3
+#: ../hacks/config/fiberlamp.xml.h:12
 msgid ""
-"Exploding fireworks. See also the \"Eruption\", \"XFlame\" and \"Pyro\" "
-"screen savers. Written by Rony B Chandran; 2004."
+"Draws a groovy rotating fiber optic lamp. Written by Tim Auckland; 2005."
 msgstr ""
-"Feu d'artifice qui explose. Voir aussi les écrans de veille « Éruption », "
-"« XFlame » et « Pyro ». Écrit par Rony B Chandran ; 2004."
+"Dessine une lampe à fibre optique en rotation. Écrit par Tim Auckland; 2005."
 
-#: ../hacks/config/fireworkx.xml.h:4
+#: ../hacks/config/fireworkx.xml.h:1
 msgid "Fireworkx"
 msgstr "Feux d'artifice X"
 
-#: ../hacks/config/fireworkx.xml.h:6
-msgid "Glowing smoke"
-msgstr "Fumée brûlante"
+#: ../hacks/config/fireworkx.xml.h:6 ../hacks/config/lavalite.xml.h:6
+msgid "Activity"
+msgstr "Activité"
 
 #: ../hacks/config/fireworkx.xml.h:8
 msgid "Light flash"
 msgstr "Éclair lumineux"
 
+#: ../hacks/config/fireworkx.xml.h:9
+msgid "Glowing smoke"
+msgstr "Fumée brûlante"
+
 #: ../hacks/config/fireworkx.xml.h:10
 msgid "Shells upward"
 msgstr ""
 
+#: ../hacks/config/fireworkx.xml.h:12
+msgid ""
+"Exploding fireworks. See also the \"Eruption\", \"XFlame\" and \"Pyro\" "
+"screen savers. Written by Rony B Chandran; 2004."
+msgstr ""
+"Feu d'artifice qui explose. Voir aussi les écrans de veille « Éruption », "
+"« XFlame » et « Pyro ». Écrit par Rony B Chandran ; 2004."
+
 #: ../hacks/config/flag.xml.h:1
 msgid "Flag"
 msgstr "Drapeau"
 
-#: ../hacks/config/flag.xml.h:11
+#: ../hacks/config/flag.xml.h:2
 msgid "Text for flag"
 msgstr "Texte sur le drapeau"
 
-#: ../hacks/config/flag.xml.h:12
+#: ../hacks/config/flag.xml.h:14
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. This draws a waving colored flag, that undulates its way "
@@ -4270,57 +4384,63 @@
 "picture of \"Bob\". Written by Charles Vidal and Jamie Zawinski; 1997."
 msgstr ""
 
-#: ../hacks/config/flame.xml.h:5
+#: ../hacks/config/flame.xml.h:1
 msgid "Flame"
 msgstr "Flamme"
 
-#: ../hacks/config/flame.xml.h:8
-msgid "Iterative fractals. Written by Scott Draves; 1993."
-msgstr "Un autre générateur fractal itératif. Écrit par Scott Draves; 1993."
-
-#: ../hacks/config/flame.xml.h:13
+#: ../hacks/config/flame.xml.h:9
 msgid "Number of fractals"
 msgstr "Nombre de fractales"
 
-#: ../hacks/config/flipflop.xml.h:2
-msgid "Draw Sticks"
-msgstr "Dessiner des batonnets"
-
-#: ../hacks/config/flipflop.xml.h:3
-msgid "Draw Tiles"
-msgstr "Dessiner des carreaux"
-
-#: ../hacks/config/flipflop.xml.h:4
-msgid ""
-"Draws a grid of 3D colored tiles that change positions with each other. "
-"Written by Kevin Ogden and Sergio Gutierrez; 2003."
-msgstr ""
+#: ../hacks/config/flame.xml.h:15
+msgid "Iterative fractals. Written by Scott Draves; 1993."
+msgstr "Un autre générateur fractal itératif. Écrit par Scott Draves; 1993."
 
-#: ../hacks/config/flipflop.xml.h:5
+#: ../hacks/config/flipflop.xml.h:1
 msgid "FlipFlop"
 msgstr "FlipFlop"
 
-#: ../hacks/config/flipflop.xml.h:8
-msgid "Load image"
-msgstr "Charger l'image"
-
-#: ../hacks/config/flipflop.xml.h:12
+#: ../hacks/config/flipflop.xml.h:5
 msgid "Stopped"
 msgstr "Arrêté"
 
-#: ../hacks/config/flipflop.xml.h:13
+#: ../hacks/config/flipflop.xml.h:7
 msgid "Whirlwind"
 msgstr ""
 
-#: ../hacks/config/flipflop.xml.h:14
+#: ../hacks/config/flipflop.xml.h:8
+msgid "Draw Tiles"
+msgstr "Dessiner des carreaux"
+
+#: ../hacks/config/flipflop.xml.h:9
+msgid "Draw Sticks"
+msgstr "Dessiner des batonnets"
+
+#: ../hacks/config/flipflop.xml.h:10
 msgid "Width"
 msgstr "Largeur"
 
+#: ../hacks/config/flipflop.xml.h:12
+msgid "Load image"
+msgstr "Charger l'image"
+
+#: ../hacks/config/flipflop.xml.h:15
+msgid ""
+"Draws a grid of 3D colored tiles that change positions with each other. "
+"Written by Kevin Ogden and Sergio Gutierrez; 2003."
+msgstr ""
+
 #: ../hacks/config/flipscreen3d.xml.h:1
 msgid "FlipScreen3D"
 msgstr ""
 
-#: ../hacks/config/flipscreen3d.xml.h:3
+#: ../hacks/config/flipscreen3d.xml.h:5 ../hacks/config/gleidescope.xml.h:12
+#: ../hacks/config/glplanet.xml.h:8 ../hacks/config/ifs.xml.h:67
+#: ../hacks/config/tangram.xml.h:15 ../hacks/config/topblock.xml.h:17
+msgid "Rotate"
+msgstr "Rotation globale"
+
+#: ../hacks/config/flipscreen3d.xml.h:7
 msgid ""
 "Grabs an image of the desktop, turns it into a GL texture map, and spins it "
 "around and deforms it in various ways. Written by Ben Buxton and Jamie "
@@ -4330,94 +4450,88 @@
 "manières en utilisant une texture OpenGL. Écrit par Ben Buxton et Jamie "
 "Zawinski ; 2001."
 
-#: ../hacks/config/flipscreen3d.xml.h:6 ../hacks/config/gleidescope.xml.h:11
-#: ../hacks/config/glplanet.xml.h:10 ../hacks/config/ifs.xml.h:11
-#: ../hacks/config/tangram.xml.h:9 ../hacks/config/topblock.xml.h:17
-msgid "Rotate"
-msgstr "Rotation globale"
-
-#: ../hacks/config/fliptext.xml.h:1 ../hacks/config/starwars.xml.h:4
-msgid "Centered text"
-msgstr "Texte centré"
-
-#: ../hacks/config/fliptext.xml.h:2
-msgid ""
-"Draws successive pages of text. The lines flip in and out in a soothing 3D "
-"pattern. Written by Jamie Zawinski; 2005."
-msgstr ""
-"Affiche quelques lignes de texte qui tournoient dans une police 3D unie. "
-"Écrit par Jamie Zawinski; 2005."
-
-#: ../hacks/config/fliptext.xml.h:4
+#: ../hacks/config/fliptext.xml.h:1
 msgid "FlipText"
 msgstr "FlipTexte"
 
-#: ../hacks/config/fliptext.xml.h:5 ../hacks/config/starwars.xml.h:8
+#: ../hacks/config/fliptext.xml.h:8
+msgid "Random text alignment"
+msgstr "Alignement de texte aléatoire"
+
+#: ../hacks/config/fliptext.xml.h:9 ../hacks/config/starwars.xml.h:7
 msgid "Flush left text"
 msgstr "Vider le texte par la gauche"
 
-#: ../hacks/config/fliptext.xml.h:6 ../hacks/config/starwars.xml.h:9
+#: ../hacks/config/fliptext.xml.h:10 ../hacks/config/starwars.xml.h:8
+msgid "Centered text"
+msgstr "Texte centré"
+
+#: ../hacks/config/fliptext.xml.h:11 ../hacks/config/starwars.xml.h:9
 msgid "Flush right text"
 msgstr "Vider le texte par la droite"
 
-#: ../hacks/config/fliptext.xml.h:7 ../hacks/config/starwars.xml.h:10
+#: ../hacks/config/fliptext.xml.h:12 ../hacks/config/starwars.xml.h:17
 msgid "Font point size"
 msgstr ""
 
-#: ../hacks/config/fliptext.xml.h:11
-msgid "Random text alignment"
-msgstr "Alignement de texte aléatoire"
-
-#: ../hacks/config/fliptext.xml.h:15
+#: ../hacks/config/fliptext.xml.h:13
 msgid "Text columns"
 msgstr "Colonnes de texte"
 
-#: ../hacks/config/fliptext.xml.h:16 ../hacks/config/starwars.xml.h:15
+#: ../hacks/config/fliptext.xml.h:14 ../hacks/config/starwars.xml.h:16
 msgid "Text lines"
 msgstr "Lignes de textes"
 
-#: ../hacks/config/flow.xml.h:1 ../hacks/config/galaxy.xml.h:1
-#: ../hacks/config/glforestfire.xml.h:1 ../hacks/config/julia.xml.h:2
-#: ../hacks/config/laser.xml.h:1 ../hacks/config/lisa.xml.h:3
-#: ../hacks/config/lissie.xml.h:3 ../hacks/config/piecewise.xml.h:2
-#: ../hacks/config/qix.xml.h:4 ../hacks/config/rocks.xml.h:1
-#: ../hacks/config/rotor.xml.h:1 ../hacks/config/rubik.xml.h:1
-#: ../hacks/config/shadebobs.xml.h:1 ../hacks/config/slip.xml.h:1
-#: ../hacks/config/spiral.xml.h:1 ../hacks/config/swirl.xml.h:1
-#: ../hacks/config/worm.xml.h:1
-msgid "Count"
-msgstr "Nombre"
-
-#: ../hacks/config/flow.xml.h:2 ../hacks/config/glschool.xml.h:3
-#: ../hacks/config/molecule.xml.h:7 ../hacks/config/spheremonics.xml.h:2
-msgid "Draw bounding box"
-msgstr "Dessiner le cadre englobant"
+#: ../hacks/config/fliptext.xml.h:16
+msgid ""
+"Draws successive pages of text. The lines flip in and out in a soothing 3D "
+"pattern. Written by Jamie Zawinski; 2005."
+msgstr ""
+"Affiche quelques lignes de texte qui tournoient dans une police 3D unie. "
+"Écrit par Jamie Zawinski; 2005."
 
-#: ../hacks/config/flow.xml.h:4
+#: ../hacks/config/flow.xml.h:1
 msgid "Flow"
 msgstr "Flux"
 
-#: ../hacks/config/flow.xml.h:8
+#: ../hacks/config/flow.xml.h:6 ../hacks/config/galaxy.xml.h:5
+#: ../hacks/config/glforestfire.xml.h:6 ../hacks/config/julia.xml.h:6
+#: ../hacks/config/laser.xml.h:5 ../hacks/config/lisa.xml.h:14
+#: ../hacks/config/lissie.xml.h:12 ../hacks/config/piecewise.xml.h:6
+#: ../hacks/config/qix.xml.h:18 ../hacks/config/rocks.xml.h:6
+#: ../hacks/config/rotor.xml.h:11 ../hacks/config/rubik.xml.h:5
+#: ../hacks/config/shadebobs.xml.h:12 ../hacks/config/slip.xml.h:6
+#: ../hacks/config/spiral.xml.h:6 ../hacks/config/swirl.xml.h:6
+#: ../hacks/config/worm.xml.h:8
+msgid "Count"
+msgstr "Nombre"
+
+#: ../hacks/config/flow.xml.h:14
 msgid "Length of trails"
 msgstr "Taille des traînées"
 
-#: ../hacks/config/flow.xml.h:13
-msgid "Periodic attractors"
-msgstr "Attracteurs périodiques"
+#: ../hacks/config/flow.xml.h:16
+msgid "Rotating around attractor"
+msgstr "Tourner autour de l'attracteur"
 
-#: ../hacks/config/flow.xml.h:14
+#: ../hacks/config/flow.xml.h:17
 msgid "Ride in the flow"
 msgstr "Circulation dans le flux."
 
-#: ../hacks/config/flow.xml.h:15
-msgid "Rotating around attractor"
-msgstr "Tourner autour de l'attracteur"
+#: ../hacks/config/flow.xml.h:18 ../hacks/config/glschool.xml.h:16
+#: ../hacks/config/molecule.xml.h:10 ../hacks/config/spheremonics.xml.h:20
+msgid "Draw bounding box"
+msgstr "Dessiner le cadre englobant"
 
-#: ../hacks/config/flow.xml.h:16
+#: ../hacks/config/flow.xml.h:19
+msgid "Periodic attractors"
+msgstr "Attracteurs périodiques"
+
+#: ../hacks/config/flow.xml.h:20
 msgid "Search for new attractors"
 msgstr "Rechercher de nouveaux attracteurs"
 
-#: ../hacks/config/flow.xml.h:20
+#: ../hacks/config/flow.xml.h:22
 msgid ""
 "Strange attractors formed of flows in a 3D differential equation phase "
 "space. Features the popular attractors described by Lorentz, Roessler, "
@@ -4427,92 +4541,92 @@
 msgstr ""
 
 #: ../hacks/config/fluidballs.xml.h:1
+msgid "FluidBalls"
+msgstr "Balles fluides"
+
+#: ../hacks/config/fluidballs.xml.h:11
 msgid "      Freefall"
 msgstr "      Chute libre"
 
-#: ../hacks/config/fluidballs.xml.h:3
-msgid "Clay"
-msgstr "Argile"
+#: ../hacks/config/fluidballs.xml.h:13
+msgid "Jupiter"
+msgstr "Jupiterienne"
 
-#: ../hacks/config/fluidballs.xml.h:5
-msgid "FluidBalls"
-msgstr "Balles fluides"
+#: ../hacks/config/fluidballs.xml.h:14
+msgid "Still"
+msgstr "Tranquille"
 
-#: ../hacks/config/fluidballs.xml.h:7 ../hacks/config/twang.xml.h:7
-msgid "Friction"
-msgstr "Friction"
+#: ../hacks/config/fluidballs.xml.h:15
+msgid "Wind"
+msgstr "Vent"
 
-#: ../hacks/config/fluidballs.xml.h:10
+#: ../hacks/config/fluidballs.xml.h:16
 msgid "Hurricane"
 msgstr "Ouragan"
 
-#: ../hacks/config/fluidballs.xml.h:11
-msgid "Jupiter"
-msgstr "Jupiterienne"
+#: ../hacks/config/fluidballs.xml.h:17
+msgid "Clay"
+msgstr "Argile"
 
-#: ../hacks/config/fluidballs.xml.h:15
-msgid ""
-"Models the physics of bouncing balls, or of particles in a gas or fluid, "
-"depending on the settings. If \"Shake Box\" is selected, then every now and "
-"then, the box will be rotated, changing which direction is down (in order to "
-"keep the settled balls in motion.) Written by Peter Birtles and Jamie "
-"Zawinski; 2002."
-msgstr ""
+#: ../hacks/config/fluidballs.xml.h:18 ../hacks/config/twang.xml.h:11
+msgid "Friction"
+msgstr "Friction"
 
-#: ../hacks/config/fluidballs.xml.h:17
+#: ../hacks/config/fluidballs.xml.h:19
 msgid "Rubber"
 msgstr "Caoutchouc"
 
-#: ../hacks/config/fluidballs.xml.h:18
-msgid "Shake box"
+#: ../hacks/config/fluidballs.xml.h:20
+msgid "Various ball sizes"
 msgstr ""
 
 #: ../hacks/config/fluidballs.xml.h:21
-msgid "Still"
-msgstr "Tranquille"
-
-#: ../hacks/config/fluidballs.xml.h:22
-msgid "Various ball sizes"
+msgid "Shake box"
 msgstr ""
 
 #: ../hacks/config/fluidballs.xml.h:23
-msgid "Wind"
-msgstr "Vent"
+msgid ""
+"Models the physics of bouncing balls, or of particles in a gas or fluid, "
+"depending on the settings. If \"Shake Box\" is selected, then every now and "
+"then, the box will be rotated, changing which direction is down (in order to "
+"keep the settled balls in motion.) Written by Peter Birtles and Jamie "
+"Zawinski; 2002."
+msgstr ""
 
 #: ../hacks/config/flurry.xml.h:1
-msgid "Binary"
-msgstr "Binaire"
+msgid "Flurry"
+msgstr "Bourrasque"
 
-#: ../hacks/config/flurry.xml.h:2
+#: ../hacks/config/flurry.xml.h:3
 msgid "Classic"
 msgstr "Classique"
 
-#: ../hacks/config/flurry.xml.h:3
-msgid "Fire"
-msgstr "Feux"
-
 #: ../hacks/config/flurry.xml.h:4
-msgid "Flurry"
-msgstr "Bourrasque"
+msgid "RGB"
+msgstr "RVB"
 
 #: ../hacks/config/flurry.xml.h:5
-msgid "Insane"
-msgstr "Folie"
+msgid "Fire"
+msgstr "Feux"
+
+#: ../hacks/config/flurry.xml.h:7
+msgid "Binary"
+msgstr "Binaire"
 
-#: ../hacks/config/flurry.xml.h:6
+#: ../hacks/config/flurry.xml.h:8
 msgid "Psychedelic"
 msgstr "Psychédélique"
 
-#: ../hacks/config/flurry.xml.h:7
-msgid "RGB"
-msgstr "RVB"
+#: ../hacks/config/flurry.xml.h:9
+msgid "Insane"
+msgstr "Folie"
 
-#: ../hacks/config/flurry.xml.h:8 ../hacks/config/klein.xml.h:19
-#: ../hacks/config/sballs.xml.h:11 ../hacks/config/starfish.xml.h:12
+#: ../hacks/config/flurry.xml.h:10 ../hacks/config/klein.xml.h:6
+#: ../hacks/config/sballs.xml.h:5 ../hacks/config/starfish.xml.h:2
 msgid "Random"
 msgstr "Aléatoire"
 
-#: ../hacks/config/flurry.xml.h:10
+#: ../hacks/config/flurry.xml.h:11
 msgid ""
 "This X11 port of the OSX screensaver of the same name draws a colourful "
 "star(fish)like flurry of particles. Original Mac version: "
@@ -4520,84 +4634,84 @@
 "Sargeant; 2002."
 msgstr ""
 
-#: ../hacks/config/flyingtoasters.xml.h:2
-#, no-c-format
-msgid ""
-"A fleet of 3d space-age jet-powered flying toasters (and toast!) Inspired by "
-"the ancient Berkeley Systems After Dark flying toasters. "
-"http://en.wikipedia.org/wiki/After_Dark_%28software%29#Flying_Toasters "
-"Written by Jamie Zawinski and Devon Dossett; 2003."
-msgstr ""
-
-#: ../hacks/config/flyingtoasters.xml.h:3
-msgid "Air speed"
-msgstr "Vitesse de l'air"
-
-#: ../hacks/config/flyingtoasters.xml.h:4 ../hacks/config/jigglypuff.xml.h:1
-msgid "Chrome"
-msgstr "Chrome"
-
-#: ../hacks/config/flyingtoasters.xml.h:6
+#: ../hacks/config/flyingtoasters.xml.h:1
 msgid "FlyingToasters"
 msgstr "Grille-pain volant"
 
-#: ../hacks/config/flyingtoasters.xml.h:11
-msgid "Number of slices"
-msgstr "Nombre de tranches"
+#: ../hacks/config/flyingtoasters.xml.h:6
+msgid "Air speed"
+msgstr "Vitesse de l'air"
 
-#: ../hacks/config/flyingtoasters.xml.h:12
+#: ../hacks/config/flyingtoasters.xml.h:9
 msgid "Number of toasters"
 msgstr "Nombre de grille-pain"
 
-#: ../hacks/config/flyingtoasters.xml.h:15
+#: ../hacks/config/flyingtoasters.xml.h:10
 msgid "Swarm"
 msgstr "Essaim"
 
-#: ../hacks/config/fontglide.xml.h:1 ../hacks/config/tangram.xml.h:1
-#: ../hacks/config/xlyap.xml.h:1
-msgid "Brief"
-msgstr "Brève"
+#: ../hacks/config/flyingtoasters.xml.h:11
+msgid "Number of slices"
+msgstr "Nombre de tranches"
 
-#: ../hacks/config/fontglide.xml.h:3
-msgid "Font border thickness"
-msgstr "Épaisseur des contours de la police"
+#: ../hacks/config/flyingtoasters.xml.h:12 ../hacks/config/jigglypuff.xml.h:23
+msgid "Chrome"
+msgstr "Chrome"
+
+#: ../hacks/config/flyingtoasters.xml.h:16
+#, no-c-format
+msgid ""
+"A fleet of 3d space-age jet-powered flying toasters (and toast!) Inspired by "
+"the ancient Berkeley Systems After Dark flying toasters. "
+"http://en.wikipedia.org/wiki/After_Dark_%28software%29#Flying_Toasters "
+"Written by Jamie Zawinski and Devon Dossett; 2003."
+msgstr ""
 
-#: ../hacks/config/fontglide.xml.h:4
+#: ../hacks/config/fontglide.xml.h:1
 msgid "FontGlide"
 msgstr "Vol plané de texte"
 
-#: ../hacks/config/fontglide.xml.h:7
+#: ../hacks/config/fontglide.xml.h:8
+msgid "Pages of text"
+msgstr "Pages de texte"
+
+#: ../hacks/config/fontglide.xml.h:9
 msgid "Horizontally scrolling text"
 msgstr "Défilement horizontal du texte"
 
 #: ../hacks/config/fontglide.xml.h:10
+msgid "Random display style"
+msgstr "Style d'affichage aléatoire"
+
+#: ../hacks/config/fontglide.xml.h:11 ../hacks/config/tangram.xml.h:5
+#: ../hacks/config/xlyap.xml.h:5
+msgid "Brief"
+msgstr "Brève"
+
+#: ../hacks/config/fontglide.xml.h:12
 msgid "Page linger"
 msgstr ""
 
-#: ../hacks/config/fontglide.xml.h:11
-msgid "Pages of text"
-msgstr "Pages de texte"
+#: ../hacks/config/fontglide.xml.h:14
+msgid "Font border thickness"
+msgstr "Épaisseur des contours de la police"
 
-#: ../hacks/config/fontglide.xml.h:12
+#: ../hacks/config/fontglide.xml.h:15
+msgid "Vapor trails"
+msgstr "Traînés vaporeuses"
+
+#: ../hacks/config/fontglide.xml.h:17
 msgid ""
 "Puts text on the screen using large characters that glide in from the edges, "
 "assemble, then disperse. Alternately, it can simply scroll whole sentences "
 "from right to left. Written by Jamie Zawinski; 2003."
 msgstr ""
 
-#: ../hacks/config/fontglide.xml.h:13
-msgid "Random display style"
-msgstr "Style d'affichage aléatoire"
-
-#: ../hacks/config/fontglide.xml.h:17
-msgid "Vapor trails"
-msgstr "Traînés vaporeuses"
-
-#: ../hacks/config/forest.xml.h:1 ../hacks/config/glforestfire.xml.h:4
+#: ../hacks/config/forest.xml.h:1 ../hacks/config/glforestfire.xml.h:10
 msgid "Forest"
 msgstr "Forêt"
 
-#: ../hacks/config/forest.xml.h:8
+#: ../hacks/config/forest.xml.h:9
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Fractal trees. Written by Peter Baumung; 1997."
@@ -4605,66 +4719,66 @@
 "Cet écran de veille a été retiré de la distribution de XScreenSaver depuis "
 "la version 5.08. Arbres de fractales. Écrit par Peter Baumung ; 1997."
 
-#: ../hacks/config/fuzzyflakes.xml.h:2
-msgid "Blue"
-msgstr "Bleu"
-
-#: ../hacks/config/fuzzyflakes.xml.h:3
-msgid "Border thickness"
-msgstr "Épaisseur de la bordure"
-
-#: ../hacks/config/fuzzyflakes.xml.h:4
-msgid "Cyan"
-msgstr "Cyan"
-
-#: ../hacks/config/fuzzyflakes.xml.h:5
-msgid ""
-"Falling colored snowflake/flower shapes. "
-"http://en.wikipedia.org/wiki/Snowflake Written by Barry Dmytro; 2004."
-msgstr ""
-
-#: ../hacks/config/fuzzyflakes.xml.h:9
+#: ../hacks/config/fuzzyflakes.xml.h:1
 msgid "FuzzyFlakes"
 msgstr "FuzzyFlakes"
 
-#: ../hacks/config/fuzzyflakes.xml.h:10
-msgid "Green"
-msgstr "Vert"
-
-#: ../hacks/config/fuzzyflakes.xml.h:13 ../hacks/config/hypnowheel.xml.h:10
-#: ../hacks/config/xspirograph.xml.h:5
+#: ../hacks/config/fuzzyflakes.xml.h:9 ../hacks/config/hypnowheel.xml.h:10
+#: ../hacks/config/xspirograph.xml.h:8
 msgid "Layers"
 msgstr "Couches"
 
-#: ../hacks/config/fuzzyflakes.xml.h:15
-msgid "Magenta"
-msgstr "Magenta"
-
-#: ../hacks/config/fuzzyflakes.xml.h:17
-msgid "Pink"
-msgstr "Rose"
-
-#: ../hacks/config/fuzzyflakes.xml.h:19
+#: ../hacks/config/fuzzyflakes.xml.h:11
 msgid "Random colors"
 msgstr "Couleurs aléatoires"
 
-#: ../hacks/config/fuzzyflakes.xml.h:20
+#: ../hacks/config/fuzzyflakes.xml.h:13
 msgid "Red"
 msgstr "Rouge"
 
-#: ../hacks/config/fuzzyflakes.xml.h:28
+#: ../hacks/config/fuzzyflakes.xml.h:14
+msgid "Pink"
+msgstr "Rose"
+
+#: ../hacks/config/fuzzyflakes.xml.h:15
 msgid "Yellow"
 msgstr "Jaune"
 
-#: ../hacks/config/galaxy.xml.h:4
+#: ../hacks/config/fuzzyflakes.xml.h:16
+msgid "Green"
+msgstr "Vert"
+
+#: ../hacks/config/fuzzyflakes.xml.h:17
+msgid "Cyan"
+msgstr "Cyan"
+
+#: ../hacks/config/fuzzyflakes.xml.h:18
+msgid "Blue"
+msgstr "Bleu"
+
+#: ../hacks/config/fuzzyflakes.xml.h:19
+msgid "Magenta"
+msgstr "Magenta"
+
+#: ../hacks/config/fuzzyflakes.xml.h:24
+msgid "Border thickness"
+msgstr "Épaisseur de la bordure"
+
+#: ../hacks/config/fuzzyflakes.xml.h:28
+msgid ""
+"Falling colored snowflake/flower shapes. "
+"http://en.wikipedia.org/wiki/Snowflake Written by Barry Dmytro; 2004."
+msgstr ""
+
+#: ../hacks/config/galaxy.xml.h:1
 msgid "Galaxy"
 msgstr "Galaxie"
 
-#: ../hacks/config/galaxy.xml.h:10
+#: ../hacks/config/galaxy.xml.h:12
 msgid "Rotate viewpoint"
 msgstr "Rotation du point de vue"
 
-#: ../hacks/config/galaxy.xml.h:13
+#: ../hacks/config/galaxy.xml.h:14
 msgid ""
 "This draws spinning galaxies, which then collide and scatter their stars to "
 "the, uh, four winds or something. Written by Uli Siegmund, Harald Backert, "
@@ -4674,15 +4788,15 @@
 "leurs étoiles aux quatre vents (en quelque sorte). Écrit par Uli Siegmund, "
 "Harald Backert et Hubert Feyrer; 1997."
 
-#: ../hacks/config/gears.xml.h:5
-msgid "Gear count"
-msgstr "Nombre d'engrenages"
-
-#: ../hacks/config/gears.xml.h:6
+#: ../hacks/config/gears.xml.h:1
 msgid "Gears"
 msgstr "Engrenages"
 
-#: ../hacks/config/gears.xml.h:13
+#: ../hacks/config/gears.xml.h:9
+msgid "Gear count"
+msgstr "Nombre d'engrenages"
+
+#: ../hacks/config/gears.xml.h:15
 msgid ""
 "This draws sets of turning, interlocking gears, rotating in three "
 "dimensions. See also the \"Pinion\" and \"MoebiusGears\" screen savers. "
@@ -4691,60 +4805,60 @@
 "2007."
 msgstr ""
 
-#: ../hacks/config/gflux.xml.h:2 ../hacks/config/glhanoi.xml.h:3
-#: ../hacks/config/lavalite.xml.h:2
+#: ../hacks/config/gflux.xml.h:1
+msgid "GFlux"
+msgstr "GFlux"
+
+#: ../hacks/config/gflux.xml.h:6 ../hacks/config/interference.xml.h:6
+msgid "Wave speed"
+msgstr "Vitesse des vagues"
+
+#: ../hacks/config/gflux.xml.h:9
+msgid "Mesh density"
+msgstr "Densité du maillage"
+
+#: ../hacks/config/gflux.xml.h:12 ../hacks/config/glmatrix.xml.h:16
+msgid "Waves"
+msgstr "Vagues"
+
+#: ../hacks/config/gflux.xml.h:13 ../hacks/config/glhanoi.xml.h:13
+#: ../hacks/config/hilbert.xml.h:14 ../hacks/config/lavalite.xml.h:10
 msgid "10"
 msgstr "10"
 
-#: ../hacks/config/gflux.xml.h:3
-msgid "Checkerboard"
-msgstr "Échiquier"
-
-#: ../hacks/config/gflux.xml.h:6
-msgid ""
-"Draws a rippling waves on a rotating wireframe grid. Written by Josiah "
-"Pease; 2000."
+#: ../hacks/config/gflux.xml.h:14
+msgid "Wire mesh"
 msgstr ""
-"Dessine des vagues ondulantes sur une grille en rotation. Écrit par Josiah "
-"Pease; 2000."
 
-#: ../hacks/config/gflux.xml.h:8
+#: ../hacks/config/gflux.xml.h:15
 msgid "Flat lighting"
 msgstr "Éclairage plat"
 
-#: ../hacks/config/gflux.xml.h:10
-msgid "GFlux"
-msgstr "GFlux"
-
-#: ../hacks/config/gflux.xml.h:13
-msgid "Mesh density"
-msgstr "Densité du maillage"
+#: ../hacks/config/gflux.xml.h:17
+msgid "Checkerboard"
+msgstr "Échiquier"
 
-#: ../hacks/config/gflux.xml.h:14
+#: ../hacks/config/gflux.xml.h:18
 msgid "Picture"
 msgstr "Image"
 
-#: ../hacks/config/gflux.xml.h:18 ../hacks/config/interference.xml.h:22
-msgid "Wave speed"
-msgstr "Vitesse des vagues"
-
-#: ../hacks/config/gflux.xml.h:19 ../hacks/config/glmatrix.xml.h:20
-msgid "Waves"
-msgstr "Vagues"
-
 #: ../hacks/config/gflux.xml.h:20
-msgid "Wire mesh"
+msgid ""
+"Draws a rippling waves on a rotating wireframe grid. Written by Josiah "
+"Pease; 2000."
 msgstr ""
+"Dessine des vagues ondulantes sur une grille en rotation. Écrit par Josiah "
+"Pease; 2000."
 
 #: ../hacks/config/glblur.xml.h:1
-msgid "Blur smoothness"
-msgstr ""
-
-#: ../hacks/config/glblur.xml.h:5
 msgid "GLBlur"
 msgstr "Flou GL"
 
-#: ../hacks/config/glblur.xml.h:17
+#: ../hacks/config/glblur.xml.h:6
+msgid "Blur smoothness"
+msgstr ""
+
+#: ../hacks/config/glblur.xml.h:18
 msgid ""
 "This draws a box and a few line segments, and generates a radial blur "
 "outward from it. This creates flowing field effects. This is done by "
@@ -4755,273 +4869,258 @@
 "Zawinski; 2002."
 msgstr ""
 
-#: ../hacks/config/glcells.xml.h:2
-msgid "15"
-msgstr "15"
+#: ../hacks/config/glcells.xml.h:1
+msgid "GLCells"
+msgstr "Cellules (GL)"
 
-#: ../hacks/config/glcells.xml.h:3
-msgid "Cell division"
-msgstr "Division des cellules"
+#: ../hacks/config/glcells.xml.h:9
+msgid "Max cells"
+msgstr "Cellules maximum"
 
-#: ../hacks/config/glcells.xml.h:4
+#: ../hacks/config/glcells.xml.h:12
 msgid "Cell radius"
 msgstr "Rayon des cellules"
 
-#: ../hacks/config/glcells.xml.h:5
-msgid ""
-"Cells growing, dividing and dying on your screen. Written by Matthias "
-"Toussaint; 2007."
+#: ../hacks/config/glcells.xml.h:14
+msgid "Lowest sphere detail"
+msgstr "Détail de la sphère la plus basse"
+
+#: ../hacks/config/glcells.xml.h:15
+msgid "Medium sphere detail"
 msgstr ""
-"Cellules qui grandissent, se divisent puis meurent sur votre écran. Écrit "
-"par Matthias Toussaint ; 2007."
 
-#: ../hacks/config/glcells.xml.h:8
-msgid "GLCells"
-msgstr "Cellules (GL)"
+#: ../hacks/config/glcells.xml.h:16
+msgid "Normal sphere detail"
+msgstr ""
 
-#: ../hacks/config/glcells.xml.h:9
-msgid "Gorge"
-msgstr "Gorge"
+#: ../hacks/config/glcells.xml.h:17
+msgid "More sphere detail"
+msgstr "Plus de détails pour la sphère"
 
-#: ../hacks/config/glcells.xml.h:11
+#: ../hacks/config/glcells.xml.h:18
 msgid "Highest sphere detail"
 msgstr "Détail de la sphère la plus haute"
 
-#: ../hacks/config/glcells.xml.h:13
-msgid "Keep dead cells"
-msgstr "Conserver les cellules mortes"
-
-#: ../hacks/config/glcells.xml.h:18
-msgid "Lowest sphere detail"
-msgstr "Détail de la sphère la plus basse"
+#: ../hacks/config/glcells.xml.h:19
+msgid "Starve"
+msgstr ""
 
 #: ../hacks/config/glcells.xml.h:20
-msgid "Max cells"
-msgstr "Cellules maximum"
+msgid "Min food"
+msgstr "Nourriture minimale"
 
 #: ../hacks/config/glcells.xml.h:21
-msgid "Max food"
-msgstr "Nourriture maximum"
+msgid "Gorge"
+msgstr "Gorge"
 
 #: ../hacks/config/glcells.xml.h:22
-msgid "Medium sphere detail"
-msgstr ""
+msgid "Max food"
+msgstr "Nourriture maximum"
 
 #: ../hacks/config/glcells.xml.h:23
-msgid "Min distance"
-msgstr "Distance minimale"
+msgid "Quick"
+msgstr ""
 
 #: ../hacks/config/glcells.xml.h:24
-msgid "Min food"
-msgstr "Nourriture minimale"
-
-#: ../hacks/config/glcells.xml.h:25
-msgid "More sphere detail"
-msgstr "Plus de détails pour la sphère"
+msgid "Cell division"
+msgstr "Division des cellules"
 
 #: ../hacks/config/glcells.xml.h:26
-msgid "Normal sphere detail"
-msgstr ""
-
-#: ../hacks/config/glcells.xml.h:27
-msgid "Quick"
-msgstr ""
+msgid "Min distance"
+msgstr "Distance minimale"
 
-#: ../hacks/config/glcells.xml.h:33
-msgid "Starve"
-msgstr ""
+#: ../hacks/config/glcells.xml.h:30
+msgid "15"
+msgstr "15"
 
-#: ../hacks/config/gleidescope.xml.h:2 ../hacks/config/glslideshow.xml.h:6
-msgid "5 minutes"
-msgstr "5 minutes"
+#: ../hacks/config/glcells.xml.h:31
+msgid "Keep dead cells"
+msgstr "Conserver les cellules mortes"
 
-#: ../hacks/config/gleidescope.xml.h:3
+#: ../hacks/config/glcells.xml.h:34
 msgid ""
-"A kaleidoscope that operates on your desktop image, or on image files loaded "
-"from disk. http://en.wikipedia.org/wiki/Kaleidoscope Written by Andrew Dean; "
-"2003."
+"Cells growing, dividing and dying on your screen. Written by Matthias "
+"Toussaint; 2007."
 msgstr ""
-"Un kaléidoscope qui opère sur l'image de votre bureau ou sur des fichiers "
-"d'image chargés depuis le disque. http://en.wikipedia.org/wiki/Kaleidoscope "
-"Écrit par Andrew Dean ; 2003."
+"Cellules qui grandissent, se divisent puis meurent sur votre écran. Écrit "
+"par Matthias Toussaint ; 2007."
 
-#: ../hacks/config/gleidescope.xml.h:5
+#: ../hacks/config/gleidescope.xml.h:1
 msgid "Gleidescope"
 msgstr "Kaleïdoscope GL"
 
-#: ../hacks/config/gleidescope.xml.h:7
+#: ../hacks/config/gleidescope.xml.h:6
+msgid "Size of tube"
+msgstr "Taille du tube"
+
+#: ../hacks/config/gleidescope.xml.h:9
 msgid "Image duration"
 msgstr "Durée des images"
 
-#: ../hacks/config/gleidescope.xml.h:10
+#: ../hacks/config/gleidescope.xml.h:10 ../hacks/config/glslideshow.xml.h:7
+msgid "5 minutes"
+msgstr "5 minutes"
+
+#: ../hacks/config/gleidescope.xml.h:11
 msgid "Move"
 msgstr "Déplacement"
 
-#: ../hacks/config/gleidescope.xml.h:13
-msgid "Size of tube"
-msgstr "Taille du tube"
-
-#: ../hacks/config/gleidescope.xml.h:15 ../hacks/config/hypercube.xml.h:18
-#: ../hacks/config/mirrorblob.xml.h:28 ../hacks/config/zoom.xml.h:15
+#: ../hacks/config/gleidescope.xml.h:13 ../hacks/config/hypercube.xml.h:11
+#: ../hacks/config/mirrorblob.xml.h:6 ../hacks/config/zoom.xml.h:1
 msgid "Zoom"
 msgstr "Zoom"
 
-#: ../hacks/config/glforestfire.xml.h:2
-msgid "Desert"
-msgstr "Désert"
-
-#: ../hacks/config/glforestfire.xml.h:3 ../hacks/config/glmatrix.xml.h:5
-#: ../hacks/config/glschool.xml.h:7
-msgid "Fog"
-msgstr "Brouillard"
+#: ../hacks/config/gleidescope.xml.h:15
+msgid ""
+"A kaleidoscope that operates on your desktop image, or on image files loaded "
+"from disk. http://en.wikipedia.org/wiki/Kaleidoscope Written by Andrew Dean; "
+"2003."
+msgstr ""
+"Un kaléidoscope qui opère sur l'image de votre bureau ou sur des fichiers "
+"d'image chargés depuis le disque. http://en.wikipedia.org/wiki/Kaleidoscope "
+"Écrit par Andrew Dean ; 2003."
 
-#: ../hacks/config/glforestfire.xml.h:6
+#: ../hacks/config/glforestfire.xml.h:1
 msgid "GLForestFire"
 msgstr "Feu de forêt GL"
 
-#: ../hacks/config/glforestfire.xml.h:8
+#: ../hacks/config/glforestfire.xml.h:5
+msgid "Rain"
+msgstr "Pluie"
+
+#: ../hacks/config/glforestfire.xml.h:7
 msgid "Huge fire"
 msgstr "Grand feu"
 
-#: ../hacks/config/glforestfire.xml.h:10
+#: ../hacks/config/glforestfire.xml.h:8
+msgid "Desert"
+msgstr "Désert"
+
+#: ../hacks/config/glforestfire.xml.h:9
 msgid "Number of trees"
 msgstr "Nombre d'arbres"
 
-#: ../hacks/config/glforestfire.xml.h:11
-msgid "Rain"
-msgstr "Pluie"
-
 #: ../hacks/config/glforestfire.xml.h:12
+msgid "Textures"
+msgstr "Textures"
+
+#: ../hacks/config/glforestfire.xml.h:13
 msgid "Shadows"
 msgstr "Ombres"
 
-#: ../hacks/config/glforestfire.xml.h:14
-msgid "Textures"
-msgstr "Textures"
+#: ../hacks/config/glforestfire.xml.h:14 ../hacks/config/glmatrix.xml.h:15
+#: ../hacks/config/glschool.xml.h:14
+msgid "Fog"
+msgstr "Brouillard"
 
-#: ../hacks/config/glforestfire.xml.h:15
+#: ../hacks/config/glforestfire.xml.h:17
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Draws an animation of sprinkling fire-like 3D triangles in a "
 "landscape filled with trees. Written by Eric Lassauge; 2002."
 msgstr ""
 
-#: ../hacks/config/glhanoi.xml.h:5
-msgid "31"
-msgstr "31"
-
-#: ../hacks/config/glhanoi.xml.h:6 ../hacks/config/pulsar.xml.h:5
-msgid "Enable fog"
-msgstr "Activer le brouillard"
-
-#: ../hacks/config/glhanoi.xml.h:7 ../hacks/config/pulsar.xml.h:6
-msgid "Enable lighting"
-msgstr "Activer l'éclairage"
-
-#: ../hacks/config/glhanoi.xml.h:9
+#: ../hacks/config/glhanoi.xml.h:1
 msgid "GLHanoi"
 msgstr "GL Hanoï"
 
-#: ../hacks/config/glhanoi.xml.h:11
-msgid "Length of disk trails"
-msgstr ""
-
-#: ../hacks/config/glhanoi.xml.h:13
+#: ../hacks/config/glhanoi.xml.h:6
 msgid "Number of disks"
 msgstr "Nombre de disques"
 
-#: ../hacks/config/glhanoi.xml.h:14
+#: ../hacks/config/glhanoi.xml.h:7
+msgid "31"
+msgstr "31"
+
+#: ../hacks/config/glhanoi.xml.h:8
 msgid "Number of poles"
 msgstr ""
 
-#: ../hacks/config/glhanoi.xml.h:16
+#: ../hacks/config/glhanoi.xml.h:10
+msgid "Speed (of smallest disks)"
+msgstr "Vitesse (des disques les plus petits)"
+
+#: ../hacks/config/glhanoi.xml.h:12
+msgid "Length of disk trails"
+msgstr "Longueur de la traînée des disques"
+
+#: ../hacks/config/glhanoi.xml.h:14 ../hacks/config/pulsar.xml.h:7
+msgid "Enable fog"
+msgstr "Activer le brouillard"
+
+#: ../hacks/config/glhanoi.xml.h:17 ../hacks/config/pulsar.xml.h:6
+msgid "Enable lighting"
+msgstr "Activer l'éclairage"
+
+#: ../hacks/config/glhanoi.xml.h:18
 msgid ""
 "Solves the Towers of Hanoi puzzle. Move N disks from one pole to another, "
 "one disk at a time, with no disk ever resting on a disk smaller than itself. "
 "http://en.wikipedia.org/wiki/Tower_of_Hanoi Written by Dave Atkinson; 2005."
 msgstr ""
 
-#: ../hacks/config/glhanoi.xml.h:17
-msgid "Speed (of smallest disks)"
-msgstr ""
-
-#: ../hacks/config/glknots.xml.h:4
+#: ../hacks/config/glknots.xml.h:1
 msgid "GLKnots"
 msgstr "Noeuds GL"
 
-#: ../hacks/config/glknots.xml.h:5
-msgid ""
-"Generates some twisting 3d knot patterns. Spins 'em around. "
-"http://en.wikipedia.org/wiki/Knot_theory Written by Jamie Zawinski; 2003."
-msgstr ""
-
-#: ../hacks/config/glknots.xml.h:8 ../hacks/config/jigsaw.xml.h:10
-#: ../hacks/config/lavalite.xml.h:17 ../hacks/config/mirrorblob.xml.h:20
-#: ../hacks/config/spheremonics.xml.h:9
-msgid "Resolution"
-msgstr "Résolution"
-
 #: ../hacks/config/glknots.xml.h:16
 msgid "Segmented"
 msgstr "Segmenté"
 
-#: ../hacks/config/glmatrix.xml.h:1 ../hacks/config/xmatrix.xml.h:1
-msgid "Binary encoding"
-msgstr "Codage binaire"
+#: ../hacks/config/glknots.xml.h:17 ../hacks/config/jigsaw.xml.h:12
+#: ../hacks/config/lavalite.xml.h:11 ../hacks/config/mirrorblob.xml.h:14
+#: ../hacks/config/spheremonics.xml.h:8
+msgid "Resolution"
+msgstr "Résolution"
 
-#: ../hacks/config/glmatrix.xml.h:3
+#: ../hacks/config/glknots.xml.h:25
 msgid ""
-"Draws 3D dropping characters similar to what is seen in the title sequence "
-"of \"The Matrix\". See also \"xmatrix\" for a 2D rendering of the similar "
-"effect that appeared on the computer monitors actually *in* the movie. "
-"Written by Jamie Zawinski; 2003."
-msgstr ""
-"Dessine des caractères 3D qui tombent de façon similaire à ce que l'on voit "
-"dans la séquence de titre de «Matrix». Voir également «xmatrix» pour un "
-"rendu 2D du même effet qui apparaît sur les moniteurs *dans* le film. Écrit "
-"par Jamie Zawinski; 2003."
+"Generates some twisting 3d knot patterns. Spins 'em around. "
+"http://en.wikipedia.org/wiki/Knot_theory Written by Jamie Zawinski; 2003."
+msgstr ""
 
-#: ../hacks/config/glmatrix.xml.h:7
+#: ../hacks/config/glmatrix.xml.h:1
 msgid "GLMatrix"
 msgstr "GLMatrix"
 
-#: ../hacks/config/glmatrix.xml.h:8 ../hacks/config/xmatrix.xml.h:7
-msgid "Genetic encoding"
-msgstr "Codage génétique"
-
-#: ../hacks/config/glmatrix.xml.h:9
+#: ../hacks/config/glmatrix.xml.h:6
 msgid "Glyph density"
 msgstr "Densité des symboles"
 
-#: ../hacks/config/glmatrix.xml.h:10
+#: ../hacks/config/glmatrix.xml.h:9
 msgid "Glyph speed"
 msgstr "Vitesse des symboles"
 
-#: ../hacks/config/glmatrix.xml.h:11 ../hacks/config/xmatrix.xml.h:8
+#: ../hacks/config/glmatrix.xml.h:11 ../hacks/config/xmatrix.xml.h:4
+msgid "Matrix encoding"
+msgstr "Codage en matrice"
+
+#: ../hacks/config/glmatrix.xml.h:12 ../hacks/config/xmatrix.xml.h:5
+msgid "Binary encoding"
+msgstr "Codage binaire"
+
+#: ../hacks/config/glmatrix.xml.h:13 ../hacks/config/xmatrix.xml.h:6
 msgid "Hexadecimal encoding"
 msgstr "Codage hexadécimal"
 
-#: ../hacks/config/glmatrix.xml.h:14 ../hacks/config/xmatrix.xml.h:13
-msgid "Matrix encoding"
-msgstr "Codage en matrice"
+#: ../hacks/config/glmatrix.xml.h:14 ../hacks/config/xmatrix.xml.h:7
+msgid "Genetic encoding"
+msgstr "Codage génétique"
 
-#: ../hacks/config/glmatrix.xml.h:15
+#: ../hacks/config/glmatrix.xml.h:17
 msgid "Panning"
 msgstr "Panoramique"
 
-#: ../hacks/config/glplanet.xml.h:1
+#: ../hacks/config/glmatrix.xml.h:21
 msgid ""
-"Draws a planet bouncing around in space. The built-in image is a map of the "
-"earth (extracted from `xearth'), but you can wrap any texture around the "
-"sphere, e.g., the planetary textures that come with `ssystem'. Written by "
-"David Konerding; 1998."
+"Draws the 3D \"digital rain\" effect, as seen in the title sequence of \"The "
+"Matrix\". See also \"xmatrix\" for a 2D rendering of the similar effect that "
+"appeared on the computer monitors actually *in* the movie. "
+"http://en.wikipedia.org/wiki/Matrix_digital_rain Written by Jamie Zawinski; "
+"2003."
 msgstr ""
-"Dessine une planète qui rebondit dans l'espace. L'image intégrée est un "
-"planisphère (extrait de «xearth»), mais vous pouvez entourer la sphère d'une "
-"texture quelconque, p. ex., les textures planétaires fournies avec "
-"«ssystem».Écrit par David Konerding. 1998"
 
-#: ../hacks/config/glplanet.xml.h:3
+#: ../hacks/config/glplanet.xml.h:1
 msgid "GLPlanet"
 msgstr "Planète GL"
 
@@ -5030,35 +5129,51 @@
 msgid "Image file"
 msgstr "Fichier image"
 
-#: ../hacks/config/glplanet.xml.h:9 ../hacks/config/moebiusgears.xml.h:9
+#: ../hacks/config/glplanet.xml.h:9 ../hacks/config/moebiusgears.xml.h:12
 msgid "Roll"
 msgstr "Pivote"
 
-#: ../hacks/config/glschool.xml.h:1
-msgid "Avoidance"
-msgstr "Evitement"
-
-#: ../hacks/config/glschool.xml.h:2
-msgid "Centering"
-msgstr "Centrage"
-
-#: ../hacks/config/glschool.xml.h:4
-msgid "Draw goal"
+#: ../hacks/config/glplanet.xml.h:14
+msgid ""
+"Draws a planet bouncing around in space. The built-in image is a map of the "
+"earth (extracted from `xearth'), but you can wrap any texture around the "
+"sphere, e.g., the planetary textures that come with `ssystem'. Written by "
+"David Konerding; 1998."
 msgstr ""
+"Dessine une planète qui rebondit dans l'espace. L'image intégrée est un "
+"planisphère (extrait de «xearth»), mais vous pouvez entourer la sphère d'une "
+"texture quelconque, p. ex., les textures planétaires fournies avec "
+"«ssystem».Écrit par David Konerding. 1998"
+
+#: ../hacks/config/glschool.xml.h:1
+msgid "GLSchool"
+msgstr "GLSchool"
 
 #: ../hacks/config/glschool.xml.h:6
 msgid "Fish count"
 msgstr "Nombre de poissons"
 
 #: ../hacks/config/glschool.xml.h:9
-msgid "GLSchool"
-msgstr "GLSchool"
+msgid "Avoidance"
+msgstr "Evitement"
 
 #: ../hacks/config/glschool.xml.h:10
+msgid "Velocity matching"
+msgstr ""
+
+#: ../hacks/config/glschool.xml.h:11
+msgid "Centering"
+msgstr "Centrage"
+
+#: ../hacks/config/glschool.xml.h:12
 msgid "Goal following"
 msgstr ""
 
-#: ../hacks/config/glschool.xml.h:16
+#: ../hacks/config/glschool.xml.h:15
+msgid "Draw goal"
+msgstr ""
+
+#: ../hacks/config/glschool.xml.h:18
 msgid ""
 "Uses Craig Reynolds' Boids algorithm to simulate a school of fish. "
 "http://en.wikipedia.org/wiki/Boids Written by David C. Lambert; 2006."
@@ -5067,49 +5182,73 @@
 "poissons. http://en.wikipedia.org/wiki/Boids Ecrit par David C. Lambert ; "
 "2006."
 
-#: ../hacks/config/glschool.xml.h:17
-msgid "Velocity matching"
-msgstr ""
-
-#: ../hacks/config/glslideshow.xml.h:4 ../hacks/config/rd-bomb.xml.h:4
-#: ../hacks/config/rdbomb.xml.h:4 ../hacks/config/substrate.xml.h:4
-#, no-c-format
-msgid "100%"
-msgstr "100%"
+#: ../hacks/config/glslideshow.xml.h:1
+msgid "GLSlideshow"
+msgstr "Diaporama GL"
 
-#: ../hacks/config/glslideshow.xml.h:8
+#: ../hacks/config/glslideshow.xml.h:9
 #, no-c-format
 msgid "50%"
 msgstr "50 %"
 
-#: ../hacks/config/glslideshow.xml.h:9
+#: ../hacks/config/glslideshow.xml.h:10
 msgid "Always show at least this much of the image"
 msgstr "Toujours afficher au moins cette quantité de l'image"
 
-#: ../hacks/config/glslideshow.xml.h:10
+#: ../hacks/config/glslideshow.xml.h:12 ../hacks/config/rd-bomb.xml.h:10
+#: ../hacks/config/rdbomb.xml.h:10 ../hacks/config/substrate.xml.h:15
+#, no-c-format
+msgid "100%"
+msgstr "100%"
+
+#: ../hacks/config/glslideshow.xml.h:14
+msgid "Pan/zoom duration"
+msgstr "Durée du mouvement / zoom"
+
+#: ../hacks/config/glslideshow.xml.h:17
 msgid "Crossfade duration"
 msgstr "Temps de fondu"
 
-#: ../hacks/config/glslideshow.xml.h:12
-msgid "GLSlideshow"
-msgstr "Diaporama GL"
-
-#: ../hacks/config/glslideshow.xml.h:15
+#: ../hacks/config/glslideshow.xml.h:21
 msgid ""
 "Loads a random sequence of images and smoothly scans and zooms around in "
 "each, fading from pan to pan. Written by Jamie Zawinski and Mike Oliphant; "
 "2003."
 msgstr ""
 
-#: ../hacks/config/glslideshow.xml.h:18
-msgid "Pan/zoom duration"
-msgstr "Durée du mouvement / zoom"
+#: ../hacks/config/glsnake.xml.h:1
+msgid "GLSnake"
+msgstr "Serpent (GL)"
+
+#: ../hacks/config/glsnake.xml.h:8
+msgid "Tight"
+msgstr "Serré"
+
+#: ../hacks/config/glsnake.xml.h:9
+msgid "Packing"
+msgstr "Noeuds"
+
+#: ../hacks/config/glsnake.xml.h:10
+msgid "Loose"
+msgstr "Eloigné"
 
-#: ../hacks/config/glsnake.xml.h:3
+#: ../hacks/config/glsnake.xml.h:12
 msgid "Angular velocity"
 msgstr "Vitesse angulaire"
 
-#: ../hacks/config/glsnake.xml.h:5
+#: ../hacks/config/glsnake.xml.h:14
+msgid "Y angular velocity"
+msgstr "Vélocité angulaire Y"
+
+#: ../hacks/config/glsnake.xml.h:15
+msgid "Z angular velocity"
+msgstr "Vélocité angulaire Z"
+
+#: ../hacks/config/glsnake.xml.h:16
+msgid "Show titles"
+msgstr "Afficher les titres"
+
+#: ../hacks/config/glsnake.xml.h:20
 #, no-c-format
 msgid ""
 "Draws a simulation of the Rubik's Snake puzzle. See also the \"Rubik\" and "
@@ -5117,90 +5256,70 @@
 "Written by Jamie Wilkinson, Andrew Bennetts, and Peter Aylett; 2002."
 msgstr ""
 
-#: ../hacks/config/glsnake.xml.h:9
-msgid "GLSnake"
-msgstr "Serpent (GL)"
-
-#: ../hacks/config/glsnake.xml.h:11
-msgid "Loose"
-msgstr "Eloigné"
-
-#: ../hacks/config/glsnake.xml.h:13
-msgid "Packing"
-msgstr "Noeuds"
-
-#: ../hacks/config/glsnake.xml.h:15
-msgid "Show titles"
-msgstr "Afficher les titres"
-
-#: ../hacks/config/glsnake.xml.h:17
-msgid "Tight"
-msgstr "Serré"
+#: ../hacks/config/gltext.xml.h:1
+msgid "GLText"
+msgstr "Texte GL"
 
-#: ../hacks/config/glsnake.xml.h:19
-msgid "Y angular velocity"
-msgstr "Vélocité angulaire Y"
+#: ../hacks/config/gltext.xml.h:5
+msgid "Display system information"
+msgstr "Afficher des informations système"
 
-#: ../hacks/config/glsnake.xml.h:20
-msgid "Z angular velocity"
-msgstr "Vélocité angulaire Z"
+#: ../hacks/config/gltext.xml.h:6
+msgid "Display date and time"
+msgstr "Afficher la date et l'heure"
 
-#: ../hacks/config/gltext.xml.h:1
+#: ../hacks/config/gltext.xml.h:7
 msgid "Always face front"
 msgstr "Toujours voir la face avant"
 
-#: ../hacks/config/gltext.xml.h:2
-msgid "Display date and time"
-msgstr "Afficher la date et l'heure"
-
-#: ../hacks/config/gltext.xml.h:3
-msgid "Display system information"
-msgstr "Afficher des informations système"
+#: ../hacks/config/gltext.xml.h:8
+msgid "Spin all the way around"
+msgstr "Rotation"
 
-#: ../hacks/config/gltext.xml.h:4
+#: ../hacks/config/gltext.xml.h:20
 msgid ""
 "Displays a few lines of text spinning around in a solid 3D font. The text "
 "can use strftime() escape codes to display the current date and time. "
 "Written by Jamie Zawinski; 2001."
 msgstr ""
 
-#: ../hacks/config/gltext.xml.h:7
-msgid "GLText"
-msgstr "Texte GL"
-
-#: ../hacks/config/gltext.xml.h:18
-msgid "Spin all the way around"
-msgstr "Rotation"
-
 #: ../hacks/config/goop.xml.h:1
-msgid "Additive colors (transmitted light)"
-msgstr ""
+msgid "Goop"
+msgstr "Gouttes"
 
-#: ../hacks/config/goop.xml.h:2
+#: ../hacks/config/goop.xml.h:9
 msgid "Blobs"
 msgstr ""
 
-#: ../hacks/config/goop.xml.h:3
+#: ../hacks/config/goop.xml.h:11
 msgid "Elasticity"
 msgstr "Élasticité"
 
-#: ../hacks/config/goop.xml.h:7
-msgid "Goop"
-msgstr "Gouttes"
+#: ../hacks/config/goop.xml.h:12
+msgid "Speed limit"
+msgstr "Vitesse maximale"
 
-#: ../hacks/config/goop.xml.h:11
-msgid "Opaque blobs"
+#: ../hacks/config/goop.xml.h:14
+msgid "Transparent blobs"
 msgstr ""
 
 #: ../hacks/config/goop.xml.h:15
-msgid "Speed limit"
-msgstr "Vitesse maximale"
+msgid "Opaque blobs"
+msgstr ""
 
 #: ../hacks/config/goop.xml.h:16
-msgid "Subtractive colors (reflected light)"
+msgid "XOR blobs"
 msgstr ""
 
 #: ../hacks/config/goop.xml.h:17
+msgid "Additive colors (transmitted light)"
+msgstr ""
+
+#: ../hacks/config/goop.xml.h:18
+msgid "Subtractive colors (reflected light)"
+msgstr ""
+
+#: ../hacks/config/goop.xml.h:19
 msgid ""
 "This draws set of animating, transparent, amoeba-like blobs. The blobs "
 "change shape as they wander around the screen, and they are translucent, so "
@@ -5211,37 +5330,37 @@
 "Zawinski; 1997."
 msgstr ""
 
-#: ../hacks/config/goop.xml.h:18
-msgid "Transparent blobs"
-msgstr ""
-
-#: ../hacks/config/goop.xml.h:19
-msgid "XOR blobs"
-msgstr ""
-
-#: ../hacks/config/grav.xml.h:3
+#: ../hacks/config/grav.xml.h:1
 msgid "Grav"
 msgstr "Gravité"
 
-#: ../hacks/config/grav.xml.h:8
+#: ../hacks/config/grav.xml.h:6
 msgid "Number of objects"
 msgstr "Nombre d'objets"
 
-#: ../hacks/config/grav.xml.h:9
-msgid "Object trails"
-msgstr ""
-
 #: ../hacks/config/grav.xml.h:10
 msgid "Orbital decay"
 msgstr ""
 
-#: ../hacks/config/grav.xml.h:12
+#: ../hacks/config/grav.xml.h:11
+msgid "Object trails"
+msgstr "Traînées des objets"
+
+#: ../hacks/config/grav.xml.h:13
 msgid ""
 "This draws a simple orbital simulation. With trails enabled, it looks kind "
 "of like a cloud-chamber photograph. Written by Greg Bowering; 1997."
 msgstr ""
 
 #: ../hacks/config/greynetic.xml.h:1
+msgid "Greynetic"
+msgstr "Rectangles de couleur"
+
+#: ../hacks/config/greynetic.xml.h:5
+msgid "Grey"
+msgstr "Gris"
+
+#: ../hacks/config/greynetic.xml.h:7
 msgid ""
 "Draws random colored, stippled and transparent rectangles. Written by Jamie "
 "Zawinski; 1992."
@@ -5249,45 +5368,29 @@
 "Dessine des rectangles colorés, en pointillés et transparents de manière "
 "aléatoire. Écrit par Jamie Zawinski; 1992."
 
-#: ../hacks/config/greynetic.xml.h:3
-msgid "Grey"
-msgstr "Gris"
+#: ../hacks/config/halftone.xml.h:1
+msgid "Halftone"
+msgstr "Demi-teintes"
 
-#: ../hacks/config/greynetic.xml.h:4
-msgid "Greynetic"
-msgstr "Rectangles de couleur"
+#: ../hacks/config/halftone.xml.h:6
+msgid "Gravity points"
+msgstr "Gravité des points"
+
+#: ../hacks/config/halftone.xml.h:9
+msgid "Dot size"
+msgstr "Taille des points"
 
-#: ../hacks/config/halftone.xml.h:1 ../hacks/config/metaballs.xml.h:1
+#: ../hacks/config/halftone.xml.h:10 ../hacks/config/metaballs.xml.h:14
 msgid "Big"
 msgstr "Élevé"
 
-#: ../hacks/config/halftone.xml.h:2
+#: ../hacks/config/halftone.xml.h:11
 msgid "Dot fill factor"
 msgstr "Facteur de remplissage par point"
 
-#: ../hacks/config/halftone.xml.h:3
-msgid "Dot size"
-msgstr "Taille des points"
-
-#: ../hacks/config/halftone.xml.h:4
-msgid ""
-"Draws the gravity force in each point on the screen seen through a halftone "
-"dot pattern. The gravity force is calculated from a set of moving mass "
-"points. View it from a distance for best effect. "
-"http://en.wikipedia.org/wiki/Halftone Written by Peter Jaric; 2002."
-msgstr ""
-
-#: ../hacks/config/halftone.xml.h:7
-msgid "Gravity points"
-msgstr "Gravité des points"
-
-#: ../hacks/config/halftone.xml.h:8
-msgid "Halftone"
-msgstr "Demi-teintes"
-
 #: ../hacks/config/halftone.xml.h:13
-msgid "Maximum mass"
-msgstr "Masse max."
+msgid "Minimum speed"
+msgstr "Vitesse min."
 
 #: ../hacks/config/halftone.xml.h:14
 msgid "Maximum speed"
@@ -5298,40 +5401,48 @@
 msgstr "Masse min."
 
 #: ../hacks/config/halftone.xml.h:16
-msgid "Minimum speed"
-msgstr "Vitesse min."
-
-#: ../hacks/config/halo.xml.h:1
-msgid "Animate circles"
-msgstr "Animer les cercles"
+msgid "Maximum mass"
+msgstr "Masse max."
 
-#: ../hacks/config/halo.xml.h:2
+#: ../hacks/config/halftone.xml.h:18
 msgid ""
-"Draws trippy psychedelic circular patterns that hurt to look at. "
-"http://en.wikipedia.org/wiki/Moire_pattern Written by Jamie Zawinski; 1993."
+"Draws the gravity force in each point on the screen seen through a halftone "
+"dot pattern. The gravity force is calculated from a set of moving mass "
+"points. View it from a distance for best effect. "
+"http://en.wikipedia.org/wiki/Halftone Written by Peter Jaric; 2002."
 msgstr ""
 
-#: ../hacks/config/halo.xml.h:5
+#: ../hacks/config/halo.xml.h:1
 msgid "Halo"
 msgstr "Halo"
 
-#: ../hacks/config/halo.xml.h:9
+#: ../hacks/config/halo.xml.h:6
 msgid "Number of circles"
 msgstr "Nombre de cercles"
 
-#: ../hacks/config/halo.xml.h:11
-msgid "Ramp mode"
-msgstr ""
-
-#: ../hacks/config/halo.xml.h:12
+#: ../hacks/config/halo.xml.h:10
 msgid "Random mode"
 msgstr "Mode aléatoire"
 
-#: ../hacks/config/halo.xml.h:13
+#: ../hacks/config/halo.xml.h:11
 msgid "Seuss mode"
 msgstr "Mode Seuss"
 
-#: ../hacks/config/helix.xml.h:4
+#: ../hacks/config/halo.xml.h:12
+msgid "Ramp mode"
+msgstr ""
+
+#: ../hacks/config/halo.xml.h:13
+msgid "Animate circles"
+msgstr "Animer les cercles"
+
+#: ../hacks/config/halo.xml.h:15
+msgid ""
+"Draws trippy psychedelic circular patterns that hurt to look at. "
+"http://en.wikipedia.org/wiki/Moire_pattern Written by Jamie Zawinski; 1993."
+msgstr ""
+
+#: ../hacks/config/helix.xml.h:1
 msgid "Helix"
 msgstr "Hélix"
 
@@ -5340,108 +5451,175 @@
 msgstr ""
 "Génère de nombreux motifs en spirale. Écrit par Jamie Zawinski; 1992."
 
-#: ../hacks/config/hopalong.xml.h:1 ../hacks/config/interference.xml.h:3
-#: ../hacks/config/qix.xml.h:3 ../hacks/config/wander.xml.h:1
+#: ../hacks/config/hilbert.xml.h:1
+msgid "Hilbert"
+msgstr "Hilbert"
+
+#: ../hacks/config/hilbert.xml.h:2
+msgid "2D or 3D"
+msgstr "2D ou 3D"
+
+#: ../hacks/config/hilbert.xml.h:3
+msgid "2D"
+msgstr "2D"
+
+#: ../hacks/config/hilbert.xml.h:4
+msgid "3D"
+msgstr "3D"
+
+#: ../hacks/config/hilbert.xml.h:5
+msgid "Open or closed paths"
+msgstr ""
+
+#: ../hacks/config/hilbert.xml.h:6
+msgid "Closed"
+msgstr ""
+
+#: ../hacks/config/hilbert.xml.h:7
+msgid "Open"
+msgstr ""
+
+#. 
+#. On a 2.93 gHz iMac i7, I get these rates with -delay 0:
+#. 
+#. detail 3:  invisible
+#. detail 4:  barely visible
+#. detail 5:  1000+ fps, looks like noise at -delay 0, ok at -delay 20000
+#. detail 8:  ~700+ fps
+#. detail 9:  ~400 fps
+#. detail 10: ~300 fps
+#. detail 11: ~100 fps
+#. detail 12:  ~50 fps
+#. detail 13:  ~17 fps
+#. detail 14:   ~8 fps
+#. detail 15:   ~2 fps
+#. 
+#. With the default -delay, CPU load only starts causing the frame rate
+#. to drop below 30 fps detail 12 or higher.
+#. 
+#: ../hacks/config/hilbert.xml.h:12 ../hacks/config/hypnowheel.xml.h:12
+#: ../hacks/config/ifs.xml.h:23
+msgid "2"
+msgstr "2"
+
+#: ../hacks/config/hilbert.xml.h:13
+msgid "Recursion levels"
+msgstr "Niveaux de récursion"
+
+#: ../hacks/config/hilbert.xml.h:22
+msgid ""
+"This draws the recursive Hilbert space-filling curve, in both 2D and 3D "
+"variants. It incrementally animates the growth and recursion to the maximum "
+"depth, then unwinds it back. The Hilbert path is a single contiguous line "
+"that can fill a volume without crossing itself. As a data structure, Hilbert "
+"paths are useful because ordering along the curve preserves locality: points "
+"that close together along the curve are also close together in space. The "
+"converse is often, but not always, true. The coloration reflects this. "
+"http://en.wikipedia.org/wiki/Hilbert_curve Written by Jamie Zawinski; 2011."
+msgstr ""
+
+#: ../hacks/config/hopalong.xml.h:1
+msgid "Hopalong"
+msgstr "Cercles psychédéliques"
+
+#: ../hacks/config/hopalong.xml.h:8 ../hacks/config/interference.xml.h:17
+#: ../hacks/config/qix.xml.h:11 ../hacks/config/wander.xml.h:12
 msgid "Color contrast"
 msgstr "Contraste des couleurs"
 
-#: ../hacks/config/hopalong.xml.h:3
+#: ../hacks/config/hopalong.xml.h:12
+msgid "Sine"
+msgstr "Sinus"
+
+#: ../hacks/config/hopalong.xml.h:13
+msgid "Martin"
+msgstr "Martin"
+
+#: ../hacks/config/hopalong.xml.h:15
+msgid "Jong"
+msgstr "Jong"
+
+#: ../hacks/config/hopalong.xml.h:16
+msgid "RR"
+msgstr "RR"
+
+#: ../hacks/config/hopalong.xml.h:17
 msgid "EJK1"
 msgstr "EJK1"
 
-#: ../hacks/config/hopalong.xml.h:4
+#: ../hacks/config/hopalong.xml.h:18
 msgid "EJK2"
 msgstr "EJK2"
 
-#: ../hacks/config/hopalong.xml.h:5
+#: ../hacks/config/hopalong.xml.h:19
 msgid "EJK3"
 msgstr "EJK3"
 
-#: ../hacks/config/hopalong.xml.h:6
+#: ../hacks/config/hopalong.xml.h:20
 msgid "EJK4"
 msgstr "EJK4"
 
-#: ../hacks/config/hopalong.xml.h:7
+#: ../hacks/config/hopalong.xml.h:21
 msgid "EJK5"
 msgstr "EJK5"
 
-#: ../hacks/config/hopalong.xml.h:8
+#: ../hacks/config/hopalong.xml.h:22
 msgid "EJK6"
 msgstr "EJK6"
 
-#: ../hacks/config/hopalong.xml.h:11
-msgid "Hopalong"
-msgstr "Cercles psychédéliques"
-
-#: ../hacks/config/hopalong.xml.h:12
-msgid "Jong"
-msgstr "Jong"
-
-#: ../hacks/config/hopalong.xml.h:16
-msgid "Martin"
-msgstr "Martin"
-
-#: ../hacks/config/hopalong.xml.h:19
-msgid "RR"
-msgstr "RR"
-
-#: ../hacks/config/hopalong.xml.h:21
-msgid "Sine"
-msgstr "Sinus"
-
-#: ../hacks/config/hopalong.xml.h:23
+#: ../hacks/config/hopalong.xml.h:24
 msgid ""
 "This draws lacy fractal patterns based on iteration in the imaginary plane, "
 "from a 1986 Scientific American article. See also the \"Discrete\" screen "
 "saver. Written by Patrick Naughton; 1992."
 msgstr ""
 
-#: ../hacks/config/hyperball.xml.h:4
+#: ../hacks/config/hyperball.xml.h:1
 msgid "HyperBall"
 msgstr "HyperBall"
 
-#: ../hacks/config/hyperball.xml.h:8
-msgid ""
-"This screen saver was removed from the XScreenSaver distribution as of "
-"version 5.10. It has been replaced by the more general \"Polytopes\" screen "
-"saver, which can display this object as well as others. The Polytopes \"120-"
-"cell\" object corresponds to this one. Hyperball is to hypercube as "
-"dodecahedron is to cube: this displays a 2D projection of the sequence of 3D "
-"objects which are the projections of the 4D analog to the dodecahedron. "
-"Technically, it is a \"120 cell polytope\". "
-"http://en.wikipedia.org/wiki/Hypercube "
-"http://en.wikipedia.org/wiki/Regular_polytope Written by Joe Keane; 2000."
-msgstr ""
-
-#: ../hacks/config/hyperball.xml.h:9 ../hacks/config/hypercube.xml.h:12
+#: ../hacks/config/hyperball.xml.h:6 ../hacks/config/hypercube.xml.h:6
 msgid "XW rotation"
 msgstr "rotation XW"
 
-#: ../hacks/config/hyperball.xml.h:10 ../hacks/config/hypercube.xml.h:13
+#: ../hacks/config/hyperball.xml.h:8 ../hacks/config/hypercube.xml.h:8
 msgid "XY rotation"
 msgstr "rotation XY"
 
-#: ../hacks/config/hyperball.xml.h:11 ../hacks/config/hypercube.xml.h:14
+#: ../hacks/config/hyperball.xml.h:9 ../hacks/config/hypercube.xml.h:9
 msgid "XZ rotation"
 msgstr "rotation XZ"
 
-#: ../hacks/config/hyperball.xml.h:12 ../hacks/config/hypercube.xml.h:15
+#: ../hacks/config/hyperball.xml.h:10 ../hacks/config/hypercube.xml.h:13
 msgid "YW rotation"
 msgstr "rotation YW"
 
-#: ../hacks/config/hyperball.xml.h:13 ../hacks/config/hypercube.xml.h:16
+#: ../hacks/config/hyperball.xml.h:11 ../hacks/config/hypercube.xml.h:14
 msgid "YZ rotation"
 msgstr "rotation YZ"
 
-#: ../hacks/config/hyperball.xml.h:14 ../hacks/config/hypercube.xml.h:17
+#: ../hacks/config/hyperball.xml.h:12 ../hacks/config/hypercube.xml.h:15
 msgid "ZW rotation"
 msgstr "rotation ZW"
 
-#: ../hacks/config/hypercube.xml.h:5
+#: ../hacks/config/hyperball.xml.h:14
+msgid ""
+"This screen saver was removed from the XScreenSaver distribution as of "
+"version 5.10. It has been replaced by the more general \"Polytopes\" screen "
+"saver, which can display this object as well as others. The Polytopes \"120-"
+"cell\" object corresponds to this one. Hyperball is to hypercube as "
+"dodecahedron is to cube: this displays a 2D projection of the sequence of 3D "
+"objects which are the projections of the 4D analog to the dodecahedron. "
+"Technically, it is a \"120 cell polytope\". "
+"http://en.wikipedia.org/wiki/Hypercube "
+"http://en.wikipedia.org/wiki/Regular_polytope Written by Joe Keane; 2000."
+msgstr ""
+
+#: ../hacks/config/hypercube.xml.h:1
 msgid "HyperCube"
 msgstr "HyperCube"
 
-#: ../hacks/config/hypercube.xml.h:11
+#: ../hacks/config/hypercube.xml.h:18
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.10. It has been replaced by the more general \"Polytopes\" screen "
@@ -5457,180 +5635,180 @@
 "Mueller, and Jamie Zawinski; 1992."
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:1 ../hacks/config/klein.xml.h:2
-#: ../hacks/config/polytopes.xml.h:1
-msgid "-4.0"
-msgstr "-4.0"
-
-#: ../hacks/config/hypertorus.xml.h:2 ../hacks/config/klein.xml.h:6
-#: ../hacks/config/polytopes.xml.h:5
-msgid "4.0"
-msgstr "4.0"
-
-#: ../hacks/config/hypertorus.xml.h:3
-msgid "Color wheel"
-msgstr ""
-
-#: ../hacks/config/hypertorus.xml.h:6
+#: ../hacks/config/hypertorus.xml.h:1
 msgid "Hypertorus"
 msgstr "Hypertore 4D"
 
-#: ../hacks/config/hypertorus.xml.h:8 ../hacks/config/klein.xml.h:14
-#: ../hacks/config/polytopes.xml.h:13
-msgid "Orthographic 3D"
+#: ../hacks/config/hypertorus.xml.h:6 ../hacks/config/klein.xml.h:13
+#: ../hacks/config/polytopes.xml.h:2
+msgid "Wireframe mesh"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:9 ../hacks/config/klein.xml.h:15
-#: ../hacks/config/polytopes.xml.h:14
-msgid "Orthographic 4D"
-msgstr ""
+#: ../hacks/config/hypertorus.xml.h:7 ../hacks/config/klein.xml.h:14
+#: ../hacks/config/mirrorblob.xml.h:27 ../hacks/config/polytopes.xml.h:3
+msgid "Solid surface"
+msgstr "Surface unie"
 
-#: ../hacks/config/hypertorus.xml.h:10 ../hacks/config/klein.xml.h:16
-#: ../hacks/config/polytopes.xml.h:15
-msgid "Perspective 3D"
-msgstr "Perspective 3D"
+#: ../hacks/config/hypertorus.xml.h:8 ../hacks/config/klein.xml.h:15
+#: ../hacks/config/polytopes.xml.h:4
+msgid "Transparent surface"
+msgstr "Surface transparente"
 
-#: ../hacks/config/hypertorus.xml.h:11 ../hacks/config/klein.xml.h:17
-#: ../hacks/config/polytopes.xml.h:16
-msgid "Perspective 4D"
-msgstr "Perspective 4D"
+#: ../hacks/config/hypertorus.xml.h:9 ../hacks/config/klein.xml.h:16
+msgid "Solid object"
+msgstr "Objet uni"
 
-#: ../hacks/config/hypertorus.xml.h:12 ../hacks/config/klein.xml.h:20
+#: ../hacks/config/hypertorus.xml.h:10 ../hacks/config/klein.xml.h:17
 msgid "See-through bands"
 msgstr "Voir à travers les bandes"
 
-#: ../hacks/config/hypertorus.xml.h:13
+#: ../hacks/config/hypertorus.xml.h:11
 msgid "See-through spirals (1 spiral)"
 msgstr "Voir à travers les spirales (1 spirale)"
 
-#: ../hacks/config/hypertorus.xml.h:14
-msgid "See-through spirals (16 spirals)"
-msgstr "Voir à travers les spirales (16 spirales)"
-
-#: ../hacks/config/hypertorus.xml.h:15
+#: ../hacks/config/hypertorus.xml.h:12
 msgid "See-through spirals (2 spirals)"
 msgstr "Voir à travers les spirales (2 spirales)"
 
-#: ../hacks/config/hypertorus.xml.h:16
+#: ../hacks/config/hypertorus.xml.h:13
 msgid "See-through spirals (4 spirals)"
 msgstr "Voir à travers les spirales (4 spirales)"
 
-#: ../hacks/config/hypertorus.xml.h:17
+#: ../hacks/config/hypertorus.xml.h:14
 msgid "See-through spirals (8 spirals)"
 msgstr "Voir à travers les spirales (8 spirales)"
 
-#: ../hacks/config/hypertorus.xml.h:19 ../hacks/config/klein.xml.h:23
-msgid "Solid object"
+#: ../hacks/config/hypertorus.xml.h:15
+msgid "See-through spirals (16 spirals)"
+msgstr "Voir à travers les spirales (16 spirales)"
+
+#: ../hacks/config/hypertorus.xml.h:16 ../hacks/config/klein.xml.h:18
+msgid "Two-sided"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:20 ../hacks/config/klein.xml.h:24
-#: ../hacks/config/mirrorblob.xml.h:23 ../hacks/config/polytopes.xml.h:21
-msgid "Solid surface"
+#: ../hacks/config/hypertorus.xml.h:17
+msgid "Color wheel"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:21
-msgid ""
-"This shows a rotating Clifford Torus: a torus lying on the \"surface\" of a "
-"4D hypersphere. Inspired by Thomas Banchoff's book \"Beyond the Third "
-"Dimension: Geometry, Computer Graphics, and Higher Dimensions\", Scientific "
-"American Library, 1990. http://en.wikipedia.org/wiki/N-sphere "
-"http://en.wikipedia.org/wiki/Clifford_torus "
-"http://en.wikipedia.org/wiki/Regular_polytope Written by Carsten Steger; "
-"2003."
+#: ../hacks/config/hypertorus.xml.h:18 ../hacks/config/klein.xml.h:21
+#: ../hacks/config/polytopes.xml.h:14
+msgid "Perspective 3D"
+msgstr "Perspective 3D"
+
+#: ../hacks/config/hypertorus.xml.h:19 ../hacks/config/klein.xml.h:22
+#: ../hacks/config/polytopes.xml.h:15
+msgid "Orthographic 3D"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:22 ../hacks/config/klein.xml.h:26
-#: ../hacks/config/polytopes.xml.h:23
-msgid "Transparent surface"
-msgstr "Surface transparente"
+#: ../hacks/config/hypertorus.xml.h:20 ../hacks/config/klein.xml.h:23
+#: ../hacks/config/polytopes.xml.h:16
+msgid "Perspective 4D"
+msgstr "Perspective 4D"
 
-#: ../hacks/config/hypertorus.xml.h:23 ../hacks/config/klein.xml.h:28
-msgid "Two-sided"
+#: ../hacks/config/hypertorus.xml.h:21 ../hacks/config/klein.xml.h:24
+#: ../hacks/config/polytopes.xml.h:17
+msgid "Orthographic 4D"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:24 ../hacks/config/klein.xml.h:29
-#: ../hacks/config/polytopes.xml.h:24
+#: ../hacks/config/hypertorus.xml.h:22 ../hacks/config/klein.xml.h:25
+#: ../hacks/config/polytopes.xml.h:18
+msgid "-4.0"
+msgstr "-4.0"
+
+#: ../hacks/config/hypertorus.xml.h:23 ../hacks/config/klein.xml.h:26
+#: ../hacks/config/polytopes.xml.h:19
 msgid "WX rotation speed"
 msgstr "Vitesse de rotation WX"
 
-#: ../hacks/config/hypertorus.xml.h:25 ../hacks/config/klein.xml.h:30
-#: ../hacks/config/polytopes.xml.h:25
+#: ../hacks/config/hypertorus.xml.h:24 ../hacks/config/klein.xml.h:27
+#: ../hacks/config/polytopes.xml.h:20
+msgid "4.0"
+msgstr "4.0"
+
+#: ../hacks/config/hypertorus.xml.h:25 ../hacks/config/klein.xml.h:28
+#: ../hacks/config/polytopes.xml.h:21
 msgid "WY rotation speed"
 msgstr "Vitesse de rotation WY"
 
-#: ../hacks/config/hypertorus.xml.h:26 ../hacks/config/klein.xml.h:31
-#: ../hacks/config/polytopes.xml.h:26
+#: ../hacks/config/hypertorus.xml.h:26 ../hacks/config/klein.xml.h:29
+#: ../hacks/config/polytopes.xml.h:22
 msgid "WZ rotation speed"
 msgstr "Vitesse de rotation WZ"
 
-#: ../hacks/config/hypertorus.xml.h:27 ../hacks/config/klein.xml.h:36
-#: ../hacks/config/polytopes.xml.h:27
-msgid "Wireframe mesh"
-msgstr ""
-
-#: ../hacks/config/hypertorus.xml.h:28 ../hacks/config/klein.xml.h:37
-#: ../hacks/config/polytopes.xml.h:28
+#: ../hacks/config/hypertorus.xml.h:27 ../hacks/config/klein.xml.h:33
+#: ../hacks/config/polytopes.xml.h:26
 msgid "XY rotation speed"
 msgstr "Vitesse de rotation XY"
 
-#: ../hacks/config/hypertorus.xml.h:29 ../hacks/config/klein.xml.h:38
-#: ../hacks/config/polytopes.xml.h:29
+#: ../hacks/config/hypertorus.xml.h:28 ../hacks/config/klein.xml.h:34
+#: ../hacks/config/polytopes.xml.h:27
 msgid "XZ rotation speed"
 msgstr "Vitesse de rotation XZ"
 
-#: ../hacks/config/hypertorus.xml.h:30 ../hacks/config/klein.xml.h:39
-#: ../hacks/config/polytopes.xml.h:30
+#: ../hacks/config/hypertorus.xml.h:29 ../hacks/config/klein.xml.h:35
+#: ../hacks/config/polytopes.xml.h:28
 msgid "YZ rotation speed"
 msgstr "Vitesse de rotation YZ"
 
-#: ../hacks/config/hypnowheel.xml.h:2 ../hacks/config/ifs.xml.h:1
-msgid "2"
-msgstr "2"
-
-#: ../hacks/config/hypnowheel.xml.h:3 ../hacks/config/intermomentary.xml.h:2
-msgid "50"
-msgstr "50"
-
-#: ../hacks/config/hypnowheel.xml.h:5
+#: ../hacks/config/hypertorus.xml.h:30
 msgid ""
-"Draws a series of overlapping, translucent spiral patterns. The tightness of "
-"their spirals fluctuates in and out. "
-"http://en.wikipedia.org/wiki/Moire_pattern Written by Jamie Zawinski; 2008."
+"This shows a rotating Clifford Torus: a torus lying on the \"surface\" of a "
+"4D hypersphere. Inspired by Thomas Banchoff's book \"Beyond the Third "
+"Dimension: Geometry, Computer Graphics, and Higher Dimensions\", Scientific "
+"American Library, 1990. http://en.wikipedia.org/wiki/N-sphere "
+"http://en.wikipedia.org/wiki/Clifford_torus "
+"http://en.wikipedia.org/wiki/Regular_polytope Written by Carsten Steger; "
+"2003."
 msgstr ""
 
-#: ../hacks/config/hypnowheel.xml.h:9
+#: ../hacks/config/hypnowheel.xml.h:1
 msgid "Hypnowheel"
 msgstr ""
 
-#: ../hacks/config/hypnowheel.xml.h:15
+#: ../hacks/config/hypnowheel.xml.h:7
 msgid "Symmetric twisting"
 msgstr ""
 
-#: ../hacks/config/hypnowheel.xml.h:16
+#: ../hacks/config/hypnowheel.xml.h:11 ../hacks/config/intermomentary.xml.h:5
+msgid "50"
+msgstr "50"
+
+#: ../hacks/config/hypnowheel.xml.h:15
 msgid "Twistiness"
 msgstr ""
 
-#: ../hacks/config/ifs.xml.h:2
-msgid "6"
-msgstr "6"
-
-#: ../hacks/config/ifs.xml.h:3
-msgid "Detail"
-msgstr "Détail"
+#: ../hacks/config/hypnowheel.xml.h:17
+msgid ""
+"Draws a series of overlapping, translucent spiral patterns. The tightness of "
+"their spirals fluctuates in and out. "
+"http://en.wikipedia.org/wiki/Moire_pattern Written by Jamie Zawinski; 2008."
+msgstr ""
 
-#: ../hacks/config/ifs.xml.h:6
+#: ../hacks/config/ifs.xml.h:1
 msgid "IFS"
 msgstr "IFS"
 
-#: ../hacks/config/ifs.xml.h:10
+#: ../hacks/config/ifs.xml.h:24
 msgid "Number of functions"
 msgstr "Nombre de fonctions"
 
-#: ../hacks/config/ifs.xml.h:12
+#: ../hacks/config/ifs.xml.h:25
+msgid "6"
+msgstr "6"
+
+#: ../hacks/config/ifs.xml.h:26
+msgid "Detail"
+msgstr "Détail"
+
+#: ../hacks/config/ifs.xml.h:65
+msgid "Translate"
+msgstr "Translation"
+
+#: ../hacks/config/ifs.xml.h:66
 msgid "Scale"
 msgstr "Échelle"
 
-#: ../hacks/config/ifs.xml.h:14
+#: ../hacks/config/ifs.xml.h:69
 msgid ""
 "This one draws spinning, colliding iterated-function-system images. Note "
 "that the \"Detail\" parameter is exponential. Number of points drawn is "
@@ -5638,35 +5816,31 @@
 "Written by Chris Le Sueur and Robby Griffin; 1997."
 msgstr ""
 
-#: ../hacks/config/ifs.xml.h:15
-msgid "Translate"
-msgstr "Translation"
-
 #: ../hacks/config/imsmap.xml.h:1
-msgid "1 Minute"
-msgstr "1 minute"
+msgid "IMSMap"
+msgstr "IMSMap"
 
-#: ../hacks/config/imsmap.xml.h:2
+#: ../hacks/config/imsmap.xml.h:5
 msgid "1 Second"
 msgstr "1 seconde"
 
-#: ../hacks/config/imsmap.xml.h:3
-msgid "Brightness gradients"
-msgstr ""
+#: ../hacks/config/imsmap.xml.h:7
+msgid "1 Minute"
+msgstr "1 minute"
 
-#: ../hacks/config/imsmap.xml.h:8
+#: ../hacks/config/imsmap.xml.h:15
 msgid "Hue gradients"
 msgstr ""
 
-#: ../hacks/config/imsmap.xml.h:9
-msgid "IMSMap"
+#: ../hacks/config/imsmap.xml.h:16
+msgid "Saturation gradients"
 msgstr ""
 
-#: ../hacks/config/imsmap.xml.h:15
-msgid "Saturation gradients"
+#: ../hacks/config/imsmap.xml.h:17
+msgid "Brightness gradients"
 msgstr ""
 
-#: ../hacks/config/imsmap.xml.h:18
+#: ../hacks/config/imsmap.xml.h:19
 msgid ""
 "This generates random cloud-like patterns. The idea is to take four points "
 "on the edge of the image, and assign each a random \"elevation\". Then find "
@@ -5685,6 +5859,15 @@
 "autres paramètres. Écrit par Juergen Nickelsen et Jamie Zawinski; 1992."
 
 #: ../hacks/config/interaggregate.xml.h:1
+msgid "Interaggregate"
+msgstr "InterAggregate"
+
+#: ../hacks/config/interaggregate.xml.h:6
+#: ../hacks/config/intermomentary.xml.h:6
+msgid "Number of discs"
+msgstr "Nombre de disques"
+
+#: ../hacks/config/interaggregate.xml.h:9
 msgid ""
 "A surface is filled with a hundred medium to small sized circles. Each "
 "circle has a different size and direction, but moves at the same slow rate. "
@@ -5694,50 +5877,45 @@
 "Jamie Zawinski; 2004."
 msgstr ""
 
-#: ../hacks/config/interaggregate.xml.h:5
-msgid "Interaggregate"
-msgstr "InterAggregate"
+#: ../hacks/config/interference.xml.h:1
+msgid "Interference"
+msgstr "Interférences"
 
-#: ../hacks/config/interaggregate.xml.h:8
-#: ../hacks/config/intermomentary.xml.h:8
-msgid "Number of discs"
-msgstr "Nombre de disques"
+#: ../hacks/config/interference.xml.h:9
+msgid "Wave size"
+msgstr "Taille de la vague"
+
+#: ../hacks/config/interference.xml.h:12
+msgid "Number of waves"
+msgstr "Nombre de vagues"
+
+#: ../hacks/config/interference.xml.h:14 ../hacks/config/t3d.xml.h:11
+msgid "Magnification"
+msgstr "Agrandissement"
 
-#: ../hacks/config/interference.xml.h:2
+#: ../hacks/config/interference.xml.h:19
+msgid "Hue"
+msgstr "Teinte"
+
+#: ../hacks/config/interference.xml.h:20
 msgid "360"
 msgstr "360°"
 
-#: ../hacks/config/interference.xml.h:4
+#: ../hacks/config/interference.xml.h:22
 msgid ""
 "Color field based on computing decaying sinusoidal waves. Written by Hannu "
 "Mallat; 1998."
 msgstr ""
 
-#: ../hacks/config/interference.xml.h:9
-msgid "Hue"
-msgstr "Teinte"
-
-#: ../hacks/config/interference.xml.h:10
-msgid "Interference"
-msgstr "Interférences"
-
-#: ../hacks/config/interference.xml.h:13 ../hacks/config/t3d.xml.h:9
-msgid "Magnification"
-msgstr "Agrandissement"
-
-#: ../hacks/config/interference.xml.h:16
-msgid "Number of waves"
-msgstr "Nombre de vagues"
-
-#: ../hacks/config/interference.xml.h:21
-msgid "Wave size"
-msgstr "Taille de la vague"
-
 #: ../hacks/config/intermomentary.xml.h:1
+msgid "Intermomentary"
+msgstr "InterMomentary"
+
+#: ../hacks/config/intermomentary.xml.h:7
 msgid "400"
 msgstr "400"
 
-#: ../hacks/config/intermomentary.xml.h:3
+#: ../hacks/config/intermomentary.xml.h:9
 msgid ""
 "A surface is filled with a hundred medium to small sized circles. Each "
 "circle has a different size and direction, but moves at the same slow rate. "
@@ -5750,68 +5928,72 @@
 "Hodgin, and Jamie Zawinski; 2004."
 msgstr ""
 
-#: ../hacks/config/intermomentary.xml.h:6
-msgid "Intermomentary"
-msgstr "InterMomentary"
+#: ../hacks/config/jigglypuff.xml.h:1
+msgid "JigglyPuff"
+msgstr "JigglyPuff"
 
 #: ../hacks/config/jigglypuff.xml.h:2
-msgid "Clown barf"
-msgstr "Clown retourné"
-
-#: ../hacks/config/jigglypuff.xml.h:3
-msgid "Collapse"
-msgstr ""
-
-#: ../hacks/config/jigglypuff.xml.h:5
-msgid "Cycle"
-msgstr "Cycles"
-
-#: ../hacks/config/jigglypuff.xml.h:6
-msgid "Expand"
+msgid "Randomize almost everything"
 msgstr ""
 
-#: ../hacks/config/jigglypuff.xml.h:8
-msgid "Flower box"
-msgstr "Boîte de fleurs"
-
-#: ../hacks/config/jigglypuff.xml.h:11
+#: ../hacks/config/jigglypuff.xml.h:9
 msgid "Inertial damping"
 msgstr "Atténuation inertielle"
 
+#: ../hacks/config/jigglypuff.xml.h:11
+msgid "Vertex-vertex force"
+msgstr "Force vertex-vertex"
+
 #: ../hacks/config/jigglypuff.xml.h:12
-msgid "JigglyPuff"
-msgstr "JigglyPuff"
+msgid "Strong"
+msgstr ""
+
+#: ../hacks/config/jigglypuff.xml.h:14
+msgid "Sphere strength"
+msgstr "Force des sphères"
 
 #: ../hacks/config/jigglypuff.xml.h:15
-msgid "Randomize almost everything"
+msgid "Expand"
 msgstr ""
 
-#: ../hacks/config/jigglypuff.xml.h:19 ../hacks/config/sphere.xml.h:7
-msgid "Sphere"
-msgstr "Sphère"
+#: ../hacks/config/jigglypuff.xml.h:16
+msgid "Vertex-vertex behavior"
+msgstr "Comportement vertex-vertex"
 
-#: ../hacks/config/jigglypuff.xml.h:20
-msgid "Sphere strength"
-msgstr "Force des sphères"
+#: ../hacks/config/jigglypuff.xml.h:17
+msgid "Collapse"
+msgstr ""
 
-#: ../hacks/config/jigglypuff.xml.h:21
+#: ../hacks/config/jigglypuff.xml.h:18
 msgid "Spookiness"
 msgstr "Niveau de frayeur"
 
-#: ../hacks/config/jigglypuff.xml.h:22
+#: ../hacks/config/jigglypuff.xml.h:19
 msgid "Spoooooky"
 msgstr "Chair de poulesque (!)"
 
-#: ../hacks/config/jigglypuff.xml.h:23
-msgid "Strong"
-msgstr ""
+#: ../hacks/config/jigglypuff.xml.h:20
+msgid "Cycle"
+msgstr "Cycles"
+
+#: ../hacks/config/jigglypuff.xml.h:21
+msgid "Flower box"
+msgstr "Boîte de fleurs"
 
-#: ../hacks/config/jigglypuff.xml.h:24 ../hacks/config/morph3d.xml.h:12
-#: ../hacks/config/polyhedra.xml.h:150 ../hacks/config/sballs.xml.h:15
+#: ../hacks/config/jigglypuff.xml.h:22
+msgid "Clown barf"
+msgstr "Clown retourné"
+
+#: ../hacks/config/jigglypuff.xml.h:24 ../hacks/config/sphere.xml.h:1
+msgid "Sphere"
+msgstr "Sphère"
+
+#: ../hacks/config/jigglypuff.xml.h:25 ../hacks/config/morph3d.xml.h:6
+#: ../hacks/config/polyhedra.xml.h:22 ../hacks/config/sballs.xml.h:6
 msgid "Tetrahedron"
 msgstr "Tétraèdre"
 
-#: ../hacks/config/jigglypuff.xml.h:25
+#: ../hacks/config/jigglypuff.xml.h:28
 msgid ""
 "This does bad things with quasi-spherical objects. You have a tetrahedron "
 "with tesselated faces. The vertices on these faces have forces on them: one "
@@ -5822,19 +6004,7 @@
 "that jiggles in a kind of disturbing manner. Written by Keith Macleod; 2003."
 msgstr ""
 
-#: ../hacks/config/jigglypuff.xml.h:26
-msgid "Vertex-vertex behavior"
-msgstr "Comportement vertex-vertex"
-
-#: ../hacks/config/jigglypuff.xml.h:27
-msgid "Vertex-vertex force"
-msgstr "Force vertex-vertex"
-
 #: ../hacks/config/jigsaw.xml.h:1
-msgid "Chunky"
-msgstr ""
-
-#: ../hacks/config/jigsaw.xml.h:6
 msgid "Jigsaw"
 msgstr "Puzzle"
 
@@ -5842,72 +6012,87 @@
 msgid "Puzzle pieces"
 msgstr "Pièces de puzzle"
 
-#: ../hacks/config/jigsaw.xml.h:15
+#: ../hacks/config/jigsaw.xml.h:11
+msgid "Chunky"
+msgstr ""
+
+#: ../hacks/config/jigsaw.xml.h:14 ../hacks/config/sonar.xml.h:29
+msgid "Tilt"
+msgstr ""
+
+#: ../hacks/config/jigsaw.xml.h:16
 msgid ""
 "This grabs a screen image, carves it up into a jigsaw puzzle, shuffles it, "
 "and then solves the puzzle. http://en.wikipedia.org/wiki/Jigsaw_puzzle "
 "http://en.wikipedia.org/wiki/Tessellation Written by Jamie Zawinski; 1997."
 msgstr ""
 
-#: ../hacks/config/jigsaw.xml.h:16 ../hacks/config/sonar.xml.h:29
-msgid "Tilt"
-msgstr ""
-
-#. <boolean id="torches" _label="Flaming torches" arg-unset="-no-torches"/>
-#: ../hacks/config/juggle.xml.h:2 ../hacks/config/juggler3d.xml.h:3
-msgid "Bowling balls"
-msgstr "Boules de bowling"
-
-#: ../hacks/config/juggle.xml.h:3 ../hacks/config/juggler3d.xml.h:4
-msgid "Clubs"
-msgstr "Massues"
-
-#: ../hacks/config/juggle.xml.h:5
-msgid "Flaming torches"
-msgstr "Torches enflammées"
-
-#: ../hacks/config/juggle.xml.h:8
+#: ../hacks/config/juggle.xml.h:1
 msgid "Juggle"
 msgstr "Jongler"
 
 #: ../hacks/config/juggle.xml.h:9 ../hacks/config/juggler3d.xml.h:9
-msgid "Juggle this pattern"
+msgid "Performance length"
 msgstr ""
 
-#: ../hacks/config/juggle.xml.h:10 ../hacks/config/juggler3d.xml.h:11
+#: ../hacks/config/juggle.xml.h:14 ../hacks/config/juggler3d.xml.h:14
+msgid "Clubs"
+msgstr "Massues"
+
+#: ../hacks/config/juggle.xml.h:15 ../hacks/config/juggler3d.xml.h:15
+msgid "Rings"
+msgstr "Anneaux"
+
+#: ../hacks/config/juggle.xml.h:16 ../hacks/config/juggler3d.xml.h:16
 msgid "Knives"
 msgstr "Couteaux"
 
-#: ../hacks/config/juggle.xml.h:14 ../hacks/config/juggler3d.xml.h:15
-msgid "Performance length"
-msgstr ""
+#: ../hacks/config/juggle.xml.h:17
+msgid "Flaming torches"
+msgstr "Torches enflammées"
+
+#. <boolean id="torches" _label="Flaming torches" arg-unset="-no-torches"/>
+#: ../hacks/config/juggle.xml.h:18 ../hacks/config/juggler3d.xml.h:18
+msgid "Bowling balls"
+msgstr "Boules de bowling"
 
-#: ../hacks/config/juggle.xml.h:15 ../hacks/config/juggler3d.xml.h:16
+#: ../hacks/config/juggle.xml.h:19 ../hacks/config/juggler3d.xml.h:19
 msgid "Print Cambridge juggling pattern descriptions"
 msgstr ""
 
-#: ../hacks/config/juggle.xml.h:16 ../hacks/config/juggler3d.xml.h:17
-msgid "Rings"
-msgstr "Anneaux"
+#: ../hacks/config/juggle.xml.h:20 ../hacks/config/juggler3d.xml.h:20
+msgid "Juggle this pattern"
+msgstr ""
 
-#: ../hacks/config/juggle.xml.h:21
+#: ../hacks/config/juggle.xml.h:22
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.09. It has been replaced by the \"Juggler3D\" screen saver. "
 "http://en.wikipedia.org/wiki/Siteswap Written by Tim Auckland; 2002."
 msgstr ""
 
-#: ../hacks/config/juggler3d.xml.h:5
+#: ../hacks/config/juggler3d.xml.h:1
+msgid "Juggler3D"
+msgstr "Jonglage 3D"
+
+#: ../hacks/config/juggler3d.xml.h:22
 msgid ""
 "Draws a 3D juggling stick-man. http://en.wikipedia.org/wiki/Siteswap Written "
 "by Tim Auckland and Jamie Zawinski; 2002."
 msgstr ""
-
-#: ../hacks/config/juggler3d.xml.h:10
-msgid "Juggler3D"
-msgstr "Jonglage 3D"
+"Dessine un bonhomme en fil de fer qui jongle. "
+"http://fr.wikipedia.org/wiki/Siteswap Écrit par Tim Auckland et Jamie "
+"Zawinski ;2002."
 
 #: ../hacks/config/julia.xml.h:1
+msgid "Julia"
+msgstr "Julia"
+
+#: ../hacks/config/julia.xml.h:9 ../hacks/config/rorschach.xml.h:3
+msgid "Iterations"
+msgstr "Itération"
+
+#: ../hacks/config/julia.xml.h:15
 msgid ""
 "Animates the Julia set (a close relative of the Mandelbrot set). The small "
 "moving dot indicates the control point from which the rest of the image was "
@@ -5915,23 +6100,31 @@
 "http://en.wikipedia.org/wiki/Julia_set Written by Sean McCullough; 1997."
 msgstr ""
 
-#: ../hacks/config/julia.xml.h:6 ../hacks/config/rorschach.xml.h:3
-msgid "Iterations"
-msgstr "Itération"
+#: ../hacks/config/kaleidescope.xml.h:1
+msgid "Kaleidescope"
+msgstr "Kaleïdoscope"
 
-#: ../hacks/config/julia.xml.h:7
-msgid "Julia"
-msgstr "Julia"
+#: ../hacks/config/kaleidescope.xml.h:6 ../hacks/config/qix.xml.h:6
+msgid "Segments"
+msgstr "Segments"
 
-#: ../hacks/config/kaleidescope.xml.h:1
+#: ../hacks/config/kaleidescope.xml.h:8
 msgid "3"
 msgstr "3"
 
-#: ../hacks/config/kaleidescope.xml.h:2
+#: ../hacks/config/kaleidescope.xml.h:9
+msgid "Symmetry"
+msgstr "Symétrie"
+
+#: ../hacks/config/kaleidescope.xml.h:10
 msgid "32"
 msgstr "32"
 
-#: ../hacks/config/kaleidescope.xml.h:3
+#: ../hacks/config/kaleidescope.xml.h:11
+msgid "Trails"
+msgstr "Traînées"
+
+#: ../hacks/config/kaleidescope.xml.h:14
 msgid ""
 "A simple kaleidoscope. See also \"GLeidescope\". "
 "http://en.wikipedia.org/wiki/Kaleidoscope Written by Ron Tapia; 1997."
@@ -5939,92 +6132,76 @@
 "Un simple kaléidoscope. Voir aussi « GLeidescope ». "
 "http://en.wikipedia.org/wiki/Kaleidoscope Écrite par Ron Tapia ; 1997."
 
-#: ../hacks/config/kaleidescope.xml.h:7
-msgid "Kaleidescope"
-msgstr "Kaleïdoscope"
-
-#: ../hacks/config/kaleidescope.xml.h:10 ../hacks/config/qix.xml.h:19
-msgid "Segments"
-msgstr "Segments"
-
-#: ../hacks/config/kaleidescope.xml.h:13
-msgid "Symmetry"
-msgstr "Symétrie"
-
-#: ../hacks/config/kaleidescope.xml.h:14
-msgid "Trails"
-msgstr "Traînées"
-
 #: ../hacks/config/klein.xml.h:1
-msgid "-180.0"
-msgstr "-180.0"
-
-#: ../hacks/config/klein.xml.h:3
-msgid "1.0"
-msgstr "1.0"
-
-#: ../hacks/config/klein.xml.h:4
-msgid "100.0"
-msgstr "100.0"
-
-#: ../hacks/config/klein.xml.h:5
-msgid "180.0"
-msgstr "180.0"
+msgid "Klein"
+msgstr "Bouteille de Klein"
 
 #: ../hacks/config/klein.xml.h:7
-msgid "4d depth colors"
-msgstr ""
+msgid "Figure 8"
+msgstr "Figure 8"
 
 #: ../hacks/config/klein.xml.h:8
-msgid "Figure 8"
-msgstr ""
+msgid "Lawson"
+msgstr "Lawson"
+
+#: ../hacks/config/klein.xml.h:9
+msgid "Walk"
+msgstr "Marcher"
+
+#: ../hacks/config/klein.xml.h:10
+msgid "Turn"
+msgstr "Tourner"
 
 #: ../hacks/config/klein.xml.h:11
-msgid "Klein"
-msgstr "Bouteille de Klein"
+msgid "Walk and turn"
+msgstr "Marcher et tourner"
 
 #: ../hacks/config/klein.xml.h:12
-msgid "Lawson"
+msgid "Show orientation marks"
 msgstr ""
 
-#: ../hacks/config/klein.xml.h:18
+#: ../hacks/config/klein.xml.h:19
 msgid "Rainbow colors"
 msgstr "Couleurs de l'arc-en-ciel"
 
-#: ../hacks/config/klein.xml.h:22
-msgid "Show orientation marks"
+#: ../hacks/config/klein.xml.h:20
+msgid "4d depth colors"
 msgstr ""
 
-#: ../hacks/config/klein.xml.h:25
-msgid ""
-"This shows a 4D Klein bottle. You can walk on the Klein bottle or rotate it "
-"in 4D or walk on it while it rotates in 4D. Inspired by Thomas Banchoff's "
-"book \"Beyond the Third Dimension: Geometry, Computer Graphics, and Higher "
-"Dimensions\", Scientific American Library, 1990. "
-"http://en.wikipedia.org/wiki/Klein_bottle Written by Carsten Steger; 2008."
-msgstr ""
+#: ../hacks/config/klein.xml.h:30
+msgid "-180.0"
+msgstr "-180.0"
 
-#: ../hacks/config/klein.xml.h:27
-msgid "Turn"
-msgstr "Tourner"
+#: ../hacks/config/klein.xml.h:31
+msgid "Walking direction"
+msgstr "Direction de la marche"
 
 #: ../hacks/config/klein.xml.h:32
-msgid "Walk"
-msgstr "Marcher"
-
-#: ../hacks/config/klein.xml.h:33
-msgid "Walk and turn"
-msgstr "Marcher et tourner"
+msgid "180.0"
+msgstr "180.0"
 
-#: ../hacks/config/klein.xml.h:34
-msgid "Walking direction"
-msgstr "Direction de la marche"
+#: ../hacks/config/klein.xml.h:36
+msgid "1.0"
+msgstr "1.0"
 
-#: ../hacks/config/klein.xml.h:35
+#: ../hacks/config/klein.xml.h:37
 msgid "Walking speed"
 msgstr "Vitesse de la marche"
 
-#: ../hacks/config/kumppa.xml.h:4
+#: ../hacks/config/klein.xml.h:38
+msgid "100.0"
+msgstr "100.0"
+
+#: ../hacks/config/klein.xml.h:39
+msgid ""
+"This shows a 4D Klein bottle. You can walk on the Klein bottle or rotate it "
+"in 4D or walk on it while it rotates in 4D. Inspired by Thomas Banchoff's "
+"book \"Beyond the Third Dimension: Geometry, Computer Graphics, and Higher "
+"Dimensions\", Scientific American Library, 1990. "
+"http://en.wikipedia.org/wiki/Klein_bottle Written by Carsten Steger; 2008."
+msgstr ""
+
+#: ../hacks/config/kumppa.xml.h:1
 msgid "Kumppa"
 msgstr "Kumppa"
 
@@ -6040,7 +6217,11 @@
 "Des taches de couleur très, très rapides foncent vers l'écran en tournoyant "
 "et en formant des spirales. Écrit par Teemu Suutari; 1998."
 
-#: ../hacks/config/lament.xml.h:2
+#: ../hacks/config/lament.xml.h:1
+msgid "Lament"
+msgstr "Lamentation"
+
+#: ../hacks/config/lament.xml.h:9
 #, no-c-format
 msgid ""
 "Animates a simulation of Lemarchand's Box, the Lament Configuration, "
@@ -6049,34 +6230,54 @@
 "1998."
 msgstr ""
 
-#: ../hacks/config/lament.xml.h:5
-msgid "Lament"
-msgstr "Lamentation"
-
-#: ../hacks/config/laser.xml.h:5
+#: ../hacks/config/laser.xml.h:1
 msgid "Laser"
 msgstr "Laser"
 
-#: ../hacks/config/laser.xml.h:12
+#: ../hacks/config/laser.xml.h:13
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Moving radiating lines, that look vaguely like scanning laser "
 "beams. (Frankie say relax.) Written by Pascal Pensa; 1997."
 msgstr ""
 
-#: ../hacks/config/lavalite.xml.h:4
+#: ../hacks/config/lavalite.xml.h:1
+msgid "Lavalite"
+msgstr ""
+
+#: ../hacks/config/lavalite.xml.h:9
+msgid "Max blobs"
+msgstr ""
+
+#: ../hacks/config/lavalite.xml.h:12
+msgid "Impatient"
+msgstr "Impatient"
+
+#: ../hacks/config/lavalite.xml.h:17
 msgid "Classic Lavalite"
 msgstr "Lavalite classique"
 
-#: ../hacks/config/lavalite.xml.h:5
+#: ../hacks/config/lavalite.xml.h:18
+msgid "Giant Lavalite"
+msgstr "Lavalite géante"
+
+#: ../hacks/config/lavalite.xml.h:19
 msgid "Cone Lavalite"
 msgstr "Lavalite conique"
 
-#: ../hacks/config/lavalite.xml.h:7
+#: ../hacks/config/lavalite.xml.h:20
+msgid "Rocket Lavalite"
+msgstr "Lavalite roquette"
+
+#: ../hacks/config/lavalite.xml.h:21
+msgid "Random Lamp Style"
+msgstr "Style de lampe aléatoire"
+
+#: ../hacks/config/lavalite.xml.h:22
 msgid "Don't Rotate"
 msgstr "Ne pas pivoter"
 
-#: ../hacks/config/lavalite.xml.h:8
+#: ../hacks/config/lavalite.xml.h:30
 msgid ""
 "Draws a 3D Simulation a Lava Lite(r). Odd-shaped blobs of a mysterious "
 "substance are heated, slowly rise to the top of the bottle, and then drop "
@@ -6089,63 +6290,47 @@
 "http://en.wikipedia.org/wiki/Metaballs Written by Jamie Zawinski; 2002."
 msgstr ""
 
-#: ../hacks/config/lavalite.xml.h:10
-msgid "Giant Lavalite"
-msgstr "Lavalite géante"
-
-#: ../hacks/config/lavalite.xml.h:12
-msgid "Impatient"
-msgstr ""
+#: ../hacks/config/lcdscrub.xml.h:1
+msgid "LCDscrub"
+msgstr "LCDscrub"
 
-#: ../hacks/config/lavalite.xml.h:13
-msgid "Lavalite"
+#: ../hacks/config/lcdscrub.xml.h:5
+msgid "Line spread"
 msgstr ""
 
-#: ../hacks/config/lavalite.xml.h:15
-msgid "Max blobs"
+#: ../hacks/config/lcdscrub.xml.h:8
+msgid "Horizontal white"
 msgstr ""
 
-#: ../hacks/config/lavalite.xml.h:16
-msgid "Random Lamp Style"
-msgstr "Style de lampe aléatoire"
-
-#: ../hacks/config/lavalite.xml.h:18
-msgid "Rocket Lavalite"
-msgstr "Lavalite roquette"
-
-#: ../hacks/config/lcdscrub.xml.h:2
-msgid "Diagonal black"
+#: ../hacks/config/lcdscrub.xml.h:9
+msgid "Vertical white"
 msgstr ""
 
-#: ../hacks/config/lcdscrub.xml.h:3
+#: ../hacks/config/lcdscrub.xml.h:10
 msgid "Diagonal white"
 msgstr ""
 
-#: ../hacks/config/lcdscrub.xml.h:6
-msgid "Horizontal black"
+#: ../hacks/config/lcdscrub.xml.h:11
+msgid "Solid white"
 msgstr ""
 
-#: ../hacks/config/lcdscrub.xml.h:7
-msgid "Horizontal white"
+#: ../hacks/config/lcdscrub.xml.h:12
+msgid "Horizontal black"
 msgstr ""
 
-#: ../hacks/config/lcdscrub.xml.h:8
-msgid "LCDscrub"
+#: ../hacks/config/lcdscrub.xml.h:13
+msgid "Vertical black"
 msgstr ""
 
-#: ../hacks/config/lcdscrub.xml.h:9
-msgid "Line spread"
+#: ../hacks/config/lcdscrub.xml.h:14
+msgid "Diagonal black"
 msgstr ""
 
-#: ../hacks/config/lcdscrub.xml.h:12
+#: ../hacks/config/lcdscrub.xml.h:15
 msgid "Solid black"
 msgstr ""
 
-#: ../hacks/config/lcdscrub.xml.h:13
-msgid "Solid white"
-msgstr ""
-
-#: ../hacks/config/lcdscrub.xml.h:14
+#: ../hacks/config/lcdscrub.xml.h:16
 msgid ""
 "This screen saver is not meant to look pretty, but rather, to repair burn-in "
 "on LCD monitors. Believe it or not, screen burn is not a thing of the past. "
@@ -6157,45 +6342,43 @@
 "program by Daniel Sandler. Written by Jamie Zawinski; 2008."
 msgstr ""
 
-#: ../hacks/config/lcdscrub.xml.h:15
-msgid "Vertical black"
-msgstr ""
-
-#: ../hacks/config/lcdscrub.xml.h:16
-msgid "Vertical white"
-msgstr ""
-
-#: ../hacks/config/lightning.xml.h:3
+#: ../hacks/config/lightning.xml.h:1
 msgid "Lightning"
 msgstr "Éclairs"
 
-#: ../hacks/config/lightning.xml.h:8
+#: ../hacks/config/lightning.xml.h:9
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Crackling fractal lightning bolts. Written by Keith Romberg; "
 "1997."
 msgstr ""
+"Cet écran de veille a été retiré de la distribution de XScreenSaver depuis "
+"la version 5.08. Des éclairs de fractales qui crépitent. Écrit par Keith "
+"Romberg ; 1997."
 
-#: ../hacks/config/lisa.xml.h:8
+#: ../hacks/config/lisa.xml.h:1
 msgid "Lisa"
 msgstr "Lisa"
 
-#: ../hacks/config/lisa.xml.h:15
+#: ../hacks/config/lisa.xml.h:6
 msgid "Steps"
 msgstr "Étapes"
 
-#: ../hacks/config/lisa.xml.h:16
+#: ../hacks/config/lisa.xml.h:17
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Lissajous loops. http://en.wikipedia.org/wiki/Lissajous_curve "
 "Written by Caleb Cullen; 1997."
 msgstr ""
+"Cet écran de veille a été retiré de la distribution de XScreenSaver depuis "
+"la version 5.08. Courbes de Lissajous. "
+"http://en.wikipedia.org/wiki/Lissajous_curve Écrit par Caleb Cullen ; 1997."
 
-#: ../hacks/config/lissie.xml.h:7
+#: ../hacks/config/lissie.xml.h:1
 msgid "Lissie"
 msgstr "Lissajous"
 
-#: ../hacks/config/lissie.xml.h:14
+#: ../hacks/config/lissie.xml.h:16
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Lissajous loops. This one draws the progress of circular "
@@ -6204,36 +6387,36 @@
 msgstr ""
 
 #: ../hacks/config/lmorph.xml.h:1
-msgid "Closed figures"
-msgstr ""
-
-#: ../hacks/config/lmorph.xml.h:2
-msgid "Control points"
-msgstr ""
+msgid "LMorph"
+msgstr "LMorph"
 
 #: ../hacks/config/lmorph.xml.h:6
-msgid "Interpolation steps"
+msgid "Control points"
 msgstr ""
 
-#: ../hacks/config/lmorph.xml.h:7
-msgid "LMorph"
-msgstr "LMorph"
-
 #: ../hacks/config/lmorph.xml.h:8
 msgid "Less"
 msgstr "Moins"
 
-#: ../hacks/config/lmorph.xml.h:12
+#: ../hacks/config/lmorph.xml.h:9
+msgid "Interpolation steps"
+msgstr "Étapes d’interpolation"
+
+#: ../hacks/config/lmorph.xml.h:10
 msgid "More"
 msgstr "Plus"
 
-#: ../hacks/config/lmorph.xml.h:13
+#: ../hacks/config/lmorph.xml.h:14
 msgid "Open and closed figures"
-msgstr ""
+msgstr "Figures ouvertes et fermées"
 
-#: ../hacks/config/lmorph.xml.h:14
+#: ../hacks/config/lmorph.xml.h:15
 msgid "Open figures"
-msgstr ""
+msgstr "Figures ouvertes"
+
+#: ../hacks/config/lmorph.xml.h:16
+msgid "Closed figures"
+msgstr "Figures fermées"
 
 #: ../hacks/config/lmorph.xml.h:18
 msgid ""
@@ -6243,65 +6426,69 @@
 msgstr ""
 
 #: ../hacks/config/lockward.xml.h:1
-msgid ""
-"A translucent spinning, blinking thing. Sort of a cross between the wards in "
-"an old combination lock and those old backlit information displays that "
-"animated and changed color via polarized light. Written by Leo L. Schwab; "
-"2007."
+msgid "Lockward"
 msgstr ""
 
-#: ../hacks/config/lockward.xml.h:2
-msgid "Blinking effects"
-msgstr "Effets de clignotement"
-
 #: ../hacks/config/lockward.xml.h:5
-msgid "Lockward"
+msgid "Miniumum rotator idle time"
+msgstr ""
+
+#: ../hacks/config/lockward.xml.h:6
+msgid "Minimum blink idle time"
 msgstr ""
 
 #: ../hacks/config/lockward.xml.h:7
-msgid "Maximum blink dwell time"
+msgid "Minimum blink dwell time"
 msgstr ""
 
 #: ../hacks/config/lockward.xml.h:8
-msgid "Maximum blink idle time"
-msgstr ""
-
-#: ../hacks/config/lockward.xml.h:9
-msgid "Maximum rotator idle time"
-msgstr ""
+msgid "Blinking effects"
+msgstr "Effets de clignotement"
 
 #: ../hacks/config/lockward.xml.h:10
-msgid "Minimum blink dwell time"
+msgid "Maximum rotator idle time"
 msgstr ""
 
 #: ../hacks/config/lockward.xml.h:11
-msgid "Minimum blink idle time"
+msgid "Maximum blink idle time"
 msgstr ""
 
 #: ../hacks/config/lockward.xml.h:12
-msgid "Miniumum rotator idle time"
+msgid "Maximum blink dwell time"
 msgstr ""
 
-#: ../hacks/config/loop.xml.h:3
-#, no-c-format
+#: ../hacks/config/lockward.xml.h:13
 msgid ""
-"Generates loop-shaped colonies that spawn, age, and eventually die. "
-"http://en.wikipedia.org/wiki/Langton%27s_loops Written by David Bagley; 1999."
+"A translucent spinning, blinking thing. Sort of a cross between the wards in "
+"an old combination lock and those old backlit information displays that "
+"animated and changed color via polarized light. Written by Leo L. Schwab; "
+"2007."
 msgstr ""
 
-#: ../hacks/config/loop.xml.h:6
+#: ../hacks/config/loop.xml.h:1
 msgid "Loop"
 msgstr "Boucles"
 
-#: ../hacks/config/m6502.xml.h:3
-msgid "Assembly file"
+#: ../hacks/config/loop.xml.h:14
+#, no-c-format
+msgid ""
+"Generates loop-shaped colonies that spawn, age, and eventually die. "
+"http://en.wikipedia.org/wiki/Langton%27s_loops Written by David Bagley; 1999."
 msgstr ""
 
-#: ../hacks/config/m6502.xml.h:4
+#: ../hacks/config/m6502.xml.h:1
+msgid "m6502"
+msgstr "m6502"
+
+#: ../hacks/config/m6502.xml.h:3
 msgid "Display time for each program"
-msgstr ""
+msgstr "Temps d'affichage pour chaque programme"
+
+#: ../hacks/config/m6502.xml.h:5
+msgid "Assembly file"
+msgstr "Fichier d'assemblage"
 
-#: ../hacks/config/m6502.xml.h:6
+#: ../hacks/config/m6502.xml.h:7
 msgid ""
 "This emulates a 6502 microprocessor. The family of 6502 chips were used "
 "throughout the 70's and 80's in machines such as the Atari 2600, Commodore "
@@ -6312,47 +6499,47 @@
 "2007."
 msgstr ""
 
-#: ../hacks/config/m6502.xml.h:7
-msgid "m6502"
-msgstr "m6502"
-
-#: ../hacks/config/maze.xml.h:3
-msgid "Depth-first backtracking maze generator"
-msgstr ""
-
-#: ../hacks/config/maze.xml.h:5
-msgid "Grid size"
-msgstr ""
+#: ../hacks/config/maze.xml.h:1
+msgid "Maze"
+msgstr "Labyrinthe"
 
 #: ../hacks/config/maze.xml.h:6
-msgid "Head toward exit"
+msgid "Linger before solving"
 msgstr ""
 
 #: ../hacks/config/maze.xml.h:8
-msgid "Ignorant of exit direction"
+msgid "Linger after solving"
 msgstr ""
 
 #: ../hacks/config/maze.xml.h:9
-msgid "Linger after solving"
-msgstr ""
+msgid "Grid size"
+msgstr "Taille de la grille"
 
 #: ../hacks/config/maze.xml.h:10
-msgid "Linger before solving"
+msgid "Random maze generator"
+msgstr "Générateur de labyrinthe aléatoire"
+
+#: ../hacks/config/maze.xml.h:11
+msgid "Depth-first backtracking maze generator"
 msgstr ""
 
 #: ../hacks/config/maze.xml.h:12
-msgid "Maze"
-msgstr "Labyrinthe"
+msgid "Wall-building maze generator (Prim)"
+msgstr ""
 
 #: ../hacks/config/maze.xml.h:13
-msgid "Random maze generator"
-msgstr "Générateur de labyrinthe aléatoire"
+msgid "Set-joining maze generator (Kruskal)"
+msgstr ""
 
 #: ../hacks/config/maze.xml.h:14
-msgid "Set-joining maze generator (Kruskal)"
+msgid "Head toward exit"
+msgstr ""
+
+#: ../hacks/config/maze.xml.h:15
+msgid "Ignorant of exit direction"
 msgstr ""
 
-#: ../hacks/config/maze.xml.h:16
+#: ../hacks/config/maze.xml.h:17
 msgid ""
 "This generates random mazes (with three different maze-generation "
 "algorithms), and then solves them. Backtracking and look-ahead paths are "
@@ -6362,29 +6549,25 @@
 "Weinberg; 1985."
 msgstr ""
 
-#: ../hacks/config/maze.xml.h:17
-msgid "Wall-building maze generator (Prim)"
-msgstr ""
-
 #: ../hacks/config/memscroller.xml.h:1
-msgid "Draw green"
-msgstr ""
+msgid "MemScroller"
+msgstr "MemScroller"
 
-#: ../hacks/config/memscroller.xml.h:2
-msgid "Draw in RGB"
-msgstr "Dessiner en RVB"
+#: ../hacks/config/memscroller.xml.h:5
+msgid "Dump memory"
+msgstr ""
 
-#: ../hacks/config/memscroller.xml.h:3
+#: ../hacks/config/memscroller.xml.h:6
 msgid "Draw random numbers"
 msgstr ""
 
-#: ../hacks/config/memscroller.xml.h:4
-msgid "Dump memory"
-msgstr ""
+#: ../hacks/config/memscroller.xml.h:7
+msgid "Draw in RGB"
+msgstr "Dessiner en RVB"
 
 #: ../hacks/config/memscroller.xml.h:8
-msgid "MemScroller"
-msgstr "MemScroller"
+msgid "Draw green"
+msgstr ""
 
 #: ../hacks/config/memscroller.xml.h:10
 msgid ""
@@ -6392,15 +6575,15 @@
 "three windows at three different rates. Written by Jamie Zawinski; 2004."
 msgstr ""
 
-#: ../hacks/config/menger.xml.h:7 ../hacks/config/sierpinski3d.xml.h:6
-msgid "Max depth"
-msgstr ""
-
-#: ../hacks/config/menger.xml.h:8
+#: ../hacks/config/menger.xml.h:1
 msgid "Menger"
 msgstr "Menger"
 
-#: ../hacks/config/menger.xml.h:18
+#: ../hacks/config/menger.xml.h:8 ../hacks/config/sierpinski3d.xml.h:8
+msgid "Max depth"
+msgstr "Profondeur maximale"
+
+#: ../hacks/config/menger.xml.h:21
 msgid ""
 "This draws the three-dimensional variant of the recursive Menger Gasket, a "
 "cube-based fractal object analagous to the Sierpinski Tetrahedron. "
@@ -6409,108 +6592,113 @@
 "2001."
 msgstr ""
 
-#: ../hacks/config/metaballs.xml.h:2
-msgid ""
-"Draws two dimensional metaballs: overlapping and merging balls with fuzzy "
-"edges. http://en.wikipedia.org/wiki/Metaballs Written by W.P. van Paassen; "
-"2003."
-msgstr ""
+#: ../hacks/config/metaballs.xml.h:1
+msgid "MetaBalls"
+msgstr "Méta-balles"
 
-#: ../hacks/config/metaballs.xml.h:9
-msgid "MetaBall Movement"
-msgstr "Mouvement des méta-balles"
+#: ../hacks/config/metaballs.xml.h:11
+msgid "Metaball count"
+msgstr "Nombre de meta boules"
 
-#: ../hacks/config/metaballs.xml.h:10
+#: ../hacks/config/metaballs.xml.h:13
 msgid "MetaBall Radius"
 msgstr "Rayon des méta-balles"
 
-#: ../hacks/config/metaballs.xml.h:11
-msgid "MetaBalls"
-msgstr "Méta-balles"
+#: ../hacks/config/metaballs.xml.h:15
+msgid "MetaBall Movement"
+msgstr "Mouvement des méta-balles"
 
-#: ../hacks/config/metaballs.xml.h:12
-msgid "Metaball count"
+#: ../hacks/config/metaballs.xml.h:17
+msgid ""
+"Draws two dimensional metaballs: overlapping and merging balls with fuzzy "
+"edges. http://en.wikipedia.org/wiki/Metaballs Written by W.P. van Paassen; "
+"2003."
 msgstr ""
 
 #: ../hacks/config/mirrorblob.xml.h:1
+msgid "MirrorBlob"
+msgstr "Gouttes miroir"
+
+#: ../hacks/config/mirrorblob.xml.h:5
 msgid "0.1x"
 msgstr "0.1x"
 
-#: ../hacks/config/mirrorblob.xml.h:2
+#: ../hacks/config/mirrorblob.xml.h:7
 msgid "3.0x"
 msgstr "3.0x"
 
-#: ../hacks/config/mirrorblob.xml.h:3 ../hacks/config/timetunnel.xml.h:2
-msgid "30 sec"
-msgstr "30 secondes"
+#: ../hacks/config/mirrorblob.xml.h:8
+msgid "5 sec"
+msgstr "5 sec"
 
-#: ../hacks/config/mirrorblob.xml.h:4
+#: ../hacks/config/mirrorblob.xml.h:10
 msgid "5 min"
 msgstr "5 min"
 
-#: ../hacks/config/mirrorblob.xml.h:5
-msgid "5 sec"
-msgstr "5 sec"
+#: ../hacks/config/mirrorblob.xml.h:12
+msgid "Transition duration"
+msgstr "Durée de la transition"
+
+#: ../hacks/config/mirrorblob.xml.h:13 ../hacks/config/timetunnel.xml.h:4
+msgid "30 sec"
+msgstr "30 secondes"
 
-#: ../hacks/config/mirrorblob.xml.h:6
+#: ../hacks/config/mirrorblob.xml.h:16
 msgid "50 bumps"
 msgstr ""
 
-#: ../hacks/config/mirrorblob.xml.h:8
+#: ../hacks/config/mirrorblob.xml.h:17
 msgid "Clear"
 msgstr "Effacer"
 
-#: ../hacks/config/mirrorblob.xml.h:9
-msgid ""
-"Draws a wobbly blob that distorts the image behind it. Written by Jon "
-"Dowdall; 2003."
-msgstr ""
+#: ../hacks/config/mirrorblob.xml.h:19 ../hacks/config/webcollage.xml.h:10
+msgid "Opaque"
+msgstr "Opaque"
 
-#: ../hacks/config/mirrorblob.xml.h:10
+#: ../hacks/config/mirrorblob.xml.h:20
+msgid "Enable walls"
+msgstr "Activer les murs"
+
+#: ../hacks/config/mirrorblob.xml.h:21
 msgid "Enable colouring"
 msgstr "Activer la coloration"
 
-#: ../hacks/config/mirrorblob.xml.h:11
+#: ../hacks/config/mirrorblob.xml.h:22
 msgid "Enable reflected image"
-msgstr ""
-
-#: ../hacks/config/mirrorblob.xml.h:12
-msgid "Enable walls"
-msgstr "Activer les murs"
+msgstr "Activer la réflexion d'image"
 
-#: ../hacks/config/mirrorblob.xml.h:16
-msgid "MirrorBlob"
-msgstr "Gouttes miroir"
+#: ../hacks/config/mirrorblob.xml.h:23
+msgid "Show image on background"
+msgstr "Afficher l'image sur l'arrière plan"
 
-#: ../hacks/config/mirrorblob.xml.h:18
+#: ../hacks/config/mirrorblob.xml.h:24
 msgid "Offset texture coordinates"
 msgstr ""
 
-#: ../hacks/config/mirrorblob.xml.h:19 ../hacks/config/webcollage.xml.h:8
-msgid "Opaque"
-msgstr "Opaque"
-
-#: ../hacks/config/mirrorblob.xml.h:22
-msgid "Show image on background"
-msgstr "Afficher l'image sur l'arrière plan"
-
-#: ../hacks/config/mirrorblob.xml.h:25
-msgid "Transition duration"
-msgstr "Durée de la transition"
+#: ../hacks/config/mirrorblob.xml.h:28
+msgid ""
+"Draws a wobbly blob that distorts the image behind it. Written by Jon "
+"Dowdall; 2003."
+msgstr ""
 
-#: ../hacks/config/mismunch.xml.h:7
+#: ../hacks/config/mismunch.xml.h:1
 msgid "Mismunch"
 msgstr "MisMunch"
 
-#: ../hacks/config/mismunch.xml.h:11 ../hacks/config/munch.xml.h:15
+#: ../hacks/config/mismunch.xml.h:9 ../hacks/config/munch.xml.h:9
 msgid "Simultaneous squares"
-msgstr ""
+msgstr "Carrés simultanés"
+
+#: ../hacks/config/mismunch.xml.h:11 ../hacks/config/munch.xml.h:14
+#: ../hacks/config/qix.xml.h:22
+msgid "XOR"
+msgstr "XOR"
 
-#: ../hacks/config/mismunch.xml.h:12 ../hacks/config/munch.xml.h:16
+#: ../hacks/config/mismunch.xml.h:12 ../hacks/config/munch.xml.h:15
 msgid "Solid"
 msgstr "Plein"
 
-#: ../hacks/config/mismunch.xml.h:13
+#: ../hacks/config/mismunch.xml.h:14
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. It was merged with the \"Munch\" screen saver. Munching "
@@ -6520,22 +6708,17 @@
 "http://en.wikipedia.org/wiki/Munching_square Written by Steven Hazel; 2004."
 msgstr ""
 
-#: ../hacks/config/mismunch.xml.h:14 ../hacks/config/munch.xml.h:17
-#: ../hacks/config/qix.xml.h:25
-msgid "XOR"
-msgstr "XOR"
-
 #: ../hacks/config/moebius.xml.h:1
-msgid "Draw ants"
-msgstr "Dessiner des fourmis"
-
-#: ../hacks/config/moebius.xml.h:5
 msgid "Moebius"
 msgstr "Moebius"
 
-#: ../hacks/config/moebius.xml.h:7
+#: ../hacks/config/moebius.xml.h:5
 msgid "Solid floor"
-msgstr ""
+msgstr "Sol uni"
+
+#: ../hacks/config/moebius.xml.h:6
+msgid "Draw ants"
+msgstr "Dessiner des fourmis"
 
 #: ../hacks/config/moebius.xml.h:8
 msgid ""
@@ -6547,30 +6730,30 @@
 msgstr ""
 
 #: ../hacks/config/moebiusgears.xml.h:1
-msgid ""
-"Draws a closed, interlinked chain of rotating gears. The layout of the gears "
-"follows the path of a moebius strip. See also the \"Pinion\" and \"Gears\" "
-"screen savers. http://en.wikipedia.org/wiki/Involute_gear "
-"http://en.wikipedia.org/wiki/Moebius_strip Written by Jamie Zawinski; 2007."
-msgstr ""
-
-#: ../hacks/config/moebiusgears.xml.h:6
 msgid "MoebiusGears"
 msgstr "Rouages de Möbius"
 
-#: ../hacks/config/moebiusgears.xml.h:7
+#: ../hacks/config/moebiusgears.xml.h:8
 msgid "Number of gears"
 msgstr "Nombre de roues"
 
-#: ../hacks/config/moebiusgears.xml.h:8
+#: ../hacks/config/moebiusgears.xml.h:9
 msgid "Number of teeth"
 msgstr "Nombre de dents"
 
-#: ../hacks/config/moire.xml.h:6
+#: ../hacks/config/moebiusgears.xml.h:15
+msgid ""
+"Draws a closed, interlinked chain of rotating gears. The layout of the gears "
+"follows the path of a moebius strip. See also the \"Pinion\" and \"Gears\" "
+"screen savers. http://en.wikipedia.org/wiki/Involute_gear "
+"http://en.wikipedia.org/wiki/Moebius_strip Written by Jamie Zawinski; 2007."
+msgstr ""
+
+#: ../hacks/config/moire.xml.h:1
 msgid "Moire"
 msgstr "Moiré"
 
-#: ../hacks/config/moire.xml.h:8 ../hacks/config/rorschach.xml.h:6
+#: ../hacks/config/moire.xml.h:9 ../hacks/config/rorschach.xml.h:5
 msgid "Offset"
 msgstr "Décalage"
 
@@ -6581,7 +6764,11 @@
 "Michael Bayne; 1997."
 msgstr ""
 
-#: ../hacks/config/moire2.xml.h:2
+#: ../hacks/config/moire2.xml.h:1
+msgid "Moire2"
+msgstr "Moiré2"
+
+#: ../hacks/config/moire2.xml.h:10
 msgid ""
 "Generates fields of concentric circles or ovals, and combines the planes "
 "with various operations. The planes are moving independently of one another, "
@@ -6589,27 +6776,35 @@
 "http://en.wikipedia.org/wiki/Moire_pattern Written by Jamie Zawinski; 1998."
 msgstr ""
 
-#: ../hacks/config/moire2.xml.h:6
-msgid "Moire2"
-msgstr "Moiré2"
+#: ../hacks/config/molecule.xml.h:1
+msgid "Molecule"
+msgstr "Molécule"
+
+#: ../hacks/config/molecule.xml.h:8
+msgid "Label atoms"
+msgstr "Nommer les atomes"
 
-#: ../hacks/config/molecule.xml.h:3
+#: ../hacks/config/molecule.xml.h:9
 msgid "Describe molecule"
 msgstr "Décrire la molécule"
 
-#: ../hacks/config/molecule.xml.h:5
-msgid "Draw atomic bonds"
-msgstr "Dessine les liaisons atomiques"
-
-#: ../hacks/config/molecule.xml.h:6
+#: ../hacks/config/molecule.xml.h:12
 msgid "Draw atomic nuclei"
 msgstr "Dessine les nucléons atomiques"
 
-#: ../hacks/config/molecule.xml.h:8
+#: ../hacks/config/molecule.xml.h:13
+msgid "Draw atomic bonds"
+msgstr "Dessine les liaisons atomiques"
+
+#: ../hacks/config/molecule.xml.h:14
 msgid "Draw electron shells"
 msgstr ""
 
-#: ../hacks/config/molecule.xml.h:10
+#: ../hacks/config/molecule.xml.h:25
+msgid "PDB file or directory"
+msgstr "Dossier ou fichier PDB"
+
+#: ../hacks/config/molecule.xml.h:27
 #, no-c-format
 msgid ""
 "Draws several different representations of molecules. Some common molecules "
@@ -6618,63 +6813,67 @@
 "Jamie Zawinski; 2001."
 msgstr ""
 
-#: ../hacks/config/molecule.xml.h:14
-msgid "Label atoms"
-msgstr "Nommer les atomes"
-
-#: ../hacks/config/molecule.xml.h:16
-msgid "Molecule"
-msgstr "Molécule"
-
-#: ../hacks/config/molecule.xml.h:17
-msgid "PDB file or directory"
-msgstr "Dossier ou fichier PDB"
+#: ../hacks/config/morph3d.xml.h:1
+msgid "Morph3D"
+msgstr "Morph3D"
 
-#: ../hacks/config/morph3d.xml.h:1 ../hacks/config/polyhedra.xml.h:3
-#: ../hacks/config/sballs.xml.h:1
+#: ../hacks/config/morph3d.xml.h:7 ../hacks/config/polyhedra.xml.h:30
+#: ../hacks/config/sballs.xml.h:7
 msgid "Cube"
 msgstr "Cube"
 
-#: ../hacks/config/morph3d.xml.h:2 ../hacks/config/polyhedra.xml.h:14
-#: ../hacks/config/sballs.xml.h:2
+#: ../hacks/config/morph3d.xml.h:8 ../hacks/config/polyhedra.xml.h:29
+#: ../hacks/config/sballs.xml.h:8
+msgid "Octahedron"
+msgstr "Octaèdre"
+
+#: ../hacks/config/morph3d.xml.h:9 ../hacks/config/polyhedra.xml.h:62
+#: ../hacks/config/sballs.xml.h:9
 msgid "Dodecahedron"
 msgstr "Dodécaèdre"
 
-#: ../hacks/config/morph3d.xml.h:5 ../hacks/config/polyhedra.xml.h:72
-#: ../hacks/config/sballs.xml.h:6
+#: ../hacks/config/morph3d.xml.h:10 ../hacks/config/polyhedra.xml.h:61
+#: ../hacks/config/sballs.xml.h:10
 msgid "Icosahedron"
 msgstr "Icosaèdre"
 
-#: ../hacks/config/morph3d.xml.h:7
-msgid "Morph3D"
-msgstr "Morph3D"
-
-#: ../hacks/config/morph3d.xml.h:8 ../hacks/config/polyhedra.xml.h:86
-#: ../hacks/config/sballs.xml.h:8
-msgid "Octahedron"
-msgstr "Octaèdre"
-
-#: ../hacks/config/morph3d.xml.h:9
+#: ../hacks/config/morph3d.xml.h:12
 msgid ""
 "Platonic solids that turn inside out and get spikey. "
 "http://en.wikipedia.org/wiki/Platonic_solid Written by Marcelo Vianna; 1997."
 msgstr ""
 
-#: ../hacks/config/mountain.xml.h:2
-msgid ""
-"Generates random 3D plots that look vaguely mountainous. Written by Pascal "
-"Pensa; 1997."
-msgstr ""
-
-#: ../hacks/config/mountain.xml.h:7
+#: ../hacks/config/mountain.xml.h:1
 msgid "Mountain"
 msgstr "Montagnes"
 
-#: ../hacks/config/mountain.xml.h:10
+#: ../hacks/config/mountain.xml.h:6
 msgid "Peaks"
 msgstr "Sommets"
 
+#: ../hacks/config/mountain.xml.h:12
+msgid ""
+"Generates random 3D plots that look vaguely mountainous. Written by Pascal "
+"Pensa; 1997."
+msgstr ""
+
 #: ../hacks/config/munch.xml.h:1
+msgid "Munch"
+msgstr "Munch"
+
+#: ../hacks/config/munch.xml.h:11
+msgid "Munch or mismunch"
+msgstr ""
+
+#: ../hacks/config/munch.xml.h:12
+msgid "Munch only"
+msgstr ""
+
+#: ../hacks/config/munch.xml.h:13
+msgid "Mismunch only"
+msgstr ""
+
+#: ../hacks/config/munch.xml.h:17
 msgid ""
 "DATAI 2 ADDB 1,2 ROTC 2,-22 XOR 1,2 JRST .-4 As reported by HAKMEM (MIT AI "
 "Memo 239, 1972), Jackson Wright wrote the above PDP-1 code in 1962. That "
@@ -6685,44 +6884,48 @@
 "Showalter, Jamie Zawinski and Steven Hazel; 1997."
 msgstr ""
 
-#: ../hacks/config/munch.xml.h:8
-msgid "Mismunch only"
-msgstr ""
+#: ../hacks/config/nerverot.xml.h:1
+msgid "NerveRot"
+msgstr "NerveRot"
 
-#: ../hacks/config/munch.xml.h:9
-msgid "Munch"
-msgstr "Munch"
+#: ../hacks/config/nerverot.xml.h:9
+msgid "Blot count"
+msgstr "Nombre de nuées"
 
-#: ../hacks/config/munch.xml.h:10
-msgid "Munch only"
-msgstr ""
+#: ../hacks/config/nerverot.xml.h:12 ../hacks/config/topblock.xml.h:14
+msgid "Colors"
+msgstr "Couleurs"
 
-#: ../hacks/config/munch.xml.h:11
-msgid "Munch or mismunch"
-msgstr ""
+#: ../hacks/config/nerverot.xml.h:13 ../hacks/config/pyro.xml.h:8
+msgid "Seldom"
+msgstr "Rare"
 
-#: ../hacks/config/nerverot.xml.h:1
-msgid "Blot count"
-msgstr "Nombre de nuées"
+#: ../hacks/config/nerverot.xml.h:14
+msgid "Changes"
+msgstr "Changement"
+
+#: ../hacks/config/nerverot.xml.h:15
+msgid "Frequent"
+msgstr "Fréquent"
 
-#: ../hacks/config/nerverot.xml.h:2
+#: ../hacks/config/nerverot.xml.h:16
 msgid "Calm"
 msgstr "Calme"
 
-#: ../hacks/config/nerverot.xml.h:3
-msgid "Changes"
-msgstr "Changement"
+#: ../hacks/config/nerverot.xml.h:17
+msgid "Nervousness"
+msgstr "Nervosité"
 
-#: ../hacks/config/nerverot.xml.h:4 ../hacks/config/topblock.xml.h:4
-msgid "Colors"
-msgstr "Couleurs"
+#: ../hacks/config/nerverot.xml.h:18
+msgid "Spastic"
+msgstr "Spasmodique"
 
-#: ../hacks/config/nerverot.xml.h:5
+#: ../hacks/config/nerverot.xml.h:19
 msgid "Crunchiness"
 msgstr ""
 
 #. #### -max-radius [25]
-#: ../hacks/config/nerverot.xml.h:7
+#: ../hacks/config/nerverot.xml.h:23
 msgid ""
 "Draws different shapes composed of nervously vibrating squiggles, as if seen "
 "through a camera operated by a monkey on crack. Written by Dan Bornstein; "
@@ -6732,38 +6935,22 @@
 "s'ils étaient filmés par un singe sous amphétamines. Écrit par Dan "
 "Bornstein; 200."
 
-#: ../hacks/config/nerverot.xml.h:11
-msgid "Frequent"
-msgstr "Fréquent"
-
-#: ../hacks/config/nerverot.xml.h:17
-msgid "NerveRot"
-msgstr "NerveRot"
-
-#: ../hacks/config/nerverot.xml.h:18
-msgid "Nervousness"
-msgstr "Nervosité"
-
-#: ../hacks/config/nerverot.xml.h:19 ../hacks/config/pyro.xml.h:12
-msgid "Seldom"
-msgstr "Rare"
-
-#: ../hacks/config/nerverot.xml.h:22
-msgid "Spastic"
-msgstr "Spasmodique"
-
 #: ../hacks/config/noof.xml.h:1
+msgid "Noof"
+msgstr "Noof"
+
+#: ../hacks/config/noof.xml.h:6
 msgid ""
 "Draws some rotatey patterns, using OpenGL. Written by Bill Torzewski; 2004."
 msgstr ""
 "Dessine des motifs en rotation, utilise OpenGL. Écrit par Bill Torzewski ; "
 "2004."
 
-#: ../hacks/config/noof.xml.h:5
-msgid "Noof"
-msgstr "Noof"
-
 #: ../hacks/config/noseguy.xml.h:1
+msgid "NoseGuy"
+msgstr ""
+
+#: ../hacks/config/noseguy.xml.h:3
 msgid ""
 "A little man with a big nose wanders around your screen saying things. "
 "Written by Dan Heller and Jamie Zawinski; 1992."
@@ -6771,11 +6958,7 @@
 "Un petit bonhomme avec un gros nez se promène sur l'écran en disant des "
 "choses. Écrit par Dan Heller et Jamie Zawinski; 1992."
 
-#: ../hacks/config/noseguy.xml.h:2
-msgid "NoseGuy"
-msgstr ""
-
-#: ../hacks/config/pacman.xml.h:4
+#: ../hacks/config/pacman.xml.h:1
 msgid "Pacman"
 msgstr "Pacman"
 
@@ -6791,7 +6974,7 @@
 "Simule un jeu de Pac-Man sur un niveau créé au hasard. "
 "http://en.wikipedia.org/wiki/Pac-Man Écrit par Edwin de Jong ; 2004."
 
-#: ../hacks/config/pedal.xml.h:7
+#: ../hacks/config/pedal.xml.h:1
 msgid "Pedal"
 msgstr "Pédale"
 
@@ -6806,18 +6989,22 @@
 "Dale Moore; 1995."
 
 #: ../hacks/config/penetrate.xml.h:1
-msgid "Always play well"
-msgstr "Toujours bien jouer"
+msgid "Penetrate"
+msgstr "Pénétrer"
 
-#: ../hacks/config/penetrate.xml.h:2
+#: ../hacks/config/penetrate.xml.h:3
 msgid "Explosions"
 msgstr "Explosions"
 
-#: ../hacks/config/penetrate.xml.h:5
-msgid "Penetrate"
-msgstr "Pénétrer"
+#: ../hacks/config/penetrate.xml.h:6
+msgid "Start badly, but learn"
+msgstr "Mal commencer, mais apprendre"
 
 #: ../hacks/config/penetrate.xml.h:7
+msgid "Always play well"
+msgstr "Toujours bien jouer"
+
+#: ../hacks/config/penetrate.xml.h:9
 msgid ""
 "Simulates (something like) the classic arcade game Missile Command. "
 "http://en.wikipedia.org/wiki/Missile_Command Written by Adam Miller; 1999."
@@ -6826,15 +7013,19 @@
 "« Missile Command ». http://en.wikipedia.org/wiki/Missile_Command Écrit par "
 "Adam Miller ; 1999."
 
-#: ../hacks/config/penetrate.xml.h:9
-msgid "Start badly, but learn"
-msgstr "Mal commencer, mais apprendre"
-
 #: ../hacks/config/penrose.xml.h:1
+msgid "Penrose"
+msgstr "Penrose"
+
+#: ../hacks/config/penrose.xml.h:9 ../hacks/config/twang.xml.h:15
+msgid "Tile size"
+msgstr "Taille de la tuile"
+
+#: ../hacks/config/penrose.xml.h:11
 msgid "Draw ammann lines"
 msgstr "Dessine des lignes d'Ammann"
 
-#: ../hacks/config/penrose.xml.h:2
+#: ../hacks/config/penrose.xml.h:13
 msgid ""
 "Draws quasiperiodic tilings; think of the implications on modern formica "
 "technology. In April 1997, Sir Roger Penrose, a British math professor who "
@@ -6850,77 +7041,69 @@
 "http://en.wikipedia.org/wiki/Penrose_tiling Written by Timo Korvola; 1997."
 msgstr ""
 
-#: ../hacks/config/penrose.xml.h:9
-msgid "Penrose"
-msgstr "Penrose"
+#: ../hacks/config/petri.xml.h:1
+msgid "Petri"
+msgstr "Petri"
 
-#: ../hacks/config/penrose.xml.h:12 ../hacks/config/twang.xml.h:17
-msgid "Tile size"
-msgstr "Taille de la tuile"
+#: ../hacks/config/petri.xml.h:7
+msgid "Mold varieties"
+msgstr "Variétés des organismes"
+
+#: ../hacks/config/petri.xml.h:8
+msgid "Square"
+msgstr "Carré"
 
-#: ../hacks/config/petri.xml.h:2
+#: ../hacks/config/petri.xml.h:9
 msgid "Colony shape"
 msgstr "Forme de la Colonie"
 
-#: ../hacks/config/petri.xml.h:3
-msgid "Death comes"
-msgstr "La mort arrive"
-
-#: ../hacks/config/petri.xml.h:4
+#: ../hacks/config/petri.xml.h:10
 msgid "Diamond"
 msgstr "Diamant"
 
-#: ../hacks/config/petri.xml.h:6
+#: ../hacks/config/petri.xml.h:11
 msgid "Fertility"
 msgstr "Fertilité"
 
 #: ../hacks/config/petri.xml.h:13
-msgid "Maximum lifespan"
-msgstr "Durée de vie maximale"
-
-#: ../hacks/config/petri.xml.h:14
-msgid "Maximum rate of death"
-msgstr "Taux de mortalité maximum"
+msgid "Offspring"
+msgstr "Progéniture"
 
 #: ../hacks/config/petri.xml.h:15
-msgid "Maximum rate of growth"
-msgstr "Taux de croissance maximum"
+msgid "Slowly"
+msgstr "Lentement"
 
 #: ../hacks/config/petri.xml.h:16
-msgid "Minimum lifespan"
-msgstr "Durée de vie minimale"
+msgid "Death comes"
+msgstr "La mort arrive"
 
 #: ../hacks/config/petri.xml.h:17
-msgid "Minimum rate of death"
-msgstr "Taux de mortalité minimum"
+msgid "Quickly"
+msgstr "Rapidement"
 
-#: ../hacks/config/petri.xml.h:18
+#: ../hacks/config/petri.xml.h:19
 msgid "Minimum rate of growth"
 msgstr "Taux de croissance minimum"
 
-#: ../hacks/config/petri.xml.h:19
-msgid "Mold varieties"
-msgstr "Variétés des organismes"
-
-#: ../hacks/config/petri.xml.h:20
-msgid "Offspring"
-msgstr "Progéniture"
-
 #: ../hacks/config/petri.xml.h:21
-msgid "Petri"
-msgstr "Petri"
+msgid "Maximum rate of growth"
+msgstr "Taux de croissance maximum"
 
 #: ../hacks/config/petri.xml.h:22
-msgid "Quickly"
-msgstr "Rapidement"
+msgid "Minimum rate of death"
+msgstr "Taux de mortalité minimum"
 
-#: ../hacks/config/petri.xml.h:26
-msgid "Slowly"
-msgstr "Lentement"
+#: ../hacks/config/petri.xml.h:23
+msgid "Maximum rate of death"
+msgstr "Taux de mortalité maximum"
+
+#: ../hacks/config/petri.xml.h:25
+msgid "Minimum lifespan"
+msgstr "Durée de vie minimale"
 
 #: ../hacks/config/petri.xml.h:27
-msgid "Square"
-msgstr "Carré"
+msgid "Maximum lifespan"
+msgstr "Durée de vie maximale"
 
 #. #### -mem-throttle [22M]
 #: ../hacks/config/petri.xml.h:29
@@ -6934,77 +7117,75 @@
 "spirale à leur suite. Écrit par Dan Bornstein; 1999."
 
 #: ../hacks/config/phosphor.xml.h:1
+msgid "Phosphor"
+msgstr "Phosphore"
+
+#: ../hacks/config/phosphor.xml.h:5
+msgid "Font scale"
+msgstr "Échelle de la police"
+
+#: ../hacks/config/phosphor.xml.h:10
 msgid ""
 "Draws a simulation of an old terminal, with large pixels and long-sustain "
-"phosphor. On X11 systems, This program is also a fully-functional VT100 "
-"emulator! Written by Jamie Zawinski; 1999."
+"phosphor. This program is also a fully-functional VT100 emulator! Run it as "
+"an application instead of as a screen saver and you can use it as a "
+"terminal. Written by Jamie Zawinski; 1999."
 msgstr ""
-"Simule un vieux terminal avec de grands pixels et un effet de rémanence "
-"Fluorescente. Sur les systèmes X11 ce programme est aussi un émulateur VT100 "
-"complet. Écrit par Jamie Zawinski ; 1999."
 
-#: ../hacks/config/phosphor.xml.h:4
-msgid "Font scale"
-msgstr "Échelle de la police"
+#: ../hacks/config/photopile.xml.h:1
+msgid "Photopile"
+msgstr ""
 
-#: ../hacks/config/phosphor.xml.h:8
-msgid "Phosphor"
-msgstr "Phosphore"
+#: ../hacks/config/photopile.xml.h:3
+msgid "Image size"
+msgstr "Taille de l'image"
 
-#: ../hacks/config/photopile.xml.h:1 ../hacks/config/t3d.xml.h:1
+#: ../hacks/config/photopile.xml.h:5 ../hacks/config/t3d.xml.h:5
 msgid "0 deg"
 msgstr "0°"
 
-#: ../hacks/config/photopile.xml.h:2 ../hacks/config/t3d.xml.h:3
+#: ../hacks/config/photopile.xml.h:6
+msgid "Maximum angle from vertical"
+msgstr "Angle vertical maximum"
+
+#: ../hacks/config/photopile.xml.h:7 ../hacks/config/t3d.xml.h:7
 msgid "90 deg"
 msgstr "90°"
 
-#: ../hacks/config/photopile.xml.h:4
+#: ../hacks/config/photopile.xml.h:9
+msgid "Simulate instant film"
+msgstr ""
+
+#: ../hacks/config/photopile.xml.h:10
 msgid "Clip images"
 msgstr ""
 
-#: ../hacks/config/photopile.xml.h:5
+#: ../hacks/config/photopile.xml.h:11
 msgid "Draw drop shadows"
 msgstr ""
 
-#: ../hacks/config/photopile.xml.h:9
-msgid "Image size"
-msgstr "Taille de l'image"
-
-#: ../hacks/config/photopile.xml.h:11
+#: ../hacks/config/photopile.xml.h:23
 msgid ""
 "Loads several random images, and displays them as if lying in a random pile. "
 "The pile is periodically reshuffled, with new images coming in and old ones "
 "being thrown out. Written by Jens Kilian; 2008."
 msgstr ""
 
-#: ../hacks/config/photopile.xml.h:14
-msgid "Maximum angle from vertical"
-msgstr "Angle vertical maximum"
-
-#: ../hacks/config/photopile.xml.h:16
-msgid "Photopile"
-msgstr ""
-
-#: ../hacks/config/photopile.xml.h:20
-msgid "Simulate instant film"
-msgstr ""
-
 #: ../hacks/config/piecewise.xml.h:1
+msgid "Piecewise"
+msgstr "Piecewise"
+
+#: ../hacks/config/piecewise.xml.h:9
 msgid "Color shift"
 msgstr ""
 
-#: ../hacks/config/piecewise.xml.h:10
-msgid "Maximum radius"
-msgstr "Rayon max."
-
-#: ../hacks/config/piecewise.xml.h:11
+#: ../hacks/config/piecewise.xml.h:12
 msgid "Minimum radius"
 msgstr "Rayon min."
 
-#: ../hacks/config/piecewise.xml.h:12
-msgid "Piecewise"
-msgstr "Piecewise"
+#: ../hacks/config/piecewise.xml.h:14
+msgid "Maximum radius"
+msgstr "Rayon max."
 
 #: ../hacks/config/piecewise.xml.h:16
 msgid ""
@@ -7015,702 +7196,703 @@
 "aux points d'intersection. Écrit par Geoffrey Irving ; 2003."
 
 #: ../hacks/config/pinion.xml.h:1
+msgid "Pinion"
+msgstr "Pinion"
+
+#: ../hacks/config/pinion.xml.h:8
+msgid "Scrolling speed"
+msgstr "Vitesse de défilement"
+
+#: ../hacks/config/pinion.xml.h:10
+msgid "Gear size"
+msgstr "Taille de l'engrenage"
+
+#: ../hacks/config/pinion.xml.h:12
 msgid "100"
 msgstr "100"
 
-#: ../hacks/config/pinion.xml.h:2
+#: ../hacks/config/pinion.xml.h:13
+msgid "Max RPM"
+msgstr "Vitesse max."
+
+#: ../hacks/config/pinion.xml.h:14
 msgid "2000"
 msgstr "2000"
 
-#: ../hacks/config/pinion.xml.h:3
+#: ../hacks/config/pinion.xml.h:17
 msgid ""
 "Draws an interconnected set of gears moving across the screen. See also the "
 "\"Gears\" and \"MoebiusGears\" screen savers. "
 "http://en.wikipedia.org/wiki/Involute_gear Written by Jamie Zawinski; 2004."
 msgstr ""
 
-#: ../hacks/config/pinion.xml.h:6
-msgid "Gear size"
-msgstr "Taille de l'engrenage"
+#: ../hacks/config/pipes.xml.h:1
+msgid "Pipes"
+msgstr "Canalisations"
 
-#: ../hacks/config/pinion.xml.h:10
-msgid "Max RPM"
-msgstr "Vitesse max."
+#: ../hacks/config/pipes.xml.h:6
+msgid "Number of pipes"
+msgstr "Nombre de tuyaux"
 
-#: ../hacks/config/pinion.xml.h:11
-msgid "Pinion"
-msgstr "Pinion"
+#: ../hacks/config/pipes.xml.h:7
+msgid "A hundred"
+msgstr "Une centaine"
 
-#: ../hacks/config/pinion.xml.h:13
-msgid "Scrolling speed"
-msgstr "Vitesse de défilement"
+#: ../hacks/config/pipes.xml.h:9
+msgid "Pipe length"
+msgstr "Longueur des tuyaux"
 
-#: ../hacks/config/pipes.xml.h:1
-msgid ""
-"A growing plumbing system, with bolts and valves. Written by Marcelo Vianna; "
-"1997."
-msgstr ""
-"Un système de plomberie qui grossit, avec des verrous et des valves. Écrit "
-"par Marcelo Vianna ; 1997."
+#: ../hacks/config/pipes.xml.h:12
+msgid "Gadgetry"
+msgstr "Gadgets"
 
-#: ../hacks/config/pipes.xml.h:2
-msgid "A hundred"
-msgstr "Une centaine"
+#: ../hacks/config/pipes.xml.h:14
+msgid "Fisheye lens"
+msgstr "Lentille fisheye"
 
-#: ../hacks/config/pipes.xml.h:3
+#: ../hacks/config/pipes.xml.h:15
 msgid "Allow tight turns"
 msgstr "Permettre des virages serrés"
 
-#: ../hacks/config/pipes.xml.h:4
-msgid "Ball joints"
-msgstr ""
-
-#: ../hacks/config/pipes.xml.h:5
-msgid "Bolted fittings"
-msgstr ""
-
-#: ../hacks/config/pipes.xml.h:6
+#: ../hacks/config/pipes.xml.h:16
 msgid "Curved pipes"
 msgstr "Tuyaux courbes"
 
-#: ../hacks/config/pipes.xml.h:7
-msgid "Fisheye lens"
-msgstr "Lentille fisheye"
-
-#: ../hacks/config/pipes.xml.h:9
-msgid "Gadgetry"
-msgstr "Gadgets"
-
-#: ../hacks/config/pipes.xml.h:15
-msgid "Number of pipes"
-msgstr "Nombre de tuyaux"
-
 #: ../hacks/config/pipes.xml.h:17
-msgid "Pipe length"
-msgstr "Longueur des tuyaux"
-
-#: ../hacks/config/pipes.xml.h:18
-msgid "Pipes"
-msgstr "Canalisations"
-
-#: ../hacks/config/polyhedra.xml.h:4
-msgid "Cubitruncated cuboctahedron"
+msgid "Ball joints"
 msgstr ""
 
-#: ../hacks/config/polyhedra.xml.h:5
-msgid "Cuboctahedron"
-msgstr "Cuboctaèdre"
-
-#: ../hacks/config/polyhedra.xml.h:6
-msgid "Cubohemioctahedron"
-msgstr "Cubohémioctaèdre"
-
-#: ../hacks/config/polyhedra.xml.h:7
-msgid "Deltoidal hexecontahedron"
+#: ../hacks/config/pipes.xml.h:18
+msgid "Bolted fittings"
 msgstr ""
 
-#: ../hacks/config/polyhedra.xml.h:8
-msgid "Deltoidal icositetrahedron"
+#: ../hacks/config/pipes.xml.h:20
+msgid ""
+"A growing plumbing system, with bolts and valves. Written by Marcelo Vianna; "
+"1997."
 msgstr ""
+"Un système de plomberie qui grossit, avec des verrous et des valves. Écrit "
+"par Marcelo Vianna ; 1997."
 
-#: ../hacks/config/polyhedra.xml.h:9
-msgid "Disdyakisdodecahedron"
-msgstr "Disdyakisdodécaèdre"
-
-#: ../hacks/config/polyhedra.xml.h:10
-msgid "Disdyakistriacontahedron"
-msgstr "Hexaki icosaèdre"
+#: ../hacks/config/polyhedra.xml.h:1
+msgid "Polyhedra"
+msgstr "Polyèdre"
 
 #: ../hacks/config/polyhedra.xml.h:11
 msgid "Display random polyhedron"
 msgstr "Afficher des polyèdres aléatoires"
 
 #: ../hacks/config/polyhedra.xml.h:12
-msgid ""
-"Displays different 3D solids and some information about each. A new solid is "
-"chosen every few seconds. There are 75 uniform polyhedra, plus 5 infinite "
-"sets of prisms and antiprisms; including their duals brings the total to "
-"160. http://en.wikipedia.org/wiki/Uniform_polyhedra Written by Dr. Zvi "
-"Har'El and Jamie Zawinski; 2004."
-msgstr ""
+msgid "Pentagonal prism"
+msgstr "Prisme pentagonal"
 
 #: ../hacks/config/polyhedra.xml.h:13
-msgid "Ditrigonal dodecadodecahedron"
-msgstr ""
+msgid "Pentagonal dipyramid"
+msgstr "Dipyramide pentagonale"
+
+#: ../hacks/config/polyhedra.xml.h:14
+msgid "Pentagonal antiprism"
+msgstr "Antiprisme pentagonal"
+
+#: ../hacks/config/polyhedra.xml.h:15
+msgid "Pentagonal deltohedron"
+msgstr "Deltaèdre pentagonal"
+
+#: ../hacks/config/polyhedra.xml.h:16
+msgid "Pentagrammic prism"
+msgstr "Prisme pentagrammique"
+
+#: ../hacks/config/polyhedra.xml.h:17
+msgid "Pentagrammic dipyramid"
+msgstr "Dipyramide pentagrammique"
 
 #: ../hacks/config/polyhedra.xml.h:18
-msgid "Great cubicuboctahedron"
-msgstr ""
+msgid "Pentagrammic antiprism"
+msgstr "Antiprisme pentagrammique"
 
 #: ../hacks/config/polyhedra.xml.h:19
-msgid "Great deltoidal hexecontahedron"
-msgstr ""
+msgid "Pentagrammic deltohedron"
+msgstr "Deltaèdre pentagrammique"
 
 #: ../hacks/config/polyhedra.xml.h:20
-msgid "Great deltoidal icositetrahedron"
-msgstr ""
+msgid "Pentagrammic crossed antiprism"
+msgstr "Antiprisme pentagrammique croisé"
 
 #: ../hacks/config/polyhedra.xml.h:21
-msgid "Great dirhombicosidodecacron"
-msgstr ""
-
-#: ../hacks/config/polyhedra.xml.h:22
-msgid "Great dirhombicosidodecahedron"
-msgstr ""
+msgid "Pentagrammic concave deltohedron"
+msgstr "Deltaèdre pentagrammique concave"
 
 #: ../hacks/config/polyhedra.xml.h:23
-msgid "Great disdyakisdodecahedron"
-msgstr "Grand disdyakisdodécaèdre"
+msgid "Truncated tetrahedron"
+msgstr "Tétraèdre tronqué"
 
 #: ../hacks/config/polyhedra.xml.h:24
-msgid "Great disdyakistriacontahedron"
-msgstr "Grand disdyakistriacontaèdre"
+msgid "Triakistetrahedron"
+msgstr "Triaki-tétraèdre"
 
 #: ../hacks/config/polyhedra.xml.h:25
-msgid "Great ditrigonal dodecacronic hexecontahedron"
-msgstr "Grand hexacontaèdre ditrigonal dodécagonique"
+msgid "Octahemioctahedron"
+msgstr "Octahémioctaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:26
-msgid "Great ditrigonal dodecicosidodecahedron"
-msgstr "Grand dodécicosidodécaèdre ditrigonal"
+msgid "Octahemioctacron"
+msgstr "Octahémioctagone"
 
 #: ../hacks/config/polyhedra.xml.h:27
-msgid "Great ditrigonal icosidodecahedron"
-msgstr "Grand icosidodécaèdre ditrigonal"
+msgid "Tetrahemihexahedron"
+msgstr "Tétrahémihexaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:28
-msgid "Great dodecacronic hexecontahedron"
-msgstr "Grand hexacontaèdre dodécagonique"
-
-#: ../hacks/config/polyhedra.xml.h:29
-msgid "Great dodecadodecahedron"
-msgstr "Grand dodécadodécaèdre"
-
-#: ../hacks/config/polyhedra.xml.h:30
-msgid "Great dodecahedron"
-msgstr "Grand dodécaèdre"
+msgid "Tetrahemihexacron"
+msgstr "Tetrahémihexagone"
 
 #: ../hacks/config/polyhedra.xml.h:31
-msgid "Great dodecahemicosacron"
-msgstr "Grand dodécahémicosagone"
+msgid "Cuboctahedron"
+msgstr "Cuboctaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:32
-msgid "Great dodecahemicosahedron"
-msgstr "Grand dodécahémicosaèdre"
+msgid "Rhombic dodecahedron"
+msgstr "Dodécaèdre rhombique"
 
 #: ../hacks/config/polyhedra.xml.h:33
-msgid "Great dodecahemidodecacron"
-msgstr "Grand dodécahémidodécagone"
+msgid "Truncated octahedron"
+msgstr "Octaèdre tronqué"
 
 #: ../hacks/config/polyhedra.xml.h:34
-msgid "Great dodecahemidodecahedron"
-msgstr "Grand dodécahémidodécaèdre"
+msgid "Tetrakishexahedron"
+msgstr "Tetraki-hexaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:35
-msgid "Great dodecicosacron"
-msgstr "Grand dodécicosagone"
+msgid "Truncated cube"
+msgstr "Cube tronqué"
 
 #: ../hacks/config/polyhedra.xml.h:36
-msgid "Great dodecicosahedron"
-msgstr "Grand dodécicosaèdre"
+msgid "Triakisoctahedron"
+msgstr "Triaki-octaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:37
-msgid "Great dodecicosidodecahedron"
-msgstr "Grand dodécicosidodécaèdre"
+msgid "Rhombicuboctahedron"
+msgstr "Rhombicuboctaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:38
-msgid "Great hexacronic icositetrahedron"
-msgstr "Grand icositétraèdre hexagonique"
+msgid "Deltoidal icositetrahedron"
+msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:39
-msgid "Great hexagonal hexecontahedron"
-msgstr "Grand hexacontaèdre hexagonal"
+msgid "Truncated cuboctahedron"
+msgstr "Cuboctaèdre tronqué"
 
 #: ../hacks/config/polyhedra.xml.h:40
-msgid "Great icosacronic hexecontahedron"
-msgstr "Grand hexacontaèdre icosagonique"
+msgid "Disdyakisdodecahedron"
+msgstr "Disdyakisdodécaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:41
-msgid "Great icosahedron"
-msgstr "Grand isocaèdre"
+msgid "Snub cube"
+msgstr "Cube retroussé"
 
 #: ../hacks/config/polyhedra.xml.h:42
-msgid "Great icosicosidodecahedron"
-msgstr "Grand icosicosidodécaèdre"
+msgid "Pentagonal icositetrahedron"
+msgstr "Icositétrahèdre pentagonal"
 
 #: ../hacks/config/polyhedra.xml.h:43
-msgid "Great icosidodecahedron"
-msgstr "Grand icosidodécaèdre"
+msgid "Small cubicuboctahedron"
+msgstr "Petit cubicuboctaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:44
-msgid "Great icosihemidodecacron"
-msgstr "Grand icosihémidodécagone"
+msgid "Small hexacronic icositetrahedron"
+msgstr "Petit icositétraèdre hexagonique"
 
 #: ../hacks/config/polyhedra.xml.h:45
-msgid "Great icosihemidodecahedron"
-msgstr "Grand icosihémidodécaèdre"
+msgid "Great cubicuboctahedron"
+msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:46
-msgid "Great inverted pentagonal hexecontahedron"
-msgstr "Grand hexacontaèdre pentagonal inversé"
+msgid "Great hexacronic icositetrahedron"
+msgstr "Grand icositétraèdre hexagonique"
 
 #: ../hacks/config/polyhedra.xml.h:47
-msgid "Great inverted snub icosidodecahedron"
-msgstr "Grand icosidodécaèdre retroussé inversé"
+msgid "Cubohemioctahedron"
+msgstr "Cubohémioctaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:48
-msgid "Great pentagonal hexecontahedron"
-msgstr "Grand hexacontaèdre pentagonal"
+msgid "Hexahemioctacron"
+msgstr "Hexahémioctagone"
 
 #: ../hacks/config/polyhedra.xml.h:49
-msgid "Great pentagrammic hexecontahedron"
-msgstr "Grand hexacontaèdre pentagrammique"
+msgid "Cubitruncated cuboctahedron"
+msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:50
-msgid "Great pentakisdodekahedron"
-msgstr "Grand pentakidodécaèdre"
+msgid "Tetradyakishexahedron"
+msgstr "Tetradyakishexahèdre"
 
 #: ../hacks/config/polyhedra.xml.h:51
-msgid "Great retrosnub icosidodecahedron"
-msgstr "Grand retro-retroussé icosidodécaèdre"
+msgid "Great rhombicuboctahedron"
+msgstr "Grand rhombicuboctaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:52
-msgid "Great rhombic triacontahedron"
-msgstr "Grand triacontaèdre rhombique"
+msgid "Great deltoidal icositetrahedron"
+msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:53
-msgid "Great rhombicosidodecahedron"
-msgstr "Grand rhombicosidodécaèdre"
+msgid "Small rhombihexahedron"
+msgstr "Petit rhombihexaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:54
-msgid "Great rhombicuboctahedron"
-msgstr "Grand rhombicuboctaèdre"
+msgid "Small rhombihexacron"
+msgstr "Petit rhombihexagone"
 
 #: ../hacks/config/polyhedra.xml.h:55
-msgid "Great rhombidodecacron"
-msgstr "Grand rhombidodécagone"
+msgid "Stellated truncated hexahedron"
+msgstr "Hexaèdre étoilé tronqué"
 
 #: ../hacks/config/polyhedra.xml.h:56
-msgid "Great rhombidodecahedron"
-msgstr "Grand rhombidodécaèdre"
+msgid "Great triakisoctahedron"
+msgstr "Grand triakisoctahèdre"
 
 #: ../hacks/config/polyhedra.xml.h:57
-msgid "Great rhombihexacron"
-msgstr "Grand rhombihexagone"
+msgid "Great truncated cuboctahedron"
+msgstr "Grand cuboctaèdre tronqué"
 
 #: ../hacks/config/polyhedra.xml.h:58
-msgid "Great rhombihexahedron"
-msgstr "Grand rhombihexaèdre"
+msgid "Great disdyakisdodecahedron"
+msgstr "Grand disdyakisdodécaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:59
-msgid "Great snub dodecicosidodecahedron"
-msgstr "Grand dodécicosidodécaèdre retroussé"
+msgid "Great rhombihexahedron"
+msgstr "Grand rhombihexaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:60
-msgid "Great snub icosidodecahedron"
-msgstr "Grand icosidodécaèdre retroussé"
-
-#: ../hacks/config/polyhedra.xml.h:61
-msgid "Great stellapentakisdodecahedron"
-msgstr "Grand stellapentakisdodécaèdre"
-
-#: ../hacks/config/polyhedra.xml.h:62
-msgid "Great stellated dodecahedron"
-msgstr "Grand dodécaèdre étoilé"
+msgid "Great rhombihexacron"
+msgstr "Grand rhombihexagone"
 
 #: ../hacks/config/polyhedra.xml.h:63
-msgid "Great stellated truncated dodecahedron"
-msgstr "Grand dodécaèdre étoilé tronqué"
+msgid "Icosidodecahedron"
+msgstr "Icosidodécaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:64
-msgid "Great triakisicosahedron"
-msgstr "Grand triakisicosahèdre"
+msgid "Rhombic triacontahedron"
+msgstr "Triacontaèdre rhombique"
 
 #: ../hacks/config/polyhedra.xml.h:65
-msgid "Great triakisoctahedron"
-msgstr "Grand triakisoctahèdre"
+msgid "Truncated icosahedron"
+msgstr "Icosaèdre tronqué"
 
 #: ../hacks/config/polyhedra.xml.h:66
-msgid "Great triambic icosahedron"
-msgstr "Grand isocaèdre triambique"
+msgid "Pentakisdodecahedron"
+msgstr "Pentaki-dodécaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:67
-msgid "Great truncated cuboctahedron"
-msgstr "Grand cuboctaèdre tronqué"
+msgid "Truncated dodecahedron"
+msgstr "Dodécaèdre tronqué"
 
 #: ../hacks/config/polyhedra.xml.h:68
-msgid "Great truncated icosahedron"
-msgstr "Grand isocaèdre tronqué"
+msgid "Triakisicosahedron"
+msgstr "Triaki-icosaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:69
-msgid "Great truncated icosidodecahedron"
-msgstr "Grand icosidodécaèdre tronqué"
+msgid "Rhombicosidodecahedron"
+msgstr "Rhombicosidodécaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:70
-msgid "Hexahemioctacron"
-msgstr "Hexahémioctagone"
+msgid "Deltoidal hexecontahedron"
+msgstr ""
+
+#: ../hacks/config/polyhedra.xml.h:71
+msgid "Truncated icosidodecahedron"
+msgstr ""
+
+#: ../hacks/config/polyhedra.xml.h:72
+msgid "Disdyakistriacontahedron"
+msgstr "Hexaki icosaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:73
-msgid "Icosidodecadodecahedron"
-msgstr "Icosidodécadodécahèdre"
+msgid "Snub dodecahedron"
+msgstr "Dodécagone retroussé"
 
 #: ../hacks/config/polyhedra.xml.h:74
-msgid "Icosidodecahedron"
-msgstr "Icosidodécaèdre"
+msgid "Pentagonal hexecontahedron"
+msgstr "Hexacontaèdre pentagonal"
 
 #: ../hacks/config/polyhedra.xml.h:75
-msgid "Icositruncated dodecadodecahedron"
-msgstr "Dodécadodécaèdre icosi-tronqué"
+msgid "Small ditrigonal icosidodecahedron"
+msgstr "Petit icosidodécaèdre ditrigonal"
 
 #: ../hacks/config/polyhedra.xml.h:76
-msgid "Inverted snub dodecadodecahedron"
-msgstr "Dodécadodécaèdre retroussé inversé"
+msgid "Small triambic icosahedron"
+msgstr "Petit icosaèdre triambique"
+
+#: ../hacks/config/polyhedra.xml.h:77
+msgid "Small icosicosidodecahedron"
+msgstr "Petit icosicosidodécaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:78
-msgid "Medial deltoidal hexecontahedron"
-msgstr "Hexacontaèdre deltoïde médian"
+msgid "Small icosacronic hexecontahedron"
+msgstr "Petit hexacontaèdre icosagonique"
 
 #: ../hacks/config/polyhedra.xml.h:79
-msgid "Medial disdyakistriacontahedron"
-msgstr "Disdyakistriacontaèdre médian"
+msgid "Small snub icosicosidodecahedron"
+msgstr "Petit icosicosidodécaèdre retroussé"
 
 #: ../hacks/config/polyhedra.xml.h:80
-msgid "Medial hexagonal hexecontahedron"
-msgstr "Hexacontaèdre hexagonal médian"
+msgid "Small hexagonal hexecontahedron"
+msgstr "Petit hexacontaèdre hexagonal"
 
 #: ../hacks/config/polyhedra.xml.h:81
-msgid "Medial icosacronic hexecontahedron"
-msgstr "Hexacontaèdre icosagonique médian"
+msgid "Small dodecicosidodecahedron"
+msgstr "Petit dodécicosidodécaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:82
-msgid "Medial inverted pentagonal hexecontahedron"
-msgstr "Hexacontaèdre pentagonal inversé médian"
+msgid "Small dodecacronic hexecontahedron"
+msgstr "Petit hexacontaèdre dodécagonique"
 
 #: ../hacks/config/polyhedra.xml.h:83
-msgid "Medial pentagonal hexecontahedron"
-msgstr "Hexacontaèdre pentagonal médian"
+msgid "Small stellated dodecahedron"
+msgstr "Petit dodécaèdre étoilé"
 
 #: ../hacks/config/polyhedra.xml.h:84
-msgid "Medial rhombic triacontahedron"
-msgstr "Triacontaèdre rhombique médian"
+msgid "Great dodecahedron"
+msgstr "Grand dodécaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:85
-msgid "Medial triambic icosahedron"
-msgstr "Isocaèdre triambique médian"
+msgid "Great dodecadodecahedron"
+msgstr "Grand dodécadodécaèdre"
+
+#: ../hacks/config/polyhedra.xml.h:86
+msgid "Medial rhombic triacontahedron"
+msgstr "Triacontaèdre rhombique médian"
 
 #: ../hacks/config/polyhedra.xml.h:87
-msgid "Octahemioctacron"
-msgstr "Octahémioctagone"
+msgid "Truncated great dodecahedron"
+msgstr "Grand dodécaèdre tronqué"
 
 #: ../hacks/config/polyhedra.xml.h:88
-msgid "Octahemioctahedron"
-msgstr "Octahémioctaèdre"
+msgid "Small stellapentakisdodecahedron"
+msgstr "Petit stellapentakisdodécaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:89
-msgid "Pentagonal antiprism"
-msgstr "Antiprisme pentagonal"
+msgid "Rhombidodecadodecahedron"
+msgstr "Rhombidodecadodécaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:90
-msgid "Pentagonal deltohedron"
-msgstr "Deltaèdre pentagonal"
+msgid "Medial deltoidal hexecontahedron"
+msgstr "Hexacontaèdre deltoïde médian"
 
 #: ../hacks/config/polyhedra.xml.h:91
-msgid "Pentagonal dipyramid"
-msgstr "Dipyramide pentagonale"
+msgid "Small rhombidodecahedron"
+msgstr "Petit rhombidodécaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:92
-msgid "Pentagonal hexecontahedron"
-msgstr "Hexacontaèdre pentagonal"
+msgid "Small rhombidodecacron"
+msgstr "Petit rhombidodécagone"
 
 #: ../hacks/config/polyhedra.xml.h:93
-msgid "Pentagonal icositetrahedron"
-msgstr "Icositétrahèdre pentagonal"
+msgid "Snub dodecadodecahedron"
+msgstr "Dodécadodécaèdre retroussé"
 
 #: ../hacks/config/polyhedra.xml.h:94
-msgid "Pentagonal prism"
-msgstr "Prisme pentagonal"
+msgid "Medial pentagonal hexecontahedron"
+msgstr "Hexacontaèdre pentagonal médian"
 
 #: ../hacks/config/polyhedra.xml.h:95
-msgid "Pentagrammic antiprism"
-msgstr "Antiprisme pentagrammique"
+msgid "Ditrigonal dodecadodecahedron"
+msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:96
-msgid "Pentagrammic concave deltohedron"
-msgstr "Deltaèdre pentagrammique concave"
+msgid "Medial triambic icosahedron"
+msgstr "Isocaèdre triambique médian"
 
 #: ../hacks/config/polyhedra.xml.h:97
-msgid "Pentagrammic crossed antiprism"
-msgstr "Antiprisme pentagrammique croisé"
+msgid "Great ditrigonal dodecicosidodecahedron"
+msgstr "Grand dodécicosidodécaèdre ditrigonal"
 
 #: ../hacks/config/polyhedra.xml.h:98
-msgid "Pentagrammic deltohedron"
-msgstr "Deltaèdre pentagrammique"
+msgid "Great ditrigonal dodecacronic hexecontahedron"
+msgstr "Grand hexacontaèdre ditrigonal dodécagonique"
 
 #: ../hacks/config/polyhedra.xml.h:99
-msgid "Pentagrammic dipyramid"
-msgstr "Dipyramide pentagrammique"
+msgid "Small ditrigonal dodecicosidodecahedron"
+msgstr "Petit dodécicosidodécaèdre ditrigonal"
 
 #: ../hacks/config/polyhedra.xml.h:100
-msgid "Pentagrammic prism"
-msgstr "Prisme pentagrammique"
+msgid "Small ditrigonal dodecacronic hexecontahedron"
+msgstr "Petit hexacontaèdre dodécagonique ditrigonal"
 
 #: ../hacks/config/polyhedra.xml.h:101
-msgid "Pentakisdodecahedron"
-msgstr "Pentaki-dodécaèdre"
+msgid "Icosidodecadodecahedron"
+msgstr "Icosidodécadodécahèdre"
 
 #: ../hacks/config/polyhedra.xml.h:102
-msgid "Polyhedra"
-msgstr "Polyèdre"
+msgid "Medial icosacronic hexecontahedron"
+msgstr "Hexacontaèdre icosagonique médian"
 
 #: ../hacks/config/polyhedra.xml.h:103
-msgid "Rhombic dodecahedron"
-msgstr "Dodécaèdre rhombique"
+msgid "Icositruncated dodecadodecahedron"
+msgstr "Dodécadodécaèdre icosi-tronqué"
 
 #: ../hacks/config/polyhedra.xml.h:104
-msgid "Rhombic triacontahedron"
-msgstr "Triacontaèdre rhombique"
+msgid "Tridyakisicosahedron"
+msgstr "Tridyakisicosahèdre"
 
 #: ../hacks/config/polyhedra.xml.h:105
-msgid "Rhombicosacron"
-msgstr "Rhombicosagone"
+msgid "Snub icosidodecadodecahedron"
+msgstr "Icosidodécadodécahèdre retroussé"
 
 #: ../hacks/config/polyhedra.xml.h:106
-msgid "Rhombicosahedron"
-msgstr "Rhombicosaèdre"
+msgid "Medial hexagonal hexecontahedron"
+msgstr "Hexacontaèdre hexagonal médian"
 
 #: ../hacks/config/polyhedra.xml.h:107
-msgid "Rhombicosidodecahedron"
-msgstr "Rhombicosidodécaèdre"
+msgid "Great ditrigonal icosidodecahedron"
+msgstr "Grand icosidodécaèdre ditrigonal"
 
 #: ../hacks/config/polyhedra.xml.h:108
-msgid "Rhombicuboctahedron"
-msgstr "Rhombicuboctaèdre"
+msgid "Great triambic icosahedron"
+msgstr "Grand isocaèdre triambique"
 
 #: ../hacks/config/polyhedra.xml.h:109
-msgid "Rhombidodecadodecahedron"
-msgstr "Rhombidodecadodécaèdre"
+msgid "Great icosicosidodecahedron"
+msgstr "Grand icosicosidodécaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:110
-msgid "Show description"
-msgstr "Afficher la description"
+msgid "Great icosacronic hexecontahedron"
+msgstr "Grand hexacontaèdre icosagonique"
+
+#: ../hacks/config/polyhedra.xml.h:111
+msgid "Small icosihemidodecahedron"
+msgstr "Petit icosihémidodécaèdre"
+
+#: ../hacks/config/polyhedra.xml.h:112
+msgid "Small icosihemidodecacron"
+msgstr "Petit icosicosidodécaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:113
-msgid "Small cubicuboctahedron"
-msgstr "Petit cubicuboctaèdre"
+msgid "Small dodecicosahedron"
+msgstr "Petit dodécicosaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:114
-msgid "Small ditrigonal dodecacronic hexecontahedron"
-msgstr "Petit hexacontaèdre dodécagonique ditrigonal"
+msgid "Small dodecicosacron"
+msgstr "Petit dodécicosagone"
 
 #: ../hacks/config/polyhedra.xml.h:115
-msgid "Small ditrigonal dodecicosidodecahedron"
-msgstr "Petit dodécicosidodécaèdre ditrigonal"
+msgid "Small dodecahemidodecahedron"
+msgstr "Petit dodécahémidodécaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:116
-msgid "Small ditrigonal icosidodecahedron"
-msgstr "Petit icosidodécaèdre ditrigonal"
+msgid "Small dodecahemidodecacron"
+msgstr "Petit dodécahémidodécagone"
 
 #: ../hacks/config/polyhedra.xml.h:117
-msgid "Small dodecacronic hexecontahedron"
-msgstr "Petit hexacontaèdre dodécagonique"
+msgid "Great stellated dodecahedron"
+msgstr "Grand dodécaèdre étoilé"
 
 #: ../hacks/config/polyhedra.xml.h:118
-msgid "Small dodecahemicosacron"
-msgstr "Petit dodécahémicosagone"
+msgid "Great icosahedron"
+msgstr "Grand isocaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:119
-msgid "Small dodecahemicosahedron"
-msgstr "Petit dodécahémicosaèdre"
+msgid "Great icosidodecahedron"
+msgstr "Grand icosidodécaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:120
-msgid "Small dodecahemidodecacron"
-msgstr "Petit dodécahémidodécagone"
+msgid "Great rhombic triacontahedron"
+msgstr "Grand triacontaèdre rhombique"
 
 #: ../hacks/config/polyhedra.xml.h:121
-msgid "Small dodecahemidodecahedron"
-msgstr "Petit dodécahémidodécaèdre"
+msgid "Great truncated icosahedron"
+msgstr "Grand isocaèdre tronqué"
 
 #: ../hacks/config/polyhedra.xml.h:122
-msgid "Small dodecicosacron"
-msgstr "Petit dodécicosagone"
+msgid "Great stellapentakisdodecahedron"
+msgstr "Grand stellapentakisdodécaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:123
-msgid "Small dodecicosahedron"
-msgstr "Petit dodécicosaèdre"
+msgid "Rhombicosahedron"
+msgstr "Rhombicosaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:124
-msgid "Small dodecicosidodecahedron"
-msgstr "Petit dodécicosidodécaèdre"
+msgid "Rhombicosacron"
+msgstr "Rhombicosagone"
 
 #: ../hacks/config/polyhedra.xml.h:125
-msgid "Small hexacronic icositetrahedron"
-msgstr "Petit icositétraèdre hexagonique"
+msgid "Great snub icosidodecahedron"
+msgstr "Grand icosidodécaèdre retroussé"
 
 #: ../hacks/config/polyhedra.xml.h:126
-msgid "Small hexagonal hexecontahedron"
-msgstr "Petit hexacontaèdre hexagonal"
+msgid "Great pentagonal hexecontahedron"
+msgstr "Grand hexacontaèdre pentagonal"
 
 #: ../hacks/config/polyhedra.xml.h:127
-msgid "Small hexagrammic hexecontahedron"
-msgstr "Petit hexacontaèdre hexagrammique"
+msgid "Small stellated truncated dodecahedron"
+msgstr "Petit dodécaèdre étoilé tronqué"
 
 #: ../hacks/config/polyhedra.xml.h:128
-msgid "Small icosacronic hexecontahedron"
-msgstr "Petit hexacontaèdre icosagonique"
+msgid "Great pentakisdodekahedron"
+msgstr "Grand pentakidodécaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:129
-msgid "Small icosicosidodecahedron"
-msgstr "Petit icosicosidodécaèdre"
+msgid "Truncated dodecadodecahedron"
+msgstr "Dodécadodécaèdre tronqué"
 
 #: ../hacks/config/polyhedra.xml.h:130
-msgid "Small icosihemidodecacron"
-msgstr "Petit icosicosidodécaèdre"
+msgid "Medial disdyakistriacontahedron"
+msgstr "Disdyakistriacontaèdre médian"
 
 #: ../hacks/config/polyhedra.xml.h:131
-msgid "Small icosihemidodecahedron"
-msgstr "Petit icosihémidodécaèdre"
+msgid "Inverted snub dodecadodecahedron"
+msgstr "Dodécadodécaèdre retroussé inversé"
 
 #: ../hacks/config/polyhedra.xml.h:132
-msgid "Small retrosnub icosicosidodecahedron"
-msgstr "Petit icosicosidodécaèdre retro-retroussé"
+msgid "Medial inverted pentagonal hexecontahedron"
+msgstr "Hexacontaèdre pentagonal inversé médian"
 
 #: ../hacks/config/polyhedra.xml.h:133
-msgid "Small rhombidodecacron"
-msgstr "Petit rhombidodécagone"
+msgid "Great dodecicosidodecahedron"
+msgstr "Grand dodécicosidodécaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:134
-msgid "Small rhombidodecahedron"
-msgstr "Petit rhombidodécaèdre"
+msgid "Great dodecacronic hexecontahedron"
+msgstr "Grand hexacontaèdre dodécagonique"
 
 #: ../hacks/config/polyhedra.xml.h:135
-msgid "Small rhombihexacron"
-msgstr "Petit rhombihexagone"
+msgid "Small dodecahemicosahedron"
+msgstr "Petit dodécahémicosaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:136
-msgid "Small rhombihexahedron"
-msgstr "Petit rhombihexaèdre"
+msgid "Small dodecahemicosacron"
+msgstr "Petit dodécahémicosagone"
 
 #: ../hacks/config/polyhedra.xml.h:137
-msgid "Small snub icosicosidodecahedron"
-msgstr "Petit icosicosidodécaèdre retroussé"
+msgid "Great dodecicosahedron"
+msgstr "Grand dodécicosaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:138
-msgid "Small stellapentakisdodecahedron"
-msgstr "Petit stellapentakisdodécaèdre"
+msgid "Great dodecicosacron"
+msgstr "Grand dodécicosagone"
 
 #: ../hacks/config/polyhedra.xml.h:139
-msgid "Small stellated dodecahedron"
-msgstr "Petit dodécaèdre étoilé"
+msgid "Great snub dodecicosidodecahedron"
+msgstr "Grand dodécicosidodécaèdre retroussé"
 
 #: ../hacks/config/polyhedra.xml.h:140
-msgid "Small stellated truncated dodecahedron"
-msgstr "Petit dodécaèdre étoilé tronqué"
+msgid "Great hexagonal hexecontahedron"
+msgstr "Grand hexacontaèdre hexagonal"
 
 #: ../hacks/config/polyhedra.xml.h:141
-msgid "Small triambic icosahedron"
-msgstr "Petit icosaèdre triambique"
+msgid "Great dodecahemicosahedron"
+msgstr "Grand dodécahémicosaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:142
-msgid "Snub cube"
-msgstr "Cube retroussé"
+msgid "Great dodecahemicosacron"
+msgstr "Grand dodécahémicosagone"
 
 #: ../hacks/config/polyhedra.xml.h:143
-msgid "Snub dodecadodecahedron"
-msgstr "Dodécadodécaèdre retroussé"
+msgid "Great stellated truncated dodecahedron"
+msgstr "Grand dodécaèdre étoilé tronqué"
 
 #: ../hacks/config/polyhedra.xml.h:144
-msgid "Snub dodecahedron"
-msgstr "Dodécagone retroussé"
+msgid "Great triakisicosahedron"
+msgstr "Grand triakisicosahèdre"
 
 #: ../hacks/config/polyhedra.xml.h:145
-msgid "Snub icosidodecadodecahedron"
-msgstr "Icosidodécadodécahèdre retroussé"
+msgid "Great rhombicosidodecahedron"
+msgstr "Grand rhombicosidodécaèdre"
+
+#: ../hacks/config/polyhedra.xml.h:146
+msgid "Great deltoidal hexecontahedron"
+msgstr ""
+
+#: ../hacks/config/polyhedra.xml.h:147
+msgid "Great truncated icosidodecahedron"
+msgstr "Grand icosidodécaèdre tronqué"
 
 #: ../hacks/config/polyhedra.xml.h:148
-msgid "Stellated truncated hexahedron"
-msgstr "Hexaèdre étoilé tronqué"
+msgid "Great disdyakistriacontahedron"
+msgstr "Grand disdyakistriacontaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:149
-msgid "Tetradyakishexahedron"
-msgstr "Tetradyakishexahèdre"
+msgid "Great inverted snub icosidodecahedron"
+msgstr "Grand icosidodécaèdre retroussé inversé"
+
+#: ../hacks/config/polyhedra.xml.h:150
+msgid "Great inverted pentagonal hexecontahedron"
+msgstr "Grand hexacontaèdre pentagonal inversé"
 
 #: ../hacks/config/polyhedra.xml.h:151
-msgid "Tetrahemihexacron"
-msgstr "Tetrahémihexagone"
+msgid "Great dodecahemidodecahedron"
+msgstr "Grand dodécahémidodécaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:152
-msgid "Tetrahemihexahedron"
-msgstr "Tétrahémihexaèdre"
+msgid "Great dodecahemidodecacron"
+msgstr "Grand dodécahémidodécagone"
 
 #: ../hacks/config/polyhedra.xml.h:153
-msgid "Tetrakishexahedron"
-msgstr "Tetraki-hexaèdre"
+msgid "Great icosihemidodecahedron"
+msgstr "Grand icosihémidodécaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:154
-msgid "Triakisicosahedron"
-msgstr "Triaki-icosaèdre"
+msgid "Great icosihemidodecacron"
+msgstr "Grand icosihémidodécagone"
 
 #: ../hacks/config/polyhedra.xml.h:155
-msgid "Triakisoctahedron"
-msgstr "Triaki-octaèdre"
+msgid "Small retrosnub icosicosidodecahedron"
+msgstr "Petit icosicosidodécaèdre retro-retroussé"
 
 #: ../hacks/config/polyhedra.xml.h:156
-msgid "Triakistetrahedron"
-msgstr "Triaki-tétraèdre"
+msgid "Small hexagrammic hexecontahedron"
+msgstr "Petit hexacontaèdre hexagrammique"
 
 #: ../hacks/config/polyhedra.xml.h:157
-msgid "Tridyakisicosahedron"
-msgstr "Tridyakisicosahèdre"
+msgid "Great rhombidodecahedron"
+msgstr "Grand rhombidodécaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:158
-msgid "Truncated cube"
-msgstr "Cube tronqué"
+msgid "Great rhombidodecacron"
+msgstr "Grand rhombidodécagone"
 
 #: ../hacks/config/polyhedra.xml.h:159
-msgid "Truncated cuboctahedron"
-msgstr "Cuboctaèdre tronqué"
+msgid "Great retrosnub icosidodecahedron"
+msgstr "Grand retro-retroussé icosidodécaèdre"
 
 #: ../hacks/config/polyhedra.xml.h:160
-msgid "Truncated dodecadodecahedron"
-msgstr "Dodécadodécaèdre tronqué"
+msgid "Great pentagrammic hexecontahedron"
+msgstr "Grand hexacontaèdre pentagrammique"
 
 #: ../hacks/config/polyhedra.xml.h:161
-msgid "Truncated dodecahedron"
-msgstr "Dodécaèdre tronqué"
+msgid "Great dirhombicosidodecahedron"
+msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:162
-msgid "Truncated great dodecahedron"
-msgstr "Grand dodécaèdre tronqué"
-
-#: ../hacks/config/polyhedra.xml.h:163
-msgid "Truncated icosahedron"
-msgstr "Icosaèdre tronqué"
-
-#: ../hacks/config/polyhedra.xml.h:164
-msgid "Truncated icosidodecahedron"
+msgid "Great dirhombicosidodecacron"
 msgstr ""
 
-#: ../hacks/config/polyhedra.xml.h:165
-msgid "Truncated octahedron"
-msgstr "Octaèdre tronqué"
-
-#: ../hacks/config/polyhedra.xml.h:166
-msgid "Truncated tetrahedron"
-msgstr "Tétraèdre tronqué"
-
-#: ../hacks/config/polyhedra.xml.h:167
+#: ../hacks/config/polyhedra.xml.h:163
 msgid "Utah teapotahedron"
 msgstr "Théière-èdre Utah"
 
-#: ../hacks/config/polyominoes.xml.h:4
-msgid "Identical pieces"
-msgstr "Pièces identiques"
+#: ../hacks/config/polyhedra.xml.h:167
+msgid "Show description"
+msgstr "Afficher la description"
+
+#: ../hacks/config/polyhedra.xml.h:169
+msgid ""
+"Displays different 3D solids and some information about each. A new solid is "
+"chosen every few seconds. There are 75 uniform polyhedra, plus 5 infinite "
+"sets of prisms and antiprisms; including their duals brings the total to "
+"160. http://en.wikipedia.org/wiki/Uniform_polyhedra "
+"http://en.wikipedia.org/wiki/Stellation Written by Dr. Zvi Har'El and Jamie "
+"Zawinski; 2004."
+msgstr ""
 
-#: ../hacks/config/polyominoes.xml.h:9
+#: ../hacks/config/polyominoes.xml.h:1
 msgid "Polyominoes"
 msgstr "Polyominos"
 
-#: ../hacks/config/polyominoes.xml.h:10
+#: ../hacks/config/polyominoes.xml.h:2
+msgid "Identical pieces"
+msgstr "Pièces identiques"
+
+#: ../hacks/config/polyominoes.xml.h:13
 msgid ""
 "Repeatedly attempts to completely fill a rectangle with irregularly-shaped "
 "puzzle pieces. http://en.wikipedia.org/wiki/Polyomino Written by Stephen "
@@ -7720,43 +7902,43 @@
 "http://en.wikipedia.org/wiki/Polyomino  Écrit par Stephen Montgomery-Smith ; "
 "2002."
 
-#: ../hacks/config/polytopes.xml.h:2
-msgid "120-cell"
-msgstr "120-cellules"
-
-#: ../hacks/config/polytopes.xml.h:3
-msgid "16-cell (hyper-octahedron)"
-msgstr "16-cellules (hyper-octaèdre)"
-
-#: ../hacks/config/polytopes.xml.h:4
-msgid "24-cell"
-msgstr "24-cellules"
+#: ../hacks/config/polytopes.xml.h:1
+msgid "Polytopes"
+msgstr "Polytopes"
 
 #: ../hacks/config/polytopes.xml.h:6
 msgid "5-cell (hyper-tetrahedron)"
 msgstr "5-cellules (hyper-tétraèdre)"
 
 #: ../hacks/config/polytopes.xml.h:7
-msgid "600-cell"
-msgstr "600-cellules"
-
-#: ../hacks/config/polytopes.xml.h:8
 msgid "8-cell (hypercube / tesseract)"
 msgstr "8-cellules (hypercube / tesseract)"
 
+#: ../hacks/config/polytopes.xml.h:8
+msgid "16-cell (hyper-octahedron)"
+msgstr "16-cellules (hyper-octaèdre)"
+
 #: ../hacks/config/polytopes.xml.h:9
-msgid "Colors By 4D Depth"
-msgstr "Couleur en profondeur 4D"
+msgid "24-cell"
+msgstr "24-cellules"
 
-#: ../hacks/config/polytopes.xml.h:17
-msgid "Polytopes"
-msgstr "Polytopes"
+#: ../hacks/config/polytopes.xml.h:10
+msgid "120-cell"
+msgstr "120-cellules"
 
-#: ../hacks/config/polytopes.xml.h:20
+#: ../hacks/config/polytopes.xml.h:11
+msgid "600-cell"
+msgstr "600-cellules"
+
+#: ../hacks/config/polytopes.xml.h:12
 msgid "Single color"
 msgstr "Couleur unique"
 
-#: ../hacks/config/polytopes.xml.h:22
+#: ../hacks/config/polytopes.xml.h:13
+msgid "Colors By 4D Depth"
+msgstr "Couleur en profondeur 4D"
+
+#: ../hacks/config/polytopes.xml.h:30
 msgid ""
 "This shows one of the six regular 4D polytopes rotating in 4D. Inspired by "
 "H.S.M Coxeter's book \"Regular Polytopes\", 3rd Edition, Dover Publications, "
@@ -7768,28 +7950,28 @@
 msgstr ""
 
 #: ../hacks/config/pong.xml.h:1
-msgid "Clock mode"
-msgstr "Mode d'horloge"
-
-#: ../hacks/config/pong.xml.h:2
-msgid "Crisp"
-msgstr ""
+msgid "Pong"
+msgstr "Pong"
 
-#: ../hacks/config/pong.xml.h:4
+#: ../hacks/config/pong.xml.h:3
 msgid "Game speed"
 msgstr "Vitesse du jeu"
 
 #: ../hacks/config/pong.xml.h:5
+msgid "Crisp"
+msgstr ""
+
+#: ../hacks/config/pong.xml.h:6
 msgid "Noise"
 msgstr "Bruit"
 
-#: ../hacks/config/pong.xml.h:6
+#: ../hacks/config/pong.xml.h:7
 msgid "Noisy"
 msgstr "Bruyant"
 
-#: ../hacks/config/pong.xml.h:7
-msgid "Pong"
-msgstr "Pong"
+#: ../hacks/config/pong.xml.h:8
+msgid "Clock mode"
+msgstr "Mode d'horloge"
 
 #: ../hacks/config/pong.xml.h:10
 msgid ""
@@ -7799,73 +7981,81 @@
 "English and Trevor Blackwell; 2003."
 msgstr ""
 
-#: ../hacks/config/popsquares.xml.h:2
-msgid "Dark blue"
-msgstr "Bleu foncé"
-
-#: ../hacks/config/popsquares.xml.h:3
-msgid "Dark cyan"
-msgstr "Cyan foncé"
-
-#: ../hacks/config/popsquares.xml.h:4
-msgid "Dark green"
-msgstr "Vert foncé"
+#: ../hacks/config/popsquares.xml.h:1
+msgid "PopSquares"
+msgstr "PopSquares"
 
 #: ../hacks/config/popsquares.xml.h:5
-msgid "Dark magenta"
-msgstr "Magenta foncé"
+msgid "Subdivision"
+msgstr "Sub-division"
 
-#: ../hacks/config/popsquares.xml.h:6
-msgid "Dark red"
-msgstr "Rouge foncé"
+#: ../hacks/config/popsquares.xml.h:8
+msgid "Light red"
+msgstr "Rouge clair"
 
-#: ../hacks/config/popsquares.xml.h:7
-msgid "Dark yellow"
-msgstr "Jaune foncé"
+#: ../hacks/config/popsquares.xml.h:9
+msgid "Light yellow"
+msgstr "Jaune clair"
 
 #: ../hacks/config/popsquares.xml.h:10
-msgid "Light blue"
-msgstr "Bleu clair"
+msgid "Light green"
+msgstr "Vert clair"
 
 #: ../hacks/config/popsquares.xml.h:11
 msgid "Light cyan"
 msgstr "Cyan clair"
 
 #: ../hacks/config/popsquares.xml.h:12
-msgid "Light green"
-msgstr "Vert clair"
+msgid "Light blue"
+msgstr "Bleu clair"
 
 #: ../hacks/config/popsquares.xml.h:13
 msgid "Light magenta"
 msgstr "Magenta clair"
 
 #: ../hacks/config/popsquares.xml.h:14
-msgid "Light red"
-msgstr "Rouge clair"
+msgid "Dark red"
+msgstr "Rouge foncé"
 
 #: ../hacks/config/popsquares.xml.h:15
-msgid "Light yellow"
-msgstr "Jaune clair"
+msgid "Dark yellow"
+msgstr "Jaune foncé"
+
+#: ../hacks/config/popsquares.xml.h:16
+msgid "Dark green"
+msgstr "Vert foncé"
+
+#: ../hacks/config/popsquares.xml.h:17
+msgid "Dark cyan"
+msgstr "Cyan foncé"
 
 #: ../hacks/config/popsquares.xml.h:18
-msgid "PopSquares"
-msgstr "PopSquares"
+msgid "Dark blue"
+msgstr "Bleu foncé"
+
+#: ../hacks/config/popsquares.xml.h:19
+msgid "Dark magenta"
+msgstr "Magenta foncé"
 
 #: ../hacks/config/popsquares.xml.h:20
-msgid "Subdivision"
-msgstr "Sub-division"
+msgid "Twitch"
+msgstr "Mouvement compulsif"
 
-#: ../hacks/config/popsquares.xml.h:21
+#: ../hacks/config/popsquares.xml.h:22
 msgid ""
 "This draws a pop-art-ish looking grid of pulsing colors. Written by Levi "
 "Burton; 2003."
 msgstr ""
 
-#: ../hacks/config/popsquares.xml.h:22
-msgid "Twitch"
-msgstr "Mouvement compulsif"
-
 #: ../hacks/config/providence.xml.h:1
+msgid "Providence"
+msgstr "Providence"
+
+#: ../hacks/config/providence.xml.h:5
+msgid "Draw eye"
+msgstr ""
+
+#: ../hacks/config/providence.xml.h:8
 msgid ""
 "\"A pyramid unfinished. In the zenith an eye in a triangle, surrounded by a "
 "glory, proper.\" http://en.wikipedia.org/wiki/Eye_of_Providence Written by "
@@ -7875,131 +8065,123 @@
 "rayons de lumière. http://fr.wikipedia.org/wiki/Œil_de_la_Providence Écrit "
 "par Blair Tennessy ; 2004."
 
-#: ../hacks/config/providence.xml.h:2
-msgid "Draw eye"
-msgstr ""
-
-#: ../hacks/config/providence.xml.h:6
-msgid "Providence"
-msgstr "Providence"
-
 #: ../hacks/config/pulsar.xml.h:1
-msgid "Anti-alias lines"
+msgid "Pulsar"
+msgstr "Pulsar"
+
+#: ../hacks/config/pulsar.xml.h:5
+msgid "Quad count"
 msgstr ""
 
-#: ../hacks/config/pulsar.xml.h:2
-msgid ""
-"Draws some intersecting planes, making use of alpha blending, fog, textures, "
-"and mipmaps. Written by David Konerding; 1999."
+#: ../hacks/config/pulsar.xml.h:8
+msgid "Enable texturing"
+msgstr "Activer les textures"
+
+#: ../hacks/config/pulsar.xml.h:9
+msgid "Enable texture mipmaps"
 msgstr ""
-"Dessine des plans en intersection en utilisant le mélange de valeurs alpha, "
-"le brouillard, des textures, et des mipmaps. Écrit par David Konerding; 1999."
 
-#: ../hacks/config/pulsar.xml.h:3
+#: ../hacks/config/pulsar.xml.h:10
 msgid "Enable blending"
 msgstr "Activer le fondu"
 
-#: ../hacks/config/pulsar.xml.h:4
-msgid "Enable depth buffer"
+#: ../hacks/config/pulsar.xml.h:11
+msgid "Anti-alias lines"
 msgstr ""
 
-#: ../hacks/config/pulsar.xml.h:7
+#: ../hacks/config/pulsar.xml.h:12
 msgid "Enable texture filtering"
 msgstr "Activer le filtrage des textures"
 
-#: ../hacks/config/pulsar.xml.h:8
-msgid "Enable texture mipmaps"
-msgstr ""
-
-#: ../hacks/config/pulsar.xml.h:9
-msgid "Enable texturing"
-msgstr "Activer les textures"
-
 #: ../hacks/config/pulsar.xml.h:13
-msgid "Pulsar"
-msgstr "Pulsar"
-
-#: ../hacks/config/pulsar.xml.h:14
-msgid "Quad count"
+msgid "Enable depth buffer"
 msgstr ""
 
-#: ../hacks/config/pyro.xml.h:2
+#: ../hacks/config/pulsar.xml.h:15
 msgid ""
-"Exploding fireworks. See also the \"Fireworkx\", \"Eruption\", and "
-"\"XFlame\" screen savers. Written by Jamie Zawinski; 1992."
-msgstr ""
-"Des feux d'artifice qui explosent. Voir aussi les écrans de veille "
-"« Fireworkx », « Eruption » et « XFlame ». Écrit par Jamie Zawinski ; 1992."
-
-#: ../hacks/config/pyro.xml.h:3
-msgid "Explosive yield"
+"Draws some intersecting planes, making use of alpha blending, fog, textures, "
+"and mipmaps. Written by David Konerding; 1999."
 msgstr ""
+"Dessine des plans en intersection en utilisant le mélange de valeurs alpha, "
+"le brouillard, des textures, et des mipmaps. Écrit par David Konerding; 1999."
 
-#: ../hacks/config/pyro.xml.h:7
-msgid "Launch frequency"
-msgstr "Fréquence de lancement"
+#: ../hacks/config/pyro.xml.h:1
+msgid "Pyro"
+msgstr "Pyro"
 
-#: ../hacks/config/pyro.xml.h:10
+#: ../hacks/config/pyro.xml.h:6
 msgid "Particle density"
 msgstr "Densité des particules"
 
-#: ../hacks/config/pyro.xml.h:11
-msgid "Pyro"
-msgstr "Pyro"
+#: ../hacks/config/pyro.xml.h:9
+msgid "Launch frequency"
+msgstr "Fréquence de lancement"
 
-#: ../hacks/config/qix.xml.h:1
-msgid "Additive colors"
-msgstr "Couleurs additives"
+#: ../hacks/config/pyro.xml.h:12
+msgid "Explosive yield"
+msgstr ""
 
-#: ../hacks/config/qix.xml.h:2
+#: ../hacks/config/pyro.xml.h:15
 msgid ""
-"Bounces a series of line segments around the screen, and uses variations on "
-"this basic motion pattern to produce all sorts of different presentations: "
-"line segments, filled polygons, and overlapping translucent areas. "
-"http://en.wikipedia.org/wiki/Qix Written by Jamie Zawinski; 1992."
+"Exploding fireworks. See also the \"Fireworkx\", \"Eruption\", and "
+"\"XFlame\" screen savers. Written by Jamie Zawinski; 1992."
 msgstr ""
+"Des feux d'artifice qui explosent. Voir aussi les écrans de veille "
+"« Fireworkx », « Eruption » et « XFlame ». Écrit par Jamie Zawinski ; 1992."
+
+#: ../hacks/config/qix.xml.h:1
+msgid "Qix"
+msgstr "Qix"
 
-#: ../hacks/config/qix.xml.h:11
+#: ../hacks/config/qix.xml.h:12
 msgid "Line segments"
 msgstr "Segments de ligne"
 
-#: ../hacks/config/qix.xml.h:12
+#: ../hacks/config/qix.xml.h:13
+msgid "Solid objects"
+msgstr ""
+
+#: ../hacks/config/qix.xml.h:14
 msgid "Linear motion"
 msgstr ""
 
 #: ../hacks/config/qix.xml.h:15
-msgid "Max size"
-msgstr "Taille maximale"
+msgid "Random motion"
+msgstr "Mouvement aléatoire"
 
 #: ../hacks/config/qix.xml.h:16
-msgid "Poly corners"
-msgstr ""
+msgid "Additive colors"
+msgstr "Couleurs additives"
 
 #: ../hacks/config/qix.xml.h:17
-msgid "Qix"
-msgstr "Qix"
+msgid "Subtractive colors"
+msgstr "Couleurs soustractives"
 
-#: ../hacks/config/qix.xml.h:18
-msgid "Random motion"
-msgstr "Mouvement aléatoire"
+#: ../hacks/config/qix.xml.h:19
+msgid "Max size"
+msgstr "Taille maximale"
 
-#: ../hacks/config/qix.xml.h:21
-msgid "Solid objects"
+#: ../hacks/config/qix.xml.h:20
+msgid "Poly corners"
 msgstr ""
 
-#: ../hacks/config/qix.xml.h:23
-msgid "Subtractive colors"
-msgstr "Couleurs soustractives"
-
-#: ../hacks/config/qix.xml.h:24 ../hacks/config/webcollage.xml.h:17
+#: ../hacks/config/qix.xml.h:21 ../hacks/config/webcollage.xml.h:8
 msgid "Transparent"
 msgstr "Transparence des"
 
-#: ../hacks/config/queens.xml.h:4
+#: ../hacks/config/qix.xml.h:25
+msgid ""
+"Bounces a series of line segments around the screen, and uses variations on "
+"this basic motion pattern to produce all sorts of different presentations: "
+"line segments, filled polygons, and overlapping translucent areas. "
+"http://en.wikipedia.org/wiki/Qix Written by Jamie Zawinski; 1992."
+msgstr ""
+
+#: ../hacks/config/queens.xml.h:1
 msgid "Queens"
 msgstr "Reines"
 
-#: ../hacks/config/queens.xml.h:6
+#: ../hacks/config/queens.xml.h:7
 msgid ""
 "Solves the N-Queens problem (where N is between 5 and 10 queens). The "
 "problem is: how may one place N queens on an NxN chessboard such that no "
@@ -8008,99 +8190,99 @@
 "2002."
 msgstr ""
 
-#: ../hacks/config/rd-bomb.xml.h:2 ../hacks/config/rdbomb.xml.h:2
-#, no-c-format
-msgid "1%"
-msgstr "1%"
+#: ../hacks/config/rd-bomb.xml.h:1 ../hacks/config/rdbomb.xml.h:1
+msgid "RDbomb"
+msgstr ""
 
 #: ../hacks/config/rd-bomb.xml.h:5 ../hacks/config/rdbomb.xml.h:5
-msgid "Diffusion"
+#: ../hacks/config/voronoi.xml.h:12
+msgid "Wander speed"
 msgstr ""
 
-#: ../hacks/config/rd-bomb.xml.h:6 ../hacks/config/rdbomb.xml.h:6
-msgid ""
-"Draws a grid of growing square-like shapes that, once they overtake each "
-"other, react in unpredictable ways. \"RD\" stands for reaction-diffusion. "
-"Written by Scott Draves; 1997."
+#: ../hacks/config/rd-bomb.xml.h:7 ../hacks/config/rdbomb.xml.h:7
+#, no-c-format
+msgid "1%"
+msgstr "1%"
+
+#: ../hacks/config/rd-bomb.xml.h:8 ../hacks/config/rdbomb.xml.h:8
+msgid "Fill screen"
 msgstr ""
 
-#: ../hacks/config/rd-bomb.xml.h:7 ../hacks/config/rdbomb.xml.h:7
+#: ../hacks/config/rd-bomb.xml.h:12 ../hacks/config/rdbomb.xml.h:12
 msgid "Epoch"
 msgstr "Époque"
 
-#: ../hacks/config/rd-bomb.xml.h:9 ../hacks/config/rdbomb.xml.h:9
-msgid "Fill screen"
+#: ../hacks/config/rd-bomb.xml.h:17 ../hacks/config/rdbomb.xml.h:17
+msgid "X tile size"
 msgstr ""
 
-#: ../hacks/config/rd-bomb.xml.h:14 ../hacks/config/rdbomb.xml.h:14
-msgid "RDbomb"
+#: ../hacks/config/rd-bomb.xml.h:18 ../hacks/config/rdbomb.xml.h:18
+msgid "Y tile size"
 msgstr ""
 
-#: ../hacks/config/rd-bomb.xml.h:15 ../hacks/config/rdbomb.xml.h:15
+#: ../hacks/config/rd-bomb.xml.h:19 ../hacks/config/rdbomb.xml.h:19
 msgid "Reaction"
 msgstr "Réaction"
 
-#. #### default is wrong
-#: ../hacks/config/rd-bomb.xml.h:17 ../hacks/config/rdbomb.xml.h:17
-msgid "Seed radius"
-msgstr "Rayon des graines"
-
-#: ../hacks/config/rd-bomb.xml.h:22 ../hacks/config/rdbomb.xml.h:22
-#: ../hacks/config/voronoi.xml.h:15
-msgid "Wander speed"
-msgstr ""
-
-#: ../hacks/config/rd-bomb.xml.h:23 ../hacks/config/rdbomb.xml.h:23
-msgid "X tile size"
+#: ../hacks/config/rd-bomb.xml.h:20 ../hacks/config/rdbomb.xml.h:20
+msgid "Diffusion"
 msgstr ""
 
-#: ../hacks/config/rd-bomb.xml.h:24 ../hacks/config/rdbomb.xml.h:24
-msgid "Y tile size"
-msgstr ""
+#. #### default is wrong
+#: ../hacks/config/rd-bomb.xml.h:22 ../hacks/config/rdbomb.xml.h:22
+msgid "Seed radius"
+msgstr "Rayon des graines"
 
-#: ../hacks/config/ripples.xml.h:3
-msgid "Big drops"
+#: ../hacks/config/rd-bomb.xml.h:24 ../hacks/config/rdbomb.xml.h:24
+msgid ""
+"Draws a grid of growing square-like shapes that, once they overtake each "
+"other, react in unpredictable ways. \"RD\" stands for reaction-diffusion. "
+"Written by Scott Draves; 1997."
 msgstr ""
 
-#: ../hacks/config/ripples.xml.h:4
-msgid "Drippiness"
-msgstr ""
+#: ../hacks/config/ripples.xml.h:1
+msgid "Ripples"
+msgstr "Ondulations"
 
-#: ../hacks/config/ripples.xml.h:5
+#: ../hacks/config/ripples.xml.h:8
 msgid "Drizzle"
 msgstr "Bruine"
 
-#: ../hacks/config/ripples.xml.h:7
-msgid "Fluidity"
-msgstr "Fluidité"
-
 #: ../hacks/config/ripples.xml.h:9
-msgid "Grayscale"
-msgstr "Niveaux de gris"
+msgid "Drippiness"
+msgstr ""
+
+#: ../hacks/config/ripples.xml.h:10
+msgid "Storm"
+msgstr "Tempète"
+
+#: ../hacks/config/ripples.xml.h:11
+msgid "Small drops"
+msgstr ""
 
 #: ../hacks/config/ripples.xml.h:12
-msgid "Magic lighting effect"
-msgstr "Effet de lumière magique"
+msgid "Fluidity"
+msgstr "Fluidité"
 
 #: ../hacks/config/ripples.xml.h:13
+msgid "Big drops"
+msgstr ""
+
+#: ../hacks/config/ripples.xml.h:14
 msgid "Moving splashes"
 msgstr "Éclaboussures mouvantes"
 
-#: ../hacks/config/ripples.xml.h:14
+#: ../hacks/config/ripples.xml.h:15
 msgid "Psychedelic colors"
 msgstr "Couleurs psychédéliques"
 
-#: ../hacks/config/ripples.xml.h:15
-msgid "Ripples"
-msgstr "Ondulations"
+#: ../hacks/config/ripples.xml.h:16
+msgid "Grayscale"
+msgstr "Niveaux de gris"
 
 #: ../hacks/config/ripples.xml.h:17
-msgid "Small drops"
-msgstr ""
-
-#: ../hacks/config/ripples.xml.h:18
-msgid "Storm"
-msgstr "Tempète"
+msgid "Magic lighting effect"
+msgstr "Effet de lumière magique"
 
 #: ../hacks/config/ripples.xml.h:19
 msgid ""
@@ -8108,15 +8290,19 @@
 "the desktop or an image. Written by Tom Hammersley; 1999."
 msgstr ""
 
-#: ../hacks/config/rocks.xml.h:10
+#: ../hacks/config/rocks.xml.h:1
 msgid "Rocks"
 msgstr "Rochers"
 
-#: ../hacks/config/rocks.xml.h:15
+#: ../hacks/config/rocks.xml.h:9
+msgid "Velocity"
+msgstr "Vélocité"
+
+#: ../hacks/config/rocks.xml.h:12
 msgid "Steering"
 msgstr "Orientation"
 
-#: ../hacks/config/rocks.xml.h:16
+#: ../hacks/config/rocks.xml.h:18
 msgid ""
 "This draws an animation of flight through an asteroid field, with changes in "
 "rotation and direction. Written by Jamie Zawinski; 1992."
@@ -8124,15 +8310,19 @@
 "Dessine une animation de vol dans un champ d'astéroïdes, dont la  rotation "
 "et la direction changent. Écrit par Jamie Zawinski; 1992."
 
-#: ../hacks/config/rocks.xml.h:18
-msgid "Velocity"
-msgstr "Vélocité"
-
-#: ../hacks/config/rorschach.xml.h:7
+#: ../hacks/config/rorschach.xml.h:1
 msgid "Rorschach"
 msgstr "Rorschach"
 
-#: ../hacks/config/rorschach.xml.h:10
+#: ../hacks/config/rorschach.xml.h:6
+msgid "With X symmetry"
+msgstr ""
+
+#: ../hacks/config/rorschach.xml.h:7
+msgid "With Y symmetry"
+msgstr ""
+
+#: ../hacks/config/rorschach.xml.h:12
 msgid ""
 "This generates random inkblot patterns via a reflected random walk. Any deep-"
 "seated neurotic tendencies which this program reveals are your own problem. "
@@ -8140,35 +8330,47 @@
 "http://en.wikipedia.org/wiki/Random_walk Written by Jamie Zawinski; 1992."
 msgstr ""
 
-#: ../hacks/config/rorschach.xml.h:11
-msgid "With X symmetry"
-msgstr ""
-
-#: ../hacks/config/rorschach.xml.h:12
-msgid "With Y symmetry"
-msgstr ""
+#: ../hacks/config/rotor.xml.h:1
+msgid "Rotor"
+msgstr "Rotor"
 
-#: ../hacks/config/rotor.xml.h:4 ../hacks/config/skytentacles.xml.h:9
-#: ../hacks/config/wander.xml.h:8
+#: ../hacks/config/rotor.xml.h:6 ../hacks/config/skytentacles.xml.h:6
+#: ../hacks/config/wander.xml.h:9
 msgid "Length"
 msgstr "Longueur"
 
-#: ../hacks/config/rotor.xml.h:9
-msgid "Rotor"
-msgstr "Rotor"
-
-#: ../hacks/config/rotor.xml.h:13
+#: ../hacks/config/rotor.xml.h:14
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Draws a line segment moving along a complex spiraling curve. "
 "Written by Tom Lawrence; 1997."
 msgstr ""
 
-#: ../hacks/config/rotzoomer.xml.h:3
+#: ../hacks/config/rotzoomer.xml.h:1
+msgid "RotZoomer"
+msgstr "RotZoomer"
+
+#: ../hacks/config/rotzoomer.xml.h:8
+msgid "Rectangle count"
+msgstr "Nombre de rectangles"
+
+#: ../hacks/config/rotzoomer.xml.h:9
+msgid "Stationary rectangles"
+msgstr "Rectangles stationnaires"
+
+#: ../hacks/config/rotzoomer.xml.h:10
+msgid "Wandering rectangles"
+msgstr "Rectangles errants"
+
+#: ../hacks/config/rotzoomer.xml.h:11
+msgid "Sweeping arcs"
+msgstr ""
+
+#: ../hacks/config/rotzoomer.xml.h:12
 msgid "Animate"
 msgstr "Animer"
 
-#: ../hacks/config/rotzoomer.xml.h:4
+#: ../hacks/config/rotzoomer.xml.h:14
 msgid ""
 "Creates a collage of rotated and scaled portions of the screen. Written by "
 "Claudio Matsuoka; 2001."
@@ -8176,27 +8378,15 @@
 "Crée un collage de portions pivotées et mises à l'échelle de l'écran. Écrit "
 "par Claudio Matsuoka; 2001."
 
-#: ../hacks/config/rotzoomer.xml.h:9
-msgid "Rectangle count"
-msgstr "Nombre de rectangles"
-
-#: ../hacks/config/rotzoomer.xml.h:10
-msgid "RotZoomer"
-msgstr "RotZoomer"
-
-#: ../hacks/config/rotzoomer.xml.h:12
-msgid "Stationary rectangles"
-msgstr "Rectangles stationnaires"
+#: ../hacks/config/rubik.xml.h:1
+msgid "Rubik"
+msgstr "Rubik"
 
-#: ../hacks/config/rotzoomer.xml.h:13
-msgid "Sweeping arcs"
+#: ../hacks/config/rubik.xml.h:10
+msgid "Hide shuffling"
 msgstr ""
 
-#: ../hacks/config/rotzoomer.xml.h:14
-msgid "Wandering rectangles"
-msgstr "Rectangles errants"
-
-#: ../hacks/config/rubik.xml.h:3
+#: ../hacks/config/rubik.xml.h:13
 #, no-c-format
 msgid ""
 "Draws a Rubik's Cube that rotates in three dimensions and repeatedly "
@@ -8205,15 +8395,11 @@
 "Vianna; 1997."
 msgstr ""
 
-#: ../hacks/config/rubik.xml.h:6
-msgid "Hide shuffling"
-msgstr ""
-
-#: ../hacks/config/rubik.xml.h:10
-msgid "Rubik"
-msgstr "Rubik"
-
 #: ../hacks/config/rubikblocks.xml.h:1
+msgid "RubikBlocks"
+msgstr "RubikBlocks"
+
+#: ../hacks/config/rubikblocks.xml.h:21
 msgid ""
 "Animates the Rubik's Mirror Blocks puzzle. See also the \"Rubik\", "
 "\"Cube21\", and \"GLSnake\" screen savers. "
@@ -8221,54 +8407,50 @@
 "by Vasek Potocek; 2009."
 msgstr ""
 
-#: ../hacks/config/rubikblocks.xml.h:12
-msgid "RubikBlocks"
-msgstr "RubikBlocks"
-
-#: ../hacks/config/sballs.xml.h:3
-msgid ""
-"Draws an animation of textured balls spinning like crazy. Written by Eric "
-"Lassauge; 2002."
+#: ../hacks/config/sballs.xml.h:1
+msgid "SBalls"
 msgstr ""
-"Dessine une animation de balles texturées qui tournent comme des folles. "
-"Écrit par Eric Lassauge <lassauge@users.sourceforge.net>; 2002."
 
-#: ../hacks/config/sballs.xml.h:9
+#: ../hacks/config/sballs.xml.h:11
 msgid "Plane"
 msgstr "Plan"
 
-#: ../hacks/config/sballs.xml.h:10
+#: ../hacks/config/sballs.xml.h:12
 msgid "Pyramid"
 msgstr "Pyramide"
 
-#: ../hacks/config/sballs.xml.h:12
-msgid "SBalls"
-msgstr ""
-
-#: ../hacks/config/sballs.xml.h:14
+#: ../hacks/config/sballs.xml.h:13
 msgid "Star"
 msgstr "Étoile"
 
-#: ../hacks/config/shadebobs.xml.h:12
+#: ../hacks/config/sballs.xml.h:17
+msgid ""
+"Draws an animation of textured balls spinning like crazy. Written by Eric "
+"Lassauge; 2002."
+msgstr ""
+"Dessine une animation de balles texturées qui tournent comme des folles. "
+"Écrit par Eric Lassauge <lassauge@users.sourceforge.net>; 2002."
+
+#: ../hacks/config/shadebobs.xml.h:1
 msgid "ShadeBobs"
 msgstr "ShadeBobs"
 
-#: ../hacks/config/shadebobs.xml.h:15
+#: ../hacks/config/shadebobs.xml.h:17
 msgid ""
 "This draws smoothly-shaded oscillating oval patterns that look something "
 "like vapor trails or neon tubes. Written by Shane Smit; 1999."
 msgstr ""
 
-#: ../hacks/config/sierpinski.xml.h:8 ../hacks/config/surfaces.xml.h:17
-#: ../hacks/config/thornbird.xml.h:7 ../hacks/config/voronoi.xml.h:11
-msgid "Points"
-msgstr "Points"
-
-#: ../hacks/config/sierpinski.xml.h:10
+#: ../hacks/config/sierpinski.xml.h:1
 msgid "Sierpinski"
 msgstr "Sierpinski"
 
-#: ../hacks/config/sierpinski.xml.h:12
+#: ../hacks/config/sierpinski.xml.h:6 ../hacks/config/surfaces.xml.h:22
+#: ../hacks/config/thornbird.xml.h:6 ../hacks/config/voronoi.xml.h:6
+msgid "Points"
+msgstr "Points"
+
+#: ../hacks/config/sierpinski.xml.h:14
 msgid ""
 "This draws the two-dimensional variant of the recursive Sierpinski triangle "
 "fractal. See also the \"Sierpinski3D\" screen saver. "
@@ -8276,11 +8458,11 @@
 "Daignault; 1997."
 msgstr ""
 
-#: ../hacks/config/sierpinski3d.xml.h:9
+#: ../hacks/config/sierpinski3d.xml.h:1
 msgid "Sierpinski3D"
 msgstr "Sierpinski3D"
 
-#: ../hacks/config/sierpinski3d.xml.h:10
+#: ../hacks/config/sierpinski3d.xml.h:11
 msgid ""
 "This draws the Sierpinski tetrahedron fractal, the three-dimensional variant "
 "of the recursive Sierpinski triangle. "
@@ -8288,27 +8470,39 @@
 "Written by Jamie Zawinski and Tim Robinson; 1999."
 msgstr ""
 
-#: ../hacks/config/skytentacles.xml.h:3
-msgid "Cartoony"
+#: ../hacks/config/skytentacles.xml.h:1
+msgid "SkyTentacles"
 msgstr ""
 
-#: ../hacks/config/skytentacles.xml.h:4
-msgid "Draw skin"
-msgstr "Dessiner la peau"
-
-#: ../hacks/config/skytentacles.xml.h:6
+#: ../hacks/config/skytentacles.xml.h:12
 msgid "Flexibility"
 msgstr "Flexibilité"
 
 #: ../hacks/config/skytentacles.xml.h:14
-msgid "SkyTentacles"
+msgid "Wiggliness"
 msgstr ""
 
 #: ../hacks/config/skytentacles.xml.h:19
+msgid "X resolution"
+msgstr "Résolution X"
+
+#: ../hacks/config/skytentacles.xml.h:20
+msgid "Y resolution"
+msgstr "Résolution Y"
+
+#: ../hacks/config/skytentacles.xml.h:21
+msgid "Draw skin"
+msgstr "Dessiner la peau"
+
+#: ../hacks/config/skytentacles.xml.h:22
+msgid "Cartoony"
+msgstr ""
+
+#: ../hacks/config/skytentacles.xml.h:23
 msgid "Tentacles can intersect"
 msgstr ""
 
-#: ../hacks/config/skytentacles.xml.h:20
+#: ../hacks/config/skytentacles.xml.h:26
 msgid ""
 "There is a tentacled abomination in the sky. From above you it devours. "
 "Written by Jamie Zawinski; 2008."
@@ -8316,33 +8510,21 @@
 "Il y a une abomination tentaculaire dans le ciel... De là haut elle dévore "
 "tout. Écrit par Jamie Zawinski ; 2008."
 
-#: ../hacks/config/skytentacles.xml.h:24
-msgid "Wiggliness"
-msgstr ""
-
-#: ../hacks/config/skytentacles.xml.h:25
-msgid "X resolution"
-msgstr "Résolution X"
-
-#: ../hacks/config/skytentacles.xml.h:26
-msgid "Y resolution"
-msgstr "Résolution Y"
-
-#: ../hacks/config/slidescreen.xml.h:7
-msgid "Gutter size"
-msgstr "Taille de la gouttière"
+#: ../hacks/config/slidescreen.xml.h:1
+msgid "SlideScreen"
+msgstr "Glissement d'écran"
 
-#: ../hacks/config/slidescreen.xml.h:12
+#: ../hacks/config/slidescreen.xml.h:6
 msgid "Pause"
 msgstr "Pause"
 
-#: ../hacks/config/slidescreen.xml.h:15
+#: ../hacks/config/slidescreen.xml.h:12
 msgid "Slide speed"
 msgstr "Vitesse de glissement"
 
-#: ../hacks/config/slidescreen.xml.h:16
-msgid "SlideScreen"
-msgstr "Glissement d'écran"
+#: ../hacks/config/slidescreen.xml.h:17
+msgid "Gutter size"
+msgstr "Taille de la gouttière"
 
 #: ../hacks/config/slidescreen.xml.h:19
 msgid ""
@@ -8352,11 +8534,11 @@
 "http://en.wikipedia.org/wiki/Fifteen_puzzle Written by Jamie Zawinski; 1994."
 msgstr ""
 
-#: ../hacks/config/slip.xml.h:10
+#: ../hacks/config/slip.xml.h:1
 msgid "Slip"
 msgstr "Glissement"
 
-#: ../hacks/config/slip.xml.h:12
+#: ../hacks/config/slip.xml.h:14
 msgid ""
 "This throws some random bits on the screen, then sucks them through a jet "
 "engine and spews them out the other side. To avoid turning the image "
@@ -8366,74 +8548,74 @@
 msgstr ""
 
 #: ../hacks/config/sonar.xml.h:1
-msgid "A count"
-msgstr "Nombre de A"
-
-#: ../hacks/config/sonar.xml.h:2
-msgid "B count"
-msgstr "Nombre de B"
-
-#: ../hacks/config/sonar.xml.h:4
-msgid "Font size"
-msgstr "Taille de la police"
-
-#: ../hacks/config/sonar.xml.h:10
-msgid "Ping known SSH hosts"
-msgstr "Ping des machines SSH connues"
+msgid "Sonar"
+msgstr "Sonar"
 
-#: ../hacks/config/sonar.xml.h:11
+#: ../hacks/config/sonar.xml.h:8
 msgid "Ping subnet/24 (254 hosts)"
 msgstr "Ping sous-réseau/24 (254 hôtes)"
 
-#: ../hacks/config/sonar.xml.h:12
+#: ../hacks/config/sonar.xml.h:9
 msgid "Ping subnet/25 (126 hosts)"
 msgstr "Ping sous-réseau/25 (126 hôtes)"
 
-#: ../hacks/config/sonar.xml.h:13
+#: ../hacks/config/sonar.xml.h:10
 msgid "Ping subnet/26 (62 hosts)"
 msgstr "Ping sous-réseau/26 (62 hôtes)"
 
-#: ../hacks/config/sonar.xml.h:14
+#: ../hacks/config/sonar.xml.h:11
 msgid "Ping subnet/27 (31 hosts)"
 msgstr "Ping sous-réseau/27 (31 hôtes)"
 
-#: ../hacks/config/sonar.xml.h:15
+#: ../hacks/config/sonar.xml.h:12
 msgid "Ping subnet/28 (14 hosts)"
 msgstr "Ping sous-réseau/28 (14 hôtes)"
 
-#: ../hacks/config/sonar.xml.h:16
+#: ../hacks/config/sonar.xml.h:13
 msgid "Ping subnet/29 (6 hosts)"
 msgstr "Ping sous-réseau/29 (6 hôtes)"
 
-#: ../hacks/config/sonar.xml.h:17
+#: ../hacks/config/sonar.xml.h:14
 msgid "Ping subnet/30 (2 hosts)"
 msgstr "Ping sous-réseau/30 (2 hôtes)"
 
-#: ../hacks/config/sonar.xml.h:18
-msgid "Resolve host names"
-msgstr "Résoudre les noms d'hôtes"
-
-#: ../hacks/config/sonar.xml.h:21
-msgid "Show ping times"
-msgstr "Afficher les temps de réponse"
+#: ../hacks/config/sonar.xml.h:15
+msgid "Ping known SSH hosts"
+msgstr "Ping des machines SSH connues"
 
-#: ../hacks/config/sonar.xml.h:22
+#: ../hacks/config/sonar.xml.h:16
 msgid "Simulation (don't ping)"
 msgstr ""
 
+#: ../hacks/config/sonar.xml.h:18
+msgid "Font size"
+msgstr "Taille de la police"
+
 #: ../hacks/config/sonar.xml.h:23
 msgid "Simulation team A name"
 msgstr ""
 
 #: ../hacks/config/sonar.xml.h:24
+msgid "A count"
+msgstr "Nombre de A"
+
+#: ../hacks/config/sonar.xml.h:25
 msgid "Simulation team B name"
 msgstr ""
 
 #: ../hacks/config/sonar.xml.h:26
-msgid "Sonar"
-msgstr "Sonar"
+msgid "B count"
+msgstr "Nombre de B"
+
+#: ../hacks/config/sonar.xml.h:27
+msgid "Resolve host names"
+msgstr "Résoudre les noms d'hôtes"
+
+#: ../hacks/config/sonar.xml.h:28
+msgid "Show ping times"
+msgstr "Afficher les temps de réponse"
 
-#: ../hacks/config/sonar.xml.h:28
+#: ../hacks/config/sonar.xml.h:31
 msgid ""
 "This draws a sonar screen that pings (get it?) the hosts on your local "
 "network, and plots their distance (response time) from you. The three rings "
@@ -8445,27 +8627,43 @@
 msgstr ""
 
 #: ../hacks/config/speedmine.xml.h:1
-msgid "Allow wall collisions"
-msgstr "Permettre les collisions contre les murs"
-
-#: ../hacks/config/speedmine.xml.h:2
-msgid "Display crosshair"
-msgstr ""
+msgid "SpeedMine"
+msgstr "SpeedMine"
 
-#: ../hacks/config/speedmine.xml.h:8
+#: ../hacks/config/speedmine.xml.h:6
 msgid "Max velocity"
 msgstr "Vélocité max"
 
-#: ../hacks/config/speedmine.xml.h:9
-msgid "Present bonuses"
-msgstr ""
+#: ../hacks/config/speedmine.xml.h:8
+msgid "Thrust"
+msgstr "Poussée"
 
 #: ../hacks/config/speedmine.xml.h:10
+msgid "Tunnel"
+msgstr "Tunnel GL"
+
+#: ../hacks/config/speedmine.xml.h:11 ../hacks/config/worm.xml.h:1
+msgid "Worm"
+msgstr "Ver"
+
+#: ../hacks/config/speedmine.xml.h:12
 msgid "Rocky walls"
 msgstr "Murs rocheux"
 
-#. #### -psychedelic
 #: ../hacks/config/speedmine.xml.h:13
+msgid "Allow wall collisions"
+msgstr "Permettre les collisions contre les murs"
+
+#: ../hacks/config/speedmine.xml.h:14
+msgid "Present bonuses"
+msgstr ""
+
+#: ../hacks/config/speedmine.xml.h:15
+msgid "Display crosshair"
+msgstr ""
+
+#. #### -psychedelic
+#: ../hacks/config/speedmine.xml.h:19
 msgid ""
 "Simulates speeding down a rocky mineshaft, or a funky dancing worm. Written "
 "by Conrad Parker; 2001."
@@ -8473,23 +8671,7 @@
 "Simule la descente dans un puits de mine rocheux ou affiche un ver funky "
 "dansant. Écrit par Conrad Parker; 2001."
 
-#: ../hacks/config/speedmine.xml.h:15
-msgid "SpeedMine"
-msgstr "SpeedMine"
-
-#: ../hacks/config/speedmine.xml.h:16
-msgid "Thrust"
-msgstr "Poussée"
-
-#: ../hacks/config/speedmine.xml.h:17
-msgid "Tunnel"
-msgstr "Tunnel GL"
-
-#: ../hacks/config/speedmine.xml.h:19 ../hacks/config/worm.xml.h:12
-msgid "Worm"
-msgstr "Ver"
-
-#: ../hacks/config/sphere.xml.h:8
+#: ../hacks/config/sphere.xml.h:9
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Draws shaded spheres in multiple colors. Written by Tom Duff "
@@ -8499,15 +8681,15 @@
 "la version 5.08. Dessine des sphères dans de multiples couleurs. Écrit par "
 "Tom Duff et Jamie Zawinski ; 1982, 1997."
 
-#: ../hacks/config/spheremonics.xml.h:19
-msgid "Smoothed lines"
-msgstr "Lignes lissées"
-
-#: ../hacks/config/spheremonics.xml.h:20
+#: ../hacks/config/spheremonics.xml.h:1
 msgid "Spheremonics"
 msgstr "Sphèremonics"
 
-#: ../hacks/config/spheremonics.xml.h:21
+#: ../hacks/config/spheremonics.xml.h:18
+msgid "Smoothed lines"
+msgstr "Lignes lissées"
+
+#: ../hacks/config/spheremonics.xml.h:23
 msgid ""
 "These closed objects are commonly called spherical harmonics, although they "
 "are only remotely related to the mathematical definition found in the "
@@ -8517,11 +8699,11 @@
 "al_harmonics Written by Paul Bourke and Jamie Zawinski; 2002."
 msgstr ""
 
-#: ../hacks/config/spiral.xml.h:10
+#: ../hacks/config/spiral.xml.h:1
 msgid "Spiral"
 msgstr "Spirale"
 
-#: ../hacks/config/spiral.xml.h:11
+#: ../hacks/config/spiral.xml.h:12
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Moving circular moire patterns. Written by Peter "
@@ -8531,7 +8713,15 @@
 "la version 5.08. Dessine des motifs circulaires moirés. Écrit par Peter "
 "Schmitzberger ; 1997."
 
-#: ../hacks/config/spotlight.xml.h:3
+#: ../hacks/config/spotlight.xml.h:1
+msgid "Spotlight"
+msgstr "Faisceau lumineux"
+
+#: ../hacks/config/spotlight.xml.h:9
+msgid "Spotlight size"
+msgstr "Taille du projecteur"
+
+#: ../hacks/config/spotlight.xml.h:12
 msgid ""
 "Draws a spotlight scanning across a black screen, illuminating the "
 "underlying desktop (or a picture) when it passes. Written by Rick Schultz "
@@ -8540,19 +8730,15 @@
 "Trace un faisceau lumineux qui parcourt un écran noir et illumine le bureau "
 "sous-jacent. Écrit par Rick Schultz et Jamie Zawinski; 1999."
 
-#: ../hacks/config/spotlight.xml.h:11
-msgid "Spotlight"
-msgstr "Faisceau lumineux"
-
-#: ../hacks/config/spotlight.xml.h:12
-msgid "Spotlight size"
-msgstr "Taille du projecteur"
-
 #: ../hacks/config/sproingies.xml.h:1
+msgid "Sproingies"
+msgstr "Sproingies"
+
+#: ../hacks/config/sproingies.xml.h:7
 msgid "Fall off edge"
 msgstr ""
 
-#: ../hacks/config/sproingies.xml.h:9
+#: ../hacks/config/sproingies.xml.h:11
 #, no-c-format
 msgid ""
 "Slinky-like creatures walk down an infinite staircase and occasionally "
@@ -8561,41 +8747,41 @@
 "http://en.wikipedia.org/wiki/Marble_Madness Written by Ed Mackey; 1997."
 msgstr ""
 
-#: ../hacks/config/sproingies.xml.h:10
-msgid "Sproingies"
-msgstr "Sproingies"
-
-#: ../hacks/config/squiral.xml.h:3
-msgid ""
-"Draws a set of interacting, square-spiral-producing automata. The spirals "
-"grow outward until they hit something, then they go around it. Written by "
-"Jeff Epler; 1999."
-msgstr ""
-"Dessine un ensemble d'automates qui interagissent et produisent des spirales "
-"carrées. Les spirales grandissent jusqu'à ce qu'elles heurtent un obstacle, "
-"qu'elles contournent. Écrit par Jeff Epler; 1999."
+#: ../hacks/config/squiral.xml.h:1
+msgid "Squiral"
+msgstr "Spirale carrées"
 
-#: ../hacks/config/squiral.xml.h:5
-msgid "Handedness"
-msgstr "Sens de rotation"
+#: ../hacks/config/squiral.xml.h:5 ../hacks/config/twang.xml.h:9
+msgid "Randomness"
+msgstr "Caractère aléatoire"
 
 #: ../hacks/config/squiral.xml.h:7
 msgid "Left"
 msgstr "Gauche"
 
-#: ../hacks/config/squiral.xml.h:11 ../hacks/config/twang.xml.h:12
-msgid "Randomness"
-msgstr "Caractère aléatoire"
+#: ../hacks/config/squiral.xml.h:8
+msgid "Handedness"
+msgstr "Sens de rotation"
 
-#: ../hacks/config/squiral.xml.h:12
+#: ../hacks/config/squiral.xml.h:9
 msgid "Right"
 msgstr "Droite"
 
-#: ../hacks/config/squiral.xml.h:17
-msgid "Squiral"
-msgstr "Spirale carrées"
+#: ../hacks/config/squiral.xml.h:18
+msgid ""
+"Draws a set of interacting, square-spiral-producing automata. The spirals "
+"grow outward until they hit something, then they go around it. Written by "
+"Jeff Epler; 1999."
+msgstr ""
+"Dessine un ensemble d'automates qui interagissent et produisent des spirales "
+"carrées. Les spirales grandissent jusqu'à ce qu'elles heurtent un obstacle, "
+"qu'elles contournent. Écrit par Jeff Epler; 1999."
 
 #: ../hacks/config/stairs.xml.h:1
+msgid "Stairs"
+msgstr "Escaliers"
+
+#: ../hacks/config/stairs.xml.h:6
 msgid ""
 "Escher's infinite staircase. "
 "http://en.wikipedia.org/wiki/Maurits_Cornelis_Escher Written by Marcelo "
@@ -8605,23 +8791,19 @@
 "http://fr.wikipedia.org/wiki/Maurits_Cornelis_Escher Écrit par Marcelo "
 "Vianna ; 1998."
 
-#: ../hacks/config/stairs.xml.h:6
-msgid "Stairs"
-msgstr "Escaliers"
+#: ../hacks/config/starfish.xml.h:1
+msgid "Starfish"
+msgstr "Étoile de mer"
 
 #: ../hacks/config/starfish.xml.h:3
 msgid "Color gradients"
 msgstr "Gradients de couleurs"
 
-#: ../hacks/config/starfish.xml.h:11
+#: ../hacks/config/starfish.xml.h:4
 msgid "Pulsating blob"
 msgstr ""
 
-#: ../hacks/config/starfish.xml.h:14
-msgid "Starfish"
-msgstr "Étoile de mer"
-
-#: ../hacks/config/starfish.xml.h:17
+#: ../hacks/config/starfish.xml.h:18
 msgid ""
 "This generates a sequence of undulating, throbbing, star-like patterns which "
 "pulsate, rotate, and turn inside out. Another display mode uses these shapes "
@@ -8634,90 +8816,90 @@
 "organique. Écrit par Jamie Zawinski; 1997."
 
 #: ../hacks/config/starwars.xml.h:1
-msgid "  Frame rate      Low"
-msgstr ""
+msgid "StarWars"
+msgstr "StarWars"
 
 #: ../hacks/config/starwars.xml.h:2
-msgid " Stars speed     Slow"
+msgid "  Frame rate      Low"
 msgstr ""
 
-#: ../hacks/config/starwars.xml.h:3
-msgid "Anti-aliased lines"
-msgstr "Lignes lissées"
-
-#: ../hacks/config/starwars.xml.h:5
-msgid ""
-"Draws a stream of text slowly scrolling into the distance at an angle, over "
-"a star field, like at the beginning of the movie of the same name. "
-"http://en.wikipedia.org/wiki/Star_Wars_opening_crawl Written by Jamie "
-"Zawinski and Claudio Matauoka; 2001."
+#: ../hacks/config/starwars.xml.h:4
+msgid "Scroll speed     Slow"
 msgstr ""
-"Dessine un flux de texte qui défile lentement à un angle donné, au-dessus "
-"d'un champ d'étoiles, comme au début d'un film célèbre. "
-"http://en.wikipedia.org/wiki/Star_Wars_opening_crawl  Écrit par Jamie "
-"Zawinski et Claudio Matauoka ; 2001."
 
 #: ../hacks/config/starwars.xml.h:6
-msgid "Fade out"
+msgid " Stars speed     Slow"
 msgstr ""
 
-#: ../hacks/config/starwars.xml.h:12
-msgid "Scroll speed     Slow"
+#: ../hacks/config/starwars.xml.h:10
+msgid "Wrap long lines"
 msgstr ""
 
-#: ../hacks/config/starwars.xml.h:14
-msgid "StarWars"
-msgstr "StarWars"
-
-#: ../hacks/config/starwars.xml.h:16
+#: ../hacks/config/starwars.xml.h:11
 msgid "Texture-mapped font"
 msgstr ""
 
-#: ../hacks/config/starwars.xml.h:17
+#: ../hacks/config/starwars.xml.h:12
+msgid "Anti-aliased lines"
+msgstr "Lignes lissées"
+
+#: ../hacks/config/starwars.xml.h:13
 msgid "Thick lines"
 msgstr "Lignes épaisses"
 
-#: ../hacks/config/starwars.xml.h:18
-msgid "Wrap long lines"
+#: ../hacks/config/starwars.xml.h:14
+msgid "Fade out"
 msgstr ""
 
-#: ../hacks/config/starwars.xml.h:19
+#: ../hacks/config/starwars.xml.h:18
 msgid "or, Text columns"
 msgstr ""
 
-#: ../hacks/config/stonerview.xml.h:1
+#: ../hacks/config/starwars.xml.h:19
 msgid ""
-"Chains of colorful squares dance around each other in complex spiral "
-"patterns. Inspired by David Tristram's `electropaint' screen saver, "
-"originally written for SGI computers in the late 1980s or early 1990s. "
-"Written by Andrew Plotkin; 2001."
+"Draws a stream of text slowly scrolling into the distance at an angle, over "
+"a star field, like at the beginning of the movie of the same name. "
+"http://en.wikipedia.org/wiki/Star_Wars_opening_crawl Written by Jamie "
+"Zawinski and Claudio Matauoka; 2001."
 msgstr ""
+"Dessine un flux de texte qui défile lentement à un angle donné, au-dessus "
+"d'un champ d'étoiles, comme au début d'un film célèbre. "
+"http://en.wikipedia.org/wiki/Star_Wars_opening_crawl  Écrit par Jamie "
+"Zawinski et Claudio Matauoka ; 2001."
 
-#: ../hacks/config/stonerview.xml.h:6
+#: ../hacks/config/stonerview.xml.h:1
 msgid "StonerView"
 msgstr "Spirale psyché"
 
-#: ../hacks/config/stonerview.xml.h:7
+#: ../hacks/config/stonerview.xml.h:6
 msgid "Translucent"
 msgstr "Translucide"
 
-#: ../hacks/config/strange.xml.h:1
-msgid "100k"
+#: ../hacks/config/stonerview.xml.h:8
+msgid ""
+"Chains of colorful squares dance around each other in complex spiral "
+"patterns. Inspired by David Tristram's `electropaint' screen saver, "
+"originally written for SGI computers in the late 1980s or early 1990s. "
+"Written by Andrew Plotkin; 2001."
 msgstr ""
 
-#: ../hacks/config/strange.xml.h:2
+#: ../hacks/config/strange.xml.h:1
+msgid "Strange"
+msgstr "Étrange"
+
+#: ../hacks/config/strange.xml.h:5
 msgid "1k"
 msgstr ""
 
-#: ../hacks/config/strange.xml.h:8
+#: ../hacks/config/strange.xml.h:6
 msgid "Number of points"
 msgstr "Nombre de points"
 
-#: ../hacks/config/strange.xml.h:10
-msgid "Strange"
-msgstr "Étrange"
+#: ../hacks/config/strange.xml.h:7
+msgid "100k"
+msgstr ""
 
-#: ../hacks/config/strange.xml.h:11
+#: ../hacks/config/strange.xml.h:12
 msgid ""
 "This draws iterations to strange attractors: it's a colorful, unpredictably-"
 "animating swarm of dots that swoops and twists around. "
@@ -8725,111 +8907,115 @@
 "Massimino Pascal; 1997."
 msgstr ""
 
-#: ../hacks/config/substrate.xml.h:2
+#: ../hacks/config/substrate.xml.h:1
+msgid "Substrate"
+msgstr "Substrat"
+
+#: ../hacks/config/substrate.xml.h:9
+msgid "Sand grains"
+msgstr "Grains de sables"
+
+#: ../hacks/config/substrate.xml.h:12
 #, no-c-format
 msgid "0%"
 msgstr "0 %"
 
-#: ../hacks/config/substrate.xml.h:5
+#: ../hacks/config/substrate.xml.h:13
 msgid "Circle percentage"
 msgstr ""
 
-#: ../hacks/config/substrate.xml.h:6
-msgid ""
-"Crystalline lines grow on a computational substrate. A simple perpendicular "
-"growth rule creates intricate city-like structures. Written by J. Tarbell "
-"and Mike Kershaw; 2004."
-msgstr ""
-
-#: ../hacks/config/substrate.xml.h:11
+#: ../hacks/config/substrate.xml.h:16
 msgid "Initial cracks"
 msgstr "Craquements initiaux"
 
-#: ../hacks/config/substrate.xml.h:15
-msgid "Sand grains"
-msgstr "Grains de sables"
-
-#: ../hacks/config/substrate.xml.h:18
-msgid "Substrate"
-msgstr "Substrat"
-
-#: ../hacks/config/substrate.xml.h:19
+#: ../hacks/config/substrate.xml.h:17
 msgid "Wireframe only"
 msgstr "Fil de fer"
 
-#: ../hacks/config/superquadrics.xml.h:8
-msgid "Morphing 3D shapes. Written by Ed Mackey; 1987, 1997."
-msgstr "Formes 3D qui se transphorment. Écrit par Ed Mackey ; 1987, 1997."
+#: ../hacks/config/substrate.xml.h:19
+msgid ""
+"Crystalline lines grow on a computational substrate. A simple perpendicular "
+"growth rule creates intricate city-like structures. Written by J. Tarbell "
+"and Mike Kershaw; 2004."
+msgstr ""
+
+#: ../hacks/config/superquadrics.xml.h:1
+msgid "Superquadrics"
+msgstr "Superquadriques"
 
-#: ../hacks/config/superquadrics.xml.h:12
+#: ../hacks/config/superquadrics.xml.h:6
 msgid "Spin speed"
 msgstr "Vitesse de rotation"
 
-#: ../hacks/config/superquadrics.xml.h:13
-msgid "Superquadrics"
-msgstr "Superquadriques"
+#: ../hacks/config/superquadrics.xml.h:14
+msgid "Morphing 3D shapes. Written by Ed Mackey; 1987, 1997."
+msgstr "Formes 3D qui se transphorment. Écrit par Ed Mackey ; 1987, 1997."
 
 #: ../hacks/config/surfaces.xml.h:1
-msgid "Bohemian Dome"
-msgstr "Dôme bohémien"
-
-#: ../hacks/config/surfaces.xml.h:2
-msgid "Catalan's Surface"
-msgstr "Surface de Catalan"
+msgid "Surfaces"
+msgstr "Surfaces"
 
-#: ../hacks/config/surfaces.xml.h:3
-msgid "Corkscrew Surface"
-msgstr ""
+#: ../hacks/config/surfaces.xml.h:8
+msgid "Random Surface"
+msgstr "Surface aléatoire"
 
-#: ../hacks/config/surfaces.xml.h:4
+#: ../hacks/config/surfaces.xml.h:9
 msgid "Dini's Surface"
 msgstr "Surface de Dini"
 
-#: ../hacks/config/surfaces.xml.h:6
+#: ../hacks/config/surfaces.xml.h:10
 msgid "Enneper's Surface"
 msgstr "Surface d'Enneper"
 
-#: ../hacks/config/surfaces.xml.h:8
-msgid "Henneberg's Surface"
-msgstr "Surface de Henneberg"
-
-#: ../hacks/config/surfaces.xml.h:10
+#: ../hacks/config/surfaces.xml.h:11
 msgid "Kuen Surface"
 msgstr "Surface de Kuen"
 
-#: ../hacks/config/surfaces.xml.h:11
-msgid "Line Loops"
+#: ../hacks/config/surfaces.xml.h:12
+msgid "Moebius Strip"
+msgstr "Anneau de Moebius"
+
+#: ../hacks/config/surfaces.xml.h:13
+msgid "Seashell"
+msgstr "Coquillage"
+
+#: ../hacks/config/surfaces.xml.h:14
+msgid "Swallowtail"
 msgstr ""
 
 #: ../hacks/config/surfaces.xml.h:15
-msgid "Moebius Strip"
-msgstr "Anneau de Moebius"
+msgid "Bohemian Dome"
+msgstr "Dôme bohémien"
 
 #: ../hacks/config/surfaces.xml.h:16
+msgid "Whitney Umbrella"
+msgstr ""
+
+#: ../hacks/config/surfaces.xml.h:17
 msgid "Pluecker's Conoid"
 msgstr "Conoïde de Pluecker"
 
-#: ../hacks/config/surfaces.xml.h:18
-msgid "Random Display Mode"
-msgstr "Style de l'affichage aléatoire"
+#: ../hacks/config/surfaces.xml.h:18
+msgid "Henneberg's Surface"
+msgstr "Surface de Henneberg"
 
 #: ../hacks/config/surfaces.xml.h:19
-msgid "Random Surface"
-msgstr "Surface aléatoire"
+msgid "Catalan's Surface"
+msgstr "Surface de Catalan"
 
 #: ../hacks/config/surfaces.xml.h:20
-msgid "Seashell"
-msgstr "Coquillage"
+msgid "Corkscrew Surface"
+msgstr ""
 
-#: ../hacks/config/surfaces.xml.h:24
-msgid "Surfaces"
-msgstr "Surfaces"
+#: ../hacks/config/surfaces.xml.h:21
+msgid "Random Display Mode"
+msgstr "Style de l'affichage aléatoire"
 
-#: ../hacks/config/surfaces.xml.h:25
-msgid "Swallowtail"
+#: ../hacks/config/surfaces.xml.h:24
+msgid "Line Loops"
 msgstr ""
 
-#: ../hacks/config/surfaces.xml.h:26
+#: ../hacks/config/surfaces.xml.h:28
 msgid ""
 "This draws a visualization of several interesting parametric surfaces. "
 "http://mathworld.wolfram.com/DinisSurface.html "
@@ -8863,44 +9049,48 @@
 "http://mathworld.wolfram.com/CorkscrewSurface.html Écrit par Andrey "
 "Mirtchovski et Carsten Steger ; 2003."
 
-#: ../hacks/config/surfaces.xml.h:28
-msgid "Whitney Umbrella"
-msgstr ""
+#: ../hacks/config/swirl.xml.h:1
+msgid "Swirl"
+msgstr "Tourbillon"
 
-#: ../hacks/config/swirl.xml.h:3
+#: ../hacks/config/swirl.xml.h:12
 msgid "Flowing, swirly patterns. Written by M. Dobie and R. Taylor; 1997."
 msgstr ""
 "Motifs fluides et tourbillonnants. Écrit par M. Dobie et R. Taylor; 1997."
 
-#: ../hacks/config/swirl.xml.h:11
-msgid "Swirl"
-msgstr "Tourbillon"
+#: ../hacks/config/t3d.xml.h:1
+msgid "T3D"
+msgstr "T3D"
 
-#: ../hacks/config/t3d.xml.h:2
-msgid "5 minute tick marks"
-msgstr ""
+#: ../hacks/config/t3d.xml.h:6
+msgid "Turn side-to-side"
+msgstr "Tourner face à face"
 
-#: ../hacks/config/t3d.xml.h:4
-msgid "Bigger"
-msgstr "Plus grand"
+#: ../hacks/config/t3d.xml.h:8
+msgid "Wobbliness"
+msgstr "Oscillation"
 
-#: ../hacks/config/t3d.xml.h:5
+#: ../hacks/config/t3d.xml.h:9
 msgid "Cycle seconds"
 msgstr ""
 
 #: ../hacks/config/t3d.xml.h:10
-msgid "Minute tick marks"
-msgstr ""
-
-#: ../hacks/config/t3d.xml.h:13
 msgid "Smaller"
 msgstr "Plus petit"
 
+#: ../hacks/config/t3d.xml.h:12
+msgid "Bigger"
+msgstr "Plus grand"
+
+#: ../hacks/config/t3d.xml.h:13
+msgid "Minute tick marks"
+msgstr ""
+
 #: ../hacks/config/t3d.xml.h:14
-msgid "T3D"
-msgstr "T3D"
+msgid "5 minute tick marks"
+msgstr ""
 
-#: ../hacks/config/t3d.xml.h:15
+#: ../hacks/config/t3d.xml.h:17
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Draws a working analog clock composed of floating, throbbing "
@@ -8910,39 +9100,35 @@
 "la version 5.08. Ceci dessine une horloge analogique composée de bulles "
 "flottantes et palpitantes. Écrit par Bernd Paysan ; 1999."
 
-#: ../hacks/config/t3d.xml.h:16
-msgid "Turn side-to-side"
-msgstr ""
-
-#: ../hacks/config/t3d.xml.h:17
-msgid "Wobbliness"
-msgstr "Oscillation"
-
-#: ../hacks/config/tangram.xml.h:12
-msgid ""
-"Solves tangram puzzles. http://en.wikipedia.org/wiki/Tangram Written by "
-"Jeremy English; 2005."
-msgstr ""
-"Résout les puzzles de Tangram. http://en.wikipedia.org/wiki/Tangram Écrit "
-"par Jeremy English ; 2005."
-
-#: ../hacks/config/tangram.xml.h:13
+#: ../hacks/config/tangram.xml.h:1
 msgid "Tangram"
 msgstr "Tangram"
 
-#: ../hacks/config/tangram.xml.h:15
+#: ../hacks/config/tangram.xml.h:9
 msgid "X rotation"
 msgstr "Rotation X"
 
-#: ../hacks/config/tangram.xml.h:16
+#: ../hacks/config/tangram.xml.h:11
 msgid "Y rotation"
 msgstr "Rotation Y"
 
-#: ../hacks/config/tangram.xml.h:17
+#: ../hacks/config/tangram.xml.h:12
 msgid "Z rotation"
 msgstr "Rotation Z"
 
+#: ../hacks/config/tangram.xml.h:17
+msgid ""
+"Solves tangram puzzles. http://en.wikipedia.org/wiki/Tangram Written by "
+"Jeremy English; 2005."
+msgstr ""
+"Résout les puzzles de Tangram. http://en.wikipedia.org/wiki/Tangram Écrit "
+"par Jeremy English ; 2005."
+
 #: ../hacks/config/thornbird.xml.h:1
+msgid "Thornbird"
+msgstr "Buisson épineux"
+
+#: ../hacks/config/thornbird.xml.h:17
 msgid ""
 "Displays a view of the \"Bird in a Thornbush\" fractal. Written by Tim "
 "Auckland; 2002."
@@ -8950,19 +9136,31 @@
 "Affiche la fractale de l'«oiseau dans un buisson épineux». Écrit par Tim "
 "Auckland; 2002."
 
-#: ../hacks/config/thornbird.xml.h:17
-msgid "Thornbird"
-msgstr "Buisson épineux"
-
 #: ../hacks/config/timetunnel.xml.h:1
+msgid "TimeTunnel"
+msgstr ""
+
+#: ../hacks/config/timetunnel.xml.h:2
 msgid "0 sec"
 msgstr "0 seconde"
 
 #: ../hacks/config/timetunnel.xml.h:3
+msgid "Start sequence time"
+msgstr "Durée de la séquence initiale"
+
+#: ../hacks/config/timetunnel.xml.h:5
+msgid "End sequence time"
+msgstr "Moment de fin de séquence"
+
+#: ../hacks/config/timetunnel.xml.h:6
 msgid "Draw logo"
 msgstr "Dessiner le logo"
 
-#: ../hacks/config/timetunnel.xml.h:4
+#: ../hacks/config/timetunnel.xml.h:7
+msgid "Run backward"
+msgstr "Tourner à l'envers"
+
+#: ../hacks/config/timetunnel.xml.h:9
 msgid ""
 "Draws an animation similar to the opening and closing effects on the Dr. Who "
 "TV show. Written by Sean P. Brennan; 2005."
@@ -8970,35 +9168,47 @@
 "Dessine une animation similaire aux effets d'ouverture et de fermeture de la "
 "série télévisée « Dr. Who ». Écrit par Sean P. Brennan ; 2005."
 
-#: ../hacks/config/timetunnel.xml.h:5
-msgid "End sequence time"
+#: ../hacks/config/topblock.xml.h:1
+msgid "TopBlock"
 msgstr ""
 
-#: ../hacks/config/timetunnel.xml.h:6
-msgid "Run backward"
+#: ../hacks/config/topblock.xml.h:6
+msgid "Drop speed"
 msgstr ""
 
-#: ../hacks/config/timetunnel.xml.h:8
-msgid "Start sequence time"
-msgstr "Durée de la séquence initiale"
+#: ../hacks/config/topblock.xml.h:9
+msgid "Carpet size"
+msgstr "Taille du tapis"
 
-#: ../hacks/config/timetunnel.xml.h:9
-msgid "TimeTunnel"
+#: ../hacks/config/topblock.xml.h:11
+msgid "Spawn likelyhood"
 msgstr ""
 
-#: ../hacks/config/topblock.xml.h:1
+#: ../hacks/config/topblock.xml.h:12
+msgid "Polygon count"
+msgstr "Nombre de polygones"
+
+#: ../hacks/config/topblock.xml.h:18
+msgid "Follow"
+msgstr "Suivre"
+
+#: ../hacks/config/topblock.xml.h:19
 msgid "Blob mode"
 msgstr "Mode des taches"
 
-#: ../hacks/config/topblock.xml.h:2
+#: ../hacks/config/topblock.xml.h:20
+msgid "Tunnel mode"
+msgstr "Mode tunnel"
+
+#: ../hacks/config/topblock.xml.h:21
 msgid "Carpet"
 msgstr "Tapis"
 
-#: ../hacks/config/topblock.xml.h:3
-msgid "Carpet size"
-msgstr "Taille du tapis"
+#: ../hacks/config/topblock.xml.h:22
+msgid "Nipples"
+msgstr "Tétines"
 
-#: ../hacks/config/topblock.xml.h:5
+#: ../hacks/config/topblock.xml.h:25
 msgid ""
 "Creates a 3D world with dropping blocks that build up and up. Written by "
 "rednuht; 2006."
@@ -9006,35 +9216,11 @@
 "Crée un monde en 3D avec des blocs qui descendent et construisent des "
 "structures. Écrit par Rednuht ; 2006."
 
-#: ../hacks/config/topblock.xml.h:6
-msgid "Drop speed"
-msgstr ""
-
-#: ../hacks/config/topblock.xml.h:9
-msgid "Follow"
-msgstr "Suivre"
-
-#: ../hacks/config/topblock.xml.h:15
-msgid "Nipples"
-msgstr "Tétines"
-
-#: ../hacks/config/topblock.xml.h:16
-msgid "Polygon count"
-msgstr "Nombre de polygones"
-
-#: ../hacks/config/topblock.xml.h:22
-msgid "Spawn likelyhood"
-msgstr ""
-
-#: ../hacks/config/topblock.xml.h:23
-msgid "TopBlock"
-msgstr ""
-
-#: ../hacks/config/topblock.xml.h:24
-msgid "Tunnel mode"
-msgstr "Mode tunnel"
+#: ../hacks/config/triangle.xml.h:1
+msgid "Triangle"
+msgstr "Triangle"
 
-#: ../hacks/config/triangle.xml.h:2
+#: ../hacks/config/triangle.xml.h:9
 msgid ""
 "Generates random mountain ranges using iterative subdivision of triangles. "
 "Written by Tobias Gloth; 1997."
@@ -9042,65 +9228,80 @@
 "Génère des chaînes de montagne aléatoires en utilisant la subdivision "
 "itérative de triangles. Écrit par Tobias Gloth; 1997."
 
-#: ../hacks/config/triangle.xml.h:8
-msgid "Triangle"
-msgstr "Triangle"
+#: ../hacks/config/tronbit.xml.h:1
+msgid "TronBit"
+msgstr ""
 
-#: ../hacks/config/truchet.xml.h:6
+#: ../hacks/config/tronbit.xml.h:12
 msgid ""
-"This draws line- and arc-based truchet patterns that tile the screen. "
-"http://en.wikipedia.org/wiki/Tessellation Written by Adrian Likins; 1998."
+"Draws an animation of the character \"Bit\" from the film, \"Tron\". The "
+"\"yes\" state is a tetrahedron; the \"no\" state is the second stellation of "
+"an icosahedron; and the idle state oscillates between a small triambic "
+"icosahedron and the compound of an icosahedron and a dodecahedron. "
+"http://en.wikipedia.org/wiki/List_of_Tron_characters#Bit "
+"http://en.wikipedia.org/wiki/Uniform_polyhedra "
+"http://en.wikipedia.org/wiki/Stellation Written by Jamie Zawinski; 2011."
 msgstr ""
 
-#: ../hacks/config/truchet.xml.h:7
+#: ../hacks/config/truchet.xml.h:1
 msgid "Truchet"
 msgstr "Truchet"
 
-#: ../hacks/config/twang.xml.h:3
-msgid "Border width"
-msgstr "Largeur de la bordure"
-
-#: ../hacks/config/twang.xml.h:4
+#: ../hacks/config/truchet.xml.h:7
 msgid ""
-"Divides the screen into a grid, and plucks them. Written by Dan Bornstein; "
-"2002."
+"This draws line- and arc-based truchet patterns that tile the screen. "
+"http://en.wikipedia.org/wiki/Tessellation Written by Adrian Likins; 1998."
 msgstr ""
-"Divise l'écran en petits rectangles, qui sont ensuite secoués. Écrit par Dan "
-"Bornstein; 2002."
 
-#: ../hacks/config/twang.xml.h:9
+#: ../hacks/config/twang.xml.h:1
+msgid "Twang"
+msgstr "Twang"
+
+#: ../hacks/config/twang.xml.h:10
 msgid "Jumpy"
 msgstr "Sautillant"
 
-#: ../hacks/config/twang.xml.h:16
+#: ../hacks/config/twang.xml.h:12
 msgid "Springiness"
 msgstr "Flexibilité"
 
-#: ../hacks/config/twang.xml.h:18
+#: ../hacks/config/twang.xml.h:13
 msgid "Transference"
 msgstr "Migration"
 
+#: ../hacks/config/twang.xml.h:17
+msgid "Border width"
+msgstr "Largeur de la bordure"
+
 #: ../hacks/config/twang.xml.h:19
-msgid "Twang"
-msgstr "Twang"
+msgid ""
+"Divides the screen into a grid, and plucks them. Written by Dan Bornstein; "
+"2002."
+msgstr ""
+"Divise l'écran en petits rectangles, qui sont ensuite secoués. Écrit par Dan "
+"Bornstein; 2002."
 
 #: ../hacks/config/vermiculate.xml.h:1
+msgid "Vermiculate"
+msgstr "Vermiculé"
+
+#: ../hacks/config/vermiculate.xml.h:6
 msgid "Draws squiggly worm-like paths. Written by Tyler Pierce; 2001."
 msgstr "Trace des gribouillis vermiculés. Écrit par Tyler Pierce; 2001."
 
-#: ../hacks/config/vermiculate.xml.h:6
-msgid "Vermiculate"
-msgstr "Vermiculé"
+#: ../hacks/config/vidwhacker.xml.h:1
+msgid "VidWhacker"
+msgstr "VidWhacker"
 
 #: ../hacks/config/vidwhacker.xml.h:2
 msgid "2 seconds"
 msgstr "2 secondes"
 
-#: ../hacks/config/vidwhacker.xml.h:4
+#: ../hacks/config/vidwhacker.xml.h:5
 msgid "Image directory"
 msgstr "Dossier des images"
 
-#: ../hacks/config/vidwhacker.xml.h:6
+#: ../hacks/config/vidwhacker.xml.h:7
 msgid ""
 "This is a shell script that grabs a frame of video from the system's video "
 "input, and then uses some PBM filters (chosen at random) to manipulate and "
@@ -9117,11 +9318,11 @@
 "programme fonctionne très bien si vous le reliez à un téléviseur. Écrit par "
 "Jamie Zawinski; 1998."
 
-#: ../hacks/config/vidwhacker.xml.h:7
-msgid "VidWhacker"
-msgstr "VidWhacker"
+#: ../hacks/config/vines.xml.h:1
+msgid "Vines"
+msgstr "Vignes"
 
-#: ../hacks/config/vines.xml.h:7
+#: ../hacks/config/vines.xml.h:9
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Generates a continuous sequence of small, curvy geometric "
@@ -9133,49 +9334,45 @@
 "puis il efface l'écran et recommence. Écrit par Tracy Camp et David Hansen ; "
 "1997."
 
-#: ../hacks/config/vines.xml.h:9
-msgid "Vines"
-msgstr "Vignes"
+#: ../hacks/config/voronoi.xml.h:1
+msgid "Voronoi"
+msgstr "Voronoi"
+
+#: ../hacks/config/voronoi.xml.h:9
+msgid "Point size"
+msgstr "Taille des points"
 
-#: ../hacks/config/voronoi.xml.h:2
+#: ../hacks/config/voronoi.xml.h:10
 msgid "50 pixels"
 msgstr "50 pixels"
 
-#: ../hacks/config/voronoi.xml.h:4
-msgid ""
-"Draws a randomly-colored Voronoi tessellation, and periodically zooms in and "
-"adds new points. The existing points also wander around. There are a set of "
-"control points on the plane, each at the center of a colored cell. Every "
-"pixel within that cell is closer to that cell's control point than to any "
-"other control point. That is what determines the cell's shapes. "
-"http://en.wikipedia.org/wiki/Voronoi_diagram Written by Jamie Zawinski; 2007."
-msgstr ""
-
-#: ../hacks/config/voronoi.xml.h:8
+#: ../hacks/config/voronoi.xml.h:13
 msgid "Insertion speed"
 msgstr "Vitesse d'insertion"
 
-#: ../hacks/config/voronoi.xml.h:10
-msgid "Point size"
-msgstr "Taille des points"
-
 #: ../hacks/config/voronoi.xml.h:14
-msgid "Voronoi"
-msgstr "Voronoi"
+msgid "Zoom speed"
+msgstr "Vitesse du zoom"
 
-#: ../hacks/config/voronoi.xml.h:16
+#: ../hacks/config/voronoi.xml.h:15
 msgid "Zoom frequency"
 msgstr "Fréquence de zoom"
 
 #: ../hacks/config/voronoi.xml.h:17
-msgid "Zoom speed"
-msgstr "Vitesse du zoom"
+msgid ""
+"Draws a randomly-colored Voronoi tessellation, and periodically zooms in and "
+"adds new points. The existing points also wander around. There are a set of "
+"control points on the plane, each at the center of a colored cell. Every "
+"pixel within that cell is closer to that cell's control point than to any "
+"other control point. That is what determines the cell's shapes. "
+"http://en.wikipedia.org/wiki/Voronoi_diagram Written by Jamie Zawinski; 2007."
+msgstr ""
 
-#: ../hacks/config/wander.xml.h:3
+#: ../hacks/config/wander.xml.h:10
 msgid "Draw spots"
 msgstr "Affiche des points lumineux"
 
-#: ../hacks/config/wander.xml.h:4
+#: ../hacks/config/wander.xml.h:14
 msgid ""
 "Draws a colorful random-walk, in various forms. "
 "http://en.wikipedia.org/wiki/Random_walk Written by Rick Campbell; 1999."
@@ -9184,36 +9381,40 @@
 "http://en.wikipedia.org/wiki/Random_walk Écrit par Rick Campbell ; 1999."
 
 #: ../hacks/config/webcollage.xml.h:1
-msgid "2 min"
-msgstr "2 minutes"
-
-#: ../hacks/config/webcollage.xml.h:2
-msgid "2 secs"
-msgstr "2 secondes"
-
-#: ../hacks/config/webcollage.xml.h:3
-msgid "30 secs"
-msgstr "30 secondes"
+msgid "WebCollage"
+msgstr "Collage Web"
 
-#: ../hacks/config/webcollage.xml.h:4
+#: ../hacks/config/webcollage.xml.h:3
 msgid "Delay between images"
 msgstr "Délai entre les images"
 
+#: ../hacks/config/webcollage.xml.h:4
+msgid "30 secs"
+msgstr "30 secondes"
+
 #: ../hacks/config/webcollage.xml.h:5
-msgid "Image opacity"
-msgstr "Opacité des images"
+msgid "2 secs"
+msgstr "2 secondes"
 
 #: ../hacks/config/webcollage.xml.h:6
 msgid "Network timeout"
 msgstr ""
 
+#: ../hacks/config/webcollage.xml.h:7
+msgid "2 min"
+msgstr "2 minutes"
+
+#: ../hacks/config/webcollage.xml.h:9
+msgid "Image opacity"
+msgstr "Opacité des images"
+
 #. 
 #. <string id="filter"  _label="Per-image filter program" arg="-filter %"/>
 #. <string id="filter2" _label="Overall filter program" arg="-filter2 %"/>
 #. <file id="dictionary" _label="Dictionary file" arg="-dictionary %"/>
 #. <file id="dir" _label="Image directory" arg="-directory %"/>
 #. 
-#: ../hacks/config/webcollage.xml.h:16
+#: ../hacks/config/webcollage.xml.h:18
 msgid ""
 "This makes collages out of random images pulled off of the World Wide Web. "
 "It finds these images by doing random web searches, and then extracting "
@@ -9223,12 +9424,24 @@
 "nudity. Please act accordingly. See also http://www.jwz.org/webcollage/ "
 "Written by Jamie Zawinski; 1999."
 msgstr ""
+"Ce programme colle des images aléatoires trouvées sur le World Wide Web. Il "
+"les trouve en faisant des recherches aléatoires sur le web puis extrait les "
+"images des pages renvoyées. ATTENTION : Internet contient parfois de la "
+"PORNOGRAPHIE. Internet étant ce qu'il est, absolument n'importe quoi "
+"pourrait être affiché dans le patchwork, incluant, a priori, pornographie et "
+"autres images possiblement choquantes. Veuillez agir en conséquence et "
+"conscience de ceci. Voir aussi http://www.jwz.org/webcollage/ Écrit par "
+"Jamie Zawinski ; 1999."
 
-#: ../hacks/config/webcollage.xml.h:18
-msgid "WebCollage"
-msgstr "Collage Web"
+#: ../hacks/config/whirlwindwarp.xml.h:1
+msgid "WhirlWindWarp"
+msgstr ""
+
+#: ../hacks/config/whirlwindwarp.xml.h:6
+msgid "Trail size"
+msgstr "Taille des traînées"
 
-#: ../hacks/config/whirlwindwarp.xml.h:2
+#: ../hacks/config/whirlwindwarp.xml.h:9
 msgid ""
 "Floating stars are acted upon by a mixture of simple 2D forcefields. The "
 "strength of each forcefield changes continuously, and it is also switched on "
@@ -9239,102 +9452,92 @@
 "Les champs sont également  activés et désactivés au hasard. Par Paul 'Joey' "
 "Clark; 2001."
 
-#: ../hacks/config/whirlwindwarp.xml.h:8
-msgid "Trail size"
-msgstr "Taille des traînées"
-
-#: ../hacks/config/whirlwindwarp.xml.h:9
-msgid "WhirlWindWarp"
-msgstr ""
-
 #: ../hacks/config/whirlygig.xml.h:1
-msgid "Explain modes"
-msgstr "Expliquer les modes"
+msgid "Whirlygig"
+msgstr "Whirlygig"
 
-#: ../hacks/config/whirlygig.xml.h:3
-msgid "Leave a trail"
-msgstr "Laisser des traînées"
+#: ../hacks/config/whirlygig.xml.h:2
+msgid "Whirlies"
+msgstr "Tourbillons"
+
+#: ../hacks/config/whirlygig.xml.h:5
+msgid "X speed"
+msgstr "Vitesse X"
 
 #: ../hacks/config/whirlygig.xml.h:7
-msgid ""
-"This screen saver was removed from the XScreenSaver distribution as of "
-"version 5.08. Draws zooming chains of sinusoidal spots. Written by Ashton "
-"Trey Belew; 2001."
+msgid "Y speed"
 msgstr ""
-"Cet écran de veille a été retiré de la distribution de XScreenSaver depuis "
-"la version 5.08. Dessine des chaînes grossissantes de tâches sinusoïdales. "
-"Écrit par Ashton Trey Belew en 2001."
 
 #: ../hacks/config/whirlygig.xml.h:8
-msgid "Whirlies"
-msgstr "Tourbillons"
+msgid "X amplitude"
+msgstr "Amplitude X"
 
 #: ../hacks/config/whirlygig.xml.h:9
-msgid "Whirlygig"
-msgstr "Whirlygig"
+msgid "Y amplitude"
+msgstr "Amplitude Y"
 
 #: ../hacks/config/whirlygig.xml.h:10
-msgid "Wrap the screen"
-msgstr "Faire le tour de l'écran"
+msgid "X random"
+msgstr "Niveau aléatoire de X"
 
 #: ../hacks/config/whirlygig.xml.h:11
-msgid "X amplitude"
-msgstr "Amplitude X"
+msgid "X spin"
+msgstr "Rotation X"
 
 #: ../hacks/config/whirlygig.xml.h:12
-msgid "X circle"
+msgid "X funky"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:13
-msgid "X fun"
-msgstr ""
+msgid "X circle"
+msgstr "Circularité X"
 
 #: ../hacks/config/whirlygig.xml.h:14
-msgid "X funky"
-msgstr ""
+msgid "X linear"
+msgstr "Linéarité X"
 
 #: ../hacks/config/whirlygig.xml.h:15
-msgid "X innie"
-msgstr ""
+msgid "X test"
+msgstr "Test X"
 
 #: ../hacks/config/whirlygig.xml.h:16
-msgid "X linear"
+msgid "X fun"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:17
-msgid "X lissajous"
+msgid "X innie"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:18
-msgid "X random"
+msgid "X lissajous"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:19
-msgid "X speed"
+msgid "Y random"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:20
-msgid "X spin"
+msgid "Y spin"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:21
-msgid "X test"
+msgid "Y funky"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:22
-msgid "Y amplitude"
-msgstr ""
+msgid "Y circle"
+msgstr "Circularité Y"
 
 #: ../hacks/config/whirlygig.xml.h:23
-msgid "Y circle"
-msgstr ""
+msgid "Y linear"
+msgstr "Linéarité Y"
 
 #: ../hacks/config/whirlygig.xml.h:24
-msgid "Y fun"
+msgid "Y test"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:25
-msgid "Y funky"
+msgid "Y fun"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:26
@@ -9342,30 +9545,32 @@
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:27
-msgid "Y linear"
+msgid "Y lissajous"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:28
-msgid "Y lissajous"
-msgstr ""
+msgid "Leave a trail"
+msgstr "Laisser des traînées"
 
 #: ../hacks/config/whirlygig.xml.h:29
-msgid "Y random"
-msgstr ""
+msgid "Explain modes"
+msgstr "Expliquer les modes"
 
 #: ../hacks/config/whirlygig.xml.h:30
-msgid "Y speed"
-msgstr ""
-
-#: ../hacks/config/whirlygig.xml.h:31
-msgid "Y spin"
-msgstr ""
+msgid "Wrap the screen"
+msgstr "Faire le tour de l'écran"
 
 #: ../hacks/config/whirlygig.xml.h:32
-msgid "Y test"
+msgid ""
+"This screen saver was removed from the XScreenSaver distribution as of "
+"version 5.08. Draws zooming chains of sinusoidal spots. Written by Ashton "
+"Trey Belew; 2001."
 msgstr ""
+"Cet écran de veille a été retiré de la distribution de XScreenSaver depuis "
+"la version 5.08. Dessine des chaînes grossissantes de tâches sinusoïdales. "
+"Écrit par Ashton Trey Belew en 2001."
 
-#: ../hacks/config/worm.xml.h:10
+#: ../hacks/config/worm.xml.h:12
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Draws multicolored worms that crawl around the screen. Written "
@@ -9376,25 +9581,25 @@
 "l'écran. Écrit par Brad Taylor, Dave Lemke, Boris Putanec, et Henrik "
 "Theiling ; 1991."
 
-#: ../hacks/config/wormhole.xml.h:3
-msgid ""
-"Flying through a colored wormhole in space. Written by Jon Rafkind; 2004."
-msgstr ""
-"Voler à travers un tunnel coloré dans l'espace. Écrit par Jon Rafkind ; 2004."
+#: ../hacks/config/wormhole.xml.h:1
+msgid "Wormhole"
+msgstr "Trou de Ver"
 
-#: ../hacks/config/wormhole.xml.h:10
+#: ../hacks/config/wormhole.xml.h:6
 msgid "Star speed"
 msgstr "Vitesse des étoiles"
 
-#: ../hacks/config/wormhole.xml.h:11
+#: ../hacks/config/wormhole.xml.h:9
 msgid "Stars created"
 msgstr "Étoiles créées"
 
 #: ../hacks/config/wormhole.xml.h:12
-msgid "Wormhole"
-msgstr "Trou de Ver"
+msgid ""
+"Flying through a colored wormhole in space. Written by Jon Rafkind; 2004."
+msgstr ""
+"Voler à travers un tunnel coloré dans l'espace. Écrit par Jon Rafkind ; 2004."
 
-#: ../hacks/config/xanalogtv.xml.h:2
+#: ../hacks/config/xanalogtv.xml.h:1
 msgid "XAnalogTV"
 msgstr "X TV analogique"
 
@@ -9415,6 +9620,15 @@
 "Blackwell ; 2003."
 
 #: ../hacks/config/xflame.xml.h:1
+msgid "XFlame"
+msgstr "XFlame"
+
+#. #### -vartrend [20]
+#: ../hacks/config/xflame.xml.h:6
+msgid "Enable blooming"
+msgstr "Activer la floraison"
+
+#: ../hacks/config/xflame.xml.h:8
 msgid ""
 "Draws a simulation of pulsing fire. It can also take an arbitrary image and "
 "set it on fire too. Written by Carsten Haitzler and many others; 1999."
@@ -9423,26 +9637,21 @@
 "image arbitraire et lui mettre le feu. Écrit par Carsten Haitzler, avec de "
 "nombreuses contributions; 1999."
 
-#. #### -vartrend [20]
-#: ../hacks/config/xflame.xml.h:3
-msgid "Enable blooming"
-msgstr "Activer la floraison"
-
-#: ../hacks/config/xflame.xml.h:8
-msgid "XFlame"
-msgstr "XFlame"
+#: ../hacks/config/xjack.xml.h:1
+msgid "XJack"
+msgstr "XJack"
 
-#: ../hacks/config/xjack.xml.h:6
+#: ../hacks/config/xjack.xml.h:7
 msgid ""
 "This behaves schizophrenically and makes a lot of typos. Written by Jamie "
 "Zawinski; 1997."
 msgstr ""
 
-#: ../hacks/config/xjack.xml.h:7
-msgid "XJack"
-msgstr "XJack"
+#: ../hacks/config/xlyap.xml.h:1
+msgid "XLyap"
+msgstr "XLyap"
 
-#: ../hacks/config/xlyap.xml.h:9
+#: ../hacks/config/xlyap.xml.h:10
 msgid ""
 "This generates pretty fractal pictures via the Lyapunov exponent. "
 "http://en.wikipedia.org/wiki/Lyapunov_exponent Written by Ron Record; 1997."
@@ -9451,63 +9660,60 @@
 "l'exposant de Lyapunov. http://en.wikipedia.org/wiki/Lyapunov_exponent Écrit "
 "par Ron Record ; 1997."
 
-#: ../hacks/config/xlyap.xml.h:10
-msgid "XLyap"
-msgstr "XLyap"
-
-#: ../hacks/config/xmatrix.xml.h:3
-msgid ""
-"Draws dropping characters similar to what is seen on the computer monitors "
-"in \"The Matrix\". See also \"GLMatrix\" for a 3D rendering of the similar "
-"effect that appeared in the movie's title sequence. Written by Jamie "
-"Zawinski; 1999."
-msgstr ""
-"Dessine des caractères défilant de la même manière que sur les écrans "
-"d'ordinateur du film « Matrix ». Voir aussi « GLMatrix » pour un rendu 3D du "
-"même effet qui apparaît dans le générique du film. Écrit par Jamie "
-"Zawinski ; 1999."
-
-#: ../hacks/config/xmatrix.xml.h:4
-msgid "Expansion algorithm"
-msgstr "Algorithme d'expansion"
+#: ../hacks/config/xmatrix.xml.h:1
+msgid "XMatrix"
+msgstr "Xmatrix"
 
-#: ../hacks/config/xmatrix.xml.h:10
-msgid "Knock knock"
-msgstr "Toc toc"
+#: ../hacks/config/xmatrix.xml.h:2
+msgid "Small font"
+msgstr "Petite police"
 
-#: ../hacks/config/xmatrix.xml.h:11
+#: ../hacks/config/xmatrix.xml.h:3
 msgid "Large font"
 msgstr "Grande police"
 
-#: ../hacks/config/xmatrix.xml.h:14
-msgid "Phone number"
-msgstr "Numéro de téléphone"
-
-#: ../hacks/config/xmatrix.xml.h:15
+#: ../hacks/config/xmatrix.xml.h:8
 msgid "Piped ASCII text"
 msgstr ""
 
-#: ../hacks/config/xmatrix.xml.h:16
-msgid "Run trace program"
-msgstr ""
+#: ../hacks/config/xmatrix.xml.h:9
+msgid "Synergistic algorithm"
+msgstr "Algorithme synergique"
 
-#: ../hacks/config/xmatrix.xml.h:18
+#: ../hacks/config/xmatrix.xml.h:10
 msgid "Slider algorithm"
 msgstr "Algorithme de coulissement"
 
-#: ../hacks/config/xmatrix.xml.h:19
-msgid "Small font"
-msgstr "Petite police"
+#: ../hacks/config/xmatrix.xml.h:11
+msgid "Expansion algorithm"
+msgstr "Algorithme d'expansion"
 
-#: ../hacks/config/xmatrix.xml.h:21
-msgid "Synergistic algorithm"
-msgstr "Algorithme synergique"
+#: ../hacks/config/xmatrix.xml.h:12
+msgid "Run trace program"
+msgstr ""
+
+#: ../hacks/config/xmatrix.xml.h:13
+msgid "Knock knock"
+msgstr "Toc toc"
+
+#: ../hacks/config/xmatrix.xml.h:14
+msgid "Phone number"
+msgstr "Numéro de téléphone"
 
 #: ../hacks/config/xmatrix.xml.h:22
-msgid "XMatrix"
-msgstr "Xmatrix"
+msgid ""
+"Draws the \"digital rain\" effect, as seen on the computer monitors in \"The "
+"Matrix\". See also \"GLMatrix\" for a 3D rendering of the similar effect "
+"that appeared in the movie's title sequence. "
+"http://en.wikipedia.org/wiki/Matrix_digital_rain Written by Jamie Zawinski; "
+"1999."
+msgstr ""
 
 #: ../hacks/config/xrayswarm.xml.h:1
+msgid "XRaySwarm"
+msgstr "XRaySwarm"
+
+#: ../hacks/config/xrayswarm.xml.h:6
 msgid ""
 "Draws a few swarms of critters flying around the screen, with faded color "
 "trails behind them. Written by Chris Leger; 2000."
@@ -9515,47 +9721,43 @@
 "Dessine quelques nuées de bestioles qui volent sur l'écran, avec de jolies "
 "traînées dans des fondus de couleur. Écrit par Chris Leger; 2000."
 
-#: ../hacks/config/xrayswarm.xml.h:6
-msgid "XRaySwarm"
-msgstr "XRaySwarm"
+#: ../hacks/config/xspirograph.xml.h:1
+msgid "XSpirograph"
+msgstr "XSpiroGraph"
 
-#: ../hacks/config/xspirograph.xml.h:9
+#: ../hacks/config/xspirograph.xml.h:10
 msgid ""
 "Simulates that pen-in-nested-plastic-gears toy from your childhood. "
 "http://en.wikipedia.org/wiki/Spirograph Written by Rohit Singh; 2000."
 msgstr ""
 
-#: ../hacks/config/xspirograph.xml.h:10
-msgid "XSpirograph"
-msgstr "XSpiroGraph"
+#: ../hacks/config/zoom.xml.h:8
+msgid "X magnification"
+msgstr "Agrandissement selon X"
 
-#: ../hacks/config/zoom.xml.h:1
-msgid "    Y lens offset"
-msgstr ""
+#: ../hacks/config/zoom.xml.h:9
+msgid " X border width"
+msgstr " Épaisseur de la bordure X"
 
-#: ../hacks/config/zoom.xml.h:2
+#: ../hacks/config/zoom.xml.h:10
 msgid "   X lens offset"
 msgstr ""
 
-#: ../hacks/config/zoom.xml.h:3
-msgid " X border width"
-msgstr " Épaisseur de la bordure X"
+#: ../hacks/config/zoom.xml.h:11
+msgid "Y magnification"
+msgstr "Agrandissement selon Y"
 
-#: ../hacks/config/zoom.xml.h:4
+#: ../hacks/config/zoom.xml.h:12
 msgid " Y border width"
 msgstr " Épaisseur de la bordure Y"
 
-#: ../hacks/config/zoom.xml.h:10
-msgid "Lenses"
-msgstr "Lentilles"
-
 #: ../hacks/config/zoom.xml.h:13
-msgid "X magnification"
-msgstr "Agrandissement selon X"
+msgid "    Y lens offset"
+msgstr ""
 
 #: ../hacks/config/zoom.xml.h:14
-msgid "Y magnification"
-msgstr "Agrandissement selon Y"
+msgid "Lenses"
+msgstr "Lentilles"
 
 #: ../hacks/config/zoom.xml.h:16
 msgid ""
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/xz.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/xz.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/xz.po	2012-01-02 17:27:31.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/xz.po	2012-02-23 06:31:55.000000000 +0000
@@ -14,8 +14,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-12-29 18:28+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:14+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: src/xz/args.c:337
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/yasm.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/yasm.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/yasm.po	2012-01-02 17:27:18.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/yasm.po	2012-02-23 06:31:42.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:26+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:28+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: frontends/yasm/yasm-options.c:87
 #, c-format
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/zeitgeist-datahub.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/zeitgeist-datahub.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/zeitgeist-datahub.po	2012-01-02 17:27:36.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/zeitgeist-datahub.po	2012-02-23 06:31:59.000000000 +0000
@@ -7,20 +7,20 @@
 msgstr ""
 "Project-Id-Version: zeitgeist-datahub\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-22 17:12+0000\n"
+"POT-Creation-Date: 2012-02-15 12:00+0000\n"
 "PO-Revision-Date: 2011-10-05 14:44+0000\n"
 "Last-Translator: Alexandre Franke <alexandre.franke@gmail.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:36+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 02:13+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../src/zeitgeist-datahub.desktop.in.h:1
-msgid "Start the Zeitgeist Datahub for passive loggers"
-msgstr "Démarrer Zeitgeist Datahub pour les journalisations passives."
-
-#: ../src/zeitgeist-datahub.desktop.in.h:2
 msgid "Zeitgeist Datahub"
 msgstr "Zeitgeist Datahub"
+
+#: ../src/zeitgeist-datahub.desktop.in.h:2
+msgid "Start the Zeitgeist Datahub for passive loggers"
+msgstr "Démarrer Zeitgeist Datahub pour les journalisations passives."
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/zeitgeist.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/zeitgeist.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/zeitgeist.po	2012-01-02 17:27:31.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/zeitgeist.po	2012-02-23 06:31:55.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 18:29+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:14+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: fr\n"
 
 #: ../zeitgeist-daemon.py:72 ../zeitgeist-daemon.py:85
diff -Nru language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/zenmap.po language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/zenmap.po
--- language-pack-fr-base-12.04+20111229/data/fr/LC_MESSAGES/zenmap.po	2012-01-02 17:26:56.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/data/fr/LC_MESSAGES/zenmap.po	2012-02-23 06:31:22.000000000 +0000
@@ -11,8 +11,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:05+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:53+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "X-Poedit-Country: FRANCE\n"
 "X-Poedit-Language: French\n"
 
diff -Nru language-pack-fr-base-12.04+20111229/debian/changelog language-pack-fr-base-12.04+20120221/debian/changelog
--- language-pack-fr-base-12.04+20111229/debian/changelog	2012-01-02 17:26:41.000000000 +0000
+++ language-pack-fr-base-12.04+20120221/debian/changelog	2012-02-23 06:31:08.000000000 +0000
@@ -1,6 +1,6 @@
-language-pack-fr-base (1:12.04+20111229) precise; urgency=low
+language-pack-fr-base (1:12.04+20120221) precise; urgency=low
 
   * Initial Release.
 
- -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Mon, 02 Jan 2012 17:26:41 +0000
+ -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Thu, 23 Feb 2012 06:31:08 +0000