[patch] patch between 1.1 vanilla and debian release

svn154.diff (text/plain), 66.97 KB, created by Patrizio Bassi on 2009-12-04 19:16:30 UTC

diff -Naur gtk-qt-engine/ChangeLog gtk-qt-engine/ChangeLog
--- gtk-qt-engine/ChangeLog	2008-03-11 02:30:19.000000000 +0100
+++ gtk-qt-engine/ChangeLog	2008-08-06 23:12:46.000000000 +0200
@@ -1,9 +1,19 @@
-Changes since 0.8
+Changes since 1.1
 
 Improvements:
- * Ported to Qt4
+ * Set the environment variable GTK_QT_ENGINE_ACTIVE.  Style developers can
+ check for the presence of this variable to change their behaviour depending
+ on whether the their theme is being used by GTK.
+ * Use KDE4's tooltip colors properly
+ * Patch from Thomas Lübking - improve colors in Bespin
+
+Bug fixes:
+ * Fix a divide by 0 exception in styles where there are no scrollbar buttons
+ (cloudcity)
+ * Fix a crash in Firefox's open file dialog
 
 i18n:
- * Updated .pot
- * Included Czech translation by David Watzke
- * Included Italian translation by Davide Madrisan
+ * Korean translation by Park Shinjo
+ * Chinese Simplified translation by nihui
+ * Brazilian portuguese translation by Gustavo Serra Scalet
+ * Updated German translation from Jannick Kuhr
diff -Naur gtk-qt-engine/kcm_gtk/CMakeLists.txt gtk-qt-engine/kcm_gtk/CMakeLists.txt
--- gtk-qt-engine/kcm_gtk/CMakeLists.txt	2008-03-11 02:30:19.000000000 +0100
+++ gtk-qt-engine/kcm_gtk/CMakeLists.txt	2009-12-04 19:53:43.000000000 +0100
@@ -16,7 +16,7 @@
 
 KDE4_ADD_PLUGIN(kcm_gtk4 ${kcm_gtk4_SOURCES})
 
