From 5e5d5f6d65c36bc684b26561ed15021372d629ca Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Tue, 28 Jan 2025 19:48:33 +0300 Subject: [PATCH 1/3] Reapply "Update global.json" This reverts commit d88e313e32a560c3c8e1c3d6c8c5902aa1acfb6b. --- global.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/global.json b/global.json index ed820b550b..55b658ae25 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,6 @@ { "sdk": { - "version": "8.0.205" + "version": "8.0.205", + "rollForward": "latestFeature" } } From 0d2754e774ed7fe4d34214cf0353ed67bce05032 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Fri, 21 Feb 2025 22:49:02 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D1=81=D0=B0=D0=BD=D0=B8=D1=82=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/_amour/german.ftl | 38 +++++++++---------- .../_Honk/Accents/word_replacements.yml | 1 - 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/Resources/Locale/ru-RU/_amour/german.ftl b/Resources/Locale/ru-RU/_amour/german.ftl index 0f353051bd..31e93a2c4d 100644 --- a/Resources/Locale/ru-RU/_amour/german.ftl +++ b/Resources/Locale/ru-RU/_amour/german.ftl @@ -6,24 +6,24 @@ accent-german-words-3 = нет accent-german-words-replace-3 = найн accent-german-words-4 = конечно accent-german-words-replace-4 = натюрлих -accent-german-words-5 = капитан -accent-german-words-replace-5 = фюрэр -accent-german-words-6 = глава службы безопасности -accent-german-words-replace-6 = кригфюрэр -accent-german-words-7 = гсб -accent-german-words-replace-7 = кригфюрэр -accent-german-words-8 = хос -accent-german-words-replace-8 = кригфюрэр +accent-german-words-5 = точно +accent-german-words-replace-5 = экзакт +accent-german-words-6 = пиво +accent-german-words-replace-6 = биер +accent-german-words-7 = естественно +accent-german-words-replace-7 = натюрлих +accent-german-words-8 = спасибо +accent-german-words-replace-8 = данке accent-german-words-9 = плохо accent-german-words-replace-9 = шлэхт -accent-german-words-10 = главный врач -accent-german-words-replace-10 = эрцтефюрэр -accent-german-words-11 = главврач -accent-german-words-replace-11 = эрцтефюрэр -accent-german-words-12 = гв -accent-german-words-replace-12 = эрцтефюрэр -accent-german-words-13 = смо -accent-german-words-replace-13 = эрцтефюрэр +accent-german-words-10 = офицер +accent-german-words-replace-10 = офизер +accent-german-words-11 = офицеру +accent-german-words-replace-11 = офизеру +accent-german-words-12 = офицеры +accent-german-words-replace-12 = офизеры +accent-german-words-13 = офицерам +accent-german-words-replace-13 = офизерам accent-german-words-14 = гав accent-german-words-replace-14 = вов accent-german-words-15 = ганс @@ -52,8 +52,8 @@ accent-german-words-26 = хуесос accent-german-words-replace-26 = шванцлучэр accent-german-words-27 = свинья accent-german-words-replace-27 = швайн -accent-german-words-28 = да здравствует -accent-german-words-replace-28 = хайль +accent-german-words-28 = замечательно +accent-german-words-replace-28 = вундерба accent-german-words-29 = утро accent-german-words-replace-29 = моргэн accent-german-words-30 = день @@ -76,5 +76,3 @@ accent-german-words-38 = быстро accent-german-words-replace-38 = шнеля accent-german-words-39 = пиздец accent-german-words-replace-39 = зир икелхафте умштанде -accent-german-words-40 = хайль гитлер -accent-german-words-replace-40 = я даю полное согласие на изнасилование своей жопы diff --git a/Resources/Prototypes/_Honk/Accents/word_replacements.yml b/Resources/Prototypes/_Honk/Accents/word_replacements.yml index f35a5e1acc..e49f193b6c 100644 --- a/Resources/Prototypes/_Honk/Accents/word_replacements.yml +++ b/Resources/Prototypes/_Honk/Accents/word_replacements.yml @@ -40,4 +40,3 @@ accent-german-words-37: accent-german-words-replace-37 accent-german-words-38: accent-german-words-replace-38 accent-german-words-39: accent-german-words-replace-39 - accent-german-words-40: accent-german-words-replace-40 From a87f7629cf1c285d4bff1f6cacbaca20a6405498 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Fri, 21 Feb 2025 22:53:39 +0300 Subject: [PATCH 3/3] fnny --- global.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/global.json b/global.json index 55b658ae25..c214791b92 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,5 @@ { - "sdk": { - "version": "8.0.205", - "rollForward": "latestFeature" - } + "sdk": { + "version": "8.0.205" + } }