From 9b67493f371baa863910b6a7aa29342c27ce7771 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 12 Dec 2023 03:06:10 +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 c7ca88436..7d82faac6 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -901,6 +901,7 @@ Name[pl]=Otrzymano tekst Name[pt]=Texto Recebido Name[pt_BR]=Texto recebido Name[ru]=Текст получен +Name[sk]=Prijatá správa SMS Name[sl]=Besedilo prejeto Name[sv]=Text mottagen Name[ta]=குறுஞ்செய்தி வந்துள்ளது @@ -932,6 +933,7 @@ Comment[pl]=Otrzymano jakiś tekst Comment[pt]=Recebeu algum texto Comment[pt_BR]=Recebido algum texto Comment[ru]=Получен некоторый текст +Comment[sk]=Prijatá textová správa Comment[sl]=Prejeto nekaj besedila Comment[sv]=Ta emot text Comment[ta]=குறுஞ்செய்தி வந்துள்ளது