From babb8587f8d9800f611754f96af009f1d0c57405 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 13 Jun 2025 01:33:11 +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" --- quicksettings/hotspot/metadata.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quicksettings/hotspot/metadata.json b/quicksettings/hotspot/metadata.json index e668f993..56062e0b 100644 --- a/quicksettings/hotspot/metadata.json +++ b/quicksettings/hotspot/metadata.json @@ -41,7 +41,7 @@ } ], "Description": "Hotspot quick setting for Plasma Mobile", - "Description[ar]": "إعداد سريع للنقطة الفعالة لبلازما الجوال", + "Description[ar]": "إعداد سريع لنقطة اتصال لبلازما الجوال", "Description[ca@valencia]": "Configuració ràpida del punt d'accés per a Plasma Mobile", "Description[ca]": "Configuració ràpida del punt d'accés per al Plasma Mobile", "Description[cs]": "Rychlé nastavení Plasma pro mobilní telefony", @@ -80,7 +80,7 @@ "Id": "org.kde.plasma.quicksetting.hotspot", "License": "GPL-2.0+", "Name": "Hotspot", - "Name[ar]": "هوت-سبوت", + "Name[ar]": "نقطة اتصال", "Name[ca@valencia]": "Punt d'accés", "Name[ca]": "Punt d'accés", "Name[cs]": "Hotspot",