Merge branch 'master' of github.com:ddnet/ddnet

data/languages/german.txt

@@ -18,7 +18,7 @@
 #	heinrich5991	2011-07-02 09:10:21
 #	Yared Hufkens	2012-02-03 19:57:59
 #	andi103			2012-07-14 11:31:11
-#   DoNe            2014-06-30 18:26:59
+#	timakro			2014-06-30 18:26:59
 ##### /authors #####
 
 ##### translated strings #####

data/languages/persian.txt

@@ -1,5 +1,5 @@
 ##### authors #####
-Created By : OneShadow
+# Created By : OneShadow
 ##### translated strings #####
 
 %d%% loaded
@@ -31,19 +31,16 @@ Created By : OneShadow
 
 
 '%s' entered and joined the %s
-== '%s'ﻞﺧﺍﺩ ﻭ ﺩﺭﺍﻭ
-%s
+== '%s' ﻞﺧﺍﺩ ﻭ ﺩﺭﺍﻭ%s
 
 '%s' has left the game
 == '%s' از بازی بیرون رفت
 
 '%s' has left the game (%s)
-== '%s'ﺖﻓﺭ ﻥﻭﺮﯿﺑ ﯼﺯﺎﺑ ﺯﺍ
-(%s)
+== '%s' ﺖﻓﺭ ﻥﻭﺮﯿﺑ ﯼﺯﺎﺑ ﺯﺍ (%s)
 
 -Page %d-
-== -ﻪﺤﻔﺻ
-%d-
+== -ﻪﺤﻔﺻ%d-
 
 Abort
 == ﻥﺩﺮﮐ ﺩﺭ
@@ -177,8 +174,7 @@ Demo details
 
 
 Demofile: %s
-== ﻮﻣﺩ ﻞﯾﺎﻓ
-: %s
+== ﻮﻣﺩ ﻞﯾﺎﻓ: %s
 
 Demos
 == ﺎﻫ ﻮﻣﺩ
@@ -345,8 +341,7 @@ Map
 
 
 Maximum ping:
-== ﮓﻨﯿﭘ ﺖﯾﺎﻬﻧ
-:
+== ﮓﻨﯿﭘ ﺖﯾﺎﻬﻧ:
 
 Mouse sens.
 == ﺱﻮﻣ ﺵﺰﻐﻟ
@@ -467,12 +462,10 @@ Quit
 
 
 REC %3d:%02d
-== ﻂﺒﺿ
- %3d:%02d
+== ﻂﺒﺿ %3d:%02d
 
 Reason:
-== ﻞﯿﻟﺩ
-:
+== ﻞﯿﻟﺩ:
 
 Red team
 == ﺰﻣﺮﻗ ﻢﯿﺗ
@@ -716,8 +709,7 @@ Version
 
 
 Vote command:
-== ﯽﺠﻨﺳ ﺮﻈﻧ ﺕﺍﺭﻮﺘﺳﺩ
-:
+== ﯽﺠﻨﺳ ﺮﻈﻧ ﺕﺍﺭﻮﺘﺳﺩ:
 
 Vote description:
 == :ﯽﺠﻨﺳ ﺮﻈﻧ ﺕﺎﺤﯿﺿﻮﺗ
@@ -755,8 +747,7 @@ You must restart the game for all settings to take effect.
 == ﺪﻧﻮﺷ ﻡﺎﺠﻧﺍ ﺕﺎﻤﯿﻈﻨﺗ ﻪﮑﻨﯾﺍ ﯼﺍﺮﺑ ﺪﯿﻨﮐ ﯼﺭﺍﺰﮔﺭﺎﺑ ﻩﺭﺎﺑﻭﺩ ﺍﺭ ﯼﺯﺎﺑ ﺪﯾﺎﺑ ﺎﻤﺷ
 
 
-##### ﻪﻤﺟﺮﺗ ﻪﺑ ﺝﺎﯿﺘﺣﺍ
- #####
+##### ﻪﻤﺟﺮﺗ ﻪﺑ ﺝﺎﯿﺘﺣﺍ #####
 
 %.3f KiB
 == 
