[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:28:35 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=3c1cdc3
The following commit has been merged in the master branch:
commit 3c1cdc3545131c872bf87e57673f38a0b14f3d85
Author: l10n daemon script <scripty at kde.org>
Date: Fri May 29 10:01:23 2015 +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"
---
kdeconnect-non-plasma.desktop | 1 +
1 file changed, 1 insertion(+)
diff --git a/kdeconnect-non-plasma.desktop b/kdeconnect-non-plasma.desktop
index 43bde22..00847ae 100755
--- a/kdeconnect-non-plasma.desktop
+++ b/kdeconnect-non-plasma.desktop
@@ -32,6 +32,7 @@ Comment[ca]=Connecteu amb els vostres dispositius
Comment[cs]=Dosáhněte na svá zařízení
Comment[en_GB]=Reach out to your devices
Comment[es]=Contactar con sus dispositivos
+Comment[fi]=Tavoitettavuutta laitteillesi
Comment[gl]=Chega aos teus dispositivos.
Comment[hu]=Érje el eszközeit
Comment[it]=Comunica con i tuoi dispositivi
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list