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 #3946

Browse source 
3946: Another MacOS -> macOS in translations r=Jupeyy a=def-

<!-- What is the motivation for the changes of this pull request -->

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: def <dennis@felsin9.de>
This commit is contained in:
bors[bot] 2021-07-08 17:20:24 +00:00 committed by GitHub
parent 46af07f1db 6598e0a543
commit a8b3cc2a96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 54 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yaml vendored
View file

@ -65,7 +65,7 @@ jobs:
run: |
sudo apt-get install libmariadbclient-dev libwebsockets-dev -y
- name: Prepare MacOS
- name: Prepare macOS
if: contains(matrix.os, 'macOS')
run: |
brew update || true

4
data/languages/arabic.txt
View file

@ -885,8 +885,8 @@ may cause delay
Preinit VBO (iGPUs only)
== Preinit-VBO (iGPUs ﻂﻘﻓ)
Multiple texture units (disable for MacOS)
== ﺮﺘﺴﻜﺗ ﻦﻣ ﺮﺜﻛﺍ ( ﺖﻨﻛ ﺍﺫﺍ ﺔﺋﺎﻔﻃﺍ MacOS )
Multiple texture units (disable for macOS)
== ﺮﺘﺴﻜﺗ ﻦﻣ ﺮﺜﻛﺍ ( ﺖﻨﻛ ﺍﺫﺍ ﺔﺋﺎﻔﻃﺍ macOS )
UI mouse s.
== ﻮﻴﻨﻣ ﺱﻭﺎﻤﻟﺍ ﺔﻴﺳﺎﺴﺣ

2
data/languages/belarusian.txt
View file

@ -994,7 +994,7 @@ Use modern OpenGL
Preinit VBO (iGPUs only)
==
Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
==
Use high DPI

4
data/languages/bosnian.txt
View file

@ -898,8 +898,8 @@ Screen
Preinit VBO (iGPUs only)
== Inicijalizuj VBO (samo iGPU-ovi)
Multiple texture units (disable for MacOS)
== Više tekturnih jedinica (isljučeno za MacOS)
Multiple texture units (disable for macOS)
== Više tekturnih jedinica (isljučeno za macOS)
Use high DPI
== Koristi visoki DPI

2
data/languages/brazilian_portuguese.txt
View file

@ -920,7 +920,7 @@ Preinit VBO (iGPUs only)
Activate
== Ativar
Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
== Várias unidades de textura (desabilite para macOS)
UI mouse s.

2
data/languages/bulgarian.txt
View file

@ -994,7 +994,7 @@ Use modern OpenGL
Preinit VBO (iGPUs only)
==
Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
==
Use high DPI

4
data/languages/catalan.txt
View file

@ -897,8 +897,8 @@ Preinit VBO (iGPUs only)
Activate
== Activar
Multiple texture units (disable for MacOS)
== Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
== Multiple texture units (disable for macOS)
UI mouse s.
== UI mouse s.

2
data/languages/chuvash.txt
View file

@ -955,7 +955,7 @@ Use OpenGL 3.3 (experimental)
Preinit VBO (iGPUs only)
==
Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
==
Use high DPI

4
data/languages/czech.txt
View file

@ -891,8 +891,8 @@ Screen
Preinit VBO (iGPUs only)
== Preinit VBO (pouze iGPU)
Multiple texture units (disable for MacOS)
== Více texturových jednotek (deaktivovat pro MacOS)
Multiple texture units (disable for macOS)
== Více texturových jednotek (deaktivovat pro macOS)
Use high DPI
== Použít vysoké DPI

4
data/languages/danish.txt
View file

@ -944,8 +944,8 @@ Screen
Preinit VBO (iGPUs only)
== Præinit VBO (iGPUs alene)
Multiple texture units (disable for MacOS)
== Flere teksturenheder (deaktiver for MacOS)
Multiple texture units (disable for macOS)
== Flere teksturenheder (deaktiver for macOS)
Use high DPI
== Brug højt DPI

4
data/languages/dutch.txt
View file

