about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--data/languages/bosnian.txt23
-rw-r--r--data/languages/czech.txt25
-rw-r--r--data/languages/dutch.txt23
-rw-r--r--data/languages/finnish.txt25
-rw-r--r--data/languages/french.txt23
-rw-r--r--data/languages/german.txt23
-rw-r--r--data/languages/italian.txt23
-rw-r--r--data/languages/polish.txt25
-rw-r--r--data/languages/portuguese.txt25
-rw-r--r--data/languages/romanian.txt23
-rw-r--r--data/languages/russian.txt25
-rw-r--r--data/languages/serbian.txt25
-rw-r--r--data/languages/spanish.txt23
-rw-r--r--data/languages/swedish.txt25
-rw-r--r--data/languages/ukrainian.txt23
-rw-r--r--src/game/client/components/menus_ingame.cpp4
16 files changed, 294 insertions, 69 deletions
diff --git a/data/languages/bosnian.txt b/data/languages/bosnian.txt
index a38ed45a..2d573d65 100644
--- a/data/languages/bosnian.txt
+++ b/data/languages/bosnian.txt
@@ -528,6 +528,9 @@ Add Friend
 Are you sure that you want to remove the player from your friends list?
 == 
 
+Change settings
+== 
+
 Clan
 == 
 
@@ -549,18 +552,18 @@ Demo details
 Free-View
 == 
 
-Friend
-== 
-
 Friends
 == 
 
-Ignore
+Kick player
 == 
 
 Length:
 == 
 
+Make player a spectator
+== 
+
 Map:
 == 
 
@@ -612,6 +615,9 @@ Server filter
 Show friends
 == 
 
+Show ingame HUD
+== 
+
 Size:
 == 
 
@@ -636,6 +642,9 @@ Unable to delete the demo
 Unable to rename the demo
 == 
 
+Use team colors for name plates
+== 
+
 Version:
 == 
 
@@ -650,3 +659,9 @@ no limit
 
 ##### old translations #####
 
+Ignore
+== 
+
+Friend
+== 
+
diff --git a/data/languages/czech.txt b/data/languages/czech.txt
index a0602ce6..54da0687 100644
--- a/data/languages/czech.txt
+++ b/data/languages/czech.txt
@@ -477,6 +477,9 @@ Automatically record demos
 Automatically take game over screenshot
 == 
 
+Change settings
+== 
+
 Clan
 == 
 
@@ -516,21 +519,21 @@ Folder
 Free-View
 == 
 
-Friend
-== 
-
 Friends
 == 
 
-Ignore
+Invalid Demo
 == 
 
-Invalid Demo
+Kick player
 == 
 
 Length:
 == 
 
+Make player a spectator
+== 
+
 Map:
 == 
 
@@ -603,6 +606,9 @@ Show chat
 Show friends
 == 
 
+Show ingame HUD
+== 
+
 Size:
 == 
 
@@ -633,6 +639,9 @@ Unable to delete the demo
 Unable to rename the demo
 == 
 
+Use team colors for name plates
+== 
+
 Version:
 == 
 
@@ -650,3 +659,9 @@ no limit
 
 ##### old translations #####
 
+Friend
+== 
+
+Ignore
+== 
+
diff --git a/data/languages/dutch.txt b/data/languages/dutch.txt
index d2d4c2d0..689d18f5 100644
--- a/data/languages/dutch.txt
+++ b/data/languages/dutch.txt
@@ -552,6 +552,9 @@ Add Friend
 Are you sure that you want to remove the player from your friends list?
 == 
 
+Change settings
+== 
+
 Clan
 == 
 
@@ -573,18 +576,18 @@ Demo details
 Free-View
 == 
 
-Friend
-== 
-
 Friends
 == 
 
-Ignore
+Kick player
 == 
 
 Length:
 == 
 
+Make player a spectator
+== 
+
 Map:
 == 
 
@@ -627,6 +630,9 @@ Server filter
 Show friends
 == 
 
+Show ingame HUD
+== 
+
 Size:
 == 
 
