From 81daf6649e7d06faae950a77cf5baa714a393a6c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 19 Mar 2021 07:25:52 +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 +- .../connectivity-report/kdeconnect_connectivity_report.json | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/fileitemactionplugin/kdeconnectsendfile.json b/fileitemactionplugin/kdeconnectsendfile.json index e747d6d49..0e2db137a 100644 --- a/fileitemactionplugin/kdeconnectsendfile.json +++ b/fileitemactionplugin/kdeconnectsendfile.json @@ -52,7 +52,7 @@ "Name[et]": "Faili saatmine KDE Connecti kaudu", "Name[eu]": "Bidali fitxategia KDE Connect bidez", "Name[fi]": "Lähetä tiedosto KDE Connectilla", - "Name[fr]": "Envoyer le fichier via KDE Connect", + "Name[fr]": "Envoyer un fichier via KDE Connect", "Name[gl]": "Enviar o ficheiro por KDE Connect", "Name[ia]": "Invia file via KDE Connect", "Name[id]": "Send file via KDE Connect", diff --git a/plugins/connectivity-report/kdeconnect_connectivity_report.json b/plugins/connectivity-report/kdeconnect_connectivity_report.json index ab490c2de..be0a73103 100644 --- a/plugins/connectivity-report/kdeconnect_connectivity_report.json +++ b/plugins/connectivity-report/kdeconnect_connectivity_report.json @@ -6,6 +6,7 @@ "Name": "David Shlemayev", "Name[az]": "David Shlemayev", "Name[ca]": "David Shlemayev", + "Name[fr]": "David Shlemayev", "Name[it]": "David Shlemayev", "Name[nl]": "David Shlemayev", "Name[pt]": "David Shlemayev", @@ -19,6 +20,7 @@ "Description": "Show your phone's network signal strength", "Description[az]": "Telefonunuzun şəbəkə siqnalı gücü göstərilsin", "Description[ca]": "Mostra la intensitat del senyal de xarxa del vostre telèfon", + "Description[fr]": "Afficher la force du signal du réseau pour votre téléphone", "Description[it]": "Mostra la potenza del segnale di rete del tuo telefono", "Description[nl]": "Signaalsterkte van het netwerk van uw telefoon tonen", "Description[pt]": "Mostrar a potência do sinal da rede do seu telefone", @@ -34,6 +36,7 @@ "Name": "Connectivity monitor", "Name[az]": "Bağlantı monitoru", "Name[ca]": "Monitor de la connectivitat", + "Name[fr]": "Surveillance de connectivité", "Name[it]": "Monitor di connettività", "Name[nl]": "Monitor van connectiviteit", "Name[pt]": "Monitor de conectividade",