Selaa lähdekoodia

Merge pull request #5244 from thinkyhead/rc_danish_nov_2016

Update to Danish language 10/11-2016
Scott Lahteine 8 vuotta sitten
vanhempi
commit
32247c1b80

+ 1
- 1
Marlin/language_cz.h Näytä tiedosto

@@ -188,7 +188,7 @@
188 188
 #define MSG_INFO_EXTRUDERS                  "Extrudery"
189 189
 #define MSG_INFO_BAUDRATE                   "Rychlost"
190 190
 #define MSG_INFO_PROTOCOL                   "Protokol"
191
-#if LCD_WIDTH > 19
191
+#if LCD_WIDTH >= 20
192 192
   #define MSG_INFO_PRINT_COUNT              "Pocet tisku"
193 193
   #define MSG_INFO_COMPLETED_PRINTS         "Dokonceno"
194 194
   #define MSG_INFO_PRINT_TIME               "Celkovy cas"

+ 42
- 35
Marlin/language_da.h Näytä tiedosto

@@ -31,6 +31,8 @@
31 31
 #define LANGUAGE_DA_H
32 32
 
33 33
 #define MAPPER_C2C3
34
+// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
35
+//#define SIMULATE_ROMFONT
34 36
 #define DISPLAY_CHARSET_ISO10646_1
35 37
 
36 38
 #define WELCOME_MSG                         MACHINE_NAME " er klar"
@@ -113,7 +115,7 @@
113 115
 #define MSG_TEMPERATURE                     "Temperatur"
114 116
 #define MSG_MOTION                          "Bevægelse"
115 117
 #define MSG_VOLUMETRIC                      "Filament"
116
-#define MSG_VOLUMETRIC_ENABLED              "E in mm3"
118
+#define MSG_VOLUMETRIC_ENABLED              "E i mm3"
117 119
 #define MSG_FILAMENT_DIAM                   "Fil. Dia."
118 120
 #define MSG_CONTRAST                        "LCD kontrast"
119 121
 #define MSG_STORE_EPROM                     "Gem i EEPROM"
@@ -140,13 +142,15 @@
140 142
 #define MSG_CONTROL_RETRACTF                "Tilbagetræk V"
141 143
 #define MSG_CONTROL_RETRACT_ZLIFT           "Hop mm"
142 144
 #define MSG_CONTROL_RETRACT_RECOVER         "UnRet +mm"
143
-#define MSG_CONTROL_RETRACT_RECOVER_SWAP    "S UnRet+mm"
145
+#define MSG_CONTROL_RETRACT_RECOVER_SWAP    "Skift UnRet+mm"
144 146
 #define MSG_CONTROL_RETRACT_RECOVERF        "UnRet  V"
145 147
 #define MSG_AUTORETRACT                     "AutoRetr."
146 148
 #define MSG_FILAMENTCHANGE                  "Skift filament"
147 149
 #define MSG_INIT_SDCARD                     "Init. SD card"
148 150
 #define MSG_CNG_SDCARD                      "Skift SD kort"
149 151
 #define MSG_ZPROBE_OUT                      "Probe udenfor plade"
152
+#define MSG_BLTOUCH_SELFTEST                "BLTouch Selv-Test"
153
+#define MSG_BLTOUCH_RESET                   "Reset BLTouch"
150 154
 #define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
151 155
 #define MSG_FIRST                           "først"
152 156
 #define MSG_ZPROBE_ZOFFSET                  "Z Offset"
@@ -157,15 +161,16 @@
157 161
 #define MSG_HEATING_FAILED_LCD              "Opvarmning fejlet"
158 162
 #define MSG_ERR_REDUNDANT_TEMP              "Fejl: reserve temp"
159 163
 #define MSG_THERMAL_RUNAWAY                 "Temp løber løbsk"
160
-#define MSG_ERR_MAXTEMP                     "Fejl: MAKSTEMP"
161
-#define MSG_ERR_MINTEMP                     "Fejl: MINTEMP"
162
-#define MSG_ERR_MAXTEMP_BED                 "Fejl: MAKSTEMP PLADE"
163
-#define MSG_ERR_MINTEMP_BED                 "Fejl: MINTEMP PLADE"
164
-#define MSG_HALTED                          "PRINTER HALTED"
165
-#define MSG_PLEASE_RESET                    "Reset venligst"
166
-#define MSG_SHORT_DAY                       "d" // One character only
167
-#define MSG_SHORT_HOUR                      "h" // One character only
168
-#define MSG_SHORT_MINUTE                    "m" // One character only
164
+#define MSG_ERR_MAXTEMP                     "Fejl: Maks temp"
165
+#define MSG_ERR_MINTEMP                     "Fejl: Min temp"
166
+#define MSG_ERR_MAXTEMP_BED                 "Fejl: Maks Plade temp"
167
+#define MSG_ERR_MINTEMP_BED                 "Fejl: Min Plade temp"
168
+#define MSG_ERR_Z_HOMING                    "G28 Z Forbudt"
169
+#define MSG_HALTED                          "PRINTER STOPPET"
170
+#define MSG_PLEASE_RESET                    "Reset Venligst"
171
+#define MSG_SHORT_DAY                       "d" // Kun et bogstav
172
+#define MSG_SHORT_HOUR                      "h" // Kun et bogstav
173
+#define MSG_SHORT_MINUTE                    "m" // Kun et bogstav
169 174
 #define MSG_HEATING                         "Opvarmer..."
