Fix wrong automated change, update pot and French translation

locale/fr/LC_MESSAGES/pronterface.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pronterface jm1\n"
-"POT-Creation-Date: 2012-08-04 22:00+CEST\n"
+"POT-Creation-Date: 2012-08-08 10:09+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"
@@ -17,13 +17,13 @@ msgstr ""
 
 #: printrun/pronterface_widgets.py:34
 msgid "Find"
-msgstr ""
+msgstr "Trouver"
 
 #: printrun/pronterface_widgets.py:36
 msgid "Save"
 msgstr "Enregistrer"
 
-#: printrun/pronterface_widgets.py:41 pronterface.py:467 pronterface.py:1523
+#: printrun/pronterface_widgets.py:41 pronterface.py:477 pronterface.py:1535
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -57,7 +57,7 @@ msgstr ""
 "wxWidgets n'est pas installé. Ce programme nécessite la librairie wxWidgets "
 "pour fonctionner."
 
-#: pronterface.py:90
+#: pronterface.py:93
 msgid ""
 "Dimensions of Build Platform\n"
 " & optional offset of origin\n"
@@ -68,71 +68,71 @@ msgid ""
 "   XXXxYYYxZZZ+OffX+OffY+OffZ"
 msgstr ""
 
-#: pronterface.py:91
+#: pronterface.py:94
 msgid "Last Set Temperature for the Heated Print Bed"
 msgstr "Dernière température du plateau chauffant définie"
 
-#: pronterface.py:92
+#: pronterface.py:95
 msgid "Folder of last opened file"
 msgstr "Dossier du dernier fichier ouvert"
 
-#: pronterface.py:93
+#: pronterface.py:96
 msgid "Last Temperature of the Hot End"
 msgstr "Dernière température de la buse définie"
 
-#: pronterface.py:94
+#: pronterface.py:97
 msgid "Width of Extrusion in Preview (default: 0.5)"
 msgstr "Largeur de l'extrusion dans la prévisualisation (défaut : 0.5)"
 
-#: pronterface.py:95
+#: pronterface.py:98
 msgid "Fine Grid Spacing (default: 10)"
 msgstr "Espacement fin de la grille (défaut : 10)"
 
-#: pronterface.py:96
+#: pronterface.py:99
 msgid "Coarse Grid Spacing (default: 50)"
 msgstr "Espacement large de la grille (défaut : 50)"
 
-#: pronterface.py:97
+#: pronterface.py:100
 msgid "Pronterface background color (default: #FFFFFF)"
 msgstr "Couleur de fond de la Pronterface (défaut : #FFFFFF)"
 
-#: pronterface.py:100
+#: pronterface.py:103
 msgid "Printer Interface"
 msgstr "Interface de l'imprimante"
 
-#: pronterface.py:118
+#: pronterface.py:122
 msgid "Motors off"
 msgstr "Arrêter les moteurs"
 
-#: pronterface.py:118
+#: pronterface.py:122
 msgid "Switch all motors off"
 msgstr "Arrêter tous les moteurs"
 
-#: pronterface.py:119
+#: pronterface.py:123
 msgid "Check current hotend temperature"
 msgstr "Vérifier la température actuelle de la buse"
 
-#: pronterface.py:119
+#: pronterface.py:123
 msgid "Check temp"
 msgstr "Lire les températures"
 
-#: pronterface.py:120
+#: pronterface.py:124
 msgid "Advance extruder by set length"
 msgstr "Extruder sur la longueur donnée"
 
-#: pronterface.py:120
+#: pronterface.py:124
 msgid "Extrude"
 msgstr "Extruder"
 
-#: pronterface.py:121
+#: pronterface.py:125
 msgid "Reverse"
 msgstr "Inverser"
 
-#: pronterface.py:121
+#: pronterface.py:125
 msgid "Reverse extruder by set length"
 msgstr "Inverser l'extrudeur sur la longueur donnée"
 
-#: pronterface.py:139
+#: pronterface.py:143
 msgid ""
 "# I moved all your custom buttons into .pronsolerc.\n"
 "# Please don't add them here any more.\n"
@@ -143,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:144
+#: pronterface.py:148
 msgid ""
 "Note!!! You have specified custom buttons in both custombtn.txt and ."
 "pronsolerc"
@@ -151,44 +151,44 @@ msgstr ""
 "Remarque! Vous avez spécifié des boutons personnalisés dans custombtn.txt et "
 "aussi dans .pronsolerc"
 
-#: pronterface.py:145
+#: pronterface.py:149
 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:174
+#: pronterface.py:181
 msgid "Failed to start web interface"
 msgstr "Échec du lancement de l'interface web"
 
-#: pronterface.py:178
+#: pronterface.py:185
 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
+#: pronterface.py:197 pronterface.py:603 pronterface.py:1525
+#: pronterface.py:1578 pronterface.py:1705 pronterface.py:1765
+#: pronterface.py:1778
 msgid "Print"
 msgstr "Imprimer"
 
-#: pronterface.py:197
+#: pronterface.py:207
 msgid "Printer is now online."
 msgstr "Imprimante connectée."
 
