apply string patches from Frederik Schwarzer

psi-im · May 6, 2009 · 8b0993f · 8b0993f
1 parent 3ef8678
commit 8b0993f
Show file tree

Hide file tree

Showing 17 changed files with 77 additions and 78 deletions.
diff --git a/src/info.ui b/src/info.ui
@@ -66,7 +66,7 @@
        <item row="5" column="0" >
         <widget class="QLabel" name="TextLabel1_2_2_2_2" >
          <property name="text" >
-          <string>E-Mail</string>
+          <string>E-Mail:</string>
          </property>
         </widget>
        </item>
@@ -76,7 +76,7 @@
        <item row="2" column="0" >
         <widget class="QLabel" name="TextLabel1_3_2_3_2" >
          <property name="text" >
-          <string>Birthday</string>
+          <string>Birthday:</string>
          </property>
         </widget>
        </item>
@@ -190,28 +190,28 @@
        <item row="0" column="0" >
         <widget class="QLabel" name="TextLabel1_2_2" >
          <property name="text" >
-          <string>Full Name</string>
+          <string>Full Name:</string>
          </property>
         </widget>
        </item>
        <item row="3" column="0" >
         <widget class="QLabel" name="TextLabel1_3_2_2_2_2" >
          <property name="text" >
-          <string>Phone #</string>
+          <string>Phone #:</string>
          </property>
         </widget>
        </item>
        <item row="4" column="0" >
         <widget class="QLabel" name="TextLabel1_2_3_2" >
          <property name="text" >
-          <string>Homepage</string>
+          <string>Homepage:</string>
          </property>
         </widget>
        </item>
        <item row="1" column="0" >
         <widget class="QLabel" name="TextLabel1_2" >
          <property name="text" >
-          <string>Nickname</string>
+          <string>Nickname:</string>
          </property>
         </widget>
        </item>
@@ -254,14 +254,14 @@
          <item row="0" column="0" >
           <widget class="QLabel" name="TextLabel1_2_2_2_3" >
            <property name="text" >
-            <string>Company</string>
+            <string>Company:</string>
            </property>
           </widget>
          </item>
          <item row="2" column="0" >
           <widget class="QLabel" name="TextLabel1_3_2_2_2_3_2" >
            <property name="text" >
-            <string>Position</string>
+            <string>Position:</string>
            </property>
           </widget>
          </item>
@@ -271,7 +271,7 @@
          <item row="1" column="0" >
           <widget class="QLabel" name="TextLabel1_2_3_3" >
            <property name="text" >
-            <string>Department</string>
+            <string>Department:</string>
            </property>
           </widget>
          </item>
@@ -284,7 +284,7 @@
          <item row="3" column="0" >
           <widget class="QLabel" name="TextLabel1_3_2_2_2_4" >
            <property name="text" >
-            <string>Role</string>
+            <string>Role:</string>
            </property>
           </widget>
          </item>
@@ -330,14 +330,14 @@
          <item row="5" column="0" >
           <widget class="QLabel" name="TextLabel1_3_2_2_2" >
            <property name="text" >
-            <string>Country</string>
+            <string>Country:</string>
            </property>
           </widget>
          </item>
          <item row="4" column="0" >
           <widget class="QLabel" name="TextLabel1_3_2_2_2_3" >
            <property name="text" >
-            <string>Postal Code</string>
+            <string>Postal Code:</string>
            </property>
           </widget>
          </item>
@@ -353,14 +353,14 @@
          <item row="3" column="0" >
           <widget class="QLabel" name="TextLabel1_2_3" >
            <property name="text" >
-            <string>State</string>
+            <string>State:</string>
            </property>
           </widget>
          </item>
          <item row="2" column="0" >
           <widget class="QLabel" name="TextLabel1_2_2_2" >
            <property name="text" >
-            <string>City</string>
+            <string>City:</string>
            </property>
           </widget>
          </item>
@@ -370,7 +370,7 @@
          <item row="0" column="0" >
           <widget class="QLabel" name="TextLabel1_3_2_3" >
            <property name="text" >
