From 536c84ae47025b05e83e1a32058f3a27286aca6e Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Sun, 26 Feb 2012 01:00:20 +0100
Subject: [PATCH 01/12] Fix minor typo (translation argument inside _())

---
 pronterface.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pronterface.py b/pronterface.py
index cad6ec5..22592ab 100755
--- a/pronterface.py
+++ b/pronterface.py
@@ -247,7 +247,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
             else:
                 print _("You cannot set negative temperatures. To turn the hotend off entirely, set its temperature to 0.")
         except Exception,x:
-            print _("You must enter a temperature. (%s)" % (repr(x),))
+            print _("You must enter a temperature. (%s)") % (repr(x),)
     
     def do_bedtemp(self,l=""):
         try:

From a9d7b082f9edc7ded4e9ccf37b7cfe49d1bfd54b Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Sun, 26 Feb 2012 01:26:36 +0100
Subject: [PATCH 02/12] Add a word on updating .po from .pot

---
 README.i18n | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.i18n b/README.i18n
index 0b1d9fd..3684941 100644
--- a/README.i18n
+++ b/README.i18n
@@ -25,6 +25,10 @@ now there is only one, for German.  New ones can be created:
   # Edit the .po file to add messages for newlang
   msgfmt -o ${newlang}.mo ${newlang}.po
 
+To update a previously created message catalog from the template, use :
+
+  msgmerge -U locale/fr/LC_MESSAGES/${lang}.po locale/pronterface.pot
+
 As currently coded, the default location for these message catalogs is
 
   /usr/share/pronterface/locale/

From 9a20974d8f1f3274a30472fa457f33d3d574a83d Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Sun, 26 Feb 2012 02:08:57 +0100
Subject: [PATCH 03/12] Mark button name as translatable

---
 pronterface.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pronterface.py b/pronterface.py
index 22592ab..0607d49 100755
--- a/pronterface.py
+++ b/pronterface.py
@@ -165,7 +165,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
     
     def online(self):
         print _("Printer is now online.")
-        self.connectbtn.SetLabel("Disconnect")
+        self.connectbtn.SetLabel(_("Disconnect"))
         self.connectbtn.Bind(wx.EVT_BUTTON,self.disconnect)
 
         for i in self.printerControls:

From 2afaf4c61aec5d0a590638f9cf0f62453f33e77c Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Sun, 26 Feb 2012 02:14:06 +0100
Subject: [PATCH 04/12] Use format strings as much as possible for translations

---
 locale/pronterface.pot | 394 ++++++++++++++++-------------------------
 pronterface.py         |  21 ++-
 2 files changed, 167 insertions(+), 248 deletions(-)

diff --git a/locale/pronterface.pot b/locale/pronterface.pot
index 3429d9a..a8c0037 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-01-19 09:21+CET\n"
+"POT-Creation-Date: 2012-02-26 02:12+CET\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,61 +15,11 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 
 
-#: pronsole.py:250
-msgid "Communications Speed (default: 115200)"
-msgstr ""
-
-#: pronsole.py:251
-msgid "Heated Build Platform temp for ABS (default: 110 deg C)"
-msgstr ""
-
-#: pronsole.py:252
-msgid "Heated Build Platform temp for PLA (default: 60 deg C)"
-msgstr ""
-
-#: pronsole.py:253
-msgid "Feedrate for Control Panel Moves in Extrusions (default: 300mm/min)"
-msgstr ""
-
-#: pronsole.py:254
-msgid "Port used to communicate with printer"
-msgstr ""
-
-#: pronsole.py:255
-msgid ""
-"Slice command\n"
-"   default:\n"
-"       python skeinforge/skeinforge_application/skeinforge_utilities/skeinforge_craft.py $s)"
-msgstr ""
-
-#: pronsole.py:256
-msgid ""
-"Slice settings command\n"
-"   default:\n"
-"       python skeinforge/skeinforge_application/skeinforge.py"
-msgstr ""
-
-#: pronsole.py:257
-msgid "Extruder temp for ABS (default: 230 deg C)"
-msgstr ""
-
-#: pronsole.py:258
-msgid "Extruder temp for PLA (default: 185 deg C)"
-msgstr ""
-
-#: pronsole.py:259
-msgid "Feedrate for Control Panel Moves in X and Y (default: 3000mm/min)"
-msgstr ""
-
-#: pronsole.py:260
-msgid "Feedrate for Control Panel Moves in Z (default: 200mm/min)"
-msgstr ""
-
-#: pronterface.py:15
+#: pronterface.py:30
 msgid "WX is not installed. This program requires WX to run."
 msgstr ""
 
-#: pronterface.py:66
+#: pronterface.py:81
 msgid ""
 "Dimensions of Build Platform\n"
 " & optional offset of origin\n"
@@ -80,575 +30,545 @@ msgid ""
 "   XXXxYYYxZZZ+OffX+OffY+OffZ"
 msgstr ""
 
-#: pronterface.py:67
+#: pronterface.py:82
 msgid "Last Set Temperature for the Heated Print Bed"
 msgstr ""
 
-#: pronterface.py:68
+#: pronterface.py:83
 msgid "Folder of last opened file"
 msgstr ""
 
-#: pronterface.py:69
+#: pronterface.py:84
 msgid "Last Temperature of the Hot End"
 msgstr ""
 
-#: pronterface.py:70
+#: pronterface.py:85
 msgid "Width of Extrusion in Preview (default: 0.5)"
 msgstr ""
 
-#: pronterface.py:71
+#: pronterface.py:86
 msgid "Fine Grid Spacing (default: 10)"
 msgstr ""
 
-#: pronterface.py:72
+#: pronterface.py:87
 msgid "Coarse Grid Spacing (default: 50)"
 msgstr ""
 
-#: pronterface.py:73
+#: pronterface.py:88
 msgid "Pronterface background color (default: #FFFFFF)"
 msgstr ""
 
-#: pronterface.py:76
+#: pronterface.py:91
 msgid "Printer Interface"
 msgstr ""
 
-#: pronterface.py:93
+#: pronterface.py:108
 msgid "Motors off"
 msgstr ""
 
-#: pronterface.py:94
+#: pronterface.py:109
 msgid "Check temp"
 msgstr ""
 
-#: pronterface.py:95
+#: pronterface.py:110
 msgid "Extrude"
 msgstr ""
 
-#: pronterface.py:96
+#: pronterface.py:111
 msgid "Reverse"
 msgstr ""
 
-#: pronterface.py:114
+#: pronterface.py:129
 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:119
+#: pronterface.py:134
 msgid "Note!!! You have specified custom buttons in both custombtn.txt and .pronsolerc"
 msgstr ""
 
-#: pronterface.py:120
+#: pronterface.py:135
 msgid "Ignoring custombtn.txt. Remove all current buttons to revert to custombtn.txt"
 msgstr ""
 
-#: pronterface.py:148 pronterface.py:499 pronterface.py:1319
-#: pronterface.py:1373 pronterface.py:1495 pronterface.py:1529
-#: pronterface.py:1544
+#: pronterface.py:163 pronterface.py:514 pronterface.py:1333
+#: pronterface.py:1387 pronterface.py:1509 pronterface.py:1543
+#: pronterface.py:1558
 msgid "Print"
 msgstr ""
 
-#: pronterface.py:152
+#: pronterface.py:167
 msgid "Printer is now online."
 msgstr ""
 
-#: pronterface.py:212
-msgid "Setting hotend temperature to "
+#: pronterface.py:168
+msgid "Disconnect"
 msgstr ""
 
-#: pronterface.py:212 pronterface.py:248
-msgid " degrees Celsius."
+#: pronterface.py:227
+msgid "Setting hotend temperature to %f degrees Celsius."
 msgstr ""
 
-#: pronterface.py:231 pronterface.py:267 pronterface.py:325
+#: pronterface.py:246 pronterface.py:282 pronterface.py:340
 msgid "Printer is not online."
 msgstr ""
 
-#: pronterface.py:233
+#: pronterface.py:248
 msgid "You cannot set negative temperatures. To turn the hotend off entirely, set its temperature to 0."
 msgstr ""
 
-#: pronterface.py:248
-msgid "Setting bed temperature to "
+#: pronterface.py:250
+msgid "You must enter a temperature. (%s)"
 msgstr ""
 
-#: pronterface.py:269
+#: pronterface.py:263
+msgid "Setting bed temperature to %f degrees Celsius."
+msgstr ""
+
+#: pronterface.py:284
 msgid "You cannot set negative temperatures. To turn the bed off entirely, set its temperature to 0."
 msgstr ""
 
-#: pronterface.py:271
+#: pronterface.py:286
 msgid "You must enter a temperature."
 msgstr ""
 
-#: pronterface.py:286
+#: pronterface.py:301
 msgid "Do you want to erase the macro?"
 msgstr ""
 
-#: pronterface.py:290
+#: pronterface.py:305
 msgid "Cancelled."
 msgstr ""
 
-#: pronterface.py:331
+#: pronterface.py:346
 msgid " Opens file"
 msgstr ""
 
-#: pronterface.py:331
+#: pronterface.py:346
 msgid "&Open..."
 msgstr ""
 
-#: pronterface.py:332
+#: pronterface.py:347
 msgid " Edit open file"
 msgstr ""
 
-#: pronterface.py:332
+#: pronterface.py:347
 msgid "&Edit..."
 msgstr ""
 
-#: pronterface.py:333
+#: pronterface.py:348
 msgid " Clear output console"
 msgstr ""
 
-#: pronterface.py:333
+#: pronterface.py:348
 msgid "Clear console"
 msgstr ""
 
-#: pronterface.py:334
+#: pronterface.py:349
 msgid " Project slices"
 msgstr ""
 
-#: pronterface.py:334
+#: pronterface.py:349
 msgid "Projector"
 msgstr ""
 
-#: pronterface.py:335
+#: pronterface.py:350
 msgid " Closes the Window"
 msgstr ""
 
-#: pronterface.py:335
+#: pronterface.py:350
 msgid "E&xit"
 msgstr ""
 
-#: pronterface.py:336
+#: pronterface.py:351
 msgid "&File"
 msgstr ""
 
-#: pronterface.py:341
+#: pronterface.py:356
 msgid "&Macros"
 msgstr ""
 
-#: pronterface.py:342
+#: pronterface.py:357
 msgid "<&New...>"
 msgstr ""
 
-#: pronterface.py:343
+#: pronterface.py:358
 msgid " Options dialog"
 msgstr ""
 
-#: pronterface.py:343
+#: pronterface.py:358
 msgid "&Options"
 msgstr ""
 
-#: pronterface.py:345
+#: pronterface.py:360
 msgid " Adjust slicing settings"
 msgstr ""
 
-#: pronterface.py:345
+#: pronterface.py:360
 msgid "Slicing Settings"
 msgstr ""
 
-#: pronterface.py:352
+#: pronterface.py:367
 msgid "&Settings"
 msgstr ""
 
-#: pronterface.py:368
+#: pronterface.py:383
 msgid "Enter macro name"
 msgstr ""
 
-#: pronterface.py:371
+#: pronterface.py:386
 msgid "Macro name:"
 msgstr ""
 
-#: pronterface.py:374
+#: pronterface.py:389
 msgid "Ok"
 msgstr ""
 
-#: pronterface.py:378 pronterface.py:1330 pronterface.py:1587
+#: pronterface.py:393 pronterface.py:1344 pronterface.py:1601
 msgid "Cancel"
 msgstr ""
 
-#: pronterface.py:396
-msgid "' is being used by built-in command"
+#: pronterface.py:411
+msgid "Name '%s' is being used by built-in command"
 msgstr ""
 
-#: pronterface.py:396
-msgid "Name '"
-msgstr ""
-
-#: pronterface.py:399
+#: pronterface.py:414
 msgid "Macro name may contain only alphanumeric symbols and underscores"
 msgstr ""
 
-#: pronterface.py:448
+#: pronterface.py:463
 msgid "Port"
 msgstr ""
 
-#: pronterface.py:467
+#: pronterface.py:482
 msgid "Connect"
 msgstr ""
 
-#: pronterface.py:469
+#: pronterface.py:484
 msgid "Connect to the printer"
 msgstr ""
 
-#: pronterface.py:471
+#: pronterface.py:486
 msgid "Reset"
 msgstr ""
 
-#: pronterface.py:474 pronterface.py:751
+#: pronterface.py:489 pronterface.py:766
 msgid "Mini mode"
 msgstr ""
 
-#: pronterface.py:478
+#: pronterface.py:493
 msgid "Monitor Printer"
 msgstr ""
 
-#: pronterface.py:488
+#: pronterface.py:503
 msgid "Load file"
 msgstr ""
 
-#: pronterface.py:491
+#: pronterface.py:506
 msgid "Compose"
 msgstr ""
 
-#: pronterface.py:495
+#: pronterface.py:510
 msgid "SD"
 msgstr ""
 
-#: pronterface.py:503 pronterface.py:1374 pronterface.py:1419
-#: pronterface.py:1469 pronterface.py:1494 pronterface.py:1528
-#: pronterface.py:1543
+#: pronterface.py:518 pronterface.py:1388 pronterface.py:1433
+#: pronterface.py:1483 pronterface.py:1508 pronterface.py:1542
+#: pronterface.py:1557
 msgid "Pause"
 msgstr ""
 
-#: pronterface.py:516
+#: pronterface.py:531
 msgid "Send"
 msgstr ""
 
-#: pronterface.py:524 pronterface.py:625
+#: pronterface.py:539 pronterface.py:640
 msgid "mm/min"
 msgstr ""
 
-#: pronterface.py:526
+#: pronterface.py:541
 msgid "XY:"
 msgstr ""
 
-#: pronterface.py:528
+#: pronterface.py:543
 msgid "Z:"
 msgstr ""
 
-#: pronterface.py:551 pronterface.py:632
+#: pronterface.py:566 pronterface.py:647
 msgid "Heater:"
 msgstr ""
 
-#: pronterface.py:554 pronterface.py:574
+#: pronterface.py:569 pronterface.py:589
 msgid "Off"
 msgstr ""
 
-#: pronterface.py:566 pronterface.py:586
+#: pronterface.py:581 pronterface.py:601
 msgid "Set"
 msgstr ""
 
-#: pronterface.py:571 pronterface.py:634
+#: pronterface.py:586 pronterface.py:649
 msgid "Bed:"
 msgstr ""
 
-#: pronterface.py:619
+#: pronterface.py:634
 msgid "mm"
 msgstr ""
 
-#: pronterface.py:677 pronterface.py:1182 pronterface.py:1413
+#: pronterface.py:692 pronterface.py:1196 pronterface.py:1427
 msgid "Not connected to printer."
 msgstr ""
 
-#: pronterface.py:706
+#: pronterface.py:721
 msgid "SD Upload"
 msgstr ""
 
-#: pronterface.py:710
+#: pronterface.py:725
 msgid "SD Print"
 msgstr ""
 
-#: pronterface.py:758
+#: pronterface.py:773
 msgid "Full mode"
 msgstr ""
 
-#: pronterface.py:783
+#: pronterface.py:798
 msgid "Execute command: "
 msgstr ""
 
-#: pronterface.py:794
+#: pronterface.py:809
 msgid "click to add new custom button"
 msgstr ""
 
-#: pronterface.py:813
+#: pronterface.py:828
 msgid "Defines custom button. Usage: button <num> \"title\" [/c \"colour\"] command"
 msgstr ""
 
-#: pronterface.py:835
+#: pronterface.py:850
 msgid "Custom button number should be between 0 and 63"
 msgstr ""
 
-#: pronterface.py:927
+#: pronterface.py:942
 msgid "Edit custom button '%s'"
 msgstr ""
 
-#: pronterface.py:929
+#: pronterface.py:944
 msgid "Move left <<"
 msgstr ""
 
-#: pronterface.py:932
+#: pronterface.py:947
 msgid "Move right >>"
 msgstr ""
 
-#: pronterface.py:936
+#: pronterface.py:951
 msgid "Remove custom button '%s'"
 msgstr ""
 
-#: pronterface.py:939
+#: pronterface.py:954
 msgid "Add custom button"
 msgstr ""
 
-#: pronterface.py:1084
+#: pronterface.py:1099
 msgid "event object missing"
 msgstr ""
 
-#: pronterface.py:1112
+#: pronterface.py:1127
 msgid "Invalid period given."
 msgstr ""
 
-#: pronterface.py:1115
+#: pronterface.py:1130
 msgid "Monitoring printer."
 msgstr ""
 
-#: pronterface.py:1117
+#: pronterface.py:1132
 msgid "Done monitoring."
 msgstr ""
 
-#: pronterface.py:1139
+#: pronterface.py:1154
 msgid "Printer is online. "
 msgstr ""
 
-#: pronterface.py:1141 pronterface.py:1317 pronterface.py:1372
+#: pronterface.py:1156 pronterface.py:1331
 msgid "Loaded "
 msgstr ""
 
-#: pronterface.py:1144
+#: pronterface.py:1159
 msgid "Bed"
 msgstr ""
 
-#: pronterface.py:1144
+#: pronterface.py:1159
 msgid "Hotend"
 msgstr ""
 
-#: pronterface.py:1154
+#: pronterface.py:1169
 msgid " SD printing:%04.2f %%"
 msgstr ""
 
-#: pronterface.py:1157
+#: pronterface.py:1172
 msgid " Printing:%04.2f %% |"
 msgstr ""
 
-#: pronterface.py:1158
-msgid " Line# "
+#: pronterface.py:1173
+msgid " Line# %d of %d lines |"
 msgstr ""
 
-#: pronterface.py:1158
-msgid " lines |"
+#: pronterface.py:1178
+msgid " Est: %s of %s remaining | "
 msgstr ""
 
-#: pronterface.py:1158
-msgid "of "
-msgstr ""
-
-#: pronterface.py:1163
-msgid " Est: "
-msgstr ""
-
-#: pronterface.py:1164
-msgid " of: "
-msgstr ""
-
-#: pronterface.py:1165
-msgid " Remaining | "
-msgstr ""
-
-#: pronterface.py:1166
+#: pronterface.py:1180
 msgid " Z: %0.2f mm"
 msgstr ""
 
-#: pronterface.py:1233
+#: pronterface.py:1247
 msgid "Opening file failed."
 msgstr ""
 
-#: pronterface.py:1239
+#: pronterface.py:1253
 msgid "Starting print"
 msgstr ""
 
-#: pronterface.py:1262
+#: pronterface.py:1276
 msgid "Pick SD file"
 msgstr ""
 
-#: pronterface.py:1262
+#: pronterface.py:1276
 msgid "Select the file to print"
 msgstr ""
 
-#: pronterface.py:1297
+#: pronterface.py:1311
 msgid "Failed to execute slicing software: "
 msgstr ""
 
-#: pronterface.py:1304
+#: pronterface.py:1318
 msgid "Slicing..."
 msgstr ""
 
-#: pronterface.py:1317 pronterface.py:1372
+#: pronterface.py:1331
 msgid ", %d lines"
 msgstr ""
 
-#: pronterface.py:1324
+#: pronterface.py:1338
 msgid "Load File"
 msgstr ""
 
-#: pronterface.py:1331
+#: pronterface.py:1345
 msgid "Slicing "
 msgstr ""
 
-#: pronterface.py:1350
+#: pronterface.py:1364
 msgid "Open file to print"
 msgstr ""
 
-#: pronterface.py:1351
+#: pronterface.py:1365
 msgid "OBJ, STL, and GCODE files (;*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ;)"
 msgstr ""
 
-#: pronterface.py:1358
+#: pronterface.py:1372
 msgid "File not found!"
 msgstr ""
 
-#: pronterface.py:1382
+#: pronterface.py:1386
+msgid "Loaded %s, %d lines"
+msgstr ""
+
+#: pronterface.py:1396
 msgid ""
 "mm of filament used in this print\n"
 msgstr ""
 
-#: pronterface.py:1383
+#: pronterface.py:1397
 msgid ""
-"mm in X\n"
-"and is"
+"the print goes from %f mm to %f mm in X\n"
+"and is %f mm wide\n"
 msgstr ""
 
-#: pronterface.py:1383 pronterface.py:1384
+#: pronterface.py:1398
 msgid ""
-"mm wide\n"
+"the print goes from %f mm to %f mm in Y\n"
+"and is %f mm wide\n"
 msgstr ""
 
-#: pronterface.py:1383 pronterface.py:1384 pronterface.py:1385
-msgid "mm to"
-msgstr ""
-
-#: pronterface.py:1383 pronterface.py:1384 pronterface.py:1385
-msgid "the print goes from"
-msgstr ""
-
-#: pronterface.py:1384
+#: pronterface.py:1399
 msgid ""
-"mm in Y\n"
-"and is"
+"the print goes from %f mm to %f mm in Z\n"
+"and is %f mm high\n"
 msgstr ""
 
-#: pronterface.py:1385
-msgid ""
-"mm high\n"
-msgstr ""
-
-#: pronterface.py:1385
-msgid ""
-"mm in Z\n"
-"and is"
-msgstr ""
-
-#: pronterface.py:1386
+#: pronterface.py:1400
 msgid "Estimated duration (pessimistic): "
 msgstr ""
 
-#: pronterface.py:1410
+#: pronterface.py:1424
 msgid "No file loaded. Please use load first."
 msgstr ""
 
-#: pronterface.py:1421
+#: pronterface.py:1435
 msgid "Restart"
 msgstr ""
 
-#: pronterface.py:1425
+#: pronterface.py:1439
 msgid "File upload complete"
 msgstr ""
 
-#: pronterface.py:1444
+#: pronterface.py:1458
 msgid "Pick SD filename"
 msgstr ""
 
-#: pronterface.py:1452
+#: pronterface.py:1466
 msgid "Paused."
 msgstr ""
 
-#: pronterface.py:1462
+#: pronterface.py:1476
 msgid "Resume"
 msgstr ""
 
-#: pronterface.py:1478
+#: pronterface.py:1492
 msgid "Connecting..."
 msgstr ""
 
-#: pronterface.py:1509
+#: pronterface.py:1523
 msgid "Disconnected."
 msgstr ""
 
-#: pronterface.py:1536
+#: pronterface.py:1550
 msgid "Reset."
 msgstr ""
 
-#: pronterface.py:1537
+#: pronterface.py:1551
 msgid "Are you sure you want to reset the printer?"
 msgstr ""
 
-#: pronterface.py:1537
+#: pronterface.py:1551
 msgid "Reset?"
 msgstr ""
 
-#: pronterface.py:1583
+#: pronterface.py:1597
 msgid "Save"
 msgstr ""
 
