[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:30:00 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=89b61e0
The following commit has been merged in the master branch:
commit 89b61e03f58873d54e275ed7a2a5afc5338255e9
Author: l10n daemon script <scripty at kde.org>
Date: Wed Aug 10 11:53:40 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 | 1 +
plugins/runcommand/kdeconnect_runcommand_config.desktop | 1 +
plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop | 1 +
3 files changed, 3 insertions(+)
diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index de1bb65..93121a6 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -94,6 +94,7 @@ 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[cs]=Požadavek na párování přijat ze zařízení
Comment[en_GB]=Pairing request received from a device
Comment[it]=Richiesta di associazione ricevuta da un dispositivo
Comment[nl]=Verzoek om een paar te maken ontvangen van een apparaat
diff --git a/plugins/runcommand/kdeconnect_runcommand_config.desktop b/plugins/runcommand/kdeconnect_runcommand_config.desktop
index 7fc9c0c..f7842ed 100644
--- a/plugins/runcommand/kdeconnect_runcommand_config.desktop
+++ b/plugins/runcommand/kdeconnect_runcommand_config.desktop
@@ -8,6 +8,7 @@ X-KDE-ParentComponents=kdeconnect_runcommand
Name=Run Command plugin settings
Name[ca]=Ajustaments del connector Executa ordres
Name[ca at valencia]=Ajustaments del connector Executa ordes
+Name[cs]=Nastavení modulu Spustit příkaz
Name[en_GB]=Run Command plugin settings
Name[fi]=Suorita komento -liitännäisen asetukset
Name[it]=Impostazioni estensione Esegui comando
diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
index ab6873e..adddc51 100644
--- a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
@@ -8,6 +8,7 @@ X-KDE-ParentComponents=kdeconnect_sendnotifications
Name=Notification synchronization plugin settings
Name[ca]=Ajustament del connector Sincronitza les notificacions
Name[ca at valencia]=Ajustament del connector Sincronitza les notificacions
+Name[cs]=Nastavení modulu synchronizace upozornění
Name[en_GB]=Notification synchronisation plugin settings
Name[it]=Impostazioni dell'estensione di sincronizzazione delle notifiche
Name[nl]=Instellingen voor meldingen van synchronisatie plug-in
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list