-#: pronterface.py:198
+#: pronterface.py:208
 msgid "Disconnect"
 msgstr "Déconnecter"
 
-#: pronterface.py:321
+#: pronterface.py:331
 msgid "Setting hotend temperature to %f degrees Celsius."
 msgstr "Réglage de la température de la buse à %f degrés Celsius."
 
-#: pronterface.py:324 pronterface.py:346 pronterface.py:418
+#: pronterface.py:334 pronterface.py:356 pronterface.py:428
 msgid "Printer is not online."
 msgstr "Imprimante déconnectée."
 
-#: pronterface.py:326
+#: pronterface.py:336
 msgid ""
 "You cannot set negative temperatures. To turn the hotend off entirely, set "
 "its temperature to 0."
@@ -196,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:328 pronterface.py:354
+#: pronterface.py:338 pronterface.py:364
 msgid "You must enter a temperature. (%s)"
 msgstr "Vous devez saisir une température. (%s)"
 
-#: pronterface.py:343
+#: pronterface.py:353
 msgid "Setting bed temperature to %f degrees Celsius."
 msgstr "Réglage de la température du plateau à %f degrés Celsius."
 
-#: pronterface.py:350
+#: pronterface.py:360
 msgid ""
 "You cannot set negative temperatures. To turn the bed off entirely, set its "
 "temperature to 0."
@@ -212,175 +212,179 @@ 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:371
+#: pronterface.py:381
 msgid "Do you want to erase the macro?"
 msgstr "Voulez-vous effacer la macro ?"
 
-#: pronterface.py:375
+#: pronterface.py:385
 msgid "Cancelled."
 msgstr "Annulé"
 
-#: pronterface.py:426
+#: pronterface.py:436
 msgid " Opens file"
 msgstr " Ouvrir un fichier"
 
-#: pronterface.py:426
+#: pronterface.py:436
 msgid "&Open..."
 msgstr "&Ouvrir..."
 
-#: pronterface.py:427
+#: pronterface.py:437
 msgid " Edit open file"
 msgstr " Éditer le fichier ouvert"
 
-#: pronterface.py:427
+#: pronterface.py:437
 msgid "&Edit..."
 msgstr "&Éditer..."
 
-#: pronterface.py:428
+#: pronterface.py:438
 msgid " Clear output console"
 msgstr " Effacer le contenu de la console de sortie"
 
-#: pronterface.py:428
+#: pronterface.py:438
 msgid "Clear console"
 msgstr "Effacer la console"
 
-#: pronterface.py:429
+#: pronterface.py:439
 msgid " Project slices"
 msgstr " Projeter les couches"
 
-#: pronterface.py:429
+#: pronterface.py:439
 msgid "Projector"
 msgstr "Projecteur"
 
-#: pronterface.py:430
+#: pronterface.py:440
 msgid " Closes the Window"
 msgstr " Quitter le programme"
 
-#: pronterface.py:430
+#: pronterface.py:440
 msgid "E&xit"
 msgstr "&Quitter"
 
-#: pronterface.py:431
+#: pronterface.py:441
 msgid "&File"
 msgstr "&Fichier"
 
-#: pronterface.py:436
+#: pronterface.py:446
 msgid "&Macros"
 msgstr "&Macros"
 
-#: pronterface.py:437
+#: pronterface.py:447
 msgid "<&New...>"
 msgstr "<&Nouvelle...>"
 
-#: pronterface.py:438
+#: pronterface.py:448
 msgid " Options dialog"
 msgstr " Fenêtre des options"
 
-#: pronterface.py:438
+#: pronterface.py:448
 msgid "&Options"
 msgstr "&Options"
 
-#: pronterface.py:440
+#: pronterface.py:450
 msgid " Adjust slicing settings"
 msgstr " Régler les paramètres de slicing"
 
-#: pronterface.py:440
+#: pronterface.py:450
 msgid "Slicing Settings"
 msgstr "Paramètres de slicing"
 
-#: pronterface.py:442
+#: pronterface.py:452
 msgid "&Settings"
 msgstr "&Paramètres"
 
-#: pronterface.py:457
+#: pronterface.py:467
 msgid "Enter macro name"
 msgstr "Saisissez le nom de la macro"
 
-#: pronterface.py:460
+#: pronterface.py:470
 msgid "Macro name:"
 msgstr "Nom :"
 
-#: pronterface.py:463
+#: pronterface.py:473
 msgid "Ok"
 msgstr "Valider"
 
-#: pronterface.py:485
+#: pronterface.py:495
 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:490
+#: pronterface.py:500
 msgid "Name '%s' is being used by built-in command"
 msgstr "Le nom '%s' est utilisé par une commande interne"
 
-#: pronterface.py:538
+#: pronterface.py:548
 msgid "Port"
 msgstr "Port"
 
-#: pronterface.py:560
+#: pronterface.py:570 pronterface.py:1747
 msgid "Connect"
 msgstr "Connecter"
 
-#: pronterface.py:564
+#: pronterface.py:574
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: pronterface.py:579
+#: pronterface.py:589
 msgid "Load file"
 msgstr "Charger un fichier"
 
