Switch to side-by-side view

--- a/src/qtgui/i18n/recoll_zh.ts
+++ b/src/qtgui/i18n/recoll_zh.ts
@@ -612,11 +612,11 @@
     </message>
     <message>
         <source>Default character set</source>
-        <translation>默认字符集</translation>
+        <translation type="obsolete">默认字符集</translation>
     </message>
     <message>
         <source>This is the character set used for reading files which do not identify the character set internally, for example pure text files.&lt;br&gt;The default value is empty, and the value from the NLS environnement is used.</source>
-        <translation>这是用来读取那些未标明自身的字符集的文件时所使用的字符集,例如纯文本文件。&lt;br&gt;默认值是空,会使用系统里的自然语言环境参数中的值。</translation>
+        <translation type="obsolete">这是用来读取那些未标明自身的字符集的文件时所使用的字符集,例如纯文本文件。&lt;br&gt;默认值是空,会使用系统里的自然语言环境参数中的值。</translation>
     </message>
     <message>
         <source>Follow symbolic links</source>
@@ -644,6 +644,14 @@
     </message>
     <message>
         <source>Web history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default&lt;br&gt;character set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Character set used for reading files which do not identify the character set internally, for example pure text files.&lt;br&gt;The default value is empty, and the value from the NLS environnement is used.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -868,7 +876,7 @@
     </message>
     <message>
         <source>Document category filter</source>