170 175
 #define MSG_HEATING_COMPLETE                "Opvarmet"
171 176
 #define MSG_BED_HEATING                     "Opvarmer plade"
@@ -178,19 +183,19 @@
178 183
 
179 184
 #define MSG_INFO_MENU                       "Om Printer"
180 185
 #define MSG_INFO_PRINTER_MENU               "Printer Info"
181
-#define MSG_INFO_STATS_MENU                 "Printer Stat."
182
-#define MSG_INFO_BOARD_MENU                 "Board Info"
186
+#define MSG_INFO_STATS_MENU                 "Printer Stats"
187
+#define MSG_INFO_BOARD_MENU                 "Kort Info"
183 188
 #define MSG_INFO_THERMISTOR_MENU            "Thermistors"
184
-#define MSG_INFO_EXTRUDERS                  "Extrudere"
189
+#define MSG_INFO_EXTRUDERS                  "Extruders"
185 190
 #define MSG_INFO_BAUDRATE                   "Baud"
186 191
 #define MSG_INFO_PROTOCOL                   "Protocol"
187 192
 
188
-#if LCD_WIDTH > 19
189
-  #define MSG_INFO_PRINT_COUNT              "Antal Print"
193
+#if LCD_WIDTH >= 20
194
+  #define MSG_INFO_PRINT_COUNT              "Ant. Prints"
190 195
   #define MSG_INFO_COMPLETED_PRINTS         "Færdige"
191 196
   #define MSG_INFO_PRINT_TIME               "Total print tid"
192
-  #define MSG_INFO_PRINT_LONGEST            "Længste print tid"
193
-  #define MSG_INFO_PRINT_FILAMENT           "Total extruderet"
197
+  #define MSG_INFO_PRINT_LONGEST            "Længste print"
198
+  #define MSG_INFO_PRINT_FILAMENT           "Total Extruderet"
194 199
 #else
195 200
   #define MSG_INFO_PRINT_COUNT              "Prints"
196 201
   #define MSG_INFO_COMPLETED_PRINTS         "Færdige"
@@ -201,36 +206,38 @@
201 206
 
202 207
 #define MSG_INFO_MIN_TEMP                   "Min Temp"
203 208
 #define MSG_INFO_MAX_TEMP                   "Max Temp"
204
-#define MSG_INFO_PSU                        "Strømforsyning"
209
+#define MSG_INFO_PSU                        "Strømfors."
205 210
 
211
+#define MSG_DRIVE_STRENGTH                  "Driv Styrke"
212
+#define MSG_DAC_PERCENT                     "Driv %"
213
+#define MSG_DAC_EEPROM_WRITE                "DAC EEPROM Skriv"
206 214
 #define MSG_FILAMENT_CHANGE_HEADER          "SKIFT FILAMENT"
207
-#define MSG_FILAMENT_CHANGE_OPTION_HEADER   "SKIFTE MULIGHEDER:"
215
+#define MSG_FILAMENT_CHANGE_OPTION_HEADER   "Skift muligheder:"
208 216
 #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE  "Extruder mere"
209
-#define MSG_FILAMENT_CHANGE_OPTION_RESUME   "forsæt print"
217
+#define MSG_FILAMENT_CHANGE_OPTION_RESUME   "Forsæt print"
210 218
 
211 219
 #if LCD_HEIGHT >= 4
212
-  #define MSG_FILAMENT_CHANGE_INIT_1          "Vent på"
213
-  #define MSG_FILAMENT_CHANGE_INIT_2          "skift af "
214
-  #define MSG_FILAMENT_CHANGE_INIT_3          "filament"
220
+  #define MSG_FILAMENT_CHANGE_INIT_1          "Vent på start"
221
+  #define MSG_FILAMENT_CHANGE_INIT_2          "af filament"
222
+  #define MSG_FILAMENT_CHANGE_INIT_3          "skift"
215 223
   #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Vent på"
