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 2016-09-15 09:46:00 +00:00
parent 820baec72e
commit 6837a1c855
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

@ -16,6 +16,7 @@
"Name[ca@valencia]": "Accions del contenidor",
"Name[ca]": "Accions del contenidor",
"Name[da]": "Beholder-handlinger",
"Name[de]": "Containment-Aktionen",
"Name[es]": "Acciones del contenedor",
"Name[et]": "Konteineritoimingud",
"Name[it]": "Azioni dei contenitori",