-        <translation>文档分类过滤器</translation>
+        <translation type="obsolete">文档分类过滤器</translation>
     </message>
     <message>
         <source>No external viewer configured for mime type [</source>
@@ -994,19 +1002,44 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Index not up to date for this file. Refusing to risk showing the wrong entry.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click Ok to update the index for this file, then re-run the query when indexing is done. Else, Cancel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Indexer running so things should improve when it&apos;s done</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Sub-documents and attachments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Document filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Index not up to date for this file. Refusing to risk showing the wrong entry. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click Ok to update the index for this file, then you will need to re-run the query when indexing is done. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The indexer is running so things should improve when it&apos;s done. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The document belongs to an external indexwhich I can&apos;t update. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click Cancel to return to the list. Click Ignore to show the preview anyway. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Duplicate documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>These Urls ( | ipath) share the same content:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bad desktop app spec for %1: [%2]
+Please check the desktop file</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1018,323 +1051,323 @@
     </message>
     <message>
         <source>Search tools</source>
-        <translation>搜索工具</translation>
-    </message>
+        <translation type="obsolete">搜索工具</translation>
+    </message>
+    <message>
+        <source>Result list</source>
+        <translation type="obsolete">结果列表</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>文件(&amp;F)</translation>
+    </message>
+    <message>
+        <source>&amp;Tools</source>
+        <translation>工具(&amp;T)</translation>
+    </message>
+    <message>
+        <source>&amp;Preferences</source>
+        <translation>选项(&amp;P)</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>帮助(&amp;H)</translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation>退出(&amp;x)</translation>
+    </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <source>Update &amp;index</source>
+        <translation>更新索引(&amp;i)</translation>
+    </message>
+    <message>
+        <source>&amp;Erase document history</source>
+        <translation>删除文档历史(&amp;E)</translation>
+    </message>
+    <message>
+        <source>&amp;About Recoll</source>
+        <translation>Recoll说明(&amp;A)</translation>
+    </message>
+    <message>
+        <source>&amp;User manual</source>
+        <translation>用户手册(&amp;U)</translation>
+    </message>
+    <message>
+        <source>Document &amp;History</source>
+        <translation>文档历史(&amp;H)</translation>
+    </message>
+    <message>
+        <source>Document  History</source>
+        <translation>文档历史</translation>
+    </message>
+    <message>
+        <source>&amp;Advanced Search</source>
+        <translation>高端搜索(&amp;A)</translation>
+    </message>
+    <message>
+        <source>Advanced/complex  Search</source>
+        <translation>高端/复杂搜索</translation>
+    </message>
+    <message>
+        <source>&amp;Sort parameters</source>
+        <translation>排序参数(&amp;S)</translation>
+    </message>
+    <message>
+        <source>Sort parameters</source>
+        <translation>排序参数</translation>
+    </message>
+    <message>
+        <source>Term &amp;explorer</source>
+        <translation>词语探索器(&amp;e)</translation>
+    </message>
+    <message>
+        <source>Term explorer tool</source>
+        <translation>词语探索器</translation>
+    </message>
+    <message>
+        <source>Next page</source>
+        <translation>下一页</translation>
+    </message>
+    <message>
+        <source>Next page of results</source>
+        <translation>下一页结果</translation>
+    </message>
+    <message>
+        <source>First page</source>
+        <translation>第一页</translation>
+    </message>
+    <message>
+        <source>Go to first page of results</source>
+        <translation>跳转到结果的第一页</translation>
+    </message>
+    <message>
+        <source>Previous page</source>
+        <translation>上一页</translation>
+    </message>
+    <message>
+        <source>Previous page of results</source>
+        <translation>上一页结果</translation>
+    </message>
+    <message>
+        <source>&amp;Query configuration</source>
+        <translation type="obsolete">查询配置(&amp;Q)</translation>
+    </message>
+    <message>
+        <source>External index dialog</source>
+        <translation>外部索引对话框</translation>
+    </message>
+    <message>
+        <source>&amp;Indexing configuration</source>
+        <translation type="obsolete">索引配置(&amp;I)</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="obsolete">全部</translation>
+    </message>
+    <message>
+        <source>&amp;Show missing helpers</source>
+        <translation>显示缺少的辅助程序列表(&amp;S)</translation>
+    </message>
+    <message>
+        <source>PgDown</source>
+        <translation>向下翻页</translation>
+    </message>
+    <message>
+        <source>PgUp</source>
+        <translation>向上翻页</translation>
+    </message>
+    <message>
+        <source>&amp;Full Screen</source>
+        <translation>全屏(&amp;F)</translation>
+    </message>
+    <message>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation>全屏</translation>
+    </message>
+    <message>
+        <source>&amp;Erase search history</source>
+        <translation>删除搜索历史(&amp;E)</translation>
+    </message>
+    <message>
+        <source>sortByDateAsc</source>
+        <translation type="obsolete">按日期升序排列</translation>
+    </message>
+    <message>
+        <source>Sort by dates from oldest to newest</source>
+        <translation>按日期排列,最旧的在前面</translation>
+    </message>
+    <message>
+        <source>sortByDateDesc</source>
+        <translation type="obsolete">按日期降序排列</translation>
+    </message>
+    <message>
+        <source>Sort by dates from newest to oldest</source>
+        <translation>按日期排列,最新的在前面</translation>
+    </message>
+    <message>
+        <source>Show Query Details</source>
+        <translation>显示查询语句细节</translation>
+    </message>
+    <message>
+        <source>Show results as table</source>
+        <translation type="obsolete">以表格的形式显示结果</translation>
+    </message>
+    <message>
+        <source>&amp;Rebuild index</source>
+        <translation>重新构造索引(&amp;R)</translation>
+    </message>
+    <message>
+        <source>&amp;Show indexed types</source>
+        <translation>显示已索引的文件类型(&amp;S)</translation>
+    </message>
+    <message>
+        <source>Shift+PgUp</source>
+        <translation>Shift+向上翻页</translation>
+    </message>
+    <message>
+        <source>&amp;Indexing schedule</source>
+        <translation>定时索引(&amp;I)</translation>
+    </message>
+    <message>
+        <source>E&amp;xternal index dialog</source>
+        <translation>外部索引对话框(&amp;x)</translation>
+    </message>
+    <message>
+        <source>&amp;Index configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;GUI configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Results</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort by date, oldest first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort by date, newest first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show as table</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show results in a spreadsheet-like table</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save as CSV (spreadsheet) file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saves the result into a file which you can load in a spreadsheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Next Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>First Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RecollModel</name>
+    <message>
+        <source>Abstract</source>
+        <translation>摘要</translation>
+    </message>
+    <message>
+        <source>Author</source>
+        <translation>作者</translation>
+    </message>
+    <message>
+        <source>Document size</source>
+        <translation>文档尺寸</translation>
+    </message>
+    <message>
+        <source>Document date</source>
+        <translation>文档日期</translation>
+    </message>
+    <message>
+        <source>File size</source>
+        <translation>文件尺寸</translation>
+    </message>
+    <message>
+        <source>File name</source>
+        <translation>文件名</translation>
+    </message>
+    <message>
+        <source>File date</source>
+        <translation>文件日期</translation>
+    </message>
+    <message>
+        <source>Keywords</source>
+        <translation>关键词</translation>
+    </message>
+    <message>
+        <source>Original character set</source>
+        <translation>原字符集</translation>
+    </message>
+    <message>
+        <source>Relevancy rating</source>
+        <translation>相关度</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>标题</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>路径</translation>
+    </message>
+    <message>
+        <source>Mtime</source>
+        <translation>修改时间</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>日期</translation>
+    </message>
+    <message>
+        <source>Date and time</source>
+        <translation>日期及时间</translation>
+    </message>
+    <message>
+        <source>Ipath</source>
+        <translation>内部路径</translation>
+    </message>
+    <message>
+        <source>MIME type</source>
+        <translation>文件类型</translation>
+    </message>
+</context>
+<context>
+    <name>ResList</name>
     <message>
         <source>Result list</source>
         <translation>结果列表</translation>
     </message>
     <message>
-        <source>&amp;File</source>
-        <translation>文件(&amp;F)</translation>
-    </message>
-    <message>
-        <source>&amp;Tools</source>
-        <translation>工具(&amp;T)</translation>
-    </message>
-    <message>
-        <source>&amp;Preferences</source>
-        <translation>选项(&amp;P)</translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation>帮助(&amp;H)</translation>
-    </message>
-    <message>
-        <source>E&amp;xit</source>
-        <translation>退出(&amp;x)</translation>
-    </message>
-    <message>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <source>Update &amp;index</source>
-        <translation>更新索引(&amp;i)</translation>
-    </message>
-    <message>
-        <source>&amp;Erase document history</source>
-        <translation>删除文档历史(&amp;E)</translation>
-    </message>
-    <message>
-        <source>&amp;About Recoll</source>
-        <translation>Recoll说明(&amp;A)</translation>
-    </message>
-    <message>
-        <source>&amp;User manual</source>
-        <translation>用户手册(&amp;U)</translation>
-    </message>
-    <message>
-        <source>Document &amp;History</source>
-        <translation>文档历史(&amp;H)</translation>
-    </message>
-    <message>
-        <source>Document  History</source>
-        <translation>文档历史</translation>
-    </message>
-    <message>
-        <source>&amp;Advanced Search</source>
-        <translation>高端搜索(&amp;A)</translation>
-    </message>
-    <message>
-        <source>Advanced/complex  Search</source>
-        <translation>高端/复杂搜索</translation>
-    </message>
-    <message>
-        <source>&amp;Sort parameters</source>
-        <translation>排序参数(&amp;S)</translation>
-    </message>
-    <message>
-        <source>Sort parameters</source>
-        <translation>排序参数</translation>
-    </message>
-    <message>
-        <source>Term &amp;explorer</source>
-        <translation>词语探索器(&amp;e)</translation>
-    </message>
-    <message>
-        <source>Term explorer tool</source>
-        <translation>词语探索器</translation>
-    </message>
-    <message>
-        <source>Next page</source>
-        <translation>下一页</translation>
-    </message>
-    <message>
-        <source>Next page of results</source>
-        <translation>下一页结果</translation>
-    </message>
-    <message>
-        <source>First page</source>
-        <translation>第一页</translation>
-    </message>
-    <message>
-        <source>Go to first page of results</source>
-        <translation>跳转到结果的第一页</translation>
-    </message>
-    <message>
-        <source>Previous page</source>
-        <translation>上一页</translation>
-    </message>
-    <message>
-        <source>Previous page of results</source>
-        <translation>上一页结果</translation>
-    </message>
-    <message>
-        <source>&amp;Query configuration</source>
-        <translation type="obsolete">查询配置(&amp;Q)</translation>
-    </message>
-    <message>
-        <source>External index dialog</source>
-        <translation>外部索引对话框</translation>
-    </message>
-    <message>
-        <source>&amp;Indexing configuration</source>
-        <translation type="obsolete">索引配置(&amp;I)</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation>全部</translation>
-    </message>
-    <message>
-        <source>&amp;Show missing helpers</source>
-        <translation>显示缺少的辅助程序列表(&amp;S)</translation>
-    </message>
-    <message>
-        <source>PgDown</source>
-        <translation>向下翻页</translation>
-    </message>
-    <message>
-        <source>PgUp</source>
-        <translation>向上翻页</translation>
-    </message>
-    <message>
-        <source>&amp;Full Screen</source>
-        <translation>全屏(&amp;F)</translation>
-    </message>
-    <message>
-        <source>F11</source>
-        <translation>F11</translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation>全屏</translation>
-    </message>
-    <message>
-        <source>&amp;Erase search history</source>
-        <translation>删除搜索历史(&amp;E)</translation>
-    </message>
-    <message>
-        <source>sortByDateAsc</source>
-        <translation type="obsolete">按日期升序排列</translation>
-    </message>
-    <message>
-        <source>Sort by dates from oldest to newest</source>
-        <translation>按日期排列,最旧的在前面</translation>
-    </message>
-    <message>
-        <source>sortByDateDesc</source>
-        <translation type="obsolete">按日期降序排列</translation>
-    </message>
-    <message>
-        <source>Sort by dates from newest to oldest</source>
-        <translation>按日期排列,最新的在前面</translation>
-    </message>
-    <message>
-        <source>Show Query Details</source>
-        <translation>显示查询语句细节</translation>
-    </message>
-    <message>
-        <source>Show results as table</source>
-        <translation type="obsolete">以表格的形式显示结果</translation>
-    </message>
-    <message>
-        <source>&amp;Rebuild index</source>
-        <translation>重新构造索引(&amp;R)</translation>
-    </message>
-    <message>
-        <source>&amp;Show indexed types</source>
-        <translation>显示已索引的文件类型(&amp;S)</translation>
-    </message>
-    <message>
-        <source>Shift+PgUp</source>
-        <translation>Shift+向上翻页</translation>
-    </message>
-    <message>
-        <source>&amp;Indexing schedule</source>
-        <translation>定时索引(&amp;I)</translation>
-    </message>
-    <message>
-        <source>E&amp;xternal index dialog</source>
-        <translation>外部索引对话框(&amp;x)</translation>
-    </message>
-    <message>
-        <source>&amp;Index configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;GUI configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Results</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort by date, oldest first</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort by date, newest first</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show as table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show results in a spreadsheet-like table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save as CSV (spreadsheet) file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saves the result into a file which you can load in a spreadsheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RecollModel</name>
-    <message>
-        <source>Abstract</source>
-        <translation>摘要</translation>
-    </message>
-    <message>
-        <source>Author</source>
-        <translation>作者</translation>
-    </message>
-    <message>
-        <source>Document size</source>
-        <translation>文档尺寸</translation>
-    </message>
-    <message>
-        <source>Document date</source>
-        <translation>文档日期</translation>
-    </message>
-    <message>
-        <source>File size</source>
-        <translation>文件尺寸</translation>
-    </message>
-    <message>
-        <source>File name</source>
-        <translation>文件名</translation>
-    </message>
-    <message>
-        <source>File date</source>
-        <translation>文件日期</translation>
-    </message>
-    <message>
-        <source>Keywords</source>
-        <translation>关键词</translation>
-    </message>
-    <message>
-        <source>Original character set</source>
-        <translation>原字符集</translation>
-    </message>
-    <message>
-        <source>Relevancy rating</source>
-        <translation>相关度</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation>标题</translation>
-    </message>
-    <message>
-        <source>URL</source>
-        <translation>路径</translation>
-    </message>
-    <message>
-        <source>Mtime</source>
-        <translation>修改时间</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>日期</translation>
-    </message>
-    <message>
-        <source>Date and time</source>
-        <translation>日期及时间</translation>
-    </message>
-    <message>
-        <source>Ipath</source>
-        <translation>内部路径</translation>
-    </message>
-    <message>
-        <source>MIME type</source>
-        <translation>文件类型</translation>
-    </message>
-</context>
-<context>
-    <name>ResList</name>
-    <message>
-        <source>Result list</source>
-        <translation>结果列表</translation>
-    </message>
-    <message>
         <source>(show query)</source>
         <translation>(显示查询语句细节)</translation>
     </message>
@@ -1419,14 +1452,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>These Urls ( | ipath) share the same content:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Result count (est.)</source>
         <translation type="unfinished">结果数(估计值)</translation>
     </message>
@@ -1573,6 +1598,10 @@
     </message>
     <message>
         <source>Show subdocuments / attachments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open With</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2179,6 +2208,22 @@
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Only mime types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>An exclusive list of indexed mime types.&lt;br&gt;Nothing else will be indexed. Normally empty and inactive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exclude mime types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime types not to be indexed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>confgui::ConfTopPanelW</name>
@@ -2351,7 +2396,7 @@
     </message>
     <message>
         <source>Display category filter as toolbar instead of button panel (needs restart).</source>
-        <translation>将文件类型过滤器显示成工具条,而不是按钮面板(需要重启程序)。</translation>
+        <translation type="obsolete">将文件类型过滤器显示成工具条,而不是按钮面板(需要重启程序)。</translation>
     </message>
     <message>
         <source>Auto-start simple search on whitespace entry.</source>
@@ -2579,5 +2624,25 @@
         <source>Resets the Snippets window style</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Decide if document filters are shown as radio buttons, toolbar combobox, or menu.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Document filter choice style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buttons Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toolbar Combobox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>