From 344a99b67e717826ab6862f5a234dd9558a66582 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 23 Aug 2018 08:09:40 +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 df8d47f9b..477877aa0 100644 --- a/libcolorcorrect/kded/colorcorrectlocationupdater.desktop +++ b/libcolorcorrect/kded/colorcorrectlocationupdater.desktop @@ -4,6 +4,7 @@ Name=ColorCorrect Geolocation Updater Name[ca]=Actualitzador de la geolocalització del ColorCorrect Name[ca@valencia]=Actualitzador de la geolocalització del ColorCorrect Name[da]=Opdatering af geolokalisering til ColorCorrect Geolocation +Name[de]=Geolokalisierung-Aktualisierung zur Farbkorrektur Name[en_GB]=ColourCorrect Geolocation Updater Name[es]=Actualizador de geolocalización ColorCorrect Name[eu]=ColorCorrect geokokapen eguneratzailea