[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:02 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=4458006
The following commit has been merged in the master branch:
commit 4458006295788c3b7a0a6430199e4d520cb60b58
Author: l10n daemon script <scripty at kde.org>
Date: Thu Aug 11 09:50:09 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"
---
filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake b/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
index dc72e39..45c906b 100644
--- a/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
+++ b/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
@@ -14,6 +14,8 @@ X-KDE-PluginInfo-EnabledByDefault=false
X-KTp-PluginInfo-Version=@KTP_MESSAGE_FILTER_FRAMEWORK_VERSION@
Name=Geopoint Preview
+Name[ca]=Vista prèvia del punt geogràfic
+Name[ca at valencia]=Vista prèvia del punt geogràfic
Name[es]=Vista previa de punto geográfico
Name[nl]=Voorbeeld van geo-punt
Name[pt]=Antevisão de Ponto Geográfico
@@ -21,6 +23,8 @@ Name[sv]=Förhandsgranskning av geografisk punkt
Name[uk]=Перегляд геоточки
Name[x-test]=xxGeopoint Previewxx
Comment=Show geo URI on a map view.
+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[es]=Mostrar un URI geográfico en un visor de mapa.
Comment[nl]=Geo-URI op een kaart tonen.
Comment[pt]=Mostrar um URI geográfico num mapa.
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list