From a2e8466b5e2e1cb1685573aef2ed0f0d1f932a14 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 12 Apr 2015 10:30:50 +0000
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"
---
 cursors/Breeze_Snow/Breeze_Snow/index.theme       | 1 +
 cursors/Breeze_Snow/src/index.theme               | 1 +
 kdecoration/config/breezedecorationconfig.desktop | 3 +++
 kstyle/config/breezestyleconfig.desktop           | 3 +++
 wallpapers/Next/metadata.desktop                  | 1 +
 5 files changed, 9 insertions(+)

diff --git a/cursors/Breeze_Snow/Breeze_Snow/index.theme b/cursors/Breeze_Snow/Breeze_Snow/index.theme
index 61950dec..f6e28864 100644
--- a/cursors/Breeze_Snow/Breeze_Snow/index.theme
+++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme
@@ -1,5 +1,6 @@
 [Icon Theme]
 Name=Breeze Snow
+Name[ar]=نسيم ثلجيّ
 Name[ca]=Brisa neu
 Name[cs]=Breeze sníh
 Name[de]=Breeze-Schnee
diff --git a/cursors/Breeze_Snow/src/index.theme b/cursors/Breeze_Snow/src/index.theme
index 61950dec..f6e28864 100644
--- a/cursors/Breeze_Snow/src/index.theme
+++ b/cursors/Breeze_Snow/src/index.theme
@@ -1,5 +1,6 @@
 [Icon Theme]
 Name=Breeze Snow
+Name[ar]=نسيم ثلجيّ
 Name[ca]=Brisa neu
 Name[cs]=Breeze sníh
 Name[de]=Breeze-Schnee
diff --git a/kdecoration/config/breezedecorationconfig.desktop b/kdecoration/config/breezedecorationconfig.desktop
index b2725842..af7c6014 100644
--- a/kdecoration/config/breezedecorationconfig.desktop
+++ b/kdecoration/config/breezedecorationconfig.desktop
@@ -10,6 +10,7 @@ X-KDE-ParentApp=kcontrol
 X-KDE-Weight=60
 
 Name=Window  Decoration
+Name[ar]=زخرفة النّوافذ
 Name[ca]=Decoració de les finestres
 Name[cs]=Dekorace oken
 Name[de]=Fensterdekoration
@@ -40,6 +41,7 @@ Name[x-test]=xxWindow  Decorationxx
 Name[zh_CN]=窗口装饰
 Name[zh_TW]=視窗裝飾
 Comment=Modify the appearance of window decorations
+Comment[ar]=عدّل مظهر زخرفات النّوافذ
 Comment[ca]=Modifica l'aparença de les decoracions de les finestres
 Comment[cs]=Změnit vzhled dekorace oken
 Comment[de]=Das Erscheinungsbild der Fensterdekorationen ändern
@@ -70,6 +72,7 @@ Comment[x-test]=xxModify the appearance of window decorationsxx
 Comment[zh_CN]=修改窗口装饰外观
 Comment[zh_TW]=變更視窗裝飾外觀
 X-KDE-Keywords=breeze,decoration
+X-KDE-Keywords[ar]=نسيم,زخرفة
 X-KDE-Keywords[ca]=breeze,brisa,decoració
 X-KDE-Keywords[cs]=breeze,dekorace
 X-KDE-Keywords[de]=Breeze-Dekoration
diff --git a/kstyle/config/breezestyleconfig.desktop b/kstyle/config/breezestyleconfig.desktop
index c2b286b6..c5c15e01 100644
--- a/kstyle/config/breezestyleconfig.desktop
+++ b/kstyle/config/breezestyleconfig.desktop
@@ -10,6 +10,7 @@ X-KDE-ParentApp=kcontrol
 X-KDE-Weight=50
 
 Name=Widget Style
+Name[ar]=نمط الودجات
 Name[ca]=Estil dels estris
 Name[cs]=Styl widgetu
 Name[de]=Stil der Bedienelemente
@@ -40,6 +41,7 @@ Name[x-test]=xxWidget Stylexx
 Name[zh_CN]=部件样式
 Name[zh_TW]=元件樣式
 Comment=Modify the appearance of widgets
+Comment[ar]=عدّل مظهر الودجات
 Comment[ca]=Modifica l'aparença dels estris
 Comment[cs]=Změnit vzhled widgetů
 Comment[de]=Das Erscheinungsbild der Bedienelemente ändern
@@ -71,6 +73,7 @@ Comment[zh_CN]=修改部件外观
 Comment[zh_TW]=變更元件外觀
 
 X-KDE-Keywords=breeze,widget,style
+X-KDE-Keywords[ar]=نسيم,ودجة,نمط
 X-KDE-Keywords[ca]=breeze,brisa,estri,estil
 X-KDE-Keywords[cs]=breeze,widget,styl
 X-KDE-Keywords[de]=Breeze,Bedienelement,Stil
diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop
index 22b43a00..53425492 100644
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Next
+Name[ar]=التّالي
 Name[bs]=Sljedeći
 Name[ca]=Next
 Name[cs]=Následující