From 799b26861d6affd73c00d73c77fb655fc4ddc3e8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 1 Jul 2018 05:39:10 +0200 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours 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" --- .../plasma-dataengine-example-sourcesOnRequest.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/dataengines/sourcesOnRequest/plasma-dataengine-example-sourcesOnRequest.desktop b/examples/dataengines/sourcesOnRequest/plasma-dataengine-example-sourcesOnRequest.desktop index 9fe305eff..31d83d558 100644 --- a/examples/dataengines/sourcesOnRequest/plasma-dataengine-example-sourcesOnRequest.desktop +++ b/examples/dataengines/sourcesOnRequest/plasma-dataengine-example-sourcesOnRequest.desktop @@ -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