#
#
# patch "guitone/res/forms/main_window.ui"
#  from [8bfd4e073529b3d20d715e13592110837a381b54]
#    to [086950bfff52980715b9f43caf2038fa2368c2da]
#
# patch "guitone/res/i18n/guitone_de.ts"
#  from [dca79d10521b4e2fb98aebd413c95167d9ea8709]
#    to [4c846758a755d96116d7bfe76fc36bebd709000f]
#
# patch "guitone/src/model/ContentDiff.cpp"
#  from [0f4cbb219461f00b002a6fbe35bbb06258fb5fa0]
#    to [744ac8b8ee03f8cbb890061fd48f9d9c96ec3a24]
#
# patch "guitone/src/model/GetFile.cpp"
#  from [11851af0fe0d2ebb415ba2a73ceab1ace1292e61]
#    to [05345e2aaf9b1a8ed333ab590da9cadf24da21af]
#
# patch "guitone/src/model/Inventory.cpp"
#  from [0890179743d4c1ebec0fafe515a838979867324c]
#    to [7cfde5f3e235a09824f02c67f34df394985e9b69]
#
# patch "guitone/src/monotone/MonotoneDelegate.cpp"
#  from [33233e6fa3b2058ec9be7db7277d31532c7bf642]
#    to [0986e7b2551f4ccf87bcecc7da446cb417514d84]
#
# patch "guitone/src/monotone/MonotoneDelegate.h"
#  from [90d2cbee4e869a67166728b9f5fa73dc574ae57a]
#    to [b874cc9da422e4dbdf80623712b01d3f0213aa37]
#
# patch "guitone/src/view/MainWindow.cpp"
#  from [1dea0e2380aae2f2f5e08271070ea75ebd2064dd]
#    to [afa591155fdb43a496e9712bd5fa6248770b96e7]
#
# patch "guitone/src/view/dialogs/CheckoutRevision.cpp"
#  from [0ad602766bdbe0e74db8140ed4fa83650071437d]
#    to [d1f8bb32050e9348c9b692e9a028a28a680d1f89]
#
# patch "guitone/src/view/dialogs/SelectRevision.cpp"
#  from [92d6faeeb9416af1595cde39023647be92340fe0]
#    to [a53559f75c0a42111e1789d2f37a4453eb5522d9]
#
# patch "guitone/src/view/dialogs/UpdateWorkspace.cpp"
#  from [6afc965a7d6216f59b4fe5a3404db462387a2b13]
#    to [b0e31a4d3c8e49ac88fcc05ffa27c5203b94a840]
#
============================================================
--- guitone/res/forms/main_window.ui	8bfd4e073529b3d20d715e13592110837a381b54
+++ guitone/res/forms/main_window.ui	086950bfff52980715b9f43caf2038fa2368c2da
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>734</width>
-    <height>526</height>
+    <width>713</width>
+    <height>544</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -116,17 +116,31 @@ or File > Open Database for a database r
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>734</width>
-     <height>22</height>
+     <width>713</width>
+     <height>24</height>
     </rect>
    </property>
+   <widget class="QMenu" name="menuHelp" >
+    <property name="title" >
+     <string>Help</string>
+    </property>
+    <addaction name="actionAbout_Qt" />
+    <addaction name="actionAbout_guitone" />
+   </widget>
    <widget class="QMenu" name="menuDatabase" >
     <property name="title" >
      <string>Database</string>
     </property>
     <addaction name="actionKey_management" />
     <addaction name="actionChangeset_browser" />
+    <addaction name="actionCheckout_revision" />
    </widget>
+   <widget class="QMenu" name="menuWorkspace" >
+    <property name="title" >
+     <string>Workspace</string>
+    </property>
+    <addaction name="actionUpdate_workspace" />
+   </widget>
    <widget class="QMenu" name="menuView" >
     <property name="title" >
      <string>View</string>
@@ -153,29 +167,40 @@ or File > Open Database for a database r
     <addaction name="actionExpand_tree" />
     <addaction name="menuShow" />
    </widget>
-   <widget class="QMenu" name="menuDatabase" >
+   <widget class="QMenu" name="menuFile" >
     <property name="title" >
-     <string>Database</string>
+     <string>File</string>
     </property>
-    <addaction name="actionKey_management" />
-    <addaction name="actionChangeset_browser" />
-    <addaction name="actionCheckout_revision" />
-   </widget>
-   <widget class="QMenu" name="menuWorkspace" >
-    <property name="title" >
-     <string>Workspace</string>
-    </property>
-    <addaction name="actionUpdate_workspace" />
-   </widget>
+    <widget class="QMenu" name="menuRecent_Databases" >
+     <property name="title" >
+      <string>Recent Databases</string>
+     </property>
+     <addaction name="actionNo_previous_databases_available" />
+    </widget>
+    <widget class="QMenu" name="menuRecent_Workspaces" >
+     <property name="title" >
+      <string>Recent Workspaces</string>
+     </property>
+     <addaction name="actionNo_recent_workspaces_found" />
+    </widget>
+    <addaction name="actionOpen_Workspace" />
+    <addaction name="menuRecent_Workspaces" />
+    <addaction name="separator" />
+    <addaction name="actionOpen_Database" />
+    <addaction name="menuRecent_Databases" />
+    <addaction name="separator" />
     <addaction name="actionClose" />
     <addaction name="separator" />
+    <addaction name="actionPreferences" />
+    <addaction name="separator" />
+    <addaction name="actionQuit" />
+   </widget>
    <widget class="QMenu" name="menuWindow" >
     <property name="title" >
      <string>Window</string>
     </property>
     <addaction name="actionBring_all_to_front" />
     <addaction name="separator" />
-    <addaction name="actionQuit" />
    </widget>
    <addaction name="menuFile" />
    <addaction name="menuView" />
@@ -222,9 +247,6 @@ or File > Open Database for a database r
    <property name="shortcut" >
     <string>Ctrl+Q</string>
    </property>
-   <property name="shortcutContext" >
-    <enum>Qt::ApplicationShortcut</enum>
-   </property>
    <property name="menuRole" >
     <enum>QAction::QuitRole</enum>
    </property>
@@ -424,9 +446,6 @@ or File > Open Database for a database r
    <property name="text" >
     <string>Close</string>
    </property>
-   <property name="shortcut" >
-    <string>Ctrl+W</string>
-   </property>
   </action>
   <action name="actionBring_all_to_front" >
    <property name="text" >
@@ -456,7 +475,7 @@ or File > Open Database for a database r
  </resources>
  <connections>
   <connection>
-   <sender>actionClose</sender>
+   <sender>actionQuit</sender>
    <signal>triggered()</signal>
    <receiver>MainWindow</receiver>
    <slot>close()</slot>
============================================================
--- guitone/res/i18n/guitone_de.ts	dca79d10521b4e2fb98aebd413c95167d9ea8709
+++ guitone/res/i18n/guitone_de.ts	4c846758a755d96116d7bfe76fc36bebd709000f
@@ -37,37 +37,37 @@
 <context>
     <name>Attributes</name>
     <message>
-        <location filename="../../src/model/Attributes.cpp" line="177"/>
+        <location filename="../../src/model/Attributes.cpp" line="178"/>
         <source>added</source>
         <translation>hinzugefügt</translation>
     </message>
     <message>
