[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=a43bb1b

The following commit has been merged in the master branch:
commit a43bb1bdbb3fb7b75c64d9162278a013b9b63b75
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Nov 5 09:58:11 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/remotecommands/kdeconnect_remotecommands.json | 1 +
 plugins/telephony/kdeconnect_telephony.json           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json
index 0c100e6..3c51fab 100644
--- a/plugins/remotecommands/kdeconnect_remotecommands.json
+++ b/plugins/remotecommands/kdeconnect_remotecommands.json
@@ -40,6 +40,7 @@
         "Name[ca]": "Allotja ordres remotes", 
         "Name[cs]": "Přijímat vzdálené příkazy", 
         "Name[da]": "Vært for eksterne kommandoer", 
+        "Name[el]": "Απομακρυσμένη εκτέλεση εντολών", 
         "Name[es]": "Órdenes en servidor remoto", 
         "Name[fi]": "Etäkomennot", 
         "Name[it]": "Comandi remoti host", 
diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json
index 8bf028b..2a4d2aa 100644
--- a/plugins/telephony/kdeconnect_telephony.json
+++ b/plugins/telephony/kdeconnect_telephony.json
@@ -15,6 +15,7 @@
         "Description[cs]": "Zobrazit upozornění pro telefonáty a SMS", 
         "Description[da]": "Vis bekendtgørelser for opkald og sms", 
         "Description[de]": "Benachrichtigungen für Anrufe und SMS anzeigen", 
+        "Description[el]": "Εμφάνιση ειδοποιήσεων για κλήσεις και SMS", 
         "Description[es]": "Mostrar notificaciones de llamadas y SMS", 
         "Description[fi]": "Näytä puhelujen ja tekstiviestien ilmoitukset", 
         "Description[it]": "Mostra notifiche per le chiamate e per gli SMS", 

-- 
kdeconnect packaging



More information about the pkg-kde-commits mailing list