From fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 7 Jan 2011 04:10:07 +0000
Subject: 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
---
 kcontrol/view1394/kcmview1394.desktop | 4 ++--
 kcontrol/view1394/oui.db              | 2 +-
 kcontrol/view1394/view1394widget.ui   | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kcontrol/view1394')

diff --git a/kcontrol/view1394/kcmview1394.desktop b/kcontrol/view1394/kcmview1394.desktop
index ea0340e4a..fb1b7ad79 100644
--- a/kcontrol/view1394/kcmview1394.desktop
+++ b/kcontrol/view1394/kcmview1394.desktop
@@ -122,11 +122,11 @@ Comment[mk]=Видете ги IEEE 1394 уредите закачени на о
 Comment[mn]=Энэ компьютерт залгагдсан IEEE 1394-төхөөрөмж харуулах
 Comment[ms]=Papar peranti IEEE 1394 yang dilekapkan pada komputer ini
 Comment[mt]=Ara l-apparat IEEE 1394 imqabbad ma' dal-kompjuter
-Comment[nb]=Se hvilke IEEE 1394-enheter som er koblet til denne tqmaskinen
+Comment[nb]=Se hvilke IEEE 1394-enheter som er koblet til denne maskinen
 Comment[nds]=De IEEE1394-Reedschappen ankieken, de dissen Reekner tokoppelt sünd
 Comment[ne]=यो कम्प्युटरमा सङ्लग्न गरिएका IEEE 1394 यन्त्र देखाउनुहोस्
 Comment[nl]=Hier kunt u de IEEE 1394-apparaten die op deze computer zijn aangesloten bekijken
-Comment[nn]=Viser IEE 1394-einingane knytte til datatqmaskina
+Comment[nn]=Viser IEE 1394-einingane knytte til datamaskina
 Comment[pa]=ਆਪਣੇ ਕੰਪਿਊਟਰ ਨਾਲ ਜੁੜੇ IEEE 1394 ਜੰਤਰ ਵੇਖੋ
 Comment[pl]=Informacja o urządzeniach IEEE 1394 podłączonych do tego komputera
 Comment[pt]=Ver os dispositivos IEEE 1394 ligados a este computador
diff --git a/kcontrol/view1394/oui.db b/kcontrol/view1394/oui.db
index dfe302b5b..76f80cc84 100644
--- a/kcontrol/view1394/oui.db
+++ b/kcontrol/view1394/oui.db
@@ -3509,7 +3509,7 @@
 000E02 Advantech AMT Inc.
 000E03 Aarohi Communications, Inc.
 000E05 WIRELESS MATRIX CORP.
-000E06 Team Sitqmoco Ltd
+000E06 Team Simoco Ltd
 000E07 Sony Ericsson Mobile Communications AB
 000E08 Sipura Technology, Inc.
 000E09 Shenzhen Coship Software Co.,LTD.
diff --git a/kcontrol/view1394/view1394widget.ui b/kcontrol/view1394/view1394widget.ui
index 1677e9ab0..5b6ba13e8 100644
--- a/kcontrol/view1394/view1394widget.ui
+++ b/kcontrol/view1394/view1394widget.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>View1394Widget</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -147,7 +147,7 @@
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -163,7 +163,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -182,5 +182,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
-- 
cgit v1.2.1