[SCM] kdeconnect packaging branch, master, updated. upstream/1.0.1-206-gf661872
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 18:27:03 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=8dd4f04
The following commit has been merged in the master branch:
commit 8dd4f04f976292b56bd165a1f22992523ee43063
Author: l10n daemon script <scripty at kde.org>
Date: Mon Sep 26 09:25:33 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/telephony/kdeconnect_telephony.json | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json
index a384ed7..8433392 100644
--- a/plugins/telephony/kdeconnect_telephony.json
+++ b/plugins/telephony/kdeconnect_telephony.json
@@ -9,6 +9,13 @@
}
],
"Description": "Show notifications for calls and SMS",
+ "Description[ca]": "Mostra les notificacions de les trucades i els SMS",
+ "Description[de]": "Benachrichtigungen für Anrufe und SMS anzeigen",
+ "Description[nl]": "Meldingen tonen van oproepen en SMSjes",
+ "Description[pt]": "Mostrar notificações para as chamadas e SMS",
+ "Description[sv]": "Visa underrättelser om samtal och SMS",
+ "Description[uk]": "Показ сповіщень щодо дзвінків і SMS",
+ "Description[x-test]": "xxShow notifications for calls and SMSxx",
"EnabledByDefault": true,
"Icon": "call-start",
"Id": "kdeconnect_telephony",
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list