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

---
 koffice-i18n-ru/messages/koffice/kexi.po    |  9 ++++---
 koffice-i18n-ru/messages/koffice/kspread.po | 28 ++++++++++-----------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/koffice-i18n-ru/messages/koffice/kexi.po b/koffice-i18n-ru/messages/koffice/kexi.po
index ff437c09..9029358b 100644
--- a/koffice-i18n-ru/messages/koffice/kexi.po
+++ b/koffice-i18n-ru/messages/koffice/kexi.po
@@ -5,12 +5,13 @@
 # KDE3 - koffice/kexi.po Russian translation.
 # Copyright (c) 2006 Russian translation team.
 # Alexander Golubev <fatzer2@gmail.com>, 2022.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: kexi\n"
 "POT-Creation-Date: 2023-11-20 20:17+0000\n"
-"PO-Revision-Date: 2022-02-14 22:00+0000\n"
-"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"PO-Revision-Date: 2023-12-01 21:14+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/koffice/kexi/ru/>\n"
 "Language: ru\n"
@@ -19,7 +20,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 4.10.1\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).
 #: core/kexiaboutdata.cpp:75
@@ -5687,7 +5688,7 @@ msgstr "Открыть в режиме конструктора"
 #: plugins/macros/kexipart/keximacroerrorbase.ui:187
 #, no-c-format
 msgid "Abort"
-msgstr "Отмена"
+msgstr "Прервать"
 
 #: plugins/queries/kexiaddparamwidget.ui:16
 #, no-c-format
diff --git a/koffice-i18n-ru/messages/koffice/kspread.po b/koffice-i18n-ru/messages/koffice/kspread.po
index 28a686b4..e0cf6551 100644
--- a/koffice-i18n-ru/messages/koffice/kspread.po
+++ b/koffice-i18n-ru/messages/koffice/kspread.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kspread\n"
 "POT-Creation-Date: 2021-07-07 18:32+0000\n"
-"PO-Revision-Date: 2023-06-04 17:55+0000\n"
+"PO-Revision-Date: 2023-12-03 17:55+0000\n"
 "Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/koffice/kspread/ru/>\n"
@@ -2971,7 +2971,7 @@ msgstr "Испания"
 
 #: kspread_format.cpp:3084 kspread_format.cpp:3334
 msgid "United Kingdom"
-msgstr "Соединённое королевство Великобритания"
+msgstr "Великобритания"
 
 #: kspread_format.cpp:3084
 msgid "Pound"
@@ -3264,7 +3264,7 @@ msgstr "XOF"
 
 #: kspread_format.cpp:3113
 msgid "Bermuda"
-msgstr "Бермудские острова"
+msgstr "Бермуды"
 
 #: kspread_format.cpp:3113
 msgid "Bermudian Dollar"
@@ -3462,11 +3462,11 @@ msgstr "CVE"
 
 #: kspread_format.cpp:3132
 msgid "Cayman Islands"
-msgstr "Каймановы острова"
+msgstr "Острова Кайман"
 
 #: kspread_format.cpp:3132
 msgid "Cayman Islands Dollar"
-msgstr "Доллар Каймановых островов"
+msgstr "Доллар Островов Кайман"
 
 #: kspread_format.cpp:3132
 msgid "KYD"
@@ -3474,7 +3474,7 @@ msgstr "KYD"
 
 #: kspread_format.cpp:3133
 msgid "Central African Republic"
-msgstr "Центрально-Африканская Республика"
+msgstr "Центральноафриканская Республика"
 
 #: kspread_format.cpp:3134
 msgid "Chad"
@@ -3514,7 +3514,7 @@ msgstr "CNY"
 
 #: kspread_format.cpp:3138
 msgid "Christmas Island"
-msgstr "остров Рождества"
+msgstr "Остров Рождества"
 
 #: kspread_format.cpp:3139
 msgid "Cocos (Keeling) Islands"
@@ -3562,7 +3562,7 @@ msgstr "CDF"
 
 #: kspread_format.cpp:3144
 msgid "Cook Islands"
-msgstr "острова Кука"
+msgstr "Острова Кука"
 
 #: kspread_format.cpp:3144 kspread_format.cpp:3263 kspread_format.cpp:3267
 #: kspread_format.cpp:3280 kspread_format.cpp:3323
@@ -3588,7 +3588,7 @@ msgstr "C"
 
 #: kspread_format.cpp:3146
 msgid "Cote D'Ivoire"
-msgstr "Кот д'Ивуар"
+msgstr "Кот-д’Ивуар"
 
 #: kspread_format.cpp:3147
 msgid "Croatia"
@@ -3673,7 +3673,7 @@ msgstr "RD$"
 
 #: kspread_format.cpp:3154
 msgid "Dominican Republic"
-msgstr "Доминиканская республика"
+msgstr "Доминиканская Республика"
 
 #: kspread_format.cpp:3154
 msgid "Dominican Peso"
@@ -4189,7 +4189,7 @@ msgstr "KWD"
 
 #: kspread_format.cpp:3220
 msgid "Kyrgyzstan"
-msgstr "Киргизстан"
+msgstr "Киргизия"
 
 #: kspread_format.cpp:3220
 msgid "Som"
@@ -4393,7 +4393,7 @@ msgstr "MTL"
 
 #: kspread_format.cpp:3240
 msgid "Marshall Islands"
-msgstr "Маршалловы острова"
+msgstr "Маршалловы Острова"
 
 #: kspread_format.cpp:3241
 msgid "Martinique"
@@ -4657,7 +4657,7 @@ msgstr "PAB"
 
 #: kspread_format.cpp:3276
 msgid "Papua New Guinea"
-msgstr "Папуа-Новая Гвинея"
+msgstr "Папуа Новая Гвинея"
 
 #: kspread_format.cpp:3276
 msgid "Kina"
@@ -4785,7 +4785,7 @@ msgstr "RWF"
 
 #: kspread_format.cpp:3290
 msgid "Saint Helena"
-msgstr "остров Святой Елены"
+msgstr "Остров Святой Елены"
 
 #: kspread_format.cpp:3290
 msgid "Saint Helena Pound"