@@ -639,6 +645,9 @@ Type:
 Unable to rename the demo
 == 
 
+Use team colors for name plates
+== 
+
 Version:
 == 
 
@@ -650,3 +659,9 @@ Vote description:
 
 ##### old translations #####
 
+Ignore
+== 
+
+Friend
+== 
+
diff --git a/data/languages/finnish.txt b/data/languages/finnish.txt
index 7233cbca..1580125c 100644
--- a/data/languages/finnish.txt
+++ b/data/languages/finnish.txt
@@ -501,6 +501,9 @@ Automatically record demos
 Automatically take game over screenshot
 == 
 
+Change settings
+== 
+
 Clan
 == 
 
@@ -528,21 +531,21 @@ Folder
 Free-View
 == 
 
-Friend
-== 
-
 Friends
 == 
 
-Ignore
+Invalid Demo
 == 
 
-Invalid Demo
+Kick player
 == 
 
 Length:
 == 
 
+Make player a spectator
+== 
+
 Map:
 == 
 
@@ -609,6 +612,9 @@ Server filter
 Show friends
 == 
 
+Show ingame HUD
+== 
+
 Size:
 == 
 
@@ -636,6 +642,9 @@ Unable to delete the demo
 Unable to rename the demo
 == 
 
+Use team colors for name plates
+== 
+
 Version:
 == 
 
@@ -650,3 +659,9 @@ no limit
 
 ##### old translations #####
 
+Ignore
+== 
+
+Friend
+== 
+
diff --git a/data/languages/french.txt b/data/languages/french.txt
index 5f4de597..88793508 100644
--- a/data/languages/french.txt
+++ b/data/languages/french.txt
@@ -540,6 +540,9 @@ Add Friend
 Are you sure that you want to remove the player from your friends list?
 == 
 
+Change settings
+== 
+
 Clan
 == 
 
@@ -561,18 +564,18 @@ Demo details
 Free-View
 == 
 
-Friend
-== 
-
 Friends
 == 
 
-Ignore
+Kick player
 == 
 
 Length:
 == 
 
+Make player a spectator
+== 
+
 Map:
 == 
 
@@ -618,6 +621,9 @@ Server filter
 Show friends
 == 
 
+Show ingame HUD
+== 
+
 Size:
 == 
 
@@ -639,6 +645,9 @@ Unable to delete the demo
 Unable to rename the demo
 == 
 
+Use team colors for name plates
+== 
+
 Version:
 == 
 
@@ -650,3 +659,9 @@ Vote description:
 
 ##### old translations #####
 
+Ignore
+== 
+
+Friend
+== 
+
diff --git a/data/languages/german.txt b/data/languages/german.txt
index 01daf7eb..5ddc1760 100644
--- a/data/languages/german.txt
+++ b/data/languages/german.txt
@@ -552,6 +552,9 @@ Add Friend
 Are you sure that you want to remove the player from your friends list?
 == 
 
+Change settings
+== 
+
 Clan
 == 
 
@@ -573,18 +576,18 @@ Demo details
 Free-View
 == 
 
-Friend
-== 
-
 Friends
 == 
 
-Ignore
+Kick player
 == 
 
 Length:
 == 
 
+Make player a spectator
+== 
+
 Map:
 == 
 
@@ -627,6 +630,9 @@ Server filter
 Show friends
 == 
 
+Show ingame HUD
+== 
+
 Size:
 == 
 
@@ -639,6 +645,9 @@ Type:
 Unable to rename the demo
 == 
 
+Use team colors for name plates
+== 
+
 Version:
 == 
 
@@ -650,3 +659,9 @@ Vote description:
 
 ##### old translations #####
 
+Ignore
+== 
+
+Friend
+== 
+
diff --git a/data/languages/italian.txt b/data/languages/italian.txt
index 9a510a89..5a549c66 100644
--- a/data/languages/italian.txt
+++ b/data/languages/italian.txt
@@ -534,6 +534,9 @@ Add Friend
 Are you sure that you want to remove the player from your friends list?
 == 
 
