diff --git a/locale/fr/LC_MESSAGES/plater.po b/locale/fr/LC_MESSAGES/plater.po
index 9113445..6e1ddb0 100644
--- a/locale/fr/LC_MESSAGES/plater.po
+++ b/locale/fr/LC_MESSAGES/plater.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plater\n"
-"POT-Creation-Date: 2012-02-26 02:40+CET\n"
+"POT-Creation-Date: 2012-08-04 21:53+CEST\n"
 "PO-Revision-Date: 2012-02-26 02:41+0100\n"
 "Last-Translator: Guillaume Seguin <guillaume@segu.in>\n"
 "Language-Team: FR <guillaume@segu.in>\n"
@@ -15,81 +15,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: plater.py:247
+#: plater.py:246
 msgid "Plate building tool"
 msgstr "Outil d'assemblage de plateau"
 
-#: plater.py:253
+#: plater.py:252
 msgid "Clear"
 msgstr "Vider"
 
-#: plater.py:254
+#: plater.py:253
 msgid "Load"
 msgstr "Charger"
 
-#: plater.py:256
+#: plater.py:255 plater.py:258
 msgid "Export"
 msgstr "Exporter"
 
-#: plater.py:259
+#: plater.py:260
 msgid "Done"
 msgstr "Terminé"
 
-#: plater.py:261
+#: plater.py:262
 msgid "Cancel"
 msgstr "Annuler"
 
-#: plater.py:263
+#: plater.py:264
 msgid "Snap to Z = 0"
 msgstr "Poser en Z = 0"
 
-#: plater.py:264
+#: plater.py:265
 msgid "Put at 100, 100"
 msgstr "Placer en 100, 100"
 
-#: plater.py:265
+#: plater.py:266
 msgid "Delete"
 msgstr "Supprimer"
 
-#: plater.py:266
+#: plater.py:267
 msgid "Auto"
 msgstr "Auto"
 
-#: plater.py:290
+#: plater.py:291
 msgid "Autoplating"
 msgstr "Placement auto"
 
-#: plater.py:318
+#: plater.py:319
 msgid "Bed full, sorry sir :("
 msgstr "Le lit est plein, désolé :("
 
-#: plater.py:328
+#: plater.py:329
 msgid ""
 "Are you sure you want to clear the grid? All unsaved changes will be lost."
 msgstr ""
 "Êtes vous sur de vouloir vider la grille ? Toutes les modifications non "
 "enregistrées seront perdues."
 
-#: plater.py:328
+#: plater.py:329
 msgid "Clear the grid?"
 msgstr "Vider la grille ?"
 
-#: plater.py:370
+#: plater.py:371
 msgid "Pick file to save to"
 msgstr "Choisir le fichier dans lequel enregistrer"
 
-#: plater.py:371
+#: plater.py:372
 msgid "STL files (;*.stl;*.STL;)"
 msgstr "Fichiers STL (;*.stl;*.STL;)"
 
-#: plater.py:391
+#: plater.py:393
 msgid "wrote %s"
 msgstr "%s écrit"
 
-#: plater.py:394
+#: plater.py:396
 msgid "Pick file to load"
 msgstr "Choisir le fichier à charger"
 
-#: plater.py:395
+#: plater.py:397
 msgid "STL files (;*.stl;*.STL;)|*.stl|OpenSCAD files (;*.scad;)|*.scad"
 msgstr "Fichiers STL (;*.stl;*.STL;)|*.stl|Fichiers OpenSCAD (;*.scad;)|*.scad"
diff --git a/locale/fr/LC_MESSAGES/pronterface.po b/locale/fr/LC_MESSAGES/pronterface.po
index e1b5dfc..8094fae 100644
--- a/locale/fr/LC_MESSAGES/pronterface.po
+++ b/locale/fr/LC_MESSAGES/pronterface.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pronterface jm1\n"
-"POT-Creation-Date: 2012-03-16 03:48+CET\n"
+"POT-Creation-Date: 2012-08-04 22:00+CEST\n"
 "PO-Revision-Date: 2012-03-16 03:50+0100\n"
 "Last-Translator: Guillaume Seguin <guillaume@segu.in>\n"
 "Language-Team: FR <c.laguilhon.debat@gmail.com>\n"
