edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #2999 #3001 #3003

Browse source 
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>
This commit is contained in:
bors[bot] 2020-10-04 08:01:53 +00:00 committed by GitHub
parent b33b3295c0 31b6194ca1 7f78ecde82 1ac04833ec
commit 9df4299bb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 1281 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -1070,6 +1070,7 @@ set(EXPECTED_DATA
languages/romanian.txt languages/romanian.txt
languages/russian.txt languages/russian.txt
languages/serbian.txt languages/serbian.txt
languages/serbian_cyrillic.txt
languages/simplified_chinese.txt languages/simplified_chinese.txt
languages/slovak.txt languages/slovak.txt
languages/spanish.txt languages/spanish.txt

30
data/languages/brazilian_portuguese.txt
View file

@ -1241,46 +1241,46 @@ Play
== Jogar == Jogar
Downloading ddnet-info.json failed Downloading ddnet-info.json failed
== == Falha ao baixar ddnet-info.json
Saving ddnet-settings.cfg failed Saving ddnet-settings.cfg failed
== == Falha ao salvar ddnet-settings.cfg
Theme Theme
== == Tema
File File
== == Arquivo
Demos directory Demos directory
== == Diretório de demos
Themes directory Themes directory
== == Diretório de temas
Skin Database Skin Database
== == Banco de Dados de Skins
Skins directory Skins directory
== == Diretório de skins
Background music volume Background music volume
== == Volume da música de fundo
Assets Assets
== == Ativos
Use current map as background Use current map as background
== == Usar o mapa atual como plano de fundo
Entities Entities
== == Entidades
Emoticons Emoticons
== == Emoticons
Particles Particles
== == Partículas
Assets directory Assets directory
== == Diretório de ativos

4
data/languages/index.txt
View file

@ -92,6 +92,10 @@ serbian
== Srpski == Srpski
== 688 == 688
serbian_cyrillic
== Српски
== 688
simplified_chinese simplified_chinese
== 简体中文 == 简体中文
== 156 == 156

1260
data/languages/serbian_cyrillic.txt Normal file
View file

File diff suppressed because it is too large Load diff

2
src/game/client/components/menus_settings.cpp
View file

@ -618,7 +618,7 @@ void CMenus::RenderSettingsTee(CUIRect MainView)
if(str_comp(s->m_aName, Skin) == 0) if(str_comp(s->m_aName, Skin) == 0)
OldSelected = i; OldSelected = i;
CListboxItem Item = UiDoListboxNextItem(&s_paSkinList[i], OldSelected == i); CListboxItem Item = UiDoListboxNextItem(s_paSkinList[i], OldSelected == i);
char aBuf[128]; char aBuf[128];
if(Item.m_Visible) if(Item.m_Visible)
{ {