From 1fff89b7f35fb6495096ff576fa52579b65babd5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 1 May 2022 01:52: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" --- fileitemactionplugin/kdeconnectsendfile.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fileitemactionplugin/kdeconnectsendfile.json b/fileitemactionplugin/kdeconnectsendfile.json index fa42c7125..75e03845f 100644 --- a/fileitemactionplugin/kdeconnectsendfile.json +++ b/fileitemactionplugin/kdeconnectsendfile.json @@ -4,7 +4,7 @@ "Description": "Send file to other device using KDE Connect", "Description[ar]": "أرسل ملف إلى جهاز أخر باستعمال كدي المتصل", "Description[az]": "Digər cihazlara KDE Connect ilə fayl göndərin", - "Description[ca@valencia]": "Envia fitxers a un altre dispositiu mitjançant KDE Connect", + "Description[ca@valencia]": "Envia fitxers a un atre dispositiu mitjançant KDE Connect", "Description[ca]": "Envia fitxers a un altre dispositiu mitjançant el KDE Connect", "Description[cs]": "Poslat soubor na jiné zařízení přes KDE Connect", "Description[da]": "Send fil til en anden enhed med brug af KDE Connect",