thomas
/
marlin
Obserwuj 1
Gwiazdka 0
Forkuj 0
Kod Problemy 0 Pull Requests 0 Wydania 0 Wiki Aktywność
Przeglądaj źródła

Update German language, &c. (#14613)

Ludy 4 lat temu
rodzic
e96468566d
commit
6dcb85927a
5 zmienionych plików z 38 dodań i 36 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 2
    0
      Marlin/src/HAL/HAL_AVR/pinsDebug.h
  2. 33
    33
      Marlin/src/lcd/language/language_de.h
  3. 1
    1
      Marlin/src/lcd/menu/menu.cpp
  4. 1
    1
      Marlin/src/lcd/menu/menu_configuration.cpp
  5. 1
    1
      Marlin/src/pins/stm32/pins_STM3R_MINI.h

+ 2
- 0
Marlin/src/HAL/HAL_AVR/pinsDebug.h Wyświetl plik 

@@ -353,6 +353,8 @@ static void pwm_details(uint8_t pin) {
353 353 
         timer_prefix(0, 'A', 3);
354 354 
       #endif
355 355 
     }
356 
+  #else
357 
+    UNUSED(print_is_also_tied);
356 358 
   #endif
357 359 
 } // pwm_details
358 360

+ 33
- 33
Marlin/src/lcd/language/language_de.h Wyświetl plik 

@@ -41,12 +41,12 @@
41 41 
 #define MSG_SD_REMOVED                      _UxGT("SD-Karte entfernt")
42 42 
 #define MSG_SD_RELEASED                     _UxGT("SD-Karte freigeg.")
43 43 
 #define MSG_LCD_ENDSTOPS                    _UxGT("Endstopp") // Max length 8 characters
44 
-#define MSG_LCD_SOFT_ENDSTOPS               _UxGT("Soft-Endstopp")
44 
+#define MSG_LCD_SOFT_ENDSTOPS               _UxGT("Software-Endstopp")
45 45 
 #define MSG_MAIN                            _UxGT("Hauptmenü")
46 46 
 #define MSG_ADVANCED_SETTINGS               _UxGT("Erw. Einstellungen")
47 47 
 #define MSG_CONFIGURATION                   _UxGT("Konfiguration")
48 48 
 #define MSG_AUTOSTART                       _UxGT("Autostart")
49 
-#define MSG_DISABLE_STEPPERS                _UxGT("Motoren deaktivieren") // M84
49 
+#define MSG_DISABLE_STEPPERS                _UxGT("Motoren deaktivieren") // M84 :: Max length 19 characters
50 50 
 #define MSG_DEBUG_MENU                      _UxGT("Debug-Menü")
51 51 
 #define MSG_PROGRESS_BAR_TEST               _UxGT("Statusbalken-Test")
52 52 
 #define MSG_AUTO_HOME                       _UxGT("Home XYZ") // G28
 
@@ -62,18 +62,18 @@
62 62 
 #define MSG_SET_HOME_OFFSETS                _UxGT("Setze Homeversatz")
63 63 
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Homeversatz aktiv")
64 64 
 #define MSG_SET_ORIGIN                      _UxGT("Setze Nullpunkte") //"G92 X0 Y0 Z0" commented out in ultralcd.cpp
