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-06-12 05:14:10 +02:00
parent 2d4548e4d0
commit 2544d1c9c7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scriptengines/python/plasma-scriptengine-dataengine-python.desktop
View File

@ -53,7 +53,7 @@ Comment[et]=Plasma andmemootori toetus Pythonile
Comment[fi]=Plasma-tietomoottorituki Python-kielelle
Comment[fr]=Prise en charge du moteur de données de Plasma pour Python
Comment[gd]=Taic ri inneal-dàta aig Plasma airson Python
Comment[gl]=Motor de datos de Plasma para dar soporte a Python
Comment[gl]=Compatibilidade do motor de datos de Plasma con Python.
Comment[hu]=Plazma adatmotor támogatás Pythonhoz
Comment[ia]=Supporto de moptor de datos de Plasma per Python
Comment[it]=Supporto per Python del motore di dati di Plasma