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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit a9670e5a81645572ed1dec08a2b37268879a3e02
Author: l10n daemon script <scripty at kde.org>
Date:   Fri Feb 12 09:32:36 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/clipboard/kdeconnect_clipboard.json                     | 2 +-
 plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/clipboard/kdeconnect_clipboard.json b/plugins/clipboard/kdeconnect_clipboard.json
index 13c217f..d3e6ee4 100644
--- a/plugins/clipboard/kdeconnect_clipboard.json
+++ b/plugins/clipboard/kdeconnect_clipboard.json
@@ -24,7 +24,7 @@
         "Description[nn]": "Del utklippstavla mellom einingar", 
         "Description[pl]": "Współdziel schowek pomiędzy urządzeniami", 
         "Description[pt]": "Partilhar a área de transferência entre dispositivos", 
-        "Description[pt_BR]": "Compartilhar a área de transferência entre dispositivos", 
+        "Description[pt_BR]": "Compartilha a área de transferência entre dispositivos", 
         "Description[ru]": "Общий буфер обмена между устройствами", 
         "Description[sk]": "Zdieľať schránku medzi zariadeniami", 
         "Description[sv]": "Dela klippbordet mellan apparater", 
diff --git a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
index 9696d18..8cff723 100644
--- a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
+++ b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
@@ -24,7 +24,7 @@
         "Description[nn]": "Hindra pauseskjermen i å starta når eininga er kopla til", 
         "Description[pl]": "Powstrzymaj wygaszacz ekrany po podłączeniu urządzenia", 
         "Description[pt]": "Inibir o protector de ecrã quando o dispositivo estiver ligado", 
-        "Description[pt_BR]": "Inibir o protetor de tela quando o dispositivo estiver conectado", 
+        "Description[pt_BR]": "Inibe o protetor de tela quando o dispositivo estiver conectado", 
         "Description[ru]": "Предотвращение запуска блокировщика экрана, когда устройство подключено", 
         "Description[sk]": "Obmedziť šetrič obrazovky keď je pripojené zariadenie", 
         "Description[sv]": "Stoppa skärmsläckaren när apparaten ansluts", 

-- 
kdeconnect packaging