1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge pull request #6253

powerjungle (2):
      fix(translation): match text to translation files
      fix(translation): match text to translation files part 2
This commit is contained in:
sudden6 2020-11-18 23:58:35 +01:00
commit 5a46d3c28e
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
10 changed files with 16 additions and 17 deletions

View File

@ -138,7 +138,7 @@
<item> <item>
<widget class="QGroupBox" name="publicGroup"> <widget class="QGroupBox" name="publicGroup">
<property name="title"> <property name="title">
<string>Public information</string> <string>Public Information</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>

View File

@ -107,7 +107,7 @@ void AboutForm::replaceVersions()
bodyUI->gitVersion->setText( bodyUI->gitVersion->setText(
tr("Commit hash: %1").arg(createLink(commitLink, QString(GIT_VERSION)))); tr("Commit hash: %1").arg(createLink(commitLink, QString(GIT_VERSION))));
bodyUI->toxCoreVersion->setText(tr("Toxcore version: %1").arg(TOXCORE_VERSION)); bodyUI->toxCoreVersion->setText(tr("toxcore version: %1").arg(TOXCORE_VERSION));
bodyUI->qtVersion->setText(tr("Qt version: %1").arg(QT_VERSION_STR)); bodyUI->qtVersion->setText(tr("Qt version: %1").arg(QT_VERSION_STR));
QString issueBody = QString("##### Brief Description\n\n" QString issueBody = QString("##### Brief Description\n\n"

View File

@ -360,7 +360,7 @@ p, li { white-space: pre-wrap; }
</size> </size>
</property> </property>
<property name="title"> <property name="title">
<string>Known issues</string> <string>Known Issues</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_8"> <layout class="QVBoxLayout" name="verticalLayout_8">
<item> <item>

View File

@ -83,7 +83,7 @@
<item> <item>
<widget class="QPushButton" name="btnCopyDebug"> <widget class="QPushButton" name="btnCopyDebug">
<property name="text"> <property name="text">
<string>Copy debug log</string> <string>Copy Debug Log</string>
</property> </property>
</widget> </widget>
</item> </item>

View File

@ -38,7 +38,7 @@
<item> <item>
<widget class="QGroupBox" name="audioGroup"> <widget class="QGroupBox" name="audioGroup">
<property name="title"> <property name="title">
<string>Audio settings</string> <string>Audio Settings</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<property name="bottomMargin"> <property name="bottomMargin">
@ -165,7 +165,7 @@
<item> <item>
<widget class="QGroupBox" name="videoGroup"> <widget class="QGroupBox" name="videoGroup">
<property name="title"> <property name="title">
<string>Video settings</string> <string>Video Settings</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>

View File

@ -104,7 +104,7 @@
<string>Start qTox on operating system startup (current profile).</string> <string>Start qTox on operating system startup (current profile).</string>
</property> </property>
<property name="text"> <property name="text">
<string>Auto-start</string> <string>Autostart</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -235,7 +235,7 @@ instead of closing entirely.</string>
<enum>Qt::LeftToRight</enum> <enum>Qt::LeftToRight</enum>
</property> </property>
<property name="text"> <property name="text">
<string>Auto-away after (0 to disable):</string> <string>Auto away after (0 to disable):</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -303,14 +303,14 @@ instead of closing entirely.</string>
<string comment="autoaccept cb tooltip">You can set this on a per-friend basis by right clicking individual friends.</string> <string comment="autoaccept cb tooltip">You can set this on a per-friend basis by right clicking individual friends.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Auto-accept files</string> <string>Autoaccept files</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="4" column="0">
<widget class="QLabel" name="maxAutoAcceptSizeLabel"> <widget class="QLabel" name="maxAutoAcceptSizeLabel">
<property name="text"> <property name="text">
<string>Max auto-accept file size (0 for unlimited):</string> <string>Max autoaccept file size (0 to disable):</string>
</property> </property>
</widget> </widget>
</item> </item>

View File

@ -123,7 +123,7 @@ If you are getting spammed with friend requests, change the NoSpam.</string>
<string/> <string/>
</property> </property>
<property name="title"> <property name="title">
<string>Blacklist</string> <string>BlackList</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>

View File

@ -36,7 +36,7 @@ public:
~UserInterfaceForm(); ~UserInterfaceForm();
QString getFormName() final QString getFormName() final
{ {
return tr("User interface"); return tr("User Interface");
} }
private slots: private slots:

View File

@ -111,7 +111,7 @@
<string>New text styling preference may not load until qTox restarts.</string> <string>New text styling preference may not load until qTox restarts.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Text style format:</string> <string>Text Style format:</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>

View File

@ -2601,17 +2601,16 @@ void Widget::retranslateUi()
setUsername(core->getUsername()); setUsername(core->getUsername());
setStatusMessage(core->getStatusMessage()); setStatusMessage(core->getStatusMessage());
filterDisplayName->setText(tr("By name")); filterDisplayName->setText(tr("By Name"));
filterDisplayActivity->setText(tr("By activity")); filterDisplayActivity->setText(tr("By Activity"));
filterAllAction->setText(tr("All")); filterAllAction->setText(tr("All"));
filterOnlineAction->setText(tr("Online")); filterOnlineAction->setText(tr("Online"));
filterOfflineAction->setText(tr("Offline")); filterOfflineAction->setText(tr("Offline"));
filterFriendsAction->setText(tr("Friends")); filterFriendsAction->setText(tr("Friends"));
filterGroupsAction->setText(tr("Groups")); filterGroupsAction->setText(tr("Groups"));
ui->searchContactText->setPlaceholderText(tr("Search contacts")); ui->searchContactText->setPlaceholderText(tr("Search Contacts"));
updateFilterText(); updateFilterText();
ui->searchContactText->setPlaceholderText(tr("Search contacts"));
statusOnline->setText(tr("Online", "Button to set your status to 'Online'")); statusOnline->setText(tr("Online", "Button to set your status to 'Online'"));
statusAway->setText(tr("Away", "Button to set your status to 'Away'")); statusAway->setText(tr("Away", "Button to set your status to 'Away'"));
statusBusy->setText(tr("Busy", "Button to set your status to 'Busy'")); statusBusy->setText(tr("Busy", "Button to set your status to 'Busy'"));