From 452b9102c6d81a7d844f38068d627b84b4a43ed9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 22 Apr 2025 01:29:51 +0000
Subject: [PATCH] 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"
---
 bin/plasma-mobile-dev.desktop.cmake                          | 2 ++
 bin/plasma-mobile.desktop.cmake                              | 1 +
 quicksettings/autohidepanels/metadata.json                   | 5 +----
 .../record/plasma_mobile_quicksetting_record.notifyrc        | 2 ++
 .../plasma_mobile_quicksetting_screenshot.notifyrc           | 2 ++
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bin/plasma-mobile-dev.desktop.cmake b/bin/plasma-mobile-dev.desktop.cmake
index eebc6d9c..70621b71 100644
--- a/bin/plasma-mobile-dev.desktop.cmake
+++ b/bin/plasma-mobile-dev.desktop.cmake
@@ -6,6 +6,7 @@ Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/plasma-dbus-run-session-if-needed @CMAKE_IN
 Type=Application
 DesktopNames=KDE
 Name=Plasma Mobile (Development)
+Name[ar]=بلازما الجوال (التطوير)
 Name[az]=Plasma Mobil (Tərtibat)
 Name[ca]=Plasma Mobile (Desenvolupament)
 Name[ca@valencia]=Plasma Mobile (Desenvolupament)
@@ -44,6 +45,7 @@ Name[x-test]=xxPlasma Mobile (Development)xx
 Name[zh_CN]=Plasma Mobile (开发)
 Name[zh_TW]=Plasma 行動（開發）
 Comment=Plasma Mobile by KDE
+Comment[ar]=بلازما الجوال من كيدي
 Comment[az]=KDE Plasma Mobil
 Comment[ca]=Plasma Mobile, creat per la comunitat KDE
 Comment[ca@valencia]=Plasma Mobile, creat per la comunitat KDE
diff --git a/bin/plasma-mobile.desktop.cmake b/bin/plasma-mobile.desktop.cmake
index 06ff6b7d..d4cd5b7c 100644
--- a/bin/plasma-mobile.desktop.cmake
+++ b/bin/plasma-mobile.desktop.cmake
@@ -52,6 +52,7 @@ Name[x-test]=xxPlasma Mobilexx
 Name[zh_CN]=Plasma Mobile
 Name[zh_TW]=Plasma 行動
 Comment=Plasma Mobile by KDE
+Comment[ar]=بلازما الجوال من كيدي
 Comment[az]=KDE Plasma Mobil
 Comment[ca]=Plasma Mobile, creat per la comunitat KDE
 Comment[ca@valencia]=Plasma Mobile, creat per la comunitat KDE
diff --git a/quicksettings/autohidepanels/metadata.json b/quicksettings/autohidepanels/metadata.json
index 72cfbc62..1579dc93 100644
--- a/quicksettings/autohidepanels/metadata.json
+++ b/quicksettings/autohidepanels/metadata.json
@@ -4,17 +4,14 @@
         "Authors": [
             {
                 "Email": "stanleymicah@proton.me",
-                "Name": "Micah Stanley",
-                "Name[x-test]": "xxMicah Stanleyxx"
+                "Name": "Micah Stanley"
             }
         ],
         "Description": "Auto Hide Panels quick setting for Plasma Mobile",
-        "Description[x-test]": "xxAuto Hide Panels quick setting for Plasma Mobilexx",
         "Icon": "view-fullscreen",
         "Id": "org.kde.plasma.quicksetting.autohidepanels",
         "License": "GPL-2.0+",
         "Name": "Auto Hide Panels",
-        "Name[x-test]": "xxAuto Hide Panelsxx",
         "Website": "https://kde.org"
     }
 }
diff --git a/quicksettings/record/plasma_mobile_quicksetting_record.notifyrc b/quicksettings/record/plasma_mobile_quicksetting_record.notifyrc
index d4032be1..b5f3a84a 100644
--- a/quicksettings/record/plasma_mobile_quicksetting_record.notifyrc
+++ b/quicksettings/record/plasma_mobile_quicksetting_record.notifyrc
@@ -49,6 +49,7 @@ Name[zh_TW]=Plasma
 
 [Event/captured]
 Name=Captured
+Name[ar]=الملتقط
 Name[az]=Şəkli çəkildi
 Name[ca]=Capturat
 Name[ca@valencia]=Capturat
@@ -90,6 +91,7 @@ Name[x-test]=xxCapturedxx
 Name[zh_CN]=已捕获
 Name[zh_TW]=已擷取
 Comment=Captured
+Comment[ar]=الملتقط
 Comment[az]=Şəkli çəkildi
 Comment[ca]=Capturat
 Comment[ca@valencia]=Capturat
diff --git a/quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc b/quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc
index d4032be1..b5f3a84a 100644
--- a/quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc
+++ b/quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc
@@ -49,6 +49,7 @@ Name[zh_TW]=Plasma
 
 [Event/captured]
 Name=Captured
+Name[ar]=الملتقط
 Name[az]=Şəkli çəkildi
 Name[ca]=Capturat
 Name[ca@valencia]=Capturat
@@ -90,6 +91,7 @@ Name[x-test]=xxCapturedxx
 Name[zh_CN]=已捕获
 Name[zh_TW]=已擷取
 Comment=Captured
+Comment[ar]=الملتقط
 Comment[az]=Şəkli çəkildi
 Comment[ca]=Capturat
 Comment[ca@valencia]=Capturat