From: l10n daemon script <scripty@kde.org>
Date: Mon, 2 May 2022 01:41:17 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/e148329393c749cd20153bda5b1873f5b93bb6f2

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"
---

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index cfe09e763..4fd797730 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -2,6 +2,7 @@
     "KPlugin": {
         "Description": "Configure general file manager settings",
         "Description[ar]": "اضبط إعدادات مدير الملفّات العامّة",
+        "Description[az]": "Əsas fayl meneceri ayarlarını tənzimləyin",
         "Description[ca@valencia]": "Configura les opcions generals del gestor de fitxers",
         "Description[ca]": "Configura les opcions generals del gestor de fitxers",
         "Description[es]": "Configurar las preferencias generales del gestor de archivos",
@@ -19,6 +20,7 @@
         "Icon": "system-file-manager",
         "Name": "General",
         "Name[ar]": "عامّ",
+        "Name[az]": "Əsas",
         "Name[ca@valencia]": "General",
         "Name[ca]": "General",
         "Name[es]": "General",
diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index db11a5cb2..340a0f06e 100644
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -2,6 +2,7 @@
     "KPlugin": {
         "Description": "Configure file manager navigation",
         "Description[ar]": "اضبط التّنقّل في مدير الملفّات",
+        "Description[az]": "Fayl meneceri naviqasiyasını tənzimləyin",
         "Description[ca@valencia]": "Configura la navegació del gestor de fitxers",
         "Description[ca]": "Configura la navegació del gestor de fitxers",
         "Description[es]": "Configurar la navegación del gestor de archivos",
diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index 3f1449ee4..219c2053f 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -2,6 +2,7 @@
     "KPlugin": {
         "Description": "Configure file manager view modes",
         "Description[ar]": "اضبط أوضاع العرض في مدير الملفّات",
+        "Description[az]": "Fayl meneceri baxış rejimlərini tənzimləyin",
         "Description[ca@valencia]": "Configura els modes de vista del gestor de fitxers",
         "Description[ca]": "Configura els modes de vista del gestor de fitxers",
         "Description[es]": "Configurar los modos de vistas del gestor de archivos",