@@ -15,13 +15,49 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: pronterface.py:30
+#: printrun/pronterface_widgets.py:34
+msgid "Find"
+msgstr ""
+
+#: printrun/pronterface_widgets.py:36
+msgid "Save"
+msgstr "Enregistrer"
+
+#: printrun/pronterface_widgets.py:41 pronterface.py:467 pronterface.py:1523
+msgid "Cancel"
+msgstr "Annuler"
+
+#: printrun/pronterface_widgets.py:125
+msgid "Edit settings"
+msgstr "Modifier les paramètres"
+
+#: printrun/pronterface_widgets.py:127
+msgid "Defaults"
+msgstr "Paramètres par défaut"
+
+#: printrun/pronterface_widgets.py:156
+msgid "Custom button"
+msgstr "Commande personnalisée"
+
+#: printrun/pronterface_widgets.py:161
+msgid "Button title"
+msgstr "Titre du bouton"
+
+#: printrun/pronterface_widgets.py:164
+msgid "Command"
+msgstr "Commande"
+
+#: printrun/pronterface_widgets.py:173
+msgid "Color"
+msgstr "Couleur"
+
+#: pronterface.py:26
 msgid "WX is not installed. This program requires WX to run."
 msgstr ""
 "wxWidgets n'est pas installé. Ce programme nécessite la librairie wxWidgets "
 "pour fonctionner."
 
-#: pronterface.py:81
+#: pronterface.py:90
 msgid ""
 "Dimensions of Build Platform\n"
 " & optional offset of origin\n"
@@ -32,55 +68,71 @@ msgid ""
 "   XXXxYYYxZZZ+OffX+OffY+OffZ"
 msgstr ""
 
-#: pronterface.py:82
+#: pronterface.py:91
 msgid "Last Set Temperature for the Heated Print Bed"
 msgstr "Dernière température du plateau chauffant définie"
 
-#: pronterface.py:83
+#: pronterface.py:92
 msgid "Folder of last opened file"
 msgstr "Dossier du dernier fichier ouvert"
 
-#: pronterface.py:84
+#: pronterface.py:93
 msgid "Last Temperature of the Hot End"
 msgstr "Dernière température de la buse définie"
 
-#: pronterface.py:85
+#: pronterface.py:94
 msgid "Width of Extrusion in Preview (default: 0.5)"
 msgstr "Largeur de l'extrusion dans la prévisualisation (défaut : 0.5)"
 
-#: pronterface.py:86
+#: pronterface.py:95
 msgid "Fine Grid Spacing (default: 10)"
 msgstr "Espacement fin de la grille (défaut : 10)"
 
-#: pronterface.py:87
+#: pronterface.py:96
 msgid "Coarse Grid Spacing (default: 50)"
 msgstr "Espacement large de la grille (défaut : 50)"
 
-#: pronterface.py:88
+#: pronterface.py:97
 msgid "Pronterface background color (default: #FFFFFF)"
 msgstr "Couleur de fond de la Pronterface (défaut : #FFFFFF)"
 
-#: pronterface.py:91
+#: pronterface.py:100
 msgid "Printer Interface"
 msgstr "Interface de l'imprimante"
 
-#: pronterface.py:109
+#: pronterface.py:118
 msgid "Motors off"
 msgstr "Arrêter les moteurs"
 
-#: pronterface.py:110
+#: pronterface.py:118
+msgid "Switch all motors off"
+msgstr "Arrêter tous les moteurs"
+
+#: pronterface.py:119
+msgid "Check current hotend temperature"
+msgstr "Vérifier la température actuelle de la buse"
+
+#: pronterface.py:119
 msgid "Check temp"
 msgstr "Lire les températures"
 
-#: pronterface.py:111
+#: pronterface.py:120
+msgid "Advance extruder by set length"
+msgstr "Extruder sur la longueur donnée"
+
+#: pronterface.py:120
 msgid "Extrude"
 msgstr "Extruder"
 
