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-04-29 09:46:18 +00:00
parent c9e8c4b38c
commit e37a2d454a
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
templates/cpp-plasmoid/src/package/metadata.desktop
View File

@ -3,6 +3,7 @@ Name=%{APPNAME}
Name[ast]=%{APPNAME}
Name[ca]=%{APPNAME}
Name[ca@valencia]=%{APPNAME}
Name[cs]=%{APPNAME}
Name[da]=%{APPNAME}
Name[de]=%{APPNAME}
Name[en_GB]=%{APPNAME}

1
templates/qml-plasmoid/package/metadata.desktop
View File

@ -3,6 +3,7 @@ Name=%{APPNAME}
Name[ast]=%{APPNAME}
Name[ca]=%{APPNAME}
Name[ca@valencia]=%{APPNAME}
Name[cs]=%{APPNAME}
Name[da]=%{APPNAME}
Name[de]=%{APPNAME}
Name[en_GB]=%{APPNAME}