Skip to content

Commit

Permalink
Merge pull request #1427 from thinkyhead/fewer_preheat_strings
Browse files Browse the repository at this point in the history 
Remove language strings that only add a number
  • Loading branch information
@thinkyhead
thinkyhead committed Jan 28, 2015
2 parents 7378a7f + 53eea61 commit 34377ee
Show file tree
Hide file tree
Showing 16 changed files with 343 additions and 543 deletions.
27 changes: 14 additions & 13 deletions Marlin/language.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,20 @@
// ==> ALSO TRY ALL AVAILABLE LANGUAGE OPTIONS

// Languages
// en English
// pl Polish
// fr French
// de German
// es Spanish
// ru Russian
// it Italian
// pt Portuguese
// fi Finnish
// an Aragonese
// nl Dutch
// ca Catalan
// eu Basque-Euskera
// en English
// pl Polish
// fr French
// de German
// es Spanish
// ru Russian
// it Italian
// pt Portuguese
// pt-br Portuguese (Brazil)
// fi Finnish
// an Aragonese
// nl Dutch
// ca Catalan
// eu Basque-Euskera

#ifndef LANGUAGE_INCLUDE
// pick your language from the list above
Expand Down
32 changes: 4 additions & 28 deletions Marlin/language_an.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,13 @@
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_SET_ORIGIN "Establir zero"
#define MSG_PREHEAT_PLA "Precalentar PLA"
#define MSG_PREHEAT_PLA0 "Precalentar PLA1"
#define MSG_PREHEAT_PLA1 "Precalentar PLA2"
#define MSG_PREHEAT_PLA2 "Precalentar PLA3"
#define MSG_PREHEAT_PLA3 "Precalentar PLA4"
#define MSG_PREHEAT_PLA0123 "Precalentar PLA a"
#define MSG_PREHEAT_PLA_N "Precalentar PLA "
#define MSG_PREHEAT_PLA_ALL "Precalentar PLA a"
#define MSG_PREHEAT_PLA_BEDONLY "Prec. PLA Base"
#define MSG_PREHEAT_PLA_SETTINGS "Achustar tem. PLA"
#define MSG_PREHEAT_ABS "Precalentar ABS"
#define MSG_PREHEAT_ABS0 "Precalentar ABS1"
#define MSG_PREHEAT_ABS1 "Precalentar ABS2"
#define MSG_PREHEAT_ABS2 "Precalentar ABS3"
#define MSG_PREHEAT_ABS3 "Precalentar ABS4"
#define MSG_PREHEAT_ABS0123 "Precalentar ABS a"
#define MSG_PREHEAT_ABS_N "Precalentar ABS "
#define MSG_PREHEAT_ABS_ALL "Precalentar ABS a"
#define MSG_PREHEAT_ABS_BEDONLY "Prec. ABS Base"
#define MSG_PREHEAT_ABS_SETTINGS "Achustar tem. ABS"
#define MSG_COOLDOWN "Enfriar"
Expand All @@ -43,21 +37,14 @@
#define MSG_MOVE_Y "Move Y"
#define MSG_MOVE_Z "Move Z"
#define MSG_MOVE_E "Extruder"
#define MSG_MOVE_E1 "Extruder2"
#define MSG_MOVE_E2 "Extruder3"
#define MSG_MOVE_01MM "Move 0.1mm"
#define MSG_MOVE_1MM "Move 1mm"
#define MSG_MOVE_10MM "Move 10mm"
#define MSG_SPEED "Velocidat"
#define MSG_NOZZLE "Nozzle"
#define MSG_NOZZLE1 "Nozzle2"
#define MSG_NOZZLE2 "Nozzle3"
#define MSG_BED "Base"
#define MSG_FAN_SPEED "Ixoriador"
#define MSG_FLOW "Fluxo"
#define MSG_FLOW0 "Fluxo 0"
#define MSG_FLOW1 "Fluxo 1"
#define MSG_FLOW2 "Fluxo 2"
#define MSG_CONTROL "Control"
#define MSG_MIN "\002 Min"
#define MSG_MAX "\002 Max"
Expand Down Expand Up @@ -132,17 +119,6 @@
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_ENDSTOP_ABORT "Endstop abort"