-        <location filename="../../src/model/Attributes.cpp" line="178"/>
+        <location filename="../../src/model/Attributes.cpp" line="179"/>
         <source>dropped</source>
         <translation>entfernt</translation>
     </message>
     <message>
-        <location filename="../../src/model/Attributes.cpp" line="179"/>
+        <location filename="../../src/model/Attributes.cpp" line="180"/>
         <source>changed</source>
         <translation>verändert</translation>
     </message>
     <message>
-        <location filename="../../src/model/Attributes.cpp" line="180"/>
+        <location filename="../../src/model/Attributes.cpp" line="181"/>
         <source>unchanged</source>
         <translation>unverändert</translation>
     </message>
     <message>
-        <location filename="../../src/model/Attributes.cpp" line="200"/>
+        <location filename="../../src/model/Attributes.cpp" line="201"/>
         <source>Key</source>
         <translation>Schlüssel</translation>
     </message>
     <message>
-        <location filename="../../src/model/Attributes.cpp" line="201"/>
+        <location filename="../../src/model/Attributes.cpp" line="202"/>
         <source>Value</source>
         <translation>Wert</translation>
     </message>
     <message>
-        <location filename="../../src/model/Attributes.cpp" line="202"/>
+        <location filename="../../src/model/Attributes.cpp" line="203"/>
         <source>State</source>
         <translation>Status</translation>
     </message>
@@ -83,52 +83,52 @@
 <context>
     <name>Certs</name>
     <message>
-        <location filename="../../src/model/Certs.cpp" line="175"/>
+        <location filename="../../src/model/Certs.cpp" line="176"/>
         <source>ok</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../../src/model/Certs.cpp" line="176"/>
+        <location filename="../../src/model/Certs.cpp" line="177"/>
         <source>bad</source>
         <translation>schlecht</translation>
     </message>
     <message>
-        <location filename="../../src/model/Certs.cpp" line="177"/>
+        <location filename="../../src/model/Certs.cpp" line="178"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../../src/model/Certs.cpp" line="182"/>
+        <location filename="../../src/model/Certs.cpp" line="183"/>
         <source>trusted</source>
         <translation>vertrauenswürdig</translation>
     </message>
     <message>
-        <location filename="../../src/model/Certs.cpp" line="183"/>
+        <location filename="../../src/model/Certs.cpp" line="184"/>
         <source>untrusted</source>
         <translation>nicht vertrauenswürdig</translation>
     </message>
     <message>
-        <location filename="../../src/model/Certs.cpp" line="202"/>
+        <location filename="../../src/model/Certs.cpp" line="203"/>
         <source>Key</source>
         <translation>Schlüssel</translation>
     </message>
     <message>
-        <location filename="../../src/model/Certs.cpp" line="203"/>
+        <location filename="../../src/model/Certs.cpp" line="204"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../../src/model/Certs.cpp" line="204"/>
+        <location filename="../../src/model/Certs.cpp" line="205"/>
         <source>Value</source>
         <translation>Wert</translation>
     </message>
     <message>
-        <location filename="../../src/model/Certs.cpp" line="205"/>
+        <location filename="../../src/model/Certs.cpp" line="206"/>
         <source>Signature</source>
         <translation>Signatur</translation>
     </message>
     <message>
-        <location filename="../../src/model/Certs.cpp" line="206"/>
+        <location filename="../../src/model/Certs.cpp" line="207"/>
         <source>Trust</source>
         <translation>Vertrauen</translation>
     </message>
@@ -138,32 +138,32 @@
     <message>
         <location filename="../forms/changeset_browser.ui" line="13"/>
         <source>Changeset Browser</source>
-        <translation type="unfinished"></translation>
+        <translation>Änderungen-Browser</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/ChangesetBrowser.cpp" line="90"/>
+        <location filename="../../src/view/dialogs/ChangesetBrowser.cpp" line="92"/>
         <source>display branches as tree</source>
-        <translation type="unfinished"></translation>
+        <translation>zeige Zweige als Baum</translation>
     </message>
     <message>
         <location filename="../forms/changeset_browser.ui" line="79"/>
         <source>all Changesets</source>
-        <translation type="unfinished"></translation>
+        <translation>alle Änderungen</translation>
     </message>
     <message>
         <location filename="../forms/changeset_browser.ui" line="86"/>
         <source>50 More Changesets</source>
-        <translation type="unfinished">50 weitere Änderungen</translation>
+        <translation>50 weitere Änderungen</translation>
     </message>
     <message>
         <location filename="../forms/changeset_browser.ui" line="106"/>
         <source>close</source>
-        <translation type="unfinished"></translation>
+        <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/ChangesetBrowser.cpp" line="91"/>
+        <location filename="../../src/view/dialogs/ChangesetBrowser.cpp" line="93"/>
         <source>display branches flat</source>
-        <translation type="unfinished"></translation>
+        <translation>zeige Zweige als Liste</translation>
     </message>
 </context>
 <context>
@@ -512,63 +512,63 @@
     <message>
         <location filename="../../src/model/Inventory.cpp" line="402"/>
         <source>[unknown branch]</source>
-        <translation>[unbekannter Zweig]</translation>
+        <translation type="obsolete">[unbekannter Zweig]</translation>
     </message>
 </context>
 <context>
     <name>InventoryItem</name>
     <message>
-        <location filename="../../src/model/InventoryItem.cpp" line="176"/>
+        <location filename="../../src/model/InventoryItem.cpp" line="177"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../../src/model/InventoryItem.cpp" line="177"/>
+        <location filename="../../src/model/InventoryItem.cpp" line="178"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="../../src/model/InventoryItem.cpp" line="267"/>
+        <location filename="../../src/model/InventoryItem.cpp" line="268"/>
         <source>Rename Source</source>
         <translation>Quelle für Umbenennen</translation>
     </message>
     <message>
-        <location filename="../../src/model/InventoryItem.cpp" line="271"/>
+        <location filename="../../src/model/InventoryItem.cpp" line="272"/>
         <source>Rename Target</source>
         <translation>Ziel für Umbenennen</translation>
     </message>
     <message>
-        <location filename="../../src/model/InventoryItem.cpp" line="275"/>
+        <location filename="../../src/model/InventoryItem.cpp" line="276"/>
         <source>Added</source>
         <translation>hinzugefügt</translation>
     </message>
     <message>
-        <location filename="../../src/model/InventoryItem.cpp" line="279"/>
+        <location filename="../../src/model/InventoryItem.cpp" line="280"/>
         <source>Dropped</source>
         <translation>entfernt</translation>
     </message>
     <message>
-        <location filename="../../src/model/InventoryItem.cpp" line="283"/>
+        <location filename="../../src/model/InventoryItem.cpp" line="284"/>
         <source>Missing</source>
         <translation>fehlend</translation>
     </message>
     <message>
-        <location filename="../../src/model/InventoryItem.cpp" line="291"/>
+        <location filename="../../src/model/InventoryItem.cpp" line="292"/>
         <source>Unchanged</source>
         <translation>unverändert</translation>
     </message>
     <message>
-        <location filename="../../src/model/InventoryItem.cpp" line="295"/>
+        <location filename="../../src/model/InventoryItem.cpp" line="296"/>
         <source>Unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../../src/model/InventoryItem.cpp" line="299"/>
