[SCM] ktp-text-ui packaging branch, master, updated. debian/0.6.3-1-24-gd1120c6

Diane Trout diane-guest at moszumanska.debian.org
Sat May 17 03:42:29 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-text-ui.git;a=commitdiff;h=a0cfe10

The following commit has been merged in the master branch:
commit a0cfe103428c5c70a86e15fd179f91ac4f10fa1c
Merge: 892f9a1ebad00eec6f2ff2efd6c553db99fa520d 60376e3e20eddc50da98b48a4f23d7966e66b40d
Author: Diane Trout <diane at ghic.org>
Date:   Thu Feb 20 09:11:49 2014 -0800

    Merge tag 'upstream/0.7.80'
    
    Upstream version 0.7.80

 CMakeLists.txt                                     |   2 +-
 app/chat-window.cpp                                |  23 +--
 app/emoticon-text-edit-selector.cpp                |   8 +-
 app/invite-contact-dialog.cpp                      |   2 +-
 app/main.cpp                                       |  27 +---
 app/telepathy-chat-ui.cpp                          |  10 +-
 app/telepathy-chat-ui.h                            |   4 +-
 config/behavior-config.cpp                         |  23 +++
 config/behavior-config.h                           |   4 +
 config/behavior-config.ui                          |  43 ++++-
 config/kcm_ktp_chat_appearance.desktop             |   2 +
 config/kcm_ktp_chat_behavior.desktop               |   1 +
 config/kcm_ktp_chat_messages.desktop               |   3 +
 ...ktptextui_message_filter_bugzilla.desktop.cmake |   1 +
 ...tptextui_message_filter_emoticons.desktop.cmake |   3 +
 ...ptextui_message_filter_formatting.desktop.cmake |   2 +
 ...tptextui_message_filter_highlight.desktop.cmake |   5 +-
 .../ktptextui_message_filter_images.desktop.cmake  |   2 +
 .../kcm_ktptextui_message_filter_latex.desktop     |  16 +-
 .../ktptextui_message_filter_latex.desktop.cmake   |  34 +++-
 filters/latex/latex-filter.cpp                     |   3 -
 ...ui_message_filter_searchexpansion.desktop.cmake |   3 +
 .../ktptextui_message_filter_tts.desktop.cmake     |   1 +
 ...extui_message_filter_urlexpansion.desktop.cmake |  31 +++-
 .../ktptextui_message_filter_youtube.desktop.cmake |   5 +-
 lib/CMakeLists.txt                                 |   1 -
 lib/chat-text-edit.cpp                             |  15 +-
 lib/chat-text-edit.h                               |   2 +
 lib/chat-widget.cpp                                |  22 +--
 lib/logmanager.cpp                                 | 177 --------------------
 lib/logmanager.h                                   |  73 ---------
 lib/notify-filter.cpp                              |  18 ++-
 lib/text-chat-config.cpp                           |  15 ++
 lib/text-chat-config.h                             |   3 +
 .../config/kcm_ktp_logviewer_behavior.desktop      |   9 +-
 logviewer/entity-view.cpp                          |   3 +-
 logviewer/ktp-log-viewer.desktop                   |   4 +
 logviewer/message-view.cpp                         |  12 +-
 logviewer/person-entity-merge-model.cpp            |   2 +-
 po/CMakeLists.txt                                  |   1 +
 po/bs/kcm_ktp_chat_appearance.po                   |  12 +-
 po/bs/kcm_ktp_chat_behavior.po                     |  36 ++++-
 po/bs/ktp-adiumxtra-protocol-handler.po            |   8 +-
 po/bs/ktp-filters.po                               |   8 +-
 po/bs/ktp-text-ui.po                               | 103 ++++++------
 po/bs/ktpchat.po                                   |  58 +++----
 po/ca/kcm_ktp_chat_appearance.po                   |   2 +-
 po/ca/kcm_ktp_chat_behavior.po                     |  26 ++-
 po/ca/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/ca/ktp-filters.po                               |   2 +-
 po/ca/ktp-text-ui.po                               |  70 ++++----
 po/ca/ktpchat.po                                   |  50 +++---
 po/ca at valencia/kcm_ktp_chat_appearance.po          |   2 +-
 po/ca at valencia/kcm_ktp_chat_behavior.po            |  24 ++-
 po/ca at valencia/ktp-adiumxtra-protocol-handler.po   |   2 +-
 po/ca at valencia/ktp-text-ui.po                      |  70 ++++----
 po/ca at valencia/ktpchat.po                          |  50 +++---
 po/cs/kcm_ktp_chat_appearance.po                   |   2 +-
 po/cs/kcm_ktp_chat_behavior.po                     |  28 +++-
 po/cs/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/cs/ktp-filters.po                               |   2 +-
 po/cs/ktp-text-ui.po                               |  70 ++++----
 po/cs/ktpchat.po                                   |  50 +++---
 po/da/kcm_ktp_chat_appearance.po                   |   2 +-
 po/da/kcm_ktp_chat_behavior.po                     |  26 ++-
 po/da/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/da/ktp-filters.po                               |   4 +-
 po/da/ktp-text-ui.po                               |  72 ++++-----
 po/da/ktpchat.po                                   |  52 +++---
 po/de/kcm_ktp_chat_appearance.po                   |   2 +-
 po/de/kcm_ktp_chat_behavior.po                     |  24 ++-
 po/de/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/de/ktp-filters.po                               |   4 +-
 po/de/ktp-text-ui.po                               |  72 ++++-----
 po/de/ktpchat.po                                   |  55 +++----
 po/el/kcm_ktp_chat_appearance.po                   |   2 +-
 po/el/kcm_ktp_chat_behavior.po                     |  28 +++-
 po/el/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/el/ktp-filters.po                               |  29 +++-
 po/el/ktp-text-ui.po                               |  84 +++++-----
 po/el/ktpchat.po                                   |  50 +++---
 po/es/kcm_ktp_chat_appearance.po                   |   2 +-
 po/es/kcm_ktp_chat_behavior.po                     |  27 +++-
 po/es/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/es/ktp-filters.po                               |  20 ++-
 po/es/ktp-text-ui.po                               |  78 ++++-----
 po/es/ktpchat.po                                   |  56 +++----
 po/et/kcm_ktp_chat_appearance.po                   |   4 +-
 po/et/kcm_ktp_chat_behavior.po                     |  26 ++-
 po/et/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/et/ktp-text-ui.po                               |  70 ++++----
 po/et/ktpchat.po                                   |  50 +++---
 po/fi/kcm_ktp_chat_appearance.po                   |   2 +-
 po/fi/kcm_ktp_chat_behavior.po                     |  24 ++-
 po/fi/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/fi/ktp-filters.po                               |   2 +-
 po/fi/ktp-text-ui.po                               |  80 ++++-----
 po/fi/ktpchat.po                                   |  54 +++----
 po/fr/kcm_ktp_chat_appearance.po                   |   2 +-
 po/fr/kcm_ktp_chat_behavior.po                     |  28 +++-
 po/fr/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/fr/ktp-filters.po                               |   5 +-
 po/fr/ktp-text-ui.po                               |  70 ++++----
 po/fr/ktpchat.po                                   |  50 +++---
 po/ga/kcm_ktp_chat_appearance.po                   |   4 +-
 po/ga/kcm_ktp_chat_behavior.po                     |  22 ++-
 po/ga/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/ga/ktp-text-ui.po                               |  70 ++++----
 po/ga/ktpchat.po                                   |  50 +++---
 po/gl/kcm_ktp_chat_appearance.po                   |   2 +-
 po/gl/kcm_ktp_chat_behavior.po                     |  32 +++-
 po/gl/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/gl/ktp-filters.po                               |  33 ++--
 po/gl/ktp-text-ui.po                               |  94 +++++------
 po/gl/ktpchat.po                                   |  67 ++++----
 po/hu/kcm_ktp_chat_appearance.po                   |   2 +-
 po/hu/kcm_ktp_chat_behavior.po                     |  26 ++-
 po/hu/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/hu/ktp-filters.po                               |   4 +-
 po/hu/ktp-text-ui.po                               |  72 ++++-----
 po/hu/ktpchat.po                                   |  52 +++---
 po/ia/kcm_ktp_chat_appearance.po                   |   4 +-
 po/ia/kcm_ktp_chat_behavior.po                     |  30 +++-
 po/ia/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/ia/ktp-filters.po                               |  14 +-
 po/ia/ktp-text-ui.po                               |  80 ++++-----
 po/ia/ktpchat.po                                   |  62 +++----
 po/it/kcm_ktp_chat_appearance.po                   |   2 +-
 po/it/kcm_ktp_chat_behavior.po                     |  24 ++-
 po/it/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/it/ktp-filters.po                               |   2 +-
 po/it/ktp-text-ui.po                               |  70 ++++----
 po/it/ktpchat.po                                   |  50 +++---
 po/ja/kcm_ktp_chat_appearance.po                   |   2 +-
 po/ja/kcm_ktp_chat_behavior.po                     |  22 ++-
 po/ja/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/ja/ktp-text-ui.po                               |  70 ++++----
 po/ja/ktpchat.po                                   |  50 +++---
 po/kk/kcm_ktp_chat_appearance.po                   |   2 +-
 po/kk/kcm_ktp_chat_behavior.po                     |  22 ++-
 po/kk/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/kk/ktp-filters.po                               |   2 +-
 po/kk/ktp-text-ui.po                               |  70 ++++----
 po/kk/ktpchat.po                                   |  50 +++---
 po/km/kcm_ktp_chat_appearance.po                   |   4 +-
 po/km/kcm_ktp_chat_behavior.po                     |  25 ++-
 po/km/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/km/ktp-text-ui.po                               |  74 +++++----
 po/km/ktpchat.po                                   |  50 +++---
 po/lt/kcm_ktp_chat_appearance.po                   |  76 +--------
 po/lt/kcm_ktp_chat_behavior.po                     |  23 ++-
 po/lt/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/{sr at latin => lt}/ktp-filters.po                 |  28 ++--
 po/lt/ktp-text-ui.po                               |  70 ++++----
 po/lt/ktpchat.po                                   |  63 +++-----
 po/mr/kcm_ktp_chat_appearance.po                   |   2 +-
 po/mr/kcm_ktp_chat_behavior.po                     |  22 ++-
 po/mr/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/mr/ktp-filters.po                               |   2 +-
 po/mr/ktp-text-ui.po                               |  70 ++++----
 po/mr/ktpchat.po                                   |  50 +++---
 po/nb/kcm_ktp_chat_appearance.po                   |   6 +-
 po/nb/kcm_ktp_chat_behavior.po                     |  41 ++++-
 po/nb/ktp-adiumxtra-protocol-handler.po            |  21 ++-
 po/nb/ktp-filters.po                               |  46 +++++-
 po/nb/ktp-text-ui.po                               | 120 +++++++++-----
 po/nb/ktpchat.po                                   |  69 ++++----
 po/nds/kcm_ktp_chat_appearance.po                  |   4 +-
 po/nds/kcm_ktp_chat_behavior.po                    |  22 ++-
 po/nds/ktp-adiumxtra-protocol-handler.po           |   2 +-
 po/nds/ktp-text-ui.po                              |  71 ++++----
 po/nds/ktpchat.po                                  |  56 ++++---
 po/nl/kcm_ktp_chat_appearance.po                   |   2 +-
 po/nl/kcm_ktp_chat_behavior.po                     |  26 ++-
 po/nl/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/nl/ktp-filters.po                               |  17 +-
 po/nl/ktp-text-ui.po                               |  72 ++++-----
 po/nl/ktpchat.po                                   |  52 +++---
 po/pa/CMakeLists.txt                               |   2 +
 po/{cs => pa}/kcm_ktp_chat_appearance.po           |  35 ++--
 po/{wa => pa}/kcm_ktp_chat_behavior.po             |  61 ++++---
 po/{gl => pa}/ktp-filters.po                       |  24 ++-
 po/{mr => pa}/ktp-text-ui.po                       | 146 ++++++++---------
 po/{nds => pa}/ktpchat.po                          | 120 +++++++-------
 po/pl/kcm_ktp_chat_appearance.po                   |  17 +-
 po/pl/kcm_ktp_chat_behavior.po                     |  35 +++-
 po/pl/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/pl/ktp-filters.po                               |  25 +--
 po/pl/ktp-text-ui.po                               |  97 +++++------
 po/pl/ktpchat.po                                   |  66 ++++----
 po/pt/kcm_ktp_chat_appearance.po                   |   2 +-
 po/pt/kcm_ktp_chat_behavior.po                     |  25 ++-
 po/pt/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/pt/ktp-filters.po                               |   8 +-
 po/pt/ktp-text-ui.po                               |  78 ++++-----
 po/pt/ktpchat.po                                   |  57 +++----
 po/pt_BR/kcm_ktp_chat_appearance.po                |   2 +-
 po/pt_BR/kcm_ktp_chat_behavior.po                  |  24 ++-
 po/pt_BR/ktp-adiumxtra-protocol-handler.po         |   2 +-
 po/pt_BR/ktp-filters.po                            |  14 +-
 po/pt_BR/ktp-text-ui.po                            |  84 +++++-----
 po/pt_BR/ktpchat.po                                |  63 ++++----
 po/ro/kcm_ktp_chat_appearance.po                   |   2 +-
 po/ro/kcm_ktp_chat_behavior.po                     |  22 ++-
 po/ro/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/{hu => ro}/ktp-filters.po                       |  26 ++-
 po/ro/ktp-text-ui.po                               |  84 +++++-----
 po/ro/ktpchat.po                                   |  62 ++++---
 po/ru/kcm_ktp_chat_appearance.po                   |   4 +-
 po/ru/kcm_ktp_chat_behavior.po                     |  24 ++-
 po/ru/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/ru/ktp-filters.po                               |  13 +-
 po/ru/ktp-text-ui.po                               |  72 ++++-----
 po/ru/ktpchat.po                                   |  52 +++---
 po/sk/kcm_ktp_chat_appearance.po                   |   2 +-
 po/sk/kcm_ktp_chat_behavior.po                     |  24 ++-
 po/sk/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/sk/ktp-filters.po                               |   2 +-
 po/sk/ktp-text-ui.po                               |  70 ++++----
 po/sk/ktpchat.po                                   |  50 +++---
 po/sl/kcm_ktp_chat_appearance.po                   |  81 +---------
 po/sl/kcm_ktp_chat_behavior.po                     |  25 ++-
 po/sl/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/sl/ktp-filters.po                               |  10 +-
 po/sl/ktp-text-ui.po                               |  82 +++++-----
 po/sl/ktpchat.po                                   |  55 +++----
 po/sr/kcm_ktp_chat_appearance.po                   |   2 +-
 po/sr/kcm_ktp_chat_behavior.po                     |  30 +++-
 po/sr/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/sr/ktp-filters.po                               |  22 ++-
 po/sr/ktp-text-ui.po                               |  90 ++++++-----
 po/sr/ktpchat.po                                   |  62 ++++---
 po/sr at ijekavian/kcm_ktp_chat_appearance.po         |   2 +-
 po/sr at ijekavian/kcm_ktp_chat_behavior.po           |  30 +++-
 po/sr at ijekavian/ktp-adiumxtra-protocol-handler.po  |   2 +-
 po/sr at ijekavian/ktp-filters.po                     |  22 ++-
 po/sr at ijekavian/ktp-text-ui.po                     |  90 ++++++-----
 po/sr at ijekavian/ktpchat.po                         |  62 ++++---
 po/sr at ijekavianlatin/kcm_ktp_chat_appearance.po    |   2 +-
 po/sr at ijekavianlatin/kcm_ktp_chat_behavior.po      |  30 +++-
 .../ktp-adiumxtra-protocol-handler.po              |   2 +-
 po/sr at ijekavianlatin/ktp-filters.po                |  22 ++-
 po/sr at ijekavianlatin/ktp-text-ui.po                |  90 ++++++-----
 po/sr at ijekavianlatin/ktpchat.po                    |  62 ++++---
 po/sr at latin/kcm_ktp_chat_appearance.po             |   2 +-
 po/sr at latin/kcm_ktp_chat_behavior.po               |  30 +++-
 po/sr at latin/ktp-adiumxtra-protocol-handler.po      |   2 +-
 po/sr at latin/ktp-filters.po                         |  22 ++-
 po/sr at latin/ktp-text-ui.po                         |  90 ++++++-----
 po/sr at latin/ktpchat.po                             |  62 ++++---
 po/sv/kcm_ktp_chat_appearance.po                   |   8 +-
 po/sv/kcm_ktp_chat_behavior.po                     |  30 +++-
 po/sv/ktp-adiumxtra-protocol-handler.po            |   8 +-
 po/sv/ktp-filters.po                               |  21 ++-
 po/sv/ktp-text-ui.po                               |  78 ++++-----
 po/sv/ktpchat.po                                   |  58 +++----
 po/tr/kcm_ktp_chat_appearance.po                   |   2 +-
 po/tr/kcm_ktp_chat_behavior.po                     |  26 ++-
 po/tr/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/{hu => tr}/ktp-filters.po                       |  25 ++-
 po/{et => tr}/ktp-text-ui.po                       | 179 ++++++++++-----------
 po/{ia => tr}/ktpchat.po                           | 149 +++++++++--------
 po/ug/kcm_ktp_chat_appearance.po                   |   7 +-
 po/ug/kcm_ktp_chat_behavior.po                     |  28 +++-
 po/ug/ktp-adiumxtra-protocol-handler.po            |  16 +-
 po/{zh_CN => ug}/ktp-filters.po                    |  26 ++-
 po/ug/ktp-text-ui.po                               |  95 ++++++-----
 po/ug/ktpchat.po                                   |  58 +++----
 po/uk/kcm_ktp_chat_appearance.po                   |   2 +-
 po/uk/kcm_ktp_chat_behavior.po                     |  24 ++-
 po/uk/ktp-adiumxtra-protocol-handler.po            |   2 +-
 po/uk/ktp-filters.po                               |  20 ++-
 po/uk/ktp-text-ui.po                               |  72 ++++-----
 po/uk/ktpchat.po                                   |  52 +++---
 po/vi/ktp-text-ui.po                               |  94 +++++------
 po/vi/ktpchat.po                                   |  50 +++---
 po/wa/kcm_ktp_chat_behavior.po                     |  22 ++-
 po/zh_CN/kcm_ktp_chat_appearance.po                |   2 +-
 po/zh_CN/kcm_ktp_chat_behavior.po                  |  22 ++-
 po/zh_CN/ktp-adiumxtra-protocol-handler.po         |   2 +-
 po/zh_CN/ktp-filters.po                            |  14 +-
 po/zh_CN/ktp-text-ui.po                            |  70 ++++----
 po/zh_CN/ktpchat.po                                |  52 +++---
 po/zh_TW/kcm_ktp_chat_appearance.po                |   4 +-
 po/zh_TW/kcm_ktp_chat_behavior.po                  |  32 +++-
 po/zh_TW/ktp-adiumxtra-protocol-handler.po         |   4 +-
 po/zh_TW/ktp-filters.po                            |   6 +-
 po/zh_TW/ktp-text-ui.po                            |  74 ++++-----
 po/zh_TW/ktpchat.po                                |  58 +++----
 289 files changed, 4831 insertions(+), 4086 deletions(-)

-- 
ktp-text-ui packaging



More information about the pkg-kde-commits mailing list