-#: pronterface.py:1639
+#: pronterface.py:1653
 msgid "Edit settings"
 msgstr ""
 
-#: pronterface.py:1641
+#: pronterface.py:1655
 msgid "Defaults"
 msgstr ""
 
-#: pronterface.py:1670
+#: pronterface.py:1684
 msgid "Custom button"
 msgstr ""
 
-#: pronterface.py:1675
+#: pronterface.py:1689
 msgid "Button title"
 msgstr ""
 
-#: pronterface.py:1678
+#: pronterface.py:1692
 msgid "Command"
 msgstr ""
 
-#: pronterface.py:1687
+#: pronterface.py:1701
 msgid "Color"
 msgstr ""
 
diff --git a/pronterface.py b/pronterface.py
index 0607d49..f69d567 100755
--- a/pronterface.py
+++ b/pronterface.py
@@ -224,7 +224,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
             if f>=0:
                 if self.p.online:
                     self.p.send_now("M104 S"+l)
-                    print _("Setting hotend temperature to "),f,_(" degrees Celsius.")
+                    print _("Setting hotend temperature to %f degrees Celsius.") % f
                     self.hsetpoint=f
                     self.hottgauge.SetTarget(int(f))
                     if f>0: 
@@ -260,7 +260,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
             if f>=0:
                 if self.p.online:
                     self.p.send_now("M140 S"+l)
-                    print _("Setting bed temperature to "),f,_(" degrees Celsius.")
+                    print _("Setting bed temperature to %f degrees Celsius.") % f
                     self.bsetpoint=f
                     self.bedtgauge.SetTarget(int(f))
                     if f>0: 
@@ -408,7 +408,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
         if self.macros.has_key(macro):
             old_def = self.macros[macro]
         elif hasattr(self.__class__,"do_"+macro):
-            print _("Name '")+macro+_("' is being used by built-in command")
+            print _("Name '%s' is being used by built-in command") % macro
             return
         elif len([c for c in macro if not c.isalnum() and c != "_"]):
             print _("Macro name may contain only alphanumeric symbols and underscores")
@@ -1170,14 +1170,13 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
                 if self.p.printing:
                     fractioncomplete = float(self.p.queueindex)/len(self.p.mainqueue)
                     string+= _(" Printing:%04.2f %% |") % (100*float(self.p.queueindex)/len(self.p.mainqueue),)
-                    string+= _(" Line# ") + str(self.p.queueindex) + _("of ") + str(len(self.p.mainqueue)) + _(" lines |" )
+                    string+= _(" Line# %d of %d lines |" ) % (self.p.queueindex, len(self.p.mainqueue))
                 if fractioncomplete > 0.0:
                     secondselapsed = int(time.time()-self.starttime)
                     secondsestimate = secondselapsed/fractioncomplete
                     secondsremain = secondsestimate - secondselapsed
-                    string+= _(" Est: ") + time.strftime('%H:%M:%S', time.gmtime(secondsremain))
-                    string+= _(" of: ") + time.strftime('%H:%M:%S', time.gmtime(secondsestimate))
-                    string+= _(" Remaining | ")
+                    string+= _(" Est: %s of %s remaining | ") % (time.strftime('%H:%M:%S', time.gmtime(secondsremain)),
+                                                                 time.strftime('%H:%M:%S', time.gmtime(secondsestimate)))
                     string+= _(" Z: %0.2f mm") % self.curlayer
                 wx.CallAfter(self.status.SetStatusText,string)
                 wx.CallAfter(self.gviz.Refresh)
@@ -1384,7 +1383,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
                 of=open(self.filename)
                 self.f=[i.replace("\n","").replace("\r","") for i in of]
                 of.close
-                self.status.SetStatusText(_("Loaded ") + name + _(", %d lines") % (len(self.f),))
+                self.status.SetStatusText(_("Loaded %s, %d lines") % (name, len(self.f)))
                 wx.CallAfter(self.printbtn.SetLabel, _("Print"))
                 wx.CallAfter(self.pausebtn.SetLabel, _("Pause"))
                 wx.CallAfter(self.pausebtn.Disable)
@@ -1395,9 +1394,9 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
     def loadviz(self):
         Xtot,Ytot,Ztot,Xmin,Xmax,Ymin,Ymax,Zmin,Zmax = pronsole.measurements(self.f)
         print pronsole.totalelength(self.f), _("mm of filament used in this print\n")
-        print _("the print goes from"),Xmin,_("mm to"),Xmax,_("mm in X\nand is"),Xtot,_("mm wide\n")
-        print _("the print goes from"),Ymin,_("mm to"),Ymax,_("mm in Y\nand is"),Ytot,_("mm wide\n")
-        print _("the print goes from"),Zmin,_("mm to"),Zmax,_("mm in Z\nand is"),Ztot,_("mm high\n")
+        print _("the print goes from %f mm to %f mm in X\nand is %f mm wide\n") % (Xmin, Xmax, Xtot)
+        print _("the print goes from %f mm to %f mm in Y\nand is %f mm wide\n") % (Ymin, Ymax, Ytot)
+        print _("the print goes from %f mm to %f mm in Z\nand is %f mm high\n") % (Zmin, Zmax, Ztot)
         print _("Estimated duration (pessimistic): "), pronsole.estimate_duration(self.f)
         #import time
         #t0=time.time()

From 26fbc96b5315055c19e57fcfe459e910d188cafd Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Sun, 26 Feb 2012 02:14:49 +0100
Subject: [PATCH 05/12] Update French translation

---
 locale/fr/LC_MESSAGES/fr.po          | 714 ++++++++++++++-------------
 locale/fr/LC_MESSAGES/pronterface.mo | Bin 9220 -> 8664 bytes
 2 files changed, 374 insertions(+), 340 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/fr.po b/locale/fr/LC_MESSAGES/fr.po
index 14926e7..4d188a9 100755
--- a/locale/fr/LC_MESSAGES/fr.po
+++ b/locale/fr/LC_MESSAGES/fr.po
@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pronterface jm1\n"
-"POT-Creation-Date: 2011-08-06 13:27+PDT\n"
-"PO-Revision-Date: 2011-11-16 16:53+0100\n"
-"Last-Translator: Cyril Laguilhon-Debat <c.laguilhon.debat@gmail.com>\n"
+"POT-Creation-Date: 2012-02-26 02:12+CET\n"
+"PO-Revision-Date: 2012-02-26 02:13+0100\n"
+"Last-Translator: Guillaume Seguin <guillaume@segu.in>\n"
 "Language-Team: FR <c.laguilhon.debat@gmail.com>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -15,558 +15,592 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: pronterface.py:15
+#: pronterface.py:30
 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."
+msgstr ""
+"wxWidgets n'est pas installé. Ce programme nécessite la librairie wxWidgets "
+"pour fonctionner."
 
-#: pronterface.py:67
+#: pronterface.py:81
+msgid ""
+"Dimensions of Build Platform\n"
+" & optional offset of origin\n"
+"\n"
+"Examples:\n"
+"   XXXxYYY\n"
+"   XXX,YYY,ZZZ\n"
+"   XXXxYYYxZZZ+OffX+OffY+OffZ"
+msgstr ""
+
+#: pronterface.py:82
+msgid "Last Set Temperature for the Heated Print Bed"
+msgstr "Dernière température du plateau chauffant définie"
+
+#: pronterface.py:83
+msgid "Folder of last opened file"
+msgstr "Dossier du dernier fichier ouvert"
+
+#: pronterface.py:84
+msgid "Last Temperature of the Hot End"
+msgstr "Dernière température de la buse définie"
+
+#: pronterface.py:85
+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
+msgid "Fine Grid Spacing (default: 10)"
+msgstr "Espacement fin de la grille (défaut : 10)"
+
+#: pronterface.py:87
+msgid "Coarse Grid Spacing (default: 50)"
+msgstr "Espacement large de la grille (défaut : 50)"
+
+#: pronterface.py:88
+msgid "Pronterface background color (default: #FFFFFF)"
+msgstr "Couleur de fond de la Pronterface (défaut : #FFFFFF)"
+
+#: pronterface.py:91
 msgid "Printer Interface"
-msgstr "Interface imprimante"
+msgstr "Interface de l'imprimante"
 
-#: pronterface.py:80
+#: pronterface.py:108
 msgid "Motors off"
 msgstr "Arrêter les moteurs"
 
-#: pronterface.py:81
+#: pronterface.py:109
 msgid "Check temp"
 msgstr "Lire les températures"
 
-#: pronterface.py:82
+#: pronterface.py:110
 msgid "Extrude"
 msgstr "Extruder"
 
-#: pronterface.py:83
+#: pronterface.py:111
 msgid "Reverse"
 msgstr "Inverser"
 
-#: pronterface.py:99
+#: pronterface.py:129
 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 ""
-"# 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"
+"# Tous vos boutons personalisés ont été déplacés dans le fichier ."
+"pronsolerc.\n"
+"# Veuillez ne plus en ajouter ici.\n"
+"# Une sauvegarde de vos anciens boutons est dans le fichier custombtn.old\n"
 
-#: pronterface.py:104
-msgid "Note!!! You have specified custom buttons in both custombtn.txt and .pronsolerc"
-msgstr "Remarque! Vous avez spécifié des boutons personnalisés dans custombtn.txt et aussi dans .pronsolerc"
+#: pronterface.py:134
+msgid ""
+"Note!!! You have specified custom buttons in both custombtn.txt and ."
+"pronsolerc"
+msgstr ""
+"Remarque! Vous avez spécifié des boutons personnalisés dans custombtn.txt et "
+"aussi dans .pronsolerc"
 
-#: pronterface.py:105
-msgid "Ignoring custombtn.txt. Remove all current buttons to revert to custombtn.txt"
-msgstr "Ignorant custombtn.txt. Retirez tous les boutons en cours pour revenir à custombtn.txt"
+#: pronterface.py:135
+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:130
-#: pronterface.py:476
-#: pronterface.py:1228
-#: pronterface.py:1279
-#: pronterface.py:1396
-#: pronterface.py:1428
-#: pronterface.py:1443
+#: pronterface.py:163 pronterface.py:514 pronterface.py:1333
+#: pronterface.py:1387 pronterface.py:1509 pronterface.py:1543
+#: pronterface.py:1558
 msgid "Print"
 msgstr "Imprimer"
 
-#: pronterface.py:134
+#: pronterface.py:167
 msgid "Printer is now online."
 msgstr "L'imprimante est connectée"
 
-#: pronterface.py:188
-msgid "Setting hotend temperature to "
-msgstr "Réglage de la température de la buse à"
-
-#: pronterface.py:188
-#: pronterface.py:224
-msgid " degrees Celsius."
-msgstr " degrés Celsius."
-
-#: pronterface.py:207
-#: pronterface.py:242
-msgid "Printer is not online."
-msgstr "L'imprimante est déconnectée"
-
-#: pronterface.py:209
-msgid "You cannot set negative temperatures. To turn the hotend off entirely, set its temperature to 0."
-msgstr "Vous ne pouvez pas régler une température négative.Pour éteindre le chauffage de la buse, réglez sa température à 0°c."
-
-#: pronterface.py:224
-msgid "Setting bed temperature to "
-msgstr "Réglage de la température du plateau à "
-
-#: pronterface.py:244
-msgid "You cannot set negative temperatures. To turn the bed off entirely, set its temperature to 0."
-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:246
-msgid "You must enter a temperature."
-msgstr "Vous devez saisir une température."
-
-#: pronterface.py:261
-msgid "Do you want to erase the macro?"
-msgstr "Voulez-vous effacer la macro ?"
-
-#: pronterface.py:265
-msgid "Cancelled."
-msgstr "Annulé"
-
-#: pronterface.py:295
-msgid " Opens file"
-msgstr " Ouvrir un fichier"
-
-#: pronterface.py:295
-msgid "&Open..."
-msgstr "&Ouvrir..."
-
-#: pronterface.py:296
-msgid " Edit open file"
-msgstr " Éditer le fichier ouvert"
-
-#: pronterface.py:296
-msgid "&Edit..."
-msgstr "&Éditer..."
-
-#: pronterface.py:297
-msgid " Clear output console"
-msgstr "Effacer le contenu de la console de sortie"
-
-#: pronterface.py:297
-msgid "Clear console"
-msgstr "Effacer la console"
-
-#: pronterface.py:298
-msgid " Closes the Window"
-msgstr " Quitter le programme"
-
-#: pronterface.py:298
-msgid "E&xit"
-msgstr "&Quitter"
-
-#: pronterface.py:299
-msgid "&File"
-msgstr "&Fichier"
-
-#: pronterface.py:304
-msgid "&Macros"
-msgstr "&Macros"
-
-#: pronterface.py:305
-msgid "<&New...>"
-msgstr "<&Nouvelle...>"
-
-#: pronterface.py:306
-msgid " Options dialog"
-msgstr " Fenêtre des options"
-
-#: pronterface.py:306
-msgid "&Options"
-msgstr "&Options"
-
-#: pronterface.py:308
-msgid " Adjust SFACT settings"
-msgstr " Régler les paramètres SFACT"
-
-#: pronterface.py:308
-msgid "SFACT Settings"
-msgstr "Paramètres &SFACT..."
-
-#: pronterface.py:311
-msgid " Quickly adjust SFACT settings for active profile"
-msgstr " Réglages rapides des paramètres SFACT pour le profil actif."
-
-#: pronterface.py:311
-msgid "SFACT Quick Settings"
-msgstr "Réglages rapides SFACT"
-
-#: pronterface.py:315
-msgid "&Settings"
-msgstr "&Paramètres"
-
-#: pronterface.py:331
-msgid "Enter macro name"
-msgstr "Saisissez le nom de la macro"
-
-#: pronterface.py:334
-msgid "Macro name:"
-msgstr "Nom :"
-
-#: pronterface.py:337
-msgid "Ok"
-msgstr "Valider"
-
-#: pronterface.py:341
-#: pronterface.py:1465
-msgid "Cancel"
-msgstr "Annuler"
-
-#: pronterface.py:359
-msgid "' is being used by built-in command"
-msgstr "' est utilisé par des commandes internes."
-
-#: pronterface.py:359
-msgid "Name '"
-msgstr "Le nom '"
-
-#: pronterface.py:362
-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:411
-msgid "Port"
-msgstr "Port :"
-
-#: pronterface.py:430
-msgid "Connect"
-msgstr "Connecter"
-
-#: pronterface.py:432
-msgid "Connect to the printer"
-msgstr "Connecter l'imprimante"
-
-#: pronterface.py:434
+#: pronterface.py:168
 msgid "Disconnect"
 msgstr "Déconnecter"
 
-#: pronterface.py:438
+#: pronterface.py:227
+msgid "Setting hotend temperature to %f degrees Celsius."
+msgstr "Réglage de la température de la buse à %f degrés Celsius."
+
+#: pronterface.py:246 pronterface.py:282 pronterface.py:340
+msgid "Printer is not online."
+msgstr "L'imprimante est déconnectée"
+
+#: pronterface.py:248
+msgid ""
+"You cannot set negative temperatures. To turn the hotend off entirely, set "
+"its temperature to 0."
+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:250
+msgid "You must enter a temperature. (%s)"
+msgstr "Vous devez saisir une température. (%s)"
+
+#: pronterface.py:263
+msgid "Setting bed temperature to %f degrees Celsius."
+msgstr "Réglage de la température du plateau à %f degrés Celsius."
+
+#: pronterface.py:284
+msgid ""
+"You cannot set negative temperatures. To turn the bed off entirely, set its "
+"temperature to 0."
+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:286
+msgid "You must enter a temperature."
+msgstr "Vous devez saisir une température."
+
+#: pronterface.py:301
+msgid "Do you want to erase the macro?"
+msgstr "Voulez-vous effacer la macro ?"
+
+#: pronterface.py:305
+msgid "Cancelled."
+msgstr "Annulé"
+
+#: pronterface.py:346
+msgid " Opens file"
+msgstr " Ouvrir un fichier"
+
+#: pronterface.py:346
+msgid "&Open..."
+msgstr "&Ouvrir..."
+
+#: pronterface.py:347
+msgid " Edit open file"
+msgstr " Éditer le fichier ouvert"
+
+#: pronterface.py:347
+msgid "&Edit..."
+msgstr "&Éditer..."
+
+#: pronterface.py:348
+msgid " Clear output console"
+msgstr " Effacer le contenu de la console de sortie"
+
+#: pronterface.py:348
+msgid "Clear console"
+msgstr "Effacer la console"
+
+#: pronterface.py:349
+msgid " Project slices"
+msgstr " Projeter les couches"
+
+#: pronterface.py:349
+msgid "Projector"
+msgstr "Projecteur"
+
+#: pronterface.py:350
+msgid " Closes the Window"
+msgstr " Quitter le programme"
+
+#: pronterface.py:350
+msgid "E&xit"
+msgstr "&Quitter"
+
+#: pronterface.py:351
+msgid "&File"
+msgstr "&Fichier"
+
+#: pronterface.py:356
+msgid "&Macros"
+msgstr "&Macros"
+
+#: pronterface.py:357
+msgid "<&New...>"
+msgstr "<&Nouvelle...>"
+
+#: pronterface.py:358
+msgid " Options dialog"
+msgstr " Fenêtre des options"
+
+#: pronterface.py:358
+msgid "&Options"
+msgstr "&Options"
+
+#: pronterface.py:360
+msgid " Adjust slicing settings"
+msgstr " Régler les paramètres de slicing"
+
+#: pronterface.py:360
+msgid "Slicing Settings"
+msgstr "Paramètres de slicing"
+
+#: pronterface.py:367
+msgid "&Settings"
+msgstr "&Paramètres"
+
+#: pronterface.py:383
+msgid "Enter macro name"
+msgstr "Saisissez le nom de la macro"
+
+#: pronterface.py:386
+msgid "Macro name:"
+msgstr "Nom :"
+
+#: pronterface.py:389
+msgid "Ok"
+msgstr "Valider"
+
+#: pronterface.py:393 pronterface.py:1344 pronterface.py:1601
+msgid "Cancel"
+msgstr "Annuler"
+
+#: pronterface.py:411
+msgid "Name '%s' is being used by built-in command"
+msgstr "Le nom '%s' est utilisé par une commande interne"
+
+#: pronterface.py:414
+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:463
+msgid "Port"
+msgstr "Port"
+
+#: pronterface.py:482
+msgid "Connect"
+msgstr "Connecter"
+
+#: pronterface.py:484
+msgid "Connect to the printer"
+msgstr "Connecter l'imprimante"
+
+#: pronterface.py:486
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: pronterface.py:441
-#: pronterface.py:687
+#: pronterface.py:489 pronterface.py:766
 msgid "Mini mode"
 msgstr "Mode réduit"
 
-#: pronterface.py:455
-msgid ""
-"Monitor\n"
-"printer"
-msgstr ""
-"Surveiller\n"
-"l'imprimante"
+#: pronterface.py:493
+msgid "Monitor Printer"
+msgstr "Surveiller l'imprimante"
 
-#: pronterface.py:465
+#: pronterface.py:503
 msgid "Load file"
 msgstr "Charger un fichier"
 
-#: pronterface.py:468
-msgid "SD Upload"
-msgstr "Copier sur SD"
+#: pronterface.py:506
+msgid "Compose"
+msgstr "Composer"
 
-#: pronterface.py:472
-msgid "SD Print"
-msgstr "Imprimer depuis SD"
+#: pronterface.py:510
+msgid "SD"
+msgstr "SD"
 
-#: pronterface.py:480
-#: pronterface.py:1280
-#: pronterface.py:1321
-#: pronterface.py:1370
-#: pronterface.py:1395
-#: pronterface.py:1427
-#: pronterface.py:1442
+#: pronterface.py:518 pronterface.py:1388 pronterface.py:1433
+#: pronterface.py:1483 pronterface.py:1508 pronterface.py:1542
+#: pronterface.py:1557
 msgid "Pause"
 msgstr "Pause"
 
-#: pronterface.py:494
+#: pronterface.py:531
 msgid "Send"
 msgstr "Envoyer"
 
-#: pronterface.py:502
-#: pronterface.py:603
+#: pronterface.py:539 pronterface.py:640
 msgid "mm/min"
 msgstr "mm/min"
 
-#: pronterface.py:504
+#: pronterface.py:541
 msgid "XY:"
 msgstr "XY:"
 
-#: pronterface.py:506
+#: pronterface.py:543
 msgid "Z:"
 msgstr "Z:"
 
-#: pronterface.py:529
+#: pronterface.py:566 pronterface.py:647
 msgid "Heater:"
 msgstr "Buse :"
 
-#: pronterface.py:532
-#: pronterface.py:552
+#: pronterface.py:569 pronterface.py:589
 msgid "Off"
 msgstr "Off"
 
-#: pronterface.py:544
-#: pronterface.py:564
+#: pronterface.py:581 pronterface.py:601
 msgid "Set"
 msgstr "Régler"
 
-#: pronterface.py:549
+#: pronterface.py:586 pronterface.py:649
 msgid "Bed:"
 msgstr "Plateau :"
 
-#: pronterface.py:597
+#: pronterface.py:634
 msgid "mm"
 msgstr "mm"
 
-#: pronterface.py:636
-#: pronterface.py:1099
-#: pronterface.py:1315
+#: pronterface.py:692 pronterface.py:1196 pronterface.py:1427
 msgid "Not connected to printer."
-msgstr "Imprimante non connectée"
+msgstr "Imprimante non connectée."
 
-#: pronterface.py:694
+#: pronterface.py:721
+msgid "SD Upload"
+msgstr "Copier sur SD"
+
+#: pronterface.py:725
+msgid "SD Print"
+msgstr "Imprimer depuis SD"
+
+#: pronterface.py:773
 msgid "Full mode"
 msgstr "Mode complet"
 
-#: pronterface.py:719
+#: pronterface.py:798
 msgid "Execute command: "
 msgstr "Exécuter la commande :"
 
-#: pronterface.py:730
+#: pronterface.py:809
 msgid "click to add new custom button"
 msgstr "Ajouter un bouton personnalisé"
 
-#: pronterface.py:751
-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:828
+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:773
+#: pronterface.py:850
 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."
+msgstr ""
+"Les numéros des boutons personnalisés doivent être compris entre 0 et 63."
 
-#: pronterface.py:865
+#: pronterface.py:942
 msgid "Edit custom button '%s'"
-msgstr "Editer le bouton personnalisé n°'%s'"
+msgstr "Editer le bouton personnalisé '%s'"
 