216
-  #define MSG_FILAMENT_CHANGE_UNLOAD_2        "filament tømning"
217
-  #define MSG_FILAMENT_CHANGE_INSERT_1        "indsæt filament"
218
-  #define MSG_FILAMENT_CHANGE_INSERT_2        "og tryk for"
219
-  #define MSG_FILAMENT_CHANGE_INSERT_3        "at fortsætte..."
224
+  #define MSG_FILAMENT_CHANGE_UNLOAD_2        "filament udskyd."
225
+  #define MSG_FILAMENT_CHANGE_INSERT_1        "Indsæt filament"
226
+  #define MSG_FILAMENT_CHANGE_INSERT_2        "og tryk på knap"
227
+  #define MSG_FILAMENT_CHANGE_INSERT_3        "for at fortsætte..."
220 228
   #define MSG_FILAMENT_CHANGE_LOAD_1          "Vent på"
221
-  #define MSG_FILAMENT_CHANGE_LOAD_2          "filament fødning"
229
+  #define MSG_FILAMENT_CHANGE_LOAD_2          "filament indtag"
222 230
   #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Vent på"
223
-  #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "filament extrudere"
224
-  #define MSG_FILAMENT_CHANGE_RESUME_1        "Vent på at"
225
-  #define MSG_FILAMENT_CHANGE_RESUME_2        "print forsætter"
231
+  #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "filament extrudering"
232
+  #define MSG_FILAMENT_CHANGE_RESUME_1        "Vent på at print"
233
+  #define MSG_FILAMENT_CHANGE_RESUME_2        "fortsætter"
226 234
 #else // LCD_HEIGHT < 4
227 235
   #define MSG_FILAMENT_CHANGE_INIT_1          "Vent venligst..."
228
-  #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Tømmer..."
236
+  #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Udskyder..."
229 237
   #define MSG_FILAMENT_CHANGE_INSERT_1        "Indsæt og klik"
230
-  #define MSG_FILAMENT_CHANGE_LOAD_1          "Føder..."
238
+  #define MSG_FILAMENT_CHANGE_LOAD_1          "Indtager..."
231 239
   #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Extrudere..."
232 240
   #define MSG_FILAMENT_CHANGE_RESUME_1        "Fortsætter..."
233 241
 #endif // LCD_HEIGHT < 4
234 242
 
235 243
 #endif // LANGUAGE_DA_H
236
-

+ 1
- 1
Marlin/language_de.h Näytä tiedosto

@@ -185,7 +185,7 @@
185 185
 #define MSG_INFO_BAUDRATE                   "Baud"
186 186
 #define MSG_INFO_PROTOCOL                   "Protokol"
187 187
 
188
-#if LCD_WIDTH > 19
188
+#if LCD_WIDTH >= 20
189 189
   #define MSG_INFO_PRINT_COUNT              "Gesamte Drucke"
190 190
   #define MSG_INFO_COMPLETED_PRINTS         "Beendete Drucke"
191 191
   #define MSG_INFO_PRINT_TIME               "Gesamte Druckzeit"

+ 1
- 1
Marlin/language_el.h Näytä tiedosto

@@ -180,7 +180,7 @@
180 180
 #define MSG_INFO_BAUDRATE                   "Baud"
181 181
 #define MSG_INFO_PROTOCOL                   "Protocol"
182 182
 
183
-#if LCD_WIDTH > 19
183
+#if LCD_WIDTH >= 20
184 184
   #define MSG_INFO_PRINT_COUNT              "Print Count"
185 185
   #define MSG_INFO_COMPLETED_PRINTS         "Completed  "
186 186
   #define MSG_INFO_PRINT_TIME               "Total Time "

+ 1
- 1
Marlin/language_en.h Näytä tiedosto

@@ -488,7 +488,7 @@
488 488
   #define MSG_INFO_PROTOCOL                   "Protocol"
489 489
 #endif
490 490
 
491
-#if LCD_WIDTH > 19
491
+#if LCD_WIDTH >= 20
492 492
   #ifndef MSG_INFO_PRINT_COUNT
493 493
     #define MSG_INFO_PRINT_COUNT              "Print Count"
494 494
   #endif

+ 1
- 2
Marlin/language_fr.h Näytä tiedosto

@@ -188,8 +188,7 @@
188 188
 #define MSG_INFO_BAUDRATE                   "Baud"
189 189
 #define MSG_INFO_PROTOCOL                   "Protocole"
190 190
 
191
-
192
-#if LCD_WIDTH > 19
191
+#if LCD_WIDTH >= 20
193 192
   #define MSG_INFO_PRINT_COUNT              "Nbre impressions"
194 193
   #define MSG_INFO_COMPLETED_PRINTS         "Terminees"
195 194
   #define MSG_INFO_PRINT_TIME               "Tps impr. total"

+ 35
- 35
Marlin/language_gl.h Näytä tiedosto

@@ -182,18 +182,18 @@
182 182
 #define MSG_INFO_EXTRUDERS                  "Extrusores"
183 183
 #define MSG_INFO_BAUDRATE                   "Baudios"