-            <string>Street</string>
+            <string>Street:</string>
            </property>
           </widget>
          </item>

diff --git a/src/mucjoin.ui b/src/mucjoin.ui
@@ -49,7 +49,7 @@
    <item row="2" column="0" colspan="2" >
     <widget class="QGroupBox" name="gb_info" >
      <property name="title" >
-      <string>Room information:</string>
+      <string>Room information</string>
      </property>
      <layout class="QGridLayout" >
       <item row="0" column="0" >

diff --git a/src/options/opt_advanced.ui b/src/options/opt_advanced.ui
@@ -22,14 +22,14 @@
    <item>
     <widget class="QCheckBox" name="ck_messageevents" >
      <property name="text" >
-      <string>Enable 'Contact is typing ...' events</string>
+      <string>Enable "Contact is typing ..." events</string>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QCheckBox" name="ck_inactiveevents" >
      <property name="text" >
-      <string>Enable 'inactivity' events (end/suspend conversation)</string>
+      <string>Enable "Inactivity" events (end/suspend conversation)</string>
      </property>
     </widget>
    </item>

diff --git a/src/options/opt_appearance.cpp b/src/options/opt_appearance.cpp
@@ -69,7 +69,7 @@ QSize FontLabel::sizeHint() const
 //----------------------------------------------------------------------------
 // OptionsTabAppearance
 //----------------------------------------------------------------------------
