From 90bac2a18e98fa83994a4d9927e97a2e0abd1ba4 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Mon, 2 Sep 2013 17:16:54 +0000 Subject: [PATCH] Fixed some strings Updated english translation git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6675 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/feeds/MsgItem.cpp | 2 +- retroshare-gui/src/gui/notifyqt.cpp | 4 +- retroshare-gui/src/lang/retroshare_en.ts | 56 +++++++++++++++++++----- 3 files changed, 47 insertions(+), 15 deletions(-) diff --git a/retroshare-gui/src/gui/feeds/MsgItem.cpp b/retroshare-gui/src/gui/feeds/MsgItem.cpp index 096403c87..2d9142e62 100644 --- a/retroshare-gui/src/gui/feeds/MsgItem.cpp +++ b/retroshare-gui/src/gui/feeds/MsgItem.cpp @@ -130,7 +130,7 @@ void MsgItem::updateItemStatic() subjectLabel->setText(QString::fromStdWString(mi.title)); if(mi.msgflags & RS_MSG_ENCRYPTED) - msgLabel->setText(RsHtml().formatText(NULL, tr("[Encrypted message]"), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS)); + msgLabel->setText(RsHtml().formatText(NULL, QString("[%1]").arg(tr("Encrypted message")), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS)); else msgLabel->setText(RsHtml().formatText(NULL, QString::fromStdWString(mi.msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS)); diff --git a/retroshare-gui/src/gui/notifyqt.cpp b/retroshare-gui/src/gui/notifyqt.cpp index 9b29b52fa..2b808765a 100644 --- a/retroshare-gui/src/gui/notifyqt.cpp +++ b/retroshare-gui/src/gui/notifyqt.cpp @@ -780,7 +780,7 @@ void NotifyQt::UpdateGUI() if (popupflags & RS_POPUP_MSG) { - toaster = new Toaster(new MessageToaster(std::string(), QObject::tr("Unknown title"), QObject::tr("[Encrypted message]"))); + toaster = new Toaster(new MessageToaster(std::string(), tr("Unknown title"), QString("[%1]").arg(tr("Encrypted message")))); } break; case RS_POPUP_MSG: @@ -934,7 +934,7 @@ void NotifyQt::testToaster(uint notifyFlags, /*RshareSettings::enumToasterPositi switch(type) { case RS_POPUP_ENCRYPTED_MSG: - toaster = new Toaster(new MessageToaster(std::string(), tr("Unknown title"), tr("[Encrypted message]"))); + toaster = new Toaster(new MessageToaster(std::string(), tr("Unknown title"), QString("[%1]").arg(tr("Encrypted message")))); break; case RS_POPUP_MSG: toaster = new Toaster(new MessageToaster(id, title, message)); diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts index 46a113319..8e15901cc 100644 --- a/retroshare-gui/src/lang/retroshare_en.ts +++ b/retroshare-gui/src/lang/retroshare_en.ts @@ -1396,6 +1396,14 @@ Double click lobbies to enter and chat. <h1><img width="32" src=":/images/64px_help.png">&nbsp;&nbsp;Chat Lobbies</h1> <p>Chat lobbies are distributed chat rooms, and work pretty much like IRC. They allow you to talk anonymously with tons of people without the need to make friends.</p> <p>A chat lobby can be public (you friends see it) or private (your friends can't see it, unless you invite them with <img src=":/images/add_24x24.png" width=12/>). Once you have been invited to a private lobby, you will be able to see it when your friends are using it.</p> <p>The list at left shows chat lobbies your friends are participating into. You can either <ul> <li>Right click to create a new chat lobby</li> <li>Double click a chat lobby to enter, chat, and show it to your friends</li> </ul> Note: For the chat lobbies to work properly, your computer needs be on time. So check your system clock! </p> + + Search Chat lobbies + + + + Search Name + + ChatMsgItem @@ -4254,6 +4262,10 @@ p, li { white-space: pre-wrap; } GB + + File Never Seen + + DetailsDialog @@ -6728,6 +6740,14 @@ p, li { white-space: pre-wrap; } Edit Channel + + Add Channel Admins + + + + Select Channel Admins + + GxsChannelPostItem @@ -9223,6 +9243,10 @@ Do you want to save message ? Hide + + Encrypted message + + NATStatus @@ -9757,6 +9781,14 @@ Right-click and select 'make friend' to be able to connect. This is a test. + + Unknown title + + + + Encrypted message + + OnlineToaster @@ -10390,10 +10422,6 @@ p, li { white-space: pre-wrap; } 0 - - /\ - - \/ @@ -10426,6 +10454,14 @@ p, li { white-space: pre-wrap; } Comment + + Vote Up + + + + Vote Down + + PostedListDialog @@ -10465,10 +10501,6 @@ p, li { white-space: pre-wrap; } This Year - - New Topic - - Submit Post @@ -10521,6 +10553,10 @@ p, li { white-space: pre-wrap; } Please create or choose a Signing Id before Voting + + Create New Topic + + PrintPreview @@ -13193,10 +13229,6 @@ Try to be patient! UserID - - File Never Seen - - Expand all