From 2a6775577ffa5d134002d9d9e9e6f483ba58bde4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 15 Oct 2019 09:09:33 +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" --- libcolorcorrect/kded/colorcorrectlocationupdater.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/libcolorcorrect/kded/colorcorrectlocationupdater.desktop b/libcolorcorrect/kded/colorcorrectlocationupdater.desktop index c752d57c6..59efa164a 100644 --- a/libcolorcorrect/kded/colorcorrectlocationupdater.desktop +++ b/libcolorcorrect/kded/colorcorrectlocationupdater.desktop @@ -8,6 +8,7 @@ Name[de]=Geolokalisierung-Aktualisierung zur Farbkorrektur Name[en_GB]=ColourCorrect Geolocation Updater Name[es]=Actualizador de geolocalización ColorCorrect Name[eu]=ColorCorrect geokokapen eguneratzailea +Name[fi]=ColorCorrect Geolocation -päivittäjä Name[fr]=Actualisation de géolocalisation ColorCorrect Name[gl]=Actualizador de geolocalización de ColorCorrect Name[id]=Pembaru Geolokasi ColorCorrect