Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-17 13:24:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

make IP connect state string fully translatable (patch from Henry)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8513 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
electron128 2015-06-17 17:18:52 +00:00
parent 962db670f1
commit 4cb081f4ff
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,16 +249,14 @@ QString StatusDefs::connectStateIpString(RsPeerDetails &details)
break; break;
case RS_PEER_CONNECTSTATE_TRYING_TCP: case RS_PEER_CONNECTSTATE_TRYING_TCP:
case RS_PEER_CONNECTSTATE_CONNECTED_TCP: case RS_PEER_CONNECTSTATE_CONNECTED_TCP:
stateString += qApp->translate("StatusDefs", "TCP"); stateString += QString(details.actAsServer ? qApp->translate("StatusDefs", "TCP-in") : qApp->translate("StatusDefs", "TCP-out"));
stateString += QString(details.actAsServer ? "-in" : "-out");
break; break;
case RS_PEER_CONNECTSTATE_TRYING_UDP: case RS_PEER_CONNECTSTATE_TRYING_UDP:
case RS_PEER_CONNECTSTATE_CONNECTED_UDP: case RS_PEER_CONNECTSTATE_CONNECTED_UDP:
stateString += qApp->translate("StatusDefs", "UDP"); stateString += qApp->translate("StatusDefs", "UDP");
break; break;
case RS_PEER_CONNECTSTATE_CONNECTED_TOR: case RS_PEER_CONNECTSTATE_CONNECTED_TOR:
stateString += qApp->translate("StatusDefs", "Tor"); stateString += QString(details.actAsServer ? qApp->translate("StatusDefs", "Tor-in") : qApp->translate("StatusDefs", "Tor-out"));
stateString += QString(details.actAsServer ? "-in" : "-out");
break; break;
case RS_PEER_CONNECTSTATE_CONNECTED_UNKNOWN: case RS_PEER_CONNECTSTATE_CONNECTED_UNKNOWN:
stateString += qApp->translate("StatusDefs", "unkown"); stateString += qApp->translate("StatusDefs", "unkown");

38
retroshare-gui/src/lang/retroshare_en.ts
View File

@ -16588,7 +16588,17 @@ This choice can be reverted in settings.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-17"/> <location line="+41"/>
<source>TCP-in</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+0"/>
<source>TCP-out</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-58"/>
<source>inbound connection</source> <source>inbound connection</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -16598,30 +16608,30 @@ This choice can be reverted in settings.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+56"/> <location line="+60"/>
<source>TCP</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>UDP</source> <source>UDP</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+7"/> <location line="+3"/>
<source>Tor-in</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+0"/>
<source>Tor-out</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<source>unkown</source> <source>unkown</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-82"/> <location line="-80"/>
<source>Connected: Tor</source> <source>Connected: Tor</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location line="+78"/>
<source>Tor</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>StatusMessage</name> <name>StatusMessage</name>