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-01-26 10:21:15 +00:00
parent bd10d78e1e
commit e965b8c647
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

@ -2,6 +2,7 @@
Comment=Basic App Comment=Basic App
Comment[ca]=Aplicació bàsica Comment[ca]=Aplicació bàsica
Comment[ca@valencia]=Aplicació bàsica Comment[ca@valencia]=Aplicació bàsica
Comment[da]=Basal app
Comment[de]=Einfache Anwendung Comment[de]=Einfache Anwendung
Comment[en_GB]=Basic App Comment[en_GB]=Basic App
Comment[es]=Aplicación básica Comment[es]=Aplicación básica