diff --git a/plugins/FeedReader/lang/FeedReader_en.ts b/plugins/FeedReader/lang/FeedReader_en.ts index ecc151e04..abcdeba97 100644 --- a/plugins/FeedReader/lang/FeedReader_en.ts +++ b/plugins/FeedReader/lang/FeedReader_en.ts @@ -595,12 +595,12 @@ FeedReaderPlugin - + This plugin provides a Feedreader. - + FeedReader diff --git a/plugins/VOIP/lang/VOIP_en.ts b/plugins/VOIP/lang/VOIP_en.ts index a2f5e304d..46f5b4e84 100644 --- a/plugins/VOIP/lang/VOIP_en.ts +++ b/plugins/VOIP/lang/VOIP_en.ts @@ -506,113 +506,113 @@ VOIPChatWidgetHolder - + Mute - + Start Call - + Start Video Call - + Hangup Call - + Mute yourself - + Unmute yourself - - - - - - + + + + + + VoIP Status - + Outgoing Call stopped. - + Hold Call - + Outgoing Call is started... - + Resume Call - + Shut camera off - + You're now sending video... - - + + Activate camera - + Video call stopped - + %1 inviting you to start a video conversation. do you want Accept or Decline the invitation? - + Accept Video Call - + %1 inviting you to start a audio conversation. do you want Accept or Decline the invitation? - + Accept Call - + Activate audio - + Answer @@ -628,8 +628,13 @@ VOIPToasterItem - - Show Chat + + Answer + + + + + Answer with video @@ -737,12 +742,8 @@ - Audio Call received from this peer. - - - - Video Call received from this peer. + calling diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp index 0576bb954..b1ae15487 100644 --- a/retroshare-gui/src/gui/GenCertDialog.cpp +++ b/retroshare-gui/src/gui/GenCertDialog.cpp @@ -236,7 +236,7 @@ void GenCertDialog::init() } #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."); if (mOnlyGenerateIdentity) { diff --git a/retroshare-gui/src/gui/settings/ChatPage.cpp b/retroshare-gui/src/gui/settings/ChatPage.cpp index 6b48bf002..5061364c1 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.cpp +++ b/retroshare-gui/src/gui/settings/ChatPage.cpp @@ -299,7 +299,7 @@ ChatPage::load() item->setData(Qt::DisplayRole,tr("Private chat invite from ")+QString::fromUtf8(detail.name.c_str())) ; 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("Valid until : ") + QDateTime::fromTime_t(invites[i].time_of_validity).toString() ; diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts index b0c0a281a..243f9d113 100644 --- a/retroshare-gui/src/lang/retroshare_en.ts +++ b/retroshare-gui/src/lang/retroshare_en.ts @@ -751,11 +751,6 @@ p, li { white-space: pre-wrap; } Talking to - - Your friend has more than one nodes. -Please choose one of it to chat with. - - ChatLobbyDialog @@ -4652,10 +4647,6 @@ the same profile (PGP key pair). Create a new profile and node - - You can create a new profile with this form. - - Alternatively you can use an existing profile. Just uncheck "Create a new profile" @@ -4743,6 +4734,10 @@ and use the import button to load it Fill in your PGP password when asked, to sign your new key. + + You can create a new profile with this form. + + GeneralPage @@ -7465,6 +7460,10 @@ p, li { white-space: pre-wrap; } Show web interface + + Open Messenger + + MessageComposer @@ -10912,6 +10911,38 @@ Reported error is: day(s) ago + + Ban only IP %1 + + + + Ban entire range %2 + + + + Ban entire range %1 + + + + Move IP %1 to whitelist + + + + Whitelist entire range %1 + + + + whitelist entire range %1 + + + + Whitelist only IP + + + + Whitelist entire range + + QuickStartWizard @@ -12191,6 +12222,106 @@ Check your ports! Network + + IP Filters + + + + IP blacklist + + + + Deny all connections from the following IP ranges: + + + + <html><head/><body><p>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.</p><p>Automatically guessing masquerading IPs can put your friends IPs in the blacklist. This case, use the context menu to whitelist them.</p></body></html> + + + + IP range + + + + Status + + + + Origin + + + + Reason + + + + Comment + + + + Include the IPs reported by your friends + + + + Auto-group IPs by ranges when at least : + + + + IPs + + + + Automatically include masquerading IPs reported by DHT + + + + IP whitelist + + + + <html><head/><body><p>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.</p><p>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 &quot;Details&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.</p></body></html> + + + + Manual input + + + + <html><head/><body><p>Enter an IP range. Accepted formats:</p><p>193.190.209.15</p><p>193.190.209.15/24</p><p>193.190.209.15/16</p></body></html> + + + + <html><head/><body><p>Enter any comment you'd like</p></body></html> + + + + Add to blacklist + + + + Add to whitelist + + + + IP Range + + + + Reported by DHT for IP masquerading + + + + Range made from %1 collected addresses + + + + Remove + + + + Added by you + + ServicePermissionDialog