-#: pronterface.py:112
+#: pronterface.py:121
 msgid "Reverse"
 msgstr "Inverser"
 
-#: pronterface.py:130
+#: pronterface.py:121
+msgid "Reverse extruder by set length"
+msgstr "Inverser l'extrudeur sur la longueur donnée"
+
+#: pronterface.py:139
 msgid ""
 "# I moved all your custom buttons into .pronsolerc.\n"
 "# Please don't add them here any more.\n"
@@ -91,7 +143,7 @@ msgstr ""
 "# Veuillez ne plus en ajouter ici.\n"
 "# Une sauvegarde de vos anciens boutons est dans le fichier custombtn.old\n"
 
-#: pronterface.py:135
+#: pronterface.py:144
 msgid ""
 "Note!!! You have specified custom buttons in both custombtn.txt and ."
 "pronsolerc"
@@ -99,36 +151,44 @@ msgstr ""
 "Remarque! Vous avez spécifié des boutons personnalisés dans custombtn.txt et "
 "aussi dans .pronsolerc"
 
-#: pronterface.py:136
+#: pronterface.py:145
 msgid ""
 "Ignoring custombtn.txt. Remove all current buttons to revert to custombtn.txt"
 msgstr ""
 "custombtn.txt ignoré. Retirez tous les boutons en cours pour revenir à "
 "custombtn.txt"
 
-#: pronterface.py:165 pronterface.py:520 pronterface.py:1343
-#: pronterface.py:1397 pronterface.py:1521 pronterface.py:1555
-#: pronterface.py:1567
+#: pronterface.py:174
+msgid "Failed to start web interface"
+msgstr "Échec du lancement de l'interface web"
+
+#: pronterface.py:178
+msgid "CherryPy is not installed. Web Interface Disabled."
+msgstr "CherryPy n'est pas installé. L'interface web est désactivée."
+
+#: pronterface.py:189 pronterface.py:593 pronterface.py:1513
+#: pronterface.py:1566 pronterface.py:1692 pronterface.py:1726
+#: pronterface.py:1739
 msgid "Print"
 msgstr "Imprimer"
 
-#: pronterface.py:169
+#: pronterface.py:197
 msgid "Printer is now online."
-msgstr "L'imprimante est connectée"
+msgstr "Imprimante connectée."
 
-#: pronterface.py:170
+#: pronterface.py:198
 msgid "Disconnect"
 msgstr "Déconnecter"
 
-#: pronterface.py:229
+#: pronterface.py:321
 msgid "Setting hotend temperature to %f degrees Celsius."
 msgstr "Réglage de la température de la buse à %f degrés Celsius."
 
-#: pronterface.py:248 pronterface.py:284 pronterface.py:346
+#: pronterface.py:324 pronterface.py:346 pronterface.py:418
 msgid "Printer is not online."
-msgstr "L'imprimante est déconnectée"
+msgstr "Imprimante déconnectée."
 
-#: pronterface.py:250
+#: pronterface.py:326
 msgid ""
 "You cannot set negative temperatures. To turn the hotend off entirely, set "
 "its temperature to 0."
@@ -136,15 +196,15 @@ msgstr ""
 "Vous ne pouvez pas régler une température négative. Pour éteindre la buse, "
 "réglez sa température à 0°C."
 
-#: pronterface.py:252
+#: pronterface.py:328 pronterface.py:354
 msgid "You must enter a temperature. (%s)"
 msgstr "Vous devez saisir une température. (%s)"
 
-#: pronterface.py:265
+#: pronterface.py:343
 msgid "Setting bed temperature to %f degrees Celsius."
 msgstr "Réglage de la température du plateau à %f degrés Celsius."
 
-#: pronterface.py:286
+#: pronterface.py:350
 msgid ""
 "You cannot set negative temperatures. To turn the bed off entirely, set its "
 "temperature to 0."
@@ -152,343 +212,323 @@ msgstr ""
 "Vous ne pouvez pas régler une température négative. Pour désactiver votre "
 "plateau chauffant, réglez sa température à 0°C."
 