184 184
 #define MSG_INFO_PROTOCOL                   "Protocolo"
185
-#if LCD_WIDTH > 19
186
-    #define MSG_INFO_PRINT_COUNT              "Total traballos"
187
-    #define MSG_INFO_COMPLETED_PRINTS         "Total completos"
188
-    #define MSG_INFO_PRINT_TIME               "Tempo impresion"
189
-    #define MSG_INFO_PRINT_LONGEST            "Traballo +longo"
190
-    #define MSG_INFO_PRINT_FILAMENT           "Total extruido"
185
+#if LCD_WIDTH >= 20
186
+  #define MSG_INFO_PRINT_COUNT              "Total traballos"
187
+  #define MSG_INFO_COMPLETED_PRINTS         "Total completos"
188
+  #define MSG_INFO_PRINT_TIME               "Tempo impresion"
189
+  #define MSG_INFO_PRINT_LONGEST            "Traballo +longo"
190
+  #define MSG_INFO_PRINT_FILAMENT           "Total extruido"
191 191
 #else
192
-    #define MSG_INFO_PRINT_COUNT              "Traballos"
193
-    #define MSG_INFO_COMPLETED_PRINTS         "Completos"
194
-    #define MSG_INFO_PRINT_TIME               "Tempo"
195
-    #define MSG_INFO_PRINT_LONGEST            "O +longo"
196
-    #define MSG_INFO_PRINT_FILAMENT           "Extruido"
192
+  #define MSG_INFO_PRINT_COUNT              "Traballos"
193
+  #define MSG_INFO_COMPLETED_PRINTS         "Completos"
194
+  #define MSG_INFO_PRINT_TIME               "Tempo"
195
+  #define MSG_INFO_PRINT_LONGEST            "O +longo"
196
+  #define MSG_INFO_PRINT_FILAMENT           "Extruido"
197 197
 #endif
198 198
 #define MSG_INFO_MIN_TEMP                   "Min Temp"
199 199
 #define MSG_INFO_MAX_TEMP                   "Max Temp"
@@ -203,31 +203,31 @@
203 203
 #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE  "Extruir mais"
204 204
 #define MSG_FILAMENT_CHANGE_OPTION_RESUME   "Segue traballo"
205 205
 #if LCD_HEIGHT >= 4
206
-    #define MSG_FILAMENT_CHANGE_INIT_1          "Agarde para"
207
-    #define MSG_FILAMENT_CHANGE_INIT_2          "iniciar troco"
208
-    #define MSG_FILAMENT_CHANGE_INIT_3          "de filamento"
209
-    #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Agarde pola"
210
-    #define MSG_FILAMENT_CHANGE_UNLOAD_2        "descarga do"
211
-    #define MSG_FILAMENT_CHANGE_UNLOAD_3        "filamento"
212
-    #define MSG_FILAMENT_CHANGE_INSERT_1        "Introduza o"
213
-    #define MSG_FILAMENT_CHANGE_INSERT_2        "filamento e"
214
-    #define MSG_FILAMENT_CHANGE_INSERT_3        "faga click"
215
-    #define MSG_FILAMENT_CHANGE_LOAD_1          "Agarde pola"
216
-    #define MSG_FILAMENT_CHANGE_LOAD_2          "carga do"
217
-    #define MSG_FILAMENT_CHANGE_LOAD_3          "filamento"
218
-    #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Agarde pola"
219
-    #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "extrusion do"
220
-    #define MSG_FILAMENT_CHANGE_EXTRUDE_3       "filamento"
221
-    #define MSG_FILAMENT_CHANGE_RESUME_1        "Agarde para"
222
-    #define MSG_FILAMENT_CHANGE_RESUME_2        "seguir co"
223
-    #define MSG_FILAMENT_CHANGE_RESUME_3        "traballo"
206
+  #define MSG_FILAMENT_CHANGE_INIT_1          "Agarde para"
207
+  #define MSG_FILAMENT_CHANGE_INIT_2          "iniciar troco"
208
+  #define MSG_FILAMENT_CHANGE_INIT_3          "de filamento"
209
+  #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Agarde pola"
210
+  #define MSG_FILAMENT_CHANGE_UNLOAD_2        "descarga do"
211
+  #define MSG_FILAMENT_CHANGE_UNLOAD_3        "filamento"
212
+  #define MSG_FILAMENT_CHANGE_INSERT_1        "Introduza o"
213
+  #define MSG_FILAMENT_CHANGE_INSERT_2        "filamento e"
214
+  #define MSG_FILAMENT_CHANGE_INSERT_3        "faga click"
215
+  #define MSG_FILAMENT_CHANGE_LOAD_1          "Agarde pola"
216
+  #define MSG_FILAMENT_CHANGE_LOAD_2          "carga do"
217
+  #define MSG_FILAMENT_CHANGE_LOAD_3          "filamento"
218
+  #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Agarde pola"
219
+  #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "extrusion do"
220
+  #define MSG_FILAMENT_CHANGE_EXTRUDE_3       "filamento"
221
+  #define MSG_FILAMENT_CHANGE_RESUME_1        "Agarde para"
222
+  #define MSG_FILAMENT_CHANGE_RESUME_2        "seguir co"
223
+  #define MSG_FILAMENT_CHANGE_RESUME_3        "traballo"
224 224
 #else // LCD_HEIGHT < 4