-#: pronterface.py:583
+#: pronterface.py:593
 msgid "Compose"
 msgstr "Composer"
 
-#: pronterface.py:588
+#: pronterface.py:598
 msgid "SD"
 msgstr "SD"
 
-#: pronterface.py:598 pronterface.py:1567 pronterface.py:1618
-#: pronterface.py:1668 pronterface.py:1691 pronterface.py:1725
-#: pronterface.py:1742
+#: pronterface.py:608 pronterface.py:1579 pronterface.py:1631
+#: pronterface.py:1681 pronterface.py:1704 pronterface.py:1764
+#: pronterface.py:1781
 msgid "Pause"
 msgstr "Pause"
 
-#: pronterface.py:616
+#: pronterface.py:612
+msgid "Recover"
+msgstr "Récupérer"
+
+#: pronterface.py:630
 msgid "Send"
 msgstr "Envoyer"
 
-#: pronterface.py:657
+#: pronterface.py:671
 msgid "XY:"
 msgstr "XY:"
 
-#: pronterface.py:659
+#: pronterface.py:673
 msgid "mm/min   Z:"
 msgstr "mm/min   Z:"
 
-#: pronterface.py:664
+#: pronterface.py:678
 msgid "Watch"
 msgstr "Surveiller"
 
-#: pronterface.py:669
+#: pronterface.py:683
 msgid "Heat:"
 msgstr "Buse:"
 
-#: pronterface.py:672 pronterface.py:695
+#: pronterface.py:686 pronterface.py:709
 msgid "Off"
 msgstr "Off"
 
-#: pronterface.py:686 pronterface.py:709
+#: pronterface.py:700 pronterface.py:723
 msgid "Set"
 msgstr "Régler"
 
-#: pronterface.py:692
+#: pronterface.py:706
 msgid "Bed:"
 msgstr "Plateau :"
 
-#: pronterface.py:742
+#: pronterface.py:756
 msgid "mm"
 msgstr "mm"
 
-#: pronterface.py:750
+#: pronterface.py:764
 msgid ""
 "mm/\n"
 "min"
@@ -388,147 +392,148 @@ msgstr ""
 "mm/\n"
 "min"
 
-#: pronterface.py:807 pronterface.py:1373 pronterface.py:1612
+#: pronterface.py:821 pronterface.py:1387 pronterface.py:1625
+#: pronterface.py:1723
 msgid "Not connected to printer."
 msgstr "Imprimante non connectée."
 
-#: pronterface.py:854
+#: pronterface.py:869
 msgid "SD Upload"
 msgstr "Copier sur SD"
 
-#: pronterface.py:858
+#: pronterface.py:873
 msgid "SD Print"
 msgstr "Imprimer depuis SD"
 
-#: pronterface.py:899
+#: pronterface.py:914
 msgid "Mini mode"
 msgstr "Mode réduit"
 
-#: pronterface.py:906
+#: pronterface.py:921
 msgid "Full mode"
 msgstr "Mode complet"
 
-#: pronterface.py:931
+#: pronterface.py:946
 msgid "Execute command: "
 msgstr "Exécuter la commande :"
 
-#: pronterface.py:942
+#: pronterface.py:957
 msgid "click to add new custom button"
 msgstr "Ajouter un bouton personnalisé"
 
-#: pronterface.py:964
+#: pronterface.py:979
 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:988
+#: pronterface.py:1003
 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:1081
+#: pronterface.py:1096
 msgid "Edit custom button '%s'"
 msgstr "Editer le bouton personnalisé '%s'"
 
-#: pronterface.py:1083
+#: pronterface.py:1098
 msgid "Move left <<"
 msgstr "Déplacer vers la gauche <<"
 
-#: pronterface.py:1086
+#: pronterface.py:1101
 msgid "Move right >>"
 msgstr "Déplacer vers la droite >>"
 
-#: pronterface.py:1090
+#: pronterface.py:1105
 msgid "Remove custom button '%s'"
 msgstr "Supprimer le bouton personnalisé '%s'"
 
-#: pronterface.py:1093
+#: pronterface.py:1108
 msgid "Add custom button"
 msgstr "Ajouter un bouton personnalisé"
 
-#: pronterface.py:1255
+#: pronterface.py:1270
 msgid "event object missing"
 msgstr "événement d'objet manquant"
 
-#: pronterface.py:1288
+#: pronterface.py:1306
 msgid "Invalid period given."
 msgstr "La période donnée est invalide"
 
-#: pronterface.py:1293
+#: pronterface.py:1311
 msgid "Monitoring printer."
 msgstr "Imprimante sous surveillance."
 
-#: pronterface.py:1297
+#: pronterface.py:1315
 msgid "Done monitoring."
 msgstr "Surveillance de l'imprimante effectuée."
 
-#: pronterface.py:1345
+#: pronterface.py:1355
 msgid " SD printing:%04.2f %%"
 msgstr " Impression SD : %04.2f %%"
 
-#: pronterface.py:1348
-msgid " Printing:%04.2f %% |"
-msgstr " Impression : %04.2f %% |"
+#: pronterface.py:1358
+msgid " Printing: %04.2f%% |"
+msgstr " Impression : %04.2f%% |"
 
