Merge pull request #6253

powerjungle (2):
      fix(translation): match text to translation files
      fix(translation): match text to translation files part 2

src/widget/form/profileform.ui

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

src/widget/form/settings/aboutform.cpp

@@ -107,7 +107,7 @@ void AboutForm::replaceVersions()
     bodyUI->gitVersion->setText(
         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));
 
     QString issueBody = QString("##### Brief Description\n\n"

src/widget/form/settings/aboutsettings.ui

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

src/widget/form/settings/advancedsettings.ui

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

src/widget/form/settings/avform.ui

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

src/widget/form/settings/generalsettings.ui

@@ -104,7 +104,7 @@
                <string>Start qTox on operating system startup (current profile).</string>
               </property>
               <property name="text">
-               <string>Auto-start</string>
+               <string>Autostart</string>
               </property>
              </widget>
             </item>
@@ -235,7 +235,7 @@ instead of closing entirely.</string>
                <enum>Qt::LeftToRight</enum>
               </property>
               <property name="text">
-               <string>Auto-away after (0 to disable):</string>
+               <string>Auto away after (0 to disable):</string>
               </property>
              </widget>
             </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>
               </property>
               <property name="text">
-               <string>Auto-accept files</string>
+               <string>Autoaccept files</string>
               </property>
              </widget>
             </item>
             <item row="4" column="0">
              <widget class="QLabel" name="maxAutoAcceptSizeLabel">
               <property name="text">
-               <string>Max auto-accept file size (0 for unlimited):</string>
+               <string>Max autoaccept file size (0 to disable):</string>
               </property>
              </widget>
             </item>

src/widget/form/settings/privacysettings.ui

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

src/widget/form/settings/userinterfaceform.h

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

src/widget/form/settings/userinterfacesettings.ui

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

src/widget/widget.cpp

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