Browse Source

Merge pull request #1757 from bq/Translation-strings

Added new trasnslatable labels.
Scott Lahteine 9 years ago
parent
commit
0b57a2ab8b

+ 1
- 1
Marlin/Marlin_main.cpp View File

843
         int hours, minutes;
843
         int hours, minutes;
844
         minutes=(t/60)%60;
844
         minutes=(t/60)%60;
845
         hours=t/60/60;
845
         hours=t/60/60;
846
-        sprintf_P(time, PSTR("%i hours %i minutes"),hours, minutes);
846
+        sprintf_P(time, PSTR("%i "MSG_END_HOUR" %i "MSG_END_MINUTE),hours, minutes);
847
         SERIAL_ECHO_START;
847
         SERIAL_ECHO_START;
848
         SERIAL_ECHOLN(time);
848
         SERIAL_ECHOLN(time);
849
         lcd_setstatus(time, true);
849
         lcd_setstatus(time, true);

+ 2
- 0
Marlin/language_an.h View File

123
 #define MSG_BABYSTEP_Y                      "Babystep Y"
123
 #define MSG_BABYSTEP_Y                      "Babystep Y"
124
 #define MSG_BABYSTEP_Z                      "Babystep Z"
124
 #define MSG_BABYSTEP_Z                      "Babystep Z"
125
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
125
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
126
+#define MSG_END_HOUR                        "hours"
127
+#define MSG_END_MINUTE                      "minutes"
126
 
128
 
127
 #ifdef DELTA_CALIBRATION_MENU
129
 #ifdef DELTA_CALIBRATION_MENU
128
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
130
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"

+ 2
- 0
Marlin/language_ca.h View File

124
 #define MSG_BABYSTEP_Y                      "Babystep Y"
124
 #define MSG_BABYSTEP_Y                      "Babystep Y"
125
 #define MSG_BABYSTEP_Z                      "Babystep Z"
125
 #define MSG_BABYSTEP_Z                      "Babystep Z"
126
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
126
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
127
+#define MSG_END_HOUR                        "hours"
128
+#define MSG_END_MINUTE                      "minutes"
127
 
129
 
128
 #ifdef DELTA_CALIBRATION_MENU
130
 #ifdef DELTA_CALIBRATION_MENU
129
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
131
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"

+ 2
- 0
Marlin/language_de.h View File

122
 #define MSG_BABYSTEP_Y                      "Babystep Y"
122
 #define MSG_BABYSTEP_Y                      "Babystep Y"
123
 #define MSG_BABYSTEP_Z                      "Babystep Z"
123
 #define MSG_BABYSTEP_Z                      "Babystep Z"
124
 #define MSG_ENDSTOP_ABORT                   "Endstop Abbr. Ein"
124
 #define MSG_ENDSTOP_ABORT                   "Endstop Abbr. Ein"
125
+#define MSG_END_HOUR                        "Stunden"
126
+#define MSG_END_MINUTE                      "Minuten"
125
 
127
 
126
 #ifdef DELTA_CALIBRATION_MENU
128
 #ifdef DELTA_CALIBRATION_MENU
127
     #define MSG_DELTA_CALIBRATE             "Delta Kalibrieren"
129
     #define MSG_DELTA_CALIBRATE             "Delta Kalibrieren"

+ 6
- 0
Marlin/language_en.h View File

417
 #ifndef MSG_ERR_MAXTEMP_BED
417
 #ifndef MSG_ERR_MAXTEMP_BED
418
 #define MSG_ERR_MAXTEMP_BED                 "Err: MAXTEMP BED"
418
 #define MSG_ERR_MAXTEMP_BED                 "Err: MAXTEMP BED"
419
 #endif
419
 #endif
420
+#ifndef MSG_END_HOUR
421
+#define MSG_END_HOUR                        "hours"
422
+#endif
423
+#ifndef MSG_END_MINUTE
424
+#define MSG_END_MINUTE                      "minutes"
425
+#endif
420
 
426
 
421
 #ifdef DELTA_CALIBRATION_MENU
427
 #ifdef DELTA_CALIBRATION_MENU
422
   #ifndef MSG_DELTA_CALIBRATE
428
   #ifndef MSG_DELTA_CALIBRATE

+ 2
- 0
Marlin/language_es.h View File

123
 #define MSG_BABYSTEP_Y                      "Babystep Y"
123
 #define MSG_BABYSTEP_Y                      "Babystep Y"
124
 #define MSG_BABYSTEP_Z                      "Babystep Z"
124
 #define MSG_BABYSTEP_Z                      "Babystep Z"
125
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
125
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
126
+#define MSG_END_HOUR                        "horas"
127
+#define MSG_END_MINUTE                      "minutos"
126
 
128
 
127
 #ifdef DELTA_CALIBRATION_MENU
129
 #ifdef DELTA_CALIBRATION_MENU
128
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
130
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"

+ 2
- 0
Marlin/language_eu.h View File

