[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

Maximiliano Curia maxy at moszumanska.debian.org
Sat May 28 00:22:47 UTC 2016 

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

The following commit has been merged in the master branch:
commit f48e6f2d451385513861bfe3a1037aca6dab7c3a
Merge: dce1d7da58ea53e485d8cb0d6c2c0ea41b54fe59 278f9f82550cf763e96585ec5aed6418f9cc760e
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Sun Sep 30 19:48:16 2012 +0200

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	config/kcm_ktp_chat_messages.desktop
    	filters/emoticons/ktptextui_message_filter_emoticons.desktop
    	filters/formatting/ktptextui_message_filter_formatting.desktop
    	filters/images/ktptextui_message_filter_images.desktop
    	filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop
    	lib/ktptxtui_message_filter.desktop
    	tests/message-processor-basic-tests.cpp
    	tests/message-processor-basic-tests.h

 app/chat-window.cpp                                |  6 ++++--
 app/main.cpp                                       |  3 ++-
 config/kcm_ktp_chat_messages.desktop               |  2 ++
 .../ktptextui_message_filter_emoticons.desktop     |  2 ++
 .../ktptextui_message_filter_formatting.desktop    | 10 ++++++++++
 .../images/ktptextui_message_filter_images.desktop |  1 +
 ...tptextui_message_filter_searchexpansion.desktop |  1 +
 lib/ktptxtui_message_filter.desktop                |  8 ++++----
 logviewer/ktp-log-viewer.desktop                   |  4 ++--
 tests/message-processor-basic-tests.cpp            | 23 ++++++++++++++--------
 tests/message-processor-basic-tests.h              |  1 +
 11 files changed, 44 insertions(+), 17 deletions(-)

diff --cc config/kcm_ktp_chat_messages.desktop
index 4d087a1,53eec98..d7aae44
--- a/config/kcm_ktp_chat_messages.desktop
+++ b/config/kcm_ktp_chat_messages.desktop
@@@ -12,7 -11,8 +12,8 @@@ Name[it]=Estension
  Name[nb]=Programtillegg
  Name[nl]=Plug-ins
  Name[nn]=Programtillegg
 -Name[pl]=Wtyczki
 +Name[pt]='Plugins'
+ Name[pt]='Plugins'
  Name[pt_BR]=Plugins
  Name[se]=Lassemoduvllat
  Name[sk]=Pluginy
@@@ -29,14 -29,13 +30,15 @@@ Exec=kcmshell4 kcm_ktp_message_filter
  Comment=How to deal with extra information obtained from messages
  Comment[ca]=Com tractar la informació extra obtinguda dels missatges
  Comment[cs]=Jak se vypořádat s extra informacemi obdrženými ze zpráv
 -Comment[da]=Hvordan ekstra information fra beskeder skal håndteres
 +Comment[da]=Hvordan ekstra information modtaget i beskeder skal håndteres
  Comment[el]=Πώς να χειριστείτε επιπλέον πληροφορίες που αποκτήθηκαν από μηνύματα
  Comment[es]=Como tratar la información extra obtenida de los mensajes
 +Comment[fr]=Comment traiter les informations complémentaires obtenues depuis des messages
 +Comment[hu]=Hogyan kezelje az üzenetekből kapott extra információkat
  Comment[it]=Come gestire le informazioni aggiuntive ricavate dai messaggi
  Comment[nl]=Hoe te handelen met extra informatie verkregen uit berichten
 -Comment[pl]=Sposób radzenia sobie z dodatkowymi informacjami uzyskanymi z wiadomości
 +Comment[pt]=Como lidar com a informação extra obtida a partir das mensagens
+ Comment[pt]=Como lidar com a informação extra obtida das mensagens
  Comment[pt_BR]=Como lidar com informações adicionais obtidas a partir de mensagens
  Comment[sk]=Ako sa vysporiadať s dodatočnými informáciami získanými zo správ
  Comment[sr]=Како обрадити допунске податке добијене уз поруке
diff --cc filters/emoticons/ktptextui_message_filter_emoticons.desktop
index 2c4760d,fa362f0..211c1d5
--- a/filters/emoticons/ktptextui_message_filter_emoticons.desktop
+++ b/filters/emoticons/ktptextui_message_filter_emoticons.desktop
@@@ -11,9 -10,9 +11,10 @@@ Name[hu]=Hangulatjele
  Name[it]=Emoticon
  Name[nl]=Emoticons
  Name[nn]=Fjesingar
 -Name[pl]=Emotikony
 +Name[pt]=Ícones Emotivos
+ Name[pt]=Ícones Emotivos
  Name[pt_BR]=Emoticons
 +Name[ru]=Смайлики
  Name[se]=Mojánat
  Name[sk]=Emotikony
  Name[sr]=Емотикони
@@@ -32,11 -31,10 +33,12 @@@ Comment[da]=Vis emotikoner (smileys) in
  Comment[el]=Να εμφανίζονται τα emoticons (γελαστά πρόσωπα) μέσα στη συνομιλία
  Comment[es]=Mostrar emoticonos (caras sonrientes) dentro del chat
  Comment[fi]=Näytä hymiöt (hymynaamat) chatissä
 +Comment[fr]=Afficher les émoticônes (visages souriants) au sein de la discussion
 +Comment[hu]=Hangulatjelek (smiley arcok) megjelenítése a csevegésen belül
  Comment[it]=Mostra emoticon (faccine) nella chat
  Comment[nl]=Emoticons tonen (lachende gezichtjes) in de chat
 -Comment[pl]=Pokaż emotikony (buźki) wewnątrz okna rozmowy
 +Comment[pt]=Mostrar os ícones emotivos nas conversas
+ Comment[pt]=Mostrar os ícones emotivos (sorrisos) dentro da conversa
  Comment[pt_BR]=Mostra emoticons (carinhas) no interior do bate-papo
  Comment[sk]=Zobraziť emotikony (smajlíkov) v rozhovore
  Comment[sr]=Приказ емотикона (смешкова) унутар ћаскања
diff --cc filters/formatting/ktptextui_message_filter_formatting.desktop
index 07b12ac,9d16282..d342105
--- a/filters/formatting/ktptextui_message_filter_formatting.desktop
+++ b/filters/formatting/ktptextui_message_filter_formatting.desktop
@@@ -1,29 -1,46 +1,39 @@@
  [Desktop Entry]
  Encoding=UTF-8
 -Name=Google Talk Style Formatting
 -Name[ca]=Formatació seguint l'estil de Google Talk
 -Name[cs]=Formátovat stylem Google Talk
 -Name[da]=Google Talk-agtig formatering
 -Name[el]=Στιλ διαμόρφωσης Google Talk
 -Name[es]=Formato de estilo Google Talk
 -Name[fi]=Google Talkin tapainen muotoilu
 -Name[it]=Formato stile Google Talk
 -Name[nl]=Opmaak volgens de stijl van Google-Talk
 -Name[pl]=Formatowanie w stylu Google Talk
 -Name[pt]=Estilo de Formatação do Google Talk
 -Name[pt_BR]=Formatação no estilo do Google-Talk
 -Name[sk]=Formátovanie štýlom Google Talk
 -Name[sr]=Форматирање у стилу Гугл‑разговора
 -Name[sr at ijekavian]=Форматирање у стилу Гугл‑разговора
 -Name[sr at ijekavianlatin]=Formatiranje u stilu Google-razgovora
 -Name[sr at latin]=Formatiranje u stilu Google-razgovora
 -Name[sv]=Formatering enligt Google-talk
 -Name[uk]=Форматування у стилі Google-Talk
 -Name[x-test]=xxGoogle Talk Style Formattingxx
 -Name[zh_TW]=Google Talk 樣式的格式
 -Comment=Use _, * and - to make text italic, bold or strikeout respectively
 -Comment[ca]=Usa _, * and - per convertir el text a itàlic, negreta o tatxat respectivament
 -Comment[cs]=Použít _, * a - pro kurzívu, tučný a přeškrtnutý text
 +Name=Text Formatting
 +Name[cs]=Formátování textu
 +Name[da]=Tekstformatering
 +Name[el]=Διαμόρφωση κειμένου
 +Name[hu]=Szövegformázás
 +Name[it]=Formattazione del testo
 +Name[nl]=Opmaken van tekst
 +Name[pt]=Formatação do Texto
 +Name[pt_BR]=Formatação do texto
 +Name[sv]=Textformatering
 +Name[uk]=Форматування тексту
 +Name[x-test]=xxText Formattingxx
 +Comment=Use /, _, * and - to make text italic, underlined, bold or strikeout respectively
 +Comment[cs]=Použít /,_, * a - pro kurzívu, podtržený, tučný a přeškrtnutý text
 +Comment[da]=Brug _, * og - til at lave hhv. kursiv, understreget, fed eller overstreget
 +Comment[el]=Χρησιμοποιήστε /, _, * και - για πλάγιους, υπογραμμισμένους, έντονους ή με επιγράμμιση χαρακτήρες αντίστοιχα
 +Comment[hu]=A /, _, * és - használatával teheti a szöveget döntötté, aláhúzottá, félkövérré vagy áthúzottá
 +Comment[it]=Usa /, _, * e - per rendere il testo rispettivamente corsivo, sottolineato, grassetto o barrato
 +Comment[nl]=Gebruik /, _, * and - om tekst respectievelijk cursief, onderlijnt, vet of doorgestreept te maken
 +Comment[pt]=Usar o '/', '_', '*' e '-' para tornar o texto itálico, sublinhado, negrito ou traçado, respectivamente
 +Comment[pt_BR]=Use /, _, * e - para tornar o texto em itálico, sublinhado, negrito ou riscado, respectivamente
 +Comment[sv]=Använd /,_, * och - för att antingen visa texten kursiv, understruken, med fetstil eller överstruken
 +Comment[uk]=Використовувати /, _, * і - для курсиву, підкресленого, напівжирного та перекресленого тексту, відповідно
 +Comment[x-test]=xxUse /, _, * and - to make text italic, underlined, bold or strikeout respectivelyxx
+ Comment[da]=Brug _, * og - til at gøre tekst hhv. kursiv, fed eller gennemstreget
+ Comment[el]=Χρησιμοποιήστε _, * και - για πλάγιους, έντονους ή με επιγράμμιση χαρακτήρες αντίστοιχα
 -Comment[es]=Utilizar _, * y - para poner el texto en cursiva, negrita o tachado respectivamente
+ Comment[it]=Usa _, * e - per rendere il testo rispettivamente corsivo, grassetto o barrato
 -Comment[nl]=Gebruik _, * and - om tekst respectievelijk cursief, vet of doorgestreept te maken
+ Comment[pl]=Użyj odpowiednio _, * i - aby tekst był napisany kursywą, pogrubiony lub przekreślony
+ Comment[pt]=Usar o _, * e o - para tornar o texto itálico, negrito ou traçado, respectivamente
 -Comment[pt_BR]=Use _, * e - para tornar o texto em itálico, negrito ou riscado, respectivamente
 -Comment[sk]=Použite _, * a - na zmenu textu na kurzívu, tučné alebo prečiarknuté
+ Comment[sr]=Користите _, * и - за курзив, подебљано и прецртано
+ Comment[sr at ijekavian]=Користите _, * и - за курзив, подебљано и прецртано
+ Comment[sr at ijekavianlatin]=Koristite _, * i - za kurziv, podebljano i precrtano
+ Comment[sr at latin]=Koristite _, * i - za kurziv, podebljano i precrtano
 -Comment[sv]=Använd _, * och - för att antingen visa texten kursiv, med fetstil eller överstruken
 -Comment[uk]=Використовувати _, * і - для курсиву, напівжирного та перекресленого тексту, відповідно
 -Comment[x-test]=xxUse _, * and - to make text italic, bold or strikeout respectivelyxx
+ Comment[zh_TW]=用 _  * 與 - 等符號來表示斜體、粗體與加上刪除線的文字
  Type=Service
  ServiceTypes=KTpTextUi/MessageFilter
  X-KDE-Library=ktptextui_message_filter_formatting
diff --cc filters/images/ktptextui_message_filter_images.desktop
index 61b430a,d5fcbe6..c070a86
--- a/filters/images/ktptextui_message_filter_images.desktop
+++ b/filters/images/ktptextui_message_filter_images.desktop
@@@ -6,11 -6,10 +6,12 @@@ Name[da]=Forhåndsvisning af billed
  Name[el]=Προεπισκόπηση εικόνας
  Name[es]=Vista previa de imagen
  Name[fi]=Kuvan esikatselu
 +Name[fr]=Aperçu d'image
 +Name[hu]=A kép előnézete
  Name[it]=Anteprima di immagini
  Name[nl]=Afbeeldingsvoorbeeld
 -Name[pl]=PodglÄ…d obrazu
 +Name[pt]=Antevisão da Imagem
+ Name[pt]=Antevisão da Imagem
  Name[pt_BR]=Visualização de imagem
  Name[sk]=Náhľad obrázka
  Name[sr]=Преглед слике
diff --cc filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop
index 244f968,a4d06fc..04d6d92
--- a/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop
+++ b/filters/searchexpansion/ktptextui_message_filter_searchexpansion.desktop
@@@ -11,7 -10,8 +11,8 @@@ Name[it]=Scorciatoie we
  Name[nb]=Nettsnarveier
  Name[nl]=Webkoppelingen
  Name[nn]=Vevsnarvegar
 -Name[pl]=Skróty sieciowe
 +Name[pt]=Atalhos Web
+ Name[pt]=Atalhos Web
  Name[pt_BR]=Atalhos da Internet
  Name[se]=Fierpmádatlávkestagat
  Name[sk]=Webové skratky
diff --cc lib/ktptxtui_message_filter.desktop
index ddee4e1,7014f38..ddcae2c
--- a/lib/ktptxtui_message_filter.desktop
+++ b/lib/ktptxtui_message_filter.desktop
@@@ -4,19 -4,14 +4,20 @@@ X-KDE-ServiceType=KTpTextUi/MessageFilt
  Comment=Telepathy Text-Ui Message Filter
  Comment[ca]=Filtre de missatge Text-IU del Telepathy
  Comment[cs]=Filtr textových zpráv Telepathy
- Comment[da]=Beskedfilter til tekst-brugerflade til Telepathy
+ Comment[da]=Telepathy Text-Ui beskedfilter
  Comment[el]=Telepathy Text-Ui φίλτρο μηνυμάτων
  Comment[es]=Filtro de mensajes de la interfaz de texto de Telepathy
- Comment[et]=Telepathy teksti kasutajaliidese sõnumifilter
+ Comment[it]=Filtro dei messaggi dell'interfaccia di Telepathy
 +Comment[fr]=Filtre de message d'interface utilisateur de texte pour Telepathy
 +Comment[hu]=Telepathy üzenetszűrő
 +Comment[it]=Filtro dei messaggi dell'interfaccia di Telepathy
 +Comment[km]=តម្រង​សារ Text-Ui របស់ Telepathy
 +Comment[lt]=Telepatijos tekstinės NS žinutės filtras
  Comment[nl]=Tekstinterface voor het berichtenfilter van Telepathy
- Comment[pt]=Filtro de Mensagens da Interface de Texto do Telepathy
+ Comment[pl]=Interfejs użytkownika filtrowania wiadomości - Telepathy Tekst
+ Comment[pt]=Filtro de Mensagens em Texto do Telepathy
  Comment[pt_BR]=Filtro de mensagens da interface de texto do Telepathy
 +Comment[ru]=Фильтр сообщений окна текстового общения
  Comment[sk]=Filter správ Telepathy Text-Ui
  Comment[sr]=Филтер порука за телепатијско текстуално сучеље
  Comment[sr at ijekavian]=Филтер порука за телепатијско текстуално сучеље
diff --cc logviewer/ktp-log-viewer.desktop
index 228eb6d,ff4d761..65c9f79
--- a/logviewer/ktp-log-viewer.desktop
+++ b/logviewer/ktp-log-viewer.desktop
@@@ -7,16 -7,14 +7,16 @@@ Name[de]=Instant-Messenger-Protokollbet
  Name[el]=KDE IM Log Viewer
  Name[es]=Visor de registros de MI de KDE
  Name[et]=KDE kiirsuihtluse loginäitaja
 -Name[fr]=Afficheur de journaux de messagerie instantanée de KDE
 +Name[fr]=Afficheur de journaux de MI de KDE
  Name[hu]=KDE üzenetküldő - Naplómegjelenítő
  Name[it]=Visore registri del sistema MI di KDE
 +Name[km]=កម្មវិធី​មើល​កំណត់​ហេតុ KDE
  Name[lt]=KDE TP žurnalo žiūryklė
  Name[nl]=KDE viewer voor IM-log
- Name[pl]=PrzeglÄ…darka dziennika KI KDE
+ Name[pl]=Przeglądarka dzienników KI KDE
  Name[pt]=Visualizador dos Registos de MI do KDE
  Name[pt_BR]=Visualizador dos registros de MI do KDE
 +Name[ru]=Просмотр журнала общения в KDE
  Name[sk]=Prehliadač záznamu KDE IM
  Name[sr]=Приказивач КДЕ ИМ дневника
  Name[sr at ijekavian]=Приказивач КДЕ ИМ дневника
@@@ -38,13 -36,11 +38,13 @@@ GenericName[et]=KDE kiirsuhtluse loginÃ
  GenericName[fr]=Afficheur de journaux de messagerie instantanée de KDE
  GenericName[hu]=KDE azonnali üzenetküldő - Naplómegjelenítő
  GenericName[it]=Visore registri del sistema di messaggistica istantanea di KDE
 +GenericName[km]=កម្មវិធី​មើល​កំណត់​ហេតុ​កម្មវិធី​ផ្ញើ​សារ​បន្ទាន់ KDE
  GenericName[lt]=KDE tikralaikio pokalbio žurnalo žiūryklė
  GenericName[nl]=KDE viewer voor Instant Messenger-log
- GenericName[pl]=PrzeglÄ…darka dziennika komunikatora internetowego KDE
+ GenericName[pl]=Przeglądarka dzienników komunikatora internetowego KDE
  GenericName[pt]=Visualizador de Registos de Mensagens Instantâneas do KDE
  GenericName[pt_BR]=Visualizador de registros de mensagens instantâneas do KDE
 +GenericName[ru]=Просмотр журнала обмена мгновенными сообщениями в KDE
  GenericName[sk]=Prehliadač záznamu KDE instant messengera
  GenericName[sr]=Приказивач КДЕ брзогласничког дневника
  GenericName[sr at ijekavian]=Приказивач КДЕ брзогласничког дневника
diff --cc tests/message-processor-basic-tests.cpp
index 61bf255,94a5169..580a3b3
--- a/tests/message-processor-basic-tests.cpp
+++ b/tests/message-processor-basic-tests.cpp
@@@ -122,6 -100,54 +122,13 @@@ void MessageProcessorBasicTests::testMu
      QCOMPARE(qvariant_cast<KUrl>(urls.at(1)), KUrl("http://www.google.com.au"));
  }
  
