From a6b665006e0568b3ac9df2c0a712d69c5ac300f1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 5 Mar 2023 03:32:52 +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" --- .../kdecorations/aurorae/themes/plastik/package/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.json b/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.json index 9a450faa50..80a893a3eb 100644 --- a/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.json +++ b/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.json @@ -36,7 +36,7 @@ } ], "Description": "The classic theme known from KDE 3", - "Description[ar]": "السّمة الكلاسيكيّة المعروفة من كدي 3", + "Description[ar]": "السّمة الكلاسيكيّة المعروفة من كِيدِي 3", "Description[be]": "Класічная тэма, вядомая з KDE 3", "Description[bg]": "Класическата тема, позната от KDE 3", "Description[ca@valencia]": "El tema clàssic conegut des de KDE 3",