merge changes from upstream

This commit is contained in:
PavelSindler 2019-02-12 13:38:02 +01:00
commit af77db321b
15 changed files with 2610 additions and 1618 deletions

View File

@ -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

View File

@ -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"

View File

@ -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"

View File

@ -18,6 +18,10 @@
"\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode"
"\x1b[2JWARNUNG:\x1b[1;0HCrash Erkennung\x1b[2;0Hdeaktiviert im\x1b[3;0HStealth Modus"
#
">Cancel"
"\x00"
#MSG_BABYSTEPPING_Z c=20 r=0
"Adjusting Z"
"Z wurde eingestellt"
@ -118,6 +122,10 @@
"Blackout occurred. Recover print?"
"Stromausfall! Druck wiederherstellen?"
#
"Calibrating home"
"\x00"
#MSG_CALIBRATE_BED c=0 r=0
"Calibrate XYZ"
"Kalibrierung XYZ"
@ -310,6 +318,10 @@
"Extruder"
"\x00"
#
"Fail stats MMU"
"\x00"
#MSG_FSENS_AUTOLOAD_ON c=17 r=1
"F. autoload [on]"
"F.Autoladen [an]"
@ -646,6 +658,18 @@
"Measured skew"
"Schraeglauf"
#
"MMU fails"
"\x00"
#
"MMU load failed "
"\x00"
#
"MMU load fails"
"\x00"
#MSG_MMU_OK_RESUMING c=20 r=4
"MMU OK. Resuming..."
"MMU OK. Weiterdrucken..."
@ -662,6 +686,10 @@
"MMU needs user attention."
"MMU erfordert Benutzereingriff."
#
"MMU power fails"
"\x00"
#MSG_STEALTH_MODE_ON c=0 r=0
"Mode [Stealth]"
"Modus [Stealth]"
@ -706,6 +734,10 @@
"No SD card"
"Keine SD Karte"
#
"N/A"
"\x00"
#MSG_NO c=0 r=0
"No"
"Nein"
@ -870,6 +902,14 @@
"Print aborted"
"Druck abgebrochen"
#
"Preheating to load"
"\x00"
#
"Preheating to unload"
"\x00"
#MSG_SELFTEST_PRINT_FAN_SPEED c=18 r=0
"Print fan:"
"Druckvent.:"
@ -878,6 +918,10 @@
"Print from SD"
"Drucken von SD"
#
"Press the knob"
"\x00"
#MSG_PRINT_PAUSED c=20 r=1
"Print paused"
"Druck pausiert"
@ -918,6 +962,10 @@
"Remove old filament and press the knob to start loading new filament."
"Entfernen Sie das alte Filament und druecken Sie den Knopf, um das neue zu laden."
#
"Prusa i3 MK3S OK."
"\x00"
#
"Prusa i3 MK2 ready."
"Prusa i3 MK2 bereit."
@ -1018,6 +1066,14 @@
"Show end stops"
"Endschalter Status"
#
"Sensor state"
"\x00"
#
"Sensors info"
"\x00"
#
"Show pinda state"
"Pinda-Status anzeigen"
@ -1162,6 +1218,14 @@
"Total failures"
"\x00"
#
"to load filament"
"\x00"
#
"to unload filament"
"\x00"
#MSG_UNLOAD_FILAMENT c=17 r=0
"Unload filament"
"Filament entladen"

View File

@ -18,6 +18,10 @@
"\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode"
"\x1b[2JATENCION:\x1b[1;0HDec. choque\x1b[2;0Hdesactivada en\x1b[3;0HModo silencio"
#
">Cancel"
"\x00"
#MSG_BABYSTEPPING_Z c=20 r=0
"Adjusting Z"
"Ajustar Z"
@ -118,6 +122,10 @@
"Blackout occurred. Recover print?"
"Se fue la luz. ?Reanudar la impresion?"
#
"Calibrating home"
"\x00"
#MSG_CALIBRATE_BED c=0 r=0
"Calibrate XYZ"
"Calibrar XYZ"
@ -310,6 +318,10 @@
"Extruder"
"Extruir"
#
"Fail stats MMU"
"\x00"
#MSG_FSENS_AUTOLOAD_ON c=17 r=1
"F. autoload [on]"
"Autocarg.Fil[act]"
@ -646,6 +658,18 @@
"Measured skew"
"Desviacion medida:"
#
"MMU fails"
"\x00"
#
"MMU load failed "
"\x00"
#
"MMU load fails"
"\x00"
#MSG_MMU_OK_RESUMING c=20 r=4
"MMU OK. Resuming..."
"MMU OK. Resumiendo..."
@ -662,6 +686,10 @@
"MMU needs user attention."
"MMU necesita atencion del usuario."
#
"MMU power fails"
"\x00"
#MSG_STEALTH_MODE_ON c=0 r=0
"Mode [Stealth]"
"Modo [Silencio]"
@ -706,6 +734,10 @@
"No SD card"
"No hay tarjeta SD"
#
"N/A"
"\x00"
#MSG_NO c=0 r=0
"No"
"\x00"
@ -870,6 +902,14 @@
"Print aborted"
"Impresion cancelada"
#
"Preheating to load"
"\x00"
#
"Preheating to unload"
"\x00"
#MSG_SELFTEST_PRINT_FAN_SPEED c=18 r=0
"Print fan:"
"Ventilador del fusor:"
@ -878,6 +918,10 @@
"Print from SD"
"Menu tarjeta SD"
#
"Press the knob"
"\x00"
#MSG_PRINT_PAUSED c=20 r=1
"Print paused"
"Impresion en pausa"
@ -918,6 +962,10 @@
"Remove old filament and press the knob to start loading new filament."
"Retire el filamento viejo y presione el dial para comenzar a cargar el nuevo filamento."
#
"Prusa i3 MK3S OK."
"\x00"
#
"Prusa i3 MK2 ready."
"Preparado para i3 MK2."
@ -1018,6 +1066,14 @@
"Show end stops"
"Mostrar endstops"
#
"Sensor state"
"\x00"
#
"Sensors info"
"\x00"
#
"Show pinda state"
"Mostrar estado 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"
"Soltar filamento"