@@ -784,8 +775,7 @@ You must restart the game for all settings to take effect.
 
 
 '%s' called for vote to kick '%s' (%s)
-== ﻥﺩﺮﮐ ﮏﯿﮐ ﯼﺍﺮﺑ ﺖﺳﺍ ﻩﺩﺮﮐ ﺩﺎﺠﯾﺍ ﯽﺠﻨﺳ ﺮﻈﻧ %s''
-'%s' (%s)
+== ﻥﺩﺮﮐ ﮏﯿﮐ ﯼﺍﺮﺑ ﺖﺳﺍ ﻩﺩﺮﮐ ﺩﺎﺠﯾﺍ ﯽﺠﻨﺳ ﺮﻈﻧ '%s' (%s)
 
 '%s' called for vote to move '%s' to spectators (%s)
 == (%s) ﺮﮔﺎﺷﺎﻤﺗ ﺖﻟﺎﺣ ﻪﺑ %s'' ﻦﺘﻓﺭ ﯼﺍﺮﺑ ﺖﺳﺍ ﻩﺩﺮﮐ ﺩﺎﺠﯾﺍ ﯽﺠﻨﺳ ﺮﻈﻧ %s''
@@ -800,8 +790,7 @@ You must restart the game for all settings to take effect.
 
 
 Admin forced server option '%s' (%s)
-== ﻪﺑ ﺩﺮﮐ ﻞﯿﻤﺤﺗ ﺍﺭ ﺕﺎﻤﯿﻈﻨﺗ ﻦﯿﻣﺩﺍ
-'%s' (%s)
+== ﻪﺑ ﺩﺮﮐ ﻞﯿﻤﺤﺗ ﺍﺭ ﺕﺎﻤﯿﻈﻨﺗ ﻦﯿﻣﺩﺍ '%s' (%s)
 
 Admin forced vote no
 == ﺩﺮﮐ ﺩﺭ ﺍﺭ ﯽﺠﻨﺳ ﺮﻈﻧ ﻦﯿﻣﺩﺍ

data/languages/scripts/readme.txt

@@ -1,4 +1,4 @@
-Teeworlds language scripts by DoNe
+Teeworlds language scripts by timakro
 
 These scripts can help you to improve the language files. This is a short tutorial
 about how to use the scripts.
@@ -32,6 +32,6 @@ start of the file. Now you can move the file back to its original location.
 $ mv newspanish.txt ../spanish.txt
 
 
-Often people know bette phrases for translations where the english phrase was just
-written again. To find these you can use find_unchanged.py
+Often people know better phrases for translations where the english phrase was just
+copied. To find these you can use find_unchanged.py
 $ python find_unchanged.py ../spanish.txt

data/languages/scripts/twlang.py

@@ -14,6 +14,8 @@ def decode(fileobj, elements_per_key):
     for index, line in enumerate(fileobj):
         line = line.decode("utf-8-sig").encode("utf-8")
         line = line[:-1]
+        if line and line[-1] == "\r":
+            line = line[:-1]
         if not line or line[:1] == "#":
             continue
         if line[:3] == "== ":

data/languages/simplified_chinese.txt

@@ -841,7 +841,7 @@ Servers
 == 服务器
 
 Size
-==大小
+== 大小
 
 Skin
 == 皮肤
@@ -1158,12 +1158,6 @@ Shuffle the current teams
 initialisation finished after %.2fms
 == %.2fms 后初始化完成
 
-dropped weird message '%s' (%d), failed on '%s'
-==
-
-You must restart the game for all settings to take effect.
-== 你必须重新启动游戏才能让所有新的设置生效。
-
 Use DDRace Scoreboard
 == 使用DDRace计分板
 
@@ -1302,9 +1296,6 @@ Dummy Timeout code
 default
 == 默认
 
-Weapon
-== 武器
-
 DM
 == 死亡竞技
 
@@ -1354,4 +1345,4 @@ Spectator
 == 旁观者
 
 Search
-== 搜索
+== 搜索