#
#
# patch "guitone/res/forms/preferences.ui"
#  from [b2a58b08e11a292a2f334514e2c24dfedcc7cd21]
#    to [50dcda14fc2c4f5147800b73b015bf988efd52f4]
#
# patch "guitone/res/i18n/guitone_de.ts"
#  from [10ac88a1778d3080da3364fb948d06be4a4b4906]
#    to [5861fddfc07e8d18c75fb918b7ace3021a971bfa]
#
# patch "guitone/src/util/DebugLog.cpp"
#  from [061f8dd3f473df0360dd67bad76e70f8a891462d]
#    to [0bf89411af60bddec2e3e1e527ecb5d025caa37e]
#
============================================================
--- guitone/res/forms/preferences.ui	b2a58b08e11a292a2f334514e2c24dfedcc7cd21
+++ guitone/res/forms/preferences.ui	50dcda14fc2c4f5147800b73b015bf988efd52f4
@@ -5,7 +5,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>343</width>
+    <width>372</width>
     <height>248</height>
    </rect>
   </property>
@@ -17,6 +17,12 @@
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
+  <property name="minimumSize" >
+   <size>
+    <width>372</width>
+    <height>248</height>
+   </size>
+  </property>
   <property name="maximumSize" >
    <size>
     <width>16777215</width>
============================================================
--- guitone/res/i18n/guitone_de.ts	10ac88a1778d3080da3364fb948d06be4a4b4906
+++ guitone/res/i18n/guitone_de.ts	5861fddfc07e8d18c75fb918b7ace3021a971bfa
@@ -932,63 +932,103 @@ monotone gab zurück:
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="57"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="72"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="74"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="89"/>
         <source>Notice</source>
         <translation>Hinweis</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="77"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="92"/>
         <source>You need to reload your current workspace or restart guitone to use the new monotone binary.</source>
         <translation>Sie müssen Ihren derzeitigen Arbeitsbereich neu laden oder guitone neu starten, um die neuen Einstellungen zu verwenden.</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="90"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="114"/>
         <source>Choose the monotone executable</source>
         <translation>Wählen Sie die ausführbare Datei von monotone</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="93"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="117"/>
         <source>Binaries (mtn mtn.exe)</source>
         <translation>Ausführbare Dateien (mtn mtn.exe)</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="62"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="77"/>
         <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>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/view/dialogs/Preferences.cpp" line="44"/>
+        <source>Low (fatal errors)</source>
+        <translation>Niedrig (fatale Fehler)</translation>
+    </message>
+    <message>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="45"/>
+        <source>Medium (critical errors)</source>
+        <translation>Mittel (kritische Fehler)</translation>
+    </message>
+    <message>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="46"/>
+        <source>High (warnings)</source>
+        <translation>Hoch (Warnungen)</translation>
+    </message>
+    <message>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="47"/>
+        <source>All (debug messages)</source>
+        <translation>Alle (Debug-Meldungen)</translation>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../forms/preferences.ui" line="24"/>
+        <location filename="../forms/preferences.ui" line="36"/>
         <source>Preferences</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../forms/preferences.ui" line="53"/>
+        <location filename="../forms/preferences.ui" line="65"/>
         <source>Path to monotone executable</source>
         <translation>Pfad zur ausführbaren Datei von monotone</translation>
     </message>
     <message>
-        <location filename="../forms/preferences.ui" line="86"/>
+        <location filename="../forms/preferences.ui" line="98"/>
         <source>Browse</source>
         <translation>Durchsuchen</translation>
     </message>
     <message>
-        <location filename="../forms/preferences.ui" line="119"/>
+        <location filename="../forms/preferences.ui" line="206"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../forms/preferences.ui" line="126"/>
+        <location filename="../forms/preferences.ui" line="213"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
+    <message>
+        <location filename="../forms/preferences.ui" line="110"/>
+        <source>Logging</source>
+        <translation>Protokollierung</translation>
+    </message>
+    <message>
+        <location filename="../forms/preferences.ui" line="130"/>
+        <source>enable console logging</source>
+        <translation>Protokollierung auf Konsole aktivieren</translation>
+    </message>
+    <message>
+        <location filename="../forms/preferences.ui" line="140"/>
+        <source>enable file logging (%1)</source>
+        <translation>Protokollierung in Datei aktivieren (%1)</translation>
+    </message>
+    <message>
+        <location filename="../forms/preferences.ui" line="155"/>
+        <source>Log level</source>
+        <translation>Protokoll-Level</translation>
+    </message>
 </context>
 <context>
     <name>QShortcut</name>
============================================================
--- guitone/src/util/DebugLog.cpp	061f8dd3f473df0360dd67bad76e70f8a891462d
+++ guitone/src/util/DebugLog.cpp	0bf89411af60bddec2e3e1e527ecb5d025caa37e
@@ -51,6 +51,12 @@ DebugLog::DebugLog()
                          "disable file logging.").arg(logFilePath()));
         fileLogging = false;
     }
+
+    QString sep;
+    sep.fill('=', 32);
+    log(Debug, sep);
+    log(Debug, "|    guitone session started   |");
+    log(Debug, sep);
 }

 DebugLog::~DebugLog()
@@ -95,7 +101,7 @@ void DebugLog::log(Type t, QString msg)
     QString logStr;
     logStr.append(
         QString("%1: %2: %3\n")
-            .arg(current.toString("yyyy-MM-dd hh:mm:ss"))
+            .arg(current.toString("yyyy-MM-dd hh:mm:ss.zzz"))
             .arg(errors[t-1])
             .arg(msg)
     );