StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr1078'

Browse Source
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2015-02-01 13:14:32 +01:00
commit 2f8d512a2f
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widget/form/settings/generalsettings.ui
View File

@ -264,7 +264,7 @@ instead of system taskbar.</string>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="autoAwayLabel">
<property name="toolTip">
<string>Your status is changed to Away after set time of inactivity.</string>
<string>Your status is changed to Away after set period of inactivity.</string>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
@ -327,7 +327,7 @@ instead of system taskbar.</string>
<item>
<widget class="QCheckBox" name="showInFront">
<property name="toolTip">
<string comment="toolTip for Show window setting">Focus qTox when you receive message.</string>
<string comment="toolTip for Focus window setting">Focus qTox when you receive message.</string>
</property>
<property name="text">
<string>Focus window</string>

7
src/widget/form/settings/privacysettings.ui
View File

@ -54,15 +54,12 @@
<item>
<widget class="QCheckBox" name="cbKeepHistory">
<property name="toolTip">
<string extracomment="History keeping still under developing. Log format changin is possible."/>
<string comment="toolTip for Keep History setting">History keeping is still in development.
Save format changes are possible, which may result in data loss.</string>
</property>
<property name="text">
<string>Keep History (unstable)</string>
</property>
<property name="toolTip">
<string comment="toolTip for history setting">History is available in qTox, but we cannot promise that one day it will not dissapear without a trace :-/
We will try our best to make sure that this will not happen though!</string>
</property>
</widget>
</item>
<item alignment="Qt::AlignTop">