+        <location filename="../../src/model/InventoryItem.cpp" line="300"/>
         <source>Ignored</source>
         <translation>ignoriert</translation>
     </message>
     <message>
-        <location filename="../../src/model/InventoryItem.cpp" line="287"/>
+        <location filename="../../src/model/InventoryItem.cpp" line="288"/>
         <source>Modified</source>
         <translation>Verändert</translation>
     </message>
@@ -576,127 +576,127 @@
 <context>
     <name>InventoryView</name>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="268"/>
+        <location filename="../../src/view/InventoryView.cpp" line="281"/>
         <source>&amp;Add</source>
         <translation>&amp;Hinzufügen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="269"/>
+        <location filename="../../src/view/InventoryView.cpp" line="282"/>
         <source>Add to workspace</source>
         <translation>Zum Arbeitsbereich hinzufügen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="272"/>
+        <location filename="../../src/view/InventoryView.cpp" line="285"/>
         <source>&amp;Remove</source>
         <translation>En&amp;tfernen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="273"/>
+        <location filename="../../src/view/InventoryView.cpp" line="286"/>
         <source>Remove from workspace</source>
         <translation>Vom Arbeitsbereich entfernen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="276"/>
+        <location filename="../../src/view/InventoryView.cpp" line="289"/>
         <source>&amp;Commit</source>
         <translation>&amp;Einpflegen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="277"/>
+        <location filename="../../src/view/InventoryView.cpp" line="290"/>
         <source>Commit</source>
         <translation>Einpflegen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="280"/>
+        <location filename="../../src/view/InventoryView.cpp" line="293"/>
         <source>I&amp;gnore</source>
         <translation>Datei &amp;ignorieren</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="281"/>
+        <location filename="../../src/view/InventoryView.cpp" line="294"/>
         <source>Ignore file</source>
         <translation>Datei ignorieren</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="284"/>
+        <location filename="../../src/view/InventoryView.cpp" line="297"/>
         <source>&amp;Unignore</source>
         <translation>Datei nicht ign&amp;orieren</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="285"/>
+        <location filename="../../src/view/InventoryView.cpp" line="298"/>
         <source>Unignore file</source>
         <translation>Datei nicht mehr ignorieren</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="288"/>
+        <location filename="../../src/view/InventoryView.cpp" line="301"/>
         <source>R&amp;evert</source>
         <translation>&amp;Zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="289"/>
+        <location filename="../../src/view/InventoryView.cpp" line="302"/>
         <source>Revert uncommitted changes</source>
         <translation>Nicht eingepflegte Änderungen verwerfen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="300"/>
+        <location filename="../../src/view/InventoryView.cpp" line="313"/>
         <source>Rena&amp;me</source>
         <translation>Um&amp;benennen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="301"/>
+        <location filename="../../src/view/InventoryView.cpp" line="314"/>
         <source>Rename file</source>
         <translation>Datei umbenennen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="292"/>
+        <location filename="../../src/view/InventoryView.cpp" line="305"/>
         <source>D&amp;iff</source>
         <translation>U&amp;nterschiede anzeigen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="293"/>
+        <location filename="../../src/view/InventoryView.cpp" line="306"/>
         <source>Diff against base revision</source>
         <translation>Unterschiede im Vergleich zur Basisrevision anzeigen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="260"/>
+        <location filename="../../src/view/InventoryView.cpp" line="273"/>
         <source>&amp;Go into</source>
         <translation>&amp;Wechseln zu</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="261"/>
+        <location filename="../../src/view/InventoryView.cpp" line="274"/>
         <source>Go into the directory</source>
         <translation>Wechsle in das Verzeichnis</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="264"/>
+        <location filename="../../src/view/InventoryView.cpp" line="277"/>
         <source>&amp;Open</source>
         <translation>&amp;Öffnen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="265"/>
+        <location filename="../../src/view/InventoryView.cpp" line="278"/>
         <source>Open in default program</source>
         <translation>In Standardprogramm öffnen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="377"/>
+        <location filename="../../src/view/InventoryView.cpp" line="390"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="367"/>
+        <location filename="../../src/view/InventoryView.cpp" line="380"/>
         <source>The file you&apos;re trying to open does not exist.</source>
         <translation>Die Datei, die Sie versucht haben zu öffnen, existiert nicht.</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="379"/>
+        <location filename="../../src/view/InventoryView.cpp" line="392"/>
         <source>Unable to open files on your platform - please contact the author about this problem.</source>
         <translation>Kann keine Dateien auf Ihrer Plattform öffnen - bitte kontaktieren Sie den Autor über dieses Problem.</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="296"/>
+        <location filename="../../src/view/InventoryView.cpp" line="309"/>
         <source>D&amp;iff all</source>
         <translation>Alle U&amp;nterschiede anzeigen</translation>
     </message>
     <message>
-        <location filename="../../src/view/InventoryView.cpp" line="297"/>
+        <location filename="../../src/view/InventoryView.cpp" line="310"/>
         <source>Show all differences</source>
         <translation>Zeigt Unterschiede in allen Dateien</translation>
     </message>
@@ -785,77 +785,77 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../forms/main_window.ui" line="179"/>
+        <location filename="../forms/main_window.ui" line="146"/>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="159"/>
+        <location filename="../forms/main_window.ui" line="125"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="173"/>
+        <location filename="../forms/main_window.ui" line="140"/>
         <source>Workspace</source>
         <translation>Arbeitsbereich</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="133"/>
+        <location filename="../forms/main_window.ui" line="172"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="143"/>
+        <location filename="../forms/main_window.ui" line="182"/>
         <source>Recent Workspaces</source>
         <translation>Vorherige Arbeitsbereiche</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="212"/>
+        <location filename="../forms/main_window.ui" line="215"/>
         <source>Open Workspace</source>
         <translation>Arbeitsbereich öffnen</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="215"/>
+        <location filename="../forms/main_window.ui" line="218"/>
         <source>Ctrl+O</source>
         <translation>Strg+O</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="412"/>
+        <location filename="../../src/view/MainWindow.cpp" line="446"/>
         <source>No previous workspaces available.</source>
         <translation>Keine vorherigen Arbeitsbereiche verfügbar.</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="231"/>
+        <location filename="../forms/main_window.ui" line="234"/>
         <source>Preferences....</source>
         <translation>Einstellungen...</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="234"/>
+        <location filename="../forms/main_window.ui" line="237"/>
         <source>Ctrl+P</source>
         <translation>Strg+P</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="242"/>
+        <location filename="../forms/main_window.ui" line="245"/>
         <source>Quit</source>
         <translation>Beenden</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="245"/>
+        <location filename="../forms/main_window.ui" line="248"/>
         <source>Ctrl+Q</source>
         <translation>Strg+Q</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="342"/>
+        <location filename="../../src/view/MainWindow.cpp" line="376"/>
         <source>Hide ignored files</source>
         <translation>Ignorierte Dateien verstecken</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="256"/>
+        <location filename="../forms/main_window.ui" line="259"/>
         <source>Ctrl+H</source>
         <translation>Strg+H</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="267"/>
+        <location filename="../forms/main_window.ui" line="270"/>
         <source>All files</source>
         <translation>Alle Dateien</translation>
     </message>
