Merge branch 'master' into google

diff --cc trunk/src/base/backbone/backbone.cpp
Simple merge

diff --cc trunk/src/plugins/google/src/GooglePlugin.cpp
index 184e40e,607c41c..d622641
--- 1/trunk/src/plugins/google/src/GooglePlugin.cpp
--- 2/trunk/src/plugins/google/src/GooglePlugin.cpp
+++ b/trunk/src/plugins/google/src/GooglePlugin.cpp
@@@ -27,16 -27,16 +27,16 @@@
  #include <QDebug>
  #include "GoogleDictDialog.h"
  
 -
  GooglePlugin::GooglePlugin(QObject *parent): CommonDictInterface(parent),
                      _langFrom(tr("")), _langTo(tr("")),_name(tr("")),
-                     _type(tr("google")), _infoNote(tr("")) {
+                     _type("google"), _infoNote(tr("")) {
  
 -    stopped = false;
 -    _connectionAccept = false;
      _settings = new Settings();
      _dictDialog = new GoogleDictDialog(this,this);
 +    http = new QHttp(this);
  
 +    stopped = false;
 +    _connectionAccept = false;
      _icon = QIcon(":/icons/drawing.png");
      languages=initLanguages();
      _settings->setValue("type","google");

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