From ee113b8cdc884737e28d50bf0e94b2c4f2eed9fc Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 14 Feb 2022 01:43:34 +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"
---
 bin/plasma-mobile.desktop.cmake                   | 2 ++
 containments/homescreen/package/metadata.desktop  | 1 +
 containments/panel/package/metadata.desktop       | 1 +
 containments/taskpanel/package/metadata.desktop   | 1 +
 look-and-feel/metadata.desktop                    | 3 +++
 plasma_phone_components.notifyrc                  | 3 +++
 quicksettings/airplanemode/metadata.desktop       | 1 +
 quicksettings/caffeine/metadata.desktop           | 3 +++
 quicksettings/nightcolor/package/metadata.desktop | 1 +
 quicksettings/powermenu/package/metadata.desktop  | 3 +++
 shell/metadata.desktop                            | 2 ++
 11 files changed, 21 insertions(+)

diff --git a/bin/plasma-mobile.desktop.cmake b/bin/plasma-mobile.desktop.cmake
index 8c58fc63..5b4cbaf0 100644
--- a/bin/plasma-mobile.desktop.cmake
+++ b/bin/plasma-mobile.desktop.cmake
@@ -7,6 +7,7 @@ TryExec=${CMAKE_INSTALL_FULL_BINDIR}/kwinwrapper
 DesktopNames=KDE
 Name=Plasma Mobile
 Name[ast]=Plasma Mobile
+Name[az]=Plasma Mobil
 Name[ca]=Plasma Mobile
 Name[ca@valencia]=Plasma Mobile
 Name[cs]=Plasma Mobile
@@ -43,6 +44,7 @@ Name[zh_CN]=Plasma Mobile
 Name[zh_TW]=Plasma 行動
 Comment=Plasma Mobile by KDE
 Comment[ast]=Plasma Mobile, por KDE
+Comment[az]=KDE Plasma Mobil
 Comment[ca]=Plasma Mobile, creat per la comunitat KDE
 Comment[ca@valencia]=Plasma Mobile, creat per la comunitat KDE
 Comment[cs]=Plasma Mobile od KDE
diff --git a/containments/homescreen/package/metadata.desktop b/containments/homescreen/package/metadata.desktop
index ff7513b5..3b1448ef 100644
--- a/containments/homescreen/package/metadata.desktop
+++ b/containments/homescreen/package/metadata.desktop
@@ -6,6 +6,7 @@ Encoding=UTF-8
 Keywords=
 Name=Phone Homescreen
 Name[ast]=Pantalla d'aniciu del teléfonu
+Name[az]=Telefon ana ekranı
 Name[ca]=Pantalla d'inici del telèfon
 Name[ca@valencia]=Pantalla d'inici del telèfon
 Name[cs]=Domácí obrazovka telefonu
diff --git a/containments/panel/package/metadata.desktop b/containments/panel/package/metadata.desktop
index bf147090..60ee2824 100644
--- a/containments/panel/package/metadata.desktop
+++ b/containments/panel/package/metadata.desktop
@@ -6,6 +6,7 @@ Encoding=UTF-8
 Keywords=
 Name=Phone Panel
 Name[ast]=Panel del teléfonu
+Name[az]=Telefon paneli
 Name[ca]=Plafó del telèfon
 Name[ca@valencia]=Plafó del telèfon
 Name[cs]=Panel telefonu
diff --git a/containments/taskpanel/package/metadata.desktop b/containments/taskpanel/package/metadata.desktop
index f9d0761b..78893942 100644
--- a/containments/taskpanel/package/metadata.desktop
+++ b/containments/taskpanel/package/metadata.desktop
@@ -6,6 +6,7 @@ Encoding=UTF-8
 Keywords=
 Name=Phone Task panel
 Name[ast]=Panel de xeres del teléfonu
+Name[az]=Telefon tapşırıq paneli
 Name[ca]=Plafó de tasques del telèfon
 Name[ca@valencia]=Plafó de tasques del telèfon
 Name[da]=Opgavepanel til telefon
diff --git a/look-and-feel/metadata.desktop b/look-and-feel/metadata.desktop
index d955dd41..ef230e14 100644
--- a/look-and-feel/metadata.desktop
+++ b/look-and-feel/metadata.desktop
@@ -4,6 +4,7 @@
 [Desktop Entry]
 Name=Plasma Phone
 Name[ast]=Plasma Phone
+Name[az]=Plasma Telefon
 Name[ca]=Telèfon del Plasma
 Name[ca@valencia]=Telèfon del Plasma
 Name[cs]=Plasma Phone
@@ -41,6 +42,7 @@ Name[zh_CN]=Plasma Phone
 Name[zh_TW]=Plasma 電話
 Comment=Plasma workspace for smartphones
 Comment[ast]=La estaya de trabayu de Plasma pa teléfonos intelixentes
+Comment[az]=Smartfonlar üçün Plasma iş sahəsi
 Comment[ca]=Espai de treball del Plasma per a telèfons intel·ligents
 Comment[ca@valencia]=Espai de treball del Plasma per a telèfons intel·ligents
 Comment[da]=Plasma arbejdsområde til smartphones
@@ -77,6 +79,7 @@ Comment[zh_CN]=专为手机定制的 Plasma 工作空间
 Comment[zh_TW]=智慧型手機的 Plasma 工作空間
 Keywords=Phone, Workspace, Look and Feel
 Keywords[ast]=Teléfonu, estilu y aspeutu, y estaya de trabayu
+Keywords[az]=Telefon, İş sahəsi, Xarici görünüş
 Keywords[ca]=Telèfon, Espai de treball, Aspecte i comportament
 Keywords[ca@valencia]=Telèfon, Espai de treball, Aspecte i comportament
 Keywords[da]=Telefon, arbejdsområde, udseende og fremtoning
diff --git a/plasma_phone_components.notifyrc b/plasma_phone_components.notifyrc
index 8e8258de..ee363af3 100644
--- a/plasma_phone_components.notifyrc
+++ b/plasma_phone_components.notifyrc
@@ -5,6 +5,7 @@
 IconName=preferences-system-windows-effect-screenshot
 Name=Plasma
 Name[ast]=Plasma
+Name[az]=Plasma
 Name[ca]=Plasma
 Name[ca@valencia]=Plasma
 Name[cs]=Plasma
@@ -37,6 +38,7 @@ Name[zh_CN]=Plasma
 
 [Event/captured]
 Name=Captured
+Name[az]=Şəkli çəkildi
 Name[ca]=Capturat
 Name[ca@valencia]=Capturat
 Name[cs]=Zachyceno
@@ -66,6 +68,7 @@ Name[uk]=Захоплено
 Name[x-test]=xxCapturedxx
 Name[zh_CN]=已捕获
 Comment=Captured
+Comment[az]=Şəkli çəkildi
 Comment[ca]=Capturat
 Comment[ca@valencia]=Capturat
 Comment[cs]=Zachyceno
diff --git a/quicksettings/airplanemode/metadata.desktop b/quicksettings/airplanemode/metadata.desktop
index 5ed1eceb..8e7e36f8 100644
--- a/quicksettings/airplanemode/metadata.desktop
+++ b/quicksettings/airplanemode/metadata.desktop
@@ -3,6 +3,7 @@
 
 [Desktop Entry]
 Name=Airplane Mode
+Name[az]=Uçuş rejimi
 Name[ca]=Mode avió
 Name[ca@valencia]=Mode avió
 Name[cs]=Režim v Letadle
diff --git a/quicksettings/caffeine/metadata.desktop b/quicksettings/caffeine/metadata.desktop
index f4c6b897..fbda30f0 100644
--- a/quicksettings/caffeine/metadata.desktop
+++ b/quicksettings/caffeine/metadata.desktop
@@ -3,7 +3,10 @@
 
 [Desktop Entry]
 Name=Caffeine
+Name[az]=Caffeine
 Name[ca]=Caffeine
+Name[es]=Cafeína
+Name[fr]=Caffeine
 Name[nl]=Cafeïne
 Name[sv]=Koffein
 Name[uk]=Кофеїн
diff --git a/quicksettings/nightcolor/package/metadata.desktop b/quicksettings/nightcolor/package/metadata.desktop
index 5df47fcf..27e6df59 100644
--- a/quicksettings/nightcolor/package/metadata.desktop
+++ b/quicksettings/nightcolor/package/metadata.desktop
@@ -3,6 +3,7 @@
 
 [Desktop Entry]
 Name=Night Color
+Name[az]=Gecə rəngi
 Name[ca]=Color de nit
 Name[ca@valencia]=Color de nit
 Name[cs]=Noční barva
diff --git a/quicksettings/powermenu/package/metadata.desktop b/quicksettings/powermenu/package/metadata.desktop
index e4923934..81484f2b 100644
--- a/quicksettings/powermenu/package/metadata.desktop
+++ b/quicksettings/powermenu/package/metadata.desktop
@@ -3,7 +3,10 @@
 
 [Desktop Entry]
 Name=Power Menu
+Name[az]=Güc menyusu
 Name[ca]=Power Menu
+Name[es]=Menú de energía
+Name[fr]=Menu « Énergie »
 Name[nl]=Energiemenu
 Name[sv]=Strömmeny
 Name[uk]=Меню живлення
diff --git a/shell/metadata.desktop b/shell/metadata.desktop
index ee9e5179..74a9cd0d 100644
--- a/shell/metadata.desktop
+++ b/shell/metadata.desktop
@@ -6,6 +6,7 @@
 Encoding=UTF-8
 Name=Phone
 Name[ast]=Teléfonu
+Name[az]=Telefon
 Name[ca]=Telèfon
 Name[ca@valencia]=Telèfon
 Name[cs]=Telefon
@@ -43,6 +44,7 @@ Name[zh_CN]=手机
 Name[zh_TW]=電話
 Comment=Plasma shell for phones
 Comment[ast]=La shell de Plasma pa teléfonos
+Comment[az]=Telefonlar üçün Plasma üz qabığı
 Comment[ca]=Espai de treball Plasma per a telèfons
 Comment[ca@valencia]=Espai de treball Plasma per a telèfons
 Comment[cs]=Plasma Shell pro telefony