-#: pronterface.py:288
-msgid "You must enter a temperature."
-msgstr "Vous devez saisir une température."
-
-#: pronterface.py:303
+#: pronterface.py:371
 msgid "Do you want to erase the macro?"
 msgstr "Voulez-vous effacer la macro ?"
 
-#: pronterface.py:307
+#: pronterface.py:375
 msgid "Cancelled."
 msgstr "Annulé"
 
-#: pronterface.py:352
+#: pronterface.py:426
 msgid " Opens file"
 msgstr " Ouvrir un fichier"
 
-#: pronterface.py:352
+#: pronterface.py:426
 msgid "&Open..."
 msgstr "&Ouvrir..."
 
-#: pronterface.py:353
+#: pronterface.py:427
 msgid " Edit open file"
 msgstr " Éditer le fichier ouvert"
 
-#: pronterface.py:353
+#: pronterface.py:427
 msgid "&Edit..."
 msgstr "&Éditer..."
 
-#: pronterface.py:354
+#: pronterface.py:428
 msgid " Clear output console"
 msgstr " Effacer le contenu de la console de sortie"
 
-#: pronterface.py:354
+#: pronterface.py:428
 msgid "Clear console"
 msgstr "Effacer la console"
 
-#: pronterface.py:355
+#: pronterface.py:429
 msgid " Project slices"
 msgstr " Projeter les couches"
 
-#: pronterface.py:355
+#: pronterface.py:429
 msgid "Projector"
 msgstr "Projecteur"
 
-#: pronterface.py:356
+#: pronterface.py:430
 msgid " Closes the Window"
 msgstr " Quitter le programme"
 
-#: pronterface.py:356
+#: pronterface.py:430
 msgid "E&xit"
 msgstr "&Quitter"
 
-#: pronterface.py:357
+#: pronterface.py:431
 msgid "&File"
 msgstr "&Fichier"
 
-#: pronterface.py:362
+#: pronterface.py:436
 msgid "&Macros"
 msgstr "&Macros"
 
-#: pronterface.py:363
+#: pronterface.py:437
 msgid "<&New...>"
 msgstr "<&Nouvelle...>"
 
-#: pronterface.py:364
+#: pronterface.py:438
 msgid " Options dialog"
 msgstr " Fenêtre des options"
 
-#: pronterface.py:364
+#: pronterface.py:438
 msgid "&Options"
 msgstr "&Options"
 
-#: pronterface.py:366
+#: pronterface.py:440
 msgid " Adjust slicing settings"
 msgstr " Régler les paramètres de slicing"
 
-#: pronterface.py:366
+#: pronterface.py:440
 msgid "Slicing Settings"
 msgstr "Paramètres de slicing"
 
-#: pronterface.py:373
+#: pronterface.py:442
 msgid "&Settings"
 msgstr "&Paramètres"
 
-#: pronterface.py:389
+#: pronterface.py:457
 msgid "Enter macro name"
 msgstr "Saisissez le nom de la macro"
 
-#: pronterface.py:392
+#: pronterface.py:460
 msgid "Macro name:"
 msgstr "Nom :"
 
-#: pronterface.py:395
+#: pronterface.py:463
 msgid "Ok"
 msgstr "Valider"
 
-#: pronterface.py:399 pronterface.py:1354 pronterface.py:1613
-msgid "Cancel"
-msgstr "Annuler"
+#: pronterface.py:485
+msgid "Macro name may contain only ASCII alphanumeric symbols and underscores"
+msgstr ""
+"Un nom de macro ne peut contenir que des caractères alphanumérique ASCII et "
+"des underscore (_)"
 
-#: pronterface.py:417
+#: pronterface.py:490
 msgid "Name '%s' is being used by built-in command"
 msgstr "Le nom '%s' est utilisé par une commande interne"
 