-INCLUDE_DIRECTORIES(${KDE4_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR})
 LINK_DIRECTORIES(${KDE4_LIB_DIR})
 
 TARGET_LINK_LIBRARIES(kcm_gtk4 ${KDE4_KDECORE_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
diff -Naur gtk-qt-engine/po/CMakeLists.txt gtk-qt-engine/po/CMakeLists.txt
--- gtk-qt-engine/po/CMakeLists.txt	2008-03-11 02:30:19.000000000 +0100
+++ gtk-qt-engine/po/CMakeLists.txt	2009-12-04 19:53:32.000000000 +0100
@@ -1,46 +1,23 @@
-# .po to .gmo stuff
+FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt)
+
 FILE(GLOB _pofiles *.po)
 
-FOREACH(_file ${_pofiles})
-	GET_FILENAME_COMPONENT(_file_we ${_file} NAME_WE)
-	SET(_out "${_file_we}.gmo")
-	SET(_in "${_file_we}.po")
-	
-	ADD_CUSTOM_COMMAND(
-		OUTPUT ${_out}
-		COMMAND ${MSGFMT_EXECUTABLE} -o ${_out} ${_in}
-		DEPENDS ${_in}
-	)
-	
-	INSTALL(
-		FILES ${_out}
-		DESTINATION share/locale/${_file_we}/LC_MESSAGES/
-		RENAME gtkqtengine.mo
-	)
-	
-	SET(_outputs ${_outputs} ${_out})
-ENDFOREACH(_file)
-
-ADD_CUSTOM_TARGET(
-	pofiles ALL
-	DEPENDS ${_outputs}
-)
-
-
-# Stuff to generate the .pot
-FILE(GLOB POT_UIFILES ../kcm_gtk/*.ui)
-SET(POT_SOURCES ../kcm_gtk/kcmgtk.cpp)
-SET(POT_OUTPUT gtkqtengine.pot)
-
-ADD_CUSTOM_COMMAND(
-	OUTPUT _${POT_OUTPUT}
-	COMMAND ${EXTRACTRC_PATH} ${POT_UIFILES} > rc.cpp
-	COMMAND ${XGETTEXT_PATH} --foreign-user -C -ci18n -ki18n -ktr2i18n
-		-kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -o ${POT_OUTPUT} rc.cpp ${POT_SOURCES}
-	COMMAND rm rc.cpp
-)
-
-ADD_CUSTOM_TARGET(
-	extract_messages
-	DEPENDS _${POT_OUTPUT}
-)
+FOREACH(_current_PO_FILE ${_pofiles})
+   SET(_addToAll ALL)
+   SET(_installDest ${LOCALE_INSTALL_DIR})
+
+   GET_FILENAME_COMPONENT(_basename ${_current_PO_FILE} NAME_WE)
+      SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.gmo)
+   message(STATUS gmo file: ${_gmoFile})
+      add_custom_command(OUTPUT ${_gmoFile}
+            COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_current_PO_FILE}
+            WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+            DEPENDS ${_current_PO_FILE}
+         )
+
+   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.gmo DESTINATION ${_installDest}/${_basename}/LC_MESSAGES/ RENAME gtkqtengine.mo)
+
+   LIST(APPEND _gmoFiles ${_gmoFile})
+ENDFOREACH(_current_PO_FILE)
+
+ADD_CUSTOM_TARGET(pofiles ${_addToAll} DEPENDS ${_gmoFiles})
diff -Naur gtk-qt-engine/po/de.po gtk-qt-engine/po/de.po
--- gtk-qt-engine/po/de.po	2008-03-11 02:30:19.000000000 +0100
+++ gtk-qt-engine/po/de.po	2008-08-06 23:12:46.000000000 +0200
@@ -4,148 +4,261 @@
 #
 # Sebastian Roth <[e-mail]>, 2005.
 # Jannick Kuhr <[e-mail]>, 2006.
+# Jannick Kuhr <[e-mail]>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-12 20:48+0000\n"
-"PO-Revision-Date: 2006-07-07 17:07+0200\n"
-"Last-Translator: Jannick Kuhr <[e-mail]>\n"
-"Language-Team: Deutsch <[e-mail]>\n"
+"POT-Creation-Date: 2008-04-03 10:54+0100\n"
+"PO-Revision-Date: 2008-07-28 14:56+0200\n"
+"Last-Translator: Jannick Kuhr <[e-mail]>\n"
+"Language-Team: German <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.2\n"
+"X-Generator: Lokalize 0.2\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Sebastian Roth, Jannick Kuhr"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "[e-mail], [e-mail]"
-
-#: kcmgtk.cpp:206
-msgid "%1 (size %2)"
-msgstr "%1 (Größe %2)"
-
-#: kcmgtk.cpp:351
-msgid "No Mozilla profiles found"
-msgstr "Keine Mozilla-Profile gefunden"
-
-#: kcmgtk.cpp:351
-msgid "Could not load Mozilla profiles"
-msgstr "Die Mozilla-Profile konnten nicht geladen werden"
-
-#: kcmgtk.cpp:363 kcmgtk.cpp:407 kcmgtk.cpp:524
-msgid "Mozilla profile"
-msgstr "Mozilla-Profil"
-
-#: kcmgtk.cpp:378
-msgid "Thunderbird"
-msgstr "Thunderbird"
-
-#: kcmgtk.cpp:378
-msgid "Firefox"
-msgstr "Firefox"
-
-#: kcmgtk.cpp:407
-msgid ""
-"Your Mozilla profile was updated sucessfully.  You must close and restart "
-"all Firefox and Thunderbird windows for the changes to take effect"
-msgstr "Das Mozilla-Profil wurde erfolgreich aktualisiert. Alle laufenden Firefox- und Thunderbird-Fenster müssen geschlossen und neu geöffnet werden, um die Änderungen zu übernehmen."
-
-#: kcmgtk.cpp:524
-msgid "Could not write to %1"
-msgstr "%1 ließ sich nicht schreiben"
-
-#: kcmgtkwidget.cpp:191 mozillaprofile.cpp:62
-msgid "Form2"
-msgstr "Form2"
-
-#: kcmgtkwidget.cpp:192
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 13
+#: rc.cpp:3
+msgid "Dialog"
+msgstr "Dialog"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 19
+#: rc.cpp:6
 msgid "GTK Styles"
 msgstr "GTK-Stile"
 
-#: kcmgtkwidget.cpp:193
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 45
+#: rc.cpp:9
 msgid "&Use my KDE style in GTK applications"
-msgstr "KDE-Stil in GTK-Anwendungen verwenden"
+msgstr "KDE-Stil in GTK-Anwendungen &verwenden"
 
-#: kcmgtkwidget.cpp:194
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 52
+#: rc.cpp:12
 msgid "Use &another style:"
-msgstr "Anderen Stil verwenden:"
+msgstr "&Anderen Stil verwenden:"
 
-#: kcmgtkwidget.cpp:195
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 84
+#: rc.cpp:15
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Warning:</span> The Gtk-Qt theme engine is not installed. This "
+"means you will not be able to use your KDE style in GTK applications.</p></"
+"body></html>"
+msgstr ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Warnung:</span> Die Gtk-Qt-Theme-Engine ist nicht installiert. Das bedeutet, dass "
+"Sie Ihren KDE-Stil nicht in GTK-Anwendungen verwenden können.</p></"
+"body></html>"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 94
+#: rc.cpp:21
 msgid "Gtk-Qt theme engine homepage"
 msgstr "Homepage der Gtk-Qt-Theme-Engine"
 
-#: kcmgtkwidget.cpp:196
-msgid "http://gtk-qt.ecs.soton.ac.uk/"
-msgstr "http://gtk-qt.ecs.soton.ac.uk/"
-
-#: kcmgtkwidget.cpp:197
-msgid ""
-"<b>Warning:</b> The Gtk-Qt theme engine is not installed.  This means you "
-"will not be able to use your KDE style in GTK applications."
-msgstr "<b>Warnung:</b> Die Gtk-Qt-Theme-Engine ist nicht installiert. Das bedeutet ,dass Ihre KDE-Stile nicht in GTK-Anwendungen verwendet werden können."
-
-#: kcmgtkwidget.cpp:198
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 97
+#: rc.cpp:24
+msgid "http://gtk-qt.ecs.soton.ac.uk"
+msgstr "http://gtk-qt.ecs.soton.ac.uk"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 104
+#: rc.cpp:27
+msgid "Change search paths..."
+msgstr "Suchpfade ändern ..."
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 127
+#: rc.cpp:30
 msgid "GTK Fonts"
 msgstr "GTK-Schriftarten"
 
-#: kcmgtkwidget.cpp:199
-msgid "Change..."
-msgstr "Ändern ..."
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 157
+#: rc.cpp:33
+msgid "Use m&y KDE fonts in GTK applications"
+msgstr "&KDE-Schriftarten in GTK-Anwendungen verwenden"
 
-#: kcmgtkwidget.cpp:200
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 164
+#: rc.cpp:36
 msgid "Use another font:"
 msgstr "Eine andere Schriftart verwenden:"
 
-#: kcmgtkwidget.cpp:201
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 171
+#: rc.cpp:39
+msgid "Change..."
+msgstr "Ändern ..."
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 198
+#: rc.cpp:42
 msgid "The Quick Brown Fox Jumped Over The Lazy Dog"
 msgstr "Falsches Üben von Xylophonmusik quält jeden größeren Zwerg"
 
-#: kcmgtkwidget.cpp:202
-msgid "Use m&y KDE fonts in GTK applications"
-msgstr "KDE-Schriftarten in GTK-Anwendungen verwenden"
-
-#: kcmgtkwidget.cpp:203
-msgid "Preview line 1"
-msgstr "Vorschauzeile 1"
-
-msgid "GTK Keyboard Shortcuts"
-msgstr "GTK-Tastenkürzel"
-
-msgid "Use Emacs-like key&board shortcuts for text editing"
-msgstr "Emacs-Tastenkürzel zum Editieren von Text verwenden"
-
-#: kcmgtkwidget.cpp:204
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 211
+#: rc.cpp:45
 msgid "Firefox and Thunderbird"
 msgstr "Firefox und Thunderbird"
 
-#: kcmgtkwidget.cpp:205
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 247
+#: rc.cpp:48
 msgid ""
 "Scrollbar buttons may sometimes be displayed incorrectly in Firefox and "
 "Thunderbird.  This can be fixed by installing some files into your Mozilla "
 "profile."
 msgstr ""
-"Die Knöpfe der Bildlaufleiste werden in Firefox und Thunderbird gelegentlich falsch dargestellt. Dies kann durch das Installieren einiger Dateien "
-"in das Mozilla-Profilverzeichnis behoben werden."
-
-#: kcmgtkwidget.cpp:206
+"Die Knöpfe der Bildlaufleiste werden in Firefox und Thunderbird gelegentlich "
+"falsch dargestellt. Dies kann durch das Installieren einiger Dateien in das "
+"Mozilla-Profilverzeichnis behoben werden."
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 257
+#: rc.cpp:51
 msgid "I&nstall scrollbar fix..."
-msgstr "Korrektur für Bildlaufleiste installieren ..."
+msgstr "Korrektur für Bildlaufleiste i&nstallieren ..."
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 286
+#: rc.cpp:54
+msgid ""
+"Note that changes made here will only affect GTK applications when KDE is "
+"running.  To change the styles and fonts used by applications in GNOME, use "
+"the GNOME configuration tools."
+msgstr ""
+"Beachten Sie, dass die hier durchgeführten Änderungen GTK-Anwendungen nur betreffen, sofern sie "
+"unter KDE ausgeführt werden. Verwenden Sie die Gnome-Einrichtungswerkzeuge, um die Stile und "
+"Schriftarten von Anwendungen in Gnome zu verändern "
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/searchpaths.ui line 13
+#: rc.cpp:57
+msgid "Change search paths"
+msgstr "Suchpfade ändern"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/searchpaths.ui line 19
+#: rc.cpp:60
+msgid ""
+"The control center module could not find the GTK-Qt theme engine in its list "
+"of search paths.  If you have installed it elsewhere, you will need to add "
+"the correct path to the list below."
+msgstr ""
+"Das Kontrollzentrum-Modul konnte die GTK-Qt-Theme-Engine nicht in der Liste der Suchpfade finden. "
+"Wenn Sie sie an einem anderen Ort installiert haben, müssen Sie den korrekten Pfad der Liste "
+"hinzufügen."
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/searchpaths.ui line 43
+#: rc.cpp:63
+msgid "Add"
+msgstr "Hinzufügen"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/searchpaths.ui line 56
+#: rc.cpp:66
+msgid "Remove"
+msgstr "Entfernen"
+
+#: ../kcm_gtk/kcmgtk.cpp:71
+msgid "kcm_gtk4"
+msgstr "kcm_gtk4"
+
+#: ../kcm_gtk/kcmgtk.cpp:74
+msgid "Change the appearance of GTK applications"
+msgstr "Das Erscheinungsbild von GTK-Anwednungen ändern"
+
+#: ../kcm_gtk/kcmgtk.cpp:109
+msgid "%1 (size %2)"
+msgstr "%1 (Größe %2)"
+
+#: ../kcm_gtk/firefoxfix.cpp:48
+msgid "No Mozilla profiles found"
+msgstr "Keine Mozilla-Profile gefunden"
+
+#: ../kcm_gtk/firefoxfix.cpp:48
+msgid "Could not load Mozilla profiles"
+msgstr "Die Mozilla-Profile konnten nicht geladen werden"
+
+#: ../kcm_gtk/firefoxfix.cpp:55
+msgid ""
+"Your Mozilla profile was updated sucessfully.  You must close and restart "
+"all Firefox and Thunderbird windows for the changes to take effect"
+msgstr ""
+"Das Mozilla-Profil wurde erfolgreich aktualisiert. Alle laufenden Firefox- "
+"und Thunderbird-Fenster müssen geschlossen und neu geöffnet werden, um die "
+"Änderungen zu übernehmen."
+
+#: ../kcm_gtk/firefoxfix.cpp:55 ../kcm_gtk/firefoxfix.cpp:191
+msgid "Mozilla profile"
+msgstr "Mozilla-Profil"
+
+#: ../kcm_gtk/firefoxfix.cpp:191
+msgid "Could not write to %1"
+msgstr "%1 ließ sich nicht schreiben"
+
+#~ msgid ""
+#~ "_: NAME OF TRANSLATORS\n"
+#~ "Your names"
+#~ msgstr "Sebastian Roth, Jannick Kuhr"
+
+#~ msgid ""
+#~ "_: EMAIL OF TRANSLATORS\n"
+#~ "Your emails"
+#~ msgstr "[e-mail], [e-mail]"
+
+#~ msgid "Thunderbird"
+#~ msgstr "Thunderbird"
+
+#~ msgid "Firefox"
+#~ msgstr "Firefox"
+
+#~ msgid "Form2"
+#~ msgstr "Form2"
+
+#~ msgid ""
+#~ "<b>Warning:</b> The Gtk-Qt theme engine is not installed.  This means you "
+#~ "will not be able to use your KDE style in GTK applications."
+#~ msgstr ""
+#~ "<b>Warnung:</b> Die Gtk-Qt-Theme-Engine ist nicht installiert. Das "
+#~ "bedeutet ,dass Ihre KDE-Stile nicht in GTK-Anwendungen verwendet werden "
+#~ "können."
+
+#~ msgid "Preview line 1"
+#~ msgstr "Vorschauzeile 1"
+
+#~ msgid "GTK Keyboard Shortcuts"
+#~ msgstr "GTK-Tastenkürzel"
+
+#~ msgid "Use Emacs-like key&board shortcuts for text editing"
+#~ msgstr "Emacs-Tastenkürzel zum Editieren von Text verwenden"
 
-#: mozillaprofile.cpp:38 mozillaprofile.cpp:64
-msgid "Profile"
-msgstr "Profil"
-
-#: mozillaprofile.cpp:63
-msgid "Please select the profiles that you want to fix:"
-msgstr "Bitte wählen Sie die zu korrigierenden Profile aus:"
+#~ msgid "Profile"
+#~ msgstr "Profil"
 
+#~ msgid "Please select the profiles that you want to fix:"
+#~ msgstr "Bitte wählen Sie die zu korrigierenden Profile aus:"
 
diff -Naur gtk-qt-engine/po/gtkqtengine.pot gtk-qt-engine/po/gtkqtengine.pot
--- gtk-qt-engine/po/gtkqtengine.pot	2008-03-11 02:30:19.000000000 +0100
+++ gtk-qt-engine/po/gtkqtengine.pot	2008-04-03 11:55:27.000000000 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-10 05:16+0000\n"
+"POT-Creation-Date: 2008-04-03 10:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -15,14 +15,181 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../kcm_gtk/kcmgtk.cpp:70
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 13
+#: rc.cpp:3
+msgid "Dialog"
+msgstr ""
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 19
+#: rc.cpp:6
+msgid "GTK Styles"
+msgstr ""
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 45
+#: rc.cpp:9
+msgid "&Use my KDE style in GTK applications"
+msgstr ""
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 52
+#: rc.cpp:12
+msgid "Use &another style:"
+msgstr ""
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 84
+#: rc.cpp:15
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Warning:</span> The Gtk-Qt theme engine is not installed. This "
+"means you will not be able to use your KDE style in GTK applications.</p></"
+"body></html>"
+msgstr ""
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 94
+#: rc.cpp:21
+msgid "Gtk-Qt theme engine homepage"
+msgstr ""
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 97
+#: rc.cpp:24
+msgid "http://gtk-qt.ecs.soton.ac.uk"
+msgstr ""
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 104
+#: rc.cpp:27
+msgid "Change search paths..."
+msgstr ""
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 127
+#: rc.cpp:30
+msgid "GTK Fonts"
+msgstr ""
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 157
+#: rc.cpp:33
+msgid "Use m&y KDE fonts in GTK applications"
+msgstr ""
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 164
+#: rc.cpp:36
+msgid "Use another font:"
+msgstr ""
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 171
+#: rc.cpp:39
+msgid "Change..."
+msgstr ""
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 198
+#: rc.cpp:42
+msgid "The Quick Brown Fox Jumped Over The Lazy Dog"
+msgstr ""
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 211
+#: rc.cpp:45
+msgid "Firefox and Thunderbird"
+msgstr ""
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 247
+#: rc.cpp:48
+msgid ""
+"Scrollbar buttons may sometimes be displayed incorrectly in Firefox and "
+"Thunderbird.  This can be fixed by installing some files into your Mozilla "
+"profile."
+msgstr ""
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 257
+#: rc.cpp:51
+msgid "I&nstall scrollbar fix..."
+msgstr ""
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 286
+#: rc.cpp:54
+msgid ""
+"Note that changes made here will only affect GTK applications when KDE is "
+"running.  To change the styles and fonts used by applications in GNOME, use "
+"the GNOME configuration tools."
+msgstr ""
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/searchpaths.ui line 13
+#: rc.cpp:57
+msgid "Change search paths"
+msgstr ""
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/searchpaths.ui line 19
+#: rc.cpp:60
+msgid ""
+"The control center module could not find the GTK-Qt theme engine in its list "
+"of search paths.  If you have installed it elsewhere, you will need to add "
+"the correct path to the list below."
+msgstr ""
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/searchpaths.ui line 43
+#: rc.cpp:63
+msgid "Add"
+msgstr ""
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/searchpaths.ui line 56
+#: rc.cpp:66
+msgid "Remove"
+msgstr ""
+
+#: ../kcm_gtk/kcmgtk.cpp:71
 msgid "kcm_gtk4"
 msgstr ""
 
-#: ../kcm_gtk/kcmgtk.cpp:73
+#: ../kcm_gtk/kcmgtk.cpp:74
 msgid "Change the appearance of GTK applications"
 msgstr ""
 
-#: ../kcm_gtk/kcmgtk.cpp:108
+#: ../kcm_gtk/kcmgtk.cpp:109
 msgid "%1 (size %2)"
 msgstr ""
+
+#: ../kcm_gtk/firefoxfix.cpp:48
+msgid "No Mozilla profiles found"
+msgstr ""
+
+#: ../kcm_gtk/firefoxfix.cpp:48
+msgid "Could not load Mozilla profiles"
+msgstr ""
+
+#: ../kcm_gtk/firefoxfix.cpp:55
+msgid ""
+"Your Mozilla profile was updated sucessfully.  You must close and restart "
+"all Firefox and Thunderbird windows for the changes to take effect"
+msgstr ""
+
+#: ../kcm_gtk/firefoxfix.cpp:55 ../kcm_gtk/firefoxfix.cpp:191
+msgid "Mozilla profile"
+msgstr ""
+
+#: ../kcm_gtk/firefoxfix.cpp:191
+msgid "Could not write to %1"
+msgstr ""
diff -Naur gtk-qt-engine/po/ko.po gtk-qt-engine/po/ko.po
--- gtk-qt-engine/po/ko.po	1970-01-01 01:00:00.000000000 +0100
+++ gtk-qt-engine/po/ko.po	2008-04-03 11:55:27.000000000 +0200
@@ -0,0 +1,146 @@
+# translation of gtk-engine-kde4 to Korean.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Park Shinjo <[e-mail]>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: ko\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-02-12 20:48+0000\n"
+"PO-Revision-Date: 2008-03-23 00:54+0900\n"
+"Last-Translator: Park Shinjo <[e-mail]>\n"
+"Language-Team: Korean <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Park Shinjo"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "[e-mail]"
+
+#: kcmgtk.cpp:206
+msgid "%1 (size %2)"
+msgstr "%1 (크기 %2)"
+
+#: kcmgtk.cpp:351
+msgid "No Mozilla profiles found"
+msgstr "Mozilla 프로필을 찾을 수 없음"
+
+#: kcmgtk.cpp:351
+msgid "Could not load Mozilla profiles"
+msgstr "Mozilla 프로필을 불러올 수 없음"
+
+#: kcmgtk.cpp:363 kcmgtk.cpp:407 kcmgtk.cpp:524
+msgid "Mozilla profile"
+msgstr "Mozilla 프로필"
+
+#: kcmgtk.cpp:378
+msgid "Thunderbird"
+msgstr "Thunderbird"
+
+#: kcmgtk.cpp:378
+msgid "Firefox"
+msgstr "Firefox"
+
+#: kcmgtk.cpp:407
+msgid ""
+"Your Mozilla profile was updated sucessfully.  You must close and restart "
+"all Firefox and Thunderbird windows for the changes to take effect"
+msgstr "Mozilla 프로필을 업데이트하였습니다. 모든 Firefox와 Thunderbird를"
+"종료한 다음 다시 시작해야 효과가 적용됩니다."
+
+#: kcmgtk.cpp:524
+msgid "Could not write to %1"
+msgstr "%1에 쓸 수 없음"
+
+#: kcmgtkwidget.cpp:191 mozillaprofile.cpp:62
+msgid "Form2"
+msgstr "Form2"
+
+#: kcmgtkwidget.cpp:192
+msgid "GTK Styles"
+msgstr "GTK 스타일"
+
+#: kcmgtkwidget.cpp:193
+msgid "Use my KDE style in GTK applications"
+msgstr "내 KDE 스타일을 GTK 프로그램에서 사용하기"
+
+#: kcmgtkwidget.cpp:194
+msgid "Use another style:"
+msgstr "다른 스타일 사용하기"
+
+#: kcmgtkwidget.cpp:195
+msgid "Gtk-Qt theme engine homepage"
+msgstr "Gtk-Qt 테마 엔진 홈페이지"
+
+#: kcmgtkwidget.cpp:196
+msgid "http://www.freedesktop.org/wiki/Software_2fgtk_2dqt"
+msgstr "http://www.freedesktop.org/wiki/Software_2fgtk_2dqt"
+
+#: kcmgtkwidget.cpp:197
+msgid ""
+"<b>Warning:</b> The Gtk-Qt theme engine is not installed.  This means you "
+"will not be able to use your KDE style in GTK applications."
+msgstr ""
+"<b>경고:</b> Gtk-Qt 테마 엔진이 설치되지 않았습니다. "
+"GTK 프로그램에서 KDE 스타일을 사용할 수 없습니다."
+
+#: kcmgtkwidget.cpp:198
+msgid "GTK Fonts"
+msgstr "GTK 글꼴"
+
+#: kcmgtkwidget.cpp:199
+msgid "Change..."
+msgstr "바꾸기..."
+
+#: kcmgtkwidget.cpp:200
+msgid "Use another font:"
+msgstr "다른 글꼴 사용하기:"
+
+#: kcmgtkwidget.cpp:201
+msgid "The Quick Brown Fox Jumped Over The Lazy Dog"
+msgstr "키스의 고유 조건은 입술끼리 만나야 되고 특별한 요령은 필요치 않다."
+
+#: kcmgtkwidget.cpp:202
+msgid "Use my KDE fonts in GTK applications"
+msgstr "내 KDE 글꼴을 GTK 프로그램에서 사용하기"
+
+#: kcmgtkwidget.cpp:203
+msgid "Preview line 1"
+msgstr "미리 보기 줄 1"
+
+#: kcmgtkwidget.cpp:204
+msgid "Firefox and Thunderbird"
+msgstr "Firefox와 Thunderbird"
+
+#: kcmgtkwidget.cpp:205
+msgid ""
+"Scrollbar buttons may sometimes be displayed incorrectly in Firefox and "
+"Thunderbird.  This can be fixed by installing some files into your Mozilla "
+"profile."
+msgstr ""
+"Firefox와 Thunderbird에서 때때로 스크롤바 단추들이 잘못 표시될 수 "
+"있습니다. 이는 Mozilla 프로필에 몇몇 파일을 추가해서 해결할 수 있"
+"습니다."
+
+#: kcmgtkwidget.cpp:206
+msgid "Install scrollbar fix..."
+msgstr "스크롤바 픽스 설치하기..."
+
+#: mozillaprofile.cpp:38 mozillaprofile.cpp:64
+msgid "Profile"
+msgstr "프로필"
+
+#: mozillaprofile.cpp:63
+msgid "Please select the profiles that you want to fix:"
+msgstr "픽스를 설치할 프로필을 선택하십시오:"
+
diff -Naur gtk-qt-engine/po/pt_BR.po gtk-qt-engine/po/pt_BR.po
--- gtk-qt-engine/po/pt_BR.po	1970-01-01 01:00:00.000000000 +0100
+++ gtk-qt-engine/po/pt_BR.po	2008-06-13 22:15:20.000000000 +0200
@@ -0,0 +1,218 @@
+# translation of pt_BR.po to
+# translation of gtkqtengine.po to
+# This file is put in the public domain.
+#
+# Gustavo Serra Scalet <[e-mail]>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: pt_BR\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-04-03 10:54+0100\n"
+"PO-Revision-Date: 2008-06-04 17:58-0300\n"
+"Last-Translator: Gustavo Serra Scalet <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n > 1);\n"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 13
+#: rc.cpp:3
+msgid "Dialog"
+msgstr "Diálogo"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 19
+#: rc.cpp:6
+msgid "GTK Styles"
+msgstr "Estilos GTK"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 45
+#: rc.cpp:9
+msgid "&Use my KDE style in GTK applications"
+msgstr "&Use meus estilos KDE nos programas GTK"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 52
+#: rc.cpp:12
+msgid "Use &another style:"
+msgstr "Use &outro estilo:"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 84
+#: rc.cpp:15
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Warning:</span> The Gtk-Qt theme engine is not installed. This "
+"means you will not be able to use your KDE style in GTK applications.</p></"
+"body></html>"
+msgstr ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Aviso:</span> O Gtk-Qt theme engine não está instalado. Isso "
+"siginifica que você não poderá usar seus estilos KDE nos programas GTK. < /"
+"p> </body></html>"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 94
+#: rc.cpp:21
+msgid "Gtk-Qt theme engine homepage"
+msgstr "Página do Gtk-Qt theme engine"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 97
+#: rc.cpp:24
+msgid "http://gtk-qt.ecs.soton.ac.uk"
+msgstr "http://gtk-qt.ecs.soton.ac.uk"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 104
+#: rc.cpp:27
+msgid "Change search paths..."
+msgstr "Trocar caminhos de busca"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 127
+#: rc.cpp:30
+msgid "GTK Fonts"
+msgstr "Fontes GTK"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 157
+#: rc.cpp:33
+msgid "Use m&y KDE fonts in GTK applications"
+msgstr "Use minhas &fontes KDE nos programas GTK"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 164
+#: rc.cpp:36
+msgid "Use another font:"
+msgstr "Usar outra fonte:"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 171
+#: rc.cpp:39
+msgid "Change..."
+msgstr "Modificar..."
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 198
+#: rc.cpp:42
+msgid "The Quick Brown Fox Jumped Over The Lazy Dog"
+msgstr "Frase de exemplo da área de fontes"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 211
+#: rc.cpp:45
+msgid "Firefox and Thunderbird"
+msgstr "Firefox e Thunderbird"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 247
+#: rc.cpp:48
+msgid ""
+"Scrollbar buttons may sometimes be displayed incorrectly in Firefox and "
+"Thunderbird.  This can be fixed by installing some files into your Mozilla "
+"profile."
+msgstr ""
+"Botões das barras de rolagens podem ser mostrados incorretamente no Firefox "
+"e Thunderbird.  Isso pode ser arrumado instalando alguns arquivos no seu "
+"perfil do Mozilla."
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 257
+#: rc.cpp:51
+msgid "I&nstall scrollbar fix..."
+msgstr "I&nstalar correção de barra de rolagem."
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 286
+#: rc.cpp:54
+msgid ""
+"Note that changes made here will only affect GTK applications when KDE is "
+"running.  To change the styles and fonts used by applications in GNOME, use "
+"the GNOME configuration tools."
+msgstr ""
+"Saiba que mudanças feitas aqui irão apenas afetar os programas GTK quando o "
+"KDE estiver sendo executado.  Para modificar os estilos e fontes utilizados "
+"pelos programas no GNOME, use as ferramentas de configurações do GNOME."
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/searchpaths.ui line 13
+#: rc.cpp:57
+msgid "Change search paths"
+msgstr "Trocar caminhos de busca"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/searchpaths.ui line 19
+#: rc.cpp:60
+msgid ""
+"The control center module could not find the GTK-Qt theme engine in its list "
+"of search paths.  If you have installed it elsewhere, you will need to add "
+"the correct path to the list below."
+msgstr ""
+"O módulo da central de controlenão pode achar o GTK-Qt theme engine na sua "
+"lista de caminhos de buscas.  Se você instalou em outro lugar, você "
+"precisará incluir o caminho correto na lista abaixo."
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/searchpaths.ui line 43
+#: rc.cpp:63
+msgid "Add"
+msgstr "Incluir"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/searchpaths.ui line 56
+#: rc.cpp:66
+msgid "Remove"
+msgstr "Remover"
+
+#: ../kcm_gtk/kcmgtk.cpp:71
+msgid "kcm_gtk4"
+msgstr "kcm_gtk4"
+
+#: ../kcm_gtk/kcmgtk.cpp:74
+msgid "Change the appearance of GTK applications"
+msgstr "Trocar a aparência dos programas GTK"
+
+#: ../kcm_gtk/kcmgtk.cpp:109
+msgid "%1 (size %2)"
+msgstr "%1 (tamanho %2)"
+
+#: ../kcm_gtk/firefoxfix.cpp:48
+msgid "No Mozilla profiles found"
+msgstr "Nenhum perfil Mozilla encontrado"
+
+#: ../kcm_gtk/firefoxfix.cpp:48
+msgid "Could not load Mozilla profiles"
+msgstr "Não pode carregar perfis Mozilla"
+
+#: ../kcm_gtk/firefoxfix.cpp:55
+msgid ""
+"Your Mozilla profile was updated sucessfully.  You must close and restart "
+"all Firefox and Thunderbird windows for the changes to take effect"
+msgstr ""
+"Seu perfil Mozilla foi atualizado com sucesso.  Você deve fechar e reiniciar "
+"todas as janelas Firefox e Thunderbird para que as mudanças façam efeito"
+
+#: ../kcm_gtk/firefoxfix.cpp:55 ../kcm_gtk/firefoxfix.cpp:191
+msgid "Mozilla profile"
+msgstr "Perfil Mozilla"
+
+#: ../kcm_gtk/firefoxfix.cpp:191
+msgid "Could not write to %1"
+msgstr "Não pode escrever em %1"
diff -Naur gtk-qt-engine/po/zh_cn.po gtk-qt-engine/po/zh_cn.po
--- gtk-qt-engine/po/zh_cn.po	1970-01-01 01:00:00.000000000 +0100
+++ gtk-qt-engine/po/zh_cn.po	2008-06-11 19:36:10.000000000 +0200
@@ -0,0 +1,205 @@
+# translation of gtkqtengine.po to 简体中文
+# This file is put in the public domain.
+#
+# Ni Hui <[e-mail]>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: gtkqtengine\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-04-03 10:54+0100\n"
+"PO-Revision-Date: 2008-06-05 13:31+0800\n"
+"Last-Translator: Ni Hui <[e-mail]>\n"
+"Language-Team: 简体中文 <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 13
+#: rc.cpp:3
+msgid "Dialog"
+msgstr "对话框"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 19
+#: rc.cpp:6
+msgid "GTK Styles"
+msgstr "GTK 风格"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 45
+#: rc.cpp:9
+msgid "&Use my KDE style in GTK applications"
+msgstr "在 GTK 应用程序中使用我的 KDE 风格(&U)"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 52
+#: rc.cpp:12
+msgid "Use &another style:"
+msgstr "使用其它风格(&A)："
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 84
+#: rc.cpp:15
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Warning:</span> The Gtk-Qt theme engine is not installed. This "
+"means you will not be able to use your KDE style in GTK applications.</p></"
+"body></html>"
+msgstr ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">警告：</span> 没有安装 Gtk-Qt 主题引擎。这意味着您无法在 GTK 应用程序中使用您的 KDE 风格。</p></"
+"body></html>"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 94
+#: rc.cpp:21
+msgid "Gtk-Qt theme engine homepage"
+msgstr "Gtk-Qt 主题引擎主页"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 97
+#: rc.cpp:24
+msgid "http://gtk-qt.ecs.soton.ac.uk"
+msgstr "http://gtk-qt.ecs.soton.ac.uk"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 104
+#: rc.cpp:27
+msgid "Change search paths..."
+msgstr "更改搜索路径..."
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 127
+#: rc.cpp:30
+msgid "GTK Fonts"
+msgstr "GTK 字体"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 157
+#: rc.cpp:33
+msgid "Use m&y KDE fonts in GTK applications"
+msgstr "在 GTK 应用程序中使用我的 KDE 字体(&Y)"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 164
+#: rc.cpp:36
+msgid "Use another font:"
+msgstr "使用其它字体："
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 171
+#: rc.cpp:39
+msgid "Change..."
+msgstr "更改..."
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 198
+#: rc.cpp:42
+msgid "The Quick Brown Fox Jumped Over The Lazy Dog"
+msgstr "The Quick Brown Fox Jumped Over The Lazy Dog 欲穷千里目 更上一层楼"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 211
+#: rc.cpp:45
+msgid "Firefox and Thunderbird"
+msgstr "Firefox 和 Thunderbird"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 247
+#: rc.cpp:48
+msgid ""
+"Scrollbar buttons may sometimes be displayed incorrectly in Firefox and "
+"Thunderbird.  This can be fixed by installing some files into your Mozilla "
+"profile."
+msgstr "在 Firefox 和 Thunderbird 中的滚动条按钮有时候显示不正确。这可以通过在您的 Mozilla 配置文件中安装一些文件来修复它。"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 257
+#: rc.cpp:51
+msgid "I&nstall scrollbar fix..."
+msgstr "安装滚动条修复(&N)..."
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 286
+#: rc.cpp:54
+msgid ""
+"Note that changes made here will only affect GTK applications when KDE is "
+"running.  To change the styles and fonts used by applications in GNOME, use "
+"the GNOME configuration tools."
+msgstr "注意，在此作出的更改仅会在 KDE 运行时影响到 GTK 应用程序。 要更改 GNOME 中应用程序所使用的风格和字体，请使用 GNOME 配置工具。"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/searchpaths.ui line 13
+#: rc.cpp:57
+msgid "Change search paths"
+msgstr "更改搜索路径"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/searchpaths.ui line 19
+#: rc.cpp:60
+msgid ""
+"The control center module could not find the GTK-Qt theme engine in its list "
+"of search paths.  If you have installed it elsewhere, you will need to add "
+"the correct path to the list below."
+msgstr "控制中心模块无法在其搜索路径列表中找到 GTK-Qt 主题引擎。 如果您已将其安装于某个位置，您需要将正确的路径添加到下方的列表中。"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/searchpaths.ui line 43
+#: rc.cpp:63
+msgid "Add"
+msgstr "添加"
+
+#. i18n: tag string
+#. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/searchpaths.ui line 56
+#: rc.cpp:66
+msgid "Remove"
+msgstr "删除"
+
+#: ../kcm_gtk/kcmgtk.cpp:71
+msgid "kcm_gtk4"
+msgstr "kcm_gtk4"
+
+#: ../kcm_gtk/kcmgtk.cpp:74
+msgid "Change the appearance of GTK applications"
+msgstr "更改 GTK 应用程序的外观"
+
+#: ../kcm_gtk/kcmgtk.cpp:109
+msgid "%1 (size %2)"
+msgstr "%1 (大小 %2)"
+
+#: ../kcm_gtk/firefoxfix.cpp:48
+msgid "No Mozilla profiles found"
+msgstr "未找到 Mozilla 配置文件"
+
+#: ../kcm_gtk/firefoxfix.cpp:48
+msgid "Could not load Mozilla profiles"
+msgstr "无法装入 Mozilla 配置文件"
+
+#: ../kcm_gtk/firefoxfix.cpp:55
+msgid ""
+"Your Mozilla profile was updated sucessfully.  You must close and restart "
+"all Firefox and Thunderbird windows for the changes to take effect"
+msgstr "您的 Mozilla 配置文件已经成功更新。 您必须关闭并重启动所有的 Firefox 和 Thunderbird 窗口以使更改生效"
+
+#: ../kcm_gtk/firefoxfix.cpp:55 ../kcm_gtk/firefoxfix.cpp:191
+msgid "Mozilla profile"
+msgstr "Mozilla 配置文件"
+
+#: ../kcm_gtk/firefoxfix.cpp:191
+msgid "Could not write to %1"
+msgstr "无法写入 %1"
+
diff -Naur gtk-qt-engine/src/colormapper.cpp gtk-qt-engine/src/colormapper.cpp
--- gtk-qt-engine/src/colormapper.cpp	2008-03-11 02:30:19.000000000 +0100
+++ gtk-qt-engine/src/colormapper.cpp	2008-04-03 18:19:26.000000000 +0200
@@ -25,24 +25,35 @@
 #include <QToolTip>
 
 
-QPalette ColorMapper::mapGtkToQt(GtkStyle* style)
+QPalette ColorMapper::mapGtkToQt(GtkStyle* style, GtkStateType state, bool isButton)
 {
 	QPalette palette(QApplication::palette());
 	
 	mapGtkToQt(style->fg[GTK_STATE_NORMAL],   &palette, QPalette::Active, QPalette::WindowText);
-	mapGtkToQt(style->bg[GTK_STATE_NORMAL],   &palette, QPalette::Active, QPalette::Window);
-	mapGtkToQt(style->text[GTK_STATE_NORMAL], &palette, QPalette::Active, QPalette::Text);
 	mapGtkToQt(style->base[GTK_STATE_NORMAL], &palette, QPalette::Active, QPalette::Base);
 	mapGtkToQt(style->fg[GTK_STATE_SELECTED], &palette, QPalette::Active, QPalette::HighlightedText);
 	mapGtkToQt(style->bg[GTK_STATE_SELECTED], &palette, QPalette::Active, QPalette::Highlight);
 	
 	mapGtkToQt(style->fg[GTK_STATE_INSENSITIVE],   &palette, QPalette::Disabled, QPalette::WindowText);
-	mapGtkToQt(style->bg[GTK_STATE_INSENSITIVE],   &palette, QPalette::Disabled, QPalette::Window);
-	mapGtkToQt(style->text[GTK_STATE_INSENSITIVE], &palette, QPalette::Disabled, QPalette::Text);
 	mapGtkToQt(style->base[GTK_STATE_INSENSITIVE], &palette, QPalette::Disabled, QPalette::Base);
 	mapGtkToQt(style->fg[GTK_STATE_INSENSITIVE],   &palette, QPalette::Disabled, QPalette::HighlightedText);
 	mapGtkToQt(style->bg[GTK_STATE_INSENSITIVE],   &palette, QPalette::Disabled, QPalette::Highlight);
 	
+	if (isButton)
+	{
+		mapGtkToQt(style->bg[state], &palette, QPalette::Active, QPalette::Button);
+		mapGtkToQt(style->fg[state], &palette, QPalette::Active, QPalette::ButtonText);
+		mapGtkToQt(style->bg[GTK_STATE_INSENSITIVE], &palette, QPalette::Disabled, QPalette::Button);
+		mapGtkToQt(style->fg[GTK_STATE_INSENSITIVE], &palette, QPalette::Disabled, QPalette::ButtonText);
+	}
+	else
+	{
+		mapGtkToQt(style->bg[GTK_STATE_NORMAL], &palette, QPalette::Active, QPalette::Window);
+		mapGtkToQt(style->fg[GTK_STATE_NORMAL], &palette, QPalette::Active, QPalette::Text);
+		mapGtkToQt(style->bg[GTK_STATE_INSENSITIVE], &palette, QPalette::Disabled, QPalette::Window);
+		mapGtkToQt(style->fg[GTK_STATE_INSENSITIVE], &palette, QPalette::Disabled, QPalette::Text);
+	}
+	
 	return palette;
 }
 
@@ -52,12 +63,6 @@
 	
 	palette->setColor(group, role, qcolor);
 	
-	// Make button roles the same as normal roles
-	if (role == QPalette::Window)
-		palette->setColor(group, QPalette::Button, qcolor);
-	if (role == QPalette::WindowText)
-		palette->setColor(group, QPalette::ButtonText, qcolor);
-	
 	// The inactive group should be set the same as the active group
 	if (group == QPalette::Active)
 		mapGtkToQt(color, palette, QPalette::Inactive, role);
diff -Naur gtk-qt-engine/src/colormapper.h gtk-qt-engine/src/colormapper.h
--- gtk-qt-engine/src/colormapper.h	2008-03-11 02:30:19.000000000 +0100
+++ gtk-qt-engine/src/colormapper.h	2008-04-03 17:53:07.000000000 +0200
@@ -29,7 +29,7 @@
 class ColorMapper
 {
 public:
-	static QPalette mapGtkToQt(GtkStyle* style);
+	static QPalette mapGtkToQt(GtkStyle* style, GtkStateType state, bool isButton);
 
 private:
 	ColorMapper() {}
diff -Naur gtk-qt-engine/src/engine.cpp gtk-qt-engine/src/engine.cpp
--- gtk-qt-engine/src/engine.cpp	2008-03-11 02:30:19.000000000 +0100
+++ gtk-qt-engine/src/engine.cpp	2009-12-04 19:53:52.000000000 +0100
@@ -26,8 +26,8 @@
 #include "rcproperties.h"
 
 // Creates an offscreen pixmap of the right size and opens a QPainter on it.
-#define GTK_QT_SETUP(OptionClassName) \
-	QPalette palette(ColorMapper::mapGtkToQt(m_style)); \
+#define GTK_QT_SETUP(OptionClassName, isButton) \
+	QPalette palette(ColorMapper::mapGtkToQt(m_style, m_state, isButton)); \
 	QPixmap offscreenPixmap; \
 	if (m_fillPixmap) \
 		offscreenPixmap = QPixmap(*m_fillPixmap); \
@@ -110,7 +110,8 @@
 	    commandLine.contains("metacity") ||
 	    commandLine.contains("xfwm4") ||
 	    commandLine.contains("gnome-settings-daemon") ||
-	    commandLine.contains("gnome-panel"))
+	    commandLine.contains("gnome-panel") ||
+	    commandLine.contains("nspluginviewer"))
 	{
 		m_enabled = false;
 		qDebug() << "Disabling the GTK-Qt Theme Engine for" << commandLine;
@@ -126,6 +127,9 @@
 	if (!m_enabled)
 		return;
 	
+	// Styles can check for this if they need to enable workarounds for gtk-qt
+	setenv("GTK_QT_ENGINE_ACTIVE", "1", true);
+	
 	// Create a QApplication if there isn't one already
 	if (QApplication::instance() == NULL)
 	{
@@ -236,7 +240,7 @@
 void Engine::drawButton(bool defaultButton)
 {
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOptionButton)
+	GTK_QT_SETUP(QStyleOptionButton, true)
 	
 	// Handle default buttons (ones that get activated when you press enter)
 	option.features = defaultButton ? QStyleOptionButton::DefaultButton : QStyleOptionButton::None;
@@ -249,7 +253,7 @@
 void Engine::drawCheckBox(bool checked)
 {
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOptionButton)
+	GTK_QT_SETUP(QStyleOptionButton, true)
 	
 	// Handle checked state
 	m_dummyCheckBox->setChecked(checked);
@@ -267,7 +271,7 @@
 void Engine::drawRadioButton(bool checked)
 {
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOptionButton)
+	GTK_QT_SETUP(QStyleOptionButton, true)
 	
 	// Handle checked state
 	m_dummyRadioButton->setChecked(checked);
@@ -285,7 +289,7 @@
 void Engine::drawTab(int tabCount, int selectedTab, int tab, bool upsideDown)
 {
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOptionTabV2)
+	GTK_QT_SETUP(QStyleOptionTabV2, false)
 	option.cornerWidgets = QStyleOptionTab::NoCornerWidgets;
 	option.shape = QTabBar::RoundedNorth;
 	
@@ -333,7 +337,7 @@
 void Engine::drawTabFrame()
 {
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOptionTabWidgetFrame)
+	GTK_QT_SETUP(QStyleOptionTabWidgetFrame, false)
 	option.shape = QTabBar::RoundedNorth;
 	option.leftCornerWidgetSize = QSize(0, 0);
 	option.rightCornerWidgetSize = QSize(0, 0);
@@ -347,7 +351,7 @@
 void Engine::drawLineEdit(bool editable)
 {
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOptionFrameV2)
+	GTK_QT_SETUP(QStyleOptionFrameV2, false)
 	option.lineWidth = m_qtStyle->pixelMetric(QStyle::PM_DefaultFrameWidth, &option, m_dummyLineEdit);
 	option.midLineWidth = 0;
 	option.state |= QStyle::State_Sunken;
@@ -363,7 +367,7 @@
 void Engine::drawFrame(int type)
 {
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOptionFrameV2)
+	GTK_QT_SETUP(QStyleOptionFrameV2, false)
 	option.state |= QStyle::State_Sunken;
 	option.state &= ~QStyle::State_Raised;
 	
@@ -375,7 +379,7 @@
 		default: element = QStyle::PE_Frame;         break;
 	}
 	
-	m_qtStyle->drawPrimitive(element, &option, &p);
+	m_qtStyle->drawPrimitive(element, &option, &p, m_dummyWidget);
 	
 	GTK_QT_FINISH
 }
@@ -383,7 +387,7 @@
 void Engine::drawArrow(GtkArrowType direction)
 {
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOption)
+	GTK_QT_SETUP(QStyleOption, false)
 	
 	QStyle::PrimitiveElement element;
 	switch (direction)
@@ -403,7 +407,7 @@
 void Engine::drawListHeader()
 {
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOptionHeader)
+	GTK_QT_SETUP(QStyleOptionHeader, false)
 	option.orientation = Qt::Horizontal;
 	option.section = 1;
 	option.position = QStyleOptionHeader::Middle;
@@ -420,7 +424,7 @@
 void Engine::drawMenuBarItem()
 {
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOptionMenuItem)
+	GTK_QT_SETUP(QStyleOptionMenuItem, false)
 	option.state |= QStyle::State_Sunken | QStyle::State_Selected;
 	option.state &= ~QStyle::State_Raised;
 	
@@ -432,7 +436,7 @@
 void Engine::drawMenu()
 {
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOptionFrame)
+	GTK_QT_SETUP(QStyleOptionFrame, false)
 	option.state = QStyle::State_None;
 	option.lineWidth = style()->pixelMetric(QStyle::PM_MenuPanelWidth);
 	option.midLineWidth = 0;
@@ -445,7 +449,7 @@
 void Engine::drawMenuItem(int type)
 {
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOptionMenuItem)
+	GTK_QT_SETUP(QStyleOptionMenuItem, false)
 	option.state |= QStyle::State_Sunken | QStyle::State_Selected;
 	option.state &= ~QStyle::State_Raised;
 	
@@ -464,7 +468,7 @@
 void Engine::drawMenuCheck()
 {
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOption)
+	GTK_QT_SETUP(QStyleOption, false)
 	
 	m_qtStyle->drawPrimitive(QStyle::PE_IndicatorMenuCheckMark, &option, &p, m_dummyMenu);
 	
@@ -474,7 +478,7 @@
 void Engine::drawHLine()
 {
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOption)
+	GTK_QT_SETUP(QStyleOption, false)
 	
 	qDrawShadeLine(&p, 0, 0, m_size.width(), 0, option.palette);
 	
@@ -484,7 +488,7 @@
 void Engine::drawVLine()
 {
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOption)
+	GTK_QT_SETUP(QStyleOption, false)
 	
 	qDrawShadeLine(&p, 0, 0, 0, m_size.height(), option.palette);
 	
@@ -494,7 +498,7 @@
 void Engine::drawComboBox()
 {
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOptionComboBox)
+	GTK_QT_SETUP(QStyleOptionComboBox, true)
 	
 	m_qtStyle->drawComplexControl(QStyle::CC_ComboBox, &option, &p, m_dummyComboBox);
 	
@@ -504,7 +508,7 @@
 void Engine::drawProgressBar(GtkProgressBarOrientation orientation, double percentage)
 {
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOptionProgressBarV2)
+	GTK_QT_SETUP(QStyleOptionProgressBarV2, false)
 	option.maximum = 10000;
 	option.minimum = 0;
 	option.progress = int(percentage * 10000);
@@ -529,7 +533,7 @@
 void Engine::drawProgressChunk()
 {
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOptionProgressBarV2)
+	GTK_QT_SETUP(QStyleOptionProgressBarV2, false)
 	option.maximum = 10000;
 	option.minimum = 0;
 	option.progress = 10000;
@@ -542,7 +546,7 @@
 void Engine::drawSpinButton(int direction)
 {
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOptionSpinBox)
+	GTK_QT_SETUP(QStyleOptionSpinBox, false)
 	option.frame = false;
 	
 	QStyle::PrimitiveElement element;
@@ -561,7 +565,7 @@
 void Engine::drawSlider(GtkAdjustment* adj, GtkOrientation orientation, int inverted)
 {
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOptionSlider)
+	GTK_QT_SETUP(QStyleOptionSlider, false)
 	option.minimum = 0;
 	option.maximum = 10000;
 	option.orientation = (orientation == GTK_ORIENTATION_HORIZONTAL) ? Qt::Horizontal : Qt::Vertical;
@@ -581,7 +585,7 @@
 void Engine::drawScrollBar(GtkOrientation orientation, GtkAdjustment* adj)
 {
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOptionSlider)
+	GTK_QT_SETUP(QStyleOptionSlider, false)
 	option.minimum = int(adj->lower);
 	option.maximum = int(adj->upper - adj->page_size);
 	option.singleStep = int(adj->step_increment);
@@ -617,7 +621,7 @@
 		m_size = QSize(m_size.width(), m_size.height() + extraSpace);
 
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOptionSlider)
+	GTK_QT_SETUP(QStyleOptionSlider, false)
 	option.minimum = 0;
 	option.maximum = 1;
 	option.singleStep = 10000;
@@ -638,6 +642,8 @@
 	
 	// Figure out where the slider is.  Hope this rect is the same size as oldSize
 	QRect sliderRect = m_qtStyle->subControlRect(QStyle::CC_ScrollBar, &option, QStyle::SC_ScrollBarSlider, m_dummyScrollBar);
+	if (sliderRect.width() < 0 || sliderRect.height() < 0) // Firefox again :(
+		return;
 	
 	// Get rid of the buttons so we're left with just the scrollbar slider of the size we were asked to draw
 	offscreenPixmap = offscreenPixmap.copy(sliderRect);
@@ -648,7 +654,7 @@
 void Engine::drawSplitter(GtkOrientation orientation)
 {
 	GTK_QT_DEBUG_FUNC
-	GTK_QT_SETUP(QStyleOption)
+	GTK_QT_SETUP(QStyleOption, false)
 	
 	// By "horizontal", GTK means "bar goes from left to right" and Qt means "the two panes are to the left and right of the bar"
 	if (orientation != GTK_ORIENTATION_HORIZONTAL)
diff -Naur gtk-qt-engine/src/engine.h gtk-qt-engine/src/engine.h
--- gtk-qt-engine/src/engine.h	2008-03-11 02:30:19.000000000 +0100
+++ gtk-qt-engine/src/engine.h	2008-04-03 17:53:07.000000000 +0200
@@ -39,6 +39,7 @@
 #include <QScrollBar>
 
 #include <gtk/gtk.h>
+#include <gtk/gtkstyle.h>
 #include <gdk/gdkx.h>
 
 // The GTK headers suck
diff -Naur gtk-qt-engine/src/qt_theme_draw.c gtk-qt-engine/src/qt_theme_draw.c
--- gtk-qt-engine/src/qt_theme_draw.c	2008-03-11 02:30:19.000000000 +0100
+++ gtk-qt-engine/src/qt_theme_draw.c	2008-03-16 10:19:59.000000000 +0100
@@ -19,6 +19,7 @@
  ***************************************************************************/
 
 #include <math.h>
+#include <stdlib.h>
 #include <string.h>
 #include <gtk/gtkprogressbar.h>
 #include <gdk/gdk.h>
diff -Naur gtk-qt-engine/src/rcproperties.cpp gtk-qt-engine/src/rcproperties.cpp
--- gtk-qt-engine/src/rcproperties.cpp	2008-03-11 02:30:19.000000000 +0100
+++ gtk-qt-engine/src/rcproperties.cpp	2008-04-14 17:32:35.000000000 +0200
@@ -18,16 +18,26 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <QDir> // This has to be above any GTK headers
+
 #include "utilities.h"
 #include "rcproperties.h"
 #include "engine.h"
 
-#include <QDebug>
+#include <QtDebug>
 #include <QToolTip>
 #include <QFile>
 #include <QSettings>
 #include <QFileInfo>
 
+#define INITDUMMY(className) \
+	dummy.setPalette(QApplication::palette()); \
+	dummy.setObjectName(className); \
+	Engine::instance()->m_qtStyle->polish(&dummy);
+
+#define WCOLOR(class, role) \
+	GtkQtUtilities::colorString(dummy.palette().color(QPalette::class, QPalette::role))
+
 
 bool RcProperties::s_scrollBarHasBack1;
 bool RcProperties::s_scrollBarHasForward1;
@@ -44,22 +54,55 @@
 {
 	GTK_QT_DEBUG_FUNC
 	
+	initKdeSettings();
+	
 	setWidgetProperties();
 	setColorProperties();
 	setIconProperties();
+	
+	// KDE's "Apply colors to non-KDE apps" setting is broken.
+	// It applies colors to the "*" class which overrides colors set by the style
+	// We take the (rather extreme) measure of removing its gtkrc file
+	
+	char** rcFiles = gtk_rc_get_default_files();
+	while (*rcFiles != NULL)
+	{
+		QString fileName(*(rcFiles++));
+		
+		if (!fileName.endsWith("/share/config/gtkrc-2.0"))
+			continue;
+		
+		// Open the file and check for a known string just to make
+		// sure we're not accidentally deleting something else
+		QFile file(fileName);
+		if (!file.exists())
+			continue;
+		
+		file.open(QIODevice::ReadOnly);
+		if (!file.readLine(20).startsWith("# created by KDE"))
+			continue;
+		
+		file.close();
+		file.remove();
+	}
 }
 
 void RcProperties::setWidgetProperties()
 {
 	const QStyle* qtStyle = Engine::instance()->m_qtStyle;
 	
+	// Buttons
+	GtkQtUtilities::parseRcString("GtkButton::child_displacement_x = " + QString::number(qtStyle->pixelMetric(QStyle::PM_ButtonShiftHorizontal)), "*", GtkQtUtilities::WidgetClass);
+	GtkQtUtilities::parseRcString("GtkButton::child_displacement_y = " + QString::number(qtStyle->pixelMetric(QStyle::PM_ButtonShiftVertical)), "*", GtkQtUtilities::WidgetClass);
+	
 	// Check boxes
 	// We add 2 to the size to account for the box around the check indicator
 	GtkQtUtilities::parseRcString("GtkCheckButton::indicator-size = " + QString::number(qtStyle->pixelMetric(QStyle::PM_IndicatorHeight) + 2), "*", GtkQtUtilities::WidgetClass);
 	
 	// Tabs
+	GtkQtUtilities::parseRcString("GtkButton::tab-curvature = 0", "*", GtkQtUtilities::WidgetClass);
 	GtkQtUtilities::parseRcString("GtkNotebook::tab-overlap = " + QString::number(qtStyle->pixelMetric(QStyle::PM_TabBarTabOverlap)), "*", GtkQtUtilities::WidgetClass);
-	GtkQtUtilities::parseRcString("xthickness = 3", "*.GtkNotebook", GtkQtUtilities::WidgetClass); // Hardcode values that look good
+	GtkQtUtilities::parseRcString("xthickness = 2", "*.GtkNotebook", GtkQtUtilities::WidgetClass); // Hardcode values that look good
 	GtkQtUtilities::parseRcString("ythickness = 3", "*.GtkNotebook", GtkQtUtilities::WidgetClass);
 	
 	// Line edits
@@ -131,7 +174,16 @@
 	
 	int availableSize = 200 - qtStyle->subControlRect(QStyle::CC_ScrollBar, &option, QStyle::SC_ScrollBarGroove, scrollBar).width();
 	s_scrollBarButtonCount = s_scrollBarHasForward1 + s_scrollBarHasBack1 + s_scrollBarHasForward2 + s_scrollBarHasBack2; // Evil
-	s_scrollBarButtonSize = availableSize / s_scrollBarButtonCount;
+	if (s_scrollBarButtonCount != 0)
+		s_scrollBarButtonSize = availableSize / s_scrollBarButtonCount;
+}
+
+QString RcProperties::gtkPaletteString(const QPalette& pal, const QString& bgfg, QPalette::ColorRole role)
+{
+	return bgfg + "[NORMAL] = "      + GtkQtUtilities::colorString(pal.color(QPalette::Inactive, role)) + "\n"
+	     + bgfg + "[ACTIVE] = "      + GtkQtUtilities::colorString(pal.color(QPalette::Active, role))   + "\n"
+	     + bgfg + "[PRELIGHT] = "    + GtkQtUtilities::colorString(pal.color(QPalette::Active, role))   + "\n"
+	     + bgfg + "[INSENSITIVE] = " + GtkQtUtilities::colorString(pal.color(QPalette::Disabled, role)) + "\n";
 }
 
 void RcProperties::setColorProperties()
@@ -167,24 +219,72 @@
 	mapColor("base[INSENSITIVE]", QPalette::Disabled, QPalette::Base);
 	
 	// Tooltips
-	QString tooltipColor = GtkQtUtilities::colorString(QToolTip::palette().color(QPalette::Active, QPalette::Base));
-	GtkQtUtilities::parseRcString("bg[NORMAL] = " + tooltipColor, "*.tooltips.*.GtkToggleButton", GtkQtUtilities::WidgetClass);
-	GtkQtUtilities::parseRcString("bg[NORMAL] = " + tooltipColor, "gtk-tooltips", GtkQtUtilities::Widget);
-	GtkQtUtilities::parseRcString("bg[NORMAL] = " + tooltipColor, "gtk-tooltip", GtkQtUtilities::Widget);
-	
-	// Buttons
-	QString buttonColor = GtkQtUtilities::colorString(QApplication::palette().color(QPalette::Active, QPalette::Button));
-	GtkQtUtilities::parseRcString("bg[NORMAL] = " + buttonColor, "GtkButton", GtkQtUtilities::Class);
-	GtkQtUtilities::parseRcString("bg[ACTIVE] = " + buttonColor, "GtkButton", GtkQtUtilities::Class);
-	GtkQtUtilities::parseRcString("bg[NORMAL] = " + buttonColor, "GtkOptionMenu", GtkQtUtilities::Class);
-	GtkQtUtilities::parseRcString("bg[ACTIVE] = " + buttonColor, "GtkOptionMenu", GtkQtUtilities::Class);
-	
-	buttonColor = GtkQtUtilities::colorString(QApplication::palette().color(QPalette::Disabled, QPalette::Button));
-	GtkQtUtilities::parseRcString("bg[INSENSITIVE] = " + buttonColor, "GtkButton", GtkQtUtilities::Class);
+	QColor tooltipBg(convertColor(kdeConfigValue("/share/config/kdeglobals", "Colors:Tooltip/BackgroundNormal", QToolTip::palette().color(QPalette::Active, QPalette::Base), true).second));
+	QColor tooltipFg(convertColor(kdeConfigValue("/share/config/kdeglobals", "Colors:Tooltip/ForegroundNormal", QToolTip::palette().color(QPalette::Active, QPalette::Text), true).second));
+	GtkQtUtilities::parseRcString("bg[NORMAL] = " + GtkQtUtilities::colorString(tooltipBg), "gtk-tooltip*", GtkQtUtilities::Widget);
+	GtkQtUtilities::parseRcString("fg[NORMAL] = " + GtkQtUtilities::colorString(tooltipFg), "gtk-tooltip*", GtkQtUtilities::Widget);
 	
 	// Lists
 	QString activeListColor = GtkQtUtilities::colorString(QApplication::palette().color(QPalette::Active, QPalette::HighlightedText));
 	GtkQtUtilities::parseRcString("text[ACTIVE] = " + activeListColor, "GtkTreeView", GtkQtUtilities::Class);
+	
+	// Patch from Thomas Lübking:
+	// Ask the Qt style for color settings of a (growing?) bunch of widget types.
+	// We pass a dummy widget to QStyle::polish(QWidget*) with the widget's object
+	// name reflecting (a faked) QObject::className alongside with the apps
+	// default palette - if the style changes the palette, we add a gtk style
+	// for the matching gtk widgets
+	// NOTICE using a dummy widget objectName rather than a matching QWidget
+	// here does not only allow us to skip couple of widget headers here for no
+	// sense, but also is REQUIRED! because the Qt styles tend to do freaky things
+	// on certain widget types, which we need to prevent...
+	//
+	// as the GTK and Qt palette models do not really fit, we'll translate
+	// QPalette::Inactive -> GTK_STATE_NORMAL
+	// QPalette::Active -> GTK_STATE_PRELIGHT
+	// QPalette::Active -> GTK_STATE_ACTIVE
+	// QPalette::Disabled -> GTK_STATE_INSENSITIVE
+	
+	QWidget dummy;
+	
+	INITDUMMY("QPushButton")
+	GtkQtUtilities::parseRcString(gtkPaletteString(dummy.palette(), "bg", QPalette::Button), "GtkButton", GtkQtUtilities::Class);
+	GtkQtUtilities::parseRcString(gtkPaletteString(dummy.palette(), "fg", QPalette::ButtonText), "*.GtkButton*GtkLabel", GtkQtUtilities::WidgetClass);
+	
+	INITDUMMY("QComboBox")
+	GtkQtUtilities::parseRcString(gtkPaletteString(dummy.palette(), "bg", QPalette::Button), "GtkOptionMenu", GtkQtUtilities::Class);
+
+	INITDUMMY("QCheckBox")
+	GtkQtUtilities::parseRcString(gtkPaletteString(dummy.palette(), "bg", QPalette::Button), "GtkCheckButton", GtkQtUtilities::Class);
+	
+	INITDUMMY("QRadioButton")
+	GtkQtUtilities::parseRcString(gtkPaletteString(dummy.palette(), "bg", QPalette::Button), "GtkRadioButton", GtkQtUtilities::Class);
+	
+	INITDUMMY("QTabBar")
+	if (dummy.palette() != QApplication::palette())
+	{
+		// SIC! GTK thinks all tabs but the active are active...
+		GtkQtUtilities::parseRcString(
+			"fg[ACTIVE] = "      + WCOLOR(Inactive, WindowText) + "\n" +
+			"fg[NORMAL] = "      + WCOLOR(Active, WindowText) + "\n" +
+			"fg[PRELIGHT] = "    + WCOLOR(Active, WindowText) + "\n" +
+			"fg[INSENSITIVE] = " + WCOLOR(Disabled, WindowText),
+			"*.GtkNotebook.GtkLabel", GtkQtUtilities::WidgetClass);
+	}
+
+	INITDUMMY("QMenu")
+	if (dummy.palette() != QApplication::palette())
+	{
+		GtkQtUtilities::parseRcString(gtkPaletteString(dummy.palette(), "bg", QPalette::Window), "GtkMenu", GtkQtUtilities::Class);
+		GtkQtUtilities::parseRcString(gtkPaletteString(dummy.palette(), "fg", QPalette::WindowText), "*.GtkMenuItem.GtkLabel", GtkQtUtilities::Class);
+	}
+
+	INITDUMMY("QMenuBar")
+	if (dummy.palette() != QApplication::palette())
+	{
+		GtkQtUtilities::parseRcString(gtkPaletteString(dummy.palette(), "bg", QPalette::Window), "GtkMenuBar", GtkQtUtilities::Class);
+		GtkQtUtilities::parseRcString(gtkPaletteString(dummy.palette(), "fg", QPalette::WindowText), "*.GtkMenuBar.GtkMenuItem.GtkLabel", GtkQtUtilities::WidgetClass);
+	}
 }
 
 void RcProperties::mapColor(const QString& name, QPalette::ColorGroup group, QPalette::ColorRole role)
@@ -192,7 +292,7 @@
 	QPalette palette(QApplication::palette());
 	QString color(GtkQtUtilities::colorString(palette.color(group, role)));
 	
-	GtkQtUtilities::parseRcString(name + " = " + color, "*", GtkQtUtilities::Class);
+	GtkQtUtilities::parseRcString(name + " = " + color, "GtkWidget", GtkQtUtilities::Class);
 }
 
 PathAndValue RcProperties::kdeConfigValue(const QString& file, const QString& key, const QVariant& def, bool searchAllFiles)