@ -912,8 +912,8 @@ Screen
Preinit VBO (iGPUs only)
== Preinit VBO (alleen iGPUs)
Multiple texture units (disable for MacOS)
== Meerdere texture eenheden (uitgeschakeld voor MacOS)
Multiple texture units (disable for macOS)
== Meerdere texture eenheden (uitgeschakeld voor macOS)
Use high DPI
== Gebruik hoge DPI

2
data/languages/finnish.txt
View file

@ -994,7 +994,7 @@ Use modern OpenGL
Preinit VBO (iGPUs only)
== Esialusta VBO (vain iGPUt)
Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
== Monta tekstuuriyksikköä (älä käytä macOS:ällä)
Use high DPI

4
data/languages/french.txt
View file

@ -869,8 +869,8 @@ Remove chat
Markers:
== Marqueurs :
Multiple texture units (disable for MacOS)
== Unités de texture multiple (désactivé pour MacOS)
Multiple texture units (disable for macOS)
== Unités de texture multiple (désactivé pour macOS)
Pause
== Pause

2
data/languages/german.txt
View file

@ -910,7 +910,7 @@ may cause delay
Preinit VBO (iGPUs only)
== Preinit-VBO (nur für iGPUs)
Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
== Mehrere Textureinheiten (nicht für Mac OS)
UI mouse s.

2
data/languages/greek.txt
View file

@ -955,7 +955,7 @@ Use OpenGL 3.3 (experimental)
Preinit VBO (iGPUs only)
==
Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
==
Use high DPI

4
data/languages/hungarian.txt
View file

@ -906,8 +906,8 @@ Threaded sound loading
Activate
== Aktiválás
Multiple texture units (disable for MacOS)
== Több textúra egységek (kapcsolja ki MacOS esetén)
Multiple texture units (disable for macOS)
== Több textúra egységek (kapcsolja ki macOS esetén)
UI mouse s.
== UI egér sebesség

2
data/languages/italian.txt
View file

@ -976,7 +976,7 @@ Screen
Preinit VBO (iGPUs only)
== Preinit VBO (solo iGPU)
Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
== Unità multiple di texture
Use high DPI

2
data/languages/japanese.txt
View file

@ -994,7 +994,7 @@ Use modern OpenGL
Preinit VBO (iGPUs only)
== VBO を事前初期化（統合型グラフィックのみ）
Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
== 多重テクスチャユニット（macOS 以外）
Use high DPI

2
data/languages/korean.txt
View file

@ -993,7 +993,7 @@ Use modern OpenGL
Preinit VBO (iGPUs only)
==
Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
==
Use high DPI

2
data/languages/kyrgyz.txt
View file

@ -985,7 +985,7 @@ Use modern OpenGL
Preinit VBO (iGPUs only)
==
Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
==
Use high DPI

4
data/languages/norwegian.txt
View file

@ -903,8 +903,8 @@ Screen
Preinit VBO (iGPUs only)
== Preinit. VBO (kun iGPU)
Multiple texture units (disable for MacOS)
== Multiple texture units (slå av for MacOS)
Multiple texture units (disable for macOS)
== Multiple texture units (slå av for macOS)
Use high DPI
== Bruk høy DPI

2
data/languages/persian.txt
View file

@ -838,7 +838,7 @@ Use modern OpenGL
Preinit VBO (iGPUs only)
==
Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
==
Use high DPI

4
data/languages/polish.txt
View file

@ -811,8 +811,8 @@ Destination file already exist
Reload
== Przeładuj
Multiple texture units (disable for MacOS)
== Jednostki z wieloma teksturami (wyłącz dla MacOS)
Multiple texture units (disable for macOS)
== Jednostki z wieloma teksturami (wyłącz dla macOS)
Replay feature is disabled!
== Funkcja odtwarzania jest wyłączona!

2
data/languages/portuguese.txt
View file

@ -1121,7 +1121,7 @@ Use modern OpenGL
Preinit VBO (iGPUs only)
==
Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
==
Use high DPI

2
data/languages/romanian.txt
View file

@ -1000,7 +1000,7 @@ Use modern OpenGL
Preinit VBO (iGPUs only)
==
Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
==
Use high DPI

4
data/languages/russian.txt
View file

