fixed conflicts

[meabook] / meabook

diff --git a/meabook b/meabook
index d4fa9d5..39d118c 100755 (executable)
--- a/meabook
+++ b/meabook
@@ -2,6 +2,9 @@
 
 import os
 import sys
+import gettext
+gettext.textdomain('meabook')
+_ = gettext.gettext
 from optparse import OptionParser
 
 # add meabook directory to Python path in debug mode
@@ -44,9 +47,9 @@ def main(argv):
         basedir = os.path.join(os.environ['HOME'], '.meabook')
 
     model = SQLite(basedir)
-    view = app_factory(opts.ui)
+    view, renderer = app_factory(opts.ui)
     config = MeabookConfig(basedir, model)
-    controller = MeabookController(model, view, config)
+    controller = MeabookController(model, view, renderer, config)
 
 
 if __name__ == "__main__":