- moved from DEVEL

Changed files:
    qt4-assistant.desktop -> 1.4
    qt4-build-lib-static.patch -> 1.5
    qt4-buildsystem.patch -> 1.7
    qt4-designer.desktop -> 1.4
    qt4-linguist.desktop -> 1.4
    qt4-locale.patch -> 1.12
    qt4-pg_libs.patch -> 1.2
    qt4-pl-update.patch -> 1.3
    qt4-qtconfig.desktop -> 1.4
    qt4-tools.patch -> 1.9

diff --git a/qt4-assistant.desktop b/qt4-assistant.desktop
index b682037d0455905566fb293bb74b188186247542..6381c0373c74818cf2add25520295a8c35ad1883 100644 (file)
--- a/qt4-assistant.desktop
+++ b/qt4-assistant.desktop
@@ -1,4 +1,5 @@
 [Desktop Entry]
+Encoding=UTF-8
 Exec=assistant-qt4
 Name=Qt4 Assistant
 Name[af]=Qt4 Assistent

diff --git a/qt4-build-lib-static.patch b/qt4-build-lib-static.patch
index e4df97ab390597b38a2d3f72bcf456f95707d3c6..277e52fbbeb8c0130ea701a672c8bda7c2b644ea 100644 (file)
--- a/qt4-build-lib-static.patch
+++ b/qt4-build-lib-static.patch
@@ -1,24 +1,16 @@
 --- qt-x11-opensource-src-4.1.0/tools/assistant/lib/lib.pro.orig       2006-02-13 07:13:58.000000000 +0100
 +++ qt-x11-opensource-src-4.1.0/tools/assistant/lib/lib.pro    2006-02-13 07:39:59.000000000 +0100
-@@ -4,7 +4,6 @@
- CONFIG                += qt warn_on
- mac|win32:CONFIG                += debug_and_release
- mac:unix:CONFIG       += explicitlib
--CONFIG                += dll
- 
- HEADERS         = qassistantclient.h \
-                   qassistantclient_global.h
-@@ -17,6 +16,10 @@
- }
- 
- DEFINES += QT_ASSISTANT_CLIENT_LIBRARY
+@@ -2,6 +2,10 @@
+ TEMPLATE = lib
+ TARGET = QtHelp
+ DEFINES += QHELP_LIB QT_CLUCENE_SUPPORT
 +!contains(CONFIG, static) {
 +    CONFIG += dll
 +}
 +
- contains(CONFIG, static) {
-     DEFINES += QT_ASSISTANT_CLIENT_STATIC
- }
+ CONFIG += qt warn_on
+ 
+ include(../../../src/qbase.pri)
 --- qt-x11-opensource-src-4.1.0/tools/designer/src/uitools/uitools.pro.orig    2005-12-16 12:52:20.000000000 +0100
 +++ qt-x11-opensource-src-4.1.0/tools/designer/src/uitools/uitools.pro 2006-02-13 09:26:05.000000000 +0100
 @@ -1,7 +1,7 @@

diff --git a/qt4-buildsystem.patch b/qt4-buildsystem.patch
index 4a934671d84652fc85eae12df265b88b9d3167f4..ab28487f171fc19f11a474a997c19786b744db75 100644 (file)
--- a/qt4-buildsystem.patch
+++ b/qt4-buildsystem.patch
@@ -12,18 +12,6 @@
          if [ "$PLATFORM_MAC" = "yes" ]; then
              echo "export MACOSX_DEPLOYMENT_TARGET = 10.2" >>$mkfile
              echo "CARBON_LFLAGS +=-framework CoreServices -framework CoreFoundation" >>$mkfile
---- qt-copy/tools/assistant/lib/lib.pro.orig   2005-05-13 16:39:04.000000000 +0200
-+++ qt-copy/tools/assistant/lib/lib.pro        2005-05-13 20:21:32.014137768 +0200
-@@ -4,8 +4,8 @@
- 
- CONFIG                += qt warn_on
- mac|win32:CONFIG                += debug_and_release
- mac:unix:CONFIG       += explicitlib
--CONFIG                -= dll
-+CONFIG                += dll
- 
- HEADERS         = qassistantclient.h \
-                   qassistantclient_global.h
 --- qt-copy/src/plugins/sqldrivers/sqldrivers.pro.orig 2005-05-15 21:26:42.000000000 +0200
 +++ qt-copy/src/plugins/sqldrivers/sqldrivers.pro      2005-05-15 21:26:59.000000000 +0200
 @@ -8,3 +8,4 @@

