From 875df4e2c2377bcc9c7c2b166967fc2b9c0610cd Mon Sep 17 00:00:00 2001
From: electron128 <unknown@unknown.com>
Date: Mon, 1 Jun 2015 14:20:26 +0000
Subject: [PATCH] fix typos in strings (patch from Henry)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8335 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/Identity/IdDialog.cpp       | 8 ++++----
 retroshare-gui/src/gui/MessagesDialog.cpp          | 2 +-
 retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp    | 2 +-
 retroshare-gui/src/gui/common/GroupFlagsWidget.cpp | 6 +++---
 retroshare-gui/src/gui/connect/PGPKeyDialog.ui     | 2 +-
 retroshare-gui/src/gui/msgs/MessageComposer.cpp    | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp
index c5da806b0..03348bda5 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp
@@ -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)
diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp
index 815be38a0..f6f2fbf0b 100644
--- a/retroshare-gui/src/gui/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/MessagesDialog.cpp
@@ -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>                   \
  ") ;
 
diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
index 694c8c691..7360f4b64 100644
--- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
+++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
@@ -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)) ;
     }
 }
diff --git a/retroshare-gui/src/gui/common/GroupFlagsWidget.cpp b/retroshare-gui/src/gui/common/GroupFlagsWidget.cpp
index 90d21e81a..49e4cd3e2 100644
--- a/retroshare-gui/src/gui/common/GroupFlagsWidget.cpp
+++ b/retroshare-gui/src/gui/common/GroupFlagsWidget.cpp
@@ -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.") ;
 
diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
index c05e63a63..1e498c0e3 100644
--- a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
+++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
@@ -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>
diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
index c7fb26fa1..6bb6400db 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
@@ -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())) ;
 }