Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-14 01:23:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed and updated english translation.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8324 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2015-05-31 11:19:20 +00:00
parent 94649dfbfd
commit feaffedbb6
5 changed files with 179 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/FeedReader/lang/FeedReader_en.ts
View file

@ -595,12 +595,12 @@
<context> <context>
<name>FeedReaderPlugin</name> <name>FeedReaderPlugin</name>
<message> <message>
<location filename="../FeedReaderPlugin.cpp" line="153"/> <location filename="../FeedReaderPlugin.cpp" line="154"/>
<source>This plugin provides a Feedreader.</source> <source>This plugin provides a Feedreader.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../FeedReaderPlugin.cpp" line="158"/> <location filename="../FeedReaderPlugin.cpp" line="159"/>
<source>FeedReader</source> <source>FeedReader</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

69
plugins/VOIP/lang/VOIP_en.ts
View file

@ -506,113 +506,113 @@
<context> <context>
<name>VOIPChatWidgetHolder</name> <name>VOIPChatWidgetHolder</name>
<message> <message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="62"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="63"/>
<source>Mute</source> <source>Mute</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="75"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="76"/>
<source>Start Call</source> <source>Start Call</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="103"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="104"/>
<source>Start Video Call</source> <source>Start Video Call</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="89"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="90"/>
<source>Hangup Call</source> <source>Hangup Call</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="168"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="169"/>
<source>Mute yourself</source> <source>Mute yourself</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="170"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="171"/>
<source>Unmute yourself</source> <source>Unmute yourself</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="189"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="190"/>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="226"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="227"/>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="264"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="265"/>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="282"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="283"/>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="295"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="296"/>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="387"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="388"/>
<source>VoIP Status</source> <source>VoIP Status</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="189"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="190"/>
<source>Outgoing Call stopped.</source> <source>Outgoing Call stopped.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="208"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="209"/>
<source>Hold Call</source> <source>Hold Call</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="226"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="227"/>
<source>Outgoing Call is started...</source> <source>Outgoing Call is started...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="241"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="242"/>
<source>Resume Call</source> <source>Resume Call</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="261"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="262"/>
<source>Shut camera off</source> <source>Shut camera off</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="265"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="266"/>
<source>You&apos;re now sending video...</source> <source>You&apos;re now sending video...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="277"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="278"/>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="298"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="299"/>
<source>Activate camera</source> <source>Activate camera</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="283"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="284"/>
<source>Video call stopped</source> <source>Video call stopped</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="296"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="297"/>
<source>%1 inviting you to start a video conversation. do you want Accept or Decline the invitation?</source> <source>%1 inviting you to start a video conversation. do you want Accept or Decline the invitation?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="297"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="298"/>
<source>Accept Video Call</source> <source>Accept Video Call</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="388"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="389"/>
<source>%1 inviting you to start a audio conversation. do you want Accept or Decline the invitation?</source> <source>%1 inviting you to start a audio conversation. do you want Accept or Decline the invitation?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="389"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="390"/>
<source>Accept Call</source> <source>Accept Call</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="390"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="391"/>
<source>Activate audio</source> <source>Activate audio</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../gui/VOIPChatWidgetHolder.cpp" line="411"/> <location filename="../gui/VOIPChatWidgetHolder.cpp" line="412"/>
<source>Answer</source> <source>Answer</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -628,8 +628,13 @@
<context> <context>
<name>VOIPToasterItem</name> <name>VOIPToasterItem</name>
<message> <message>
<location filename="../gui/VOIPToasterItem.ui" line="133"/> <location filename="../gui/VOIPToasterItem.cpp" line="43"/>
<source>Show Chat</source> <source>Answer</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/VOIPToasterItem.cpp" line="47"/>
<source>Answer with video</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
@ -737,12 +742,8 @@
</message> </message>
<message> <message>
<location filename="../gui/VOIPToasterNotify.cpp" line="325"/> <location filename="../gui/VOIPToasterNotify.cpp" line="325"/>
<source>Audio Call received from this peer.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gui/VOIPToasterNotify.cpp" line="349"/> <location filename="../gui/VOIPToasterNotify.cpp" line="349"/>
<source>Video Call received from this peer.</source> <source>calling</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>

2
retroshare-gui/src/gui/GenCertDialog.cpp
View file

