From 3dc779311ce6cfe6aeb2e056a2af2977c13b10fa Mon Sep 17 00:00:00 2001
From: Dennis Ploeger <github.dennis@dieploegers.de>
Date: Mon, 30 Aug 2021 20:57:25 +0200
Subject: [PATCH] Issue 336 (#380)

Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
Co-authored-by: dploeger <dploeger@users.noreply.github.com>
---
 .../esc/_test/test_esc_compiler.gd            |  18 +-
 .../game/core-scripts/esc/commands/say.gd     |  17 +-
 .../core-scripts/esc/types/esc_command.gd     |   3 +
 .../esc/types/esc_dialog_option.gd            |  20 ++-
 docs/api/ESCDialogOption.md                   |  10 +-
 docs/api/SayCommand.md                        |   9 +-
 docs/esc.md                                   |  30 ++--
 game/rooms/room01/esc/wall_item.esc           |   8 +-
 .../room01/esc/wall_item_popupdialog.esc      |   8 +-
 game/rooms/room06/esc/worker.esc              |   4 +-
 game/translations/game.csv                    |  12 +-
 game/translations/game.de.translation         | Bin 0 -> 732 bytes
 game/translations/game.en.translation         | Bin 386 -> 681 bytes
 game/translations/game.fr.translation         | Bin 406 -> 724 bytes
 game/translations/main_menu.csv               |  36 ++--
 game/translations/main_menu.de.translation    | Bin 0 -> 1056 bytes
 game/translations/main_menu.en.translation    | Bin 921 -> 989 bytes
 game/translations/main_menu.fr.translation    | Bin 956 -> 1032 bytes
 game/ui/commons/load/load_game.gd             |  10 +-
 game/ui/commons/load/load_game.tscn           |  50 +++---
 game/ui/commons/main_menu/flags/en_EN.png     | Bin 9746 -> 0 bytes
 game/ui/commons/main_menu/flags/fr_FR.png     | Bin 2981 -> 0 bytes
 game/ui/commons/main_menu/main.tscn           |   1 +
 game/ui/commons/main_menu/main_menu.gd        |  10 +-
 game/ui/commons/main_menu/main_menu.tscn      |  53 ++++--
 game/ui/commons/options/flags/de.png          | Bin 0 -> 2245 bytes
 .../en_EN_small.png => options/flags/en.png}  | Bin
 .../fr_FR_small.png => options/flags/fr.png}  | Bin
 game/ui/commons/options/options.gd            |  34 +++-
 game/ui/commons/options/options.tscn          | 154 +++++++++---------
 game/ui/commons/pause_menu/pause_menu.gd      |   8 +-
 game/ui/commons/pause_menu/pause_menu.tscn    |  81 ++++-----
 game/ui/commons/save/save_game.gd             |   9 +-
 game/ui/commons/save/save_game.tscn           |  53 +++---
 project.godot                                 |   5 +-
 35 files changed, 389 insertions(+), 254 deletions(-)
 create mode 100644 game/translations/game.de.translation
 create mode 100644 game/translations/main_menu.de.translation
 delete mode 100644 game/ui/commons/main_menu/flags/en_EN.png
 delete mode 100644 game/ui/commons/main_menu/flags/fr_FR.png
 create mode 100644 game/ui/commons/options/flags/de.png
 rename game/ui/commons/{main_menu/flags/en_EN_small.png => options/flags/en.png} (100%)
 rename game/ui/commons/{main_menu/flags/fr_FR_small.png => options/flags/fr.png} (100%)

diff --git a/addons/escoria-core/game/core-scripts/esc/_test/test_esc_compiler.gd b/addons/escoria-core/game/core-scripts/esc/_test/test_esc_compiler.gd
index 89702c15..4c69d8a4 100644
--- a/addons/escoria-core/game/core-scripts/esc/_test/test_esc_compiler.gd
+++ b/addons/escoria-core/game/core-scripts/esc/_test/test_esc_compiler.gd
@@ -18,6 +18,7 @@ func _test_basic() -> bool:
 >
 	say player "Test5"
 	say player  "Test 6"
+	say player TEST:"Test 7"
 	"""
 	var script = escoria.esc_compiler.compile(esc.split("\n"))
 	
@@ -70,12 +71,17 @@ func _test_basic() -> bool:
 	
 	subject = script.events["test"].statements[1]
 	assert(subject is ESCGroup)
-	assert(subject.statements.size() == 2)
+	assert(subject.statements.size() == 3)
 	
 	subject = script.events["test"].statements[1].statements[1]
 	assert(subject is ESCCommand)
 	assert(subject.name == "say")
-	assert(subject.parameters[1] == "Test 6")
+	assert(subject.parameters[1] == "Test 6")	
+	
+	subject = script.events["test"].statements[1].statements[2]
+	assert(subject is ESCCommand)
+	assert(subject.name == "say")
+	assert(subject.parameters[1] == "TEST:Test 7")
 	
 	return true
 	
@@ -222,6 +228,8 @@ func _test_dialog() -> bool:
 	- "Option 3"
 		>
 			say player "test3"
+	- TEST:"Option 4"
+		say player "test4"
 !
 	"""
 	var script = escoria.esc_compiler.compile(esc.split("\n"))
@@ -230,7 +238,7 @@ func _test_dialog() -> bool:
 	assert(subject.size() == 1)
 
 	assert(subject[0] is ESCDialog)
-	assert(subject[0].options.size() == 3)
+	assert(subject[0].options.size() == 4)
 	
 	subject = script.events["test"].statements[0].options[0]
 	assert(subject is ESCDialogOption)
@@ -276,6 +284,10 @@ func _test_dialog() -> bool:
 	assert(subject[0].statements[0] is ESCCommand)
 	assert(subject[0].statements[0].parameters.size() == 2)
 	
+	subject = script.events["test"].statements[0].options[3]
+	assert(subject is ESCDialogOption)
+	assert(subject.option == "TEST:Option 4")
+	
 	return true
 	
 
diff --git a/addons/escoria-core/game/core-scripts/esc/commands/say.gd b/addons/escoria-core/game/core-scripts/esc/commands/say.gd
index 32273aaa..6f8fe4c0 100644
--- a/addons/escoria-core/game/core-scripts/esc/commands/say.gd
+++ b/addons/escoria-core/game/core-scripts/esc/commands/say.gd
@@ -1,7 +1,14 @@
 # `say object text [type] [avatar]`
 #
 # Runs the specified string as a dialog said by the object. Blocks execution 
-# until the dialog finishes playing. Optional parameters:
+# until the dialog finishes playing. 
+#
+# The text supports translation keys by prepending the key and separating
+# it with a `:` from the text.
+# 
+# Example: `say player ROOM1_PICTURE:"Picture's looking good."`
+#
+# Optional parameters:
 # 
 # * "type" determines the type of dialog UI to use. Default value is "default"
 # * "avatar" determines the avatar to use for the dialog. Default value is 
@@ -64,11 +71,15 @@ func run(command_params: Array) -> int:
 			]
 		)
 		return ESCExecution.RC_ERROR
-		
+	
+	var _line = command_params[1]
+	if ":" in _line:
+		_line = tr(_line.split(":")[0])
+	
 	escoria.dialog_player.say(
 		command_params[0], 
 		dialog_scene_name, 
-		command_params[1]
+		_line
 	)
 	yield(escoria.dialog_player, "dialog_line_finished")
 	return ESCExecution.RC_OK
diff --git a/addons/escoria-core/game/core-scripts/esc/types/esc_command.gd b/addons/escoria-core/game/core-scripts/esc/types/esc_command.gd
index 68ba9f88..c063a8a3 100644
--- a/addons/escoria-core/game/core-scripts/esc/types/esc_command.gd
+++ b/addons/escoria-core/game/core-scripts/esc/types/esc_command.gd
@@ -46,6 +46,9 @@ func _init(command_string):
 						parameters.append(
 							parameter.substr(1, parameter.length() - 2)
 						)
+					elif ":" in parameter and '"' in parameter:
+						quote_open = true
+						parameter_values.append(parameter.replace('"', ''))
 					elif parameter.begins_with('"'):
 						quote_open = true
 						parameter_values.append(parameter.substr(1))
diff --git a/addons/escoria-core/game/core-scripts/esc/types/esc_dialog_option.gd b/addons/escoria-core/game/core-scripts/esc/types/esc_dialog_option.gd
index f481be2b..1cc5599a 100644
--- a/addons/escoria-core/game/core-scripts/esc/types/esc_dialog_option.gd
+++ b/addons/escoria-core/game/core-scripts/esc/types/esc_dialog_option.gd
@@ -5,11 +5,12 @@ class_name ESCDialogOption
 
 # Regex that matches dialog option lines
 const REGEX = \
