edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #2982 #2985 #2996

Browse source 
2982: Update french translation r=Jupeyy a=def-

by SunnyPistache & Pipou

2985: No country flag for Traditional Chinese r=Jupeyy a=def-



2996: Make types/countries fit ingame (fixes #2989) r=Jupeyy a=def-



Co-authored-by: def <dennis@felsin9.de>
This commit is contained in:
bors[bot] 2020-10-04 02:22:18 +00:00 committed by GitHub
parent e368dabc80 73f44c0d95 7a97512cdf 3a55ff86d6
commit 9717c4453f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
data/languages/french.txt
View file

@ -15,6 +15,7 @@
# Ubu 2011-04-04 21:09:05
# Choupom 2011-07-02 19:23:49
# SunnyPistache & Pipou 2020-07-09 21:09:00
# SunnyPistache & Pipou 2020-10-03 09:29:00
##### /authors #####
##### translated strings #####
@ -1187,110 +1188,110 @@ transmits your player name to info2.ddnet.tw
== transmet votre pseudonyme à info2.ddnet.tw
Downloading ddnet-info.json failed
==
== Le téléchargement de ddnet-info.json a échoué
Saving ddnet-settings.cfg failed
==
== L'enregistrement de ddnet-settings.cfg a échoué
The width or height of texture %s is not divisible by 16, which might cause visual bugs.
==
== La largeur ou la hauteur de la texture %s n'est pas divisible par 16, ce qui pourrait causer des bugs visuels
Warning
==
== Alerte
Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
==
== Appuyez sur "k" pour mourir (recommencer) et "a" pour vous mettre en pause afin de regarder les autres joueurs. Allez dans les configurations pour voir davantage de raccourcis.
Country / Region
==
== Pays / Region
Speed
==
== Vitesse
Theme
==
== Thème
%d of %d servers
==
== %d sur %d serveurs
%d of %d server
==
== %d sur %d serveur
%d players
==
== %d joueurs
%d player
==
== %d joueur
File
==
== Fichier
Demos directory
==
== Répertoire des enregistrements
Skip the main menu
==
== Passer le menu principal
Themes directory
==
== Répertoire des thèmes
Download skins
==
== Télécharger des skins
Skin Database
==
== Base de données de skins
Skins directory
==
== Répertoire des skins
Background music volume
==
== Volume de la musique de fond
Assets
==
== Assets
Client message
==
== Message du client
Show others (own team only)
==
== Montrer les autres (de sa propre équipe uniquement)
Use current map as background
==
== Utiliser la carte actuelle en tant qu'arrière-plan
Entities
==
== Entités
Emoticons
==
== Émoticônes
Particles
==
== Particles
Assets directory
==
== Répertoire des assets
https://wiki.ddnet.tw/
==
== https://wiki.ddnet.tw/
Website
==
== Site web
Settings
==
== Configurations
Stop server
==
== Arrêter le serveur
Run server
==
== Démarrer le serveur
Server executable not found, can't run server
==
== L'exécutable du serveur est introuvable, le serveur ne peut donc pas démarrer
Editor
==
== Éditeur
[Start menu]
Play
==
== Jouer

2
data/languages/index.txt
View file

@ -110,7 +110,7 @@ swedish
traditional_chinese
== 繁體中文
== 158
== -1
turkish
== Türkçe

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

@ -807,7 +807,7 @@ void CMenus::RenderServerbrowserFilters(CUIRect View)
// add more space
ServerFilter.HSplitTop(5.0f, 0, &ServerFilter);
ServerFilter.HSplitTop(20.0f, &Button, &ServerFilter);
ServerFilter.HSplitTop(140.0f, &ServerFilter, 0);
ServerFilter.HSplitTop(120.0f, &ServerFilter, 0);
RenderTools()->DrawUIRect(&ServerFilter, ms_ColorTabbarActive, CUI::CORNER_B, 10.0f);