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

Conflicts:
	src/plugins/stardict/StarDialog.cpp

diff --cc src/plugins/stardict/StarDialog.cpp
index 8ca8b3a,c8deb1b..b6b4e78
--- 1/src/plugins/stardict/StarDialog.cpp
--- 2/src/plugins/stardict/StarDialog.cpp
+++ b/src/plugins/stardict/StarDialog.cpp
@@@ -223,19 -192,7 +199,13 @@@ void StarDialog::saveSettings() 
      }
      else {
          _settings->setValue("path", _dictionaryFilePath);
 +        _settings->setValue("ifoFileName", _dictName + ".ifo");
 +        _settings->setValue("idxFileName", _dictName + ".idx");
 +        _settings->setValue("dictFileName", _dictName + ".dict");
 +        if (QFile::exists(_dictName + ".syn") == true) {
 +                _settings->setValue("synFileName", _dictName + ".syn");
 +        }
      }
- 
-     if(_generateCache)
-         _settings->setValue("generateCache", "true");
-     else
-         _settings->setValue("generateCache", "false");
- 
      if(_accents)
          _settings->setValue("strip_accents", "true");
      else

diff --cc src/plugins/stardict/StarDialog.h
Simple merge