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 2018-07-01 05:39:10 +02:00
parent 0c8dd9dc2b
commit 799b26861d
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/sourcesOnRequest/plasma-dataengine-example-sourcesOnRequest.desktop
View File

@ -54,7 +54,7 @@ Comment[gd]=Ball-eisimpleir airson inneal-dàta a sheallas mar a fhreagrar do dh
Comment[gl]=Un exemplo de DataEngine que mostra como responder a pedidos de creación e actualización de orixes
Comment[hu]=DataEngine példa forráslétrehozási és frissítési kérések megválaszolására
Comment[ia]=Un exemplo de dataEngine (motor de datos) monstrante como responder a requestas de creation de fonte e actualisationes
Comment[id]=Sebuah pertampilan contoh MesinData bagaimana untuk merespon atas permintaan terhadap pembaruan dan penciptaan sumber
Comment[id]=Sebuah pertampilan contoh MesinData bagaimana untuk merespon atas permintaan terhadap update dan penciptaan sumber
Comment[it]=Un esempio di motore di dati che mostra come rispondere alle richieste di creazione di fonti e aggiornamenti
Comment[ko]=원본 생성과 업데이트에 반응할 방법에 대한 데이터 엔진 예제
Comment[nb]=Et DataEngine-eksempel som viser hvordan forespørsel om oppretting og oppdatering av kilder skal besvares