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-04 09:12:31 +00:00
parent 1e1a75f7d3
commit 8a21e2bb27
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,10 @@
[Desktop Entry] [Desktop Entry]
Comment=Basic App Comment=Basic App
Comment[nl]=Basis app
Comment[pt]=Aplicação Básica
Comment[sv]=Enkel applikation
Comment[uk]=Базова програма
Comment[x-test]=xxBasic Appxx
Name=Bug Name=Bug
Name[ast]=Fallu Name[ast]=Fallu
Name[ca]=Error Name[ca]=Error