[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=05cc6fa
The following commit has been merged in the master branch:
commit 05cc6fa1314d26fcd244bf4aa4a156042cd0857c
Author: l10n daemon script <scripty at kde.org>
Date: Sat Apr 9 09:56:16 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 +
1 file changed, 1 insertion(+)
diff --git a/plugins/findmyphone/kdeconnect_findmyphone.json b/plugins/findmyphone/kdeconnect_findmyphone.json
index 1b75c8b..a7ff2e5 100644
--- a/plugins/findmyphone/kdeconnect_findmyphone.json
+++ b/plugins/findmyphone/kdeconnect_findmyphone.json
@@ -43,6 +43,7 @@
"Name[ca at valencia]": "Troba el meu telèfon",
"Name[ca]": "Troba el meu telèfon",
"Name[cs]": "Najít můj telefon",
+ "Name[de]": "Telefon suchen",
"Name[es]": "Encontrar mi teléfono",
"Name[fi]": "Löydä puhelimeni",
"Name[gl]": "Atopar o móbil",
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list