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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit db94ec8ff3f987d5ffd93bf322cd01d19383fb8d
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue May 15 14:35:54 2012 +0100

    Don't mark names and email addresses in the demo chat preview to be translatable.
    
    Also remove mention to @yahoo.com which makes header fit the rest of the content which was updated.
    
    CCBUG: 300064
    Reviewed-by: Martin Klapetek
---
 config/appearance-config.cpp | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/config/appearance-config.cpp b/config/appearance-config.cpp
index 516b9e7..2e0ed61 100644
--- a/config/appearance-config.cpp
+++ b/config/appearance-config.cpp
@@ -46,8 +46,8 @@ AppearanceConfig::AppearanceConfig(QWidget *parent, const QVariantList& args)
     m_demoChatHeader.setChatName(i18n("A demo chat"));
     m_demoChatHeader.setSourceName(i18n("Jabber"));
     m_demoChatHeader.setTimeOpened(QDateTime::currentDateTime());
-    m_demoChatHeader.setDestinationName(i18n("BobMarley at yahoo.com"));
-    m_demoChatHeader.setDestinationDisplayName(i18n("Bob Marley"));
+    m_demoChatHeader.setDestinationName(QString::fromLatin1("ted at example.com"));
+    m_demoChatHeader.setDestinationDisplayName(QString::fromLatin1("Ted"));
     m_demoChatHeader.setGroupChat(false);
 
     ui->chatView->load(AdiumThemeView::SingleUserChat);
@@ -178,39 +178,39 @@ void AppearanceConfig::sendDemoMessages()
 {
     //add a fake message
     AdiumThemeContentInfo message(AdiumThemeMessageInfo::HistoryRemoteToLocal);
-    message.setMessage(i18n("Ok!"));
-    message.setSenderDisplayName(i18n("larry at example.com"));
-    message.setSenderScreenName(i18n("Larry Demo"));
+    message.setMessage(i18nc("Example message in preview conversation","Ok!"));
+    message.setSenderDisplayName(QString::fromLatin1("larry at example.com"));
+    message.setSenderScreenName(QString::fromLatin1("Larry Demo"));
     message.setService(i18n("Jabber"));
     message.setTime(QDateTime::currentDateTime());
     ui->chatView->addContentMessage(message);
 
     message = AdiumThemeContentInfo(AdiumThemeMessageInfo::HistoryRemoteToLocal);
     message.setMessage(i18n("Bye Bye"));
-    message.setSenderDisplayName(i18n("larry at example.com"));
-    message.setSenderScreenName(i18n("Larry Demo"));
+    message.setSenderDisplayName(QString::fromLatin1("larry at example.com"));
+    message.setSenderScreenName(QString::fromLatin1("Larry Demo"));
     message.setService(i18n("Jabber"));
     message.setTime(QDateTime::currentDateTime());
     ui->chatView->addContentMessage(message);
 
     message = AdiumThemeContentInfo(AdiumThemeMessageInfo::HistoryLocalToRemote);
     message.setMessage(i18n("Have fun!"));
-    message.setSenderDisplayName(i18n("ted at example.com"));
-    message.setSenderScreenName(i18n("Ted Example"));
+    message.setSenderDisplayName(QString::fromLatin1("ted at example.com"));
+    message.setSenderScreenName(QString::fromLatin1("Ted Example"));
     message.setService(i18n("Jabber"));
     message.setTime(QDateTime::currentDateTime());
     ui->chatView->addContentMessage(message);
 
     message = AdiumThemeContentInfo(AdiumThemeMessageInfo::HistoryLocalToRemote);
     message.setMessage(i18n("cya"));
-    message.setSenderDisplayName(i18n("ted at example.com"));
-    message.setSenderScreenName(i18n("Ted Example"));
+    message.setSenderDisplayName(QString::fromLatin1("ted at example.com"));
+    message.setSenderScreenName(QString::fromLatin1("Ted Example"));
     message.setService(i18n("Jabber"));
     message.setTime(QDateTime::currentDateTime());
     ui->chatView->addContentMessage(message);
 
     AdiumThemeStatusInfo statusMessage(true);
-    statusMessage.setMessage(i18n("Ted Example waves."));
+    statusMessage.setMessage(QString::fromLatin1("Ted Example waves."));
     statusMessage.setTime(QDateTime::currentDateTime());
     statusMessage.setService(i18n("Jabber"));
     ui->chatView->addStatusMessage(statusMessage);
@@ -224,16 +224,16 @@ void AppearanceConfig::sendDemoMessages()
 
     message = AdiumThemeContentInfo(AdiumThemeMessageInfo::RemoteToLocal);
     message.setMessage(i18n("Hello"));
-    message.setSenderDisplayName(i18n("larry at example.com"));
-    message.setSenderScreenName(i18n("Larry Demo"));
+    message.setSenderDisplayName(QString::fromLatin1("larry at example.com"));
+    message.setSenderScreenName(QString::fromLatin1("Larry Demo"));
     message.setService(i18n("Jabber"));
     message.setTime(QDateTime::currentDateTime());
     ui->chatView->addContentMessage(message);
 
     message = AdiumThemeContentInfo(AdiumThemeMessageInfo::RemoteToLocal);
     message.setMessage(i18n("What's up?"));
-    message.setSenderDisplayName(i18n("larry at example.com"));
-    message.setSenderScreenName(i18n("Larry Demo"));
+    message.setSenderDisplayName(QString::fromLatin1("larry at example.com"));
+    message.setSenderScreenName(QString::fromLatin1("Larry Demo"));
     message.setService(i18n("Jabber"));
     message.setTime(QDateTime::currentDateTime());
     ui->chatView->addContentMessage(message);
@@ -250,8 +250,8 @@ void AppearanceConfig::sendDemoMessages()
 
     message = AdiumThemeContentInfo(AdiumThemeMessageInfo::LocalToRemote);
     message.setMessage(i18n("A different example message"));
-    message.setSenderDisplayName(i18n("ted at example.com"));
-    message.setSenderScreenName(i18n("Ted Example"));
+    message.setSenderDisplayName(QString::fromLatin1("ted at example.com"));
+    message.setSenderScreenName(QString::fromLatin1("Ted Example"));
     message.setService(i18n("Jabber"));
     message.setTime(QDateTime::currentDateTime());
     ui->chatView->addContentMessage(message);

-- 
ktp-text-ui packaging