changed time left localisation in the map download popup to allow better translations

14 files changed, 157 insertions, 196 deletions

diff --git a/data/languages/bosnian.txt b/data/languages/bosnian.txt
index 7ca370c9..a9dde9b7 100644
--- a/data/languages/bosnian.txt
+++ b/data/languages/bosnian.txt
@@ -465,6 +465,18 @@ Your skin
 %d%% loaded
 == 
 
+%i minute left
+== 
+
+%i minutes left
+== 
+
+%i second left
+== 
+
+%i seconds left
+== 
+
 %s Right click for context menu.
 == 
 
@@ -948,23 +960,8 @@ ZO
 [ctrl+p] Toggles proof borders. These borders represent what a player maximum can see.
 == 
 
-left
-== 
-
-minute
-== 
-
-minutes
-== 
-
 no limit
 == 
 
-second
-== 
-
-seconds
-== 
-
 ##### old translations #####
 
diff --git a/data/languages/czech.txt b/data/languages/czech.txt
index b27d788e..80db8b7e 100644
--- a/data/languages/czech.txt
+++ b/data/languages/czech.txt
@@ -441,6 +441,18 @@ Your skin
 %ds left
 == 
 
+%i minute left
+== 
+
+%i minutes left
+== 
+
+%i second left
+== 
+
+%i seconds left
+== 
+
 %s Right click for context menu.
 == 
 
@@ -948,23 +960,8 @@ ZO
 [ctrl+p] Toggles proof borders. These borders represent what a player maximum can see.
 == 
 
-left
-== 
-
-minute
-== 
-
-minutes
-== 
-
 no limit
 == 
 
-second
-== 
-
-seconds
-== 
-
 ##### old translations #####
 
diff --git a/data/languages/dutch.txt b/data/languages/dutch.txt
index 41789988..f27655fa 100644
--- a/data/languages/dutch.txt
+++ b/data/languages/dutch.txt
@@ -943,25 +943,22 @@ ZO
 [ctrl+p] Toggles proof borders. These borders represent what a player maximum can see.
 == [ctrl+p] Test grenzen. Deze grenzen laten zien wat een speler maximaal kan zien.
 
-left
-== nog
-
-minute
-== minuut
-
-minutes
-== minuten
-
 no limit
 == ongelimiteerd
 
-second
-== seconde
+##### needs translation #####
 
-seconds
-== seconden
+%i minute left
+== 
 
-##### needs translation #####
+%i minutes left
+== 
+
+%i second left
+== 
+
+%i seconds left
+== 
 
 Name plates size
 == 
diff --git a/data/languages/finnish.txt b/data/languages/finnish.txt
index dcc0c714..a4638b17 100644
--- a/data/languages/finnish.txt
+++ b/data/languages/finnish.txt
@@ -465,6 +465,18 @@ Your skin
 %d%% loaded
 == 
 
+%i minute left
+== 
+
+%i minutes left
+== 
+
+%i second left
+== 
+
+%i seconds left
+== 
+
 %s Right click for context menu.
 == 
 
@@ -948,23 +960,8 @@ ZO
 [ctrl+p] Toggles proof borders. These borders represent what a player maximum can see.
 == 
 
-left
-== 
-
-minute
-== 
-
-minutes
-== 
-
 no limit
 == 
 
-second
-== 
-
-seconds
-== 
-
 ##### old translations #####
 
diff --git a/data/languages/french.txt b/data/languages/french.txt
index d1c563e0..1f867016 100644
--- a/data/languages/french.txt
+++ b/data/languages/french.txt
@@ -723,6 +723,18 @@ ZO
 
 ##### needs translation #####
 
+%i minute left
+== 
+
+%i minutes left
+== 
+
+%i second left
+== 
+
+%i seconds left
+== 
+
 %s Right click for context menu.
 == 
 
@@ -948,23 +960,8 @@ Y-axis of the envelope
 [ctrl+p] Toggles proof borders. These borders represent what a player maximum can see.
 == 
 
