[SCM] ktp-text-ui packaging branch, master, updated. debian/16.04.2-1-88-g820317b
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Sep 12 14:10:06 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=87406c5
The following commit has been merged in the master branch:
commit 87406c57c7e3c4ad2e3dc61b14de3cb9475731cc
Author: l10n daemon script <scripty at kde.org>
Date: Fri Feb 24 06:00:01 2017 +0100
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"
---
filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake | 2 ++
1 file changed, 2 insertions(+)
diff --git a/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake b/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
index 78902a5..4da4715 100644
--- a/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
+++ b/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
@@ -17,6 +17,7 @@ Name=Geopoint Preview
Name[ast]=Previsualización de xeopuntu
Name[ca]=Vista prèvia del punt geogràfic
Name[ca at valencia]=Vista prèvia del punt geogràfic
+Name[cs]=Náhled na geopoint
Name[en_GB]=Geopoint Preview
Name[es]=Vista previa de punto geográfico
Name[et]=Geopunkti eelvaatlus
@@ -43,6 +44,7 @@ Comment=Show geo URI on a map view.
Comment[ast]=Amuesa la URI xeo nuna vista de mapa.
Comment[ca]=Mostra la URI geogràfica a la vista d'un mapa.
Comment[ca at valencia]=Mostra la URI geogràfica a la vista d'un mapa.
+Comment[cs]=Zobrazovat geo URI při pohledu na mapu.
Comment[en_GB]=Show geo URI on a map view.
Comment[es]=Mostrar un URI geográfico en un visor de mapa.
Comment[et]=Geo-URI näitamine kaardil
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list