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 2015-12-08 10:05:59 +00:00
parent eb7d6cc1cf
commit 4a6cc3319e
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/developerguide/basic/metadata.desktop
View File

@ -1,6 +1,7 @@
[Desktop Entry]
Comment=Basic App
Comment[ca]=Aplicació bàsica
Comment[ca@valencia]=Aplicació bàsica
Comment[es]=Aplicación básica
Comment[fi]=Perussovellus
Comment[gl]=Programa básico