From d2ba1b2cc4e35ebcbdd6e6a7fe825c4ab63e8b3a Mon Sep 17 00:00:00 2001
From: Cyril Laguilhon-Debat <mecton@gmail.com>
Date: Tue, 6 Sep 2011 14:06:42 +0200
Subject: [PATCH 1/5] Change location of locale/ directory

necessary for windows compatibility
---
 pronterface.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pronterface.py b/pronterface.py
index aff073c..84610da 100755
--- a/pronterface.py
+++ b/pronterface.py
@@ -2,7 +2,7 @@
 
 # Set up Internationalization using gettext
 import gettext
-gettext.install('pronterface', '/usr/share/pronterface/locale', unicode=1)
+gettext.install('pronterface', './locale', unicode=1)
 
 try:
     import wx

From 603dcf01b063c82320a1727646b62a5efdad834a Mon Sep 17 00:00:00 2001
From: Cyril Laguilhon-Debat <mecton@gmail.com>
Date: Tue, 6 Sep 2011 14:15:36 +0200
Subject: [PATCH 2/5] French localisation update

---
 locale/fr/LC_MESSAGES/fr.po          |  96 +++++++++++++--------------
 locale/fr/LC_MESSAGES/pronterface.mo | Bin 5425 -> 6615 bytes
 2 files changed, 48 insertions(+), 48 deletions(-)
 mode change 100644 => 100755 locale/fr/LC_MESSAGES/fr.po
 mode change 100644 => 100755 locale/fr/LC_MESSAGES/pronterface.mo

diff --git a/locale/fr/LC_MESSAGES/fr.po b/locale/fr/LC_MESSAGES/fr.po
old mode 100644
new mode 100755
index 0038151..5f5aa32
--- a/locale/fr/LC_MESSAGES/fr.po
+++ b/locale/fr/LC_MESSAGES/fr.po
@@ -6,8 +6,8 @@ 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"
-"Last-Translator: Jonathan Marsden <jmarsden@fastmail.fm>\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,7 +17,7 @@ msgstr ""
 
 #: pronterface.py:10
 msgid "WX is not installed. This program requires WX to run."
-msgstr "WX n'est pas installé. Ce programme demande WX à courir."
+msgstr "wxWidgets n'est pas installé. Ce programme nécéssite la librairie wxWidgets pour fonctionner."
 
 #: pronterface.py:55
 msgid "Printer Interface"
@@ -141,7 +141,7 @@ msgstr "Extruder"
 
 #: pronterface.py:96
 msgid "Reverse"
-msgstr "Renverser"
+msgstr "Inverser"
 
 #: pronterface.py:112
 msgid ""
@@ -166,7 +166,7 @@ msgstr "Imprimer"
 
 #: pronterface.py:145
 msgid "Printer is now online"
-msgstr "L'imprimante est maintenant en ligne"
+msgstr "L'imprimante est connectée"
 
 #: pronterface.py:194
 msgid "Setting hotend temperature to "
@@ -178,23 +178,23 @@ msgstr " degrés Celsius."
 
 #: pronterface.py:198 pronterface.py:219
 msgid "Printer is not online."
-msgstr "L'imprimante n'est pas en ligne."
+msgstr "L'imprimante est déconnectée"
 
 #: pronterface.py:200
 msgid "You cannot set negative temperatures. To turn the hotend off entirely, set its temperature to 0."
-msgstr "On ne peut pas régler les températures négatives. Pour désactiver l'extrémité chaude entièrement, mis sa température à 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."
 
 #: pronterface.py:202 pronterface.py:223
 msgid "You must enter a temperature."
-msgstr "Il faut entrer une température."
+msgstr "Vous devez saisir une température."
 
 #: pronterface.py:215
 msgid "Setting bed temperature to "
-msgstr "Réglage de la température de la base à "
+msgstr "Réglage de la température du plateau chauffant à "
 
 #: pronterface.py:221
 msgid "You cannot set negative temperatures. To turn the bed off entirely, set its temperature to 0."
-msgstr "On ne peut pas régler les températures négatives. Pour désactiver la base entièrement, mis sa température à 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."
 
 #: pronterface.py:238
 msgid "Do you want to erase the macro?"
@@ -206,11 +206,11 @@ msgstr "Annulé."
 
 #: pronterface.py:271
 msgid " Opens file"
-msgstr " Ouvre le fichier"
+msgstr " Ouvrir un fichier"
 
 #: pronterface.py:271
 msgid "&Open..."
-msgstr "&Ouvre..."
+msgstr "&Ouvrir..."
 
 #: pronterface.py:272
 msgid " Edit open file"
@@ -222,23 +222,23 @@ msgstr "&Editer..."
 
 #: pronterface.py:274
 msgid " Adjust SFACT settings"
-msgstr " Réglez les paramètres du SFACT"
+msgstr " Régler les paramètres SFACT"
 
 #: pronterface.py:274
 msgid "SFACT Settings"
-msgstr "Paramètres du &SFACT"
+msgstr "Paramètres &SFACT..."
 
 #: pronterface.py:277
 msgid " Quickly adjust SFACT settings for active profile"
-msgstr " Régler rapidement les paramètres du SFACT pour le profil actif."
+msgstr " Réglages rapides des paramètres SFACT pour le profil actif."
 
 #: pronterface.py:277
 msgid "SFACT Quick Settings"
-msgstr "SFACT réglages rapides"
+msgstr "Réglages rapides SFACT"
 
 #: pronterface.py:281
 msgid " Closes the Window"
-msgstr " Ferme la fenêtre"
+msgstr " Quitter le programme"
 
 #: pronterface.py:281
 msgid "E&xit"
@@ -254,11 +254,11 @@ msgstr ""
 
 #: pronterface.py:286
 msgid "<&New...>"
-msgstr "<&Nouvelles...>"
+msgstr "<&Nouvelle...>"
 
 #: pronterface.py:287
 msgid " Options dialog"
-msgstr " Dialogue d'options"
+msgstr " Options"
 
 #: pronterface.py:287
 msgid "&Options"
@@ -274,7 +274,7 @@ msgstr "Entrez le nom de la macro"
 
 #: pronterface.py:307
 msgid "Macro name:"
-msgstr "Nom de la macro:"
+msgstr "Nom :"
 
 #: pronterface.py:310
 msgid "Ok"
@@ -298,15 +298,15 @@ msgstr ""
 
 #: pronterface.py:390
 msgid "Connect"
-msgstr "Rattacher"
+msgstr "Connecter"
 
 #: pronterface.py:392
 msgid "Connect to the printer"
-msgstr "Rattacher au imprimant"
+msgstr "Connecter l'imprimante"
 
 #: pronterface.py:394
 msgid "Disconnect"
-msgstr "Détacher"
+msgstr "Déconnecter"
 
 #: pronterface.py:398
 msgid "Reset"
