[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

Maximiliano Curia maxy at moszumanska.debian.org
Fri May 27 23:59:42 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=4405b79

The following commit has been merged in the master branch:
commit 4405b79099edc5e2fb68173830e67e295d7e1dff
Author: Pino Toscano <pino at kde.org>
Date:   Thu Jun 16 13:55:16 2011 +0200

    i18n: style fixes and improvements
    
    - proper capitalization in labels
    - add missing colons in labels
    - CamelCase Gadu-Gadu
    - remove extra periods in text of checkboxes
---
 butterfly/main-options-widget.ui             |  2 +-
 gabble/main-options-widget-googletalk.ui     |  2 +-
 gabble/proxy-settings-widget.ui              | 10 ++--
 gabble/server-settings-widget.ui             | 14 +++---
 haze/aim-main-options-widget.ui              | 70 ++++++++++++++--------------
 haze/aim-server-settings-widget.ui           |  4 +-
 haze/icq-server-settings-widget.ui           |  2 +-
 haze/myspaceim-main-options-widget.ui        |  2 +-
 haze/yahoo-main-options-widget.ui            |  4 +-
 haze/yahoo-server-settings-widget.ui         | 10 ++--
 rakia/rakia-advanced-options-widget.ui       |  8 ++--
 sunshine/sunshine-advanced-options-widget.ui |  2 +-
 sunshine/sunshine-main-options-widget.ui     |  2 +-
 13 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/butterfly/main-options-widget.ui b/butterfly/main-options-widget.ui
index bad99d3..e3df55b 100644
--- a/butterfly/main-options-widget.ui
+++ b/butterfly/main-options-widget.ui
@@ -26,7 +26,7 @@
    <item row="0" column="0">
     <widget class="QLabel" name="accountLabel">
      <property name="text">
-      <string>Email Address:</string>
+      <string>Email address:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
diff --git a/gabble/main-options-widget-googletalk.ui b/gabble/main-options-widget-googletalk.ui
index 8205ea1..3651bdc 100644
--- a/gabble/main-options-widget-googletalk.ui
+++ b/gabble/main-options-widget-googletalk.ui
@@ -32,7 +32,7 @@
      <item row="0" column="0">
       <widget class="QLabel" name="accountLabel">
        <property name="text">
-        <string>Email Address:</string>
+        <string>Email address:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
diff --git a/gabble/proxy-settings-widget.ui b/gabble/proxy-settings-widget.ui
index 857381a..1dadfb3 100644
--- a/gabble/proxy-settings-widget.ui
+++ b/gabble/proxy-settings-widget.ui
@@ -25,7 +25,7 @@
         <item>
          <widget class="QLabel" name="stunServerLabel">
           <property name="text">
-           <string>STUN Server:</string>
+           <string>STUN server:</string>
           </property>
          </widget>
         </item>
@@ -53,7 +53,7 @@
         <item>
          <widget class="QLabel" name="fallbackStunServerLabel">
           <property name="text">
-           <string>Fallback STUN Server:</string>
+           <string>Fallback STUN server:</string>
           </property>
          </widget>
         </item>
@@ -90,7 +90,7 @@
         <item>
          <widget class="QLabel" name="httpsProxyServerLabel">
           <property name="text">
-           <string>HTTPS Proxy Server:</string>
+           <string>HTTPS proxy server:</string>
           </property>
          </widget>
         </item>
@@ -116,7 +116,7 @@
       <item>
        <widget class="QLabel" name="fallbackSocks5ProxiesLabel">
         <property name="text">
-         <string>Fallback SOCKS 5 Proxy Servers:</string>
+         <string>Fallback SOCKS 5 proxy servers:</string>
         </property>
        </widget>
       </item>
@@ -148,7 +148,7 @@ p, li { white-space: pre-wrap; }
         <item>
          <widget class="QLabel" name="fallbackConferenceServerLabel">
           <property name="text">
-           <string>Fallback Conference Server:</string>
+           <string>Fallback conference server:</string>
           </property>
          </widget>
         </item>
diff --git a/gabble/server-settings-widget.ui b/gabble/server-settings-widget.ui
index 42cd0ae..95c5cea 100644
--- a/gabble/server-settings-widget.ui
+++ b/gabble/server-settings-widget.ui
@@ -23,7 +23,7 @@
       <item row="0" column="0">
        <widget class="QLabel" name="serverLabel">
         <property name="text">
-         <string>Server Address:</string>
+         <string>Server address:</string>
         </property>
        </widget>
       </item>
@@ -33,7 +33,7 @@
       <item row="1" column="0">
        <widget class="QLabel" name="portLabel">
         <property name="text">
-         <string>Server Port:</string>
+         <string>Server port:</string>
         </property>
        </widget>
       </item>
@@ -66,7 +66,7 @@
       <item row="0" column="0">
        <widget class="QLabel" name="keepaliveIntervalLabel">
         <property name="text">
-         <string>Keep Alive Interval:</string>
+         <string>Keep Alive interval:</string>
         </property>
        </widget>
       </item>
@@ -76,7 +76,7 @@
       <item row="4" column="0" colspan="2">
        <widget class="QCheckBox" name="lowBandwidthCheckBox">
         <property name="text">
-         <string>Use Low Bandwidth Mode.</string>
+         <string>Use low bandwidth mode</string>
         </property>
        </widget>
       </item>
@@ -121,21 +121,21 @@
       <item>
        <widget class="QCheckBox" name="requireEncryptionCheckBox">
         <property name="text">
-         <string>Require Encrypted Connection.</string>
+         <string>Require encrypted connection</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="ignoreSslErrorsCheckBox">
         <property name="text">
-         <string>Ignore SSL Errors.</string>
+         <string>Ignore SSL errors</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="oldSslCheckBox">
         <property name="text">
-         <string>Use Old-Style SSL.</string>
+         <string>Use old-style SSL</string>
         </property>
        </widget>
       </item>
diff --git a/haze/aim-main-options-widget.ui b/haze/aim-main-options-widget.ui
index eba7245..bb3a949 100644
--- a/haze/aim-main-options-widget.ui
+++ b/haze/aim-main-options-widget.ui
@@ -19,42 +19,42 @@
   <property name="windowTitle">
    <string>Account Preferences</string>
   </property>
-    <layout class="QFormLayout" name="formLayout">
-     <property name="sizeConstraint">
-      <enum>QLayout::SetMinimumSize</enum>
+  <layout class="QFormLayout" name="formLayout">
+   <property name="sizeConstraint">
+    <enum>QLayout::SetMinimumSize</enum>
+   </property>
+   <item row="0" column="0">
+    <widget class="QLabel" name="accountLabel">
+     <property name="text">
+      <string>Username:</string>
      </property>
-     <item row="0" column="0">
-      <widget class="QLabel" name="accountLabel">
-       <property name="text">
-        <string>Username</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="KLineEdit" name="accountLineEdit">
-       <property name="text">
-        <string/>
-       </property>
-       <property name="clickMessage">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="passwordLabel">
-       <property name="text">
-        <string>Password</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="KLineEdit" name="passwordLineEdit">
-       <property name="passwordMode">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="KLineEdit" name="accountLineEdit">
+     <property name="text">
+      <string/>
+     </property>
+     <property name="clickMessage">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="passwordLabel">
+     <property name="text">
+      <string>Password:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="KLineEdit" name="passwordLineEdit">
+     <property name="passwordMode">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/haze/aim-server-settings-widget.ui b/haze/aim-server-settings-widget.ui
index 68e6ce6..be02f1b 100644
--- a/haze/aim-server-settings-widget.ui
+++ b/haze/aim-server-settings-widget.ui
@@ -40,7 +40,7 @@ p, li { white-space: pre-wrap; }
    <item row="1" column="0">
     <widget class="QLabel" name="serverAddressLabel">
      <property name="text">
-      <string>Address</string>
+      <string>Address:</string>
      </property>
     </widget>
    </item>
@@ -87,7 +87,7 @@ p, li { white-space: pre-wrap; }
    <item row="4" column="0">
     <widget class="QLabel" name="encryptionLabel">
      <property name="text">
-      <string>Encryption</string>
+      <string>Encryption:</string>
      </property>
     </widget>
    </item>
diff --git a/haze/icq-server-settings-widget.ui b/haze/icq-server-settings-widget.ui
index 15b425e..ec552d4 100644
--- a/haze/icq-server-settings-widget.ui
+++ b/haze/icq-server-settings-widget.ui
@@ -95,7 +95,7 @@ p, li { white-space: pre-wrap; }
      <item row="5" column="1">
       <widget class="QCheckBox" name="allowMultipleLoginsCheckBox">
        <property name="text">
-        <string>Allow Multiple Logins</string>
+        <string>Allow multiple logins</string>
        </property>
       </widget>
      </item>
diff --git a/haze/myspaceim-main-options-widget.ui b/haze/myspaceim-main-options-widget.ui
index 73163ab..0951f38 100644
--- a/haze/myspaceim-main-options-widget.ui
+++ b/haze/myspaceim-main-options-widget.ui
@@ -51,7 +51,7 @@
      <item row="1" column="0">
       <widget class="QLabel" name="passwordLabel">
        <property name="text">
-        <string>Password</string>
+        <string>Password:</string>
        </property>
       </widget>
      </item>
diff --git a/haze/yahoo-main-options-widget.ui b/haze/yahoo-main-options-widget.ui
index ddca261..2fab597 100644
--- a/haze/yahoo-main-options-widget.ui
+++ b/haze/yahoo-main-options-widget.ui
@@ -31,7 +31,7 @@
      <item row="0" column="0">
       <widget class="QLabel" name="accountLabel">
        <property name="text">
-        <string>Username</string>
+        <string>Username:</string>
        </property>
       </widget>
      </item>
@@ -45,7 +45,7 @@
      <item row="1" column="0">
       <widget class="QLabel" name="passwordLabel">
        <property name="text">
-        <string>Password</string>
+        <string>Password:</string>
        </property>
       </widget>
      </item>
diff --git a/haze/yahoo-server-settings-widget.ui b/haze/yahoo-server-settings-widget.ui
index f478559..6645bc4 100644
--- a/haze/yahoo-server-settings-widget.ui
+++ b/haze/yahoo-server-settings-widget.ui
@@ -85,14 +85,14 @@ p, li { white-space: pre-wrap; }
      <item row="3" column="0">
       <widget class="QLabel" name="xferHostLabel">
        <property name="text">
-        <string>Host</string>
+        <string>Host:</string>
        </property>
       </widget>
      </item>
      <item row="4" column="0">
       <widget class="QLabel" name="xferPortLabel">
        <property name="text">
-        <string>Port</string>
+        <string>Port:</string>
        </property>
       </widget>
      </item>
@@ -132,7 +132,7 @@ p, li { white-space: pre-wrap; }
      <item row="6" column="0">
       <widget class="QLabel" name="roomListLocaleLablel">
        <property name="text">
-        <string>Room List</string>
+        <string>Room List:</string>
        </property>
       </widget>
      </item>
@@ -172,14 +172,14 @@ p, li { white-space: pre-wrap; }
      <item row="9" column="1">
       <widget class="QCheckBox" name="SslProxy">
        <property name="text">
-        <string>Use SSL on Proxy</string>
+        <string>Use SSL on proxy</string>
        </property>
       </widget>
      </item>
      <item row="10" column="1">
       <widget class="QCheckBox" name="ignoreInvites">
        <property name="text">
-        <string>Ignore Invites</string>
+        <string>Ignore invites</string>
        </property>
       </widget>
      </item>
diff --git a/rakia/rakia-advanced-options-widget.ui b/rakia/rakia-advanced-options-widget.ui
index c32f6c0..89febce 100644
--- a/rakia/rakia-advanced-options-widget.ui
+++ b/rakia/rakia-advanced-options-widget.ui
@@ -63,7 +63,7 @@
       <item row="0" column="0">
        <widget class="QLabel" name="proxyLabel">
         <property name="text">
-         <string>Proxy Host:</string>
+         <string>Proxy host:</string>
         </property>
        </widget>
       </item>
@@ -73,7 +73,7 @@
       <item row="1" column="0">
        <widget class="QLabel" name="portLabel">
         <property name="text">
-         <string>Proxy Port:</string>
+         <string>Proxy port:</string>
         </property>
        </widget>
       </item>
@@ -133,14 +133,14 @@
       <item row="0" column="0">
        <widget class="QLabel" name="stunServerLabel">
         <property name="text">
-         <string>STUN Server:</string>
+         <string>STUN server:</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="stunPortLabel">
         <property name="text">
-         <string>STUN Port:</string>
+         <string>STUN port:</string>
         </property>
        </widget>
       </item>
diff --git a/sunshine/sunshine-advanced-options-widget.ui b/sunshine/sunshine-advanced-options-widget.ui
index e74d3ad..8141d3e 100644
--- a/sunshine/sunshine-advanced-options-widget.ui
+++ b/sunshine/sunshine-advanced-options-widget.ui
@@ -79,7 +79,7 @@
          <string>Enable loose routing as per RFC 3261</string>
         </property>
         <property name="text">
-         <string>Synchronise your contacts with the gadu-gadu server</string>
+         <string>Synchronise your contacts with the Gadu-Gadu server</string>
         </property>
        </widget>
       </item>
diff --git a/sunshine/sunshine-main-options-widget.ui b/sunshine/sunshine-main-options-widget.ui
index 6dcd9b7..c191b10 100644
--- a/sunshine/sunshine-main-options-widget.ui
+++ b/sunshine/sunshine-main-options-widget.ui
@@ -22,7 +22,7 @@
      <item row="0" column="0">
       <widget class="QLabel" name="accountLabel">
        <property name="text">
-        <string>Account</string>
+        <string>Account:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

-- 
ktp-accounts-kcm packaging



More information about the pkg-kde-commits mailing list