about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--data/languages/bosnian.txt3
-rw-r--r--data/languages/bulgarian.txt3
-rw-r--r--data/languages/czech.txt3
-rw-r--r--data/languages/danish.txt3
-rw-r--r--data/languages/dutch.txt17
-rw-r--r--data/languages/finnish.txt3
-rw-r--r--data/languages/french.txt3
-rw-r--r--data/languages/german.txt19
-rw-r--r--data/languages/index.txt3
-rw-r--r--data/languages/italian.txt463
-rw-r--r--data/languages/norwegian.txt3
-rw-r--r--data/languages/polish.txt3
-rw-r--r--data/languages/portuguese.txt28
-rw-r--r--data/languages/romanian.txt3
-rw-r--r--data/languages/russian.txt19
-rw-r--r--data/languages/serbian.txt3
-rw-r--r--data/languages/slovak.txt3
-rw-r--r--data/languages/spanish.txt3
-rw-r--r--data/languages/swedish.txt3
-rw-r--r--data/languages/turkish.txt673
-rw-r--r--data/languages/ukrainian.txt3
-rw-r--r--data/mapres/jungle_deathtiles.pngbin264060 -> 263805 bytes
-rw-r--r--data/mapres/jungle_doodads.pngbin237695 -> 237659 bytes
-rw-r--r--src/engine/server/server.cpp4
-rw-r--r--src/game/client/components/menus_browser.cpp7
-rw-r--r--src/game/client/components/menus_demo.cpp2
-rw-r--r--src/game/editor/ed_editor.cpp11
-rw-r--r--src/game/editor/ed_editor.h2
28 files changed, 1012 insertions, 278 deletions
diff --git a/data/languages/bosnian.txt b/data/languages/bosnian.txt
index 2915511a..eb22257a 100644
--- a/data/languages/bosnian.txt
+++ b/data/languages/bosnian.txt
@@ -657,6 +657,9 @@ no limit
 
 ##### needs translation #####
 
+Demofile: %s
+== 
+
 Play background music
 == 
 
diff --git a/data/languages/bulgarian.txt b/data/languages/bulgarian.txt
index 47af094e..b1554ea0 100644
--- a/data/languages/bulgarian.txt
+++ b/data/languages/bulgarian.txt
@@ -657,6 +657,9 @@ no limit
 
 ##### needs translation #####
 
+Demofile: %s
+== 
+
 Play background music
 == 
 
diff --git a/data/languages/czech.txt b/data/languages/czech.txt
index 88a7675a..b604891f 100644
--- a/data/languages/czech.txt
+++ b/data/languages/czech.txt
@@ -657,6 +657,9 @@ no limit
 
 ##### needs translation #####
 
+Demofile: %s
+== 
+
 Play background music
 == 
 
diff --git a/data/languages/danish.txt b/data/languages/danish.txt
index bd2225fd..da025407 100644
--- a/data/languages/danish.txt
+++ b/data/languages/danish.txt
@@ -657,6 +657,9 @@ no limit
 
 ##### needs translation #####
 
+Demofile: %s
+== 
+
 Play background music
 == 
 
diff --git a/data/languages/dutch.txt b/data/languages/dutch.txt
index e8fc7b7b..4cd9a7bd 100644
--- a/data/languages/dutch.txt
+++ b/data/languages/dutch.txt
@@ -388,6 +388,9 @@ Pistol
 Play
 == Spelen
 
+Play background music
+== Speel achtergrondmuziek
+
 Player
 == Speler
 
@@ -538,6 +541,12 @@ Sound volume
 Spectate
 == Toekijken
 
+Spectate next
+== Volg volgende speler
+
+Spectate previous
+== Volg vorige speler
+
 Spectator mode
 == Toeschouwer modus
 
@@ -657,13 +666,7 @@ no limit
 
 ##### needs translation #####
 
-Play background music
-== 
-
-Spectate next
-== 
-
-Spectate previous
+Demofile: %s
 == 
 
 ##### old translations #####
diff --git a/data/languages/finnish.txt b/data/languages/finnish.txt
index 60650940..6e7825ea 100644
--- a/data/languages/finnish.txt
+++ b/data/languages/finnish.txt
@@ -657,6 +657,9 @@ no limit
 
 ##### needs translation #####
 
+Demofile: %s
+== 
+
 Play background music
 == 
 
diff --git a/data/languages/french.txt b/data/languages/french.txt
index 52ef4fc9..9344a013 100644
--- a/data/languages/french.txt
+++ b/data/languages/french.txt
@@ -657,6 +657,9 @@ no limit
 
 ##### needs translation #####
 
+Demofile: %s
+== 
+
 Play background music
 == 
 
diff --git a/data/languages/german.txt b/data/languages/german.txt
index 799d2865..a5dbefb1 100644
--- a/data/languages/german.txt
+++ b/data/languages/german.txt
@@ -388,6 +388,9 @@ Pistol
 Play
 == Abspielen
 
+Play background music
+== Hintergrundmusik abspielen
+
 Player
 == Spieler
 
@@ -538,6 +541,12 @@ Sound volume
 Spectate
 == Zuschauen
 
+Spectate next
+== Nächstem zusehen
+
+Spectate previous
+== Vorherigem zusehen
+
 Spectator mode
 == Zuschaueroptionen
 
@@ -578,7 +587,7 @@ The server is running a non-standard tuning on a pure game type.
 == Der Server läuft nicht mit Standardeinstellungen.
 
 There's an unsaved map in the editor, you might want to save it before you quit the game.
-== Im Editor ist noch eine ungespeicherte Karte.
+== Im Editor ist noch eine ungespeicherte Karte. Vielleicht möchtest du sie speichern.
 
 Time limit
 == Zeitlimit
@@ -657,13 +666,7 @@ no limit
 
 ##### needs translation #####
 
-Play background music
-== 
-
-Spectate next
-== 
-
-Spectate previous
+Demofile: %s
 == 
 
 ##### old translations #####
diff --git a/data/languages/index.txt b/data/languages/index.txt
index fbdae862..fa5862c9 100644
--- a/data/languages/index.txt
+++ b/data/languages/index.txt
@@ -55,5 +55,8 @@ spanish
 swedish
 == Svenska
 
+turkish
+== Türkçe
+
 ukrainian
 == Українська
diff --git a/data/languages/italian.txt b/data/languages/italian.txt
index cb136560..6e5e03ac 100644
--- a/data/languages/italian.txt
+++ b/data/languages/italian.txt
@@ -1,30 +1,45 @@
 
 ##### translated strings #####
 
+%d Bytes
+== %d Bytes
+
 %d of %d servers, %d players
-== %d di %d server, %d giocatori
+== %d di %d servers, %d giocatori
 
 %d%% loaded
-== %d%% caricati
+== %d%% caricato
 
 %ds left
-== %ds ancora
+== %ds rimanenti
 
 %i minute left
-== %i minuto ancora
+== %i minuto residuo
 
 %i minutes left
-== %i minuti ancora
+== %i minuti residui
 
 %i second left
-== %i secondo ancora
+== %i secondo residuo
 
 %i seconds left
-== %i secondi ancora
+== %i secondi residui
+
+%s wins!
+== %s vittorie!
+
+-Page %d-
+== -Pagina %d-
 
 Abort
 == Annulla
 
+Add
+== Aggiungi
+
+Add Friend
+== Aggiungi Amico
+
 Address
 == Indirizzo
 
@@ -35,25 +50,28 @@ Alpha
 == Alpha
 
 Always show name plates
-== Mostra sempre etichette dei nomi
+== Mostra sempre nomi
 
 Are you sure that you want to delete the demo?
-== Sicuro di voler cancellare questa registrazione?
+== Sicuro di voler eliminare la demo?
 
 Are you sure that you want to quit?
 == Sicuro di voler uscire?
 
+Are you sure that you want to remove the player from your friends list?
+== Sicuro di voler rimuovere il giocatore dalla lista degli amici?
+
 As this is the first time you launch the game, please enter your nick name below. It's recommended that you check the settings to adjust them to your liking before joining a server.
-== E' la prima volta che avvii il gioco, ti preghiamo di inserire il tuo nickname. E' consigliato aggiustare le impostazioni in base alle proprie preferenze prima di entrare in un server.
+== E' la prima volta che avvii il gioco, inserisci il tuo nickname. E' bene che tu controlli le opzioni prima di giocare per avere una migliore esperienza di gioco.
 
 Automatically record demos
-== Registra demo automaticamente
+== Registra automaticamente demo
 
 Automatically take game over screenshot
-== Foto automatica a fine partita
+== Cattura automaticamente la schermata 'game over'
 
 Blue team
-== Squadra Blu
+== Squadra blu
 
 Blue team wins!
 == La squadra blu ha vinto!
@@ -62,11 +80,20 @@ Body
 == Corpo
 
 Call vote
-== Inizia voto
+== Chiama voto
+
+Change settings
+== Cambia configurazione
 
 Chat
 == Chat
 
+Clan
+== Clan
+
+Client
+== Client
+
 Close
 == Chiudi
 
@@ -80,7 +107,7 @@ Connecting to
 == Connessione a
 
 Connection Problems...
-== Connessione Persa...
+== Problemi di connessione...
 
 Console
 == Console
@@ -88,6 +115,18 @@ Console
 Controls
 == Controlli
 
+Count players only
+== Conta solo giocatori
+
+Country
+== Paese
+
+Crc:
+== Crc:
+
+Created:
+== Creato:
+
 Current
 == Attuale
 
@@ -98,10 +137,13 @@ Custom colors
 == Colori personalizzati
 
 Delete
-== Cancella
+== Elimina
 
 Delete demo
-== Cancella demo
+== Elimina demo
+
+Demo details
+== Dettagli demo
 
 Demos
 == Demo
@@ -113,19 +155,19 @@ Disconnected
 == Disconnesso
 
 Display Modes
-== Tipo di visualizzazione
+== Modalità Display
 
 Downloading map
-== Scaricando la mappa
+== Scaricamento mappa
 
 Draw!
-== Pareggio!
+== Patta!
 
 Dynamic Camera
-== Visuale dinamica
+== Camera dinamica
 
 Emoticon
-== Emozioni
+== Emoticon
 
 Enter
 == Entra
@@ -134,10 +176,10 @@ Error
 == Errore
 
 Error loading demo
-== Impossibile caricare la demo
+== Errore caricamento demo
 
 FSAA samples
-== Esempi FSAA
+== Campioni FSAA
 
 Favorite
 == Preferito
@@ -160,29 +202,35 @@ Folder
 Force vote
 == Forza voto
 
+Free-View
+== Camera libera
+
+Friends
+== Amici
+
 Fullscreen
-== Schermo intero
+== A tutto schermo
 
 Game
-== Gioco
+== Partita
 
 Game info
-== Dettagli gioco
+== Informazioni partita
 
 Game over
-== Game over
+== Fine partita
 
 Game type
-== Tipo di gioco
+== Modalità di gioco
 
 Game types:
-== Tipi di gioco:
+== Modalità di gioco:
 
 General
 == Generale
 
 Graphics
-== Grafica
+== Gráfica
 
 Grenade
 == Granata
@@ -191,22 +239,22 @@ Hammer
 == Martello
 
 Has people playing
-== Ha gente in gioco
+== Contiene giocatori
 
 High Detail
-== Molti dettagli
+== Alta Risoluzione
 
 Hook
 == Rampino
 
 Host address
-== Indirizzo host
+== Indirizzo Host
 
 Hue
-== Col.
+== Tinta
 
 Info
-== Info
+== Informazioni
 
 Internet
 == Internet
@@ -215,35 +263,50 @@ Invalid Demo
 == Demo non valida
 
 Join blue
-== Entra blu
+== Unisciti ai blu
 
 Join game
-== Entra
+== Unisciti alla partita
 
 Join red
-== Entra rosso
+== Unisciti ai rossi
 
 Jump
 == Salta
 
+Kick player
+== Espelli giocatore
+
 LAN
 == LAN
 
 Language
 == Lingua
 
+Length:
+== Lunghezza:
+
 Lht.
-== Lum.
+== Luminosità
 
 Loading
 == Caricamento
 
 MOTD
-== MDG
+== MOTD
 
 Map
 == Mappa
 
+Map:
+== Mappa:
+
+Max Screenshots
+== Screenshot Massimi
+
+Max demos
+== Demo massime
+
 Maximum ping:
 == Ping massimo:
 
@@ -251,31 +314,40 @@ Miscellaneous
 == Altro
 
 Mouse sens.
-== Sensibilità
+== Sensività del mouse
 
 Move left
-== Muovi a sinistra
+== Sinistra
+
+Move player to spectators
+== Muovi giocatore tra gli spettatori
 
 Move right
-== Muovi a destra
+== Destra
 
 Movement
 == Movimento
 
 Mute when not active
-== Muto quando inattivo
+== Silenzioso se inattivo
 
 Name
 == Nome
 
 Name plates size
-== Dimensione etichetta
+== Lunghezza nomi
+
+Netversion:
+== Versione net
+
+New name:
+== Nuovo nome:
 
 News
 == Notizie
 
 Next weapon
-== Successiva
+== Prossima arma
 
 Nickname
 == Nickname
@@ -290,7 +362,7 @@ No servers found
 == Nessun server trovato
 
 No servers match your filter criteria
-== Nessun server corrisponde ai filtri di ricerca
+== Nessun server rispecchia i tuoi criteri
 
 Ok
 == Ok
@@ -299,7 +371,7 @@ Open
 == Apri
 
 Parent Folder
-== Indietro
+== Cartella superiore
 
 Password
 == Password
@@ -314,22 +386,25 @@ Pistol
 == Pistola
 
 Play
-== Guarda
+== Gioca
 
 Player
 == Giocatore
 
+Player options
+== Opzioni giocatore
+
 Players
 == Giocatori
 
 Please balance teams!
-== Squadre sbilanciate!
+== Bilancia le squadre!
 
 Prev. weapon
-== Precedente
+== Arma precedente
 
 Quality Textures
-== Textures di qualità
+== Qualità Textures
 
 Quick search:
 == Ricerca rapida:
@@ -337,6 +412,12 @@ Quick search:
 Quit
 == Esci
 
+Quit anyway?
+== Vuoi uscire comunque?
+
+REC %3d:%02d
+== REC %3d:%02d
+
 Reason:
 == Motivo:
 
@@ -347,100 +428,136 @@ Red team
 == Squadra rossa
 
 Red team wins!
-== La squadra rossa ha vinto!
+== La squadra rossa vince!
 
 Refresh
 == Aggiorna
 
 Refreshing master servers
-== Aggiornando la lista server
+== Aggiornamento server principali
 
 Remote console
 == Console remota
 
+Remove
+== Rimuovi
+
+Remove friend
+== Rimuovi amico
+
+Rename
+== Renomina
+
+Rename demo
+== Rinomina demo
+
 Reset filter
-== Annulla filtri
+== Azzera filtri
 
 Reset to defaults
-== Reimposta
+== Ripristina impostazioni iniziali
 
 Rifle
-== Laser
+== Mitra
 
 Round
-== Turno
+== Round
 
 Sample rate
-== Frequenza
+== Frequenza di campionamento
 
 Sat.
 == Sat.
 
 Score
-== Punti
+== Punteggi
 
 Score board
-== Scoreboard
+== Tabella dei Punteggi
 
 Score limit
-== Punteggio massimo
+== Punteggio Max.
 
 Scoreboard
-== Scoreboard
+== Tabella dei Punteggi
 
 Screenshot
-== Screenshot
+== Schermata
+
+Server address:
+== Indirizzo server:
 
 Server details
-== Dettagli del server
+== Dettagli server
+
+Server filter
+== Filtri server
 
 Server info
-== Dettagli
+== Info server
 
 Server not full
 == Server non pieno
 
 Settings
-== Impostazioni
+== Configurazioni
 
 Shotgun
 == Fucile
 
 Show chat
-== Mostra Chat
+== Mostra chat
+
+Show friends
+== Mostra amici
+
+Show ingame HUD
+== Mostra HUD in gioco
 
 Show name plates
-== Mostra etichetta nomi
+== Mostra nomi
 
 Show only supported
 == Mostra solo supportati
 
+Size:
+== Dimensioni:
+
 Skins
 == Skins
 
 Sound
 == Suono
 
+Sound error
+== Suono errore
+
 Sound volume
-== Volume
+== Volume suono
 
 Spectate
-== Osserva
+== Spettatore
+
+Spectator mode
+== Modalità spettatore
 
 Spectators
 == Spettatori
 
 Standard gametype
-== Tipo di gioco classico
+== Tipo di gioco standard
 
 Standard map
-== Mappa classica
+== Mappa standard
 
 Stop record
-== Termina reg.
+== Ferma registrazione
+
+Sudden Death
+== Morte istantanea
 
 Switch weapon on pickup
-== Cambia arma alla raccolta
+== Cambia arma automaticamente
 
 Team
 == Squadra
@@ -449,37 +566,49 @@ Team chat
 == Chat di squadra
 
 Teeworlds %s is out! Download it at www.teeworlds.com!
-== E' uscito Teeworlds %s! Scaricalo da www.teeworlds.com !
+== Teeworlds %s e' stato rilasciato! Scaricalo da www.teeworlds.com!
 
 Texture Compression
-== Compressione Texture
+== Compressione textures
 
 The audio device couldn't be initialised.
 == Il dispositivo audio non può essere inizializzato.
 
 The server is running a non-standard tuning on a pure game type.
-== Il server sta eseguendo un tuning non-standard su un tipo di gioco classico.
+== Il server è attivo con una configurazione non standard in una modalità di gioco pura.
+
+There's an unsaved map in the editor, you might want to save it before you quit the game.
+== C'è una mappa non salvata nell'editor, sicuramente vorrai salvarla prima di uscire.
 
 Time limit
-== Limite di tempo
+== Limite tempo.
 
 Time limit: %d min
-== Tempo limite %d min
+== Limite tempo: %d min
 
 Try again
-== Ritenta
+== Riprova
 
 Type
-== Tipo
+== Tipologia
+
+Type:
+== Tipologia:
 
 UI Color
-== Colore del menu
+== Colore UI
 
 Unable to delete the demo
-== Impossibile eliminare la registrazione
+== Impossibile eliminare la demo
+
+Unable to rename the demo
+== Impossibile rinominare la demo
 
 Use sounds
-== Usa suoni
+== Attiva suoni
+
+Use team colors for name plates
+== Utilizza i colori del team per i nomi
 
 V-Sync
 == V-Sync
@@ -487,6 +616,15 @@ V-Sync
 Version
 == Versione
 
+Version:
+== Versione:
+
+Vote command:
+== Comando voto:
+
+Vote description:
+== Descrizione voto:
+
 Vote no
 == Vota no
 
@@ -494,10 +632,13 @@ Vote yes
 == Vota si
 
 Voting
-== Votazione
+== Votazione in corso
+
+Warmup
+== Riscaldamento
 
 Weapon
-== Attiva arma
+== Arma
 
 Welcome to Teeworlds
 == Benvenuto su Teeworlds!
@@ -506,165 +647,27 @@ Yes
 == Si
 
 You must restart the game for all settings to take effect.
-== E' necessario riavviare il gioco per rendere effettive le modifiche.
+== E' necessario riavviare il gioco per impostare i cambiamenti.
 
 Your skin
-== La tua Skin
+== Tua skin
 
 no limit
-== senza limite
+== senza limiti
 
 ##### needs translation #####
 
-%d Bytes
-== 
-
-%s wins!
-== 
-
--Page %d-
-== 
-
-Add
-== 
-
-Add Friend
-== 
-
-Are you sure that you want to remove the player from your friends list?
-== 
-
-Change settings
-== 
-
-Clan
-== 
-
-Client
-== 
-
-Count players only
-== 
-
-Country
-== 
-
-Crc:
-== 
-
-Created:
-== 
-
-Demo details
-== 
-
-Free-View
-== 
-
-Friends
-== 
-
-Kick player
-== 
-
-Length:
-== 
-
-Map:
-== 
-
-Max Screenshots
-== 
-
-Max demos
-== 
-
-Move player to spectators
-== 
-
-Netversion:
-== 
-
-New name:
+Demofile: %s
 == 
 
 Play background music
 == 
 
-Player options
-== 
-
-Quit anyway?
-== 
-
-REC %3d:%02d
-== 
-
-Remove
-== 
-
-Remove friend
-== 
-
-Rename
-== 
-
-Rename demo
-== 
-
-Server address:
-== 
-
-Server filter
-== 
-
-Show friends
-== 
-
-Show ingame HUD
-== 
-
-Size:
-== 
-
-Sound error
-== 
-
 Spectate next
 == 
 
 Spectate previous
 == 
 
-Spectator mode
-== 
-
-Sudden Death
-== 
-
-There's an unsaved map in the editor, you might want to save it before you quit the game.
-== 
-
-Type:
-== 
-
-Unable to rename the demo
-== 
-
-Use team colors for name plates
-== 
-
-Version:
-== 
-
-Vote command:
-== 
-
-Vote description:
-== 
-
-Warmup
-== 
-
 ##### old translations #####
 
diff --git a/data/languages/norwegian.txt b/data/languages/norwegian.txt
index 2e944ea5..18846891 100644
--- a/data/languages/norwegian.txt
+++ b/data/languages/norwegian.txt
@@ -657,6 +657,9 @@ no limit
 
 ##### needs translation #####
 
+Demofile: %s
+== 
+
 Play background music
 == 
 
diff --git a/data/languages/polish.txt b/data/languages/polish.txt
index fbc7c0da..ed75f3ed 100644
--- a/data/languages/polish.txt
+++ b/data/languages/polish.txt
@@ -531,6 +531,9 @@ Delete demo
 Demo details
 == 
 
+Demofile: %s
+== 
+
 Folder
 == 
 
diff --git a/data/languages/portuguese.txt b/data/languages/portuguese.txt
index 08e2e68c..0821e6a6 100644
--- a/data/languages/portuguese.txt
+++ b/data/languages/portuguese.txt
@@ -61,6 +61,9 @@ Are you sure that you want to quit?
 Are you sure that you want to remove the player from your friends list?
 == Tem certeza que deseja remover o jogador da sua lista de amigos?
 
+As this is the first time you launch the game, please enter your nick name below. It's recommended that you check the settings to adjust them to your liking before joining a server.
+== Como esta é a primeira vez que você abre o jogo, por favor, coloque seu apelido abaixo. É recomendado que você verifique as configurações e então ajuste-as para suas preferências antes de entrar em um servidor.
+
 Automatically record demos
 == Gravar demos automaticamente
 
@@ -385,6 +388,9 @@ Pistol
 Play
 == Assistir
 
+Play background music
+== Tocar música de fundo
+
 Player
 == Jogador
 
@@ -482,7 +488,7 @@ Screenshot
 == Captura de tela
 
 Server address:
-== Endereço do server:
+== End. do servidor:
 
 Server details
 == Detalhes do server
@@ -535,6 +541,12 @@ Sound volume
 Spectate
 == Observar
 
+Spectate next
+== Observar próximo
+
+Spectate previous
+== Observar anterior
+
 Spectator mode
 == Modo Observador
 
@@ -654,17 +666,11 @@ no limit
 
 ##### needs translation #####
 
-As this is the first time you launch the game, please enter your nick name below. It's recommended that you check the settings to adjust them to your liking before joining a server.
-== 
-
-Play background music
-== 
-
-Spectate next
-== 
-
-Spectate previous
+Demofile: %s
 == 
 
 ##### old translations #####
 
+
+== ## translated strings #####
+
diff --git a/data/languages/romanian.txt b/data/languages/romanian.txt
index ca2aff9a..894a0dbe 100644
--- a/data/languages/romanian.txt
+++ b/data/languages/romanian.txt
@@ -657,6 +657,9 @@ no limit
 
 ##### needs translation #####
 
+Demofile: %s
+== 
+
 Play background music
 == 
 
diff --git a/data/languages/russian.txt b/data/languages/russian.txt
index dd8a6ec8..183df36f 100644
--- a/data/languages/russian.txt
+++ b/data/languages/russian.txt
@@ -388,6 +388,9 @@ Pistol
 Play
 == Воспроизвести
 
+Play background music
+== Воспроизвести фоновую музыку
+
 Player
 == Игрок
 
@@ -398,7 +401,7 @@ Players
 == Игроки
 
 Please balance teams!
-== Пожалуйста отбалансируйте команды!
+== Пожалуйста cбалансируйте команды!
 
 Prev. weapon
 == Пред. оружие
@@ -538,6 +541,12 @@ Sound volume
 Spectate
 == Наблюдать
 
+Spectate next
+== Наблюдать следующего
+
+Spectate previous
+== Наблюдать предыдущего
+
 Spectator mode
 == Наблюдатель
 
@@ -657,13 +666,7 @@ no limit
 
 ##### needs translation #####
 
-Play background music
-== 
-
-Spectate next
-== 
-
-Spectate previous
+Demofile: %s
 == 
 
 ##### old translations #####
diff --git a/data/languages/serbian.txt b/data/languages/serbian.txt
index 99501d77..f2a92625 100644
--- a/data/languages/serbian.txt
+++ b/data/languages/serbian.txt
@@ -528,6 +528,9 @@ Delete demo
 Demo details
 == 
 
+Demofile: %s
+== 
+
 Folder
 == 
 
diff --git a/data/languages/slovak.txt b/data/languages/slovak.txt
index 25ca442c..62d18363 100644
--- a/data/languages/slovak.txt
+++ b/data/languages/slovak.txt
@@ -657,6 +657,9 @@ no limit
 
 ##### needs translation #####
 
+Demofile: %s
+== 
+
 Play background music
 == 
 
diff --git a/data/languages/spanish.txt b/data/languages/spanish.txt
index b015fc3a..27fd05db 100644
--- a/data/languages/spanish.txt
+++ b/data/languages/spanish.txt
@@ -657,6 +657,9 @@ no limit
 
 ##### needs translation #####
 
+Demofile: %s
+== 
+
 Play background music
 == 
 
diff --git a/data/languages/swedish.txt b/data/languages/swedish.txt
index 22176110..fa7282a3 100644
--- a/data/languages/swedish.txt
+++ b/data/languages/swedish.txt
@@ -657,6 +657,9 @@ no limit
 
 ##### needs translation #####
 
+Demofile: %s
+== 
+
 Play background music
 == 
 
diff --git a/data/languages/turkish.txt b/data/languages/turkish.txt
new file mode 100644
index 00000000..64a02918
--- /dev/null
+++ b/data/languages/turkish.txt
@@ -0,0 +1,673 @@
+
+##### translated strings #####
+
+%d Bytes
+== %d Bayt
+
+%d of %d servers, %d players
+== %d/%d sunucu, %d oyuncu
+
+%d%% loaded
+== %d%% yüklendi
+
+%ds left
+== %ds kaldı
+
+%i minute left
+== %i dakika kaldı
+
+%i minutes left
+== %i dakika kaldı
+
+%i second left
+== %i saniye kaldı
+
+%i seconds left
+== %i saniye kaldı
+
+%s wins!
+== %s kazandı!
+
+-Page %d-
+== -Page %d-
+
+Abort
+== İptal
+
+Add
+== Ekle
+
+Add Friend
+== Arkadaş Ekle
+
+Address
+== Adres
+
+All
+== Hepsi
+
+Alpha
+== Alfa
+
+Always show name plates
+== İsim etiketlerini herzaman göster
+
+Are you sure that you want to delete the demo?
+== Bu demo dosyasını silmek istediğinize eminmisiniz?
+
+Are you sure that you want to quit?
+== Çıkmak istediğinize eminmisiniz?
+
+Are you sure that you want to remove the player from your friends list?
+== Bu oyuncuyu arkadaş listenizden kaldırmak istediğinize emin misiniz?
+
+As this is the first time you launch the game, please enter your nick name below. It's recommended that you check the settings to adjust them to your liking before joining a server.
+== Oyunu ilk açışınız olduğundan takma adınızı giriniz. Bir oyuna katılmadan evvel ayarlara bakmanız ve isteğinize göre özelleştirmeniz önerilir.
+
+Automatically record demos
+== Otomatik olarak demo kaydet
+
+Automatically take game over screenshot
+== Otomatik olarak oyun bitişinde ekran görüntüsü al
+
+Blue team
+== Mavi takım
+
+Blue team wins!
+== Mavi takım kazandı!
+
+Body
+== Gövde
+
+Call vote
+== Oylama başlat
+
+Change settings
+== Ayarları değiştir
+
+Chat
+== Chat
+
+Clan
+== Clan
+
+Client
+== İstemci
+
+Close
+== Kapa
+
+Compatible version
+== Uyumlu versiyon
+
+Connect
+== Bağlan
+
+Connecting to
+== Bağlanılıyor
+
+Connection Problems...
+== Bağlantı Hatası...
+
+Console
+== Konsol
+
+Controls
+== Kontroller
+
+Count players only
+== Sadece oyuncuları say
+
+Country
+== Ülke
+
+Crc:
+== Crc :
+
+Created:
+== Hazırlandı :
+
+Current
+== Şimdiki
+
+Current version: %s
+== Mevcut versyon : %s
+
+Custom colors
+== Özel renkler
+
+Delete
+== Sil
+
+Delete demo
+== Demoyu sil
+
+Demo details
+== Demo ayrıntıları
+
+Demos
+== Demolar
+
+Disconnect
+== Bağlantıyı kes
+
+Disconnected
+== Bağlantı kesildi
+
+Display Modes
+== Çözünürlük
+
+Downloading map
+== Harita yükleniyor
+
+Draw!
+== Berabere!
+
+Dynamic Camera
+== Dinamik kamera
+
+Emoticon
+== Yüz ifadesi
+
+Enter
+== Gir
+
+Error
+== Hata
+
+Error loading demo
+== Demo yüklenirken hata oluştu
+
+FSAA samples
+== FSAA örnekleri
+
+Favorite
+== Favori
+
+Favorites
+== Favoriler
+
+Feet
+== Ayak
+
+Filter
+== Filtre
+
+Fire
+== Ateş
+
+Folder
+== Dosya
+
+Force vote
+== Oylamayı zorla
+
+Free-View
+== Serbest Görüntü
+
+Friends
+== Arkadaşlar
+
+Fullscreen
+== Tam ekran
+
+Game
+== Oyun
+
+Game info
+== Oyun bilgisi
+
+Game over
+== Oyun sonu
+
+Game type
+== Oyun türü
+
+Game types:
+== Oyun türü:
+
+General
+== Genel
+
+Graphics
+== Grafik
+
+Grenade
+== El bombası
+
+Hammer
+== Çekiç
+
+Has people playing
+== Oynayan insan bulunduran
+
+High Detail
+== High Detail
+
+Hook
+== Kanca
+
+Host address
+== Sunucu adresi
+
+Hue
+== Renk
+
+Info
+== Bilgi
+
+Internet
+== Internet
+
+Invalid Demo
+== Geçersiz Demo
+
+Join blue
+== Maviye katıl
+
+Join game
+== Oyuna katıl
+
+Join red
+== Kırmızıya katıl
+
+Jump
+== Zıpla
+
+Kick player
+== Oyuncuyu At
+
+LAN
+== LAN
+
+Language
+== Dil
+
+Length:
+== Uzunluk:
+
+Lht.
+== Parlaklık
+
+Loading
+== Yükleniyor
+
+MOTD
+== MOTD
+
+Map
+== Harita
+
+Map:
+== Harita:
+
+Max Screenshots
+== Maksimum Ekran Alıntısı
+
+Max demos
+== Maksimum Demo
+
+Maximum ping:
+== Maximum ping
+
+Miscellaneous
+== Çeşitli
+
+Mouse sens.
+== Mouse duyarlılığı
+
+Move left
+== Sola git
+
+Move player to spectators
+== Seyircilere katıl
+
+Move right
+== Sağa git
+
+Movement
+== Hareket
+
+Mute when not active
+== Aktif değilken sessizleştir
+
+Name
+== İsim
+
+Name plates size
+== Boyut
+
+Netversion:
+== Netversion :
+
+New name:
+== Yeni isim :
+
+News
+== Haberler
+
+Next weapon
+== Sonraki silah
+
+Nickname
+== Takma ad
+
+No
+== Hayır
+
+No password
+== Şifresiz
+
+No servers found
+== Sunucu bulunamadı
+
+No servers match your filter criteria
+== Filtre kriterlerinize uygun sunucu bulunamadı
+
+Ok
+== Ok
+
+Open
+== Aç
+
+Parent Folder
+== Üst dizin
+
+Password
+== Şifre
+
+Password incorrect
+== Hatalı şifre
+
+Ping
+== Ping
+
+Pistol
+== Tabanca
+
+Play
+== Oynat
+
+Player
+== Oyuncu
+
+Player options
+== Oyuncu ayarları
+
+Players
+== Oyuncular
+
+Please balance teams!
+== Takımları dengeleyin!
+
+Prev. weapon
+== Önceki silah
+
+Quality Textures
+== Kaliteli dolgular
+
+Quick search:
+== Hızlı Arama :
+
+Quit
+== Çıkmak
+
+Quit anyway?
+== Çıkmak istediğinize emin misiniz?
+
+REC %3d:%02d
+== REC %3d:%02d
+
+Reason:
+== Neden :
+
+Record demo
+== Demo kaydet
+
+Red team
+== Kırmızı takım
+
+Red team wins!
+== Kırmızı takım kazandı!
+
+Refresh
+== Yenile
+
+Refreshing master servers
+== Ana sunucu yenileniyor
+
+Remote console
+== Uzak Konsol
+
+Remove
+== Çıkar
+
+Remove friend
+== Arkadaşı sil
+
+Rename
+== Yeniden isimlendir
+
+Rename demo
+== Demonun adını değiştir
+
+Reset filter
+== Filitreleri varsayılanlara getir
+
+Reset to defaults
+== Réinitialiser
+
+Rifle
+== Laser
+
+Round
+== Round
+
+Sample rate
+== Sample rate
+
+Sat.
+== Doygunluk
+
+Score
+== Skor
+
+Score board
+== Skor tahtası
+
+Score limit
+== Skor limiti
+
+Scoreboard
+== Skor tahtası
+
+Screenshot
+== Ekran alıntısı
+
+Server address:
+== Sunucu adresi :
+
+Server details
+== Sunucucu detayları
+
+Server filter
+== Filtreler
+
+Server info
+== Sunucu bilgisi
+
+Server not full
+== Sunucu dolu değil
+
+Settings
+== Ayarlar
+
+Shotgun
+== Tüfek
+
+Show chat
+== Sohbeti göster
+
+Show friends
+== Arkadaşları göster
+
+Show ingame HUD
+== Oyun içi HUD ı göster
+
+Show name plates
+== İsim etiketlerini göster
+
+Show only supported
+== Desteklenmeyen çözünürlükleri gizle
+
+Size:
+== Boyut:
+
+Skins
+== Skins
+
+Sound
+== Ses
+
+Sound error
+== Ses hatası
+
+Sound volume
+== Ses yüksekliği
+
+Spectate
+== İzle
+
+Spectator mode
+== İzleyici modu
+
+Spectators
+== İzleyiciler
+
+Standard gametype
+== Standart oyun türleri
+
+Standard map
+== Standart haritalar
+
+Stop record
+== Kaydı durdur
+
+Sudden Death
+== Ani ölüm
+
+Switch weapon on pickup
+== Silah alındığıda yeni silaha geç
+
+Team
+== Takım
+
+Team chat
+== Takım sohbeti
+
+Teeworlds %s is out! Download it at www.teeworlds.com!
+== Teeworlds %s çıktı! www.teeworlds.com dan indirin!
+
+Texture Compression
+== Dolgu sıkıştırması
+
+The audio device couldn't be initialised.
+== Ses donanımı başlatılamadı.
+
+The server is running a non-standard tuning on a pure game type.
+== Bu sunucu standart olmayan bir ayarı saf bir oyun türünde kullanıyor.
+
+There's an unsaved map in the editor, you might want to save it before you quit the game.
+== Editörde kaydedilmemiş bir harita var, kapatmadan evvel kaydetmek isteyebilirsiniz.
+
+Time limit
+== Süre limiti
+
+Time limit: %d min
+== Süre limiti: %d min
+
+Try again
+== Tekrar dene
+
+Type
+== Tür
+
+Type:
+== Tür:
+
+UI Color
+== Menü rengi
+
+Unable to delete the demo
+== Demo silinemiyor
+
+Unable to rename the demo
+== Demonun ismi değiştirilemiyor
+
+Use sounds
+== Sesleri kullan
+
+Use team colors for name plates
+== İsim etiketlerinde takım renklerini kullan
+
+V-Sync
+== V-Sync
+
+Version
+== Versyon
+
+Version:
+== Versyon :
+
+Vote command:
+== Komut:
+
+Vote description:
+== Açıklama :
+
+Vote no
+== Hayır oyu ver
+
+Vote yes
+== Evet oyu ver
+
+Voting
+== Oylama
+
+Warmup
+== Isınma
+
+Weapon
+== Silah
+
+Welcome to Teeworlds
+== Teeworlds'e hoşgeldin
+
+Yes
+== Evet
+
+You must restart the game for all settings to take effect.
+== Bütün ayarların aktif olması için oyunu yeniden başlatmalısınız.
+
+Your skin
+== Your skin
+
+no limit
+== limit yok
+
+##### needs translation #####
+
+Demofile: %s
+== 
+
+Play background music
+== 
+
+Spectate next
+== 
+
+Spectate previous
+== 
+
+##### old translations #####
+
diff --git a/data/languages/ukrainian.txt b/data/languages/ukrainian.txt
index c906e446..4b76b8f8 100644
--- a/data/languages/ukrainian.txt
+++ b/data/languages/ukrainian.txt
@@ -549,6 +549,9 @@ Delete demo
 Demo details
 == 
 
+Demofile: %s
+== 
+
 Free-View
 == 
 
diff --git a/data/mapres/jungle_deathtiles.png b/data/mapres/jungle_deathtiles.png
index ab1de32a..24ce0a63 100644
--- a/data/mapres/jungle_deathtiles.png
+++ b/data/mapres/jungle_deathtiles.png
Binary files differdiff --git a/data/mapres/jungle_doodads.png b/data/mapres/jungle_doodads.png
index 8123ad2a..cdafe4be 100644
--- a/data/mapres/jungle_doodads.png
+++ b/data/mapres/jungle_doodads.png
Binary files differdiff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp
index 266b9130..beac5b9a 100644
--- a/src/engine/server/server.cpp
+++ b/src/engine/server/server.cpp
@@ -355,11 +355,11 @@ int *CServer::LatestInput(int ClientID, int *size)
 const char *CServer::ClientName(int ClientID)
 {
 	if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State == CServer::CClient::STATE_EMPTY)
-		return "(invalid client)";
+		return "(invalid)";
 	if(m_aClients[ClientID].m_State == CServer::CClient::STATE_INGAME)
 		return m_aClients[ClientID].m_aName;
 	else
-		return "(connecting client)";
+		return "(connecting)";
 
 }
 
diff --git a/src/game/client/components/menus_browser.cpp b/src/game/client/components/menus_browser.cpp
index 3ab02db8..d517e669 100644
--- a/src/game/client/components/menus_browser.cpp
+++ b/src/game/client/components/menus_browser.cpp
@@ -619,23 +619,24 @@ void CMenus::RenderServerbrowserServerDetail(CUIRect View)
 
 	if (pSelectedServer)
 	{
-		ServerScoreBoard.VSplitLeft(5.0f, 0, &ServerScoreBoard);
 		ServerScoreBoard.Margin(3.0f, &ServerScoreBoard);
 		for (int i = 0; i < pSelectedServer->m_NumClients; i++)
 		{
 			CUIRect Name, Clan, Score, Flag;
 			ServerScoreBoard.HSplitTop(25.0f, &Name, &ServerScoreBoard);
+			RenderTools()->DrawUIRect(&Name, vec4(1,1,1,(i%2+1)*0.05f), CUI::CORNER_ALL, 4.0f);
+			Name.VSplitLeft(5.0f, 0, &Name);
 			Name.VSplitLeft(30.0f, &Score, &Name);
 			Name.VSplitRight(34.0f, &Name, &Flag);
 			Flag.HMargin(4.0f, &Flag);
-			Name.HSplitTop(12.0f, &Name, &Clan);
+			Name.HSplitTop(11.0f, &Name, &Clan);
 
 			// score
 			if(pSelectedServer->m_aClients[i].m_Player)
 			{
 				char aTemp[16];
 				str_format(aTemp, sizeof(aTemp), "%d", pSelectedServer->m_aClients[i].m_Score);
-				TextRender()->SetCursor(&Cursor, Score.x, Score.y+(Score.h-FontSize)/2.0f, FontSize, TEXTFLAG_RENDER|TEXTFLAG_STOP_AT_END);
+				TextRender()->SetCursor(&Cursor, Score.x, Score.y+(Score.h-FontSize)/4.0f, FontSize, TEXTFLAG_RENDER|TEXTFLAG_STOP_AT_END);
 				Cursor.m_LineWidth = Score.w;
 				TextRender()->TextEx(&Cursor, aTemp, -1);
 			}
diff --git a/src/game/client/components/menus_demo.cpp b/src/game/client/components/menus_demo.cpp
index 7fcfab99..28b22b7f 100644
--- a/src/game/client/components/menus_demo.cpp
+++ b/src/game/client/components/menus_demo.cpp
@@ -201,7 +201,7 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 
 		// demo name
 		char aBuf[128];
-		str_format(aBuf, sizeof(aBuf), "Demofile: %s", DemoPlayer()->GetDemoName());
+		str_format(aBuf, sizeof(aBuf), Localize("Demofile: %s"), DemoPlayer()->GetDemoName());
 		CTextCursor Cursor;
 		TextRender()->SetCursor(&Cursor, NameBar.x, NameBar.y, Button.h*0.5f, TEXTFLAG_RENDER|TEXTFLAG_STOP_AT_END);
 		Cursor.m_LineWidth = MainView.w;
diff --git a/src/game/editor/ed_editor.cpp b/src/game/editor/ed_editor.cpp
index 1163dc4a..2be4da76 100644
--- a/src/game/editor/ed_editor.cpp
+++ b/src/game/editor/ed_editor.cpp
@@ -1157,12 +1157,8 @@ void CEditor::DoQuadPoint(CQuad *pQuad, int QuadIndex, int V)
 	Graphics()->QuadsDraw(&QuadItem, 1);
 }
 
-void CEditor::DoMapEditor(CUIRect View, CUIRect ToolBar)
+void CEditor::DoMapEditor(CUIRect View, CUIRect ToolBar, bool ShowPicker)
 {
-	//UI()->ClipEnable(&view);
-
-	bool ShowPicker = Input()->KeyPressed(KEY_SPACE) != 0 && m_Dialog == DIALOG_NONE;
-
 	// render all good stuff
 	if(!ShowPicker)
 	{
@@ -3050,6 +3046,7 @@ void CEditor::Render()
 	RenderBackground(View, ms_CheckerTexture, 32.0f, 1.0f);
 
 	CUIRect MenuBar, CModeBar, ToolBar, StatusBar, EnvelopeEditor, ToolBox;
+	bool ShowPicker = Input()->KeyPressed(KEY_SPACE) != 0 && m_Dialog == DIALOG_NONE;
 
 	if(m_GuiActive)
 	{
@@ -3059,7 +3056,7 @@ void CEditor::Render()
 		View.VSplitLeft(100.0f, &ToolBox, &View);
 		View.HSplitBottom(16.0f, &View, &StatusBar);
 
-		if(m_ShowEnvelopeEditor)
+		if(m_ShowEnvelopeEditor && !ShowPicker)
 		{
 			float size = 125.0f;
 			if(m_ShowEnvelopeEditor == 2)
@@ -3072,7 +3069,7 @@ void CEditor::Render()
 
 	//	a little hack for now
 	if(m_Mode == MODE_LAYERS)
-		DoMapEditor(View, ToolBar);
+		DoMapEditor(View, ToolBar, ShowPicker);
 
 	if(m_GuiActive)
 	{
diff --git a/src/game/editor/ed_editor.h b/src/game/editor/ed_editor.h
index aab757e1..41162b22 100644
--- a/src/game/editor/ed_editor.h
+++ b/src/game/editor/ed_editor.h
@@ -697,7 +697,7 @@ public:
 	vec4 ButtonColorMul(const void *pID);
 
 	void DoQuadPoint(CQuad *pQuad, int QuadIndex, int v);
-	void DoMapEditor(CUIRect View, CUIRect Toolbar);
+	void DoMapEditor(CUIRect View, CUIRect Toolbar, bool ShowPicker);
 	void DoToolbar(CUIRect Toolbar);
 	void DoQuad(CQuad *pQuad, int Index);
 	float UiDoScrollbarV(const void *pID, const CUIRect *pRect, float Current);