diff --git a/locale/de/LC_MESSAGES/de.po b/locale/de/LC_MESSAGES/de.po
old mode 100644
new mode 100755
index 92e9c47..de01b90
--- a/locale/de/LC_MESSAGES/de.po
+++ b/locale/de/LC_MESSAGES/de.po
@@ -5,248 +5,239 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pronterface jm1\n"
-"POT-Creation-Date: 2011-08-06 13:27+PDT\n"
-"PO-Revision-Date: 2011-08-06 13:27+PDT\n"
+"POT-Creation-Date: 2011-09-06 16:31+0100\n"
+"PO-Revision-Date: 2011-09-06 16:31+0100\n"
 "Last-Translator: Jonathan Marsden <jmarsden@fastmail.fm>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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: UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
 
-
 #: pronterface.py:10
 msgid "WX is not installed. This program requires WX to run."
 msgstr "WX ist nicht installiert. Dieses Programm erfordert WX zu laufen."
 
-#: pronterface.py:55
+#: pronterface.py:60
 msgid "Printer Interface"
 msgstr "Druckerschnittstelle"
 
-#: pronterface.py:67
+#: pronterface.py:72
 msgid "X+100"
 msgstr ""
 
-#: pronterface.py:68
+#: pronterface.py:73
 msgid "X+10"
 msgstr ""
 
-#: pronterface.py:69
+#: pronterface.py:74
 msgid "X+1"
 msgstr ""
 
-#: pronterface.py:70
+#: pronterface.py:75
 msgid "X+0.1"
 msgstr ""
 
-#: pronterface.py:71
+#: pronterface.py:76
 msgid "HomeX"
 msgstr "XHeimkehren"
 
-#: pronterface.py:72
+#: pronterface.py:77
 msgid "X-0.1"
 msgstr ""
 
-#: pronterface.py:73
+#: pronterface.py:78
 msgid "X-1"
 msgstr ""
 
-#: pronterface.py:74
+#: pronterface.py:79
 msgid "X-10"
 msgstr ""
 
-#: pronterface.py:75
+#: pronterface.py:80
 msgid "X-100"
 msgstr ""
 
-#: pronterface.py:76
+#: pronterface.py:81
 msgid "Y+100"
 msgstr ""
 
-#: pronterface.py:77
+#: pronterface.py:82
 msgid "Y+10"
 msgstr ""
 
-#: pronterface.py:78
+#: pronterface.py:83
 msgid "Y+1"
 msgstr ""
 
-#: pronterface.py:79
+#: pronterface.py:84
 msgid "Y+0.1"
 msgstr ""
 
-#: pronterface.py:80
+#: pronterface.py:85
 msgid "HomeY"
 msgstr "YHeimkehren"
 
-#: pronterface.py:81
+#: pronterface.py:86
 msgid "Y-0.1"
 msgstr ""
 
-#: pronterface.py:82
+#: pronterface.py:87
 msgid "Y-1"
 msgstr ""
 
-#: pronterface.py:83
+#: pronterface.py:88
 msgid "Y-10"
 msgstr ""
 
-#: pronterface.py:84
+#: pronterface.py:89
 msgid "Y-100"
 msgstr ""
 
-#: pronterface.py:85
+#: pronterface.py:90
 msgid "Motors off"
 msgstr "Motoren aus"
 
-#: pronterface.py:86
+#: pronterface.py:91
 msgid "Z+10"
 msgstr ""
 
-#: pronterface.py:87
+#: pronterface.py:92
 msgid "Z+1"
 msgstr ""
 
-#: pronterface.py:88
+#: pronterface.py:93
 msgid "Z+0.1"
 msgstr ""
 
-#: pronterface.py:89
+#: pronterface.py:94
 msgid "HomeZ"
 msgstr "ZHeimkehren"
 
-#: pronterface.py:90
+#: pronterface.py:95
 msgid "Z-0.1"
 msgstr ""
 
-#: pronterface.py:91
+#: pronterface.py:96
 msgid "Z-1"
 msgstr ""
 
-#: pronterface.py:92
+#: pronterface.py:97
 msgid "Z-10"
 msgstr ""
 
-#: pronterface.py:93
+#: pronterface.py:98
 msgid "Home"
 msgstr "Heimkehren"
 
-#: pronterface.py:94
+#: pronterface.py:99
 msgid "Check temp"
 msgstr "Temperatur prüfen"
 
-#: pronterface.py:95
+#: pronterface.py:100
 msgid "Extrude"
 msgstr ""
 
-#: pronterface.py:96
+#: pronterface.py:101
 msgid "Reverse"
 msgstr "Umkehren"
 
-#: pronterface.py:112
+#: pronterface.py:117
 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:117
+#: pronterface.py:122
 msgid "Note!!! You have specified custom buttons in both custombtn.txt and .pronsolerc"
 msgstr "Beachten! Sie haben benutzerdefinierte Schaltflächen in custombtn.txt und .pronsolerc angegeben"
 
-#: pronterface.py:118
+#: pronterface.py:123
 msgid "Ignoring custombtn.txt. Remove all current buttons to revert to custombtn.txt"
 msgstr "Ignorieren custombtn.txt. Zur Nutzung custombtn.txt wieder entfernen alle gängigen Tasten"
 
-#: pronterface.py:141 pronterface.py:427 pronterface.py:956
-#: pronterface.py:1003 pronterface.py:1113 pronterface.py:1140
-#: pronterface.py:1154
+#: pronterface.py:146
+#: pronterface.py:434
+#: pronterface.py:971
+#: pronterface.py:1020
+#: pronterface.py:1134
+#: pronterface.py:1161
+#: pronterface.py:1175
 msgid "Print"
 msgstr "Drucken"
 
-#: pronterface.py:145
+#: pronterface.py:150
 msgid "Printer is now online"
 msgstr "Drucker wird jetzt online"
 
-#: pronterface.py:194
+#: pronterface.py:199
 msgid "Setting hotend temperature to "
 msgstr "Einstellen hotend Temperatur auf "
 
-#: pronterface.py:194 pronterface.py:215
+#: pronterface.py:199
+#: pronterface.py:220
 msgid " degrees Celsius."
 msgstr " Grad Celsius."
 
-#: pronterface.py:198 pronterface.py:219
+#: pronterface.py:203
+#: pronterface.py:224
 msgid "Printer is not online."
 msgstr "Drucker wird nicht online."
 
-#: pronterface.py:200
+#: pronterface.py:205
 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 den hotend ganz auszushalten, einstellen Sie die Temperatur auf 0"
 
-#: pronterface.py:202 pronterface.py:223
+#: pronterface.py:207
+#: pronterface.py:228
 msgid "You must enter a temperature."
 msgstr "Sie müssen eine Temperatur eingeben."
 
-#: pronterface.py:215
+#: pronterface.py:220
 msgid "Setting bed temperature to "
 msgstr "Bett-Temperatur eingestellt: "
 
-#: pronterface.py:221
+#: pronterface.py:226
 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 den Bett ganz auszushalten, einstellen Sie die Temperatur auf 0"
 
-#: pronterface.py:238
+#: pronterface.py:243
 msgid "Do you want to erase the macro?"
 msgstr "Möchten Sie das Makro löschen?"
 
-#: pronterface.py:242
+#: pronterface.py:247
 msgid "Cancelled."
 msgstr "Abgesagt."
 
-#: pronterface.py:271
-msgid " Opens file"
-msgstr " Öffnet eine Datei"
-
-#: pronterface.py:271
+#: pronterface.py:277
 msgid "&Open..."
 msgstr "&Öffnen..."
 
-#: pronterface.py:272
-msgid " Edit open file"
-msgstr " Datei bearbeiten"
+#: pronterface.py:277
+msgid " Opens file"
+msgstr " Öffnet eine Datei"
 
-#: pronterface.py:272
+#: pronterface.py:278
 msgid "&Edit..."
 msgstr "&Bearbeiten..."
 
-#: pronterface.py:274
-msgid " Adjust SFACT settings"
-msgstr " SFACT Einstellungen anpassen"
+#: pronterface.py:278
+msgid " Edit open file"
+msgstr " Datei bearbeiten"
 
-#: pronterface.py:274
-msgid "SFACT Settings"
-msgstr "SFACT Einstellungen"
-
-#: pronterface.py:277
-msgid " Quickly adjust SFACT settings for active profile"
-msgstr " SFACT Einstellungen für aktive Profil schnell anpassen"
-
-#: pronterface.py:277
-msgid "SFACT Quick Settings"
-msgstr "SFACT schnelle Einstellungen"
-
-#: pronterface.py:281
-msgid " Closes the Window"
-msgstr " schließt das Fenster"
-
-#: pronterface.py:281
+#: pronterface.py:279
 msgid "E&xit"
 msgstr "Verlassen"
 
-#: pronterface.py:282
-msgid "&Print"
-msgstr "&Drucken"
+#: pronterface.py:279
+msgid " Closes the Window"
+msgstr " schließt das Fenster"
+
+#: pronterface.py:280
+msgid "&File"
+msgstr ""
 
 #: pronterface.py:285
 msgid "&Macros"
