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"
2021-06-20 01:17:58 +00:00 · 2021-06-20 01:17:58 +00:00 · 03c3df109a
commit 03c3df109a
parent 8df168592b
1 changed files with 1 additions and 0 deletions
--- 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",