From: Mateusz Półrola <mateusz.polrola@comarch.pl>
Date: Mon, 9 Aug 2010 11:12:47 +0000 (+0200)
Subject: Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
X-Git-Tag: 0.4~70^2~5
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=1b5bf15f6c1881434720b181a09027dc2cd8303f;p=mdictionary

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

Conflicts:
	trunk/src/plugins/xdxf/src/xdxfplugin.cpp
---

1b5bf15f6c1881434720b181a09027dc2cd8303f
diff --cc trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index dd2f54c,47c269d..f1c8b60
--- a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@@ -32,12 -32,11 +32,12 @@@ XdxfPlugin::XdxfPlugin(QObject *parent
                      _type(tr("xdxf")), _infoNote(tr("")) {
      _settings = new Settings();
      _dictDialog = new XdxfDictDialog(this);
-     _settings->setValue("Type","xdxf");
+     _settings->setValue("type","xdxf");
      if(isCached())
-         _settings->setValue("Cached","true");
+         _settings->setValue("cached","true");
      else
-         _settings->setValue("Cached","false");
+         _settings->setValue("cached","false");
 +
      setPath("/usr/lib/mdictionary/dict.xdxf");
      stopped = false;
  }