More buxfixes

Fixed Kicker loaing problem
Additional KDE->Trinity reference conversions


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

11 files changed, 25 insertions, 25 deletions

diff --git a/kicker/kicker/core/extensionSettings.kcfg b/kicker/kicker/core/extensionSettings.kcfg
index 432b1fb15..89d60b05a 100644
--- a/kicker/kicker/core/extensionSettings.kcfg
+++ b/kicker/kicker/core/extensionSettings.kcfg
@@ -106,7 +106,7 @@
 
 <entry name="CustomSize" type="Int" >
       <label>Custom size</label>
-      <default>58</default>
+      <default>30</default>
       <min>16</min>
    </entry>
 
diff --git a/kicker/kicker/panel.desktop b/kicker/kicker/panel.desktop
index ba0cad218..972255476 100644
--- a/kicker/kicker/panel.desktop
+++ b/kicker/kicker/panel.desktop
@@ -79,8 +79,8 @@ Name[zh_CN]=Trinity 面板
 Name[zh_TW]=Trinity 面板
 Name[zu]=Iwindi lemininingwane le-Trinity
 X-DCOP-ServiceType=wait
-X-Trinity-autostart-after=kdesktop
+X-KDE-autostart-after=kdesktop
 DocPath=kicker/index.html
 Type=Service
-OnlyShowIn=Trinity;
-X-Trinity-autostart-phase=0
+OnlyShowIn=KDE;
+X-KDE-autostart-phase=0
diff --git a/kpersonalizer/kcountrypagedlg.ui b/kpersonalizer/kcountrypagedlg.ui
index 47b9a97e7..72ab5f5cd 100644
--- a/kpersonalizer/kcountrypagedlg.ui
+++ b/kpersonalizer/kcountrypagedlg.ui
@@ -77,9 +77,9 @@
                 </sizepolicy>
             </property>
             <property name="text">
-                <string>&lt;p&gt;This Personalizer will help you configure the basic setup of your KDE desktop in five quick, easy steps. You can set things like your country (for date and time formats, etc.), language, desktop behavior and more.&lt;/p&gt;
-&lt;p&gt;You will be able to change all the settings later using the KDE Control Center. You may choose to postpone your personalization until later by clicking on &lt;b&gt;Skip Wizard&lt;/b&gt;. Any changes made so far, will then be reversed, except for the country and language settings. However, new users are encouraged to use this simple method.&lt;/p&gt;
-&lt;p&gt;If you already like your KDE configuration and wish to quit the Wizard, click &lt;b&gt;Skip Wizard&lt;/b&gt;, then &lt;b&gt;Quit&lt;/b&gt;.&lt;/p&gt;</string>
+                <string>&lt;p&gt;This Personalizer will help you configure the basic setup of your Trinity desktop in five quick, easy steps. You can set things like your country (for date and time formats, etc.), language, desktop behavior and more.&lt;/p&gt;
+&lt;p&gt;You will be able to change all the settings later using the Trinity Control Center. You may choose to postpone your personalization until later by clicking on &lt;b&gt;Skip Wizard&lt;/b&gt;. Any changes made so far, will then be reversed, except for the country and language settings. However, new users are encouraged to use this simple method.&lt;/p&gt;
+&lt;p&gt;If you already like your Trinity configuration and wish to quit the Wizard, click &lt;b&gt;Skip Wizard&lt;/b&gt;, then &lt;b&gt;Quit&lt;/b&gt;.&lt;/p&gt;</string>
             </property>
             <property name="textFormat">
                 <enum>RichText</enum>
@@ -97,7 +97,7 @@
                 <cstring>txt_welcome</cstring>
             </property>
             <property name="text">
-                <string>&lt;h3&gt;Welcome to KDE %VERSION%!&lt;/h3&gt;</string>
+                <string>&lt;h3&gt;Welcome to Trinity %VERSION%!&lt;/h3&gt;</string>
             </property>
         </widget>
         <widget class="QLayoutWidget" row="4" column="1">
diff --git a/kpersonalizer/keyecandypagedlg.ui b/kpersonalizer/keyecandypagedlg.ui
index c2437b0b2..4f94df4ed 100644
--- a/kpersonalizer/keyecandypagedlg.ui
+++ b/kpersonalizer/keyecandypagedlg.ui
@@ -60,7 +60,7 @@
                 </sizepolicy>
             </property>
             <property name="text">
