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] 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()