Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-25 23:45:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added patch from Henry

Browse source 
- 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
This commit is contained in:
thunder2 2014-12-22 21:54:49 +00:00
parent 993135c576
commit 4bb15cd211
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/settings/ChatPage.ui
View file

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

2
retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp
View file

@ -193,7 +193,7 @@ void ServicePermissionsPage::load()
columnHeaders.push_back(tr("Default")); columnHeaders.push_back(tr("Default"));
for(pit = peerList.begin(); pit != peerList.end(); ++pit) 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. // Fill in CheckBoxes.

8
retroshare-gui/src/lang/retroshare_en.ts
View file

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