-#: pronterface.py:1349
+#: pronterface.py:1359
 msgid " Line# %d of %d lines |"
 msgstr " Ligne# %d sur %d lignes |"
 
-#: pronterface.py:1354
+#: pronterface.py:1364
 msgid " Est: %s of %s remaining | "
 msgstr " ETA: %s restant sur %s | "
 
-#: pronterface.py:1356
+#: pronterface.py:1366
 msgid " Z: %0.2f mm"
 msgstr " Z: %0.2f mm"
 
-#: pronterface.py:1427
+#: pronterface.py:1439
 msgid "Opening file failed."
 msgstr "L'ouverture du fichier a échoué"
 
-#: pronterface.py:1433
+#: pronterface.py:1445
 msgid "Starting print"
 msgstr "Début de l'impression..."
 
-#: pronterface.py:1454
+#: pronterface.py:1466
 msgid "Pick SD file"
 msgstr "Choisir un fichier sur la carte SD"
 
-#: pronterface.py:1454
+#: pronterface.py:1466
 msgid "Select the file to print"
 msgstr "Sélectionnez le fichier à imprimer :"
 
-#: pronterface.py:1489
+#: pronterface.py:1501
 msgid "Failed to execute slicing software: "
 msgstr "Une erreur s'est produite lors du slicing : "
 
-#: pronterface.py:1498
+#: pronterface.py:1510
 msgid "Slicing..."
 msgstr "Slicing..."
 
-#: pronterface.py:1511
+#: pronterface.py:1523
 msgid ", %d lines"
 msgstr ", %d lignes"
 
-#: pronterface.py:1511
+#: pronterface.py:1523
 msgid "Loaded "
 msgstr "Chargé "
 
-#: pronterface.py:1518
+#: pronterface.py:1530
 msgid "Load File"
 msgstr "Charger un fichier"
 
-#: pronterface.py:1524
+#: pronterface.py:1536
 msgid "Slicing "
 msgstr "Slicing "
 
-#: pronterface.py:1543
+#: pronterface.py:1555
 msgid "Open file to print"
 msgstr "Ouvrir un fichier à imprimer"
 
-#: pronterface.py:1544
+#: pronterface.py:1556
 msgid ""
 "OBJ, STL, and GCODE files (*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ)|*."
 "gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ|All Files (*.*)|*.*"
@@ -536,19 +541,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:1551
+#: pronterface.py:1563
 msgid "File not found!"
 msgstr "Fichier non trouvé"
 
-#: pronterface.py:1565
+#: pronterface.py:1577
 msgid "Loaded %s, %d lines"
 msgstr "%s chargé, %d lignes"
 
-#: pronterface.py:1575
+#: pronterface.py:1588
 msgid "mm of filament used in this print\n"
 msgstr "mm de filament utilisés pour cette impression\n"
 
-#: pronterface.py:1576 pronterface.py:1578
+#: pronterface.py:1589 pronterface.py:1591
 msgid ""
 "the print goes from %f mm to %f mm in X\n"
 "and is %f mm wide\n"
@@ -556,7 +561,7 @@ msgstr ""
 "L'impression va de %f mm à %f mm en X\n"
 "et mesure %f mm de large\n"
 
-#: pronterface.py:1579
+#: pronterface.py:1592
 msgid ""
 "the print goes from %f mm to %f mm in Y\n"
 "and is %f mm wide\n"
@@ -564,7 +569,7 @@ msgstr ""
 "L'impression va de %f mm à %f mm en Y\n"
 "et mesure %f mm de large\n"
 
-#: pronterface.py:1580
+#: pronterface.py:1593
 msgid ""
 "the print goes from %f mm to %f mm in Z\n"
 "and is %f mm high\n"
@@ -572,50 +577,50 @@ msgstr ""
 "L'impression va de %f mm à %f mm en Y\n"
 "et mesure %f mm de haut\n"
 
-#: pronterface.py:1582
+#: pronterface.py:1595
 msgid "Estimated duration (pessimistic): "
 msgstr "Durée estimée (pessimiste) : "
 
-#: pronterface.py:1609
+#: pronterface.py:1622
 msgid "No file loaded. Please use load first."
 msgstr "Aucun fichier chargé. Veuillez charger un fichier avant."
 
-#: pronterface.py:1620
+#: pronterface.py:1633
 msgid "Restart"
 msgstr "Recommencer"
 
-#: pronterface.py:1624
+#: pronterface.py:1637
 msgid "File upload complete"
 msgstr "Envoi du fichier terminé"
 
-#: pronterface.py:1643
+#: pronterface.py:1656
 msgid "Pick SD filename"
 msgstr "Lister les fichiers sur la carte SD"
 
-#: pronterface.py:1650
+#: pronterface.py:1663
 msgid "Paused."
 msgstr "En pause."
 
-#: pronterface.py:1661
+#: pronterface.py:1674
 msgid "Resume"
 msgstr "Reprendre"
 
-#: pronterface.py:1675
+#: pronterface.py:1688
 msgid "Connecting..."
 msgstr "Connection en cours..."
 