@@ -239,15 +339,14 @@
 		s_kdeSearchPaths << kdeDir;
 	s_kdeSearchPaths << settings.value("KDEPrefix").toString();
 	
+	s_kdeSearchPaths << QDir::homePath() + "/.kde4";
+	s_kdeSearchPaths << QDir::homePath() + "/.kde";
 	s_kdeSearchPaths << "/usr/local";
 	s_kdeSearchPaths << "/usr";
 }
 
 void RcProperties::setIconProperties()
 {
-	// Find the current KDE icon theme
-	initKdeSettings();
-	
 	// Get the theme's directory and those of its parents
 	QString iconThemeName(kdeConfigValue("/share/config/kdeglobals", "Icons/Theme", "oxygen", true).second.toString());
 	traverseIconThemeDir(iconThemeName);
@@ -352,7 +451,7 @@
 	iconMappings += doIconMapping("gtk-zoom-fit", "actions/zoom-fit-best.png");
 	iconMappings += doIconMapping("gtk-zoom-in", "actions/zoom-in.png");
 	iconMappings += doIconMapping("gtk-zoom-out", "actions/zoom-out.png");
-	iconMappings += "} class \"*\" style \"KDE-icons\"";
+	iconMappings += "} class \"GtkWidget\" style \"KDE-icons\"";
 	
 	GtkQtUtilities::parseRcString(iconMappings);
 }
