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

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

diff --cc trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index 48e3857,24e3ad1..0502a85
--- 1/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
--- 2/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@@ -378,8 -394,7 +415,8 @@@ bool XdxfPlugin::makeCache(QString dir
      QSqlQuery cur(db);
      cur.exec("PRAGMA synchronous = 0");
      cur.exec("drop table dict");
-     cur.exec("create table dict(word text ,transl text)");
 +    QCoreApplication::processEvents();
+     cur.exec("create table dict(word text ,translation text)");
      int counter = 0;
      cur.exec("BEGIN;");
  

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