Fix some source code for better translation, added some new words to translate and removed some words not to be translated.

Fixed german translation.
Please review the other languages.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4892 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/gui/HelpDialog.ui

@@ -557,7 +557,7 @@ p, li { white-space: pre-wrap; }
 <p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">RetroShare provides filesharing, chat, messages and channels</span></p>
 <p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p>
 <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; font-weight:600;">Usefull External Links to more information:</span></p>
-<ul style="-qt-list-indent: 1;"><li style=" font-size:8pt;" align="justify" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">Retroshare Webpage</span></a></li>
+<ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:8pt;" align="justify" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net"><span style=" text-decoration: underline; color:#0000ff;">Retroshare Webpage</span></a></li>
 <li style=" font-size:8pt;" align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net/wiki/index.php/Main_Page"><span style=" text-decoration: underline; color:#0000ff;">Retroshare Wiki</span></a></li>
 <li style=" font-size:8pt; text-decoration: underline; color:#0000ff;" align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://retroshare.sourceforge.net/forum/">RetroShare's Forum</a></li>
 <li style=" font-size:8pt;" align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://sourceforge.net/projects/retroshare/"><span style=" text-decoration: underline; color:#0000ff;">Retroshare Project Page</span></a></li>
@@ -602,13 +602,6 @@ p, li { white-space: pre-wrap; }
          <property name="readOnly">
           <bool>true</bool>
          </property>
-         <property name="html">
-          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Arial'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
          <property name="acceptRichText">
           <bool>false</bool>
          </property>
@@ -641,13 +634,6 @@ p, li { white-space: pre-wrap; }
          <property name="readOnly">
           <bool>true</bool>
          </property>
-         <property name="html">
-          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Arial'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
          <property name="acceptRichText">
           <bool>false</bool>
          </property>

retroshare-gui/src/gui/StartDialog.cpp

