#
#
# patch "build.sh"
#  from [f2e5495f9013a8b24e8dfecffea3015ea68f86d1]
#    to [09fd336def3a03ac273b673eae083c9891612925]
#
# patch "guitone/res/i18n/guitone_de.ts"
#  from [065107c0776d4e4c784912d23dd9995b29b561bc]
#    to [cf46309a566fac8fa41f981fe2568f263c031728]
#
# patch "guitone/src/Guitone.cpp"
#  from [72db4ba5a31fd28c6994ba6d756343996ceeabcd]
#    to [59f7c976e4f4a48bfae559c5aef423a09f6ca4f1]
#
# patch "guitone/src/main.cpp"
#  from [8ada0d2863004cf71e52119f283830d39e16b559]
#    to [8f6e734d3a814023ea66e767ffc611e536bd7329]
#
============================================================
--- build.sh	f2e5495f9013a8b24e8dfecffea3015ea68f86d1
+++ build.sh	09fd336def3a03ac273b673eae083c9891612925
@@ -1,9 +1,8 @@ cd guitone && \
 #!/bin/sh

 qmake guitone.pro

 cd guitone && \
- lupdate guitone.pro && \
  lrelease guitone.pro && \
  cd ..
  make $@
============================================================
--- guitone/res/i18n/guitone_de.ts	065107c0776d4e4c784912d23dd9995b29b561bc
+++ guitone/res/i18n/guitone_de.ts	cf46309a566fac8fa41f981fe2568f263c031728
@@ -344,17 +344,17 @@
 <context>
     <name>Guitone</name>
     <message>
-        <location filename="../../src/Guitone.cpp" line="341"/>
+        <location filename="../../src/Guitone.cpp" line="319"/>
         <source>Error</source>
         <translation type="unfinished">Fehler</translation>
     </message>
     <message>
-        <location filename="../../src/Guitone.cpp" line="346"/>
+        <location filename="../../src/Guitone.cpp" line="324"/>
         <source>The path to the monotone binary is either invalid or points to an older version of monotone. Guitone requires monotone version %1 or a monotone with interface version %2 or later.</source>
         <translation type="unfinished">Der Pfad zur ausführbaren Datei von monotone ist entweder ungültig oder zeigt auf eine ältere Version von monotone. Guitone benötigt monotone Version %1 oder ein monotone mit einer Interface-Version %2 oder neuer.</translation>
     </message>
     <message>
-        <location filename="../../src/Guitone.cpp" line="110"/>
+        <location filename="../../src/Guitone.cpp" line="88"/>
         <source>Critical Monotone Error</source>
         <translation type="unfinished">Kritischer monotone-Fehler</translation>
     </message>
============================================================
--- guitone/src/Guitone.cpp	72db4ba5a31fd28c6994ba6d756343996ceeabcd
+++ guitone/src/Guitone.cpp	59f7c976e4f4a48bfae559c5aef423a09f6ca4f1
@@ -19,62 +19,23 @@
  ***************************************************************************/

 #include "Guitone.h"
-#include "DebugLog.h"
 #include "MainWindow.h"
 #include "Monotone.h"
 #include "Preferences.h"
 #include "Settings.h"

-#include <QLocale>
-#include <QTranslator>
 #include <QMessageBox>
 #include <QTimer>
 #include <QMutexLocker>
 #include <QDesktopWidget>

-void guitoneMsgHandler(QtMsgType type, const char *msg)
-{
-    switch (type)
-    {
-        case QtDebugMsg:
-            DebugLog::debug(msg);
-            break;
-        case QtWarningMsg:
-            DebugLog::warn(msg);
-            break;
-        case QtCriticalMsg:
-            DebugLog::critical(msg);
-            break;
-        case QtFatalMsg:
-            DebugLog::fatal(msg);
-            abort();
-     }
-}
-
 Guitone::Guitone(int argc, char** argv) : QApplication(argc, argv)
 {
-    qInstallMsgHandler(guitoneMsgHandler);
-
     setQuitOnLastWindowClosed(false);

     setOrganizationName("Thomas Keller");
     setOrganizationDomain("thomaskeller.biz");
     setApplicationName("guitone");
-
-    // try to find a suitable locale and setup translations
-    QString locale = QLocale::system().name();
-    QTranslator translator;
-
-	QString transFileName("guitone_" + locale);
-	if (translator.load(transFileName, ":/i18n"))
-    {
-        installTranslator(&translator);
-    }
-    else
-    {
-        qWarning("Guitone::Guitone: Couldn't load translation file "
-                 "for %s - using default", qPrintable(locale));
-    }
 }

 bool Guitone::init()
============================================================
--- guitone/src/main.cpp	8ada0d2863004cf71e52119f283830d39e16b559
+++ guitone/src/main.cpp	8f6e734d3a814023ea66e767ffc611e536bd7329
@@ -18,12 +18,52 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/

+#include "DebugLog.h"
 #include "Guitone.h"

+#include <QLocale>
+#include <QTranslator>
+
+void guitoneMsgHandler(QtMsgType type, const char *msg)
+{
+    switch (type)
+    {
+        case QtDebugMsg:
+            DebugLog::debug(msg);
+            break;
+        case QtWarningMsg:
+            DebugLog::warn(msg);
+            break;
+        case QtCriticalMsg:
+            DebugLog::critical(msg);
+            break;
+        case QtFatalMsg:
+            DebugLog::fatal(msg);
+            abort();
+     }
+}
+
 int main(int argc, char** argv)
 {
+    // install our own message handler to catch debug messages, warnings, etc.
+    qInstallMsgHandler(guitoneMsgHandler);
+
+    // try to find a suitable locale and setup translations
+    QString locale = QLocale::system().name();
+    QTranslator translator;
+    QString transFileName("guitone_" + locale);
+	
+    if (!translator.load(transFileName, ":/i18n"))
+    {
+       qWarning("Guitone::Guitone: Couldn't load translation file "
+                 "for %s - using default", qPrintable(locale));
+    }
+
     Guitone app(argc, argv);
+    app.installTranslator(&translator);
+
     if (!app.init()) return 1;
+
     return app.exec();
 }