@@ -256,299 +247,386 @@ msgstr "&Makros"
 msgid "<&New...>"
 msgstr "<&Neu...>"
 
-#: pronterface.py:287
-msgid " Options dialog"
-msgstr " Optionen-Dialog"
-
 #: pronterface.py:287
 msgid "&Options"
 msgstr "&Optionen"
 
-#: pronterface.py:288
+#: pronterface.py:287
+msgid " Options dialog"
+msgstr " Optionen-Dialog"
+
+#: pronterface.py:289
+msgid "SFACT Settings"
+msgstr "SFACT Einstellungen"
+
+#: pronterface.py:289
+msgid " Adjust SFACT settings"
+msgstr " SFACT Einstellungen anpassen"
+
+#: pronterface.py:292
+msgid "SFACT Quick Settings"
+msgstr "SFACT schnelle Einstellungen"
+
+#: pronterface.py:292
+msgid " Quickly adjust SFACT settings for active profile"
+msgstr " SFACT Einstellungen für aktive Profil schnell anpassen"
+
+#: pronterface.py:295
 msgid "&Settings"
 msgstr "&Einstellungen"
 
-#: pronterface.py:304
+#: pronterface.py:311
 msgid "Enter macro name"
 msgstr "Makro name eingeben"
 
-#: pronterface.py:307
+#: pronterface.py:314
 msgid "Macro name:"
 msgstr "Makro name:"
 
-#: pronterface.py:310
+#: pronterface.py:317
 msgid "Ok"
 msgstr ""
 
-#: pronterface.py:314
+#: pronterface.py:321
+#: pronterface.py:1197
 msgid "Cancel"
 msgstr "Absagen"
 
-#: pronterface.py:332
-msgid "' is being used by built-in command"
-msgstr ""
-
-#: pronterface.py:332
+#: pronterface.py:339
 msgid "Name '"
 msgstr ""
 
-#: pronterface.py:368
+#: pronterface.py:339
+msgid "' is being used by built-in command"
+msgstr ""
+
+#: pronterface.py:342
+msgid "Macro name may contain only alphanumeric symbols and underscores"
+msgstr ""
+
+#: pronterface.py:375
 msgid "Port:"
 msgstr ""
 
-#: pronterface.py:390
+#: pronterface.py:397
 msgid "Connect"
 msgstr "Verbinden"
 
-#: pronterface.py:392
+#: pronterface.py:399
 msgid "Connect to the printer"
 msgstr "Drucker Verbinden"
 
-#: pronterface.py:394
+#: pronterface.py:401
 msgid "Disconnect"
 msgstr "Trennen"
 
-#: pronterface.py:398
+#: pronterface.py:405
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: pronterface.py:401 pronterface.py:579
+#: pronterface.py:408
+#: pronterface.py:592
 msgid "Mini mode"
 msgstr "Mini-Modus"
 
-#: pronterface.py:407
-msgid "Monitor\nprinter"
-msgstr "Drucker\nüberwachen"
+#: pronterface.py:414
+msgid ""
+"Monitor\n"
+"printer"
+msgstr ""
+"Drucker\n"
+"überwachen"
 
-#: pronterface.py:416
+#: pronterface.py:423
 msgid "Load file"
 msgstr "Datei laden"
 
-#: pronterface.py:419
+#: pronterface.py:426
 msgid "SD Upload"
 msgstr "SD hochladen"
 
-#: pronterface.py:423
+#: pronterface.py:430
 msgid "SD Print"
 msgstr "SD Drucken"
 
-#: pronterface.py:431 pronterface.py:1004 pronterface.py:1040
-#: pronterface.py:1088 pronterface.py:1112 pronterface.py:1139
-#: pronterface.py:1153
+#: pronterface.py:438
+#: pronterface.py:1021
+#: pronterface.py:1061
+#: pronterface.py:1109
+#: pronterface.py:1133
+#: pronterface.py:1160
+#: pronterface.py:1174
 msgid "Pause"
 msgstr ""
 
-#: pronterface.py:445
+#: pronterface.py:452
 msgid "Send"
 msgstr "Senden"
 
-#: pronterface.py:453 pronterface.py:511
+#: pronterface.py:460
+#: pronterface.py:518
 msgid "mm/min"
 msgstr ""
 
-#: pronterface.py:455
+#: pronterface.py:462
 msgid "XY:"
 msgstr ""
 
-#: pronterface.py:457
+#: pronterface.py:464
 msgid "Z:"
 msgstr ""
 
-#: pronterface.py:474
+#: pronterface.py:481
 msgid "Heater:"
 msgstr "Heizung:"
 
-#: pronterface.py:482 pronterface.py:494
+#: pronterface.py:489
+#: pronterface.py:501
 msgid "Set"
 msgstr ""
 
-#: pronterface.py:486
+#: pronterface.py:493
 msgid "Bed:"
 msgstr "Bett"
 
-#: pronterface.py:505
+#: pronterface.py:512
 msgid "mm"
 msgstr ""
 
-#: pronterface.py:538 pronterface.py:833 pronterface.py:1034
+#: pronterface.py:551
+#: pronterface.py:846
+#: pronterface.py:1055
 msgid "Not connected to printer."
 msgstr "Keine Verbindung zum Drucker."
 
-#: pronterface.py:586
+#: pronterface.py:599
 msgid "Full mode"
 msgstr "voll-Modus"
 
-#: pronterface.py:624
+#: pronterface.py:637
 msgid "Defines custom button. Usage: button <num> \"title\" [/c \"colour\"] command"
 msgstr ""
 
-#: pronterface.py:646
+#: pronterface.py:659
 msgid "Custom button number should be between 0 and 63"
 msgstr ""
 
-#: pronterface.py:736
+#: pronterface.py:749
+#, python-format
 msgid "Edit custom button '%s'"
 msgstr ""
 
-#: pronterface.py:738
+#: pronterface.py:751
 msgid "Move left <<"
 msgstr ""
 
-#: pronterface.py:741
+#: pronterface.py:754
 msgid "Move right >>"
 msgstr ""
 
-#: pronterface.py:745
+#: pronterface.py:758
+#, python-format
 msgid "Remove custom button '%s'"
 msgstr ""
 
-#: pronterface.py:748
+#: pronterface.py:761
 msgid "Add custom button"
 msgstr ""
 
-#: pronterface.py:763
+#: pronterface.py:776
 msgid "event object missing"
 msgstr ""
 
-#: pronterface.py:791
+#: pronterface.py:804
 msgid "Invalid period given."
 msgstr ""
 
-#: pronterface.py:794
+#: pronterface.py:807
 msgid "Monitoring printer."
 msgstr ""
 
-#: pronterface.py:796
+#: pronterface.py:809
 msgid "Done monitoring."
 msgstr ""
 
-#: pronterface.py:815
+#: pronterface.py:828
 msgid "Printer is online. "
 msgstr ""
 
-#: pronterface.py:817 pronterface.py:954 pronterface.py:1002
+#: pronterface.py:830
+#: pronterface.py:969
+#: pronterface.py:1019
 msgid "Loaded "
 msgstr ""
 
-#: pronterface.py:820
-msgid "Bed"
-msgstr "Bett"
-
-#: pronterface.py:820
+#: pronterface.py:833
 msgid "Hotend"
 msgstr ""
 
-#: pronterface.py:823
+#: pronterface.py:833
+msgid "Bed"
+msgstr "Bett"
+
+#: pronterface.py:836
+#, python-format
 msgid " SD printing:%04.2f %%"
 msgstr ""
 
-#: pronterface.py:825
+#: pronterface.py:838
+#, python-format
 msgid " Printing:%04.2f %%"
 msgstr ""
 
-#: pronterface.py:879
+#: pronterface.py:892
 msgid "Opening file failed."
 msgstr ""
 
-#: pronterface.py:885
+#: pronterface.py:898
 msgid "Starting print"
 msgstr ""
 
-#: pronterface.py:908
-msgid "Pick SD file"
-msgstr ""
-
-#: pronterface.py:908
+#: pronterface.py:921
 msgid "Select the file to print"
 msgstr ""
 
-#: pronterface.py:936
+#: pronterface.py:921
+msgid "Pick SD file"
+msgstr ""
+
+#: pronterface.py:949
 msgid "Skeinforge execution failed."
 msgstr ""
 
-#: pronterface.py:943
+#: pronterface.py:956
 msgid "Skeining..."
 msgstr ""
 
-#: pronterface.py:954 pronterface.py:1002
+#: pronterface.py:969
+#: pronterface.py:1019
+#, python-format
 msgid ", %d lines"
 msgstr ""
 
-#: pronterface.py:963
+#: pronterface.py:978
 msgid "Skeining "
 msgstr ""
 
-#: pronterface.py:965
+#: pronterface.py:980
 msgid ""
 "Skeinforge not found. \n"
 "Please copy Skeinforge into a directory named \"skeinforge\" in the same directory as this file."
 msgstr ""
 
-#: pronterface.py:984
+#: pronterface.py:999
 msgid "Open file to print"
 msgstr "Zu druckenden Datei öffnen"
 
-#: pronterface.py:985
+#: pronterface.py:1000
 msgid "STL and GCODE files (;*.gcode;*.g;*.stl;*.STL;)"
 msgstr ""
 
-#: pronterface.py:992
+#: pronterface.py:1007
 msgid "File not found!"
 msgstr ""
 
-#: pronterface.py:1011
-msgid "mm of filament used in this print"
+#: pronterface.py:1029
+msgid "mm of filament used in this print\n"
+msgstr ""
+
+#: 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
+msgid ""
+"mm in X\n"
+"and is"
+msgstr ""
+
+#: pronterface.py:1030
+#: pronterface.py:1031
+msgid "mm wide\n"
 msgstr ""
 
 #: pronterface.py:1031
+msgid ""
+"mm in Y\n"
+"and is"
+msgstr ""
+
+#: pronterface.py:1032
+msgid ""
+"mm in Z\n"
+"and is"
+msgstr ""
+
+#: pronterface.py:1032
+msgid "mm high\n"
+msgstr ""
+
+#: pronterface.py:1052
 msgid "No file loaded. Please use load first."
 msgstr ""
 
-#: pronterface.py:1042
+#: pronterface.py:1063
 msgid "Restart"
 msgstr "Neustart"
 
-#: pronterface.py:1046
+#: pronterface.py:1067
 msgid "File upload complete"
 msgstr ""
 
-#: pronterface.py:1065
+#: pronterface.py:1086
 msgid "Pick SD filename"
 msgstr ""
 
-#: pronterface.py:1081
+#: pronterface.py:1102
 msgid "Resume"
 msgstr ""
 
-#: pronterface.py:1147
+#: pronterface.py:1168
 msgid "Are you sure you want to reset the printer?"
 msgstr "Möchten Sie wirklich, der Drucker Zurückzusetzen?"
 
-#: pronterface.py:1147
+#: pronterface.py:1168
 msgid "Reset?"
 msgstr "Zurücksetzen?"
 
-#: pronterface.py:1226
+#: pronterface.py:1193
+msgid "Save"
+msgstr ""
+
+#: pronterface.py:1248
 msgid "Edit settings"
 msgstr "Einstellungen bearbeiten"
 
-#: pronterface.py:1228
+#: pronterface.py:1250
 msgid "Defaults"
 msgstr "Standardwerte"
 
-#: pronterface.py:1250
+#: pronterface.py:1272
 msgid "Custom button"
 msgstr ""
 
-#: pronterface.py:1258
+#: pronterface.py:1280
 msgid "Button title"
 msgstr ""
 
-#: pronterface.py:1261
+#: pronterface.py:1283
 msgid "Command"
 msgstr ""
 
-#: pronterface.py:1270
+#: pronterface.py:1292
 msgid "Color"
 msgstr "Farbe"
 
+#~ msgid "&Print"
+#~ msgstr "&Drucken"
diff --git a/locale/de/LC_MESSAGES/pronterface.mo b/locale/de/LC_MESSAGES/pronterface.mo
index ff0371d..3079929 100644
Binary files a/locale/de/LC_MESSAGES/pronterface.mo and b/locale/de/LC_MESSAGES/pronterface.mo differ
diff --git a/locale/fr/LC_MESSAGES/fr.po b/locale/fr/LC_MESSAGES/fr.po
index 5f5aa32..d18b1a0 100755
--- a/locale/fr/LC_MESSAGES/fr.po
+++ b/locale/fr/LC_MESSAGES/fr.po
@@ -5,550 +5,630 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pronterface jm1\n"
-"POT-Creation-Date: 2011-08-06 13:27+PDT\n"
-"PO-Revision-Date: 2011-09-05 18:02+GMT\n"
-"Last-Translator: Cyril Laguilhon-Debat <c.laguilhon.debat@gmail.com.fm>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2011-09-06 16:31+0100\n"
+"PO-Revision-Date: 2011-09-06 16:32+0100\n"
+"Last-Translator: Cyril Laguilhon-Debat <c.laguilhon.debat@gmail.com>\n"
+"Language-Team: FR <c.laguilhon.debat@gmail.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
 
-
 #: pronterface.py:10
 msgid "WX is not installed. This program requires WX to run."
 msgstr "wxWidgets n'est pas installé. Ce programme nécéssite la librairie wxWidgets pour fonctionner."
 
-#: pronterface.py:55
+#: pronterface.py:60
 msgid "Printer Interface"
 msgstr "Interface imprimante"
 
-#: pronterface.py:67
+#: pronterface.py:72
 msgid "X+100"
 msgstr ""
 
-#: pronterface.py:68
+#: pronterface.py:73
 msgid "X+10"
 msgstr ""
 
-#: pronterface.py:69
+#: pronterface.py:74
 msgid "X+1"
 msgstr ""
 
-#: pronterface.py:70
+#: pronterface.py:75
 msgid "X+0.1"
 msgstr ""
 
-#: pronterface.py:71
+#: pronterface.py:76
 msgid "HomeX"
 msgstr "Origine X"
 
-#: pronterface.py:72
+#: pronterface.py:77
 msgid "X-0.1"
 msgstr ""
 
-#: pronterface.py:73
+#: pronterface.py:78
 msgid "X-1"
 msgstr ""
 
-#: pronterface.py:74
+#: pronterface.py:79
 msgid "X-10"
 msgstr ""
 
-#: pronterface.py:75
+#: pronterface.py:80
 msgid "X-100"
 msgstr ""
 
-#: pronterface.py:76
+#: pronterface.py:81
 msgid "Y+100"
 msgstr ""
 
-#: pronterface.py:77
+#: pronterface.py:82
 msgid "Y+10"
 msgstr ""
 
-#: pronterface.py:78
+#: pronterface.py:83
 msgid "Y+1"
 msgstr ""
 
-#: pronterface.py:79
+#: pronterface.py:84
 msgid "Y+0.1"
 msgstr ""
 
-#: pronterface.py:80
+#: pronterface.py:85
 msgid "HomeY"
 msgstr "Origine Y"
 
-#: pronterface.py:81
+#: pronterface.py:86
 msgid "Y-0.1"
 msgstr ""
 
-#: pronterface.py:82
+#: pronterface.py:87
 msgid "Y-1"
 msgstr ""
 
-#: pronterface.py:83
+#: pronterface.py:88
 msgid "Y-10"
 msgstr ""
 
-#: pronterface.py:84
+#: pronterface.py:89
 msgid "Y-100"
 msgstr ""
 
-#: pronterface.py:85
+#: pronterface.py:90
 msgid "Motors off"
 msgstr "Arrêter les moteurs"
 
-#: pronterface.py:86
+#: pronterface.py:91
 msgid "Z+10"
 msgstr ""
 
-#: pronterface.py:87
+#: pronterface.py:92
 msgid "Z+1"
 msgstr ""
 
-#: pronterface.py:88
+#: pronterface.py:93
 msgid "Z+0.1"
 msgstr ""
 
-#: pronterface.py:89
+#: pronterface.py:94
 msgid "HomeZ"
 msgstr "Origine Z"
 
-#: pronterface.py:90
+#: pronterface.py:95
 msgid "Z-0.1"
 msgstr ""
 
-#: pronterface.py:91
+#: pronterface.py:96
 msgid "Z-1"
 msgstr ""
 
-#: pronterface.py:92
+#: pronterface.py:97
 msgid "Z-10"
 msgstr ""
 
-#: pronterface.py:93
+#: pronterface.py:98
 msgid "Home"
 msgstr "Origine"
 
-#: pronterface.py:94
+#: pronterface.py:99
 msgid "Check temp"
-msgstr "Vérifier la température"
+msgstr "Lire les températures"
 
-#: pronterface.py:95
+#: pronterface.py:100
 msgid "Extrude"
 msgstr "Extruder"
 
-#: pronterface.py:96
+#: pronterface.py:101
 msgid "Reverse"
 msgstr "Inverser"
 
-#: pronterface.py:112
+#: pronterface.py:117
 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:117
+#: pronterface.py:122
 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:118
+#: pronterface.py:123
 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:141 pronterface.py:427 pronterface.py:956
-#: pronterface.py:1003 pronterface.py:1113 pronterface.py:1140
-#: pronterface.py:1154
+#: pronterface.py:146
+#: pronterface.py:434
+#: pronterface.py:971
+#: pronterface.py:1020
+#: pronterface.py:1134
+#: pronterface.py:1161
+#: pronterface.py:1175
 msgid "Print"
 msgstr "Imprimer"
 
-#: pronterface.py:145
+#: pronterface.py:150
 msgid "Printer is now online"
 msgstr "L'imprimante est connectée"
 
-#: pronterface.py:194
+#: pronterface.py:199
 msgid "Setting hotend temperature to "
