[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=776c7a8
The following commit has been merged in the master branch:
commit 776c7a81a61921fc4152df1cdf3e00c830148307
Author: l10n daemon script <scripty at kde.org>
Date: Sun Sep 25 09:28:23 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 | 25 +------------------------
1 file changed, 1 insertion(+), 24 deletions(-)
diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json
index f8eff3f..a384ed7 100644
--- a/plugins/telephony/kdeconnect_telephony.json
+++ b/plugins/telephony/kdeconnect_telephony.json
@@ -9,29 +9,6 @@
}
],
"Description": "Show notifications for calls and SMS",
- "Description[ast]": "Amuesa avisos pa llamaes y SMS",
- "Description[ca at valencia]": "Mostra les notificacions de les trucades i SMS",
- "Description[ca]": "Mostra les notificacions de les trucades i SMS",
- "Description[cs]": "Zobrazit upozornění pro telefonáty a SMS",
- "Description[de]": "Zeigt Benachrichtigungen für Anrufe und SMS",
- "Description[es]": "Mostrar notificaciones para llamadas y SMS",
- "Description[fi]": "Näytä puhelujen ja tekstiviestien ilmoitukset",
- "Description[gl]": "Mostrar notificacións de chamadas e mensaxes SMS.",
- "Description[hu]": "Értesítések megjelenítése hívásokról és SMS-ekről",
- "Description[it]": "Mostra notifiche per le chiamate e per gli SMS",
- "Description[ko]": "통화와 SMS 알림 표시",
- "Description[nl]": "Meldingen tonen van oproepen en SMSjes",
- "Description[nn]": "Vis varslingar for oppringingar og SMS",
- "Description[pl]": "Pokaż powiadomienia dla dzwonienia i SMS",
- "Description[pt]": "Mostrar notificações para as chamadas e SMS",
- "Description[pt_BR]": "Mostra notificações para chamadas e SMS",
- "Description[ru]": "Показ уведомлений для звонков и SMS",
- "Description[sk]": "Zobraziť oznámenia pre hovory a SMS",
- "Description[sv]": "Visa underrättelser om samtal och SMS",
- "Description[tr]": "Çağrı ve SMS'ler için bildirim göster",
- "Description[uk]": "Показ сповіщень щодо дзвінків і SMS",
- "Description[x-test]": "xxShow notifications for calls and SMSxx",
- "Description[zh_CN]": "显示来电和短信通知",
"EnabledByDefault": true,
"Icon": "call-start",
"Id": "kdeconnect_telephony",
@@ -77,4 +54,4 @@
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.telephony"
]
-}
+}
\ No newline at end of file
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list