-left
-== 
-
-minute
-== 
-
-minutes
-== 
-
 no limit
 == 
 
-second
-== 
-
-seconds
-== 
-
 ##### old translations #####
 
diff --git a/data/languages/german.txt b/data/languages/german.txt
index 30075856..876b605a 100644
--- a/data/languages/german.txt
+++ b/data/languages/german.txt
@@ -943,25 +943,22 @@ ZO
 [ctrl+p] Toggles proof borders. These borders represent what a player maximum can see.
 == [Strg+P] Schaltet Testrahmen um. Diese Rahmen zeigen, wie viel der Spieler höchstens sehen kann.
 
-left
-== noch
-
-minute
-== Minute
-
-minutes
-== Minuten
-
 no limit
 == Keine Begrenzung
 
-second
-== Sekunde
+##### needs translation #####
 
-seconds
-== Sekunden
+%i minute left
+== 
 
-##### needs translation #####
+%i minutes left
+== 
+
+%i second left
+== 
+
+%i seconds left
+== 
 
 Name plates size
 == 
diff --git a/data/languages/italian.txt b/data/languages/italian.txt
index acf81171..a8b04e22 100644
--- a/data/languages/italian.txt
+++ b/data/languages/italian.txt
@@ -435,6 +435,18 @@ You must restart the game for all settings to take effect.
 %ds left
 == 
 
+%i minute left
+== 
+
+%i minutes left
+== 
+
+%i second left
+== 
+
+%i seconds left
+== 
+
 %s Right click for context menu.
 == 
 
@@ -948,23 +960,8 @@ ZO
 [ctrl+p] Toggles proof borders. These borders represent what a player maximum can see.
 == 
 
-left
-== 
-
-minute
-== 
-
-minutes
-== 
-
 no limit
 == 
 
-second
-== 
-
-seconds
-== 
-
 ##### old translations #####
 
diff --git a/data/languages/polish.txt b/data/languages/polish.txt
index 4e41f154..79eb8db6 100644
--- a/data/languages/polish.txt
+++ b/data/languages/polish.txt
@@ -783,6 +783,18 @@ ZO
 %d%% loaded
 == 
 
+%i minute left
+== 
+
+%i minutes left
+== 
+
+%i second left
+== 
+
+%i seconds left
+== 
+
 Alpha value of the envelope
 == 
 
@@ -948,23 +960,8 @@ Y-axis of the envelope
 [HOME] Restore map focus
 == 
 
-left
-== 
-
-minute
-== 
-
-minutes
-== 
-
 no limit
 == 
 
-second
-== 
-
-seconds
-== 
-
 ##### old translations #####
 
diff --git a/data/languages/portuguese.txt b/data/languages/portuguese.txt
index 7d842279..9e09864e 100644
--- a/data/languages/portuguese.txt
+++ b/data/languages/portuguese.txt
@@ -462,6 +462,18 @@ Your skin
 %d%% loaded
 == 
 
+%i minute left
+== 
+
+%i minutes left
+== 
+
+%i second left
+== 
+
+%i seconds left
+== 
+
 %s Right click for context menu.
 == 
 
@@ -948,23 +960,8 @@ ZO
 [ctrl+p] Toggles proof borders. These borders represent what a player maximum can see.
 == 
 
-left
-== 
-
-minute
-== 
-
-minutes
-== 
-
 no limit
 == 
 
-second
-== 
-
-seconds
-== 
-
 ##### old translations #####
 
diff --git a/data/languages/russian.txt b/data/languages/russian.txt
index b1289ac5..3553ebd5 100644
--- a/data/languages/russian.txt
+++ b/data/languages/russian.txt
@@ -795,6 +795,18 @@ ZO
 
 ##### needs translation #####
 
+%i minute left
+== 
+
+%i minutes left
+== 
+
+%i second left
+== 
+
+%i seconds left
+== 
+
 Alpha value of the envelope
 == 
 