-#: pronterface.py:867
+#: pronterface.py:944
 msgid "Move left <<"
 msgstr "Déplacer vers la gauche <<"
 
-#: pronterface.py:870
+#: pronterface.py:947
 msgid "Move right >>"
 msgstr "Déplacer vers la droite >>"
 
-#: pronterface.py:874
+#: pronterface.py:951
 msgid "Remove custom button '%s'"
-msgstr "Supprimer le bouton personnalisé n°'%s'"
+msgstr "Supprimer le bouton personnalisé '%s'"
 
-#: pronterface.py:877
+#: pronterface.py:954
 msgid "Add custom button"
 msgstr "Ajouter un bouton personnalisé"
 
-#: pronterface.py:1022
+#: pronterface.py:1099
 msgid "event object missing"
-msgstr "evennement d'objet manquant"
+msgstr "événement d'objet manquant"
 
-#: pronterface.py:1050
+#: pronterface.py:1127
 msgid "Invalid period given."
 msgstr "La période donnée est invalide"
 
-#: pronterface.py:1053
+#: pronterface.py:1130
 msgid "Monitoring printer."
-msgstr "Surveillance de l'imprimante"
+msgstr "Imprimante sous surveillance."
 
-#: pronterface.py:1055
+#: pronterface.py:1132
 msgid "Done monitoring."
 msgstr "Surveillance de l'imprimante effectuée."
 
-#: pronterface.py:1077
+#: pronterface.py:1154
 msgid "Printer is online. "
-msgstr "L'imprimante est connectée"
+msgstr "L'imprimante est connectée. "
 
-#: pronterface.py:1079
-#: pronterface.py:1226
-#: pronterface.py:1278
+#: pronterface.py:1156 pronterface.py:1331
 msgid "Loaded "
 msgstr "Chargé "
 
-#: pronterface.py:1082
+#: pronterface.py:1159
 msgid "Bed"
 msgstr "Plateau"
 
-#: pronterface.py:1082
+#: pronterface.py:1159
 msgid "Hotend"
 msgstr "Buse"
 
-#: pronterface.py:1089
+#: pronterface.py:1169
 msgid " SD printing:%04.2f %%"
 msgstr "Impression SD : %04.2f %%"
 
-#: pronterface.py:1091
-msgid " Printing:%04.2f %%"
-msgstr "Impression : %04.2f %%"
+#: pronterface.py:1172
+msgid " Printing:%04.2f %% |"
+msgstr "Impression : %04.2f %% |"
 
-#: pronterface.py:1149
+#: pronterface.py:1173
+msgid " Line# %d of %d lines |"
+msgstr "Ligne# %d sur %d lignes |"
+
+#: pronterface.py:1178
+msgid " Est: %s of %s remaining | "
+msgstr " ETA: %s restant sur %s | "
+
+#: pronterface.py:1180
+msgid " Z: %0.2f mm"
+msgstr " Z: %0.2f mm"
+
+#: pronterface.py:1247
 msgid "Opening file failed."
 msgstr "L'ouverture du fichier a échoué"
 
-#: pronterface.py:1155
+#: pronterface.py:1253
 msgid "Starting print"
 msgstr "Début de l'impression..."
 
-#: pronterface.py:1178
+#: pronterface.py:1276
 msgid "Pick SD file"
 msgstr "Choisir un fichier sur la carte SD"
 
-#: pronterface.py:1178
+#: pronterface.py:1276
 msgid "Select the file to print"
 msgstr "Sélectionnez le fichier à imprimer :"
 
-#: pronterface.py:1206
-msgid "Skeinforge execution failed."
-msgstr "Exécution de Skeinforge échoué"
+#: pronterface.py:1311
+msgid "Failed to execute slicing software: "
+msgstr "Une erreur s'est produite lors du slicing : "
 
-#: pronterface.py:1213
-msgid "Skeining..."
-msgstr "Skeining..."
+#: pronterface.py:1318
+msgid "Slicing..."
+msgstr "Slicing..."
 
-#: pronterface.py:1226
-#: pronterface.py:1278
+#: pronterface.py:1331
 msgid ", %d lines"
 msgstr ", %d lignes"
 
-#: pronterface.py:1235
-msgid "Skeining "
-msgstr "Skeining "
+#: pronterface.py:1338
+msgid "Load File"
+msgstr "Charger un fichier"
 
-#: pronterface.py:1237
-msgid ""
-"Skeinforge not found. \n"
-"Please copy Skeinforge into a directory named \"skeinforge\" in the same directory as this file."
-msgstr ""
-"Skeinforge non trouvé. \n"
-"Veuillez copier Skeinforge dans un répertoire nommé \"skeinforge\" placé dans le repertoire du programme."
+#: pronterface.py:1345
+msgid "Slicing "
+msgstr "Slicing "
 
-#: pronterface.py:1256
+#: pronterface.py:1364
 msgid "Open file to print"
 msgstr "Ouvrir un fichier à imprimer"
 
-#: pronterface.py:1257
+#: pronterface.py:1365
 msgid "OBJ, STL, and GCODE files (;*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ;)"
-msgstr "Fichiers OBJ, STL et GCODE (;*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ;)"
+msgstr ""
+"Fichiers OBJ, STL et GCODE (;*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ;)"
 
-#: pronterface.py:1264
+#: pronterface.py:1372
 msgid "File not found!"
 msgstr "Fichier non trouvé"
 
-#: pronterface.py:1288
+#: pronterface.py:1386
+msgid "Loaded %s, %d lines"
+msgstr "%s chargé, %d lignes"
+
+#: pronterface.py:1396
 msgid "mm of filament used in this print\n"
 msgstr "mm de filament utilisés pour cette impression\n"
 
-#: pronterface.py:1289
+#: pronterface.py:1397
 msgid ""
-"mm in X\n"
-"and is"
+"the print goes from %f mm to %f mm in X\n"
+"and is %f mm wide\n"
 msgstr ""
-"mm en X\n"
-"et mesure"
+"L'impression va de %f mm à %f m en X\n"
+"et mesure %f mm de large\n"
 
-#: pronterface.py:1289
-#: pronterface.py:1290
-msgid "mm wide\n"
-msgstr "mm de large\n"
-
-#: pronterface.py:1289
-#: pronterface.py:1290
-#: pronterface.py:1291
-msgid "mm to"
-msgstr "mm à"
-
-#: pronterface.py:1289
-#: pronterface.py:1290
-#: pronterface.py:1291
-msgid "the print goes from"
-msgstr "L'impression va de"
-
-#: pronterface.py:1290
+#: pronterface.py:1398
 msgid ""
-"mm in Y\n"
-"and is"
+"the print goes from %f mm to %f mm in Y\n"
+"and is %f mm wide\n"
 msgstr ""
-"mm en Y\n"
-"et mesure"
+"L'impression va de %f mm à %f m en Y\n"
+"et mesure %f mm de large\n"
 
-#: pronterface.py:1291
-msgid "mm high\n"
-msgstr "mm de haut\n"
-
-#: pronterface.py:1291
+#: pronterface.py:1399
 msgid ""
-"mm in Z\n"
-"and is"
+"the print goes from %f mm to %f mm in Z\n"
+"and is %f mm high\n"
 msgstr ""
-"mm en Z\n"
-"et mesure"
+"L'impression va de %f mm à %f m en Y\n"
+"et mesure %f mm de haut\n"
 
-#: pronterface.py:1292
+#: pronterface.py:1400
 msgid "Estimated duration (pessimistic): "
-msgstr "Durée estimée (pessimiste)"
+msgstr "Durée estimée (pessimiste) : "
 
-#: pronterface.py:1312
+#: pronterface.py:1424
 msgid "No file loaded. Please use load first."
 msgstr "Aucun fichier chargé. Veuillez charger un fichier avant."
 
-#: pronterface.py:1323
+#: pronterface.py:1435
 msgid "Restart"
 msgstr "Recommencer"
 
-#: pronterface.py:1327
+#: pronterface.py:1439
 msgid "File upload complete"
 msgstr "Envoi du fichier terminé"
 
-#: pronterface.py:1346
+#: pronterface.py:1458
 msgid "Pick SD filename"
 msgstr "Lister les fichiers sur la carte SD"
 
-#: pronterface.py:1353
+#: pronterface.py:1466
 msgid "Paused."
-msgstr "En pause"
+msgstr "En pause."
 
-#: pronterface.py:1363
+#: pronterface.py:1476
 msgid "Resume"
 msgstr "Reprendre"
 
-#: pronterface.py:1379
+#: pronterface.py:1492
 msgid "Connecting..."
 msgstr "Connection en cours..."
 
-#: pronterface.py:1410
+#: pronterface.py:1523
 msgid "Disconnected."
-msgstr "Déconnecté"
+msgstr "Déconnecté."
 
-#: pronterface.py:1435
+#: pronterface.py:1550
 msgid "Reset."
-msgstr "Réinitialiser"
+msgstr "Réinitialisée."
 
-#: pronterface.py:1436
+#: pronterface.py:1551
 msgid "Are you sure you want to reset the printer?"
 msgstr "Etes-vous sûr de vouloir réinitialiser l'imprimante?"
 
-#: pronterface.py:1436
+#: pronterface.py:1551
 msgid "Reset?"
 msgstr "Réinitialiser ?"
 
-#: pronterface.py:1461
+#: pronterface.py:1597
 msgid "Save"
 msgstr "Enregistrer"
 
-#: pronterface.py:1519
+#: pronterface.py:1653
 msgid "Edit settings"
 msgstr "Modifier les paramètres"
 
-#: pronterface.py:1521
+#: pronterface.py:1655
 msgid "Defaults"
 msgstr "Paramètres par défaut"
 
-#: pronterface.py:1543
+#: pronterface.py:1684
 msgid "Custom button"
 msgstr "Commande personnalisée"
 
-#: pronterface.py:1551
+#: pronterface.py:1689
 msgid "Button title"
 msgstr "Titre du bouton"
 
-#: pronterface.py:1554
+#: pronterface.py:1692
 msgid "Command"
 msgstr "Commande"
 
-#: pronterface.py:1563
+#: pronterface.py:1701
 msgid "Color"
 msgstr "Couleur"