+Change settings
+== 
+
 Clan
 == 
 
@@ -555,18 +558,18 @@ Demo details
 Free-View
 == 
 
-Friend
-== 
-
 Friends
 == 
 
-Ignore
+Kick player
 == 
 
 Length:
 == 
 
+Make player a spectator
+== 
+
 Map:
 == 
 
@@ -618,6 +621,9 @@ Server filter
 Show friends
 == 
 
+Show ingame HUD
+== 
+
 Size:
 == 
 
@@ -636,6 +642,9 @@ Type:
 Unable to rename the demo
 == 
 
+Use team colors for name plates
+== 
+
 Version:
 == 
 
@@ -650,3 +659,9 @@ Warmup
 
 ##### old translations #####
 
+Ignore
+== 
+
+Friend
+== 
+
diff --git a/data/languages/polish.txt b/data/languages/polish.txt
index 59fff939..443762d8 100644
--- a/data/languages/polish.txt
+++ b/data/languages/polish.txt
@@ -504,6 +504,9 @@ Automatically record demos
 Automatically take game over screenshot
 == 
 
+Change settings
+== 
+
 Clan
 == 
 
@@ -531,21 +534,21 @@ Folder
 Free-View
 == 
 
-Friend
-== 
-
 Friends
 == 
 
-Ignore
+Invalid Demo
 == 
 
-Invalid Demo
+Kick player
 == 
 
 Length:
 == 
 
+Make player a spectator
+== 
+
 Map:
 == 
 
@@ -609,6 +612,9 @@ Server filter
 Show friends
 == 
 
+Show ingame HUD
+== 
+
 Size:
 == 
 
@@ -636,6 +642,9 @@ Unable to delete the demo
 Unable to rename the demo
 == 
 
+Use team colors for name plates
+== 
+
 Version:
 == 
 
@@ -650,3 +659,9 @@ no limit
 
 ##### old translations #####
 
+Ignore
+== 
+
+Friend
+== 
+
diff --git a/data/languages/portuguese.txt b/data/languages/portuguese.txt
index 87a717f2..14926b19 100644
--- a/data/languages/portuguese.txt
+++ b/data/languages/portuguese.txt
@@ -498,6 +498,9 @@ Automatically record demos
 Automatically take game over screenshot
 == 
 
+Change settings
+== 
+
 Clan
 == 
 
@@ -528,21 +531,21 @@ Folder
 Free-View
 == 
 
-Friend
-== 
-
 Friends
 == 
 
-Ignore
+Invalid Demo
 == 
 
-Invalid Demo
+Kick player
 == 
 
 Length:
 == 
 
+Make player a spectator
+== 
+
 Map:
 == 
 
@@ -609,6 +612,9 @@ Server filter
 Show friends
 == 
 
+Show ingame HUD
+== 
+
 Size:
 == 
 
@@ -636,6 +642,9 @@ Unable to delete the demo
 Unable to rename the demo
 == 
 
+Use team colors for name plates
+== 
+
 Version:
 == 
 
@@ -650,3 +659,9 @@ no limit
 
 ##### old translations #####
 
+Ignore
+== 
+
+Friend
+== 
+
diff --git a/data/languages/romanian.txt b/data/languages/romanian.txt
index b47cd867..187ba72b 100644
--- a/data/languages/romanian.txt
+++ b/data/languages/romanian.txt
@@ -552,6 +552,9 @@ Add Friend
 Are you sure that you want to remove the player from your friends list?
 == 
 
+Change settings
+== 
+
 Clan
 == 
 
@@ -573,18 +576,18 @@ Demo details
 Free-View
 == 
 
-Friend
-== 
-
 Friends
 == 
 
-Ignore
+Kick player
 == 
 
 Length:
 == 
 
+Make player a spectator
+== 
+
 Map:
 == 
 
@@ -627,6 +630,9 @@ Server filter
 Show friends
 == 
 