@@ -314,29 +314,29 @@ msgstr "Réinitialiser"
 
 #: pronterface.py:401 pronterface.py:579
 msgid "Mini mode"
-msgstr "Mode mini"
+msgstr "Mode réduit"
 
 #: pronterface.py:407
 msgid "Monitor\nprinter"
-msgstr "Surveiller\nl'imprimante"
+msgstr " Loguer les messages\n de l'imprimante"
 
 #: pronterface.py:416
 msgid "Load file"
-msgstr "Charger le fichier"
+msgstr "Charger un fichier"
 
 #: pronterface.py:419
 msgid "SD Upload"
-msgstr "Télécharger SD"
+msgstr "Envoyer sur la carte SD"
 
 #: pronterface.py:423
 msgid "SD Print"
-msgstr "Imprimer SD"
+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
 msgid "Pause"
-msgstr "Pauser"
+msgstr "Pause"
 
 #: pronterface.py:445
 msgid "Send"
@@ -368,11 +368,11 @@ msgstr "Base:"
 
 #: pronterface.py:505
 msgid "mm"
-msgstr ""
+msgstr "mm"
 
 #: pronterface.py:538 pronterface.py:833 pronterface.py:1034
 msgid "Not connected to printer."
-msgstr "Pas rattaché à l'imprimante"
+msgstr "Imprimante non connectée"
 
 #: pronterface.py:586
 msgid "Full mode"
@@ -388,7 +388,7 @@ msgstr ""
 
 #: pronterface.py:736
 msgid "Edit custom button '%s'"
-msgstr ""
+msgstr "Editer le bouton personnalisé n°'%s'"
 
 #: pronterface.py:738
 msgid "Move left <<"
@@ -400,11 +400,11 @@ msgstr ""
 
 #: pronterface.py:745
 msgid "Remove custom button '%s'"
-msgstr ""
+msgstr "Supprimer le bouton personnalisé n°'%s'"
 
 #: pronterface.py:748
 msgid "Add custom button"
-msgstr ""
+msgstr "Ajouter un bouton personnalisé"
 
 #: pronterface.py:763
 msgid "event object missing"
@@ -424,11 +424,11 @@ msgstr ""
 
 #: pronterface.py:815
 msgid "Printer is online. "
-msgstr ""
+msgstr "L'imprimante est connectée"
 
 #: pronterface.py:817 pronterface.py:954 pronterface.py:1002
 msgid "Loaded "
-msgstr ""
+msgstr "Chargé "
 
 #: pronterface.py:820
 msgid "Bed"
@@ -436,7 +436,7 @@ msgstr "Base"
 
 #: pronterface.py:820
 msgid "Hotend"
-msgstr "Extrémité chaude"
+msgstr "Extrémité"
 
 #: pronterface.py:823
 msgid " SD printing:%04.2f %%"
@@ -456,7 +456,7 @@ msgstr ""
 
 #: pronterface.py:908
 msgid "Pick SD file"
-msgstr "Choisir un fichier SD"
+msgstr "Choisir un fichier sur la carte SD"
 
 #: pronterface.py:908
 msgid "Select the file to print"
@@ -482,7 +482,7 @@ msgstr ""
 msgid ""
 "Skeinforge not found. \n"
 "Please copy Skeinforge into a directory named \"skeinforge\" in the same directory as this file."
-msgstr ""
+msgstr "Skeinforge non trouvé. \nVeuillez copier Skeinforge das un répertoire nommé \"skeinforge\" placé dans le repertoire de ce programme."
 
 #: pronterface.py:984
 msgid "Open file to print"
@@ -498,11 +498,11 @@ msgstr "Fichier non trouvé"
 
 #: pronterface.py:1011
 msgid "mm of filament used in this print"
-msgstr ""
+msgstr "longueur (en mm) de filament utilisés pour cette impression"
 
 #: pronterface.py:1031
 msgid "No file loaded. Please use load first."
-msgstr ""
+msgstr "Aucun fichier chargé. Veuillez charger un fichier avant."
 
 #: pronterface.py:1042
 msgid "Restart"
@@ -510,23 +510,23 @@ msgstr "Recommencer"
 
 #: pronterface.py:1046
 msgid "File upload complete"
-msgstr ""
+msgstr "Envoi du fichier terminé"
 
 #: pronterface.py:1065
 msgid "Pick SD filename"
-msgstr ""
+msgstr "Lister les fichiers sur la carte SD"
 
 #: pronterface.py:1081
 msgid "Resume"
-msgstr "Résumer"
+msgstr "Reprendre"
 
 #: pronterface.py:1147
 msgid "Are you sure you want to reset the printer?"
-msgstr "Etes-vous certain que vous souhaitez réinitialiser l'imprimante?"
+msgstr "Etes-vous sûrde vouloir réinitialiser l'imprimante?"
 
 #: pronterface.py:1147
 msgid "Reset?"
-msgstr "Réinitialiser?"
+msgstr "Réinitialiser ?"
 
 #: pronterface.py:1226
 msgid "Edit settings"
@@ -538,11 +538,11 @@ msgstr "Paramètres par défaut"
 
 #: pronterface.py:1250
 msgid "Custom button"
-msgstr ""
+msgstr "Commande personnalisée"
 
 #: pronterface.py:1258
 msgid "Button title"
-msgstr ""
+msgstr "Titre du bouton"
 
 #: pronterface.py:1261
 msgid "Command"
diff --git a/locale/fr/LC_MESSAGES/pronterface.mo b/locale/fr/LC_MESSAGES/pronterface.mo
old mode 100644
new mode 100755
index 2c5b2b3b3d6d1d5cd2e14c2729cc9927810b48ad..006d9aad404301912e4a8f0c6807a3cd325534dd
GIT binary patch
literal 6615
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

