From cea97ef8b5db2c07264d2a34e1359a644b49599c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 24 Oct 2016 12:05:32 +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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications.json b/plugins/sendnotifications/kdeconnect_sendnotifications.json index 76ed14e95..ea8cf328c 100644 --- a/plugins/sendnotifications/kdeconnect_sendnotifications.json +++ b/plugins/sendnotifications/kdeconnect_sendnotifications.json @@ -6,7 +6,6 @@ "Email": "holger.k@elberer.de", "Name": "Holger Kaelberer", "Name[da]": "Holger Freyther", - "Name[it]": "Holger Freyther", "Name[x-test]": "xxHolger Kaelbererxx" } ], @@ -17,6 +16,7 @@ "Description[da]": "Udsend denne computers bekendtgørelser, så de kan vises på andre enheder.", "Description[de]": "Die Benachrichtigungen dieses Rechners aussenden, sodass sie auf anderen Geräten angezeigt werden können.", "Description[et]": "Arvuti märguannete levitamine, et neid oleks näha ka teistes seadmetes", + "Description[fi]": "Lähetä tämän tietokoneen ilmoitukset, jotta ne voidaan näyttää muilla laitteilla.", "Description[it]": "Trasmetti le notifiche di questo computer, affinché possano essere mostrate su altri dispositivi.", "Description[nl]": "De meldingen van deze computer rondsturen, zodat ze op andere apparaten getoond kunnen worden.", "Description[pl]": "Rozgłaszaj powiadomienia tego komputera, tak aby można je było wyświetlać na innych urządzeniach.", @@ -36,6 +36,7 @@ "Name[da]": "Send bekendtgørelser", "Name[de]": "Benachrichtigungen senden", "Name[et]": "Märguannete saatmine", + "Name[fi]": "Lähetä ilmoituksia", "Name[it]": "Invia notifiche", "Name[nl]": "Stuur meldingen", "Name[pl]": "Wysyłaj powiadomienia",