diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -908,36 +908,6 @@ STR_GAME_OPTIONS_CURRENCY_CUSTOM        
 STR_GAME_OPTIONS_CURRENCY_GEL                                   :Kartvela Lario (GEL)
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Irana Rialo (IRR)
 
-###length 2
-STR_CONFIG_SETTING_ROAD_SIDE_LEFT                               :Veturu maldekstre
-STR_CONFIG_SETTING_ROAD_SIDE_RIGHT                              :Veturu dekstre
-
-STR_MAPGEN_TOWN_NAME_LABEL                                      :{BLACK}Urbonomoj
-STR_MAPGEN_TOWN_NAME_DROPDOWN_TOOLTIP                           :{BLACK}Elektu stilon de urbonomoj
-
-###length 21
-STR_MAPGEN_TOWN_NAME_ORIGINAL_ENGLISH                           :Angle (Originale)
-STR_MAPGEN_TOWN_NAME_FRENCH                                     :France
-STR_MAPGEN_TOWN_NAME_GERMAN                                     :Germane
-STR_MAPGEN_TOWN_NAME_ADDITIONAL_ENGLISH                         :Angle (Aldone)
-STR_MAPGEN_TOWN_NAME_LATIN_AMERICAN                             :Latin-Amerike
-STR_MAPGEN_TOWN_NAME_SILLY                                      :Angle (Stulte)
-STR_MAPGEN_TOWN_NAME_SWEDISH                                    :Svede
-STR_MAPGEN_TOWN_NAME_DUTCH                                      :Nederlande
-STR_MAPGEN_TOWN_NAME_FINNISH                                    :Finne
-STR_MAPGEN_TOWN_NAME_POLISH                                     :Pole
-STR_MAPGEN_TOWN_NAME_SLOVAK                                     :Slovake
-STR_MAPGEN_TOWN_NAME_NORWEGIAN                                  :Norvege
-STR_MAPGEN_TOWN_NAME_HUNGARIAN                                  :Hungare
-STR_MAPGEN_TOWN_NAME_AUSTRIAN                                   :Aŭstrie
-STR_MAPGEN_TOWN_NAME_ROMANIAN                                   :Rumane
-STR_MAPGEN_TOWN_NAME_CZECH                                      :Ĉeĥe
-STR_MAPGEN_TOWN_NAME_SWISS                                      :Svise
-STR_MAPGEN_TOWN_NAME_DANISH                                     :Dane
-STR_MAPGEN_TOWN_NAME_TURKISH                                    :Turke
-STR_MAPGEN_TOWN_NAME_ITALIAN                                    :Itale
-STR_MAPGEN_TOWN_NAME_CATALAN                                    :Katalune
-
 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Aŭtomata konservado
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Elektu intervalon inter aŭtomataj konservadoj de la ludo
 
@@ -1011,8 +981,6 @@ STR_CURRENCY_PREVIEW                                            :{LTBLUE}Antaŭvido: {ORANGE}{CURRENCY_LONG}
 STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 pundo (£) en via valuto
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Ŝanĝi parametron por alia monunuo
 
-STR_AI_CONFIG_MAX_COMPETITORS                                   :{LTBLUE}Maksimumo da konkurantoj: {ORANGE}{COMMA}
-
 STR_NONE                                                        :Neniom
 STR_FUNDING_ONLY                                                :Funduso sola
 STR_MINIMAL                                                     :Malgrandeto
@@ -1062,6 +1030,12 @@ STR_SUBSIDY_X2                          
 STR_SUBSIDY_X3                                                  :x3
 STR_SUBSIDY_X4                                                  :x4
 
+###length 4
+STR_CLIMATE_TEMPERATE_LANDSCAPE                                 :Modera landaspekto
+STR_CLIMATE_SUB_ARCTIC_LANDSCAPE                                :Arktikeca landaspekto
+STR_CLIMATE_SUB_TROPICAL_LANDSCAPE                              :Tropikeca landaspekto
+STR_CLIMATE_TOYLAND_LANDSCAPE                                   :Ludolandaspekto
+
 ###length 7
 STR_TERRAIN_TYPE_VERY_FLAT                                      :Tre Ebene
 STR_TERRAIN_TYPE_FLAT                                           :Ebene
@@ -1286,6 +1260,10 @@ STR_CONFIG_SETTING_TREE_PLACER_ORIGINAL 
 STR_CONFIG_SETTING_TREE_PLACER_IMPROVED                         :Plibonigita
 
 