@@ -865,7 +865,7 @@
         <translation type="obsolete">A</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="278"/>
+        <location filename="../forms/main_window.ui" line="281"/>
         <source>All changed files</source>
         <translation>Alle geänderten Dateien</translation>
     </message>
@@ -875,7 +875,7 @@
         <translation type="obsolete">G</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="289"/>
+        <location filename="../forms/main_window.ui" line="292"/>
         <source>Patched files</source>
         <translation>Inhaltlich geänderte Dateien</translation>
     </message>
@@ -885,7 +885,7 @@
         <translation type="obsolete">P</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="300"/>
+        <location filename="../forms/main_window.ui" line="303"/>
         <source>Added files</source>
         <translation>Hinzugefügte Dateien</translation>
     </message>
@@ -895,7 +895,7 @@
         <translation type="obsolete">H</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="311"/>
+        <location filename="../forms/main_window.ui" line="314"/>
         <source>Removed files</source>
         <translation>Entfernte Dateien</translation>
     </message>
@@ -905,7 +905,7 @@
         <translation type="obsolete">E</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="322"/>
+        <location filename="../forms/main_window.ui" line="325"/>
         <source>Renamed files</source>
         <translation>Umbenannte Dateien</translation>
     </message>
@@ -915,7 +915,7 @@
         <translation type="obsolete">U</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="333"/>
+        <location filename="../forms/main_window.ui" line="336"/>
         <source>Missing files</source>
         <translation>Fehlende Dateien</translation>
     </message>
@@ -925,7 +925,7 @@
         <translation type="obsolete">F</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="344"/>
+        <location filename="../forms/main_window.ui" line="347"/>
         <source>Unknown files</source>
         <translation>Unbekannte Dateien</translation>
     </message>
@@ -935,7 +935,7 @@
         <translation type="obsolete">K</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="395"/>
+        <location filename="../forms/main_window.ui" line="404"/>
         <source>Ignored files</source>
         <translation>Ignorierte Dateien</translation>
     </message>
@@ -945,12 +945,12 @@
         <translation type="obsolete">I</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="378"/>
+        <location filename="../../src/view/MainWindow.cpp" line="412"/>
         <source>Expand tree</source>
         <translation>Baum aufklappen</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="355"/>
+        <location filename="../forms/main_window.ui" line="358"/>
         <source>Ctrl+T</source>
         <translation>Strg+T</translation>
     </message>
@@ -965,27 +965,27 @@
         <translation type="obsolete">Strg+R</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="368"/>
+        <location filename="../forms/main_window.ui" line="377"/>
         <source>Key management</source>
         <translation>Schlüsselverwaltung</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="371"/>
+        <location filename="../forms/main_window.ui" line="380"/>
         <source>Ctrl+K</source>
         <translation>Strg+K</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="376"/>
+        <location filename="../forms/main_window.ui" line="385"/>
         <source>About Qt</source>
         <translation>Über Qt</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="384"/>
+        <location filename="../forms/main_window.ui" line="393"/>
         <source>About guitone</source>
         <translation>Über guitone</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="183"/>
+        <location filename="../forms/main_window.ui" line="150"/>
         <source>Show</source>
         <translation>Zeige</translation>
     </message>
@@ -995,154 +995,215 @@
         <translation>guitone - ein Frontend für monotone</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="75"/>
-        <location filename="../../src/view/MainWindow.cpp" line="191"/>
-        <location filename="../../src/view/MainWindow.cpp" line="200"/>
+        <location filename="../../src/view/MainWindow.cpp" line="182"/>
         <source>Select your workspace...</source>
         <translation>Wählen Sie Ihren Arbeitsbereich aus...</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="275"/>
+        <location filename="../../src/view/MainWindow.cpp" line="255"/>
         <source>Loading aborted</source>
         <translation>Laden abgebrochen</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="219"/>
+        <location filename="../../src/view/MainWindow.cpp" line="201"/>
         <source>Invalid workspace</source>
         <translation>Ungültiger Arbeitsbereich</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="220"/>
+        <location filename="../../src/view/MainWindow.cpp" line="202"/>
         <source>The chosen directory is no monotone workspace!</source>
         <translation>Das gewählte Verzeichnis ist kein monotone-Arbeitsverzeichnis!</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="233"/>
+        <location filename="../../src/view/MainWindow.cpp" line="220"/>
         <source>Unable to execute command</source>
         <translation>Konnte Kommando nicht ausführen</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="234"/>
+        <location filename="../../src/view/MainWindow.cpp" line="221"/>
         <source>Unable to execute &apos;%1&apos; - maybe another command is still running?</source>
         <translation>Konnte &apos;%1&apos; nicht ausführen - eventuell läuft noch ein anderes Kommando?</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="247"/>
-        <location filename="../../src/view/MainWindow.cpp" line="343"/>
+        <location filename="../../src/view/MainWindow.cpp" line="377"/>
         <source>Show ignored files</source>
         <translation>Zeige ignorierte Dateien</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="379"/>
+        <location filename="../../src/view/MainWindow.cpp" line="413"/>
         <source>Collapse tree</source>
         <translation>Baum zuklappen</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="447"/>
+        <location filename="../../src/view/MainWindow.cpp" line="508"/>
         <source>&amp;%1 %2</source>
         <translation>&amp;%1 %2</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="80"/>
-        <location filename="../forms/main_window.ui" line="137"/>
+        <location filename="../forms/main_window.ui" line="176"/>
         <source>Recent Databases</source>
         <translation>Vorherige Datenbanken</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="403"/>
+        <location filename="../forms/main_window.ui" line="412"/>
         <source>Open Database</source>
         <translation>Datenbank öffnen</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="438"/>
+        <location filename="../../src/view/MainWindow.cpp" line="472"/>
         <source>No previous databases available.</source>
         <translation>Keine vorherigen geöffneten Datenbanken verfügbar.</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="125"/>
+        <location filename="../forms/main_window.ui" line="132"/>
         <source>Database</source>
         <translation>Datenbank</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="406"/>
+        <location filename="../forms/main_window.ui" line="415"/>
         <source>Ctrl+Shift+O</source>
         <translation>Strg+Shift+O</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="329"/>
+        <location filename="../../src/view/MainWindow.cpp" line="336"/>
         <source>Loaded database: %1</source>
         <translation>Geladene Datenbank: %1</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="268"/>
+        <location filename="../../src/view/MainWindow.cpp" line="248"/>
         <source>Select your database...</source>
         <translation>Wählen Sie eine Datenbank aus...</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="271"/>
+        <location filename="../../src/view/MainWindow.cpp" line="251"/>
         <source>monotone Databases (*.mtn *.db)</source>
         <translation>monotone-Datenbanken (*.mtn *.db)</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="329"/>
-        <location filename="../forms/main_window.ui" line="425"/>
+        <location filename="../forms/main_window.ui" line="434"/>
         <source>Ctrl+B</source>
         <translation>Strg+B</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="422"/>
+        <location filename="../forms/main_window.ui" line="431"/>
         <source>Changeset browser</source>
         <translation>Änderungen-Browser</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="435"/>
+        <location filename="../forms/main_window.ui" line="447"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="271"/>
+        <location filename="../forms/main_window.ui" line="273"/>
         <source>Alt+A</source>
         <translation>Alt+A</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="282"/>
+        <location filename="../forms/main_window.ui" line="284"/>
         <source>Alt+C</source>
         <translation>Alt+C</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="293"/>
+        <location filename="../forms/main_window.ui" line="295"/>
         <source>Alt+P</source>
         <translation>Alt+P</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="304"/>
+        <location filename="../forms/main_window.ui" line="306"/>
         <source>Alt+N</source>
         <translation>Alt+N</translation>
     </message>
     <message>
+        <location filename="../forms/main_window.ui" line="98"/>
+        <source>Currently there is no workspace or database loaded.
+
+To open a workspace, go to File &gt; Open workspace
+or File &gt; Open Database for a database respectively.</source>
+        <translation>Derzeit ist weder ein Arbeitsbereich noch eine Datenbank geladen,
+
+Um einen Arbeitsbereich zu öffnen, gehen Sie auf Datei &gt; Arbeitsbereich öffnen
+oder respektive auf Datei &gt; Datenbank öffnen.</translation>
     </message>
     <message>
+        <location filename="../forms/main_window.ui" line="200"/>
+        <source>Window</source>
+        <translation>Fenster</translation>
     </message>
     <message>
+        <location filename="../forms/main_window.ui" line="317"/>
+        <source>Alt+D</source>
+        <translation>Alt+D</translation>
     </message>
     <message>
+        <location filename="../forms/main_window.ui" line="328"/>
+        <source>Alt+R</source>
+        <translation>Alt+R</translation>
     </message>
     <message>
+        <location filename="../forms/main_window.ui" line="339"/>
+        <source>Alt+M</source>
+        <translation>Alt+M</translation>
     </message>
     <message>
-To open a workspace, go to File &gt; Open workspace
-or File &gt; Open Database for a database respectively.</source>
-        <translation type="unfinished">Derzeit ist weder ein Arbeitsbereich noch eine Datenbank geladen.
-
-Um einen Arbeitsbereich zu öffnen, gehen Sie zu
-Datei &gt; Arbeitsbereich öffnen oder nutzen
-Datei &gt; Datenbank öffnen, um eine Datenbank zu laden.</translation>
+        <location filename="../forms/main_window.ui" line="350"/>
+        <source>Alt+U</source>
+        <translation>Alt+U</translation>
     </message>
     <message>
+        <location filename="../forms/main_window.ui" line="369"/>
+        <source>Update workspace</source>
+        <translation>Arbeitsbereich aktualisieren</translation>
     </message>
     <message>
+        <location filename="../forms/main_window.ui" line="372"/>
+        <source>Ctrl+U</source>
+        <translation>Strg+U</translation>
     </message>
     <message>
+        <location filename="../forms/main_window.ui" line="407"/>
+        <source>Alt+I</source>
+        <translation>Alt+I</translation>
+    </message>
+    <message>
+        <location filename="../forms/main_window.ui" line="439"/>
+        <source>Checkout revision</source>
+        <translation>Revision auschecken</translation>
+    </message>
+    <message>
+        <location filename="../forms/main_window.ui" line="442"/>
+        <source>Ctrl+Shift+U</source>
+        <translation>Strg+Umschalt+U</translation>
+    </message>
+    <message>
+        <location filename="../forms/main_window.ui" line="452"/>
+        <source>Bring all to front</source>
+        <translation>Alle nach vorne bringen</translation>
+    </message>
+    <message>
+        <location filename="../../src/view/MainWindow.cpp" line="342"/>
+        <source>%1 - database mode - guitone</source>
+        <translation>%1 - Datenbankmodus - guitone</translation>
+    </message>
+    <message>
+        <location filename="../../src/view/MainWindow.cpp" line="354"/>
+        <source>%1 - workspace mode - guitone</source>
+        <translation>%1 - Arbeitsbereichmodus - guitone</translation>
+    </message>
+    <message>
+        <location filename="../../src/view/MainWindow.cpp" line="363"/>
+        <source>No workspace or database loaded - guitone</source>
+        <translation>Kein Arbeitsbereich oder Datenbank geladen - guitone</translation>
+    </message>
+    <message>
+        <location filename="../../src/view/MainWindow.cpp" line="600"/>
+        <source>Unable to load workspace</source>
+        <translation>Konnte Arbeitsbereich nicht laden</translation>
+    </message>
+    <message>
+        <location filename="../../src/view/MainWindow.cpp" line="602"/>
+        <source>The workspace &apos;%1&apos; could not be loaded.
+monotone returned:

 %2</source>
         <translation>Der Arbeitsbereich &apos;%1&apos; konnte nicht geladen werden.
@@ -1154,12 +1215,12 @@ monotone gab zurück:
 <context>
     <name>Manifest</name>
     <message>
-        <location filename="../../src/model/Manifest.cpp" line="175"/>
+        <location filename="../../src/model/Manifest.cpp" line="176"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../../src/model/Manifest.cpp" line="176"/>
+        <location filename="../../src/model/Manifest.cpp" line="177"/>
         <source>Hash</source>
         <translation>Prüfsumme</translation>
     </message>
@@ -1174,7 +1235,7 @@ monotone gab zurück:
     <message>
         <location filename="../forms/manifest.ui" line="51"/>
         <source>Save selected</source>
-        <translation>Selektierte speichern</translation>
+        <translation>Auswahl speichern</translation>
     </message>
     <message>
         <location filename="../forms/manifest.ui" line="58"/>
@@ -1195,7 +1256,7 @@ monotone returned:

 monotone returned:
 %2</source>
-        <translation>Der monotone-Prozess wurde unerwartet beendet (Rückgabewert %1). Bitte konfigurieren Sie den Pfad zur ausführbaren Datei von monotone im Einstellungsdialog neu oder überprüfen Sie, ob die Version der Datenbank, die Sie versucht haben zu laden, mit der Version von monotone übereinstimmt, die Sie benutzen.
+        <translation>Der monotone-Prozess wurde unerwartet beendet (Rückgabewert %1). Bitte überprüfen Sie den Pfad zur ausführbaren Datei von monotone im Eigenschaften-Dialog und stellen Sie sicher, dass die Version der Datenbank, die Sie versucht haben zu laden, mit der Version von monotone übereinstimmt.

 monotone gab zurück:
 %2</translation>
@@ -1204,7 +1265,7 @@ monotone gab zurück:
 <context>
     <name>MonotoneDelegate</name>
     <message>
-        <location filename="../../src/monotone/MonotoneDelegate.cpp" line="127"/>
+        <location filename="../../src/monotone/MonotoneDelegate.cpp" line="130"/>
         <source>[unknown branch]</source>
         <translation>[unbekannter Zweig]</translation>
     </message>
@@ -1212,29 +1273,29 @@ monotone gab zurück:
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="72"/>
-        <source>Error</source>
-        <translation>Fehler</translation>
+        <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="89"/>
-        <source>Notice</source>
-        <translation>Hinweis</translation>
+        <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="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>
+        <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="114"/>
-        <source>Choose the monotone executable</source>
-        <translation>Wählen Sie die ausführbare Datei von monotone</translation>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="47"/>
+        <source>All (debug messages)</source>
+        <translation>Alle (Debugmeldungen)</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="117"/>
-        <source>Binaries (mtn mtn.exe)</source>
-        <translation>Ausführbare Dateien (mtn mtn.exe)</translation>
+        <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="77"/>
@@ -1242,24 +1303,24 @@ monotone gab zurück:
         <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>
