[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=770c356
The following commit has been merged in the master branch:
commit 770c3563713537f1d7cd01bf41e441a54457e8a7
Author: l10n daemon script <scripty at kde.org>
Date: Mon Feb 8 13:39: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/kdeconnect.notifyrc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index df8df79..401c378 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -96,11 +96,15 @@ Name[x-test]=xxPairing Requestxx
Name[zh_CN]=配对请求
Comment=Pairing request received from a device
Comment[ca]=Les sol·licituds d'aparellament rebudes des d'un dispositiu
+Comment[ca at valencia]=Les sol·licituds d'aparellament rebudes des d'un dispositiu
Comment[de]=Verbindungsanfrage von einem Gerät erhalten
+Comment[fi]=Saatiin paripyyntö laitteelta
+Comment[gl]=Recibiuse unha solicitude de emparellamento dun dispositivo.
Comment[nl]=Verzoek om een paar te maken ontvangen van apparaten
Comment[pl]=Otrzymano żądanie parowania z urządzenia
Comment[pt]=Pedido de emparelhamento recebido de um dispositivo
Comment[pt_BR]=Solicitação de emparelhamento recebida de um dispositivo
+Comment[sv]=Begäran om ihopparning mottagen från en apparat
Comment[uk]=Від пристрою отримано запит щодо пов’язування
Comment[x-test]=xxPairing request received from a devicexx
Action=Popup
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list