alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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"
This commit is contained in:
l10n daemon script 2021-06-20 01:17:58 +00:00
parent 8df168592b
commit 03c3df109a
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plasma/packagestructure/containmentactions-packagestructure.json
View File

@ -50,6 +50,7 @@
], ],
"Id": "Plasma/ContainmentActions", "Id": "Plasma/ContainmentActions",
"Name": "Containment Actions", "Name": "Containment Actions",
"Name[ar]": "إجراءات الاحتواء",
"Name[az]": "Plasma konteyneri əməlləri", "Name[az]": "Plasma konteyneri əməlləri",
"Name[ca@valencia]": "Accions del contenidor", "Name[ca@valencia]": "Accions del contenidor",
"Name[ca]": "Accions del contenidor", "Name[ca]": "Accions del contenidor",