Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 26 insertions, 26 deletions

diff --git a/kxkb/kcmlayoutwidget.ui b/kxkb/kcmlayoutwidget.ui
index 8e9f9d79e..82c866009 100644
--- a/kxkb/kcmlayoutwidget.ui
+++ b/kxkb/kcmlayoutwidget.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>LayoutConfigWidget</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>600</width>
             <height>510</height>
@@ -34,7 +34,7 @@
             <property name="name">
                 <cstring>tabWidget</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>600</width>
                     <height>500</height>
@@ -56,7 +56,7 @@
                             <cstring>chkEnable</cstring>
                         </property>
                         <property name="text">
-                            <string>&amp;Enable keyboard tqlayouts</string>
+                            <string>&amp;Enable keyboard layouts</string>
                         </property>
                         <property name="checked">
                             <bool>true</bool>
@@ -70,7 +70,7 @@
                             <string></string>
                         </property>
                         <property name="whatsThis" stdset="0">
-                            <string>&lt;h1&gt;Keyboard Layout&lt;/h1&gt; Here you can choose your keyboard tqlayout and model. The 'model' refers to the type of keyboard that is connected to your computer, while the keyboard tqlayout defines "which key does what" and may be different for different countries.</string>
+                            <string>&lt;h1&gt;Keyboard Layout&lt;/h1&gt; Here you can choose your keyboard layout and model. The 'model' refers to the type of keyboard that is connected to your computer, while the keyboard layout defines "which key does what" and may be different for different countries.</string>
                         </property>
                         <grid>
                             <property name="name">
@@ -81,7 +81,7 @@
                                     <cstring>textLabel1_4</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Available tqlayouts:</string>
+                                    <string>Available layouts:</string>
                                 </property>
                             </widget>
                             <widget class="QLabel" row="2" column="2" rowspan="1" colspan="3">
@@ -89,7 +89,7 @@
                                     <cstring>textLabel1_4_2</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Active tqlayouts:</string>
+                                    <string>Active layouts:</string>
                                 </property>
                             </widget>
                             <widget class="QLabel" row="0" column="2" rowspan="1" colspan="3">
@@ -116,7 +116,7 @@
                                     </sizepolicy>
                                 </property>
                                 <property name="whatsThis" stdset="0">
-                                    <string>Here you can choose a keyboard model. This setting is independent of your keyboard tqlayout and refers to the "hardware" model, i.e. the way your keyboard is manufactured. Modern keyboards that come with your computer usually have two extra keys and are referred to as "104-key" models, which is probably what you want if you do not know what kind of keyboard you have.
+                                    <string>Here you can choose a keyboard model. This setting is independent of your keyboard layout and refers to the "hardware" model, i.e. the way your keyboard is manufactured. Modern keyboards that come with your computer usually have two extra keys and are referred to as "104-key" models, which is probably what you want if you do not know what kind of keyboard you have.
 </string>
                                 </property>
                             </widget>
@@ -194,12 +194,12 @@
                                     <bool>true</bool>
                                 </property>
                                 <property name="whatsThis" stdset="0">
-                                    <string>If more than one tqlayout is present in this list, the KDE panel will offer a docked flag. By clicking on this flag you can easily switch between tqlayouts. The first tqlayout will be default one.</string>
+                                    <string>If more than one layout is present in this list, the KDE panel will offer a docked flag. By clicking on this flag you can easily switch between layouts. The first layout will be default one.</string>
                                 </property>
                             </widget>
                             <widget class="QLayoutWidget" row="4" column="2" rowspan="1" colspan="3">
                                 <property name="name">
-                                    <cstring>tqlayout10</cstring>
+                                    <cstring>layout10</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -303,7 +303,7 @@
                                 <property name="name">
                                     <cstring>listLayoutsSrc</cstring>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>260</width>
                                         <height>0</height>
@@ -313,7 +313,7 @@
                                     <bool>true</bool>
                                 </property>
                                 <property name="whatsThis" stdset="0">
-                                    <string>This is the list of available keyboard tqlayouts in your system. You can add tqlayout to the active list by selecting it and pressing "Add" button.</string>
+                                    <string>This is the list of available keyboard layouts in your system. You can add layout to the active list by selecting it and pressing "Add" button.</string>
                                 </property>
                             </widget>
                             <widget class="QLineEdit" row="8" column="1" rowspan="1" colspan="4">
@@ -324,7 +324,7 @@
                                     <bool>true</bool>
                                 </property>
                                 <property name="whatsThis" stdset="0">