-#: pronterface.py:420
-msgid "Macro name may contain only alphanumeric symbols and underscores"
-msgstr ""
-"Un nom de macro ne peut contenir que des caractères alphanumérique et des "
-"underscore (_)"
-
-#: pronterface.py:469
+#: pronterface.py:538
 msgid "Port"
 msgstr "Port"
 
-#: pronterface.py:488
+#: pronterface.py:560
 msgid "Connect"
 msgstr "Connecter"
 
-#: pronterface.py:490
-msgid "Connect to the printer"
-msgstr "Connecter l'imprimante"
-
-#: pronterface.py:492
+#: pronterface.py:564
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: pronterface.py:495 pronterface.py:772
-msgid "Mini mode"
-msgstr "Mode réduit"
-
-#: pronterface.py:499
-msgid "Monitor Printer"
-msgstr "Surveiller l'imprimante"
-
-#: pronterface.py:509
+#: pronterface.py:579
 msgid "Load file"
 msgstr "Charger un fichier"
 
-#: pronterface.py:512
+#: pronterface.py:583
 msgid "Compose"
 msgstr "Composer"
 
-#: pronterface.py:516
+#: pronterface.py:588
 msgid "SD"
 msgstr "SD"
 
-#: pronterface.py:524 pronterface.py:1398 pronterface.py:1444
-#: pronterface.py:1495 pronterface.py:1520 pronterface.py:1554
-#: pronterface.py:1570
+#: pronterface.py:598 pronterface.py:1567 pronterface.py:1618
+#: pronterface.py:1668 pronterface.py:1691 pronterface.py:1725
+#: pronterface.py:1742
 msgid "Pause"
 msgstr "Pause"
 
-#: pronterface.py:537
+#: pronterface.py:616
 msgid "Send"
 msgstr "Envoyer"
 
-#: pronterface.py:545 pronterface.py:646
-msgid "mm/min"
-msgstr "mm/min"
-
-#: pronterface.py:547
+#: pronterface.py:657
 msgid "XY:"
 msgstr "XY:"
 
-#: pronterface.py:549
-msgid "Z:"
-msgstr "Z:"
+#: pronterface.py:659
+msgid "mm/min   Z:"
+msgstr "mm/min   Z:"
 
-#: pronterface.py:572 pronterface.py:653
-msgid "Heater:"
-msgstr "Buse :"
+#: pronterface.py:664
+msgid "Watch"
+msgstr "Surveiller"
 
-#: pronterface.py:575 pronterface.py:595
+#: pronterface.py:669
+msgid "Heat:"
+msgstr "Buse:"
+
+#: pronterface.py:672 pronterface.py:695
 msgid "Off"
 msgstr "Off"
 
-#: pronterface.py:587 pronterface.py:607
+#: pronterface.py:686 pronterface.py:709
 msgid "Set"
 msgstr "Régler"
 
-#: pronterface.py:592 pronterface.py:655
+#: pronterface.py:692
 msgid "Bed:"
 msgstr "Plateau :"
 
-#: pronterface.py:640
+#: pronterface.py:742
 msgid "mm"
 msgstr "mm"
 
-#: pronterface.py:698 pronterface.py:1206 pronterface.py:1438
+#: pronterface.py:750
+msgid ""
+"mm/\n"
+"min"
+msgstr ""
+"mm/\n"
+"min"
+
+#: pronterface.py:807 pronterface.py:1373 pronterface.py:1612
 msgid "Not connected to printer."
 msgstr "Imprimante non connectée."
 
-#: pronterface.py:727
+#: pronterface.py:854
 msgid "SD Upload"
 msgstr "Copier sur SD"
 
-#: pronterface.py:731
+#: pronterface.py:858
 msgid "SD Print"
 msgstr "Imprimer depuis SD"
 
-#: pronterface.py:779
+#: pronterface.py:899
+msgid "Mini mode"
+msgstr "Mode réduit"
+
+#: pronterface.py:906
 msgid "Full mode"
 msgstr "Mode complet"
 
-#: pronterface.py:804
+#: pronterface.py:931
 msgid "Execute command: "
 msgstr "Exécuter la commande :"
 