225
-    #define MSG_FILAMENT_CHANGE_INIT_1          "Agarde..."
226
-    #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Descargando..."
227
-    #define MSG_FILAMENT_CHANGE_INSERT_1        "Introduza e click"
228
-    #define MSG_FILAMENT_CHANGE_LOAD_1          "Cargando..."
229
-    #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Extruindo..."
230
-    #define MSG_FILAMENT_CHANGE_RESUME_1        "Seguindo..."
225
+  #define MSG_FILAMENT_CHANGE_INIT_1          "Agarde..."
226
+  #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Descargando..."
227
+  #define MSG_FILAMENT_CHANGE_INSERT_1        "Introduza e click"
228
+  #define MSG_FILAMENT_CHANGE_LOAD_1          "Cargando..."
229
+  #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Extruindo..."
230
+  #define MSG_FILAMENT_CHANGE_RESUME_1        "Seguindo..."
231 231
 #endif // LCD_HEIGHT < 4
232 232
 
233 233
 #endif // LANGUAGE_GL_H

+ 1
- 1
Marlin/language_it.h Näytä tiedosto

@@ -190,7 +190,7 @@
190 190
 #define MSG_INFO_EXTRUDERS                  "Estrusori"
191 191
 #define MSG_INFO_BAUDRATE                   "Baud"
192 192
 #define MSG_INFO_PROTOCOL                   "Protocollo"
193
-#if LCD_WIDTH > 19
193
+#if LCD_WIDTH >= 20
194 194
   #define MSG_INFO_PRINT_COUNT              "Contat. stampa"
195 195
   #define MSG_INFO_COMPLETED_PRINTS         "Completati"
196 196
   #define MSG_INFO_PRINT_TIME               "Tempo totale"

+ 13
- 13
Marlin/language_kana.h Näytä tiedosto

@@ -89,7 +89,7 @@
89 89
 #define MSG_MIN                             LCD_STR_THERMOMETER " \xbb\xb2\xc3\xb2"                            // " サイテイ" (" Min")
90 90
 #define MSG_MAX                             LCD_STR_THERMOMETER " \xbb\xb2\xba\xb3"                            // " サイコウ" (" Max")
91 91
 #define MSG_FACTOR                          LCD_STR_THERMOMETER " \xcc\xa7\xb8\xc0\xb0"                        // " ファクター" (" Fact")
92
-#if LCD_WIDTH > 19
92
+#if LCD_WIDTH >= 20
93 93
   #define MSG_AUTOTEMP                      "\xbc\xde\xc4\xde\xb3\xb5\xdd\xc4\xde\xbe\xb2\xb7\xde\xae"         // "ジドウオンドセイギョ" ("Autotemp")
94 94
 #else
95 95
   #define MSG_AUTOTEMP                      "\xbc\xde\xc4\xde\xb3\xb5\xdd\xc4\xde"                             // "ジドウオンド" ("Autotemp")
@@ -101,7 +101,7 @@
101 101
 #define MSG_PID_D                           "PID-D"
102 102
 #define MSG_PID_C                           "PID-C"
103 103
 #define MSG_SELECT                          "\xbe\xdd\xc0\xb8"                                                 // "センタク" ("Select")
104
-#if LCD_WIDTH > 19
104
+#if LCD_WIDTH >= 20
105 105
   #define MSG_ACC                           "\xb6\xbf\xb8\xc4\xde mm/s2"                                       // "カソクド mm/s2" ("Accel")
106 106
   #define MSG_VX_JERK                       "X\xbc\xde\xb8\x20\xd4\xb8\xc4\xde mm/s"                           // "Xジク ヤクド mm/s" ("Vx-jerk")
107 107
   #define MSG_VY_JERK                       "Y\xbc\xde\xb8\x20\xd4\xb8\xc4\xde mm/s"                           // "Yジク ヤクド mm/s" ("Vy-jerk")
@@ -132,7 +132,7 @@
132 132
 #define MSG_MOTION                          "\xb3\xba\xde\xb7\xbe\xaf\xc3\xb2"                                 // "ウゴキセッテイ" ("Motion")
133 133
 #define MSG_VOLUMETRIC                      "\xcc\xa8\xd7\xd2\xdd\xc4"                                         // "フィラメント" ("Filament")
134 134
 #define MSG_VOLUMETRIC_ENABLED              "E in mm3"
