From 51f9dcce9f5c9847167d9ca57feb5a64266ed244 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 11 Sep 2017 04:59:00 +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/quicksettings/package/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/applets/quicksettings/package/metadata.desktop b/applets/quicksettings/package/metadata.desktop index 92b12e0a..b5745884 100644 --- a/applets/quicksettings/package/metadata.desktop +++ b/applets/quicksettings/package/metadata.desktop @@ -4,6 +4,7 @@ Name=Quick Settings Name[ast]=Axustes rápidos Name[ca]=Opcions ràpides Name[cs]=Rychlé nastavení +Name[de]=Schnelleinstellungen Name[es]=Ajustes rápidos Name[nl]=Snelle instellingen Name[nn]=Snøgginnstillingar