From 6d6a361e8b077e24248ee84f8e29d2b257de5a3b Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 25 Sep 2020 06:30:55 +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"
---
 src/org.kde.partitionmanager.desktop | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop
index 90c5ae4..db54d94 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -3,6 +3,7 @@ Type=Application
 Name=KDE Partition Manager
 Name[ar]=مدير أقسام كدي
 Name[ast]=Xestor de particiones de KDE
+Name[az]=KDE Bölmələr Meneceri
 Name[bg]=Управление на дялове за KDE
 Name[bs]=KDE‑ov menadžer particija
 Name[ca]=Gestor de particions del KDE
@@ -56,6 +57,7 @@ Name[zh_TW]=KDE 磁碟分割區管理員
 GenericName=Partition Editor
 GenericName[ar]=محرّر أقسام
 GenericName[ast]=Editor de particiones
+GenericName[az]=Bölmələr Redaktoru
 GenericName[bg]=Редактор на дялове
 GenericName[bs]=Uređivač particija
 GenericName[ca]=Editor de particions
@@ -108,6 +110,7 @@ GenericName[zh_TW]=磁碟分割區編輯器
 Comment=Manage disks, partitions and file systems
 Comment[ar]=أدِر الأقراص، والأقسام وأنظمة الملفّات
 Comment[ast]=Xestiona discos, particiones y sistemes de ficheros
+Comment[az]=Disklər, bölmələr, və fayl sistemləri idarə edilməsi
 Comment[bg]=Управлява размерите на дискове, дялове и операционни системи
 Comment[bs]=Upravljajte diskovima, particijama i datotečnim sistemima
 Comment[ca]=Gestioneu discos, particions i sistemes de fitxers
@@ -164,6 +167,7 @@ Categories=System;Filesystem;KDE;Qt;
 X-KDE-StartupNotify=true
 Keywords=partition;disk;
 Keywords[ast]=partición;particionar;discu;
+Keywords[az]=partition;disk;bölmə;
 Keywords[ca]=partició;disc;
 Keywords[ca@valencia]=partició;disc;
 Keywords[cs]=oddíl;disk;