+        <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="45"/>
-        <source>Medium (critical errors)</source>
-        <translation>Mittel (kritische Fehler)</translation>
+        <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 oder guitone neu laden, um die neue monotone-Binary zu nutzen.</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="46"/>
-        <source>High (warnings)</source>
-        <translation>Hoch (Warnungen)</translation>
+        <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="47"/>
-        <source>All (debug messages)</source>
-        <translation>Alle (Debug-Meldungen)</translation>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="117"/>
+        <source>Binaries (mtn mtn.exe)</source>
+        <translation>Binärdateien (mtn mtn.exe)</translation>
     </message>
 </context>
 <context>
@@ -1280,35 +1341,35 @@ monotone gab zurück:
         <translation>Durchsuchen</translation>
     </message>
     <message>
-        <location filename="../forms/preferences.ui" line="206"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <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>
+        <translation>Logmeldungen</translation>
     </message>
     <message>
         <location filename="../forms/preferences.ui" line="130"/>
         <source>enable console logging</source>
-        <translation>Protokollierung auf Konsole aktivieren</translation>
+        <translation>Konsolenlogging aktivieren</translation>
     </message>
     <message>
         <location filename="../forms/preferences.ui" line="140"/>
         <source>enable file logging (%1)</source>
-        <translation>Protokollierung in Datei aktivieren (%1)</translation>
+        <translation>Dateilogging aktivieren (%1)</translation>
     </message>
     <message>
         <location filename="../forms/preferences.ui" line="155"/>
         <source>Log level</source>
-        <translation>Protokoll-Level</translation>
+        <translation>Log-Level</translation>
     </message>
+    <message>
+        <location filename="../forms/preferences.ui" line="206"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../forms/preferences.ui" line="213"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
 </context>
 <context>
     <name>QShortcut</name>
@@ -1318,16 +1379,16 @@ monotone gab zurück:
         <translation>Strg</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="56"/>
-        <source>Shift</source>
-        <translation>Umschalt</translation>
-    </message>
-    <message>
         <location filename="../../src/view/MainWindow.cpp" line="55"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
+        <location filename="../../src/view/MainWindow.cpp" line="56"/>
+        <source>Shift</source>
+        <translation>Umschalt</translation>
+    </message>
+    <message>
         <location filename="../../src/view/MainWindow.cpp" line="57"/>
         <source>Meta</source>
         <translation>Meta</translation>
@@ -1338,12 +1399,12 @@ monotone gab zurück:
     <message>
         <location filename="../../src/view/dialogs/RevisionDiff.cpp" line="39"/>
         <source>base revision</source>
-        <translation>Basis-Revision</translation>
+        <translation>Basisrevision</translation>
     </message>
     <message>
         <location filename="../../src/view/dialogs/RevisionDiff.cpp" line="40"/>
         <source>workspace revision</source>
-        <translation>Arbeitsbereich-Revision</translation>
+        <translation>Arbeitsbereichrevision</translation>
     </message>
     <message>
         <location filename="../../src/view/dialogs/RevisionDiff.cpp" line="56"/>
@@ -1377,16 +1438,16 @@ monotone gab zurück:
         <translation>Kann keine Dateien auf Ihrer Plattform öffnen - bitte kontaktieren Sie den Autor über dieses Problem.</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/RevisionManifest.cpp" line="167"/>
-        <source>Please close this message to remove the temporary file.</source>
-        <translation>Bitte schliessen Sie diesen Dialog, um die temporäre Datei zu entfernen.</translation>
-    </message>
-    <message>
         <location filename="../../src/view/dialogs/RevisionManifest.cpp" line="165"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
+        <location filename="../../src/view/dialogs/RevisionManifest.cpp" line="167"/>
+        <source>Please close this message to remove the temporary file.</source>
+        <translation>Bitte schließen Sie diese Meldung, um die temporäre Datei zu entfernen.</translation>
+    </message>
+    <message>
         <location filename="../../src/view/dialogs/RevisionManifest.cpp" line="180"/>
         <source>Open file</source>
         <translation>Datei öffnen</translation>
@@ -1394,7 +1455,7 @@ monotone gab zurück:
     <message>
         <location filename="../../src/view/dialogs/RevisionManifest.cpp" line="181"/>
         <source>Save selected</source>
-        <translation>Selektierte speichern</translation>
+        <translation>Auswahl speichern</translation>
     </message>
     <message>
         <location filename="../../src/view/dialogs/RevisionManifest.cpp" line="182"/>
@@ -1425,22 +1486,22 @@ monotone gab zurück:
     <message>
         <location filename="../forms/select_revision.ui" line="60"/>
         <source>Find</source>
-        <translation>Finden</translation>
+        <translation>Finde</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SelectRevision.cpp" line="375"/>
+        <location filename="../../src/view/dialogs/SelectRevision.cpp" line="377"/>
         <source>Select as first revision</source>
         <translation>Als erste Revision auswählen</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SelectRevision.cpp" line="376"/>
+        <location filename="../../src/view/dialogs/SelectRevision.cpp" line="378"/>
         <source>Select as second revision</source>
         <translation>Als zweite Revision auswählen</translation>
     </message>
     <message>
         <location filename="../forms/select_revision.ui" line="136"/>
         <source>Show differences</source>
-        <translation>Änderungen anzeigen</translation>
+        <translation>Unterschiede anzeigen</translation>
     </message>
     <message>
         <location filename="../forms/select_revision.ui" line="187"/>
@@ -1480,12 +1541,12 @@ monotone gab zurück:
     <message>
         <location filename="../../src/view/dialogs/SelectRevision.cpp" line="46"/>
         <source>Custom</source>
-        <translation>Selbstdefiniert</translation>
+        <translation>Benutzerdefiniert</translation>
     </message>
     <message>
         <location filename="../../src/view/dialogs/SelectRevision.cpp" line="47"/>
         <source>Combined</source>
-        <translation>Kombiniert</translation>
+        <translation>Zusammengefügt</translation>
     </message>
     <message>
         <location filename="../../src/view/dialogs/SelectRevision.cpp" line="188"/>
@@ -1498,55 +1559,50 @@ monotone gab zurück:
         <translation>Konnte &apos;%1&apos; nicht ausführen - eventuell läuft noch ein anderes Kommando?</translation>
     </message>
     <message>
-        <location filename="../forms/switch_workspace.ui" line="136"/>
-        <source>Show differences</source>
-        <translation>Änderungen anzeigen</translation>
+        <location filename="../../src/view/dialogs/SelectRevision.cpp" line="203"/>
+        <source>Invalid selection</source>
+        <translation>Ungültige Auswahl</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SelectRevision.cpp" line="311"/>
+        <location filename="../../src/view/dialogs/SelectRevision.cpp" line="204"/>
+        <source>The given selection could not be processed: %1</source>
+        <translation>Die ausgewählte Selektion konnte nicht bearbeitet werden: %1</translation>
+    </message>
+    <message>
+        <location filename="../../src/view/dialogs/SelectRevision.cpp" line="313"/>
         <source>First: %1...</source>
         <translation>Erste: %1...</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SelectRevision.cpp" line="320"/>
