From: CryptoManiac <CryptoManiac@users.noreply.github.com>
Date: Sun, 25 Jan 2015 22:08:54 +0000 (+0300)
Subject: Merge pull request #126 from fsb4000/tooltip
X-Git-Tag: nvc-v0.5.3~130^2
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=affafa0fab7feb2db60df7be4599eaacd29da54e;hp=-c;p=novacoin.git

Merge pull request #126 from fsb4000/tooltip

Typo fix
---

affafa0fab7feb2db60df7be4599eaacd29da54e
diff --combined src/qt/forms/optionsdialog.ui
index d5da8e3,2bdd423..0572c82
--- a/src/qt/forms/optionsdialog.ui
+++ b/src/qt/forms/optionsdialog.ui
@@@ -23,7 -23,7 +23,7 @@@
        <enum>QTabWidget::North</enum>
       </property>
       <property name="currentIndex">
 -      <number>0</number>
 +      <number>1</number>
       </property>
       <widget class="QWidget" name="tabMain">
        <attribute name="title">
@@@ -233,77 -233,6 +233,77 @@@
          </layout>
         </item>
         <item>
 +        <widget class="QCheckBox" name="connectTor">
 +         <property name="text">
 +          <string>Connect through &amp;Tor:</string>
 +         </property>
 +        </widget>
 +       </item>
 +       <item>
 +        <layout class="QHBoxLayout" name="horizontalLayout_Tor">
 +         <item>
 +          <widget class="QLabel" name="torIpLabel">
 +           <property name="minimumSize">
 +            <size>
 +             <width>60</width>
 +             <height>0</height>
 +            </size>
 +           </property>
 +           <property name="text">
 +            <string>Tor IP:</string>
 +           </property>
 +          </widget>
 +         </item>
 +         <item>
 +          <widget class="QValidatedLineEdit" name="torIp">
 +           <property name="maximumSize">
 +            <size>
 +             <width>130</width>
 +             <height>16777215</height>
 +            </size>
 +           </property>
 +          </widget>
 +         </item>
 +         <item>
 +          <widget class="QLabel" name="torPortLabel">
 +           <property name="text">
 +            <string>Port:</string>
 +           </property>
 +          </widget>
 +         </item>
 +         <item>
 +          <widget class="QLineEdit" name="torPort">
 +           <property name="maximumSize">
 +            <size>
 +             <width>55</width>
 +             <height>16777215</height>
 +            </size>
 +           </property>
 +          </widget>
 +         </item>
 +         <item>
 +          <widget class="QCheckBox" name="TorOnly">
 +           <property name="text">
 +            <string>Use Tor only</string>
 +           </property>
 +          </widget>
 +         </item>
 +         <item>
 +          <spacer name="horizontalSpacer">
 +           <property name="orientation">
 +            <enum>Qt::Horizontal</enum>
 +           </property>
 +           <property name="sizeHint" stdset="0">
 +            <size>
 +             <width>40</width>
 +             <height>20</height>
 +            </size>
 +           </property>
 +          </spacer>
 +         </item>
 +        </layout>
 +       </item>
 +       <item>
          <spacer name="verticalSpacer_Network">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
@@@ -336,7 -265,7 +336,7 @@@
         <item>
          <widget class="QCheckBox" name="minimizeOnClose">
           <property name="toolTip">
-           <string>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</string>
+           <string>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</string>
           </property>
           <property name="text">
            <string>M&amp;inimize on close</string>