From 7b3a3d50e5ead06400a4023402f31562b9c55d0d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 14 Dec 2019 05:35:48 +0100 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, 2 insertions(+) diff --git a/fileitemactionplugin/kdeconnectsendfile.json b/fileitemactionplugin/kdeconnectsendfile.json index 982298188..a8ae8fc1c 100644 --- a/fileitemactionplugin/kdeconnectsendfile.json +++ b/fileitemactionplugin/kdeconnectsendfile.json @@ -3,6 +3,7 @@ "Category": "Utilities", "Description": "Send file to other device using 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[en_GB]": "Send file to other device using KDE Connect", "Description[es]": "Enviar archivo a otro dispositivo usando KDE Connect", "Description[et]": "Faili saatmine teise seadmesse KDE Connecti kaudu", @@ -23,6 +24,7 @@ ], "Name": "Send file via KDE Connect", "Name[ca]": "Envia el fitxer a través del KDE Connect", + "Name[cs]": "Poslat soubor přes KDE Connect", "Name[en_GB]": "Send file via KDE Connect", "Name[es]": "Enviar archivo con KDE Connect", "Name[et]": "Faili saatmine KDE Connecti kaudu",