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

diff --cc trunk/src/plugins/google/src/GooglePlugin.h
Simple merge

diff --cc trunk/src/plugins/google/src/GoogleSettingsDialog.h
index 2ed18d4,c286ef9..5e3d7c3
--- 1/trunk/src/plugins/google/src/GoogleSettingsDialog.h
--- 2/trunk/src/plugins/google/src/GoogleSettingsDialog.h
+++ b/trunk/src/plugins/google/src/GoogleSettingsDialog.h
@@@ -50,14 -49,12 +49,12 @@@ public
          \returns function return settings to GooglePlugin
      */
      static Settings* getSettings(QWidget *parent,
-                                  QString langTo ="",
-                                  QString langFrom ="",
+                                  Settings *pluginSettings=0,
                                   QString acceptButtonLabel = tr("Add"));
- 
      /*!
 -        function set a new settings in plugin;
 +        function sets a new settings in plugin;
          \param plugin plugin whose settings you will change
 -        \param parent parent widget on which will be displayed dialog
 +        \param parent parent widget on which dialog will be displayed
      */
      static void changeSettings(GooglePlugin* plugin, QWidget *parent);