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

Conflicts:
	trunk/src/plugins/google/src/GoogleSettingsDialog.cpp

diff --cc trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
index 6489cbd,39c1aec..b9183e9
--- 1/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
--- 2/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
+++ b/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
@@@ -43,7 -43,12 +43,11 @@@ GoogleSettingsDialog::GoogleSettingsDia
      _langTo=languages.key(langTo);
      _langFrom=languages.key(langFrom);
  
-     changeLangButton=new QPushButton(QIcon::fromTheme("object-flip-vertical"),tr(""));
 -
+     #ifdef Q_WS_MAEMO_5
+         changeLangButton=new QPushButton(QIcon::fromTheme("general_refresh"),tr(""));
+     #else
+         changeLangButton=new QPushButton(QIcon::fromTheme("object-flip-vertical"),tr(""));
+     #endif
      langFromLabel = new QLabel("From:");
      langToLabel = new QLabel(" To: ");
      connectInfoLabel = new QLabel(tr("Google plugin make use of internet "

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