mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-11-28 11:30:40 -05:00
Added patch from Henry
- Changed some english strings Updated english translation. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5903 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2
parent
f127201ae5
commit
4acc7e5e34
8 changed files with 239 additions and 136 deletions
|
|
@ -1872,14 +1872,21 @@ void ForumsFillThread::run()
|
|||
|
||||
item->setText(COLUMN_THREAD_TITLE, ForumsDialog::titleFromInfo(msginfo));
|
||||
|
||||
text = QString::fromUtf8(rsPeers->getPeerName(msginfo.srcId).c_str());
|
||||
if (text.isEmpty())
|
||||
if (msginfo.msgflags & RS_DISTRIB_MISSING_MSG)
|
||||
{
|
||||
item->setText(COLUMN_THREAD_AUTHOR, tr("Anonymous"));
|
||||
item->setText(COLUMN_THREAD_AUTHOR, tr("Unknown"));
|
||||
}
|
||||
else
|
||||
{
|
||||
item->setText(COLUMN_THREAD_AUTHOR, text);
|
||||
text = QString::fromUtf8(rsPeers->getPeerName(msginfo.srcId).c_str());
|
||||
if (text.isEmpty())
|
||||
{
|
||||
item->setText(COLUMN_THREAD_AUTHOR, tr("Anonymous"));
|
||||
}
|
||||
else
|
||||
{
|
||||
item->setText(COLUMN_THREAD_AUTHOR, text);
|
||||
}
|
||||
}
|
||||
|
||||
if (msginfo.msgflags & RS_DISTRIB_AUTHEN_REQ)
|
||||
|
|
|
|||
|
|
@ -268,7 +268,7 @@
|
|||
</sizepolicy>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Edit Personal message</string>
|
||||
<string>Edit status message</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
|
|
@ -762,10 +762,10 @@
|
|||
<normaloff>:/images/message-news.png</normaloff>:/images/message-news.png</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Set your Personal Message</string>
|
||||
<string>Set your status message</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Edit your status Message</string>
|
||||
<string>Edit your status message</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionMessageHistory">
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ RsCollectionFile::RsCollectionFile(const std::vector<DirDetails>& file_infos)
|
|||
|
||||
static void showErrorBox(const QString& filename, const QString& error)
|
||||
{
|
||||
QMessageBox mb(QMessageBox::Warning, QObject::tr("Treatment of collection file has failed"), QObject::tr("The collection file %1 could not be opened.\nReported error is: %2").arg(filename).arg(error), QMessageBox::Ok);
|
||||
QMessageBox mb(QMessageBox::Warning, QObject::tr("Failed to process collection file"), QObject::tr("The collection file %1 could not be opened.\nReported error is: %2").arg(filename).arg(error), QMessageBox::Ok);
|
||||
mb.setWindowIcon(QIcon(":/images/rstray3.png"));
|
||||
mb.exec();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -782,7 +782,7 @@
|
|||
<item row="6" column="0" colspan="2">
|
||||
<widget class="QLabel" name="alreadyRegisteredLabel">
|
||||
<property name="text">
|
||||
<string>It seems your friend is already registered. Adding it might just set it's ip address.</string>
|
||||
<string>This peer is already on your friend list. Adding it might just set it's ip address.</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
|
|
|
|||
|
|
@ -35,10 +35,10 @@
|
|||
<enum>Qt::NoFocus</enum>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Edit Personal message</string>
|
||||
<string>Edit status message</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Edit Personal message</string>
|
||||
<string>Edit status message</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
</size>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Personal message</string>
|
||||
<string>Status message</string>
|
||||
</property>
|
||||
<property name="windowIcon">
|
||||
<iconset resource="../images.qrc">
|
||||
|
|
@ -59,7 +59,7 @@ border: 1px solid #CCCCCC;}
|
|||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Status message</string>
|
||||
<string>Message:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" name="txt_StatusMessage">
|
||||
|
|
@ -87,7 +87,7 @@ border: 1px solid #CCCCCC;}
|
|||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt; font-weight:600;">Personal message</span></p></body></html></string>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt; font-weight:600;">Status message</span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label_2">
|
||||
|
|
@ -104,7 +104,7 @@ p, li { white-space: pre-wrap; }
|
|||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#666666;">Enter your Status message</span></p></body></html></string>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#666666;">Enter your message</span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label">
|
||||
|
|
|
|||
|
|
@ -377,7 +377,7 @@ p, li { white-space: pre-wrap; }
|
|||
<item>
|
||||
<widget class="QLabel" name="label_6">
|
||||
<property name="text">
|
||||
<string>Max average tunnel request forwarded per second:</string>
|
||||
<string>Max. tunnel requests forwarded per second:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue