From 811bdd7111439345f255c9b8ad04be43f2ae51c0 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 2 Feb 2018 05:22:22 +0100
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"
---
 app/latte-layouts.knsrc                    | 1 +
 app/lattedock.notifyrc                     | 6 ++++++
 applets/separator/metadata.desktop.cmake   | 1 +
 applets/separator/package/metadata.desktop | 1 +
 4 files changed, 9 insertions(+)

diff --git a/app/latte-layouts.knsrc b/app/latte-layouts.knsrc
index 55f18082a..6d666e084 100644
--- a/app/latte-layouts.knsrc
+++ b/app/latte-layouts.knsrc
@@ -1,5 +1,6 @@
 [KNewStuff3]
 Name=Latte Layouts
+Name[ar]=مخطّطات لاتيه
 Name[ca]=Disposicions del Latte
 Name[ca@valencia]=Disposicions del Latte
 Name[de]=Latte-Profile
diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc
index 10cbea83b..0bb7dc2c1 100644
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@@ -1,5 +1,6 @@
 [Global]
 Name=Latte Dock
+Name[ar]=رصيف لاتيه
 Name[ca]=Latte Dock
 Name[ca@valencia]=Latte Dock
 Name[da]=Latte-dok
@@ -16,6 +17,7 @@ Name[uk]=Панель Латте
 Name[x-test]=xxLatte Dockxx
 Name[zh_TW]=Latte Dock
 Comment=Latte Dock
+Comment[ar]=رصيف لاتيه
 Comment[ca]=Acoblable del Latte
 Comment[ca@valencia]=Acoblable del Latte
 Comment[da]=Latte-dok
@@ -35,6 +37,7 @@ IconName=latte-dock
 
 [Event/import-done]
 Name=Configuration imported successfully
+Name[ar]=استوردتُ الضّّبط بنجاح
 Name[ca]=La configuració s'ha importat amb èxit
 Name[ca@valencia]=La configuració s'ha importat amb èxit
 Name[da]=Import af konfiguration gennemført
@@ -55,6 +58,7 @@ Action=Popup
 
 [Event/import-fail]
 Name=Failed to import configuration
+Name[ar]=فشل استيراد الضّبط
 Name[ca]=Ha fallat en importar la configuració
 Name[ca@valencia]=Ha fallat en importar la configuració
 Name[da]=Kunne ikke importere konfiguration
@@ -75,6 +79,7 @@ Action=Popup
 
 [Event/export-done]
 Name=Configuration exported successfully
+Name[ar]=صدّرتُ الضّبط بنجاح
 Name[ca]=La configuració s'ha exportat amb èxit
 Name[ca@valencia]=La configuració s'ha exportat amb èxit
 Name[da]=Eksport af konfiguration gennemført
@@ -95,6 +100,7 @@ Action=Popup
 
 [Event/export-fail]
 Name=Failed to export configuration
+Name[ar]=فشل تصدير الضّبط
 Name[ca]=Ha fallat en exportar la configuració
 Name[ca@valencia]=Ha fallat en exportar la configuració
 Name[da]=Kunne ikke eksportere konfiguration
diff --git a/applets/separator/metadata.desktop.cmake b/applets/separator/metadata.desktop.cmake
index fc49c4f9f..ed6ab0ace 100644
--- a/applets/separator/metadata.desktop.cmake
+++ b/applets/separator/metadata.desktop.cmake
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Separator
+Name[ar]=فاصل
 Name[ca]=Separador
 Name[ca@valencia]=Separador
 Name[cs]=Oddělovač
diff --git a/applets/separator/package/metadata.desktop b/applets/separator/package/metadata.desktop
index fc49c4f9f..ed6ab0ace 100644
--- a/applets/separator/package/metadata.desktop
+++ b/applets/separator/package/metadata.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Separator
+Name[ar]=فاصل
 Name[ca]=Separador
 Name[ca@valencia]=Separador
 Name[cs]=Oddělovač