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 2017-10-17 05:06:20 +02:00
parent dea8a1ed5f
commit 673a8a7dd9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/dataengines/simpleEngine/plasma-dataengine-example-simpleEngine.desktop
View File

@ -53,7 +53,7 @@ Comment[eu]='DataEngine'ren inplementazio oso oinarrizkoa
Comment[fi]=Erittäin yksinkertainen DataEngine-toteutus
Comment[fr]=Une implémentation très basique de DataEngine
Comment[gd]=Ball-eisimpleir glè bhunasach de DataEngine
Comment[gl]=Unha implementación moi básica de DataEngine
Comment[gl]=Unha realización moi básica de DataEngine
Comment[hu]=Egy nagyon egyszerű adatmotor megvalósítás
Comment[ia]=Un implementation multo basic de DataEngine (Motor de datos)
Comment[it]=Un'implementazione base di un motore di dati