From 39947e3d383bca0aa7fec2c65f014301f277cff2 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 7 Feb 2021 06:52:57 +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"
---
 .../devicenotifications.notifyrc              | 69 +++++++++++++++++++
 .../plasma-dataengine-powermanagement.desktop |  2 +-
 2 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/dataengines/devicenotifications/devicenotifications.notifyrc b/dataengines/devicenotifications/devicenotifications.notifyrc
index 67e334821..0a9981f71 100644
--- a/dataengines/devicenotifications/devicenotifications.notifyrc
+++ b/dataengines/devicenotifications/devicenotifications.notifyrc
@@ -1,5 +1,74 @@
 [Global]
 Name=Device Notifier
+Name[ar]=مُخطِر الأجهزة
+Name[ast]=Avisador de preseos
+Name[az]=Cihaz qoşulmaları bildirişləri
+Name[be@latin]=Infarmavańnie pra novyja pryłady
+Name[bg]=Уведомяване за нови устройства
+Name[bn]=ডিভাইস নোটিফায়ার
+Name[bn_IN]=ডিভাইসের সূচনা ব্যবস্থা
+Name[bs]=Izveštavač o uređajima
+Name[ca]=Notificador de dispositius
+Name[ca@valencia]=Notificador de dispositius
+Name[csb]=Dôwôcz wiédzë ò ùrządzeniach
+Name[da]=Enhedsbekendtgørelse
+Name[de]=Geräteüberwachung
+Name[el]=Ειδοποίηση νέας συσκευής
+Name[en_GB]=Device Notifier
+Name[eo]=Atentigilo pri nova aparato
+Name[es]=Notificador de dispositivos
+Name[et]=Seadmete teadustaja
+Name[eu]=Gailu-jakinarazlea
+Name[fa]=اخطار دهنده‌ی دستگاه
+Name[fi]=Laiteilmoitin
+Name[fr]=Notification de nouveau périphérique
+Name[fy]=Apparaat meidieler
+Name[ga]=Fógróir Gléis
+Name[gl]=Notificador de dispositivos
+Name[gu]=ઉપકરણ નોંધ કરનાર
+Name[he]=מודיע על התקנים
+Name[hi]=उपकरण सूचक
+Name[hne]=उपकरन बतइया
+Name[hr]=Glasnik uređaja
+Name[hsb]=Zdźělenki wo gratach
+Name[hu]=Eszközértesítő
+Name[ia]=Notificator de dispositivo
+Name[id]=Penotifikasi Perangkat
+Name[is]=Tilkynningar um ný tæki
+Name[it]=Notificatore dei dispositivi
+Name[ja]=デバイスの通知
+Name[kk]=Құрылғы құлақтандырғышы
+Name[km]=កម្មវិធី​ជូនដំណឹង​ឧបករណ៍​
+Name[kn]=ಹೊಸ ಸಾಧನ ಸೂಚಕ
+Name[ko]=장치 알림이
+Name[ku]=Hişyarkerê Cîhaz
+Name[lt]=Pranešimai apie įrenginius
+Name[lv]=Ierīču paziņotājs
+Name[mk]=Известувач за уреди
+Name[ml]=ഡിവൈസ് നോട്ടിഫയര്‍
+Name[mr]=साधन निदर्शक
+Name[nds]=Bescheden över Reedschappen
+Name[nl]=Apparaatmelder
+Name[pa]=ਜੰਤਰ ਨੋਟੀਫਾਇਰ
+Name[pl]=Powiadomienia o urządzeniach
+Name[pt_BR]=Notificação de dispositivos
+Name[ro]=Notificare dispozitive
+Name[ru]=Подключаемые устройства
+Name[si]=උපාංග දැනුම් දීම
+Name[sk]=Monitor zariadení
+Name[sl]=Obvestila o napravah
+Name[sr]=извештавач о уређајима
+Name[sr@ijekavian]=извјештавач о уређајима
+Name[sr@ijekavianlatin]=izvještavač o uređajima
+Name[sr@latin]=izveštavač o uređajima
+Name[sv]=Underrättelse om enheter
+Name[ta]=கருவி நோட்டம்
+Name[th]=แจ้งให้ทราบถึงอุปกรณ์
+Name[tr]=Aygıt Bildirici
+Name[ug]=ئۈسكۈنە ئۇقتۇرۇشى
+Name[uk]=Сповіщення про пристрої
+Name[wa]=Notifiaedje d' éndjin
+Name[zh_TW]=裝置通知
 IconName=device-notifier
 
 [Event/safelyRemovable]
diff --git a/dataengines/powermanagement/plasma-dataengine-powermanagement.desktop b/dataengines/powermanagement/plasma-dataengine-powermanagement.desktop
index b8324d9e6..0cab86213 100644
--- a/dataengines/powermanagement/plasma-dataengine-powermanagement.desktop
+++ b/dataengines/powermanagement/plasma-dataengine-powermanagement.desktop
@@ -3,7 +3,7 @@
 Name=Power Management
 Name[ar]=إدارة الطاقة
 Name[ast]=Xestión enerxética
-Name[az]=El.qida idarəçisi
+Name[az]=Enerji İdarəetməsi
 Name[bg]=Управление на захранването
 Name[bn]=শক্তি ব্যবস্থাপনা
 Name[bs]=Upravljanje napajanjem