-	'^[^-]*- "(?<option>[^"]+)"( \\[(?<conditions>[^\\]]+)\\])?$'
+	'^[^-]*- (?<trans_key>[^:]+)?:?"' +\
+	'(?<option>[^"]+)"( \\[(?<conditions>[^\\]]+)\\])?$'
 
 
 # Option displayed in the HUD
-var option: String
+var option: String setget ,get_option
 
 # Conditions to show this dialog
 var conditions: Array = []
@@ -23,7 +24,14 @@ func _init(option_string: String):
 	if option_regex.search(option_string):
 		for result in option_regex.search_all(option_string):
 			if "option" in result.names:
-				self.option = escoria.utils.get_re_group(result, "option")
+				var _trans_key = ""
+				if "trans_key" in result.names:
+					_trans_key = "%s:" % \
+							escoria.utils.get_re_group(result, "trans_key")
+				self.option = "%s%s" % [
+					_trans_key,
+					escoria.utils.get_re_group(result, "option")
+				]
 			if "conditions" in result.names:
 				for condition_text in escoria.utils.get_re_group(
 							result, 
@@ -41,6 +49,12 @@ func _init(option_string: String):
 		)
 
 
+func get_option():
+	if ":" in option:
+		return tr(option.split(":")[0])
+	return option
+
+
 # Check, if conditions match
 func is_valid() -> bool:
 	for condition in self.conditions:
diff --git a/docs/api/ESCDialogOption.md b/docs/api/ESCDialogOption.md
index c60fae5b..f7e9f38d 100644
--- a/docs/api/ESCDialogOption.md
+++ b/docs/api/ESCDialogOption.md
@@ -13,7 +13,7 @@ An option of an ESC dialog
 ### REGEX
 
 ```gdscript
-const REGEX: String = "^[^-]*- \"(?<option>[^\"]+)\"( \\[(?<conditions>[^\\]]+)\\])?$"
+const REGEX: String = "^[^-]*- (?<trans_key>[^:]+)?:?\"(?<option>[^\"]+)\"( \\[(?<conditions>[^\\]]+)\\])?$"
 ```
 
 Regex that matches dialog option lines
@@ -26,6 +26,8 @@ Regex that matches dialog option lines
 var option: String
 ```
 
+- **Getter**: `get_option`
+
 Option displayed in the HUD
 
 ### conditions
@@ -46,6 +48,12 @@ func _init(option_string: String)
 
 Create a dialog option from a string
 
+### get\_option
+
+```gdscript
+func get_option()
+```
+
 ### is\_valid
 
 ```gdscript
diff --git a/docs/api/SayCommand.md b/docs/api/SayCommand.md
index a7886474..65d72a72 100644
--- a/docs/api/SayCommand.md
+++ b/docs/api/SayCommand.md
@@ -9,7 +9,14 @@
 `say object text [type] [avatar]`
 
 Runs the specified string as a dialog said by the object. Blocks execution
-until the dialog finishes playing. Optional parameters:
+until the dialog finishes playing.
+
+The text supports translation keys by prepending the key and separating
+it with a `:` from the text.
+
+Example: `say player ROOM1_PICTURE:"Picture's looking good."`
+
+Optional parameters:
 
 * "type" determines the type of dialog UI to use. Default value is "default"
 * "avatar" determines the avatar to use for the dialog. Default value is
diff --git a/docs/esc.md b/docs/esc.md
index 8f1336dd..e88f7556 100644
--- a/docs/esc.md
+++ b/docs/esc.md
@@ -252,7 +252,14 @@ group or an event.
 #### <a name="SayCommand.md"></a>`say object text [type] [avatar]` [API-Doc](api/SayCommand.md)
 
 Runs the specified string as a dialog said by the object. Blocks execution
-until the dialog finishes playing. Optional parameters:
+until the dialog finishes playing.
+
+The text supports translation keys by prepending the key and separating
+it with a `:` from the text.
+
+Example: `say player ROOM1_PICTURE:"Picture's looking good."`
+
+Optional parameters:
 
 * "type" determines the type of dialog UI to use. Default value is "default"
 * "avatar" determines the avatar to use for the dialog. Default value is
@@ -373,21 +380,6 @@ Makes the `player` walk to the position `x`/`y`.
 
 <!-- /ESCCOMMANDS -->
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 ## Dialogs
 
 Dialogs are specified by writing `?` with optional parameters, followed by a list of dialog options starting with `-`. Use `!` to end the dialog.
@@ -398,17 +390,19 @@ The following parameters are available:
 * timeout: (default value 0) timeout to select an option. After the time has passed, the "timeout_option" will be selected automatically. If the value is 0, there's no timeout.
 * timeout_option: (default value 0) index of option (starting from 1) selected when timeout is reached.
 
