diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 01dea6cb2..940ae6c4d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -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 diff --git a/data/languages/arabic.txt b/data/languages/arabic.txt index 3f649cdeb..bede41360 100644 --- a/data/languages/arabic.txt +++ b/data/languages/arabic.txt @@ -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. == ﻮﻴﻨﻣ ﺱﻭﺎﻤﻟﺍ ﺔﻴﺳﺎﺴﺣ diff --git a/data/languages/belarusian.txt b/data/languages/belarusian.txt index ef2b72edb..30c5294ee 100644 --- a/data/languages/belarusian.txt +++ b/data/languages/belarusian.txt @@ -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 diff --git a/data/languages/bosnian.txt b/data/languages/bosnian.txt index 21c7bcfd4..bfa271ab4 100644 --- a/data/languages/bosnian.txt +++ b/data/languages/bosnian.txt @@ -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 diff --git a/data/languages/brazilian_portuguese.txt b/data/languages/brazilian_portuguese.txt index 66b7cf329..08caafd5e 100644 --- a/data/languages/brazilian_portuguese.txt +++ b/data/languages/brazilian_portuguese.txt @@ -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. diff --git a/data/languages/bulgarian.txt b/data/languages/bulgarian.txt index b536abc55..34f60e605 100644 --- a/data/languages/bulgarian.txt +++ b/data/languages/bulgarian.txt @@ -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 diff --git a/data/languages/catalan.txt b/data/languages/catalan.txt index 1da285759..748b6c9a8 100644 --- a/data/languages/catalan.txt +++ b/data/languages/catalan.txt @@ -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. diff --git a/data/languages/chuvash.txt b/data/languages/chuvash.txt index f1b4356c0..b15741bae 100644 --- a/data/languages/chuvash.txt +++ b/data/languages/chuvash.txt @@ -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 diff --git a/data/languages/czech.txt b/data/languages/czech.txt index 94c28b049..9c4d3d944 100644 --- a/data/languages/czech.txt +++ b/data/languages/czech.txt @@ -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 diff --git a/data/languages/danish.txt b/data/languages/danish.txt index d96fae815..83bd7b22e 100644 --- a/data/languages/danish.txt +++ b/data/languages/danish.txt @@ -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 diff --git a/data/languages/dutch.txt b/data/languages/dutch.txt index ff856b4e6..c0ead52be 100644 --- a/data/languages/dutch.txt +++ b/data/languages/dutch.txt @@ -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 diff --git a/data/languages/finnish.txt b/data/languages/finnish.txt index 9e3e3b079..9d4baf5aa 100644 --- a/data/languages/finnish.txt +++ b/data/languages/finnish.txt @@ -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 diff --git a/data/languages/french.txt b/data/languages/french.txt index 99da849e3..a47a521aa 100644 --- a/data/languages/french.txt +++ b/data/languages/french.txt @@ -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 diff --git a/data/languages/german.txt b/data/languages/german.txt index b3c2c12c3..597564a22 100644 --- a/data/languages/german.txt +++ b/data/languages/german.txt @@ -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. diff --git a/data/languages/greek.txt b/data/languages/greek.txt index 72ce39f88..b7769a89b 100644 --- a/data/languages/greek.txt +++ b/data/languages/greek.txt @@ -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 diff --git a/data/languages/hungarian.txt b/data/languages/hungarian.txt index aea3a8244..defd2ced4 100644 --- a/data/languages/hungarian.txt +++ b/data/languages/hungarian.txt @@ -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 diff --git a/data/languages/italian.txt b/data/languages/italian.txt index a0ca1f784..e04971102 100644 --- a/data/languages/italian.txt +++ b/data/languages/italian.txt @@ -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 diff --git a/data/languages/japanese.txt b/data/languages/japanese.txt index dd1a73ace..d385c1c68 100644 --- a/data/languages/japanese.txt +++ b/data/languages/japanese.txt @@ -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 diff --git a/data/languages/korean.txt b/data/languages/korean.txt index 9b5282efd..924435b06 100644 --- a/data/languages/korean.txt +++ b/data/languages/korean.txt @@ -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 diff --git a/data/languages/kyrgyz.txt b/data/languages/kyrgyz.txt index d05d4ac82..594bd83a0 100644 --- a/data/languages/kyrgyz.txt +++ b/data/languages/kyrgyz.txt @@ -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 diff --git a/data/languages/norwegian.txt b/data/languages/norwegian.txt index a642cc864..bd3a6abf7 100644 --- a/data/languages/norwegian.txt +++ b/data/languages/norwegian.txt @@ -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 diff --git a/data/languages/persian.txt b/data/languages/persian.txt index 8ac4dd32c..491ffcbaa 100644 --- a/data/languages/persian.txt +++ b/data/languages/persian.txt @@ -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 diff --git a/data/languages/polish.txt b/data/languages/polish.txt index b4de84728..407f22e09 100644 --- a/data/languages/polish.txt +++ b/data/languages/polish.txt @@ -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! diff --git a/data/languages/portuguese.txt b/data/languages/portuguese.txt index 3a2475de1..a1708ded9 100644 --- a/data/languages/portuguese.txt +++ b/data/languages/portuguese.txt @@ -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 diff --git a/data/languages/romanian.txt b/data/languages/romanian.txt index a9ddd7f04..4a41ff605 100644 --- a/data/languages/romanian.txt +++ b/data/languages/romanian.txt @@ -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 diff --git a/data/languages/russian.txt b/data/languages/russian.txt index f187366c3..507e74ac7 100644 --- a/data/languages/russian.txt +++ b/data/languages/russian.txt @@ -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 == Использовать высокую чувств. diff --git a/data/languages/serbian.txt b/data/languages/serbian.txt index 655ba46ef..c56e3ddc5 100644 --- a/data/languages/serbian.txt +++ b/data/languages/serbian.txt @@ -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 diff --git a/data/languages/serbian_cyrillic.txt b/data/languages/serbian_cyrillic.txt index c2c27918f..be817dd14 100644 --- a/data/languages/serbian_cyrillic.txt +++ b/data/languages/serbian_cyrillic.txt @@ -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 diff --git a/data/languages/simplified_chinese.txt b/data/languages/simplified_chinese.txt index 27b263074..231d821ee 100644 --- a/data/languages/simplified_chinese.txt +++ b/data/languages/simplified_chinese.txt @@ -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? == 文件已存在,是否覆盖? diff --git a/data/languages/slovak.txt b/data/languages/slovak.txt index 311096eec..71b28d08e 100644 --- a/data/languages/slovak.txt +++ b/data/languages/slovak.txt @@ -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 diff --git a/data/languages/spanish.txt b/data/languages/spanish.txt index dfcaba839..fa0617a3f 100644 --- a/data/languages/spanish.txt +++ b/data/languages/spanish.txt @@ -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 diff --git a/data/languages/swedish.txt b/data/languages/swedish.txt index 14e9c259a..3ad0933f5 100644 --- a/data/languages/swedish.txt +++ b/data/languages/swedish.txt @@ -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 diff --git a/data/languages/traditional_chinese.txt b/data/languages/traditional_chinese.txt index 97b56fc1e..6402c0f8d 100644 --- a/data/languages/traditional_chinese.txt +++ b/data/languages/traditional_chinese.txt @@ -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? == 檔案已存在,是否覆蓋? diff --git a/data/languages/turkish.txt b/data/languages/turkish.txt index 69088b26b..7aff424ff 100644 --- a/data/languages/turkish.txt +++ b/data/languages/turkish.txt @@ -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 diff --git a/data/languages/ukrainian.txt b/data/languages/ukrainian.txt index 0e6c5e283..46bfa0b38 100644 --- a/data/languages/ukrainian.txt +++ b/data/languages/ukrainian.txt @@ -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 diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp index 86700933b..a370325f5 100644 --- a/src/game/client/components/menus_settings.cpp +++ b/src/game/client/components/menus_settings.cpp @@ -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;