Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-13 16:39:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added translation for "[ ... Missing Message ... ]".

Browse Source 
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4934 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-02-13 20:40:36 +00:00
parent d26be6c05c
commit 8675eb9225
6 changed files with 99 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
retroshare-gui/src/gui/ForumsDialog.cpp
View File

@ -872,9 +872,6 @@ void ForumsDialog::insertThreads()
subscribeFlags = fi.subscribeFlags; subscribeFlags = fi.subscribeFlags;
ui.forumName->setText(QString::fromStdWString(fi.forumName)); ui.forumName->setText(QString::fromStdWString(fi.forumName));
ui.progressBarLayOut->setEnabled(true); ui.progressBarLayOut->setEnabled(true);
ui.progLayOutTxt->show(); ui.progLayOutTxt->show();
@ -1068,6 +1065,24 @@ void ForumsDialog::FillChildren(QTreeWidgetItem *Parent, QTreeWidgetItem *NewPar
} }
} }
QString ForumsDialog::titleFromInfo(ForumMsgInfo &msgInfo)
{
if (msgInfo.msgflags & RS_DISTRIB_MISSING_MSG) {
return QApplication::translate("ForumsDialog", "[ ... Missing Message ... ]");
}
return QString::fromStdWString(msgInfo.title);
}
QString ForumsDialog::messageFromInfo(ForumMsgInfo &msgInfo)
{
if (msgInfo.msgflags & RS_DISTRIB_MISSING_MSG) {
return QApplication::translate("ForumsDialog", "Placeholder for missing Message");
}
return QString::fromStdWString(msgInfo.msg);
}
void ForumsDialog::insertPost() void ForumsDialog::insertPost()
{ {
if ((mCurrForumId == "") || (mCurrThreadId == "")) if ((mCurrForumId == "") || (mCurrThreadId == ""))
@ -1124,10 +1139,10 @@ void ForumsDialog::insertPost()
} }
} }
QString extraTxt = RsHtml::formatText(QString::fromStdWString(msg.msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS); QString extraTxt = RsHtml::formatText(messageFromInfo(msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS);
ui.postText->setHtml(extraTxt); ui.postText->setHtml(extraTxt);
ui.threadTitle->setText(QString::fromStdWString(msg.title)); ui.threadTitle->setText(titleFromInfo(msg));
} }
void ForumsDialog::previousMessage () void ForumsDialog::previousMessage ()
@ -1814,7 +1829,7 @@ void ForumsFillThread::run()
item->setText(COLUMN_THREAD_DATE, text); item->setText(COLUMN_THREAD_DATE, text);
} }
item->setText(COLUMN_THREAD_TITLE, QString::fromStdWString(tit->title)); item->setText(COLUMN_THREAD_TITLE, ForumsDialog::titleFromInfo(msginfo));
text = QString::fromUtf8(rsPeers->getPeerName(msginfo.srcId).c_str()); text = QString::fromUtf8(rsPeers->getPeerName(msginfo.srcId).c_str());
if (text.isEmpty()) if (text.isEmpty())
@ -1928,7 +1943,7 @@ void ForumsFillThread::run()
child->setText(COLUMN_THREAD_DATE, text); child->setText(COLUMN_THREAD_DATE, text);
} }
child->setText(COLUMN_THREAD_TITLE, QString::fromStdWString(mit->title)); child->setText(COLUMN_THREAD_TITLE, ForumsDialog::titleFromInfo(msginfo));
text = QString::fromUtf8(rsPeers->getPeerName(msginfo.srcId).c_str()); text = QString::fromUtf8(rsPeers->getPeerName(msginfo.srcId).c_str());
if (text.isEmpty()) if (text.isEmpty())
@ -1954,7 +1969,7 @@ void ForumsFillThread::run()
if (filterColumn == COLUMN_THREAD_CONTENT) { if (filterColumn == COLUMN_THREAD_CONTENT) {
// need content for filter // need content for filter
QTextDocument doc; QTextDocument doc;
doc.setHtml(QString::fromStdWString(msginfo.msg)); doc.setHtml(ForumsDialog::messageFromInfo(msginfo));
child->setText(COLUMN_THREAD_CONTENT, doc.toPlainText().replace(QString("\n"), QString(" "))); child->setText(COLUMN_THREAD_CONTENT, doc.toPlainText().replace(QString("\n"), QString(" ")));
} }

4
retroshare-gui/src/gui/ForumsDialog.h
View File

@ -30,6 +30,7 @@
class ForumInfo; class ForumInfo;
class ForumsFillThread; class ForumsFillThread;
class ForumMsgInfo;
class ForumsDialog : public RsAutoUpdatePage class ForumsDialog : public RsAutoUpdatePage
{ {
@ -44,6 +45,9 @@ public:
/* overloaded from RsAuthUpdatePage */ /* overloaded from RsAuthUpdatePage */
virtual void updateDisplay(); virtual void updateDisplay();
static QString titleFromInfo(ForumMsgInfo &msgInfo);
static QString messageFromInfo(ForumMsgInfo &msgInfo);
protected: protected:
bool eventFilter(QObject *obj, QEvent *ev); bool eventFilter(QObject *obj, QEvent *ev);

2
retroshare-gui/src/gui/RetroShareLink.cpp
View File

@ -346,7 +346,7 @@ bool RetroShareLink::createForum(const std::string& id, const std::string& msgId
} else { } else {
ForumMsgInfo mi; ForumMsgInfo mi;
if (rsForums->getForumMessage(id, msgId, mi)) { if (rsForums->getForumMessage(id, msgId, mi)) {
_name = QString::fromStdWString(mi.title); _name = ForumsDialog::titleFromInfo(mi);
} }
} }
} }

11
retroshare-gui/src/gui/feeds/ForumMsgItem.cpp
View File

@ -34,6 +34,7 @@
#include "gui/chat/HandleRichText.h" #include "gui/chat/HandleRichText.h"
#include "gui/common/AvatarDefs.h" #include "gui/common/AvatarDefs.h"
#include "gui/notifyqt.h" #include "gui/notifyqt.h"
#include "gui/ForumsDialog.h"
//#include "gui/settings/rsharesettings.h" //#include "gui/settings/rsharesettings.h"
/**** /****
@ -154,8 +155,8 @@ void ForumMsgItem::updateItemStatic()
} }
prevSubLabel->setText(link.toHtml()); prevSubLabel->setText(link.toHtml());
prevMsgLabel->setText(RsHtml::formatText(QString::fromStdWString(msg.msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS)); prevMsgLabel->setText(RsHtml::formatText(ForumsDialog::messageFromInfo(msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS));
QDateTime qtime; QDateTime qtime;
qtime.setTime_t(msg.ts); qtime.setTime_t(msg.ts);
QString timestamp = qtime.toString("dd.MMMM yyyy hh:mm"); QString timestamp = qtime.toString("dd.MMMM yyyy hh:mm");
@ -179,7 +180,7 @@ void ForumMsgItem::updateItemStatic()
} }
nextSubLabel->setText(link.toHtml()); nextSubLabel->setText(link.toHtml());
nextMsgLabel->setText(RsHtml::formatText(QString::fromStdWString(msg.msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS)); nextMsgLabel->setText(RsHtml::formatText(ForumsDialog::messageFromInfo(msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS));
QDateTime qtime; QDateTime qtime;
qtime.setTime_t(msg.ts); qtime.setTime_t(msg.ts);
@ -196,7 +197,7 @@ void ForumMsgItem::updateItemStatic()
RetroShareLink linkParent; RetroShareLink linkParent;
linkParent.createForum(msgParent.forumId, msgParent.msgId); linkParent.createForum(msgParent.forumId, msgParent.msgId);
prevSubLabel->setText(linkParent.toHtml()); prevSubLabel->setText(linkParent.toHtml());
prevMsgLabel->setText(RsHtml::formatText(QString::fromStdWString(msgParent.msg), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS)); prevMsgLabel->setText(RsHtml::formatText(ForumsDialog::messageFromInfo(msgParent), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS));
if (rsPeers->getPeerName(msgParent.srcId) !="") if (rsPeers->getPeerName(msgParent.srcId) !="")
{ {
@ -217,7 +218,7 @@ void ForumMsgItem::updateItemStatic()
} }
/* header stuff */ /* header stuff */
subjectLabel->setText(QString::fromStdWString(msg.title)); subjectLabel->setText(ForumsDialog::titleFromInfo(msg));
//srcLabel->setText(QString::fromStdString(msg.srcId)); //srcLabel->setText(QString::fromStdString(msg.srcId));
} }