135
-#if LCD_WIDTH > 19
135
+#if LCD_WIDTH >= 20
136 136
   #define MSG_FILAMENT_DIAM                 "\xcc\xa8\xd7\xd2\xdd\xc4\xc1\xae\xaf\xb9\xb2"                     // "フィラメントチョッケイ" ("Fil. Dia.")
137 137
 #else
138 138
   #define MSG_FILAMENT_DIAM                 "\xcc\xa8\xd7\xd2\xdd\xc4\xb9\xb2"                                 // "フィラメントケイ" ("Fil. Dia.")
@@ -157,7 +157,7 @@
157 157
 #define MSG_NO_MOVE                         "\xb3\xba\xde\xb7\xcf\xbe\xdd"                                     // "ウゴキマセン" ("No move.")
158 158
 #define MSG_KILLED                          "\xcb\xbc\xde\xae\xb3\xc3\xb2\xbc"                                 // "ヒジョウテイシ" ("KILLED. ")
159 159
 #define MSG_STOPPED                         "\xc3\xb2\xbc\xbc\xcf\xbc\xc0"                                     // "テイシシマシタ" ("STOPPED. ")
160
-#if LCD_WIDTH > 19
160
+#if LCD_WIDTH >= 20
161 161
   #define MSG_CONTROL_RETRACT               "\xcb\xb7\xba\xd0\xd8\xae\xb3 mm"                                  // "ヒキコミリョウ mm" ("Retract mm")
162 162
   #define MSG_CONTROL_RETRACT_SWAP          "\xcb\xb7\xba\xd0\xd8\xae\xb3S mm"                                 // "ヒキコミリョウS mm" ("Swap Re.mm")
163 163
   #define MSG_CONTROL_RETRACTF              "\xcb\xb7\xba\xd0\xbf\xb8\xc4\xde mm/s"                            // "ヒキコミソクド mm/s" ("Retract  V")
@@ -179,14 +179,14 @@
179 179
 #define MSG_INIT_SDCARD                     "SD\xb6\xb0\xc4\xde\xbb\xb2\xd6\xd0\xba\xd0"                       // "SDカードサイヨミコミ" ("Init. SD card")
180 180
 #define MSG_CNG_SDCARD                      "SD\xb6\xb0\xc4\xde\xba\xb3\xb6\xdd"                               // "SDカードコウカン" ("Change SD card")
181 181
 #define MSG_ZPROBE_OUT                      "Z\xcc\xdf\xdb\xb0\xcc\xde\x20\xcd\xde\xaf\xc4\xde\xb6\xde\xb2"    // "Zプローブ ベッドガイ" ("Z probe out. bed")
182
-#if LCD_WIDTH > 19
182
+#if LCD_WIDTH >= 20
183 183
   #define MSG_BLTOUCH_SELFTEST              "BLTouch \xbc\xde\xba\xbc\xdd\xc0\xde\xdd"                         // "BLTouch ジコシンダン" ("BLTouch Self-Test")
184 184
 #else
185 185
   #define MSG_BLTOUCH_SELFTEST              "BLTouch \xbe\xd9\xcc\xc3\xbd\xc4"                                 // "BLTouch セルフテスト" ("BLTouch Self-Test")
186 186
 #endif
187 187
 #define MSG_BLTOUCH_RESET                   "BLTouch \xd8\xbe\xaf\xc4"                                         // "BLTouch リセット" ("Reset BLTouch")
188 188
 #define MSG_HOME                            "\xbb\xb7\xc6"                                                     // "サキニ" ("Home") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
189
-#if LCD_WIDTH > 19
189
+#if LCD_WIDTH >= 20
190 190
   #define MSG_FIRST                         "\xa6\xcc\xaf\xb7\xbb\xbe\xc3\xb8\xc0\xde\xbb\xb2"                 // "ヲフッキサセテクダサイ" ("first")
191 191
 #else
192 192
   #define MSG_FIRST                         "\xa6\xcc\xaf\xb7\xbb\xbe\xd6"                                     // "ヲフッキサセヨ" ("first")
@@ -195,13 +195,13 @@
195 195
 #define MSG_BABYSTEP_X                      "X\xbc\xde\xb8\x20\xcb\xde\xc4\xde\xb3"                            // "Xジク ビドウ" ("Babystep X")
196 196
 #define MSG_BABYSTEP_Y                      "Y\xbc\xde\xb8\x20\xcb\xde\xc4\xde\xb3"                            // "Yジク ビドウ" ("Babystep Y")
197 197
 #define MSG_BABYSTEP_Z                      "Z\xbc\xde\xb8\x20\xcb\xde\xc4\xde\xb3"                            // "Zジク ビドウ" ("Babystep Z")
