From a80d7a1bea91fcb03bb1c5a405a5f29b8b0bef49 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 21 Jun 2023 02:20:37 +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"
---
 bin/plasma-mobile-dev.desktop.cmake                            | 1 +
 kcms/time/clockconfig_actions.actions                          | 3 +++
 .../record/plasma_mobile_quicksetting_record.notifyrc          | 3 +++
 .../screenshot/plasma_mobile_quicksetting_screenshot.notifyrc  | 3 +++
 4 files changed, 10 insertions(+)

diff --git a/bin/plasma-mobile-dev.desktop.cmake b/bin/plasma-mobile-dev.desktop.cmake
index a3376ea1..54122161 100644
--- a/bin/plasma-mobile-dev.desktop.cmake
+++ b/bin/plasma-mobile-dev.desktop.cmake
@@ -16,6 +16,7 @@ Name[es]=Plasma Mobile (desarrollo)
 Name[eu]=Plasma Mugikorra (Garapena)
 Name[fi]=Plasma Mobile (kehitys)
 Name[fr]=Plasma Mobile (Développement)
+Name[gl]=Plasma Mobile (desenvolvemento)
 Name[ia]=Plasma Mobile (Disveloppamento)
 Name[is]=Plasma Mobile (þróunarútgáfa)
 Name[it]=Plasma Mobile (sviluppo)
diff --git a/kcms/time/clockconfig_actions.actions b/kcms/time/clockconfig_actions.actions
index 06efd30b..8dd42e37 100644
--- a/kcms/time/clockconfig_actions.actions
+++ b/kcms/time/clockconfig_actions.actions
@@ -15,6 +15,7 @@ Name[es]=Módulo de control de fecha y hora
 Name[eu]=Data eta orduaren kontrolerako modulua
 Name[fi]=Ajan ja päiväyksen hallintamoduuli
 Name[fr]=Module de contrôle de la date et de l'heure
+Name[gl]=Módulo de control da data e hora
 Name[ia]=Modulo de controlo de data e tempore
 Name[it]=Modulo di controllo di data e ora
 Name[ka]=თარიღისა და დროის კონტროლის მოდული
@@ -44,6 +45,7 @@ Name[es]=Guardar las preferencias de fecha y hora
 Name[eu]=Gorde data/ordu ezarpenak
 Name[fi]=Tallenna päiväyksen ja ajan asetukset
 Name[fr]=Enregistrer la configuration pour la date et l'heure
+Name[gl]=Garda a configuración da data e hora
 Name[ia]=Salveguarda le preferentias de data & tempore
 Name[it]=Salva le impostazioni di data e ora
 Name[ka]=თარიღის/დროის პარამეტრების შენახვა
@@ -70,6 +72,7 @@ Description[es]=Las políticas del sistema le impiden guardar las preferencias d
 Description[eu]=Sistemako gidalerroek data/ordu ezarpenak gordetzea eragozten dizute.
 Description[fi]=Järjestelmäkäytäntö estää sinua tallentamasta aika-asetuksia.
 Description[fr]=La politique du système vous empêche d'enregistrer la configuration pour la date et l'heure.
+Description[gl]=As políticas do sistema non permiten que garde a configuración da data e hora.
 Description[ia]=Le politicas de systema preveni te ex salveguardar le preferentias de tempore/data.
 Description[it]=Le politiche del sistema ti impediscono di salvare le impostazioni di data e ora.
 Description[ka]=სისტემის წესები გიკრძალავთ დროის/თარიღის პარამეტრების შენახვას.
diff --git a/quicksettings/record/plasma_mobile_quicksetting_record.notifyrc b/quicksettings/record/plasma_mobile_quicksetting_record.notifyrc
index 150674a2..a6bf5cdc 100644
--- a/quicksettings/record/plasma_mobile_quicksetting_record.notifyrc
+++ b/quicksettings/record/plasma_mobile_quicksetting_record.notifyrc
@@ -18,6 +18,7 @@ Name[es]=Plasma
 Name[eu]=Plasma
 Name[fi]=Plasma
 Name[fr]=Plasma
+Name[gl]=Plasma
 Name[hi]=प्लाज़्मा
 Name[hu]=Plasma
 Name[ia]=Plasma
@@ -57,6 +58,7 @@ Name[es]=Capturado
 Name[eu]=Atzemanda
 Name[fi]=Kaapattu
 Name[fr]=Capturé
+Name[gl]=Capturada
 Name[hi]=कैप्चर्ड
 Name[hu]=Rögzítve
 Name[ia]=Capturate
@@ -93,6 +95,7 @@ Comment[es]=Capturado
 Comment[eu]=Atzemanda
 Comment[fi]=Kaapattu
 Comment[fr]=Capturé
+Comment[gl]=Capturada.
 Comment[hi]=कैप्चर्ड
 Comment[hu]=Rögzítve
 Comment[ia]=Capturate
diff --git a/quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc b/quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc
index 150674a2..a6bf5cdc 100644
--- a/quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc
+++ b/quicksettings/screenshot/plasma_mobile_quicksetting_screenshot.notifyrc
@@ -18,6 +18,7 @@ Name[es]=Plasma
 Name[eu]=Plasma
 Name[fi]=Plasma
 Name[fr]=Plasma
+Name[gl]=Plasma
 Name[hi]=प्लाज़्मा
 Name[hu]=Plasma
 Name[ia]=Plasma
@@ -57,6 +58,7 @@ Name[es]=Capturado
 Name[eu]=Atzemanda
 Name[fi]=Kaapattu
 Name[fr]=Capturé
+Name[gl]=Capturada
 Name[hi]=कैप्चर्ड
 Name[hu]=Rögzítve
 Name[ia]=Capturate
@@ -93,6 +95,7 @@ Comment[es]=Capturado
 Comment[eu]=Atzemanda
 Comment[fi]=Kaapattu
 Comment[fr]=Capturé
+Comment[gl]=Capturada.
 Comment[hi]=कैप्चर्ड
 Comment[hu]=Rögzítve
 Comment[ia]=Capturate