@ -236,7 +236,7 @@ void GenCertDialog::init()
} }
#ifdef TO_REMOVE #ifdef TO_REMOVE
QString text; /*= ui.header_label->text() + "\n";*/ QString text; /* = ui.header_label->text() + "\n";*/
text += tr("You can create a new profile with this form."); text += tr("You can create a new profile with this form.");
if (mOnlyGenerateIdentity) { if (mOnlyGenerateIdentity) {

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

@ -299,7 +299,7 @@ ChatPage::load()
item->setData(Qt::DisplayRole,tr("Private chat invite from ")+QString::fromUtf8(detail.name.c_str())) ; item->setData(Qt::DisplayRole,tr("Private chat invite from ")+QString::fromUtf8(detail.name.c_str())) ;
QString tt ; QString tt ;
tt += tr("Name : ") + QString::fromUtf8(detail.name.c_str())) ; tt += tr("Name : ") + QString::fromUtf8(detail.name.c_str()) ;
tt += "\n" + tr("PGP id : ") + QString::fromStdString(invites[i].destination_pgp_id.toStdString()) ; tt += "\n" + tr("PGP id : ") + QString::fromStdString(invites[i].destination_pgp_id.toStdString()) ;
tt += "\n" + tr("Valid until : ") + QDateTime::fromTime_t(invites[i].time_of_validity).toString() ; tt += "\n" + tr("Valid until : ") + QDateTime::fromTime_t(invites[i].time_of_validity).toString() ;

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

@ -751,11 +751,6 @@ p, li { white-space: pre-wrap; }
<source>Talking to </source> <source>Talking to </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Your friend has more than one nodes.
Please choose one of it to chat with.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>ChatLobbyDialog</name> <name>ChatLobbyDialog</name>
@ -4652,10 +4647,6 @@ the same profile (PGP key pair).</source>
<source>Create a new profile and node</source> <source>Create a new profile and node</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message id="ui.header_label->text() + "\n";">
<source>You can create a new profile with this form.</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Alternatively you can use an existing profile. Just uncheck &quot;Create a new profile&quot;</source> <source>Alternatively you can use an existing profile. Just uncheck &quot;Create a new profile&quot;</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -4743,6 +4734,10 @@ and use the import button to load it</source>
Fill in your PGP password when asked, to sign your new key.</source> Fill in your PGP password when asked, to sign your new key.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>You can create a new profile with this form.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>GeneralPage</name> <name>GeneralPage</name>
@ -7465,6 +7460,10 @@ p, li { white-space: pre-wrap; }
<source>Show web interface</source> <source>Show web interface</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Open Messenger</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>MessageComposer</name> <name>MessageComposer</name>
@ -10912,6 +10911,38 @@ Reported error is:
<source> day(s) ago</source> <source> day(s) ago</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Ban only IP %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ban entire range %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ban entire range %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Move IP %1 to whitelist</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Whitelist entire range %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>whitelist entire range %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Whitelist only IP </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Whitelist entire range </source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>QuickStartWizard</name> <name>QuickStartWizard</name>
@ -12191,6 +12222,106 @@ Check your ports!</source>
<source>Network</source> <source>Network</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>IP Filters</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>IP blacklist</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deny all connections from the following IP ranges:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list get automatically filled from information gathered at multiple sources: masquerading peers reported by the DHT, IP ranged entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. This case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>IP range</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Status</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Origin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reason</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Comment</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Include the IPs reported by your friends</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Auto-group IPs by ranges when at least :</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> IPs</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Automatically include masquerading IPs reported by DHT</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>IP whitelist</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to disallow connections to peers not in the white-list. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. If not activated, connections will still be checked w.r.t. the whitelist, and the blacklit above, but will pass if not in the whitelist.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Manual input</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter an IP range. Accepted formats:&lt;/p&gt;&lt;p&gt;193.190.209.15&lt;/p&gt;&lt;p&gt;193.190.209.15/24&lt;/p&gt;&lt;p&gt;193.190.209.15/16&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter any comment you&apos;d like&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add to blacklist</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add to whitelist</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>IP Range</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reported by DHT for IP masquerading</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Range made from %1 collected addresses</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Added by you</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>ServicePermissionDialog</name> <name>ServicePermissionDialog</name>