Merge branch 'google'

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

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

diff --cc src/plugins/google/google.pro
Simple merge

diff --cc src/plugins/xdxf/xdxf.pro
index d108a3c,ac31c1a..1fe7ee8
--- 1/src/plugins/xdxf/xdxf.pro
--- 2/src/plugins/xdxf/xdxf.pro
+++ b/src/plugins/xdxf/xdxf.pro
@@@ -23,14 -23,12 +23,14 @@@ HEADERS += 
      XdxfSettingsDialog.h \
      XdxfCachingDialog.h
  
 -
  RESOURCES += \
      xdxf.qrc
 +
 +TRANSLATIONS += dict_xdxf_pl.ts \
 +                dict_xdxf_en.ts
      
  unix {
-   INSTALLS += dicts
+   INSTALLS += dicts plugin-icon
  
    dicts.path = $$PLUGINS_DIR
    dicts.files += ../../../data/dicts/eng-us.xdxf

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