From f9404b83ed4e37b497efad46344e95e4826fc280 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 13 Mar 2023 01:45:53 +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/sms/kdeconnect_sms.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/sms/kdeconnect_sms.json b/plugins/sms/kdeconnect_sms.json index 2c5ad5dcc..35c79ef4e 100644 --- a/plugins/sms/kdeconnect_sms.json +++ b/plugins/sms/kdeconnect_sms.json @@ -54,7 +54,7 @@ "Description[ca]": "Envia i rep SMS", "Description[cs]": "Posílat a přijímat SMS", "Description[da]": "Send og modtag sms", - "Description[de]": "Senden und Empfangen von SMS", + "Description[de]": "SMS senden und empfangen", "Description[el]": "Αποστολή και λήψη SMS", "Description[en_GB]": "Send and receive SMS", "Description[es]": "Enviar y recibir SMS",