+ void MessageProcessorBasicTests::textRichTextUrlParsing()
+ {
+     compare("go to http://example.com/page.php?code=",
+             "go to <a href=\"http://example.com/page.php?code=123"\">http://example.com/page.php?code=123"</a>");
+ }
+ 
+ 
 -void MessageProcessorBasicTests::compare(const char *input, const char *expected) {
 -    QString processed = s.getProcessedMessage(input);
 -    QString href = QLatin1String(expected);
 -
 -    QCOMPARE(processed, href);
 -}
 -
 -// void MessageProcessorBasicTests::testSingleCharBold()
 -// {
 -//     compare("*b*", "<b>b</b>");
 -// }
 -
 -// void MessageProcessorBasicTests::testBold()
 -// {
 -//     compare("*this* shoudl *be in bold*", "<b>this</b> shoudl <b>be in bold</b>");
 -// }
 -
 -// void MessageProcessorBasicTests::testBoldItalics()
 -// {
 -//     compare("_*this is bold italics*_", "<i><b>this is bold italics</b></i>");
 -//     compare("_*this is bold italics_*", "<i><b>this is bold italics</i></b>");
 -// }
 -
 -// void MessageProcessorBasicTests::testMultiWordItalics()
 -// {
 -//     compare("_all _ this _hsould_ be in italics_", "<i>all _ this _hsould</i> be in italics_");
 -//     compare("_f f_ fd _f f_", "<i>f f</i> fd <i>f f</i>");
 -//     compare("_f _f_", "<i>f _f</i>");
 -//     compare("_dsd _ _ ss_", "<i>dsd _ _ ss</i>");
 -// }
 -
 -// void MessageProcessorBasicTests::testSingleWordItalics()
 -// {
 -//     compare("_b_", "<i>b</i>");
 -// }
 -
 -// void MessageProcessorBasicTests::testStrikethrough()
 -// {
 -//     compare("-strike through-", "<s>strike through</s>");
 -// }
 -
  void MessageProcessorBasicTests::testImageEmbedGIF()
  {
      const char* message = "http://kde.org/images/teaser/jointhegame.gif";
diff --cc tests/message-processor-basic-tests.h
index 2fa3177,db0ade5..452ac08
--- a/tests/message-processor-basic-tests.h
+++ b/tests/message-processor-basic-tests.h
@@@ -38,6 -40,13 +38,7 @@@ private Q_SLOTS
      void testUnsupportedProtocolCatching();
      void testMetadataGeneration();
      void testMultipleURLCatching();
+     void textRichTextUrlParsing();
 -//     void testSingleWordItalics();
 -//     void testMultiWordItalics();
 -//     void testSingleCharBold();
 -//     void testBoldItalics();
 -//     void testStrikethrough();
 -//     void testBold();
      void testImageEmbedGIF();
      void testXSS();
  //     void testSearchExpansion();

-- 
ktp-text-ui packaging

More information about the pkg-kde-commits mailing list