@@ -422,3 +521,19 @@
 	
 	return "stock[\"" + stockName + "\"] = {" + lines.join(",") + "}\n";
 }
+
+QColor RcProperties::convertColor(const QVariant& variant)
+{
+	if (variant.value<QColor>().isValid())
+		return variant.value<QColor>();
+	
+	// KDE seems to store colors in its config files as QStringList(r, g, b), which you can't convert
+	// with QVariant::value<QColor>
+	QStringList list(variant.toStringList());
+	if (list.count() == 3)
+		return QColor(list[0].toInt(), list[1].toInt(), list[2].toInt());
+	else if (list.count() == 4)
+		return QColor(list[0].toInt(), list[1].toInt(), list[2].toInt(), list[3].toInt());
+	return QColor();
+}
+
diff -Naur gtk-qt-engine/src/rcproperties.h gtk-qt-engine/src/rcproperties.h
--- gtk-qt-engine/src/rcproperties.h	2008-03-11 02:30:19.000000000 +0100
+++ gtk-qt-engine/src/rcproperties.h	2008-04-03 17:53:07.000000000 +0200
@@ -51,6 +51,8 @@
 	static QString doIconMapping(const QString& stockName, const QString& path);
 	
 	static void mapColor(const QString& name, QPalette::ColorGroup group, QPalette::ColorRole role);
+	static QColor convertColor(const QVariant& variant);
+	static QString gtkPaletteString(const QPalette& pal, const QString& bgfg, QPalette::ColorRole role = QPalette::Window);
 	
 	static bool s_scrollBarHasBack1;
 	static bool s_scrollBarHasForward1;