#define MSG_RECTRACT "Retraer"
#define MSG_RECTRACT_WIDE "Retraer"
#define MSG_TEMPERATURE_WIDE "Temperatura"
#define MSG_TEMPERATURE_RTN "Temperatura"
#define MSG_MAIN_WIDE "Menu Prencipal"
#define MSG_MOTION_WIDE "Movimiento"
#define MSG_PREPARE_ALT "Preparar"
#define MSG_CONTROL_ARROW "Control \x7E"
#define MSG_RETRACT_ARROW "Retraer \x7E"
#define MSG_STEPPER_RELEASED "Desacoplada."

#ifdef DELTA_CALIBRATION_MENU
#define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X"
Expand Down
31 changes: 4 additions & 27 deletions Marlin/language_ca.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,13 @@
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_SET_ORIGIN "Establir origen"
#define MSG_PREHEAT_PLA "Preescalfar PLA"
#define MSG_PREHEAT_PLA0 "Preescalfar PLA 1"
#define MSG_PREHEAT_PLA1 "Preescalfar PLA 2"
#define MSG_PREHEAT_PLA2 "Preescalfar PLA 3"
#define MSG_PREHEAT_PLA3 "Preescalfar PLA 4"
#define MSG_PREHEAT_PLA0123 "Preesc. tot PLA"
#define MSG_PREHEAT_PLA_N "Preescalfar PLA "
#define MSG_PREHEAT_PLA_ALL "Preesc. tot PLA"
#define MSG_PREHEAT_PLA_BEDONLY "Preesc. llit PLA"
#define MSG_PREHEAT_PLA_SETTINGS "Configuració PLA"
#define MSG_PREHEAT_ABS "Preescalfar ABS"
#define MSG_PREHEAT_ABS0 "Preescalfar ABS 1"
#define MSG_PREHEAT_ABS1 "Preescalfar ABS 2"
#define MSG_PREHEAT_ABS2 "Preescalfar ABS 3"
#define MSG_PREHEAT_ABS3 "Preescalfar ABS 4"
#define MSG_PREHEAT_ABS0123 "Preesc. tot ABS"
#define MSG_PREHEAT_ABS_N "Preescalfar ABS "
#define MSG_PREHEAT_ABS_ALL "Preesc. tot ABS"
#define MSG_PREHEAT_ABS_BEDONLY "Preesc. llit ABS"
#define MSG_PREHEAT_ABS_SETTINGS "Configuració ABS"
#define MSG_COOLDOWN "Refredar"
Expand All @@ -43,21 +37,14 @@
#define MSG_MOVE_Y "Moure Y"
#define MSG_MOVE_Z "Moure Z"
#define MSG_MOVE_E "Extrusor"
#define MSG_MOVE_E1 "Extruder2"
#define MSG_MOVE_E2 "Extruder3"
#define MSG_MOVE_01MM "Moure 0.1mm"
#define MSG_MOVE_1MM "Moure 1mm"
#define MSG_MOVE_10MM "Moure 10mm"
#define MSG_SPEED "Velocitat"
#define MSG_NOZZLE "Nozzle"
#define MSG_NOZZLE1 "Nozzle2"
#define MSG_NOZZLE2 "Nozzle3"
#define MSG_BED "Llit"
#define MSG_FAN_SPEED "Vel. Ventilador"
#define MSG_FLOW "Fluxe"
#define MSG_FLOW0 "Fluxe 0"
#define MSG_FLOW1 "Fluxe 1"
#define MSG_FLOW2 "Fluxe 2"
#define MSG_CONTROL "Control"
#define MSG_MIN " \002 Min"
#define MSG_MAX " \002 Max"
Expand All @@ -69,14 +56,6 @@
#define MSG_PID_I "PID-I"
#define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C"
#define MSG_PID_P1 "PID-P E2"
#define MSG_PID_I1 "PID-I E2"
#define MSG_PID_D1 "PID-D E2"
#define MSG_PID_C1 "PID-C E2"
#define MSG_PID_P2 "PID-P E3"
#define MSG_PID_I2 "PID-I E3"
#define MSG_PID_D2 "PID-D E3"
#define MSG_PID_C2 "PID-C E3"
#define MSG_ACC "Accel"
#define MSG_VXY_JERK "Vxy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
Expand Down Expand Up @@ -140,8 +119,6 @@
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_ENDSTOP_ABORT "Endstop abort"