-#: pronterface.py:1705
+#: pronterface.py:1738
 msgid "Disconnected."
 msgstr "Déconnecté."
 
-#: pronterface.py:1732
+#: pronterface.py:1771
 msgid "Reset."
 msgstr "Réinitialisée."
 
-#: pronterface.py:1733
+#: pronterface.py:1772
 msgid "Are you sure you want to reset the printer?"
 msgstr "Etes-vous sûr de vouloir réinitialiser l'imprimante?"
 
-#: pronterface.py:1733
+#: pronterface.py:1772
 msgid "Reset?"
 msgstr "Réinitialiser ?"

locale/pronterface.pot

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-08-04 22:00+CEST\n"
+"POT-Creation-Date: 2012-08-08 10:09+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"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: printrun/pronterface_widgets.py:41 pronterface.py:467 pronterface.py:1523
+#: printrun/pronterface_widgets.py:41 pronterface.py:477 pronterface.py:1535
 msgid "Cancel"
 msgstr ""
 
@@ -55,7 +55,7 @@ msgstr ""
 msgid "WX is not installed. This program requires WX to run."
 msgstr ""
 
-#: pronterface.py:90
+#: pronterface.py:93
 msgid ""
 "Dimensions of Build Platform\n"
 " & optional offset of origin\n"
@@ -66,519 +66,524 @@ msgid ""
 "   XXXxYYYxZZZ+OffX+OffY+OffZ"
 msgstr ""
 
-#: pronterface.py:91
+#: pronterface.py:94
 msgid "Last Set Temperature for the Heated Print Bed"
 msgstr ""
 
-#: pronterface.py:92
+#: pronterface.py:95
 msgid "Folder of last opened file"
 msgstr ""
 
-#: pronterface.py:93
+#: pronterface.py:96
 msgid "Last Temperature of the Hot End"
 msgstr ""
 
-#: pronterface.py:94
+#: pronterface.py:97
 msgid "Width of Extrusion in Preview (default: 0.5)"
 msgstr ""
 
-#: pronterface.py:95
+#: pronterface.py:98
 msgid "Fine Grid Spacing (default: 10)"
 msgstr ""
 
-#: pronterface.py:96
+#: pronterface.py:99
 msgid "Coarse Grid Spacing (default: 50)"
 msgstr ""
 
-#: pronterface.py:97
+#: pronterface.py:100
 msgid "Pronterface background color (default: #FFFFFF)"
 msgstr ""
 
-#: pronterface.py:100
+#: pronterface.py:103
 msgid "Printer Interface"
 msgstr ""
 
-#: pronterface.py:118
+#: pronterface.py:122
 msgid "Motors off"
 msgstr ""
 
-#: pronterface.py:118
+#: pronterface.py:122
 msgid "Switch all motors off"
 msgstr ""
 
-#: pronterface.py:119
+#: pronterface.py:123
 msgid "Check current hotend temperature"
 msgstr ""
 
-#: pronterface.py:119
+#: pronterface.py:123
 msgid "Check temp"
 msgstr ""
 
-#: pronterface.py:120
+#: pronterface.py:124
 msgid "Advance extruder by set length"
 msgstr ""
 
-#: pronterface.py:120
+#: pronterface.py:124
 msgid "Extrude"
 msgstr ""
 
-#: pronterface.py:121
+#: pronterface.py:125
 msgid "Reverse"
 msgstr ""
 
-#: pronterface.py:121
+#: pronterface.py:125
 msgid "Reverse extruder by set length"
 msgstr ""
 
-#: pronterface.py:139
+#: pronterface.py:143
 msgid ""
 "# I moved all your custom buttons into .pronsolerc.\n"
 "# Please don't add them here any more.\n"
 "# Backup of your old buttons is in custombtn.old\n"
 msgstr ""
 
-#: pronterface.py:144
+#: pronterface.py:148
 msgid "Note!!! You have specified custom buttons in both custombtn.txt and .pronsolerc"
 msgstr ""
 
-#: pronterface.py:145
+#: pronterface.py:149
 msgid "Ignoring custombtn.txt. Remove all current buttons to revert to custombtn.txt"
 msgstr ""
 
-#: pronterface.py:174
+#: pronterface.py:181
 msgid "Failed to start web interface"
 msgstr ""
 
-#: pronterface.py:178
+#: pronterface.py:185
 msgid "CherryPy is not installed. Web Interface Disabled."
 msgstr ""
 
-#: pronterface.py:189 pronterface.py:593 pronterface.py:1513
-#: pronterface.py:1566 pronterface.py:1692 pronterface.py:1726
-#: pronterface.py:1739
+#: pronterface.py:197 pronterface.py:603 pronterface.py:1525
+#: pronterface.py:1578 pronterface.py:1705 pronterface.py:1765
+#: pronterface.py:1778
 msgid "Print"
 msgstr ""
 
-#: pronterface.py:197
+#: pronterface.py:207
 msgid "Printer is now online."
 msgstr ""
 
-#: pronterface.py:198
+#: pronterface.py:208
 msgid "Disconnect"
 msgstr ""
 