BIN
retroshare-gui/src/lang/retroshare_de.qm
View File

Binary file not shown.

88
retroshare-gui/src/lang/retroshare_de.ts
View File

@ -691,7 +691,7 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>CertificatePage</name> <name>CertificatePage</name>
<message> <message>
<location filename="../gui/connect/ConnectFriendWizard.cpp" line="+736"/> <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+737"/>
<source>Certificate files</source> <source>Certificate files</source>
<translation>Zertifikat-Dateien</translation> <translation>Zertifikat-Dateien</translation>
</message> </message>
@ -790,7 +790,7 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="+26"/> <location line="+26"/>
<location filename="../gui/feeds/ChanMsgItem.cpp" line="+324"/> <location filename="../gui/feeds/ChanMsgItem.cpp" line="+322"/>
<source>Expand</source> <source>Expand</source>
<translation>Erweitern</translation> <translation>Erweitern</translation>
</message> </message>
@ -825,7 +825,7 @@ p, li { white-space: pre-wrap; }
<translation>Kopiere RetroShare Link</translation> <translation>Kopiere RetroShare Link</translation>
</message> </message>
<message> <message>
<location filename="../gui/feeds/ChanMsgItem.cpp" line="-217"/> <location filename="../gui/feeds/ChanMsgItem.cpp" line="-215"/>
<source>Channel Feed</source> <source>Channel Feed</source>
<translation>Kanal</translation> <translation>Kanal</translation>
</message> </message>
@ -1563,7 +1563,7 @@ p, li { white-space: pre-wrap; }
<translation>Schriftart auf den Standard setzen</translation> <translation>Schriftart auf den Standard setzen</translation>
</message> </message>
<message> <message>
<location filename="../gui/chat/ChatWidget.cpp" line="+344"/> <location filename="../gui/chat/ChatWidget.cpp" line="+345"/>
<source>Paste RetroShare Link</source> <source>Paste RetroShare Link</source>
<translation>RetroShare Link einfügen</translation> <translation>RetroShare Link einfügen</translation>
</message> </message>
@ -1573,7 +1573,7 @@ p, li { white-space: pre-wrap; }
<translation>tippt...</translation> <translation>tippt...</translation>
</message> </message>
<message> <message>
<location line="+129"/> <location line="+127"/>
<source>Do you really want to physically delete the history?</source> <source>Do you really want to physically delete the history?</source>
<translation>Möchtest du wirklich den Nachrichtenverlauf physisch löschen?</translation> <translation>Möchtest du wirklich den Nachrichtenverlauf physisch löschen?</translation>
</message> </message>
@ -1953,7 +1953,7 @@ und meinen GPG Schlüssel nicht unterzeichnet</translation>
<context> <context>
<name>ConnectFriendWizard</name> <name>ConnectFriendWizard</name>
<message> <message>
<location filename="../gui/connect/ConnectFriendWizard.cpp" line="-881"/> <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-882"/>
<source>Certificate Load Failed</source> <source>Certificate Load Failed</source>
<translation>Das Zertifikat konnte nicht geladen werden</translation> <translation>Das Zertifikat konnte nicht geladen werden</translation>
</message> </message>
@ -3674,7 +3674,7 @@ Das ist nützlich, wenn Du eine externe Festplatte freigibst und die Datei nicht
<context> <context>
<name>EmailPage</name> <name>EmailPage</name>
<message> <message>
<location filename="../gui/connect/ConnectFriendWizard.cpp" line="+1140"/> <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+1141"/>
<source>Invite Friends by Email</source> <source>Invite Friends by Email</source>
<translation>Lade Freunde per Email ein</translation> <translation>Lade Freunde per Email ein</translation>
</message> </message>
@ -4264,7 +4264,7 @@ p, li { white-space: pre-wrap; }
<translation>Unterzeichnen</translation> <translation>Unterzeichnen</translation>
</message> </message>
<message> <message>
<location filename="../gui/feeds/ForumMsgItem.cpp" line="+88"/> <location filename="../gui/feeds/ForumMsgItem.cpp" line="+91"/>
<source>Forum Post</source> <source>Forum Post</source>
<translation>Beitrag</translation> <translation>Beitrag</translation>
</message> </message>
@ -4286,7 +4286,7 @@ p, li { white-space: pre-wrap; }
<translation>Als Antwort auf</translation> <translation>Als Antwort auf</translation>
</message> </message>
<message> <message>
<location line="+178"/> <location line="+180"/>
<source>Please give a Text Message</source> <source>Please give a Text Message</source>
<translation>Bitte Nachricht eingeben</translation> <translation>Bitte Nachricht eingeben</translation>
</message> </message>
@ -4426,7 +4426,17 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+906"/> <location line="+554"/>
<source>[ ... Missing Message ... ]</source>
<translation>[ ... Fehlende Nachricht ... ]</translation>
</message>
<message>
<location line="+9"/>
<source>Placeholder for missing Message</source>
<translation>Platzhalter für fehlende Nachricht</translation>
</message>
<message>
<location line="+358"/>
<location line="+81"/> <location line="+81"/>
<source>RetroShare</source> <source>RetroShare</source>
<translation></translation> <translation></translation>
@ -4442,7 +4452,7 @@ p, li { white-space: pre-wrap; }
<translation>Du kannst einem anonymen Autor nicht antworten</translation> <translation>Du kannst einem anonymen Autor nicht antworten</translation>
</message> </message>
<message> <message>
<location line="-1311"/> <location line="-1326"/>
<source>Your Forums</source> <source>Your Forums</source>
<translation>Deine Foren</translation> <translation>Deine Foren</translation>
</message> </message>
@ -4603,7 +4613,7 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location filename="../gui/ForumsDialog.cpp" line="+151"/> <location filename="../gui/ForumsDialog.cpp" line="+151"/>
<location line="+1081"/> <location line="+1096"/>
<source>Start New Thread</source> <source>Start New Thread</source>
<translation>Erstelle neues Thema</translation> <translation>Erstelle neues Thema</translation>
</message> </message>
@ -4631,7 +4641,7 @@ p, li { white-space: pre-wrap; }
<translation>Inhalt</translation> <translation>Inhalt</translation>
</message> </message>
<message> <message>
<location filename="../gui/ForumsDialog.cpp" line="-1068"/> <location filename="../gui/ForumsDialog.cpp" line="-1083"/>
<location line="+3"/> <location line="+3"/>
<source>Mark as read</source> <source>Mark as read</source>
<translation>Als gelesen markieren</translation> <translation>Als gelesen markieren</translation>
@ -4652,7 +4662,7 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>ForumsFillThread</name> <name>ForumsFillThread</name>
<message> <message>
<location line="+1453"/> <location line="+1468"/>
<location line="+114"/> <location line="+114"/>
<source>Anonymous</source> <source>Anonymous</source>
<translation>Anonym</translation> <translation>Anonym</translation>
@ -5203,7 +5213,7 @@ p, li { white-space: pre-wrap; }
<message> <message>
<location line="+5"/> <location line="+5"/>
<source>Reset font to default</source> <source>Reset font to default</source>
<translation type="unfinished"></translation> <translation type="unfinished">Schriftart auf den Standard setzen</translation>
</message> </message>
<message> <message>
<source>Hide Offline Friends</source> <source>Hide Offline Friends</source>
@ -5269,7 +5279,7 @@ p, li { white-space: pre-wrap; }
<translation>Neuigkeiten</translation> <translation>Neuigkeiten</translation>
</message> </message>
<message> <message>
<location line="+37"/> <location line="+38"/>
<source>Welcome to RetroShare&apos;s group chat.</source> <source>Welcome to RetroShare&apos;s group chat.</source>
<translation>Willkommen bei RetroShare&apos;s Gruppenchat.</translation> <translation>Willkommen bei RetroShare&apos;s Gruppenchat.</translation>
</message> </message>
@ -5399,7 +5409,7 @@ p, li { white-space: pre-wrap; }
<translation>Neuer Gruppenchat</translation> <translation>Neuer Gruppenchat</translation>
</message> </message>
<message> <message>
<location line="+230"/> <location line="+234"/>
<source>Do you really want to physically delete the history?</source> <source>Do you really want to physically delete the history?</source>
<translation>Möchtest du wirklich den Nachrichtenverlauf physisch löschen?</translation> <translation>Möchtest du wirklich den Nachrichtenverlauf physisch löschen?</translation>
</message> </message>
@ -5752,7 +5762,7 @@ p, li { white-space: pre-wrap; }
<location line="-44"/> <location line="-44"/>
<location line="+45"/> <location line="+45"/>
<source>Generate new Location</source> <source>Generate new Location</source>
<translation>Erstelle neues Ort</translation> <translation>Erstelle neuen Ort</translation>
</message> </message>
<message> <message>
<location line="-44"/> <location line="-44"/>
@ -9263,7 +9273,7 @@ p, li { white-space: pre-wrap; }
<translation>Bitte geben Sie das Passwort ein um folgenden GPG Schlüssel freizuschalten:</translation> <translation>Bitte geben Sie das Passwort ein um folgenden GPG Schlüssel freizuschalten:</translation>
</message> </message>
<message> <message>
<location line="+139"/> <location line="+144"/>
<source>Examining shared files...</source> <source>Examining shared files...</source>
<translation>Prüfe freigegebene Dateien...</translation> <translation>Prüfe freigegebene Dateien...</translation>
</message> </message>
@ -10605,7 +10615,7 @@ Lockdatei:
<translation type="obsolete">Der Empfänger der Nachricht ist unbekannt.</translation> <translation type="obsolete">Der Empfänger der Nachricht ist unbekannt.</translation>
</message> </message>
<message> <message>
<location filename="../gui/RetroShareLink.cpp" line="+514"/> <location filename="../gui/RetroShareLink.cpp" line="+518"/>
<source>Click to add this RetroShare cert to your GPG keyring <source>Click to add this RetroShare cert to your GPG keyring
and open the Make Friend Wizard. and open the Make Friend Wizard.
</source> </source>
@ -10614,7 +10624,7 @@ und den Assistent zum Hinzufügen von Freunden zu starten.
</translation> </translation>
</message> </message>
<message> <message>
<location line="+264"/> <location line="+266"/>
<source>Add file</source> <source>Add file</source>
<translation>Datei hinzufügen</translation> <translation>Datei hinzufügen</translation>
</message> </message>
@ -10649,7 +10659,7 @@ und den Assistent zum Hinzufügen von Freunden zu starten.
<translation>Bestätigung</translation> <translation>Bestätigung</translation>
</message> </message>
<message> <message>
<location line="+328"/> <location line="+334"/>
<source>%1 of %2 RetroShare links processed.</source> <source>%1 of %2 RetroShare links processed.</source>
<translation>%1 von %2 RetroShare Links verarbeitet.</translation> <translation>%1 von %2 RetroShare Links verarbeitet.</translation>
</message> </message>
@ -12131,7 +12141,39 @@ Es hilft auch, wenn Sie sich hinter einer Firewall/VPN befinden.</translation>
<translation>Erlaube RetroShare folgende Webseiten nach Ihrer IP zu fragen:</translation> <translation>Erlaube RetroShare folgende Webseiten nach Ihrer IP zu fragen:</translation>
</message> </message>
<message> <message>
<location line="-106"/> <location line="+18"/>
<source>Turtle router</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Warning&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt; &lt;/span&gt;This tab contains hard-core parameters which are unlikely to need modification. Dont change them unless you really know what you&apos;re doing. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+15"/>
<source>Max average tunnel request forwarded per second:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
<source>This value controls how many tunnel request your peer can forward per second.
If you have a large internet bandwidth, you may raise this up to 30-40, to allow
statisticlly longuer tunnels to pass. Be very careful though, since this generates
many small packets that can significantly slow down your own file transfer.
The default value is 20.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-152"/>
<source>Dynamic DNS</source> <source>Dynamic DNS</source>
<translation>Dynamisches DNS</translation> <translation>Dynamisches DNS</translation>
</message> </message>