diff --git a/qt4-designer.desktop b/qt4-designer.desktop
index 79996e9a20a9073bb4026856974aa9f743a94af9..d835217999cd8bccb75897e934da30893ed806aa 100644 (file)
--- a/qt4-designer.desktop
+++ b/qt4-designer.desktop
@@ -69,9 +69,11 @@ Comment[tr]=Qt4 arayüz tasarım programı
 Comment[uk]=Редактор інтерфейсу для Qt4
 Comment[zh_CN]=Qt4 界面设计程序
 Comment[zh_TW]=Qt4 介面編輯器
-MimeType=application/x-designer;
+MapNotify=true
+MimeType=application/x-designer
 Icon=designer-qt4
 Terminal=false
 Type=Application
 Categories=Qt;GUIDesigner;
+Encoding=UTF-8
 # vi: encoding=utf-8

diff --git a/qt4-linguist.desktop b/qt4-linguist.desktop
index db8bc35960598a5caaf3150caf11148d4da81854..102487bc99f54e340f60a49fe93b19e32381556c 100644 (file)
--- a/qt4-linguist.desktop
+++ b/qt4-linguist.desktop
@@ -1,4 +1,5 @@
 [Desktop Entry]
+Encoding=UTF-8
 Exec=linguist-qt4
 Name=Qt4 Linguist
 Name[ar]=مترجم كيوتي
@@ -102,7 +103,8 @@ GenericName[zh_TW]=翻譯工具
 GenericName[zu]=Ithuluzi Lokuguqulela
 Categories=Qt;Development;
 X-KDE-StartupNotify=true
-MimeType=application/x-linguist;
+MimeType=application/x-linguist
 Terminal=false
 Type=Application
 Icon=linguist-qt4
+

diff --git a/qt4-locale.patch b/qt4-locale.patch
index b2473cbc056a2422985e9d69088d6422fbd78a0c..98a2f6f8c9bc87aa0ffd4e6665fac685a37140ee 100644 (file)
--- a/qt4-locale.patch
+++ b/qt4-locale.patch
@@ -106,15 +106,15 @@ diff -Nur qt-x11-opensource-src-4.2.1.orig/src/corelib/kernel/qtranslator.cpp qt
      // realname is now the fully qualified name of a readable file.
  
      bool ok = false;
-diff -Nur qt-x11-opensource-src-4.2.1.orig/tools/assistant/main.cpp qt-x11-opensource-src-4.2.1.chng/tools/assistant/main.cpp
---- qt-x11-opensource-src-4.2.1.orig/tools/assistant/main.cpp  2006-10-20 17:35:28.000000000 +0200
-+++ qt-x11-opensource-src-4.2.1.chng/tools/assistant/main.cpp  2006-11-28 14:23:03.000000000 +0100
+diff -Nur qt-x11-opensource-src-4.2.1.orig/tools/assistant/compat/main.cpp qt-x11-opensource-src-4.2.1.chng/tools/assistant/main.cpp
+--- qt-x11-opensource-src-4.2.1.orig/tools/assistant/compat/main.cpp   2006-10-20 17:35:28.000000000 +0200
++++ qt-x11-opensource-src-4.2.1.chng/tools/assistant/compat/main.cpp   2006-11-28 14:23:03.000000000 +0100
 @@ -310,11 +310,11 @@
          resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
  
      QTranslator translator( 0 );
--    translator.load( QLatin1String("assistant_") + QLocale::system().name(), resourceDir );
-+    translator.load( QLatin1String("qt4-assistant_") + QLocale::system().name(), resourceDir );
+-    translator.load( QLatin1String("assistant_adp_") + QLocale::system().name(), resourceDir );
++    translator.load( QLatin1String("qt4-assistant_adp_") + QLocale::system().name(), resourceDir );
      a.installTranslator( &translator );
  
      QTranslator qtTranslator( 0 );

diff --git a/qt4-pg_libs.patch b/qt4-pg_libs.patch
new file mode 100644 (file)
index 0000000..9f40d3d
--- /dev/null
+++ b/qt4-pg_libs.patch
@@ -0,0 +1,11 @@
+--- qt-x11-opensource-src-4.4.0/configure.orig 2008-05-21 17:50:04.993798168 +0200
++++ qt-x11-opensource-src-4.4.0/configure      2008-05-21 17:52:14.984864177 +0200
+@@ -4171,7 +4171,7 @@
+                 if "$WHICH" pg_config >/dev/null 2>&1; then
+                     QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
+                     QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
+-                    QT_LIBS_PSQL=`pg_config --libs 2>/dev/null`
++                    QT_LIBS_PSQL=-lpq
+                 fi
+                 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
+                 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL $QT_LIBS_PSQL"

