Merge pull request #1513 from XPila/MK3

Localization (script fix + new texts + updated .po and .pot)
prusa3d · Feb 7, 2019 · fe75e9d · fe75e9d
2 parents 3fd66d0 + 6309efc
commit fe75e9d
Show file tree

Hide file tree

Showing 15 changed files with 2,610 additions and 1,618 deletions.
diff --git a/lang/lang-add.sh b/lang/lang-add.sh
@@ -34,7 +34,7 @@ insert_xx()
 	#replace '[' and ']' in string with '\[' and '\]'
 	str=$(echo "$1" | sed "s/\[/\\\[/g;s/\]/\\\]/g")
 	# extract english texts, merge new text, grep line number
-	ln=$((cat lang_en_$2.txt; echo $1) | sed "/^$/d;/^#/d" | sed -n 'p;n' | sort | grep -n "$str" | sed "s/:.*//")
+	ln=$((cat lang_en_$2.txt; echo "$1") | sed "/^$/d;/^#/d" | sed -n 'p;n' | sort | grep -n "$str" | sed "s/:.*//")
 	# calculate position for insertion
 	ln=$((4*(ln-2)+1))
 	# insert new text

diff --git a/lang/lang_en.txt b/lang/lang_en.txt
@@ -13,6 +13,9 @@
 #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4
 "\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode"
 
+#
+">Cancel"
+
 #MSG_BABYSTEPPING_Z c=20 r=0
 "Adjusting Z"
 
@@ -88,6 +91,9 @@
 #MSG_RECOVER_PRINT c=20 r=2
 "Blackout occurred. Recover print?"
 
+#
+"Calibrating home"
+
 #MSG_CALIBRATE_BED c=0 r=0
 "Calibrate XYZ"
 
@@ -232,6 +238,9 @@
 #MSG_MOVE_E c=0 r=0
 "Extruder"
 
+#
+"Fail stats MMU"
+
 #MSG_FSENS_AUTOLOAD_ON c=17 r=1
 "F. autoload  [on]"
 
@@ -484,6 +493,15 @@
 #
 "Measured skew"
 
+#
+"MMU fails"
+
+#
+"MMU load failed     "
+
+#
+"MMU load fails"
+
 #MSG_MMU_OK_RESUMING c=20 r=4
 "MMU OK. Resuming..."
 
@@ -496,6 +514,9 @@
 #
 "MMU needs user attention."
 
+#
+"MMU power fails"
+
 #MSG_STEALTH_MODE_ON c=0 r=0
 "Mode    [Stealth]"
 
@@ -529,6 +550,9 @@
 #MSG_NO_CARD c=0 r=0
 "No SD card"
 
+#
+"N/A"
+
 #MSG_NO c=0 r=0
 "No"
 
@@ -652,12 +676,21 @@
 #MSG_PRINT_ABORTED c=20 r=0
 "Print aborted"
 
+#
+"Preheating to load"
+
+#
+"Preheating to unload"
+
 #MSG_SELFTEST_PRINT_FAN_SPEED c=18 r=0
 "Print fan:"
 
 #MSG_CARD_MENU c=0 r=0
 "Print from SD"
 
+#
+"Press the knob"
+
 #MSG_PRINT_PAUSED c=20 r=1
 "Print paused"
 
@@ -688,6 +721,9 @@
 #MSG_REMOVE_OLD_FILAMENT c=20 r=4
 "Remove old filament and press the knob to start loading new filament."
 
+#
+"Prusa i3 MK3S OK."
+
 #
 "Prusa i3 MK2 ready."
 
@@ -763,6 +799,12 @@
 #MSG_SHOW_END_STOPS c=17 r=1
 "Show end stops"
 
+#
+"Sensor state"
+
+#
+"Sensors info"
+
 #
 "Show pinda state"
 
@@ -871,6 +913,12 @@
 #
 "Total failures"
 
+#
+"to load filament"
+
+#
+"to unload filament"
+
 #MSG_UNLOAD_FILAMENT c=17 r=0
 "Unload filament"
 

diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
@@ -18,6 +18,10 @@
 "\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode"
 "\x1b[2JPOZOR:\x1b[1;0HCrash detekce\x1b[2;0Hdeaktivovana ve\x1b[3;0HStealth modu"
 
+#
+">Cancel"
+"\x00"
+
 #MSG_BABYSTEPPING_Z c=20 r=0
 "Adjusting Z"
 "Dostavovani Z"
@@ -118,6 +122,10 @@
 "Blackout occurred. Recover print?"
 "Detekovan vypadek proudu.Obnovit tisk?"
 
+#
+"Calibrating home"
+"\x00"
+
 #MSG_CALIBRATE_BED c=0 r=0
 "Calibrate XYZ"
 "Kalibrace XYZ"
@@ -310,6 +318,10 @@
 "Extruder"
 "\x00"
 
+#
+"Fail stats MMU"
+"\x00"
+
 #MSG_FSENS_AUTOLOAD_ON c=17 r=1
 "F. autoload  [on]"
 "F. autozav. [zap]"
@@ -646,6 +658,18 @@
 "Measured skew"
 "Merene zkoseni"
 
+#
+"MMU fails"
+"\x00"
+
+#
+"MMU load failed     "
+"\x00"
+
+#
+"MMU load fails"
+"\x00"
+
 #MSG_MMU_OK_RESUMING c=20 r=4
 "MMU OK. Resuming..."
 "MMU OK. Pokracuji..."
@@ -662,6 +686,10 @@
 "MMU needs user attention."
 "MMU potrebuje zasah uzivatele."
 
+#
+"MMU power fails"
+"\x00"
+
 #MSG_STEALTH_MODE_ON c=0 r=0
 "Mode    [Stealth]"
 "Mod       [tichy]"
@@ -706,6 +734,10 @@
 "No SD card"
 "Zadna SD karta"
 
+#
+"N/A"
+"\x00"
+
 #MSG_NO c=0 r=0
 "No"
 "Ne"
@@ -870,6 +902,14 @@
 "Print aborted"
 "Tisk prerusen"
 
+#
+"Preheating to load"
+"\x00"
+
+#
+"Preheating to unload"
+"\x00"
+
 #MSG_SELFTEST_PRINT_FAN_SPEED c=18 r=0
 "Print fan:"
 "Tiskovy vent.:"
@@ -878,6 +918,10 @@
 "Print from SD"
 "Tisk z SD"
 
+#
+"Press the knob"
+"\x00"
+
 #MSG_PRINT_PAUSED c=20 r=1
 "Print paused"
 "Tisk pozastaven"
@@ -918,6 +962,10 @@
 "Remove old filament and press the knob to start loading new filament."
 "Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho."
 
+#
+"Prusa i3 MK3S OK."
+"\x00"
+
 #
 "Prusa i3 MK2 ready."
 "Prusa i3 MK2 ok."
@@ -1018,6 +1066,14 @@
 "Show end stops"
 "Stav konc. spin."
 
+#
+"Sensor state"
+"\x00"
+
+#
+"Sensors info"
+"\x00"
+
 #
 "Show pinda state"
 "Zobrazit stav PINDA"
@@ -1162,6 +1218,14 @@
 "Total failures"
 "\x00"
 
+#
+"to load filament"
+"\x00"
+
+#
+"to unload filament"
+"\x00"
+
 #MSG_UNLOAD_FILAMENT c=17 r=0
 "Unload filament"
 "Vyjmout filament"