@@ -948,23 +960,8 @@ Y-axis of the envelope
 [HOME] Restore map focus
 == 
 
-left
-== 
-
-minute
-== 
-
-minutes
-== 
-
 no limit
 == 
 
-second
-== 
-
-seconds
-== 
-
 ##### old translations #####
 
diff --git a/data/languages/serbian.txt b/data/languages/serbian.txt
index 4c525341..5493c516 100644
--- a/data/languages/serbian.txt
+++ b/data/languages/serbian.txt
@@ -465,6 +465,18 @@ Your skin
 %d%% loaded
 == 
 
+%i minute left
+== 
+
+%i minutes left
+== 
+
+%i second left
+== 
+
+%i seconds left
+== 
+
 %s Right click for context menu.
 == 
 
@@ -948,23 +960,8 @@ ZO
 [ctrl+p] Toggles proof borders. These borders represent what a player maximum can see.
 == 
 
-left
-== 
-
-minute
-== 
-
-minutes
-== 
-
 no limit
 == 
 
-second
-== 
-
-seconds
-== 
-
 ##### old translations #####
 
diff --git a/data/languages/swedish.txt b/data/languages/swedish.txt
index 30975552..ecb7cea6 100644
--- a/data/languages/swedish.txt
+++ b/data/languages/swedish.txt
@@ -435,6 +435,18 @@ You must restart the game for all settings to take effect.
 %ds left
 == 
 
+%i minute left
+== 
+
+%i minutes left
+== 
+
+%i second left
+== 
+
+%i seconds left
+== 
+
 %s Right click for context menu.
 == 
 
@@ -948,23 +960,8 @@ ZO
 [ctrl+p] Toggles proof borders. These borders represent what a player maximum can see.
 == 
 
-left
-== 
-
-minute
-== 
-
-minutes
-== 
-
 no limit
 == 
 
-second
-== 
-
-seconds
-== 
-
 ##### old translations #####
 
diff --git a/data/languages/ukrainian.txt b/data/languages/ukrainian.txt
index f11080e2..8586928b 100644
--- a/data/languages/ukrainian.txt
+++ b/data/languages/ukrainian.txt
@@ -849,6 +849,18 @@ ZO
 
 ##### needs translation #####
 
+%i minute left
+== 
+
+%i minutes left
+== 
+
+%i second left
+== 
+
+%i seconds left
+== 
+
 Alpha value of the envelope
 == 
 
@@ -948,23 +960,8 @@ Y-axis of the envelope
 [HOME] Restore map focus
 == 
 
-left
-== 
-
-minute
-== 
-
-minutes
-== 
-
 no limit
 == 
 
-second
-== 
-
-seconds
-== 
-
 ##### old translations #####
 
diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp
index 8e8a8654..3d84f2d3 100644
--- a/src/game/client/components/menus.cpp
+++ b/src/game/client/components/menus.cpp
@@ -979,13 +979,13 @@ int CMenus::Render()
 				if(TimeLeft >= 60)
 				{
 					TimeLeft /= 60;
-					pTimeLeftString = TimeLeft == 1 ? Localize("minute") : Localize("minutes");
+					pTimeLeftString = TimeLeft == 1 ? Localize("%i minute left") : Localize("%i minutes left");
 				}
 				else
-					pTimeLeftString = TimeLeft == 1 ? Localize("second") : Localize("seconds");
+					pTimeLeftString = TimeLeft == 1 ? Localize("%i second left") : Localize("%i seconds left");
 				Box.HSplitTop(20.f, 0, &Box);
 				Box.HSplitTop(24.f, &Part, &Box);
-				str_format(aBuf, sizeof(aBuf), "%i %s %s", TimeLeft, pTimeLeftString, Localize("left"));
+				str_format(aBuf, sizeof(aBuf), pTimeLeftString, TimeLeft);
 				UI()->DoLabel(&Part, aBuf, 20.f, 0, -1);
 
 				// progress bar