+Options support translation keys by prepending and separating them with a `:` from the rest of the text.
+
 Example:
 
 ```
 # character's "talk" event
 :talk
 ? avatar timeout timeout_option
-	- "I'd like to buy a map." [!player_has_map]
+	- MAP:"I'd like to buy a map." [!player_has_map]
 		say player "I'd like to buy a map"
 		say map_vendor "Do you know the secret code?"
 		?
-			- "Uncle Sven sends regards."
+			- UNCLE_SVEN:"Uncle Sven sends regards."
 				say player "Uncle Sven sends regards."
 
 				>	[player_has_money]
diff --git a/game/rooms/room01/esc/wall_item.esc b/game/rooms/room01/esc/wall_item.esc
index 97d73b0c..699df6a7 100755
--- a/game/rooms/room01/esc/wall_item.esc
+++ b/game/rooms/room01/esc/wall_item.esc
@@ -1,13 +1,13 @@
 :look
 > [eq dialog_advance 0]
-	say player "I don't know what that stuff is."
+	say player ROOM1_look_wall_item_1:"I don't know what that stuff is."
 	set_global dialog_advance 1
 	stop
 > [eq dialog_advance 1]
-	say player "I REALLY don't know what that stuff is."
+	say player ROOM1_look_wall_item_2:"I REALLY don't know what that stuff is."
 	set_global dialog_advance 2
 	stop
 > [eq dialog_advance 2]
-	say player "No, SERIOUSLY, I have no idea what that is!"
-	say player "Please stop asking me that!"
+	say player ROOM1_look_wall_item_3:"No, SERIOUSLY, I have no idea what that is!"
+	say player ROOM1_look_wall_item_4:"Please stop asking me that!"
 	stop
diff --git a/game/rooms/room01/esc/wall_item_popupdialog.esc b/game/rooms/room01/esc/wall_item_popupdialog.esc
index bed8a100..757e450a 100755
--- a/game/rooms/room01/esc/wall_item_popupdialog.esc
+++ b/game/rooms/room01/esc/wall_item_popupdialog.esc
@@ -1,13 +1,13 @@
 :look
 > [eq dialog_popup_advance 0]
-	say player "I don't know what that stuff is." dialog_box_inset
+	say player ROOM1_look_wall_item_1:"I don't know what that stuff is." dialog_box_inset
 	set_global dialog_popup_advance 1
 	stop
 > [eq dialog_popup_advance 1]
-	say player "I REALLY don't know what that stuff is." dialog_box_inset
+	say player ROOM1_look_wall_item_2:"I REALLY don't know what that stuff is." dialog_box_inset
 	set_global dialog_popup_advance 2
 	stop
 > [eq dialog_popup_advance 2]
-	say player "No, SERIOUSLY, I have no idea what that is!" dialog_box_inset
-	say player "Please stop asking me that!" dialog_box_inset
+	say player ROOM1_look_wall_item_3:"No, SERIOUSLY, I have no idea what that is!" dialog_box_inset
+	say player ROOM1_look_wall_item_4:"Please stop asking me that!" dialog_box_inset
 	stop
diff --git a/game/rooms/room06/esc/worker.esc b/game/rooms/room06/esc/worker.esc
index 15406144..11cc0dc4 100644
--- a/game/rooms/room06/esc/worker.esc
+++ b/game/rooms/room06/esc/worker.esc
@@ -13,7 +13,7 @@ say player "I don't think he'd like that."
 	set_global talked_once true
 
 ? res://game/characters/mark/mark_talk.tscn 5 1
-	- "What are you doing here?"
+	- ROOM6_dialog_1:"What are you doing here?"
 		say player 	"What are you doing here?"
 		say worker 	"I'm working! Can't you see that?"
 		say worker	"My colleague is supposed to bring me an important report. And he's not coming!"
@@ -28,7 +28,7 @@ say player "I don't think he'd like that."
 				say worker	"Eh! I'm not asking you anythin'!"
 				stop
 		!
-	- "I'm selling these fine leather jackets."
+	- ROOM6_dialog_2:"I'm selling these fine leather jackets."
 		say player	"I'm selling these fine leather jackets."
 		say worker 	"Go away, kid."
 		stop
diff --git a/game/translations/game.csv b/game/translations/game.csv
index 3e76593a..e640fa6d 100644
--- a/game/translations/game.csv
+++ b/game/translations/game.csv
@@ -1,5 +1,7 @@
-keys,en,fr
-ROOM1_look_wall_item_1,"I don't know what that stuff is.","Je ne sais pas ce que c'est."
-ROOM1_look_wall_item_2,"I REALLY don't know what that stuff is.","Je ne sais VRAIMENT pas ce que c'est."
-ROOM1_look_wall_item_3,"No, SERIOUSLY, I have no idea what that is!","Non, SÉRIEUSEMENT, je n'ai aucune idée de ce que c'est !"
-ROOM1_look_wall_item_4,"Please stop asking me that!","Arrêtez de me demander !"
+keys,en,fr,de
+ROOM1_look_wall_item_1,"I don't know what that stuff is.","Je ne sais pas ce que c'est.","Ich habe keine Ahnung, was das ist."
+ROOM1_look_wall_item_2,"I REALLY don't know what that stuff is.","Je ne sais VRAIMENT pas ce que c'est.","Ich habe WIRKLICH keine Ahnung, was das ist!"
+ROOM1_look_wall_item_3,"No, SERIOUSLY, I have no idea what that is!","Non, SÉRIEUSEMENT, je n'ai aucune idée de ce que c'est !","IM ERNST! Ich habe keine Ahnung, was das ist!"
+ROOM1_look_wall_item_4,"Please stop asking me that!","Arrêtez de me demander !","Bite hör' auf, mich danach zu fragen!"
+ROOM6_dialog_1,"What are you doing here?","Que faites-vous ici ?","Was machst Du hier?"
+ROOM6_dialog_2,"I'm selling these fine leather jackets.", "Je vends ces superbes blousons en cuir.","Ich verkaufe diese schicken Lederjacken."
diff --git a/game/translations/game.de.translation b/game/translations/game.de.translation
new file mode 100644
index 0000000000000000000000000000000000000000..727a82671db02e3fabbc2fbc2e50c542a1a6e928
GIT binary patch
literal 732
zcmbVKOD_Xa6h5O$t3@;x9*IX%gQPS_ELezFqM;&#2$3|?aicXgmAPZX3cJQ1u(PqW
zBw{CifFEFk1<S6xx#PQInsmX&NxppNeCKt~WVCf{o_q^{t7wD2wxsjihOJw?pgZ}Z
zRjvCshtSyp*o+sCZG&YBMME!SoMMI>%wp71o3r#oMqwz2jB|aTacV^1bufy+&Ea(!
zN6!`*H6zR(8zysnL2lxXowxRX+PGooj~s|Z3eW_2lcti%F^WnF_Up~{NXU;8^m&hw
zl==X<)rEmPZU9GpKjyQ{%abKb>wzyv^#O4}u9o=tES+A1yMS8#4Z3{SFfa;K>))ZD
zAXb5q8vP6UHsXF@utwh*sys{~?giwm>YQ!p2)*0e!SV)K^9YEo%iF6oi3N2t)a@!W
z<SMB&xxqzkb$z3sMCvKKOTw&cjfmM;_-#5qesehxa1}50CCqv?5jmT@ySfnOi&&ZK
z76)ZvPFRA(Trv`KmFN4Y80=IN@sW#CM_0M@s^-osVZR@v-Nvnyw!D&>U;1;)Zx6r%
IA`SobHx4bY*8l(j

literal 0
HcmV?d00001

diff --git a/game/translations/game.en.translation b/game/translations/game.en.translation
index 189a5056f824f1f7a63722d1e8ebaac99812ee24..9b738f4d961d474b3d674aac6eced99ebdb5e2cf 100644
GIT binary patch
literal 681
zcmbV~%SyvQ6ow~OtJeDkwBV&;wJyBwq)4TRVxXv`mQr2BGz@KRO*E5&*p(~67tn>E
zo4$Y`x^nMZs0-aFuH8)hr>2mFD+fN#IbY_?$%H6LWreuQhghcv`PRC|^4peXu##pM
zOryT<-?0UqgTSK9EL%ENOQx=sRNGXUP7O*rz0VBofRa|21In0|ql`48sC7`%hBS}2
zQ*A9<qND?5wyYPa?Fuo8*;c{G{kAdPDjeF7gh(I&Y9~eK<`zi1P*{K7S$vR25CUS1
zgN0Cwe#CY+?{%YiF77CzSR=@rKnR3^m?e09JFlD~4uCP&3I7b=?Ye1?e}UIfhrpD_
zzr$~!?gK*}zccmyuz-3Pc=u=Ep@^6f1mX^(;1clkWAG@sTlKG{ZX9Wu@C|?1X-Tds
z@@6WT$b`B4WPa>@9$%l$F9sZGj5v}UnTg$A=#rZ6YD-5>2;cwW#Rgx%;Dm3bXYcx#
tf&pG!t6V*b{ahwald>95Br?@e9vSDw`#27Z`6j2M6QV`_Q!DsMe*o`5p_2dr

literal 386
zcmV-|0e${bQ$s@n000005C8x}0ssJN0RR9fwJ-f(LjeT~00vS+JRs#dYYNEF0g%9x
z05EF;f`Cyb1wfWf&_1wh&m_b^E7^$OcEUI+C+7oC3)tVG!$<SSvBgTHF00F03M~LI
z051R)_7_}X6im2+wX<9}av$x&kE@*+3vCtuho3VTzDD|4kcuHLOFdG*!oZ*T5*UlX
zDzf9K!f0zWDusT`Xz~&}+X7$WXvgYxG1iZ8{aAG5T$Z|igX>SQtu1P8*ORhBp-iVu
zbFSUr`#ll=!cRh$W&nrZM3yE1f&YRm&6f{Znl23ooAW%+U-JhXn`)Z{h3xQd2SS5E
zMKqGq?jOwA$soyQCj&|Zge}?ytxzfv5N$iDI45ZHalar%DO8c!AjxK?74J@11R)?m
z0%IVw4$VN9y)x(Lf0d7^PYVMYT?1R7l=o;f!2+SYk&W$qKN(C*IznuQU~v}4B9+BG
gvk&{x!rh{sY8Aj#4)s>#mm^EbJLNarHd0eVL%D;csQ>@~

diff --git a/game/translations/game.fr.translation b/game/translations/game.fr.translation
index 17fa0cb1ba9fdf46739841e0f2cd0ce679e8a103..399a6ad621fdba3771297df70ccb301b9b5de1f6 100644
GIT binary patch
literal 724
zcmbV~y-Va^5XNV9)zw5n1=l<LSaFF8!eX<9cY4UN;0h;RRs}y`iQ!dOvx(-7m0H>8
z-TevITBuxeHkJpr7WOuJg;xFnA|yVuMu=eL3lGoCZ!$A^L-d0FmBLdEe^E2ysc}QD
zPP>LJEyF80_RDkc_5?cHAy-Ie%QZ#Oa!kW2dQMTA!WPsNt=UFdP(4UlNNKDHNp(mn
z9fA~ut9ZMjXDnHQ8j&t-nd`y}0dJC?Te4T4+ob81HatM07}Nk&CJkpYL!>godGpS3
z6!@dmgud(&qZGtj0~}bzYvF1bw}j4hzA`(XF2p=41*IWg&H8`)WBWI}4eAUT^K0-{
zcozB;;Wywr$WxFO;dkK6$a&7k2%qnNILjmF*#i+i2ac3@2lwzDx}m?2|6NlC<C*M5
zc_F!%pdj{z{K@Wgpcc*#^n7lnko%UKoKE{|O1<9~Pkhiiu9f>Bc7CL+<rRNZd-VIV
zy+N!8lO_~rB)Ok#&@R=*<b2!0>A#bK4lSYDKKWy+il*b-)uCb?R{a^-;TClK9F2QH
b-K;*A=QX>(_9>iM&0Wv+&#x(wj{o@y6$q*V

literal 406
zcmV;H0crkHQ$s@n000005C8yb0ssJh0RR9fwJ-f(Y5}DS09H~(Ixw#@2DqTKlEZfe
z1#~cA=>i9XV6-JpgfFET5+vWBd>5~18oS#W8s4E-4~gS9tqUU}SAwx__(=*d05bqL
z02tTT|IO=*h6Ar*1@R~5&r(pdUj;8r#P$9+_^){=wlcLir1!+a)FR_Q!S)~X2YcbF
z02~gwDiF@0`l72)2;$+tmN{A%#H+A%GtPAbgr)uqyxJ7a9}82~|M~hqb6i(6AKl{V
z&<`Q`IF&jK(#S()cHSsP=7s(b@}GlXN3vY`uYelKQswgBGm>RW#DCF9ma_sbVDB9j
zp2_<?CQdFfJ7XxFiA>uZH<Dn`cEcpOW{FJOEOVCNInZn$y_qiE=}a0O$rF*8xZUBD
z^mT|41t%at0)n8^4xhn3^qYl{*lbs@Fe|eu%LDnH|1~>ow6?(1hmrUeCghE5Z0Ebl
ze%d6NxwVZG8+jo^0I&<Ak!s?ew-39~!fw%?Y7byChgvK0og+)--Q+ibHd0eVLyX|M
AvH$=8

diff --git a/game/translations/main_menu.csv b/game/translations/main_menu.csv
index 93e893b2..b4c25e09 100644
--- a/game/translations/main_menu.csv
+++ b/game/translations/main_menu.csv
@@ -1,17 +1,19 @@
-keys,en,fr
-NEW_GAME,New game,Nouvelle partie
-LOAD_GAME,Load game,Charger
-OPTIONS,Options,Options
-QUIT,Quit,Quitter
-OPTIONS_BACK,Back,Retour
-OPTIONS_LANGUAGE,Language,Langue
-GENERAL_VOLUME,General,Général
-MUSIC_VOLUME,Music,Musique
-SOUND_VOLUME,Sound effects,Effets sonores
-CANCEL,Cancel,Annuler
-OK,OK,OK
-ENTER_SAVE_NAME,Enter the save name:,Entrez un nom de sauvegarde
-APPLY,Apply,Appliquer
-CONFIRM_OVERWRITE,Overwrite the savegame?,Écraser la sauvegarde ?
-YES,Yes,Oui
-NO,No,Non
+keys,en,fr,de
+NEW_GAME,New game,Nouvelle partie,Neues Spiel
+CONTINUE_GAME,Continue game,Continuer la partie,Weiterspielen
+LOAD_GAME,Load game,Charger,Spiel laden
+SAVE_GAME,Save game,Sauvegarder,Spiel speichern
+OPTIONS,Options,Options,Einstellungen
+QUIT,Quit,Quitter,Beenden
+OPTIONS_BACK,Back,Retour,Zurück
+OPTIONS_LANGUAGE,Language,Langue,Sprache
+GENERAL_VOLUME,General,Général,Allgemein
+MUSIC_VOLUME,Music,Musique,Musik
+SOUND_VOLUME,Sound effects,Effets sonores,Soundeffekte
+CANCEL,Cancel,Annuler,Abbrechen
+OK,OK,Ok,Ok
+ENTER_SAVE_NAME,Enter the save name:,Entrez un nom de sauvegarde,Bitte gib einen Namen für das Spiel ein:
+APPLY,Apply,Appliquer,Anwenden
+CONFIRM_OVERWRITE,Overwrite the savegame?,Écraser la sauvegarde ?,Soll das Spiel überschrieben werden?
+YES,Yes,Oui,Ja
+NO,No,Non,Nein
diff --git a/game/translations/main_menu.de.translation b/game/translations/main_menu.de.translation
new file mode 100644
index 0000000000000000000000000000000000000000..987ec021334c8078223627d362a31b6fa0710805
GIT binary patch
literal 1056
zcmbW1O=uHQ5XWC)tw|e=714sC@q?&Uh+68QA4*dTL1|jDftFASo9%0|X1g2q?H=s4
z9=+sHY4PBtew3bU5f2u6D1sNMHxD9M@E{gF3I*BtpCnHf@#KRa^X8wKc{9V3jFK5*
z&9etq(t-O}N)@H7t(wA69o;fz+<)5;GCP6Ih2`2B&l{Ge8hOXc3yqtc9q|8VsxzF0
zq0De0)FKybADnsyXYII_&|Th93kGNV;TBx2%$=q{FA2xi&0-@>XtrK)ATkyJZJ=JM
zH<7r)A|&DbbLJNOKug)%v{Rgs6az;AomLP5hX9RNYn~In`&rz(d_IL-hJOw8gCt0S
z4441~Ku^X%2~dkfHX8~YhoxQ6kWwF=ySYSdQZIzmjmIDE9EMM^G_}+RmeW6JxwJ@H
zyVTEB``$c)PxJWojkTpO_n@5yG>43T{v%j91D|>&q<;0G8PCF(-;>mfZ0JQEI`u>E
zOMUiZ=%odpdZf3dzMZ;X8;4Kv{&`=0o3Cy_qZ*VG1e9~~dyvZfc{i^1Y!%`Eoxi<2
zpY5S|5C<~<wcg!+9zK0hMAt;e#b>b8lfSQ>%B81kP3<5o?VM`81*2s);tIXYyy57`
z>XFa8VUKx(3%f=XHn}s<?Xfi1O{Q3`ImM@^dD-F2Q(70EJn)qM&?>71HrFRVE!x4!
z3)RToa4m3y-BMZ3wKvx_R2>XgsfJRqRjovs$a(h_ikD0bv%XMnCA#IMTYi<O&h5@d
r(UoW|(968>VB%OC;_E%QT*Q=$&W%Qm>+k1g>#gQ;rxp>A!GFVVI%U$G

literal 0
HcmV?d00001

diff --git a/game/translations/main_menu.en.translation b/game/translations/main_menu.en.translation
index c1f4dabb4baedf2c73794d8001b776f8fa4b874f..9edeb798f772ab99f705349b6a94c576a35572d9 100644
GIT binary patch
literal 989
zcmbW0PiPZC6vkiDsA<!x6+}TXIY@*yP_^ixt=2XMgRMzT_7D*pChM?Sy4hX!k5ciZ
z9`#V9UcD5tN0H*egI+v)?7@>D2>v^I-1xmFQ$q06fgd~HH}iJidox?9R`S#x19&P%
zF<&YQzo~h`_AL>Zj;;3X`I$uIao|bc2|ZobEk_qtJ#gy2E^SE%d)I8yk~9dXC4FBQ
z(x(FuI}wsnm^P7JJrE5`(g<WD)K_HCHTX+@;F-433G;Q&bOV?~F)##n-ZV8aagK)B
z!uW5^+>ivwfMbBielQG<0IsLq9jAKcr!gPv(Y)m>^hGcO=0OouKn*m&K9B)Tz&SCR
zmW=Utd5uwi`SH~a&W&?nlyAM<zH=Cwo5fvF{-w>*U+!kVe`am^Qwu)V!~IwLKfK-e
zwhVm;9PRO6|B1UNq18oE`_I3yvs@SVic!8n`8NgV{yZOiNp5NI`6w8*|7-C{`wDb_
zz3+akuRVp&`7?3AG3noN2anx+vf{$$1!%67*?sTkx;75Yhs<ZD;@_K-sWh~zf2=k-
zz6#wR|I^LAdIVqP%k^;Fb5LHO8=-IN6qRS5eT*o&HhH2J(aq2dsN_&oy*(Sx<+cZg
zuvGp&=M_e_63%qOYR6{j7B2R@&{t^Ab*)ue6t)rKw$q{`?q&@B2cp8#!`S77^NRzf
gD9Wd=4`x#ckEkT?clK1pJ=vM%g{?~q_X<DuKWv__{Qv*}

delta 503
zcmcc1K9hZeBV+x4Bp|`SzyRaQ0of`@e2};nkZ%CQW<YEM#7;o$1H?f<43cLB(h5Kv
z1H_C_91_C87zbp7<UklE?%(XP1Ze)`1B{}EvOsZmAm%`lw_WM?Ef<UU{>@9C@J*Iu
z5|@ks$}&SS%v7Ukd1_jd{eZIeKp8eDhRIgl=GdA%xeh1`l)!M&_E%FU22NhbB(50^
zl!ckBmS}n&<ZezVhMDzn<<t<p$?urN>s^5|JV49`#99%8+9gnxARQnV$OCaL5IZF%
zXEXRD=B1Y=rl&Iea}B6rv}4JC!;<r#(Td@pyRme{KL+2@;>=`*$kbwnfBw%Mi(GlP
zvgBKXRM;~(78K-EGW-jUwrA4Oxz5b>kHI-HFF7?wm%%Te!QY!9ur#xT!6!d4MIk*g
Y7ihk}P49t!41THQ5I)cWLBT=J01bzBZ~y=R

diff --git a/game/translations/main_menu.fr.translation b/game/translations/main_menu.fr.translation
index c56bc02e5ff98f5a00129f38b7492f41cba3a245..ea0ff8832092fb5496b09ea5e13520512a8c3333 100644
GIT binary patch
literal 1032
zcmbW1O=uHA6vtn-RnsPZ)DNmqOpB624aDz*jY^HhSZ%hZITS?0B#g=0&2HR}iztYC
z$w8q=MZ9=v#T-0HDHS{@1kXKs=*5C3zm6U^{$G=o5PEXp$GrES_h#PA&TM8nlcZMb
zLhsWDdnzUDQq~fNtqVsp4L|O``yev+154VbYZYWpHw!|~IcCl-NJG+&_Ax`0CG|il
zOWPJjY11}18yS*9FiWT|=ZL&6X*=A!TbPwjOW>7k$I^^qGtDkoTE&4#6ac+oW2Q6l
z_%RBzgtqCPyD`9rvZdAEvWTTY&=0t61!1ro@b((5cCgJp411)_=a8fDPlE)w08$_W
zW<VbBl7pZGxI`wK4F(3#^I7mFeO-NYae>QZtzFk&eYwGP@s1fk{%kG%hYzuHp5eLC
z&kvyUr`QYp_>W5q-^%d!0AAnM-~3i8hv4&>Fus2Lxe>j*iC(1SyDaq1dhV_TmnHPh
z`qxvB8<WtvPR5^q<@@~HVq3h@8jJi=Oql=faa5dIy$QcFf4w%JJqdjuH~{?o588>)
zFnqpIJHg0I-;t;2`TOny{`x;EvDYu*^BM9O-+>5t3)ESfbZza9E6Gz6Pd<5csa`Yc
zHB0E^U5m!wdz8j&^2TE^rK^8wWvJJqMxb6Dc$m9VJ=YyIN7dU9&XekDl#veJ3XN4N
zI?rg)Rbdn{bFw6?B3y5LYG{qV{(QE$+|2aIOGYMoqW7xz)d>Y&`nvfdlxW)1&6u!9
OV}{}C$VbcIAMh8lAHhoi

delta 507
zcmeC+*u%adfU*8R5|ChEV1RMufNT{cK1f^($Tt9DGa$ABVkaQ>0pcJa2FbGmX$2sT
z0b)id4hi94ECRCGftUkH+`rjni8cen<nxT8hKfLOE+~fSvt8-;tq~}Ou5bV5B~SP!
z>oSQ;W&>qepctmhXj-0{@#I*bEXZBxW>($i*jhQc7bpvq1e**p9j15ttEm%{C+}qv
z*USfsGDERiqUm{%Dj0^Tez<aKi23BdOyZ_tKv`ZO<_BV}2tn-*Ak72B0zk|L#PUEq
z1&D)EOY%#L7<>}*(o0h(A7B<KcR#!`@9@f^#2g0S(&Eg*(o_cj(oBZ`jE6gAn&Q1X
z?O4?Et^Kor0`?4!1qC@E6-5mHTy=Dqn8i15SLFJ~;Fy<JngbN{%g<x*_h$GPsHVT;
kAA@s7Vo^FsslQF{fqxAD{G#(`aNGEMG5uo*3J!7x0MAu@RR910

diff --git a/game/ui/commons/load/load_game.gd b/game/ui/commons/load/load_game.gd
index f200a737..8a60261b 100644
--- a/game/ui/commons/load/load_game.gd
+++ b/game/ui/commons/load/load_game.gd
@@ -14,13 +14,17 @@ func _on_back_pressed():
 	emit_signal("back_button_pressed")
 
 func refresh_savegames():
-	for slot in $ScrollContainer/slots.get_children():
-		$ScrollContainer/slots.remove_child(slot)
+	for slot in $CenterContainer/VBoxContainer/\
+			ScrollContainer/slots.get_children():
+		$CenterContainer/VBoxContainer/\
+				ScrollContainer/slots.remove_child(slot)
 	
 	var saves_list = escoria.save_manager.get_saves_list()
 	for i in saves_list.size():
 		var save_data = saves_list[i+1]
 		var new_slot = slot_ui_scene.instance()
-		$ScrollContainer/slots.add_child(new_slot)
+		$CenterContainer/VBoxContainer/ScrollContainer/slots.add_child(
+			new_slot
+		)
 		new_slot.set_slot_name_date(save_data["name"], save_data["date"])
 		new_slot.connect("pressed", self, "_on_slot_pressed", [i+1])
diff --git a/game/ui/commons/load/load_game.tscn b/game/ui/commons/load/load_game.tscn
index 12a14027..9af172d2 100644
--- a/game/ui/commons/load/load_game.tscn
+++ b/game/ui/commons/load/load_game.tscn
@@ -13,38 +13,48 @@ __meta__ = {
 }
 slot_ui_scene = ExtResource( 2 )
 
-[node name="back" type="Button" parent="."]
-margin_left = 130.0
-margin_top = 329.0
-margin_right = 304.0
-margin_bottom = 383.0
-custom_fonts/font = ExtResource( 1 )
-text = "OPTIONS_BACK"
+[node name="CenterContainer" type="CenterContainer" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="ScrollContainer" type="ScrollContainer" parent="."]
-anchor_left = 0.291
-anchor_top = 0.369
-anchor_right = 0.709
-anchor_bottom = 0.941
-margin_left = -0.480011
-margin_top = -1.10001
-margin_right = 0.479919
-margin_bottom = -0.900024
+[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"]
+margin_left = 390.0
+margin_top = 184.0
+margin_right = 890.0
+margin_bottom = 715.0
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="ScrollContainer" type="ScrollContainer" parent="CenterContainer/VBoxContainer"]
+margin_right = 500.0
+margin_bottom = 500.0
+rect_min_size = Vector2( 500, 500 )
 scroll_horizontal_enabled = false
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="slots" type="VBoxContainer" parent="ScrollContainer"]
-margin_right = 536.0
-margin_bottom = 515.0
+[node name="slots" type="VBoxContainer" parent="CenterContainer/VBoxContainer/ScrollContainer"]
+margin_right = 500.0
+margin_bottom = 500.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[connection signal="pressed" from="back" to="." method="_on_back_pressed"]
+[node name="back" type="Button" parent="CenterContainer/VBoxContainer"]
+margin_top = 504.0
+margin_right = 500.0
+margin_bottom = 531.0
+custom_fonts/font = ExtResource( 1 )
+text = "OPTIONS_BACK"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[connection signal="pressed" from="CenterContainer/VBoxContainer/back" to="." method="_on_back_pressed"]
diff --git a/game/ui/commons/main_menu/flags/en_EN.png b/game/ui/commons/main_menu/flags/en_EN.png
deleted file mode 100644
index bf01becd59da9528d0f6c32ca3f7b9f3d20a6380..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9746
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
OW=@|y?bsAq=6?WHUWC8^

diff --git a/game/ui/commons/main_menu/flags/fr_FR.png b/game/ui/commons/main_menu/flags/fr_FR.png
deleted file mode 100644
index 928f3f1db3dbfd3b35aa3ba40c4984a4005670c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2981
zcmeAS@N?(olHy`uVBq!ia0y~yU~gbxU}a!p28!H%ynG3eVo7)Ob!1@J*w6hZkrl{S
zNcITwWnidMV_;}#VPN<L6l!?Ez))(y!0;-8fx&791A}<MoLzx7KnczOpAc6D<*EPw
z|9`7#$-M2gKTwb{$=lt9@jsL9Js^j@#M9T6{SmjUn2_9!)ixXq3|uokT^vIyZoR!|
z$jHFJ!MtGVmL;0K5BXL&1m&H|-N_-Q6R{!TU=u6%C}T7bMpMFQE*Q-Pqq$%-7mVhD
z(OfW^3uu`O{#%_6=G&6_*Q@~8ZdEODjVMV;EJ?LWE=mPb3`Pcq7P^Lpx<-~EMn+bK
t7FI@<+6D$z1_pohK5RkJkei>9nO2EgLvOJMuo=w2;OXk;vd$@?2>{bH&eQ+^

diff --git a/game/ui/commons/main_menu/main.tscn b/game/ui/commons/main_menu/main.tscn
index ba51b5e3..e3912d3b 100644
--- a/game/ui/commons/main_menu/main.tscn
+++ b/game/ui/commons/main_menu/main.tscn
@@ -19,6 +19,7 @@ __meta__ = {
 [node name="new_game" type="Button" parent="."]
 margin_right = 358.0
 margin_bottom = 152.0
+rect_min_size = Vector2( 0, 150 )
 size_flags_vertical = 3
 custom_fonts/font = ExtResource( 1 )
 text = "NEW_GAME"
diff --git a/game/ui/commons/main_menu/main_menu.gd b/game/ui/commons/main_menu/main_menu.gd
index 2bd7ef20..4e4bc5e8 100644
--- a/game/ui/commons/main_menu/main_menu.gd
+++ b/game/ui/commons/main_menu/main_menu.gd
@@ -19,7 +19,7 @@ func _ready():
 			]
 		)
 		return false
-
+	
 
 func _on_continue_pressed():
 	pass
@@ -34,13 +34,13 @@ func _on_new_game_pressed():
 
 
 func _on_load_game_pressed():
-	$Panel/main.hide()
+	$Panel/CenterContainer/main.hide()
 	$Panel/load_game.refresh_savegames()
 	$Panel/load_game.show()
 
 
 func _on_options_pressed():
-	$Panel/main.hide()
+	$Panel/CenterContainer/main.hide()
 	$Panel/options.show()
 
 
@@ -53,10 +53,10 @@ func _on_quit_pressed():
 
 func _on_options_back_button_pressed():
 	$Panel/options.hide()
-	$Panel/main.show()
+	$Panel/CenterContainer/main.show()
 
 
 func _on_load_game_back_button_pressed():
 	$Panel/load_game.hide()
-	$Panel/main.show()
+	$Panel/CenterContainer/main.show()
 	
diff --git a/game/ui/commons/main_menu/main_menu.tscn b/game/ui/commons/main_menu/main_menu.tscn
index cf8dbab1..2c1ac807 100644
--- a/game/ui/commons/main_menu/main_menu.tscn
+++ b/game/ui/commons/main_menu/main_menu.tscn
@@ -22,19 +22,46 @@ __meta__ = {
 "_editor_description_": ""
 }
 
-[node name="TextureRect" type="TextureRect" parent="Panel"]
-anchor_left = 0.5
-anchor_right = 0.5
-margin_left = -308.0
-margin_top = 52.0
-margin_right = 308.0
-margin_bottom = 288.0
+[node name="CenterContainer" type="CenterContainer" parent="Panel"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+
+[node name="main" type="VBoxContainer" parent="Panel/CenterContainer"]
+margin_left = 332.0
+margin_top = 150.0
+margin_right = 948.0
+margin_bottom = 749.0
+custom_constants/separation = 100
+
+[node name="TextureRect" type="TextureRect" parent="Panel/CenterContainer/main"]
+margin_right = 616.0
+margin_bottom = 236.0
 texture = ExtResource( 3 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="main" parent="Panel" instance=ExtResource( 2 )]
+[node name="buttons" parent="Panel/CenterContainer/main" instance=ExtResource( 2 )]
+anchor_left = 0.0
+anchor_top = 0.0
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_left = 0.0
+margin_top = 336.0
+margin_right = 616.0
+margin_bottom = 599.0
+
+[node name="new_game" parent="Panel/CenterContainer/main/buttons" index="0"]
+margin_right = 616.0
+
+[node name="load_game" parent="Panel/CenterContainer/main/buttons" index="1"]
+margin_right = 616.0
+
+[node name="options" parent="Panel/CenterContainer/main/buttons" index="2"]
+margin_right = 616.0
+
+[node name="quit" parent="Panel/CenterContainer/main/buttons" index="3"]
+margin_right = 616.0
 
 [node name="options" parent="Panel" instance=ExtResource( 4 )]
 visible = false
@@ -42,11 +69,11 @@ visible = false
 [node name="load_game" parent="Panel" instance=ExtResource( 5 )]
 visible = false
 
-[connection signal="pressed" from="Panel/main/new_game" to="." method="_on_new_game_pressed"]
-[connection signal="pressed" from="Panel/main/load_game" to="." method="_on_load_game_pressed"]
-[connection signal="pressed" from="Panel/main/options" to="." method="_on_options_pressed"]
-[connection signal="pressed" from="Panel/main/quit" to="." method="_on_quit_pressed"]
+[connection signal="pressed" from="Panel/CenterContainer/main/buttons/new_game" to="." method="_on_new_game_pressed"]
+[connection signal="pressed" from="Panel/CenterContainer/main/buttons/load_game" to="." method="_on_load_game_pressed"]
+[connection signal="pressed" from="Panel/CenterContainer/main/buttons/options" to="." method="_on_options_pressed"]
+[connection signal="pressed" from="Panel/CenterContainer/main/buttons/quit" to="." method="_on_quit_pressed"]
 [connection signal="back_button_pressed" from="Panel/options" to="." method="_on_options_back_button_pressed"]
 [connection signal="back_button_pressed" from="Panel/load_game" to="." method="_on_load_game_back_button_pressed"]
 
-[editable path="Panel/main"]
+[editable path="Panel/CenterContainer/main/buttons"]
diff --git a/game/ui/commons/options/flags/de.png b/game/ui/commons/options/flags/de.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fe98a8943edc5098b18521a8397ad18883f89f5
GIT binary patch
literal 2245
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

literal 0
HcmV?d00001

diff --git a/game/ui/commons/main_menu/flags/en_EN_small.png b/game/ui/commons/options/flags/en.png
similarity index 100%
rename from game/ui/commons/main_menu/flags/en_EN_small.png
rename to game/ui/commons/options/flags/en.png
diff --git a/game/ui/commons/main_menu/flags/fr_FR_small.png b/game/ui/commons/options/flags/fr.png
similarity index 100%
rename from game/ui/commons/main_menu/flags/fr_FR_small.png
rename to game/ui/commons/options/flags/fr.png
diff --git a/game/ui/commons/options/options.gd b/game/ui/commons/options/options.gd
index 41d2fc62..9ee8b654 100644
--- a/game/ui/commons/options/options.gd
+++ b/game/ui/commons/options/options.gd
@@ -6,6 +6,29 @@ onready var settings_changed = false
 var backup_settings
 
 
+# A list of languages already added to the language selection
+var _loaded_languages: Array = []
+
+
+func _ready() -> void:
+	var _flags_container: HBoxContainer = \
+			$CenterContainer/VBoxContainer/MarginContainer/options/flags
+	for child in _flags_container.get_children():
+		_flags_container.remove_child(child)
+		
+	_loaded_languages = []
+	
+	for lang in TranslationServer.get_loaded_locales():
+		if not lang in _loaded_languages:
+			_loaded_languages.append(lang)
+			var _lang = TextureRect.new()
+			_lang.texture = load(
+				"res://game/ui/commons/options/flags/%s.png" % lang
+			)
+			_flags_container.add_child(_lang)
+			_lang.connect("gui_input", self, "_on_language_input", [lang])
+
+
 func show():
 	backup_settings = escoria.settings.duplicate()
 	initialize_options(escoria.settings)
@@ -13,13 +36,10 @@ func show():
 
 
 func initialize_options(p_settings):
-	$options/general_volume.value = p_settings["master_volume"]
-	$options/sound_volume.value = p_settings["sfx_volume"]
-	$options/music_volume.value = p_settings["music_volume"]
-
-
-func greyout_other_languages(_except_lang: String) -> void:
-	pass
+	var _options = $CenterContainer/VBoxContainer/MarginContainer/options
+	_options.get_node("general_volume").value = p_settings["master_volume"]
+	_options.get_node("sound_volume").value = p_settings["sfx_volume"]
+	_options.get_node("music_volume").value = p_settings["music_volume"]
 
 
 func _on_language_input(event: InputEvent, language: String):
diff --git a/game/ui/commons/options/options.tscn b/game/ui/commons/options/options.tscn
index 612a9bd7..6e9432f8 100644
--- a/game/ui/commons/options/options.tscn
+++ b/game/ui/commons/options/options.tscn
@@ -1,8 +1,6 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=1]
-[ext_resource path="res://game/ui/commons/main_menu/flags/en_EN_small.png" type="Texture" id=2]
-[ext_resource path="res://game/ui/commons/main_menu/flags/fr_FR_small.png" type="Texture" id=3]
 [ext_resource path="res://game/ui/commons/options/options.gd" type="Script" id=4]
 
 [node name="options" type="Control"]
@@ -13,133 +11,139 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="back" type="Button" parent="."]
-margin_left = 130.0
-margin_top = 329.0
-margin_right = 304.0
-margin_bottom = 383.0
-custom_fonts/font = ExtResource( 1 )
-text = "OPTIONS_BACK"
+[node name="CenterContainer" type="CenterContainer" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+
+[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"]
+margin_left = 482.0
+margin_top = 366.0
+margin_right = 798.0
+margin_bottom = 533.0
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="options" type="GridContainer" parent="."]
-anchor_left = 0.5
-anchor_top = 0.5
-anchor_right = 0.5
-anchor_bottom = 0.5
-margin_left = -275.5
-margin_top = -75.0
-margin_right = 275.5
-margin_bottom = 75.0
+[node name="MarginContainer" type="MarginContainer" parent="CenterContainer/VBoxContainer"]
+margin_right = 316.0
+margin_bottom = 136.0
+size_flags_vertical = 6
+custom_constants/margin_right = 20
+custom_constants/margin_top = 20
+custom_constants/margin_left = 20
+custom_constants/margin_bottom = 20
+
+[node name="options" type="GridContainer" parent="CenterContainer/VBoxContainer/MarginContainer"]
+margin_left = 20.0
+margin_top = 20.0
+margin_right = 296.0
+margin_bottom = 116.0
+size_flags_vertical = 6
 custom_constants/hseparation = 40
 columns = 2
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="label" type="Label" parent="options"]
-margin_top = 27.0
+[node name="label" type="Label" parent="CenterContainer/VBoxContainer/MarginContainer/options"]
 margin_right = 220.0
-margin_bottom = 48.0
+margin_bottom = 21.0
 custom_fonts/font = ExtResource( 1 )
 text = "OPTIONS_LANGUAGE"
 
-[node name="flags" type="HBoxContainer" parent="options"]
+[node name="flags" type="HBoxContainer" parent="CenterContainer/VBoxContainer/MarginContainer/options"]
 margin_left = 260.0
-margin_right = 553.0
-margin_bottom = 75.0
+margin_right = 276.0
+margin_bottom = 21.0
 size_flags_vertical = 3
 custom_constants/separation = 30
 alignment = 1
 
-[node name="fr" type="TextureRect" parent="options/flags"]
-margin_right = 113.0
-margin_bottom = 75.0
-texture = ExtResource( 3 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="en" type="TextureRect" parent="options/flags"]
-margin_left = 143.0
-margin_right = 293.0
-margin_bottom = 75.0
-texture = ExtResource( 2 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="label2" type="Label" parent="options"]
-margin_top = 79.0
+[node name="label2" type="Label" parent="CenterContainer/VBoxContainer/MarginContainer/options"]
+margin_top = 25.0
 margin_right = 220.0
-margin_bottom = 100.0
+margin_bottom = 46.0
 custom_fonts/font = ExtResource( 1 )
 text = "GENERAL_VOLUME"
 
-[node name="general_volume" type="HSlider" parent="options"]
+[node name="general_volume" type="HSlider" parent="CenterContainer/VBoxContainer/MarginContainer/options"]
 margin_left = 260.0
-margin_top = 79.0
-margin_right = 553.0
-margin_bottom = 95.0
+margin_top = 25.0
+margin_right = 276.0
+margin_bottom = 41.0
 size_flags_horizontal = 3
 min_value = 0.001
 max_value = 1.0
 step = 0.001
 value = 0.001
 
-[node name="label3" type="Label" parent="options"]
-margin_top = 104.0
+[node name="label3" type="Label" parent="CenterContainer/VBoxContainer/MarginContainer/options"]
+margin_top = 50.0
 margin_right = 220.0
-margin_bottom = 125.0
+margin_bottom = 71.0
 custom_fonts/font = ExtResource( 1 )
 text = "SOUND_VOLUME"
 
-[node name="sound_volume" type="HSlider" parent="options"]
+[node name="sound_volume" type="HSlider" parent="CenterContainer/VBoxContainer/MarginContainer/options"]
 margin_left = 260.0
-margin_top = 104.0
-margin_right = 553.0
-margin_bottom = 120.0
+margin_top = 50.0
+margin_right = 276.0
+margin_bottom = 66.0
 size_flags_horizontal = 3
 min_value = 0.001
 max_value = 1.0
 step = 0.001
 value = 0.001
 
-[node name="label4" type="Label" parent="options"]
-margin_top = 129.0
+[node name="label4" type="Label" parent="CenterContainer/VBoxContainer/MarginContainer/options"]
+margin_top = 75.0
 margin_right = 220.0
-margin_bottom = 150.0
+margin_bottom = 96.0
 custom_fonts/font = ExtResource( 1 )
 text = "MUSIC_VOLUME"
 
-[node name="music_volume" type="HSlider" parent="options"]
+[node name="music_volume" type="HSlider" parent="CenterContainer/VBoxContainer/MarginContainer/options"]
 margin_left = 260.0
-margin_top = 129.0
-margin_right = 553.0
-margin_bottom = 145.0
+margin_top = 75.0
+margin_right = 276.0
+margin_bottom = 91.0
 size_flags_horizontal = 3
 min_value = 0.001
 max_value = 1.0
 step = 0.001
 value = 0.001
 
-[node name="apply" type="Button" parent="."]
-margin_left = 364.0
-margin_top = 712.0
-margin_right = 544.0
-margin_bottom = 767.0
+[node name="HBoxContainer" type="HBoxContainer" parent="CenterContainer/VBoxContainer"]
+margin_top = 140.0
+margin_right = 316.0
+margin_bottom = 167.0
+custom_constants/separation = 20
+alignment = 1
+
+[node name="back" type="Button" parent="CenterContainer/VBoxContainer/HBoxContainer"]
+margin_left = 22.0
+margin_right = 196.0
+margin_bottom = 27.0
+custom_fonts/font = ExtResource( 1 )
+text = "OPTIONS_BACK"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="apply" type="Button" parent="CenterContainer/VBoxContainer/HBoxContainer"]
+margin_left = 216.0
+margin_right = 293.0
+margin_bottom = 27.0
 custom_fonts/font = ExtResource( 1 )
 text = "APPLY"
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[connection signal="pressed" from="back" to="." method="_on_back_pressed"]
-[connection signal="gui_input" from="options/flags/fr" to="." method="_on_language_input" binds= [ "fr" ]]
-[connection signal="gui_input" from="options/flags/en" to="." method="_on_language_input" binds= [ "en" ]]
-[connection signal="value_changed" from="options/general_volume" to="." method="_on_general_volume_changed"]
-[connection signal="value_changed" from="options/sound_volume" to="." method="_on_sound_volume_changed"]
-[connection signal="value_changed" from="options/music_volume" to="." method="_on_music_volume_changed"]
-[connection signal="pressed" from="apply" to="." method="_on_apply_pressed"]
+[connection signal="value_changed" from="CenterContainer/VBoxContainer/MarginContainer/options/general_volume" to="." method="_on_general_volume_changed"]
+[connection signal="value_changed" from="CenterContainer/VBoxContainer/MarginContainer/options/sound_volume" to="." method="_on_sound_volume_changed"]
+[connection signal="value_changed" from="CenterContainer/VBoxContainer/MarginContainer/options/music_volume" to="." method="_on_music_volume_changed"]
+[connection signal="pressed" from="CenterContainer/VBoxContainer/HBoxContainer/back" to="." method="_on_back_pressed"]
+[connection signal="pressed" from="CenterContainer/VBoxContainer/HBoxContainer/apply" to="." method="_on_apply_pressed"]
diff --git a/game/ui/commons/pause_menu/pause_menu.gd b/game/ui/commons/pause_menu/pause_menu.gd
index 274fb60b..e228a6a5 100644
--- a/game/ui/commons/pause_menu/pause_menu.gd
+++ b/game/ui/commons/pause_menu/pause_menu.gd
@@ -11,12 +11,12 @@ func _on_continue_pressed():
 
 
 func _on_save_game_pressed():
-	$Panel/VBoxContainer.hide()
+	$Panel/CenterContainer/VBoxContainer.hide()
 	$save_game.show()
 
 
 func _on_load_game_pressed():
-	$Panel/VBoxContainer.hide()
+	$Panel/CenterContainer/VBoxContainer.hide()
 	$load_game.refresh_savegames()
 	$load_game.show()
 
@@ -26,10 +26,10 @@ func _on_quit_pressed():
 
 
 func _on_save_game_back_button_pressed():
-	$Panel/VBoxContainer.show()
+	$Panel/CenterContainer/VBoxContainer.show()
 	$save_game.hide()
 
 
 func _on_load_game_back_button_pressed():
-	$Panel/VBoxContainer.show()
+	$Panel/CenterContainer/VBoxContainer.show()
 	$load_game.hide()
diff --git a/game/ui/commons/pause_menu/pause_menu.tscn b/game/ui/commons/pause_menu/pause_menu.tscn
index 64e6ff03..98bc3e0f 100644
--- a/game/ui/commons/pause_menu/pause_menu.tscn
+++ b/game/ui/commons/pause_menu/pause_menu.tscn
@@ -21,70 +21,77 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="TextureRect" type="TextureRect" parent="Panel"]
-anchor_left = 0.5
-anchor_right = 0.5
-margin_left = -308.0
-margin_right = 308.0
+[node name="CenterContainer" type="CenterContainer" parent="Panel"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="VBoxContainer" type="VBoxContainer" parent="Panel/CenterContainer"]
+margin_left = 332.0
+margin_top = 151.0
+margin_right = 948.0
+margin_bottom = 748.0
+custom_constants/separation = 100
+
+[node name="TextureRect" type="TextureRect" parent="Panel/CenterContainer/VBoxContainer"]
+margin_right = 616.0
 margin_bottom = 236.0
 texture = ExtResource( 3 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="VBoxContainer" type="VBoxContainer" parent="Panel"]
-anchor_left = 0.5
-anchor_top = 0.5
-anchor_right = 0.5
-anchor_bottom = 0.5
-margin_left = -127.8
-margin_top = -80.62
-margin_right = 127.8
-margin_bottom = 80.62
+[node name="menuitems" type="VBoxContainer" parent="Panel/CenterContainer/VBoxContainer"]
+margin_top = 336.0
+margin_right = 616.0
+margin_bottom = 597.0
 custom_constants/separation = 10
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="continue" type="Button" parent="Panel/VBoxContainer"]
-margin_right = 255.0
-margin_bottom = 32.0
+[node name="continue" type="Button" parent="Panel/CenterContainer/VBoxContainer/menuitems"]
+margin_right = 616.0
+margin_bottom = 150.0
+rect_min_size = Vector2( 0, 150 )
 size_flags_vertical = 3
 custom_fonts/font = ExtResource( 2 )
-text = "Continue"
+text = "CONTINUE_GAME"
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="save_game" type="Button" parent="Panel/VBoxContainer"]
-margin_top = 42.0
-margin_right = 255.0
-margin_bottom = 75.0
+[node name="save_game" type="Button" parent="Panel/CenterContainer/VBoxContainer/menuitems"]
+margin_top = 160.0
+margin_right = 616.0
+margin_bottom = 187.0
 size_flags_vertical = 3
 custom_fonts/font = ExtResource( 2 )
-text = "Save game"
+text = "SAVE_GAME"
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="load_game" type="Button" parent="Panel/VBoxContainer"]
-margin_top = 85.0
-margin_right = 255.0
-margin_bottom = 118.0
+[node name="load_game" type="Button" parent="Panel/CenterContainer/VBoxContainer/menuitems"]
+margin_top = 197.0
+margin_right = 616.0
+margin_bottom = 224.0
 size_flags_vertical = 3
 custom_fonts/font = ExtResource( 2 )
-text = "Load game"
+text = "LOAD_GAME"
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="quit" type="Button" parent="Panel/VBoxContainer"]
-margin_top = 128.0
-margin_right = 255.0
-margin_bottom = 161.0
+[node name="quit" type="Button" parent="Panel/CenterContainer/VBoxContainer/menuitems"]
+margin_top = 234.0
+margin_right = 616.0
+margin_bottom = 261.0
 size_flags_vertical = 3
 custom_fonts/font = ExtResource( 2 )
-text = "Quit"
+text = "QUIT"
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -95,9 +102,9 @@ visible = false
 [node name="load_game" parent="." instance=ExtResource( 5 )]
 visible = false
 
-[connection signal="pressed" from="Panel/VBoxContainer/continue" to="." method="_on_continue_pressed"]
-[connection signal="pressed" from="Panel/VBoxContainer/save_game" to="." method="_on_save_game_pressed"]
-[connection signal="pressed" from="Panel/VBoxContainer/load_game" to="." method="_on_load_game_pressed"]
-[connection signal="pressed" from="Panel/VBoxContainer/quit" to="." method="_on_quit_pressed"]
+[connection signal="pressed" from="Panel/CenterContainer/VBoxContainer/menuitems/continue" to="." method="_on_continue_pressed"]
+[connection signal="pressed" from="Panel/CenterContainer/VBoxContainer/menuitems/save_game" to="." method="_on_save_game_pressed"]
+[connection signal="pressed" from="Panel/CenterContainer/VBoxContainer/menuitems/load_game" to="." method="_on_load_game_pressed"]
+[connection signal="pressed" from="Panel/CenterContainer/VBoxContainer/menuitems/quit" to="." method="_on_quit_pressed"]
 [connection signal="back_button_pressed" from="save_game" to="." method="_on_save_game_back_button_pressed"]
 [connection signal="back_button_pressed" from="load_game" to="." method="_on_load_game_back_button_pressed"]
diff --git a/game/ui/commons/save/save_game.gd b/game/ui/commons/save/save_game.gd
index 6791bcb7..bd5fe210 100644
--- a/game/ui/commons/save/save_game.gd
+++ b/game/ui/commons/save/save_game.gd
@@ -19,14 +19,15 @@ func _on_slot_pressed(p_slot_n: int):
 
 
 func refresh_savegames():
-	for slot in $ScrollContainer/slots.get_children():
-		$ScrollContainer/slots.remove_child(slot)
+	var _slots = $CenterContainer/VBoxContainer/ScrollContainer/slots
+	for slot in _slots.get_children():
+		_slots.remove_child(slot)
 	
 	var saves_list = escoria.save_manager.get_saves_list()
 	for i in saves_list.size():
 		var save_data = saves_list[i+1]
 		var new_slot = slot_ui_scene.instance()
-		$ScrollContainer/slots.add_child(new_slot)
+		_slots.add_child(new_slot)
 		new_slot.set_slot_name_date(save_data["name"], save_data["date"])
 		new_slot.connect("pressed", self, "_on_slot_pressed", [i+1])
 	
@@ -39,7 +40,7 @@ func refresh_savegames():
 		datetime["minute"],
 	]
 	var new_slot = slot_ui_scene.instance()
-	$ScrollContainer/slots.add_child(new_slot)
+	_slots.add_child(new_slot)
 	new_slot.set_slot_name_date(tr("New save"), datetime_string)
 	new_slot.connect("pressed", self, "_on_slot_pressed", [saves_list.size()+1])
 		
diff --git a/game/ui/commons/save/save_game.tscn b/game/ui/commons/save/save_game.tscn
index 784e56ea..ace5a45f 100644
--- a/game/ui/commons/save/save_game.tscn
+++ b/game/ui/commons/save/save_game.tscn
@@ -15,44 +15,51 @@ __meta__ = {
 }
 slot_ui_scene = ExtResource( 1 )
 
-[node name="back" type="Button" parent="."]
-margin_left = 130.0
-margin_top = 329.0
-margin_right = 304.0
-margin_bottom = 383.0
-custom_fonts/font = ExtResource( 3 )
-text = "OPTIONS_BACK"
+[node name="save_name_popup" parent="." instance=ExtResource( 4 )]
+
+[node name="overwrite_confirm_popup" parent="." instance=ExtResource( 5 )]
+
+[node name="CenterContainer" type="CenterContainer" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="ScrollContainer" type="ScrollContainer" parent="."]
-anchor_left = 0.284
-anchor_top = 0.367
-anchor_right = 0.709
-anchor_bottom = 0.94
-margin_left = 8.47998
-margin_top = 0.699982
-margin_right = 0.479919
-margin_bottom = -6.10352e-05
+[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"]
+margin_left = 390.0
+margin_top = 184.0
+margin_right = 890.0
+margin_bottom = 715.0
+
+[node name="ScrollContainer" type="ScrollContainer" parent="CenterContainer/VBoxContainer"]
+margin_right = 500.0
+margin_bottom = 500.0
+rect_min_size = Vector2( 500, 500 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="slots" type="VBoxContainer" parent="ScrollContainer"]
-margin_right = 536.0
-margin_bottom = 515.0
+[node name="slots" type="VBoxContainer" parent="CenterContainer/VBoxContainer/ScrollContainer"]
+margin_right = 500.0
+margin_bottom = 500.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="save_name_popup" parent="." instance=ExtResource( 4 )]
+[node name="back" type="Button" parent="CenterContainer/VBoxContainer"]
+margin_top = 504.0
+margin_right = 500.0
+margin_bottom = 531.0
+custom_fonts/font = ExtResource( 3 )
+text = "OPTIONS_BACK"
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
-[node name="overwrite_confirm_popup" parent="." instance=ExtResource( 5 )]
-
-[connection signal="pressed" from="back" to="." method="_on_back_pressed"]
 [connection signal="savegame_cancel" from="save_name_popup" to="." method="_on_save_name_popup_savegame_cancel"]
 [connection signal="savegame_name_ok" from="save_name_popup" to="." method="_on_save_name_popup_savegame_name_ok"]
 [connection signal="confirm_yes" from="overwrite_confirm_popup" to="." method="_on_overwrite_confirm_popup_confirm_yes"]
+[connection signal="pressed" from="CenterContainer/VBoxContainer/back" to="." method="_on_back_pressed"]
diff --git a/project.godot b/project.godot
index f8c3ca2a..4de6c9ce 100644
--- a/project.godot
+++ b/project.godot
@@ -584,7 +584,7 @@ _global_script_class_icons={
 
 [application]
 
-config/name="Escoria-reloaded"
+config/name="Escoria"
 run/main_scene="res://addons/escoria-core/game/main_scene.tscn"
 boot_splash/image="res://addons/escoria-core/logo/escoria-logo-small.png"
 boot_splash/fullsize=false
@@ -659,7 +659,8 @@ switch_action_verb={
 
 [locale]
 
-translations=PoolStringArray( "res://game/translations/game.en.translation", "res://game/translations/game.fr.translation", "res://game/translations/main_menu.en.translation", "res://game/translations/main_menu.fr.translation" )
+translations=PoolStringArray( "res://game/translations/game.en.translation", "res://game/translations/game.fr.translation", "res://game/translations/main_menu.en.translation", "res://game/translations/main_menu.fr.translation", "res://game/translations/game.de.translation", "res://game/translations/main_menu.de.translation" )
+locale_filter=[ 0, [  ] ]
 
 [network]