From ffa955096fde17839062ba5f1d2333b6f0fca152 Mon Sep 17 00:00:00 2001 From: def Date: Mon, 31 Aug 2020 13:07:42 +0200 Subject: [PATCH] Add localization for texture warning, improve wording (fixes #2688) --- data/languages/belarusian.txt | 3 +++ data/languages/bosnian.txt | 3 +++ data/languages/brazilian_portuguese.txt | 3 +++ data/languages/bulgarian.txt | 3 +++ data/languages/catalan.txt | 3 +++ data/languages/chuvash.txt | 3 +++ data/languages/czech.txt | 3 +++ data/languages/danish.txt | 3 +++ data/languages/dutch.txt | 3 +++ data/languages/finnish.txt | 3 +++ data/languages/french.txt | 3 +++ data/languages/german.txt | 3 +++ data/languages/greek.txt | 3 +++ data/languages/hungarian.txt | 3 +++ data/languages/italian.txt | 3 +++ data/languages/japanese.txt | 3 +++ data/languages/korean.txt | 3 +++ data/languages/kyrgyz.txt | 3 +++ data/languages/norwegian.txt | 3 +++ data/languages/persian.txt | 3 +++ data/languages/polish.txt | 3 +++ data/languages/portuguese.txt | 3 +++ data/languages/romanian.txt | 3 +++ data/languages/russian.txt | 3 +++ data/languages/serbian.txt | 3 +++ data/languages/simplified_chinese.txt | 3 +++ data/languages/slovak.txt | 3 +++ data/languages/spanish.txt | 3 +++ data/languages/swedish.txt | 3 +++ data/languages/traditional_chinese.txt | 3 +++ data/languages/turkish.txt | 3 +++ data/languages/ukrainian.txt | 3 +++ src/engine/client/graphics_threaded.cpp | 13 +++++-------- 33 files changed, 101 insertions(+), 8 deletions(-) diff --git a/data/languages/belarusian.txt b/data/languages/belarusian.txt index bef5e02d7..3bd0e7acf 100644 --- a/data/languages/belarusian.txt +++ b/data/languages/belarusian.txt @@ -648,6 +648,9 @@ Successfully saved the replay! Replay feature is disabled! == +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Game paused == diff --git a/data/languages/bosnian.txt b/data/languages/bosnian.txt index b7b49c149..037c5169c 100644 --- a/data/languages/bosnian.txt +++ b/data/languages/bosnian.txt @@ -1148,6 +1148,9 @@ Best 9+ new mentions == 9+ novih označenja +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Country / Region == diff --git a/data/languages/brazilian_portuguese.txt b/data/languages/brazilian_portuguese.txt index a669a4742..0e9edf11d 100644 --- a/data/languages/brazilian_portuguese.txt +++ b/data/languages/brazilian_portuguese.txt @@ -1146,6 +1146,9 @@ Zoom in Zoom out == Zoom out +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Server best: == diff --git a/data/languages/bulgarian.txt b/data/languages/bulgarian.txt index f09fdaa05..b116fa715 100644 --- a/data/languages/bulgarian.txt +++ b/data/languages/bulgarian.txt @@ -645,6 +645,9 @@ Successfully saved the replay! Replay feature is disabled! == +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Game paused == diff --git a/data/languages/catalan.txt b/data/languages/catalan.txt index fb60b8faf..263a5d8d6 100644 --- a/data/languages/catalan.txt +++ b/data/languages/catalan.txt @@ -1181,6 +1181,9 @@ Replay %3d:%02d 9+ new mentions == 9+ noves mencions +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Use k key to kill (restart), q to pause and watch other players. See settings for other key binds. == diff --git a/data/languages/chuvash.txt b/data/languages/chuvash.txt index d8c175a76..8115518af 100644 --- a/data/languages/chuvash.txt +++ b/data/languages/chuvash.txt @@ -648,6 +648,9 @@ Successfully saved the replay! Replay feature is disabled! == +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Game paused == diff --git a/data/languages/czech.txt b/data/languages/czech.txt index 444c9c13e..91f980195 100644 --- a/data/languages/czech.txt +++ b/data/languages/czech.txt @@ -651,6 +651,9 @@ Successfully saved the replay! Replay feature is disabled! == +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Game paused == diff --git a/data/languages/danish.txt b/data/languages/danish.txt index 48c71fe73..826977f70 100644 --- a/data/languages/danish.txt +++ b/data/languages/danish.txt @@ -648,6 +648,9 @@ Successfully saved the replay! Replay feature is disabled! == +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Game paused == diff --git a/data/languages/dutch.txt b/data/languages/dutch.txt index 6a3c493fb..12c9304ba 100644 --- a/data/languages/dutch.txt +++ b/data/languages/dutch.txt @@ -1193,6 +1193,9 @@ Grabs 9+ new mentions == 9+ nieuwe berichten +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Use k key to kill (restart), q to pause and watch other players. See settings for other key binds. == diff --git a/data/languages/finnish.txt b/data/languages/finnish.txt index a55f34758..6d6d6b615 100644 --- a/data/languages/finnish.txt +++ b/data/languages/finnish.txt @@ -649,6 +649,9 @@ Successfully saved the replay! Replay feature is disabled! == +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Game paused == diff --git a/data/languages/french.txt b/data/languages/french.txt index 449f005ff..e8863efcf 100644 --- a/data/languages/french.txt +++ b/data/languages/french.txt @@ -1209,6 +1209,9 @@ Show DDNet map finishes in server browser transmits your player name to info2.ddnet.tw == transmet votre pseudonyme à info2.ddnet.tw +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Use k key to kill (restart), q to pause and watch other players. See settings for other key binds. == diff --git a/data/languages/german.txt b/data/languages/german.txt index 02bc6dcd8..60f0a4169 100644 --- a/data/languages/german.txt +++ b/data/languages/german.txt @@ -1211,3 +1211,6 @@ Client message Country / Region == Land / Region + +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== Die Breite oder Höhe von Textur %s ist nicht durch 16 teilbar, was visuelle Bugs verursachen kann. diff --git a/data/languages/greek.txt b/data/languages/greek.txt index efe597466..53b4bd1b5 100644 --- a/data/languages/greek.txt +++ b/data/languages/greek.txt @@ -654,6 +654,9 @@ Successfully saved the replay! Replay feature is disabled! == +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Server best: == diff --git a/data/languages/hungarian.txt b/data/languages/hungarian.txt index 15b73d53b..a3780ca44 100644 --- a/data/languages/hungarian.txt +++ b/data/languages/hungarian.txt @@ -1187,6 +1187,9 @@ Length Are you sure that you want to disconnect your dummy? == Biztos, hogy kiakarod léptetni a másolatodat? +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Use k key to kill (restart), q to pause and watch other players. See settings for other key binds. == diff --git a/data/languages/italian.txt b/data/languages/italian.txt index 54b1a24fc..e244b4975 100644 --- a/data/languages/italian.txt +++ b/data/languages/italian.txt @@ -654,6 +654,9 @@ Successfully saved the replay! Replay feature is disabled! == +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Game paused == diff --git a/data/languages/japanese.txt b/data/languages/japanese.txt index 3ed108865..a73aec336 100644 --- a/data/languages/japanese.txt +++ b/data/languages/japanese.txt @@ -648,6 +648,9 @@ Successfully saved the replay! Replay feature is disabled! == +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Game paused == diff --git a/data/languages/korean.txt b/data/languages/korean.txt index 693e38b21..a1823ddc6 100644 --- a/data/languages/korean.txt +++ b/data/languages/korean.txt @@ -650,6 +650,9 @@ Successfully saved the replay! Replay feature is disabled! == +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Server best: == diff --git a/data/languages/kyrgyz.txt b/data/languages/kyrgyz.txt index b96546a53..6290404ec 100644 --- a/data/languages/kyrgyz.txt +++ b/data/languages/kyrgyz.txt @@ -645,6 +645,9 @@ Successfully saved the replay! Replay feature is disabled! == +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Server best: == diff --git a/data/languages/norwegian.txt b/data/languages/norwegian.txt index ea882de43..6514986d6 100644 --- a/data/languages/norwegian.txt +++ b/data/languages/norwegian.txt @@ -648,6 +648,9 @@ Successfully saved the replay! Replay feature is disabled! == +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Game paused == diff --git a/data/languages/persian.txt b/data/languages/persian.txt index 5cbe09771..afef8c542 100644 --- a/data/languages/persian.txt +++ b/data/languages/persian.txt @@ -786,6 +786,9 @@ Personal best: Best == ﻦﯾﺮﺘﻬﺑ +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Use k key to kill (restart), q to pause and watch other players. See settings for other key binds. == diff --git a/data/languages/polish.txt b/data/languages/polish.txt index 0c104b6a5..9f355e808 100644 --- a/data/languages/polish.txt +++ b/data/languages/polish.txt @@ -1193,6 +1193,9 @@ Indicate map finish Show others (own team only) == Pokazuj innych (tylko drużynę) +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Use k key to kill (restart), q to pause and watch other players. See settings for other key binds. == diff --git a/data/languages/portuguese.txt b/data/languages/portuguese.txt index 4add7e0e3..b0b331129 100644 --- a/data/languages/portuguese.txt +++ b/data/languages/portuguese.txt @@ -901,6 +901,9 @@ Successfully saved the replay! Replay feature is disabled! == +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Server best: == diff --git a/data/languages/romanian.txt b/data/languages/romanian.txt index 7722f24d7..8a04f7831 100644 --- a/data/languages/romanian.txt +++ b/data/languages/romanian.txt @@ -660,6 +660,9 @@ Successfully saved the replay! Replay feature is disabled! == +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Server best: == diff --git a/data/languages/russian.txt b/data/languages/russian.txt index c831209fe..a0c802f34 100644 --- a/data/languages/russian.txt +++ b/data/languages/russian.txt @@ -1194,6 +1194,9 @@ Grabs Client message == Сообщение от клиента +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Use k key to kill (restart), q to pause and watch other players. See settings for other key binds. == diff --git a/data/languages/serbian.txt b/data/languages/serbian.txt index 3c37cb874..14143ccdd 100644 --- a/data/languages/serbian.txt +++ b/data/languages/serbian.txt @@ -670,6 +670,9 @@ Video name: Use k key to kill (restart), q to pause and watch other players. See settings for other key binds. == Tipka K da se ubijes (restart), tipka q da pauziras i gledas druge igrače. +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Server best: == diff --git a/data/languages/simplified_chinese.txt b/data/languages/simplified_chinese.txt index f8e6c1e6f..29de6103a 100644 --- a/data/languages/simplified_chinese.txt +++ b/data/languages/simplified_chinese.txt @@ -1207,3 +1207,6 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo Country / Region == 国家 / 地区 + +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== diff --git a/data/languages/slovak.txt b/data/languages/slovak.txt index d936c35ff..d3947b6aa 100644 --- a/data/languages/slovak.txt +++ b/data/languages/slovak.txt @@ -648,6 +648,9 @@ Successfully saved the replay! Replay feature is disabled! == +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Game paused == diff --git a/data/languages/spanish.txt b/data/languages/spanish.txt index 7e4ffe520..d2a74feae 100644 --- a/data/languages/spanish.txt +++ b/data/languages/spanish.txt @@ -1194,6 +1194,9 @@ Grabs 9+ new mentions == 9+ nuevas menciones +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Use k key to kill (restart), q to pause and watch other players. See settings for other key binds. == diff --git a/data/languages/swedish.txt b/data/languages/swedish.txt index 50558f868..8d0ac9063 100644 --- a/data/languages/swedish.txt +++ b/data/languages/swedish.txt @@ -1190,6 +1190,9 @@ Connect Dummy Show others (own team only) == Visa andra (eget lag endast) +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Use k key to kill (restart), q to pause and watch other players. See settings for other key binds. == diff --git a/data/languages/traditional_chinese.txt b/data/languages/traditional_chinese.txt index 74b02e623..ed8926773 100644 --- a/data/languages/traditional_chinese.txt +++ b/data/languages/traditional_chinese.txt @@ -1201,3 +1201,6 @@ Auto %3d:%02d Replay %3d:%02d == 回放 %3d:%02d + +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== diff --git a/data/languages/turkish.txt b/data/languages/turkish.txt index 71a369bd5..4c5e6563e 100644 --- a/data/languages/turkish.txt +++ b/data/languages/turkish.txt @@ -1199,5 +1199,8 @@ Grabs 9+ new mentions == 9+ yeni bildirim +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Country / Region == diff --git a/data/languages/ukrainian.txt b/data/languages/ukrainian.txt index 96642290b..3576af9f7 100644 --- a/data/languages/ukrainian.txt +++ b/data/languages/ukrainian.txt @@ -1188,6 +1188,9 @@ Grabs 9+ new mentions == 9+ нових згадок +The width or height of texture %s is not divisible by 16, which might cause visual bugs. +== + Use k key to kill (restart), q to pause and watch other players. See settings for other key binds. == diff --git a/src/engine/client/graphics_threaded.cpp b/src/engine/client/graphics_threaded.cpp index 257bec741..ddb5e4a1b 100644 --- a/src/engine/client/graphics_threaded.cpp +++ b/src/engine/client/graphics_threaded.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include // cosf, sinf, log2f @@ -454,16 +455,12 @@ IGraphics::CTextureHandle CGraphics_Threaded::LoadTextureRaw(int Width, int Heig { SGraphicsWarning NewWarning; char aText[128]; - if(pTexName && *pTexName) + aText[0] = '\0'; + if(pTexName) { - str_format(aText, sizeof(aText), ":\n\"%s\"\n", pTexName); + str_format(aText, sizeof(aText), "\"%s\"", pTexName); } - else - { - aText[0] = ' '; - aText[1] = 0; - } - str_format(NewWarning.m_aWarningMsg, sizeof(NewWarning.m_aWarningMsg), "The width and height of texture%sare not divisible by 16, which might cause visual bugs.", aText); + str_format(NewWarning.m_aWarningMsg, sizeof(NewWarning.m_aWarningMsg), Localize("The width or height of texture %s is not divisible by 16, which might cause visual bugs."), aText); m_Warnings.emplace_back(NewWarning); }