From 3a9b60f35099101cfc31ae1d9f15e5053435c301 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 13 Sep 2022 01:46:19 +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"
---
 containments/homescreens/folio/package/metadata.json | 12 +++++++++++-
 quicksettings/donotdisturb/metadata.json             |  7 +++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/containments/homescreens/folio/package/metadata.json b/containments/homescreens/folio/package/metadata.json
index 5a072af3..33ce7503 100644
--- a/containments/homescreens/folio/package/metadata.json
+++ b/containments/homescreens/folio/package/metadata.json
@@ -37,7 +37,7 @@
         "Description[es]": "Pantalla de inicio para móvil centrada en la personalización.",
         "Description[eu]": "Norbere gustura egokitzeko gaitasuna helburu duen mugikorreko etxeko pantaila.",
         "Description[fr]": "Un écran d'accueil pour périphérique mobile, avec une attention pour la personnalisation.",
-        "Description[ka]": "მობილური საწყისი ეკრანი მორგებადობაზე ფოკუსით",
+        "Description[ka]": "მობილური საწყისი ეკრანი მორგებადობაზე ფოკუსით.",
         "Description[nl]": "Een startscherm voor een mobiel gericht op aanpasbaarheid.",
         "Description[pt]": "Ecrã inicial móvel com um foco na personalização.",
         "Description[sl]": "Mobilni domači zaslon z poudarkom na prilagodljivosti po meri.",
@@ -47,6 +47,16 @@
         "Id": "org.kde.phone.homescreen",
         "License": "GPLv2+",
         "Name": "Folio",
+        "Name[ca@valencia]": "Folio",
+        "Name[ca]": "Folio",
+        "Name[es]": "Folio",
+        "Name[eu]": "Folio",
+        "Name[nl]": "Folio",
+        "Name[pt]": "Folio",
+        "Name[sl]": "Folio",
+        "Name[tr]": "Folyo",
+        "Name[uk]": "Фоліо",
+        "Name[x-test]": "xxFolioxx",
         "ServiceTypes": [
             "Plasma/Applet",
             "Plasma/Containment"
diff --git a/quicksettings/donotdisturb/metadata.json b/quicksettings/donotdisturb/metadata.json
index 53a93d58..41975346 100644
--- a/quicksettings/donotdisturb/metadata.json
+++ b/quicksettings/donotdisturb/metadata.json
@@ -31,9 +31,13 @@
         "Description": "Quick setting to toggle do not disturb mode",
         "Description[ca@valencia]": "Configuració ràpida per a canviar el mode no destorbar",
         "Description[ca]": "Configuració ràpida per canviar el mode no destorbar",
+        "Description[es]": "Ajuste rápido para cambiar el modo «no molestar»",
         "Description[eu]": "Zaratarik ez modua txandakatzeko ezarpen azkarra",
+        "Description[fr]": "Configuration rapide pour basculer ou non en mode « Ne pas déranger »",
+        "Description[ka]": "სისტემის ძილის შეწყვეტის სწრაფი მორგება",
         "Description[nl]": "Snelle instelling om modus niet storen om te schakelen",
         "Description[pt]": "Configuração rápida para activar/desactivar o modo 'não incomodar'",
+        "Description[sl]": "Hitre nastavitve za preklop v način Ne moti",
         "Description[tr]": "Rahatsız etme kipini açıp/kapatmak için tez ayar",
         "Description[uk]": "Швидке встановлення режиму «не турбувати»",
         "Description[x-test]": "xxQuick setting to toggle do not disturb modexx",
@@ -43,9 +47,12 @@
         "Name": "Do Not Disturb",
         "Name[ca@valencia]": "No destorbar",
         "Name[ca]": "No destorbar",
+        "Name[es]": "No molestar",
         "Name[eu]": "Zatarik ez",
+        "Name[fr]": "Ne pas déranger",
         "Name[nl]": "Niet storen",
         "Name[pt]": "Não Incomodar",
+        "Name[sl]": "Ne moti",
         "Name[tr]": "Rahatsız Etme",
         "Name[uk]": "Не турбувати",
         "Name[x-test]": "xxDo Not Disturbxx",