#define MSG_RECTRACT "Retreure"

#ifdef DELTA_CALIBRATION_MENU
#define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X"
Expand Down
32 changes: 4 additions & 28 deletions Marlin/language_de.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,13 @@
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_SET_ORIGIN "Setze Nullpunkt"
#define MSG_PREHEAT_PLA "Vorwärmen PLA"
#define MSG_PREHEAT_PLA0 "Vorwärmen PLA 1"
#define MSG_PREHEAT_PLA1 "Vorwärmen PLA 2"
#define MSG_PREHEAT_PLA2 "Vorwärmen PLA 3"
#define MSG_PREHEAT_PLA3 "Vorwärmen PLA 4"
#define MSG_PREHEAT_PLA0123 "Vorw. PLA Alle"
#define MSG_PREHEAT_PLA_N "Vorwärmen PLA "
#define MSG_PREHEAT_PLA_ALL "Vorw. PLA Alle"
#define MSG_PREHEAT_PLA_BEDONLY "Vorw. PLA Bett"
#define MSG_PREHEAT_PLA_SETTINGS "Vorwärm. PLA Ein."
#define MSG_PREHEAT_ABS "Vorwärmen ABS"
#define MSG_PREHEAT_ABS0 "Vorwärmen ABS 1"
#define MSG_PREHEAT_ABS1 "Vorwärmen ABS 2"
#define MSG_PREHEAT_ABS2 "Vorwärmen ABS 3"
#define MSG_PREHEAT_ABS3 "Vorwärmen ABS 4"
#define MSG_PREHEAT_ABS0123 "Vorw. ABS Alle"
#define MSG_PREHEAT_ABS_N "Vorwärmen ABS "
#define MSG_PREHEAT_ABS_ALL "Vorw. ABS Alle"
#define MSG_PREHEAT_ABS_BEDONLY "Vorw. ABS Bett"
#define MSG_PREHEAT_ABS_SETTINGS "Vorwärm. ABS Ein."
#define MSG_COOLDOWN "Abkühlen"
Expand All @@ -43,21 +37,14 @@
#define MSG_MOVE_Y "Y bewegen"
#define MSG_MOVE_Z "Z bewegen"
#define MSG_MOVE_E "Extruder"
#define MSG_MOVE_E1 "Extruder2"
#define MSG_MOVE_E2 "Extruder3"
#define MSG_MOVE_01MM "0.1mm bewegen"
#define MSG_MOVE_1MM "1mm bewegen"
#define MSG_MOVE_10MM "10mm bewegen"
#define MSG_SPEED "Geschw"
#define MSG_NOZZLE "Düse"
#define MSG_NOZZLE1 "Düse2"
#define MSG_NOZZLE2 "Düse3"
#define MSG_BED "Bett"
#define MSG_FAN_SPEED "Lüftergeschw."
#define MSG_FLOW "Fluss"
#define MSG_FLOW0 "Fluss 0"
#define MSG_FLOW1 "Fluss 1"
#define MSG_FLOW2 "Fluss 2"
#define MSG_CONTROL "Einstellungen"
#define MSG_MIN "\002 Min"
#define MSG_MAX "\002 Max"
Expand All @@ -69,14 +56,6 @@
#define MSG_PID_I "PID-I"
#define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C"
#define MSG_PID_P1 "PID-P E2"
#define MSG_PID_I1 "PID-I E2"
#define MSG_PID_D1 "PID-D E2"
#define MSG_PID_C1 "PID-C E2"
#define MSG_PID_P2 "PID-P E3"
#define MSG_PID_I2 "PID-I E3"
#define MSG_PID_D2 "PID-D E3"
#define MSG_PID_C2 "PID-C E3"
#define MSG_ACC "Acc"
#define MSG_VXY_JERK "Vxy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
Expand Down Expand Up @@ -140,9 +119,6 @@
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_ENDSTOP_ABORT "Endstop abort"

#define MSG_STEPPER_RELEASED "Stepper frei"
#define MSG_RECTRACT_WIDE "Rectract"

