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 2020-04-04 06:27:52 +02:00
parent 8b5e093141
commit 26eb57c53e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/testcontainmentactionsplugin/plasma-containmentactions-test.desktop
View File

@ -66,7 +66,7 @@ Comment[hu]=Üres bővítmény tesztelésre
Comment[ia]=Un plugin vacue pro essayar
Comment[id]=Sebuah plugin dumi untuk pengujian
Comment[it]=Un'estensione finta di prova
Comment[ko]=테스트를 위한 뼈대 플러그인
Comment[ko]=테스트용 뼈대 플러그인
Comment[lt]=Netikras papildinys testavimui
Comment[mr]=चाचणीसाठी नकली प्लगइन
Comment[nb]=Et attrapp-programtillegg for testing

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

@ -62,7 +62,7 @@ Comment[hu]=Plazma adatmotor támogatás Pythonhoz
Comment[ia]=Supporto de moptor de datos de Plasma per Python
Comment[id]=Dukungan mesin data Plasma untuk Python
Comment[it]=Supporto per Python del motore di dati di Plasma
Comment[ko]=파이썬을 위한 Plasma 데이터 엔진 지원
Comment[ko]=Python용 Plasma 데이터 엔진 지원
Comment[lt]=Plasma duomenų variklio palaikymas Python kalbai
Comment[lv]=Plasma datu dzinēja atbalsts priekš Python
Comment[nb]=Plasma datamotor-støtte for Python