$ git status
On branch updatebot-test-pull-chillerbot
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Changes to be committed:
modified: data/languages/belarusian.txt
modified: data/languages/bosnian.txt
modified: data/languages/bulgarian.txt
modified: data/languages/chuvash.txt
modified: data/languages/dutch.txt
modified: data/languages/finnish.txt
modified: data/languages/greek.txt
modified: data/languages/hungarian.txt
modified: data/languages/korean.txt
modified: data/languages/kyrgyz.txt
modified: data/languages/persian.txt
modified: data/languages/romanian.txt
modified: data/languages/serbian.txt
modified: data/languages/slovak.txt
modified: data/languages/swedish.txt
modified: data/languages/turkish.txt
modified: src/game/client/components/scoreboard.cpp
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: data/languages/arabic.txt
both modified: data/languages/brazilian_portuguese.txt
both modified: data/languages/catalan.txt
both modified: data/languages/czech.txt
both modified: data/languages/danish.txt
both modified: data/languages/french.txt
both modified: data/languages/german.txt
both modified: data/languages/italian.txt
both modified: data/languages/japanese.txt
both modified: data/languages/norwegian.txt
both modified: data/languages/polish.txt
both modified: data/languages/portuguese.txt
both modified: data/languages/russian.txt
both modified: data/languages/serbian_cyrillic.txt
both modified: data/languages/simplified_chinese.txt
both modified: data/languages/spanish.txt
both modified: data/languages/traditional_chinese.txt
both modified: data/languages/ukrainian.txt
Conflicts:
data/languages/arabic.txt
DDNet %s is available:
==
Discord
==
https://ddnet.tw/discord
==
<<<<<<< HEAD
Tutorial
==
Can't find a Tutorial server
=======
Super
==
Team %d
>>>>>>> updatebot-test-pull-ddnet
data/languages/brazilian_portuguese.txt
Graphics cards
== Placas de vídeo
auto
== auto
Run on join
== Executar ao entrar
Chat command (e.g. showall 1)
<<<<<<< HEAD
== Comando de chat (p. ex., showall 1)
Tutorial
== Tutorial
Can't find a Tutorial server
== Não foi possível encontrar o servidor de tutorial
=======
==
data/languages/catalan.txt
Graphics cards
== Tarjetes gràfiques
auto
== auto
Run on join
== Córrer en unir-se
Chat command (e.g. showall 1)
<<<<<<< HEAD
== Commanda del xat (e.g showall 1)
Tutorial
== Tutorial
Can't find a Tutorial server
== No s'ha pogut trobar un servidor del tutorial
=======
==
data/languages/czech.txt
Chat command (e.g. showall 1)
==
Discord
==
https://ddnet.tw/discord
==
<<<<<<< HEAD
Tutorial
==
Can't find a Tutorial server
=======
Super
==
Team %d
>>>>>>> updatebot-test-pull-ddnet
data/languages/danish.txt
Chat command (e.g. showall 1)
==
Discord
==
https://ddnet.tw/discord
==
<<<<<<< HEAD
Tutorial
==
Can't find a Tutorial server
=======
Super
==
Team %d
>>>>>>> updatebot-test-pull-ddnet
data/languages/french.txt
Config directory
== Répertoire de configuration
Windowed fullscreen
== Plein écran fenêtré
Run on join
== Exécuter en rejoignant
Chat command (e.g. showall 1)
<<<<<<< HEAD
== Commande du chat (ex: showall 1)
The format of texture %s is not RGBA which will cause visual bugs.
== La texture %s n'est pas au format RGBA, ce qui causera des bugs visuels.
Join Tutorial Server
== Rejoindre un serveur de tutoriel
Skip Tutorial
== Passer le tutoriel
data/languages/german.txt
Run on join
== Ausführen beim Betreten
Chat command (e.g. showall 1)
== Chat-Befehl (z.B. showall 1)
Windowed fullscreen
== Vollbild-Fenster
<<<<<<< HEAD
The format of texture %s is not RGBA which will cause visual bugs.
== Das Format der Textur %s ist nicht RGBA was graphische Fehler verursachen wird.
Join Tutorial Server
== Tutorial-Server betreten
Skip Tutorial
== Tutorial überspringen
Renderer
data/languages/italian.txt
Chat command (e.g. showall 1)
==
Discord
==
https://ddnet.tw/discord
==
<<<<<<< HEAD
Tutorial
==
Can't find a Tutorial server
=======
Super
==
Team %d
>>>>>>> updatebot-test-pull-ddnet
data/languages/japanese.txt
Show local player's key presses
==
Run on join
==
Chat command (e.g. showall 1)
==
<<<<<<< HEAD
Tutorial
==
Can't find a Tutorial server
=======
Super
==
Team %d
>>>>>>> updatebot-test-pull-ddnet
data/languages/norwegian.txt
Chat command (e.g. showall 1)
==
Discord
==
https://ddnet.tw/discord
==
<<<<<<< HEAD
Tutorial
==
Can't find a Tutorial server
=======
Super
==
Team %d
>>>>>>> updatebot-test-pull-ddnet
data/languages/polish.txt
Chat command (e.g. showall 1)
==
Discord
==
https://ddnet.tw/discord
==
<<<<<<< HEAD
Tutorial
==
Can't find a Tutorial server
=======
Super
==
Team %d
>>>>>>> updatebot-test-pull-ddnet
data/languages/portuguese.txt
Disconnect Dummy
== Desconectar Dummy
Are you sure that you want to disconnect your dummy?
== Tens a certeza que queres desconectar o teu dummy?
Welcome to DDNet
== Bem-vindo à DDNet
<<<<<<< HEAD
=======
Most importantly communication is key: There is no tutorial so you'll have to chat (t key) with other players to learn the basics and tricks of the game.
== O mais importante é a comunicação: Não existe um tutorial pelo que terás de utilizar o chat (tecla t) para conversar com outros jogadores para que aprendas os básicos e os truques do jogo.
>>>>>>> updatebot-test-pull-ddnet
It's recommended that you check the settings to adjust them to your liking before joining a server.
== É recomendado que verifiques as definições para ajustá-las a teu gosto antes de te juntares a um servidor.
Please enter your nickname below.
== Por favor introduz o teu nome abaixo.
--
Settings
== Definições
Stop server
== Parar servidor
Editor
== Editor
[Start menu]
<<<<<<< HEAD
=======
%d new mentions
== %d novas menções
9+ new mentions
== 9+ novas menções
>>>>>>> updatebot-test-pull-ddnet
Successfully saved the replay!
==
Replay feature is disabled!
==
The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
==
<<<<<<< HEAD
The format of texture %s is not RGBA which will cause visual bugs.
==
=======
>>>>>>> updatebot-test-pull-ddnet
Debug mode enabled. Press Ctrl+Shift+D to disable debug mode.
==
Server best:
==
--
Render demo
==
Replace video
==
DDraceNetwork is a cooperative online game where the goal is for you and your group of tees to reach the finish line of the map. As a newcomer you should start on Novice servers, which host the easiest maps. Consider the ping to choose a server close to you.
==
<<<<<<< HEAD
Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
==
Join Tutorial Server
==
Skip Tutorial
==
=======
--
Entities
==
Emoticons
==
Assets directory
==
<<<<<<< HEAD
Tutorial
==
Can't find a Tutorial server
==
=======
>>>>>>> updatebot-test-pull-ddnet
Run server
==
--
==
Spree
==
Grabs
==
1 new mention
==
<<<<<<< HEAD
%d new mentions
==
9+ new mentions
==
=======
>>>>>>> updatebot-test-pull-ddnet
data/languages/russian.txt
auto
==
Run on join
==
Chat command (e.g. showall 1)
==
<<<<<<< HEAD
Tutorial
==
Can't find a Tutorial server
=======
Super
==
Team %d
>>>>>>> updatebot-test-pull-ddnet
data/languages/serbian_cyrillic.txt
Chat command (e.g. showall 1)
==
Discord
==
https://ddnet.tw/discord
==
<<<<<<< HEAD
Tutorial
==
Can't find a Tutorial server
=======
Super
==
Team %d
>>>>>>> updatebot-test-pull-ddnet
data/languages/simplified_chinese.txt
Run on join
== 进入时执行
Chat command (e.g. showall 1)
== 聊天指令（例如: showall 1）
Windowed fullscreen
== 窗口化全屏
<<<<<<< HEAD
The format of texture %s is not RGBA which will cause visual bugs.
== 纹理文件 %s 并非 RGBA 格式，这可能会导致显示错误。
Join Tutorial Server
== 进入教学服务器
Skip Tutorial
== 跳过教学
Renderer
data/languages/spanish.txt
Config directory
== Directorio de configuración
Run on join
== Ejec. al entrar
Chat command (e.g. showall 1)
== Comando de chat (Ej. showall 1)
<<<<<<< HEAD
The format of texture %s is not RGBA which will cause visual bugs.
== El formato de la textura %s no es RGBA, lo que puede causar errores visuales.
Join Tutorial Server
== Ir a un servidor Tutorial
Skip Tutorial
== Saltar Tutorial
Windowed fullscreen
data/languages/traditional_chinese.txt
Run on join
== 加入時執行
Chat command (e.g. showall 1)
== 聊天指令 (例如: showall 1)
Windowed fullscreen
== 視窗化全螢幕
<<<<<<< HEAD
The format of texture %s is not RGBA which will cause visual bugs.
== %s 材質文件并非RGBA格式因此可能會導致視覺錯誤
Join Tutorial Server
== 進入教學伺服器
Skip Tutorial
== 跳過教學
Renderer
data/languages/ukrainian.txt
auto
==
Run on join
==
Chat command (e.g. showall 1)
==
<<<<<<< HEAD
Tutorial
==
Can't find a Tutorial server
=======
Super
==
Team %d
>>>>>>> updatebot-test-pull-ddnet
Failed to merge https://github.com/ddnet/ddnet/pull/4726 into chillerbot
Conflicts: