From: Daniel Albers <daniel@lbe.rs>
Date: Mon, 29 Feb 2016 19:44:45 +0000 (+0100)
Subject: Merge pull request #189 from phuzion/master
X-Git-Tag: travis-deploy-test~510
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=a79aec8dbbfced1dc5f4ca7f2d3d5342b11daba7;hp=324ae188301d46e2268462bc0d8411baed8f00b8

Merge pull request #189 from phuzion/master

Minor string cleanup
---

diff --git a/src/qtui/settingspages/backlogsettingspage.ui b/src/qtui/settingspages/backlogsettingspage.ui
index 789fd4af..8405f1dd 100644
--- a/src/qtui/settingspages/backlogsettingspage.ui
+++ b/src/qtui/settingspages/backlogsettingspage.ui
@@ -135,7 +135,7 @@
          <item>
           <widget class="QLabel" name="label">
            <property name="toolTip">
-            <string>amount of messages per buffer that are requested after the core connection has been established.</string>
+            <string>Amount of messages per buffer that are requested after the core connection has been established.</string>
            </property>
            <property name="text">
             <string>Initial backlog amount:</string>
diff --git a/src/qtui/settingspages/chatviewsettingspage.ui b/src/qtui/settingspages/chatviewsettingspage.ui
index 250022fa..208e7a55 100644
--- a/src/qtui/settingspages/chatviewsettingspage.ui
+++ b/src/qtui/settingspages/chatviewsettingspage.ui
@@ -177,7 +177,7 @@
      <item>
       <widget class="QLabel" name="label_2">
        <property name="text">
-        <string>Web Search Url:</string>
+        <string>Web Search URL:</string>
        </property>
       </widget>
      </item>
diff --git a/src/qtui/settingspages/coreaccounteditdlg.ui b/src/qtui/settingspages/coreaccounteditdlg.ui
index 379b6f23..647366f3 100644
--- a/src/qtui/settingspages/coreaccounteditdlg.ui
+++ b/src/qtui/settingspages/coreaccounteditdlg.ui
@@ -144,7 +144,7 @@
        <widget class="QComboBox" name="proxyType">
         <item>
          <property name="text">
-          <string>Socks 5</string>
+          <string>SOCKS 5</string>
          </property>
         </item>
         <item>
diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui
index 7ef574ac..5fa1c469 100644
--- a/src/qtui/settingspages/networkssettingspage.ui
+++ b/src/qtui/settingspages/networkssettingspage.ui
@@ -713,8 +713,8 @@ UTF-8 should be a sane choice for most networks.</string>
                <item row="1" column="0">
                 <widget class="QLabel" name="label_5">
                  <property name="toolTip">
-                  <string>Incoming messages encoded in Utf8 will always be treated as such.
-This setting defines the encoding for messages that are not Utf8.</string>
+                  <string>Incoming messages encoded in UTF-8 will always be treated as such.
+This setting defines the encoding for messages that are not UTF-8.</string>
                  </property>
                  <property name="text">
                   <string>Receive fallback:</string>
@@ -733,8 +733,8 @@ This setting defines the encoding for messages that are not Utf8.</string>
                   </sizepolicy>
                  </property>
                  <property name="toolTip">
-                  <string>Incoming messages encoded in Utf8 will always be treated as such.
-This setting defines the encoding for messages that are not Utf8.</string>
+                  <string>Incoming messages encoded in UTF-8 will always be treated as such.
+This setting defines the encoding for messages that are not UTF-8.</string>
                  </property>
                  <property name="insertPolicy">
                   <enum>QComboBox::InsertAlphabetically</enum>
diff --git a/src/qtui/settingspages/servereditdlg.ui b/src/qtui/settingspages/servereditdlg.ui
index 29177102..2627f689 100644
--- a/src/qtui/settingspages/servereditdlg.ui
+++ b/src/qtui/settingspages/servereditdlg.ui
@@ -193,7 +193,7 @@
              <widget class="QComboBox" name="proxyType">
               <item>
                <property name="text">
-                <string>Socks 5</string>
+                <string>SOCKS 5</string>
                </property>
               </item>
               <item>