Merge branch 'master' into google

diff --cc src/include/translation.h
index bfcf326,bc24bac..2d7407e
--- 1/src/include/translation.h
--- 2/src/include/translation.h
+++ b/src/include/translation.h
@@@ -51,11 -51,11 +51,11 @@@ class Translation 
          return this->key()==translation->key();
      }
  
 -    //! \return parsed raw format into html
 -    virtual QString toHtml() const = 0;
 +    //! \return parsed raw format into xml
 +    virtual QString toXml() const = 0;
  
      //! \return whether given translation is taken from bookmarks
-     virtual bool isBookmark() const {
+     virtual int isBookmark() const {
          return _bookmark;
     }
  

diff --cc src/mdictionary/backbone/BookmarkTranslations.h
Simple merge

diff --cc src/mdictionary/backbone/Bookmarks.cpp
index e046157,5583368..a2f55c8
--- 1/src/mdictionary/backbone/Bookmarks.cpp
--- 2/src/mdictionary/backbone/Bookmarks.cpp
+++ b/src/mdictionary/backbone/Bookmarks.cpp
@@@ -68,9 -66,8 +66,8 @@@ void Bookmarks::add(Translation* transl
      cur.prepare("insert into bookmarks values (?,?,?)");
      cur.addBindValue(translation->key());
      cur.addBindValue(removeAccents(translation->key()));
 -    cur.addBindValue(translation->toHtml());
 +    cur.addBindValue(translation->toXml());
      cur.exec();
-     db.close();
  }
  
  

diff --cc src/mdictionary/backbone/Bookmarks.h
Simple merge

diff --cc src/mdictionary/backbone/backbone.cpp
Simple merge

diff --cc src/mdictionary/gui/MainWindow.cpp
Simple merge

diff --cc src/plugins/google/GoogleDialog.cpp
Simple merge

diff --cc src/plugins/google/TranslationGoogle.h
Simple merge

diff --cc src/plugins/xdxf/TranslationXdxf.h
Simple merge