From ff7b037422ee69aa18ae1295f72e2849682f6cc3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 8 Jun 2018 05:55:04 +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" --- applets/clock/metadata.desktop | 1 + applets/quicksettings/package/metadata.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/applets/clock/metadata.desktop b/applets/clock/metadata.desktop index fe363464..d47e3615 100644 --- a/applets/clock/metadata.desktop +++ b/applets/clock/metadata.desktop @@ -9,6 +9,7 @@ Name[de]=Uhr Name[el]=Ρολόι Name[en_GB]=Clock Name[es]=Reloj +Name[fr]=Horloge Name[gl]=Reloxo Name[it]=Orologio Name[nl]=Klok diff --git a/applets/quicksettings/package/metadata.desktop b/applets/quicksettings/package/metadata.desktop index eb399001..65257acd 100644 --- a/applets/quicksettings/package/metadata.desktop +++ b/applets/quicksettings/package/metadata.desktop @@ -8,6 +8,7 @@ Name[cs]=Rychlé nastavení Name[de]=Schnelleinstellungen Name[en_GB]=Quick Settings Name[es]=Ajustes rápidos +Name[fr]=Paramètres rapides Name[gl]=Configuración rápida Name[it]=Impostazioni rapide Name[nl]=Snelle instellingen