[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=5e2f7e5

The following commit has been merged in the master branch:
commit 5e2f7e5be034afdb7b8bedbe552024b8214b4024
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Tue Jun 19 01:54:30 2012 +0300

    Re-i18n-ify some strings that were wrongly un-i18n-ified
    
    Reviewed-by: Pino Toscano
    CCBUG: 300064
---
 config/appearance-config.cpp | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/config/appearance-config.cpp b/config/appearance-config.cpp
index 2e0ed61..5e2a778 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(QString::fromLatin1("ted at example.com"));
-    m_demoChatHeader.setDestinationDisplayName(QString::fromLatin1("Ted"));
+    m_demoChatHeader.setDestinationName(i18nc("Example email", "ted at example.com"));
+    m_demoChatHeader.setDestinationDisplayName(i18nc("Example name", "Ted"));
     m_demoChatHeader.setGroupChat(false);
 
     ui->chatView->load(AdiumThemeView::SingleUserChat);
@@ -179,38 +179,38 @@ void AppearanceConfig::sendDemoMessages()
     //add a fake message
     AdiumThemeContentInfo message(AdiumThemeMessageInfo::HistoryRemoteToLocal);
     message.setMessage(i18nc("Example message in preview conversation","Ok!"));
-    message.setSenderDisplayName(QString::fromLatin1("larry at example.com"));
-    message.setSenderScreenName(QString::fromLatin1("Larry Demo"));
+    message.setSenderDisplayName(i18nc("Example email", "larry at example.com"));
+    message.setSenderScreenName(i18nc("Example name", "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(QString::fromLatin1("larry at example.com"));
-    message.setSenderScreenName(QString::fromLatin1("Larry Demo"));
+    message.setSenderDisplayName(i18nc("Example email", "larry at example.com"));
+    message.setSenderScreenName(i18nc("Example name", "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(QString::fromLatin1("ted at example.com"));
-    message.setSenderScreenName(QString::fromLatin1("Ted Example"));
+    message.setSenderDisplayName(i18nc("Example email", "ted at example.com"));
+    message.setSenderScreenName(i18nc("Example name", "Ted Example"));
     message.setService(i18n("Jabber"));
     message.setTime(QDateTime::currentDateTime());
     ui->chatView->addContentMessage(message);
 
     message = AdiumThemeContentInfo(AdiumThemeMessageInfo::HistoryLocalToRemote);
     message.setMessage(i18n("cya"));
-    message.setSenderDisplayName(QString::fromLatin1("ted at example.com"));
-    message.setSenderScreenName(QString::fromLatin1("Ted Example"));
+    message.setSenderDisplayName(i18nc("Example email", "ted at example.com"));
+    message.setSenderScreenName(i18nc("Example name", "Ted Example"));
     message.setService(i18n("Jabber"));
     message.setTime(QDateTime::currentDateTime());
     ui->chatView->addContentMessage(message);
 
     AdiumThemeStatusInfo statusMessage(true);
-    statusMessage.setMessage(QString::fromLatin1("Ted Example waves."));
+    statusMessage.setMessage(i18nc("Example message", "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(QString::fromLatin1("larry at example.com"));
-    message.setSenderScreenName(QString::fromLatin1("Larry Demo"));
+    message.setSenderDisplayName(i18nc("Example email", "larry at example.com"));
+    message.setSenderScreenName(i18nc("Example name", "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(QString::fromLatin1("larry at example.com"));
-    message.setSenderScreenName(QString::fromLatin1("Larry Demo"));
+    message.setSenderDisplayName(i18nc("Example email", "larry at example.com"));
+    message.setSenderScreenName(i18nc("Example name", "Larry Demo"));
     message.setService(i18n("Jabber"));
     message.setTime(QDateTime::currentDateTime());
     ui->chatView->addContentMessage(message);
@@ -242,16 +242,16 @@ void AppearanceConfig::sendDemoMessages()
     message.setMessage(i18n("Check out which cool adium themes work "
                             "<a href=\"http://community.kde.org/Real-Time_Communication_and_Collaboration/Components/Chat_Window/Themes\">"
                             "here</a>!"));
-    message.setSenderDisplayName(i18n("ted at example.com"));
-    message.setSenderScreenName(i18n("Ted Example"));
+    message.setSenderDisplayName(i18nc("Example email", "ted at example.com"));
+    message.setSenderScreenName(i18nc("Example name", "Ted Example"));
     message.setService(i18n("Jabber"));
     message.setTime(QDateTime::currentDateTime());
     ui->chatView->addContentMessage(message);
 
     message = AdiumThemeContentInfo(AdiumThemeMessageInfo::LocalToRemote);
     message.setMessage(i18n("A different example message"));
-    message.setSenderDisplayName(QString::fromLatin1("ted at example.com"));
-    message.setSenderScreenName(QString::fromLatin1("Ted Example"));
+    message.setSenderDisplayName(i18nc("Example email", "ted at example.com"));
+    message.setSenderScreenName(i18nc("Example name", "Ted Example"));
     message.setService(i18n("Jabber"));
     message.setTime(QDateTime::currentDateTime());
     ui->chatView->addContentMessage(message);

-- 
ktp-text-ui packaging