Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-12 11:02:30 -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

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);