-msgstr "Réglage de la température de l'extrémité chaude à "
+msgstr "Réglage de la température de la buse à"
 
-#: pronterface.py:194 pronterface.py:215
+#: pronterface.py:199
+#: pronterface.py:220
 msgid " degrees Celsius."
 msgstr " degrés Celsius."
 
-#: pronterface.py:198 pronterface.py:219
+#: pronterface.py:203
+#: pronterface.py:224
 msgid "Printer is not online."
 msgstr "L'imprimante est déconnectée"
 
-#: pronterface.py:200
+#: pronterface.py:205
 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égétive.Pour éteindre la résistante de votre extrudeur, réglez sa température à 0°c."
+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:202 pronterface.py:223
+#: pronterface.py:207
+#: pronterface.py:228
 msgid "You must enter a temperature."
 msgstr "Vous devez saisir une température."
 
-#: pronterface.py:215
+#: pronterface.py:220
 msgid "Setting bed temperature to "
-msgstr "Réglage de la température du plateau chauffant à "
+msgstr "Réglage de la température du plateau à "
 
-#: pronterface.py:221
+#: pronterface.py:226
 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égétive. Pour désactiver votre plateau chauffant, réglez sa température à 0°c."
+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:238
+#: pronterface.py:243
 msgid "Do you want to erase the macro?"
-msgstr "Voulez-vous effacer la macro?"
+msgstr "Voulez-vous effacer la macro ?"
 
-#: pronterface.py:242
+#: pronterface.py:247
 msgid "Cancelled."
-msgstr "Annulé."
+msgstr "Annulé"
 
-#: pronterface.py:271
-msgid " Opens file"
-msgstr " Ouvrir un fichier"
-
-#: pronterface.py:271
+#: pronterface.py:277
 msgid "&Open..."
 msgstr "&Ouvrir..."
 
-#: pronterface.py:272
-msgid " Edit open file"
-msgstr " Editer le fichier ouvert"
+#: pronterface.py:277
+msgid " Opens file"
+msgstr " Ouvrir un fichier"
 
-#: pronterface.py:272
+#: pronterface.py:278
 msgid "&Edit..."
 msgstr "&Editer..."
 
-#: pronterface.py:274
-msgid " Adjust SFACT settings"
-msgstr " Régler les paramètres SFACT"
+#: pronterface.py:278
+msgid " Edit open file"
+msgstr " Editer le fichier ouvert"
 
-#: pronterface.py:274
-msgid "SFACT Settings"
-msgstr "Paramètres &SFACT..."
-
-#: pronterface.py:277
-msgid " Quickly adjust SFACT settings for active profile"
-msgstr " Réglages rapides des paramètres SFACT pour le profil actif."
-
-#: pronterface.py:277
-msgid "SFACT Quick Settings"
-msgstr "Réglages rapides SFACT"
-
-#: pronterface.py:281
-msgid " Closes the Window"
-msgstr " Quitter le programme"
-
-#: pronterface.py:281
+#: pronterface.py:279
 msgid "E&xit"
 msgstr "&Quitter"
 
-#: pronterface.py:282
-msgid "&Print"
-msgstr "&Imprimer"
+#: pronterface.py:279
+msgid " Closes the Window"
+msgstr " Quitter le programme"
+
+#: pronterface.py:280
+msgid "&File"
+msgstr "&Fichier"
 
 #: pronterface.py:285
 msgid "&Macros"
-msgstr ""
+msgstr "&Macros"
 
 #: pronterface.py:286
 msgid "<&New...>"
 msgstr "<&Nouvelle...>"
 
 #: pronterface.py:287
-msgid " Options dialog"
-msgstr " Options"
+msgid "&Options"
+msgstr "&Options"
 
 #: pronterface.py:287
-msgid "&Options"
-msgstr ""
+msgid " Options dialog"
+msgstr " Fenêtre des options"
 
-#: pronterface.py:288
+#: pronterface.py:289
+msgid "SFACT Settings"
+msgstr "Paramètres &SFACT..."
+
+#: pronterface.py:289
+msgid " Adjust SFACT settings"
+msgstr " Régler les paramètres SFACT"
+
+#: pronterface.py:292
+msgid "SFACT Quick Settings"
+msgstr "Réglages rapides SFACT"
+
+#: pronterface.py:292
+msgid " Quickly adjust SFACT settings for active profile"
+msgstr " Réglages rapides des paramètres SFACT pour le profil actif."
+
+#: pronterface.py:295
 msgid "&Settings"
 msgstr "&Paramètres"
 
-#: pronterface.py:304
+#: pronterface.py:311
 msgid "Enter macro name"
-msgstr "Entrez le nom de la macro"
+msgstr "Saisissez le nom de la macro"
 
-#: pronterface.py:307
+#: pronterface.py:314
 msgid "Macro name:"
 msgstr "Nom :"
 
-#: pronterface.py:310
+#: pronterface.py:317
 msgid "Ok"
 msgstr "Valider"
 
-#: pronterface.py:314
+#: pronterface.py:321
+#: pronterface.py:1197
 msgid "Cancel"
 msgstr "Annuler"
 
-#: pronterface.py:332
-msgid "' is being used by built-in command"
-msgstr ""
-
-#: pronterface.py:332
+#: pronterface.py:339
 msgid "Name '"
-msgstr "Nom '"
+msgstr "Le nom '"
 
-#: pronterface.py:368
+#: pronterface.py:339
+msgid "' is being used by built-in command"
+msgstr "' est utilisé par des commandes internes."
+
+#: pronterface.py:342
+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:375
 msgid "Port:"
-msgstr ""
+msgstr "Port :"
 
-#: pronterface.py:390
+#: pronterface.py:397
 msgid "Connect"
 msgstr "Connecter"
 
-#: pronterface.py:392
+#: pronterface.py:399
 msgid "Connect to the printer"
 msgstr "Connecter l'imprimante"
 
-#: pronterface.py:394
+#: pronterface.py:401
 msgid "Disconnect"
 msgstr "Déconnecter"
 
-#: pronterface.py:398
+#: pronterface.py:405
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: pronterface.py:401 pronterface.py:579
+#: pronterface.py:408
+#: pronterface.py:592
 msgid "Mini mode"
 msgstr "Mode réduit"
 
-#: pronterface.py:407
-msgid "Monitor\nprinter"
-msgstr " Loguer les messages\n de l'imprimante"
+#: pronterface.py:414
+msgid ""
+"Monitor\n"
+"printer"
+msgstr ""
+" Loguer les messages\n"
+"de l'imprimante"
 
-#: pronterface.py:416
+#: pronterface.py:423
 msgid "Load file"
 msgstr "Charger un fichier"
 
-#: pronterface.py:419
+#: pronterface.py:426
 msgid "SD Upload"
-msgstr "Envoyer sur la carte SD"
+msgstr "Copier sur la carte SD"
 
-#: pronterface.py:423
+#: pronterface.py:430
 msgid "SD Print"
 msgstr "Imprimer depuis la carte SD"
 
-#: pronterface.py:431 pronterface.py:1004 pronterface.py:1040
-#: pronterface.py:1088 pronterface.py:1112 pronterface.py:1139
-#: pronterface.py:1153
+#: pronterface.py:438
+#: pronterface.py:1021
+#: pronterface.py:1061
+#: pronterface.py:1109
+#: pronterface.py:1133
+#: pronterface.py:1160
+#: pronterface.py:1174
 msgid "Pause"
 msgstr "Pause"
 
-#: pronterface.py:445
+#: pronterface.py:452
 msgid "Send"
 msgstr "Envoyer"
 
-#: pronterface.py:453 pronterface.py:511
+#: pronterface.py:460
+#: pronterface.py:518
 msgid "mm/min"
-msgstr ""
+msgstr "mm/min"
 
-#: pronterface.py:455
+#: pronterface.py:462
 msgid "XY:"
 msgstr ""
 
-#: pronterface.py:457
+#: pronterface.py:464
 msgid "Z:"
 msgstr ""
 
-#: pronterface.py:474
+#: pronterface.py:481
 msgid "Heater:"
-msgstr "Chauffage:"
+msgstr "Buse :"
 
-#: pronterface.py:482 pronterface.py:494
+#: pronterface.py:489
+#: pronterface.py:501
 msgid "Set"
 msgstr "Régler"
 
-#: pronterface.py:486
+#: pronterface.py:493
 msgid "Bed:"
-msgstr "Base:"
+msgstr "Plateau :"
 
-#: pronterface.py:505
+#: pronterface.py:512
 msgid "mm"
 msgstr "mm"
 
-#: pronterface.py:538 pronterface.py:833 pronterface.py:1034
+#: pronterface.py:551
+#: pronterface.py:846
+#: pronterface.py:1055
 msgid "Not connected to printer."
 msgstr "Imprimante non connectée"
 
-#: pronterface.py:586
+#: pronterface.py:599
 msgid "Full mode"
-msgstr "Mode plein"
+msgstr "Mode complet"
 