-#: pronterface.py:321
+#: pronterface.py:331
 msgid "Setting hotend temperature to %f degrees Celsius."
 msgstr ""
 
-#: pronterface.py:324 pronterface.py:346 pronterface.py:418
+#: pronterface.py:334 pronterface.py:356 pronterface.py:428
 msgid "Printer is not online."
 msgstr ""
 
-#: pronterface.py:326
+#: pronterface.py:336
 msgid "You cannot set negative temperatures. To turn the hotend off entirely, set its temperature to 0."
 msgstr ""
 
-#: pronterface.py:328 pronterface.py:354
+#: pronterface.py:338 pronterface.py:364
 msgid "You must enter a temperature. (%s)"
 msgstr ""
 
-#: pronterface.py:343
+#: pronterface.py:353
 msgid "Setting bed temperature to %f degrees Celsius."
 msgstr ""
 
-#: pronterface.py:350
+#: pronterface.py:360
 msgid "You cannot set negative temperatures. To turn the bed off entirely, set its temperature to 0."
 msgstr ""
 
-#: pronterface.py:371
+#: pronterface.py:381
 msgid "Do you want to erase the macro?"
 msgstr ""
 
-#: pronterface.py:375
+#: pronterface.py:385
 msgid "Cancelled."
 msgstr ""
 
-#: pronterface.py:426
+#: pronterface.py:436
 msgid " Opens file"
 msgstr ""
 
-#: pronterface.py:426
+#: pronterface.py:436
 msgid "&Open..."
 msgstr ""
 
-#: pronterface.py:427
+#: pronterface.py:437
 msgid " Edit open file"
 msgstr ""
 
-#: pronterface.py:427
+#: pronterface.py:437
 msgid "&Edit..."
 msgstr ""
 
-#: pronterface.py:428
+#: pronterface.py:438
 msgid " Clear output console"
 msgstr ""
 
-#: pronterface.py:428
+#: pronterface.py:438
 msgid "Clear console"
 msgstr ""
 
-#: pronterface.py:429
+#: pronterface.py:439
 msgid " Project slices"
 msgstr ""
 
-#: pronterface.py:429
+#: pronterface.py:439
 msgid "Projector"
 msgstr ""
 
-#: pronterface.py:430
+#: pronterface.py:440
 msgid " Closes the Window"
 msgstr ""
 
-#: pronterface.py:430
+#: pronterface.py:440
 msgid "E&xit"
 msgstr ""
 
-#: pronterface.py:431
+#: pronterface.py:441
 msgid "&File"
 msgstr ""
 
-#: pronterface.py:436
+#: pronterface.py:446
 msgid "&Macros"
 msgstr ""
 
-#: pronterface.py:437
+#: pronterface.py:447
 msgid "<&New...>"
 msgstr ""
 
-#: pronterface.py:438
+#: pronterface.py:448
 msgid " Options dialog"
 msgstr ""
 
-#: pronterface.py:438
+#: pronterface.py:448
 msgid "&Options"
 msgstr ""
 
-#: pronterface.py:440
+#: pronterface.py:450
 msgid " Adjust slicing settings"
 msgstr ""
 
-#: pronterface.py:440
+#: pronterface.py:450
 msgid "Slicing Settings"
 msgstr ""
 
-#: pronterface.py:442
+#: pronterface.py:452
 msgid "&Settings"
 msgstr ""
 
-#: pronterface.py:457
+#: pronterface.py:467
 msgid "Enter macro name"
 msgstr ""
 
-#: pronterface.py:460
+#: pronterface.py:470
 msgid "Macro name:"
 msgstr ""
 
-#: pronterface.py:463
+#: pronterface.py:473
 msgid "Ok"
 msgstr ""
 
-#: pronterface.py:485
+#: pronterface.py:495
 msgid "Macro name may contain only ASCII alphanumeric symbols and underscores"
 msgstr ""
 
-#: pronterface.py:490
+#: pronterface.py:500
 msgid "Name '%s' is being used by built-in command"
 msgstr ""
 
-#: pronterface.py:538
+#: pronterface.py:548
 msgid "Port"
 msgstr ""
 
-#: pronterface.py:560
+#: pronterface.py:570 pronterface.py:1747
 msgid "Connect"
 msgstr ""
 
-#: pronterface.py:564
+#: pronterface.py:574
 msgid "Reset"
 msgstr ""
 
-#: pronterface.py:579
+#: pronterface.py:589
 msgid "Load file"
 msgstr ""
 
-#: pronterface.py:583
+#: pronterface.py:593
 msgid "Compose"
 msgstr ""
 
-#: pronterface.py:588
+#: pronterface.py:598
 msgid "SD"
 msgstr ""
 
-#: pronterface.py:598 pronterface.py:1567 pronterface.py:1618
-#: pronterface.py:1668 pronterface.py:1691 pronterface.py:1725
-#: pronterface.py:1742
+#: pronterface.py:608 pronterface.py:1579 pronterface.py:1631
+#: pronterface.py:1681 pronterface.py:1704 pronterface.py:1764
+#: pronterface.py:1781
 msgid "Pause"
 msgstr ""
 