65 
-#define MSG_PREHEAT_1                       _UxGT("Vorwärmen " PREHEAT_1_LABEL)
66 
-#define MSG_PREHEAT_1_N                     _UxGT("Vorwärmen " PREHEAT_1_LABEL " ")
67 
-#define MSG_PREHEAT_1_ALL                   _UxGT("Vorw. " PREHEAT_1_LABEL " Alles")
68 
-#define MSG_PREHEAT_1_END                   _UxGT("Vorw. " PREHEAT_1_LABEL " Extr.")
69 
-#define MSG_PREHEAT_1_BEDONLY               _UxGT("Vorw. " PREHEAT_1_LABEL " Bett")
70 
-#define MSG_PREHEAT_1_SETTINGS              _UxGT("Vorw. " PREHEAT_1_LABEL " Einst.")
71 
-#define MSG_PREHEAT_2                       _UxGT("Vorwärmen " PREHEAT_2_LABEL)
72 
-#define MSG_PREHEAT_2_N                     _UxGT("Vorwärmen " PREHEAT_2_LABEL " ")
73 
-#define MSG_PREHEAT_2_ALL                   _UxGT("Vorw. " PREHEAT_2_LABEL " Alles")
74 
-#define MSG_PREHEAT_2_END                   _UxGT("Vorw. " PREHEAT_2_LABEL " Extr.")
75 
-#define MSG_PREHEAT_2_BEDONLY               _UxGT("Vorw. " PREHEAT_2_LABEL " Bett")
76 
-#define MSG_PREHEAT_2_SETTINGS              _UxGT("Vorw. " PREHEAT_2_LABEL " Einst.")
65 
+#define MSG_PREHEAT_1                       _UxGT(PREHEAT_1_LABEL " Vorwärmen")
66 
+#define MSG_PREHEAT_1_N                     _UxGT(PREHEAT_1_LABEL " Vorwärmen ")
67 
+#define MSG_PREHEAT_1_ALL                   _UxGT(PREHEAT_1_LABEL " Alles Vorwärmen")
68 
+#define MSG_PREHEAT_1_END                   _UxGT(PREHEAT_1_LABEL " Extr. Vorwärmen")
69 
+#define MSG_PREHEAT_1_BEDONLY               _UxGT(PREHEAT_1_LABEL " Bett Vorwärmen")
70 
+#define MSG_PREHEAT_1_SETTINGS              _UxGT(PREHEAT_1_LABEL " Einstellungen")
71 
+#define MSG_PREHEAT_2                       _UxGT(PREHEAT_2_LABEL " Vorwärmen")
72 
+#define MSG_PREHEAT_2_N                     _UxGT(PREHEAT_2_LABEL " Vorwärmen ")
73 
+#define MSG_PREHEAT_2_ALL                   _UxGT(PREHEAT_2_LABEL " Alles Vorwärmen")
74 
+#define MSG_PREHEAT_2_END                   _UxGT(PREHEAT_2_LABEL " Extr. Vorwärmen")
75 
+#define MSG_PREHEAT_2_BEDONLY               _UxGT(PREHEAT_2_LABEL " Bett Vorwärmen")
76 
+#define MSG_PREHEAT_2_SETTINGS              _UxGT(PREHEAT_2_LABEL " Einstellungen")
77 77 
 #define MSG_PREHEAT_CUSTOM                  _UxGT("benutzerdef. Heizen")
78 78 
 #define MSG_COOLDOWN                        _UxGT("Abkühlen")
79 79 
 #define MSG_LASER_MENU                      _UxGT("Laser")
 
@@ -81,15 +81,15 @@
81 81 
 #define MSG_LASER_ON                        _UxGT("Laser an")
82 82 
 #define MSG_LASER_POWER                     _UxGT("Laserleistung")
83 83 
 #define MSG_SPINDLE_MENU                    _UxGT("Spindel-Steuerung")
84 
-#define MSG_SPINDLE_OFF                     _UxGT("Spindel Aus")
85 
-#define MSG_SPINDLE_ON                      _UxGT("Spindel An")
84 
+#define MSG_SPINDLE_OFF                     _UxGT("Spindel aus")
85 
+#define MSG_SPINDLE_ON                      _UxGT("Spindel an")
86 86 
 #define MSG_SPINDLE_POWER                   _UxGT("Spindelleistung")
87 87 
 #define MSG_SPINDLE_REVERSE                 _UxGT("Spindelrichtung")
88 88 
 #define MSG_SWITCH_PS_ON                    _UxGT("Netzteil ein")
89 89 
 #define MSG_SWITCH_PS_OFF                   _UxGT("Netzteil aus")
90 90 
 #define MSG_EXTRUDE                         _UxGT("Extrudieren")
91 91 
 #define MSG_RETRACT                         _UxGT("Einzug")
92 
-#define MSG_MOVE_AXIS                       _UxGT("Achse Bewegen")
92 
+#define MSG_MOVE_AXIS                       _UxGT("Achsen bewegen")
93 93 
 #define MSG_BED_LEVELING                    _UxGT("Bett-Nivellierung")
94 94 
 #define MSG_LEVEL_BED                       _UxGT("Bett nivellieren")