+Show ingame HUD
+== 
+
 Size:
 == 
 
@@ -639,6 +645,9 @@ Type:
 Unable to rename the demo
 == 
 
+Use team colors for name plates
+== 
+
 Version:
 == 
 
@@ -650,3 +659,9 @@ Vote description:
 
 ##### old translations #####
 
+Ignore
+== 
+
+Friend
+== 
+
diff --git a/data/languages/russian.txt b/data/languages/russian.txt
index 1bde3f9d..d5a0a4a9 100644
--- a/data/languages/russian.txt
+++ b/data/languages/russian.txt
@@ -507,6 +507,9 @@ Automatically record demos
 Automatically take game over screenshot
 == 
 
+Change settings
+== 
+
 Clan
 == 
 
@@ -534,21 +537,21 @@ Folder
 Free-View
 == 
 
-Friend
-== 
-
 Friends
 == 
 
-Ignore
+Invalid Demo
 == 
 
-Invalid Demo
+Kick player
 == 
 
 Length:
 == 
 
+Make player a spectator
+== 
+
 Map:
 == 
 
@@ -609,6 +612,9 @@ Server filter
 Show friends
 == 
 
+Show ingame HUD
+== 
+
 Size:
 == 
 
@@ -636,6 +642,9 @@ Unable to delete the demo
 Unable to rename the demo
 == 
 
+Use team colors for name plates
+== 
+
 Version:
 == 
 
@@ -650,3 +659,9 @@ no limit
 
 ##### old translations #####
 
+Ignore
+== 
+
+Friend
+== 
+
diff --git a/data/languages/serbian.txt b/data/languages/serbian.txt
index 6096e63c..ebdbf52f 100644
--- a/data/languages/serbian.txt
+++ b/data/languages/serbian.txt
@@ -501,6 +501,9 @@ Automatically record demos
 Automatically take game over screenshot
 == 
 
+Change settings
+== 
+
 Clan
 == 
 
@@ -528,21 +531,21 @@ Folder
 Free-View
 == 
 
-Friend
-== 
-
 Friends
 == 
 
-Ignore
+Invalid Demo
 == 
 
-Invalid Demo
+Kick player
 == 
 
 Length:
 == 
 
+Make player a spectator
+== 
+
 Map:
 == 
 
@@ -609,6 +612,9 @@ Server filter
 Show friends
 == 
 
+Show ingame HUD
+== 
+
 Size:
 == 
 
@@ -636,6 +642,9 @@ Unable to delete the demo
 Unable to rename the demo
 == 
 
+Use team colors for name plates
+== 
+
 Version:
 == 
 
@@ -650,3 +659,9 @@ no limit
 
 ##### old translations #####
 
+Ignore
+== 
+
+Friend
+== 
+
diff --git a/data/languages/spanish.txt b/data/languages/spanish.txt
index 12e8a675..ac3fdea8 100644
--- a/data/languages/spanish.txt
+++ b/data/languages/spanish.txt
@@ -552,6 +552,9 @@ Add Friend
 Are you sure that you want to remove the player from your friends list?
 == 
 
+Change settings
+== 
+
 Clan
 == 
 
@@ -573,18 +576,18 @@ Demo details
 Free-View
 == 
 
-Friend
-== 
-
 Friends
 == 
 
-Ignore
+Kick player
 == 
 
 Length:
 == 
 
+Make player a spectator
+== 
+
 Map:
 == 
 
@@ -627,6 +630,9 @@ Server filter
 Show friends
 == 
 
+Show ingame HUD
+== 
+
 Size:
 == 
 
@@ -639,6 +645,9 @@ Type:
 Unable to rename the demo
 == 
 
+Use team colors for name plates
+== 
+
 Version:
 == 
 
@@ -650,3 +659,9 @@ Vote description:
 
 ##### old translations #####
 
+Ignore
+== 
+
+Friend
+== 
+
diff --git a/data/languages/swedish.txt b/data/languages/swedish.txt
index 96296099..376d6f79 100644
--- a/data/languages/swedish.txt
+++ b/data/languages/swedish.txt
@@ -471,6 +471,9 @@ Automatically record demos
 Automatically take game over screenshot
 == 
 