-#: pronterface.py:624
+#: pronterface.py:637
 msgid "Defines custom button. Usage: button <num> \"title\" [/c \"colour\"] command"
-msgstr ""
+msgstr "Définit des boutons personnalidés. Utilisation : <numero> \"Libelle\" [/c \"couleur\"] commande"
 
-#: pronterface.py:646
+#: pronterface.py:659
 msgid "Custom button number should be between 0 and 63"
-msgstr ""
+msgstr "Les numéros des boutons personnalisés doivent être compris entre 0 et 63."
 
-#: pronterface.py:736
+#: pronterface.py:749
+#, python-format
 msgid "Edit custom button '%s'"
 msgstr "Editer le bouton personnalisé n°'%s'"
 
-#: pronterface.py:738
+#: pronterface.py:751
 msgid "Move left <<"
-msgstr ""
+msgstr "Déplacer vers la gauche <<"
 
-#: pronterface.py:741
+#: pronterface.py:754
 msgid "Move right >>"
-msgstr ""
+msgstr "Déplacer vers la droite >>"
 
-#: pronterface.py:745
+#: pronterface.py:758
+#, python-format
 msgid "Remove custom button '%s'"
 msgstr "Supprimer le bouton personnalisé n°'%s'"
 
-#: pronterface.py:748
+#: pronterface.py:761
 msgid "Add custom button"
 msgstr "Ajouter un bouton personnalisé"
 
-#: pronterface.py:763
+#: pronterface.py:776
 msgid "event object missing"
-msgstr ""
+msgstr "evennement d'objet manquant"
 
-#: pronterface.py:791
+#: pronterface.py:804
 msgid "Invalid period given."
-msgstr ""
+msgstr "La période donnée est invalide"
 
-#: pronterface.py:794
+#: pronterface.py:807
 msgid "Monitoring printer."
-msgstr ""
+msgstr "Surveillance de l'imprimante"
 
-#: pronterface.py:796
+#: pronterface.py:809
 msgid "Done monitoring."
-msgstr ""
+msgstr "Surveillance de l'imprimante effectuée."
 
-#: pronterface.py:815
+#: pronterface.py:828
 msgid "Printer is online. "
 msgstr "L'imprimante est connectée"
 
-#: pronterface.py:817 pronterface.py:954 pronterface.py:1002
+#: pronterface.py:830
+#: pronterface.py:969
+#: pronterface.py:1019
 msgid "Loaded "
 msgstr "Chargé "
 
-#: pronterface.py:820
-msgid "Bed"
-msgstr "Base"
-
-#: pronterface.py:820
+#: pronterface.py:833
 msgid "Hotend"
-msgstr "Extrémité"
+msgstr "Buse"
 
-#: pronterface.py:823
+#: pronterface.py:833
+msgid "Bed"
+msgstr "Plateau"
+
+#: pronterface.py:836
+#, python-format
 msgid " SD printing:%04.2f %%"
-msgstr " Impression SD:%04.2f %%"
+msgstr "Impression SD : %04.2f %%"
 
-#: pronterface.py:825
+#: pronterface.py:838
+#, python-format
 msgid " Printing:%04.2f %%"
-msgstr "Impression:%04.2f %%"
+msgstr "Impression : %04.2f %%"
 
-#: pronterface.py:879
+#: pronterface.py:892
 msgid "Opening file failed."
 msgstr "L'ouverture du fichier a échoué"
 
-#: pronterface.py:885
-msgid "Commencement d'impression"
-msgstr ""
+#: pronterface.py:898
+msgid "Starting print"
+msgstr "Début de l'impression..."
 
-#: pronterface.py:908
+#: pronterface.py:921
+msgid "Select the file to print"
+msgstr "Sélectionnez le fichier à imprimer :"
+
+#: pronterface.py:921
 msgid "Pick SD file"
 msgstr "Choisir un fichier sur la carte SD"
 
-#: pronterface.py:908
-msgid "Select the file to print"
-msgstr "Sélectionner le fichier à imprimer"
-
-#: pronterface.py:936
+#: pronterface.py:949
 msgid "Skeinforge execution failed."
 msgstr "Exécution de Skeinforge échoué"
 
-#: pronterface.py:943
+#: pronterface.py:956
 msgid "Skeining..."
-msgstr ""
+msgstr "Skeining..."
 
-#: pronterface.py:954 pronterface.py:1002
+#: pronterface.py:969
+#: pronterface.py:1019
+#, python-format
 msgid ", %d lines"
-msgstr ""
+msgstr ", %d lignes"
 
-#: pronterface.py:963
+#: pronterface.py:978
 msgid "Skeining "
-msgstr ""
+msgstr "Skeining "
 
-#: pronterface.py:965
+#: 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 non trouvé. \nVeuillez copier Skeinforge das un répertoire nommé \"skeinforge\" placé dans le repertoire de ce programme."
+msgstr ""
+"Skeinforge non trouvé. \n"
+"Veuillez copier Skeinforge dans un répertoire nommé \"skeinforge\" placé dans le repertoire du programme."
 
-#: pronterface.py:984
+#: pronterface.py:999
 msgid "Open file to print"
 msgstr "Ouvrir un fichier à imprimer"
 
-#: pronterface.py:985
+#: pronterface.py:1000
 msgid "STL and GCODE files (;*.gcode;*.g;*.stl;*.STL;)"
 msgstr "Fichiers STL et GCODE (;*.gcode;*.g;*.stl;*.STL;)"
 
-#: pronterface.py:992
+#: pronterface.py:1007
 msgid "File not found!"
 msgstr "Fichier non trouvé"
 
-#: pronterface.py:1011
-msgid "mm of filament used in this print"
-msgstr "longueur (en mm) de filament utilisés pour cette impression"
+#: pronterface.py:1029
+msgid "mm of filament used in this print\n"
+msgstr "mm de filament utilisés pour cette impression\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 "mm à"
+
+#: pronterface.py:1030
+msgid ""
+"mm in X\n"
+"and is"
+msgstr ""
+
+#: pronterface.py:1030
+#: pronterface.py:1031
+msgid "mm wide\n"
+msgstr ""
 
 #: pronterface.py:1031
+msgid ""
+"mm in Y\n"
+"and is"
+msgstr ""
+
+#: pronterface.py:1032
+msgid ""
+"mm in Z\n"
+"and is"
+msgstr ""
+
+#: pronterface.py:1032
+msgid "mm high\n"
+msgstr ""
+
+#: pronterface.py:1052
 msgid "No file loaded. Please use load first."
 msgstr "Aucun fichier chargé. Veuillez charger un fichier avant."
 
-#: pronterface.py:1042
+#: pronterface.py:1063
 msgid "Restart"
 msgstr "Recommencer"
 
-#: pronterface.py:1046
+#: pronterface.py:1067
 msgid "File upload complete"
 msgstr "Envoi du fichier terminé"
 
-#: pronterface.py:1065
+#: pronterface.py:1086
 msgid "Pick SD filename"
 msgstr "Lister les fichiers sur la carte SD"
 
-#: pronterface.py:1081
+#: pronterface.py:1102
 msgid "Resume"
 msgstr "Reprendre"
 
-#: pronterface.py:1147
+#: pronterface.py:1168
 msgid "Are you sure you want to reset the printer?"
 msgstr "Etes-vous sûrde vouloir réinitialiser l'imprimante?"
 
-#: pronterface.py:1147
+#: pronterface.py:1168
 msgid "Reset?"
 msgstr "Réinitialiser ?"
 
-#: pronterface.py:1226
+#: pronterface.py:1193
+msgid "Save"
+msgstr "Enregistrer"
+
+#: pronterface.py:1248
 msgid "Edit settings"
 msgstr "Modifier les paramètres"
 
-#: pronterface.py:1228
+#: pronterface.py:1250
 msgid "Defaults"
 msgstr "Paramètres par défaut"
 
-#: pronterface.py:1250
+#: pronterface.py:1272
 msgid "Custom button"
 msgstr "Commande personnalisée"
 
-#: pronterface.py:1258
+#: pronterface.py:1280
 msgid "Button title"
 msgstr "Titre du bouton"
 
-#: pronterface.py:1261
+#: pronterface.py:1283
 msgid "Command"
 msgstr "Commande"
 
-#: pronterface.py:1270
+#: pronterface.py:1292
 msgid "Color"
 msgstr "Couleur"
 
+#~ msgid "&Print"
+#~ msgstr "&Imprimer"
diff --git a/locale/fr/LC_MESSAGES/pronterface.mo b/locale/fr/LC_MESSAGES/pronterface.mo
old mode 100755
new mode 100644
index 006d9aa..a87b9fb
Binary files a/locale/fr/LC_MESSAGES/pronterface.mo and b/locale/fr/LC_MESSAGES/pronterface.mo differ
diff --git a/locale/nl/LC_MESSAGES/nl.mo b/locale/nl/LC_MESSAGES/nl.mo
deleted file mode 100644
index 9a092ce..0000000
Binary files a/locale/nl/LC_MESSAGES/nl.mo and /dev/null differ
diff --git a/locale/nl/LC_MESSAGES/nl.po b/locale/nl/LC_MESSAGES/nl.po
old mode 100644
new mode 100755
index 33a169c..7c422bb
--- a/locale/nl/LC_MESSAGES/nl.po
+++ b/locale/nl/LC_MESSAGES/nl.po
@@ -5,145 +5,145 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pronterface rl1\n"
-"POT-Creation-Date: 2011-08-08 16:27+PDT\n"
-"PO-Revision-Date: 2011-08-08 16:27+PDT\n"
+"POT-Creation-Date: 2011-09-06 16:31+0100\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
 
