fixed a problem with the country flag selector, changed a localisation and the format of a file

18 files changed, 19 insertions, 19 deletions

diff --git a/data/languages/bosnian.txt b/data/languages/bosnian.txt
index 075442ec..e7a197fe 100644
--- a/data/languages/bosnian.txt
+++ b/data/languages/bosnian.txt
@@ -618,7 +618,7 @@ Color+
 Constructs game tiles from this layer
 == 
 
-Country flags
+Country
 == 
 
 Crc:
diff --git a/data/languages/czech.txt b/data/languages/czech.txt
index 91f90da2..9bd49704 100644
--- a/data/languages/czech.txt
+++ b/data/languages/czech.txt
@@ -570,7 +570,7 @@ Connection Problems...
 Constructs game tiles from this layer
 == 
 
-Country flags
+Country
 == 
 
 Crc:
diff --git a/data/languages/dutch.txt b/data/languages/dutch.txt
index c77ecbd9..163b6260 100644
--- a/data/languages/dutch.txt
+++ b/data/languages/dutch.txt
@@ -984,7 +984,7 @@ Collision
 Constructs game tiles from this layer
 == 
 
-Country flags
+Country
 == 
 
 Crc:
diff --git a/data/languages/finnish.txt b/data/languages/finnish.txt
index a83d57f6..5cbac3c9 100644
--- a/data/languages/finnish.txt
+++ b/data/languages/finnish.txt
@@ -591,7 +591,7 @@ Color+
 Constructs game tiles from this layer
 == 
 
-Country flags
+Country
 == 
 
 Crc:
diff --git a/data/languages/french.txt b/data/languages/french.txt
index 112f53dc..51f24924 100644
--- a/data/languages/french.txt
+++ b/data/languages/french.txt
@@ -864,7 +864,7 @@ Collision
 Constructs game tiles from this layer
 == 
 
-Country flags
+Country
 == 
 
 Crc:
diff --git a/data/languages/german.txt b/data/languages/german.txt
index e2f58d21..1ea374b2 100644
--- a/data/languages/german.txt
+++ b/data/languages/german.txt
@@ -984,7 +984,7 @@ Collision
 Constructs game tiles from this layer
 == 
 
-Country flags
+Country
 == 
 
 Crc:
diff --git a/data/languages/index.txt b/data/languages/index.txt
index 2f360384..02d46719 100644
--- a/data/languages/index.txt
+++ b/data/languages/index.txt
@@ -43,5 +43,5 @@ spanish
 swedish
 == Svenska
 
-ukrainian

-== Українська

+ukrainian
+== Українська
diff --git a/data/languages/italian.txt b/data/languages/italian.txt
index 115e66aa..b2e3b0eb 100644
--- a/data/languages/italian.txt
+++ b/data/languages/italian.txt
@@ -954,7 +954,7 @@ Collision
 Constructs game tiles from this layer
 == 
 
-Country flags
+Country
 == 
 
 Crc:
diff --git a/data/languages/polish.txt b/data/languages/polish.txt
index d8e42cfe..3e910dac 100644
--- a/data/languages/polish.txt
+++ b/data/languages/polish.txt
@@ -840,7 +840,7 @@ Color
 Constructs game tiles from this layer
 == 
 
-Country flags
+Country
 == 
 
 Crc:
diff --git a/data/languages/portuguese.txt b/data/languages/portuguese.txt
index 5b2dcf32..ab704e09 100644
--- a/data/languages/portuguese.txt
+++ b/data/languages/portuguese.txt
@@ -588,7 +588,7 @@ Color+
 Constructs game tiles from this layer
 == 
 
-Country flags
+Country
 == 
 
 Crc:
diff --git a/data/languages/romanian.txt b/data/languages/romanian.txt
index 4a5555d3..1f1e4d63 100644
--- a/data/languages/romanian.txt
+++ b/data/languages/romanian.txt
@@ -984,7 +984,7 @@ Collision
 Constructs game tiles from this layer
 == 
 
-Country flags
+Country
 == 
 
 Crc:
diff --git a/data/languages/russian.txt b/data/languages/russian.txt
index 672fe891..ccf1b25f 100644
--- a/data/languages/russian.txt
+++ b/data/languages/russian.txt
@@ -852,7 +852,7 @@ Color
 Constructs game tiles from this layer
 == 
 
-Country flags
+Country
 == 
 
 Crc:
diff --git a/data/languages/serbian.txt b/data/languages/serbian.txt
index 95f16295..f4ec0c7e 100644
--- a/data/languages/serbian.txt
+++ b/data/languages/serbian.txt
@@ -591,7 +591,7 @@ Color+
 Constructs game tiles from this layer
 == 
 
-Country flags
+Country
 == 
 
 Crc:
diff --git a/data/languages/spanish.txt b/data/languages/spanish.txt
index 8e9bf816..46c14845 100644
--- a/data/languages/spanish.txt
+++ b/data/languages/spanish.txt
@@ -984,7 +984,7 @@ Collision
 Constructs game tiles from this layer
 == 
 
-Country flags
+Country
 == 
 
 Crc:
diff --git a/data/languages/swedish.txt b/data/languages/swedish.txt
index 6627337b..e637615f 100644
--- a/data/languages/swedish.txt
+++ b/data/languages/swedish.txt
@@ -564,7 +564,7 @@ Connection Problems...
 Constructs game tiles from this layer
 == 
 
-Country flags
+Country
 == 
 
 Crc:
diff --git a/data/languages/ukrainian.txt b/data/languages/ukrainian.txt
index 9fce4438..4c081d59 100644
--- a/data/languages/ukrainian.txt
+++ b/data/languages/ukrainian.txt
@@ -900,7 +900,7 @@ Color
 Constructs game tiles from this layer
 == 
 
-Country flags
+Country
 == 
 
 Crc:
diff --git a/src/game/client/components/countryflags.cpp b/src/game/client/components/countryflags.cpp
index 3a56d43a..ae0217b2 100644
--- a/src/game/client/components/countryflags.cpp
+++ b/src/game/client/components/countryflags.cpp
@@ -59,7 +59,7 @@ void CCountryFlags::LoadCountryflagsIndexfile()
 
 		// add entry
 		CCountryFlag CountryFlag;
-		CountryFlag.m_CountryCode = str_toint(pReplacement);
+		CountryFlag.m_CountryCode = str_toint(pReplacement+3);
 		CountryFlag.m_Texture = Graphics()->LoadTextureRaw(Info.m_Width, Info.m_Height, Info.m_Format, Info.m_pData, Info.m_Format, 0);
 		mem_free(Info.m_pData);
 		str_format(aBuf, sizeof(aBuf), "loaded country flag '%s'", aOrigin);
diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp
index 5fc90459..4a67a0ce 100644
--- a/src/game/client/components/menus_settings.cpp
+++ b/src/game/client/components/menus_settings.cpp
@@ -122,7 +122,7 @@ void CMenus::RenderSPPage0(CUIRect MainView)
 	MainView.HSplitTop(200.0f, &Button, &MainView);
 	static float s_ScrollValue = 0.0f;
 	int OldSelected = -1;
-	UiDoListboxStart(&s_ScrollValue, &Button, 50.0f, Localize("Country flags"), "", m_pClient->m_pCountryFlags->Num(), 6, OldSelected, s_ScrollValue);
+	UiDoListboxStart(&s_ScrollValue, &Button, 50.0f, Localize("Country"), "", m_pClient->m_pCountryFlags->Num(), 6, OldSelected, s_ScrollValue);
 
 	for(int i = 0; i < m_pClient->m_pCountryFlags->Num(); ++i)
 	{