Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-23 14:41:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed some typos (patch from Henry)

Browse source 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7770 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-12-17 18:02:52 +00:00
parent dd48f5f027
commit a3b844da6b
10 changed files with 1193 additions and 718 deletions
Download patch file Download diff file Expand all files Collapse all files

4
retroshare-gui/src/gui/PluginManager.cpp
View file

@ -283,7 +283,7 @@ PluginManager::removePlugin(QString pluginName)
QFile fl(fn);
if (!fl.remove())
{
QString em = tr("Error: failed to revove file %1"
QString em = tr("Error: failed to remove file %1"
"(uninstalling plugin '%2')")
.arg(fn).arg(pluginName);
emit errorAppeared( em);
@ -335,7 +335,7 @@ PluginManager::installPlugin(QString fileName)
} //
else
{
QString em = tr("Error: can't copy %1 as %2")
QString em = tr("Error: can't copy %1 to %2")
.arg(fileName, newFileName) ;
emit errorAppeared( em );
}

12
retroshare-gui/src/gui/chat/ChatWidget.cpp
View file

@ -103,7 +103,7 @@ ChatWidget::ChatWidget(QWidget *parent) :
connect(ui->actionSearchWithoutLimit, SIGNAL(triggered()), this, SLOT(toogle_SeachWithoutLimit()));
connect(ui->searchButton, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuSearchButton(QPoint)));
ui->markButton->setToolTip(tr("<b>Mark this selected text</b><br><i>Ctr+M</i>"));
ui->markButton->setToolTip(tr("<b>Mark this selected text</b><br><i>Ctrl+M</i>"));
connect(ui->sendButton, SIGNAL(clicked()), this, SLOT(sendChat()));
connect(ui->addFileButton, SIGNAL(clicked()), this , SLOT(addExtraFile()));
@ -870,7 +870,7 @@ void ChatWidget::updateLenOfChatTextEdit()
}
ui->sendButton->setEnabled(!msgToLarge);
text = tr("%1This message counts %2 characters.").arg(msgToLarge ? tr("Warning: ") : "").arg(msg.length());
text = tr("%1This message consists of %2 characters.").arg(msgToLarge ? tr("Warning: ") : "").arg(msg.length());
ui->sendButton->setToolTip(text);
ui->chatTextEdit->setToolTip(msgToLarge?text:"");
}
@ -1060,10 +1060,10 @@ bool ChatWidget::findText(const QString& qsStringToFind, bool bBackWard, bool bF
if (bFound)
{
qpBackGround.setColor(QPalette::Base,QColor(0,200,0));
ui->leSearch->setToolTip(QString::number(uiFoundCount)+tr(" founded items."));
ui->leSearch->setToolTip(QString::number(uiFoundCount)+tr(" items found."));
} else {
qpBackGround.setColor(QPalette::Base,QColor(200,0,0));
ui->leSearch->setToolTip(tr("No items founded."));
ui->leSearch->setToolTip(tr("No items found."));
}
ui->leSearch->setPalette(qpBackGround);
@ -1099,7 +1099,7 @@ void ChatWidget::on_markButton_clicked(bool bValue)
if (ui->textBrowser->textCursor().selectedText().length()>0)
{
qtcMark=ui->textBrowser->textCursor();
ui->markButton->setToolTip(tr("<b>Return to marked text</b><br><i>Ctr+M</i>"));
ui->markButton->setToolTip(tr("<b>Return to marked text</b><br><i>Ctrl+M</i>"));
} else { bValue=false;}
} else {
@ -1107,7 +1107,7 @@ void ChatWidget::on_markButton_clicked(bool bValue)
{
ui->textBrowser->setTextCursor(qtcMark);
qtcMark=QTextCursor(ui->textBrowser->document());
ui->markButton->setToolTip(tr("<b>Mark this selected text</b><br><i>Ctr+M</i>"));
ui->markButton->setToolTip(tr("<b>Mark this selected text</b><br><i>Ctrl+M</i>"));
}
}

2
retroshare-gui/src/gui/chat/ChatWidget.ui
View file

@ -816,7 +816,7 @@ border-image: url(:/images/closepressed.png)
<string>Don't stop to color after X items found (need more CPU)</string>
</property>
<property name="toolTip">
<string>WARNING: Could take long time on big history.</string>
<string>WARNING: Could take a long time on big history.</string>
</property>
</action>
<action name="actionChooseColor">

2
retroshare-gui/src/gui/common/RsCollectionDialog.cpp
View file

@ -594,7 +594,7 @@ void RsCollectionDialog::changeFileName()
QMessageBox mb;
mb.setText(tr("Save Collection File."));
mb.setInformativeText(tr("File already exist.")+"\n"+tr("What do you want to do?"));
mb.setInformativeText(tr("File already exists.")+"\n"+tr("What do you want to do?"));
QAbstractButton *btnOwerWrite = mb.addButton(tr("Overwrite"), QMessageBox::YesRole);
QAbstractButton *btnMerge = mb.addButton(tr("Merge"), QMessageBox::NoRole);
QAbstractButton *btnCancel = mb.addButton(tr("Cancel"), QMessageBox::ResetRole);

2
retroshare-gui/src/gui/common/RsCollectionDialog.ui
View file

@ -147,7 +147,7 @@
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Change the file were collection will be saved.&lt;/p&gt;&lt;p&gt;If you select an existing file, you could merge it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Change the file where collection will be saved.&lt;/p&gt;&lt;p&gt;If you select an existing file, you could merge it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>...</string>

2
retroshare-gui/src/gui/common/RsCollectionFile.cpp
View file

@ -374,7 +374,7 @@ bool RsCollectionFile::openNewColl(QWidget *parent)
QMessageBox mb;
mb.setText(tr("Save Collection File."));
mb.setInformativeText(tr("File already exist.")+"\n"+tr("What do you want to do?"));
mb.setInformativeText(tr("File already exists.")+"\n"+tr("What do you want to do?"));
QAbstractButton *btnOwerWrite = mb.addButton(tr("Overwrite"), QMessageBox::YesRole);
QAbstractButton *btnMerge = mb.addButton(tr("Merge"), QMessageBox::NoRole);
QAbstractButton *btnCancel = mb.addButton(tr("Cancel"), QMessageBox::ResetRole);

2
retroshare-gui/src/gui/settings/ChatPage.ui
View file

@ -385,7 +385,7 @@
<item>
<widget class="QLabel" name="lSearch_MaxLimitColor">
<property name="text">
<string>Number of found text coloring</string>
<string>Maximum count for coloring matching text</string>
</property>
</widget>
</item>

1514
retroshare-gui/src/lang/retroshare_en.ts
View file

File diff suppressed because it is too large Load diff