From cadc8b76b04c08610513449ecba1ddbb6f4a057c Mon Sep 17 00:00:00 2001
From: Automated System <gitea@mirror.git.trinitydesktop.org>
Date: Sun, 21 Apr 2024 22:31:48 +0000
Subject: [PATCH] Merge translation files from master branch.

---
 translations/desktop_files/ru.po | 13 ++++++-------
 translations/messages/ru.po      |  6 +++---
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/translations/desktop_files/ru.po b/translations/desktop_files/ru.po
index 99959cd..00d3233 100644
--- a/translations/desktop_files/ru.po
+++ b/translations/desktop_files/ru.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-11-30 10:29+0100\n"
-"PO-Revision-Date: 2024-04-12 16:44+0000\n"
+"PO-Revision-Date: 2024-04-21 17:50+0000\n"
 "Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/applications/kpilot-desktop-files/ru/>\n"
@@ -20,9 +20,8 @@ msgstr ""
 
 #. Name
 #: kpilot/kpilot.desktop:2
-#, fuzzy
 msgid "KPilot"
-msgstr "Служба синхронизации КПК"
+msgstr "KPilot"
 
 #. GenericName
 #: kpilot/kpilot.desktop:4
@@ -67,7 +66,7 @@ msgstr "Канал синхронизации адресных книг КПК 
 #. Name
 #: conduits/docconduit/doc_conduit.desktop:2
 msgid "Palm DOC"
-msgstr ""
+msgstr "Palm DOC"
 
 #. Comment
 #: conduits/docconduit/doc_conduit.desktop:4
@@ -77,7 +76,7 @@ msgstr "Перенос текстовых файлов на КПК."
 #. Name
 #: conduits/docconduit/kpalmdoc.desktop:2
 msgid "KPalmDOC"
-msgstr ""
+msgstr "KPalmDOC"
 
 #. GenericName
 #: conduits/docconduit/kpalmdoc.desktop:4
@@ -122,7 +121,7 @@ msgstr "Канал синхронизации заметок КПК и TDE."
 #. Name
 #: conduits/notepadconduit/notepad-conduit.desktop:2
 msgid "NotePad"
-msgstr ""
+msgstr "NotePad"
 
 #. Comment
 #: conduits/notepadconduit/notepad-conduit.desktop:4
@@ -132,7 +131,7 @@ msgstr "Канал создания резервных копий примеча
 #. Name
 #: conduits/null/null-conduit.desktop:2
 msgid "NULL"
-msgstr ""
+msgstr "NULL"
 
 #. Comment
 #: conduits/null/null-conduit.desktop:4
diff --git a/translations/messages/ru.po b/translations/messages/ru.po
index 6d2e95b..f96acef 100644
--- a/translations/messages/ru.po
+++ b/translations/messages/ru.po
@@ -5,12 +5,12 @@
 # Oleg Batalov <olegbatalov@mail.ru>, 2004.
 # Олег Баталов <olegbatalov@mail.ru>, 2004.
 # Gregory Mokhin <mok@kde.ru>, 2004.
-# Andrei Stepanov <adem4ik@gmail.com>, 2023.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: kpilot\n"
 "POT-Creation-Date: 2021-07-07 18:32+0000\n"
-"PO-Revision-Date: 2023-12-02 22:14+0000\n"
+"PO-Revision-Date: 2024-04-21 17:50+0000\n"
 "Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/applications/kpilot/ru/>\n"
@@ -767,7 +767,7 @@ msgstr "Настройки канала заметок"
 #: conduits/notepadconduit/notepad-conduit.cpp:59
 #: conduits/notepadconduit/notepad-factory.cpp:89
 msgid "Notepad"
-msgstr "Примечание "
+msgstr "Блокнот"
 
 #: conduits/notepadconduit/notepad-conduit.cpp:79
 #: conduits/sysinfoconduit/sysinfo-conduit.cpp:591