From 7ff0b7ed1381fd3d1f6cf66c2725534234977cc6 Mon Sep 17 00:00:00 2001
From: Automated System <gitea@mirror.git.trinitydesktop.org>
Date: Sun, 3 Dec 2023 21:20:59 +0000
Subject: [PATCH] Merge translation files from master branch.

---
 translations/messages/kdiff3/ru.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/translations/messages/kdiff3/ru.po b/translations/messages/kdiff3/ru.po
index a8d26a4..db0a7b7 100644
--- a/translations/messages/kdiff3/ru.po
+++ b/translations/messages/kdiff3/ru.po
@@ -1,13 +1,13 @@
 # KDE3 - kdiff3.pot Russian translation.
 # KDE3 - kdeextragear-1/kdiff3.po Russian translation.
 # Nick Shaforostoff <shafff@ukr.net>, 2004-2005.
-#
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: kdiff3\n"
 "POT-Creation-Date: 2023-11-26 18:16+0000\n"
-"PO-Revision-Date: 2020-01-05 16:07+0000\n"
-"Last-Translator: Serg Bormant <bormant@mail.ru>\n"
+"PO-Revision-Date: 2023-12-01 21:13+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/applications/kdiff3/ru/>\n"
 "Language: ru\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 3.10\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Instead of a literal translation, add your name to the end of the list (separated by a comma).
 msgid ""
@@ -2178,7 +2178,7 @@ msgstr ""
 
 #: pdiff.cpp:981
 msgid "Abort"
-msgstr "Стоп"
+msgstr "Прервать"
 
 #: pdiff.cpp:987 pdiff.cpp:1084
 msgid "Opening files..."