diff --git a/qt4-pl-update.patch b/qt4-pl-update.patch
index a66a7ae34c592eb4cc1ce40a751c98b77063f044..b0a54958742f200988ea2bb3bc3be85e1903a568 100644 (file)
--- a/qt4-pl-update.patch
+++ b/qt4-pl-update.patch
@@ -77,133 +77,8 @@
      </message>
  </context>
  <context>
---- qt-x11-opensource-src-4.3.3/translations/qtconfig_pl.ts.orig       2007-12-04 17:43:38.000000000 +0100
-+++ qt-x11-opensource-src-4.3.3/translations/qtconfig_pl.ts    2008-01-04 17:53:35.810111777 +0100
-@@ -308,7 +308,7 @@
-     <message>
-         <location filename="../tools/qtconfig/mainwindowbase.ui" line="785"/>
-         <source>Global Strut</source>
--        <translation type="unfinished"></translation>
-+        <translation>Uchwyt globalny</translation>
-     </message>
-     <message>
-         <location filename="../tools/qtconfig/mainwindowbase.ui" line="797"/>
-@@ -446,7 +446,7 @@
-     <message>
-         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="39"/>
-         <source>&lt;b&gt;Edit Palette&lt;/b&gt;&lt;p&gt;Change the palette of the current widget or form.&lt;/p&gt;&lt;p&gt;Use a generated palette or select colors for each color group and each color role.&lt;/p&gt;&lt;p&gt;The palette can be tested with different widget layouts in the preview section.&lt;/p&gt;</source>
--        <translation type="unfinished"></translation>
-+        <translation>&lt;b&gt;Modyfikuj paletę&lt;/b&gt;&lt;p&gt;Zmień paletę bieżącego widżetu lub formularza.&lt;/p&gt;&lt;p&gt;Użyj wygenerowanej palety lub wybranych kolorów dla każdej grupy kolorów i roli kolorów.&lt;/p&gt;&lt;p&gt;Paletę można przetestować z różnymi układami widżetów w sekcji podglądu.&lt;/p&gt;</translation>
-     </message>
-     <message>
-         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="68"/>
-@@ -486,17 +486,17 @@
-     <message>
-         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="160"/>
-         <source>Central color &amp;roles</source>
--        <translation type="unfinished"></translation>
-+        <translation>Centralne &amp;role koloru</translation>
-     </message>
-     <message>
-         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="178"/>
-         <source>Choose central color role</source>
--        <translation type="unfinished"></translation>
-+        <translation>Wybierz centralną rolę koloru</translation>
-     </message>
-     <message>
-         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="181"/>
-         <source>&lt;b&gt;Select a color role.&lt;/b&gt;&lt;p&gt;Available central roles are: &lt;ul&gt; &lt;li&gt;Window - general background color.&lt;/li&gt; &lt;li&gt;WindowText - general foreground color. &lt;/li&gt; &lt;li&gt;Base - used as background color for e.g. text entry widgets, usually white or another light color. &lt;/li&gt; &lt;li&gt;Text - the foreground color used with Base. Usually this is the same as WindowText, in what case it must provide good contrast both with Window and Base. &lt;/li&gt; &lt;li&gt;Button - general button background color, where buttons need a background different from Window, as in the Macintosh style. &lt;/li&gt; &lt;li&gt;ButtonText - a foreground color used with the Button color. &lt;/li&gt; &lt;li&gt;Highlight - a color to indicate a selected or highlighted item. &lt;/li&gt; &lt;li&gt;HighlightedText - a text color that contrasts to Highlight. &lt;/li&gt; &lt;li&gt;BrightText - a text color that is very different from WindowText and contrasts well with e.g. black. &lt;/li&gt; &lt;/ul&gt; &lt;/p&gt;</source>
--        <translation type="unfinished"></translation>
-+        <translation>&lt;b&gt;Wybierz rolę koloru.&lt;/b&gt;&lt;p&gt;Dostępne role centralne to: &lt;ul&gt; &lt;li&gt;Okno - ogólny kolor tła.&lt;/li&gt; &lt;li&gt;Tekst okna - ogólny kolor pierwszoplanowy. &lt;/li&gt; &lt;li&gt;Podstawa - kolor tła dla np. widżetów wprowadzania tekstu; zwykle biały lub inny jasny kolor. &lt;/li&gt; &lt;li&gt;Tekst - kolor pierwszoplanowy używany z podstawą. Zwykle ten sam, co tekst okna, który w tym przypadku powinien dobrze kontrastować zarówno z oknem, jak i podstawą. &lt;/li&gt; &lt;li&gt;Przycisk - ogólny kolor tła przycisku, kiedy przyciski wymagają innego tła niż okno, jak w stylu Macintosh. &lt;/li&gt; &lt;li&gt;Tekst przycisku - kolor pierwszoplanowy używany z kolorem przycisku. &lt;/li&gt; &lt;li&gt;Wyróżnienie - kolor oznaczający wybrany lub wyróżniony element. &lt;/li&gt; &lt;li&gt;Tekst wyróżniony - kolor tekstu kontrastujący z wyróżnieniem. &lt;/li&gt; &lt;li&gt;Tekst jasny - kolor tekstu różniący się znacząco od tekstu okna i kontrastujący dobrze np. z czarnym. &lt;/li&gt; &lt;/ul&gt; &lt;/p&gt;</translation>
-     </message>
-     <message>
-         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="185"/>
-@@ -526,7 +526,7 @@
-     <message>
-         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="210"/>
-         <source>BrightText</source>
--        <translation type="unfinished"></translation>
-+        <translation>Tekst jasny</translation>
-     </message>
-     <message>
-         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="215"/>
-@@ -556,7 +556,7 @@
-     <message>
-         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="304"/>
-         <source>Choose a color for the selected central color role.</source>
--        <translation type="unfinished"></translation>
-+        <translation>Wybierz kolor dla wybranej roli centralnej koloru.</translation>
-     </message>
-     <message>
-         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="319"/>
-@@ -566,47 +566,47 @@
-     <message>
-         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="348"/>
-         <source>Build &amp;from button color</source>
--        <translation type="unfinished"></translation>
-+        <translation>&amp;Utwórz z koloru przycisku</translation>
-     </message>
-     <message>
-         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="354"/>
-         <source>Generate shadings</source>
--        <translation type="unfinished"></translation>
-+        <translation>Wygeneruj cienie</translation>
-     </message>
-     <message>
-         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="357"/>
-         <source>Check to let 3D-effect colors be calculated from button-color.</source>
--        <translation type="unfinished"></translation>
-+        <translation>Zaznacz w celu obliczenia kolorów efektów 3D z koloru przycisku</translation>
-     </message>
-     <message>
-         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="367"/>
-         <source>Choose 3D-effect color role</source>
--        <translation type="unfinished"></translation>
-+        <translation>Wybierz rolę koloru efektów 3D</translation>
-     </message>
-     <message>
-         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="370"/>
-         <source>&lt;b&gt;Select a color role.&lt;/b&gt;&lt;p&gt;Available effect roles are: &lt;ul&gt; &lt;li&gt;Light - lighter than Button color. &lt;/li&gt; &lt;li&gt;Midlight - between Button and Light. &lt;/li&gt; &lt;li&gt;Mid - between Button and Dark. &lt;/li&gt; &lt;li&gt;Dark - darker than Button. &lt;/li&gt; &lt;li&gt;Shadow - a very dark color. &lt;/li&gt; &lt;/ul&gt;</source>
--        <translation type="unfinished"></translation>
-+        <translation>&lt;b&gt;Wybierz rolę koloru.&lt;/b&gt;&lt;p&gt;Dostępne role efektów to: &lt;ul&gt; &lt;li&gt;Jasny - jaśniejszy niż kolor przycisku. &lt;/li&gt; &lt;li&gt;Średnio jasny - pośredni między przyciskiem a światłem. &lt;/li&gt; &lt;li&gt;Pośredni - między przyciskiem a ciemnym. &lt;/li&gt; &lt;li&gt;Ciemny - ciemniejszy niż przycisk. &lt;/li&gt; &lt;li&gt;Cień - bardzo ciemny kolor. &lt;/li&gt; &lt;/ul&gt;</translation>
-     </message>
-     <message>
-         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="374"/>
-         <source>Light</source>
--        <translation type="unfinished"></translation>
-+        <translation>Jasny</translation>
-     </message>
-     <message>
-         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="379"/>
-         <source>Midlight</source>
--        <translation type="unfinished"></translation>
-+        <translation>Średnio jasny</translation>
-     </message>
-     <message>
-         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="384"/>
-         <source>Mid</source>
--        <translation type="unfinished"></translation>
-+        <translation>Pośredni</translation>
-     </message>
-     <message>
-         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="389"/>
-         <source>Dark</source>
--        <translation type="unfinished"></translation>
-+        <translation>Ciemny</translation>
-     </message>
-     <message>
-         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="394"/>
-@@ -621,7 +621,7 @@
-     <message>
-         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="475"/>
-         <source>Choose a color for the selected effect color role.</source>
--        <translation type="unfinished"></translation>
-+        <translation>Wybierz kolor dla wybranej roli koloru efektu.</translation>
-     </message>
-     <message>
-         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="517"/>
---- qt-x11-opensource-src-4.3.4/translations/designer_pl.ts.orig       2008-02-19 18:47:30.000000000 +0100
-+++ qt-x11-opensource-src-4.3.4/translations/designer_pl.ts    2008-02-29 15:23:53.753191684 +0100
+--- qt-x11-opensource-src-4.3.3/translations/designer_pl.ts.orig       2007-12-04 17:43:07.000000000 +0100
++++ qt-x11-opensource-src-4.3.3/translations/designer_pl.ts    2008-01-04 17:03:55.303516715 +0100
 @@ -756,7 +756,7 @@
      <message>
          <location filename="../../../../data/depot/qt/4.3/tools/designer/src/designer/plugindialog.ui" line="60"/>
@@ -246,8 +121,8 @@
 @@ -2069,7 +2069,7 @@
      <message>
          <location filename="../../../../data/depot/qt/4.3/tools/designer/src/designer/versiondialog.cpp" line="169"/>
-         <source>%1&lt;br/&gt;%2&lt;br/&gt;Copyright 2000-2008 Trolltech ASA. All rights reserved.&lt;br/&gt;&lt;br/&gt;The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.&lt;br/&gt; </source>
--        <translation type="unfinished">%1&lt;br/&gt;%2&lt;br/&gt;Copyright (C) 2000-2008 Trolltech ASA. Wszystkie prawa zastrzeżone.&lt;br/&gt;&lt;br/&gt;Program dostarczony jest BEZ ŻADNYCH GWARANCJI.&lt;br/&gt; </translation>
+         <source>%1&lt;br/&gt;%2&lt;br/&gt;Copyright 2000-2007 Trolltech ASA. All rights reserved.&lt;br/&gt;&lt;br/&gt;The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.&lt;br/&gt; </source>
+-        <translation type="unfinished">%1&lt;br/&gt;%2&lt;br/&gt;Copyright (C) 2000-2007 Trolltech ASA. Wszystkie prawa zastrzeżone.&lt;br/&gt;&lt;br/&gt;Program dostarczony jest BEZ ŻADNYCH GWARANCJI.&lt;br/&gt; </translation>
 +        <translation>%1&lt;br/&gt;%2&lt;br/&gt;Copyright (C) 2000-2007 Trolltech ASA. Wszystkie prawa zastrzeżone.&lt;br/&gt;&lt;br/&gt;Program dostarczony jest BEZ ŻADNYCH GWARANCJI.&lt;br/&gt; </translation>
      </message>
  </context>
@@ -291,8 +166,8 @@
      </message>
  </context>
  <context>
---- qt-x11-opensource-src-4.3.4/translations/linguist_pl.ts.orig       2008-02-19 18:47:39.000000000 +0100
-+++ qt-x11-opensource-src-4.3.4/translations/linguist_pl.ts    2008-02-29 15:25:57.385768693 +0100
+--- qt-x11-opensource-src-4.3.3/translations/linguist_pl.ts.orig       2007-12-04 17:43:16.000000000 +0100
++++ qt-x11-opensource-src-4.3.3/translations/linguist_pl.ts    2008-01-04 17:13:33.877191315 +0100
 @@ -76,22 +76,22 @@
      <message>
          <location filename="../../../../data/depot/qt/4.3/tools/linguist/linguist/msgedit.cpp" line="507"/>
@@ -320,7 +195,7 @@
      </message>
  </context>
  <context>
-@@ -791,12 +791,12 @@
+@@ -785,12 +785,12 @@
      <message>
          <location filename="../../../../data/depot/qt/4.3/tools/linguist/linguist/mainwindow.ui" line="769"/>
          <source>Open auxiliary source</source>
@@ -335,16 +210,16 @@
      </message>
  </context>
  <context>
-@@ -1351,7 +1351,7 @@
+@@ -1330,7 +1330,7 @@
      <message>
          <location filename="../../../../data/depot/qt/4.3/tools/linguist/linguist/trwindow.cpp" line="943"/>
