[SCM] kdeconnect packaging branch, master, updated. upstream/1.0.1-206-gf661872

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 18:27:06 UTC 2017


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

The following commit has been merged in the master branch:
commit c055f7ffd2c45d07264c7ef4771e809df759f55d
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Oct 4 12:55:54 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 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json
index 1be08bf..45bb586 100644
--- a/plugins/remotecommands/kdeconnect_remotecommands.json
+++ b/plugins/remotecommands/kdeconnect_remotecommands.json
@@ -29,6 +29,7 @@
         "Id": "kdeconnect_remotecommands", 
         "License": "GPL", 
         "Name": "Host remote commands", 
+        "Name[ca at valencia]": "Ordes a la màquina remota", 
         "Name[ca]": "Ordres a la màquina remota", 
         "Name[nl]": "Commando's op afstand hosten", 
         "Name[pl]": "Wykonuj polecenia zdalne", 

-- 
kdeconnect packaging



More information about the pkg-kde-commits mailing list