[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=9df0fc1

The following commit has been merged in the master branch:
commit 9df0fc1e24c50a278c58c5f086a7bc10ba64ce3e
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Jan 31 09:40:47 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/lockdevice/kdeconnect_lockdevice.json       | 1 +
 plugins/mpriscontrol/kdeconnect_mpriscontrol.json   | 1 +
 plugins/pausemusic/kdeconnect_pausemusic.json       | 2 +-
 plugins/remotecontrol/kdeconnect_remotecontrol.json | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/lockdevice/kdeconnect_lockdevice.json b/plugins/lockdevice/kdeconnect_lockdevice.json
index 0c22969..b163b48 100644
--- a/plugins/lockdevice/kdeconnect_lockdevice.json
+++ b/plugins/lockdevice/kdeconnect_lockdevice.json
@@ -36,6 +36,7 @@
         "Id": "kdeconnect_lockdevice", 
         "License": "GPL", 
         "Name": "LockDevice", 
+        "Name[ast]": "Bloquiar preséu", 
         "Name[ca at valencia]": "Bloqueja el dispositiu", 
         "Name[ca]": "Bloqueja el dispositiu", 
         "Name[cs]": "Uzamknout zařízení", 
diff --git a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
index 2027124..872ce37 100644
--- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
+++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
@@ -37,6 +37,7 @@
         "Id": "kdeconnect_mpriscontrol", 
         "License": "GPL", 
         "Name": "Multimedia control receiver", 
+        "Name[ast]": "Mandu de control multimedia", 
         "Name[ca at valencia]": "Receptor del comandament multimèdia", 
         "Name[ca]": "Receptor del comandament multimèdia", 
         "Name[cs]": "Dálkový ovladač multimédií", 
diff --git a/plugins/pausemusic/kdeconnect_pausemusic.json b/plugins/pausemusic/kdeconnect_pausemusic.json
index 4638ac1..a9cbd1a 100644
--- a/plugins/pausemusic/kdeconnect_pausemusic.json
+++ b/plugins/pausemusic/kdeconnect_pausemusic.json
@@ -9,7 +9,7 @@
             }
         ], 
         "Description": "Pause music/videos during a phone call", 
-        "Description[ast]": "Posa música/videos nuna llamada telefónica", 
+        "Description[ast]": "Posa la música/videos nuna llamada telefónica", 
         "Description[ca at valencia]": "Pausa la música/vídeos durant una trucada telefònica", 
         "Description[ca]": "Pausa la música/vídeos durant una trucada telefònica", 
         "Description[cs]": "Pozastavit hudbu/video během telefonátu", 
diff --git a/plugins/remotecontrol/kdeconnect_remotecontrol.json b/plugins/remotecontrol/kdeconnect_remotecontrol.json
index 4067c1d..819497c 100644
--- a/plugins/remotecontrol/kdeconnect_remotecontrol.json
+++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json
@@ -36,6 +36,7 @@
         "Id": "kdeconnect_remotecontrol", 
         "License": "GPL", 
         "Name": "RemoteControl", 
+        "Name[ast]": "Control remotu", 
         "Name[ca at valencia]": "Control remot", 
         "Name[ca]": "Control remot", 
         "Name[cs]": "Dálkové ovládání", 

-- 
kdeconnect packaging



More information about the pkg-kde-commits mailing list