#
#
# patch "ChangeLog"
#  from [615d42afd8682671e7016d94dc076614048926a4]
#    to [9c7476cb68d5a4162f0015980b54c2a0d767d419]
#
# patch "README"
#  from [5cd255837ca357a22153c84d00106f29d9ebb976]
#    to [3becea4a889f548a17cdfb9c9f504d181b5d9834]
#
# patch "res/i18n/guitone_de.ts"
#  from [fdb077c21f41e7edfb39abf1279a6b55becd5390]
#    to [3b0993a128ae9a40dbf4ace8009c6c82adc0c349]
#
# patch "src/view/Guitone.cpp"
#  from [bf65255876d788cddad6ebfbb4808291ac52871f]
#    to [fa55a14466d1bcaacda65e58a5906435538020af]
#
============================================================
--- ChangeLog	615d42afd8682671e7016d94dc076614048926a4
+++ ChangeLog	9c7476cb68d5a4162f0015980b54c2a0d767d419
@@ -1,3 +1,19 @@
+2006-10-03 (0.4)
+ - Interims release, mainly to show we're still alive =)
+ - support for different monotone binaries, configurable via preferences dialog
+   (version check added, guitone now requires mtn >= 0.29)
+ - revision browser (later used for switching the workspace revision, etc.)
+ - new attributes view (utilizes mtn automate attributes)
+ - improved error handling (fatal errors)
+ - OSX application icon and updated logo
+ - localized application menu on OSX
+ - states of tree and list views (column sizes and positions) are now remembered
+ - minor fixes
+ - internal: added BasicIO parser
+ - internal: removed OSX < 10.4 warning
+ - internal: i18n files are now managed via qrc as well
+ - internal: inventory items can get a label setting (independent of the path)
+
 2006-06-17 (0.3)
  - Move to Qt4
  - Icon overlays for workspace states
============================================================
--- README	5cd255837ca357a22153c84d00106f29d9ebb976
+++ README	3becea4a889f548a17cdfb9c9f504d181b5d9834
@@ -9,34 +9,28 @@
 You need Qt >= 4.1 and monotone >= 0.30 (0.29 works as well but has a bug
 in the attributes display) to build and later run monotone.

-Under Linux just do
+Under Linux / MacOS X just do

  $ cd /path/to/guitone
  $ ./build.sh
- $ bin/guitone

-On MacOS X, you should have a recent version of XCode installed. Then
-you create a XCode project file with
+On MacOS X you can build guitone also with Xcode. For this to work you should
+have a recent version of XCode installed (>= 2.3 because of gcc) which is
+usually found somewhere on the installation DVD. Then you can create a XCode
+project file with

  $ qmake -spec macx-xcode

 and open this with XCode. If you need to tweak settings (i.e. architecture)
-in the Qt project file (guitone.pro), remember to redo this step. After
-building the app is placed under bin/guitone.app and can be clicked on as
-usual through the Finder or is opened by triggering
+in the Qt project file (guitone.pro), remember to redo this step.

- $ open bin/guitone.app
+The created binary is monolithic can be found in bin/.

-from command line.

-With CTRL-I (Mac: CMD + I) you select the base folder of the workspace
-which is then loaded.
-
 The most recent version can always be obtained from the monotone
 repository on venge.net/monotone. guitone is located in the branch
 net.venge.monotone.guitone.

-And btw... contributions are welcome!

 Platform Notes
 ==============
@@ -50,14 +44,19 @@
   version of Qt such as 4.1.0 consider updating to a later
   version. Apparently in 4.1.4 the problem is gone.

-* If you like to build on windows, you only have to get an running
-  version of QT 4.1.x. Please see at Trolltech for assistance for
-  setting up a version. After that get the source of guitone und run
-  qmake in it. Runing your make-tool and guitone is build.
+* If you like to build on Windows, all you need is a working version of
+  Qt 4.1.x. Please check the docs at trolltech.com for assistance how to
+  build Qt on Windows.
+  After that get the sources of guitone, unpack them into some directory
+  and run qmake in it. Then start your favourite make tool and you're done.

+
 Authors
 =======

-Thomas Keller <me AT thomaskeller DOT biz>
-Ingo Maindorfer <ingo AT liquidcooling DOT de>
+Thomas "TommyD" Keller <me AT thomaskeller DOT biz>
+Ingo "Slinky" Maindorfer <ingo AT liquidcooling DOT de>

+Contributions are very welcome, we're usually hanging around in the monotone
+IRC at irc://irc.oftc.net/#monotone so don't hesitate to contact us!
+
============================================================
--- res/i18n/guitone_de.ts	fdb077c21f41e7edfb39abf1279a6b55becd5390
+++ res/i18n/guitone_de.ts	3b0993a128ae9a40dbf4ace8009c6c82adc0c349
@@ -199,7 +199,7 @@
     </message>
     <message>
         <source>&amp;Key Managment</source>
-        <translation>&amp;Schlüsselverwaltung</translation>
+        <translation type="obsolete">&amp;Schlüsselverwaltung</translation>
     </message>
     <message>
         <source>About &amp;Qt</source>
============================================================
--- src/view/Guitone.cpp	bf65255876d788cddad6ebfbb4808291ac52871f
+++ src/view/Guitone.cpp	fa55a14466d1bcaacda65e58a5906435538020af
@@ -102,6 +102,8 @@ Guitone::Guitone()
         Qt::CTRL + Qt::Key_R
     );

+    // Disabled until we see any functionality there...
+    /*
     menu = menuBar()->addMenu(tr("&Key Managment"));
     menu->addAction(
         tr("&Key Managment"),
@@ -109,6 +111,7 @@ Guitone::Guitone()
         SLOT(openKeyManagmentDialog()),
         Qt::CTRL + Qt::Key_K
     );
+    */

     menu = menuBar()->addMenu(tr("&Help"));
     menu->addAction(