-#: pronterface.py:815
+#: pronterface.py:942
 msgid "click to add new custom button"
 msgstr "Ajouter un bouton personnalisé"
 
-#: pronterface.py:834
+#: pronterface.py:964
 msgid ""
 "Defines custom button. Usage: button <num> \"title\" [/c \"colour\"] command"
 msgstr ""
 "Définit des boutons personnalidés. Utilisation : <numero> \"Libelle\" [/c "
 "\"couleur\"] commande"
 
-#: pronterface.py:856
+#: pronterface.py:988
 msgid "Custom button number should be between 0 and 63"
 msgstr ""
 "Les numéros des boutons personnalisés doivent être compris entre 0 et 63."
 
-#: pronterface.py:948
+#: pronterface.py:1081
 msgid "Edit custom button '%s'"
 msgstr "Editer le bouton personnalisé '%s'"
 
-#: pronterface.py:950
+#: pronterface.py:1083
 msgid "Move left <<"
 msgstr "Déplacer vers la gauche <<"
 
-#: pronterface.py:953
+#: pronterface.py:1086
 msgid "Move right >>"
 msgstr "Déplacer vers la droite >>"
 
-#: pronterface.py:957
+#: pronterface.py:1090
 msgid "Remove custom button '%s'"
 msgstr "Supprimer le bouton personnalisé '%s'"
 
-#: pronterface.py:960
+#: pronterface.py:1093
 msgid "Add custom button"
 msgstr "Ajouter un bouton personnalisé"
 
-#: pronterface.py:1105
+#: pronterface.py:1255
 msgid "event object missing"
 msgstr "événement d'objet manquant"
 
-#: pronterface.py:1133
+#: pronterface.py:1288
 msgid "Invalid period given."
 msgstr "La période donnée est invalide"
 
-#: pronterface.py:1136
+#: pronterface.py:1293
 msgid "Monitoring printer."
 msgstr "Imprimante sous surveillance."
 
-#: pronterface.py:1138
+#: pronterface.py:1297
 msgid "Done monitoring."
 msgstr "Surveillance de l'imprimante effectuée."
 
-#: pronterface.py:1160
-msgid "Printer is online. "
-msgstr "L'imprimante est connectée. "
-
-#: pronterface.py:1162 pronterface.py:1341
-msgid "Loaded "
-msgstr "Chargé "
-
-#: pronterface.py:1165
-msgid "Bed"
-msgstr "Plateau"
-
-#: pronterface.py:1165
-msgid "Hotend"
-msgstr "Buse"
-
-#: pronterface.py:1175
+#: pronterface.py:1345
 msgid " SD printing:%04.2f %%"
 msgstr " Impression SD : %04.2f %%"
 
-#: pronterface.py:1178
+#: pronterface.py:1348
 msgid " Printing:%04.2f %% |"
 msgstr " Impression : %04.2f %% |"
 
-#: pronterface.py:1179
+#: pronterface.py:1349
 msgid " Line# %d of %d lines |"
 msgstr " Ligne# %d sur %d lignes |"
 
-#: pronterface.py:1184
+#: pronterface.py:1354
 msgid " Est: %s of %s remaining | "
 msgstr " ETA: %s restant sur %s | "
 
-#: pronterface.py:1186
+#: pronterface.py:1356
 msgid " Z: %0.2f mm"
 msgstr " Z: %0.2f mm"
 
-#: pronterface.py:1257
+#: pronterface.py:1427
 msgid "Opening file failed."
 msgstr "L'ouverture du fichier a échoué"
 
-#: pronterface.py:1263
+#: pronterface.py:1433
 msgid "Starting print"
 msgstr "Début de l'impression..."
 
-#: pronterface.py:1286
+#: pronterface.py:1454
 msgid "Pick SD file"
 msgstr "Choisir un fichier sur la carte SD"
 
-#: pronterface.py:1286
+#: pronterface.py:1454
 msgid "Select the file to print"
 msgstr "Sélectionnez le fichier à imprimer :"
 
-#: pronterface.py:1321
+#: pronterface.py:1489
 msgid "Failed to execute slicing software: "
 msgstr "Une erreur s'est produite lors du slicing : "
 