123
 #define MSG_BABYSTEP_Y                      "Babystep Y"
123
 #define MSG_BABYSTEP_Y                      "Babystep Y"
124
 #define MSG_BABYSTEP_Z                      "Babystep Z"
124
 #define MSG_BABYSTEP_Z                      "Babystep Z"
125
 #define MSG_ENDSTOP_ABORT                   "Endstop deuseztat"
125
 #define MSG_ENDSTOP_ABORT                   "Endstop deuseztat"
126
+#define MSG_END_HOUR                        "hours"
127
+#define MSG_END_MINUTE                      "minutes"
126
 
128
 
127
 #ifdef DELTA_CALIBRATION_MENU
129
 #ifdef DELTA_CALIBRATION_MENU
128
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
130
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"

+ 3
- 1
Marlin/language_fi.h View File

123
 #define MSG_BABYSTEP_Y                      "Babystep Y"
123
 #define MSG_BABYSTEP_Y                      "Babystep Y"
124
 #define MSG_BABYSTEP_Z                      "Babystep Z"
124
 #define MSG_BABYSTEP_Z                      "Babystep Z"
125
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
125
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
126
+#define MSG_END_HOUR                        "hours"
127
+#define MSG_END_MINUTE                      "minutes"
126
 
128
 
127
 #ifdef DELTA_CALIBRATION_MENU
129
 #ifdef DELTA_CALIBRATION_MENU
128
     #define MSG_DELTA_CALIBRATE             "Delta Kalibrointi"
130
     #define MSG_DELTA_CALIBRATE             "Delta Kalibrointi"
132
     #define MSG_DELTA_CALIBRATE_CENTER      "Kalibroi Center"
134
     #define MSG_DELTA_CALIBRATE_CENTER      "Kalibroi Center"
133
 #endif // DELTA_CALIBRATION_MENU
135
 #endif // DELTA_CALIBRATION_MENU
134
 
136
 
135
-#endif // LANGUAGE_FI_H
137
+#endif // LANGUAGE_FI_H

+ 2
- 0
Marlin/language_fr.h View File

124
 #define MSG_BABYSTEP_Y                      "Babystep Y"
124
 #define MSG_BABYSTEP_Y                      "Babystep Y"
125
 #define MSG_BABYSTEP_Z                      "Babystep Z"
125
 #define MSG_BABYSTEP_Z                      "Babystep Z"
126
 #define MSG_ENDSTOP_ABORT                   "Butee abandon"
126
 #define MSG_ENDSTOP_ABORT                   "Butee abandon"
127
+#define MSG_END_HOUR                        "heures"
128
+#define MSG_END_MINUTE                      "minutes"
127
 
129
 
128
 #ifdef DELTA_CALIBRATION_MENU
130
 #ifdef DELTA_CALIBRATION_MENU
129
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
131
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"

+ 2
- 0
Marlin/language_it.h View File

124
 #define MSG_BABYSTEP_Y                      "Babystep Y"
124
 #define MSG_BABYSTEP_Y                      "Babystep Y"
125
 #define MSG_BABYSTEP_Z                      "Babystep Z"
125
 #define MSG_BABYSTEP_Z                      "Babystep Z"
126
 #define MSG_ENDSTOP_ABORT                   "Finecorsa abort"
126
 #define MSG_ENDSTOP_ABORT                   "Finecorsa abort"
127
+#define MSG_END_HOUR                        "ore"
128
+#define MSG_END_MINUTE                      "minuti"
127
 
129
 
128
 #ifdef DELTA_CALIBRATION_MENU
130
 #ifdef DELTA_CALIBRATION_MENU
129
     #define MSG_DELTA_CALIBRATE             "Calibraz. Delta"
131
     #define MSG_DELTA_CALIBRATE             "Calibraz. Delta"

+ 2
- 0
Marlin/language_kana.h View File

126
 #define MSG_BABYSTEP_Y                      "\xcb\xde\xc4\xde\xb3 Y"                                       // "Babystep Y"
126
 #define MSG_BABYSTEP_Y                      "\xcb\xde\xc4\xde\xb3 Y"                                       // "Babystep Y"
127
 #define MSG_BABYSTEP_Z                      "\xcb\xde\xc4\xde\xb3 Z"                                       // "Babystep Z"
127
 #define MSG_BABYSTEP_Z                      "\xcb\xde\xc4\xde\xb3 Z"                                       // "Babystep Z"
128
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
128
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
129
+#define MSG_END_HOUR                        "hours"
130
+#define MSG_END_MINUTE                      "minutes"
129
 
131
 
130
 /* These are from language.h. PLEASE DON'T TRANSLATE! All translatable messages can be found in language_en.h
132
 /* These are from language.h. PLEASE DON'T TRANSLATE! All translatable messages can be found in language_en.h
131
 #define MSG_HEATING                         "\xb6\xc8\xc2\xc1\xad\xb3..."                                  // "Heating..."
133
 #define MSG_HEATING                         "\xb6\xc8\xc2\xc1\xad\xb3..."                                  // "Heating..."

+ 2
- 0
Marlin/language_kana_utf8.h View File

130
 #define MSG_BABYSTEP_Y                      "ゼドウ Y"                    // "Babystep Y"
130
 #define MSG_BABYSTEP_Y                      "ゼドウ Y"                    // "Babystep Y"
131
 #define MSG_BABYSTEP_Z                      "ゼドウ Z"                    // "Babystep Z"
131
 #define MSG_BABYSTEP_Z                      "ゼドウ Z"                    // "Babystep Z"
132
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
132
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
133
+#define MSG_END_HOUR                        "hours"
134
+#define MSG_END_MINUTE                      "minutes"
133
 
135
 
134
 #ifdef DELTA_CALIBRATION_MENU
136
 #ifdef DELTA_CALIBRATION_MENU
135
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
137
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"

+ 2
- 0
Marlin/language_nl.h View File

123
 #define MSG_BABYSTEP_Y                      "Babystap Y"
123
 #define MSG_BABYSTEP_Y                      "Babystap Y"
124
 #define MSG_BABYSTEP_Z                      "Babystap Z"
124
 #define MSG_BABYSTEP_Z                      "Babystap Z"
125
 #define MSG_ENDSTOP_ABORT                   "Endstop afbr."
125
 #define MSG_ENDSTOP_ABORT                   "Endstop afbr."
126
+#define MSG_END_HOUR                        "hours"
127
+#define MSG_END_MINUTE                      "minutes"
126
 
128
 
127
 #ifdef DELTA_CALIBRATION_MENU
129
 #ifdef DELTA_CALIBRATION_MENU
128
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
130
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"

+ 3
- 0
Marlin/language_pl.h View File

123
 #define MSG_BABYSTEP_Y                      "Babystep Y"
123
 #define MSG_BABYSTEP_Y                      "Babystep Y"
124
 #define MSG_BABYSTEP_Z                      "Babystep Z"
124
 #define MSG_BABYSTEP_Z                      "Babystep Z"
125
 #define MSG_ENDSTOP_ABORT                   "Blad wyl. kranc."
125
 #define MSG_ENDSTOP_ABORT                   "Blad wyl. kranc."
126
+#define MSG_END_HOUR                        "hours"
127
+#define MSG_END_MINUTE                      "minutes"
128
+
126
 
129
 
127
 #ifdef DELTA_CALIBRATION_MENU
130
 #ifdef DELTA_CALIBRATION_MENU
128
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
131
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"

+ 2
- 0
Marlin/language_pt-br.h View File

123
 #define MSG_BABYSTEP_Y                      "Babystep Y"
123
 #define MSG_BABYSTEP_Y                      "Babystep Y"
124
 #define MSG_BABYSTEP_Z                      "Babystep Z"
124
 #define MSG_BABYSTEP_Z                      "Babystep Z"
125
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
125
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
126
+#define MSG_END_HOUR                        "horas"
127
+#define MSG_END_MINUTE                      "minutos"
126
 
128
 
127
 #ifdef DELTA_CALIBRATION_MENU
129
 #ifdef DELTA_CALIBRATION_MENU
128
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
130
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"

+ 2
- 0
Marlin/language_pt.h View File

123
 #define MSG_BABYSTEP_Y                      "Babystep Y"
123
 #define MSG_BABYSTEP_Y                      "Babystep Y"
124
 #define MSG_BABYSTEP_Z                      "Babystep Z"
124
 #define MSG_BABYSTEP_Z                      "Babystep Z"
125
 #define MSG_ENDSTOP_ABORT                   "Endstop abort."
125
 #define MSG_ENDSTOP_ABORT                   "Endstop abort."
126
+#define MSG_END_HOUR                        "horas"
127
+#define MSG_END_MINUTE                      "minutos"
126
 
128
 
127
 #ifdef DELTA_CALIBRATION_MENU
129
 #ifdef DELTA_CALIBRATION_MENU
128
     #define MSG_DELTA_CALIBRATE             "Delta Calibracao"
130
     #define MSG_DELTA_CALIBRATE             "Delta Calibracao"

+ 2
- 0
Marlin/language_ru.h View File

123
 #define MSG_BABYSTEP_Y                      "Babystep Y"
123
 #define MSG_BABYSTEP_Y                      "Babystep Y"
124
 #define MSG_BABYSTEP_Z                      "Babystep Z"
124
 #define MSG_BABYSTEP_Z                      "Babystep Z"
125
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
125
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
126
+#define MSG_END_HOUR                        "hours"
127
+#define MSG_END_MINUTE                      "minutes"
126
 
128
 
127
 #ifdef DELTA_CALIBRATION_MENU
129
 #ifdef DELTA_CALIBRATION_MENU
128
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
130
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"

Loading…
Cancel
Save