From 30d7abbb7627d3c769ee78bf07d38d7a91bdc645 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 7 Jul 2022 01:42:28 +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"
---
 plugins/contacts/kdeconnect_contacts.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/contacts/kdeconnect_contacts.json b/plugins/contacts/kdeconnect_contacts.json
index 7549b3b00..3b9854c98 100644
--- a/plugins/contacts/kdeconnect_contacts.json
+++ b/plugins/contacts/kdeconnect_contacts.json
@@ -90,7 +90,7 @@
         "Name": "Contacts",
         "Name[ar]": "المتراسلون",
         "Name[ast]": "Contautos",
-        "Name[az]": "Kontaktlar",
+        "Name[az]": "Əlaqələr",
         "Name[bg]": "Контакти",
         "Name[ca@valencia]": "Contactes",
         "Name[ca]": "Contactes",