Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase

2 files changed, 16 insertions, 16 deletions

diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui
index 2ded51364..d69481f21 100644
--- a/kcontrol/kicker/menutab.ui
+++ b/kcontrol/kicker/menutab.ui
@@ -77,7 +77,7 @@
                 <cstring>m_kmenuGroup</cstring>
             </property>
             <property name="title">
-                <string>K Menu</string>
+                <string>TDE Menu</string>
             </property>
             <hbox>
                 <property name="name">
@@ -127,7 +127,7 @@
                                         <string>&amp;Name only</string>
                                     </property>
                                     <property name="whatsThis" stdset="0">
-                                        <string>When this option is selected, items in the K Menu will appear with the application's name next to the icon.</string>
+                                        <string>When this option is selected, items in the TDE Menu will appear with the application's name next to the icon.</string>
                                     </property>
                                 </widget>
                                 <widget class="TQRadioButton" row="2" column="1">
@@ -141,7 +141,7 @@
                                         <bool>true</bool>
                                     </property>
                                     <property name="whatsThis" stdset="0">
-                                        <string>When this option is selected, items in the K Menu will appear with the application's name and a brief description next to the icon.</string>
+                                        <string>When this option is selected, items in the TDE Menu will appear with the application's name and a brief description next to the icon.</string>
                                     </property>
                                 </widget>
                                 <widget class="TQRadioButton" row="3" column="1">
@@ -152,7 +152,7 @@
                                         <string>D&amp;escription only</string>
                                     </property>
                                     <property name="whatsThis" stdset="0">
-                                        <string>When this option is selected, items in the K Menu will appear with the application's brief description next to the icon.</string>
+                                        <string>When this option is selected, items in the TDE Menu will appear with the application's brief description next to the icon.</string>
                                     </property>
                                 </widget>
                                 <widget class="TQRadioButton" row="4" column="1">
@@ -166,7 +166,7 @@
                                         <string>Des&amp;cription (Name)</string>
                                     </property>
                                     <property name="whatsThis" stdset="0">
-                                        <string>When this option is selected, items in the K Menu will appear with a brief description and the application's name in brackets next to the icon.</string>
+                                        <string>When this option is selected, items in the TDE Menu will appear with a brief description and the application's name in brackets next to the icon.</string>
                                     </property>
                                 </widget>
                             </grid>
@@ -182,9 +182,9 @@
                                 <bool>true</bool>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>&lt;qt&gt;When this option is selected an image will appear down the left-hand side of the K Menu. The image will be tinted according to your color settings.
+                                <string>&lt;qt&gt;When this option is selected an image will appear down the left-hand side of the TDE Menu. The image will be tinted according to your color settings.
                                     
-                                    &lt;p&gt;&lt;b&gt;Tip&lt;/b&gt;: You can customize the image that appears in the K Menu by putting an image file called kside.png and a tileable image file called kside_tile.png in $TDEHOME/share/apps/kicker/pics.&lt;/qt&gt;</string>
+                                    &lt;p&gt;&lt;b&gt;Tip&lt;/b&gt;: You can customize the image that appears in the TDE Menu by putting an image file called kside.png and a tileable image file called kside_tile.png in $TDEHOME/share/apps/kicker/pics.&lt;/qt&gt;</string>
                             </property>
                         </widget>
                         <spacer>
@@ -209,13 +209,13 @@
 					<cstring>kcfg_ShowKMenuText</cstring>
 				</property>
 				<property name="text">
-					<string>Display text in K Menu button</string>
+					<string>Display text in TDE Menu button</string>
 				</property>
 				<property name="checked">
 					<bool>true</bool>
 				</property>
 				<property name="whatsThis" stdset="0">
-					<string>&lt;qt&gt;When this option is selected the text below will be shown in the K Menu button.</string>
+					<string>&lt;qt&gt;When this option is selected the text below will be shown in the TDE Menu button.</string>
 				</property>
 			</widget>
 			<grid>
@@ -246,7 +246,7 @@
 						</sizepolicy>
 					</property>
 					<property name="text">
-						<string>K Menu button icon:</string>
+						<string>TDE Menu button icon:</string>
 					</property>
 				</widget>
 				<widget class="KPushButton" row="3" column="3" colspan="2">
@@ -358,10 +358,10 @@
                                 <cstring>m_editKMenuButton</cstring>
                             </property>
                             <property name="text">
-                                <string>Edit &amp;K Menu</string>
+                                <string>Edit &amp;TDE Menu</string>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>Start the editor for the K menu. Here you can add, edit, remove and hide applications.</string>
+                                <string>Start the editor for the TDE Menu. Here you can add, edit, remove and hide applications.</string>
                             </property>
                         </widget>
                     </vbox>
@@ -668,7 +668,7 @@
 				<cstring>m_pSearchGroup</cstring>
 			</property>
 			<property name="title">
-				<string>K Menu Search</string>
+				<string>TDE Menu Search</string>
 			</property>
 			<grid>
 				<property name="name">
@@ -679,13 +679,13 @@
 						<cstring>kcfg_UseSearchBar</cstring>
 					</property>
 					<property name="text">
-						<string>Show search field in K Menu</string>
+						<string>Show search field in TDE Menu</string>
 					</property>
 					<property name="checked">
 						<bool>true</bool>
 					</property>
 					<property name="whatsThis" stdset="0">
-						<string>&lt;qt&gt;When this option is selected a text-based search field will appear in the K Menu.&lt;/qt&gt;</string>
+						<string>&lt;qt&gt;When this option is selected a text-based search field will appear in the TDE Menu.&lt;/qt&gt;</string>
 					</property>
 				</widget>
 				<spacer row="0" column="1" rowspan="3" colspan="1">
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index 35a89acfc..35ebdd6af 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -273,7 +273,7 @@ void MenuTab::launchMenuEditor()
                                                   true /*nowait*/ ) != 0 )
     {
         KMessageBox::error(this,
-                           i18n("The KDE menu editor (kmenuedit) could not be launched.\n"
+                           i18n("The TDE menu editor (kmenuedit) could not be launched.\n"
                            "Perhaps it is not installed or not in your path."),
                            i18n("Application Missing"));
     }