SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

CMakeLists.txt

@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.16)
 
 # KDE Application Version, managed by release script
 set (RELEASE_SERVICE_VERSION_MAJOR "25")
-set (RELEASE_SERVICE_VERSION_MINOR "07")
-set (RELEASE_SERVICE_VERSION_MICRO "70")
+set (RELEASE_SERVICE_VERSION_MINOR "08")
+set (RELEASE_SERVICE_VERSION_MICRO "0")
 set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(krfb VERSION ${RELEASE_SERVICE_VERSION})

krfb/krfb.notifyrc

@@ -496,7 +496,7 @@ Action=Popup
 
 [Event/InvalidPassword]
 Name=Invalid Password
-Name[ar]=كلمة المرور غير صحيحة
+Name[ar]=كلمة السر غير صحيحة
 Name[bg]=Неправилна парола
 Name[bs]=Neispravna šifra
 Name[ca]=Contrasenya no vàlida
@@ -562,7 +562,7 @@ Name[zh_CN]=无效密码
 Name[zh_TW]=不正確的密碼
 Comment=Invalid password
 Comment[af]=Ongeldige wagwoord
-Comment[ar]=كلمة المرور غير صحيحة
+Comment[ar]=كلمة السر غير صحيحة
 Comment[bg]=Неправилна парола
 Comment[bn]=অবৈধ পাসওয়ার্ড
 Comment[br]=Tremenger siek 
@@ -643,7 +643,7 @@ Action=Popup
 
 [Event/InvalidPasswordInvitations]
 Name=Invalid Password Invitations
-Name[ar]=كلمة المرور الدعوات غير صحيحة
+Name[ar]=كلمة السر الدعوات غير صحيحة
 Name[bg]=Неправилна парола за покана
 Name[bs]=Neispravna šifra pozivnice
 Name[ca]=Contrasenya no vàlida de les invitacions
@@ -915,7 +915,7 @@ Action=Popup
 
 [Event/NewConnectionAutoAccepted]
 Name=New Connection Auto Accepted
-Name[ar]=اتصال جديد مقبول تلقائيا
+Name[ar]=اتصال جديد مقبول آليّا
 Name[bg]=Автоматично приемане на новата връзка
 Name[bs]=Nova veza je automatski prihvaćena
 Name[ca]=Connexió nova acceptada automàticament
@@ -978,7 +978,7 @@ Name[zh_CN]=新连接自动接受
 Name[zh_TW]=新連線自動接受
 Comment=New connection automatically established
 Comment[af]=Nuwe verbinding automaties vasgestel
-Comment[ar]=اتصال جديد مفعل تلقائيا 
+Comment[ar]=اتصال جديد مفعل آليّا 
 Comment[bg]=Новата връзка е автоматично приета
 Comment[bn]=নতুন সংযোগ স্বয়ংক্রীয়ভাবে স্থাপন করা হল
 Comment[bs]=Nova veza je automatski uspostavljena

krfb/org.kde.krfb.appdata.xml

@@ -195,6 +195,7 @@
   </provides>
   <project_group>KDE</project_group>
   <releases>
+    <release version="25.08.0" date="2025-08-14"/>
     <release version="25.04.3" date="2025-07-03"/>
     <release version="25.04.2" date="2025-06-05"/>
     <release version="25.04.1" date="2025-05-08"/>

po/ar/krfb.po

@@ -7,13 +7,13 @@
 # Munzir Taha <munzir@kacst.edu.sa>, 2004.
 # محمد سعد  Mohamed SAAD <metehyi@free.fr>, 2006.
 # Youssef Chahibi <chahibi@gmail.com>, 2007.
-# SPDX-FileCopyrightText: 2009, 2024 zayed <zayed.alsaidi@gmail.com>
+# SPDX-FileCopyrightText: 2009, 2024, 2025 zayed <zayed.alsaidi@gmail.com>
 msgid ""
 msgstr ""
 "Project-Id-Version: krfb\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
 "POT-Creation-Date: 2025-03-01 00:46+0000\n"
-"PO-Revision-Date: 2024-02-24 12:24+0400\n"
+"PO-Revision-Date: 2025-08-03 12:03+0400\n"
 "Last-Translator: Zayed Al-Saidi <zayed.alsaidi@gmail.com>\n"
 "Language-Team: ar\n"
 "Language: ar\n"
@@ -21,7 +21,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"X-Generator: Lokalize 23.08.5\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -106,7 +107,7 @@ msgstr "اسمح للاتصالات البعيدة بإدارة سطح المك
 #: krfb.kcfg:37
 #, kde-format
 msgid "Allow connections without an invitation."
-msgstr "اسمح للاتصالات البعيدة بدون دعوة."
+msgstr "اسمح للاتصالات البعيدة دون دعوة."
 
 #. i18n: ectx: label, entry (unattendedAccessPassword), group (Security)
 #. i18n: ectx: label, entry (desktopSharingPassword), group (Security)
@@ -178,7 +179,7 @@ msgstr "النقل إلى كِيدِي4"
 #: main-virtualmonitor.cpp:92 main.cpp:101
 #, kde-format
 msgid "Tim Jansen"
-msgstr "Tim Jansen"
+msgstr "تيم يانسن"
 
 #: main-virtualmonitor.cpp:92 main.cpp:101
 #, kde-format

po/ka/krfb.po

@@ -68,7 +68,7 @@ msgstr "ჩაკეცილად გაშვება"
 #: krfb.kcfg:15
 #, kde-format
 msgid "Use the default port for VNC (5900)"
-msgstr "VNC-ის ნაგულისხმები პორტის გამოყენება (5900)"
+msgstr "VNC-ის ნაგულისხმევი პორტის გამოყენება (5900)"
 
 #. i18n: ectx: label, entry (port), group (TCP)
 #: krfb.kcfg:19
@@ -481,7 +481,7 @@ msgstr "პაროლები KDE-ის საფულეში არ შ
 #: ui/configtcp.ui:26
 #, kde-format
 msgid "Use default port"
-msgstr "ნაგულისხმები პორტის გამოყენება"
+msgstr "ნაგულისხმევი პორტის გამოყენება"
 
 #. i18n: ectx: property (text), widget (QLabel, label)
 #: ui/configtcp.ui:50

po/zh_CN/krfb.po

@@ -14,8 +14,8 @@ msgstr ""
 "X-Crowdin-Project: kdeorg\n"
 "X-Crowdin-Project-ID: 269464\n"
 "X-Crowdin-Language: zh-CN\n"
-"X-Crowdin-File: /kf6-trunk/messages/krfb/krfb.pot\n"
-"X-Crowdin-File-ID: 49236\n"
+"X-Crowdin-File: /kf6-stable/messages/krfb/krfb.pot\n"
+"X-Crowdin-File-ID: 50988\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"