198
-#if LCD_WIDTH > 19
198
+#if LCD_WIDTH >= 20
199 199
   #define MSG_ENDSTOP_ABORT                 "\xb2\xc4\xde\xb3\xb9\xde\xdd\xb6\xb2\xb9\xdd\xc1\xb7\xc9\xb3"     // "イドウゲンカイケンチキノウ" ("Endstop abort")
200 200
 #else
201 201
   #define MSG_ENDSTOP_ABORT                 "\xb2\xc4\xde\xb3\xb9\xde\xdd\xb6\xb2\xb9\xdd\xc1"                 // "イドウゲンカイケンチ" ("Endstop abort")
202 202
 #endif
203 203
 #define MSG_HEATING_FAILED_LCD              "\xb6\xc8\xc2\xbc\xaf\xca\xdf\xb2"                                 // "カネツシッパイ" ("Heating failed")
204
-#if LCD_WIDTH > 19
204
+#if LCD_WIDTH >= 20
205 205
   #define MSG_ERR_REDUNDANT_TEMP            "\xb4\xd7\xb0:\xbc\xde\xae\xb3\xc1\xae\xb3\xbb\xb0\xd0\xbd\xc0\xb0\xb7\xc9\xb3" // "エラー:ジョウチョウサーミスターキノウ" ("Err: REDUNDANT TEMP")
206 206
 #else
207 207
   #define MSG_ERR_REDUNDANT_TEMP            "\xb4\xd7\xb0:\xbc\xde\xae\xb3\xc1\xae\xb3\xbb\xb0\xd0\xbd\xc0"                 // "エラー:ジョウチョウサーミスタ" ("Err: REDUNDANT TEMP")
@@ -209,7 +209,7 @@
209 209
 #define MSG_THERMAL_RUNAWAY                 "\xc8\xc2\xce\xde\xb3\xbf\xb3"                                                  // "ネツボウソウ" ("THERMAL RUNAWAY")
210 210
 #define MSG_ERR_MAXTEMP                     "\xb4\xd7\xb0:\xbb\xb2\xba\xb3\xb5\xdd\xc1\xae\xb3\xb6"                         // "エラー:サイコウオンチョウカ" ("Err: MAXTEMP")
211 211
 #define MSG_ERR_MINTEMP                     "\xb4\xd7\xb0:\xbb\xb2\xc3\xb2\xb5\xdd\xd0\xcf\xdd"                             // "エラー:サイテイオンミマン" ("Err: MINTEMP")
212
-#if LCD_WIDTH > 19
212
+#if LCD_WIDTH >= 20
213 213
   #define MSG_ERR_MAXTEMP_BED               "\xb4\xd7\xb0:\xcd\xde\xaf\xc4\xde\x20\xbb\xb2\xba\xb3\xb5\xdd\xc1\xae\xb3\xb6" // "エラー:ベッド サイコウオンチョウカ" ("Err: MAXTEMP BED")
214 214
   #define MSG_ERR_MINTEMP_BED               "\xb4\xd7\xb0:\xcd\xde\xaf\xc4\xde\x20\xbb\xb2\xc3\xb2\xb5\xdd\xd0\xcf\xdd"     // "エラー:ベッド サイテイオンミマン" ("Err: MINTEMP BED")
215 215
 #else
@@ -243,20 +243,20 @@
243 243
 #define MSG_INFO_COMPLETED_PRINTS           "\xb6\xdd\xd8\xae\xb3\xbd\xb3"                                     // "カンリョウスウ" ("Completed")
244 244
 #define MSG_INFO_PRINT_TIME                 "\xcc\xdf\xd8\xdd\xc4\xbc\xde\xb6\xdd\xd9\xb2\xb9\xb2"             // "プリントジカンルイケイ" ("Total print time")
245 245
 #define MSG_INFO_PRINT_LONGEST              "\xbb\xb2\xc1\xae\xb3\xcc\xdf\xd8\xdd\xc4\xbc\xde\xb6\xdd"         // "サイチョウプリントジカン" ("Longest job time")
246
-#if LCD_WIDTH > 19
246
+#if LCD_WIDTH >= 20
247 247
   #define MSG_INFO_PRINT_FILAMENT           "\xcc\xa8\xd7\xd2\xdd\xc4\xbc\xd6\xb3\xd8\xae\xb3\xd9\xb2\xb9\xb2" // "フィラメントシヨウリョウルイケイ" ("Extruded total")
248 248
 #else
249 249
   #define MSG_INFO_PRINT_FILAMENT           "\xcc\xa8\xd7\xd2\xdd\xc4\xbf\xb3\xbc\xd6\xb3\xd8\xae\xb3"         // "フィラメントソウシヨウリョウ" ("Extruded")
250 250
 #endif
251 251
 #define MSG_INFO_MIN_TEMP                   "\xbe\xaf\xc3\xb2\xbb\xb2\xc3\xb2\xb5\xdd"                         // "セッテイサイテイオン" ("Min Temp")
