Merge branch 'gui' of ssh://drop.maemo.org/git/mdictionary into gui

Conflicts:
	trunk/src/base/base.pro

diff --cc trunk/src/base/base.pro
index 1272aef,1ef9a0a..c691002
--- 1/trunk/src/base/base.pro
--- 2/trunk/src/base/base.pro
+++ b/trunk/src/base/base.pro
@@@ -51,9 -53,11 +53,12 @@@ HEADERS  += gui/MainWindow.h 
      gui/SettingsWidget.h \
      gui/BookmarksWidget.h \
      gui/WelcomeScreenWidget.h \
-     ../includes/Notify.h
++    ../includes/Notify.h \
+     gui/TranslationTextEdit.h
+ 
 -FORMS    += gui/MainWindow.ui
 -RESOURCES += gui/gui.qrc
 +FORMS += gui/MainWindow.ui
+ 
 +RESOURCES += gui/gui.qrc
  unix { 
      # VARIABLES
      isEmpty(PREFIX):PREFIX = /usr