From 1ae9370a72b8704930dc004b584fea2d29cc0ebc Mon Sep 17 00:00:00 2001 From: Dav999 Date: Wed, 29 Nov 2023 16:17:56 +0100 Subject: [PATCH 01/15] =?UTF-8?q?Japanese:=20apply=20change=20from=20?= =?UTF-8?q?=E5=87=84=E3=81=84=20to=20=E3=81=99=E3=81=94=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desktop_version/lang/ja/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop_version/lang/ja/strings.xml b/desktop_version/lang/ja/strings.xml index 80cba666..97a9d86d 100644 --- a/desktop_version/lang/ja/strings.xml +++ b/desktop_version/lang/ja/strings.xml @@ -347,7 +347,7 @@ Sランク以上を獲得" explanation="ranks are B A S V, see below" max="38*3" - + From 02e15ed82968fbc610f6480a8ba39b1484cda53c Mon Sep 17 00:00:00 2001 From: Dav999 Date: Wed, 29 Nov 2023 16:19:21 +0100 Subject: [PATCH 02/15] Italian: Fix in-game timer ON/OFF being reversed --- desktop_version/lang/it/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop_version/lang/it/strings.xml b/desktop_version/lang/it/strings.xml index 1e195961..613821a9 100644 --- a/desktop_version/lang/it/strings.xml +++ b/desktop_version/lang/it/strings.xml @@ -207,8 +207,8 @@ - - + + From 80626d358c23a39dc989c7cca38c9e9cc5371679 Mon Sep 17 00:00:00 2001 From: Reese Rivers <44736084+Fussmatte@users.noreply.github.com> Date: Wed, 29 Nov 2023 13:14:16 -0500 Subject: [PATCH 03/15] Fixed duplicated/shifted characters --- desktop_version/fonts/font.fontmeta | 1 - 1 file changed, 1 deletion(-) diff --git a/desktop_version/fonts/font.fontmeta b/desktop_version/fonts/font.fontmeta index 8a5a4366..e4117f33 100644 --- a/desktop_version/fonts/font.fontmeta +++ b/desktop_version/fonts/font.fontmeta @@ -56,7 +56,6 @@ - From a111576a984fdd886fca3fd1c9a6af3b5d41ebe2 Mon Sep 17 00:00:00 2001 From: Dav999 Date: Thu, 30 Nov 2023 02:53:49 +0100 Subject: [PATCH 04/15] Correct one letter's capitalization in German It's a menu option, so it should be uncapitalized, like all other menu options. --- desktop_version/lang/de/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop_version/lang/de/strings.xml b/desktop_version/lang/de/strings.xml index 7f754558..8441a393 100644 --- a/desktop_version/lang/de/strings.xml +++ b/desktop_version/lang/de/strings.xml @@ -69,7 +69,7 @@ - + From 10ed1079ae1c9604c65d9ea741643191549006f3 Mon Sep 17 00:00:00 2001 From: Dav999 Date: Thu, 30 Nov 2023 17:18:09 +0100 Subject: [PATCH 05/15] Fix "he'd be a a big help" typo Now that the language files are fairly stable, we should be able to do this without any accidental reverts taking place (if any do happen, it should be easy to see and prevent) --- desktop_version/lang/ca/cutscenes.xml | 2 +- desktop_version/lang/cy/cutscenes.xml | 2 +- desktop_version/lang/de/cutscenes.xml | 2 +- desktop_version/lang/en/cutscenes.xml | 2 +- desktop_version/lang/eo/cutscenes.xml | 2 +- desktop_version/lang/es/cutscenes.xml | 2 +- desktop_version/lang/fr/cutscenes.xml | 2 +- desktop_version/lang/ga/cutscenes.xml | 2 +- desktop_version/lang/it/cutscenes.xml | 2 +- desktop_version/lang/ja/cutscenes.xml | 2 +- desktop_version/lang/ko/cutscenes.xml | 2 +- desktop_version/lang/nl/cutscenes.xml | 2 +- desktop_version/lang/pl/cutscenes.xml | 2 +- desktop_version/lang/pt_BR/cutscenes.xml | 2 +- desktop_version/lang/pt_PT/cutscenes.xml | 2 +- desktop_version/lang/ru/cutscenes.xml | 2 +- desktop_version/lang/szl/cutscenes.xml | 2 +- desktop_version/lang/tr/cutscenes.xml | 2 +- desktop_version/lang/uk/cutscenes.xml | 2 +- desktop_version/lang/zh/cutscenes.xml | 2 +- desktop_version/lang/zh_TW/cutscenes.xml | 2 +- desktop_version/src/Scripts.cpp | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/desktop_version/lang/ca/cutscenes.xml b/desktop_version/lang/ca/cutscenes.xml index 0d1a9d41..5d3e1406 100644 --- a/desktop_version/lang/ca/cutscenes.xml +++ b/desktop_version/lang/ca/cutscenes.xml @@ -365,7 +365,7 @@ - + diff --git a/desktop_version/lang/cy/cutscenes.xml b/desktop_version/lang/cy/cutscenes.xml index 4b6eb708..4363af86 100644 --- a/desktop_version/lang/cy/cutscenes.xml +++ b/desktop_version/lang/cy/cutscenes.xml @@ -365,7 +365,7 @@ - + diff --git a/desktop_version/lang/de/cutscenes.xml b/desktop_version/lang/de/cutscenes.xml index 4aef05cb..12fe310f 100644 --- a/desktop_version/lang/de/cutscenes.xml +++ b/desktop_version/lang/de/cutscenes.xml @@ -365,7 +365,7 @@ - + diff --git a/desktop_version/lang/en/cutscenes.xml b/desktop_version/lang/en/cutscenes.xml index fec382e6..919528ca 100644 --- a/desktop_version/lang/en/cutscenes.xml +++ b/desktop_version/lang/en/cutscenes.xml @@ -365,7 +365,7 @@ - + diff --git a/desktop_version/lang/eo/cutscenes.xml b/desktop_version/lang/eo/cutscenes.xml index ec3784a7..b078ec14 100644 --- a/desktop_version/lang/eo/cutscenes.xml +++ b/desktop_version/lang/eo/cutscenes.xml @@ -365,7 +365,7 @@ - + diff --git a/desktop_version/lang/es/cutscenes.xml b/desktop_version/lang/es/cutscenes.xml index ef0d015d..e29dd25b 100644 --- a/desktop_version/lang/es/cutscenes.xml +++ b/desktop_version/lang/es/cutscenes.xml @@ -365,7 +365,7 @@ - + diff --git a/desktop_version/lang/fr/cutscenes.xml b/desktop_version/lang/fr/cutscenes.xml index 35685308..f76cbe45 100644 --- a/desktop_version/lang/fr/cutscenes.xml +++ b/desktop_version/lang/fr/cutscenes.xml @@ -365,7 +365,7 @@ - + diff --git a/desktop_version/lang/ga/cutscenes.xml b/desktop_version/lang/ga/cutscenes.xml index 0f58c472..2f8c8346 100644 --- a/desktop_version/lang/ga/cutscenes.xml +++ b/desktop_version/lang/ga/cutscenes.xml @@ -365,7 +365,7 @@ - + diff --git a/desktop_version/lang/it/cutscenes.xml b/desktop_version/lang/it/cutscenes.xml index 5ca0bbb9..e4e16146 100644 --- a/desktop_version/lang/it/cutscenes.xml +++ b/desktop_version/lang/it/cutscenes.xml @@ -365,7 +365,7 @@ - + diff --git a/desktop_version/lang/ja/cutscenes.xml b/desktop_version/lang/ja/cutscenes.xml index 0936258b..c6c15b29 100644 --- a/desktop_version/lang/ja/cutscenes.xml +++ b/desktop_version/lang/ja/cutscenes.xml @@ -518,7 +518,7 @@ - diff --git a/desktop_version/lang/ko/cutscenes.xml b/desktop_version/lang/ko/cutscenes.xml index 166e44e5..ae190cfa 100755 --- a/desktop_version/lang/ko/cutscenes.xml +++ b/desktop_version/lang/ko/cutscenes.xml @@ -365,7 +365,7 @@ - + diff --git a/desktop_version/lang/nl/cutscenes.xml b/desktop_version/lang/nl/cutscenes.xml index b2a64163..12911046 100644 --- a/desktop_version/lang/nl/cutscenes.xml +++ b/desktop_version/lang/nl/cutscenes.xml @@ -365,7 +365,7 @@ - + diff --git a/desktop_version/lang/pl/cutscenes.xml b/desktop_version/lang/pl/cutscenes.xml index 6e2d7866..a5954ff0 100644 --- a/desktop_version/lang/pl/cutscenes.xml +++ b/desktop_version/lang/pl/cutscenes.xml @@ -365,7 +365,7 @@ - + diff --git a/desktop_version/lang/pt_BR/cutscenes.xml b/desktop_version/lang/pt_BR/cutscenes.xml index c1fdb2b5..57e5fe65 100644 --- a/desktop_version/lang/pt_BR/cutscenes.xml +++ b/desktop_version/lang/pt_BR/cutscenes.xml @@ -365,7 +365,7 @@ - + diff --git a/desktop_version/lang/pt_PT/cutscenes.xml b/desktop_version/lang/pt_PT/cutscenes.xml index cce8e786..166f5b71 100644 --- a/desktop_version/lang/pt_PT/cutscenes.xml +++ b/desktop_version/lang/pt_PT/cutscenes.xml @@ -365,7 +365,7 @@ - + diff --git a/desktop_version/lang/ru/cutscenes.xml b/desktop_version/lang/ru/cutscenes.xml index be21f64b..c8ac5bb8 100644 --- a/desktop_version/lang/ru/cutscenes.xml +++ b/desktop_version/lang/ru/cutscenes.xml @@ -365,7 +365,7 @@ - + diff --git a/desktop_version/lang/szl/cutscenes.xml b/desktop_version/lang/szl/cutscenes.xml index 43319438..da49af34 100644 --- a/desktop_version/lang/szl/cutscenes.xml +++ b/desktop_version/lang/szl/cutscenes.xml @@ -365,7 +365,7 @@ - + diff --git a/desktop_version/lang/tr/cutscenes.xml b/desktop_version/lang/tr/cutscenes.xml index 99c5cd62..c64fba79 100644 --- a/desktop_version/lang/tr/cutscenes.xml +++ b/desktop_version/lang/tr/cutscenes.xml @@ -365,7 +365,7 @@ - + diff --git a/desktop_version/lang/uk/cutscenes.xml b/desktop_version/lang/uk/cutscenes.xml index 6ef13bef..6a1ce392 100644 --- a/desktop_version/lang/uk/cutscenes.xml +++ b/desktop_version/lang/uk/cutscenes.xml @@ -365,7 +365,7 @@ - + diff --git a/desktop_version/lang/zh/cutscenes.xml b/desktop_version/lang/zh/cutscenes.xml index dff797c0..d028de2d 100644 --- a/desktop_version/lang/zh/cutscenes.xml +++ b/desktop_version/lang/zh/cutscenes.xml @@ -381,7 +381,7 @@ - + diff --git a/desktop_version/lang/zh_TW/cutscenes.xml b/desktop_version/lang/zh_TW/cutscenes.xml index 95332b35..eea819b7 100644 --- a/desktop_version/lang/zh_TW/cutscenes.xml +++ b/desktop_version/lang/zh_TW/cutscenes.xml @@ -381,7 +381,7 @@ - + diff --git a/desktop_version/src/Scripts.cpp b/desktop_version/src/Scripts.cpp index cf82c79c..18f1984c 100644 --- a/desktop_version/src/Scripts.cpp +++ b/desktop_version/src/Scripts.cpp @@ -4598,7 +4598,7 @@ bool scriptclass::load(const std::string& name) "squeak(purple)", "changemood(purple,0)", "text(purple,0,0,2)", - "If you can find him, he'd be a", + "If you can find him, he'd be", "a big help fixing the ship!", "position(purple,above)", "speak_active", From bafd494a675bd3f2175c3aed1375615901b73dc2 Mon Sep 17 00:00:00 2001 From: Dav999 Date: Thu, 30 Nov 2023 23:35:01 +0100 Subject: [PATCH 06/15] =?UTF-8?q?Polish:=20Change=20roomname=20Ostrze?= =?UTF-8?q?=C5=BCenie=20to=20Przestroga?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desktop_version/lang/pl/roomnames.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop_version/lang/pl/roomnames.xml b/desktop_version/lang/pl/roomnames.xml index 746622a5..0ea8a099 100644 --- a/desktop_version/lang/pl/roomnames.xml +++ b/desktop_version/lang/pl/roomnames.xml @@ -125,7 +125,7 @@ - + From 96d36f86f0ffcb6e92b13ee38833559d09a7dfce Mon Sep 17 00:00:00 2001 From: AllyTally Date: Thu, 30 Nov 2023 22:13:52 -0400 Subject: [PATCH 07/15] Change 0s to 713 for lab background This is so it gets treated as a background tile, so background tiles don't get thrown away when you shift tilesets. --- desktop_version/src/Editor.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/desktop_version/src/Editor.cpp b/desktop_version/src/Editor.cpp index 125ada23..d6ded494 100644 --- a/desktop_version/src/Editor.cpp +++ b/desktop_version/src/Editor.cpp @@ -259,13 +259,13 @@ editorclass::editorclass(void) register_tilecol(EditorTileset_OUTSIDE, 6, "basic", 498, "outside", 698); register_tilecol(EditorTileset_OUTSIDE, 7, "basic", 501, "outside", 701); - register_tilecol(EditorTileset_LAB, 0, "lab_cyan", 280, "none", 0); - register_tilecol(EditorTileset_LAB, 1, "lab_red", 283, "none", 0); - register_tilecol(EditorTileset_LAB, 2, "lab_pink", 286, "none", 0); - register_tilecol(EditorTileset_LAB, 3, "basic", 289, "none", 0); - register_tilecol(EditorTileset_LAB, 4, "lab_yellow", 292, "none", 0); - register_tilecol(EditorTileset_LAB, 5, "lab_green", 295, "none", 0); - register_tilecol(EditorTileset_LAB, 6, "none", 0, "none", 0, true); + register_tilecol(EditorTileset_LAB, 0, "lab_cyan", 280, "none", 713); + register_tilecol(EditorTileset_LAB, 1, "lab_red", 283, "none", 713); + register_tilecol(EditorTileset_LAB, 2, "lab_pink", 286, "none", 713); + register_tilecol(EditorTileset_LAB, 3, "basic", 289, "none", 713); + register_tilecol(EditorTileset_LAB, 4, "lab_yellow", 292, "none", 713); + register_tilecol(EditorTileset_LAB, 5, "lab_green", 295, "none", 713); + register_tilecol(EditorTileset_LAB, 6, "none", 0, "none", 713, true); register_tilecol(EditorTileset_WARP_ZONE, 0, "basic", 80, "none", 120); register_tilecol(EditorTileset_WARP_ZONE, 1, "basic", 83, "none", 123); From b23983c0b854d7594ed5d0ea625393dc125616a7 Mon Sep 17 00:00:00 2001 From: AllyTally Date: Thu, 30 Nov 2023 22:24:10 -0400 Subject: [PATCH 08/15] Fix BG tile bug from switching from pink SS If you had a pink space station background, and switched to a different tileset, some solid tiles would be placed instead. This commit fixes that by transforming the room into the basic autotiling tiles before changing the tileset itself. The reason why I chose this solution is because it will help with a future change, being unhardcoding warp zone backgrounds (which'll help with custom autotiling, if that becomes a thing.) --- desktop_version/src/Editor.cpp | 42 ++++++++++++++++++++++++++++++++++ desktop_version/src/Editor.h | 2 ++ 2 files changed, 44 insertions(+) diff --git a/desktop_version/src/Editor.cpp b/desktop_version/src/Editor.cpp index d6ded494..55c70583 100644 --- a/desktop_version/src/Editor.cpp +++ b/desktop_version/src/Editor.cpp @@ -4017,8 +4017,48 @@ bool editorclass::lines_can_pass(int x, int y) return false; } +void editorclass::make_autotiling_base(void) +{ + if (cl.getroomprop(levx, levy)->directmode == 1) + { + return; + } + + for (int i = 0; i < SCREEN_WIDTH_TILES * SCREEN_HEIGHT_TILES; i++) + { + int tile_x = i % SCREEN_WIDTH_TILES; + int tile_y = i / SCREEN_WIDTH_TILES; + int tile = get_tile(tile_x, tile_y); + + if (tile == 0) + { + continue; + } + + TileTypes type = get_tile_type(tile_x, tile_y, false); + + switch (type) + { + case TileType_NONSOLID: + if (type == TileType_NONSOLID || is_warp_zone_background(tile)) + { + set_tile(tile_x, tile_y, 2); + } + break; + case TileType_SOLID: + set_tile(tile_x, tile_y, 1); + break; + case TileType_SPIKE: + set_tile(tile_x, tile_y, 6); + break; + } + } +} + void editorclass::switch_tileset(const bool reversed) { + make_autotiling_base(); + int tiles = cl.getroomprop(levx, levy)->tileset; if (reversed) @@ -4052,6 +4092,8 @@ void editorclass::switch_tileset(const bool reversed) void editorclass::switch_tilecol(const bool reversed) { + make_autotiling_base(); + int tilecol = cl.getroomprop(levx, levy)->tilecol; if (reversed) diff --git a/desktop_version/src/Editor.h b/desktop_version/src/Editor.h index 149cb005..f0f879db 100644 --- a/desktop_version/src/Editor.h +++ b/desktop_version/src/Editor.h @@ -177,6 +177,8 @@ public: bool lines_can_pass(int x, int y); + void make_autotiling_base(void); + int get_enemy_tile(int t); void switch_tileset(const bool reversed); From 2d1009e815b7457706751467ababb53d70a74cbf Mon Sep 17 00:00:00 2001 From: Ethan Lee Date: Fri, 1 Dec 2023 12:08:26 -0500 Subject: [PATCH 09/15] Add "type:" override check for virtual Sony gamepads. Fixes #1056 --- desktop_version/src/ButtonGlyphs.cpp | 19 ++++++++++++++++++- desktop_version/src/ButtonGlyphs.h | 2 +- desktop_version/src/KeyPoll.cpp | 15 +++------------ 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/desktop_version/src/ButtonGlyphs.cpp b/desktop_version/src/ButtonGlyphs.cpp index 6a2801f9..b04ecc0e 100644 --- a/desktop_version/src/ButtonGlyphs.cpp +++ b/desktop_version/src/ButtonGlyphs.cpp @@ -178,14 +178,31 @@ void BUTTONGLYPHS_keyboard_set_active(bool active) keyboard_is_active = active; } -void BUTTONGLYPHS_update_layout(Uint16 vendor, Uint16 product) +void BUTTONGLYPHS_update_layout(SDL_GameController *c) { + Uint16 vendor = SDL_GameControllerGetVendor(c); + Uint16 product = SDL_GameControllerGetProduct(c); + if (vendor == 0x054c) { layout = LAYOUT_PLAYSTATION; } else if (vendor == 0x28de) { + /* Steam Virtual Gamepads can hypothetically tell us that the physical + * device is a PlayStation controller, so try to catch that scenario */ + const char *mapping = SDL_GameControllerMapping(c); + if (SDL_strstr(mapping, "type:") != NULL) + { + SDL_GameControllerType gct = SDL_GameControllerGetType(c); + if ( gct == SDL_CONTROLLER_TYPE_PS3 || + gct == SDL_CONTROLLER_TYPE_PS4 || + gct == SDL_CONTROLLER_TYPE_PS5 ) + { + layout = LAYOUT_PLAYSTATION; + return; + } + } layout = LAYOUT_DECK; } else if (vendor == 0x057e) diff --git a/desktop_version/src/ButtonGlyphs.h b/desktop_version/src/ButtonGlyphs.h index 223dd86c..bef8f805 100644 --- a/desktop_version/src/ButtonGlyphs.h +++ b/desktop_version/src/ButtonGlyphs.h @@ -17,7 +17,7 @@ bool BUTTONGLYPHS_keyboard_is_available(void); bool BUTTONGLYPHS_keyboard_is_active(void); void BUTTONGLYPHS_keyboard_set_active(bool active); -void BUTTONGLYPHS_update_layout(Uint16 vendor, Uint16 product); +void BUTTONGLYPHS_update_layout(SDL_GameController *c); const char* BUTTONGLYPHS_get_wasd_text(void); const char* BUTTONGLYPHS_get_button(ActionSet actionset, Action action, int binding); diff --git a/desktop_version/src/KeyPoll.cpp b/desktop_version/src/KeyPoll.cpp index d2224881..ec6bf094 100644 --- a/desktop_version/src/KeyPoll.cpp +++ b/desktop_version/src/KeyPoll.cpp @@ -280,10 +280,7 @@ void KeyPoll::Poll(void) BUTTONGLYPHS_keyboard_set_active(false); controller = controllers[evt.cbutton.which]; - BUTTONGLYPHS_update_layout( - SDL_GameControllerGetVendor(controller), - SDL_GameControllerGetProduct(controller) - ); + BUTTONGLYPHS_update_layout(controller); break; case SDL_CONTROLLERBUTTONUP: buttonmap[(SDL_GameControllerButton) evt.cbutton.button] = false; @@ -319,10 +316,7 @@ void KeyPoll::Poll(void) BUTTONGLYPHS_keyboard_set_active(false); controller = controllers[evt.caxis.which]; - BUTTONGLYPHS_update_layout( - SDL_GameControllerGetVendor(controller), - SDL_GameControllerGetProduct(controller) - ); + BUTTONGLYPHS_update_layout(controller); break; } case SDL_CONTROLLERDEVICEADDED: @@ -335,10 +329,7 @@ void KeyPoll::Poll(void) ); controllers[SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(controller))] = controller; BUTTONGLYPHS_keyboard_set_active(false); - BUTTONGLYPHS_update_layout( - SDL_GameControllerGetVendor(controller), - SDL_GameControllerGetProduct(controller) - ); + BUTTONGLYPHS_update_layout(controller); break; } case SDL_CONTROLLERDEVICEREMOVED: From 3c49be7d8130ccec34eabcbc4c542b048e35c244 Mon Sep 17 00:00:00 2001 From: Dav999 Date: Tue, 5 Dec 2023 04:42:27 +0100 Subject: [PATCH 10/15] =?UTF-8?q?Fix=20ACCI=C3=93N=20having=20changed=20to?= =?UTF-8?q?=20ACTION=20in=20Spanish?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desktop_version/lang/es/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop_version/lang/es/strings.xml b/desktop_version/lang/es/strings.xml index 4a80fb06..7254dacf 100644 --- a/desktop_version/lang/es/strings.xml +++ b/desktop_version/lang/es/strings.xml @@ -220,7 +220,7 @@ - + From 2533e144b648e45e7afdd0fcd2da0f81629e9366 Mon Sep 17 00:00:00 2001 From: Dav999 Date: Tue, 5 Dec 2023 04:00:47 +0100 Subject: [PATCH 11/15] Fix centering of game complete texts if level font != interface font Textboxes created with graphics.createtextboxflipme() use PR_FONT_LEVEL by default, but can be overridden with graphics.textboxprintflags() to, for example, set PR_FONT_INTERFACE. This happens for the textboxes on the Game Complete screen, which use interface text. The textboxes are centered by setting the X position to -1 though, which means they're solely centered based on the width of the first line, in the level font (because the font hasn't been changed to the interface font yet). Normally, this isn't a problem, because in the main game (where the Game Complete screen usually appears), the level font is always equal to the interface font. However, in custom levels you can still get it (by calling gamestate 3500) and in that case some of the text may be misaligned. This change fixes that by adding graphics.textboxcenterx() to these textboxes. As far as I can tell, these are the only textboxes that are centered by just x=-1 despite changing the font afterwards. --- desktop_version/src/Game.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index 8a0e5194..8d5ea50e 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -2881,6 +2881,7 @@ void Game::updatestate(void) graphics.createtextboxflipme(loc::gettext("All Crew Members Rescued!"), -1, 64, TEXT_COLOUR("transparent")); graphics.textboxprintflags(PR_FONT_INTERFACE); + graphics.textboxcenterx(); char buffer[SCREEN_WIDTH_CHARS + 1]; timestringcenti(buffer, sizeof(buffer)); savetime = buffer; @@ -2956,11 +2957,13 @@ void Game::updatestate(void) ); graphics.createtextboxflipme(buffer, -1, 158, TEXT_COLOUR("transparent")); graphics.textboxprintflags(PR_FONT_INTERFACE); + graphics.textboxcenterx(); graphics.createtextboxflipme( loc::gettext_roomname(map.custommode, hardestroom_x, hardestroom_y, hardestroom.c_str(), hardestroom_specialname), -1, 170, TEXT_COLOUR("transparent") ); graphics.textboxprintflags(PR_FONT_INTERFACE); + graphics.textboxcenterx(); break; } case 3508: From d745bf2e6c428c9fbbb4c9d8ed209f3dcf775ec1 Mon Sep 17 00:00:00 2001 From: Dav999 Date: Tue, 5 Dec 2023 15:17:16 +0100 Subject: [PATCH 12/15] Restore correct LIES/TRUTH for Korean This reverts the Korean sprites in commit 6a8db6a22d7286fd3d403540b9d4f013cd1c32d6. How many times did we accidentally flip these around now lol --- .../lang/ko/graphics/flipsprites.png | Bin 2259 -> 1976 bytes desktop_version/lang/ko/graphics/sprites.png | Bin 2251 -> 1965 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/desktop_version/lang/ko/graphics/flipsprites.png b/desktop_version/lang/ko/graphics/flipsprites.png index 22b2671a4f7a18723aa7441e7f06a470daa0faf2..2cb1e46e165bd333b26393068fb901862d9161b0 100644 GIT binary patch delta 1402 zcmYjO3sBN`9RK}AA+^#PoAWiDQI|PP%N`~Qc95?uT_%|i%rZyRD-H%mF@i!# zs96iU4H&1P%a$(z0Osj|Q5gWNf3oV3B(3U{F=vm+fR6^?$qZ z0T~91Bf2^}J1OkB7Gl4vPLJrNUkhbGak0ydN<8Nn11b_gz(3e5Dbq7=E30y47_iWa zlJ8w^VS=^71>OQ*H1XnZrAw+^S(}6*IuQ>d&Ev&s0hg(#J==@2OR|ZM8RZr% zSF~8Z&N{H_(O}n-NeW&6z*6c~0QWg+oC4n@UH4u%s2bGPaCtk=$D6OK@PoUVJY!`` z&a0@-v#>Kk-5sEH*PB3f-xNn>{n^9rMHMAuxA5~g%VSLEYK2RJj+$nLIokSBNOjO^ zo}r2!v@|tDM11OW*le)X5)yV%mUCA0RUQLdSqr06h+iDP&hOZKl@5DykAi7IA8I2F zdrZa~^0~Wwo9W!ZPxw)&uGh3TgQt``R+!93{q^LlipdN$lL+1Ha(4=R7!m&|PdeV+ zE6w_&r+l>~6WNOOaI>gbZqgEdrcz4D;1tbK>)Pd)};#)MuzJP92E( z>!v|&tiThz9W{$R>;Y7ftnKa8oI6@uUSfr@iDgc?=?NSqY|tzGcq;PXbb+pGhf`o` zG&9m>lQs`;Jyl?qp6J;w)6>?7HwJ`Qhxcu-v7}7tl>;Y~-r{tr+1^~e)FDnF;37C- z45+`1(z;j+fg>cF@_wxyuzt6`dp30(wga4ChP3xKoGB$E0Eo|@NW2o&w_)L=>f-%R z7D3Nw3+2UDn8@6QpGHVQ+6Loq(h%zfEChl2{qw%FGT}gY^OmQ^`xnc(yXJ(Nr*Nhp zXDmG2dz;@X8E3VGjk~f+VxsPH3=fUO&Y55+#x-9I{tvM{@P?(?wi)TZLux&gUeOHY zCp&{5MxrZd_C)mslllhi^I9`mDPH`k4#;gu%&nguM+j+ZVB~q z7pHg@NpPsY!1YSyVKjM$qH{f^bW!!3MAQ=*2+@RT^53*rlLxW9|F-u5$b_Rx&%6)gfWN90S93@_VYK zmOW`cGsW3)rEthd@wI^tQfsE|!`X8P2iR^LJeHNwVGS~UTBJswDF-YMEKQ??QzaAj zxk}$!QVZ2^`n%@BllkA;S5!4YDX_b*a>W#g<9*k?UdgTwGHS4ANCp%XpElJ21Q3;u zToaT198;QQ1?B{nZ5A{fgBtu?T^3oF9i0F+W-In delta 1644 zcmV-y29x=?57QBlBvAxsK}|sb0I`mI`%#ks00@dnL_t(|obBB~lA|^h24FkIYW8!J zzCmALjxtBdQF4K~LEohJS-Hwt(V?*b0TL4E`>Ilvwha#)=YK*5e7gaY(FIXT@a85@B zaPAsgwZ8vcg9gAZ;}P-|TydWu#1s%w=0fqK>z+qWhm@#Ox+#>d&owy$V6$N;r3$Dm z>&a2ORN$7}f7)Y?k)So9l4|sSzc(i?v^DrVb(X%hm@P_0e_DH378t_3GDuT_0%F)-XvG zLh6^T4>W3Th*T$?a$Nd5w2ry;sb6n>+U7a{ zg8CqtyFpscpi#eUecGS_@M7-Qr~1&z89wTltxr4r9soh1dF1{l5|5Z`R=;e0+TaL) zZ-yhx&}g#{o!nQzs$ZsmK5fwecrhGdmY8Z#zifTlp#kvC+z4|#D$Nm2>X)rgTQmT^ z83)YKQw{2utxsEg3Ea5h7mG__v-JFyFDKP6TOXkKtq3gdRuDizTSFvO_^9t@a6mz8 z!z6Y1sPA^rKtZvgk}G`FFI%5>__Bzg*kHNpPa?KnpEmgLFli}&gmQNx^Yi_AQ~-xUu7B*P@GrUlked%MljcU4M^AmUSbu68`e`T) zh`rnk2r4w!d`$g+kcufFfJSKmRBLLA!_)_);eR9+l|Buz#rl2C&}pZ`=Z@GG0N`Sb zAovn{)oHG)Q`Ik9A86FvIrm#0Q~zA`X_M1H`6f0rzRVa+qzear~uFsXgtTGIkarmfz{rX&s zvw*nWZgC+JI{ol=d%ap!{qxnQO^%VF6n_eE@9;|e`tdvJZjS%_`}gdBv#IqgEeEv6 z?VvAWse$y*YXm?~1E|d2fSy`D_6P%LhXzoowIlZab*6v-PVU!_-%q15)uHe#1s;+#56z!hCv;37SH%KdzS~=9<^r7b*4FI>B(?9`{p&NfT@Y}El_~^Rl+v5@SUVn65 z)DO82*SBSv6oz%T?%#O1rRRZk{3h^5v7x&r{9E+Vb z_k{n{a&sZMx6y>weN^)j{%|}EV28OTkZa_>)Nr;gJGai1`(erl>Y)Mb6lwxnLvty> z`{&2&UaEh!cXXYi2}}ij|Nadh8^2ytfIKvS1co8j|GjlRyhlIi0gVM}EykRw?J{Q=8i^ z^Z#(X<{LmQmclWnISntW8b22+_WFaIO{Ufc23Mm249tx}Q-)HmQSRF5p0(?)VI4p^ z8o&xE0&J?0q&Sy9^qO3w>D*sD=UO-LKMf!t#f4L$$M*zV%(9`^2vcB+2C%`JfEU0( ztu%jtjpl;gEe(J(&;Sw{o~h$37T^ptfR$oy{AQ#NoPi&NS!sBxWhnfo&X;#o0MteU z*kJB=0G1jAKrKuGtrWUDW@rjX_ye`m09F#}z*U$63K;%K$(m)>{0&f=BY+irkqcaj z1~3qNaTmZ9m;wT5lu_-BBc^;DSpcOt0stRql+kAbp(6z&d!TkgDiL@61kOfK?GW=F qfo1^I%6GHT1<(PJunrhNa{mFds$IvN^7e870000a diff --git a/desktop_version/lang/ko/graphics/sprites.png b/desktop_version/lang/ko/graphics/sprites.png index fe9f735f9e2fb739de0e6079c5f403b08cb91b04..6d5cbb201ee0cf0a6266c468fd4c2e9118fc26d3 100644 GIT binary patch delta 1376 zcmYjPdr;C@6uzKB=Ct@+H6OUGm4P-{R;#Omj_*gM`6yk>)r_4s(#qGU_`_zLNiC#@ zvd%iv`Y6dnMI|4hwwWxjqLjH7m9{DPLIYGn5f-=oWADtF`R;e_oO922K7m;?is}p@ zGeaW-k<#ru%^VN5D@!H-0LB?1r>_F=)w8XDanl>m=}AL^U!)%ZZRIAKAB_M&dWQ!1 z#pJ$`y^Ff^_K2m?Xu;K0%NcXUr=fM&6!xt7r-jDZJ=Q z9s8;3huAM^VdeErItND``%5v=%gc>%6_aLgSaisR#GRdRj88G^aleKzZBQb!3SyjC za>1)r5`&UgOuXtnL~2=Ct%x5`NTpk8Xmo8O$NHXTLs2vsWb$)Mhw#Q;+#YnuqZpfp zTF)MT&OgYe~}L;SIIj?c}u~9KRehWlI;7>Ytcr8L(6mDTb?{=x>$XfPP@^ z7eJo7kam@89uodKsfv_I$?@K_$kKv-Pt3hW?l%N!;7l+bH=v_z*D>u{8(IiyL6R*3 zsx=AegN(tp=tT2wZ2oh&@QM~6jb(ZUTW54wl^f@FjX*lBD~G~Xuh(b@dI1BisRb6G zl^V?$D-G3dZ0TFU7rkO=R6L}4qZ@9l(w3QUjf(yi1@Lj5cGPdhJSfhW8Y4LA;`0Tb zYQ7lMw^w&sFO(?URN)4LV4(HdEOz*YI=?(OZ`z`3c>7WNctPKSO#*ZjB$v)Ac-84} z;2%gkF46Zk#q<=gq%_Kh)y-ZCECjE-={BGgC9ek$jAdQ@X0Q42Q^@hUzlkhuK_6c4eS00 zLr~_`o1HF0PyNQkWIRXRDzbx~+(M(#&vc1HXE*xJ{R`3XB@1?VvVv@h9?9JQu=gtf)Z4o#4suq7rI|)dy>L~ z7>&UrviYW!8s%Xa5Qwp@VuU?(Bni_Smz%RVY zS(dLYiSxX33MFQ0JUl9XloP(MF8<9S9IgH1y534wKCq6j-_0He@o&qzQhG%)*!{U~ zQNo+T=~6cIxIQsmSi}2nr?M2Ah137lrV0opMDC)eu=1)4$6Bt2yEaJ?vV~=WlAQ`S zo#GqcW3RAO5A=%}oi#jxRkv&qb(i4a)Zib(Vvaj|Sr)lVjEe-INO%n77Z=88#4^~n zjPvkDH}ze%UJcijOg%Ota^H)G48wrw#i5htlItVdKOkPhZc$CFKRuuq W-6Y=R2NgDN*(x;fSOC*M`Px76hnm0u delta 1652 zcmV-)28;Qv56cmdBu@lqK}|sb0I`mI`%#ks00@FfL_t(|obBDqb)+~H24JdBt$OcF zoWUf}p>!w{$|T?noXPBGRp->KaAQgc0Rjp1eJekJ3-0Rws>GwZ4wJzJUVnfbZl!mC zdVSvS&)DzZACFyMKkApQ&-Hl$5i}P*y}d$6{j&9eMt$Dz&y)a4T~7UT)dw22G*ohj zkoslo1C3f6Cb>dL{j&9eMr{od>z{jlpi#r{=)WHSY;OJWcGN#lecE*|y#tih2S&=( zB%yE_uJ`_U-1-noy*fqxvVZky+mF&aKwbLacz--@eW0k{PJP;<0q{+1+My4n@z?5K zr#@}b0C>>{OR1>@^~=_$9U1`NghrUd5K28Uss1_Z(-sYYpz)O`{m;7Y`v_J2Yu2X? z8UQcG!7}_lG%8j9TJ>p%%RmVVO*@Q3XU`B)zifTl-~~i5U_ztLHGkVtzyA6_<4Qk@ z!1^8q0Th(uQ3mRtw?5FgrD2jgeAM?iXpUp9kQYk>CHI`O`ep0W4lf*nQbXvfABos{ zecIr~!;A4F2*zP_bm-Jv|A@ymls2WX1K>;Ou>&RdVb67P*yHbY zrsL=Qyp`m|l0eBh9e=Sk$V%-?uDUfHKW*?1fEP=GZqD{IthA09G4+9&PSz?zzs~c1i_m$>XOz8URURA3=CT03G!a zh_PcV8MLMAb4?lmn_MxJu6Rrkq5-hV5hs6ZKEd4j@pBDEI)6-B^Gy1^9l1}fA3xXU z1w_|%UHAO=ugTHo?d{_hTjuumaqEBAFRT8!>eD7uKmd(0T42)DsB--C;m9=S2vq&D z^|?Op09a%gHYKJV)Gu3~Yw^M%I{(}Y%`*?b-x5aZm#q%~G{$IwFQJiWXhfO1ociag zPkX#*=(;ZLGJnJ+%c*~^`n2g@dIzY>ny^Wk!&d(s^=XR{17Au{L8xyE2mm;MQ3JC| z-)Pig{m>)KjfkTFew&5Elk7IaQx$a7}jp#-++B-0DnZ444}{`xc`{|hV9%5%;^jR zxW(y^7LS>Icp(v0`mWQtQFe*TF-sr61^@s60000000000000000001R4IV00sb4>T zKfA8${`v3k*?*&c*;Fap1g_8L0RS}0=K)+mXhgr{9R$!O;ZT{W>73Lc-?~1~4xvzi zP-ypo9bWrguJwU7nF6ZJIGkfazQ_6ioZPRUzn?-Mh%psV*xHcZIe)k5k(UEt9g|*8Mrtwt+u}v&hw0j@~x#hX$}gtO+a);Hhm) z{cgO>c%Rnn!`{aGve)z!kVXU8DAWXhwg&IoVC)L-fo(3=w3)h_Cl;h6eHS5$k znjY?xCIH9M02as*pjQgGHGhw}b!u!}IgkOGEbvRe%r;V4Q5nt(*f` zX#DigC6|n90zgePfK0~Mv-e+{0s?BK0jw0e8pxxJfiutmR#+11ngLKN4Im&il3%kv zK+QCO1 From 8f7d0f4913204aff6fbc3e2ab3767b7c3ed2159e Mon Sep 17 00:00:00 2001 From: Dav999 Date: Tue, 5 Dec 2023 16:14:16 +0100 Subject: [PATCH 13/15] Make some minor refinements to Dutch translation I put a main focus on the first cutscenes in the game, changing the first "Uh oh..." from something like "Oh dear..." to "Oh no..." to make sure it always sounds right. (The real translation of "Uh oh" is "O-o", but that seemed too easy to read wrong for the first line in the game that I wanted to avoid it altogether.) --- desktop_version/lang/nl/cutscenes.xml | 8 ++++---- desktop_version/lang/nl/strings.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/desktop_version/lang/nl/cutscenes.xml b/desktop_version/lang/nl/cutscenes.xml index 12911046..2aac9824 100644 --- a/desktop_version/lang/nl/cutscenes.xml +++ b/desktop_version/lang/nl/cutscenes.xml @@ -2,7 +2,7 @@ - + @@ -11,7 +11,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -687,7 +687,7 @@ Weet u heel zeker dat u dit wilt doen?"/> DIMENSIONAL STABILISER OFFLINE" translation="-= WAARSCHUWING =- DIMENSIONALE STABILISATOR INACTIEF" centertext="1" pad="1"/> - + diff --git a/desktop_version/lang/nl/strings.xml b/desktop_version/lang/nl/strings.xml index 59b7b94e..8240c199 100644 --- a/desktop_version/lang/nl/strings.xml +++ b/desktop_version/lang/nl/strings.xml @@ -494,7 +494,7 @@ - + From c6600002925c23eb4d24fdac04bf9a6c0f09cf3e Mon Sep 17 00:00:00 2001 From: TerryCavanagh Date: Tue, 5 Dec 2023 16:46:41 +0100 Subject: [PATCH 14/15] =?UTF-8?q?updated=20=C4=B0ZLE=20sprite=20for=20turk?= =?UTF-8?q?ish?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit as approved by our translator --- .../lang/tr/graphics/flipsprites.png | Bin 2362 -> 2062 bytes desktop_version/lang/tr/graphics/sprites.png | Bin 2386 -> 2074 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/desktop_version/lang/tr/graphics/flipsprites.png b/desktop_version/lang/tr/graphics/flipsprites.png index 9c7ca7237f075902b8da8411db7a29c1b1897937..625bca5b7275380a81c99da265a5a81691ca2462 100644 GIT binary patch delta 1482 zcmXw3e>l^59RGYbHeHsboLaP9kEcs9_at=`n_rJfx~5%+5T_0sStyzG{Z1(qrjF`4 zwuQQcNo+fktxLD(QDK@KCQ5F?=!Y5e>vlce`*~jfyq@>_^~dXZyUZZ*0Du*2T1YYg8z21#=y4q5ppi6*@eK3?psrx$LX;^0*iwHVPsZs! z?ZE52;hlI)C+?oC>kxrvZ@+aU3|;w+@Aou7G|&2#mh+~QuLsduamCFu@?BwVGZ`6> zQSSe_8iuulBz?mn{V+rLTjLS zMN(=8(ohyNq_n;Xb>;H8elnaDsmAJ;jYBP8p-A$r&g>%?ES|)~w6tAQLKTv>9*SRv ztxF+y9jtz%(CdfOE^Q2Gy?$Rn;i-4Vm!VIenmtB=Np+(j=m;8Q+L(3@M6F$o_-U#j zVBbvk_HppH>6TSRFcwEYVQ1rLaFdN0Z1&jG0|ZLpx<270+4>u`Y{ghRNIb6rN8)o@>(W#-zoNK;=H-buV;mEhT!7 zQe$Da=HX;@%So6-oqpn{3tuorO8J*bWsZ>#1-9Yr=G~xMaF9rgpW5_xd`hC93PaI9UloHKGpbIb z!d}^6MTjXVZ?VXPxS|Ue7YEZ}Qe$fAqq|NETu3B}s#<=f6)o?vnbqqM=f`aErye|F z&kVrRpE}i_bNaXt5WU46vySYB)c4fpy`Gy7i3XOrtK`pg1?00VAg?KV{B3du4w#9( zW~&b!MuVW7Ri&48da{9OOlXNzT77_{ZmNkgOwoxn2RB63W6YFzXmoK}TLc&sk$f!Rll9Vsga_psriM-k=s3X=gFm&V zK|cg*v-C3`iZGp==Hh=kw@-F0mFKU-i`MRY7FW*Im>M zJG&g7(YhW%0z}V({8a8tP<{>BtLd(HP<>PvWw2@=YzF4~cHB@K2R_4ECukIPCW{<9 zw587SxSH2L_MK8CSpbN$L7vU&A4cJYCvo$lCgX$giZOu4NJMWLs10v*H&jBvWUP@r zuRfbDOUa|6L9qHp>g0qw*;cP}#evAx4{^egm~jaKP=!@Ep~eXaj62z>5M*}?0(K); z<-mXI9GQevY4JdvDIw;p+7EH%c8RHXGhg}SLY4P5D}r(=~+ArEIQ aoFERc_VKng=Ng+B0Ds^8J|eHk%zpvyrM9R5 delta 1790 zcmVaA08ls8EB3@d z0+YccKmY_mC81gbAqFmg zfb!jPcL2!i_U&i8WxMwC$0YekGHWA_|Z!*{XSUs zNkahuMwKuEm;BRF0DvGP@at0mfJwPplYa@bkgHMvfFkt^k0OwU0su_PnS684KCVsy z0D^Liz`L`J`mwvmW&!aj0KljtN8nS}8n_BL4ZlpFX_|6w#o%Ue02$=E6+|gFqpOXI z3jE{f5qN30qXv8)RuNq#Lks)bM8O&vBpTynxqnI^nbrMk>%(|%$ZLq`%gX0 z0Ck{GE^QrnUY=16(>SGW`{$5Jlf3C|6fWP`lBv(S& z61RlD#_GeF_Mh`p0QiSwvYy`=XXS%S(9*T-RLM{Lyz!}n4-Ze)9@vbXgv8GqAE?yZ z{obxgKx^MGet+5Vfl6&nCb5!`_<7?4mD-y`Y=7?Ufl6Iv1S`HGz&Z{dRjx}IQx`Xl zJ=fo6xc$-tlj7%%Pu*Mxz%IE*oZ=htvz-FKlb6Ti7WxLNv0D_x9&L)BH$L@H0N5?} zC{%p20Jc#8*eo_<7?~ z4`&(>v^23?^(zr;k53(Zco;R8giJz2VIIBoQDgkEK6J}a3J`m_8z>ZLs`yy?Ar?zO0F_bz zDAw2#houjQ!ygi}a-W7+WBe{==(N-RYe)120Drg`BZ$fk4=DCWmBTYl*1T8zbHt}^ zjsXBv%4whk*OI%@=5S=0Vw5R<-uTqZ3;>`~3II>{mKmO9(qDT{aUUA-^TwxM3IG7q zC^V7`-2iRuy;JRoUw(Y*W(ELIDQ5w(>PpwCFGtyWg{t^@<5Mp)000000000000000 z0FkZ+e}D|!HLw7m-hXMErfI(a{(9>_4vGC9pkD3<3Q#Ep0H9L75T;;DmT6+W2dIx3 zK*6Tg@B#Kx01DI}vBxL^pWc6I`#*cz1Fk^{1+-;;jbW9s(z zdb{7-?k9I&fdAcdci_z4?)UcP@wml!Pyg}D<8kYr>$dGb9!sQ4x0z~xtRHi)h2Gn> z9eQnPyJN9J+XCyn%iV!9n@W&Pvn=^{?S%fHLa64We}oe9lJ>U5Te9pk*RG`_NJ9aLU|0l>NdCk4N4Bx_y=#igl6H;$ zAuh)NA_=XlFA-WBA6q`z+UC;NmTo(@jI?xVXl=VdTxI}~j4i9wD8>F8{X=|a05i5G zv$fle9ZQ%xOJ}OBscq)Y?wM~4%_ADdKwH>QnV4vz| z087{HV~;+UCcD_j07C2Y-TPx4AK23NTwJpNNW%=^#A1z@x1NHzWEp9!?WOH5y?_i@ zulmu{*ww4U*XJ(!T4U=OLjW;VzXY__-h^!g3zWhV(7@CI(4#N70!T>#0H~A#uu|v% zW&hvMbD@6$e{ypSV8qr$ZHWgs3p0QfLZf&WHUVd)0Iam;{`6)8K*G1)@04R}Tvmpl7 g0g7(jG?0D_W3L`y0o6951J07*qoM6N<$f;j$O_W%F@ diff --git a/desktop_version/lang/tr/graphics/sprites.png b/desktop_version/lang/tr/graphics/sprites.png index 765075c71d9bf06e0276abc4429c7bfc6b3a8196..593c7a3950ff655a75be6e5718e75ced8198daf3 100644 GIT binary patch literal 2074 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 Date: Tue, 5 Dec 2023 16:49:57 +0100 Subject: [PATCH 15/15] =?UTF-8?q?changed=20Spanish=20name=20in=20meta.xml?= =?UTF-8?q?=20to=20Espa=C3=B1ol=20(es)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit might consider adding an Español (latam) edit next year, but this is enough for 2.4. We're using "Español (es)" instead of "Castellano" because our translator prefers it --- desktop_version/lang/es/meta.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop_version/lang/es/meta.xml b/desktop_version/lang/es/meta.xml index 0d5b33ea..01582715 100644 --- a/desktop_version/lang/es/meta.xml +++ b/desktop_version/lang/es/meta.xml @@ -3,7 +3,7 @@ 1 - español + español (es) Traducción al español de Felipe Mercader y Sara Marín