Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix typos in strings (patch from Henry)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8335 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
electron128 2015-06-01 14:20:26 +00:00
parent da722292f6
commit 875df4e2c2
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -548,13 +548,13 @@ void IdDialog::requestIdDetails()
static QString getHumanReadableDuration(uint32_t seconds)
{
if(seconds < 60)
return QString::number(seconds) + QObject::tr(" seconds ago") ;
return QString(tr("%1 seconds ago")).arg(seconds) ;
else if(seconds < 3600)
return QString::number(seconds/60) + QObject::tr(" minute(s) ago") ;
return QString(tr("%1 minute(s) ago")).arg(seconds/60) ;
else if(seconds < 24*3600)
return QString::number(seconds/3600) + QObject::tr(" hour(s) ago") ;
return QString(tr("%1 hour(s) ago")).arg(seconds/3600) ;
else
return QString::number(seconds/86400) + QObject::tr(" day(s) ago") ;
return QString(tr("%1 day(s) ago")).arg(seconds/86400) ;
}
void IdDialog::insertIdDetails(uint32_t token)

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

@ -304,7 +304,7 @@ MessagesDialog::MessagesDialog(QWidget *parent)
the <img width=\"16\" src=\":/images/stock_signature_ok.png\"/> button \
in the message composer window. Distant messages stay into your Outbox until an acknowledgement of receipt has been received.</p>\
<p>Generally, you may use messages to recommend files to your friends by pasting file links, \
or recommend friend nodes to other friends nodes, in order to strenghten your network, or send feedback \
or recommend friend nodes to other friend nodes, in order to strenghten your network, or send feedback \
to a channel's owner.</p> \
") ;

2
retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
View File

@ -551,7 +551,7 @@ void ChatLobbyDialog::distantChatParticipant()
default:
error_str = tr("Unknown error.") ;
}
QMessageBox::warning(NULL,tr("Cannot start distant chat"),tr("Distant cannot be initiated: ")+error_str
QMessageBox::warning(NULL,tr("Cannot start distant chat"),tr("Distant chat cannot be initiated:")+" "+error_str
+QString::number(error_code)) ;
}
}

6
retroshare-gui/src/gui/common/GroupFlagsWidget.cpp
View File

@ -159,16 +159,16 @@ QString GroupFlagsWidget::groupInfoString(FileStorageFlags flags, const QList<QS
res += tr("All friend nodes can browse this directory") + "\n" ;
else if(flags & DIR_FLAGS_BROWSABLE_GROUPS)
if(!groupNames.empty())
res += tr("Only friends nodes in groups %1 can browse this directory").arg(groups_string) + "\n" ;
res += tr("Only friend nodes in groups %1 can browse this directory").arg(groups_string) + "\n" ;
else
res += tr("No one can browse this directory") + "\n" ;
else
res += tr("No one can browse this directory") + "\n" ;
if(flags & DIR_FLAGS_NETWORK_WIDE_OTHERS)
res += tr("All friends nodes can relay anonymous tunnels to this directory") ;
res += tr("All friend nodes can relay anonymous tunnels to this directory") ;
else if(flags & DIR_FLAGS_NETWORK_WIDE_GROUPS)
res += tr("Only friends nodes in groups ") + groups_string + tr(" can relay anonymous tunnels to this directory") ;
res += tr("Only friend nodes in groups ") + groups_string + tr(" can relay anonymous tunnels to this directory") ;
else
res += tr("No one can anonymously access this directory.") ;

2
retroshare-gui/src/gui/connect/PGPKeyDialog.ui
View File

@ -147,7 +147,7 @@
</font>
</property>
<property name="text">
<string>This key has signed my own PGP key</string>
<string>This key has signed your own PGP key</string>
</property>
</widget>
</item>

2
retroshare-gui/src/gui/msgs/MessageComposer.cpp
View File

@ -1535,7 +1535,7 @@ QString MessageComposer::getRecipientEmailAddress(const RsPeerId& id,const RsPee
{
QString location_name = detail.location.empty()?tr("[Missing]"):QString::fromUtf8(detail.location.c_str()) ;
return (QString("%1 (")+tr("Friend node & location:")+" %2, %3)").arg(QString::fromUtf8(detail.name.c_str()))
return (QString("%1 (")+tr("Node name & id:")+" %2, %3)").arg(QString::fromUtf8(detail.name.c_str()))
.arg(location_name)
.arg(QString::fromUtf8(detail.id.toStdString().c_str())) ;
}