[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:08 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=7a106e4
The following commit has been merged in the master branch:
commit 7a106e4a0e7f8ce284b6fcab2c6931681512c7d9
Author: l10n daemon script <scripty at kde.org>
Date: Thu Apr 13 05:08:08 2017 +0200
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 0077c30..dee3101 100644
--- a/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
+++ b/filters/geopoint/ktptextui_message_filter_geopoint.desktop.cmake
@@ -38,6 +38,7 @@ Name[sr at ijekavian]=Преглед географске тачке
Name[sr at ijekavianlatin]=Pregled geografske tačke
Name[sr at latin]=Pregled geografske tačke
Name[sv]=Förhandsgranskning av geografisk punkt
+Name[tr]=Geopoint Önizlemesi
Name[uk]=Перегляд геоточки
Name[x-test]=xxGeopoint Previewxx
Name[zh_CN]=地理位置预览
@@ -67,6 +68,7 @@ Comment[sr at ijekavian]=Приказивање географског УРИ‑ј
Comment[sr at ijekavianlatin]=Prikazivanje geografskog URI‑ja na karti
Comment[sr at latin]=Prikazivanje geografskog URI‑ja na karti
Comment[sv]=Visa geografisk webbadress i en kartvy.
+Comment[tr]=Harita görünümüne coğrafi URI'yi göster.
Comment[uk]=Показувати геоадресу на перегляді карти.
Comment[x-test]=xxShow geo URI on a map view.xx
Comment[zh_CN]=在地图视图上显示地理 URI。
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list