@@ -163,13 +163,13 @@ void StartDialog::loadCertificates()
 										tr("Another RetroShare using the same profile is "
 											"already running on your system. Please close "
                                                                                         "that instance first, or choose another profile\n"
-                                                                                        "lock file:\n ")+ QString::fromStdString(lockFile));
+                                                                                        "lock file:\n")+ QString::fromStdString(lockFile));
 				break;
 		case 2:	QMessageBox::warning(	this,
 										tr("Multiple instances"),
-										tr("An unexpected error occurred when Retroshare"
+										tr("An unexpected error occurred when Retroshare "
                                                                                         "tried to acquire the single instance lock\n"
-                                                                                        "lock file:\n ")+ QString::fromStdString(lockFile));
+                                                                                        "lock file:\n")+ QString::fromStdString(lockFile));
 				break;
 		case 3: QMessageBox::warning(	this,
 										tr("Login Failure"),

retroshare-gui/src/gui/TurtleRouterDialog.cpp

@@ -42,7 +42,6 @@ TurtleRouterDialog::TurtleRouterDialog(QWidget *parent)
 
 TurtleRouterDialog::~TurtleRouterDialog()
 {
-
     // save settings
     processSettings(false);
 }
@@ -133,10 +132,10 @@ void TurtleRouterDialog::updateTunnelRequests(	const std::vector<std::vector<std
 
 		QTreeWidgetItem *parent = findParentHashItem(hash) ;
 
-		if(parent->text(0).left(14) == QString("Unknown hashes"))
+		if(parent->text(0).left(14) == tr("Unknown hashes"))
 			unknown_hash_found = true ;
 
-		QString str =  "Tunnel id: " + QString::fromUtf8(tunnels_info[i][0].c_str()) + "\t [" + QString::fromUtf8(tunnels_info[i][2].c_str()) + "] --> [" + QString::fromUtf8(tunnels_info[i][1].c_str()) + "]\t\t last transfer: " + QString::fromStdString(tunnels_info[i][4]) + "\t Speed: " + QString::fromStdString(tunnels_info[i][5]) ;
+		QString str = tr("Tunnel id") + ": " + QString::fromUtf8(tunnels_info[i][0].c_str()) + "\t [" + QString::fromUtf8(tunnels_info[i][2].c_str()) + "] --> [" + QString::fromUtf8(tunnels_info[i][1].c_str()) + "]\t\t " + tr("last transfer") + ": " + QString::fromStdString(tunnels_info[i][4]) + "\t " + tr("Speed") + ": " + QString::fromStdString(tunnels_info[i][5]) ;
 		stl.clear() ;
 		stl.push_back(str) ;
 
@@ -145,7 +144,7 @@ void TurtleRouterDialog::updateTunnelRequests(	const std::vector<std::vector<std
 
 	for(uint i=0;i<search_reqs_info.size();++i)
 	{
-		QString str = "Request id: " + QString::number(search_reqs_info[i].request_id,16) + "\t from [" + getPeerName(search_reqs_info[i].source_peer_id) + "]\t " + QString::number(search_reqs_info[i].age)+" secs ago" ;
+		QString str = tr("Request id: %1\t from [%2]\t %3 secs ago").arg(search_reqs_info[i].request_id,0,16).arg(getPeerName(search_reqs_info[i].source_peer_id)).arg(search_reqs_info[i].age);
 
 		stl.clear() ;
 		stl.push_back(str) ;
@@ -157,7 +156,7 @@ void TurtleRouterDialog::updateTunnelRequests(	const std::vector<std::vector<std
 	for(uint i=0;i<tunnel_reqs_info.size();++i)
 		if(i+MAX_TUNNEL_REQUESTS_DISPLAY >= tunnel_reqs_info.size() || i < MAX_TUNNEL_REQUESTS_DISPLAY)
 		{
-			QString str = "Request id: " + QString::number(tunnel_reqs_info[i].request_id,16) + "\t from [" + getPeerName(tunnel_reqs_info[i].source_peer_id) + "]\t " + QString::number(tunnel_reqs_info[i].age)+" secs ago" ;
+			QString str = tr("Request id: %1\t from [%2]\t %3 secs ago").arg(tunnel_reqs_info[i].request_id,0,16).arg(getPeerName(tunnel_reqs_info[i].source_peer_id)).arg(tunnel_reqs_info[i].age);
 
 			stl.clear() ;
 			stl.push_back(str) ;
@@ -175,14 +174,14 @@ void TurtleRouterDialog::updateTunnelRequests(	const std::vector<std::vector<std
 	top_level_t_requests->setText(0, tr("Tunnel requests") + "("+QString::number(tunnel_reqs_info.size()) + ")") ;
 
 	QTreeWidgetItem *unknown_hashs_item = findParentHashItem("") ;
-	unknown_hashs_item->setText(0,QString("Unknown hashes (") + QString::number(unknown_hashs_item->childCount())+QString(")")) ;
+	unknown_hashs_item->setText(0,tr("Unknown hashes") + " (" + QString::number(unknown_hashs_item->childCount())+QString(")")) ;
 
 	// Ok, this is a N2 search, but there are very few elements in the list.
 	for(int i=2;i<_f2f_TW->topLevelItemCount();)
 	{
 		bool found = false ;
 
-		if(_f2f_TW->topLevelItem(i)->text(0).left(14) == "Unknown hashes" && unknown_hash_found)
+		if(_f2f_TW->topLevelItem(i)->text(0).left(14) == tr("Unknown hashes") && unknown_hash_found)
 			found = true ;
 
 		if(_f2f_TW->topLevelItem(i)->childCount() > 0)	// this saves uploading hashes
@@ -203,12 +202,12 @@ QTreeWidgetItem *TurtleRouterDialog::findParentHashItem(const std::string& hash)
 {
 	// look for the hash, and insert a new element if necessary.
 	//
-	QList<QTreeWidgetItem*> items = _f2f_TW->findItems((hash=="")?QString("Unknown hashes"):QString::fromStdString(hash),Qt::MatchStartsWith) ;
+	QList<QTreeWidgetItem*> items = _f2f_TW->findItems((hash=="")?tr("Unknown hashes"):QString::fromStdString(hash),Qt::MatchStartsWith) ;
 
 	if(items.empty())
 	{	
 		QStringList stl ;
-		stl.push_back((hash=="")?QString("Unknown hashes"):QString::fromStdString(hash)) ;
+		stl.push_back((hash=="")?tr("Unknown hashes"):QString::fromStdString(hash)) ;
 		QTreeWidgetItem *item = new QTreeWidgetItem(_f2f_TW,stl) ;
 		_f2f_TW->insertTopLevelItem(0,item) ;
 
@@ -217,5 +216,3 @@ QTreeWidgetItem *TurtleRouterDialog::findParentHashItem(const std::string& hash)
 	else
 		return items.front() ;
 }
-
-

retroshare-gui/src/gui/TurtleRouterDialog.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <QPoint>
 #include <retroshare/rsturtle.h>
 #include "ui_TurtleRouterDialog.h"
 #include "RsAutoUpdatePage.h"
@@ -8,6 +7,8 @@
 
 class TurtleRouterDialog: public RsAutoUpdatePage, public Ui::TurtleRouterDialogForm
 {
+	Q_OBJECT
+
 	public:
 		TurtleRouterDialog(QWidget *parent = NULL) ;
 		~TurtleRouterDialog();
@@ -33,6 +34,3 @@ class TurtleRouterDialog: public RsAutoUpdatePage, public Ui::TurtleRouterDialog
 		QTreeWidgetItem *top_level_t_requests ;
 
 } ;
-
-
-

retroshare-gui/src/gui/TurtleRouterStatistics.cpp

@@ -140,10 +140,10 @@ class TRHistogram
 			oy += (p+1)*celly+6 ;
 
 			painter->setPen(QColor::fromRgb(0,0,0)) ;
-			painter->drawText(ox,oy+celly,QObject::tr("(Age in seconds)"));
+			painter->drawText(ox,oy+celly,"("+QApplication::translate("TurtleRouterStatistics", "Age in seconds")+")");
-			painter->drawText(ox+MaxTime*cellx+20,oy+celly,QObject::tr("(Depth)"));
+			painter->drawText(ox+MaxTime*cellx+20,oy+celly,"("+QApplication::translate("TurtleRouterStatistics", "Depth")+")");
 
-			painter->drawText(ox+MaxDepth*cellx+30+(MaxTime+1)*cellx+120,oy+celly,"("+QObject::tr("total")+")");
+			painter->drawText(ox+MaxDepth*cellx+30+(MaxTime+1)*cellx+120,oy+celly,"("+QApplication::translate("TurtleRouterStatistics", "total")+")");
 
 			oy += 3*celly ;
 
@@ -227,7 +227,6 @@ void TurtleRouterStatistics::processSettings(bool bLoad)
 
 }
 
-
 void TurtleRouterStatistics::updateDisplay()
 {
 	std::vector<std::vector<std::string> > hashes_info ;
@@ -254,7 +253,7 @@ QString TurtleRouterStatistics::getPeerName(const std::string& peer_id)
 	{
 		RsPeerDetails detail ;
 		if(!rsPeers->getPeerDetails(peer_id,detail))
-			return "unknown peer";
+			return tr("Unknown Peer");
 
 		return (names[peer_id] = QString::fromUtf8(detail.name.c_str())) ;
 	}
@@ -289,13 +288,13 @@ void TurtleRouterStatisticsWidget::updateTunnelStatistics(const std::vector<std:
 	// draw...
 	int ox=5,oy=5 ;
 
-	TRHistogram(search_reqs_info).draw(&painter,ox,oy,QObject::tr("Search requests repartition:")) ;
+	TRHistogram(search_reqs_info).draw(&painter,ox,oy,tr("Search requests repartition") + ":") ;
 
 	painter.setPen(QColor::fromRgb(70,70,70)) ;
 	painter.drawLine(0,oy,maxWidth,oy) ;
 	oy += celly ;
 
-	TRHistogram(tunnel_reqs_info).draw(&painter,ox,oy,QObject::tr("Tunnel requests repartition:")) ;
+	TRHistogram(tunnel_reqs_info).draw(&painter,ox,oy,tr("Tunnel requests repartition") + ":") ;
 
 	// now give information about turtle traffic.
 	//
@@ -306,7 +305,7 @@ void TurtleRouterStatisticsWidget::updateTunnelStatistics(const std::vector<std:
 	painter.drawLine(0,oy,maxWidth,oy) ;
 	oy += celly ;
 
-	painter.drawText(ox,oy+celly,tr("Turtle router traffic:")) ; oy += celly*2 ;
+	painter.drawText(ox,oy+celly,tr("Turtle router traffic")+":") ; oy += celly*2 ;
 	painter.drawText(ox+2*cellx,oy+celly,tr("Tunnel requests Up")+"\t: " + speedString(info.tr_up_Bps) ) ; oy += celly ;
 	painter.drawText(ox+2*cellx,oy+celly,tr("Tunnel requests Dn")+"\t: " + speedString(info.tr_dn_Bps) ) ; oy += celly ;
 	painter.drawText(ox+2*cellx,oy+celly,tr("Incoming file data")+"\t: " + speedString(info.data_dn_Bps) ) ; oy += celly ;
@@ -352,5 +351,3 @@ void TurtleRouterStatisticsWidget::resizeEvent(QResizeEvent *event)
 	 QWidget::resizeEvent(event);
 	 update();
 }
-
-

retroshare-gui/src/gui/TurtleRouterStatistics.h

@@ -30,6 +30,8 @@ class TurtleRouterStatisticsWidget ;
 
 class TurtleRouterStatistics: public RsAutoUpdatePage, public Ui::TurtleRouterStatistics
 {
+	Q_OBJECT
+
 	public:
 		TurtleRouterStatistics(QWidget *parent = NULL) ;
 		~TurtleRouterStatistics();
@@ -49,6 +51,8 @@ class TurtleRouterStatistics: public RsAutoUpdatePage, public Ui::TurtleRouterSt
 
 class TurtleRouterStatisticsWidget:  public QWidget
 {
+	Q_OBJECT
+
 	public:
 		TurtleRouterStatisticsWidget(QWidget *parent = NULL) ;
 

retroshare-gui/src/gui/channels/CreateChannel.ui

@@ -296,7 +296,7 @@
          <item>
           <widget class="QCheckBox" name="pubKeyShare_cb">
            <property name="toolTip">
-            <string>Key recipients can publish to restricted-type channels, and can view and publish  for private-type channels </string>
+            <string>Key recipients can publish to restricted-type channels, and can view and publish  for private-type channels</string>
            </property>
            <property name="text">
             <string>Share Private Publish Key</string>

retroshare-gui/src/gui/channels/CreateChannelMsg.ui

@@ -332,7 +332,7 @@ p, li { white-space: pre-wrap; }
           <item row="0" column="4">
            <widget class="QCheckBox" name="thumbNailCb">
             <property name="toolTip">
-             <string> allow channels to get frame for message thumbnail from movie media attachments or not</string>
+             <string>Allow channels to get frame for message thumbnail from movie media attachments or not</string>
             </property>
             <property name="text">
              <string>Auto Thumbnail</string>
@@ -352,8 +352,8 @@ p, li { white-space: pre-wrap; }
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>517</width>
+               <width>511</width>
-               <height>269</height>
+               <height>277</height>
               </rect>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout">

retroshare-gui/src/gui/connect/ConfCertDialog.ui

@@ -602,7 +602,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:'Sans'; font-size:10pt; 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;">Signing a friend's key is a way to express your trust into this friend, to your other friends. Besides, only signed peers will receive information about your other trusted friends.</p>
+<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Signing a friend's key is a way to express your trust into this friend, to your other friends. Besides, only signed peers will receive information about your other trusted friends.</p>
 <p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Signing a key cannot be undone, so do it wisely.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>

retroshare-gui/src/gui/forums/CreateForum.ui

@@ -259,7 +259,7 @@ p, li { white-space: pre-wrap; }
          <item>
           <widget class="QCheckBox" name="pubKeyShare_cb">
            <property name="toolTip">
-            <string>Key recipients can publish to restricted-type channels, and can view and publish  for private-type channels </string>
+            <string>Key recipients can publish to restricted-type channels, and can view and publish  for private-type channels</string>
            </property>
            <property name="text">
             <string>Share Private Publish Key</string>

retroshare-gui/src/gui/settings/CryptoPage.cpp

@@ -85,7 +85,7 @@ CryptoPage::copyRSLink()
 		urls.push_back(link) ;
 		RSLinkClipboard::copyLinks(urls) ;
 		QMessageBox::information(this,
-				tr("RetroShare"),
+				"RetroShare",
 				tr("A RetroShare link with your Public Key is copied to Clipboard, paste and send it to your"
 					" friend via email or some other way"));
 	}

retroshare-gui/src/gui/settings/RelayPage.ui

@@ -147,7 +147,7 @@
       <item row="1" column="2" rowspan="2">
        <widget class="QLabel" name="label_9">
         <property name="text">
-         <string>x</string>
+         <string notr="true">x</string>
         </property>
        </widget>
       </item>
@@ -191,7 +191,7 @@
       <item row="3" column="2" rowspan="2">
        <widget class="QLabel" name="label_10">
         <property name="text">
-         <string>x</string>
+         <string notr="true">x</string>
         </property>
        </widget>
       </item>
@@ -235,7 +235,7 @@
       <item row="5" column="2" rowspan="2">
        <widget class="QLabel" name="label_11">
         <property name="text">
-         <string>x</string>
+         <string notr="true">x</string>
         </property>
        </widget>
       </item>
@@ -319,7 +319,7 @@
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <property name="horizontalSpacing">
-       <number>-1</number>
+       <number>6</number>
       </property>
       <property name="verticalSpacing">
        <number>0</number>

retroshare-gui/src/gui/statusbar/dhtstatus.cpp

@@ -94,7 +94,7 @@ void DHTStatus::getDHTStatus()
 			if (config.netDhtRsNetSize < MIN_RS_NET_SIZE)
 			{
 				dhtstatusLabel->setPixmap(QPixmap(":/images/yellowled.png"));
-				dhtstatusLabel->setToolTip(tr("DHT Searching for Retroshare Peers"));
+				dhtstatusLabel->setToolTip(tr("DHT Searching for RetroShare Peers"));
 				
 				spaceLabel->setVisible(true);
 				dhtnetworkLabel->setVisible(true);