-#: pronterface.py:616
+#: pronterface.py:612
+msgid "Recover"
+msgstr ""
+
+#: pronterface.py:630
 msgid "Send"
 msgstr ""
 
-#: pronterface.py:657
+#: pronterface.py:671
 msgid "XY:"
 msgstr ""
 
-#: pronterface.py:659
+#: pronterface.py:673
 msgid "mm/min   Z:"
 msgstr ""
 
-#: pronterface.py:664
+#: pronterface.py:678
 msgid "Watch"
 msgstr ""
 
-#: pronterface.py:669
+#: pronterface.py:683
 msgid "Heat:"
 msgstr ""
 
-#: pronterface.py:672 pronterface.py:695
+#: pronterface.py:686 pronterface.py:709
 msgid "Off"
 msgstr ""
 
-#: pronterface.py:686 pronterface.py:709
+#: pronterface.py:700 pronterface.py:723
 msgid "Set"
 msgstr ""
 
-#: pronterface.py:692
+#: pronterface.py:706
 msgid "Bed:"
 msgstr ""
 
-#: pronterface.py:742
+#: pronterface.py:756
 msgid "mm"
 msgstr ""
 
-#: pronterface.py:750
+#: pronterface.py:764
 msgid ""
 "mm/\n"
 "min"
 msgstr ""
 
-#: pronterface.py:807 pronterface.py:1373 pronterface.py:1612
+#: pronterface.py:821 pronterface.py:1387 pronterface.py:1625
+#: pronterface.py:1723
 msgid "Not connected to printer."
 msgstr ""
 
-#: pronterface.py:854
+#: pronterface.py:869
 msgid "SD Upload"
 msgstr ""
 
-#: pronterface.py:858
+#: pronterface.py:873
 msgid "SD Print"
 msgstr ""
 
-#: pronterface.py:899
+#: pronterface.py:914
 msgid "Mini mode"
 msgstr ""
 
-#: pronterface.py:906
+#: pronterface.py:921
 msgid "Full mode"
 msgstr ""
 
-#: pronterface.py:931
+#: pronterface.py:946
 msgid "Execute command: "
 msgstr ""
 
-#: pronterface.py:942
+#: pronterface.py:957
 msgid "click to add new custom button"
 msgstr ""
 
-#: pronterface.py:964
+#: pronterface.py:979
 msgid "Defines custom button. Usage: button <num> \"title\" [/c \"colour\"] command"
 msgstr ""
 
-#: pronterface.py:988
+#: pronterface.py:1003
 msgid "Custom button number should be between 0 and 63"
 msgstr ""
 
-#: pronterface.py:1081
+#: pronterface.py:1096
 msgid "Edit custom button '%s'"
 msgstr ""
 
-#: pronterface.py:1083
+#: pronterface.py:1098
 msgid "Move left <<"
 msgstr ""
 
-#: pronterface.py:1086
+#: pronterface.py:1101
 msgid "Move right >>"
 msgstr ""
 
-#: pronterface.py:1090
+#: pronterface.py:1105
 msgid "Remove custom button '%s'"
 msgstr ""
 
-#: pronterface.py:1093
+#: pronterface.py:1108
 msgid "Add custom button"
 msgstr ""
 
-#: pronterface.py:1255
+#: pronterface.py:1270
 msgid "event object missing"
 msgstr ""
 
-#: pronterface.py:1288
+#: pronterface.py:1306
 msgid "Invalid period given."
 msgstr ""
 
-#: pronterface.py:1293
+#: pronterface.py:1311
 msgid "Monitoring printer."
 msgstr ""
 
-#: pronterface.py:1297
+#: pronterface.py:1315
 msgid "Done monitoring."
 msgstr ""
 
-#: pronterface.py:1345
+#: pronterface.py:1355
 msgid " SD printing:%04.2f %%"
 msgstr ""
 
-#: pronterface.py:1348
-msgid " Printing:%04.2f %% |"
+#: pronterface.py:1358
+msgid " Printing: %04.2f%% |"
 msgstr ""
 
-#: pronterface.py:1349
+#: pronterface.py:1359
 msgid " Line# %d of %d lines |"
 msgstr ""
 
-#: pronterface.py:1354
+#: pronterface.py:1364
 msgid " Est: %s of %s remaining | "
 msgstr ""
 
-#: pronterface.py:1356
+#: pronterface.py:1366
 msgid " Z: %0.2f mm"
 msgstr ""
 
-#: pronterface.py:1427
+#: pronterface.py:1439
 msgid "Opening file failed."
 msgstr ""
 
-#: pronterface.py:1433
+#: pronterface.py:1445
 msgid "Starting print"
 msgstr ""
 
-#: pronterface.py:1454
+#: pronterface.py:1466
 msgid "Pick SD file"
 msgstr ""
 
-#: pronterface.py:1454
+#: pronterface.py:1466
 msgid "Select the file to print"
 msgstr ""
 
-#: pronterface.py:1489
+#: pronterface.py:1501
 msgid "Failed to execute slicing software: "
 msgstr ""
 
-#: pronterface.py:1498
+#: pronterface.py:1510
 msgid "Slicing..."
 msgstr ""
 