#ifdef DELTA_CALIBRATION_MENU
#define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X"
Expand Down
46 changes: 8 additions & 38 deletions Marlin/language_en.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,15 @@
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_SET_ORIGIN "Set origin"
#define MSG_PREHEAT_PLA "Preheat PLA"
#define MSG_PREHEAT_PLA0 "Preheat PLA 1"
#define MSG_PREHEAT_PLA1 "Preheat PLA 2"
#define MSG_PREHEAT_PLA2 "Preheat PLA 3"
#define MSG_PREHEAT_PLA3 "Preheat PLA 4"
#define MSG_PREHEAT_PLA0123 "Preheat PLA All"
#define MSG_PREHEAT_PLA_BEDONLY "Preheat PLA Bed"
#define MSG_PREHEAT_PLA_SETTINGS "Preheat PLA conf"
#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " All"
#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Bed"
#define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA " conf"
#define MSG_PREHEAT_ABS "Preheat ABS"
#define MSG_PREHEAT_ABS0 "Preheat ABS 1"
#define MSG_PREHEAT_ABS1 "Preheat ABS 2"
#define MSG_PREHEAT_ABS2 "Preheat ABS 3"
#define MSG_PREHEAT_ABS3 "Preheat ABS 4"
#define MSG_PREHEAT_ABS0123 "Preheat ABS All"
#define MSG_PREHEAT_ABS_BEDONLY "Preheat ABS Bed"
#define MSG_PREHEAT_ABS_SETTINGS "Preheat ABS conf"
#define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " "
#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " All"
#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Bed"
#define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS " conf"
#define MSG_COOLDOWN "Cooldown"
#define MSG_SWITCH_PS_ON "Switch power on"
#define MSG_SWITCH_PS_OFF "Switch power off"
Expand All @@ -43,24 +37,14 @@
#define MSG_MOVE_Y "Move Y"
#define MSG_MOVE_Z "Move Z"
#define MSG_MOVE_E "Extruder"
#define MSG_MOVE_E1 "Extruder2"
#define MSG_MOVE_E2 "Extruder3"
#define MSG_MOVE_E3 "Extruder4"
#define MSG_MOVE_01MM "Move 0.1mm"
#define MSG_MOVE_1MM "Move 1mm"
#define MSG_MOVE_10MM "Move 10mm"
#define MSG_SPEED "Speed"
#define MSG_NOZZLE "Nozzle"
#define MSG_NOZZLE1 "Nozzle2"
#define MSG_NOZZLE2 "Nozzle3"
#define MSG_NOZZLE3 "Nozzle4"
#define MSG_BED "Bed"
#define MSG_FAN_SPEED "Fan speed"
#define MSG_FLOW "Flow"
#define MSG_FLOW0 "Flow 0"
#define MSG_FLOW1 "Flow 1"
#define MSG_FLOW2 "Flow 2"
#define MSG_FLOW3 "Flow 3"
#define MSG_CONTROL "Control"
#define MSG_MIN " \002 Min"
#define MSG_MAX " \002 Max"
Expand All @@ -72,18 +56,6 @@
#define MSG_PID_I "PID-I"
#define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C"
#define MSG_PID_P1 "PID-P E2"
#define MSG_PID_I1 "PID-I E2"
#define MSG_PID_D1 "PID-D E2"
#define MSG_PID_C1 "PID-C E2"
#define MSG_PID_P2 "PID-P E3"
#define MSG_PID_I2 "PID-I E3"
#define MSG_PID_D2 "PID-D E3"
#define MSG_PID_C2 "PID-C E3"
#define MSG_PID_P3 "PID-P E4"
#define MSG_PID_I3 "PID-I E4"
#define MSG_PID_D3 "PID-D E4"
#define MSG_PID_C3 "PID-C E4"
#define MSG_ACC "Accel"
#define MSG_VXY_JERK "Vxy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
Expand Down Expand Up @@ -148,8 +120,6 @@
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_ENDSTOP_ABORT "Endstop abort"

#define MSG_RECTRACT "Rectract"

#ifdef DELTA_CALIBRATION_MENU
#define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X"
Expand Down
Loading

0 comments on commit 34377ee

Please sign in to comment.