#
#
# patch "src/monotone/MonotoneManager.cpp"
#  from [a17a4f2ff69e20060d1699e699b42b1c015063cf]
#    to [03d21bf3da3e159d125d11929945b2ed14550cdd]
# 
# patch "src/monotone/MonotoneManager.h"
#  from [b88dfb8198ac73168c3e313927d39ef357530964]
#    to [a41cbd2798cbc629d9525a01b9af41eabf3e21c1]
#
============================================================
--- src/monotone/MonotoneManager.cpp	a17a4f2ff69e20060d1699e699b42b1c015063cf
+++ src/monotone/MonotoneManager.cpp	03d21bf3da3e159d125d11929945b2ed14550cdd
@@ -45,6 +45,7 @@ MonotoneThread * MonotoneManager::getThr
 // threads around - i.e. use shared ptrs or something
 MonotoneThread * MonotoneManager::getThreadForWorkspace(const WorkspacePath & workspace)
 {
+    // ensure that its normalized
     WorkspacePath normalizedWorkspace = normalizeWorkspacePath(workspace);
     DatabaseFile databaseFile = getDatabaseFilePath(normalizedWorkspace);
     return getThread(databaseFile, workspace);
@@ -58,7 +59,7 @@ MonotoneThread * MonotoneManager::getThr
 MonotoneThread * MonotoneManager::getThread(const DatabaseFile & database, const WorkspacePath & workspace)
 {
     if (mtnPath.isEmpty())
-        throw GuitoneException("Monotone binary path not set");
+        throw GuitoneException(tr("Monotone binary path not set"));
 
     // FIXME: since we cannot set the workspace directory after we've
     // started the process, we need to ensure that each workspace runs with
============================================================
--- src/monotone/MonotoneManager.h	b88dfb8198ac73168c3e313927d39ef357530964
+++ src/monotone/MonotoneManager.h	a41cbd2798cbc629d9525a01b9af41eabf3e21c1
@@ -48,6 +48,9 @@ public:
     //! returns the interface version of a given monotone binary
     static QString getInterfaceVersion(const QString &);
 
+    //! returns the directory which contains the _MTN directory
+    static WorkspacePath normalizeWorkspacePath(const WorkspacePath &);
+
     //! compares two version strings
     static int versionCompare(const QString &, const QString &);
 
@@ -58,7 +61,6 @@ private:
 
 private:
     MonotoneThread * getThread(const DatabaseFile &, const WorkspacePath &);
-    WorkspacePath normalizeWorkspacePath(const WorkspacePath &);
 
     QMap<QString, MonotoneThread *> threadMap;
     QMap<WorkspacePath, DatabaseFile> workspaceMap;