From 03c3df109a36d3ed8dadb30975157197826298ef Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 20 Jun 2021 01:17:58 +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" --- .../packagestructure/containmentactions-packagestructure.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plasma/packagestructure/containmentactions-packagestructure.json b/src/plasma/packagestructure/containmentactions-packagestructure.json index 398d4a45a..42b28c045 100644 --- a/src/plasma/packagestructure/containmentactions-packagestructure.json +++ b/src/plasma/packagestructure/containmentactions-packagestructure.json @@ -50,6 +50,7 @@ ], "Id": "Plasma/ContainmentActions", "Name": "Containment Actions", + "Name[ar]": "إجراءات الاحتواء", "Name[az]": "Plasma konteyneri əməlləri", "Name[ca@valencia]": "Accions del contenidor", "Name[ca]": "Accions del contenidor",