From d974d3f76a569440bc07155d47de38829c163b34 Mon Sep 17 00:00:00 2001
From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
Date: Wed, 25 Mar 2020 04:42:03 +0200
Subject: [PATCH] Implemented Esperanto

---
 Prefabs/Dialogs/PreferencesDialog.tscn | 129 +++++++++++++------------
 Scripts/Dialogs/AboutDialog.gd         |   1 +
 Scripts/Main.gd                        |   2 +-
 Translations/Translations.pot          |   3 +
 project.godot                          |   2 +-
 5 files changed, 74 insertions(+), 63 deletions(-)

diff --git a/Prefabs/Dialogs/PreferencesDialog.tscn b/Prefabs/Dialogs/PreferencesDialog.tscn
index f5b0560..9e97aa7 100644
--- a/Prefabs/Dialogs/PreferencesDialog.tscn
+++ b/Prefabs/Dialogs/PreferencesDialog.tscn
@@ -41,23 +41,23 @@ size_flags_horizontal = 3
 
 [node name="VBoxContainer" type="VBoxContainer" parent="HSplitContainer/ScrollContainer"]
 margin_right = 205.0
-margin_bottom = 876.0
+margin_bottom = 904.0
 size_flags_horizontal = 3
 
 [node name="General" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"]
-margin_right = 334.0
-margin_bottom = 66.0
+margin_right = 205.0
+margin_bottom = 56.0
 
 [node name="General Options" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/General"]
-margin_right = 334.0
-margin_bottom = 14.0
+margin_right = 205.0
+margin_bottom = 28.0
 rect_min_size = Vector2( 0, 28 )
 text = "General Options"
 
 [node name="SmoothZoom" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/General"]
-margin_top = 18.0
-margin_right = 334.0
-margin_bottom = 42.0
+margin_top = 32.0
+margin_right = 205.0
+margin_bottom = 56.0
 mouse_default_cursor_shape = 2
 pressed = true
 text = "Smooth Zoom"
@@ -83,19 +83,19 @@ items = [ "None", null, false, 0, null, "Affect Brush's Alpha", null, false, 1,
 selected = 1
 
 [node name="Languages" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"]
-margin_top = 70.0
-margin_right = 334.0
-margin_bottom = 438.0
+margin_top = 60.0
+margin_right = 205.0
+margin_bottom = 484.0
 
 [node name="Language Options" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"]
-margin_right = 334.0
+margin_right = 205.0
 margin_bottom = 28.0
 rect_min_size = Vector2( 0, 28 )
 text = "Language options"
 
 [node name="System Language" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"]
 margin_top = 32.0
-margin_right = 334.0
+margin_right = 205.0
 margin_bottom = 56.0
 mouse_default_cursor_shape = 2
 pressed = true
@@ -103,14 +103,14 @@ text = "System Language"
 
 [node name="German" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"]
 margin_top = 60.0
-margin_right = 334.0
+margin_right = 205.0
 margin_bottom = 84.0
 mouse_default_cursor_shape = 2
 text = "Deutsch [de]"
 
 [node name="Greek" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"]
 margin_top = 88.0
-margin_right = 334.0
+margin_right = 205.0
 margin_bottom = 112.0
 mouse_default_cursor_shape = 2
 custom_fonts/font = ExtResource( 2 )
@@ -118,136 +118,143 @@ text = "Ελληνικά [el]"
 
 [node name="English" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"]
 margin_top = 116.0
-margin_right = 334.0
+margin_right = 205.0
 margin_bottom = 140.0
 mouse_default_cursor_shape = 2
 text = "English [en]"
 
-[node name="Spanish" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"]
+[node name="Esperanto" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"]
 margin_top = 144.0
-margin_right = 334.0
+margin_right = 205.0
 margin_bottom = 168.0
 mouse_default_cursor_shape = 2
+text = "Esperanto [eo]"
+
+[node name="Spanish" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"]
+margin_top = 172.0
+margin_right = 205.0
+margin_bottom = 196.0
+mouse_default_cursor_shape = 2
 text = "Español [es]"
 
 [node name="French" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"]
-margin_top = 172.0
-margin_right = 334.0
-margin_bottom = 196.0
+margin_top = 200.0
+margin_right = 205.0
+margin_bottom = 224.0
 mouse_default_cursor_shape = 2
 text = "Français [fr]"
 
 [node name="Italian" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"]
-margin_top = 200.0
-margin_right = 334.0
-margin_bottom = 224.0
+margin_top = 228.0
+margin_right = 205.0
+margin_bottom = 252.0
 mouse_default_cursor_shape = 2
 text = "Italiano [it]"
 
 [node name="Latvian" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"]
-margin_top = 200.0
-margin_right = 334.0
-margin_bottom = 224.0
+margin_top = 256.0
+margin_right = 205.0
+margin_bottom = 280.0
 mouse_default_cursor_shape = 2
 text = "Latvian [lv]"
 
 [node name="Polish" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"]
-margin_top = 228.0
-margin_right = 334.0
-margin_bottom = 252.0
+margin_top = 284.0
+margin_right = 205.0
+margin_bottom = 308.0
 mouse_default_cursor_shape = 2
 text = "Polski [pl]"
 
 [node name="Brazilian Portuguese" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"]
-margin_top = 256.0
-margin_right = 334.0
-margin_bottom = 280.0
+margin_top = 312.0
+margin_right = 205.0
+margin_bottom = 336.0
 mouse_default_cursor_shape = 2
 text = "Português Brasileiro [pt_BR]"
 
 [node name="Russian" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"]
-margin_top = 284.0
-margin_right = 334.0
-margin_bottom = 308.0
+margin_top = 340.0
+margin_right = 205.0
+margin_bottom = 364.0
 mouse_default_cursor_shape = 2
 text = "Русский [ru]"
 
 [node name="Chinese Simplified" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"]
-margin_top = 312.0
-margin_right = 334.0
-margin_bottom = 338.0
+margin_top = 368.0
+margin_right = 205.0
+margin_bottom = 394.0
 mouse_default_cursor_shape = 2
 custom_fonts/font = ExtResource( 3 )
 text = "简体中文 [zh_CN]"
 
 [node name="Chinese Traditional" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Languages"]
-margin_top = 342.0
-margin_right = 334.0
-margin_bottom = 368.0
+margin_top = 398.0
+margin_right = 205.0
+margin_bottom = 424.0
 mouse_default_cursor_shape = 2
 custom_fonts/font = ExtResource( 3 )
 text = "繁體中文 [zh_TW]"
 
 [node name="Themes" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"]
-margin_top = 442.0
-margin_right = 334.0
-margin_bottom = 610.0
+margin_top = 488.0
+margin_right = 205.0
+margin_bottom = 656.0
 
 [node name="Theme Options" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes"]
-margin_right = 334.0
+margin_right = 205.0
 margin_bottom = 28.0
 rect_min_size = Vector2( 0, 28 )
 text = "Theme options"
 
 [node name="Dark Theme" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes"]
 margin_top = 32.0
-margin_right = 334.0
+margin_right = 205.0
 margin_bottom = 56.0
 mouse_default_cursor_shape = 2
 text = "Dark"
 
 [node name="Gray Theme" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes"]
 margin_top = 60.0
-margin_right = 334.0
+margin_right = 205.0
 margin_bottom = 84.0
 mouse_default_cursor_shape = 2
 text = "Gray"
 
 [node name="Godot\'s Theme" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes"]
 margin_top = 88.0
-margin_right = 334.0
+margin_right = 205.0
 margin_bottom = 112.0
 mouse_default_cursor_shape = 2
 text = "Godot"
 
 [node name="Gold Theme" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes"]
 margin_top = 116.0
-margin_right = 334.0
+margin_right = 205.0
 margin_bottom = 140.0
 mouse_default_cursor_shape = 2
 text = "Gold"
 
 [node name="Light Theme" type="CheckBox" parent="HSplitContainer/ScrollContainer/VBoxContainer/Themes"]
 margin_top = 144.0
-margin_right = 334.0
+margin_right = 205.0
 margin_bottom = 168.0
 mouse_default_cursor_shape = 2
 text = "Light"
 
 [node name="Grid&Guides" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"]
-margin_top = 614.0
-margin_right = 334.0
-margin_bottom = 746.0
+margin_top = 660.0
+margin_right = 205.0
+margin_bottom = 792.0
 
 [node name="GridOptionsLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides"]
-margin_right = 334.0
+margin_right = 205.0
 margin_bottom = 28.0
 rect_min_size = Vector2( 0, 28 )
 text = "Grid options"
 
 [node name="GridOptions" type="GridContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Grid&Guides"]
 margin_top = 32.0
-margin_right = 334.0
+margin_right = 205.0
 margin_bottom = 132.0
 custom_constants/vseparation = 4
 custom_constants/hseparation = 4
@@ -316,19 +323,19 @@ mouse_default_cursor_shape = 2
 color = Color( 0.63, 0.13, 0.94, 1 )
 
 [node name="Image" type="VBoxContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer"]
-margin_top = 750.0
-margin_right = 334.0
-margin_bottom = 858.0
+margin_top = 796.0
+margin_right = 205.0
+margin_bottom = 904.0
 
 [node name="ImageOptionsLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Image"]
-margin_right = 334.0
+margin_right = 205.0
 margin_bottom = 28.0
 rect_min_size = Vector2( 0, 28 )
 text = "Image Options"
 
 [node name="ImageOptions" type="GridContainer" parent="HSplitContainer/ScrollContainer/VBoxContainer/Image"]
 margin_top = 32.0
-margin_right = 334.0
+margin_right = 205.0
 margin_bottom = 108.0
 custom_constants/vseparation = 4
 custom_constants/hseparation = 4
diff --git a/Scripts/Dialogs/AboutDialog.gd b/Scripts/Dialogs/AboutDialog.gd
index 8cff0c5..229c3fd 100644
--- a/Scripts/Dialogs/AboutDialog.gd
+++ b/Scripts/Dialogs/AboutDialog.gd
@@ -78,6 +78,7 @@ func _on_AboutDialog_about_to_show() -> void:
 	translators.create_item(translators_root).set_text(0, "  azagaya - " + tr("Spanish"))
 	translators.create_item(translators_root).set_text(0, "  Lilly And (KatieAnd) - " + tr("Spanish"))
 	translators.create_item(translators_root).set_text(0, "  Agnis Aldiņš (NeZvers) - " + tr("Latvian"))
+	translators.create_item(translators_root).set_text(0, "  Teashrock - " + tr("Esperanto"))
 
 func _on_AboutDialog_popup_hide() -> void:
 	groups.clear()
diff --git a/Scripts/Main.gd b/Scripts/Main.gd
index eff0c1b..890ac39 100644
--- a/Scripts/Main.gd
+++ b/Scripts/Main.gd
@@ -23,7 +23,7 @@ func _ready() -> void:
 		Global.loaded_locales = TranslationServer.get_loaded_locales()
 	else:
 		# Hardcoded list of locales
-		Global.loaded_locales = ["de_DE", "el_GR", "en_US", "es_ES", "fr_FR", "it_IT", "lv_LV", "pl_PL", "pt_BR", "ru_RU", "zh_CN","zh_TW"]
+		Global.loaded_locales = ["de_DE", "el_GR", "en_US", "eo_UY", "es_ES", "fr_FR", "it_IT", "lv_LV", "pl_PL", "pt_BR", "ru_RU", "zh_CN","zh_TW"]
 
 	# Make sure locales are always sorted, in the same order
 	Global.loaded_locales.sort()
diff --git a/Translations/Translations.pot b/Translations/Translations.pot
index a1a2715..5d25b5f 100644
--- a/Translations/Translations.pot
+++ b/Translations/Translations.pot
@@ -377,6 +377,9 @@ msgstr ""
 msgid "Spanish"
 msgstr ""
 
+msgid "Esperanto"
+msgstr ""
+
 msgid "Development Team"
 msgstr ""
 
diff --git a/project.godot b/project.godot
index ec39981..7177164 100644
--- a/project.godot
+++ b/project.godot
@@ -224,7 +224,7 @@ space={
 
 [locale]
 
-translations=PoolStringArray( "res://Translations/zh_TW.po", "res://Translations/pt_BR.po", "res://Translations/de_DE.po", "res://Translations/el_GR.po", "res://Translations/en_US.po", "res://Translations/fr_FR.po", "res://Translations/it_IT.po", "res://Translations/pl_PL.po", "res://Translations/ru_RU.po", "res://Translations/es_ES.po", "res://Translations/zh_CN.po", "res://Translations/lv_LV.po" )
+translations=PoolStringArray( "res://Translations/zh_TW.po", "res://Translations/pt_BR.po", "res://Translations/de_DE.po", "res://Translations/el_GR.po", "res://Translations/en_US.po", "res://Translations/fr_FR.po", "res://Translations/it_IT.po", "res://Translations/pl_PL.po", "res://Translations/ru_RU.po", "res://Translations/es_ES.po", "res://Translations/zh_CN.po", "res://Translations/lv_LV.po", "res://Translations/eo_UY.po" )
 locale_filter=[ 0, [  ] ]
 
 [rendering]