-
 #: pronterface.py:10
 msgid "WX is not installed. This program requires WX to run."
 msgstr "WX is niet geïnstalleerd. Dit programma vereist WX."
 
-#: pronterface.py:55
+#: pronterface.py:60
 msgid "Printer Interface"
 msgstr "Printer Interface"
 
-#: pronterface.py:67
+#: pronterface.py:72
 msgid "X+100"
 msgstr "X+100"
 
-#: pronterface.py:68
+#: pronterface.py:73
 msgid "X+10"
 msgstr "X+10"
 
-#: pronterface.py:69
+#: pronterface.py:74
 msgid "X+1"
 msgstr "X+1"
 
-#: pronterface.py:70
+#: pronterface.py:75
 msgid "X+0.1"
 msgstr "X+0.1"
 
-#: pronterface.py:71
+#: pronterface.py:76
 msgid "HomeX"
 msgstr "0-puntX"
 
-#: pronterface.py:72
+#: pronterface.py:77
 msgid "X-0.1"
 msgstr "X-0.1"
 
-#: pronterface.py:73
+#: pronterface.py:78
 msgid "X-1"
 msgstr "X-1"
 
-#: pronterface.py:74
+#: pronterface.py:79
 msgid "X-10"
 msgstr "X-10"
 
-#: pronterface.py:75
+#: pronterface.py:80
 msgid "X-100"
 msgstr "X-100"
 
-#: pronterface.py:76
+#: pronterface.py:81
 msgid "Y+100"
 msgstr "Y+100"
 
-#: pronterface.py:77
+#: pronterface.py:82
 msgid "Y+10"
 msgstr "Y+10"
 
-#: pronterface.py:78
+#: pronterface.py:83
 msgid "Y+1"
 msgstr "Y+1"
 
-#: pronterface.py:79
+#: pronterface.py:84
 msgid "Y+0.1"
 msgstr "Y+0.1"
 
-#: pronterface.py:80
+#: pronterface.py:85
 msgid "HomeY"
 msgstr "0-puntY"
 
-#: pronterface.py:81
+#: pronterface.py:86
 msgid "Y-0.1"
 msgstr "Y-0.1"
 
-#: pronterface.py:82
+#: pronterface.py:87
 msgid "Y-1"
 msgstr "Y-1"
 
-#: pronterface.py:83
+#: pronterface.py:88
 msgid "Y-10"
 msgstr "Y-10"
 
-#: pronterface.py:84
+#: pronterface.py:89
 msgid "Y-100"
 msgstr "Y-100"
 
-#: pronterface.py:85
+#: pronterface.py:90
 msgid "Motors off"
 msgstr "Motoren uit"
 
-#: pronterface.py:86
+#: pronterface.py:91
 msgid "Z+10"
 msgstr "Z+10"
 
-#: pronterface.py:87
+#: pronterface.py:92
 msgid "Z+1"
 msgstr "Z+1"
 
-#: pronterface.py:88
+#: pronterface.py:93
 msgid "Z+0.1"
 msgstr "Z+0.1"
 
-#: pronterface.py:89
+#: pronterface.py:94
 msgid "HomeZ"
 msgstr "0-puntZ"
 
-#: pronterface.py:90
+#: pronterface.py:95
 msgid "Z-0.1"
 msgstr "Z-0.1"
 
-#: pronterface.py:91
+#: pronterface.py:96
 msgid "Z-1"
 msgstr "Z-1"
 
-#: pronterface.py:92
+#: pronterface.py:97
 msgid "Z-10"
 msgstr "Z-10"
 
-#: pronterface.py:93
+#: pronterface.py:98
 msgid "Home"
 msgstr "0-punt"
 
-#: pronterface.py:94
+#: pronterface.py:99
 msgid "Check temp"
 msgstr "Controleer Temp."
 
-#: pronterface.py:95
+#: pronterface.py:100
 msgid "Extrude"
 msgstr "Extruden"
 
-#: pronterface.py:96
+#: pronterface.py:101
 msgid "Reverse"
 msgstr "Terug"
 
-#: pronterface.py:112
+#: pronterface.py:117
 msgid ""
 "# I moved all your custom buttons into .pronsolerc.\n"
 "# Please don't add them here any more.\n"
@@ -153,108 +153,94 @@ msgstr ""
 "# Hier geen nieuwe knoppen definiëren.\n"
 "# Een backup van de oude knoppen staat in custombtn.old\n"
 
-#: pronterface.py:117
+#: 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:118
+#: 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"
+msgstr "Negeer custombtn.txt. Verwijder alle gedefinieerde knoppen om gebruik te maken van custombtn.txt"
 
-#: pronterface.py:141 pronterface.py:427 pronterface.py:956
-#: pronterface.py:1003 pronterface.py:1113 pronterface.py:1140
-#: pronterface.py:1154
+#: pronterface.py:146
+#: pronterface.py:434
+#: pronterface.py:971
+#: pronterface.py:1020
+#: pronterface.py:1134
+#: pronterface.py:1161
+#: pronterface.py:1175
 msgid "Print"
 msgstr "Printen"
 
-#: pronterface.py:145
+#: pronterface.py:150
 msgid "Printer is now online"
 msgstr "Printer is nu verbonden"
 
-#: pronterface.py:194
+#: pronterface.py:199
 msgid "Setting hotend temperature to "
 msgstr "Stel elementtemperatuur in op "
 
-#: pronterface.py:194 pronterface.py:215
+#: pronterface.py:199
+#: pronterface.py:220
 msgid " degrees Celsius."
 msgstr " graden Celsius."
 
-#: pronterface.py:198 pronterface.py:219
+#: pronterface.py:203
+#: pronterface.py:224
 msgid "Printer is not online."
 msgstr "Printer is niet verbonden."
 
-#: pronterface.py:200
+#: 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."
+msgstr "Negatieve temperatuur is niet instelbaar. Om het element uit te schakelen wordt temperatuur 0 ingesteld."
 
-#: pronterface.py:202 pronterface.py:223
+#: pronterface.py:207
+#: pronterface.py:228
 msgid "You must enter a temperature."
 msgstr "Er moet een temperatuur worden ingesteld."
 
-#: pronterface.py:215
+#: pronterface.py:220
 msgid "Setting bed temperature to "
 msgstr "Bed teperatuur ingesteld op "
 
-#: pronterface.py:221
+#: 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."
+msgstr "Negatieve temperatuur is niet instelbaar. Om het printbed uit te schakelen wordt temperatuur 0 ingesteld."
 
-#: pronterface.py:238
+#: pronterface.py:243
 msgid "Do you want to erase the macro?"
 msgstr "Wilt u de macro verwijderen?"
 
-#: pronterface.py:242
+#: pronterface.py:247
 msgid "Cancelled."
 msgstr "Afgebroken"
 
-#: pronterface.py:271
-msgid " Opens file"
-msgstr " Opent bestand"
-
-#: pronterface.py:271
+#: pronterface.py:277
 msgid "&Open..."
 msgstr "&Open..."
 
-#: pronterface.py:272
-msgid " Edit open file"
-msgstr " Wijzig geopend bestand"
+#: pronterface.py:277
+msgid " Opens file"
+msgstr " Opent bestand"
 
-#: pronterface.py:272
+#: pronterface.py:278
 msgid "&Edit..."
 msgstr "&Wijzig..."
 
-#: pronterface.py:274
-msgid " Adjust SFACT settings"
-msgstr "Instellen SFACT"
+#: pronterface.py:278
+msgid " Edit open file"
+msgstr " Wijzig geopend bestand"
 
-#: pronterface.py:274
-msgid "SFACT Settings"
-msgstr "SFACT Instellingen"
-
-#: pronterface.py:277
-msgid " Quickly adjust SFACT settings for active profile"
-msgstr " Eenvoudig SFACT's huidige profiel instellen"
-
-#: pronterface.py:277
-msgid "SFACT Quick Settings"
-msgstr "SFACT Snelinstelling"
-
-#: pronterface.py:281
-msgid " Closes the Window"
-msgstr " Sluit het venster"
-
-#: pronterface.py:281
+#: pronterface.py:279
 msgid "E&xit"
 msgstr "&Stoppen"
 
-#: pronterface.py:282
-msgid "&Print"
-msgstr "&Printen"
+#: pronterface.py:279
+msgid " Closes the Window"
+msgstr " Sluit het venster"
+
+#: pronterface.py:280
+msgid "&File"
+msgstr ""
 
 #: pronterface.py:285
 msgid "&Macros"
