From fb88fc72a483027ff6a39d97da83bfdce5da5373 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 22 Jul 2018 07:44:50 +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" --- .../applicationjobs/plasma-dataengine-applicationjobs.desktop | 2 +- libcolorcorrect/kded/colorcorrectlocationupdater.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop b/dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop index 6b1b548c8..d325a322f 100644 --- a/dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop +++ b/dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop @@ -92,7 +92,7 @@ Comment[he]=עידכוני עבודת יישום (באמצעות kuiserver) Comment[hr]=Ažuriranja poslova aplikacija (preko kuiservera) Comment[hu]=Feladatfrissítő (a kuiserveren keresztül) Comment[ia]=Actualisationes de travalio de application (via kuiserver) -Comment[id]=Tugas aplikasi diperbarui (via kuiserver) +Comment[id]=Tugas aplikasi diupdate (via kuiserver) Comment[is]=Uppfærslutilkynningar um verkefni forrita (með kuiserver) Comment[it]=Aggiornamenti sui processi delle applicazioni (via kuiserver) Comment[ja]=アプリケーションジョブ更新 (kuiserver 経由) diff --git a/libcolorcorrect/kded/colorcorrectlocationupdater.desktop b/libcolorcorrect/kded/colorcorrectlocationupdater.desktop index 55c304809..1803c9ab8 100644 --- a/libcolorcorrect/kded/colorcorrectlocationupdater.desktop +++ b/libcolorcorrect/kded/colorcorrectlocationupdater.desktop @@ -43,7 +43,7 @@ Comment[eu]=kokapen datu eguneratuak bidaltzen dizkio konposatzaileari Comment[fi]=Lähettää päivitetyn sijaintitiedon koostajalle Comment[fr]=Envoie des données de localisation actualisées au compositeur Comment[gl]=Envía datos de localización actualizados ao compositor. -Comment[id]=Mengirimkan data lokasi yang diperbarui ke kompositor +Comment[id]=Mengirimkan data lokasi yang diupdate ke kompositor Comment[it]=Invia i dati di posizione aggiornati al compositore Comment[nl]=Verstuurt bijgewerkte locatiegegevens naar de compositeur Comment[nn]=Send oppdater staddata til samansetjaren