From b7c84d33982b5c1ba9fed5820cc05d8dd42c69be Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 22 Jul 2023 01:45:05 +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/sendnotifications/kdeconnect_sendnotifications.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications.json b/plugins/sendnotifications/kdeconnect_sendnotifications.json index 74fc6e43d..4ee620154 100644 --- a/plugins/sendnotifications/kdeconnect_sendnotifications.json +++ b/plugins/sendnotifications/kdeconnect_sendnotifications.json @@ -60,6 +60,7 @@ "Description[et]": "Arvuti märguannete levitamine, et neid oleks näha ka teistes seadmetes", "Description[eu]": "Hedatu ordenagailu honen jakinarazpenak, beste gailuetan erakutsi ahal izateko", "Description[fi]": "Lähetä tämän tietokoneen ilmoitukset, jotta ne voidaan näyttää muilla laitteilla.", + "Description[fr]": "Diffuser les notifications de cet ordinateur pour qu'elles puissent être vues par d'autres périphériques.", "Description[gl]": "Emitir as notificacións deste computador para que se mostren noutros dispositivos.", "Description[ia]": "Diffunde le notificationes de iste computator, assi que illos pote esser monstrate sur altere dispositivos.", "Description[id]": "Siarkan pemberitahuan komputer ini, sehingga ia tampil pada perangkat lain.", @@ -90,6 +91,7 @@ "Name[et]": "Märguannete saatmine", "Name[eu]": "Bidali jakinarazpenak", "Name[fi]": "Lähetä ilmoituksia", + "Name[fr]": "Envoyer les notifications", "Name[gl]": "Enviar notificacións", "Name[ia]": "Invia notificationes", "Name[id]": "Send notifications",