Added patch from Henry

- Changed string for translation
- Fixed utf8 issue in ServicePermissionsPage
Updated english translation


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

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

@@ -326,7 +326,7 @@
               <item>
                <widget class="QLabel" name="lSearch_CharToStart">
                 <property name="text">
-                 <string>Number of char to start search</string>
+                 <string>Threshold for automatic search</string>
                 </property>
                </widget>
               </item>

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

@@ -193,7 +193,7 @@ void ServicePermissionsPage::load()
 	columnHeaders.push_back(tr("Default"));
 	for(pit = peerList.begin(); pit != peerList.end(); ++pit)
 	{
-		columnHeaders.push_back(QString::fromStdString( rsPeers->getPeerName(*pit)));
+		columnHeaders.push_back(QString::fromUtf8(rsPeers->getPeerName(*pit).c_str()));
 	}
 
 	// Fill in CheckBoxes.

retroshare-gui/src/lang/retroshare_en.ts

@@ -1217,10 +1217,6 @@ Double click lobbies to enter and chat.</source>
         <source>Search by default</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Number of char to start search</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Case sensitive</source>
         <translation type="unfinished"></translation>
@@ -1257,6 +1253,10 @@ Double click lobbies to enter and chat.</source>
         <source>Maximum count for coloring matching text</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Threshold for automatic search</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ChatStyle</name>