diff --git a/kmymoney2/dialogs/kbackupdlgdecl.ui b/kmymoney2/dialogs/kbackupdlgdecl.ui
index 2f27a20..8cf2dd5 100644
--- a/kmymoney2/dialogs/kbackupdlgdecl.ui
+++ b/kmymoney2/dialogs/kbackupdlgdecl.ui
@@ -98,8 +98,7 @@ Click OK to perform the backup. If your system does not use an automounter, make
                                 <cstring>lblMountPoint</cstring>
                             </property>
                             <property name="text">
-                                <string>Mount Point:</string>
-                                <comment>This is the mount point</comment>
+                                <string context="This is the mount point">Mount Point:</string>
                             </property>
                         </widget>
                         <widget class="TQLineEdit">
diff --git a/kmymoney2/dialogs/kfindtransactiondlgdecl.ui b/kmymoney2/dialogs/kfindtransactiondlgdecl.ui
index fc96f1f..f43586a 100644
--- a/kmymoney2/dialogs/kfindtransactiondlgdecl.ui
+++ b/kmymoney2/dialogs/kfindtransactiondlgdecl.ui
@@ -217,8 +217,7 @@
                                                         <cstring>TextLabel6</cstring>
                                                     </property>
                                                     <property name="text">
-                                                        <string>To</string>
-                                                        <comment>To (Date)</comment>
+                                                        <string context="To (Date)">To</string>
                                                     </property>
                                                 </widget>
                                                 <widget class="TQLabel" row="1" column="0">
@@ -226,8 +225,7 @@
                                                         <cstring>TextLabel5</cstring>
                                                     </property>
                                                     <property name="text">
-                                                        <string>From</string>
-                                                        <comment>From (Date)</comment>
+                                                        <string context="From (Date)">From</string>
                                                     </property>
                                                 </widget>
                                                 <widget class="kMyMoneyDateInput" row="2" column="1">
@@ -364,8 +362,7 @@
                                                         <cstring>TextLabel8</cstring>
                                                     </property>
                                                     <property name="text">
-                                                        <string>to</string>
-                                                        <comment>to (amount)</comment>
+                                                        <string context="to (amount)">to</string>
                                                     </property>
                                                 </widget>
                                                 <widget class="kMyMoneyEdit" row="0" column="1">
@@ -384,8 +381,7 @@
                                                         <cstring>TextLabel7</cstring>
                                                     </property>
                                                     <property name="text">
-                                                        <string>from</string>
-                                                        <comment>from (amount)</comment>
+                                                        <string context="from (amount)">from</string>
                                                     </property>
                                                 </widget>
                                                 <widget class="kMyMoneyEdit" row="1" column="1">
@@ -776,8 +772,7 @@
                                                         <cstring>TextLabel14</cstring>
                                                     </property>
                                                     <property name="text">
-                                                        <string>to</string>
-                                                        <comment>to (number)</comment>
+                                                        <string context="to (number)">to</string>
                                                     </property>
                                                 </widget>
                                                 <widget class="kMyMoneyLineEdit" row="2" column="1">
@@ -795,8 +790,7 @@
                                                         <cstring>TextLabel13</cstring>
                                                     </property>
                                                     <property name="text">
-                                                        <string>from</string>
-                                                        <comment>from (number)</comment>
+                                                        <string context="from (number)">from</string>
                                                     </property>
                                                 </widget>
                                                 <widget class="kMyMoneyLineEdit" row="1" column="1">
diff --git a/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui b/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui
index 0c23a4b..2789cdb 100644
--- a/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui
+++ b/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui
@@ -403,8 +403,7 @@ Selecting 0% will list all transactions.</string>
                                             <cstring>textLabel2</cstring>
                                         </property>
                                         <property name="text">
-                                            <string>percent.</string>
-                                            <comment>Same transaction if amount differs less than percent.</comment>
+                                            <string context="Same transaction if amount differs less than percent.">percent.</string>
                                         </property>
                                     </widget>
                                 </hbox>
diff --git a/kmymoney2/widgets/kmymoneyreportconfigtab1decl.ui b/kmymoney2/widgets/kmymoneyreportconfigtab1decl.ui
index a023c37..b996d6c 100644
--- a/kmymoney2/widgets/kmymoneyreportconfigtab1decl.ui
+++ b/kmymoney2/widgets/kmymoneyreportconfigtab1decl.ui
@@ -85,8 +85,7 @@
                 <string>Convert values to base currency</string>
             </property>
             <property name="toolTip" stdset="0">
-                <string>&lt;p&gt;Select this option to convert all values in the report to your base currency.&lt;/p&gt;&lt;p&gt;Leave it unchecked if you'd like to see values in their original currency.&lt;/p&gt;&lt;p&gt;If currencies are not converted, then subtotals will not be shown.&lt;/p&gt;</string>
-                <comment>Convert 'em!!</comment>
+                <string context="Convert 'em!!">&lt;p&gt;Select this option to convert all values in the report to your base currency.&lt;/p&gt;&lt;p&gt;Leave it unchecked if you'd like to see values in their original currency.&lt;/p&gt;&lt;p&gt;If currencies are not converted, then subtotals will not be shown.&lt;/p&gt;</string>
             </property>
         </widget>
         <widget class="TQCheckBox">