bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Cleanup for language files

Browse Source 
・Remove abolished strings (MSG_NOZZLE1, MSG_NOZZLE2)
・Remove duplicated strings 
・Arrange the strings in unified order
・Adjust spacing
・Remove some comments in Japanese files(follow-up the PR #3560)

The most part of these changes were salvaged from closed my PR#3550.
This commit is contained in:
esenapaj 2016-04-23 13:27:05 +09:00
parent 2bb56ef6de
commit 8d0b2f358a
10 changed files with 40 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/language_bg.h
View File

@ -65,6 +65,7 @@
#define MSG_EXTRUDE "Екструзия"
#define MSG_RETRACT "Откат"
#define MSG_MOVE_AXIS "Движение по ос"
#define MSG_LEVEL_BED "Нивелиране"
#define MSG_MOVE_X "Движение по X"
#define MSG_MOVE_Y "Движение по Y"
#define MSG_MOVE_Z "Движение по Z"
@ -72,7 +73,6 @@
#define MSG_MOVE_01MM "Премести с 0.1mm"
#define MSG_MOVE_1MM "Премести с 1mm"
#define MSG_MOVE_10MM "Премести с 10mm"
#define MSG_LEVEL_BED "Нивелиране"
#define MSG_SPEED "Скорост"
#define MSG_NOZZLE LCD_STR_THERMOMETER " Дюза"
#define MSG_BED LCD_STR_THERMOMETER " Легло"

6
Marlin/language_da.h
View File

@ -74,8 +74,6 @@
#define MSG_MOVE_10MM "Flyt 10mm"
#define MSG_SPEED "Hastighed"
#define MSG_NOZZLE "Dyse"
#define MSG_NOZZLE1 "Dyse2"
#define MSG_NOZZLE2 "Dyse3"
#define MSG_BED "Plade"
#define MSG_FAN_SPEED "Blæser hastighed"
#define MSG_FLOW "Flow"
@ -141,22 +139,22 @@
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "S UnRet+mm"
#define MSG_CONTROL_RETRACT_RECOVERF "UnRet V"
#define MSG_AUTORETRACT "AutoRetr."
#define MSG_ZPROBE_OUT "Probe udenfor plade"
#define MSG_FILAMENTCHANGE "Skift filament"
#define MSG_INIT_SDCARD "Init. SD card"
#define MSG_CNG_SDCARD "Skift SD kort"
#define MSG_ZPROBE_OUT "Probe udenfor plade"
#define MSG_YX_UNHOMED "Home X/Y før Z"
#define MSG_ZPROBE_ZOFFSET "Z Offset"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_END_HOUR "Timer"
#define MSG_END_MINUTE "Minutter"
#define MSG_HEATING "Opvarmer..."
#define MSG_HEATING_COMPLETE "Opvarmet"
#define MSG_BED_HEATING "Opvarmer plade"
#define MSG_BED_DONE "Plade opvarmet"
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_BED_Z "Plade Z"
#define MSG_HEATING_FAILED_LCD "Opvarmning mislykkedes"

8
Marlin/language_es.h
View File

@ -74,6 +74,7 @@
#define MSG_MOVE_1MM "Mover 1mm"
#define MSG_MOVE_10MM "Mover 10mm"
#define MSG_SPEED "Velocidad"
#define MSG_BED_Z "Plataforma Z"
#define MSG_NOZZLE "Boquilla"
#define MSG_BED "Plataforma"
#define MSG_FAN_SPEED "Ventilador"
@ -102,6 +103,7 @@
#define MSG_VTRAV_MIN "Vel. viaje min"
#define MSG_AMAX "Acel. max"
#define MSG_A_RETRACT "Acel. retrac."
#define MSG_A_TRAVEL "Acel. Viaje"
#define MSG_XSTEPS "X pasos/mm"
#define MSG_YSTEPS "Y pasos/mm"
#define MSG_ZSTEPS "Z pasos/mm"
@ -149,10 +151,6 @@
#define MSG_BABYSTEP_Y "Micropaso Y"
#define MSG_BABYSTEP_Z "Micropaso Z"
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_END_HOUR "horas"
#define MSG_END_MINUTE "minutos"
#define MSG_BED_Z "Plataforma Z"
#define MSG_A_TRAVEL "Acel. Viaje"
#define MSG_HEATING_FAILED_LCD "Error: al calentar"
#define MSG_ERR_REDUNDANT_TEMP "Error: temperatura redundante"
#define MSG_THERMAL_RUNAWAY "Error de temperatura"
@ -160,6 +158,8 @@
#define MSG_ERR_MINTEMP "Error: Temp Minima"
#define MSG_ERR_MAXTEMP_BED "Error: Temp Max Plataforma"
#define MSG_ERR_MINTEMP_BED "Error: Temp Min Plataforma"
#define MSG_END_HOUR "horas"
#define MSG_END_MINUTE "minutos"
#define MSG_HEATING "Calentando..."
#define MSG_HEATING_COMPLETE "Calentamiento Completo"
#define MSG_BED_HEATING "Calentando plataforma ..."

11
Marlin/language_fr.h
View File

@ -35,7 +35,6 @@
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1
#define WELCOME_MSG MACHINE_NAME " prete."
#define MSG_SD_INSERTED "Carte inseree"
#define MSG_SD_REMOVED "Carte retiree"
@ -66,6 +65,7 @@
#define MSG_EXTRUDE "Extrusion"
#define MSG_RETRACT "Retraction"
#define MSG_MOVE_AXIS "Deplacer un axe"
#define MSG_LEVEL_BED "Regl. Niv. Plateau"
#define MSG_MOVE_X "Depl. X"
#define MSG_MOVE_Y "Depl. Y"
#define MSG_MOVE_Z "Depl. Z"
@ -74,9 +74,9 @@
#define MSG_MOVE_1MM "Depl. 1mm"
#define MSG_MOVE_10MM "Depl. 10mm"
#define MSG_SPEED " Vitesse"
#define MSG_BED_Z "Plateau Z"
#define MSG_NOZZLE "Buse"
#define MSG_BED "Plateau"
#define MSG_LEVEL_BED "Regl. Niv. Plateau"
#define MSG_FAN_SPEED "Vite. ventilateur"
#define MSG_FLOW "Flux"
#define MSG_CONTROL "Controler"
@ -103,6 +103,7 @@
#define MSG_VTRAV_MIN "Vdepl min"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "A-retract"
#define MSG_A_TRAVEL "A-Depl."
#define MSG_XSTEPS "Xpas/mm"
#define MSG_YSTEPS "Ypas/mm"
#define MSG_ZSTEPS "Zpas/mm"
@ -150,10 +151,6 @@
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_ENDSTOP_ABORT "Butee abandon"
#define MSG_END_HOUR "heures"
#define MSG_END_MINUTE "minutes"
#define MSG_BED_Z "Plateau Z"
#define MSG_A_TRAVEL "A-Depl."
#define MSG_HEATING_FAILED_LCD "Erreur de chauffe"
#define MSG_ERR_REDUNDANT_TEMP "Err: ERREUR TEMP. REDONDANTE"
#define MSG_THERMAL_RUNAWAY "EMBALLEMENT THERMIQUE"
@ -161,6 +158,8 @@
#define MSG_ERR_MINTEMP "Err: TEMP. MIN"
#define MSG_ERR_MAXTEMP_BED "Err: TEMP. MAX PLATEAU"
#define MSG_ERR_MINTEMP_BED "Err: TEMP. MIN PLATEAU"
#define MSG_END_HOUR "heures"
#define MSG_END_MINUTE "minutes"
#define MSG_HEATING "En chauffe..."
#define MSG_HEATING_COMPLETE "Chauffe terminee"
#define MSG_BED_HEATING "Plateau en chauffe..."

8
Marlin/language_it.h
View File

@ -74,6 +74,7 @@
#define MSG_MOVE_1MM "Muovi di 1mm"
#define MSG_MOVE_10MM "Muovi di 10mm"
#define MSG_SPEED "Velocità"
#define MSG_BED_Z "piatto Z"
#define MSG_NOZZLE "Ugello"
#define MSG_BED "Piatto"
#define MSG_FAN_SPEED "Velocità ventola"
@ -102,6 +103,7 @@
#define MSG_VTRAV_MIN "VTrav min"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "A-retract"
#define MSG_A_TRAVEL "A-Spostamento"
#define MSG_XSTEPS "Xpassi/mm"
#define MSG_YSTEPS "Ypassi/mm"
#define MSG_ZSTEPS "Zpassi/mm"
@ -149,10 +151,6 @@
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_ENDSTOP_ABORT "Finecorsa abort"
#define MSG_END_HOUR "ore"
#define MSG_END_MINUTE "minuti"
#define MSG_BED_Z "piatto Z"
#define MSG_A_TRAVEL "A-Spostamento"
#define MSG_HEATING_FAILED_LCD "Riscald. Fallito"
#define MSG_ERR_REDUNDANT_TEMP "Err: TEMP RIDONDANTI"
#define MSG_THERMAL_RUNAWAY "TEMP FUORI CONTROLLO"
@ -160,6 +158,8 @@
#define MSG_ERR_MINTEMP "Err: TEMP MINIMA"
#define MSG_ERR_MAXTEMP_BED "Err: TEMP MASSIMA PIATTO"
#define MSG_ERR_MINTEMP_BED "Err: TEMP MINIMA PIATTO"
#define MSG_END_HOUR "ore"
#define MSG_END_MINUTE "minuti"
#define MSG_HEATING "Riscaldamento.."
#define MSG_HEATING_COMPLETE "Risc. completato"
#define MSG_BED_HEATING "Risc. Piatto.."

8
Marlin/language_kana.h
View File

@ -98,10 +98,10 @@
#define MSG_VZ_JERK "Z\xbc\xde\xb8\x20\xd4\xb8\xc4\xde mm/s" // "Zｼﾞｸ ﾔｸﾄﾞ mm/s" ("Vz-jerk")
#define MSG_VE_JERK "\xb4\xb8\xbd\xc4\xd9\xb0\xc0\xde\xb0\x20\xd4\xb8\xc4\xde" // "ｴｸｽﾄﾙｰﾀﾞｰ ﾔｸﾄﾞ" ("Ve-jerk")
#define MSG_VMAX "\xbb\xb2\xc0\xde\xb2\xcc\xa8\xb0\xc4\xde\xda\xb0\xc4 " // "ｻｲﾀﾞｲﾌｨｰﾄﾞﾚｰﾄ " ("Vmax ")
#define MSG_X "X" // "X" ("x")
#define MSG_Y "Y" // "Y" ("y")
#define MSG_Z "Z" // "Z" ("z")
#define MSG_E "E" // "E" ("e")
#define MSG_X "X"
#define MSG_Y "Y"
#define MSG_Z "Z"
#define MSG_E "E"
#define MSG_VMIN "\xbb\xb2\xbc\xae\xb3\xcc\xa8\xb0\xc4\xde\xda\xb0\xc4" // "ｻｲｼｮｳﾌｨｰﾄﾞﾚｰﾄ" ("Vmin")
#define MSG_VTRAV_MIN "\xbb\xb2\xbc\xae\xb3\xc4\xd7\xcd\xde\xd9\xda\xb0\xc4" // "ｻｲｼｮｳﾄﾗﾍﾞﾙﾚｰﾄ" ("VTrav min")
#define MSG_AMAX "\xbb\xb2\xc0\xde\xb2\xb6\xbf\xb8\xc4\xde " // "ｻｲﾀﾞｲｶｿｸﾄﾞ" ("Amax ")

8
Marlin/language_kana_utf8.h
View File

@ -101,10 +101,10 @@
#define MSG_VZ_JERK "Zジク ヤクド mm/s" // "Vz-jerk"
#define MSG_VE_JERK "エクストルーダー ヤクド" // "Ve-jerk"
#define MSG_VMAX "サイダイフィードレート " // "Vmax "
#define MSG_X "X" // "x"
#define MSG_Y "Y" // "y"
#define MSG_Z "Z" // "z"
#define MSG_E "E" // "e"
#define MSG_X "X"
#define MSG_Y "Y"
#define MSG_Z "Z"
#define MSG_E "E"
#define MSG_VMIN "サイショウフィードレート" // "Vmin"
#define MSG_VTRAV_MIN "サイショウトラベルレート" // "VTrav min"
#define MSG_AMAX "サイダイカソクド " // "Amax "

21
Marlin/language_nl.h
View File

@ -43,11 +43,11 @@
#define MSG_DISABLE_STEPPERS "Motoren uit"
#define MSG_AUTO_HOME "Auto home"
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
#define MSG_LEVEL_BED_WAITING "Click to Begin"
#define MSG_LEVEL_BED_DONE "Leveling Done!"
#define MSG_LEVEL_BED_CANCEL "Cancel"
#define MSG_LEVEL_BED_WAITING "Klik voor begin"
#define MSG_LEVEL_BED_DONE "Bed level kompl."
#define MSG_LEVEL_BED_CANCEL "Bed level afbr."
#define MSG_SET_HOME_OFFSETS "Zet home offsets"
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
#define MSG_HOME_OFFSETS_APPLIED "H offset toegep."
#define MSG_SET_ORIGIN "Nulpunt instellen"
#define MSG_PREHEAT_PLA "PLA voorverwarmen"
#define MSG_PREHEAT_PLA_N "PLA voorverw. "
@ -73,6 +73,7 @@
#define MSG_MOVE_1MM "Verplaats 1mm"
#define MSG_MOVE_10MM "Verplaats 10mm"
#define MSG_SPEED "Snelheid"
#define MSG_BED_Z "Bed Z"
#define MSG_NOZZLE "Nozzle"
#define MSG_BED "Bed"
#define MSG_FAN_SPEED "Fan snelheid"
@ -101,6 +102,7 @@
#define MSG_VTRAV_MIN "VTrav min"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "A-retract"
#define MSG_A_TRAVEL "A-travel"
#define MSG_XSTEPS "Xsteps/mm"
#define MSG_YSTEPS "Ysteps/mm"
#define MSG_ZSTEPS "Zsteps/mm"
@ -148,10 +150,6 @@
#define MSG_BABYSTEP_Y "Babystap Y"
#define MSG_BABYSTEP_Z "Babystap Z"
#define MSG_ENDSTOP_ABORT "Endstop afbr."
#define MSG_END_HOUR "uur"
#define MSG_END_MINUTE "minuten"
#define MSG_BED_Z "Bed Z"
#define MSG_A_TRAVEL "A-travel"
#define MSG_HEATING_FAILED_LCD "voorverw. fout"
#define MSG_ERR_REDUNDANT_TEMP "Redun. temp fout"
#define MSG_THERMAL_RUNAWAY "Therm. wegloop"
@ -159,15 +157,12 @@
#define MSG_ERR_MINTEMP "Err: Min. temp"
#define MSG_ERR_MAXTEMP_BED "Err: Max.tmp bed"
#define MSG_ERR_MINTEMP_BED "Err: Min.tmp bed"
#define MSG_END_HOUR "uur"
#define MSG_END_MINUTE "minuten"
#define MSG_HEATING "Voorwarmen..."
#define MSG_HEATING_COMPLETE "Voorverw. kompl."
#define MSG_BED_HEATING "Bed voorverw."
#define MSG_BED_DONE "Bed is voorverw."
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
#define MSG_LEVEL_BED_WAITING "Klik voor begin"
#define MSG_LEVEL_BED_DONE "Bed level kompl."
#define MSG_LEVEL_BED_CANCEL "Bed level afbr."
#define MSG_HOME_OFFSETS_APPLIED "H offset toegep."
#define MSG_DELTA_CALIBRATE "Delta Calibratie"
#define MSG_DELTA_CALIBRATE_X "Kalibreer X"

8
Marlin/language_pt-br.h
View File

@ -73,6 +73,7 @@
#define MSG_MOVE_1MM "Mover 1mm"
#define MSG_MOVE_10MM "Mover 10mm"
#define MSG_SPEED "Velocidade"
#define MSG_BED_Z "Base Z"
#define MSG_NOZZLE LCD_STR_THERMOMETER " Bocal"
#define MSG_BED LCD_STR_THERMOMETER " Base"
#define MSG_FAN_SPEED "Vel. Ventoinha"
@ -101,6 +102,7 @@
#define MSG_VTRAV_MIN "VTrav min"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "Retrair A"
#define MSG_A_TRAVEL "A-movimento"
#define MSG_XSTEPS "Passo X/mm"
#define MSG_YSTEPS "Passo Y/mm"
#define MSG_ZSTEPS "Passo Z/mm"
@ -148,10 +150,6 @@
#define MSG_BABYSTEP_Y "Passinho Y"
#define MSG_BABYSTEP_Z "Passinho Z"
#define MSG_ENDSTOP_ABORT "Fim de Curso"
#define MSG_END_HOUR "Horas"
#define MSG_END_MINUTE "Minutos"
#define MSG_BED_Z "Base Z"
#define MSG_A_TRAVEL "A-movimento"
#define MSG_HEATING_FAILED_LCD "Aquecimento falhou"
#define MSG_ERR_REDUNDANT_TEMP "Err: REDUNDANT TEMP"
#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY"
@ -159,6 +157,8 @@
#define MSG_ERR_MINTEMP "Err: T Minima"
#define MSG_ERR_MAXTEMP_BED "Err: T Base Maxima"
#define MSG_ERR_MINTEMP_BED "Err: T Base Minima"
#define MSG_END_HOUR "Horas"
#define MSG_END_MINUTE "Minutos"
#define MSG_HEATING "Aquecendo..."
#define MSG_HEATING_COMPLETE "Aquecida."
#define MSG_BED_HEATING "Aquecendo base.."

8
Marlin/language_pt-br_utf8.h
View File

@ -73,6 +73,7 @@
#define MSG_MOVE_1MM "Mover 1mm"
#define MSG_MOVE_10MM "Mover 10mm"
#define MSG_SPEED "Velocidade"
#define MSG_BED_Z "Base Z"
#define MSG_NOZZLE LCD_STR_THERMOMETER " Bocal"
#define MSG_BED LCD_STR_THERMOMETER " Base"
#define MSG_FAN_SPEED "Vel. Ventoinha"
@ -101,6 +102,7 @@
#define MSG_VTRAV_MIN "VTrav min"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "Retrair A"
#define MSG_A_TRAVEL "A-movimento"
#define MSG_XSTEPS "Passo X/mm"
#define MSG_YSTEPS "Passo Y/mm"
#define MSG_ZSTEPS "Passo Z/mm"
@ -148,10 +150,6 @@
#define MSG_BABYSTEP_Y "Passinho Y"
#define MSG_BABYSTEP_Z "Passinho Z"
#define MSG_ENDSTOP_ABORT "Fim de Curso"
#define MSG_END_HOUR "Horas"
#define MSG_END_MINUTE "Minutos"
#define MSG_BED_Z "Base Z"
#define MSG_A_TRAVEL "A-movimento"
#define MSG_HEATING_FAILED_LCD "Aquecimento falhou"
#define MSG_ERR_REDUNDANT_TEMP "Err: REDUNDANT TEMP"
#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY"
@ -159,6 +157,8 @@
#define MSG_ERR_MINTEMP "Err: T Mínima"
#define MSG_ERR_MAXTEMP_BED "Err: T Base Máxima"
#define MSG_ERR_MINTEMP_BED "Err: T Base Mínima"
#define MSG_END_HOUR "Horas"
#define MSG_END_MINUTE "Minutos"
#define MSG_HEATING "Aquecendo..."
#define MSG_HEATING_COMPLETE "Aquecida."
#define MSG_BED_HEATING "Aquecendo base.."