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 2019-01-06 05:32:12 +01:00
parent 4d491d4e04
commit 8339575e58
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plasma/packagestructure/plasmageneric-packagestructure.json
View File

@ -79,7 +79,7 @@
"Name[tr]": "Genel",
"Name[uk]": "Загальний",
"Name[x-test]": "xxGenericxx",
"Name[zh_CN]": "常规",
"Name[zh_CN]": "通用",
"Name[zh_TW]": "一般",
"ServiceTypes": [
"KPackage/PackageStructure"