-         <source>&lt;center&gt;&lt;img src=&quot;:/images/splash.png&quot;/&gt;&lt;/img&gt;&lt;p&gt;%1&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Qt Linguist is a tool for adding translations to Qt applications.&lt;/p&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Copyright (C) 2000-2008 Trolltech ASA. All rights reserved.&lt;/p&gt;&lt;p&gt;The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.&lt;/p&gt;</source>
+         <source>&lt;center&gt;&lt;img src=&quot;:/images/splash.png&quot;/&gt;&lt;/img&gt;&lt;p&gt;%1&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Qt Linguist is a tool for adding translations to Qt applications.&lt;/p&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Copyright (C) 2000-2007 Trolltech ASA. All rights reserved.&lt;/p&gt;&lt;p&gt;The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.&lt;/p&gt;</source>
 -        <translation type="unfinished"></translation>
 +        <translation>&lt;center&gt;&lt;img src=&quot;:/images/splash.png&quot;/&gt;&lt;/img&gt;&lt;p&gt;%1&lt;/p&gt;&lt;/center&gt;&lt;p&gt;Qt Linguist jest narzędziem do dodawania tłumaczeń do aplikacji Qt.&lt;/p&gt;&lt;p&gt;%2&lt;/p&gt;&lt;p&gt;Copyright (C) 2000-2007 Trolltech ASA. Wszelkie prawa zastrzeżone.&lt;/p&gt;&lt;p&gt;Program dostarczony jest BEZ ŻADNYCH GWARANCJI.&lt;/p&gt;</translation>
      </message>
      <message>
          <location filename="../../../../data/depot/qt/4.3/tools/linguist/linguist/trwindow.cpp" line="1620"/>
-@@ -1562,12 +1562,12 @@
+@@ -1541,12 +1541,12 @@
      <message>
          <location filename="../../../../data/depot/qt/4.3/tools/linguist/linguist/trwindow.cpp" line="933"/>
          <source>This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.</source>
@@ -359,7 +234,7 @@
      </message>
      <message>
          <location filename="../../../../data/depot/qt/4.3/tools/linguist/linguist/trwindow.cpp" line="689"/>
-@@ -1621,33 +1621,35 @@
+@@ -1600,33 +1600,35 @@
      <message>
          <location filename="../../../../data/depot/qt/4.3/tools/linguist/linguist/trwindow.cpp" line="302"/>
          <source>%1 translation</source>
@@ -401,5 +276,130 @@
 -        <translation type="unfinished"></translation>
 +        <translation>Istniejące tłumaczenie %1</translation>
      </message>
+ </context>
+ <context>
+--- qt-x11-opensource-src-4.3.3/translations/qtconfig_pl.ts.orig       2007-12-04 17:43:38.000000000 +0100
++++ qt-x11-opensource-src-4.3.3/translations/qtconfig_pl.ts    2008-01-04 17:53:35.810111777 +0100
+@@ -308,7 +308,7 @@
+     <message>
+         <location filename="../tools/qtconfig/mainwindowbase.ui" line="785"/>
+         <source>Global Strut</source>
+-        <translation type="unfinished"></translation>
++        <translation>Uchwyt globalny</translation>
+     </message>
+     <message>
+         <location filename="../tools/qtconfig/mainwindowbase.ui" line="797"/>
+@@ -446,7 +446,7 @@
+     <message>
+         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="39"/>
+         <source>&lt;b&gt;Edit Palette&lt;/b&gt;&lt;p&gt;Change the palette of the current widget or form.&lt;/p&gt;&lt;p&gt;Use a generated palette or select colors for each color group and each color role.&lt;/p&gt;&lt;p&gt;The palette can be tested with different widget layouts in the preview section.&lt;/p&gt;</source>
+-        <translation type="unfinished"></translation>
++        <translation>&lt;b&gt;Modyfikuj paletę&lt;/b&gt;&lt;p&gt;Zmień paletę bieżącego widżetu lub formularza.&lt;/p&gt;&lt;p&gt;Użyj wygenerowanej palety lub wybranych kolorów dla każdej grupy kolorów i roli kolorów.&lt;/p&gt;&lt;p&gt;Paletę można przetestować z różnymi układami widżetów w sekcji podglądu.&lt;/p&gt;</translation>
+     </message>
+     <message>
+         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="68"/>
+@@ -486,17 +486,17 @@
+     <message>
+         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="160"/>
+         <source>Central color &amp;roles</source>
+-        <translation type="unfinished"></translation>
++        <translation>Centralne &amp;role koloru</translation>
+     </message>
      <message>
-         <location filename="../../../../data/depot/qt/4.3/tools/linguist/linguist/trwindow.cpp" line="14"/>
+         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="178"/>
+         <source>Choose central color role</source>
+-        <translation type="unfinished"></translation>
++        <translation>Wybierz centralną rolę koloru</translation>
+     </message>
+     <message>
+         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="181"/>
+         <source>&lt;b&gt;Select a color role.&lt;/b&gt;&lt;p&gt;Available central roles are: &lt;ul&gt; &lt;li&gt;Window - general background color.&lt;/li&gt; &lt;li&gt;WindowText - general foreground color. &lt;/li&gt; &lt;li&gt;Base - used as background color for e.g. text entry widgets, usually white or another light color. &lt;/li&gt; &lt;li&gt;Text - the foreground color used with Base. Usually this is the same as WindowText, in what case it must provide good contrast both with Window and Base. &lt;/li&gt; &lt;li&gt;Button - general button background color, where buttons need a background different from Window, as in the Macintosh style. &lt;/li&gt; &lt;li&gt;ButtonText - a foreground color used with the Button color. &lt;/li&gt; &lt;li&gt;Highlight - a color to indicate a selected or highlighted item. &lt;/li&gt; &lt;li&gt;HighlightedText - a text color that contrasts to Highlight. &lt;/li&gt; &lt;li&gt;BrightText - a text color that is very different from WindowText and contrasts well with e.g. black. &lt;/li&gt; &lt;/ul&gt; &lt;/p&gt;</source>
+-        <translation type="unfinished"></translation>
++        <translation>&lt;b&gt;Wybierz rolę koloru.&lt;/b&gt;&lt;p&gt;Dostępne role centralne to: &lt;ul&gt; &lt;li&gt;Okno - ogólny kolor tła.&lt;/li&gt; &lt;li&gt;Tekst okna - ogólny kolor pierwszoplanowy. &lt;/li&gt; &lt;li&gt;Podstawa - kolor tła dla np. widżetów wprowadzania tekstu; zwykle biały lub inny jasny kolor. &lt;/li&gt; &lt;li&gt;Tekst - kolor pierwszoplanowy używany z podstawą. Zwykle ten sam, co tekst okna, który w tym przypadku powinien dobrze kontrastować zarówno z oknem, jak i podstawą. &lt;/li&gt; &lt;li&gt;Przycisk - ogólny kolor tła przycisku, kiedy przyciski wymagają innego tła niż okno, jak w stylu Macintosh. &lt;/li&gt; &lt;li&gt;Tekst przycisku - kolor pierwszoplanowy używany z kolorem przycisku. &lt;/li&gt; &lt;li&gt;Wyróżnienie - kolor oznaczający wybrany lub wyróżniony element. &lt;/li&gt; &lt;li&gt;Tekst wyróżniony - kolor tekstu kontrastujący z wyróżnieniem. &lt;/li&gt; &lt;li&gt;Tekst jasny - kolor tekstu różniący się znacząco od tekstu okna i kontrastujący dobrze np. z czarnym. &lt;/li&gt; &lt;/ul&gt; &lt;/p&gt;</translation>
+     </message>
+     <message>
+         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="185"/>
+@@ -526,7 +526,7 @@
+     <message>
+         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="210"/>
+         <source>BrightText</source>
+-        <translation type="unfinished"></translation>
++        <translation>Tekst jasny</translation>
+     </message>
+     <message>
+         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="215"/>
+@@ -556,7 +556,7 @@
+     <message>
+         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="304"/>
+         <source>Choose a color for the selected central color role.</source>
+-        <translation type="unfinished"></translation>
++        <translation>Wybierz kolor dla wybranej roli centralnej koloru.</translation>
+     </message>
+     <message>
+         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="319"/>
+@@ -566,47 +566,47 @@
+     <message>
+         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="348"/>
+         <source>Build &amp;from button color</source>
+-        <translation type="unfinished"></translation>
++        <translation>&amp;Utwórz z koloru przycisku</translation>
+     </message>
+     <message>
+         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="354"/>
+         <source>Generate shadings</source>
+-        <translation type="unfinished"></translation>
++        <translation>Wygeneruj cienie</translation>
+     </message>
+     <message>
+         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="357"/>
+         <source>Check to let 3D-effect colors be calculated from button-color.</source>
+-        <translation type="unfinished"></translation>
++        <translation>Zaznacz w celu obliczenia kolorów efektów 3D z koloru przycisku</translation>
+     </message>
+     <message>
+         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="367"/>
+         <source>Choose 3D-effect color role</source>
+-        <translation type="unfinished"></translation>
++        <translation>Wybierz rolę koloru efektów 3D</translation>
+     </message>
+     <message>
+         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="370"/>
+         <source>&lt;b&gt;Select a color role.&lt;/b&gt;&lt;p&gt;Available effect roles are: &lt;ul&gt; &lt;li&gt;Light - lighter than Button color. &lt;/li&gt; &lt;li&gt;Midlight - between Button and Light. &lt;/li&gt; &lt;li&gt;Mid - between Button and Dark. &lt;/li&gt; &lt;li&gt;Dark - darker than Button. &lt;/li&gt; &lt;li&gt;Shadow - a very dark color. &lt;/li&gt; &lt;/ul&gt;</source>
+-        <translation type="unfinished"></translation>
++        <translation>&lt;b&gt;Wybierz rolę koloru.&lt;/b&gt;&lt;p&gt;Dostępne role efektów to: &lt;ul&gt; &lt;li&gt;Jasny - jaśniejszy niż kolor przycisku. &lt;/li&gt; &lt;li&gt;Średnio jasny - pośredni między przyciskiem a światłem. &lt;/li&gt; &lt;li&gt;Pośredni - między przyciskiem a ciemnym. &lt;/li&gt; &lt;li&gt;Ciemny - ciemniejszy niż przycisk. &lt;/li&gt; &lt;li&gt;Cień - bardzo ciemny kolor. &lt;/li&gt; &lt;/ul&gt;</translation>
+     </message>
+     <message>
+         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="374"/>
+         <source>Light</source>
+-        <translation type="unfinished"></translation>
++        <translation>Jasny</translation>
+     </message>
+     <message>
+         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="379"/>
+         <source>Midlight</source>
+-        <translation type="unfinished"></translation>
++        <translation>Średnio jasny</translation>
+     </message>
+     <message>
+         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="384"/>
+         <source>Mid</source>
+-        <translation type="unfinished"></translation>
++        <translation>Pośredni</translation>
+     </message>
+     <message>
+         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="389"/>
+         <source>Dark</source>
+-        <translation type="unfinished"></translation>
++        <translation>Ciemny</translation>
+     </message>
+     <message>
+         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="394"/>
+@@ -621,7 +621,7 @@
+     <message>
+         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="475"/>
+         <source>Choose a color for the selected effect color role.</source>
+-        <translation type="unfinished"></translation>
++        <translation>Wybierz kolor dla wybranej roli koloru efektu.</translation>
+     </message>
+     <message>
+         <location filename="../tools/qtconfig/paletteeditoradvancedbase.ui" line="517"/>

