Merge branch 'master' into google

Conflicts:
	src/include/CommonDictInterface.h
	src/mdictionary/backbone/backbone.h
	src/plugins/google/GooglePlugin.h
	src/plugins/xdxf/xdxfplugin.h

diff --cc src/include/CommonDictInterface.h
index 2c7f8b5,af0079a..0f0c415
--- 1/src/include/CommonDictInterface.h
--- 2/src/include/CommonDictInterface.h
+++ b/src/include/CommonDictInterface.h
@@@ -47,32 -47,32 +47,32 @@@ class CommonDictInterface : public QObj
      CommonDictInterface(QObject *parent = 0):QObject(parent) {}
      virtual ~CommonDictInterface() {}
  
-     //! returns source language code iso 639-2
+     //! \returns source language code iso 639-2
      virtual QString langFrom() const = 0;
  
-     //! returns destination language code iso 639-2
+     //! \returns destination language code iso 639-2
      virtual QString langTo() const = 0;
  
-     //! returns dictionary name (like "old English" or so)
+     //! \returns dictionary name (like "old English" or so)
      virtual QString name() const = 0;
  
-     //! returns dictionary type (xdxf, google translate, etc)
+     //! \returns dictionary type (xdxf, google translate, etc)
      virtual QString type() const = 0;
  
 -    //! \returns information about dictionary in html (name, authors, etc)
 +    //! returns information about dictionary (name, authors, etc)
      virtual QString infoNote() const = 0;
  
-     /*! returns DictDialog object that creates dialogs
-         for adding new dictionary and changing plugin settings*/
+     /*! \returns DictDialog object that creates dialogs
+         for adding a new dictionary and changing plugin settings*/
      virtual DictDialog* dictDialog() = 0;
  
-     //! returns new, clean copy of plugin with settings set as in Settings*
+     //! \returns new, clean copy of plugin with settings set as in Settings*
      virtual CommonDictInterface* getNew(const Settings*) const = 0;
  
-     //! returns whether plugin can start searching
+     //! \returns whether plugin can start searching
      virtual bool isAvailable() const = 0;
  
-     //! returns the actual translation of a word given in key
+     //! \returns the actual translation of a word given in a key
      virtual QString search(QString key) = 0;
  
      //! \returns unique value (unique for every dictionary, not plugin)

diff --cc src/include/translation.h
Simple merge

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

diff --cc src/mdictionary/backbone/backbone.h
index a9f05c0,66ebea4..be84df7
--- 1/src/mdictionary/backbone/backbone.h
--- 2/src/mdictionary/backbone/backbone.h
+++ b/src/mdictionary/backbone/backbone.h
@@@ -173,9 -173,9 +173,9 @@@ public Q_SLOTS
      /*! Fired by FutureWatcher when search result is ready, fetch Future to
          final result
        */
 -    void htmlTranslationReady();
 +    void xmlTranslationReady();
  
-     /*! Removes given dictionary
+     /*! Removes a given dictionary
          \param dict dictionary to be deleted
        */
      void removeDictionary(CommonDictInterface* dict);

diff --cc src/mdictionary/gui/TranslationWidget.h
index b0537d0,a051c22..9e3e36c
--- 1/src/mdictionary/gui/TranslationWidget.h
--- 2/src/mdictionary/gui/TranslationWidget.h
+++ b/src/mdictionary/gui/TranslationWidget.h
@@@ -34,9 -34,9 +34,9 @@@
  #include <QPropertyAnimation>
  #include "../../include/GUIInterface.h"
  
- //! Displays translation of word found in dictionaries
+ //! Displays translation of a word found in dictionaries
  /*!
 -    Displays many translations of word, formatted as html.
 +    Displays many translations of word, formatted as xml.
  */
  class TranslationWidget : public QScrollArea {
      Q_OBJECT

diff --cc src/plugins/google/GooglePlugin.h
index c6e201f,d8f65b3..01097bb
--- 1/src/plugins/google/GooglePlugin.h
--- 2/src/plugins/google/GooglePlugin.h
+++ b/src/plugins/google/GooglePlugin.h
@@@ -50,19 -50,19 +50,19 @@@ public
      GooglePlugin(QObject *parent=0);
      ~GooglePlugin();
  
-     //! returns source language code iso 639-2
+     //! \returns source language code iso 639-2
      QString langFrom() const;
  
-     //! returns destination language code iso 639-2
+     //! \returns destination language code iso 639-2
      QString langTo() const;
  
-     //! returns dictionary name (like "old English" or so)
+     //! \returns dictionary name (like "old English" or so)
      QString name() const;
  
-     //! returns dictionary type (xdxf, google translate, etc)
+     //! \returns dictionary type (xdxf, google translate, etc)
      QString type() const;
  
 -    //! \returns information about dictionary in html (name, authors, etc)
 +    //! returns information about dictionary (name, authors, etc)
      QString infoNote() const;
  
      //! sets the language to which the translation is done

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

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

diff --cc src/plugins/xdxf/xdxfplugin.cpp
Simple merge

diff --cc src/plugins/xdxf/xdxfplugin.h
index 4223c08,555b7a1..804d187
--- 1/src/plugins/xdxf/xdxfplugin.h
--- 2/src/plugins/xdxf/xdxfplugin.h
+++ b/src/plugins/xdxf/xdxfplugin.h
@@@ -54,23 -54,23 +54,27 @@@ public
  
      ~XdxfPlugin();
  
-     //! returns source language code iso 639-2
+     //! \returns source language code iso 639-2
      QString langFrom() const;
  
-     //! returns destination language code iso 639-2
+     //! \returns destination language code iso 639-2
      QString langTo() const;
  
-     //! returns dictionary name (like "old English" or so)
+     //! \returns dictionary name (like "old English" or so)
      QString name() const;
  
-     //! returns dictionary type (xdxf, google translate, etc)
+     //! \returns dictionary type (xdxf, google translate, etc)
      QString type() const;
  
++<<<<<<< HEAD
 +    //! returns information about dictionary in xml (name, authors, etc)
++=======
+     //! \returns information about dictionary in html (name, authors, etc)
++>>>>>>> master
      QString infoNote() const;
  
-     /*! returns DictDialog object that creates dialogs
-         for adding new dictionary and changing plugin settings
+     /*! \returns DictDialog object that creates dialogs
+         for adding a new dictionary and changing plugin settings
        */
      DictDialog* dictDialog();