Branch: master

c21f94f7 2014-10-03 21:03:56 François Andriot
Fixed incorrect renamed strings. This resolves bug 2138.
M kommander/editor/connectioneditor.ui
M kommander/editor/formwindow.cpp
M kommander/editor/mainwindowactions.cpp
M kommander/editor/propertyeditor.cpp
diff --git a/kommander/editor/connectioneditor.ui b/kommander/editor/connectioneditor.ui
index 90824b2..2f1683a 100644
--- a/kommander/editor/connectioneditor.ui
+++ b/kommander/editor/connectioneditor.ui
@@ -116,7 +116,7 @@
                 <cstring>slotBox</cstring>
             </property>
             <property name="whatsThis" stdset="0">
-                <string>&lt;b&gt;A list of Q_SLOTS for the receiver.&lt;/b&gt;&lt;p&gt;The Q_SLOTS that are displayed are only those which have arguments that correspond with the arguments of the signal that is currently selected in the Signal-list.&lt;/b&gt;</string>
+                <string>&lt;b&gt;A list of slots for the receiver.&lt;/b&gt;&lt;p&gt;The slots that are displayed are only those which have arguments that correspond with the arguments of the signal that is currently selected in the Signal-list.&lt;/b&gt;</string>
             </property>
         </widget>
         <widget class="TDEListBox" row="1" column="0">
@@ -124,7 +124,7 @@
                 <cstring>signalBox</cstring>
             </property>
             <property name="whatsThis" stdset="0">
-                <string>Displays the list of Q_SIGNALS that the widget emits.</string>
+                <string>Displays the list of signals that the widget emits.</string>
             </property>
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp
index a826329..7079629 100644
--- a/kommander/editor/formwindow.cpp
+++ b/kommander/editor/formwindow.cpp
@@ -1906,7 +1906,7 @@
 void FormWindow::layoutHorizontal()
 {
   TQWidgetList widgets(selectedWidgets());
-  LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand(i18n("Lay OutQt::Horizontally"),
+  LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand(i18n("Lay Out Horizontally"),
       this, mainContainer(), 0, widgets);
   clearSelection(false);
   commandHistory()->addCommand(cmd);
@@ -1916,7 +1916,7 @@
 void FormWindow::layoutVertical()
 {
   TQWidgetList widgets(selectedWidgets());
-  LayoutVerticalCommand *cmd = new LayoutVerticalCommand(i18n("Lay OutQt::Vertically"),
+  LayoutVerticalCommand *cmd = new LayoutVerticalCommand(i18n("Lay Out Vertically"),
       this, mainContainer(), 0, widgets);
   clearSelection(false);
   commandHistory()->addCommand(cmd);
@@ -1927,7 +1927,7 @@
 {
   TQWidgetList widgets(selectedWidgets());
   LayoutHorizontalSplitCommand *cmd =
-      new LayoutHorizontalSplitCommand(i18n("Lay OutQt::Horizontally (in splitter)"),
+      new LayoutHorizontalSplitCommand(i18n("Lay Out Horizontally (in splitter)"),
       this, mainContainer(), 0, widgets);
   clearSelection(false);
   commandHistory()->addCommand(cmd);
@@ -1938,7 +1938,7 @@
 {
   TQWidgetList widgets(selectedWidgets());
   LayoutVerticalSplitCommand *cmd =
-      new LayoutVerticalSplitCommand(i18n("Lay OutQt::Vertically (in splitter)"),
+      new LayoutVerticalSplitCommand(i18n("Lay Out Vertically (in splitter)"),
       this, mainContainer(), 0, widgets);
   clearSelection(false);
   commandHistory()->addCommand(cmd);
@@ -1972,7 +1972,7 @@
         ((TQWidget *) o)->isVisibleTo(this) && insertedWidgets.find((TQWidget *) o))
       widgets.append((TQWidget *) o);
   }
-  LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand(i18n("Lay Out ChildrenQt::Horizontally"),
+  LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand(i18n("Lay Out Children Horizontally"),
       this, mainContainer(), w, widgets);
   clearSelection(false);
   commandHistory()->addCommand(cmd);
@@ -1993,7 +1993,7 @@
         ((TQWidget *) o)->isVisibleTo(this) && insertedWidgets.find((TQWidget *) o))
       widgets.append((TQWidget *) o);
   }
-  LayoutVerticalCommand *cmd = new LayoutVerticalCommand(i18n("Lay Out ChildrenQt::Vertically"),
+  LayoutVerticalCommand *cmd = new LayoutVerticalCommand(i18n("Lay Out Children Vertically"),
       this, mainContainer(), w, widgets);
   clearSelection(false);
   commandHistory()->addCommand(cmd);
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index 1dc5424..80f490d 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -207,16 +207,16 @@
   actionEditAdjustSize->setWhatsThis(whatsThisFrom("Layout|Adjust Size"));
   actionEditAdjustSize->setEnabled(false);
 
-  actionEditHLayout = new TDEAction(i18n("Lay OutQt::Horizontally"), createIconSet("edithlayout.xpm"),
+  actionEditHLayout = new TDEAction(i18n("Lay Out Horizontally"), createIconSet("edithlayout.xpm"),
                                   CTRL + Key_H, TQT_TQOBJECT(this), TQT_SLOT(editLayoutHorizontal()), actionCollection(), "edit_layout_h");
   actionEditHLayout->setToolTip(i18n("Lays out the selected widgets horizontally"));
-  actionEditHLayout->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Horizontally"));
+  actionEditHLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out Horizontally"));
   actionEditHLayout->setEnabled(false);
 
-  actionEditVLayout = new TDEAction(i18n("Lay OutQt::Vertically"), createIconSet("editvlayout.xpm"),
+  actionEditVLayout = new TDEAction(i18n("Lay Out Vertically"), createIconSet("editvlayout.xpm"),
                                   CTRL + Key_L, TQT_TQOBJECT(this), TQT_SLOT(editLayoutVertical()), actionCollection(), "edit_layout_v");
   actionEditVLayout->setToolTip(i18n("Lays out the selected widgets vertically"));
-  actionEditVLayout->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Vertically"));
+  actionEditVLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out Vertically"));
   actionEditVLayout->setEnabled(false);
 
   actionEditGridLayout = new TDEAction(i18n("Lay Out in a Grid"), createIconSet("editgrid.xpm"),
@@ -225,18 +225,18 @@
   actionEditGridLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out in a Grid"));
   actionEditGridLayout->setEnabled(false);
 
-  actionEditSplitHorizontal = new TDEAction(i18n("Lay OutQt::Horizontally in Splitter"), createIconSet("editvlayoutsplit.xpm"),
+  actionEditSplitHorizontal = new TDEAction(i18n("Lay Out Horizontally in Splitter"), createIconSet("editvlayoutsplit.xpm"),
                                           TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLayoutHorizontalSplit()), actionCollection(),
                                           "edit_split_h");
   actionEditSplitHorizontal->setToolTip(i18n("Lays out the selected widgets horizontally in a splitter"));
-  actionEditSplitHorizontal->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Horizontally in Splitter"));
+  actionEditSplitHorizontal->setWhatsThis(whatsThisFrom("Layout|Lay Out Horizontally in Splitter"));
   actionEditSplitHorizontal->setEnabled(false);
 
-  actionEditSplitVertical = new TDEAction(i18n("Lay OutQt::Vertically in Splitter"), createIconSet("edithlayoutsplit.xpm"),
+  actionEditSplitVertical = new TDEAction(i18n("Lay Out Vertically in Splitter"), createIconSet("edithlayoutsplit.xpm"),
                                         TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLayoutVerticalSplit()), actionCollection(),
                                         "edit_split_v");
   actionEditSplitVertical->setToolTip(i18n("Lays out the selected widgets vertically in a splitter"));
-  actionEditSplitVertical->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Vertically (in Splitter)"));
+  actionEditSplitVertical->setWhatsThis(whatsThisFrom("Layout|Lay Out Vertically (in Splitter)"));
   actionEditSplitVertical->setEnabled(false);
 
   actionEditBreakLayout = new TDEAction(i18n("Break Layout"), createIconSet("editbreaklayout.xpm"),
diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp
index 6bdbb12..4893ee8 100644
--- a/kommander/editor/propertyeditor.cpp
+++ b/kommander/editor/propertyeditor.cpp
@@ -2271,11 +2271,11 @@
 
     cur = TQBitmap(sizev_width, sizev_height, sizev_bits, true);
     cur.setMask( cur );
-    comb->insertItem( cur, i18n("SizeQt::Vertical"), TQObject::SizeVerCursor );
+    comb->insertItem( cur, i18n("Size Vertical"), TQObject::SizeVerCursor );
 
     cur = TQBitmap(sizeh_width, sizeh_height, sizeh_bits, true);
     cur.setMask( cur );
-    comb->insertItem( cur, i18n("SizeQt::Horizontal"), TQObject::SizeHorCursor );
+    comb->insertItem( cur, i18n("Size Horizontal"), TQObject::SizeHorCursor );
 
     cur = TQBitmap(sizef_width, sizef_height, sizef_bits, true);
     cur.setMask( cur );
@@ -2295,11 +2295,11 @@
 
     cur = TQBitmap(vsplit_width, vsplit_height, vsplit_bits, true);
     cur.setMask( cur );
-    comb->insertItem( cur, i18n("SplitQt::Vertical"), TQObject::SplitVCursor );
+    comb->insertItem( cur, i18n("Split Vertical"), TQObject::SplitVCursor );
 
     cur = TQBitmap(hsplit_width, hsplit_height, hsplit_bits, true);
     cur.setMask( cur );
-    comb->insertItem( cur, i18n("SplitQt::Horizontal"), TQObject::SplitHCursor );
+    comb->insertItem( cur, i18n("Split Horizontal"), TQObject::SplitHCursor );
 
     cur = TQBitmap(hand_width, hand_height, hand_bits, true);
     cur.setMask( cur );