Sfoglia il codice sorgente

🌐 Update Greek language (#22799)

Lefteris Garyfalakis 3 anni fa
parent
commit
e60e4b8f57
Nessun account collegato all'indirizzo email del committer

+ 2
- 2
Marlin/Configuration.h Vedi File

@@ -2044,10 +2044,10 @@
2044 2044
  *
2045 2045
  * Select the language to display on the LCD. These languages are available:
2046 2046
  *
2047
- *   en, an, bg, ca, cz, da, de, el, el_gr, es, eu, fi, fr, gl, hr, hu, it,
2047
+ *   en, an, bg, ca, cz, da, de, el, el_CY, es, eu, fi, fr, gl, hr, hu, it,
2048 2048
  *   jp_kana, ko_KR, nl, pl, pt, pt_br, ro, ru, sk, sv, tr, uk, vi, zh_CN, zh_TW
2049 2049
  *
2050
- * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cz':'Czech', 'da':'Danish', 'de':'German', 'el':'Greek', 'el_gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'hu':'Hungarian', 'it':'Italian', 'jp_kana':'Japanese', 'ko_KR':'Korean (South Korea)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt_br':'Portuguese (Brazilian)', 'ro':'Romanian', 'ru':'Russian', 'sk':'Slovak', 'sv':'Swedish', 'tr':'Turkish', 'uk':'Ukrainian', 'vi':'Vietnamese', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Traditional)' }
2050
+ * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cz':'Czech', 'da':'Danish', 'de':'German', 'el':'Greek (Greece)', 'el_CY':'Greek (Cyprus)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'hu':'Hungarian', 'it':'Italian', 'jp_kana':'Japanese', 'ko_KR':'Korean (South Korea)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt_br':'Portuguese (Brazilian)', 'ro':'Romanian', 'ru':'Russian', 'sk':'Slovak', 'sv':'Swedish', 'tr':'Turkish', 'uk':'Ukrainian', 'vi':'Vietnamese', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Traditional)' }
2051 2051
  */
2052 2052
 #define LCD_LANGUAGE en
2053 2053
 

+ 2
- 2
Marlin/src/core/language.h Vedi File

@@ -48,8 +48,8 @@
48 48
 // cz         Czech
49 49
 // da         Danish
50 50
 // de         German
51
-// el         Greek
52
-// el_gr      Greek (Greece)
51
+// el         Greek (Greece)
52
+// el_CY      Greek (Cyprus)
53 53
 // en         English
54 54
 // es         Spanish
55 55
 // eu         Basque-Euskera

Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h → Marlin/src/lcd/dogm/fontdata/langdata_el_CY.h Vedi File

@@ -77,7 +77,7 @@ const u8g_fntpgm_uint8_t fontpage_64_166_166[24] U8G_FONT_SECTION("fontpage_64_1
77 77
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xA6,0xA6,0x00,0x01,0x00,0x00,
78 78
   0x00,0x05,0x01,0x01,0x06,0x00,0x00,0xA8};
79 79
 