-#: pronterface.py:1328
+#: pronterface.py:1498
 msgid "Slicing..."
 msgstr "Slicing..."
 
-#: pronterface.py:1341
+#: pronterface.py:1511
 msgid ", %d lines"
 msgstr ", %d lignes"
 
-#: pronterface.py:1348
+#: pronterface.py:1511
+msgid "Loaded "
+msgstr "Chargé "
+
+#: pronterface.py:1518
 msgid "Load File"
 msgstr "Charger un fichier"
 
-#: pronterface.py:1355
+#: pronterface.py:1524
 msgid "Slicing "
 msgstr "Slicing "
 
-#: pronterface.py:1374
+#: pronterface.py:1543
 msgid "Open file to print"
 msgstr "Ouvrir un fichier à imprimer"
 
-#: pronterface.py:1375
+#: pronterface.py:1544
 msgid ""
 "OBJ, STL, and GCODE files (*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ)|*."
 "gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ|All Files (*.*)|*.*"
@@ -496,19 +536,19 @@ msgstr ""
 "Fichiers OBJ, STL et GCODE (;*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ;)|*."
 "gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ|Tous les fichiers (*.*)|*.*"
 
-#: pronterface.py:1382
+#: pronterface.py:1551
 msgid "File not found!"
 msgstr "Fichier non trouvé"
 
-#: pronterface.py:1396
+#: pronterface.py:1565
 msgid "Loaded %s, %d lines"
 msgstr "%s chargé, %d lignes"
 
-#: pronterface.py:1406
+#: pronterface.py:1575
 msgid "mm of filament used in this print\n"
 msgstr "mm de filament utilisés pour cette impression\n"
 
-#: pronterface.py:1407
+#: pronterface.py:1576 pronterface.py:1578
 msgid ""
 "the print goes from %f mm to %f mm in X\n"
 "and is %f mm wide\n"
@@ -516,7 +556,7 @@ msgstr ""
 "L'impression va de %f mm à %f mm en X\n"
 "et mesure %f mm de large\n"
 
-#: pronterface.py:1408
+#: pronterface.py:1579
 msgid ""
 "the print goes from %f mm to %f mm in Y\n"
 "and is %f mm wide\n"
@@ -524,7 +564,7 @@ msgstr ""
 "L'impression va de %f mm à %f mm en Y\n"
 "et mesure %f mm de large\n"
 
-#: pronterface.py:1409
+#: pronterface.py:1580
 msgid ""
 "the print goes from %f mm to %f mm in Z\n"
 "and is %f mm high\n"
@@ -532,78 +572,50 @@ msgstr ""
 "L'impression va de %f mm à %f mm en Y\n"
 "et mesure %f mm de haut\n"
 
-#: pronterface.py:1410
+#: pronterface.py:1582
 msgid "Estimated duration (pessimistic): "
 msgstr "Durée estimée (pessimiste) : "
 
-#: pronterface.py:1435
+#: pronterface.py:1609
 msgid "No file loaded. Please use load first."
 msgstr "Aucun fichier chargé. Veuillez charger un fichier avant."
 
-#: pronterface.py:1446
+#: pronterface.py:1620
 msgid "Restart"
 msgstr "Recommencer"
 
-#: pronterface.py:1450
+#: pronterface.py:1624
 msgid "File upload complete"
 msgstr "Envoi du fichier terminé"
 
-#: pronterface.py:1469
+#: pronterface.py:1643
 msgid "Pick SD filename"
 msgstr "Lister les fichiers sur la carte SD"
 
-#: pronterface.py:1477
+#: pronterface.py:1650
 msgid "Paused."
 msgstr "En pause."
 
-#: pronterface.py:1488
+#: pronterface.py:1661
 msgid "Resume"
 msgstr "Reprendre"
 
-#: pronterface.py:1504
+#: pronterface.py:1675
 msgid "Connecting..."
 msgstr "Connection en cours..."
 
-#: pronterface.py:1535
+#: pronterface.py:1705
 msgid "Disconnected."
 msgstr "Déconnecté."
 