+###length 2
+STR_CONFIG_SETTING_ROAD_SIDE_LEFT                               :Veturu maldekstre
+STR_CONFIG_SETTING_ROAD_SIDE_RIGHT                              :Veturu dekstre
+
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION                           :Altecmapa turniĝo: {STRING}
 ###length 2
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE         :Maldekstrume
@@ -1645,12 +1623,6 @@ STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Ŝanĝu daton: {ORANGE}{DATE_SHORT}
 STR_CHEAT_CHANGE_DATE_QUERY_CAPT                                :{WHITE}Ŝanĝu nunan jaron
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Ebligu ŝanĝi produktvalorojn: {ORANGE}{STRING}
 
-###length 4
-STR_CLIMATE_TEMPERATE_LANDSCAPE                                 :Modera landaspekto
-STR_CLIMATE_SUB_ARCTIC_LANDSCAPE                                :Arktikeca landaspekto
-STR_CLIMATE_SUB_TROPICAL_LANDSCAPE                              :Tropikeca landaspekto
-STR_CLIMATE_TOYLAND_LANDSCAPE                                   :Ludolandaspekto
-
 # Livery window
 
 STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Montru ĝeneralajn kolorskemojn
@@ -2420,6 +2392,8 @@ STR_MAPGEN_MAPSIZE                      
 STR_MAPGEN_MAPSIZE_TOOLTIP                                      :{BLACK}Selektu la grandeco de la mapo en azuleĥoj. La nombro de disponeblaj azuleĥoj estos iom pli malgranda
 STR_MAPGEN_BY                                                   :{BLACK}*
 STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Kiom da urboj:
+STR_MAPGEN_TOWN_NAME_LABEL                                      :{BLACK}Urbonomoj
+STR_MAPGEN_TOWN_NAME_DROPDOWN_TOOLTIP                           :{BLACK}Elektu stilon de urbonomoj
 STR_MAPGEN_DATE                                                 :{BLACK}Dato:
 STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Kiom da industrioj:
 STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Landgenerilo:
@@ -2430,6 +2404,29 @@ STR_MAPGEN_SMOOTHNESS                   
 STR_MAPGEN_VARIETY                                              :{BLACK}Diverseca distribuo:
 STR_MAPGEN_GENERATE                                             :{WHITE}Generu
 
+###length 21
+STR_MAPGEN_TOWN_NAME_ORIGINAL_ENGLISH                           :Angle (Originale)
+STR_MAPGEN_TOWN_NAME_FRENCH                                     :France
+STR_MAPGEN_TOWN_NAME_GERMAN                                     :Germane
+STR_MAPGEN_TOWN_NAME_ADDITIONAL_ENGLISH                         :Angle (Aldone)
+STR_MAPGEN_TOWN_NAME_LATIN_AMERICAN                             :Latin-Amerike
+STR_MAPGEN_TOWN_NAME_SILLY                                      :Angle (Stulte)
+STR_MAPGEN_TOWN_NAME_SWEDISH                                    :Svede
+STR_MAPGEN_TOWN_NAME_DUTCH                                      :Nederlande
+STR_MAPGEN_TOWN_NAME_FINNISH                                    :Finne
+STR_MAPGEN_TOWN_NAME_POLISH                                     :Pole
+STR_MAPGEN_TOWN_NAME_SLOVAK                                     :Slovake
+STR_MAPGEN_TOWN_NAME_NORWEGIAN                                  :Norvege
+STR_MAPGEN_TOWN_NAME_HUNGARIAN                                  :Hungare
+STR_MAPGEN_TOWN_NAME_AUSTRIAN                                   :Aŭstrie
+STR_MAPGEN_TOWN_NAME_ROMANIAN                                   :Rumane
+STR_MAPGEN_TOWN_NAME_CZECH                                      :Ĉeĥe
+STR_MAPGEN_TOWN_NAME_SWISS                                      :Svise
+STR_MAPGEN_TOWN_NAME_DANISH                                     :Dane
+STR_MAPGEN_TOWN_NAME_TURKISH                                    :Turke
+STR_MAPGEN_TOWN_NAME_ITALIAN                                    :Itale
+STR_MAPGEN_TOWN_NAME_CATALAN                                    :Katalune
+
 # Strings for map borders at game generation
 STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Maprandoj:
 STR_MAPGEN_NORTHWEST                                            :{BLACK}Nordokcidenta
@@ -3523,6 +3520,7 @@ STR_AI_CONFIG_CAPTION                   
 STR_AI_CONFIG_HUMAN_PLAYER                                      :Homa ludanto
 STR_AI_CONFIG_RANDOM_AI                                         :Hazarda AI
 STR_AI_CONFIG_NONE                                              :(neniu)
+STR_AI_CONFIG_MAX_COMPETITORS                                   :{LTBLUE}Maksimumo da konkurantoj: {ORANGE}{COMMA}
 
 STR_AI_CONFIG_MOVE_UP                                           :{BLACK}Movi supren
 STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}Movi elektitan AI-on supren en la listo