delta 2536
zcmb`{TWnNC7{KvaD3`WS+HNVO78nXxXrbJ-6r^G=Tzj!Jkp~PO+G+R1-Lv(avqdqc
ziY7dW4`jkq6^#$l`amKmkr0)*AwFOP!vhb9@e(C5QDcZ2m5BdudkUKH=%nBN=FILn
z^UXJNdUfqPwZmVQ<{eYC4x)-UGD)c?@m3xmw9%<bmE#ze;(45fSFjMjjjn&jIM=sv
zHO8ln-`9#IT<^u{=tUktembn4r<2bYha-<-9oHi`89zbE<sx!}x{L*QHS!yr!u5~H
zpSl_O7fRxjnN=pP<U{UTgbT19r!c?jpfi(!9xTTFC=UuyR{AVTf-gto$50Y_4Q1jt
zBS#}oq9pn*w&OXJ`}6sbip5c`7w|EQ`PDKylGz578(VNL?!-<s$gZgOP`2QGEW?W^
z34Db!@cZccCQ8ZwK&e0>51)<ID8Fw&nP)Q&%Sv0Lfp(PZ9wceC7kP#<C=;f!2w%dL
zXt4sbC>8kvWy`+C`|vxQk1>`lXG`OHd<Y-Mppg1MLFaP@=HVKau_LBb7cS&_gnf|}
ze}Gbv%P1@R0p+mWLP@NctRBH7C<!G{e)j^BgR&?KIUYHRQn6D-)L-`aBL=qMC6twv
zFes%eN2y2^N<|i<B(fqJ-x`f~qD-&{rR4i@4n7l&A4OT<2+DKLq9pq9Fdcc|wdjjq
zQC9XhO6H}UNO2xYB1=&wS{2zC*@9B34txxq==v=3r#|IF?z@hX*bS7*4d13CD=nj5
zl3^wGV*|>BuSer2P`2a(%Hg?za;SbnSy3Ld%L8Yk#%f%Q%}7yI0$Gzffb6z9jNCV@
zEFH=0)#!`2ket*hluWZI6J5jA_zTK|7f~ija9d;-)^fcEAH)|?5<Z8GcpXEmAj?De
z3Tk=(i+OsCfl6Yc$wVzgJHZ*tRR(fRR^Jizg*C(uLbgdxyEHjmvaM1XS-l)iS(GFq
zP2LV!be_Eb(i(^j#AaeUv5r_uNZU!sYb8xyBWcxytWMfmLQ1=m*h(xXmJu5Xsn8}u
z+Ad;MuE#5g^~7)!A5yM~);iHaDt)I(X=NLvHII|~rzBe>C;s7ROis151w>n}H-5fk
z&+jLeL}S7OQastqZG<LP5Nu2C4OoPnEmcEEt0T4$>+OYUzuV8Iud}oAci4gaCi`Lj
zT06Diusv4LXn!j>VNVveoYpg@#7>XQjK@x2De8_bKd6%?(1VWeq_U%-Promtceib6
z?oqnU_$i~4j_x;J_U+KOj}|YiWWeZtw>RM$U+EUtNu~!fM)%dE?V;joZG7!JgKnQm
z885uYv+eofJuzb|OX?Q4h9+1sl+FaY*Z861dip6Ilp6@rnS|qp=AeD9WSKovvPpM4
zVd(TGnDb6gI~nb!27Nc>c%iK=t;&;M*!I#|d%U#EPLFS$rh5}krq9^UxU>3SX?LVk
zx-Yk~l+){{8&!Ln%arT6YInvTGHx<y`~v%Dd}&pe6R@D%+}SameM2W}?#>yOohkEG
zb0X~quCFuRL|v>mdu4-HV}g*%2HJQ!=?-|NUhTSjv(fT(ie-n!V*z)5WsA$__cf_*
z)0<9FL~5hDvtvOfB^~1p89$)6J-2YGy}L#AWXF=(F_!8Nj1T1YPy5-ifuu8FWC5}x
zf$I9tHro^BNAh!3*zW|!w$0gR>nb+x>-4l|^q|R%C!c!?kCkH*n$%!+jB;e;pm;pr
z3Ed$R)a$Nv#@BtM>GaA7KX<e|l~sjqcGS-uhvk$wu$L-kr_}#6NsW0rB*By$vN_{>
ZeeW5I>ecq7?sr%e8TmFgH$JIe{R2s-s%`)P


From b03443cc6afee981e1d2c7192be32de1a0627a65 Mon Sep 17 00:00:00 2001
From: Cyril Laguilhon-Debat <mecton@gmail.com>
Date: Tue, 6 Sep 2011 17:48:16 +0200
Subject: [PATCH 3/5] Translations + some minors gui improvements

- french translations
- added some translated strings in pronterface.py
- resized macro window and control's positions
- reordered main menu
---
 locale/de/LC_MESSAGES/de.po          | 422 +++++++++++++----------
 locale/de/LC_MESSAGES/pronterface.mo | Bin 4460 -> 4475 bytes
 locale/fr/LC_MESSAGES/fr.po          | 496 ++++++++++++++++-----------
 locale/fr/LC_MESSAGES/pronterface.mo | Bin 6615 -> 8158 bytes
 locale/nl/LC_MESSAGES/nl.mo          | Bin 8278 -> 0 bytes
 locale/nl/LC_MESSAGES/nl.po          | 425 +++++++++++++----------
 locale/nl/LC_MESSAGES/pronterface.mo | Bin 0 -> 8205 bytes
 pronterface.py                       |  36 +-
 8 files changed, 804 insertions(+), 575 deletions(-)
 mode change 100644 => 100755 locale/de/LC_MESSAGES/de.po
 mode change 100755 => 100644 locale/fr/LC_MESSAGES/pronterface.mo
 delete mode 100644 locale/nl/LC_MESSAGES/nl.mo
 mode change 100644 => 100755 locale/nl/LC_MESSAGES/nl.po
 create mode 100644 locale/nl/LC_MESSAGES/pronterface.mo

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 ff0371d1e3bd8f5a5267cfe39ffea7f3ac48e986..3079929d61583e8c2c0afdb77cd6af9ec3a72ec9 100644
GIT binary patch
delta 1580
zcmZA1OGs2v9LMovjy*;#Q+sHZqp4+f#~EMQXqpxkVHl!8h2Yg>nwVy691(+>R-q6?
zj1g2I)uN<mBNVQJ=&=x&5m*$h+EmbE6E5oevs*}q`QOhy$8+!b-~YMSPsQ`aiFetq
ztA^H06cD*fj5&%KE)KMTG-KA{8O+8}T!l9<9q&8+$LOd35?A9-T#o5Wjai1dsD6QC
zDXuUkVZ47%Og&aGp%qgxg32L={LC;1H=cJKL)I|ks0FU061|ODXc{&DDHh@^YW`=;
z#P68J`X+^|$;4!%ZdAZQ3zwiSD0i%Mti?l&H=wQ?LscT_^e0dinnWcqjd}PC+wmQ$
zl3ub*V|~-YiAuH~^#n(84Gw4mUPO{Lmyl~s((wlJGj}*Bkq4NIk8mZ<pdMrnH{g5R
zg!5R7`Ko_6Cx<!d!H2jJSCRHeiZK?df0xHoV$V^DzQr8;f?2pE!<c%^K`q?ocpR1R
zDP*dNp%Ojs{CzZo`fK1C1J!s7mGLXbIn)i_qvm}?mF_F5GA=e!<8D-9xya9yanN-&
z=)p$Rylz~NLDU0W$fW+-qj3hPikU$5@1ZiDa(v=AgU1+u?ewd7T+M4jU3U<5<1S}B
zgsR{W_FxjV6+ci3W+ix2v}fxvA1&0&asXMw^dfW304hPvm!qf!uOP)RH&LJOBr1Uy
zsCQ-#mB0rq!e7{eMeN%!Ci*xT;p7dLVi$E}>lgN0rD`DbIckw&Vl(l#ZQ(@wudQfy
z29<OZq3uwDdN0%hgc2zyw8c9K9(<pv<V0^}389RYy^qivswZ09EIM0>3TIGX$u6QX
zIqO=NP~G_NweTjvzovSr=xW=E9Ry`qXjL575!wtj)mp9W4+}>x$HGN@)zL$2BeeM{
zTaC6)uVx*wxcTYiC(orlo!Ymw*wx(8KM;+@twV#s&<U$`C^%?!Mgt!A;r32zPpsdL
zhoTW{uO06Xc&dDUzvbI$`RY9Wx<IwR!sqw-l9%0i9siBF+w8%()fuxRgJC-!jRib=
zMq;6`r_Bxyg~BIw!~R}7?rH4vhW`$EPiSa&@U$HYd;6lv&+aYUCK4R7gDjoQNk8JM
S?+wMLBI&6qQ)e^2xqbsEyq+Hb

delta 1561
zcmY+^OKeP09LMofohhBR9^+Az8f~?xOQ%I&)QIUUq_klOO^6#>icXo1NLPcX$HF5f
zO^`?=tcV0nh*u)s36jRbBN7W?BNi;!%*OXOJrYjle?RA(-aF@i|L088CErVupZuNy
zLkkhp6eEn;C_P+g2fW5i!h`6?vp5E?VjkYJ<L4M;{0_%qZjLddun0$DnH|rwE<!#@
z)5JBG8=9@HSjl)JW@A4pm*dFCoaExe0qaF%O>-5s&<#|=cTfooq3-{HGw=)Qeh)Vn
zu)gup8Oy|ER3dYbkE!9Jg&R>1gsc&33$9{*4eGgzsES;%<6EdoJwzoigj4V%w&E}J
zv%YC2O)aniRl3cnH`s#{@u>a#1tfWM33=9BvED>J<}Mc{@)#%JYaETAQ7`fni|{uV
zqo13Ti|7RDY{Koh1)t({EGO-iS;mA><5Rqz61#><^a+l~x2Ot!!#Yf(7G9V?><U!E
zYmh&gc4P_DnNR&m#_X{-_Srui!y4w#pfZ1EeTn*_A=DSVM;*$~s0#kF^J!Fq-U98h
zF@;?8+$;>BgL-~-0rj6uX9E*@lf9_D>PIDZ+K$hmGQVuSZoQA~%)hYXQeIp4EkJ!w
zBkFr2cD@}|$xhsYhm&-)Ctpz+W^rP)ceywfi&2NB9$CYzMQ$}NW-4dxLoIj+d3kdJ
z^>aRtO5ir??7T!J@CIjM@&}#ebo^}KevD!tzQS1;p^h8@Q%EQgC83|C7AYmlh`((%
zolMy=WG9vEGD6#=1nUX4MuJ1Q-pr+=J#HX$+N+2egceuEsz#7lOephz+k6Idh<SEW
zhqH-TntI?VOsanTH!}-~f1B#2+Ne2%jx2ARX*zW}5ZVhhs*`CIR<VExsAF3Rs+N_6
zHou(UXEilb_*w>PONKGkSd{AaKJvE3yJCq!C#TF)(bgJuR>V8pL|0GD3A>4ohCp>y
zFz8g(IaP}T!J3BZ+RC<YG<DiHrTPCUUyIwDaH4TH*1OwH^u!wiD|=#YVuu?Gta9VM
z+d5)_B|E!^d!bJ5?RL9%&+km7eHAGuZ=H8tG~(0^9?8qj@`mI4w(c72&;RZD15-_v
Ae*gdg

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 006d9aad404301912e4a8f0c6807a3cd325534dd..a87b9fb4f169096c4fb50e2d5550058dea6b7dde
GIT binary patch
literal 8158
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

delta 2804
zcmY+_e{5Cd9mnyfK%o?9p|_<X<@SKI6xv?;V->suVbJP;{+cZmhQChQbIV=sIrrw=
zbE}3W-R8E0KjuuH7?WWbX4z)rHsUbq!m`a&=ZunQ%%V{-YO+icqsEyf8fW(Y+@4PN
zq~H5`&bjwI&-eL0&%J$X->bc|Z`Cb(z|c+-O~fZljG4t3D|w;)ZG|!G@p-Jnx3L!g
zg{yFB)xvcxCb(|KZtO)p=ixg1F7jvYi+vE6YpU~fR`SNLV;@63a0%P-GA_kWaT)#x
zSK|^MVgOT%)wn)(Gb;BEBuCQ|n?@yc0N3CNtkP1a>1cogHsfj30B5lgA4Wa!2V9HK
zp$2{pRf)H;9zR0<OeKTq{aRGQji~XOVz<P$;c}HaMP~^6Py^hH8sI0W5<d{%e;764
zqsX7R#EUBMS8T=0xB)-G5v<{1cGKLB+Bz4NXoO1W49=>QKc%CUJruw3Thta@M3wAW
zY``~Bd;BqKqUAiSfgDsKt*FF1<LkcodJnQ|rXRJyAygt0tEqntog6oI;%U4FA4Qe!
z8PwiCj~nqaCh;ojuvW1zC2YYyJd3yC%Xla5WbjRRKdKVH!_D{@9<DIvl^W`=0h26W
zE8L4(*%+#1J}UF?p)x*$H{v-|qE}Fr`ZrQ_Q^kc$pjMhhay4zJt?NUbu>n-V-Ygxh
z^en2B=TRU06{?g^pc42KDzWF{`|rf}uc9XU7`0WOqYiC?>}5MDfrF?@jH1R1P-kZL
zE;?GtIn)GC#vgbYwb!r5_dme$3b|QcAu7QnDuLG6uGlnkOiVvc;3zVLc?6ZfC8TJx
z<{3K5@b9=4-$j*r1ux~V4c@@@7F2?_Vg_eW30y&~>>sGTUCKV{xfa}l?RXsyqb3fK
zkDAk%)c5~>IyzhzVqd`RT>ld}CuSXWB~#;|R@9AJ@m|z`H=~{(MU^}k`$N=<AHr_D
zfLh=?sKl4^;T8J+*U<SIuE$+?1htZT@kjVeOk+Fy^aIS`8N7;GS&_2nbU%oD@Mp;3
zE;r^XC#?ww2p#qvgqjZW>~3B(cn_gfO%VOWVmm@-lo(vRfj1HQe{q!1iZr>traHK7
zL?`jp#*UUNxp+@ii<{PO%r>H>+*^3j>f4D9;vjL1_%@+^9V2=Pt^8ZW5b+H{ZP@~5
z9Qh)YPk4N*jJ|r>lEtRqAG41u?XQ|n_6TuE7qq>Ewq`#;wadQ|*W=BE4&wph1fjNN
z0rU0PKGb&Thsq(YC2k<L6KecMnJ#5|i>_$jT%i0~ANO~m4v$W_nhu(NYL62sf}`=j
zc9`ByV%Xlc@|DJsf)}JxDbqR{W`oGIj(Jg(4W{jntDmas_cCrN7ZvTFS9RFWSG{LH
zTis+Q)+DQ<d{}hynT-9-nydC~%@_7u?S~hCzcx`}UthP?uC8m@Haaric`)?cD4P#D
z``yS(J3U?9-JM;#JG-uTx_i?-yV^(l$8Di*!@&RFsvdNUQRjH*2F0AqL}}-6K5(N`
zZr}{LVR6a}oIT(17kc|MeAaifxm3o!QP)&GIJiHTP36Ps8*MVtxAf@vP4-wKS&5yy
z?cE8-zLc0sj1-hq(H!y%p;s)@PupYlhiaWKZ#ZN9X?vl*tz)D#6K2D5ee`bD_d+V=
zhOR&VNW{}-PwQ~LG~?xRUeO+EIJxqGTl9=x?BflaH>S+7`MEHg$$FuabDhZZ3tYQV
zDfI074M!TkGLlnpLuYD!j*3V2)Ac(l_Sxaa!^;MOD6~Isyrs5~^Rj_Cc*-qhGVZiz
zzi4b*HE?$n&d>STXnxM_xaPz#?}pP%RSKL;cJdUn>Va^2e$Fw&dEc4xl!fn3hWWG^
z%5%x%Q>AQV2J_P;<>(b1pPDd1vD)6Tp|xW8;?o<BR@hA&KdT%FX7cygjZJ&)$)?_|
zWAk%4Z&H;E$`3Bi=**vYvT>>GUz&EWnOsOYi1dzqsVR9aS#0yZOx@8Z$VG3rY&v0Q
zH|?+UoJr3qg!ySI?RzORaokoWudAQ(d^g~u6UX)G$$W{;u~(8kODMp7$?uD`%?*yL
zbrrM4$PFS-tDecTS&rspqEcx8m~69?&CLnlH@SSk(o3P!#=-La?e-VV9Tn!kouaKM

diff --git a/locale/nl/LC_MESSAGES/nl.mo b/locale/nl/LC_MESSAGES/nl.mo
deleted file mode 100644
index 9a092cec71d40a8ef35c99c02d6f724590ebf2f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8278
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

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 0000000000000000000000000000000000000000..dc2606e6d7ff3f5bf0ebf2d944deb794df1d21c5
GIT binary patch
literal 8205
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
Q#XCDd0_m6Uo67e81_>taApigX

literal 0
HcmV?d00001

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)

From 1e91e807b7d0db5118d27914e7af22ea1f81584b Mon Sep 17 00:00:00 2001
From: Cyril Laguilhon-Debat <mecton@gmail.com>
Date: Tue, 6 Sep 2011 18:55:52 +0200
Subject: [PATCH 4/5] Removing Tab chars, adding "Clear" button, and resizing
 translations

---
 locale/fr/LC_MESSAGES/fr.po          |  10 ++++++---
 locale/fr/LC_MESSAGES/pronterface.mo | Bin 8158 -> 8085 bytes
 pronterface.py                       |  30 +++++++++++++++++++--------
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/fr.po b/locale/fr/LC_MESSAGES/fr.po
index d18b1a0..92fb9ae 100755
--- a/locale/fr/LC_MESSAGES/fr.po
+++ b/locale/fr/LC_MESSAGES/fr.po
@@ -343,11 +343,11 @@ msgstr "Charger un fichier"
 
 #: pronterface.py:426
 msgid "SD Upload"
-msgstr "Copier sur la carte SD"
+msgstr "Copier sur SD"
 
 #: pronterface.py:430
 msgid "SD Print"
-msgstr "Imprimer depuis la carte SD"
+msgstr "Imprimer depuis SD"
 
 #: pronterface.py:438
 #: pronterface.py:1021
@@ -359,10 +359,14 @@ msgstr "Imprimer depuis la carte SD"
 msgid "Pause"
 msgstr "Pause"
 
-#: pronterface.py:452
+#: pronterface.py:458
 msgid "Send"
 msgstr "Envoyer"
 
+#: pronterface.py:462
+msgid "Clear"
+msgstr "Effacer"
+
 #: pronterface.py:460
 #: pronterface.py:518
 msgid "mm/min"
diff --git a/locale/fr/LC_MESSAGES/pronterface.mo b/locale/fr/LC_MESSAGES/pronterface.mo
index a87b9fb4f169096c4fb50e2d5550058dea6b7dde..2a320dfb2e96588ba204cacb2bbe1e9e076b8c4e 100644
GIT binary patch
delta 2427
zcmZA1e@xVM9LMoDc*!9mbSH{>bRZV~$POz_`r&B`qKPQ}27f?w7$$PkTtDVGn}xWE
zZeFI$TCK+BvRv-e*6hcYZAj}6`J?)SrMa|~b0Zeo)@Jp5-F^J0&v<_ypYQjM&*$@g
ze?H&496l0`UG{m77%fT!h_^?W=|Lca3oV*yHV${94?8gjk7E{|boZa4pZi{%g#)Pn
z%N}KRFHS)(&cS;yj7$-;a`!=%b1m|}wgro^8Tqp=_xu=Y!1r+mo<Y`ZKcfe);b{CF
zN8)Yd&+a(AtXd23Cykj+prd4i&JxthLzs;f7{b-43|_}d>_QFv0|xOb=3*MNYXTpR
z$9&W{rKr#6q2{Z`9Ok!mbjIRVROY+g7dlWG9YhTncXm79MP=B7RrnF+;oqona+y^V
zO~m;)8Cjz>qCRiMnD+7&I@-JasEpo0#;_B}pPl8Ri7wy+_$^MrA*{x%F=pvlhdLvh
zQ3>rtExZFY-T_nvy4~{+$FTqU!Y4e?o}NRM{vs-qE2xFtLQR;-YW4kM)Pkm=GAwoX
zbKQLywN;BznXW)Bs1_N@S}}y}s=rEniU;|aK;3_bI#m5Q3BSkta0vC5<dViNoQay?
z15{~0MosV;&c=(l3ID-*+(?!M_yuY~12H-(-5)p^|3qatjyfvC0PaX5W7Gl;Qw~+;
zG^!%KsFGiG&xcVJ9L4DKun6_NdSqyO6}80&P!)<DrK1wQ=RP>$K1iVU>~oxseW(nF
zQ5k9#I`uiIOhc$~BB+YAAjPtm-1B|TL#PEFP2I=rl>6WuYDHh72Ixh7u^;ss{f5g>
z4|QLKDs2R{&<m&vUBan2h#D`SFYC}2p|-dZwS^7n<@{MY9ja#gP^CJK8t^P?3%*8W
z)`wbHzjMHO9d%{~aUBk0AueM!ZA}YmA$zbE_oKG>8jjZce}m2x{0p_R0IQ(NR)#u!
z%bnX$19e~-9zy=Ck4qE&f?DX(iK#<YgGJm&Q4=0Uov~x6U)J*&Q-)XQXy9K_6Az+F
z>0x#)px7D4Y24SL&cGYU!L~P1XQKyIq0^}G&Z8>u4f0cAKO)7k>&R}}ok`Sx79Brn
zYk+dpUadrB^0IRe>JWCK7LY(?_7m>Ke^C?f<=xUaU8u@*V?8GDH5^M;?f4d|0(n8|
z&tj~Mqpa6(4Tf+%s$`w03LV5We4J1Tn~51jE73yeq(4Kb6%s26ZOJ2q+M`4xp{gm7
zMTA;@jLZFmR=<__f7`%=3PLA8LTo1L39UX%Y$Mc^?UO{cZfMD*Qr+Zr4%g?2C)~3K
zaXB$l_iG64Po-{Xs>DV@dpMg=sr81u5YP6GU$B&(+Nu=xFlrOogXB+6a!C5CiN^?S
zsM@oHj`>sZh&R}xZJbZ6AnrC*eiJd5;0Pw$cCJyPJauai;Z$M?QA<2WsFf0IQnInT
zw!rllVnKY!8(gx3p2t01i|dIxLMNWzisXLl{oO*`ZHwtt5hX+eQA0eP*pPWL&9gny
z(3VKg3T4DAeLd+FHSw=}CGmiNcjA)2AU&hJsi~nc(w4ZH7aW<rYLP8$jW$Qx3SZpS
KmY5zmGvYs!x!Ml^

delta 2497
zcmY+^drZ}39LMp8OK?!s0))7pqtywc0}>I62_pC6qM`*T#tDu<DTf_6=0A33<jS=!
z11)D4bF%oO`bP}cy4hN8j8@Satt?rsm0Q^w&8?7H@6X|(t!L+ZUeE9O{mygwKF{wQ
zE4@@2x|9%o%uxJ925~gX7&XMl@<nNnGbS0mn1Bax1wMsK@kM(*iiupG!+e}X{qAqP
z0h5*(<3KlFhk3{lAya5?Y_wJ(zcGz?6Sg29bI`UwiRy3&b8rNiv-upO@k@-yuQ3LH
zLO$k-^-t6UqL_Uw<D0l}g-%g3PQ_)o7W1$KHS=Dq!ADRXo<}E6;`R6os^fV~!ANGI
ze$r6)vr$Q1kIG;fCNaL*N<}N)V;|^4t>gfz!-LjA>k-t-p2d269#`UzsD9>914T3X
zCX7esWa?4(TTm0|z>xN=pNdxW1oB%mgnZ0NzBJIA=*F{{iWjjFuVN%tE?+nsHJHTp
zPSnKvQ2p&kWnj>@AGMxXPX4u*uhO8@pFyo;0yVK2)PR4WI$XxIHK9b*3e)WMYJ0r~
zwN?43l@_BWRDpD1S}+g0Q5inIg8bh|<z?G2jyg>5U^;$)S$GlkcFbWAQ&^4$cp8=3
z7f=J7#zH)UZFm{mv5Hk@;wWlDAEPq&O^C{BD&L`2sCP^&jKPm0STSk>Q=~(g`5l#!
z7<$p`=t8v@pfXsCCD@L7?j+K+c^kFGlc)?$qcRwpu{VCUH)c_Lb`5Vs2fb^B1*jF4
zqE3AS7Gf`|qY+d_-awLM#%=or>!+v*PTT7%$V5WsDi!_kANzoVr}X+bu?~yu_2a0N
zzJ!|K94a%hJe-Yg)XExBhqW2CwIS5j9k=)2LY=MmF;(yX7gW^Yuc*}jg<6q*t%*6T
z3DykM;c?^rn1e1HL~Y3kY9i;b70;u#Hl6*@IIHkx%*717|4mfLw&_D1y2I8}sE*#l
z^>_jKaP0Z75U7bBLLIInxC%#615TjM)@P`H(pl63lNm()W@1PKyQwIZ8<3A_weH6?
zTo0l4{$1oin@QA}_!gC+%cu@#k&n5?7rSFp$UDh2xybICD$K`SsNX-6LH@N@Cuq=0
zKD17t4&M}N0`sVqxmo5Q)}RLd1l7?rDl<P|JI>=FY-3fA;tVPSyE(a<;A5!Q?-eKc
z&!cjR2BmBYm7=dO0+n_R+)Zdgy~JKZC;T2lg-6X6!bjXeES3kUC~I0kxozYqg!f*P
z*B0vh{jW50RY}}SbP{dE1BCXmgy<nuwAu|sgDxmq)w*zP;j0k3h+^B8gY~w)9r@=r
z)dY!JNX1Un9^Of~2)!Z?4QD!1%4(^pY+E3_gKMc55F3fxZF>{mMciVqy{M$$Jsfm6
z_hnNnB^rsvl1pV5QABVy!{uSV{Y1sWrSagcL=DkGbPy`qHFh;zw1`a$RkIm0h9lyf
zwfm^)JyqF3=v{3kbmDb7wcqy<yNSh8MWv3=p=>9%5@lmOaj!>=r7iWuCU5ig`2z!<
z`u?t-PS56GSHEYwzt}ZgmGGLQuB@SYM_F~{@NWsHi<&)K{Jzef0Z*N`w=3xF@)f(P
z0>0jk?j`@-Y4QgH9lr8zZ=l~dQ0xj0?D4D{doD36a%_BMR*ZA6*VW+-4ES746{g(Z
U*W(Mg`hx-2V)NMd>1U(<1*q5b3IG5A

diff --git a/pronterface.py b/pronterface.py
index 4bcb1df..865d022 100755
--- a/pronterface.py
+++ b/pronterface.py
@@ -1,15 +1,20 @@
 #!/usr/bin/env python
 
 # Set up Internationalization using gettext
-import gettext
-gettext.install('pronterface', './locale', unicode=1)
+# searching for installed locales on /usr/share; uses relative folder if not found (windows)
+import os, gettext
+
+if os.path.exists('/usr/share/pronterface/locale'):
+    gettext.install('pronterface', '/usr/share/pronterface/locale', unicode=1)
+else: 
+    gettext.install('pronterface', './locale', unicode=1)
 
 try:
     import wx
 except:
     print _("WX is not installed. This program requires WX to run.")
     raise
-import printcore, os, sys, glob, time, threading, traceback, StringIO, gviz, traceback, cStringIO
+import printcore, sys, glob, time, threading, traceback, StringIO, gviz, traceback, cStringIO
 try:
     os.chdir(os.path.split(__file__)[0])
 except:
@@ -273,19 +278,20 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
     def popmenu(self):
         self.menustrip = wx.MenuBar()
         # File menu
-	m = wx.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")))
         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()
+        # 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':
+        
+        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
@@ -445,14 +451,17 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
         self.logbox.SetEditable(0)
         lrs.Add(self.logbox)
         lbrs=wx.BoxSizer(wx.HORIZONTAL)
-        self.commandbox=wx.TextCtrl(self.panel,size=(250,30),pos=(440,420),style = wx.TE_PROCESS_ENTER)
+        self.commandbox=wx.TextCtrl(self.panel,size=(240,30),pos=(440,420),style = wx.TE_PROCESS_ENTER)
         self.commandbox.Bind(wx.EVT_TEXT_ENTER,self.sendline)
         #self.printerControls.append(self.commandbox)
         lbrs.Add(self.commandbox)
-        self.sendbtn=wx.Button(self.panel,-1,_("Send"),pos=(700,420))
+        self.sendbtn=wx.Button(self.panel,-1,_("Send"),size=(55,28), pos=(700,420))
         self.sendbtn.Bind(wx.EVT_BUTTON,self.sendline)
         #self.printerControls.append(self.sendbtn)
         lbrs.Add(self.sendbtn)
+        self.clearbtn=wx.Button(self.panel,-1,_("Clear"),size=(55,28), pos=(750,420))
+        self.clearbtn.Bind(wx.EVT_BUTTON,self.clearOutput)
+        lbrs.Add(self.clearbtn)
         lrs.Add(lbrs)
         
         #left pane
@@ -819,6 +828,9 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
         wx.CallAfter(self.logbox.AppendText,">>>"+command+"\n")
         self.onecmd(str(command))
         self.commandbox.SetSelection(0,len(command))
+
+    def clearOutput(self,e):
+        self.logbox.Clear()
         
     def statuschecker(self):
         try:

From 786bf24f324fc727a8c85995411830640fa4308a Mon Sep 17 00:00:00 2001
From: Cyril Laguilhon-Debat <mecton@gmail.com>
Date: Tue, 6 Sep 2011 21:26:37 +0200
Subject: [PATCH 5/5] Moved "Clear" button to menu

---
 locale/fr/LC_MESSAGES/fr.po          |  12 ++++++++----
 locale/fr/LC_MESSAGES/pronterface.mo | Bin 8085 -> 8193 bytes
 pronterface.py                       |   7 +++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/fr.po b/locale/fr/LC_MESSAGES/fr.po
index 92fb9ae..7e1bba0 100755
--- a/locale/fr/LC_MESSAGES/fr.po
+++ b/locale/fr/LC_MESSAGES/fr.po
@@ -239,6 +239,14 @@ msgstr " Quitter le programme"
 msgid "&File"
 msgstr "&Fichier"
 
+#: pronterface.py:284
+msgid "Clear console"
+msgstr "Effacer la console"
+
+#: pronterface.py:284
+msgid " Clear output console"
+msgstr "Effacer le contenu de la console de sortie"
+
 #: pronterface.py:285
 msgid "&Macros"
 msgstr "&Macros"
@@ -363,10 +371,6 @@ msgstr "Pause"
 msgid "Send"
 msgstr "Envoyer"
 
-#: pronterface.py:462
-msgid "Clear"
-msgstr "Effacer"
-
 #: pronterface.py:460
 #: pronterface.py:518
 msgid "mm/min"
diff --git a/locale/fr/LC_MESSAGES/pronterface.mo b/locale/fr/LC_MESSAGES/pronterface.mo
index 2a320dfb2e96588ba204cacb2bbe1e9e076b8c4e..0dc2de7b77b999a0978d95227a2da47bc0089122 100644
GIT binary patch
delta 2568
zcmYk-YfzL`9LMp)3c-d#tP)fLi<ygHf+?CQ0$vak<&v06B-^rE#IlR9`>M+mWo6AU
zspUAnXr>o2z34?3%qg=P%dvb>)-*LSHjZO<r?FCJv}TyTzh@5(&+PyCob&9%x%|&L
z%YoXVI_In}{ea=xMa(8%oo38IT#(6)Yme8M8}T{J$5+sYM=%#pVK$E0`j0r1`W0M+
z-s@9;zXJ29w_z4`V}>z~>7$^&2JIJ*Sa&0Bm|?sX4<aA)zI}cY)!>&{f#;F2n;b@y
zjy{}@1$Z6KMP4x#)}=Uu{!KjvMq-*#18KK*qGle(8Tcqx;`68(9K}Zb1l90#dMm*K
zyaAV?+HJ%F+>B}`V!uydCjFbIDJYf0I167!&HQb>fX7fXI)Q5Nl=Zar8`KQX;3hne
zTB<5~Q#%c)c3Q9ww;^LThtSarBNQ}%H&AQ$5o$(XBW;<p$jAK7O&wjsd1!Ksxd{T;
zjP>ZjeW*S15^6%Pp$2{o)!xUb44uv)|N7#bec>n6nvSDVKY^M_KBLpXDo`EPqW*3>
zYCt<tGmO}J%+`~rrFslC(PvNt+KV)8Msmr2C56L0P>L^LA^vLX9)_t+m5H}tHWp(5
zby^xQi6K-6W2n^rfa>5PR^tSA;u2=ph5NAxFF6!6qCE1Y)Xl>=I3G2`Ce#euFqX!Q
zQ3Lplbd=-Is0{gNM42f=UNNgt&)ZR%?8R01B<j86s7yO&C}^$!K&9#`DwS#cwVr!X
z&u5|5t_am}IclcusF?;)yT2c+aWAT!lc>ymfh5&@XP^I)(lLKh&<L-hMxIMWe>ex#
zaXG4i#mL9haMN+xf=w8;_4iOI{t7kFN?uZ?R$>`;pxWDw+PuS9sPliAg4XhL`@(Oi
z&2|Zus!TS78Z1RE#X{5ot5E~1v97naqV`e;-iux6$9GW^977Fc9CzsaU!kD2ZlO1I
zv=!%K2sN-h$f}qT)FwP?{T9{G-?$wAMLwqbW=;Y&qXv2ewb?$zQv4p(-vm0^Z0WSB
zpV$Cuh8s~0x1l=jK&7%D`Ir~1uj72`pQ84_U&uyxN3Fe)$LN)zB2;?;R0gV0zb9*E
zlYg>oT6w_on;u+*4yu8-P;2!8Y9<$~<ETw|88v_srl*;0z^AYm)$v7CJJ(Q|$zT>;
zSb{_NL^1h)oPvj~s|*YwlQ1Kw<9Hk^@dPSmmr)t|2h(r~p$>Y8dP0M7Gk}xV0t%W$
zm3^?vs^jN#xG^}>ZXb4I8L`XOL%594;5HF`1bw@Mh+_kx>z)+utW{K2b;Ss!el77Z
zv7M+RZYOj(T3=lohzE%%QA_BoPF_1GY$Wa@!o(Uv>DSdrXe~K)?(ana?;yyqxtq|X
zrPYb(Cz=TMyZal#-gDgaQg{D{x2Z7Y(wgs_QlDnaI-VWGYFiIt4be<=5f2a^LZ|39
zLRW;?;+9gk`$7B9J#xKNbXM1;zH{#nac`YcS8<!Icj9J(6Xb5J71%;7CA3dg61vtC
zeigX3653n3781*eyOfGjLc9J>LYI!x;urh8#lCQGz#mU0`jZKNC>|S(N5iAfdiSMe
z{a-80K9p6yE)ofb!UO(jSkDvTSkm7e_D6%0Z>csIA4v3sN8g;8;mMxz)#y9<=e+*`
DIg#a$

delta 2483
zcmZA1YfRQv9Ki8|QUP8AL{v&p^O6}@Y0^b71IYw$cuBlqN(80gz;#*k(P>^bFUvAz
z)@n63*Tv<Yv^A?2*@m`W#Ea?$D|KnB-k6JOYqR=(9}aIi<M;pk&;NNi=lp)>{GV;*
zhsqK^WTzhrv{s^kc&&d3J}9_}3#~OXggo4Y*|-~r;87fa@5cT|m_xr4r(!qye}l3@
zxEaS`22RHtund_Z5h~&b)zPKM|AsX<7Mqa2urEG8f)4l=PR0+BHHV9sj+b#D{(?8+
zpU7Xh9?f9YE+8jmB7_m#nC$521a#%aI0!4T7;DiCc3>6mLkIpAN8=?NifPR51lc$o
z^U-li(9dV0^UcR0%paC<lZ%aL<}buA>_ju#j}G{9v?KZkn&C05#`ka-{*8_^lv$l<
zB$neCWQ}1R`gsc`+{@><aqsq^8NH5-5so8&;S?7qI*a4+OB{jMa6S$g96~>=L(j-+
zG@(uC!gr$M?L{ll5ud*^nEm$)AMn6EJ&l(B9Gb}mbYXv>6K1knzdsgT&?Gd&lGvXS
z`(@}>%|SC=fG%hSGE`{6V%%c=E%6B+<YN-;e}x{ZE*yp5;H`KKeM^Rt#%7#?PVhEb
z+V{~3KE`Qy4p-qnSdS~o@)rCQT~K#|8%y^aj=|s24D+a?85ZEiG%`jPaFB9XnUiQm
zI?<9}iqCt{3T83-Oe{jbSC0%Go=3NMFIu6*VQwtpoAHC=@q;9~XP@BhcplBL2hGq`
zc<P6snHHntG@upPfD|h{6QA#j9zYj(xVN7OC*lXE(G`7$4$z5yu?u~Te#Uv|L;KZe
zX&camo<%G4HBQ8<=y>^j*+W}|ZgCa5g=;Z`^B1;oL)F4Av{XmY0Z*Y@@Hv{<d30f2
z(eCIK^vqnvW!Qs-IFH%fnhoeew&DuhgKqI<9O(Q1D>vitFLY%Etb!_sQuOfEM4Qop
zc48?WK>oscE>GZ(=tAd?>^)?Qu!w#uI^jX|j2%ILS<hg?3@>owz(1iAUqwrq&g?E=
zY_tp~(XT_#z>CPi4zHkR;}}|@ljwM7&<cEk{8WVRkm7_Z$Zm$~qp1H>ZgNQ50V>eF
zT8L)yY;-Gn2zR3kNTQj2kK6HIbmHy2TaL32txN~jV-mMvE?I5CSJ4U#8%_OLOep0j
z`x-96VqA`vY&Tk={g{UL5tgutm`t<~8wgMOqlB%HSV*`fcN4aIh;@WjGm(c0TYiGe
zZG@|DB>vwX<3T0i$!{Q56ZM3vFC&@>o7p}<%(p{JCDnVIx=!c%ByoRyb_doF&L5T#
z?oX8+nw3~dxQEjSOYIx-6w#mPYgWcKx0kRudKbE_>`LlKXi9uui}w=aWB+mI_vAkq
zABewFHV=-?1LmHW6AOsG<~FS&W)Pg$RC}6hD^bzg4R_*1;t^s6v7WG%5bP+8{5cC@
zR;m-iY~-w@4v~+t2oIvC)!zi$Mj}0R7s66pPSg>;IsE3N&W*nVYlyx!hns3*0<o4@
zL_9<cPp!Og*81knZS94ND`(BFEo^IOZ*SVz*p@t%`BGZ4W<W<qGCMcDU$Q9gV&;D!
Crq6c(

diff --git a/pronterface.py b/pronterface.py
index 865d022..8acf6de 100755
--- a/pronterface.py
+++ b/pronterface.py
@@ -281,6 +281,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
         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")))
+        self.Bind(wx.EVT_MENU, self.clearOutput, m.Append(-1,_("Clear console"),_(" Clear output console")))
         self.Bind(wx.EVT_MENU, self.OnExit, m.Append(wx.ID_EXIT,_("E&xit"),_(" Closes the Window")))
         self.menustrip.Append(m,_("&File"))
         
@@ -298,6 +299,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
             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.menustrip.Append(m,_("&Settings"))
         self.update_macros_menu()
         self.SetMenuBar(self.menustrip)
@@ -451,7 +453,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
         self.logbox.SetEditable(0)
         lrs.Add(self.logbox)
         lbrs=wx.BoxSizer(wx.HORIZONTAL)
-        self.commandbox=wx.TextCtrl(self.panel,size=(240,30),pos=(440,420),style = wx.TE_PROCESS_ENTER)
+        self.commandbox=wx.TextCtrl(self.panel,size=(295,30),pos=(440,420),style = wx.TE_PROCESS_ENTER)
         self.commandbox.Bind(wx.EVT_TEXT_ENTER,self.sendline)
         #self.printerControls.append(self.commandbox)
         lbrs.Add(self.commandbox)
@@ -459,9 +461,6 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
         self.sendbtn.Bind(wx.EVT_BUTTON,self.sendline)
         #self.printerControls.append(self.sendbtn)
         lbrs.Add(self.sendbtn)
-        self.clearbtn=wx.Button(self.panel,-1,_("Clear"),size=(55,28), pos=(750,420))
-        self.clearbtn.Bind(wx.EVT_BUTTON,self.clearOutput)
-        lbrs.Add(self.clearbtn)
         lrs.Add(lbrs)
         
         #left pane