-#: pronterface.py:1562
+#: pronterface.py:1732
 msgid "Reset."
 msgstr "Réinitialisée."
 
-#: pronterface.py:1563
+#: pronterface.py:1733
 msgid "Are you sure you want to reset the printer?"
 msgstr "Etes-vous sûr de vouloir réinitialiser l'imprimante?"
 
-#: pronterface.py:1563
+#: pronterface.py:1733
 msgid "Reset?"
 msgstr "Réinitialiser ?"
-
-#: pronterface.py:1609
-msgid "Save"
-msgstr "Enregistrer"
-
-#: pronterface.py:1665
-msgid "Edit settings"
-msgstr "Modifier les paramètres"
-
-#: pronterface.py:1667
-msgid "Defaults"
-msgstr "Paramètres par défaut"
-
-#: pronterface.py:1696
-msgid "Custom button"
-msgstr "Commande personnalisée"
-
-#: pronterface.py:1701
-msgid "Button title"
-msgstr "Titre du bouton"
-
-#: pronterface.py:1704
-msgid "Command"
-msgstr "Commande"
-
-#: pronterface.py:1713
-msgid "Color"
-msgstr "Couleur"
diff --git a/locale/pronterface.pot b/locale/pronterface.pot
index 4272433..0168bdd 100644
--- a/locale/pronterface.pot
+++ b/locale/pronterface.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-08-04 21:53+CEST\n"
+"POT-Creation-Date: 2012-08-04 22:00+CEST\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,6 +15,42 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 
 
+#: printrun/pronterface_widgets.py:34
+msgid "Find"
+msgstr ""
+
+#: printrun/pronterface_widgets.py:36
+msgid "Save"
+msgstr ""
+
+#: printrun/pronterface_widgets.py:41 pronterface.py:467 pronterface.py:1523
+msgid "Cancel"
+msgstr ""
+
+#: printrun/pronterface_widgets.py:125
+msgid "Edit settings"
+msgstr ""
+
+#: printrun/pronterface_widgets.py:127
+msgid "Defaults"
+msgstr ""
+
+#: printrun/pronterface_widgets.py:156
+msgid "Custom button"
+msgstr ""
+
+#: printrun/pronterface_widgets.py:161
+msgid "Button title"
+msgstr ""
+
+#: printrun/pronterface_widgets.py:164
+msgid "Command"
+msgstr ""
+
+#: printrun/pronterface_widgets.py:173
+msgid "Color"
+msgstr ""
+
 #: pronterface.py:26
 msgid "WX is not installed. This program requires WX to run."
 msgstr ""
@@ -247,10 +283,6 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: pronterface.py:467 pronterface.py:1523
-msgid "Cancel"
-msgstr ""
-
 #: pronterface.py:485
 msgid "Macro name may contain only ASCII alphanumeric symbols and underscores"
 msgstr ""
@@ -306,7 +338,7 @@ msgid "Watch"
 msgstr ""
 
 #: pronterface.py:669
-msgid "Heat"
+msgid "Heat:"
 msgstr ""
 
 #: pronterface.py:672 pronterface.py:695
diff --git a/pronterface.py b/pronterface.py
index 90581d6..8d57dd1 100755
--- a/pronterface.py
+++ b/pronterface.py
@@ -666,7 +666,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
         lls.Add(self.monitorbox,pos=(2,6))
         self.monitorbox.Bind(wx.EVT_CHECKBOX,self.setmonitor)
 
-        lls.Add(wx.StaticText(self.panel,-1,_("Heat")),pos=(2,0),span=(1,1),flag=wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT)
+        lls.Add(wx.StaticText(self.panel,-1,_("Heat:")),pos=(2,0),span=(1,1),flag=wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT)
         htemp_choices=[self.temps[i]+" ("+i+")" for i in sorted(self.temps.keys(),key=lambda x:self.temps[x])]
 
         self.settoff=wx.Button(self.panel,-1,_("Off"),size=(36,-1),style=wx.BU_EXACTFIT)