[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=ca77240
The following commit has been merged in the master branch:
commit ca7724043ca0e720a4194e96795b2962b164452d
Author: l10n daemon script <scripty at kde.org>
Date: Sun Mar 5 07:03:05 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 4da4715..98176bc 100644
--- a/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
+++ b/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
@@ -18,6 +18,7 @@ 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[da]=Forhåndsvisning af geopunkt
Name[en_GB]=Geopoint Preview
Name[es]=Vista previa de punto geográfico
Name[et]=Geopunkti eelvaatlus
@@ -45,6 +46,7 @@ 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[da]=Vis geo-URI på kortvisning.
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