-                <string>&lt;P&gt;KDE offers many visually appealing special effects, such as smoothed fonts, previews in the file manager and animated menus. All this beauty, however, comes at a small performance cost. &lt;/P&gt;
+                <string>&lt;P&gt;Trinity offers many visually appealing special effects, such as smoothed fonts, previews in the file manager and animated menus. All this beauty, however, comes at a small performance cost. &lt;/P&gt;
 If you have a fast, new processor, you might want to turn them all on, but for those of us with slower processors, starting off with less eye candy helps to keep your desktop more responsive.</string>
             </property>
             <property name="alignment">
diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp
index 839cc241a..9c9262a9a 100644
--- a/kpersonalizer/kospage.cpp
+++ b/kpersonalizer/kospage.cpp
@@ -38,7 +38,7 @@
 
 KOSPage::KOSPage(TQWidget *parent, const char *name ) : KOSPageDlg(parent,name) {
 	px_osSidebar->setPixmap(UserIcon("step2.png"));
-	// initialize the textview with the default description - KDE of course
+	// initialize the textview with the default description - Trinity of course
 	slotKDEDescription();
 	// Set the configfiles
 	cglobal = new KConfig("kdeglobals");
@@ -353,7 +353,7 @@ void KOSPage::slotKDEDescription(){
 	"<b>Titlebar double-click:</b> <i>Shade window</i><br>"
 	"<b>Mouse selection:</b> <i>Single click</i><br>"
 	"<b>Application startup notification:</b> <i>busy cursor</i><br>"
-	"<b>Keyboard scheme:</b> <i>KDE default</i><br>"
+	"<b>Keyboard scheme:</b> <i>Trinity default</i><br>"
 	));
 }
 
@@ -394,7 +394,7 @@ void KOSPage::slotMacDescription(){
 }
 
 
