[SCM] ktp-text-ui packaging branch, master, updated. debian/16.04.2-1-88-g820317b

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=55dda17

The following commit has been merged in the master branch:
commit 55dda17b17b4eb87c4e6cd9f9f0fd1e89ecb5f98
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Oct 2 09:31:54 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"
---
 config/behavior/kcm_ktp_chat_behavior.desktop       | 2 +-
 logviewer/config/kcm_ktp_logviewer_behavior.desktop | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/behavior/kcm_ktp_chat_behavior.desktop b/config/behavior/kcm_ktp_chat_behavior.desktop
index f486be2..3a1745b 100644
--- a/config/behavior/kcm_ktp_chat_behavior.desktop
+++ b/config/behavior/kcm_ktp_chat_behavior.desktop
@@ -21,7 +21,7 @@ Name[cs]=Chování karet rozhovoru
 Name[da]=Opførsel af chatfaneblade
 Name[de]=Verhalten von Chat-Unterfenstern
 Name[el]=Συμπεριφορά καρτέλας συνομιλίας
-Name[en_GB]=Chat Tab Behavior
+Name[en_GB]=Chat Tab Behaviour
 Name[es]=Comportamiento de la pestaña de charla
 Name[et]=Vestluskaardi käitumine
 Name[fi]=Keskusteluvälilehden toiminta
diff --git a/logviewer/config/kcm_ktp_logviewer_behavior.desktop b/logviewer/config/kcm_ktp_logviewer_behavior.desktop
index 71cf155..150f9ec 100644
--- a/logviewer/config/kcm_ktp_logviewer_behavior.desktop
+++ b/logviewer/config/kcm_ktp_logviewer_behavior.desktop
@@ -21,7 +21,7 @@ Name[cs]=Chování prohlížeče záznamů
 Name[da]=Logfremviserens opførsel
 Name[de]=Verhalten des Protokollbetrachters
 Name[el]=Συμπεριφορά ΠροβολέαΚαταγραφών
-Name[en_GB]=LogViewer Behavior
+Name[en_GB]=LogViewer Behaviour
 Name[es]=Comportamiento del visor de registros
 Name[et]=Loginäitaja käitumine
 Name[fi]=Lokikatselimen toiminta

-- 
ktp-text-ui packaging