80
-static const uxg_fontinfo_t g_fontinfo_el_gr[] PROGMEM = {
80
+static const uxg_fontinfo_t g_fontinfo_el_CY[] PROGMEM = {
81 81
   FONTDATA_ITEM(7, 136, 136, fontpage_7_136_136), // 'Έ' -- 'Έ'
82 82
   FONTDATA_ITEM(7, 145, 157, fontpage_7_145_157), // 'Α' -- 'Ν'
83 83
   FONTDATA_ITEM(7, 159, 161, fontpage_7_159_161), // 'Ο' -- 'Ρ'

+ 1
- 1
Marlin/src/lcd/language/language_el.h Vedi File

@@ -34,7 +34,7 @@ namespace Language_el {
34 34
   using namespace Language_en; // Inherit undefined strings from English
35 35
 
36 36
   constexpr uint8_t CHARSIZE              = 2;
37
-  LSTR LANGUAGE                           = _UxGT("Greek");
37
+  LSTR LANGUAGE                           = _UxGT("Greek (Greece)");
38 38
 
39 39
   LSTR WELCOME_MSG                        = MACHINE_NAME _UxGT(" έτοιμος.");
40 40
   LSTR MSG_YES                            = _UxGT("ΝΑΙ");

+ 38
- 0
Marlin/src/lcd/language/language_el_CY.h Vedi File

@@ -0,0 +1,38 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ *
5
+ * Based on Sprinter and grbl.
6
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7
+ *
8
+ * This program is free software: you can redistribute it and/or modify
9
+ * it under the terms of the GNU General Public License as published by
10
+ * the Free Software Foundation, either version 3 of the License, or
11
+ * (at your option) any later version.
12
+ *
13
+ * This program is distributed in the hope that it will be useful,
14
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
+ * GNU General Public License for more details.
17
+ *
18
+ * You should have received a copy of the GNU General Public License
19
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+#pragma once
23
+
24
+/**
25
+ * Greek (Cyprus)
26
+ *
27
+ * LCD Menu Messages
28
+ * See also https://marlinfw.org/docs/development/lcd_language.html
29
+ */
30
+
31
+#include "language_el.h"
32
+
33
+namespace Language_el_CY {
34
+  using namespace Language_el; // Inherit undefined strings from Greek (or English)
35
+
36
+  constexpr uint8_t CHARSIZE              = 2;
37
+  LSTR LANGUAGE                           = _UxGT("Greek (Cyprus)");
38
+}

+ 1
- 1
buildroot/share/fonts/genallfont.sh Vedi File

@@ -62,7 +62,7 @@ OLDWD=`pwd`
62 62
 #
63 63
 # By default loop through all languages
64 64
 #
65
-LANGS_DEFAULT="an bg ca cz da de el el_gr en es eu fi fr gl hr hu it jp_kana ko_KR nl pl pt pt_br ro ru sk sv tr uk vi zh_CN zh_TW test"
65
+LANGS_DEFAULT="an bg ca cz da de el el_CY en es eu fi fr gl hr hu it jp_kana ko_KR nl pl pt pt_br ro ru sk sv tr uk vi zh_CN zh_TW test"
66 66
 
67 67
 #
68 68
 # Generate data for language list MARLIN_LANGS or all if not provided

+ 2
- 2
buildroot/tests/mega2560 Vedi File

@@ -215,11 +215,11 @@ exec_test $1 $2 "MEGA2560 RAMPS | Redundant temperature sensor | 2x MAX6675" "$3
215 215
 #
216 216
 #restore_configs
217 217
 #opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT
218
-#for lang in an bg ca cz da de el el_gr en es eu fi fr gl hr hu it jp_kana nl pl pt pt_br ro ru sk sv tr uk vi zh_CN zh_TW test; do opt_set LCD_LANGUAGE $lang; echo "compile with language $lang ..."; exec_test $1 $2 "Stuff" "$3"; done
218
+#for lang in an bg ca cz da de el el_CY en es eu fi fr gl hr hu it jp_kana nl pl pt pt_br ro ru sk sv tr uk vi zh_CN zh_TW test; do opt_set LCD_LANGUAGE $lang; echo "compile with language $lang ..."; exec_test $1 $2 "Stuff" "$3"; done
219 219
 #
220 220
 #restore_configs
221 221
 #opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT
222
-#for lang in an bg ca cz da de el el_gr en es eu fi fr gl hr hu it jp_kana nl pl pt pt_br ro ru sk sv tr uk vi zh_CN zh_TW test; do opt_set LCD_LANGUAGE $lang; echo "compile with language $lang ..."; exec_test $1 $2 "Stuff" "$3"; done
222
+#for lang in an bg ca cz da de el el_CY en es eu fi fr gl hr hu it jp_kana nl pl pt pt_br ro ru sk sv tr uk vi zh_CN zh_TW test; do opt_set LCD_LANGUAGE $lang; echo "compile with language $lang ..."; exec_test $1 $2 "Stuff" "$3"; done
223 223
 
224 224
 ######## Example Configurations ##############
225 225
 #

Loading…
Annulla
Salva