From 079db711a1edd8cc47b399acd50f837981713b0d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 19 Jan 2024 02:55:52 +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/kdeconnect.notifyrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index 9b8f46a50..54077b03e 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -901,6 +901,7 @@ Name[fi]=Vastaanotettiin tekstiä Name[fr]=Texte reçu Name[gl]=Recibiuse texto Name[he]=התקבלה הודעה +Name[hu]=Szöveg érkezett Name[ia]=Texto Recipite Name[it]=Testo ricevuto Name[ka]=მიღებულია ტექსტი @@ -936,6 +937,7 @@ Comment[fi]=Vastaanotettiin tekstiä Comment[fr]=Réception de quelques éléments de texte Comment[gl]=Recibiuse un texto Comment[he]=הגיע טקסט כלשהו +Comment[hu]=Némi szöveg érkezett Comment[ia]=Recipite alcun texto Comment[it]=Testo ricevuto Comment[ka]=მიღებულია რაღაც ტექსტი