-
diff --git a/locale/fr/LC_MESSAGES/pronterface.mo b/locale/fr/LC_MESSAGES/pronterface.mo
index ffc768977612487e3d8a122bec7cc7db98813594..0a33f2a07ef0cd66c46f564019037f4e8add7adb 100644
GIT binary patch
delta 3258
zcmZ|QX>6259LMq5S`-VFUR<?>fpviby%wli6*<~MwP+PktYTf-r|pB?ZQ1SOMO+o*
z5j7egO}vAs(Gra>Dv2gSG&S*vXVk<PB}RFpHeL~p29NLW>6Gw7C;dO4dFDB0=0Edn
zZ(aY{+T5X%{09wXCs9GXdx9~K<F1o9P<}eum|6HUPRD`*V@lBCG+c(K;#!=Eoj3)r
zao2aFo(pgW4&zjO4evH4XWpYSnT8IYnuJ}bzI{~t4(IjA7|d?u5p$0_e+Y{?--}D|
zC1eifE6m5ks1Coy6Y)3H^M8fr=!C0<G?bzSFb_3=h0a>k$WKSzcY*T?tmS+=YM_tc
zdVI=VAH%tv|A|Fd&ck~D5>%$@v5@{vD;3>vDbB|})Qs*z4diiDs-M9!+>gq{JMQ`?
zsF{6%8}J)c%Ii-Vzi*xMBGmgX$5QOV+$t*9P$3)UWz>t`Ky~;&>c&H;l>LHC#{7l!
zVG6jZ3TNR0T!XXG#|v>cuEUQ}OL8i+%)_~;Jv6_F_1BD6(4f?uhZ<o!s-rE)pYb?o
zEq9{sy8)G<n^8*>IQO9j{5onNpQ7&n5tX4M&ZDS)PADe-x-f;esi6e5mgT5SL{S}A
zqrQT;J3k*aqjs#pO<0e+QP1y3`Y;Dknfm}qn)w`8;J2vf=jO=6Rw_}v3U9_r{2H|v
zG##ZZigR!QDr3#Ay#saMR@6jp!eqpl+cC=d5pG_Lv)K^Z6HOe-vBR0mQc<ezL;5uP
zkUw*PgJ%3O>iQUJNlql+cVj7P&+I|X_<2+Y_oHTfz_q`HdhR3C{fAJQ_zw9xa^?>z
z4K&Q=n+Vq)mHI8nzA@Wed)j$D@`$+wHQ<L``}3%Qyo7rG0P4OsorjP=bA&@17Bah;
z^lv(-XbIA&k$#9u^_RE^kD^{2BMsW+HAs`$jQYh)IqyPs@Eq#?*N{~(ZzF%^OAdPf
z@2I89XC3nO{ZFBCDHfr{KGe+abUuc9;ftuHc^NzKebnx*;`diCu0;*tY}CLuq4vrS
z<j>sZ+>5oGAH>|5RDPhM5ia7X9$bU#aTv8re?cwHZ>Y`rH_pQfPBeg(r~x*iHsc1=
z<{L!K^Z|GMQPhB*MrHVwO7c(N<}(`Puc#lCBCcwaG&);RpVJo9Ch}2hoJDn<LuKp^
z)DP36sQZRdOST_1fiIkg@f^;_=8%6?7PA%gqCV87*@4={cc3y8U?;wS%1EK*Q^jJu
z5d+kWOGwKiY(Rasoya3*8)|~Lxb`PdOYmflic<6uM(`}6kx*GpqzJvZh9Eg%=M3KX
z#6;1HlZ5t!iUy#4qN2fHL1<Z;2`%^KM26@ia_4bSQF_;fHU5`ljMzpbT$^COh2<iS
z%9_e)M15ErpRua?Y}q2=9?`jqHuyxjkjf_F5`F&{Q#qHojL<ILLbMa76DrzZDq8RL
zg!YBjdO4xpzL~IuN;T0-tkDT&A+dwd=h{lBXn&|E>+0W}0d?VtF$1`rSV3srRuL+l
z<CrXNB$|k`32m+_Vvsn#Y~bX4Vkx2hG(@Z<RQTx+_tsYIq5tqlB91C;<Al36P5nxD
zuFax<L=EoT!>fsIcYYQ2ySjGz1w<FI#I-GUw%}w!pW#lqjDxYOySHaELpIazcloK_
z;9x;hyg4(}Xk!^W(4%A8OD6mj*X%B9Y@46*qBhnYUhKC0oM!B<`=`_`u)B=i*klLO
zerkxj8)J3LYvQ~iW^4zqtJ6s`8RTZ(8<bCtj|@)rBO`|kFNrK}@%uf~HjwDHJrgyr
z+lDO|%PduQVMjsBw9Y)+9y~j(B`=l<HcX9<{5Wka68uxVx-`~fyS?7D$8gqq{TV--
zsR>q<%#Hs?yV*ECS$nLq(Hqj3GhxF>UTJkCC@!m<WEaIURY6VJ%3yEV{QTOap9;P&
zJF6&OT^Fy8H`u!R#^o!PtZg1?n0`*ApxZl^#A|0<xvY89>M)6EFEf-#k>G4v*(8T;
zey_`6*rvJBz@^}m8LO&DV{3Adr!xLPN(oi&{wI^~j_jOuG%}Jae=`y+tC%^R_jmOr
z(!Ha@E@ygg&{}a_q3vJj^Hx8}P`qGId1WwGv6<OfMrX4_e!rg?9kzpsw9TeG+cl8n
zMkd5kdg+umvZnIYykMzKPGos>__!>m?3`xL_9yJNY{s*rd#p?O@i!gIv}sSI6Uou%
qhL|A>Hj%RN#9udWAB#CZIyp?d>1Yh@n>8<JiN=B#qDv<!|K?wermHgm

delta 3842
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


From e9c0469778141c23595363a0d4b1be59e1a9f294 Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Sun, 26 Feb 2012 02:41:50 +0100
Subject: [PATCH 06/12] Use format string for translation

---
 plater.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plater.py b/plater.py
index 28f4e5a..6b32404 100755
--- a/plater.py
+++ b/plater.py
@@ -388,7 +388,7 @@ class stlwin(wx.Frame):
             facets += i.facets
         sf.close()
         stltool.emitstl(name, facets, "plater_export")
-        print _("wrote "), name
+        print _("wrote %s") % name
 
     def right(self, event):
         dlg = wx.FileDialog(self, _("Pick file to load"), self.basedir, style=wx.FD_OPEN | wx.FD_FILE_MUST_EXIST)

From 8066764a072fd51059041195667887a0ac66bd43 Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Sun, 26 Feb 2012 02:48:39 +0100
Subject: [PATCH 07/12] Update plater.pot

---
 locale/plater.pot | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/locale/plater.pot b/locale/plater.pot
index c4daabd..2db698d 100644
--- a/locale/plater.pot
+++ b/locale/plater.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-09 15:07+CET\n"
+"POT-Creation-Date: 2012-02-26 02:40+CET\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,79 +15,79 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 
 
-#: plater.py:223
+#: plater.py:247
 msgid "Plate building tool"
 msgstr ""
 
-#: plater.py:229
+#: plater.py:253
 msgid "Clear"
 msgstr ""
 
-#: plater.py:230
+#: plater.py:254
 msgid "Load"
 msgstr ""
 
-#: plater.py:232
+#: plater.py:256
 msgid "Export"
 msgstr ""
 
-#: plater.py:235
+#: plater.py:259
 msgid "Done"
 msgstr ""
 
-#: plater.py:237
+#: plater.py:261
 msgid "Cancel"
 msgstr ""
 
-#: plater.py:239
+#: plater.py:263
 msgid "Snap to Z = 0"
 msgstr ""
 
-#: plater.py:240
+#: plater.py:264
 msgid "Put at 100, 100"
 msgstr ""
 
-#: plater.py:241
+#: plater.py:265
 msgid "Delete"
 msgstr ""
 
-#: plater.py:242
+#: plater.py:266
 msgid "Auto"
 msgstr ""
 
-#: plater.py:266
+#: plater.py:290
 msgid "Autoplating"
 msgstr ""
 
-#: plater.py:294
+#: plater.py:318
 msgid "Bed full, sorry sir :("
 msgstr ""
 
-#: plater.py:304
+#: plater.py:328
 msgid "Are you sure you want to clear the grid? All unsaved changes will be lost."
 msgstr ""
 
-#: plater.py:304
+#: plater.py:328
 msgid "Clear the grid?"
 msgstr ""
 
-#: plater.py:346
+#: plater.py:370
 msgid "Pick file to save to"
 msgstr ""
 
-#: plater.py:347
-msgid "STL files (;*.stl;)"
+#: plater.py:371
+msgid "STL files (;*.stl;*.STL;)"
 msgstr ""
 
-#: plater.py:367
-msgid "wrote "
+#: plater.py:391
+msgid "wrote %s"
 msgstr ""
 
-#: plater.py:370
+#: plater.py:394
 msgid "Pick file to load"
 msgstr ""
 
-#: plater.py:371
-msgid "STL files (;*.stl;)|*.stl|OpenSCAD files (;*.scad;)|*.scad"
+#: plater.py:395
+msgid "STL files (;*.stl;*.STL;)|*.stl|OpenSCAD files (;*.scad;)|*.scad"
 msgstr ""
 

From 91eb75dff7e275d2deb61b474fa675120eb8fa23 Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Sun, 26 Feb 2012 03:10:12 +0100
Subject: [PATCH 08/12] French translation for plater

---
 locale/fr/LC_MESSAGES/plater.mo               | Bin 0 -> 1622 bytes
 locale/fr/LC_MESSAGES/plater.po               |  95 ++++++++++++++++++
 .../fr/LC_MESSAGES/{fr.po => pronterface.po}  |   0
 3 files changed, 95 insertions(+)
 create mode 100644 locale/fr/LC_MESSAGES/plater.mo
 create mode 100644 locale/fr/LC_MESSAGES/plater.po
 rename locale/fr/LC_MESSAGES/{fr.po => pronterface.po} (100%)
 mode change 100755 => 100644

diff --git a/locale/fr/LC_MESSAGES/plater.mo b/locale/fr/LC_MESSAGES/plater.mo
new file mode 100644
index 0000000000000000000000000000000000000000..d3690d499bc14e4b2edc437d31a803690b5cad5f
GIT binary patch
literal 1622
zcmaKrO>A5>5XTLaujRWSBt#K|P}Qc*TXrL;stut{cQ;k(mMq<+NC*iz?@cxauf5oQ
zNmnWtj&SDQBe`?rwumzvx%AG3BR3@e^YWC0kJgg?v&Uo4hsXC$p7>6oy@Y-W{YUiI
z&_8_$1KKa(`{1wO3GmdzN<9U>0lo}o;A3D9d=$J6J_mkS%QYzHcIx%CUMKJc$mgKg
z{uX=@ybH?tAHY|@pTNuDJ@6Uu^+%L?0?fec@aY1$jrG?sB6fbq@GSTTC~^D+J`TPL
z=fuA^F^JtI@JVnLl>7QMKLADlV^Ge22A%`Is@LCxC$at+lzjaLZh(J+Vs{P6kb4JU
zox&<Uh${KhGC9@|mO=>X`C8Th#XpG!S5{5ziI2GQut_c?PvWcCmE6g@sP(`!_a()$
zp6qFtD0#{)>p*FTX%b9viPo*9(nY<?1?4;1O*qn?fpCk-`k0z(y-dCuW>zQTCh7`Q
zw@Yi6Df$rR6iuMcS=H4pXREqm;9xv5qk3#PvFdrps(*XtLsA2;3pF(P7qo3Gi*NQn
z67dT=Y6#OzTcxoDJb=VoH7pb9MD12<Sq3#452~9Yon1ZGjLBkzY<21WJ9jF*JDW3h
zqwad|`0-p9t4p$vi5fXQ69+$`HEOB7;Ni^asD{CR&UwnN71=Eg(RkOP%G1yoZjQ5V
zU?j}DtOw^iw9;y?WUZBK<pQ-<I&Zhmcl%@LWjA@($l3o_YoBi+xW+)ol#PRS5t;Cz
zLsyXttIH|Vh$p3S^e)B&$>j)1)42C=%1uf=;cU!$+M$h`57g>V<Hofc{i9gg%~qr9
zU1A5@^BH1Dd^^2`IxuckswG5DYafj_vWrK0;^Q`ltnYF!kJX`zTP8KGvg3d}6xo$|
zhi3B$C%LRSn^U{_PD3reNvOPCUq-1}Dp=;$qqKHS!GWxng0(1=OEmVSC|mR?Y;2pn
z%5x;=9kB~MF)@Y3KK3IA1VA$mMai))X1r0(Q$$5tYI}f6H;Fhx&$4mLR4n$Rw~Ku#
z>viW!%R$`|Hx9<*&Ztp2n*}q)-k8JGxW#^5;E;5YqDe)MCq@vA63cfC;#u6S5_q58
z0!f7SmnGYyfN;@fnT)04jE<3~TNY0%nZko4)}{QC99OeD`V<=n<|4`O`1ikf&}RKL
d4pk2SNOj3Se#g)w%VPE5dz_B6*w2GW>Te>boXr3L

literal 0
HcmV?d00001

diff --git a/locale/fr/LC_MESSAGES/plater.po b/locale/fr/LC_MESSAGES/plater.po
new file mode 100644
index 0000000..9113445
--- /dev/null
+++ b/locale/fr/LC_MESSAGES/plater.po
@@ -0,0 +1,95 @@
+# French Plater Message Catalog
+# Copyright (C) 2012 Guillaume Seguin
+# Guillaume Seguin <guillaume@segu.in>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Plater\n"
+"POT-Creation-Date: 2012-02-26 02:40+CET\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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: pygettext.py 1.5\n"
+
+#: plater.py:247
+msgid "Plate building tool"
+msgstr "Outil d'assemblage de plateau"
+
+#: plater.py:253
+msgid "Clear"
+msgstr "Vider"
+
+#: plater.py:254
+msgid "Load"
+msgstr "Charger"
+
+#: plater.py:256
+msgid "Export"
+msgstr "Exporter"
+
+#: plater.py:259
+msgid "Done"
+msgstr "Terminé"
+
+#: plater.py:261
+msgid "Cancel"
+msgstr "Annuler"
+
+#: plater.py:263
+msgid "Snap to Z = 0"
+msgstr "Poser en Z = 0"
+
+#: plater.py:264
+msgid "Put at 100, 100"
+msgstr "Placer en 100, 100"
+
+#: plater.py:265
+msgid "Delete"
+msgstr "Supprimer"
+
+#: plater.py:266
+msgid "Auto"
+msgstr "Auto"
+
+#: plater.py:290
+msgid "Autoplating"
+msgstr "Placement auto"
+
+#: plater.py:318
+msgid "Bed full, sorry sir :("
+msgstr "Le lit est plein, désolé :("
+
+#: plater.py:328
+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
+msgid "Clear the grid?"
+msgstr "Vider la grille ?"
+
+#: plater.py:370
+msgid "Pick file to save to"
+msgstr "Choisir le fichier dans lequel enregistrer"
+
+#: plater.py:371
+msgid "STL files (;*.stl;*.STL;)"
+msgstr "Fichiers STL (;*.stl;*.STL;)"
+
+#: plater.py:391
+msgid "wrote %s"
+msgstr "%s écrit"
+
+#: plater.py:394
+msgid "Pick file to load"
+msgstr "Choisir le fichier à charger"
+
+#: plater.py:395
+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/fr.po b/locale/fr/LC_MESSAGES/pronterface.po
old mode 100755
new mode 100644
similarity index 100%
rename from locale/fr/LC_MESSAGES/fr.po
rename to locale/fr/LC_MESSAGES/pronterface.po

From f2d6f2ded5d90f51979520b4a9929a4e5f868ef7 Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Sun, 26 Feb 2012 03:52:53 +0100
Subject: [PATCH 09/12] Update all translations for 2afaf4c61

---
 locale/de/LC_MESSAGES/pronterface.mo | Bin 11383 -> 9961 bytes
 locale/de/LC_MESSAGES/pronterface.po | 546 ++++++++--------
 locale/it/LC_MESSAGES/pronterface.mo | Bin 11678 -> 10146 bytes
 locale/it/LC_MESSAGES/pronterface.po | 546 ++++++++--------
 locale/nl/LC_MESSAGES/nl.po          | 900 +++++++++++++++------------
 locale/nl/LC_MESSAGES/pronterface.mo | Bin 8205 -> 6719 bytes
 6 files changed, 999 insertions(+), 993 deletions(-)

diff --git a/locale/de/LC_MESSAGES/pronterface.mo b/locale/de/LC_MESSAGES/pronterface.mo
index a1a42cd39ba706bd2a2bef35b202ece31b0adb0c..8caed273a9b6a7d22ba79441c4d1b5544f69213e 100644
GIT binary patch
delta 3785
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

literal 11383
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
PpJnyC_-sbrT=)M6#Do0!

diff --git a/locale/de/LC_MESSAGES/pronterface.po b/locale/de/LC_MESSAGES/pronterface.po
index e6c864d..6dc248b 100644
--- a/locale/de/LC_MESSAGES/pronterface.po
+++ b/locale/de/LC_MESSAGES/pronterface.po
@@ -5,77 +5,21 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pronterface jm1\n"
-"POT-Creation-Date: 2012-01-19 09:21+CET\n"
+"POT-Creation-Date: 2012-02-26 02:12+CET\n"
 "PO-Revision-Date: 2012-01-23 10:01+0100\n"
 "Last-Translator: Christian Metzen <metzench@ccux-linux.de>\n"
 "Language-Team: DE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: pronsole.py:250
-msgid "Communications Speed (default: 115200)"
-msgstr "Kommunikationsgeschwindigkeit (Vorgabe: 115200)"
-
-#: pronsole.py:251
-msgid "Heated Build Platform temp for ABS (default: 110 deg C)"
-msgstr "Heizbett Temp. für ABS (Vorgabe: 110 Grad Celsius)"
-
-#: pronsole.py:252
-msgid "Heated Build Platform temp for PLA (default: 60 deg C)"
-msgstr "Heizbett Temp. für PLA (Vorgabe: 60 Grad Celsius)"
-
-#: pronsole.py:253
-msgid "Feedrate for Control Panel Moves in Extrusions (default: 300mm/min)"
-msgstr "Vorschub Control Panel Bewegungen Extrudierung (Vorgabe: 300mm/min)"
-
-#: pronsole.py:254
-msgid "Port used to communicate with printer"
-msgstr "Port für Druckerkommunikation"
-
-#: pronsole.py:255
-msgid ""
-"Slice command\n"
-"   default:\n"
-"       python skeinforge/skeinforge_application/skeinforge_utilities/skeinforge_craft.py $s)"
-msgstr ""
-"Kommando Slicing\n"
-"   Vorgabe:\n"
-"       python skeinforge/skeinforge_application/skeinforge_utilities/skeinforge_craft.py $s)"
-
-#: pronsole.py:256
-msgid ""
-"Slice settings command\n"
-"   default:\n"
-"       python skeinforge/skeinforge_application/skeinforge.py"
-msgstr ""
-"Kommando Slicing Einstellungen\n"
-"   Vorgabe:\n"
-"       python skeinforge/skeinforge_application/skeinforge.py"
-
-#: pronsole.py:257
-msgid "Extruder temp for ABS (default: 230 deg C)"
-msgstr "Extruder Temperatur für ABS (Vorgabe: 230 Grad Celsius)"
-
-#: pronsole.py:258
-msgid "Extruder temp for PLA (default: 185 deg C)"
-msgstr "Extruder Temperatur für PLA (Vorgabe: 185 Grad Celsius)"
-
-#: pronsole.py:259
-msgid "Feedrate for Control Panel Moves in X and Y (default: 3000mm/min)"
-msgstr "Vorschub Control Panel Bewegungen X und Y (Vorgabe: 3000mm/min)"
-
-#: pronsole.py:260
-msgid "Feedrate for Control Panel Moves in Z (default: 200mm/min)"
-msgstr "Vorschub Control Panel Bewegungen Z (Vorgabe: 200mm/min)"
-
-#: pronterface.py:15
+#: pronterface.py:30
 msgid "WX is not installed. This program requires WX to run."
 msgstr "WX ist nicht installiert. Dieses Programm erfordert WX zum Starten."
 
-#: pronterface.py:66
+#: pronterface.py:81
 msgid ""
 "Dimensions of Build Platform\n"
 " & optional offset of origin\n"
@@ -93,55 +37,55 @@ msgstr ""
 "   XXX,YYY,ZZZ\n"
 "   XXXxYYYxZZZ+OffX+OffY+OffZ"
 
-#: pronterface.py:67
+#: pronterface.py:82
 msgid "Last Set Temperature for the Heated Print Bed"
 msgstr "Letzte gesetzte Temperatur für das Heizbett"
 
-#: pronterface.py:68
+#: pronterface.py:83
 msgid "Folder of last opened file"
 msgstr "Verzeichniss der zuletzt geöffneten Datei"
 
-#: pronterface.py:69
+#: pronterface.py:84
 msgid "Last Temperature of the Hot End"
 msgstr "Letzte Hotend Temperatur"
 
-#: pronterface.py:70
+#: pronterface.py:85
 msgid "Width of Extrusion in Preview (default: 0.5)"
 msgstr "Vorschaubreite der Extrudierung (Vorgabe: 0.5)"
 
-#: pronterface.py:71
+#: pronterface.py:86
 msgid "Fine Grid Spacing (default: 10)"
 msgstr "Feiner Rasterabstand (Vorgabe: 10)"
 
-#: pronterface.py:72
+#: pronterface.py:87
 msgid "Coarse Grid Spacing (default: 50)"
 msgstr "Grober Rasterabstand (Vorgabe: 50)"
 
-#: pronterface.py:73
+#: pronterface.py:88
 msgid "Pronterface background color (default: #FFFFFF)"
 msgstr "Pronterface Hintergrundfarbe (Vorgabe: #FFFFFF)"
 
-#: pronterface.py:76
+#: pronterface.py:91
 msgid "Printer Interface"
 msgstr "Printer Interface"
 
-#: pronterface.py:93
+#: pronterface.py:108
 msgid "Motors off"
 msgstr "Motoren aus"
 
-#: pronterface.py:94
+#: pronterface.py:109
 msgid "Check temp"
 msgstr "Temperatur prüfen"
 
-#: pronterface.py:95
+#: pronterface.py:110
 msgid "Extrude"
 msgstr "Extrudieren"
 
-#: pronterface.py:96
+#: pronterface.py:111
 msgid "Reverse"
 msgstr "Rückwärts"
 
-#: pronterface.py:114
+#: pronterface.py:129
 msgid ""
 "# I moved all your custom buttons into .pronsolerc.\n"
 "# Please don't add them here any more.\n"
@@ -151,552 +95,560 @@ msgstr ""
 "# Bitte fügen Sie sie hier nicht mehr ein.\n"
 "# Backup Ihrer alten Buttons befindet sich in custombtn.old\n"
 
-#: pronterface.py:119
-msgid "Note!!! You have specified custom buttons in both custombtn.txt and .pronsolerc"
-msgstr "Achtung! Sie haben benutzerdefinierte Buttons in custombtn.txt und .pronsolerc angegeben"
+#: pronterface.py:134
+msgid ""
+"Note!!! You have specified custom buttons in both custombtn.txt and ."
+"pronsolerc"
+msgstr ""
+"Achtung! Sie haben benutzerdefinierte Buttons in custombtn.txt und ."
+"pronsolerc angegeben"
 
-#: pronterface.py:120
-msgid "Ignoring custombtn.txt. Remove all current buttons to revert to custombtn.txt"
-msgstr "Ignoriere custombtn.txt. Alle aktuellen Buttons entfernen um wieder zu custombtn.txt zurückzukehren"
+#: pronterface.py:135
+msgid ""
+"Ignoring custombtn.txt. Remove all current buttons to revert to custombtn.txt"
+msgstr ""
+"Ignoriere custombtn.txt. Alle aktuellen Buttons entfernen um wieder zu "
+"custombtn.txt zurückzukehren"
 
-#: pronterface.py:148
-#: pronterface.py:499
-#: pronterface.py:1319
-#: pronterface.py:1373
-#: pronterface.py:1495
-#: pronterface.py:1529
-#: pronterface.py:1544
+#: pronterface.py:163 pronterface.py:514 pronterface.py:1333
+#: pronterface.py:1387 pronterface.py:1509 pronterface.py:1543
+#: pronterface.py:1558
 msgid "Print"
 msgstr "Drucken"
 
-#: pronterface.py:152
+#: pronterface.py:167
 msgid "Printer is now online."
 msgstr "Drucker ist jetzt Online."
 
-#: pronterface.py:212
-msgid "Setting hotend temperature to "
-msgstr "Setze Hotend Temperatur auf "
+#: pronterface.py:168
+msgid "Disconnect"
+msgstr "Trennen"
 
-#: pronterface.py:212
-#: pronterface.py:248
-msgid " degrees Celsius."
-msgstr " Grad Celsius."
+#: pronterface.py:227
+msgid "Setting hotend temperature to %f degrees Celsius."
+msgstr "Setze Hotend Temperatur auf %f Grad Celsius."
 
-#: pronterface.py:231
-#: pronterface.py:267
-#: pronterface.py:325
+#: pronterface.py:246 pronterface.py:282 pronterface.py:340
 msgid "Printer is not online."
 msgstr "Drucker ist nicht online."
 
-#: pronterface.py:233
-msgid "You cannot set negative temperatures. To turn the hotend off entirely, set its temperature to 0."
-msgstr "Sie können keine negativen Temperaturen einstellen. Um das Hotend ganz auszuschalten, Temperatur auf 0 setzen."
-
 #: pronterface.py:248
-msgid "Setting bed temperature to "
-msgstr "Setze Heizbett Temperatur auf"
+msgid ""
+"You cannot set negative temperatures. To turn the hotend off entirely, set "
+"its temperature to 0."
+msgstr ""
+"Sie können keine negativen Temperaturen einstellen. Um das Hotend ganz "
+"auszuschalten, Temperatur auf 0 setzen."
 
-#: pronterface.py:269
-msgid "You cannot set negative temperatures. To turn the bed off entirely, set its temperature to 0."
-msgstr "Sie können keine negativen Temperaturen einstellen. Um das Heizbett ganz auszuschalten, Temperatur auf 0 setzen."
+#: pronterface.py:250
+msgid "You must enter a temperature. (%s)"
+msgstr "Sie müssen eine Temperatur eingeben. (%s)"
 
-#: pronterface.py:271
+#: pronterface.py:263
+msgid "Setting bed temperature to %f degrees Celsius."
+msgstr "Setze Heizbett Temperatur auf %f Grad Celsius."
+
+#: pronterface.py:284
+msgid ""
+"You cannot set negative temperatures. To turn the bed off entirely, set its "
+"temperature to 0."
+msgstr ""
+"Sie können keine negativen Temperaturen einstellen. Um das Heizbett ganz "
+"auszuschalten, Temperatur auf 0 setzen."
+
+#: pronterface.py:286
 msgid "You must enter a temperature."
 msgstr "Sie müssen eine Temperatur eingeben."
 
-#: pronterface.py:286
+#: pronterface.py:301
 msgid "Do you want to erase the macro?"
 msgstr "Möchten Sie das Makro löschen?"
 
-#: pronterface.py:290
+#: pronterface.py:305
 msgid "Cancelled."
 msgstr "Abgebrochen."
 
-#: pronterface.py:331
+#: pronterface.py:346
 msgid " Opens file"
 msgstr " Öffnet eine Datei"
 
-#: pronterface.py:331
+#: pronterface.py:346
 msgid "&Open..."
 msgstr "&Öffnen..."
 
-#: pronterface.py:332
+#: pronterface.py:347
 msgid " Edit open file"
 msgstr " Offene Datei bearbeiten"
 
-#: pronterface.py:332
+#: pronterface.py:347
 msgid "&Edit..."
 msgstr "&Bearbeiten..."
 
-#: pronterface.py:333
+#: pronterface.py:348
 msgid " Clear output console"
 msgstr " Ausgabe Konsole leeren"
 
-#: pronterface.py:333
+#: pronterface.py:348
 msgid "Clear console"
 msgstr "Konsole leeren"
 
-#: pronterface.py:334
+#: pronterface.py:349
 msgid " Project slices"
 msgstr " Projekt Slices"
 
-#: pronterface.py:334
+#: pronterface.py:349
 msgid "Projector"
 msgstr "Projektor"
 
-#: pronterface.py:335
+#: pronterface.py:350
 msgid " Closes the Window"
 msgstr " Schliesst das Fenster"
 
-#: pronterface.py:335
+#: pronterface.py:350
 msgid "E&xit"
 msgstr "&Verlassen"
 
-#: pronterface.py:336
+#: pronterface.py:351
 msgid "&File"
 msgstr "&Datei"
 
-#: pronterface.py:341
+#: pronterface.py:356
 msgid "&Macros"
 msgstr "&Makros"
 
-#: pronterface.py:342
+#: pronterface.py:357
 msgid "<&New...>"
 msgstr "<&Neu...>"
 
-#: pronterface.py:343
+#: pronterface.py:358
 msgid " Options dialog"
 msgstr " Optionen Dialog"
 
-#: pronterface.py:343
+#: pronterface.py:358
 msgid "&Options"
 msgstr "&Optionen"
 
-#: pronterface.py:345
+#: pronterface.py:360
 msgid " Adjust slicing settings"
 msgstr " Slicing Einstellungen anpassen"
 
-#: pronterface.py:345
+#: pronterface.py:360
 msgid "Slicing Settings"
 msgstr "Slicing Einstellungen"
 
-#: pronterface.py:352
+#: pronterface.py:367
 msgid "&Settings"
 msgstr "&Einstellungen"
 
-#: pronterface.py:368
+#: pronterface.py:383
 msgid "Enter macro name"
 msgstr "Makro Name eingeben"
 
-#: pronterface.py:371
+#: pronterface.py:386
 msgid "Macro name:"
 msgstr "Makro Name:"
 
-#: pronterface.py:374
+#: pronterface.py:389
 msgid "Ok"
 msgstr "Ok"
 
-#: pronterface.py:378
-#: pronterface.py:1330
-#: pronterface.py:1587
+#: pronterface.py:393 pronterface.py:1344 pronterface.py:1601
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: pronterface.py:396
-msgid "' is being used by built-in command"
-msgstr "' wird durch eingebautes Kommando genutzt"
+#: pronterface.py:411
+msgid "Name '%s' is being used by built-in command"
+msgstr "Name '%s' wird durch eingebautes Kommando genutzt"
 
-#: pronterface.py:396
-msgid "Name '"
-msgstr "Name '"
-
-#: pronterface.py:399
+#: pronterface.py:414
 msgid "Macro name may contain only alphanumeric symbols and underscores"
 msgstr "Makro Name darf nur alphanumerische Zeichen und Unterstriche enthalten"
 
-#: pronterface.py:448
+#: pronterface.py:463
 msgid "Port"
 msgstr "Port:"
 
-#: pronterface.py:467
+#: pronterface.py:482
 msgid "Connect"
 msgstr "Verbinden"
 
-#: pronterface.py:469
+#: pronterface.py:484
 msgid "Connect to the printer"
 msgstr "Drucker Verbinden"
 
-#: pronterface.py:471
+#: pronterface.py:486
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: pronterface.py:474
-#: pronterface.py:751
+#: pronterface.py:489 pronterface.py:766
 msgid "Mini mode"
 msgstr "Mini-Modus"
 
-#: pronterface.py:478
+#: pronterface.py:493
 msgid "Monitor Printer"
 msgstr "Drucker überwachen"
 
-#: pronterface.py:488
+#: pronterface.py:503
 msgid "Load file"
 msgstr "Datei laden"
 
-#: pronterface.py:491
+#: pronterface.py:506
 msgid "Compose"
 msgstr "Zusammenstellen"
 
-#: pronterface.py:495
+#: pronterface.py:510
 msgid "SD"
 msgstr "SD"
 
-#: pronterface.py:503
-#: pronterface.py:1374
-#: pronterface.py:1419
-#: pronterface.py:1469
-#: pronterface.py:1494
-#: pronterface.py:1528
-#: pronterface.py:1543
+#: pronterface.py:518 pronterface.py:1388 pronterface.py:1433
+#: pronterface.py:1483 pronterface.py:1508 pronterface.py:1542
+#: pronterface.py:1557
 msgid "Pause"
 msgstr "Pause"
 
-#: pronterface.py:516
+#: pronterface.py:531
 msgid "Send"
 msgstr "Senden"
 
-#: pronterface.py:524
-#: pronterface.py:625
+#: pronterface.py:539 pronterface.py:640
 msgid "mm/min"
 msgstr "mm/min"
 
-#: pronterface.py:526
+#: pronterface.py:541
 msgid "XY:"
 msgstr "XY:"
 
-#: pronterface.py:528
+#: pronterface.py:543
 msgid "Z:"
 msgstr "Z:"
 
-#: pronterface.py:551
-#: pronterface.py:632
+#: pronterface.py:566 pronterface.py:647
 msgid "Heater:"
 msgstr "Heizelement:"
 
-#: pronterface.py:554
-#: pronterface.py:574
+#: pronterface.py:569 pronterface.py:589
 msgid "Off"
 msgstr "Aus"
 
-#: pronterface.py:566
-#: pronterface.py:586
+#: pronterface.py:581 pronterface.py:601
 msgid "Set"
 msgstr "Ein"
 
-#: pronterface.py:571
-#: pronterface.py:634
+#: pronterface.py:586 pronterface.py:649
 msgid "Bed:"
 msgstr "Heizbett:"
 
-#: pronterface.py:619
+#: pronterface.py:634
 msgid "mm"
 msgstr "mm"
 
-#: pronterface.py:677
-#: pronterface.py:1182
-#: pronterface.py:1413
+#: pronterface.py:692 pronterface.py:1196 pronterface.py:1427
 msgid "Not connected to printer."
 msgstr "Keine Verbindung zum Drucker."
 
-#: pronterface.py:706
+#: pronterface.py:721
 msgid "SD Upload"
 msgstr "SD Laden"
 
-#: pronterface.py:710
+#: pronterface.py:725
 msgid "SD Print"
 msgstr "SD Drucken"
 
-#: pronterface.py:758
+#: pronterface.py:773
 msgid "Full mode"
 msgstr "Voll-Modus"
 
-#: pronterface.py:783
+#: pronterface.py:798
 msgid "Execute command: "
 msgstr "Kommando ausführen:"
 
-#: pronterface.py:794
+#: pronterface.py:809
 msgid "click to add new custom button"
 msgstr "Individuellen Button hinzufügen"
 
-#: pronterface.py:813
-msgid "Defines custom button. Usage: button <num> \"title\" [/c \"colour\"] command"
-msgstr "Definiert einen individuellen Button. Nutzung: button <num> \"title\" [/c \"colour\"] command"
+#: pronterface.py:828
+msgid ""
+"Defines custom button. Usage: button <num> \"title\" [/c \"colour\"] command"
+msgstr ""
+"Definiert einen individuellen Button. Nutzung: button <num> \"title\" [/c "
+"\"colour\"] command"
 
-#: pronterface.py:835
+#: pronterface.py:850
 msgid "Custom button number should be between 0 and 63"
 msgstr "Nummer des individuellen Button sollte zwischen 0 und 63 sein."
 
-#: pronterface.py:927
+#: pronterface.py:942
 msgid "Edit custom button '%s'"
 msgstr "Individuellen Button '%s' bearbeiten"
 
-#: pronterface.py:929
+#: pronterface.py:944
 msgid "Move left <<"
 msgstr "Links bewegen <<"
 
-#: pronterface.py:932
+#: pronterface.py:947
 msgid "Move right >>"
 msgstr "Rechts bewegen >>"
 
-#: pronterface.py:936
+#: pronterface.py:951
 msgid "Remove custom button '%s'"
 msgstr "Individuellen Button '%s' entfernen"
 
-#: pronterface.py:939
+#: pronterface.py:954
 msgid "Add custom button"
 msgstr "Individuellen Button hinzufuegen"
 
-#: pronterface.py:1084
+#: pronterface.py:1099
 msgid "event object missing"
 msgstr "Ereigniss Objekt fehlt"
 
-#: pronterface.py:1112
+#: pronterface.py:1127
 msgid "Invalid period given."
 msgstr "Ungültiger Abschnitt angegeben."
 
-#: pronterface.py:1115
+#: pronterface.py:1130
 msgid "Monitoring printer."
 msgstr "Überwache Drucker."
 
-#: pronterface.py:1117
+#: pronterface.py:1132
 msgid "Done monitoring."
 msgstr "Überwachung abgeschlossen."
 
-#: pronterface.py:1139
+#: pronterface.py:1154
 msgid "Printer is online. "
-msgstr "Drucker ist online."
+msgstr "Drucker ist online. "
 
-#: pronterface.py:1141
-#: pronterface.py:1317
-#: pronterface.py:1372
+#: pronterface.py:1156 pronterface.py:1331
 msgid "Loaded "
-msgstr "Geladen"
+msgstr "Geladen "
 
-#: pronterface.py:1144
+#: pronterface.py:1159
 msgid "Bed"
 msgstr "Heizbett"
 
-#: pronterface.py:1144
+#: pronterface.py:1159
 msgid "Hotend"
 msgstr "Hotend"
 
-#: pronterface.py:1154
+#: pronterface.py:1169
 msgid " SD printing:%04.2f %%"
 msgstr "SD Drucken:%04.2f %%"
 
-#: pronterface.py:1157
+#: pronterface.py:1172
 msgid " Printing:%04.2f %% |"
 msgstr " Drucken:%04.2f %% |"
 
-#: pronterface.py:1158
-msgid " Line# "
-msgstr "Zeile#"
+#: pronterface.py:1173
+msgid " Line# %d of %d lines |"
+msgstr " Zeile# %d von %d Zeilen |"
 
-#: pronterface.py:1158
-msgid " lines |"
-msgstr " Zeilen |"
+#: pronterface.py:1178
+msgid " Est: %s of %s remaining | "
+msgstr " Erw: %s von %s verbleibend | "
 
-#: pronterface.py:1158
-msgid "of "
-msgstr "von"
-
-#: pronterface.py:1163
-msgid " Est: "
-msgstr " Erw:"
-
-#: pronterface.py:1164
-msgid " of: "
-msgstr " von: "
-
-#: pronterface.py:1165
-msgid " Remaining | "
-msgstr " Verbleibend | "
-
-#: pronterface.py:1166
+#: pronterface.py:1180
 msgid " Z: %0.2f mm"
 msgstr " Z: %0.2f mm"
 
-#: pronterface.py:1233
+#: pronterface.py:1247
 msgid "Opening file failed."
 msgstr "Datei öffnen fehlgeschlagen."
 
-#: pronterface.py:1239
+#: pronterface.py:1253
 msgid "Starting print"
 msgstr "Starte Druck"
 
-#: pronterface.py:1262
+#: pronterface.py:1276
 msgid "Pick SD file"
 msgstr "Wähle SD Datei"
 
-#: pronterface.py:1262
+#: pronterface.py:1276
 msgid "Select the file to print"
 msgstr "Wähle Druckdatei"
 
-#: pronterface.py:1297
+#: pronterface.py:1311
 msgid "Failed to execute slicing software: "
 msgstr "Fehler beim Ausführen der Slicing Software:"
 
-#: pronterface.py:1304
+#: pronterface.py:1318
 msgid "Slicing..."
 msgstr "Slicing..."
 
-#: pronterface.py:1317
-#: pronterface.py:1372
+#: pronterface.py:1331
 msgid ", %d lines"
 msgstr ", %d Zeilen"
 
-#: pronterface.py:1324
+#: pronterface.py:1338
 msgid "Load File"
 msgstr "Datei laden"
 
-#: pronterface.py:1331
+#: pronterface.py:1345
 msgid "Slicing "
 msgstr "Slicing"
 
-#: pronterface.py:1350
+#: pronterface.py:1364
 msgid "Open file to print"
 msgstr "Öffne zu druckende Datei"
 
-#: pronterface.py:1351
+#: pronterface.py:1365
 msgid "OBJ, STL, and GCODE files (;*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ;)"
-msgstr "OBJ,STL und GCODE Dateien  (;*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ;)"
+msgstr ""
+"OBJ,STL und GCODE Dateien  (;*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ;)"
 
-#: pronterface.py:1358
+#: pronterface.py:1372
 msgid "File not found!"
 msgstr "Datei nicht gefunden!"
 
-#: pronterface.py:1382
+#: pronterface.py:1386
+msgid "Loaded %s, %d lines"
+msgstr "Geladen %s, %d Zeilen"
+
+#: pronterface.py:1396
 msgid "mm of filament used in this print\n"
 msgstr "mm Filament in Druck genutzt\n"
 
-#: pronterface.py:1383
+#: pronterface.py:1397
 msgid ""
-"mm in X\n"
-"and is"
+"the print goes from %f mm to %f mm in X\n"
+"and is %f mm wide\n"
 msgstr ""
-"mm in X\n"
-"und ist"
+"Der Druck verläuft von %f mm bis %f mm in X\n"
+"und ist %f mm breit\n"
 
-#: pronterface.py:1383
-#: pronterface.py:1384
-msgid "mm wide\n"
-msgstr "mm breit\n"
-
-#: pronterface.py:1383
-#: pronterface.py:1384
-#: pronterface.py:1385
-msgid "mm to"
-msgstr "mm bis"
-
-#: pronterface.py:1383
-#: pronterface.py:1384
-#: pronterface.py:1385
-msgid "the print goes from"
-msgstr "Der Druck verläuft von"
-
-#: pronterface.py:1384
+#: pronterface.py:1398
 msgid ""
-"mm in Y\n"
-"and is"
+"the print goes from %f mm to %f mm in Y\n"
+"and is %f mm wide\n"
 msgstr ""
-"mm in Y\n"
-"und ist"
+"Der Druck verläuft von %f mm bis %f mm in Y\n"
+"und ist %f mm breit\n"
 
-#: pronterface.py:1385
-msgid "mm high\n"
-msgstr "mm hoch\n"
-
-#: pronterface.py:1385
+#: pronterface.py:1399
 msgid ""
-"mm in Z\n"
-"and is"
+"the print goes from %f mm to %f mm in Z\n"
+"and is %f mm high\n"
 msgstr ""
-"mm in Z\n"
-"und ist"
+"Der Druck verläuft von %f mm bis %f mm in Z\n"
+"und ist %f mm hoch\n"
 
-#: pronterface.py:1386
+#: pronterface.py:1400
 msgid "Estimated duration (pessimistic): "
-msgstr "Geschätze Dauer (pessimistisch):"
+msgstr "Geschätze Dauer (pessimistisch): "
 
-#: pronterface.py:1410
+#: pronterface.py:1424
 msgid "No file loaded. Please use load first."
 msgstr "Keine Datei geladen. Benutze zuerst laden."
 
-#: pronterface.py:1421
+#: pronterface.py:1435
 msgid "Restart"
 msgstr "Neustart"
 
-#: pronterface.py:1425
+#: pronterface.py:1439
 msgid "File upload complete"
 msgstr "Datei Upload komplett"
 
-#: pronterface.py:1444
+#: pronterface.py:1458
 msgid "Pick SD filename"
 msgstr "Wähle SD Dateiname"
 
-#: pronterface.py:1452
+#: pronterface.py:1466
 msgid "Paused."
 msgstr "Pausiert."
 
-#: pronterface.py:1462
+#: pronterface.py:1476
 msgid "Resume"
 msgstr "Fortsetzen"
 
-#: pronterface.py:1478
+#: pronterface.py:1492
 msgid "Connecting..."
 msgstr "Verbinde..."
 
-#: pronterface.py:1509
+#: pronterface.py:1523
 msgid "Disconnected."
 msgstr "Getrennt."
 
-#: pronterface.py:1536
+#: pronterface.py:1550
 msgid "Reset."
 msgstr "Zurücksetzen."
 
-#: pronterface.py:1537
+#: pronterface.py:1551
 msgid "Are you sure you want to reset the printer?"
 msgstr "Möchten Sie den Drucker wirklich zurücksetzen?"
 
-#: pronterface.py:1537
+#: pronterface.py:1551
 msgid "Reset?"
 msgstr "Zurücksetzen?"
 
-#: pronterface.py:1583
+#: pronterface.py:1597
 msgid "Save"
 msgstr "Speichern"
 
-#: pronterface.py:1639
+#: pronterface.py:1653
 msgid "Edit settings"
 msgstr "Einstellungen bearbeiten"
 
-#: pronterface.py:1641
+#: pronterface.py:1655
 msgid "Defaults"
 msgstr "Standardwerte"
 
-#: pronterface.py:1670
+#: pronterface.py:1684
 msgid "Custom button"
 msgstr "Individueller Button"
 
-#: pronterface.py:1675
+#: pronterface.py:1689
 msgid "Button title"
 msgstr "Button Titel"
 
-#: pronterface.py:1678
+#: pronterface.py:1692
 msgid "Command"
 msgstr "Kommando"
 
-#: pronterface.py:1687
+#: pronterface.py:1701
 msgid "Color"
 msgstr "Farbe"
 
+#~ msgid "Communications Speed (default: 115200)"
+#~ msgstr "Kommunikationsgeschwindigkeit (Vorgabe: 115200)"
+
+#~ msgid "Heated Build Platform temp for ABS (default: 110 deg C)"
+#~ msgstr "Heizbett Temp. für ABS (Vorgabe: 110 Grad Celsius)"
+
+#~ msgid "Heated Build Platform temp for PLA (default: 60 deg C)"
+#~ msgstr "Heizbett Temp. für PLA (Vorgabe: 60 Grad Celsius)"
+
+#~ msgid "Feedrate for Control Panel Moves in Extrusions (default: 300mm/min)"
+#~ msgstr "Vorschub Control Panel Bewegungen Extrudierung (Vorgabe: 300mm/min)"
+
+#~ msgid "Port used to communicate with printer"
+#~ msgstr "Port für Druckerkommunikation"
+
+#~ msgid ""
+#~ "Slice command\n"
+#~ "   default:\n"
+#~ "       python skeinforge/skeinforge_application/skeinforge_utilities/"
+#~ "skeinforge_craft.py $s)"
+#~ msgstr ""
+#~ "Kommando Slicing\n"
+#~ "   Vorgabe:\n"
+#~ "       python skeinforge/skeinforge_application/skeinforge_utilities/"
+#~ "skeinforge_craft.py $s)"
+
+#~ msgid ""
+#~ "Slice settings command\n"
+#~ "   default:\n"
+#~ "       python skeinforge/skeinforge_application/skeinforge.py"
+#~ msgstr ""
+#~ "Kommando Slicing Einstellungen\n"
+#~ "   Vorgabe:\n"
+#~ "       python skeinforge/skeinforge_application/skeinforge.py"
+
+#~ msgid "Extruder temp for ABS (default: 230 deg C)"
+#~ msgstr "Extruder Temperatur für ABS (Vorgabe: 230 Grad Celsius)"
+
+#~ msgid "Extruder temp for PLA (default: 185 deg C)"
+#~ msgstr "Extruder Temperatur für PLA (Vorgabe: 185 Grad Celsius)"
+
+#~ msgid "Feedrate for Control Panel Moves in X and Y (default: 3000mm/min)"
+#~ msgstr "Vorschub Control Panel Bewegungen X und Y (Vorgabe: 3000mm/min)"
+
+#~ msgid "Feedrate for Control Panel Moves in Z (default: 200mm/min)"
+#~ msgstr "Vorschub Control Panel Bewegungen Z (Vorgabe: 200mm/min)"
diff --git a/locale/it/LC_MESSAGES/pronterface.mo b/locale/it/LC_MESSAGES/pronterface.mo
index 0bbc057fef66aeb77e3354ae03901bea8f872156..e796d8e732aa80eb46c905f6a297853538ce3f16 100644
GIT binary patch
delta 3824
zcma*p4{Vh69mnzCL0h`R7D~$>p@oNQucg=)+9{K=6|hA_iYPFlAcJSUr`N;YUA;dr
zp?Eq`rs<aHlWk&*iDHO~*(4V=(acGRk|jFgFgn=KEK6i=ZiJC+uxxYh&)u)n{W0v9
z``+vKJkLG9Ki}W)dD_RfJh?Xa{*;pM8Ona5me^2Y%nLYL&KG6-L}O;4i&JqoPQmZu
zBs_?-Fptym1oAOw`O@_ZsQboWQ9Qm9r*Yhjd~#+P-=myZgX;4%mf~-40)AxApSS)M
zzrgwN6~+Xy0(CqCt1yID;ng@Ew<B{h5#&}A!!q27LHaj)3l(F&g?x<9*Iax8HIQSd
zf&A3^w)GThCcj2L=AyN%(wGGt*PtfUgE!zB9Kr9S23}2iD(K(LrZNXxa5DCyI^K#(
zX+NriJ@)zo7~=R*)Qo?O8sG_R!1s`k`5Rv~cm<8B{kb?3m!mRv8|HN502QSqfom{}
zTC-!=il<NwOrSU2*ko---M<8@u^X4+M${g71oiu;Py_lQ>UXcAGVt>%@~<^H!wJps
zcc`_yh>h65PP-CU<687^CBA@K+rQ&D4A3f7Q-YfDbW{dgPy_5h_0x&W#jHf_iA~ky
zzmRH9(5LA~t!dUeihRsLzBH4UZ~-1g4eUJX{)zOe3|3iZpgNvokDKgq8*0FdP<vx>
zj*1$-4mF}))Z=!GJ>G$uX%gEojqUg(s)2V<GdhDx=^v5(WiH`0Sk5}OU>B;L+i@!<
zaXaSTqEbhtjcIFB^`b_Y#Mzia+A<H>^M_Esdj>V*H?b2>S}WPHI$njN0b}-|ma>X;
zX^E~yl4e#TUFXa;DjGl*HFF=e7oJ0P{4(mrbON<RAEO5L57e60v8A8F`KU~uKrP8B
z)Bry~W$HugIaK=>vGDwt@%qwktwIOuP@Av|)zA)9L&K=l?n15Y{iu|G2Q{z*s9k;-
zmGW0m_x%?2`*YU6pa%2_PG|p_a;B$-9n_2$;1cXXHGDVTiVx#M_z~*&dq|ry@F0>5
z^8?iVM^FQQ1H<?xl4|oO<YUT7pC0E%%xUvnPemi#h>LL>7G{JD(i}!*<TyHb0rmSD
zT2TgSQK@gjb=Zzt<9&EFK7x9qzJ>bTIaJ0k&0+m@qSPsla1yTOIE?zi9jK1>A|G=f
zU-WGbq1NzqR7WRK13ruM@Des*h+avSxe+&F6npR|sHdSMlq>G`a<;TK-$Z0zm<Ch|
zm!bx^0@d+aYr<atHfoK1REi%(rTBU4&rt1tjLKALJuf4ij1AbGqoR%mQ4J-mS=0?9
z*8TSU!#Ixf2T%ih%z6mb&hw}Nyl9W#LH+(TcHtS+64%nZ_Dt?pDoWWf@~D~vsFWVT
z<@h>&2`8|V#^X{<V>ia|B~)hSHX1|QW*Mr(2rj}XY6%{<=U+iB&8t|Z=l?@0U*^Og
ztn<0rsT(nXD~Yl4H7c5&iXOFV2yM)5#1=xOgwWHXmyI&CifAWPzCma?HtT@WL;vQ^
zV%^+mWx|CS>(C?O#2&&S<`Y^!Jryd-oQg8gM|_>oY*!FFiF=75LYcdkVBZy%`J2c?
zU@Ga~Y#>zhs0<Kogi^1vgt(9Rq7Eo}I+U%ui0y=yV3<(ZTEt|nyRhHZwfhr<o|4a&
z+$MW;lT~{_MQb;$Q2X>NN_9WMN|_x*g!n3<CuS+JkWkU1t2dnXNrosT#){rIn)Ghs
z7F9>6)DUB39hKXO`^Qe;ZG@hN>xo`M{|mT;${ON2;%=gw(0gG$F;;G%qCeSsB`+iD
z2^H=BafP8!X(sgis(gh=7HY*uW-s+>VzE8PzAO~IdT+M%l(p5W4SWZ24-q25#6DsI
zF-RC^d1Oa6opJm?#m%kZw38fg_)d9oH<pMcqRxn8oZeW%t9QbY!o`R)#9`VQ@%t)z
z{KFOX{<(_R{F9Z(^G7GG3izK)e%YTirP2TMl!Sk>`WMx`NjKs}XtPBP6mIpOt$BJ}
zIPL$avLU~IYG)vypSCctB0S(kylBd!>27Z*9m}TM%z7`A(I5ts87~oWGG2VxOSzeB
z%5ySF=YQOhKRx5lK&UU7b>f<om&kZ2$NlV$ZO*)Ky4hbhv&(;DW+=BH9!r?apyv#y
zVu_3sP15~9Dj8Sf@wn}UN-W`Q3c8FTmbRC6#Uftt|Gc&D^KM;q`EED=`@Ms)=wQ&V
zp4AoXXzf_!EbQoP@9?+GIvVVC6Va?2^*SAYR_)m~7BLblEM+Y2CX|SOEu~vnOI<B4
z2v_`xbsPM6-BtdJb-(iSv(M+>o--OK%aA><&EGKhUEdFN`mfdB>mO;jFtyuF#rj<>
zz^9Aq`3J+l429E8&atPRY+6?%u9HnT{YkoyBuOBRC6f8O8dHIM?Yv!qDl!~RxeQ}$
zxqZL6`M=NRkI(;o!1r5bmljv<NQ>*QZfz*8+>q;}Gj4p?b#}Vyu()bt78Z@o$B>E_
k=xoSMMF+jzyWOC<?9F|_&%b%eW$)hnpLe@MnPSKP1f;qYl>h($

literal 11678
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
Ag8%>k

diff --git a/locale/it/LC_MESSAGES/pronterface.po b/locale/it/LC_MESSAGES/pronterface.po
index 0d70178..757cdfc 100644
--- a/locale/it/LC_MESSAGES/pronterface.po
+++ b/locale/it/LC_MESSAGES/pronterface.po
@@ -5,77 +5,21 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-19 09:21+CET\n"
+"POT-Creation-Date: 2012-02-26 02:12+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Italian RepRap Community <reprap-italia@googlegroups.com>\n"
 "Language-Team: Italian RepRap Community <reprap-italia@googlegroups.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
 
-
-#: pronsole.py:250
-msgid "Communications Speed (default: 115200)"
-msgstr "Velocità di comunicazione (default: 115200)"
-
-#: pronsole.py:251
-msgid "Heated Build Platform temp for ABS (default: 110 deg C)"
-msgstr "Temperatura piano di stampa per ABS (default: 110° C) "
-
-#: pronsole.py:252
-msgid "Heated Build Platform temp for PLA (default: 60 deg C)"
-msgstr "Temperatura piano di stampa per PLA (default: 60° C)"
-
-#: pronsole.py:253
-msgid "Feedrate for Control Panel Moves in Extrusions (default: 300mm/min)"
-msgstr "Velocità dei movimenti dell'estrusore in modalità manuale (default: 300mm/min)"
-
-#: pronsole.py:254
-msgid "Port used to communicate with printer"
-msgstr "Porta usata per comunicare con la stampante"
-
-#: pronsole.py:255
-msgid ""
-"Slice command\n"
-"   default:\n"
-"       python skeinforge/skeinforge_application/skeinforge_utilities/skeinforge_craft.py $s)"
-msgstr ""
-"Comando del generatore di percorso\n"
-"   default:\n"
-"       python skeinforge/skeinforge_application/skeinforge_utilities/skeinforge_craft.py $s)"
-
-#: pronsole.py:256
-msgid ""
-"Slice settings command\n"
-"   default:\n"
-"       python skeinforge/skeinforge_application/skeinforge.py"
-msgstr ""
-"Comando di configurazione del generatore di percorso\n"
-"   default:\n"
-"       python skeinforge/skeinforge_application/skeinforge.py"
-
-#: pronsole.py:257
-msgid "Extruder temp for ABS (default: 230 deg C)"
-msgstr "Temperatura di estrusione per ABS (default: 230° C)"
-
-#: pronsole.py:258
-msgid "Extruder temp for PLA (default: 185 deg C)"
-msgstr "Temperatura di estrusione per PLA (default: 185° C"
-
-#: pronsole.py:259
-msgid "Feedrate for Control Panel Moves in X and Y (default: 3000mm/min)"
-msgstr "Velocità dei movimenti degli assi X e Y in modalità manuale (default: 3000mm/min)"
-
-#: pronsole.py:260
-msgid "Feedrate for Control Panel Moves in Z (default: 200mm/min)"
-msgstr "Velocità dei movimenti dell'asse Z in modalità manuale (default: 200mm/min)"
-
-#: pronterface.py:15
+#: pronterface.py:30
 msgid "WX is not installed. This program requires WX to run."
 msgstr "WX non è installato. Questo software richiede WX per funzionare."
 
-#: pronterface.py:66
+#: pronterface.py:81
 msgid ""
 "Dimensions of Build Platform\n"
 " & optional offset of origin\n"
@@ -93,55 +37,55 @@ msgstr ""
 "   XXX,YYY,ZZZ\n"
 "   XXXxYYYxZZZ+SposX+SposY+SposZ"
 
-#: pronterface.py:67
+#: pronterface.py:82
 msgid "Last Set Temperature for the Heated Print Bed"
 msgstr "Ultima temperatura impostata per il letto riscaldato"
 
-#: pronterface.py:68
+#: pronterface.py:83
 msgid "Folder of last opened file"
 msgstr "Cartella dell'ultimo file aperto"
 
-#: pronterface.py:69
+#: pronterface.py:84
 msgid "Last Temperature of the Hot End"
 msgstr "Ultima temperatura dell'estrusore"
 
-#: pronterface.py:70
+#: pronterface.py:85
 msgid "Width of Extrusion in Preview (default: 0.5)"
 msgstr "Larghezza dell'estrusione nell'anteprima (default: 0.5)"
 
-#: pronterface.py:71
+#: pronterface.py:86
 msgid "Fine Grid Spacing (default: 10)"
 msgstr "Spaziatura fine della griglia (default: 10)"
 
-#: pronterface.py:72
+#: pronterface.py:87
 msgid "Coarse Grid Spacing (default: 50)"
 msgstr "Spaziatura larga della griglia (default: 50)"
 
-#: pronterface.py:73
+#: pronterface.py:88
 msgid "Pronterface background color (default: #FFFFFF)"
 msgstr "Colore di sfondo di Pronterface (default: #FFFFFF)"
 
-#: pronterface.py:76
+#: pronterface.py:91
 msgid "Printer Interface"
 msgstr "Interfaccia di stampa"
 
-#: pronterface.py:93
+#: pronterface.py:108
 msgid "Motors off"
 msgstr "Spegni motori"
 
-#: pronterface.py:94
+#: pronterface.py:109
 msgid "Check temp"
 msgstr "Leggi temperatura"
 
-#: pronterface.py:95
+#: pronterface.py:110
 msgid "Extrude"
 msgstr "Estrudi"
 
-#: pronterface.py:96
+#: pronterface.py:111
 msgid "Reverse"
 msgstr "Ritrai"
 
-#: pronterface.py:114
+#: pronterface.py:129
 msgid ""
 "# I moved all your custom buttons into .pronsolerc.\n"
 "# Please don't add them here any more.\n"
@@ -151,528 +95,566 @@ msgstr ""
 "# Per favore non aggiungerne altri qui.\n"
 "# Un backup dei tuoi vecchi pulsanti è in custombtn.old\n"
 
-#: pronterface.py:119
-msgid "Note!!! You have specified custom buttons in both custombtn.txt and .pronsolerc"
-msgstr "Nota!!! Hai specificato pulsanti personalizzati sia in custombtn.txt che in .pronsolerc"
+#: pronterface.py:134
+msgid ""
+"Note!!! You have specified custom buttons in both custombtn.txt and ."
+"pronsolerc"
+msgstr ""
+"Nota!!! Hai specificato pulsanti personalizzati sia in custombtn.txt che in ."
+"pronsolerc"
 
-#: pronterface.py:120
-msgid "Ignoring custombtn.txt. Remove all current buttons to revert to custombtn.txt"
-msgstr "Ignoro custombtn.txt. Elimina tutti i pulsanti attuali per tornare a custombtn.txt"
+#: pronterface.py:135
+msgid ""
+"Ignoring custombtn.txt. Remove all current buttons to revert to custombtn.txt"
+msgstr ""
+"Ignoro custombtn.txt. Elimina tutti i pulsanti attuali per tornare a "
+"custombtn.txt"
 
-#: pronterface.py:148 pronterface.py:499 pronterface.py:1319
-#: pronterface.py:1373 pronterface.py:1495 pronterface.py:1529
-#: pronterface.py:1544
+#: pronterface.py:163 pronterface.py:514 pronterface.py:1333
+#: pronterface.py:1387 pronterface.py:1509 pronterface.py:1543
+#: pronterface.py:1558
 msgid "Print"
 msgstr "Stampa"
 
-#: pronterface.py:152
+#: pronterface.py:167
 msgid "Printer is now online."
 msgstr "La stampante ora è connessa."
 
-#: pronterface.py:212
-msgid "Setting hotend temperature to "
-msgstr "Imposto la temperatura dell'estrusore a "
+#: pronterface.py:168
+msgid "Disconnect"
+msgstr "Disconnettere."
 
-#: pronterface.py:212 pronterface.py:248
-msgid " degrees Celsius."
-msgstr " gradi Celsius"
+#: pronterface.py:227
+msgid "Setting hotend temperature to %f degrees Celsius."
+msgstr "Imposto la temperatura dell'estrusore a %f gradi Celsius."
 
-#: pronterface.py:231 pronterface.py:267 pronterface.py:325
+#: pronterface.py:246 pronterface.py:282 pronterface.py:340
 msgid "Printer is not online."
 msgstr "La stampante non è connessa."
 
-#: pronterface.py:233
-msgid "You cannot set negative temperatures. To turn the hotend off entirely, set its temperature to 0."
-msgstr "Non è possibile impostare temperature negative. Per raffreddare l'ugello imposta la sua temperatura a 0."
-
 #: pronterface.py:248
-msgid "Setting bed temperature to "
-msgstr "Imposto la temperatura del piano di stampa a "
+msgid ""
+"You cannot set negative temperatures. To turn the hotend off entirely, set "
+"its temperature to 0."
+msgstr ""
+"Non è possibile impostare temperature negative. Per raffreddare l'ugello "
+"imposta la sua temperatura a 0."
 
-#: pronterface.py:269
-msgid "You cannot set negative temperatures. To turn the bed off entirely, set its temperature to 0."
-msgstr "Non è possibile impostare temperature negative. Per raffreddare il piano di stampa imposta la sua temperatura a 0."
+#: pronterface.py:250
+msgid "You must enter a temperature. (%s)"
+msgstr "Devi inserire una temperatura. (%s)"
 
-#: pronterface.py:271
+#: pronterface.py:263
+msgid "Setting bed temperature to %f degrees Celsius."
+msgstr "Imposto la temperatura del piano di stampa a %f gradi Celsius."
+
+#: pronterface.py:284
+msgid ""
+"You cannot set negative temperatures. To turn the bed off entirely, set its "
+"temperature to 0."
+msgstr ""
+"Non è possibile impostare temperature negative. Per raffreddare il piano di "
+"stampa imposta la sua temperatura a 0."
+
+#: pronterface.py:286
 msgid "You must enter a temperature."
 msgstr "Devi inserire una temperatura."
 
-#: pronterface.py:286
+#: pronterface.py:301
 msgid "Do you want to erase the macro?"
 msgstr "Vuoi cancellare la macro?"
 
-#: pronterface.py:290
+#: pronterface.py:305
 msgid "Cancelled."
 msgstr "Annullato."
 
-#: pronterface.py:331
+#: pronterface.py:346
 msgid " Opens file"
 msgstr " Apre un file"
 
-#: pronterface.py:331
+#: pronterface.py:346
 msgid "&Open..."
 msgstr "&Apri..."
 
-#: pronterface.py:332
+#: pronterface.py:347
 msgid " Edit open file"
 msgstr " Modifica file aperto"
 
-#: pronterface.py:332
+#: pronterface.py:347
 msgid "&Edit..."
 msgstr "&Modifica"
 
-#: pronterface.py:333
+#: pronterface.py:348
 msgid " Clear output console"
 msgstr " Svuota la console"
 
-#: pronterface.py:333
+#: pronterface.py:348
 msgid "Clear console"
 msgstr "Pulisci console"
 
-#: pronterface.py:334
+#: pronterface.py:349
 msgid " Project slices"
 msgstr " Proietta i layer"
 
-#: pronterface.py:334
+#: pronterface.py:349
 msgid "Projector"
 msgstr "Proiettore"
 
-#: pronterface.py:335
+#: pronterface.py:350
 msgid " Closes the Window"
 msgstr " Chiude la finestra"
 
-#: pronterface.py:335
+#: pronterface.py:350
 msgid "E&xit"
 msgstr "&Esci"
 
-#: pronterface.py:336
+#: pronterface.py:351
 msgid "&File"
 msgstr "&File"
 
-#: pronterface.py:341
+#: pronterface.py:356
 msgid "&Macros"
 msgstr "&Macro"
 
-#: pronterface.py:342
+#: pronterface.py:357
 msgid "<&New...>"
 msgstr "<&Nuovo...>"
 
-#: pronterface.py:343
+#: pronterface.py:358
 msgid " Options dialog"
 msgstr " Finestra di opzioni"
 
-#: pronterface.py:343
+#: pronterface.py:358
 msgid "&Options"
 msgstr "&Opzioni"
 
-#: pronterface.py:345
+#: pronterface.py:360
 msgid " Adjust slicing settings"
 msgstr " Configura la generazione del percorso"
 
-#: pronterface.py:345
+#: pronterface.py:360
 msgid "Slicing Settings"
 msgstr "Impostazioni di generazione del percorso"
 
-#: pronterface.py:352
+#: pronterface.py:367
 msgid "&Settings"
 msgstr "&Impostazioni"
 
-#: pronterface.py:368
+#: pronterface.py:383
 msgid "Enter macro name"
 msgstr "Inserisci il nome della macro"
 
-#: pronterface.py:371
+#: pronterface.py:386
 msgid "Macro name:"
 msgstr "Nome macro:"
 
-#: pronterface.py:374
+#: pronterface.py:389
 msgid "Ok"
 msgstr "Ok"
 
-#: pronterface.py:378 pronterface.py:1330 pronterface.py:1587
+#: pronterface.py:393 pronterface.py:1344 pronterface.py:1601
 msgid "Cancel"
 msgstr "Annulla"
 
-#: pronterface.py:396
-msgid "' is being used by built-in command"
-msgstr "' è usato da un comando interno"
+#: pronterface.py:411
+msgid "Name '%s' is being used by built-in command"
+msgstr "Nome '%s' è usato da un comando interno"
 
-#: pronterface.py:396
-msgid "Name '"
-msgstr "Nome '"
-
-#: pronterface.py:399
+#: pronterface.py:414
 msgid "Macro name may contain only alphanumeric symbols and underscores"
-msgstr "I nomi delle macro possono contenere solo simboli alfanumerici e underscore"
+msgstr ""
+"I nomi delle macro possono contenere solo simboli alfanumerici e underscore"
 
-#: pronterface.py:448
+#: pronterface.py:463
 msgid "Port"
 msgstr "Porta"
 
-#: pronterface.py:467
+#: pronterface.py:482
 msgid "Connect"
 msgstr "Connetti"
 
-#: pronterface.py:469
+#: pronterface.py:484
 msgid "Connect to the printer"
 msgstr "Connetti alla stampante"
 
-#: pronterface.py:471
+#: pronterface.py:486
 msgid "Reset"
 msgstr "Reset"
 
-#: pronterface.py:474 pronterface.py:751
+#: pronterface.py:489 pronterface.py:766
 msgid "Mini mode"
 msgstr "Contrai"
 
-#: pronterface.py:478
+#: pronterface.py:493
 msgid "Monitor Printer"
 msgstr "Controllo automatico temperatura"
 
-#: pronterface.py:488
+#: pronterface.py:503
 msgid "Load file"
 msgstr "Carica file"
 
-#: pronterface.py:491
+#: pronterface.py:506
 msgid "Compose"
 msgstr "Componi"
 
-#: pronterface.py:495
+#: pronterface.py:510
 msgid "SD"
 msgstr "SD"
 
-#: pronterface.py:503 pronterface.py:1374 pronterface.py:1419
-#: pronterface.py:1469 pronterface.py:1494 pronterface.py:1528
-#: pronterface.py:1543
+#: pronterface.py:518 pronterface.py:1388 pronterface.py:1433
+#: pronterface.py:1483 pronterface.py:1508 pronterface.py:1542
+#: pronterface.py:1557
 msgid "Pause"
 msgstr "Pausa"
 
-#: pronterface.py:516
+#: pronterface.py:531
 msgid "Send"
 msgstr "Invia"
 
-#: pronterface.py:524 pronterface.py:625
+#: pronterface.py:539 pronterface.py:640
 msgid "mm/min"
 msgstr "mm/min"
 
-#: pronterface.py:526
+#: pronterface.py:541
 msgid "XY:"
 msgstr "XY:"
 
-#: pronterface.py:528
+#: pronterface.py:543
 msgid "Z:"
 msgstr "Z:"
 
-#: pronterface.py:551 pronterface.py:632
+#: pronterface.py:566 pronterface.py:647
 msgid "Heater:"
 msgstr "Estrusore:"
 
-#: pronterface.py:554 pronterface.py:574
+#: pronterface.py:569 pronterface.py:589
 msgid "Off"
 msgstr "Off"
 
-#: pronterface.py:566 pronterface.py:586
+#: pronterface.py:581 pronterface.py:601
 msgid "Set"
 msgstr "On"
 
-#: pronterface.py:571 pronterface.py:634
+#: pronterface.py:586 pronterface.py:649
 msgid "Bed:"
 msgstr "Piano:"
 
-#: pronterface.py:619
+#: pronterface.py:634
 msgid "mm"
 msgstr "mm"
 
-#: pronterface.py:677 pronterface.py:1182 pronterface.py:1413
+#: pronterface.py:692 pronterface.py:1196 pronterface.py:1427
 msgid "Not connected to printer."
 msgstr "Non connesso alla stampante."
 
-#: pronterface.py:706
+#: pronterface.py:721
 msgid "SD Upload"
 msgstr "Carica SD"
 
-#: pronterface.py:710
+#: pronterface.py:725
 msgid "SD Print"
 msgstr "Stampa SD"
 
-#: pronterface.py:758
+#: pronterface.py:773
 msgid "Full mode"
 msgstr "Espandi"
 
-#: pronterface.py:783
+#: pronterface.py:798
 msgid "Execute command: "
 msgstr "Esegui comando: "
 
-#: pronterface.py:794
+#: pronterface.py:809
 msgid "click to add new custom button"
 msgstr "clicca per aggiungere un nuovo pulsante personalizzato"
 
-#: pronterface.py:813
-msgid "Defines custom button. Usage: button <num> \"title\" [/c \"colour\"] command"
-msgstr "Definisce un pulsante personalizzato. Uso: button <num> \"titolo\" [/c \"colore\"] comando"
+#: pronterface.py:828
+msgid ""
+"Defines custom button. Usage: button <num> \"title\" [/c \"colour\"] command"
+msgstr ""
+"Definisce un pulsante personalizzato. Uso: button <num> \"titolo\" [/c "
+"\"colore\"] comando"
 
-#: pronterface.py:835
+#: pronterface.py:850
 msgid "Custom button number should be between 0 and 63"
 msgstr "Il numero del pulsante personalizzato dev'essere tra 0 e 63"
 
-#: pronterface.py:927
+#: pronterface.py:942
 msgid "Edit custom button '%s'"
 msgstr "Modifica pulsante personalizzato '%s'"
 
-#: pronterface.py:929
+#: pronterface.py:944
 msgid "Move left <<"
 msgstr "Muovi a sinistra <<"
 
-#: pronterface.py:932
+#: pronterface.py:947
 msgid "Move right >>"
 msgstr "Muovi a destra >>"
 
-#: pronterface.py:936
+#: pronterface.py:951
 msgid "Remove custom button '%s'"
 msgstr "Elimina pulsante personalizzato '%s'"
 
-#: pronterface.py:939
+#: pronterface.py:954
 msgid "Add custom button"
 msgstr "Aggiungi pulsante personalizzato"
 
-#: pronterface.py:1084
+#: pronterface.py:1099
 msgid "event object missing"
 msgstr "oggetto dell'evento mancante"
 
-#: pronterface.py:1112
+#: pronterface.py:1127
 msgid "Invalid period given."
 msgstr "Periodo non valido."
 
-#: pronterface.py:1115
+#: pronterface.py:1130
 msgid "Monitoring printer."
 msgstr "Sto controllando la stampante."
 
-#: pronterface.py:1117
+#: pronterface.py:1132
 msgid "Done monitoring."
 msgstr "Controllo terminato."
 
-#: pronterface.py:1139
+#: pronterface.py:1154
 msgid "Printer is online. "
 msgstr "La stampante è online. "
 
-#: pronterface.py:1141 pronterface.py:1317 pronterface.py:1372
+#: pronterface.py:1156 pronterface.py:1331
 msgid "Loaded "
 msgstr "Caricato "
 
-#: pronterface.py:1144
+#: pronterface.py:1159
 msgid "Bed"
 msgstr "Letto"
 
-#: pronterface.py:1144
+#: pronterface.py:1159
 msgid "Hotend"
 msgstr "Estrusore"
 
-#: pronterface.py:1154
+#: pronterface.py:1169
 msgid " SD printing:%04.2f %%"
 msgstr " stampa da scheda SD:%04.2f %%"
 
-#: pronterface.py:1157
+#: pronterface.py:1172
 msgid " Printing:%04.2f %% |"
 msgstr " Stampa in corso:%04.2f %% |"
 
-#: pronterface.py:1158
-msgid " Line# "
-msgstr " Linea# "
+#: pronterface.py:1173
+msgid " Line# %d of %d lines |"
+msgstr " Linea# %d di %d linee |"
 
-#: pronterface.py:1158
-msgid " lines |"
-msgstr " linee |"
+#: pronterface.py:1178
+msgid " Est: %s of %s remaining | "
+msgstr " Stima: %s di %s rimanente | "
 
-#: pronterface.py:1158
-msgid "of "
-msgstr "di "
-
-#: pronterface.py:1163
-msgid " Est: "
-msgstr " Stima: "
-
-#: pronterface.py:1164
-msgid " of: "
-msgstr " di: "
-
-#: pronterface.py:1165
-msgid " Remaining | "
-msgstr " Rimanente | "
-
-#: pronterface.py:1166
+#: pronterface.py:1180
 msgid " Z: %0.2f mm"
 msgstr " Z: %0.2f mm"
 
-#: pronterface.py:1233
+#: pronterface.py:1247
 msgid "Opening file failed."
 msgstr "Apertura del file fallita."
 
-#: pronterface.py:1239
+#: pronterface.py:1253
 msgid "Starting print"
 msgstr "Inizio della stampa"
 
-#: pronterface.py:1262
+#: pronterface.py:1276
 msgid "Pick SD file"
 msgstr "Scegli un file dalla scheda SD"
 
-#: pronterface.py:1262
+#: pronterface.py:1276
 msgid "Select the file to print"
 msgstr "Seleziona il file da stampare"
 
-#: pronterface.py:1297
+#: pronterface.py:1311
 msgid "Failed to execute slicing software: "
 msgstr "Imposibile eseguire il software di generazione percorso: "
 
-#: pronterface.py:1304
+#: pronterface.py:1318
 msgid "Slicing..."
 msgstr "Generazione percorso..."
 
-#: pronterface.py:1317 pronterface.py:1372
+#: pronterface.py:1331
 msgid ", %d lines"
 msgstr ", %d linee"
 
-#: pronterface.py:1324
+#: pronterface.py:1338
 msgid "Load File"
 msgstr "Apri file"
 
-#: pronterface.py:1331
+#: pronterface.py:1345
 msgid "Slicing "
 msgstr "Generazione del percorso "
 
-#: pronterface.py:1350
+#: pronterface.py:1364
 msgid "Open file to print"
 msgstr "Apri il file da stampare"
 
-#: pronterface.py:1351
+#: pronterface.py:1365
 msgid "OBJ, STL, and GCODE files (;*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ;)"
 msgstr "files OBJ, STL e GCODE (;*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ;)"
 
-#: pronterface.py:1358
+#: pronterface.py:1372
 msgid "File not found!"
 msgstr "File non trovato!"
 
-#: pronterface.py:1382
-msgid ""
-"mm of filament used in this print\n"
-msgstr ""
-"mm di filamento usato in questa stampa\n"
-
-#: pronterface.py:1383
-msgid ""
-"mm in X\n"
-"and is"
-msgstr ""
-"mm in X\n"
-"ed è"
-
-#: pronterface.py:1383 pronterface.py:1384
-msgid ""
-"mm wide\n"
-msgstr ""
-"mm di larghezza\n"
-
-#: pronterface.py:1383 pronterface.py:1384 pronterface.py:1385
-msgid "mm to"
-msgstr "mm a"
-
-#: pronterface.py:1383 pronterface.py:1384 pronterface.py:1385
-msgid "the print goes from"
-msgstr "la stampa va da"
-
-#: pronterface.py:1384
-msgid ""
-"mm in Y\n"
-"and is"
-msgstr ""
-"mm in Y\n"
-"ed è"
-
-#: pronterface.py:1385
-msgid ""
-"mm high\n"
-msgstr ""
-"mm di altezza\n"
-
-#: pronterface.py:1385
-msgid ""
-"mm in Z\n"
-"and is"
-msgstr ""
-"mm in Z\n"
-"ed è"
-
 #: pronterface.py:1386
+msgid "Loaded %s, %d lines"
+msgstr "Caricato %s, %d linee"
+
+#: pronterface.py:1396
+msgid "mm of filament used in this print\n"
+msgstr "mm di filamento usato in questa stampa\n"
+
+#: pronterface.py:1397
+msgid ""
+"the print goes from %f mm to %f mm in X\n"
+"and is %f mm wide\n"
+msgstr ""
+"la stampa va da %f mm a %f mm in X\n"
+"ed è %f mm di larghezza\n"
+
+#: pronterface.py:1398
+msgid ""
+"the print goes from %f mm to %f mm in Y\n"
+"and is %f mm wide\n"
+msgstr ""
+"la stampa va da %f mm a %f mm in Y\n"
+"ed è %f mm di larghezza\n"
+
+#: pronterface.py:1399
+msgid ""
+"the print goes from %f mm to %f mm in Z\n"
+"and is %f mm high\n"
+msgstr ""
+"la stampa va da %f mm a %f mm in Z\n"
+"ed è %f mm di altezza\n"
+
+#: pronterface.py:1400
 msgid "Estimated duration (pessimistic): "
 msgstr "Durata stimata (pessimistica): "
 
-#: pronterface.py:1410
+#: pronterface.py:1424
 msgid "No file loaded. Please use load first."
 msgstr "Nessub file caricato. Usare Apri prima."
 
-#: pronterface.py:1421
+#: pronterface.py:1435
 msgid "Restart"
 msgstr "Ricomincia"
 
-#: pronterface.py:1425
+#: pronterface.py:1439
 msgid "File upload complete"
 msgstr "Caricamento file completato"
 
-#: pronterface.py:1444
+#: pronterface.py:1458
 msgid "Pick SD filename"
 msgstr "Scegli un file dalla scheda SD"
 
-#: pronterface.py:1452
+#: pronterface.py:1466
 msgid "Paused."
 msgstr "In pausa."
 
-#: pronterface.py:1462
+#: pronterface.py:1476
 msgid "Resume"
 msgstr "Ripristina"
 
-#: pronterface.py:1478
+#: pronterface.py:1492
 msgid "Connecting..."
 msgstr "Connessione..."
 
-#: pronterface.py:1509
+#: pronterface.py:1523
 msgid "Disconnected."
 msgstr "Disconnesso."
 
-#: pronterface.py:1536
+#: pronterface.py:1550
 msgid "Reset."
 msgstr "Reset."
 
-#: pronterface.py:1537
+#: pronterface.py:1551
 msgid "Are you sure you want to reset the printer?"
 msgstr "Sei sicuro di voler resettare la stampante?"
 
-#: pronterface.py:1537
+#: pronterface.py:1551
 msgid "Reset?"
 msgstr "Reset?"
 
-#: pronterface.py:1583
+#: pronterface.py:1597
 msgid "Save"
 msgstr "Salva"
 
-#: pronterface.py:1639
+#: pronterface.py:1653
 msgid "Edit settings"
 msgstr "Modifica impostazioni"
 
-#: pronterface.py:1641
+#: pronterface.py:1655
 msgid "Defaults"
 msgstr "Valori di default"
 
-#: pronterface.py:1670
+#: pronterface.py:1684
 msgid "Custom button"
 msgstr "Personalizza bottone"
 
-#: pronterface.py:1675
+#: pronterface.py:1689
 msgid "Button title"
 msgstr "Titolo bottone"
 
-#: pronterface.py:1678
+#: pronterface.py:1692
 msgid "Command"
 msgstr "Comando"
 
-#: pronterface.py:1687
+#: pronterface.py:1701
 msgid "Color"
 msgstr "Colore"
+
+#~ msgid "Communications Speed (default: 115200)"
+#~ msgstr "Velocità di comunicazione (default: 115200)"
+
+#~ msgid "Heated Build Platform temp for ABS (default: 110 deg C)"
+#~ msgstr "Temperatura piano di stampa per ABS (default: 110° C) "
+
+#~ msgid "Heated Build Platform temp for PLA (default: 60 deg C)"
+#~ msgstr "Temperatura piano di stampa per PLA (default: 60° C)"
+
+#~ msgid "Feedrate for Control Panel Moves in Extrusions (default: 300mm/min)"
+#~ msgstr ""
+#~ "Velocità dei movimenti dell'estrusore in modalità manuale (default: 300mm/"
+#~ "min)"
+
+#~ msgid "Port used to communicate with printer"
+#~ msgstr "Porta usata per comunicare con la stampante"
+
+#~ msgid ""
+#~ "Slice command\n"
+#~ "   default:\n"
+#~ "       python skeinforge/skeinforge_application/skeinforge_utilities/"
+#~ "skeinforge_craft.py $s)"
+#~ msgstr ""
+#~ "Comando del generatore di percorso\n"
+#~ "   default:\n"
+#~ "       python skeinforge/skeinforge_application/skeinforge_utilities/"
+#~ "skeinforge_craft.py $s)"
+
+#~ msgid ""
+#~ "Slice settings command\n"
+#~ "   default:\n"
+#~ "       python skeinforge/skeinforge_application/skeinforge.py"
+#~ msgstr ""
+#~ "Comando di configurazione del generatore di percorso\n"
+#~ "   default:\n"
+#~ "       python skeinforge/skeinforge_application/skeinforge.py"
+
+#~ msgid "Extruder temp for ABS (default: 230 deg C)"
+#~ msgstr "Temperatura di estrusione per ABS (default: 230° C)"
+
+#~ msgid "Extruder temp for PLA (default: 185 deg C)"
+#~ msgstr "Temperatura di estrusione per PLA (default: 185° C"
+
+#~ msgid "Feedrate for Control Panel Moves in X and Y (default: 3000mm/min)"
+#~ msgstr ""
+#~ "Velocità dei movimenti degli assi X e Y in modalità manuale (default: "
+#~ "3000mm/min)"
+
+#~ msgid "Feedrate for Control Panel Moves in Z (default: 200mm/min)"
+#~ msgstr ""
+#~ "Velocità dei movimenti dell'asse Z in modalità manuale (default: 200mm/"
+#~ "min)"
diff --git a/locale/nl/LC_MESSAGES/nl.po b/locale/nl/LC_MESSAGES/nl.po
index 7c422bb..4dfcac8 100755
--- a/locale/nl/LC_MESSAGES/nl.po
+++ b/locale/nl/LC_MESSAGES/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pronterface rl1\n"
-"POT-Creation-Date: 2011-09-06 16:31+0100\n"
+"POT-Creation-Date: 2012-02-26 02:12+CET\n"
 "PO-Revision-Date: 2011-09-06 16:31+0100\n"
 "Last-Translator: Ruben Lubbes <ruben.lubbes@gmx.net>\n"
 "Language-Team: NL <LL@li.org>\n"
@@ -15,135 +15,70 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: pronterface.py:10
+#: pronterface.py:30
 msgid "WX is not installed. This program requires WX to run."
 msgstr "WX is niet geïnstalleerd. Dit programma vereist WX."
 
-#: pronterface.py:60
+#: pronterface.py:81
+msgid ""
+"Dimensions of Build Platform\n"
+" & optional offset of origin\n"
+"\n"
+"Examples:\n"
+"   XXXxYYY\n"
+"   XXX,YYY,ZZZ\n"
+"   XXXxYYYxZZZ+OffX+OffY+OffZ"
+msgstr ""
+
+#: pronterface.py:82
+msgid "Last Set Temperature for the Heated Print Bed"
+msgstr ""
+
+#: pronterface.py:83
+msgid "Folder of last opened file"
+msgstr ""
+
+#: pronterface.py:84
+msgid "Last Temperature of the Hot End"
+msgstr ""
+
+#: pronterface.py:85
+msgid "Width of Extrusion in Preview (default: 0.5)"
+msgstr ""
+
+#: pronterface.py:86
+msgid "Fine Grid Spacing (default: 10)"
+msgstr ""
+
+#: pronterface.py:87
+msgid "Coarse Grid Spacing (default: 50)"
+msgstr ""
+
+#: pronterface.py:88
+msgid "Pronterface background color (default: #FFFFFF)"
+msgstr ""
+
+#: pronterface.py:91
 msgid "Printer Interface"
 msgstr "Printer Interface"
 
-#: pronterface.py:72
-msgid "X+100"
-msgstr "X+100"
-
-#: pronterface.py:73
-msgid "X+10"
-msgstr "X+10"
-
-#: pronterface.py:74
-msgid "X+1"
-msgstr "X+1"
-
-#: pronterface.py:75
-msgid "X+0.1"
-msgstr "X+0.1"
-
-#: pronterface.py:76
-msgid "HomeX"
-msgstr "0-puntX"
-
-#: pronterface.py:77
-msgid "X-0.1"
-msgstr "X-0.1"
-
-#: pronterface.py:78
-msgid "X-1"
-msgstr "X-1"
-
-#: pronterface.py:79
-msgid "X-10"
-msgstr "X-10"
-
-#: pronterface.py:80
-msgid "X-100"
-msgstr "X-100"
-
-#: pronterface.py:81
-msgid "Y+100"
-msgstr "Y+100"
-
-#: pronterface.py:82
-msgid "Y+10"
-msgstr "Y+10"
-
-#: pronterface.py:83
-msgid "Y+1"
-msgstr "Y+1"
-
-#: pronterface.py:84
-msgid "Y+0.1"
-msgstr "Y+0.1"
-
-#: pronterface.py:85
-msgid "HomeY"
-msgstr "0-puntY"
-
-#: pronterface.py:86
-msgid "Y-0.1"
-msgstr "Y-0.1"
-
-#: pronterface.py:87
-msgid "Y-1"
-msgstr "Y-1"
-
-#: pronterface.py:88
-msgid "Y-10"
-msgstr "Y-10"
-
-#: pronterface.py:89
-msgid "Y-100"
-msgstr "Y-100"
-
-#: pronterface.py:90
+#: pronterface.py:108
 msgid "Motors off"
 msgstr "Motoren uit"
 
-#: pronterface.py:91
-msgid "Z+10"
-msgstr "Z+10"
-
-#: pronterface.py:92
-msgid "Z+1"
-msgstr "Z+1"
-
-#: pronterface.py:93
-msgid "Z+0.1"
-msgstr "Z+0.1"
-
-#: pronterface.py:94
-msgid "HomeZ"
-msgstr "0-puntZ"
-
-#: pronterface.py:95
-msgid "Z-0.1"
-msgstr "Z-0.1"
-
-#: pronterface.py:96
-msgid "Z-1"
-msgstr "Z-1"
-
-#: pronterface.py:97
-msgid "Z-10"
-msgstr "Z-10"
-
-#: pronterface.py:98
-msgid "Home"
-msgstr "0-punt"
-
-#: pronterface.py:99
+#: pronterface.py:109
 msgid "Check temp"
 msgstr "Controleer Temp."
 
-#: pronterface.py:100
+#: pronterface.py:110
 msgid "Extrude"
 msgstr "Extruden"
 
-#: pronterface.py:101
+#: pronterface.py:111
 msgid "Reverse"
 msgstr "Terug"
 
-#: pronterface.py:117
+#: pronterface.py:129
 msgid ""
 "# I moved all your custom buttons into .pronsolerc.\n"
 "# Please don't add them here any more.\n"
@@ -153,484 +88,621 @@ msgstr ""
 "# Hier geen nieuwe knoppen definiëren.\n"
 "# Een backup van de oude knoppen staat in custombtn.old\n"
 
-#: pronterface.py:122
-msgid "Note!!! You have specified custom buttons in both custombtn.txt and .pronsolerc"
-msgstr "Let op!!! Er zijn gedefinieerde knoppen in zowel custombtn.txt en .pronsolerc"
+#: pronterface.py:134
+msgid ""
+"Note!!! You have specified custom buttons in both custombtn.txt and ."
+"pronsolerc"
+msgstr ""
+"Let op!!! Er zijn gedefinieerde knoppen in zowel custombtn.txt en .pronsolerc"
 
-#: pronterface.py:123
-msgid "Ignoring custombtn.txt. Remove all current buttons to revert to custombtn.txt"
-msgstr "Negeer custombtn.txt. Verwijder alle gedefinieerde knoppen om gebruik te maken van custombtn.txt"
+#: pronterface.py:135
+msgid ""
+"Ignoring custombtn.txt. Remove all current buttons to revert to custombtn.txt"
+msgstr ""
+"Negeer custombtn.txt. Verwijder alle gedefinieerde knoppen om gebruik te "
+"maken van custombtn.txt"
 
-#: pronterface.py:146
-#: pronterface.py:434
-#: pronterface.py:971
-#: pronterface.py:1020
-#: pronterface.py:1134
-#: pronterface.py:1161
-#: pronterface.py:1175
+#: pronterface.py:163 pronterface.py:514 pronterface.py:1333
+#: pronterface.py:1387 pronterface.py:1509 pronterface.py:1543
+#: pronterface.py:1558
 msgid "Print"
 msgstr "Printen"
 
-#: pronterface.py:150
-msgid "Printer is now online"
-msgstr "Printer is nu verbonden"
+#: pronterface.py:167
+msgid "Printer is now online."
+msgstr "Printer is nu verbonden."
 
-#: pronterface.py:199
-msgid "Setting hotend temperature to "
-msgstr "Stel elementtemperatuur in op "
-
-#: pronterface.py:199
-#: pronterface.py:220
-msgid " degrees Celsius."
-msgstr " graden Celsius."
-
-#: pronterface.py:203
-#: pronterface.py:224
-msgid "Printer is not online."
-msgstr "Printer is niet verbonden."
-
-#: pronterface.py:205
-msgid "You cannot set negative temperatures. To turn the hotend off entirely, set its temperature to 0."
-msgstr "Negatieve temperatuur is niet instelbaar. Om het element uit te schakelen wordt temperatuur 0 ingesteld."
-
-#: pronterface.py:207
-#: pronterface.py:228
-msgid "You must enter a temperature."
-msgstr "Er moet een temperatuur worden ingesteld."
-
-#: pronterface.py:220
-msgid "Setting bed temperature to "
-msgstr "Bed teperatuur ingesteld op "
-
-#: pronterface.py:226
-msgid "You cannot set negative temperatures. To turn the bed off entirely, set its temperature to 0."
-msgstr "Negatieve temperatuur is niet instelbaar. Om het printbed uit te schakelen wordt temperatuur 0 ingesteld."
-
-#: pronterface.py:243
-msgid "Do you want to erase the macro?"
-msgstr "Wilt u de macro verwijderen?"
-
-#: pronterface.py:247
-msgid "Cancelled."
-msgstr "Afgebroken"
-
-#: pronterface.py:277
-msgid "&Open..."
-msgstr "&Open..."
-
-#: pronterface.py:277
-msgid " Opens file"
-msgstr " Opent bestand"
-
-#: pronterface.py:278
-msgid "&Edit..."
-msgstr "&Wijzig..."
-
-#: pronterface.py:278
-msgid " Edit open file"
-msgstr " Wijzig geopend bestand"
-
-#: pronterface.py:279
-msgid "E&xit"
-msgstr "&Stoppen"
-
-#: pronterface.py:279
-msgid " Closes the Window"
-msgstr " Sluit het venster"
-
-#: pronterface.py:280
-msgid "&File"
-msgstr ""
-
-#: pronterface.py:285
-msgid "&Macros"
-msgstr "&Macros"
-
-#: pronterface.py:286
-msgid "<&New...>"
-msgstr "<&Nieuw...>"
-
-#: pronterface.py:287
-msgid "&Options"
-msgstr "&Opties"
-
-#: pronterface.py:287
-msgid " Options dialog"
-msgstr "Optievenster"
-
-#: pronterface.py:289
-msgid "SFACT Settings"
-msgstr "SFACT Instellingen"
-
-#: pronterface.py:289
-msgid " Adjust SFACT settings"
-msgstr "Instellen SFACT"
-
-#: pronterface.py:292
-msgid "SFACT Quick Settings"
-msgstr "SFACT Snelinstelling"
-
-#: pronterface.py:292
-msgid " Quickly adjust SFACT settings for active profile"
-msgstr " Eenvoudig SFACT's huidige profiel instellen"
-
-#: pronterface.py:295
-msgid "&Settings"
-msgstr "&Instellingen"
-
-#: pronterface.py:311
-msgid "Enter macro name"
-msgstr "Voer macronaam in"
-
-#: pronterface.py:314
-msgid "Macro name:"
-msgstr "Macronaam:"
-
-#: pronterface.py:317
-msgid "Ok"
-msgstr "Ok"
-
-#: pronterface.py:321
-#: pronterface.py:1197
-msgid "Cancel"
-msgstr "Annuleer"
-
-#: pronterface.py:339
-msgid "Name '"
-msgstr "Naam '"
-
-#: pronterface.py:339
-msgid "' is being used by built-in command"
-msgstr "' wordt gebruikt door ingebouwde instructie"
-
-#: pronterface.py:342
-msgid "Macro name may contain only alphanumeric symbols and underscores"
-msgstr ""
-
-#: pronterface.py:375
-msgid "Port:"
-msgstr "Poort"
-
-#: pronterface.py:397
-msgid "Connect"
-msgstr "Verbind"
-
-#: pronterface.py:399
-msgid "Connect to the printer"
-msgstr "Verbind met printer"
-
-#: pronterface.py:401
+#: pronterface.py:168
 msgid "Disconnect"
 msgstr "Ontkoppel"
 
-#: pronterface.py:405
+#: pronterface.py:227
+msgid "Setting hotend temperature to %f degrees Celsius."
+msgstr "Stel elementtemperatuur in op %f graden Celsius."
+
+#: pronterface.py:246 pronterface.py:282 pronterface.py:340
+msgid "Printer is not online."
+msgstr "Printer is niet verbonden."
+
+#: pronterface.py:248
+msgid ""
+"You cannot set negative temperatures. To turn the hotend off entirely, set "
+"its temperature to 0."
+msgstr ""
+"Negatieve temperatuur is niet instelbaar. Om het element uit te schakelen "
+"wordt temperatuur 0 ingesteld."
+
+#: pronterface.py:250
+msgid "You must enter a temperature. (%s)"
+msgstr "Er moet een temperatuur worden ingesteld. (%s)"
+
+#: pronterface.py:263
+msgid "Setting bed temperature to %f degrees Celsius."
+msgstr "Bed teperatuur ingesteld op %f graden Celsius."
+
+#: pronterface.py:284
+msgid ""
+"You cannot set negative temperatures. To turn the bed off entirely, set its "
+"temperature to 0."
+msgstr ""
+"Negatieve temperatuur is niet instelbaar. Om het printbed uit te schakelen "
+"wordt temperatuur 0 ingesteld."
+
+#: pronterface.py:286
+msgid "You must enter a temperature."
+msgstr "Er moet een temperatuur worden ingesteld."
+
+#: pronterface.py:301
+msgid "Do you want to erase the macro?"
+msgstr "Wilt u de macro verwijderen?"
+
+#: pronterface.py:305
+msgid "Cancelled."
+msgstr "Afgebroken"
+
+#: pronterface.py:346
+msgid " Opens file"
+msgstr " Opent bestand"
+
+#: pronterface.py:346
+msgid "&Open..."
+msgstr "&Open..."
+
+#: pronterface.py:347
+msgid " Edit open file"
+msgstr " Wijzig geopend bestand"
+
+#: pronterface.py:347
+msgid "&Edit..."
+msgstr "&Wijzig..."
+
+#: pronterface.py:348
+msgid " Clear output console"
+msgstr ""
+
+#: pronterface.py:348
+msgid "Clear console"
+msgstr ""
+
+#: pronterface.py:349
+msgid " Project slices"
+msgstr ""
+
+#: pronterface.py:349
+msgid "Projector"
+msgstr ""
+
+#: pronterface.py:350
+msgid " Closes the Window"
+msgstr " Sluit het venster"
+
+#: pronterface.py:350
+msgid "E&xit"
+msgstr "&Stoppen"
+
+#: pronterface.py:351
+msgid "&File"
+msgstr ""
+
+#: pronterface.py:356
+msgid "&Macros"
+msgstr "&Macros"
+
+#: pronterface.py:357
+msgid "<&New...>"
+msgstr "<&Nieuw...>"
+
+#: pronterface.py:358
+msgid " Options dialog"
+msgstr "Optievenster"
+
+#: pronterface.py:358
+msgid "&Options"
+msgstr "&Opties"
+
+#: pronterface.py:360
+#, fuzzy
+msgid " Adjust slicing settings"
+msgstr "Instellen SFACT"
+
+#: pronterface.py:360
+#, fuzzy
+msgid "Slicing Settings"
+msgstr "SFACT Instellingen"
+
+#: pronterface.py:367
+msgid "&Settings"
+msgstr "&Instellingen"
+
+#: pronterface.py:383
+msgid "Enter macro name"
+msgstr "Voer macronaam in"
+
+#: pronterface.py:386
+msgid "Macro name:"
+msgstr "Macronaam:"
+
+#: pronterface.py:389
+msgid "Ok"
+msgstr "Ok"
+
+#: pronterface.py:393 pronterface.py:1344 pronterface.py:1601
+msgid "Cancel"
+msgstr "Annuleer"
+
+#: pronterface.py:411
+msgid "Name '%s' is being used by built-in command"
+msgstr "Naam '%s' wordt gebruikt door ingebouwde instructie"
+
+#: pronterface.py:414
+msgid "Macro name may contain only alphanumeric symbols and underscores"
+msgstr ""
+
+#: pronterface.py:463
+msgid "Port"
+msgstr "Poort"
+
+#: pronterface.py:482
+msgid "Connect"
+msgstr "Verbind"
+
+#: pronterface.py:484
+msgid "Connect to the printer"
+msgstr "Verbind met printer"
+
+#: pronterface.py:486
 msgid "Reset"
 msgstr "Reset"
 
-#: pronterface.py:408
-#: pronterface.py:592
+#: pronterface.py:489 pronterface.py:766
 msgid "Mini mode"
 msgstr "Mini-venster"
 
-#: pronterface.py:414
-msgid ""
-"Monitor\n"
-"printer"
+#: pronterface.py:493
+#, fuzzy
+msgid "Monitor Printer"
 msgstr "Printercommunicatie volgen"
 
-#: pronterface.py:423
+#: pronterface.py:503
 msgid "Load file"
 msgstr "open bestand"
 
-#: pronterface.py:426
-msgid "SD Upload"
-msgstr "uploaden naar SD"
+#: pronterface.py:506
+msgid "Compose"
+msgstr ""
 
-#: pronterface.py:430
-msgid "SD Print"
-msgstr "Afdruk van SD"
+#: pronterface.py:510
+msgid "SD"
+msgstr ""
 
-#: pronterface.py:438
-#: pronterface.py:1021
-#: pronterface.py:1061
-#: pronterface.py:1109
-#: pronterface.py:1133
-#: pronterface.py:1160
-#: pronterface.py:1174
+#: pronterface.py:518 pronterface.py:1388 pronterface.py:1433
+#: pronterface.py:1483 pronterface.py:1508 pronterface.py:1542
+#: pronterface.py:1557
 msgid "Pause"
 msgstr "Pauze"
 
-#: pronterface.py:452
+#: pronterface.py:531
 msgid "Send"
 msgstr "Zend"
 
-#: pronterface.py:460
-#: pronterface.py:518
+#: pronterface.py:539 pronterface.py:640
 msgid "mm/min"
 msgstr "mm/min"
 
-#: pronterface.py:462
+#: pronterface.py:541
 msgid "XY:"
 msgstr "XY:"
 
-#: pronterface.py:464
+#: pronterface.py:543
 msgid "Z:"
 msgstr "Z:"
 
-#: pronterface.py:481
+#: pronterface.py:566 pronterface.py:647
 msgid "Heater:"
 msgstr "Element:"
 
-#: pronterface.py:489
-#: pronterface.py:501
+#: pronterface.py:569 pronterface.py:589
+msgid "Off"
+msgstr ""
+
+#: pronterface.py:581 pronterface.py:601
 msgid "Set"
 msgstr "Stel in"
 
-#: pronterface.py:493
+#: pronterface.py:586 pronterface.py:649
 msgid "Bed:"
 msgstr "Bed:"
 
-#: pronterface.py:512
+#: pronterface.py:634
 msgid "mm"
 msgstr "mm"
 
-#: pronterface.py:551
-#: pronterface.py:846
-#: pronterface.py:1055
+#: pronterface.py:692 pronterface.py:1196 pronterface.py:1427
 msgid "Not connected to printer."
 msgstr "Printer is niet verbonden."
 
-#: pronterface.py:599
+#: pronterface.py:721
+msgid "SD Upload"
+msgstr "uploaden naar SD"
+
+#: pronterface.py:725
+msgid "SD Print"
+msgstr "Afdruk van SD"
+
+#: pronterface.py:773
 msgid "Full mode"
 msgstr "Volledig venster"
 
-#: pronterface.py:637
-msgid "Defines custom button. Usage: button <num> \"title\" [/c \"colour\"] command"
-msgstr "Definieert eigen knop. Gebruik: knop <num> \"titel\" [/c \"kleur\"] commando"
+#: pronterface.py:798
+msgid "Execute command: "
+msgstr ""
 
-#: pronterface.py:659
+#: pronterface.py:809
+#, fuzzy
+msgid "click to add new custom button"
+msgstr "Definieer eigen knop."
+
+#: pronterface.py:828
+msgid ""
+"Defines custom button. Usage: button <num> \"title\" [/c \"colour\"] command"
+msgstr ""
+"Definieert eigen knop. Gebruik: knop <num> \"titel\" [/c \"kleur\"] commando"
+
+#: pronterface.py:850
 msgid "Custom button number should be between 0 and 63"
 msgstr "Knopnummer moet tussen 0 en 63 zijn"
 
-#: pronterface.py:749
-#, python-format
+#: pronterface.py:942
 msgid "Edit custom button '%s'"
 msgstr "Wijzig gedefineerde knop '%s'"
 
-#: pronterface.py:751
+#: pronterface.py:944
 msgid "Move left <<"
 msgstr "Verplaats links <<"
 
-#: pronterface.py:754
+#: pronterface.py:947
 msgid "Move right >>"
 msgstr "Verplaats rechts >>"
 
-#: pronterface.py:758
-#, python-format
+#: pronterface.py:951
 msgid "Remove custom button '%s'"
 msgstr "Verwijder gedefinieerde knop '%s'"
 
-#: pronterface.py:761
+#: pronterface.py:954
 msgid "Add custom button"
 msgstr "Definieer eigen knop."
 
-#: pronterface.py:776
+#: pronterface.py:1099
 msgid "event object missing"
 msgstr "vermist object"
 
-#: pronterface.py:804
+#: pronterface.py:1127
 msgid "Invalid period given."
 msgstr "Foute gegevens ingevoerd"
 
-#: pronterface.py:807
+#: pronterface.py:1130
 msgid "Monitoring printer."
 msgstr "Printercommunicatie wordt gevolgd."
 
-#: pronterface.py:809
+#: pronterface.py:1132
 msgid "Done monitoring."
 msgstr "Klaar met volgen."
 
-#: pronterface.py:828
+#: pronterface.py:1154
 msgid "Printer is online. "
 msgstr "Printer is verbonden. "
 
-#: pronterface.py:830
-#: pronterface.py:969
-#: pronterface.py:1019
+#: pronterface.py:1156 pronterface.py:1331
 msgid "Loaded "
-msgstr "Geladen"
+msgstr "Geladen "
 
-#: pronterface.py:833
-msgid "Hotend"
-msgstr "Element"
-
-#: pronterface.py:833
+#: pronterface.py:1159
 msgid "Bed"
 msgstr "Bed"
 
-#: pronterface.py:836
-#, python-format
+#: pronterface.py:1159
+msgid "Hotend"
+msgstr "Element"
+
+#: pronterface.py:1169
 msgid " SD printing:%04.2f %%"
 msgstr " SD printen:%04.2f %%"
 
-#: pronterface.py:838
-#, python-format
-msgid " Printing:%04.2f %%"
-msgstr " Printen:%04.2f %%"
+#: pronterface.py:1172
+msgid " Printing:%04.2f %% |"
+msgstr " Printen:%04.2f %% |"
 
-#: pronterface.py:892
+#: pronterface.py:1173
+msgid " Line# %d of %d lines |"
+msgstr ""
+
+#: pronterface.py:1178
+msgid " Est: %s of %s remaining | "
+msgstr ""
+
+#: pronterface.py:1180
+msgid " Z: %0.2f mm"
+msgstr " Z: %0.2f mm"
+
+#: pronterface.py:1247
 msgid "Opening file failed."
 msgstr "Bestand openen mislukt"
 
-#: pronterface.py:898
+#: pronterface.py:1253
 msgid "Starting print"
 msgstr "Start het printen"
 
-#: pronterface.py:921
-msgid "Select the file to print"
-msgstr "Kies het te printen bestand"
-
-#: pronterface.py:921
+#: pronterface.py:1276
 msgid "Pick SD file"
 msgstr "Kies bestand op SD"
 
-#: pronterface.py:949
-msgid "Skeinforge execution failed."
-msgstr "Skeinforge was niet succesvol."
+#: pronterface.py:1276
+msgid "Select the file to print"
+msgstr "Kies het te printen bestand"
 
-#: pronterface.py:956
-msgid "Skeining..."
+#: pronterface.py:1311
+msgid "Failed to execute slicing software: "
+msgstr ""
+
+#: pronterface.py:1318
+#, fuzzy
+msgid "Slicing..."
 msgstr "Skeinforge draait..."
 
-#: pronterface.py:969
-#: pronterface.py:1019
-#, python-format
+#: pronterface.py:1331
 msgid ", %d lines"
-msgstr ",%d regels"
+msgstr ", %d regels"
 
-#: pronterface.py:978
-msgid "Skeining "
+#: pronterface.py:1338
+#, fuzzy
+msgid "Load File"
+msgstr "open bestand"
+
+#: pronterface.py:1345
+#, fuzzy
+msgid "Slicing "
 msgstr "Skeinforge draait"
 
-#: pronterface.py:980
-msgid ""
-"Skeinforge not found. \n"
-"Please copy Skeinforge into a directory named \"skeinforge\" in the same directory as this file."
-msgstr ""
-"Skeinforge niet gevonden.\n"
-"Plaats Skeinforge in een map met de naam \"skeinforge\" in dezelfde map als dit bestand."
-
-#: pronterface.py:999
+#: pronterface.py:1364
 msgid "Open file to print"
 msgstr "Open het te printen bestand"
 
-#: pronterface.py:1000
-msgid "STL and GCODE files (;*.gcode;*.g;*.stl;*.STL;)"
+#: pronterface.py:1365
+#, fuzzy
+msgid "OBJ, STL, and GCODE files (;*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ;)"
 msgstr "STL en GCODE bestanden (;*.gcode;*.g;*.stl;*.STL;)"
 
-#: pronterface.py:1007
+#: pronterface.py:1372
 msgid "File not found!"
 msgstr "Bestand niet gevonden!"
 
-#: pronterface.py:1029
-#, fuzzy
+#: pronterface.py:1386
+msgid "Loaded %s, %d lines"
+msgstr "Geladen %s, %d regels"
+
+#: pronterface.py:1396
 msgid "mm of filament used in this print\n"
-msgstr "mm fillament wordt gebruikt in deze print"
+msgstr "mm fillament wordt gebruikt in deze print\n"
 
-#: pronterface.py:1030
-#: pronterface.py:1031
-#: pronterface.py:1032
-msgid "the print goes from"
-msgstr ""
-
-#: pronterface.py:1030
-#: pronterface.py:1031
-#: pronterface.py:1032
-msgid "mm to"
-msgstr ""
-
-#: pronterface.py:1030
+#: pronterface.py:1397
 msgid ""
-"mm in X\n"
-"and is"
+"the print goes from %f mm to %f mm in X\n"
+"and is %f mm wide\n"
 msgstr ""
 
-#: pronterface.py:1030
-#: pronterface.py:1031
-msgid "mm wide\n"
-msgstr ""
-
-#: pronterface.py:1031
+#: pronterface.py:1398
 msgid ""
-"mm in Y\n"
-"and is"
+"the print goes from %f mm to %f mm in Y\n"
+"and is %f mm wide\n"
 msgstr ""
 
-#: pronterface.py:1032
+#: pronterface.py:1399
 msgid ""
-"mm in Z\n"
-"and is"
+"the print goes from %f mm to %f mm in Z\n"
+"and is %f mm high\n"
 msgstr ""
 
-#: pronterface.py:1032
-msgid "mm high\n"
+#: pronterface.py:1400
+msgid "Estimated duration (pessimistic): "
 msgstr ""
 
-#: pronterface.py:1052
+#: pronterface.py:1424
 msgid "No file loaded. Please use load first."
 msgstr "Geen bestand geladen. Eerst bestand inladen."
 
-#: pronterface.py:1063
+#: pronterface.py:1435
 msgid "Restart"
 msgstr "Herstart"
 
-#: pronterface.py:1067
+#: pronterface.py:1439
 msgid "File upload complete"
 msgstr "Bestandsupload voltooid"
 
-#: pronterface.py:1086
+#: pronterface.py:1458
 msgid "Pick SD filename"
 msgstr "Kies bestandsnaam op SD"
 
-#: pronterface.py:1102
+#: pronterface.py:1466
+#, fuzzy
+msgid "Paused."
+msgstr "Pauze"
+
+#: pronterface.py:1476
 msgid "Resume"
 msgstr "Hervat"
 
-#: pronterface.py:1168
+#: pronterface.py:1492
+#, fuzzy
+msgid "Connecting..."
+msgstr "Verbind"
+
+#: pronterface.py:1523
+#, fuzzy
+msgid "Disconnected."
+msgstr "Ontkoppel"
+
+#: pronterface.py:1550
+#, fuzzy
+msgid "Reset."
+msgstr "Reset"
+
+#: pronterface.py:1551
 msgid "Are you sure you want to reset the printer?"
 msgstr "Weet je zeker dat je de printer wilt resetten?"
 
-#: pronterface.py:1168
+#: pronterface.py:1551
 msgid "Reset?"
 msgstr "resetten?"
 
-#: pronterface.py:1193
+#: pronterface.py:1597
 msgid "Save"
 msgstr ""
 
-#: pronterface.py:1248
+#: pronterface.py:1653
 msgid "Edit settings"
 msgstr "Wijzig instellingen"
 
-#: pronterface.py:1250
+#: pronterface.py:1655
 msgid "Defaults"
 msgstr "Standaardinstelling"
 
-#: pronterface.py:1272
+#: pronterface.py:1684
 msgid "Custom button"
 msgstr "Gedefinieerde knop"
 
-#: pronterface.py:1280
+#: pronterface.py:1689
 msgid "Button title"
 msgstr "Knoptitel"
 
-#: pronterface.py:1283
+#: pronterface.py:1692
 msgid "Command"
 msgstr "Commando"
 
-#: pronterface.py:1292
+#: pronterface.py:1701
 msgid "Color"
 msgstr "Kleur"
 
+#~ msgid "X+100"
+#~ msgstr "X+100"
+
+#~ msgid "X+10"
+#~ msgstr "X+10"
+
+#~ msgid "X+1"
+#~ msgstr "X+1"
+
+#~ msgid "X+0.1"
+#~ msgstr "X+0.1"
+
+#~ msgid "HomeX"
+#~ msgstr "0-puntX"
+
+#~ msgid "X-0.1"
+#~ msgstr "X-0.1"
+
+#~ msgid "X-1"
+#~ msgstr "X-1"
+
+#~ msgid "X-10"
+#~ msgstr "X-10"
+
+#~ msgid "X-100"
+#~ msgstr "X-100"
+
+#~ msgid "Y+100"
+#~ msgstr "Y+100"
+
+#~ msgid "Y+10"
+#~ msgstr "Y+10"
+
+#~ msgid "Y+1"
+#~ msgstr "Y+1"
+
+#~ msgid "Y+0.1"
+#~ msgstr "Y+0.1"
+
+#~ msgid "HomeY"
+#~ msgstr "0-puntY"
+
+#~ msgid "Y-0.1"
+#~ msgstr "Y-0.1"
+
+#~ msgid "Y-1"
+#~ msgstr "Y-1"
+
+#~ msgid "Y-10"
+#~ msgstr "Y-10"
+
+#~ msgid "Y-100"
+#~ msgstr "Y-100"
+
+#~ msgid "Z+10"
+#~ msgstr "Z+10"
+
+#~ msgid "Z+1"
+#~ msgstr "Z+1"
+
+#~ msgid "Z+0.1"
+#~ msgstr "Z+0.1"
+
+#~ msgid "HomeZ"
+#~ msgstr "0-puntZ"
+
+#~ msgid "Z-0.1"
+#~ msgstr "Z-0.1"
+
+#~ msgid "Z-1"
+#~ msgstr "Z-1"
+
+#~ msgid "Z-10"
+#~ msgstr "Z-10"
+
+#~ msgid "Home"
+#~ msgstr "0-punt"
+
+#~ msgid " degrees Celsius."
+#~ msgstr " graden Celsius."
+
+#~ msgid "SFACT Quick Settings"
+#~ msgstr "SFACT Snelinstelling"
+
+#~ msgid " Quickly adjust SFACT settings for active profile"
+#~ msgstr " Eenvoudig SFACT's huidige profiel instellen"
+
+#~ msgid "Name '"
+#~ msgstr "Naam '"
+
+#~ msgid "Skeinforge execution failed."
+#~ msgstr "Skeinforge was niet succesvol."
+
+#~ msgid ""
+#~ "Skeinforge not found. \n"
+#~ "Please copy Skeinforge into a directory named \"skeinforge\" in the same "
+#~ "directory as this file."
+#~ msgstr ""
+#~ "Skeinforge niet gevonden.\n"
+#~ "Plaats Skeinforge in een map met de naam \"skeinforge\" in dezelfde map "
+#~ "als dit bestand."
+
 #~ msgid "&Print"
 #~ msgstr "&Printen"
diff --git a/locale/nl/LC_MESSAGES/pronterface.mo b/locale/nl/LC_MESSAGES/pronterface.mo
index dc2606e6d7ff3f5bf0ebf2d944deb794df1d21c5..9198c7eda8003ec76c51b214241f8494d6861f7d 100644
GIT binary patch
delta 2655
zcmZYAe@vBC9LMnkp&|&#4?$7nk-P-T@05@%NkmEUCt~4`<Pr~;TilD>dr7BmWNpzO
zX4zTV^bh{Ym4CQ4SzDHkP1k0N9E<gbW-gnXHUCLBH<oMb{kcB;k)A!@^LoznJe=p8
z?>W!qgND&%gEzC1J~0$Ov4B|olrisO*>oyOU9vG*xB@e<1ygai*Y3eNv=3k|9>ZC9
z29M%-<S?sd8Z!f%QSB{{95n5maF|Z26zuid`!SRD5nPHE8Jii!B)p7z(G}EKe?k5I
z4bM9`jrM)iizhwxkOrEJX=c!vLQX2VP>vee9&E;L<S<`S72-EI8?U1}zKeNy57Tfa
zY0>>W)C)^c8LPq^Y(U0f+PwRFaXRle0Zukz7?sM4s0V*Wb#w!>@iuapNh;k>V*0wC
zj*P(+p)yiVr2*CBQf$UzjNv>yjhpc+98Bb78c%DDlTjm`kD6f>@{FlP&8!iX`t9ER
zcGME>MWwXg^L^C7hEXpZLG||&YN;kr6T7bb>%t%2g}+csa1S-Ze{e1)r9XOc0csBv
zVFearHMSv#8KPQ_Cs5Cg;T{~v4y<533h+ZL!gCqqUl|zZf@VH}YX9jya2GYebf&){
zf#pGE%Fnd5_A#Vya}<@S)2M#FKrQ8W-t`GQMf-QuQXQfbW#GL*PBi0V-i4FMq|GpD
zt<QO0Ky~;%R^YFw8K#hDElD~mW7(+w3Q#X9MlD@6Y6(_*_nT1z7~IMUhiRvxPZPqY
z@on$=XQ;2?Yt#!8n4W$oQjy7+64VRpQK@Z29yNaN{(yIX2(?E(LS^oAWMG44)O%nY
zHKJ?Sfwxd=znW<)wYyL+>Op0qpGq?vLf!uuwWh<U%w0lF=qhSJxA0kffMr<9X!7;_
z@8D!37y40aKZ^755^|WER7%|gREG~yGf1b>^<vb(%TO6vhWWS_H32`WpM$svkE8x>
z1ZV2|zrcxRb{VzV#=Hk6P<!DTY7Ot81~!RW^Bj8Di|3*C#3HQ1EvSJU!DVPsd*uoS
zaSVH~mTz;gl#^jj)WHv^3{0YS^+T_n!gQ9<PD2f_4*3}3WjQq;iCICsL^Ki`2xUso
zD)m#Pj*}*@(SqzF&EJ^Tcx}w{xXC*gnhldRyVZEC)Y9HXXrM~3GPRA+o~R_IiZZp>
zYrKpdL<6Bcvsv$dkrS0?9${X^b%dX2CVa$Bf=Qbfi1mchu2M~qO|w@Guk66>1j&n+
zHPl+RsiLKxDvsu_wN+V3loJaHHh+8#w_rQ5me5kIB2@IdzM9xdXt!$vtJDx$b1j!P
znRdE%y_QwwHKK%QBMJ%qJC6Tz(9h)KrHBjK7y7PWA^39QzYW^O^@NHx)^midOl?he
z4jZR+jkC}8r)H<_tap4>6*b*XC}e+2{dVNytbY^ic>1C2mOg)%+vWJ8Wsa}Q=?#Y6
zs9m42&>qNGk?4!sPiHN*=QD2Gle3!=D(sEf0edoY<r-hN)8z&tt{Zh4-QH+$AX;Hs
z-B>Ib4mdr1F*n@h#N5z6H{y>CL|iA<=RElr_Ec7LVtc)<%f4wRvkMxX5?{2`?5sEL
zTW&b!^mV@Bz8-Tz!Dy6TO(?|S^mRMk!Crqz4-7;Zb};P3dV*1BUnCfgrPxh5W%hVZ
zZe~q+RZV$Kty5J~UtP1bv1z-#kW*i@ZJ^T)J1qm9os4^BM6HV6c&i~0I#3aIW7aq4
zjJ-amJ<&OAJ96j#FKa`&R};&ek$3WzB-$V6oyc>{I=7eHg{N{CaRcPS`t!@}+5BcD
zuPv`^<bM9<1Y5Eo&2C%}wet&_vdBar692oY)Y*=L!ptWw+vN+_D?h6WYwV1|F?+VK
sbXq(|_V2>ERmy{xi2Z$$u9y>WJ0k<ZH)BdkmwV9lQbN`$L&32552-m!5dZ)H

literal 8205
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
Q#XCDd0_m6Uo67e81_>taApigX


From 129aa9b009a622cbc4df0f303665fdf906c955bb Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Sun, 26 Feb 2012 04:09:56 +0100
Subject: [PATCH 10/12] Resync French pronterface.mo

---
 locale/fr/LC_MESSAGES/pronterface.mo | Bin 8664 -> 10200 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/pronterface.mo b/locale/fr/LC_MESSAGES/pronterface.mo
index 0a33f2a07ef0cd66c46f564019037f4e8add7adb..41117f7ab1228317308a7b026a65561b026365f0 100644
GIT binary patch
delta 4673
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
Un@_U8@1yr``2Q7<C~>p-H-g7nasU7T

delta 3008
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
IJC*DI0f(4og8%>k


From 501254a72f66fff6d7f12988d9e1d98066f03189 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Thu, 1 Mar 2012 14:12:10 +0100
Subject: [PATCH 11/12] Made greetings configurable (no longer just 'start')

---
 printcore.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/printcore.py b/printcore.py
index fe8f8bf..c753c53 100755
--- a/printcore.py
+++ b/printcore.py
@@ -47,6 +47,7 @@ class printcore():
         self.endcb=None#impl ()
         self.onlinecb=None#impl ()
         self.loud=False#emit sent and received lines to terminal
+        self.greetings=['start','Grbl ']
         if port is not None and baud is not None:
             #print port, baud
             self.connect(port, baud)
@@ -115,10 +116,10 @@ class printcore():
                     print "RECV: ",line.rstrip()
             if(line.startswith('DEBUG_')):
                 continue
-            if(line.startswith('start') or line.startswith('ok')):
+            if(line.startswith(tuple(self.greetings)) or line.startswith('ok')):
                 self.clear=True
-            if(line.startswith('start') or line.startswith('ok') or "T:" in line):
-                if (not self.online or line.startswith('start')) and self.onlinecb is not None:
+            if(line.startswith(tuple(self.greetings)) or line.startswith('ok') or "T:" in line):
+                if (not self.online or line.startswith(tuple(self.greetings))) and self.onlinecb is not None:
                     try:
                         self.onlinecb()
                     except:

From c2baae7bbbc7a166961a8ef4cb3a677812eeec0a Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Thu, 1 Mar 2012 14:13:57 +0100
Subject: [PATCH 12/12] Lines starting with $ are now passed through too.

---
 pronsole.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pronsole.py b/pronsole.py
index cc6c189..3179e56 100755
--- a/pronsole.py
+++ b/pronsole.py
@@ -274,7 +274,7 @@ class pronsole(cmd.Cmd):
         self.helpdict["temperature_pla"] = _("Extruder temp for PLA (default: 185 deg C)")
         self.helpdict["xy_feedrate"] = _("Feedrate for Control Panel Moves in X and Y (default: 3000mm/min)")
         self.helpdict["z_feedrate"] = _("Feedrate for Control Panel Moves in Z (default: 200mm/min)")
-
+        self.commandprefixes='MGT$'
     
     def set_temp_preset(self,key,value):
         if not key.startswith("bed"):
@@ -870,14 +870,14 @@ class pronsole(cmd.Cmd):
         print "! os.listdir('.')"
         
     def default(self,l):
-        if(l[0]=='M' or l[0]=="G" or l[0]=='T'):
+        if(l[0] in self.commandprefixes.upper()):
             if(self.p and self.p.online):
                 print "SENDING:"+l
                 self.p.send_now(l)
             else:
                 print "Printer is not online."
             return
-        if(l[0]=='m' or l[0]=="g" or l[0]=='t'):
+        elif(l[0] in self.commandprefixes.lower()):
             if(self.p and self.p.online):
                 print "SENDING:"+l.upper()
                 self.p.send_now(l.upper())