@@ -264,231 +250,269 @@ msgstr "&Macros"
 msgid "<&New...>"
 msgstr "<&Nieuw...>"
 
-#: pronterface.py:287
-msgid " Options dialog"
-msgstr "Optievenster"
-
 #: pronterface.py:287
 msgid "&Options"
 msgstr "&Opties"
 
-#: pronterface.py:288
+#: 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:304
+#: pronterface.py:311
 msgid "Enter macro name"
 msgstr "Voer macronaam in"
 
-#: pronterface.py:307
+#: pronterface.py:314
 msgid "Macro name:"
 msgstr "Macronaam:"
 
-#: pronterface.py:310
+#: pronterface.py:317
 msgid "Ok"
 msgstr "Ok"
 
-#: pronterface.py:314
+#: pronterface.py:321
+#: pronterface.py:1197
 msgid "Cancel"
 msgstr "Annuleer"
 
-#: pronterface.py:332
-msgid "' is being used by built-in command"
-msgstr "' wordt gebruikt door ingebouwde instructie"
-
-#: pronterface.py:332
+#: pronterface.py:339
 msgid "Name '"
 msgstr "Naam '"
 
-#: pronterface.py:368
+#: 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:390
+#: pronterface.py:397
 msgid "Connect"
 msgstr "Verbind"
 
-#: pronterface.py:392
+#: pronterface.py:399
 msgid "Connect to the printer"
 msgstr "Verbind met printer"
 
-#: pronterface.py:394
+#: pronterface.py:401
 msgid "Disconnect"
 msgstr "Ontkoppel"
 
-#: pronterface.py:398
+#: pronterface.py:405
 msgid "Reset"
 msgstr "Reset"
 
-#: pronterface.py:401 pronterface.py:579
+#: pronterface.py:408
+#: pronterface.py:592
 msgid "Mini mode"
 msgstr "Mini-venster"
 
-#: pronterface.py:407
+#: pronterface.py:414
 msgid ""
 "Monitor\n"
 "printer"
 msgstr "Printercommunicatie volgen"
 
-#: pronterface.py:416
+#: pronterface.py:423
 msgid "Load file"
 msgstr "open bestand"
 
-#: pronterface.py:419
+#: pronterface.py:426
 msgid "SD Upload"
 msgstr "uploaden naar SD"
 
-#: pronterface.py:423
+#: pronterface.py:430
 msgid "SD Print"
 msgstr "Afdruk van SD"
 
-#: pronterface.py:431 pronterface.py:1004 pronterface.py:1040
-#: pronterface.py:1088 pronterface.py:1112 pronterface.py:1139
-#: pronterface.py:1153
+#: pronterface.py:438
+#: pronterface.py:1021
+#: pronterface.py:1061
+#: pronterface.py:1109
+#: pronterface.py:1133
+#: pronterface.py:1160
+#: pronterface.py:1174
 msgid "Pause"
 msgstr "Pauze"
 
-#: pronterface.py:445
+#: pronterface.py:452
 msgid "Send"
 msgstr "Zend"
 
-#: pronterface.py:453 pronterface.py:511
+#: pronterface.py:460
+#: pronterface.py:518
 msgid "mm/min"
 msgstr "mm/min"
 
-#: pronterface.py:455
+#: pronterface.py:462
 msgid "XY:"
 msgstr "XY:"
 
-#: pronterface.py:457
+#: pronterface.py:464
 msgid "Z:"
 msgstr "Z:"
 
-#: pronterface.py:474
+#: pronterface.py:481
 msgid "Heater:"
 msgstr "Element:"
 
-#: pronterface.py:482 pronterface.py:494
+#: pronterface.py:489
+#: pronterface.py:501
 msgid "Set"
 msgstr "Stel in"
 
-#: pronterface.py:486
+#: pronterface.py:493
 msgid "Bed:"
 msgstr "Bed:"
 
-#: pronterface.py:505
+#: pronterface.py:512
 msgid "mm"
 msgstr "mm"
 
-#: pronterface.py:538 pronterface.py:833 pronterface.py:1034
+#: pronterface.py:551
+#: pronterface.py:846
+#: pronterface.py:1055
 msgid "Not connected to printer."
 msgstr "Printer is niet verbonden."
 
-#: pronterface.py:586
+#: pronterface.py:599
 msgid "Full mode"
 msgstr "Volledig venster"
 
-#: pronterface.py:624
+#: 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:646
+#: pronterface.py:659
 msgid "Custom button number should be between 0 and 63"
 msgstr "Knopnummer moet tussen 0 en 63 zijn"
 
-#: pronterface.py:736
+#: pronterface.py:749
+#, python-format
 msgid "Edit custom button '%s'"
 msgstr "Wijzig gedefineerde knop '%s'"
 
-#: pronterface.py:738
+#: pronterface.py:751
 msgid "Move left <<"
 msgstr "Verplaats links <<"
 
-#: pronterface.py:741
+#: pronterface.py:754
 msgid "Move right >>"
 msgstr "Verplaats rechts >>"
 
-#: pronterface.py:745
+#: pronterface.py:758
+#, python-format
 msgid "Remove custom button '%s'"
 msgstr "Verwijder gedefinieerde knop '%s'"
 
-#: pronterface.py:748
+#: pronterface.py:761
 msgid "Add custom button"
 msgstr "Definieer eigen knop."
 
-#: pronterface.py:763
+#: pronterface.py:776
 msgid "event object missing"
 msgstr "vermist object"
 
-#: pronterface.py:791
+#: pronterface.py:804
 msgid "Invalid period given."
 msgstr "Foute gegevens ingevoerd"
 
-#: pronterface.py:794
+#: pronterface.py:807
 msgid "Monitoring printer."
 msgstr "Printercommunicatie wordt gevolgd."
 
-#: pronterface.py:796
+#: pronterface.py:809
 msgid "Done monitoring."
 msgstr "Klaar met volgen."
 
-#: pronterface.py:815
+#: pronterface.py:828
 msgid "Printer is online. "
 msgstr "Printer is verbonden. "
 
-#: pronterface.py:817 pronterface.py:954 pronterface.py:1002
+#: pronterface.py:830
+#: pronterface.py:969
+#: pronterface.py:1019
 msgid "Loaded "
 msgstr "Geladen"
 
-#: pronterface.py:820
-msgid "Bed"
-msgstr "Bed"
-
-#: pronterface.py:820
+#: pronterface.py:833
 msgid "Hotend"
 msgstr "Element"
 
-#: pronterface.py:823
+#: pronterface.py:833
+msgid "Bed"
+msgstr "Bed"
+
+#: pronterface.py:836
+#, python-format
 msgid " SD printing:%04.2f %%"
 msgstr " SD printen:%04.2f %%"
 
-#: pronterface.py:825
+#: pronterface.py:838
+#, python-format
 msgid " Printing:%04.2f %%"
 msgstr " Printen:%04.2f %%"
 
-#: pronterface.py:879
+#: pronterface.py:892
 msgid "Opening file failed."
 msgstr "Bestand openen mislukt"
 
-#: pronterface.py:885
+#: pronterface.py:898
 msgid "Starting print"
 msgstr "Start het printen"
 
-#: pronterface.py:908
-msgid "Pick SD file"
-msgstr "Kies bestand op SD"
-
-#: pronterface.py:908
+#: pronterface.py:921
 msgid "Select the file to print"
 msgstr "Kies het te printen bestand"
 
-#: pronterface.py:936
+#: pronterface.py:921
+msgid "Pick SD file"
+msgstr "Kies bestand op SD"
+
+#: pronterface.py:949
 msgid "Skeinforge execution failed."
 msgstr "Skeinforge was niet succesvol."
 
-#: pronterface.py:943
+#: pronterface.py:956
 msgid "Skeining..."
 msgstr "Skeinforge draait..."
 
-#: pronterface.py:954 pronterface.py:1002
+#: pronterface.py:969
+#: pronterface.py:1019
+#, python-format
 msgid ", %d lines"
 msgstr ",%d regels"
 
-#: pronterface.py:963
+#: pronterface.py:978
 msgid "Skeining "
 msgstr "Skeinforge draait"
 
-#: pronterface.py:965
+#: pronterface.py:980
 msgid ""
 "Skeinforge not found. \n"
 "Please copy Skeinforge into a directory named \"skeinforge\" in the same directory as this file."
@@ -496,72 +520,117 @@ msgstr ""
 "Skeinforge niet gevonden.\n"
 "Plaats Skeinforge in een map met de naam \"skeinforge\" in dezelfde map als dit bestand."
 
-#: pronterface.py:984
+#: pronterface.py:999
 msgid "Open file to print"
 msgstr "Open het te printen bestand"
 
-#: pronterface.py:985
+#: pronterface.py:1000
 msgid "STL and GCODE files (;*.gcode;*.g;*.stl;*.STL;)"
 msgstr "STL en GCODE bestanden (;*.gcode;*.g;*.stl;*.STL;)"
 
