From ae605bab1271556bd42d036ff6ff27f23c830ba2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 23 Dec 2022 01:55:25 +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" --- src/effects/tileseditor/metadata.json | 2 ++ src/kcms/xwayland/kcm_kwinxwayland.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/effects/tileseditor/metadata.json b/src/effects/tileseditor/metadata.json index be178770dc..7537d56a8b 100644 --- a/src/effects/tileseditor/metadata.json +++ b/src/effects/tileseditor/metadata.json @@ -2,6 +2,7 @@ "KPlugin": { "Category": "Window Management", "Description": "Editor for the tiling areas", + "Description[ar]": "محرر لترتيب المساحات", "Description[bg]": "Редактиране на зоните на плочковидно разпределяне", "Description[ca@valencia]": "Editor per a les àrees de mosaic", "Description[ca]": "Editor per a les àrees de mosaic", @@ -20,6 +21,7 @@ "Id": "tileseditor", "License": "GPL", "Name": "Tiling Editor", + "Name[ar]": "محرر الترتيب", "Name[bg]": "Редактор на разпределяне", "Name[ca@valencia]": "Editor de mosaic", "Name[ca]": "Editor de mosaic", diff --git a/src/kcms/xwayland/kcm_kwinxwayland.json b/src/kcms/xwayland/kcm_kwinxwayland.json index 53748fe505..27dcc0a0f5 100644 --- a/src/kcms/xwayland/kcm_kwinxwayland.json +++ b/src/kcms/xwayland/kcm_kwinxwayland.json @@ -3,6 +3,7 @@ "KPlugin": { "BugReportUrl": "https://bugs.kde.org/enter_bug.cgi?product=systemsettings&component=kcm_kwinxwayland", "Description": "Select which keys will be globally available to legacy X11 apps", + "Description[ar]": "حدد أي المفاتيح التي ستكون متوفرة لتطبيقات اكس ١١ القديمة", "Description[bg]": "Изберете, кои клавиши да бъдат достъпни на глобално ниво за X11 приложения с минали версии", "Description[ca@valencia]": "Seleccioneu les tecles que estaran disponibles globalment a les aplicacions X11 antigues", "Description[ca]": "Seleccioneu les tecles que seran disponibles globalment a les aplicacions X11 antigues", @@ -18,6 +19,7 @@ "Description[x-test]": "xxSelect which keys will be globally available to legacy X11 appsxx", "Icon": "xorg", "Name": "Legacy X11 App Support", + "Name[ar]": "دعم تطبيقات اكس١١ القديمة", "Name[bg]": "Поддръжка на минали версии X11 приложения", "Name[ca@valencia]": "Implementació de les aplicacions X11 antigues", "Name[ca]": "Implementació de les aplicacions X11 antigues",