@ -984,8 +984,8 @@ Screen
Preinit VBO (iGPUs only)
== Преинициал-ть VBO (только iGPU)
Multiple texture units (disable for MacOS)
== Улучш. блоки текстур (откл. для MacOS)
Multiple texture units (disable for macOS)
== Улучш. блоки текстур (откл. для macOS)
Use high DPI
== Использовать высокую чувств.

2
data/languages/serbian.txt
View file

@ -998,7 +998,7 @@ Use modern OpenGL
Preinit VBO (iGPUs only)
==
Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
==
Use high DPI

4
data/languages/serbian_cyrillic.txt
View file

@ -937,8 +937,8 @@ may cause delay
Preinit VBO (iGPUs only)
== Preinit VBO (само у iGPUs)
Multiple texture units (disable for MacOS)
== Вишеструке текстурне јединице (угашено за MacOS)
Multiple texture units (disable for macOS)
== Вишеструке текстурне јединице (угашено за macOS)
Use high DPI
== Користи високи DPI

4
data/languages/simplified_chinese.txt
View file

@ -924,8 +924,8 @@ Preinit VBO (iGPUs only)
Activate
== 启用
Multiple texture units (disable for MacOS)
== 多重纹理单元 (MacOS不可用)
Multiple texture units (disable for macOS)
== 多重纹理单元 (macOS不可用)
File already exists, do you want to overwrite it?
== 文件已存在，是否覆盖？

2
data/languages/slovak.txt
View file

@ -994,7 +994,7 @@ Use modern OpenGL
Preinit VBO (iGPUs only)
==
Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
==
Use high DPI

4
data/languages/spanish.txt
View file

@ -909,8 +909,8 @@ Screen
Preinit VBO (iGPUs only)
== Preinit VBO (solo iGPU)
Multiple texture units (disable for MacOS)
== Múltiples unidades de textura (deshabilitar para MacOS)
Multiple texture units (disable for macOS)
== Múltiples unidades de textura (deshabilitar para macOS)
Use high DPI
== Usar DPI alto

4
data/languages/swedish.txt
View file

@ -886,8 +886,8 @@ Normal message
Show score
== Visa poäng
Multiple texture units (disable for MacOS)
== Multiple texture units (avaktivera för MacOS)
Multiple texture units (disable for macOS)
== Multiple texture units (avaktivera för macOS)
Refresh Rate
== Uppdateringsfrekvens

4
data/languages/traditional_chinese.txt
View file

@ -917,8 +917,8 @@ Preinit VBO (iGPUs only)
Activate
== 啟用
Multiple texture units (disable for MacOS)
== 多重紋理單元 (MacOS不可用)
Multiple texture units (disable for macOS)
== 多重紋理單元 (macOS不可用)
File already exists, do you want to overwrite it?
== 檔案已存在，是否覆蓋？

4
data/languages/turkish.txt
View file

@ -909,8 +909,8 @@ Screen
Preinit VBO (iGPUs only)
== Preinit VBO (sadece iGPUs)
Multiple texture units (disable for MacOS)
== Çoklu doku birimleri (MacOS'da kullanılmaz)
Multiple texture units (disable for macOS)
== Çoklu doku birimleri (macOS'da kullanılmaz)
Use high DPI
== Yüksek DPI kullan

4
data/languages/ukrainian.txt
View file

@ -892,8 +892,8 @@ Screen
Preinit VBO (iGPUs only)
== Preinit VBO (iGPUs only)
Multiple texture units (disable for MacOS)
== Декілька текстурних одиниць (вимкнути для MacOS)
Multiple texture units (disable for macOS)
== Декілька текстурних одиниць (вимкнути для macOS)
Use high DPI
== Використовувати високий DPI

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

@ -1225,7 +1225,7 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
}
MainView.HSplitTop(20.0f, &Button, &MainView);
if(DoButton_CheckBox(&g_Config.m_GfxEnableTextureUnitOptimization, Localize("Multiple texture units (disable for MacOS)"), g_Config.m_GfxEnableTextureUnitOptimization, &Button))
if(DoButton_CheckBox(&g_Config.m_GfxEnableTextureUnitOptimization, Localize("Multiple texture units (disable for macOS)"), g_Config.m_GfxEnableTextureUnitOptimization, &Button))
{
CheckSettings = true;
g_Config.m_GfxEnableTextureUnitOptimization ^= 1;