95 95 
 #define MSG_LEVEL_CORNERS                   _UxGT("Ecken nivellieren")
 
@@ -107,7 +107,7 @@
107 107 
 #define MSG_LCD_TILTING_MESH                _UxGT("Berührungspunkt")
108 108 
 #define MSG_IDEX_MENU                       _UxGT("IDEX-Modus")
109 109 
 #define MSG_OFFSETS_MENU                    _UxGT("Werkzeugversätze")
110 
-#define MSG_IDEX_MODE_AUTOPARK              _UxGT("Autom. Parken")
110 
+#define MSG_IDEX_MODE_AUTOPARK              _UxGT("Autom. parken")
111 111 
 #define MSG_IDEX_MODE_DUPLICATE             _UxGT("Duplizieren")
112 112 
 #define MSG_IDEX_MODE_MIRRORED_COPY         _UxGT("Spiegelkopie")
113 113 
 #define MSG_IDEX_MODE_FULL_CTRL             _UxGT("vollstä. Kontrolle")
 
@@ -131,14 +131,14 @@
131 131 
 #define MSG_UBL_DONE_EDITING_MESH           _UxGT("Bearbeitung beendet")
132 132 
 #define MSG_UBL_BUILD_CUSTOM_MESH           _UxGT("Eigenes Netz erst.")
133 133 
 #define MSG_UBL_BUILD_MESH_MENU             _UxGT("Netz erstellen")
134 
-#define MSG_UBL_BUILD_MESH_M1               _UxGT("Netz erstellen " PREHEAT_1_LABEL)
135 
-#define MSG_UBL_BUILD_MESH_M2               _UxGT("Netz erstellen " PREHEAT_2_LABEL)
134 
+#define MSG_UBL_BUILD_MESH_M1               _UxGT(PREHEAT_1_LABEL " Netz erstellen")
135 
+#define MSG_UBL_BUILD_MESH_M2               _UxGT(PREHEAT_2_LABEL " Netz erstellen")
136 136 
 #define MSG_UBL_BUILD_COLD_MESH             _UxGT("Netz erstellen kalt")
137 137 
 #define MSG_UBL_MESH_HEIGHT_ADJUST          _UxGT("Netzhöhe einst.")
138 138 
 #define MSG_UBL_MESH_HEIGHT_AMOUNT          _UxGT("Höhe")
139 139 
 #define MSG_UBL_VALIDATE_MESH_MENU          _UxGT("Netz validieren")
140 
-#define MSG_UBL_VALIDATE_MESH_M1            _UxGT("Netz validieren " PREHEAT_1_LABEL)
141 
-#define MSG_UBL_VALIDATE_MESH_M2            _UxGT("Netz validieren " PREHEAT_2_LABEL)
140 
+#define MSG_UBL_VALIDATE_MESH_M1            _UxGT(PREHEAT_1_LABEL " Netz validieren")
141 
+#define MSG_UBL_VALIDATE_MESH_M2            _UxGT(PREHEAT_2_LABEL " Netz validieren")
142 142 
 #define MSG_UBL_VALIDATE_CUSTOM_MESH        _UxGT("Eig. Netz validieren")
143 143 
 #define MSG_UBL_CONTINUE_MESH               _UxGT("Netzerst. forts.")
144 144 
 #define MSG_UBL_MESH_LEVELING               _UxGT("Netz-Nivellierung")
 
@@ -185,7 +185,7 @@
185 185 
 #define MSG_SET_LEDS_VIOLET                 _UxGT("Violett")
186 186 
 #define MSG_SET_LEDS_WHITE                  _UxGT("Weiß")
187 187 
 #define MSG_SET_LEDS_DEFAULT                _UxGT("Standard")
188 
-#define MSG_CUSTOM_LEDS                     _UxGT("Benutzerdef.")
188 
+#define MSG_CUSTOM_LEDS                     _UxGT("Benutzerdefiniert")
189 189 
 #define MSG_INTENSITY_R                     _UxGT("Intensität Rot")
190 190 
 #define MSG_INTENSITY_G                     _UxGT("Intensität Grün")
191 191 
 #define MSG_INTENSITY_B                     _UxGT("Intensität Blau")
 
