From 5aeba9da592a768e3b2574106693d10dbb3307c1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 8 Oct 2018 07:59:39 +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" --- effects/logout/package/metadata.desktop | 1 + effects/scale/scale_config.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/effects/logout/package/metadata.desktop b/effects/logout/package/metadata.desktop index ea8c855c14..740bf77738 100644 --- a/effects/logout/package/metadata.desktop +++ b/effects/logout/package/metadata.desktop @@ -3,6 +3,7 @@ Name=Logout Name[ca]=Sortida Name[ca@valencia]=Eixida Name[cs]=Odhlášení +Name[de]=Abmeldung Name[en_GB]=Logout Name[es]=Cerrar la sesión Name[eu]=Saio-ixtea diff --git a/effects/scale/scale_config.desktop b/effects/scale/scale_config.desktop index 712e60ed01..7afb3ada66 100644 --- a/effects/scale/scale_config.desktop +++ b/effects/scale/scale_config.desktop @@ -9,6 +9,7 @@ Name=Scale Name[ca]=Escala Name[ca@valencia]=Escala Name[cs]=Měřítko +Name[de]=Skalieren Name[en_GB]=Scale Name[es]=Escalar Name[eu]=Eskalatu