View File

@ -18,6 +18,10 @@
"\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode"
"\x1b[2JATTENTION :\x1b[1;0H Detection de crash\x1b[2;0H desactivee en mode\x1b[3;0H Furtif"
#
">Cancel"
"\x00"
#MSG_BABYSTEPPING_Z c=20 r=0
"Adjusting Z"
"Ajustement de Z"
@ -118,6 +122,10 @@
"Blackout occurred. Recover print?"
"Coupure detectee. Recup. impression ?"
#
"Calibrating home"
"\x00"
#MSG_CALIBRATE_BED c=0 r=0
"Calibrate XYZ"
"Calibrer XYZ"
@ -310,6 +318,10 @@
"Extruder"
"Extrudeur"
#
"Fail stats MMU"
"\x00"
#MSG_FSENS_AUTOLOAD_ON c=17 r=1
"F. autoload [on]"
"AutoCharg F [on]"
@ -646,6 +658,18 @@
"Measured skew"
"Deviation mesuree"
#
"MMU fails"
"\x00"
#
"MMU load failed "
"\x00"
#
"MMU load fails"
"\x00"
#MSG_MMU_OK_RESUMING c=20 r=4
"MMU OK. Resuming..."
"MMU OK. Reprise ..."
@ -662,6 +686,10 @@
"MMU needs user attention."
"Le MMU necessite l'attention de l'utilisateur."
#
"MMU power fails"
"\x00"
#MSG_STEALTH_MODE_ON c=0 r=0
"Mode [Stealth]"
"Mode [Furtif]"
@ -706,6 +734,10 @@
"No SD card"
"Pas de carte SD"
#
"N/A"
"\x00"
#MSG_NO c=0 r=0
"No"
"Non"
@ -870,6 +902,14 @@
"Print aborted"
"Impression annulee"
#
"Preheating to load"
"\x00"
#
"Preheating to unload"
"\x00"
#MSG_SELFTEST_PRINT_FAN_SPEED c=18 r=0
"Print fan:"
"Ventilo impr. :"
@ -878,6 +918,10 @@
"Print from SD"
"Impr depuis la SD"
#
"Press the knob"
"\x00"
#MSG_PRINT_PAUSED c=20 r=1
"Print paused"
"Impression en pause"
@ -918,6 +962,10 @@
"Remove old filament and press the knob to start loading new filament."
"Retirez l'ancien filament puis appuyez sur le bouton pour charger le nouveau."
#
"Prusa i3 MK3S OK."
"\x00"
#
"Prusa i3 MK2 ready."
"Prusa i3 MK2 prete."
@ -1018,6 +1066,14 @@
"Show end stops"
"Afficher butees"
#
"Sensor state"
"\x00"
#
"Sensors info"
"\x00"
#
"Show pinda state"
"Etat de la PINDA"
@ -1162,6 +1218,14 @@
"Total failures"
"Echecs au total"
#
"to load filament"
"\x00"
#
"to unload filament"
"\x00"
#MSG_UNLOAD_FILAMENT c=17 r=0
"Unload filament"
"Decharger fil."

View File

