From 9dd619f587cc1a46d5cdfdd0ed5024b3029b826e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 26 Nov 2024 03:05:16 +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"
---
 settings/org.kde.kdeconnect-settings.desktop | 2 ++
 smsapp/org.kde.kdeconnect.sms.desktop        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/settings/org.kde.kdeconnect-settings.desktop b/settings/org.kde.kdeconnect-settings.desktop
index 03ed008a6..b5e39774a 100755
--- a/settings/org.kde.kdeconnect-settings.desktop
+++ b/settings/org.kde.kdeconnect-settings.desktop
@@ -80,6 +80,7 @@ GenericName[nl]=Instellingen voor synchronisatie van apparaat
 GenericName[nn]=Innstillingar for einingssynkronisering
 GenericName[pa]=ਡਿਵਾਈਸ ਸੈਕਰੋਨਾਈਜ਼ ਸੈਟਿੰਗਾਂ
 GenericName[pl]=Ustawienia synchronizacji urządzenia
+GenericName[pt_BR]=Configurações da sincronização de dispositivo
 GenericName[sl]=Nastavitve sinhronizacijenaprav
 GenericName[sv]=Inställning av enhetssynkronisering
 GenericName[ta]=சாதன ஒத்திசைவு அமைப்புகள்
@@ -114,6 +115,7 @@ Comment[nl]=Synchronisatie van apparaat configureren
 Comment[nn]=Set opp einingssynkronisering
 Comment[pa]=ਡਿਵਾਈਸ ਸੈਕਰੋਨਾਈਜ਼ੇਸ਼ਨ ਦੀ ਸੰਰਚਨਾ
 Comment[pl]=Ustawienia synchronizacji urządzenia
+Comment[pt_BR]=Configurar sincronização de dispositivo
 Comment[sl]=Konfiguriraj sinhronizacijo naprav
 Comment[sv]=Anpassa enhetssynkronisering
 Comment[ta]=சாதன ஒத்திசைவை அமைக்க விடும்
diff --git a/smsapp/org.kde.kdeconnect.sms.desktop b/smsapp/org.kde.kdeconnect.sms.desktop
index 3f9dca831..865e4888e 100644
--- a/smsapp/org.kde.kdeconnect.sms.desktop
+++ b/smsapp/org.kde.kdeconnect.sms.desktop
@@ -73,6 +73,7 @@ GenericName[nl]=Tekstberichten versturen
 GenericName[nn]=Tekstmeldingar
 GenericName[pa]=ਟੈਕਸਟ ਸੁਨੇਹੇ
 GenericName[pl]=Wiadomości tekstowe
+GenericName[pt_BR]=Mensagem de texto
 GenericName[sl]=Sporočanje besedil
 GenericName[sv]=Textmeddelanden
 GenericName[ta]=குறுஞ்செய்தி சேவை
@@ -107,6 +108,7 @@ Comment[nl]=Lees en verzend SMS berichten op verbonden apparaten
 Comment[nn]=Les og send tekstmeldingar på tilkopla einingar
 Comment[pa]=ਕਨੈਕਟ ਕੀਤੇ ਡਿਵਾਈਸਾਂ ਉੱਤੇ SMS ਸੁਨੇਹਿਆਂ ਨੂੰ ਪੜ੍ਹੋ ਅਤੇ ਭੇਜੋ
 Comment[pl]=Czytaj i wysyłaj wiadomości SMS na podłączonych urządzeniach
+Comment[pt_BR]=Ler e executar comandos nos dispositivos conectados
 Comment[sl]=Beri in pošiljaj SMS na povezanih napravah
 Comment[sv]=Läs och skicka meddelanden via SMS på anslutna apparater
 Comment[ta]=இணைந்துள்ள சாதனங்களில் குறுஞ்செய்திகளை படிக்கவும் அனுப்பவும் விடும்