[SCM] kdeconnect packaging branch, master, updated. upstream/1.0.1-206-gf661872
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 18:27:09 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=c2fa1d6
The following commit has been merged in the master branch:
commit c2fa1d64003593834758f451d71aaa6de2da40b6
Author: l10n daemon script <scripty at kde.org>
Date: Sat Nov 5 12:37:37 2016 +0000
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 4619e11..c376947 100644
--- a/plugins/sendnotifications/kdeconnect_sendnotifications.json
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications.json
@@ -15,6 +15,7 @@
"Description[cs]": "Posílat upozornění tohoto počítače, takže mohou být zobrazena na jiných zařízeních.",
"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[es]": "Difundir las notificaciones de este equipo, para que puedan mostrarse en otros dispositivos.",
"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.",
@@ -36,6 +37,7 @@
"Name[cs]": "Posílat oznamování",
"Name[da]": "Send bekendtgørelser",
"Name[de]": "Benachrichtigungen senden",
+ "Name[es]": "Enviar notificaciones",
"Name[et]": "Märguannete saatmine",
"Name[fi]": "Lähetä ilmoituksia",
"Name[it]": "Invia notifiche",
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list