+        <location filename="../../src/view/dialogs/SelectRevision.cpp" line="322"/>
         <source>Second: %1...</source>
         <translation>Zweite: %1...</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="382"/>
-        <source>Select as first revision</source>
-        <translation>Als erste Revision auswählen</translation>
-    </message>
-    <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="383"/>
-        <source>Select as second revision</source>
-        <translation>Als zweite Revision auswählen</translation>
-    </message>
-    <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="380"/>
+        <location filename="../../src/view/dialogs/SelectRevision.cpp" line="375"/>
         <source>View files in this revision</source>
-        <translation>Zeige Dateien dieser Revision</translation>
+        <translation>Dateien in dieser Revision anzeigen</translation>
     </message>
 </context>
 <context>
     <name>Tags</name>
     <message>
-        <location filename="../../src/model/Tags.cpp" line="157"/>
+        <location filename="../../src/model/Tags.cpp" line="158"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../../src/model/Tags.cpp" line="158"/>
+        <location filename="../../src/model/Tags.cpp" line="159"/>
         <source>Revision</source>
         <translation>Revision</translation>
     </message>
     <message>
-        <location filename="../../src/model/Tags.cpp" line="159"/>
+        <location filename="../../src/model/Tags.cpp" line="160"/>
         <source>Signer</source>
-        <translation>Unterzeichner</translation>
+        <translation>Unterschreiber</translation>
     </message>
     <message>
-        <location filename="../../src/model/Tags.cpp" line="160"/>
+        <location filename="../../src/model/Tags.cpp" line="161"/>
         <source>Branches</source>
         <translation>Zweige</translation>
     </message>
@@ -1561,27 +1617,27 @@ monotone gab zurück:
     <message>
         <location filename="../forms/update_workspace.ui" line="56"/>
         <source>Update the current workspace to</source>
-        <translation>Aktualisiere den derzeitigen Arbeitsbereich</translation>
+        <translation>Aktualisiere den derzeitigen Arbeitsbereich zu</translation>
     </message>
     <message>
         <location filename="../forms/update_workspace.ui" line="76"/>
         <source>the latest revision (branch: %1)</source>
-        <translation>zur neuesten Revision (Zweig: %1)</translation>
+        <translation>der neuesten Revision (Zweig: %1)</translation>
     </message>
     <message>
         <location filename="../forms/update_workspace.ui" line="94"/>
         <source>the head of branch</source>
-        <translation>zum Kopf des Zweigs</translation>
+        <translation>dem Kopf des Zweigs</translation>
     </message>
     <message>
         <location filename="../forms/update_workspace.ui" line="145"/>
         <source>the tag</source>
-        <translation>zur Marke</translation>
+        <translation>der Marke</translation>
     </message>
     <message>
         <location filename="../forms/update_workspace.ui" line="196"/>
         <source>an individual revision (selectors allowed)</source>
-        <translation>zu einer individuellen Revision (Selektoren erlaubt)</translation>
+        <translation>einer individuellen Revision (Selektoren erlaubt)</translation>
     </message>
     <message>
         <location filename="../forms/update_workspace.ui" line="230"/>
