about summary refs log tree commit diff
diff options
context:
space:
mode:
authorxalduin <xalduin@gmail.com>2010-06-03 00:37:46 -0400
committerxalduin <xalduin@gmail.com>2010-06-03 00:37:46 -0400
commitde1a7acfaa706e39f6e0d9b27c5f4b4658145c6d (patch)
treeb5b2eec43849251a48ce668c821d686272656e90
parentcc181cda5be79c1097502ea30afb78400da962b7 (diff)
parent7cbf0f93cacdd694e61961e18d44921881e3d489 (diff)
downloadzcatch-de1a7acfaa706e39f6e0d9b27c5f4b4658145c6d.tar.gz
zcatch-de1a7acfaa706e39f6e0d9b27c5f4b4658145c6d.zip
Merge branch 'master' of git://github.com/matricks/teeworlds
-rw-r--r--data/languages/czech.txt7
-rw-r--r--data/languages/dutch.txt7
-rw-r--r--data/languages/french.txt7
-rw-r--r--data/languages/german.txt7
-rw-r--r--data/languages/italian.txt7
-rw-r--r--data/languages/portuguese.txt7
-rw-r--r--data/languages/swedish.txt7
-rw-r--r--src/game/client/components/menus.cpp2
8 files changed, 36 insertions, 15 deletions
diff --git a/data/languages/czech.txt b/data/languages/czech.txt
index 652c4089..c788edcf 100644
--- a/data/languages/czech.txt
+++ b/data/languages/czech.txt
@@ -274,8 +274,8 @@ Prev. weapon
 Quality Textures
 == Kvalitní textury
 
-Quick search
-== Rychlé hledání
+Quick search:
+== Rychlé hledání:
 
 Quit
 == Ukončit
@@ -438,5 +438,8 @@ Your skin
 Show chat
 == Show chat
 
+Password incorrect
+== Password incorrect
+
 ##### old translations ####
 
diff --git a/data/languages/dutch.txt b/data/languages/dutch.txt
index 1ec28c8d..fe9c65b8 100644
--- a/data/languages/dutch.txt
+++ b/data/languages/dutch.txt
@@ -273,8 +273,8 @@ Prev. weapon
 Quality Textures
 == Kwalteit Textures
 
-Quick search
-== Snel Zoken
+Quick search:
+== Snel Zoken:
 
 Quit
 == Stoppen
@@ -437,4 +437,7 @@ Show chat
 Your skin
 == Your skin
 
+Password incorrect
+== Password incorrect
+
 ##### old translations ####
diff --git a/data/languages/french.txt b/data/languages/french.txt
index 9d7bcd40..fa360da9 100644
--- a/data/languages/french.txt
+++ b/data/languages/french.txt
@@ -274,8 +274,8 @@ Prev. weapon
 Quality Textures
 == Textures haute qualité
 
-Quick search
-== Recherche rapide
+Quick search:
+== Recherche rapide:
 
 Quit
 == Quitter
@@ -438,5 +438,8 @@ Your skin
 
 ##### needs translation ####
 
+Password incorrect
+== Password incorrect
+
 ##### old translations ####
 
diff --git a/data/languages/german.txt b/data/languages/german.txt
index 967c3f5b..235e08ec 100644
--- a/data/languages/german.txt
+++ b/data/languages/german.txt
@@ -274,8 +274,8 @@ Prev. weapon
 Quality Textures
 == Hochaufgelöste Texturen
 
-Quick search
-== Schnelle Suche
+Quick search:
+== Schnellsuche:
 
 Quit
 == Beenden
@@ -436,6 +436,9 @@ You must restart the game for all settings to take effect.
 Your skin
 == Dein Skin
 
+Password incorrect
+== Passwort falsch
+
 ##### needs translation ####
 
 
diff --git a/data/languages/italian.txt b/data/languages/italian.txt
index 4befc772..9ec49350 100644
--- a/data/languages/italian.txt
+++ b/data/languages/italian.txt
@@ -271,8 +271,8 @@ Prev. weapon
 Quality Textures
 == Textures di qualità
 
-Quick search
-== Ricerca rapida
+Quick search:
+== Ricerca rapida:
 
 Quit
 == Esci
@@ -438,5 +438,8 @@ Show chat
 Your skin
 == Your skin
 
+Password incorrect
+== Password incorrect
+
 ##### old translations ####
 
diff --git a/data/languages/portuguese.txt b/data/languages/portuguese.txt
index 64bf7e6c..cb76f50e 100644
--- a/data/languages/portuguese.txt
+++ b/data/languages/portuguese.txt
@@ -274,8 +274,8 @@ Prev. weapon
 Quality Textures
 == Texturas de Qualidade
 
-Quick search
-== Pesquisa Rápida
+Quick search:
+== Pesquisa Rápida:
 
 Quit
 == Sair
@@ -439,5 +439,8 @@ Your skin
 ##### needs translation ####
 
 
+Password incorrect
+== Password incorrect
+
 ##### old translations ####
 
diff --git a/data/languages/swedish.txt b/data/languages/swedish.txt
index 627f3fa0..de64615f 100644
--- a/data/languages/swedish.txt
+++ b/data/languages/swedish.txt
@@ -271,8 +271,8 @@ Prev. weapon
 Quality Textures
 == Kvalitetstexturer
 
-Quick search
-== Snabbsök
+Quick search:
+== Snabbsök:
 
 Quit
 == Avsluta
@@ -438,5 +438,8 @@ Show chat
 Your skin
 == Your skin
 
+Password incorrect
+== Password incorrect
+
 ##### old translations ####
 
diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp
index 585c6d7a..b752f8cb 100644
--- a/src/game/client/components/menus.cpp
+++ b/src/game/client/components/menus.cpp
@@ -840,7 +840,7 @@ int CMenus::Render()
 		}
 		else if(m_Popup == POPUP_PASSWORD)
 		{
-			pTitle = Localize("Password Incorrect");
+			pTitle = Localize("Password incorrect");
 			pExtraText = Client()->ErrorString();
 			pButtonText = Localize("Try again");
 		}