-                                    <string>This is the command which is executed when switching to the selected tqlayout. It may help you if you want to debug tqlayout switching, or if you want to switch tqlayouts without the help of KDE.</string>
+                                    <string>This is the command which is executed when switching to the selected layout. It may help you if you want to debug layout switching, or if you want to switch layouts without the help of KDE.</string>
                                 </property>
                             </widget>
                             <widget class="QCheckBox" row="7" column="2" rowspan="1" colspan="3">
@@ -335,10 +335,10 @@
                                     <bool>false</bool>
                                 </property>
                                 <property name="text">
-                                    <string>Include latin tqlayout</string>
+                                    <string>Include latin layout</string>
                                 </property>
                                 <property name="whatsThis" stdset="0">
-                                    <string>If after you switch to this tqlayout some keyboard shortcuts based on latin keys do not work try to enable this option.</string>
+                                    <string>If after you switch to this layout some keyboard shortcuts based on latin keys do not work try to enable this option.</string>
                                 </property>
                             </widget>
                             <widget class="QLabel" row="6" column="2">
@@ -379,7 +379,7 @@
                                     <cstring>comboVariant</cstring>
                                 </property>
                                 <property name="whatsThis" stdset="0">
-                                    <string>Here you can choose a variant of selected keyboard tqlayout. Layout variants usually represent different key maps for the same language. For example, Ukrainian tqlayout might have four variants: basic, winkeys (as in Windows), typewriter (as in typewriters) and phonetic (each Ukrainian letter is placed on a transliterated latin one).
+                                    <string>Here you can choose a variant of selected keyboard layout. Layout variants usually represent different key maps for the same language. For example, Ukrainian layout might have four variants: basic, winkeys (as in Windows), typewriter (as in typewriters) and phonetic (each Ukrainian letter is placed on a transliterated latin one).
 </string>
                                 </property>
                             </widget>
@@ -393,7 +393,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>210</width>
                                         <height>20</height>
@@ -410,7 +410,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>210</width>
                                         <height>20</height>
@@ -442,7 +442,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
@@ -477,7 +477,7 @@
                                     <bool>true</bool>
                                 </property>
                                 <property name="whatsThis" stdset="0">
-                                    <string>If you select "Application" or "Window" switching policy, changing the keyboard tqlayout will only affect the current application or window.</string>
+                                    <string>If you select "Application" or "Window" switching policy, changing the keyboard layout will only affect the current application or window.</string>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -523,7 +523,7 @@
                                     <bool>true</bool>
                                 </property>
                                 <property name="whatsThis" stdset="0">
-                                    <string>Shows country flag on background of tqlayout name in tray icon</string>
+                                    <string>Shows country flag on background of layout name in tray icon</string>
                                 </property>
                             </widget>
                             <widget class="QGroupBox" row="2" column="1">
@@ -545,7 +545,7 @@
                                             <string>Enable sticky switching</string>
                                         </property>
                                         <property name="whatsThis" stdset="0">
-                                            <string>If you have more than two tqlayouts and turn this option on, switching with the keyboard shortcut or clicking on the kxkb indicator will only cycle through the last few tqlayouts. You can specify the number of tqlayouts to rotate below. You can still access all tqlayouts by right-clicking on the kxkb indicator.</string>
+                                            <string>If you have more than two layouts and turn this option on, switching with the keyboard shortcut or clicking on the kxkb indicator will only cycle through the last few layouts. You can specify the number of layouts to rotate below. You can still access all layouts by right-clicking on the kxkb indicator.</string>
                                         </property>
                                     </widget>
                                     <widget class="QLabel" row="1" column="0">
@@ -556,7 +556,7 @@
                                             <bool>false</bool>
                                         </property>
                                         <property name="text">
-                                            <string>Number of tqlayouts to rotate:</string>
+                                            <string>Number of layouts to rotate:</string>
                                         </property>
                                         <property name="buddy" stdset="0">
                                             <cstring>spinBox1</cstring>
@@ -583,7 +583,7 @@
                                     <cstring>chkShowSingle</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Show indicator for single tqlayout</string>
+                                    <string>Show indicator for single layout</string>
                                 </property>
                             </widget>
                         </grid>
@@ -710,6 +710,6 @@
     <include location="local" impldecl="in implementation">kdialogbase.h</include>
 </includes>
 <pixmapfunction>SmallIcon</pixmapfunction>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>