diff --git a/qt4-qtconfig.desktop b/qt4-qtconfig.desktop
index b6fdd193c1b13db9d4880a544009e4efc3c02d2b..185b66eaf2ce5e2f8328f81e06deef0dcd4efb01 100644 (file)
--- a/qt4-qtconfig.desktop
+++ b/qt4-qtconfig.desktop
@@ -6,9 +6,11 @@ Name[pl]=Konfiguracja Qt4
 Comment=A graphical configuration tool for programs using Qt4 
 Comment[de]=Ein grafisches Konfigurationstool für Qt4-Programme
 Comment[pl]=Narzędzie graficzne do konfiguracji programów korzystających z Qt4
-MimeType=application/x-qtconfig;
+MapNotify=true
+MimeType=application/x-qtconfig
 Terminal=false
 Icon=qtconfig-qt4
 Type=Application
 Categories=Qt;Settings;
+Encoding=UTF-8
 # vi: encoding=utf-8

diff --git a/qt4-tools.patch b/qt4-tools.patch
index 0d7cb3af4d137d77641af02f5246d72f51aa3f97..bf8faeb1f44dbe5b77f67f397d10a672c9042788 100644 (file)
--- a/qt4-tools.patch
+++ b/qt4-tools.patch
@@ -1,13 +1,15 @@
 --- qt-copy/tools/tools.pro.orig       2005-05-13 16:39:18.000000000 +0200
 +++ qt-copy/tools/tools.pro    2005-05-13 20:02:31.761482520 +0200
-@@ -7,6 +7,7 @@
-                       assistant \
-                       pixeltool \
-                       porting \
-+                      qvfb \
-                          qtestlib
+@@ -6,7 +6,8 @@
+      SUBDIRS += assistant \
+               pixeltool \
+               porting \
+-                qtestlib
++                qtestlib \
++              qvfb
       contains(QT_EDITION, Console) {
           SUBDIRS += designer/src/uitools     # Linguist depends on this
+      } else {
 diff -Nur qt-x11-opensource-src-4.1.4/src/gui/embedded.orig/qlock.cpp qt-x11-opensource-src-4.1.4/src/gui/embedded/qlock.cpp
 --- qt-x11-opensource-src-4.1.4/src/gui/embedded.orig/qlock.cpp        1970-01-01 01:00:00.000000000 +0100
 +++ qt-x11-opensource-src-4.1.4/src/gui/embedded/qlock.cpp     2006-07-02 11:35:54.386518000 +0200