[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

Maximiliano Curia maxy at moszumanska.debian.org
Fri Oct 14 14:29:33 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=51e989f

The following commit has been merged in the master branch:
commit 51e989f454a2f2f760afc4c3856cda4a1676aa1d
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Jan 23 10:32:56 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/notifications/kdeconnect_notifications_config.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/notifications/kdeconnect_notifications_config.desktop b/plugins/notifications/kdeconnect_notifications_config.desktop
index 0197529..189daa1 100644
--- a/plugins/notifications/kdeconnect_notifications_config.desktop
+++ b/plugins/notifications/kdeconnect_notifications_config.desktop
@@ -8,6 +8,7 @@ X-KDE-ParentComponents=kdeconnect_notifications
 Name=Notification synchronization plugin settings
 Name[ca]=Ajustament del connector Sincronitza les notificacions
 Name[ca at valencia]=Ajustament del connector Sincronitza les notificacions
+Name[cs]=Nastavení modulu synchronizace upozornění
 Name[en_GB]=Notification synchronisation plugin settings
 Name[es]=Preferencias del complemento de sincronización de notificaciones
 Name[fi]=Ilmoitusten synkronointiliitännäisen asetukset

-- 
kdeconnect packaging



More information about the pkg-kde-commits mailing list