Skip to content

Commit 4f3b132

Browse files
authored
Merge branch 'master' into curl
2 parents ae2d086 + 2674d38 commit 4f3b132

File tree

8 files changed

+11372
-11358
lines changed

8 files changed

+11372
-11358
lines changed

Client/cefweb/CWebApp.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ void CWebApp::OnBeforeCommandLineProcessing(const CefString& process_type, CefRe
2626
if (!pWebCore->GetGPUEnabled())
2727
command_line->AppendSwitch("disable-gpu");
2828

29+
// Disable the AutoDeElevate feature to make launching CEF with Admin privileges work.
30+
// https://github.com/chromiumembedded/cef/issues/3960
31+
// https://chromium-review.googlesource.com/c/chromium/src/+/6515318
32+
command_line->AppendSwitch("do-not-de-elevate");
33+
2934
command_line->AppendSwitch("disable-gpu-compositing"); // always disable this, causes issues with official builds
3035

3136
// command_line->AppendSwitch("disable-d3d11");

Shared/data/MTA San Andreas/MTA/locale/fa_IR/client.pot

Lines changed: 2212 additions & 2211 deletions
Large diffs are not rendered by default.

Shared/data/MTA San Andreas/MTA/locale/ro_RO/client.pot

Lines changed: 2212 additions & 2213 deletions
Large diffs are not rendered by default.

Shared/data/MTA San Andreas/MTA/locale/ru_RU/client.pot

Lines changed: 2517 additions & 2518 deletions
Large diffs are not rendered by default.

Shared/data/MTA San Andreas/MTA/locale/tr_TR/client.pot

Lines changed: 2207 additions & 2207 deletions
Large diffs are not rendered by default.

Shared/data/MTA San Andreas/MTA/locale/uk_UA/client.pot

Lines changed: 2212 additions & 2205 deletions
Large diffs are not rendered by default.

Shared/installer/locale/fa_IR.pot

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ msgstr ""
33
"Project-Id-Version: 2d3d942aa8adf891478198912ac0b233\n"
44
"Report-Msgid-Bugs-To: \n"
55
"POT-Creation-Date: 2025-04-08 22:41\n"
6-
"PO-Revision-Date: 2025-04-08 23:03\n"
6+
"PO-Revision-Date: 2025-06-28 16:21\n"
77
"Last-Translator: \n"
88
"Language-Team: Persian\n"
99
"Language: fa_IR\n"
@@ -20,17 +20,17 @@ msgstr ""
2020
#. GET_XPVISTA_PLEASE
2121
#: Shared/installer/nightly.nsi:205
2222
msgid "The version of MTA:SA you've downloaded does not support Windows XP or Vista. Please download an alternative version from www.multitheftauto.com."
23-
msgstr ""
23+
msgstr "این نسخه از MTA:SA که دانلود کرده اید از ویندوز XP یا Vista پشتیبانی نمی کند. لطفا نسخه‌ای مناسب را از www.multitheftauto.com دانلود کنید."
2424

2525
#. GET_WIN81_PLEASE
2626
#: Shared/installer/nightly.nsi:206
2727
msgid "The version of MTA:SA you've downloaded does not support Windows 7, 8 or 8.1. Please download an alternative version from www.multitheftauto.com."
28-
msgstr ""
28+
msgstr "این نسخه از MTA:SA که دانلود کرده اید از ویندوز 7، 8 یا 8.1 پشتیبانی نمی‌کند. لطفا نسخه‌ای مناسب را از www.multitheftauto.com دانلود کنید."
2929

3030
#. GET_MASTER_PLEASE
3131
#: Shared/installer/nightly.nsi:207
3232
msgid "The version of MTA:SA you've downloaded is designed for old versions of Windows. Please download an alternative version from www.multitheftauto.com."
33-
msgstr ""
33+
msgstr "این نسخه از MTA:SA برای نسخه های قدیمی ویندوز طراحی شده است. لطفا نسخه‌ای مناسب را از www.multitheftauto.com دانلود کنید."
3434

3535
#. WELCOME_TEXT
3636
#: Shared/installer/nightly.nsi:208

utils/localization/generate-translators/crowdin-translators.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,15 +422,18 @@
422422
],
423423
"ro": [
424424
"Andrei \"Vinyard\" Roib",
425+
"Can (turret001)",
425426
"ccw",
426427
"Cezar \"cezarignat\" Ignat",
427428
"Cheez",
428429
"Dan \"Talidan\" Chowdhury",
430+
"FlyingFork",
429431
"Hydra45",
430432
"qaisjp",
431433
"QuantumZ",
432434
"Stickey21",
433435
"TazZwOw Krons (sorinalex36)",
436+
"Vinyard",
434437
"wally00",
435438
"Zorgman"
436439
],

0 commit comments

Comments
 (0)