252 252
 #define MSG_INFO_MAX_TEMP                   "\xbe\xaf\xc3\xb2\xbb\xb2\xba\xb3\xb5\xdd"                         // "セッテイサイコウオン" ("Max Temp")
253
-#if LCD_WIDTH > 19
253
+#if LCD_WIDTH >= 20
254 254
   #define MSG_INFO_PSU                      "\xc3\xde\xdd\xb9\xde\xdd\xbc\xad\xcd\xde\xc2"                     // "デンゲンシュベツ" ("Power Supply")
255 255
 #else
256 256
   #define MSG_INFO_PSU                      "\xc3\xde\xdd\xb9\xde\xdd"                                         // "デンゲン" ("Power Supply")
257 257
 #endif
258 258
 #define MSG_DRIVE_STRENGTH                  "\xd3\xb0\xc0\xb0\xb8\xc4\xde\xb3\xd8\xae\xb8"                     // "モータークドウリョク" ("Drive Strength")
259
-#if LCD_WIDTH > 19
259
+#if LCD_WIDTH >= 20
260 260
   #define MSG_DAC_PERCENT                   "DAC\xbc\xad\xc2\xd8\xae\xb8 %"                                    // "DACシュツリョク %" ("Driver %")
261 261
 #else
262 262
   #define MSG_DAC_PERCENT                   "DAC\xbc\xad\xc2\xd8\xae\xb8"                                      // "DACシュツリョク" ("Driver %")
@@ -288,7 +288,7 @@
288 288
 #else // LCD_HEIGHT < 4
289 289
   #define MSG_FILAMENT_CHANGE_INIT_1        "\xba\xb3\xb6\xdd\xa6\xb6\xb2\xbc\xbc\xcf\xbd"                     // "コウカンヲカイシシマス" ("Please wait...")
290 290
   #define MSG_FILAMENT_CHANGE_UNLOAD_1      "\xcc\xa8\xd7\xd2\xdd\xc4\xc7\xb7\xc0\xde\xbc\xc1\xad\xb3"         // "フィラメントヌキダシチュウ" ("Ejecting...")
291
-  #if LCD_WIDTH > 19
291
+  #if LCD_WIDTH >= 20
292 292
     #define MSG_FILAMENT_CHANGE_INSERT_1    "\xbf\xb3\xc6\xad\xb3\xbc\x2c\xb8\xd8\xaf\xb8\xbc\xc3\xb8\xc0\xde\xbb\xb2" // "ソウニュウシ,クリックシテクダサイ" ("Insert and Click")
293 293
   #else
294 294
     #define MSG_FILAMENT_CHANGE_INSERT_1    "\xbf\xb3\xc6\xad\xb3\xbc\x2c\xb8\xd8\xaf\xb8\xbe\xd6"                     // "ソウニュウシ,クリックセヨ" ("Insert and Click")

+ 1
- 1
Marlin/language_tr.h Näytä tiedosto

@@ -186,7 +186,7 @@
186 186
 #define MSG_INFO_BAUDRATE                   "\xddleti\xfeim H\xfdz\xfd"
187 187
 #define MSG_INFO_PROTOCOL                   "Protokol"
188 188
 
189
-#if LCD_WIDTH > 19
189
+#if LCD_WIDTH >= 20
190 190
   #define MSG_INFO_PRINT_COUNT              "Bask\xfd Say\xfds\xfd"
191 191
   #define MSG_INFO_COMPLETED_PRINTS         "Tamamlanan"
192 192
   #define MSG_INFO_PRINT_TIME               "Toplam Bask\xfd S\xfcresi"

+ 2
- 2
Marlin/ultralcd_impl_HD44780.h Näytä tiedosto

@@ -721,7 +721,7 @@ static void lcd_implementation_status_screen() {
721 721
     lcd.print(itostr3(feedrate_percentage));
722 722
     lcd.print('%');
723 723
 
724
-    #if LCD_WIDTH > 19 && ENABLED(SDSUPPORT)
724
+    #if LCD_WIDTH >= 20 && ENABLED(SDSUPPORT)
725 725
 
726 726
       lcd.setCursor(7, 2);
727 727
       lcd_printPGM(PSTR("SD"));
@@ -731,7 +731,7 @@ static void lcd_implementation_status_screen() {
731 731
         lcd_printPGM(PSTR("---"));
732 732
       lcd.print('%');
733 733
 
734
-    #endif // LCD_WIDTH > 19 && SDSUPPORT
734
+    #endif // LCD_WIDTH >= 20 && SDSUPPORT
735 735
 
736 736
     lcd.setCursor(LCD_WIDTH - 6, 2);
737 737
     lcd.print(LCD_STR_CLOCK[0]);

Loading…
Peruuta
Tallenna