-#: pronterface.py:1511
+#: pronterface.py:1523
 msgid ", %d lines"
 msgstr ""
 
-#: pronterface.py:1511
+#: pronterface.py:1523
 msgid "Loaded "
 msgstr ""
 
-#: pronterface.py:1518
+#: pronterface.py:1530
 msgid "Load File"
 msgstr ""
 
-#: pronterface.py:1524
+#: pronterface.py:1536
 msgid "Slicing "
 msgstr ""
 
-#: pronterface.py:1543
+#: pronterface.py:1555
 msgid "Open file to print"
 msgstr ""
 
-#: pronterface.py:1544
+#: pronterface.py:1556
 msgid "OBJ, STL, and GCODE files (*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ)|*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ|All Files (*.*)|*.*"
 msgstr ""
 
-#: pronterface.py:1551
+#: pronterface.py:1563
 msgid "File not found!"
 msgstr ""
 
-#: pronterface.py:1565
+#: pronterface.py:1577
 msgid "Loaded %s, %d lines"
 msgstr ""
 
-#: pronterface.py:1575
+#: pronterface.py:1588
 msgid ""
 "mm of filament used in this print\n"
 msgstr ""
 
-#: pronterface.py:1576 pronterface.py:1578
+#: pronterface.py:1589 pronterface.py:1591
 msgid ""
 "the print goes from %f mm to %f mm in X\n"
 "and is %f mm wide\n"
 msgstr ""
 
-#: pronterface.py:1579
+#: pronterface.py:1592
 msgid ""
 "the print goes from %f mm to %f mm in Y\n"
 "and is %f mm wide\n"
 msgstr ""
 
-#: pronterface.py:1580
+#: pronterface.py:1593
 msgid ""
 "the print goes from %f mm to %f mm in Z\n"
 "and is %f mm high\n"
 msgstr ""
 
-#: pronterface.py:1582
+#: pronterface.py:1595
 msgid "Estimated duration (pessimistic): "
 msgstr ""
 
-#: pronterface.py:1609
+#: pronterface.py:1622
 msgid "No file loaded. Please use load first."
 msgstr ""
 
-#: pronterface.py:1620
+#: pronterface.py:1633
 msgid "Restart"
 msgstr ""
 
-#: pronterface.py:1624
+#: pronterface.py:1637
 msgid "File upload complete"
 msgstr ""
 
-#: pronterface.py:1643
+#: pronterface.py:1656
 msgid "Pick SD filename"
 msgstr ""
 
-#: pronterface.py:1650
+#: pronterface.py:1663
 msgid "Paused."
 msgstr ""
 
-#: pronterface.py:1661
+#: pronterface.py:1674
 msgid "Resume"
 msgstr ""
 
-#: pronterface.py:1675
+#: pronterface.py:1688
 msgid "Connecting..."
 msgstr ""
 
-#: pronterface.py:1705
+#: pronterface.py:1738
 msgid "Disconnected."
 msgstr ""
 
-#: pronterface.py:1732
+#: pronterface.py:1771
 msgid "Reset."
 msgstr ""
 
-#: pronterface.py:1733
+#: pronterface.py:1772
 msgid "Are you sure you want to reset the printer?"
 msgstr ""
 
-#: pronterface.py:1733
+#: pronterface.py:1772
 msgid "Reset?"
 msgstr ""
 

pronterface.py

@@ -90,7 +90,7 @@ class PronterWindow(wx.Frame, pronsole.pronsole):
         self.settings.preview_grid_step1 = 10.
         self.settings.preview_grid_step2 = 50.
         self.settings.bgcolor = "#FFFFFF"
-        self.helpdict["build_dimensions"] = _("Dimensions of Build Platform\n & optional offset of origin\n\nExamples:\n   XXXxYYY\n   XXX, YYY, ZZZ\n   XXXxYYYxZZZ+OffX+OffY+OffZ")
+        self.helpdict["build_dimensions"] = _("Dimensions of Build Platform\n & optional offset of origin\n\nExamples:\n   XXXxYYY\n   XXX,YYY,ZZZ\n   XXXxYYYxZZZ+OffX+OffY+OffZ")
         self.helpdict["last_bed_temperature"] = _("Last Set Temperature for the Heated Print Bed")
         self.helpdict["last_file_path"] = _("Folder of last opened file")
         self.helpdict["last_temperature"] = _("Last Temperature of the Hot End")
@@ -1786,9 +1786,9 @@ class PronterWindow(wx.Frame, pronsole.pronsole):
         # a string containing up to six numbers delimited by almost anything
         # first 0-3 numbers specify the build volume, no sign, always positive
         # remaining 0-3 numbers specify the coordinates of the "southwest" corner of the build platform
-        # "XXX, YYY"
+        # "XXX,YYY"
         # "XXXxYYY+xxx-yyy"
-        # "XXX, YYY, ZZZ+xxx+yyy-zzz"
+        # "XXX,YYY,ZZZ+xxx+yyy-zzz"
         # etc
         bdl = re.match(
         "[^\d+-]*(\d+)?" + # X build size