-OptionsTabAppearance::OptionsTabAppearance(QObject *parent) : MetaOptionsTab(parent, "appearance", "", tr("Appearance"), tr("Psi's Appearance"), "psi/appearance")
+OptionsTabAppearance::OptionsTabAppearance(QObject *parent) : MetaOptionsTab(parent, "appearance", "", tr("Appearance"), tr("Psi's appearance"), "psi/appearance")
 {    
 	addTab( new OptionsTabAppearanceGeneral(this) );
 	addTab( new OptionsTabIconsetEmoticons(this) );

diff --git a/src/options/opt_appearance.ui b/src/options/opt_appearance.ui
@@ -37,28 +37,28 @@
       <item row="0" column="3" >
        <widget class="QLabel" name="tl_cOnline" >
         <property name="text" >
-         <string>Online contacts</string>
+         <string>Online contacts:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="3" >
        <widget class="QLabel" name="TextLabel1_2" >
         <property name="text" >
-         <string>Away contacts</string>
+         <string>Away contacts:</string>
         </property>
        </widget>
       </item>
       <item row="2" column="3" >
        <widget class="QLabel" name="tl_cDND" >
         <property name="text" >
-         <string>DND contacts</string>
+         <string>DND contacts:</string>
         </property>
        </widget>
       </item>
       <item row="3" column="3" >
        <widget class="QLabel" name="tl_cOffline" >
         <property name="text" >
-         <string>Offline contacts</string>
+         <string>Offline contacts:</string>
         </property>
        </widget>
       </item>
@@ -78,14 +78,14 @@
       <item row="4" column="3" >
        <widget class="QLabel" name="tl_cListBack" >
         <property name="text" >
-         <string>Contact list background</string>
+         <string>Contact list background:</string>
         </property>
        </widget>
       </item>
       <item row="5" column="3" >
        <widget class="QLabel" name="tl_cStatus" >
         <property name="text" >
-         <string>Status messages</string>
+         <string>Status messages:</string>
         </property>
        </widget>
       </item>
@@ -134,14 +134,14 @@
       <item row="1" column="0" >
        <widget class="QLabel" name="tl_cProfileBack" >
         <property name="text" >
-         <string>Account heading background</string>
+         <string>Account heading background:</string>
         </property>
        </widget>
       </item>
       <item row="3" column="0" >
        <widget class="QLabel" name="tl_cGroupBack" >
         <property name="text" >
-         <string>Group heading background</string>
+         <string>Group heading background:</string>
         </property>
        </widget>
       </item>
@@ -274,28 +274,28 @@
       <item row="4" column="0" >
        <widget class="QLabel" name="tl_cAnimFront" >
         <property name="text" >
-         <string>Nick animation foreground</string>
+         <string>Nick animation foreground:</string>
         </property>
        </widget>
       </item>
       <item row="5" column="0" >
        <widget class="QLabel" name="tl_cAnimBack" >
         <property name="text" >
-         <string>Nick animation background</string>
+         <string>Nick animation background:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="0" >
        <widget class="QLabel" name="tl_cProfileFore" >
         <property name="text" >
-         <string>Account heading foreground</string>
+         <string>Account heading foreground:</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0" >
        <widget class="QLabel" name="tl_cGroupFore" >
         <property name="text" >
-         <string>Group heading foreground</string>
+         <string>Group heading foreground:</string>
         </property>
        </widget>
       </item>
@@ -407,21 +407,21 @@
          <bool>true</bool>
         </property>
         <property name="text" >
-         <string>Chat</string>
+         <string>Chat:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0" >
        <widget class="QLabel" name="tl_fMessage" >
         <property name="text" >
-         <string>Message</string>
+         <string>Message:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="4" >
        <widget class="QPushButton" name="pb_fMessage" >
         <property name="text" >
-         <string>Choose</string>
+         <string>Choose...</string>
         </property>
        </widget>
       </item>
@@ -431,7 +431,7 @@
          <bool>true</bool>
         </property>
         <property name="text" >
-         <string>Choose</string>
+         <string>Choose...</string>
         </property>
        </widget>
       </item>
@@ -441,28 +441,28 @@
          <bool>true</bool>
         </property>
         <property name="text" >
-         <string>Choose</string>
+         <string>Choose...</string>
         </property>
        </widget>
       </item>
       <item row="0" column="4" >
        <widget class="QPushButton" name="pb_fRoster" >
         <property name="text" >
-         <string>Choose</string>
+         <string>Choose...</string>
         </property>
        </widget>
       </item>
       <item row="0" column="0" >
        <widget class="QLabel" name="tl_fRoster" >
         <property name="text" >
-         <string>Roster</string>
+         <string>Roster:</string>
         </property>
        </widget>
       </item>
       <item row="3" column="0" >
        <widget class="QLabel" name="tl_fPopup" >
         <property name="text" >
-         <string>Popup</string>
+         <string>Popup:</string>
         </property>
        </widget>
       </item>

diff --git a/src/options/opt_chat.ui b/src/options/opt_chat.ui
@@ -89,7 +89,7 @@
        </item>
        <item>
         <property name="text" >
-         <string>for mucs and chats in one window.</string>
+         <string>for mucs and chats in one window</string>
         </property>
        </item>
        <item>
@@ -124,7 +124,7 @@
    <item>
     <widget class="QGroupBox" name="groupBox18" >
      <property name="title" >
-      <string>Default Action</string>
+      <string>Default action</string>
      </property>
      <layout class="QHBoxLayout" >
       <property name="margin" >

diff --git a/src/options/opt_general_groupchat.ui b/src/options/opt_general_groupchat.ui
@@ -40,7 +40,7 @@
         <string>Highlight lines and alert the user if this text is included in chat</string>
        </property>
        <property name="title" >
-        <string>Word Highlighting</string>
+        <string>Word highlighting</string>
        </property>
        <layout class="QVBoxLayout" >
         <property name="margin" >
@@ -153,14 +153,14 @@
      <item>
       <widget class="QCheckBox" name="ck_gcNickColoring" >
        <property name="text" >
-        <string>Enable Nick Coloring</string>
+        <string>Enable nick coloring</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QGroupBox" name="ncGroupBox" >
        <property name="title" >
-        <string>Nick Coloring</string>
+        <string>Nick coloring</string>
        </property>
        <layout class="QVBoxLayout" >
         <property name="margin" >

diff --git a/src/options/opt_iconset_emo.ui b/src/options/opt_iconset_emo.ui
@@ -89,7 +89,7 @@
       <item row="1" column="3" >
        <widget class="IconButton" name="pb_emoDetails" >
         <property name="text" >
-         <string>&amp;Show Details</string>
+         <string>&amp;Show details</string>
         </property>
        </widget>
       </item>