@@ -200,9 +200,9 @@
200 200 
 #define MSG_MOVE_E                          _UxGT("Bewege Extruder")
201 201 
 #define MSG_HOTEND_TOO_COLD                 _UxGT("Hotend zu kalt")
202 202 
 #define MSG_MOVE_0025MM                     _UxGT(" 0,025 mm")
203 
-#define MSG_MOVE_01MM                       _UxGT(" 0,1 mm")
204 
-#define MSG_MOVE_1MM                        _UxGT(" 1,0 mm")
205 
-#define MSG_MOVE_10MM                       _UxGT("10,0 mm")
203 
+#define MSG_MOVE_01MM                       _UxGT(" 0,1   mm")
204 
+#define MSG_MOVE_1MM                        _UxGT(" 1,0   mm")
205 
+#define MSG_MOVE_10MM                       _UxGT("10,0   mm")
206 206 
 #define MSG_SPEED                           _UxGT("Geschw.")
207 207 
 #define MSG_BED_Z                           _UxGT("Bett Z")
208 208 
 #define MSG_NOZZLE                          _UxGT("Düse")
 
@@ -216,8 +216,8 @@
216 216 
 #define MSG_MAX                             LCD_STR_THERMOMETER _UxGT(" max")
217 217 
 #define MSG_FACTOR                          LCD_STR_THERMOMETER _UxGT(" Faktor")
218 218 
 #define MSG_AUTOTEMP                        _UxGT("Auto Temperatur")
219 
-#define MSG_LCD_ON                          _UxGT("Ein")
220 
-#define MSG_LCD_OFF                         _UxGT("Aus")
219 
+#define MSG_LCD_ON                          _UxGT("an")
220 
+#define MSG_LCD_OFF                         _UxGT("aus")
221 221 
 #define MSG_PID_P                           _UxGT("PID P")
222 222 
 #define MSG_PID_I                           _UxGT("PID I")
223 223 
 #define MSG_PID_D                           _UxGT("PID D")
 
@@ -282,7 +282,7 @@
282 282 
 #define MSG_TUNE                            _UxGT("Justierung")
283 283 
 #define MSG_START_PRINT                     _UxGT("Starte Druck")
284 284 
 #define MSG_BUTTON_NEXT                     _UxGT("Weiter")
285 
-#define MSG_BUTTON_INIT                     _UxGT("Init")
285 
+#define MSG_BUTTON_INIT                     _UxGT("Bestätigen")
286 286 
 #define MSG_BUTTON_STOP                     _UxGT("Stop")
287 287 
 #define MSG_BUTTON_PRINT                    _UxGT("Drucken")
288 288 
 #define MSG_BUTTON_RESET                    _UxGT("Zurücksetzen")
 
@@ -304,11 +304,11 @@
304 304 
 #define MSG_STOPPED                         _UxGT("ANGEHALTEN")
305 305 
 #define MSG_CONTROL_RETRACT                 _UxGT("Einzug mm")
306 306 
 #define MSG_CONTROL_RETRACT_SWAP            _UxGT("Wechs. Einzug mm")
307 
-#define MSG_CONTROL_RETRACTF                _UxGT("Einzug   V")
307 
+#define MSG_CONTROL_RETRACTF                _UxGT("V Einzug")
308 308 
 #define MSG_CONTROL_RETRACT_ZHOP            _UxGT("Z-Sprung mm")
309 309 
 #define MSG_CONTROL_RETRACT_RECOVER         _UxGT("UnRet mm")
310 310 
 #define MSG_CONTROL_RETRACT_RECOVER_SWAP    _UxGT("Wechs. UnRet mm")
311 
-#define MSG_CONTROL_RETRACT_RECOVERF        _UxGT("UnRet  V")
311 
+#define MSG_CONTROL_RETRACT_RECOVERF        _UxGT("UnRet V")
312 312 
 #define MSG_CONTROL_RETRACT_RECOVER_SWAPF   _UxGT("S UnRet V")
313 313 
 #define MSG_AUTORETRACT                     _UxGT("Autom. Einzug")
314 314 
 #define MSG_FILAMENT_SWAP_LENGTH            _UxGT("Einzugslänge")
 