+Change settings
+== 
+
 Clan
 == 
 
@@ -513,21 +516,21 @@ Force vote
 Free-View
 == 
 
-Friend
-== 
-
 Friends
 == 
 
-Ignore
+Invalid Demo
 == 
 
-Invalid Demo
+Kick player
 == 
 
 Length:
 == 
 
+Make player a spectator
+== 
+
 Map:
 == 
 
@@ -600,6 +603,9 @@ Show chat
 Show friends
 == 
 
+Show ingame HUD
+== 
+
 Size:
 == 
 
@@ -630,6 +636,9 @@ Unable to delete the demo
 Unable to rename the demo
 == 
 
+Use team colors for name plates
+== 
+
 Version:
 == 
 
@@ -650,3 +659,9 @@ no limit
 
 ##### old translations #####
 
+Friend
+== 
+
+Ignore
+== 
+
diff --git a/data/languages/ukrainian.txt b/data/languages/ukrainian.txt
index 1dca7066..17af3e7e 100644
--- a/data/languages/ukrainian.txt
+++ b/data/languages/ukrainian.txt
@@ -522,6 +522,9 @@ Automatically record demos
 Automatically take game over screenshot
 == 
 
+Change settings
+== 
+
 Clan
 == 
 
@@ -546,18 +549,18 @@ Demo details
 Free-View
 == 
 
-Friend
-== 
-
 Friends
 == 
 
-Ignore
+Kick player
 == 
 
 Length:
 == 
 
+Make player a spectator
+== 
+
 Map:
 == 
 
@@ -615,6 +618,9 @@ Server filter
 Show friends
 == 
 
+Show ingame HUD
+== 
+
 Size:
 == 
 
@@ -636,6 +642,9 @@ Unable to delete the demo
 Unable to rename the demo
 == 
 
+Use team colors for name plates
+== 
+
 Version:
 == 
 
@@ -650,3 +659,9 @@ no limit
 
 ##### old translations #####
 
+Ignore
+== 
+
+Friend
+== 
+
diff --git a/src/game/client/components/menus_ingame.cpp b/src/game/client/components/menus_ingame.cpp
index 9c03e870..3d2a8906 100644
--- a/src/game/client/components/menus_ingame.cpp
+++ b/src/game/client/components/menus_ingame.cpp
@@ -339,7 +339,7 @@ void CMenus::RenderServerControlServer(CUIRect MainView)
 	static int s_VoteList = 0;
 	static float s_ScrollValue = 0;
 	CUIRect List = MainView;
-	UiDoListboxStart(&s_VoteList, &List, 24.0f, Localize("Settings"), "", m_pClient->m_pVoting->m_NumVoteOptions, 1, m_CallvoteSelectedOption, s_ScrollValue);
+	UiDoListboxStart(&s_VoteList, &List, 24.0f, Localize("Change settings"), "", m_pClient->m_pVoting->m_NumVoteOptions, 1, m_CallvoteSelectedOption, s_ScrollValue);
 	
 	for(CVoteOptionClient *pOption = m_pClient->m_pVoting->m_pFirst; pOption; pOption = pOption->m_pNext)
 	{
@@ -371,7 +371,7 @@ void CMenus::RenderServerControlKick(CUIRect MainView, bool FilterSpectators)
 	static int s_VoteList = 0;
 	static float s_ScrollValue = 0;
 	CUIRect List = MainView;
-	UiDoListboxStart(&s_VoteList, &List, 24.0f, Localize("Players"), "", NumOptions, 1, Selected, s_ScrollValue);
+	UiDoListboxStart(&s_VoteList, &List, 24.0f, FilterSpectators?Localize("Make player a spectator"):Localize("Kick player"), "", NumOptions, 1, Selected, s_ScrollValue);
 	
 	for(int i = 0; i < NumOptions; i++)
 	{