diff --git a/plugins/VOIP/lang/VOIP_en.ts b/plugins/VOIP/lang/VOIP_en.ts
index 0f1f4fba2..70db5c493 100644
--- a/plugins/VOIP/lang/VOIP_en.ts
+++ b/plugins/VOIP/lang/VOIP_en.ts
@@ -543,12 +543,12 @@
-
+ Start Video Call
-
+ Hangup Call
diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp
index 75e24616b..82ccba28b 100644
--- a/retroshare-gui/src/gui/FriendsDialog.cpp
+++ b/retroshare-gui/src/gui/FriendsDialog.cpp
@@ -809,7 +809,7 @@ void FriendsDialog::loadmypersonalstatus()
if (statustring.isEmpty())
{
- ui.mypersonalstatusLabel->setText(tr("Set here your Status message"));
+ ui.mypersonalstatusLabel->setText(tr("Set your status message here."));
}
else
{
diff --git a/retroshare-gui/src/gui/QuickStartWizard.cpp b/retroshare-gui/src/gui/QuickStartWizard.cpp
index ff4a03925..aa2b33c10 100644
--- a/retroshare-gui/src/gui/QuickStartWizard.cpp
+++ b/retroshare-gui/src/gui/QuickStartWizard.cpp
@@ -289,7 +289,7 @@ void QuickStartWizard::loadShare()
cb->addItem(tr("Browsable")) ;
cb->addItem(tr("Universal")) ;
- cb->setToolTip(tr("Decide here whether this directory is\n* Network Wide: \tanonymously shared over the network (including your friends)\n* Browsable: \tbrowsable by your friends\n* Universal: \t\tboth")) ;
+ cb->setToolTip(tr("Please decide whether this directory is\n* Network Wide: \tanonymously shared over the network (including your friends)\n* Browsable: \tbrowsable by your friends\n* Universal: \t\tboth")) ;
// TODO
// - set combobox current value depending on what rsFiles reports.
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.ui b/retroshare-gui/src/gui/common/RsCollectionDialog.ui
index d9cd6c1e2..89a739e42 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.ui
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.ui
@@ -284,7 +284,7 @@
- <html><head/><body><p>Remove selected item of collection.</p><p><span style=" font-style:italic; vertical-align:sub;"><Del></span></p></body></html>
+ <html><head/><body><p>Remove selected item from collection.</p><p><span style=" font-style:italic; vertical-align:sub;"><Del></span></p></body></html><
diff --git a/retroshare-gui/src/gui/settings/AppearancePage.ui b/retroshare-gui/src/gui/settings/AppearancePage.ui
index cbed11dbb..cee522901 100755
--- a/retroshare-gui/src/gui/settings/AppearancePage.ui
+++ b/retroshare-gui/src/gui/settings/AppearancePage.ui
@@ -369,7 +369,7 @@
- Inon Size = 32x32
+ Icon Size = 32x32
diff --git a/retroshare-gui/src/gui/settings/NotifyPage.ui b/retroshare-gui/src/gui/settings/NotifyPage.ui
index ab480e11f..dab8dda9f 100755
--- a/retroshare-gui/src/gui/settings/NotifyPage.ui
+++ b/retroshare-gui/src/gui/settings/NotifyPage.ui
@@ -177,7 +177,7 @@
- Disable All Toaster temporaly
+ Disable All Toaster temporarilyDisable All Toasters
diff --git a/retroshare-gui/src/gui/settings/ServicePermissionsPage.ui b/retroshare-gui/src/gui/settings/ServicePermissionsPage.ui
index 4219f3c60..6ee653efd 100644
--- a/retroshare-gui/src/gui/settings/ServicePermissionsPage.ui
+++ b/retroshare-gui/src/gui/settings/ServicePermissionsPage.ui
@@ -60,7 +60,7 @@
- Permissions changes are not saved permanently. (TODO)
+ Permission changes are not saved permanently. (TODO)
diff --git a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp
index 2ac28862f..658182ef2 100644
--- a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp
+++ b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp
@@ -233,7 +233,7 @@ void GlobalRouterStatisticsWidget::updateContent()
packet_string += tr(" by ")+QString::fromStdString(cache_infos[i].local_origin.toStdString()) ;
packet_string += tr(" size=")+QString::number(cache_infos[i].data_size) ;
packet_string += tr(" Status ")+status_string[cache_infos[i].status % 6] ;
- packet_string += " "+QString::number(now - cache_infos[i].time_stamp) + tr(" secs ago");
+ packet_string += " " + tr("%1 secs ago").arg(now - cache_infos[i].time_stamp);
tos[ QString::fromStdString(cache_infos[i].destination.toStdString()) ].push_back(packet_string) ;
}
diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts
index 182e9c798..7762adbc1 100644
--- a/retroshare-gui/src/lang/retroshare_en.ts
+++ b/retroshare-gui/src/lang/retroshare_en.ts
@@ -504,6 +504,10 @@ p, li { white-space: pre-wrap; }
Show SysTray on Status Bar
+
+ Icon Size = 32x32
+
+ ApplicationWindow
@@ -1485,6 +1489,14 @@ Double click lobbies to enter and chat.
<b>Return to marked text</b><br><i>Ctrl+M</i>
+
+ Display Search Box
+
+
+
+ Search Box
+
+ CircleWidget
@@ -4539,7 +4551,7 @@ you plug it in.
- Set here your Status message
+ Set your status message here.
@@ -5079,10 +5091,6 @@ p, li { white-space: pre-wrap; }
Status
-
- secs ago
-
- To:
@@ -5099,6 +5107,10 @@ p, li { white-space: pre-wrap; }
Routing matrix (
+
+ %1 secs ago
+
+ GraphWidget
@@ -8934,10 +8946,6 @@ Right-click and select 'make friend' to be able to connect.
<h1><img width="24" src=":/images/64px_help.png"> Notify</h1> <p>Retroshare will notify you about what happens in your network. Depending on your usage, you may want to enable or disable some of the notifications. This page is designed for that!</p>
-
- Disable All Toaster temporaly
-
- Disable All Toasters
@@ -8946,6 +8954,10 @@ Right-click and select 'make friend' to be able to connect.
Posted
+
+ Disable All Toaster temporarily
+
+ NotifyQt
@@ -10727,13 +10739,6 @@ p, li { white-space: pre-wrap; }
Universal
-
- Decide here whether this directory is
-* Network Wide: anonymously shared over the network (including your friends)
-* Browsable: browsable by your friends
-* Universal: both
-
- If checked, the share is anonymously shared to anybody.
@@ -10742,6 +10747,13 @@ p, li { white-space: pre-wrap; }
If checked, the share is browsable by your friends.
+
+ Please decide whether this directory is
+* Network Wide: anonymously shared over the network (including your friends)
+* Browsable: browsable by your friends
+* Universal: both
+
+ RSGraphWidget
@@ -10952,10 +10964,6 @@ Characters <b>",|,/,\,<,>,*,?</b> will be replace
>>
-
- <html><head/><body><p>Remove selected item of collection.</p><p><span style=" font-style:italic; vertical-align:sub;"><Del></span></p></body></html>
-
- <html><head/><body><p>Make a new directory in the collection.</p><p><span style=" font-style:italic; vertical-align:sub;"><+></span></p></body></html>
@@ -11040,6 +11048,10 @@ Characters <b>",|,/,\,<,>,*,?</b> will be replace
File already exists.
+
+ <html><head/><body><p>Remove selected item from collection.</p><p><span style=" font-style:italic; vertical-align:sub;"><Del></span></p></body></html>
+
+ RsCollectionFile
@@ -11818,10 +11830,6 @@ If you have issues connecting over TOR check the TOR logs too.
Reset
-
- Permissions changes are not saved permanently. (TODO)
-
- Chat
@@ -11886,6 +11894,10 @@ If you have issues connecting over TOR check the TOR logs too.
Permissions
+
+ Permission changes are not saved permanently. (TODO)
+
+ Settings