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

Conflicts:
	trunk/src/base/base.pro

diff --cc trunk/src/base/base.pro
index 1272aef,e440e9c..48ff83e
--- 1/trunk/src/base/base.pro
--- 2/trunk/src/base/base.pro
+++ b/trunk/src/base/base.pro
@@@ -26,9 -32,11 +32,12 @@@ SOURCES += gui/main.cpp 
      backbone/Bookmarks.cpp \
      gui/SettingsWidget.cpp \
      gui/BookmarksWidget.cpp \
 -    gui/WelcomeScreenWidget.cpp \ 
 +    gui/WelcomeScreenWidget.cpp \
-     gui/AboutWidget.cpp
+     gui/AboutWidget.cpp \
+     gui/TranslationTextEdit.cpp
+ 
 -HEADERS  += gui/MainWindow.h \
 +HEADERS += gui/MainWindow.h \
++
      gui/AboutWidget.h \
      gui/SearchBarWidget.h \
      gui/WordListWidget.h \
@@@ -51,9 -59,11 +60,12 @@@
      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