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

Conflicts:
	trunk/src/base/xsl.xsl

diff --cc trunk/src/base/xsl.xsl
index 1fefc09,f1b3e34..a4f3d23
--- 1/trunk/src/base/xsl.xsl
--- 2/trunk/src/base/xsl.xsl
+++ b/trunk/src/base/xsl.xsl
@@@ -17,14 -17,8 +17,13 @@@
  </xsl:template> 
  
  <xsl:template match="info">
-       <!-- <xsl:variable name="path" select="info/@path"/>-->
        <tr>
 -         <th class="info"><xsl:value-of select="."/></th>
 +              <th class="info">               
 +              <xsl:if test="@bookmark = 'true'">
 +                      <img src="mydata://image.png"/>   
 +                      </xsl:if>
 +              <xsl:value-of select="."/> <!-- <img src="{$path}"/> -->
 +              </th>
        </tr>
  </xsl:template>
  
@@@ -41,15 -35,11 +40,15 @@@
  </xsl:template>
  
  <xsl:template match="tr">
-       [<p><xsl:apply-templates/></p>]
+       [<span class="i"><xsl:apply-templates/></span>]
  </xsl:template> 
  
 +<xsl:template match="pos">
 +      (<p><xsl:apply-templates/></p>)
 +</xsl:template>
 +
  <xsl:template match="pot">
-       ,<p><xsl:apply-templates/></p>
+       ,<span class="i"><xsl:apply-templates/></span>
  </xsl:template>
  
  <xsl:template match="tence">