From cffb2d457e72721aad3375431fe72cd87a6e2a83 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 11 Sep 2015 19:52:21 -0700 Subject: [PATCH] Cleanup file formatting --- Marlin/language_an.h | 2 +- Marlin/language_bg.h | 8 ++++---- Marlin/language_ca.h | 2 +- Marlin/language_es.h | 2 +- Marlin/language_eu.h | 2 +- Marlin/language_it.h | 2 +- Marlin/language_kana.h | 2 +- Marlin/language_kana_utf8.h | 4 ++-- Marlin/language_nl.h | 2 +- Marlin/language_pl.h | 2 +- Marlin/language_test.h | 20 ++++++++++---------- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Marlin/language_an.h b/Marlin/language_an.h index 625bd1ab9c..90e8169fea 100644 --- a/Marlin/language_an.h +++ b/Marlin/language_an.h @@ -81,7 +81,7 @@ #define MSG_TEMPERATURE "Temperatura" #define MSG_MOTION "Movimiento" #define MSG_VOLUMETRIC "Filament" -#define MSG_VOLUMETRIC_ENABLED "E in mm3" +#define MSG_VOLUMETRIC_ENABLED "E in mm3" #define MSG_FILAMENT_DIAM "Fil. Dia." #define MSG_CONTRAST "Contrast" #define MSG_STORE_EPROM "Alzar Memoria" diff --git a/Marlin/language_bg.h b/Marlin/language_bg.h index 0afe344860..ca7c526490 100644 --- a/Marlin/language_bg.h +++ b/Marlin/language_bg.h @@ -7,12 +7,12 @@ */ #ifndef LANGUAGE_BG_H #define LANGUAGE_BG_H - + #define MAPPER_D0D1 // For Cyrillic // Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h //#define SIMULATE_ROMFONT #define DISPLAY_CHARSET_ISO10646_5 - + #define WELCOME_MSG MACHINE_NAME " Готов." #define MSG_SD_INSERTED "Картата е поставена" #define MSG_SD_REMOVED "Картата е извадена" @@ -124,7 +124,7 @@ #define MSG_ENDSTOP_ABORT "Стоп Кр.Изключватели" #define MSG_END_HOUR "часа" #define MSG_END_MINUTE "минути" - + #if ENABLED(DELTA_CALIBRATION_MENU) #define MSG_DELTA_CALIBRATE "Делта Калибровка" #define MSG_DELTA_CALIBRATE_X "Калибровка X" @@ -132,5 +132,5 @@ #define MSG_DELTA_CALIBRATE_Z "Калибровка Z" #define MSG_DELTA_CALIBRATE_CENTER "Калибровка Център" #endif // DELTA_CALIBRATION_MENU - + #endif // LANGUAGE_BG_H diff --git a/Marlin/language_ca.h b/Marlin/language_ca.h index dc69b57966..a5b9d08c3d 100644 --- a/Marlin/language_ca.h +++ b/Marlin/language_ca.h @@ -8,7 +8,7 @@ #ifndef LANGUAGE_CA_H #define LANGUAGE_CA_H -//#define MAPPER_NON +//#define MAPPER_NON #define MAPPER_C2C3 // because of "ó" // Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h //#define SIMULATE_ROMFONT diff --git a/Marlin/language_es.h b/Marlin/language_es.h index f047024358..85de78f5b0 100644 --- a/Marlin/language_es.h +++ b/Marlin/language_es.h @@ -81,7 +81,7 @@ #define MSG_TEMPERATURE "Temperatura" #define MSG_MOTION "Movimiento" #define MSG_VOLUMETRIC "Filamento" -#define MSG_VOLUMETRIC_ENABLED "E in mm3" +#define MSG_VOLUMETRIC_ENABLED "E in mm3" #define MSG_FILAMENT_DIAM "Fil. Dia." #define MSG_CONTRAST "Contraste" #define MSG_STORE_EPROM "Guardar memoria" diff --git a/Marlin/language_eu.h b/Marlin/language_eu.h index 3298fef143..331e020b8b 100644 --- a/Marlin/language_eu.h +++ b/Marlin/language_eu.h @@ -81,7 +81,7 @@ #define MSG_TEMPERATURE "Tenperatura" #define MSG_MOTION "Mugimendua" #define MSG_VOLUMETRIC "Filament" -#define MSG_VOLUMETRIC_ENABLED "E in mm3" +#define MSG_VOLUMETRIC_ENABLED "E in mm3" #define MSG_FILAMENT_DIAM "Fil. Dia." #define MSG_CONTRAST "LCD kontrastea" #define MSG_STORE_EPROM "Gorde memoria" diff --git a/Marlin/language_it.h b/Marlin/language_it.h index 80aa9024c5..3e2e11ee83 100644 --- a/Marlin/language_it.h +++ b/Marlin/language_it.h @@ -81,7 +81,7 @@ #define MSG_TEMPERATURE "Temperatura" #define MSG_MOTION "Movimento" #define MSG_VOLUMETRIC "Filament" -#define MSG_VOLUMETRIC_ENABLED "E in mm³" +#define MSG_VOLUMETRIC_ENABLED "E in mm³" #define MSG_FILAMENT_DIAM "Diam. filo" #define MSG_CONTRAST "Contrasto LCD" #define MSG_STORE_EPROM "Salva in EEPROM" diff --git a/Marlin/language_kana.h b/Marlin/language_kana.h index 73322e1683..07b5d314a3 100644 --- a/Marlin/language_kana.h +++ b/Marlin/language_kana.h @@ -5,7 +5,7 @@ * See also documentation/LCDLanguageFont.md * */ - + #ifndef LANGUAGE_KANA_H #define LANGUAGE_KANA_H diff --git a/Marlin/language_kana_utf8.h b/Marlin/language_kana_utf8.h index 587d3f682c..ba680e2346 100644 --- a/Marlin/language_kana_utf8.h +++ b/Marlin/language_kana_utf8.h @@ -5,7 +5,7 @@ * See also documentation/LCDLanguageFont.md * */ - + #ifndef LANGUAGE_KANA_UTF_H #define LANGUAGE_KANA_UTF_H @@ -15,7 +15,7 @@ #define DISPLAY_CHARSET_ISO10646_KANA // This is very crude replacement of the codes used in language_kana.h from somebody who really does not know what he is doing. -// Just to show the potential benefit of unicode. +// Just to show the potential benefit of unicode. // This translation can be improved by using the full charset of unicode codeblock U+30A0 to U+30FF. // 片仮名表示定義 diff --git a/Marlin/language_nl.h b/Marlin/language_nl.h index 975954c644..81772f990e 100644 --- a/Marlin/language_nl.h +++ b/Marlin/language_nl.h @@ -81,7 +81,7 @@ #define MSG_TEMPERATURE "Temperatuur" #define MSG_MOTION "Beweging" #define MSG_VOLUMETRIC "Filament" -#define MSG_VOLUMETRIC_ENABLED "E in mm3" +#define MSG_VOLUMETRIC_ENABLED "E in mm3" #define MSG_FILAMENT_DIAM "Fil. Dia." #define MSG_CONTRAST "LCD contrast" #define MSG_STORE_EPROM "Geheugen opslaan" diff --git a/Marlin/language_pl.h b/Marlin/language_pl.h index 5cf87fc9ed..e69a7ead9f 100644 --- a/Marlin/language_pl.h +++ b/Marlin/language_pl.h @@ -81,7 +81,7 @@ #define MSG_TEMPERATURE "Temperatura" #define MSG_MOTION "Ruch" #define MSG_VOLUMETRIC "Filament" -#define MSG_VOLUMETRIC_ENABLED "E in mm3" +#define MSG_VOLUMETRIC_ENABLED "E in mm3" #define MSG_FILAMENT_DIAM "Fil. Dia." #define MSG_CONTRAST "Kontrast LCD" #define MSG_STORE_EPROM "Zapisz w pamieci" diff --git a/Marlin/language_test.h b/Marlin/language_test.h index e26848ef04..0135a5d957 100644 --- a/Marlin/language_test.h +++ b/Marlin/language_test.h @@ -8,16 +8,16 @@ #ifndef LANGUAGE_TEST_H #define LANGUAGE_TEST_H -// Select ONE of the following Mappers. -// They decide what to do with a symbol in the area of [0x80:0xFF]. They take a symbol of this language file and make them point +// Select ONE of the following Mappers. +// They decide what to do with a symbol in the area of [0x80:0xFF]. They take a symbol of this language file and make them point // into an array with 128 cells, where they'll find the place of the symbol of the font in use. // -// a.)For ASCII coded Language_xx.h files like (en) there are no occurrences of symbols above 0x7F so no mapper is needed. +// a.)For ASCII coded Language_xx.h files like (en) there are no occurrences of symbols above 0x7F so no mapper is needed. // If such a symbol appears it is mapped directly into the font. This is the case for the language files we used until now, with all the STR_XX or // "\xxx" symbols. All Symbols are only one byte long. // b.) For Unicoded Language_xx.h files (currently ru, de and kana_utf8 ) the non ASCII [0x00-0x7F] symbols are represented by more then one byte. // In the case of two bytes the first is pointing to a 'codepage' and the second to a place in the codepage. These codepages contain 64 symbols. -// So two of them can be mapped. For most of the European languages the necessary symbols are contained in the pages C2 and C3. Cyrillic uses D0 +// So two of them can be mapped. For most of the European languages the necessary symbols are contained in the pages C2 and C3. Cyrillic uses D0 // and D1. // c.) For katakana (one of the Japanese symbol sets) Unicode uses 3 bytes. Here the second byte also points to a codepage and byte 3 to the symbol. // I hope the pages E282 and E283 are sufficient to write katakana. @@ -124,14 +124,14 @@ #define MSG_COOLDOWN STRG_C3_9 #define MSG_SWITCH_PS_OFF STRG_C3_a #define MSG_MOVE_AXIS STRG_C3_b - + #define MSG_MAIN STRG_OKTAL_2 #define MSG_TEMPERATURE STRG_OKTAL_3 #define MSG_MOTION STRG_OKTAL_4 #define MSG_VOLUMETRIC STRG_OKTAL_5 #define MSG_CONTRAST STRG_OKTAL_6 #define MSG_RESTORE_FAILSAFE STRG_OKTAL_7 - + #define MSG_NOZZLE STRG_OKTAL_8 #define MSG_FAN_SPEED STRG_OKTAL_9 #define MSG_AUTOTEMP STRG_OKTAL_a @@ -159,14 +159,14 @@ #define MSG_COOLDOWN STRG_D1_9 #define MSG_SWITCH_PS_OFF STRG_D1_a #define MSG_MOVE_AXIS STRG_D1_b - + #define MSG_MAIN STRG_OKTAL_2 #define MSG_TEMPERATURE STRG_OKTAL_3 #define MSG_MOTION STRG_OKTAL_4 #define MSG_VOLUMETRIC STRG_OKTAL_5 #define MSG_CONTRAST STRG_OKTAL_6 #define MSG_RESTORE_FAILSAFE STRG_OKTAL_7 - + #define MSG_NOZZLE STRG_OKTAL_8 #define MSG_FAN_SPEED STRG_OKTAL_9 #define MSG_AUTOTEMP STRG_OKTAL_a @@ -194,14 +194,14 @@ #define MSG_COOLDOWN STRG_E383_9 #define MSG_SWITCH_PS_OFF STRG_E383_a #define MSG_MOVE_AXIS STRG_E383_b - + #define MSG_MAIN STRG_OKTAL_2 #define MSG_TEMPERATURE STRG_OKTAL_3 #define MSG_MOTION STRG_OKTAL_4 #define MSG_VOLUMETRIC STRG_OKTAL_5 #define MSG_CONTRAST STRG_OKTAL_6 #define MSG_RESTORE_FAILSAFE STRG_OKTAL_7 - + #define MSG_NOZZLE STRG_OKTAL_8 #define MSG_FAN_SPEED STRG_OKTAL_9 #define MSG_AUTOTEMP STRG_OKTAL_a