@@ -353,7 +353,7 @@
353 353 
 #define MSG_BABYSTEP_Y                      _UxGT("Babystep Y")
354 354 
 #define MSG_BABYSTEP_Z                      _UxGT("Babystep Z")
355 355 
 #define MSG_BABYSTEP_TOTAL                  _UxGT("Total")
356 
-#define MSG_ENDSTOP_ABORT                   _UxGT("Endstopp Abbr.")
356 
+#define MSG_ENDSTOP_ABORT                   _UxGT("Abbr. mit Endstopp")
357 357 
 #define MSG_HEATING_FAILED_LCD              _UxGT("HEIZEN ERFOLGLOS")
358 358 
 #define MSG_HEATING_FAILED_LCD_BED          _UxGT("Bett heizen fehlge.")
359 359 
 #define MSG_HEATING_FAILED_LCD_CHAMBER      _UxGT("Geh. heizen fehlge.")
 
@@ -368,7 +368,7 @@
368 368 
 #define MSG_ERR_MAXTEMP_CHAMBER             _UxGT("Err:Gehäuse max Temp")
369 369 
 #define MSG_ERR_MINTEMP_CHAMBER             _UxGT("Err:Gehäuse min Temp")
370 370 
 #define MSG_ERR_Z_HOMING                    MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST
371 
-#define MSG_HALTED                          _UxGT("DRUCKER STOPP")
371 
+#define MSG_HALTED                          _UxGT("DRUCKER GESTOPPT")
372 372 
 #define MSG_PLEASE_RESET                    _UxGT("Bitte neustarten")
373 373 
 #define MSG_SHORT_DAY                       _UxGT("t") // One character only
374 374 
 #define MSG_SHORT_HOUR                      _UxGT("h") // One character only

+ 1
- 1
Marlin/src/lcd/menu/menu.cpp Wyświetl plik 

@@ -448,7 +448,7 @@ bool ui_selection; // = false
448 448 
 void set_ui_selection(const bool sel) { ui_selection = sel; }
449 449 
 void do_select_screen(PGM_P const yes, PGM_P const no, selectFunc_t yesFunc, selectFunc_t noFunc, PGM_P const pref, const char * const string/*=nullptr*/, PGM_P const suff/*=nullptr*/) {
450 450 
   if (ui.encoderPosition) {
451 
-    ui_selection = (ENCODERBASE) > 0 == int16_t(ui.encoderPosition) > 0;
451 
+    ui_selection = ((ENCODERBASE) > 0) == (int16_t(ui.encoderPosition) > 0);
452 452 
     ui.encoderPosition = 0;
453 453 
   }
454 454 
   const bool got_click = ui.use_click();

+ 1
- 1
Marlin/src/lcd/menu/menu_configuration.cpp Wyświetl plik 

@@ -303,7 +303,7 @@ static void lcd_factory_settings() {
303 303 
     #endif
304 304 
     START_MENU();
305 305 
     MENU_BACK(MSG_CONFIGURATION);
306 
-    MENU_ITEM_EDIT(uint8, MSG_FAN_SPEED, &ui.preheat_fan_speed[material], 0, 255);
306 
+    MENU_ITEM_EDIT(percent, MSG_FAN_SPEED, &ui.preheat_fan_speed[material], 0, 255);
307 307 
     #if HAS_TEMP_HOTEND
308 308 
       MENU_ITEM_EDIT(int3, MSG_NOZZLE, &ui.preheat_hotend_temp[material], MINTEMP_ALL, MAXTEMP_ALL - 15);
309 309 
     #endif

+ 1
- 1
Marlin/src/pins/stm32/pins_STM3R_MINI.h Wyświetl plik 

@@ -127,7 +127,7 @@
127 127 
     #define LCD_PINS_D7    PB15
128 128 
   #else
129 129 
     #define LCD_PINS_RS    PB8
130 
-    #define LCD_PINS_ENABLE PD2ins
130 
+    #define LCD_PINS_ENABLE PD2
131 131 
     #define LCD_PINS_D4    PB12
132 132 
     #define LCD_PINS_D5    PB13
133 133 
     #define LCD_PINS_D6    PB14

Napisz Podgląd
Ładowanie…
Anuluj
Zapisz