-#: pronterface.py:992
+#: pronterface.py:1007
 msgid "File not found!"
 msgstr "Bestand niet gevonden!"
 
-#: pronterface.py:1011
-msgid "mm of filament used in this print"
+#: pronterface.py:1029
+#, fuzzy
+msgid "mm of filament used in this print\n"
 msgstr "mm fillament wordt gebruikt in deze print"
 
+#: 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
+msgid ""
+"mm in X\n"
+"and is"
+msgstr ""
+
+#: pronterface.py:1030
+#: pronterface.py:1031
+msgid "mm wide\n"
+msgstr ""
+
+#: pronterface.py:1031
+msgid ""
+"mm in Y\n"
+"and is"
+msgstr ""
+
+#: pronterface.py:1032
+msgid ""
+"mm in Z\n"
+"and is"
+msgstr ""
+
+#: pronterface.py:1032
+msgid "mm high\n"
+msgstr ""
+
+#: pronterface.py:1052
 msgid "No file loaded. Please use load first."
 msgstr "Geen bestand geladen. Eerst bestand inladen."
 
-#: pronterface.py:1042
+#: pronterface.py:1063
 msgid "Restart"
 msgstr "Herstart"
 
-#: pronterface.py:1046
+#: pronterface.py:1067
 msgid "File upload complete"
 msgstr "Bestandsupload voltooid"
 
-#: pronterface.py:1065
+#: pronterface.py:1086
 msgid "Pick SD filename"
 msgstr "Kies bestandsnaam op SD"
 
-#: pronterface.py:1081
+#: pronterface.py:1102
 msgid "Resume"
 msgstr "Hervat"
 
-#: pronterface.py:1147
+#: pronterface.py:1168
 msgid "Are you sure you want to reset the printer?"
 msgstr "Weet je zeker dat je de printer wilt resetten?"
 
-#: pronterface.py:1147
+#: pronterface.py:1168
 msgid "Reset?"
 msgstr "resetten?"
 
-#: pronterface.py:1226
+#: pronterface.py:1193
+msgid "Save"
+msgstr ""
+
+#: pronterface.py:1248
 msgid "Edit settings"
 msgstr "Wijzig instellingen"
 
-#: pronterface.py:1228
+#: pronterface.py:1250
 msgid "Defaults"
 msgstr "Standaardinstelling"
 
-#: pronterface.py:1250
+#: pronterface.py:1272
 msgid "Custom button"
 msgstr "Gedefinieerde knop"
 
-#: pronterface.py:1258
+#: pronterface.py:1280
 msgid "Button title"
 msgstr "Knoptitel"
 
-#: pronterface.py:1261
+#: pronterface.py:1283
 msgid "Command"
 msgstr "Commando"
 
-#: pronterface.py:1270
+#: pronterface.py:1292
 msgid "Color"
 msgstr "Kleur"
 
-
+#~ msgid "&Print"
+#~ msgstr "&Printen"
diff --git a/locale/nl/LC_MESSAGES/pronterface.mo b/locale/nl/LC_MESSAGES/pronterface.mo
new file mode 100644
index 0000000..dc2606e
Binary files /dev/null and b/locale/nl/LC_MESSAGES/pronterface.mo differ
diff --git a/pronterface.py b/pronterface.py
index 84610da..4bcb1df 100755
--- a/pronterface.py
+++ b/pronterface.py
@@ -272,24 +272,26 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
         
     def popmenu(self):
         self.menustrip = wx.MenuBar()
-        m = wx.Menu()
+        # File menu
+	m = wx.Menu()
         self.Bind(wx.EVT_MENU, self.loadfile, m.Append(-1,_("&Open..."),_(" Opens file")))
         self.Bind(wx.EVT_MENU, self.do_editgcode, m.Append(-1,_("&Edit..."),_(" Edit open file")))
-        if sys.platform != 'darwin':
+        self.Bind(wx.EVT_MENU, self.OnExit, m.Append(wx.ID_EXIT,_("E&xit"),_(" Closes the Window")))
+        self.menustrip.Append(m,_("&File"))
+        
+	# Settings menu
+	m = wx.Menu()
+        self.macros_menu = wx.Menu()
+        m.AppendSubMenu(self.macros_menu, _("&Macros"))
+        self.Bind(wx.EVT_MENU, self.new_macro, self.macros_menu.Append(-1, _("<&New...>")))
+        self.Bind(wx.EVT_MENU, lambda *e:options(self), m.Append(-1,_("&Options"),_(" Options dialog")))
+	if sys.platform != 'darwin':
             self.Bind(wx.EVT_MENU, lambda x:threading.Thread(target=lambda :self.do_skein("set")).start(), m.Append(-1,_("SFACT Settings"),_(" Adjust SFACT settings")))
         try:
             from SkeinforgeQuickEditDialog import SkeinforgeQuickEditDialog
             self.Bind(wx.EVT_MENU, lambda *e:SkeinforgeQuickEditDialog(self), m.Append(-1,_("SFACT Quick Settings"),_(" Quickly adjust SFACT settings for active profile")))
         except:
             pass
-
-        self.Bind(wx.EVT_MENU, self.OnExit, m.Append(wx.ID_EXIT,_("E&xit"),_(" Closes the Window")))
-        self.menustrip.Append(m,_("&Print"))
-        m = wx.Menu()
-        self.macros_menu = wx.Menu()
-        m.AppendSubMenu(self.macros_menu, _("&Macros"))
-        self.Bind(wx.EVT_MENU, self.new_macro, self.macros_menu.Append(-1, _("<&New...>")))
-        self.Bind(wx.EVT_MENU, lambda *e:options(self), m.Append(-1,_("&Options"),_(" Options dialog")))
         self.menustrip.Append(m,_("&Settings"))
         self.update_macros_menu()
         self.SetMenuBar(self.menustrip)
@@ -306,17 +308,17 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
             macroed(self.filename,self.f,self.doneediting,1)
     
     def new_macro(self,e=None):
-        dialog = wx.Dialog(self,-1,_("Enter macro name"),size=(200,100))
+        dialog = wx.Dialog(self,-1,_("Enter macro name"),size=(260,85))
         panel = wx.Panel(dialog,-1)
         vbox = wx.BoxSizer(wx.VERTICAL)
         wx.StaticText(panel,-1,_("Macro name:"),(8,14))
-        dialog.namectrl = wx.TextCtrl(panel,-1,'',(80,8),size=(100,24),style=wx.TE_PROCESS_ENTER)
+        dialog.namectrl = wx.TextCtrl(panel,-1,'',(110,8),size=(130,24),style=wx.TE_PROCESS_ENTER)
         hbox = wx.BoxSizer(wx.HORIZONTAL)
-        okb = wx.Button(dialog,wx.ID_OK,_("Ok"),size=(50,24))
+        okb = wx.Button(dialog,wx.ID_OK,_("Ok"),size=(60,24))
         dialog.Bind(wx.EVT_TEXT_ENTER,lambda e:dialog.EndModal(wx.ID_OK),dialog.namectrl)
         #dialog.Bind(wx.EVT_BUTTON,lambda e:self.new_macro_named(dialog,e),okb)
         hbox.Add(okb)
-        hbox.Add(wx.Button(dialog,wx.ID_CANCEL,_("Cancel"),size=(50,24)))
+        hbox.Add(wx.Button(dialog,wx.ID_CANCEL,_("Cancel"),size=(60,24)))
         vbox.Add(panel)
         vbox.Add(hbox,1,wx.ALIGN_CENTER|wx.TOP|wx.BOTTOM,10)
         dialog.SetSizer(vbox)
@@ -337,7 +339,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
             print _("Name '")+macro+_("' is being used by built-in command")
             return
         elif len([c for c in macro if not c.isalnum() and c != "_"]):
-            print "Macro name may contain only alphanumeric symbols and underscores"
+            print _("Macro name may contain only alphanumeric symbols and underscores")
             return
         else:
             old_def = ""
@@ -1188,11 +1190,11 @@ class macroed(wx.Dialog):
         title = wx.StaticText(self.panel,-1,title%macro_name)
         #title.SetFont(wx.Font(11,wx.NORMAL,wx.NORMAL,wx.BOLD))
         titlesizer.Add(title,1)
-        self.okb = wx.Button(self.panel, -1, ("Save"))
+        self.okb = wx.Button(self.panel, -1, _("Save"))
         self.okb.Bind(wx.EVT_BUTTON, self.save)
         self.Bind(wx.EVT_CLOSE, self.close)
         titlesizer.Add(self.okb)
-        self.cancelb = wx.Button(self.panel, -1, ("Cancel"))
+        self.cancelb = wx.Button(self.panel, -1, _("Cancel"))
         self.cancelb.Bind(wx.EVT_BUTTON, self.close)
         titlesizer.Add(self.cancelb)
         topsizer=wx.BoxSizer(wx.VERTICAL)