============================================================
--- guitone/src/model/ContentDiff.cpp	0f4cbb219461f00b002a6fbe35bbb06258fb5fa0
+++ guitone/src/model/ContentDiff.cpp	744ac8b8ee03f8cbb890061fd48f9d9c96ec3a24
@@ -63,7 +63,7 @@ bool ContentDiff::readDiff(

     if (leftRevision.length() == 0)
     {
-        leftRevision = MonotoneDelegate::getBaseWorkspaceRevision();
+        leftRevision = MonotoneDelegate::getBaseWorkspaceRevision(this);
     }

     opts << "r" << leftRevision;
============================================================
--- guitone/src/model/GetFile.cpp	11851af0fe0d2ebb415ba2a73ceab1ace1292e61
+++ guitone/src/model/GetFile.cpp	05345e2aaf9b1a8ed333ab590da9cadf24da21af
@@ -35,7 +35,7 @@ bool GetFile::readFileByName(QString fil

 bool GetFile::readFileByName(QString fileName)
 {
-    return readFileByName(fileName, MonotoneDelegate::getBaseWorkspaceRevision());
+    return readFileByName(fileName, MonotoneDelegate::getBaseWorkspaceRevision(this));
 }

 bool GetFile::readFileByName(QString fileName, QString revision)
============================================================
--- guitone/src/model/Inventory.cpp	0890179743d4c1ebec0fafe515a838979867324c
+++ guitone/src/model/Inventory.cpp	7cfde5f3e235a09824f02c67f34df394985e9b69
@@ -105,7 +105,7 @@ void Inventory::parseOutput()
     // FIXME: we shouldn't really add a workspace root item here, but
     // mtn automate inventory currently doesn't print the root workspace dir
     InventoryItem * branch = new InventoryItem(rootItem, ".", 0, true, true);
-    branch->setLabel(getBranchName(this));
+    branch->setLabel(MonotoneDelegate::getBranchName(this));
     rootItem->appendChild(branch);
     branch->setChildren(buildTreeRecursive(tempItems, NULL));

@@ -372,57 +372,6 @@ bool Inventory::parseInventoryLine(
 	return true;
 }

-QString Inventory::getOption(QObject * parent, const QString & opt)
-{
-    Monotone * mtn = MTN(parent);
-
-    int cmdNum;
-    mtn->executeCommand(QStringList() << "get_option" << opt, cmdNum);
-
-    QString data = mtn->getDecodedData(cmdNum);
-
-    if (mtn->getReturnCode(cmdNum) > 0)
-    {
-        qCritical("Inventory::getOption: Couldn't retrieve option %s: %s",
-                  qPrintable(opt), qPrintable(data));
-        return QString();
-    }
-
-    if (data.length() > 1)
-        data.chop(1);
-    return data;
-}
-
-QString Inventory::getBranchName(QObject * parent)
-{
-    QString branchName = getOption(parent, "branch");
-
-    if (branchName.size() == 0)
-    {
-        branchName = QString(tr("[unknown branch]"));
-    }
-    return branchName;
-}
-
-QString Inventory::getBranchNameShort(QObject * parent)
-{
-    // FIXME: currently there is only support for the domain branch scheme
-    // tld.domain.project.branch
-    QString branchName = getBranchName(parent);
-    QStringList parts = branchName.split('.');
-    if (parts.size() == 1) return branchName;
-
-    QString shortBranchName;
-    for (int i=0, j=parts.size()-1; i<j; i++)
-    {
-        if (parts.at(i).length() == 0) continue;
-        shortBranchName.append(parts.at(i).at(0));
-    }
-    // add the rightmost part
-    shortBranchName.append('.').append(parts.last());
-    return shortBranchName;
-}
-
 bool Inventory::handleError(int errCode)
 {
     if (errCode != 2) return false;
============================================================
--- guitone/src/monotone/MonotoneDelegate.cpp	33233e6fa3b2058ec9be7db7277d31532c7bf642
+++ guitone/src/monotone/MonotoneDelegate.cpp	0986e7b2551f4ccf87bcecc7da446cb417514d84
@@ -83,9 +83,9 @@ void MonotoneDelegate::commandFinished()
     APP->restoreOverrideCursor();
 }

-QString MonotoneDelegate::getBaseWorkspaceRevision()
+QString MonotoneDelegate::getBaseWorkspaceRevision(QObject * obj)
 {
-    Monotone * mtn = Monotone::singleton();
+    Monotone * mtn = MTN(obj);

     int commandNumber;
     if (!mtn->executeCommand(QStringList() << "get_base_revision_id", commandNumber) ||
@@ -100,9 +100,9 @@ QString MonotoneDelegate::getBaseWorkspa
     return baseRevision;
 }

-QString MonotoneDelegate::getOption(const QString & opt)
+QString MonotoneDelegate::getOption(QObject * obj, const QString & opt)
 {
-    Monotone * mtn = Monotone::singleton();
+    Monotone * mtn = MTN(obj);

     int cmdNum;
     mtn->executeCommand(QStringList() << "get_option" << opt, cmdNum);
@@ -121,9 +121,9 @@ QString MonotoneDelegate::getOption(cons
     return data;
 }

-QString MonotoneDelegate::getBranchName()
+QString MonotoneDelegate::getBranchName(QObject * obj)
 {
-    QString branchName = getOption("branch");
+    QString branchName = getOption(obj, "branch");

     if (branchName.size() == 0)
     {
@@ -132,11 +132,11 @@ QString MonotoneDelegate::getBranchName(
     return branchName;
 }

-QString MonotoneDelegate::getBranchNameShort()
+QString MonotoneDelegate::getBranchNameShort(QObject * obj)
 {
     // FIXME: currently there is only support for the domain branch scheme
     // tld.domain.project.branch
-    QString branchName = getBranchName();
+    QString branchName = getBranchName(obj);
     QStringList parts = branchName.split('.');
     if (parts.size() == 1) return branchName;

@@ -151,9 +151,9 @@ QString MonotoneDelegate::getBranchNameS
     return shortBranchName;
 }

-QStringList MonotoneDelegate::resolveSelector(const QString & selector)
+QStringList MonotoneDelegate::resolveSelector(QObject * obj, const QString & selector)
 {
-    Monotone * mtn = Monotone::singleton();
+    Monotone * mtn = MTN(obj);

     int cmdNum;
     mtn->executeCommand(QStringList() << "select" << selector, cmdNum);
============================================================
--- guitone/src/monotone/MonotoneDelegate.h	90d2cbee4e869a67166728b9f5fa73dc574ae57a
+++ guitone/src/monotone/MonotoneDelegate.h	b874cc9da422e4dbdf80623712b01d3f0213aa37
@@ -35,11 +35,11 @@ public:
     bool triggerCommand(const QStringList &);
     bool triggerCommand(const QStringList &, const QStringList &);

-    static QString getBaseWorkspaceRevision();
-    static QString getOption(const QString &);
-    static QString getBranchName();
-    static QString getBranchNameShort();
-    static QStringList resolveSelector(const QString &);
+    static QString getBaseWorkspaceRevision(QObject *);
+    static QString getOption(QObject *, const QString &);
+    static QString getBranchName(QObject *);
+    static QString getBranchNameShort(QObject *);
+    static QStringList resolveSelector(QObject *, const QString &);

 private:
     AutomateCommand * cmdModel;
============================================================
--- guitone/src/view/MainWindow.cpp	1dea0e2380aae2f2f5e08271070ea75ebd2064dd
+++ guitone/src/view/MainWindow.cpp	afa591155fdb43a496e9712bd5fa6248770b96e7
@@ -351,7 +351,7 @@ void MainWindow::switchMode(Mode m)

         setWindowTitle(
             tr("%1 - workspace mode - guitone").
-                arg(Inventory::getBranchNameShort(this))
+                arg(MonotoneDelegate::getBranchNameShort(this))
         );
     }
     else
@@ -560,6 +560,18 @@ void MainWindow:: on_actionChangeset_bro
     dialog.execDocumentModal();
 }

+void MainWindow:: on_actionUpdate_workspace_triggered()
+{
+    UpdateWorkspace dialog(this);
+    dialog.execDocumentModal();
+}
+
+void MainWindow:: on_actionCheckout_revision_triggered()
+{
+    CheckoutRevision dialog(this);
+    dialog.execDocumentModal();
+}
+
 // FIXME: the next two handlers should probably ensure that the according dialog
 // is only opened once per application
 void MainWindow::on_actionPreferences_triggered()
============================================================
--- guitone/src/view/dialogs/CheckoutRevision.cpp	0ad602766bdbe0e74db8140ed4fa83650071437d
+++ guitone/src/view/dialogs/CheckoutRevision.cpp	d1f8bb32050e9348c9b692e9a028a28a680d1f89
@@ -138,7 +138,7 @@ void CheckoutRevision::accept()
         Settings::addItemToList("RecentCheckoutSelectors", selection, 10);
     }

-    QStringList revList(MonotoneDelegate::resolveSelector(selector));
+    QStringList revList(MonotoneDelegate::resolveSelector(this, selector));

     if (revList.size() == 0)
     {
============================================================
--- guitone/src/view/dialogs/SelectRevision.cpp	92d6faeeb9416af1595cde39023647be92340fe0
+++ guitone/src/view/dialogs/SelectRevision.cpp	a53559f75c0a42111e1789d2f37a4453eb5522d9
@@ -27,7 +27,7 @@ SelectRevision::SelectRevision(QWidget*
 #include <QHeaderView>

 SelectRevision::SelectRevision(QWidget* parent)
-    : Dialog(parent)
+    : Dialog(parent), selectorCompleter(0)
 {
     setupUi(this);
     Dialog::init();
@@ -50,7 +50,7 @@ SelectRevision::SelectRevision(QWidget*
     selectorModel       = new Select(this);
     sortModel           = new Toposort(this);
     certsModel          = new Certs(this);
-    branchesModel       = new Branches(false, this);
+    branchesModel       = new Branches(this, false);
     tagsModel           = new Tags(this);
     keysModel           = new Keys(this);

============================================================
--- guitone/src/view/dialogs/UpdateWorkspace.cpp	6afc965a7d6216f59b4fe5a3404db462387a2b13
+++ guitone/src/view/dialogs/UpdateWorkspace.cpp	b0e31a4d3c8e49ac88fcc05ffa27c5203b94a840
@@ -35,7 +35,7 @@ UpdateWorkspace::UpdateWorkspace(QWidget
     setWindowFlags(Qt::Sheet);

     updateToLatest->setText(
-        updateToLatest->text().arg(MonotoneDelegate::getBranchName())
+        updateToLatest->text().arg(MonotoneDelegate::getBranchName(this))
     );

     branchesModel = new Branches(this, false);
@@ -88,7 +88,7 @@ void UpdateWorkspace::accept()

     if (updateToLatest->isChecked())
     {
-        selector = "h:" + MonotoneDelegate::getBranchName();
+        selector = "h:" + MonotoneDelegate::getBranchName(this);
     }

     if (updateToBranch->isChecked())
@@ -140,7 +140,7 @@ void UpdateWorkspace::accept()
         Settings::addItemToList("RecentUpdateSelectors", selection, 10);
     }

-    QStringList revList(MonotoneDelegate::resolveSelector(selector));
+    QStringList revList(MonotoneDelegate::resolveSelector(this, selector));

     if (revList.size() == 0)
     {