@ -18,6 +18,10 @@
"\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode"
"\x1b[2JATTENZIONE:\x1b[1;0HRilev. impatto\x1b[2;0Hdisattivato in\x1b[3;0HModalita silenziosa"
#
">Cancel"
"\x00"
#MSG_BABYSTEPPING_Z c=20 r=0
"Adjusting Z"
"Compensazione Z"
@ -118,6 +122,10 @@
"Blackout occurred. Recover print?"
"C'e stato un Blackout. Recuperare la stampa?"
#
"Calibrating home"
"\x00"
#MSG_CALIBRATE_BED c=0 r=0
"Calibrate XYZ"
"Calibra XYZ"
@ -310,6 +318,10 @@
"Extruder"
"Estrusore"
#
"Fail stats MMU"
"\x00"
#MSG_FSENS_AUTOLOAD_ON c=17 r=1
"F. autoload [on]"
"Autocar.filam[on]"
@ -646,6 +658,18 @@
"Measured skew"
"Disassamento misurato"
#
"MMU fails"
"\x00"
#
"MMU load failed "
"\x00"
#
"MMU load fails"
"\x00"
#MSG_MMU_OK_RESUMING c=20 r=4
"MMU OK. Resuming..."
"MMU OK. Riprendendo... "
@ -662,6 +686,10 @@
"MMU needs user attention."
"Il MMU richiede attenzione dall'utente."
#
"MMU power fails"
"\x00"
#MSG_STEALTH_MODE_ON c=0 r=0
"Mode [Stealth]"
"Modo [Silenziosa]"
@ -706,6 +734,10 @@
"No SD card"
"Nessuna SD"
#
"N/A"
"\x00"
#MSG_NO c=0 r=0
"No"
"\x00"
@ -870,6 +902,14 @@
"Print aborted"
"Stampa interrotta"
#
"Preheating to load"
"\x00"
#
"Preheating to unload"
"\x00"
#MSG_SELFTEST_PRINT_FAN_SPEED c=18 r=0
"Print fan:"
"Ventola di stampa:"
@ -878,6 +918,10 @@
"Print from SD"
"Stampa da SD"
#
"Press the knob"
"\x00"
#MSG_PRINT_PAUSED c=20 r=1
"Print paused"
"Stampa in pausa"
@ -918,6 +962,10 @@
"Remove old filament and press the knob to start loading new filament."
"Rimuovi il filamento precedente e premi la manopola per caricare il nuovo filamento. "
#
"Prusa i3 MK3S OK."
"\x00"
#
"Prusa i3 MK2 ready."
"Prusa i3 MK2 pronta."
@ -1018,6 +1066,14 @@
"Show end stops"
"Stato finecorsa"
#
"Sensor state"
"\x00"
#
"Sensors info"
"\x00"
#
"Show pinda state"
"Mostra stato 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"
"Scarica filam."

View File

@ -18,6 +18,10 @@
"\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode"
"\x1b[2JUWAGA:\x1b[1;0HWykrywanie zderzen\x1b[2;0Hwylaczone w\x1b[3;0Htrybie Stealth"
#
">Cancel"
"\x00"
#MSG_BABYSTEPPING_Z c=20 r=0
"Adjusting Z"
"Dostrajanie Z"
@ -118,6 +122,10 @@
"Blackout occurred. Recover print?"
"Wykryto zanik napiecia. Kontynowac?"
#
"Calibrating home"
"\x00"
#MSG_CALIBRATE_BED c=0 r=0
"Calibrate XYZ"
"Kalibracja XYZ"
@ -310,6 +318,10 @@
"Extruder"
"Ekstruder"
#
"Fail stats MMU"
"\x00"
#MSG_FSENS_AUTOLOAD_ON c=17 r=1
"F. autoload [on]"
"Autolad. fil [wl]"
@ -646,6 +658,18 @@
"Measured skew"
"Zmierzony skos"
#
"MMU fails"
"\x00"
#
"MMU load failed "
"\x00"
#
"MMU load fails"
"\x00"
#MSG_MMU_OK_RESUMING c=20 r=4
"MMU OK. Resuming..."
"MMU OK. Wznawianie..."
@ -662,6 +686,10 @@
"MMU needs user attention."
"MMU wymaga uwagi uzytkownika."
#
"MMU power fails"
"\x00"
#MSG_STEALTH_MODE_ON c=0 r=0
"Mode [Stealth]"
"Tryb [Stealth]"
@ -706,6 +734,10 @@
"No SD card"
"Brak karty SD"
#
"N/A"
"\x00"
#MSG_NO c=0 r=0
"No"
"Nie"
@ -870,6 +902,14 @@
"Print aborted"
"Druk przerwany"
#
"Preheating to load"
"\x00"
#
"Preheating to unload"
"\x00"
#MSG_SELFTEST_PRINT_FAN_SPEED c=18 r=0
"Print fan:"
"Went. wydruku:"
@ -878,6 +918,10 @@
"Print from SD"
"Druk z karty SD"
#
"Press the knob"
"\x00"
#MSG_PRINT_PAUSED c=20 r=1
"Print paused"
"Druk wstrzymany"
@ -918,6 +962,10 @@
"Remove old filament and press the knob to start loading new filament."
"Wyciagnij poprzedni filament i nacisnij pokretlo aby zaladowac nowy."
#
"Prusa i3 MK3S OK."
"\x00"
#
"Prusa i3 MK2 ready."
"Prusa i3 MK2 gotowa"
@ -1018,6 +1066,14 @@
"Show end stops"
"Pokaz krancowki"
#
"Sensor state"
"\x00"
#
"Sensors info"
"\x00"
#
"Show pinda state"
"Stan sondy 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"
"Rozladowanie fil."

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff