Skip to content

Commit

Permalink
Merge #2999 #3001 #3003
Browse files Browse the repository at this point in the history
2999: Add Serbian Cyrillic translation r=def- a=cobisimo

This is adding Serbian Cyrillic translation and contain complete translation with latest strings.

by Veljko Radovanovic (VekiPro)

3001: Use skin pointer directly r=def- a=Jupeyy

Can't tell if setting the hot item in gui invalidly can potentially break stuff, also a skin refresh button would make this useless anyway

3003: Update brazilian_portuguese.txt r=def- a=rffontenelle



Co-authored-by: Nikola Radovanovic <nikola.r@toptal.com>
Co-authored-by: Jupeyy <jupjopjap@gmail.com>
Co-authored-by: Rafael Fontenelle <rffontenelle@users.noreply.github.com>
  • Loading branch information
4 people committed Oct 4, 2020
4 parents b33b329 + 31b6194 + 7f78ecd + 1ac0483 commit 9df4299
Show file tree
Hide file tree
Showing 5 changed files with 1,281 additions and 16 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Expand Up @@ -1070,6 +1070,7 @@ set(EXPECTED_DATA
languages/romanian.txt
languages/russian.txt
languages/serbian.txt
languages/serbian_cyrillic.txt
languages/simplified_chinese.txt
languages/slovak.txt
languages/spanish.txt
Expand Down
30 changes: 15 additions & 15 deletions data/languages/brazilian_portuguese.txt
Expand Up @@ -1241,46 +1241,46 @@ Play
== Jogar

Downloading ddnet-info.json failed
==
== Falha ao baixar ddnet-info.json

Saving ddnet-settings.cfg failed
==
== Falha ao salvar ddnet-settings.cfg

Theme
==
== Tema

File
==
== Arquivo

Demos directory
==
== Diretório de demos

Themes directory
==
== Diretório de temas

Skin Database
==
== Banco de Dados de Skins

Skins directory
==
== Diretório de skins

Background music volume
==
== Volume da música de fundo

Assets
==
== Ativos

Use current map as background
==
== Usar o mapa atual como plano de fundo

Entities
==
== Entidades

Emoticons
==
== Emoticons

Particles
==
== Partículas

Assets directory
==
== Diretório de ativos
4 changes: 4 additions & 0 deletions data/languages/index.txt
Expand Up @@ -92,6 +92,10 @@ serbian
== Srpski
== 688

serbian_cyrillic
== Српски
== 688

simplified_chinese
== 简体中文
== 156
Expand Down

0 comments on commit 9df4299

Please sign in to comment.