-/** retrieves the user's local values. In case he doesn't have these set, use the default values of KDE */
+/** retrieves the user's local values. In case he doesn't have these set, use the default values of Trinity */
 void KOSPage::getUserDefaults(){
 	ckcmdisplay->setGroup("KDE");
 	b_MacMenuBar = ckcmdisplay->readBoolEntry("macStyle", false);
diff --git a/kpersonalizer/kospagedlg.ui b/kpersonalizer/kospagedlg.ui
index 68888b1a6..adf084844 100644
--- a/kpersonalizer/kospagedlg.ui
+++ b/kpersonalizer/kospagedlg.ui
@@ -76,7 +76,7 @@
                         <cstring>rb_kde</cstring>
                     </property>
                     <property name="text">
-                        <string>KDE (TM)</string>
+                        <string>Trinity (TM)</string>
                     </property>
                     <property name="checked">
                         <bool>true</bool>
@@ -123,7 +123,7 @@
             <property name="text">
                 <string>&lt;b&gt;System Behavior&lt;/b&gt;&lt;br&gt;
 Graphical User Interfaces behave differently on various Operating Systems.
-KDE allows you to customize its behavior according to your needs.</string>
+Trinity allows you to customize its behavior according to your needs.</string>
             </property>
         </widget>
         <spacer row="1" column="1">
@@ -165,7 +165,7 @@ KDE allows you to customize its behavior according to your needs.</string>
                 <cstring>TextLabel2</cstring>
             </property>
             <property name="text">
-                <string>For motion impaired users, KDE provides keyboard gestures to activate special keyboard settings.</string>
+                <string>For motion impaired users, Trinity provides keyboard gestures to activate special keyboard settings.</string>
             </property>
             <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp
index 6b3692a04..e28848cc0 100644
--- a/kpersonalizer/kpersonalizer.cpp
+++ b/kpersonalizer/kpersonalizer.cpp
@@ -150,7 +150,7 @@ bool KPersonalizer::askClose(){
 	TQString text;
 	if (currentPage()==countrypage) {
 		text = i18n("<p>Are you sure you want to quit the Desktop Settings Wizard?</p>"
-		            "<p>The Desktop Settings Wizard helps you to configure the KDE desktop to your personal liking.</p>"
+		            "<p>The Desktop Settings Wizard helps you to configure the Trinity desktop to your personal liking.</p>"
 		            "<p>Click <b>Cancel</b> to return and finish your setup.</p>");
 	} else {
 		text = i18n("<p>Are you sure you want to quit the Desktop Settings Wizard?</p>"
@@ -188,7 +188,7 @@ void KPersonalizer::accept(){
 	exit(0);
 }
 
-/** calls all save functions after resetting all features/ OS/ theme selections to KDE default */
+/** calls all save functions after resetting all features/ OS/ theme selections to Trinity default */
 void KPersonalizer::setDefaults(){
 	// KCountryPage: The user may need his native language anyway
 	if(os_dirty)
@@ -223,7 +223,7 @@ void KPersonalizer::restarted(){
 	showPage(ospage);
 }
 
-/** when kpersonalizer is started before KDE session, it doesn't
+/** when kpersonalizer is started before Trinity session, it doesn't
 	offer a button for starting KControl, it also doesn't restart
 	itself automatically and only exits with exitcode 1 */
 void KPersonalizer::setBeforeSession(){
diff --git a/kpersonalizer/kpersonalizer.h b/kpersonalizer/kpersonalizer.h
index 5eeb7907e..871b42707 100644
--- a/kpersonalizer/kpersonalizer.h
+++ b/kpersonalizer/kpersonalizer.h
@@ -50,12 +50,12 @@ public:
 	/** this session is restarted, so we want to start with ospage */
 	void restarted();
 
-	/** KPersonalizer is running before KDE is started */
+	/** KPersonalizer is running before Trinity is started */
 	static void setBeforeSession();
 	static bool beforeSession() { return before_session; }
 
 public slots: // Public slots
-	/** calls all save functions after resetting all features/ OS/ theme selections to KDE default */
+	/** calls all save functions after resetting all features/ OS/ theme selections to Trinity default */
 	void setDefaults();
 	/** the cancel button is connected to the reject() slot of TQDialog,
 	*  so we have to reimplement this here to add a dialogbox to
@@ -88,7 +88,7 @@ protected slots: // Public slots
 	void slotRestart();
 
 protected: // Protected methods
-	// the close button on the titlebar sets e->accept() which we don�t want.
+	// the close button on the titlebar sets e->accept() which we don�t want.
 	virtual void closeEvent(TQCloseEvent*);
 	bool askClose();
 };
diff --git a/kpersonalizer/krefinepagedlg.ui b/kpersonalizer/krefinepagedlg.ui
index b40a82294..8d5b58357 100644
--- a/kpersonalizer/krefinepagedlg.ui
+++ b/kpersonalizer/krefinepagedlg.ui
@@ -78,7 +78,7 @@
                         </sizepolicy>
                     </property>
                     <property name="text">
-                        <string>You can refine the settings you made by starting the KDE Control Center by choosing the entry &lt;b&gt;Control Center&lt;/b&gt; in the K menu.</string>
+                        <string>You can refine the settings you made by starting the Trinity Control Center by choosing the entry &lt;b&gt;Control Center&lt;/b&gt; in the K menu.</string>
                     </property>
                     <property name="alignment">
                         <set>WordBreak|AlignTop|AlignLeft</set>
@@ -130,7 +130,7 @@
                 </sizepolicy>
             </property>
             <property name="text">
-                <string>You can also start the KDE Control Center using the button below.</string>
+                <string>You can also start the Trinity Control Center using the button below.</string>
             </property>
             <property name="alignment">
                 <set>WordBreak|AlignCenter</set>
@@ -200,7 +200,7 @@
                         <cstring>pb_kcontrol</cstring>
                     </property>
                     <property name="text">
-                        <string>&amp;Launch KDE Control Center</string>
+                        <string>&amp;Launch Trinity Control Center</string>
                     </property>
                 </widget>
                 <spacer>
diff --git a/kpersonalizer/main.cpp b/kpersonalizer/main.cpp
index 09b6b394e..b1707dfb6 100644
--- a/kpersonalizer/main.cpp
+++ b/kpersonalizer/main.cpp
@@ -29,7 +29,7 @@ static const char description[] = I18N_NOOP("KPersonalizer");
 static KCmdLineOptions options[] =
 {
 	{ "r", I18N_NOOP("Personalizer is restarted by itself"), 0 },
-	{ "before-session", I18N_NOOP("Personalizer is running before KDE session"), 0 },
+	{ "before-session", I18N_NOOP("Personalizer is running before Trinity session"), 0 },
         KCmdLineLastOption
 };
 
diff --git a/kpersonalizer/pics/step1.png b/kpersonalizer/pics/step1.png
index f77b5b534..b9e71ae97 100644
--- a/kpersonalizer/pics/step1.png
+++ b/kpersonalizer/pics/step1.png