[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:29:39 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=ef488d1
The following commit has been merged in the master branch:
commit ef488d10a885fb5831ffc4d2c11a2ca4be4bd0aa
Author: l10n daemon script <scripty at kde.org>
Date: Mon Apr 11 10:21:02 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/findmyphone/kdeconnect_findmyphone.json | 1 +
plugins/runcommand/kdeconnect_runcommand.json | 1 +
2 files changed, 2 insertions(+)
diff --git a/plugins/findmyphone/kdeconnect_findmyphone.json b/plugins/findmyphone/kdeconnect_findmyphone.json
index a7ff2e5..122315f 100644
--- a/plugins/findmyphone/kdeconnect_findmyphone.json
+++ b/plugins/findmyphone/kdeconnect_findmyphone.json
@@ -17,6 +17,7 @@
"Description[ca at valencia]": "Troba el vostra telèfon perdut fent que reproduïsca un so d'alarma ",
"Description[ca]": "Troba el vostra telèfon perdut fent que reprodueixi un so d'alarma ",
"Description[cs]": "Najděte dsvůj telefon tím, že jej necháte přehrát zvuk upomínky",
+ "Description[de]": "Finden Sie Ihr verlegtes Telefon, indem Sie mit ihm eine Warnton abspielen",
"Description[es]": "Encuentre su teléfono perdido haciéndole reproducir un sonido de alarma",
"Description[fi]": "Löydä hukkaamasi puhelin laittamalla se soittamaan hälytysääntä ",
"Description[gl]": "Reproducir un son de alarma nun teléfono móbil perdido para atopalo.",
diff --git a/plugins/runcommand/kdeconnect_runcommand.json b/plugins/runcommand/kdeconnect_runcommand.json
index 134a228..b38b6de 100644
--- a/plugins/runcommand/kdeconnect_runcommand.json
+++ b/plugins/runcommand/kdeconnect_runcommand.json
@@ -18,6 +18,7 @@
"Description[ca at valencia]": "Executa ordes de la consola de forma remota",
"Description[ca]": "Executa ordres de la consola de forma remota",
"Description[cs]": "Spouštět konzolové příkazy vzdáleně",
+ "Description[de]": "Entfernte Konsolenbefehle ausführen",
"Description[es]": "Ejecute órdenes de consola remotamente",
"Description[fi]": "Suorita konsolikomentoja etänä",
"Description[gl]": "Executar ordes de consola remotamente.",
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list