GreYFoXGTi
|
5d9ee1736e
|
made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/german.txt
data/languages/russian.txt
src/game/server/entities/flag.cpp
src/game/server/entities/flag.h
src/game/server/gamecontext.cpp
src/game/server/gamemodes/ctf.cpp
src/game/server/gamemodes/ctf.h
src/game/server/gamemodes/dm.cpp
src/game/server/gamemodes/dm.h
src/game/server/gamemodes/mod.cpp
src/game/server/gamemodes/tdm.cpp
src/game/server/gamemodes/tdm.h
|
2010-11-22 00:26:00 +02:00 |
|
vierkant
|
ebd45829ce
|
Improved dutch language file. Translated more in context.
|
2010-11-21 18:30:33 +01:00 |
|
oy
|
456fc7e9b6
|
cleaned up last commit
|
2010-11-21 17:42:58 +01:00 |
|
Sijmen Schoon
|
c2405d03b6
|
Improved Dutch translation
|
2010-11-21 17:39:54 +01:00 |
|
oy
|
97a7dea152
|
added localisation updates by Sworddragon
|
2010-11-21 14:25:00 +01:00 |
|
oy
|
ba05ddd0f5
|
removed duplicate entry from the localisation files
|
2010-11-21 14:12:39 +01:00 |
|
oy
|
f62a1c3818
|
updated language files
|
2010-11-21 00:49:10 +01:00 |
|
GreYFoXGTi
|
4d204d642f
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/engine/console.h
src/engine/shared/console.cpp
src/engine/shared/console.h
|
2010-10-26 00:25:36 +02:00 |
|
Choupom
|
65be8e5750
|
fixed error reading localizations
|
2010-10-25 18:57:30 +02:00 |
|
GreYFoXGTi
|
11f480a79b
|
Changed the Loading String to Loading DDRace Client
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-08-28 19:59:24 +02:00 |
|
vierkant
|
8625f42e30
|
Dutch translation. Some small errors and the editor translations
|
2010-06-09 20:40:12 +08:00 |
|
Fujnky
|
7ca5e0fbb1
|
Fixed localizations, most german translation strings fit in buttons now.
|
2010-06-07 16:17:40 +02:00 |
|
Fujnky
|
7cc7c8f84e
|
Merged with master
|
2010-06-07 16:00:01 +02:00 |
|
Fujnky
|
bf68f803e3
|
Internationalized editor and updated german localization
|
2010-06-05 23:36:52 +02:00 |
|
vierkant
|
7b19d24b84
|
better translation
|
2010-06-04 04:20:25 -07:00 |
|
vierkant
|
bd04ae2d77
|
sorted alphabetically
|
2010-06-04 02:41:13 -07:00 |
|
vierkant
|
b7a4193467
|
Dutch translation
|
2010-06-03 10:06:34 -07:00 |
|
Fujnky
|
551170656d
|
Fixed localization for 'Error loading demo'-Popup
|
2010-06-03 17:41:45 +02:00 |
|
Fujnky
|
5a641132e7
|
Fixed localization for 'Error loading demo'-Popup
|
2010-06-03 17:07:15 +02:00 |
|
Fujnky
|
d581e413c8
|
More localization fixes
|
2010-06-03 11:30:05 +02:00 |
|
Fujnky
|
0d4c0ccef5
|
Some localization fixes
|
2010-06-02 21:03:15 +02:00 |
|
Tom Adams
|
08df0fe63d
|
added fix for italian translation by Lanta
|
2010-05-30 14:26:04 +00:00 |
|
Tom Adams
|
baa57830ad
|
fixed bubble sort loop (#802), 2 entries in the language files and a possible overrun
|
2010-05-29 23:57:30 +00:00 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|