From 894d498940df9602789d1e15cf4d554a606d8c79 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 1 Sep 2017 04:40:26 +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 | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/applets/quicksettings/package/metadata.desktop b/applets/quicksettings/package/metadata.desktop
index fb11f66a..86116c79 100644
--- a/applets/quicksettings/package/metadata.desktop
+++ b/applets/quicksettings/package/metadata.desktop
@@ -1,8 +1,21 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Quick Settings
+Name[ca]=Opcions ràpides
+Name[cs]=Rychlé nastavení
+Name[nl]=Snelle instellingen
+Name[pt]=Configuração Rápida
+Name[sv]=Snabbinställningar
+Name[uk]=Швидке налаштовування
+Name[x-test]=xxQuick Settingsxx
 
 Comment=A panel to quickly access most important settings
+Comment[ca]=Un plafó per accedir ràpidament a les opcions més importants
+Comment[nl]=Een paneel voor snelle toegang tot de meest belangrijke instellingen
+Comment[pt]=Um painel para aceder rapidamente às configurações mais importantes
+Comment[sv]=En panel för att snabbt komma åt de viktigaste inställningarna
+Comment[uk]=Панель для пришвидшення доступу до найважливіших параметрів
+Comment[x-test]=xxA panel to quickly access most important settingsxx
 
 Icon=systemsettings
 Type=Service