diff kdiff3/README @ 92:4e6ebbbae925 0.9.95

KDiff3 0.9.95

--- a/kdiff3/README	Tue Jan 06 22:31:57 2009 +0000
+++ b/kdiff3/README	Tue Mar 03 23:50:12 2009 +0000
@@ -2,14 +2,14 @@
 =============
 
 Author: Joachim Eibl  (joachim.eibl at gmx.de)
-Copyright: (C) 2002-2008 by Joachim Eibl
-KDiff3-Version: 0.9.93
+Copyright: (C) 2002-2009 by Joachim Eibl
+KDiff3-Version: 0.9.94
 
 KDiff3 runs best on KDE but can be built without it, depending only on Qt-libs.
 These are available for Un*x, Windows, Mac.
 Thus there are many setup possibilities to consider.
 
-From version 0.9.93 on the main target platform is KDE4/Qt4.
+From version 0.9.94 on the main target platform is KDE4/Qt4.
 For KDiff3 for KDE3/Qt3 use KDiff3-0.9.92 or older.
 
 Contents
@@ -24,6 +24,7 @@
     - for Windows
     - Debugging with MinGW under Windows:
     - for Mac: Building KDiff3 for Mac OSX (with Intel processor) as a universal binary
+    - Creating and installing translation messages
 - Additional hints
 
 
@@ -75,7 +76,7 @@
 ---------------------------
 
 - for KDE4:
-   From version 0.9.93 on KDiff3 supports KDE4.
+   From version 0.9.94 on KDiff3 supports KDE4.
    For installation on most distributions you usually also require these packages (names as on opensuse):
    - g++ (g++, version 3.4 or newer)
    - libqt4-devel (Qt4-libs, version 4.4.0 or newer)
@@ -113,10 +114,10 @@
     - for Windows
     - for Mac
 
-   The version 0.9.93 requires Qt 4.4.0 or newer (from www.trolltech.com) for compilation. 
+   The version 0.9.94 requires Qt 4.4.0 or newer (from www.trolltech.com) for compilation. 
 
    You always need
-      - kdiff3-0.9.93.tar.gz
+      - kdiff3-0.9.94.tar.gz
 
       - for Un*x:    gcc, g++ with version >=3.4.2
                      Qt-X11-libraries
@@ -141,14 +142,14 @@
   Build-instructions (Un*x):
     - Make sure your shell-variable QTDIR is correct and that 
       your path contains the Qt4-bin-directory.
-    - cd into the directory kdiff3-0.9.93/src-QT4 and type
+    - cd into the directory kdiff3-0.9.94/src-QT4 and type
     - qmake kdiff3.pro
     - make (or "gmake" for GNU-Make)
 
   Build-instructions (Windows):
     - set QTDIR=<QT4-dir>         e.g.: c:\qt\4.4.1
       set "PATH=%QTDIR%\bin;%PATH%"
-    - cd into the directory kdiff3-0.9.93\src-Qt4 and type
+    - cd into the directory kdiff3-0.9.94\src-Qt4 and type
     - qmake kdiff3.pro
     - Either "nmake" for Visual Studio or "mingw32-make" depending on what you have.
 
@@ -157,7 +158,7 @@
     - Debugging without gdb on the console:
       - The qt-win-opensource-4.4.1-mingw.exe only installs release dlls. You will have to compile the
          debug dlls yourself. Enter the qt-4.4.1-directory and run "configure -debug" and then "mingw32-make".
-      - cd into the directory kdiff3-0.9.93\src-Qt4
+      - cd into the directory kdiff3-0.9.94\src-Qt4
       - edit the file "Makefile.Debug" and in the LFLAGS replace "-Wl,-subsystem,windows" with "-Wl,-subsystem,console"
          (this is necessary so that gdb can send a break signal to the running program)
       - mingw32-make debug (create a debuggable executable)
@@ -170,16 +171,28 @@
   Building KDiff3 (Qt4) for Mac OSX (with Intel processor) as a universal binary (by Michael Schmidt)
     1) Install Qt/Mac 4.x with thread support, static libraries and universal flag.
        (For Qt4 run "configure -static"; only necessary if the final binary should not require shared Qt4-libs.)
-    2) cd .../kdiff3-0.9.93/src-QT4
+    2) cd .../kdiff3-0.9.94/src-QT4
     3a) Create a makefile for kdiff3 by executing:
        qmake kdiff3.pro
     3b) optionally generate XCode-Project (for debugging purposes only) by executing:
        qmake -spec macx-xcode kdiff3.pro
     4) Execute:
        make
-    5) After the build completes copy kdiff3 from the kdiff3-0.9.93/src-QT4 directory to
+    5) After the build completes copy kdiff3 from the kdiff3-0.9.94/src-QT4 directory to
        /Applications
 
+  Creating and installing the translation messages
+    The po directory contains translations from the KDE-translation teams.
+    If you use the Qt-only-version of KDiff3, then the installation described above 
+    won't install translations automatically.
+    To create and install the translations:
+    0) Make sure /usr/lib/qt3/bin/msg2qm exists 
+       (comes with qt3-devel-tools. [Yes, really Qt3. There is no Qt4 replacement yet.])
+    1) cd .../kdiff3-0.9.95/po
+    2) sh create_qm_files install    (asks for a super user password)
+    Just to create the files in the po directory (as needed for the windows version): 
+    2) sh create_qm_files local
+
 
 (End of KDiff3 with Qt4-instructions)
 ------------------------------------------------------------------------